From c556df9e53f0276239c30d4bbe9024bd23870161 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Fri, 15 Aug 2025 12:17:56 +0100 Subject: [PATCH 001/117] first commit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..985bb4d --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# tips From f1320a2d596e809ddd03ec475e44fbdabe253e5b Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Thu, 18 Sep 2025 14:32:23 -0500 Subject: [PATCH 002/117] Datastore crate & repo setup --- .env.example | 0 .github/workflows/ci.yml | 55 + .gitignore | 14 + ...9cf31e808fa8dcbd701c75246dbdc95c58946.json | 23 + CLAUDE.md | 18 + Cargo.lock | 4510 +++++++++++++++++ Cargo.toml | 59 + README.md | 15 +- crates/datastore/Cargo.toml | 21 + .../1757444171_create_bundles_table.sql | 18 + crates/datastore/migrations/init-db.sh | 13 + crates/datastore/src/lib.rs | 4 + crates/datastore/src/postgres.rs | 319 ++ crates/datastore/src/traits.rs | 27 + crates/datastore/tests/datastore.rs | 304 ++ docs/logo.png | Bin 0 -> 127664 bytes justfile | 16 + 17 files changed, 5415 insertions(+), 1 deletion(-) create mode 100644 .env.example create mode 100644 .github/workflows/ci.yml create mode 100644 .gitignore create mode 100644 .sqlx/query-ca6a250821d4542720578da20aa9cf31e808fa8dcbd701c75246dbdc95c58946.json create mode 100644 CLAUDE.md create mode 100644 Cargo.lock create mode 100644 Cargo.toml create mode 100644 crates/datastore/Cargo.toml create mode 100644 crates/datastore/migrations/1757444171_create_bundles_table.sql create mode 100755 crates/datastore/migrations/init-db.sh create mode 100644 crates/datastore/src/lib.rs create mode 100644 crates/datastore/src/postgres.rs create mode 100644 crates/datastore/src/traits.rs create mode 100644 crates/datastore/tests/datastore.rs create mode 100644 docs/logo.png create mode 100644 justfile diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..e69de29 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..02f45d4 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,55 @@ +name: CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +env: + CARGO_TERM_COLOR: always + +jobs: + check: + name: Check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + - run: cargo check + + test: + name: Test + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + - run: cargo test + + fmt: + name: Rustfmt + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + with: + components: rustfmt + - run: cargo fmt --all -- --check + + clippy: + name: Clippy + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + with: + components: clippy + - run: cargo clippy -- -D warnings + + build: + name: Build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + - run: cargo build --release \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..88f004c --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +# Rust +/target/ + +# IDE & OS +.idea/ +.vscode/ +*.swp +*.swo +.DS_Store +Thumbs.db + +# Environment variables +.env +.env.local \ No newline at end of file diff --git a/.sqlx/query-ca6a250821d4542720578da20aa9cf31e808fa8dcbd701c75246dbdc95c58946.json b/.sqlx/query-ca6a250821d4542720578da20aa9cf31e808fa8dcbd701c75246dbdc95c58946.json new file mode 100644 index 0000000..ad77700 --- /dev/null +++ b/.sqlx/query-ca6a250821d4542720578da20aa9cf31e808fa8dcbd701c75246dbdc95c58946.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO bundles (\n id, senders, minimum_base_fee, txn_hashes, \n txs, reverting_tx_hashes, dropping_tx_hashes, \n block_number, min_timestamp, max_timestamp,\n created_at, updated_at\n )\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, NOW(), NOW())\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "BpcharArray", + "Int8", + "BpcharArray", + "TextArray", + "BpcharArray", + "BpcharArray", + "Int8", + "Int8", + "Int8" + ] + }, + "nullable": [] + }, + "hash": "ca6a250821d4542720578da20aa9cf31e808fa8dcbd701c75246dbdc95c58946" +} diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 0000000..998ae7a --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,18 @@ +# TIPS - Transaction Inclusion Prioritization Stack + +## Overview +TIPS is an experimental project to replace the p2p mempool with a collection of stateless servies to enable: + +- Higher throughput +- Simulation of all transaction +- Cost savings on hardware +- Bundle support + +## Code Style & Standards +- Do not add comments unless instructed +- Put imports at the top of the file, never in functions +- Use `just fix` to fix formatting and warnings +- Run `just ci` to verify your changes +- Add dependencies to the Cargo.toml in the root and reference them in the crate cargo files +- Always use the latest dependency versions. Use https://crates.io/ to find dependency versions when adding new deps +- For logging use the tracing crate with appropriate levels and structured logging \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 0000000..f1d0c76 --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,4510 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + +[[package]] +name = "alloy-consensus" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a3bd0305a44fb457cae77de1e82856eadd42ea3cdf0dae29df32eb3b592979" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "alloy-trie", + "alloy-tx-macros", + "auto_impl", + "c-kzg", + "derive_more", + "either", + "k256", + "once_cell", + "rand 0.8.5", + "secp256k1", + "serde", + "serde_with", + "thiserror", +] + +[[package]] +name = "alloy-consensus-any" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a842b4023f571835e62ac39fb8d523d19fcdbacfa70bf796ff96e7e19586f50" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "serde", +] + +[[package]] +name = "alloy-eip2124" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "741bdd7499908b3aa0b159bba11e71c8cddd009a2c2eb7a06e825f1ec87900a5" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "crc", + "serde", + "thiserror", +] + +[[package]] +name = "alloy-eip2930" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b82752a889170df67bbb36d42ca63c531eb16274f0d7299ae2a680facba17bd" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "serde", +] + +[[package]] +name = "alloy-eip7702" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d4769c6ffddca380b0070d71c8b7f30bed375543fe76bb2f74ec0acf4b7cd16" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "k256", + "serde", + "thiserror", +] + +[[package]] +name = "alloy-eips" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd749c57f38f8cbf433e651179fc5a676255e6b95044f467d49255d2b81725a" +dependencies = [ + "alloy-eip2124", + "alloy-eip2930", + "alloy-eip7702", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "auto_impl", + "c-kzg", + "derive_more", + "either", + "serde", + "serde_with", + "sha2", + "thiserror", +] + +[[package]] +name = "alloy-network-primitives" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db489617bffe14847bf89f175b1c183e5dd7563ef84713936e2c34255cfbd845" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-serde", + "serde", +] + +[[package]] +name = "alloy-primitives" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc9485c56de23438127a731a6b4c87803d49faf1a7068dcd1d8768aca3a9edb9" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if", + "const-hex", + "derive_more", + "foldhash", + "hashbrown 0.15.5", + "indexmap 2.11.0", + "itoa", + "k256", + "keccak-asm", + "paste", + "proptest", + "rand 0.9.2", + "ruint", + "rustc-hash", + "serde", + "sha3", + "tiny-keccak", +] + +[[package]] +name = "alloy-rlp" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4" +dependencies = [ + "alloy-rlp-derive", + "arrayvec", + "bytes", +] + +[[package]] +name = "alloy-rlp-derive" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "alloy-rpc-types-eth" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f5812f81c3131abc2cd8953dc03c41999e180cff7252abbccaba68676e15027" +dependencies = [ + "alloy-consensus", + "alloy-consensus-any", + "alloy-eips", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "alloy-sol-types", + "itertools 0.13.0", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "alloy-rpc-types-mev" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f999c26193d08e4f4a748ef5f45fb626b2fc4c1cd4dc99c0ebe1032516d37cba" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-serde" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04dfe41a47805a34b848c83448946ca96f3d36842e8c074bcf8fa0870e337d12" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-sol-macro" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d20d867dcf42019d4779519a1ceb55eba8d7f3d0e4f0a89bcba82b8f9eb01e48" +dependencies = [ + "alloy-sol-macro-expander", + "alloy-sol-macro-input", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "alloy-sol-macro-expander" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b74e91b0b553c115d14bd0ed41898309356dc85d0e3d4b9014c4e7715e48c8ad" +dependencies = [ + "alloy-sol-macro-input", + "const-hex", + "heck", + "indexmap 2.11.0", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.106", + "syn-solidity", + "tiny-keccak", +] + +[[package]] +name = "alloy-sol-macro-input" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84194d31220803f5f62d0a00f583fd3a062b36382e2bea446f1af96727754565" +dependencies = [ + "const-hex", + "dunce", + "heck", + "macro-string", + "proc-macro2", + "quote", + "syn 2.0.106", + "syn-solidity", +] + +[[package]] +name = "alloy-sol-types" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5383d34ea00079e6dd89c652bcbdb764db160cef84e6250926961a0b2295d04" +dependencies = [ + "alloy-primitives", + "alloy-sol-macro", +] + +[[package]] +name = "alloy-trie" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3412d52bb97c6c6cc27ccc28d4e6e8cf605469101193b50b0bd5813b1f990b5" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "arrayvec", + "derive_more", + "nybbles", + "serde", + "smallvec", + "tracing", +] + +[[package]] +name = "alloy-tx-macros" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e434e0917dce890f755ea774f59d6f12557bc8c7dd9fa06456af80cfe0f0181e" +dependencies = [ + "alloy-primitives", + "darling 0.21.3", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" + +[[package]] +name = "ark-ff" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" +dependencies = [ + "ark-ff-asm 0.3.0", + "ark-ff-macros 0.3.0", + "ark-serialize 0.3.0", + "ark-std 0.3.0", + "derivative", + "num-bigint", + "num-traits", + "paste", + "rustc_version 0.3.3", + "zeroize", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm 0.4.2", + "ark-ff-macros 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", + "derivative", + "digest 0.10.7", + "itertools 0.10.5", + "num-bigint", + "num-traits", + "paste", + "rustc_version 0.4.1", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" +dependencies = [ + "num-bigint", + "num-traits", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-serialize" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" +dependencies = [ + "ark-std 0.3.0", + "digest 0.9.0", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-std 0.4.0", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-std" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] + +[[package]] +name = "async-trait" +version = "0.1.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "auto_impl" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "backtrace" +version = "0.3.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" + +[[package]] +name = "bit-set" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + +[[package]] +name = "bitcoin-io" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" + +[[package]] +name = "bitcoin_hashes" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +dependencies = [ + "bitcoin-io", + "hex-conservative", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" +dependencies = [ + "serde", +] + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blst" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fd49896f12ac9b6dcd7a5998466b9b58263a695a3dd1ecc1aaca2e12a90b080" +dependencies = [ + "cc", + "glob", + "threadpool", + "zeroize", +] + +[[package]] +name = "bollard" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97ccca1260af6a459d75994ad5acc1651bcabcbdbc41467cc9786519ab854c30" +dependencies = [ + "base64 0.22.1", + "bollard-stubs", + "bytes", + "futures-core", + "futures-util", + "hex", + "home", + "http", + "http-body-util", + "hyper", + "hyper-named-pipe", + "hyper-rustls", + "hyper-util", + "hyperlocal", + "log", + "pin-project-lite", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_derive", + "serde_json", + "serde_repr", + "serde_urlencoded", + "thiserror", + "tokio", + "tokio-util", + "tower-service", + "url", + "winapi", +] + +[[package]] +name = "bollard-stubs" +version = "1.47.1-rc.27.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f179cfbddb6e77a5472703d4b30436bff32929c0aa8a9008ecf23d1d3cdd0da" +dependencies = [ + "serde", + "serde_repr", + "serde_with", +] + +[[package]] +name = "bumpalo" +version = "3.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" + +[[package]] +name = "byte-slice-cast" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +dependencies = [ + "serde", +] + +[[package]] +name = "c-kzg" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7318cfa722931cb5fe0838b98d3ce5621e75f6a6408abc21721d80de9223f2e4" +dependencies = [ + "blst", + "cc", + "glob", + "hex", + "libc", + "once_cell", + "serde", +] + +[[package]] +name = "cc" +version = "1.2.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5252b3d2648e5eedbc1a6f501e3c795e07025c1e93bbf8bbdd6eef7f447a6d54" +dependencies = [ + "find-msvc-tools", + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" + +[[package]] +name = "chrono" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +dependencies = [ + "iana-time-zone", + "num-traits", + "serde", + "windows-link 0.2.0", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-hex" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dccd746bf9b1038c0507b7cec21eb2b11222db96a2902c96e8c185d6d20fb9c4" +dependencies = [ + "cfg-if", + "cpufeatures", + "hex", + "proptest", + "serde", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "const_format" +version = "0.2.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crossbeam-queue" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crunchy" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "darling" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" +dependencies = [ + "darling_core 0.20.11", + "darling_macro 0.20.11", +] + +[[package]] +name = "darling" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +dependencies = [ + "darling_core 0.21.3", + "darling_macro 0.21.3", +] + +[[package]] +name = "darling_core" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.106", +] + +[[package]] +name = "darling_core" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "serde", + "strsim", + "syn 2.0.106", +] + +[[package]] +name = "darling_macro" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" +dependencies = [ + "darling_core 0.20.11", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "darling_macro" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +dependencies = [ + "darling_core 0.21.3", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", + "unicode-xid", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "docker_credential" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d89dfcba45b4afad7450a99b39e751590463e45c04728cf555d36bb66940de8" +dependencies = [ + "base64 0.21.7", + "serde", + "serde_json", +] + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "dyn-clone" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest 0.10.7", + "elliptic-curve", + "rfc6979", + "serdect", + "signature", + "spki", +] + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +dependencies = [ + "serde", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest 0.10.7", + "ff", + "generic-array", + "group", + "pkcs8", + "rand_core 0.6.4", + "sec1", + "serdect", + "subtle", + "zeroize", +] + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "fastrlp" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" +dependencies = [ + "arrayvec", + "auto_impl", + "bytes", +] + +[[package]] +name = "fastrlp" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce8dba4714ef14b8274c371879b175aa55b16b30f269663f19d576f380018dc4" +dependencies = [ + "arrayvec", + "auto_impl", + "bytes", +] + +[[package]] +name = "ff" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "filetime" +version = "0.2.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed" +dependencies = [ + "cfg-if", + "libc", + "libredox", + "windows-sys 0.60.2", +] + +[[package]] +name = "find-msvc-tools" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d" + +[[package]] +name = "fixed-hash" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" +dependencies = [ + "byteorder", + "rand 0.8.5", + "rustc-hex", + "static_assertions", +] + +[[package]] +name = "flume" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.4+wasi-0.2.4", +] + +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "glob" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", + "serde", +] + +[[package]] +name = "hashlink" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" +dependencies = [ + "hashbrown 0.15.5", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +dependencies = [ + "serde", +] + +[[package]] +name = "hex-conservative" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "home" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "http" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" +dependencies = [ + "atomic-waker", + "bytes", + "futures-channel", + "futures-core", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "pin-utils", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-named-pipe" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" +dependencies = [ + "hex", + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", + "winapi", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +dependencies = [ + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "libc", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + +[[package]] +name = "hyperlocal" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" +dependencies = [ + "hex", + "http-body-util", + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icu_collections" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" + +[[package]] +name = "icu_properties" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "potential_utf", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" + +[[package]] +name = "icu_provider" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +dependencies = [ + "displaydoc", + "icu_locale_core", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "impl-codec" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" +dependencies = [ + "parity-scale-codec", +] + +[[package]] +name = "impl-trait-for-tuples" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "indenter" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "964de6e86d545b246d84badc0fef527924ace5134f30641c203ef52ba83f58d5" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9" +dependencies = [ + "equivalent", + "hashbrown 0.15.5", + "serde", +] + +[[package]] +name = "io-uring" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" +dependencies = [ + "bitflags 2.9.4", + "cfg-if", + "libc", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "js-sys" +version = "0.3.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "k256" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "once_cell", + "serdect", + "sha2", +] + +[[package]] +name = "keccak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" +dependencies = [ + "cpufeatures", +] + +[[package]] +name = "keccak-asm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "505d1856a39b200489082f90d897c3f07c455563880bc5952e38eabf731c83b6" +dependencies = [ + "digest 0.10.7", + "sha3-asm", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] + +[[package]] +name = "libc" +version = "0.2.175" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" + +[[package]] +name = "libm" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" + +[[package]] +name = "libredox" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3" +dependencies = [ + "bitflags 2.9.4", + "libc", + "redox_syscall 0.5.17", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +dependencies = [ + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + +[[package]] +name = "litemap" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" + +[[package]] +name = "lock_api" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" + +[[package]] +name = "macro-string" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest 0.10.7", +] + +[[package]] +name = "memchr" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" + +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +dependencies = [ + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.59.0", +] + +[[package]] +name = "native-tls" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework 2.11.1", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "nybbles" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63cb50036b1ad148038105af40aaa70ff24d8a14fbc44ae5c914e1348533d12e" +dependencies = [ + "alloy-rlp", + "cfg-if", + "proptest", + "ruint", + "serde", + "smallvec", +] + +[[package]] +name = "object" +version = "0.36.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "op-alloy-consensus" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a501241474c3118833d6195312ae7eb7cc90bbb0d5f524cbb0b06619e49ff67" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "derive_more", + "thiserror", +] + +[[package]] +name = "openssl" +version = "0.10.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" +dependencies = [ + "bitflags 2.9.4", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "openssl-probe" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" + +[[package]] +name = "openssl-sys" +version = "0.9.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "parity-scale-codec" +version = "3.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799781ae679d79a948e13d4824a40970bfa500058d245760dd857301059810fa" +dependencies = [ + "arrayvec", + "bitvec", + "byte-slice-cast", + "const_format", + "impl-trait-for-tuples", + "parity-scale-codec-derive", + "rustversion", + "serde", +] + +[[package]] +name = "parity-scale-codec-derive" +version = "3.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34b4653168b563151153c9e4c08ebed57fb8262bebfa79711552fa983c623e7a" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "parking_lot" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.17", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "parse-display" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914a1c2265c98e2446911282c6ac86d8524f495792c38c5bd884f80499c7538a" +dependencies = [ + "parse-display-derive", + "regex", + "regex-syntax", +] + +[[package]] +name = "parse-display-derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae7800a4c974efd12df917266338e79a7a74415173caf7e70aa0a0707345281" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "regex-syntax", + "structmeta", + "syn 2.0.106", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + +[[package]] +name = "pest" +version = "2.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "potential_utf" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" +dependencies = [ + "zerovec", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "primitive-types" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" +dependencies = [ + "fixed-hash", + "impl-codec", + "uint", +] + +[[package]] +name = "proc-macro-crate" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "proc-macro2" +version = "1.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proptest" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags 2.9.4", + "lazy_static", + "num-traits", + "rand 0.9.2", + "rand_chacha 0.9.0", + "rand_xorshift", + "regex-syntax", + "rusty-fork", + "tempfile", + "unarray", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "serde", +] + +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", + "serde", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.16", +] + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.3", + "serde", +] + +[[package]] +name = "rand_xorshift" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" +dependencies = [ + "rand_core 0.9.3", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" +dependencies = [ + "bitflags 2.9.4", +] + +[[package]] +name = "ref-cast" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "regex" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "ring" +version = "0.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.16", + "libc", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rlp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" +dependencies = [ + "bytes", + "rustc-hex", +] + +[[package]] +name = "rsa" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b" +dependencies = [ + "const-oid", + "digest 0.10.7", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "ruint" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ecb38f82477f20c5c3d62ef52d7c4e536e38ea9b73fb570a20c5cae0e14bcf6" +dependencies = [ + "alloy-rlp", + "ark-ff 0.3.0", + "ark-ff 0.4.2", + "bytes", + "fastrlp 0.3.1", + "fastrlp 0.4.0", + "num-bigint", + "num-integer", + "num-traits", + "parity-scale-codec", + "primitive-types", + "proptest", + "rand 0.8.5", + "rand 0.9.2", + "rlp", + "ruint-macro", + "serde", + "valuable", + "zeroize", +] + +[[package]] +name = "ruint-macro" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" + +[[package]] +name = "rustc-demangle" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" + +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + +[[package]] +name = "rustc-hex" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" + +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver 0.11.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver 1.0.26", +] + +[[package]] +name = "rustix" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" +dependencies = [ + "bitflags 2.9.4", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.60.2", +] + +[[package]] +name = "rustls" +version = "0.23.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" +dependencies = [ + "openssl-probe", + "rustls-pki-types", + "schannel", + "security-framework 3.4.0", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +dependencies = [ + "zeroize", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "schannel" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "schemars" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "serdect", + "subtle", + "zeroize", +] + +[[package]] +name = "secp256k1" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" +dependencies = [ + "bitcoin_hashes", + "rand 0.8.5", + "secp256k1-sys", + "serde", +] + +[[package]] +name = "secp256k1-sys" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" +dependencies = [ + "cc", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.9.4", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b369d18893388b345804dc0007963c99b7d665ae71d275812d828c6f089640" +dependencies = [ + "bitflags 2.9.4", + "core-foundation 0.10.1", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" + +[[package]] +name = "semver-parser" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2" +dependencies = [ + "pest", +] + +[[package]] +name = "serde" +version = "1.0.225" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6c24dee235d0da097043389623fb913daddf92c76e9f5a1db88607a0bcbd1d" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.225" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "659356f9a0cb1e529b24c01e43ad2bdf520ec4ceaf83047b83ddcc2251f96383" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.225" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea936adf78b1f766949a4977b91d2f5595825bd6ec079aa9543ad2685fc4516" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "serde_json" +version = "1.0.143" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.11.0", + "schemars 0.9.0", + "schemars 1.0.4", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f" +dependencies = [ + "darling 0.20.11", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "serdect" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177" +dependencies = [ + "base16ct", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest 0.10.7", + "keccak", +] + +[[package]] +name = "sha3-asm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46" +dependencies = [ + "cc", + "cfg-if", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest 0.10.7", + "rand_core 0.6.4", +] + +[[package]] +name = "slab" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sqlx" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6" +dependencies = [ + "base64 0.22.1", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "either", + "event-listener", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown 0.15.5", + "hashlink", + "indexmap 2.11.0", + "log", + "memchr", + "native-tls", + "once_cell", + "percent-encoding", + "serde", + "serde_json", + "sha2", + "smallvec", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "sqlx-macros" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 2.0.106", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b" +dependencies = [ + "dotenvy", + "either", + "heck", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 2.0.106", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" +dependencies = [ + "atoi", + "base64 0.22.1", + "bitflags 2.9.4", + "byteorder", + "bytes", + "chrono", + "crc", + "digest 0.10.7", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand 0.8.5", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46" +dependencies = [ + "atoi", + "base64 0.22.1", + "bitflags 2.9.4", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand 0.8.5", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "serde_urlencoded", + "sqlx-core", + "thiserror", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "structmeta" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" +dependencies = [ + "proc-macro2", + "quote", + "structmeta-derive", + "syn 2.0.106", +] + +[[package]] +name = "structmeta-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn-solidity" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0b198d366dbec045acfcd97295eb653a7a2b40e4dc764ef1e79aafcad439d3c" +dependencies = [ + "paste", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tempfile" +version = "3.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e" +dependencies = [ + "fastrand", + "getrandom 0.3.3", + "once_cell", + "rustix", + "windows-sys 0.60.2", +] + +[[package]] +name = "testcontainers" +version = "0.23.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a4f01f39bb10fc2a5ab23eb0d888b1e2bb168c157f61a1b98e6c501c639c74" +dependencies = [ + "async-trait", + "bollard", + "bollard-stubs", + "bytes", + "docker_credential", + "either", + "etcetera", + "futures", + "log", + "memchr", + "parse-display", + "pin-project-lite", + "serde", + "serde_json", + "serde_with", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tar", + "tokio-util", + "url", +] + +[[package]] +name = "testcontainers-modules" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d43ed4e8f58424c3a2c6c56dbea6643c3c23e8666a34df13c54f0a184e6c707" +dependencies = [ + "testcontainers", +] + +[[package]] +name = "thiserror" +version = "2.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "time" +version = "0.3.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" + +[[package]] +name = "time-macros" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinystr" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tips-datastore" +version = "0.1.0" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-rpc-types-mev", + "anyhow", + "async-trait", + "eyre", + "op-alloy-consensus", + "sqlx", + "testcontainers", + "testcontainers-modules", + "tokio", + "tracing", + "uuid", +] + +[[package]] +name = "tokio" +version = "1.47.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" +dependencies = [ + "backtrace", + "bytes", + "io-uring", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "slab", + "socket2", + "tokio-macros", + "windows-sys 0.59.0", +] + +[[package]] +name = "tokio-macros" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-tar" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" +dependencies = [ + "filetime", + "futures-core", + "libc", + "redox_syscall 0.3.5", + "tokio", + "tokio-stream", + "xattr", +] + +[[package]] +name = "tokio-util" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml_datetime" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" + +[[package]] +name = "toml_edit" +version = "0.22.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +dependencies = [ + "indexmap 2.11.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "tracing-core" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" + +[[package]] +name = "ucd-trie" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" + +[[package]] +name = "uint" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] + +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + +[[package]] +name = "unicode-bidi" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "uuid" +version = "1.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" +dependencies = [ + "getrandom 0.3.3", + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "valuable" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "wait-timeout" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" +dependencies = [ + "libc", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasi" +version = "0.14.4+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a5f4a424faf49c3c2c344f166f0662341d470ea185e939657aaff130f0ec4a" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn 2.0.106", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "whoami" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" +dependencies = [ + "libredox", + "wasite", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link 0.1.3", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-link" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.3", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" +dependencies = [ + "windows-link 0.1.3", + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + +[[package]] +name = "winnow" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" +dependencies = [ + "memchr", +] + +[[package]] +name = "wit-bindgen" +version = "0.45.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36" + +[[package]] +name = "writeable" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "xattr" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909" +dependencies = [ + "libc", + "rustix", +] + +[[package]] +name = "yoke" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..b4bf333 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,59 @@ +[workspace] +members = ["crates/datastore"] +resolver = "2" + +[workspace.dependencies] +tips-datastore = { path = "crates/datastore" } + +jsonrpsee = { version = "0.26.0", features = ["server", "macros"] } + +# alloy +alloy-primitives = { version = "1.3.1", default-features = false, features = [ + "map-foldhash", + "serde", +] } +alloy-rpc-types = { version = "1.0.32", default-features = false } +alloy-consensus = { version = "1.0.32" } +alloy-provider = { version = "1.0.32" } +alloy-rpc-client = { version = "1.0.32" } +alloy-rpc-types-mev = "1.0.32" +alloy-transport-http = "1.0.32" +alloy-rlp = "0.3.12" + +# op-alloy +op-alloy-rpc-types = { version = "0.20.0" } +op-alloy-consensus = { version = "0.20.0", features = ["k256"] } +op-alloy-network = {version = "0.20.0"} + +tokio = { version = "1.47.1", features = ["full"] } +tracing = "0.1.41" +tracing-subscriber = { version = "0.3.20", features = ["env-filter"] } +anyhow = "1.0.99" +clap = { version = "4.5.47", features = ["derive", "env"] } +url = "2.5.7" +sqlx = { version = "0.8.6", features = [ + "runtime-tokio-native-tls", + "postgres", + "uuid", + "chrono", + "json", +]} +uuid = { version = "1.18.1", features = ["v4", "serde"] } +serde = { version = "1.0.219", features = ["derive"] } +chrono = { version = "0.4.42", features = ["serde"] } +eyre = "0.6.12" +async-trait = "0.1.89" +serde_json = "1.0.143" +dotenvy = "0.15.7" +testcontainers = { version = "0.23.1", features = ["blocking"] } +testcontainers-modules = { version = "0.11.2", features = ["postgres", "kafka", "minio"] } +futures-util = "0.3.32" + +# Kafka and S3 dependencies +rdkafka = { version = "0.37.0", features = ["libz-static"] } +aws-config = "1.1.7" +aws-sdk-s3 = "1.106.0" +aws-credential-types = "1.1.7" +bytes = { version = "1.8.0", features = ["serde"] } +md5 = "0.7.0" +base64 = "0.22.1" diff --git a/README.md b/README.md index 985bb4d..88122e3 100644 --- a/README.md +++ b/README.md @@ -1 +1,14 @@ -# tips +![Base](./docs/logo.png) + +# TIPS - Transaction Inclusion & Prioritization Stack + +> [!WARNING] +> This repository is an experiment to enable bundles, transaction simulation and transaction tracing for Base. +> It's being used to explore ideas and experiment. It is currently not production ready. + +## Architecture Overview + +The project consists of several components: + +### 🗄️ Datastore (`crates/datastore`) +Postgres storage layer that provides API's to persist and retrieve bundles. \ No newline at end of file diff --git a/crates/datastore/Cargo.toml b/crates/datastore/Cargo.toml new file mode 100644 index 0000000..a77c22c --- /dev/null +++ b/crates/datastore/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "tips-datastore" +version = "0.1.0" +edition = "2024" + +[dependencies] +sqlx.workspace = true +uuid.workspace = true +tokio.workspace = true +anyhow.workspace = true +async-trait.workspace = true +alloy-rpc-types-mev.workspace = true +alloy-primitives.workspace = true +alloy-consensus.workspace = true +op-alloy-consensus.workspace = true +eyre.workspace = true +tracing.workspace = true + +[dev-dependencies] +testcontainers.workspace = true +testcontainers-modules.workspace = true diff --git a/crates/datastore/migrations/1757444171_create_bundles_table.sql b/crates/datastore/migrations/1757444171_create_bundles_table.sql new file mode 100644 index 0000000..a5fcdf7 --- /dev/null +++ b/crates/datastore/migrations/1757444171_create_bundles_table.sql @@ -0,0 +1,18 @@ +-- Create bundles table +CREATE TABLE IF NOT EXISTS bundles ( + id UUID PRIMARY KEY, + + senders CHAR(42)[], + minimum_base_fee BIGINT, -- todo find a larger type + txn_hashes CHAR(66)[], + + txs TEXT[] NOT NULL, + reverting_tx_hashes CHAR(66)[], + dropping_tx_hashes CHAR(66)[], + + block_number BIGINT, + min_timestamp BIGINT, + max_timestamp BIGINT, + created_at TIMESTAMPTZ NOT NULL, + updated_at TIMESTAMPTZ NOT NULL +); \ No newline at end of file diff --git a/crates/datastore/migrations/init-db.sh b/crates/datastore/migrations/init-db.sh new file mode 100755 index 0000000..ac13ad2 --- /dev/null +++ b/crates/datastore/migrations/init-db.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +echo "Running database migrations..." + +for file in /migrations/*.sql; do + if [ -f "$file" ]; then + echo "Applying migration: $(basename "$file")" + psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$file" + fi +done + +echo "Database initialization completed successfully" \ No newline at end of file diff --git a/crates/datastore/src/lib.rs b/crates/datastore/src/lib.rs new file mode 100644 index 0000000..25abc97 --- /dev/null +++ b/crates/datastore/src/lib.rs @@ -0,0 +1,4 @@ +pub mod postgres; +pub mod traits; +pub use postgres::PostgresDatastore; +pub use traits::BundleDatastore; diff --git a/crates/datastore/src/postgres.rs b/crates/datastore/src/postgres.rs new file mode 100644 index 0000000..88b75ad --- /dev/null +++ b/crates/datastore/src/postgres.rs @@ -0,0 +1,319 @@ +use crate::traits::BundleDatastore; +use alloy_consensus::Transaction; +use alloy_consensus::private::alloy_eips::Decodable2718; +use alloy_consensus::transaction::SignerRecoverable; +use alloy_primitives::hex::{FromHex, ToHexExt}; +use alloy_primitives::{Address, TxHash}; +use alloy_rpc_types_mev::EthSendBundle; +use anyhow::Result; +use op_alloy_consensus::OpTxEnvelope; +use sqlx::PgPool; +use tracing::info; +use uuid::Uuid; + +#[derive(sqlx::FromRow, Debug)] +struct BundleRow { + senders: Option>, + minimum_base_fee: Option, + txn_hashes: Option>, + txs: Vec, + reverting_tx_hashes: Option>, + dropping_tx_hashes: Option>, + block_number: Option, + min_timestamp: Option, + max_timestamp: Option, +} + +/// Filter criteria for selecting bundles +#[derive(Debug, Clone, Default)] +pub struct BundleFilter { + pub base_fee: Option, + pub block_number: Option, + pub timestamp: Option, +} + +impl BundleFilter { + pub fn new() -> Self { + Self::default() + } + + pub fn with_base_fee(mut self, base_fee: i64) -> Self { + self.base_fee = Some(base_fee); + self + } + + pub fn valid_for_block(mut self, block_number: u64) -> Self { + self.block_number = Some(block_number); + self + } + + pub fn valid_for_timestamp(mut self, timestamp: u64) -> Self { + self.timestamp = Some(timestamp); + self + } +} + +/// Extended bundle data that includes the original bundle plus extracted metadata +#[derive(Debug, Clone)] +pub struct BundleWithMetadata { + pub bundle: EthSendBundle, + pub txn_hashes: Vec, + pub senders: Vec
, + pub min_base_fee: i64, +} + +/// PostgreSQL implementation of the BundleDatastore trait +#[derive(Debug, Clone)] +pub struct PostgresDatastore { + pool: PgPool, +} + +impl PostgresDatastore { + pub async fn run_migrations(&self) -> Result<()> { + info!(message = "running migrations"); + sqlx::migrate!("./migrations").run(&self.pool).await?; + info!(message = "migrations complete"); + Ok(()) + } + + pub async fn connect(url: String) -> Result { + let pool = PgPool::connect(&url).await?; + Ok(Self::new(pool)) + } + + /// Create a new PostgreSQL datastore instance + pub fn new(pool: PgPool) -> Self { + Self { pool } + } + + fn row_to_bundle_with_metadata(&self, row: BundleRow) -> Result { + let parsed_txs: Result, _> = + row.txs.into_iter().map(|tx_hex| tx_hex.parse()).collect(); + + let parsed_reverting_tx_hashes: Result, _> = row + .reverting_tx_hashes + .unwrap_or_default() + .into_iter() + .map(TxHash::from_hex) + .collect(); + + let parsed_dropping_tx_hashes: Result, _> = row + .dropping_tx_hashes + .unwrap_or_default() + .into_iter() + .map(TxHash::from_hex) + .collect(); + + let bundle = EthSendBundle { + txs: parsed_txs?, + block_number: row.block_number.unwrap_or(0) as u64, + min_timestamp: row.min_timestamp.map(|t| t as u64), + max_timestamp: row.max_timestamp.map(|t| t as u64), + reverting_tx_hashes: parsed_reverting_tx_hashes?, + replacement_uuid: None, + dropping_tx_hashes: parsed_dropping_tx_hashes?, + refund_percent: None, + refund_recipient: None, + refund_tx_hashes: Vec::new(), + extra_fields: Default::default(), + }; + + let parsed_txn_hashes: Result, _> = row + .txn_hashes + .unwrap_or_default() + .into_iter() + .map(TxHash::from_hex) + .collect(); + + let parsed_senders: Result, _> = row + .senders + .unwrap_or_default() + .into_iter() + .map(Address::from_hex) + .collect(); + + Ok(BundleWithMetadata { + bundle, + txn_hashes: parsed_txn_hashes?, + senders: parsed_senders?, + min_base_fee: row.minimum_base_fee.unwrap_or(0), + }) + } + + fn extract_bundle_metadata( + &self, + bundle: &EthSendBundle, + ) -> Result<(Vec, i64, Vec)> { + let mut senders = Vec::new(); + let mut txn_hashes = Vec::new(); + + let mut min_base_fee = i64::MAX; + + for tx_bytes in &bundle.txs { + let envelope = OpTxEnvelope::decode_2718_exact(tx_bytes)?; + txn_hashes.push(envelope.hash().encode_hex_with_prefix()); + + let sender = match envelope.recover_signer() { + Ok(signer) => signer, + Err(err) => return Err(err.into()), + }; + + senders.push(sender.encode_hex_with_prefix()); + min_base_fee = min_base_fee.min(envelope.max_fee_per_gas() as i64); // todo type and todo not right + } + + let minimum_base_fee = if min_base_fee == i64::MAX { + 0 + } else { + min_base_fee + }; + + Ok((senders, minimum_base_fee, txn_hashes)) + } +} + +#[async_trait::async_trait] +impl BundleDatastore for PostgresDatastore { + async fn insert_bundle(&self, bundle: EthSendBundle) -> Result { + let id = Uuid::new_v4(); + + let (senders, minimum_base_fee, txn_hashes) = self.extract_bundle_metadata(&bundle)?; + + let txs: Vec = bundle + .txs + .iter() + .map(|tx| tx.encode_hex_upper_with_prefix()) + .collect(); + let reverting_tx_hashes: Vec = bundle + .reverting_tx_hashes + .iter() + .map(|h| h.encode_hex_with_prefix()) + .collect(); + let dropping_tx_hashes: Vec = bundle + .dropping_tx_hashes + .iter() + .map(|h| h.encode_hex_with_prefix()) + .collect(); + + sqlx::query!( + r#" + INSERT INTO bundles ( + id, senders, minimum_base_fee, txn_hashes, + txs, reverting_tx_hashes, dropping_tx_hashes, + block_number, min_timestamp, max_timestamp, + created_at, updated_at + ) + VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, NOW(), NOW()) + "#, + id, + &senders, + minimum_base_fee, + &txn_hashes, + &txs, + &reverting_tx_hashes, + &dropping_tx_hashes, + bundle.block_number as i64, + bundle.min_timestamp.map(|t| t as i64), + bundle.max_timestamp.map(|t| t as i64), + ) + .execute(&self.pool) + .await?; + + Ok(id) + } + + async fn get_bundle(&self, id: Uuid) -> Result> { + let result = sqlx::query_as::<_, BundleRow>( + r#" + SELECT senders, minimum_base_fee, txn_hashes, txs, reverting_tx_hashes, + dropping_tx_hashes, block_number, min_timestamp, max_timestamp + FROM bundles + WHERE id = $1 + "#, + ) + .bind(id) + .fetch_optional(&self.pool) + .await?; + + match result { + Some(row) => { + let bundle_with_metadata = self.row_to_bundle_with_metadata(row)?; + Ok(Some(bundle_with_metadata)) + } + None => Ok(None), + } + } + + async fn cancel_bundle(&self, id: Uuid) -> Result<()> { + sqlx::query("DELETE FROM bundles WHERE id = $1") + .bind(id) + .execute(&self.pool) + .await?; + Ok(()) + } + + async fn select_bundles(&self, filter: BundleFilter) -> Result> { + let base_fee = filter.base_fee.unwrap_or(0); + let block_number = filter.block_number.unwrap_or(0) as i64; + + let (min_ts, max_ts) = if let Some(timestamp) = filter.timestamp { + (timestamp as i64, timestamp as i64) + } else { + // If not specified, set the parameters to be the whole range + (i64::MAX, 0i64) + }; + + let rows = sqlx::query_as::<_, BundleRow>( + r#" + SELECT senders, minimum_base_fee, txn_hashes, txs, reverting_tx_hashes, + dropping_tx_hashes, block_number, min_timestamp, max_timestamp + FROM bundles + WHERE minimum_base_fee >= $1 + AND (block_number = $2 OR block_number IS NULL OR block_number = 0 OR $2 = 0) + AND (min_timestamp <= $3 OR min_timestamp IS NULL) + AND (max_timestamp >= $4 OR max_timestamp IS NULL) + ORDER BY minimum_base_fee DESC + "#, + ) + .bind(base_fee) + .bind(block_number) + .bind(min_ts) + .bind(max_ts) + .fetch_all(&self.pool) + .await?; + + let mut bundles = Vec::new(); + for row in rows { + let bundle_with_metadata = self.row_to_bundle_with_metadata(row)?; + bundles.push(bundle_with_metadata); + } + + Ok(bundles) + } + + async fn find_bundle_by_transaction_hash(&self, tx_hash: TxHash) -> Result> { + let tx_hash_str = tx_hash.encode_hex_with_prefix(); + + let result = sqlx::query_scalar::<_, Uuid>( + r#" + SELECT id + FROM bundles + WHERE $1 = ANY(txn_hashes) + LIMIT 1 + "#, + ) + .bind(&tx_hash_str) + .fetch_optional(&self.pool) + .await?; + + Ok(result) + } + + async fn remove_bundle(&self, id: Uuid) -> Result<()> { + sqlx::query("DELETE FROM bundles WHERE id = $1") + .bind(id) + .execute(&self.pool) + .await?; + Ok(()) + } +} diff --git a/crates/datastore/src/traits.rs b/crates/datastore/src/traits.rs new file mode 100644 index 0000000..e5e58f2 --- /dev/null +++ b/crates/datastore/src/traits.rs @@ -0,0 +1,27 @@ +use crate::postgres::{BundleFilter, BundleWithMetadata}; +use alloy_primitives::TxHash; +use alloy_rpc_types_mev::EthSendBundle; +use anyhow::Result; +use uuid::Uuid; + +/// Trait defining the interface for bundle datastore operations +#[async_trait::async_trait] +pub trait BundleDatastore: Send + Sync { + /// Insert a new bundle into the datastore + async fn insert_bundle(&self, bundle: EthSendBundle) -> Result; + + /// Fetch a bundle with metadata by its ID + async fn get_bundle(&self, id: Uuid) -> Result>; + + /// Cancel a bundle by UUID + async fn cancel_bundle(&self, id: Uuid) -> Result<()>; + + /// Select the candidate bundles to include in the next Flashblock + async fn select_bundles(&self, filter: BundleFilter) -> Result>; + + /// Find bundle ID by transaction hash + async fn find_bundle_by_transaction_hash(&self, tx_hash: TxHash) -> Result>; + + /// Remove a bundle by ID + async fn remove_bundle(&self, id: Uuid) -> Result<()>; +} diff --git a/crates/datastore/tests/datastore.rs b/crates/datastore/tests/datastore.rs new file mode 100644 index 0000000..534292f --- /dev/null +++ b/crates/datastore/tests/datastore.rs @@ -0,0 +1,304 @@ +use alloy_primitives::{Address, Bytes, TxHash}; +use alloy_rpc_types_mev::EthSendBundle; +use sqlx::PgPool; +use testcontainers_modules::{ + postgres, + testcontainers::{ContainerAsync, runners::AsyncRunner}, +}; +use tips_datastore::postgres::BundleFilter; +use tips_datastore::{BundleDatastore, PostgresDatastore}; + +struct TestHarness { + _postgres_instance: ContainerAsync, + data_store: PostgresDatastore, +} + +async fn setup_datastore() -> eyre::Result { + let postgres_instance = postgres::Postgres::default().start().await?; + let connection_string = format!( + "postgres://postgres:postgres@{}:{}/postgres", + postgres_instance.get_host().await?, + postgres_instance.get_host_port_ipv4(5432).await? + ); + + let pool = PgPool::connect(&connection_string).await?; + let data_store = PostgresDatastore::new(pool); + + assert!(data_store.run_migrations().await.is_ok()); + Ok(TestHarness { + _postgres_instance: postgres_instance, + data_store, + }) +} + +fn get_test_tx() -> eyre::Result { + "0x02f8bf8221058304f8c782038c83d2a76b833d0900942e85c218afcdeb3d3b3f0f72941b4861f915bbcf80b85102000e0000000bb800001010c78c430a094eb7ae67d41a7cca25cdb9315e63baceb03bf4529e57a6b1b900010001f4000a101010110111101111011011faa7efc8e6aa13b029547eecbf5d370b4e1e52eec080a009fc02a6612877cec7e1223f0a14f9a9507b82ef03af41fcf14bf5018ccf2242a0338b46da29a62d28745c828077327588dc82c03a4b0210e3ee1fd62c608f8fcd".parse::().map_err(|e| e.into()) +} + +fn create_test_bundle_with_reverting_tx() -> eyre::Result { + Ok(EthSendBundle { + txs: vec![get_test_tx()?], + block_number: 12345, + min_timestamp: Some(1640995200), + max_timestamp: Some(1640995260), + reverting_tx_hashes: vec![ + "0x3ea7e1482485387e61150ee8e5c8cad48a14591789ac02cc2504046d96d0a5f4" + .parse::()?, + ], + replacement_uuid: None, + dropping_tx_hashes: vec![], + refund_percent: None, + refund_recipient: None, + refund_tx_hashes: vec![], + extra_fields: Default::default(), + }) +} + +fn create_test_bundle( + block_number: u64, + min_timestamp: Option, + max_timestamp: Option, +) -> eyre::Result { + Ok(EthSendBundle { + txs: vec![get_test_tx()?], + block_number, + min_timestamp, + max_timestamp, + reverting_tx_hashes: vec![], + replacement_uuid: None, + dropping_tx_hashes: vec![], + refund_percent: None, + refund_recipient: None, + refund_tx_hashes: vec![], + extra_fields: Default::default(), + }) +} + +#[tokio::test] +async fn insert_and_get() -> eyre::Result<()> { + let harness = setup_datastore().await?; + let test_bundle = create_test_bundle_with_reverting_tx()?; + + let insert_result = harness.data_store.insert_bundle(test_bundle.clone()).await; + if let Err(ref err) = insert_result { + eprintln!("Insert failed with error: {:?}", err); + } + assert!(insert_result.is_ok()); + let bundle_id = insert_result.unwrap(); + + let query_result = harness.data_store.get_bundle(bundle_id).await; + assert!(query_result.is_ok()); + let retrieved_bundle_with_metadata = query_result.unwrap(); + + assert!( + retrieved_bundle_with_metadata.is_some(), + "Bundle should be found" + ); + let metadata = retrieved_bundle_with_metadata.unwrap(); + let retrieved_bundle = &metadata.bundle; + + assert_eq!(retrieved_bundle.txs.len(), test_bundle.txs.len()); + assert_eq!(retrieved_bundle.block_number, test_bundle.block_number); + assert_eq!(retrieved_bundle.min_timestamp, test_bundle.min_timestamp); + assert_eq!(retrieved_bundle.max_timestamp, test_bundle.max_timestamp); + assert_eq!( + retrieved_bundle.reverting_tx_hashes.len(), + test_bundle.reverting_tx_hashes.len() + ); + assert_eq!( + retrieved_bundle.dropping_tx_hashes.len(), + test_bundle.dropping_tx_hashes.len() + ); + + assert!( + !metadata.txn_hashes.is_empty(), + "Transaction hashes should not be empty" + ); + assert!(!metadata.senders.is_empty(), "Senders should not be empty"); + assert_eq!( + metadata.txn_hashes.len(), + 1, + "Should have one transaction hash" + ); + assert_eq!(metadata.senders.len(), 1, "Should have one sender"); + assert!( + metadata.min_base_fee >= 0, + "Min base fee should be non-negative" + ); + + let expected_hash: TxHash = + "0x3ea7e1482485387e61150ee8e5c8cad48a14591789ac02cc2504046d96d0a5f4".parse()?; + let expected_sender: Address = "0x24ae36512421f1d9f6e074f00ff5b8393f5dd925".parse()?; + + assert_eq!( + metadata.txn_hashes[0], expected_hash, + "Transaction hash should match" + ); + assert_eq!(metadata.senders[0], expected_sender, "Sender should match"); + + Ok(()) +} + +#[tokio::test] +async fn select_bundles_comprehensive() -> eyre::Result<()> { + let harness = setup_datastore().await?; + + let bundle1 = create_test_bundle(100, Some(1000), Some(2000))?; + let bundle2 = create_test_bundle(200, Some(1500), Some(2500))?; + let bundle3 = create_test_bundle(300, None, None)?; // valid for all times + let bundle4 = create_test_bundle(0, Some(500), Some(3000))?; // valid for all blocks + + harness + .data_store + .insert_bundle(bundle1) + .await + .expect("Failed to insert bundle1"); + harness + .data_store + .insert_bundle(bundle2) + .await + .expect("Failed to insert bundle2"); + harness + .data_store + .insert_bundle(bundle3) + .await + .expect("Failed to insert bundle3"); + harness + .data_store + .insert_bundle(bundle4) + .await + .expect("Failed to insert bundle4"); + + let empty_filter = BundleFilter::new(); + let all_bundles = harness + .data_store + .select_bundles(empty_filter) + .await + .expect("Failed to select bundles with empty filter"); + assert_eq!( + all_bundles.len(), + 4, + "Should return all 4 bundles with empty filter" + ); + + let block_filter = BundleFilter::new().valid_for_block(200); + let filtered_bundles = harness + .data_store + .select_bundles(block_filter) + .await + .expect("Failed to select bundles with block filter"); + assert_eq!( + filtered_bundles.len(), + 2, + "Should return 2 bundles for block 200 (bundle2 + bundle4 with block 0)" + ); + assert_eq!(filtered_bundles[0].bundle.block_number, 200); + + let timestamp_filter = BundleFilter::new().valid_for_timestamp(1500); + let timestamp_filtered = harness + .data_store + .select_bundles(timestamp_filter) + .await + .expect("Failed to select bundles with timestamp filter"); + assert_eq!( + timestamp_filtered.len(), + 4, + "Should return all 4 bundles (all contain timestamp 1500: bundle1[1000-2000], bundle2[1500-2500], bundle3[NULL-NULL], bundle4[500-3000])" + ); + + let combined_filter = BundleFilter::new() + .valid_for_block(200) + .valid_for_timestamp(2000); + let combined_filtered = harness + .data_store + .select_bundles(combined_filter) + .await + .expect("Failed to select bundles with combined filter"); + assert_eq!( + combined_filtered.len(), + 2, + "Should return 2 bundles (bundle2: block=200 and timestamp range 1500-2500 contains 2000; bundle4: block=0 matches all blocks and timestamp range 500-3000 contains 2000)" + ); + assert_eq!(combined_filtered[0].bundle.block_number, 200); + + let no_match_filter = BundleFilter::new().valid_for_block(999); + let no_matches = harness + .data_store + .select_bundles(no_match_filter) + .await + .expect("Failed to select bundles with no match filter"); + assert_eq!( + no_matches.len(), + 1, + "Should return 1 bundle for non-existent block (bundle4 with block 0 is valid for all blocks)" + ); + + Ok(()) +} + +#[tokio::test] +async fn cancel_bundle_workflow() -> eyre::Result<()> { + let harness = setup_datastore().await?; + + let bundle1 = create_test_bundle(100, Some(1000), Some(2000))?; + let bundle2 = create_test_bundle(200, Some(1500), Some(2500))?; + + let bundle1_id = harness + .data_store + .insert_bundle(bundle1) + .await + .expect("Failed to insert bundle1"); + let bundle2_id = harness + .data_store + .insert_bundle(bundle2) + .await + .expect("Failed to insert bundle2"); + + let retrieved_bundle1 = harness + .data_store + .get_bundle(bundle1_id) + .await + .expect("Failed to get bundle1"); + assert!( + retrieved_bundle1.is_some(), + "Bundle1 should exist before cancellation" + ); + + let retrieved_bundle2 = harness + .data_store + .get_bundle(bundle2_id) + .await + .expect("Failed to get bundle2"); + assert!( + retrieved_bundle2.is_some(), + "Bundle2 should exist before cancellation" + ); + + harness + .data_store + .cancel_bundle(bundle1_id) + .await + .expect("Failed to cancel bundle1"); + + let cancelled_bundle1 = harness + .data_store + .get_bundle(bundle1_id) + .await + .expect("Failed to get bundle1 after cancellation"); + assert!( + cancelled_bundle1.is_none(), + "Bundle1 should not exist after cancellation" + ); + + let still_exists_bundle2 = harness + .data_store + .get_bundle(bundle2_id) + .await + .expect("Failed to get bundle2 after bundle1 cancellation"); + assert!( + still_exists_bundle2.is_some(), + "Bundle2 should still exist after bundle1 cancellation" + ); + + Ok(()) +} diff --git a/docs/logo.png b/docs/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..5dc999b136f37eb93277a7ae8e6c6f89f5f3e082 GIT binary patch literal 127664 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%0DZ1e%+iKGJNQ;S10@f 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 bT=$Q+4wsaj2{+p3;eIyP9V~FyZYTT~ME0hr literal 0 HcmV?d00001 diff --git a/justfile b/justfile new file mode 100644 index 0000000..a874491 --- /dev/null +++ b/justfile @@ -0,0 +1,16 @@ +ci: + cargo fmt --all -- --check + cargo clippy -- -D warnings + cargo build + cargo test + +fix: + cargo fmt --all + cargo clippy --fix --allow-dirty --allow-staged + +create-migration name: + touch crates/datastore/migrations/$(date +%s)_{{ name }}.sql + +sync: + ### DATABASE ### + cargo sqlx prepare -D postgresql://postgres:postgres@localhost:5432/postgres --workspace --all --no-dotenv \ No newline at end of file From fcd244b84303451809ba1411886969eb34e6a021 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Thu, 18 Sep 2025 15:26:24 -0500 Subject: [PATCH 003/117] Improve tests --- crates/datastore/tests/datastore.rs | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/crates/datastore/tests/datastore.rs b/crates/datastore/tests/datastore.rs index 534292f..c92beae 100644 --- a/crates/datastore/tests/datastore.rs +++ b/crates/datastore/tests/datastore.rs @@ -1,4 +1,4 @@ -use alloy_primitives::{Address, Bytes, TxHash}; +use alloy_primitives::{Address, Bytes, TxHash, address, b256, bytes}; use alloy_rpc_types_mev::EthSendBundle; use sqlx::PgPool; use testcontainers_modules::{ @@ -31,20 +31,19 @@ async fn setup_datastore() -> eyre::Result { }) } -fn get_test_tx() -> eyre::Result { - "0x02f8bf8221058304f8c782038c83d2a76b833d0900942e85c218afcdeb3d3b3f0f72941b4861f915bbcf80b85102000e0000000bb800001010c78c430a094eb7ae67d41a7cca25cdb9315e63baceb03bf4529e57a6b1b900010001f4000a101010110111101111011011faa7efc8e6aa13b029547eecbf5d370b4e1e52eec080a009fc02a6612877cec7e1223f0a14f9a9507b82ef03af41fcf14bf5018ccf2242a0338b46da29a62d28745c828077327588dc82c03a4b0210e3ee1fd62c608f8fcd".parse::().map_err(|e| e.into()) -} +const TX_DATA: Bytes = bytes!( + "0x02f8bf8221058304f8c782038c83d2a76b833d0900942e85c218afcdeb3d3b3f0f72941b4861f915bbcf80b85102000e0000000bb800001010c78c430a094eb7ae67d41a7cca25cdb9315e63baceb03bf4529e57a6b1b900010001f4000a101010110111101111011011faa7efc8e6aa13b029547eecbf5d370b4e1e52eec080a009fc02a6612877cec7e1223f0a14f9a9507b82ef03af41fcf14bf5018ccf2242a0338b46da29a62d28745c828077327588dc82c03a4b0210e3ee1fd62c608f8fcd" +); +const TX_HASH: TxHash = b256!("0x3ea7e1482485387e61150ee8e5c8cad48a14591789ac02cc2504046d96d0a5f4"); +const TX_SENDER: Address = address!("0x24ae36512421f1d9f6e074f00ff5b8393f5dd925"); fn create_test_bundle_with_reverting_tx() -> eyre::Result { Ok(EthSendBundle { - txs: vec![get_test_tx()?], + txs: vec![TX_DATA], block_number: 12345, min_timestamp: Some(1640995200), max_timestamp: Some(1640995260), - reverting_tx_hashes: vec![ - "0x3ea7e1482485387e61150ee8e5c8cad48a14591789ac02cc2504046d96d0a5f4" - .parse::()?, - ], + reverting_tx_hashes: vec![TX_HASH], replacement_uuid: None, dropping_tx_hashes: vec![], refund_percent: None, @@ -60,7 +59,7 @@ fn create_test_bundle( max_timestamp: Option, ) -> eyre::Result { Ok(EthSendBundle { - txs: vec![get_test_tx()?], + txs: vec![TX_DATA], block_number, min_timestamp, max_timestamp, @@ -126,15 +125,11 @@ async fn insert_and_get() -> eyre::Result<()> { "Min base fee should be non-negative" ); - let expected_hash: TxHash = - "0x3ea7e1482485387e61150ee8e5c8cad48a14591789ac02cc2504046d96d0a5f4".parse()?; - let expected_sender: Address = "0x24ae36512421f1d9f6e074f00ff5b8393f5dd925".parse()?; - assert_eq!( - metadata.txn_hashes[0], expected_hash, + metadata.txn_hashes[0], TX_HASH, "Transaction hash should match" ); - assert_eq!(metadata.senders[0], expected_sender, "Sender should match"); + assert_eq!(metadata.senders[0], TX_SENDER, "Sender should match"); Ok(()) } From 105a9d91e5860be0fdfd969c960751fca374aad1 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Thu, 18 Sep 2025 15:14:38 -0500 Subject: [PATCH 004/117] prototype: Add audit crate --- .env.example | 11 + .gitignore | 3 + Cargo.lock | 1857 ++++++++++++++++- Cargo.toml | 5 +- README.md | 8 +- crates/audit/Cargo.toml | 34 + crates/audit/src/archiver.rs | 51 + crates/audit/src/bin/main.rs | 136 ++ crates/audit/src/lib.rs | 11 + crates/audit/src/publisher.rs | 64 + crates/audit/src/reader.rs | 138 ++ crates/audit/src/storage.rs | 577 +++++ crates/audit/src/types.rs | 116 + crates/audit/tests/common/mod.rs | 78 + crates/audit/tests/integration_tests.rs | 73 + crates/audit/tests/s3_test.rs | 273 +++ docker-compose.yml | 73 + .../migrations => docker}/init-db.sh | 0 docs/AUDIT_S3_FORMAT.md | 87 + justfile | 15 +- 20 files changed, 3517 insertions(+), 93 deletions(-) create mode 100644 crates/audit/Cargo.toml create mode 100644 crates/audit/src/archiver.rs create mode 100644 crates/audit/src/bin/main.rs create mode 100644 crates/audit/src/lib.rs create mode 100644 crates/audit/src/publisher.rs create mode 100644 crates/audit/src/reader.rs create mode 100644 crates/audit/src/storage.rs create mode 100644 crates/audit/src/types.rs create mode 100644 crates/audit/tests/common/mod.rs create mode 100644 crates/audit/tests/integration_tests.rs create mode 100644 crates/audit/tests/s3_test.rs create mode 100644 docker-compose.yml rename {crates/datastore/migrations => docker}/init-db.sh (100%) create mode 100644 docs/AUDIT_S3_FORMAT.md diff --git a/.env.example b/.env.example index e69de29..77d5e6b 100644 --- a/.env.example +++ b/.env.example @@ -0,0 +1,11 @@ +# Audit service configuration +TIPS_AUDIT_KAFKA_BROKERS=localhost:9092 +TIPS_AUDIT_KAFKA_TOPIC=tips-audit +TIPS_AUDIT_KAFKA_GROUP_ID=local-audit +TIPS_AUDIT_LOG_LEVEL=info +TIPS_AUDIT_S3_BUCKET=tips +TIPS_AUDIT_S3_CONFIG_TYPE=manual +TIPS_AUDIT_S3_ENDPOINT=http://localhost:7000 +TIPS_AUDIT_S3_REGION=us-east-1 +TIPS_AUDIT_S3_ACCESS_KEY_ID=minioadmin +TIPS_AUDIT_S3_SECRET_ACCESS_KEY=minioadmin \ No newline at end of file diff --git a/.gitignore b/.gitignore index 88f004c..ed49a43 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ # Rust /target/ +# Local Dev +/data/ + # IDE & OS .idea/ .vscode/ diff --git a/Cargo.lock b/Cargo.lock index f1d0c76..1bedbc4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -32,6 +32,17 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" +[[package]] +name = "alloy-chains" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef8ff73a143281cb77c32006b04af9c047a6b8fe5860e85a88ad325328965355" +dependencies = [ + "alloy-primitives", + "num_enum", + "strum", +] + [[package]] name = "alloy-consensus" version = "1.0.32" @@ -130,6 +141,59 @@ dependencies = [ "thiserror", ] +[[package]] +name = "alloy-json-abi" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "125a1c373261b252e53e04d6e92c37d881833afc1315fceab53fd46045695640" +dependencies = [ + "alloy-primitives", + "alloy-sol-type-parser", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-json-rpc" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f614019a029c8fec14ae661aa7d4302e6e66bdbfb869dab40e78dcfba935fc97" +dependencies = [ + "alloy-primitives", + "alloy-sol-types", + "http 1.3.1", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "alloy-network" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8b6d58e98803017bbfea01dde96c4d270a29e7aed3beb65c8d28b5ab464e0e" +dependencies = [ + "alloy-consensus", + "alloy-consensus-any", + "alloy-eips", + "alloy-json-rpc", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rpc-types-any", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-signer", + "alloy-sol-types", + "async-trait", + "auto_impl", + "derive_more", + "futures-utils-wasm", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "alloy-network-primitives" version = "1.0.32" @@ -170,6 +234,45 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "alloy-provider" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed90278374435e076a04dbddbb6d714bdd518eb274a64dbd70f65701429dd747" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-network", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rpc-client", + "alloy-rpc-types-eth", + "alloy-signer", + "alloy-sol-types", + "alloy-transport", + "alloy-transport-http", + "async-stream", + "async-trait", + "auto_impl", + "dashmap", + "either", + "futures", + "futures-utils-wasm", + "lru 0.13.0", + "parking_lot", + "pin-project", + "reqwest", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "url", + "wasmtimer", +] + [[package]] name = "alloy-rlp" version = "0.3.12" @@ -192,6 +295,40 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "alloy-rpc-client" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33732242ca63f107f5f8284190244038905fb233280f4b7c41f641d4f584d40d" +dependencies = [ + "alloy-json-rpc", + "alloy-primitives", + "alloy-transport", + "alloy-transport-http", + "futures", + "pin-project", + "reqwest", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tower", + "tracing", + "url", + "wasmtimer", +] + +[[package]] +name = "alloy-rpc-types-any" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18f27c0c41a16cd0af4f5dbf791f7be2a60502ca8b0e840e0ad29803fac2d587" +dependencies = [ + "alloy-consensus-any", + "alloy-rpc-types-eth", + "alloy-serde", +] + [[package]] name = "alloy-rpc-types-eth" version = "1.0.32" @@ -209,6 +346,7 @@ dependencies = [ "itertools 0.13.0", "serde", "serde_json", + "serde_with", "thiserror", ] @@ -238,6 +376,21 @@ dependencies = [ "serde_json", ] +[[package]] +name = "alloy-signer" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79237b4c1b0934d5869deea4a54e6f0a7425a8cd943a739d6293afdf893d847" +dependencies = [ + "alloy-primitives", + "async-trait", + "auto_impl", + "either", + "elliptic-curve 0.13.8", + "k256", + "thiserror", +] + [[package]] name = "alloy-sol-macro" version = "1.3.1" @@ -286,14 +439,65 @@ dependencies = [ "syn-solidity", ] +[[package]] +name = "alloy-sol-type-parser" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe8c27b3cf6b2bb8361904732f955bc7c05e00be5f469cec7e2280b6167f3ff0" +dependencies = [ + "serde", + "winnow", +] + [[package]] name = "alloy-sol-types" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5383d34ea00079e6dd89c652bcbdb764db160cef84e6250926961a0b2295d04" dependencies = [ + "alloy-json-abi", "alloy-primitives", "alloy-sol-macro", + "serde", +] + +[[package]] +name = "alloy-transport" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb43750e137fe3a69a325cd89a8f8e2bbf4f83e70c0f60fbe49f22511ca075e8" +dependencies = [ + "alloy-json-rpc", + "alloy-primitives", + "auto_impl", + "base64 0.22.1", + "derive_more", + "futures", + "futures-utils-wasm", + "parking_lot", + "serde", + "serde_json", + "thiserror", + "tokio", + "tower", + "tracing", + "url", + "wasmtimer", +] + +[[package]] +name = "alloy-transport-http" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9b42c7d8b666eed975739201f407afc3320d3cd2e4d807639c2918fc736ea67" +dependencies = [ + "alloy-json-rpc", + "alloy-transport", + "reqwest", + "serde_json", + "tower", + "tracing", + "url", ] [[package]] @@ -334,6 +538,56 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" + +[[package]] +name = "anstyle-parse" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" +dependencies = [ + "windows-sys 0.60.2", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.60.2", +] + [[package]] name = "anyhow" version = "1.0.99" @@ -465,56 +719,508 @@ dependencies = [ ] [[package]] -name = "arrayvec" -version = "0.7.6" +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] + +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "async-trait" +version = "0.1.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "auto_impl" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "aws-config" +version = "1.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bc1b40fb26027769f16960d2f4a6bc20c4bb755d403e552c8c1a73af433c246" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-sdk-sso", + "aws-sdk-ssooidc", + "aws-sdk-sts", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand", + "hex", + "http 1.3.1", + "ring", + "time", + "tokio", + "tracing", + "url", + "zeroize", +] + +[[package]] +name = "aws-credential-types" +version = "1.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d025db5d9f52cbc413b167136afb3d8aeea708c0d8884783cf6253be5e22f6f2" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "zeroize", +] + +[[package]] +name = "aws-lc-rs" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94b8ff6c09cd57b16da53641caa860168b88c172a5ee163b0288d3d6eea12786" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e44d16778acaf6a9ec9899b92cebd65580b83f685446bf2e1f5d3d732f99dcd" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", +] + +[[package]] +name = "aws-runtime" +version = "1.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c034a1bc1d70e16e7f4e4caf7e9f7693e4c9c24cd91cf17c2a0b21abaebc7c8b" +dependencies = [ + "aws-credential-types", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand", + "http 0.2.12", + "http-body 0.4.6", + "percent-encoding", + "pin-project-lite", + "tracing", + "uuid", +] + +[[package]] +name = "aws-sdk-s3" +version = "1.106.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c230530df49ed3f2b7b4d9c8613b72a04cdac6452eede16d587fc62addfabac" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-checksums", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "bytes", + "fastrand", + "hex", + "hmac", + "http 0.2.12", + "http 1.3.1", + "http-body 0.4.6", + "lru 0.12.5", + "percent-encoding", + "regex-lite", + "sha2", + "tracing", + "url", +] + +[[package]] +name = "aws-sdk-sso" +version = "1.84.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357a841807f6b52cb26123878b3326921e2a25faca412fabdd32bd35b7edd5d3" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand", + "http 0.2.12", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "1.85.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e05f33b6c9026fecfe9b3b6740f34d41bc6ff641a6a32dabaab60209245b75" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand", + "http 0.2.12", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-sts" +version = "1.86.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d835f123f307cafffca7b9027c14979f1d403b417d8541d67cf252e8a21e35" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "fastrand", + "http 0.2.12", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084c34162187d39e3740cb635acd73c4e3a551a36146ad6fe8883c929c9f876c" +dependencies = [ + "aws-credential-types", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "crypto-bigint 0.5.5", + "form_urlencoded", + "hex", + "hmac", + "http 0.2.12", + "http 1.3.1", + "p256", + "percent-encoding", + "ring", + "sha2", + "subtle", + "time", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-async" +version = "1.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e190749ea56f8c42bf15dd76c65e14f8f765233e6df9b0506d9d934ebef867c" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "aws-smithy-checksums" +version = "0.63.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d2df0314b8e307995a3b86d44565dfe9de41f876901a7d71886c756a25979f" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "bytes", + "crc-fast", + "hex", + "http 0.2.12", + "http-body 0.4.6", + "md-5", + "pin-project-lite", + "sha1", + "sha2", + "tracing", +] + +[[package]] +name = "aws-smithy-eventstream" +version = "0.60.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "182b03393e8c677347fb5705a04a9392695d47d20ef0a2f8cfe28c8e6b9b9778" +dependencies = [ + "aws-smithy-types", + "bytes", + "crc32fast", +] + +[[package]] +name = "aws-smithy-http" +version = "0.62.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c4dacf2d38996cf729f55e7a762b30918229917eca115de45dfa8dfb97796c9" +dependencies = [ + "aws-smithy-eventstream", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http 1.3.1", + "http-body 0.4.6", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-http-client" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147e8eea63a40315d704b97bf9bc9b8c1402ae94f89d5ad6f7550d963309da1b" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "h2 0.3.27", + "h2 0.4.12", + "http 0.2.12", + "http 1.3.1", + "http-body 0.4.6", + "hyper 0.14.32", + "hyper 1.7.0", + "hyper-rustls 0.24.2", + "hyper-rustls 0.27.7", + "hyper-util", + "pin-project-lite", + "rustls 0.21.12", + "rustls 0.23.31", + "rustls-native-certs 0.8.1", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.2", + "tower", + "tracing", +] + +[[package]] +name = "aws-smithy-json" +version = "0.61.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaa31b350998e703e9826b2104dd6f63be0508666e1aba88137af060e8944047" +dependencies = [ + "aws-smithy-types", +] + +[[package]] +name = "aws-smithy-observability" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9364d5989ac4dd918e5cc4c4bdcc61c9be17dcd2586ea7f69e348fc7c6cab393" +dependencies = [ + "aws-smithy-runtime-api", +] + +[[package]] +name = "aws-smithy-query" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" dependencies = [ - "serde", + "aws-smithy-types", + "urlencoding", ] [[package]] -name = "async-trait" -version = "0.1.89" +name = "aws-smithy-runtime" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +checksum = "4fa63ad37685ceb7762fa4d73d06f1d5493feb88e3f27259b9ed277f4c01b185" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-http-client", + "aws-smithy-observability", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand", + "http 0.2.12", + "http 1.3.1", + "http-body 0.4.6", + "http-body 1.0.1", + "pin-project-lite", + "pin-utils", + "tokio", + "tracing", ] [[package]] -name = "atoi" -version = "2.0.0" +name = "aws-smithy-runtime-api" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +checksum = "07f5e0fc8a6b3f2303f331b94504bbf754d85488f402d6f1dd7a6080f99afe56" dependencies = [ - "num-traits", + "aws-smithy-async", + "aws-smithy-types", + "bytes", + "http 0.2.12", + "http 1.3.1", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", ] [[package]] -name = "atomic-waker" -version = "1.1.2" +name = "aws-smithy-types" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +checksum = "d498595448e43de7f4296b7b7a18a8a02c61ec9349128c80a368f7c3b4ab11a8" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http 1.3.1", + "http-body 0.4.6", + "http-body 1.0.1", + "http-body-util", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", + "tokio", + "tokio-util", +] [[package]] -name = "auto_impl" -version = "1.3.0" +name = "aws-smithy-xml" +version = "0.60.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" +checksum = "3db87b96cb1b16c024980f133968d52882ca0daaee3a086c6decc500f6c99728" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", + "xmlparser", ] [[package]] -name = "autocfg" -version = "1.5.0" +name = "aws-types" +version = "1.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "b069d19bf01e46298eaedd7c6f283fe565a59263e53eebec945f3e6398f42390" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "rustc_version 0.4.1", + "tracing", +] [[package]] name = "backtrace" @@ -531,6 +1237,12 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base16ct" version = "0.2.0" @@ -549,12 +1261,42 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" +dependencies = [ + "outref", + "vsimd", +] + [[package]] name = "base64ct" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" +[[package]] +name = "bindgen" +version = "0.72.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" +dependencies = [ + "bitflags 2.9.4", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.106", +] + [[package]] name = "bit-set" version = "0.8.0" @@ -647,18 +1389,18 @@ dependencies = [ "futures-util", "hex", "home", - "http", + "http 1.3.1", "http-body-util", - "hyper", + "hyper 1.7.0", "hyper-named-pipe", - "hyper-rustls", + "hyper-rustls 0.27.7", "hyper-util", "hyperlocal", "log", "pin-project-lite", - "rustls", - "rustls-native-certs", - "rustls-pemfile", + "rustls 0.23.31", + "rustls-native-certs 0.8.1", + "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", "serde_derive", @@ -711,6 +1453,16 @@ dependencies = [ "serde", ] +[[package]] +name = "bytes-utils" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" +dependencies = [ + "bytes", + "either", +] + [[package]] name = "c-kzg" version = "2.1.1" @@ -733,9 +1485,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5252b3d2648e5eedbc1a6f501e3c795e07025c1e93bbf8bbdd6eef7f447a6d54" dependencies = [ "find-msvc-tools", + "jobserver", + "libc", "shlex", ] +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + [[package]] name = "cfg-if" version = "1.0.3" @@ -754,6 +1517,72 @@ dependencies = [ "windows-link 0.2.0", ] +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "clap_lex" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" + +[[package]] +name = "cmake" +version = "0.1.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +dependencies = [ + "cc", +] + +[[package]] +name = "colorchoice" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + [[package]] name = "concurrent-queue" version = "2.5.0" @@ -852,6 +1681,28 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" +[[package]] +name = "crc-fast" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf62af4cc77d8fe1c22dde4e721d87f2f54056139d8c412e1366b740305f56f" +dependencies = [ + "crc", + "digest 0.10.7", + "libc", + "rand 0.9.2", + "regex", +] + +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam-queue" version = "0.3.12" @@ -873,6 +1724,18 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" +[[package]] +name = "crypto-bigint" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + [[package]] name = "crypto-bigint" version = "0.5.5" @@ -966,6 +1829,30 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "der" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "der" version = "0.7.10" @@ -1080,19 +1967,31 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" +[[package]] +name = "ecdsa" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +dependencies = [ + "der 0.6.1", + "elliptic-curve 0.12.3", + "rfc6979 0.3.1", + "signature 1.6.4", +] + [[package]] name = "ecdsa" version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der", + "der 0.7.10", "digest 0.10.7", - "elliptic-curve", - "rfc6979", + "elliptic-curve 0.13.8", + "rfc6979 0.4.0", "serdect", - "signature", - "spki", + "signature 2.2.0", + "spki 0.7.3", ] [[package]] @@ -1104,21 +2003,41 @@ dependencies = [ "serde", ] +[[package]] +name = "elliptic-curve" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +dependencies = [ + "base16ct 0.1.1", + "crypto-bigint 0.4.9", + "der 0.6.1", + "digest 0.10.7", + "ff 0.12.1", + "generic-array", + "group 0.12.1", + "pkcs8 0.9.0", + "rand_core 0.6.4", + "sec1 0.3.0", + "subtle", + "zeroize", +] + [[package]] name = "elliptic-curve" version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ - "base16ct", - "crypto-bigint", + "base16ct 0.2.0", + "crypto-bigint 0.5.5", "digest 0.10.7", - "ff", + "ff 0.13.1", "generic-array", - "group", - "pkcs8", + "group 0.13.0", + "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1", + "sec1 0.7.3", "serdect", "subtle", "zeroize", @@ -1200,6 +2119,16 @@ dependencies = [ "bytes", ] +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "ff" version = "0.13.1" @@ -1287,6 +2216,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "funty" version = "2.0.0" @@ -1393,6 +2328,12 @@ dependencies = [ "slab", ] +[[package]] +name = "futures-utils-wasm" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" + [[package]] name = "generic-array" version = "0.14.7" @@ -1439,23 +2380,78 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" +[[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff 0.12.1", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "group" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff", + "ff 0.13.1", "rand_core 0.6.4", "subtle", ] +[[package]] +name = "h2" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.11.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.3.1", + "indexmap 2.11.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + [[package]] name = "hashbrown" version = "0.15.5" @@ -1534,6 +2530,17 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http" version = "1.3.1" @@ -1545,6 +2552,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + [[package]] name = "http-body" version = "1.0.1" @@ -1552,7 +2570,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http", + "http 1.3.1", ] [[package]] @@ -1563,8 +2581,8 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", "futures-core", - "http", - "http-body", + "http 1.3.1", + "http-body 1.0.1", "pin-project-lite", ] @@ -1580,6 +2598,30 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +[[package]] +name = "hyper" +version = "0.14.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.27", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.5.10", + "tokio", + "tower-service", + "tracing", + "want", +] + [[package]] name = "hyper" version = "1.7.0" @@ -1590,8 +2632,9 @@ dependencies = [ "bytes", "futures-channel", "futures-core", - "http", - "http-body", + "h2 0.4.12", + "http 1.3.1", + "http-body 1.0.1", "httparse", "httpdate", "itoa", @@ -1609,7 +2652,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" dependencies = [ "hex", - "hyper", + "hyper 1.7.0", "hyper-util", "pin-project-lite", "tokio", @@ -1617,19 +2660,52 @@ dependencies = [ "winapi", ] +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.12", + "hyper 0.14.32", + "log", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", +] + [[package]] name = "hyper-rustls" version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "http", - "hyper", + "http 1.3.1", + "hyper 1.7.0", "hyper-util", - "rustls", + "rustls 0.23.31", + "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", - "tokio-rustls", + "tokio-rustls 0.26.2", + "tower-service", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.7.0", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", "tower-service", ] @@ -1639,16 +2715,19 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e" dependencies = [ + "base64 0.22.1", "bytes", "futures-channel", "futures-core", "futures-util", - "http", - "http-body", - "hyper", + "http 1.3.1", + "http-body 1.0.1", + "hyper 1.7.0", + "ipnet", "libc", + "percent-encoding", "pin-project-lite", - "socket2", + "socket2 0.6.0", "tokio", "tower-service", "tracing", @@ -1662,7 +2741,7 @@ checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" dependencies = [ "hex", "http-body-util", - "hyper", + "hyper 1.7.0", "hyper-util", "pin-project-lite", "tokio", @@ -1865,6 +2944,28 @@ dependencies = [ "libc", ] +[[package]] +name = "ipnet" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "iri-string" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.10.5" @@ -1889,6 +2990,16 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +[[package]] +name = "jobserver" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +dependencies = [ + "getrandom 0.3.3", + "libc", +] + [[package]] name = "js-sys" version = "0.3.78" @@ -1906,8 +3017,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ "cfg-if", - "ecdsa", - "elliptic-curve", + "ecdsa 0.16.9", + "elliptic-curve 0.13.8", "once_cell", "serdect", "sha2", @@ -1947,6 +3058,16 @@ version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" +[[package]] +name = "libloading" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" +dependencies = [ + "cfg-if", + "windows-targets 0.53.3", +] + [[package]] name = "libm" version = "0.2.15" @@ -1974,6 +3095,18 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "libz-sys" +version = "1.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "linux-raw-sys" version = "0.9.4" @@ -2002,6 +3135,24 @@ version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +[[package]] +name = "lru" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +dependencies = [ + "hashbrown 0.15.5", +] + +[[package]] +name = "lru" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465" +dependencies = [ + "hashbrown 0.15.5", +] + [[package]] name = "macro-string" version = "0.1.4" @@ -2013,6 +3164,15 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "matchers" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" +dependencies = [ + "regex-automata", +] + [[package]] name = "md-5" version = "0.10.6" @@ -2029,6 +3189,12 @@ version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.8.9" @@ -2066,6 +3232,25 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.50.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "num-bigint" version = "0.4.6" @@ -2139,6 +3324,28 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" +dependencies = [ + "num_enum_derive", + "rustversion", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "nybbles" version = "0.4.3" @@ -2168,6 +3375,12 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" + [[package]] name = "op-alloy-consensus" version = "0.20.0" @@ -2226,6 +3439,23 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "outref" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e" + +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", + "sha2", +] + [[package]] name = "parity-scale-codec" version = "3.7.5" @@ -2340,6 +3570,26 @@ dependencies = [ "ucd-trie", ] +[[package]] +name = "pin-project" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "pin-project-lite" version = "0.2.16" @@ -2358,9 +3608,19 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ - "der", - "pkcs8", - "spki", + "der 0.7.10", + "pkcs8 0.10.2", + "spki 0.7.3", +] + +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der 0.6.1", + "spki 0.6.0", ] [[package]] @@ -2369,8 +3629,8 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der", - "spki", + "der 0.7.10", + "spki 0.7.3", ] [[package]] @@ -2403,6 +3663,16 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn 2.0.106", +] + [[package]] name = "primitive-types" version = "0.12.2" @@ -2572,6 +3842,36 @@ dependencies = [ "rand_core 0.9.3", ] +[[package]] +name = "rdkafka" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b52c81ac3cac39c9639b95c20452076e74b8d9a71bc6fc4d83407af2ea6fff" +dependencies = [ + "futures-channel", + "futures-util", + "libc", + "log", + "rdkafka-sys", + "serde", + "serde_derive", + "serde_json", + "slab", + "tokio", +] + +[[package]] +name = "rdkafka-sys" +version = "4.9.0+2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5230dca48bc354d718269f3e4353280e188b610f7af7e2fcf54b7a79d5802872" +dependencies = [ + "libc", + "libz-sys", + "num_enum", + "pkg-config", +] + [[package]] name = "redox_syscall" version = "0.3.5" @@ -2623,22 +3923,75 @@ dependencies = [ ] [[package]] -name = "regex-automata" -version = "0.4.10" +name = "regex-automata" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-lite" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "943f41321c63ef1c92fd763bfe054d2668f7f225a5c29f0105903dc2fc04ba30" + +[[package]] +name = "regex-syntax" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" + +[[package]] +name = "reqwest" +version = "0.12.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.7.0", + "hyper-tls", + "hyper-util", + "js-sys", + "log", + "native-tls", + "percent-encoding", + "pin-project-lite", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-native-tls", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "rfc6979" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", + "crypto-bigint 0.4.9", + "hmac", + "zeroize", ] -[[package]] -name = "regex-syntax" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" - [[package]] name = "rfc6979" version = "0.4.0" @@ -2685,10 +4038,10 @@ dependencies = [ "num-integer", "num-traits", "pkcs1", - "pkcs8", + "pkcs8 0.10.2", "rand_core 0.6.4", - "signature", - "spki", + "signature 2.2.0", + "spki 0.7.3", "subtle", "zeroize", ] @@ -2775,20 +4128,45 @@ dependencies = [ "windows-sys 0.60.2", ] +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + [[package]] name = "rustls" version = "0.23.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc" dependencies = [ + "aws-lc-rs", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki", + "rustls-webpki 0.103.4", "subtle", "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework 2.11.1", +] + [[package]] name = "rustls-native-certs" version = "0.8.1" @@ -2801,6 +4179,15 @@ dependencies = [ "security-framework 3.4.0", ] +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + [[package]] name = "rustls-pemfile" version = "2.2.0" @@ -2819,12 +4206,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustls-webpki" version = "0.103.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -2893,16 +4291,40 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct 0.1.1", + "der 0.6.1", + "generic-array", + "pkcs8 0.9.0", + "subtle", + "zeroize", +] + [[package]] name = "sec1" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ - "base16ct", - "der", + "base16ct 0.2.0", + "der 0.7.10", "generic-array", - "pkcs8", + "pkcs8 0.10.2", "serdect", "subtle", "zeroize", @@ -3092,7 +4514,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177" dependencies = [ - "base16ct", + "base16ct 0.2.0", "serde", ] @@ -3138,6 +4560,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "shlex" version = "1.3.0" @@ -3153,6 +4584,16 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +dependencies = [ + "digest 0.10.7", + "rand_core 0.6.4", +] + [[package]] name = "signature" version = "2.2.0" @@ -3178,6 +4619,16 @@ dependencies = [ "serde", ] +[[package]] +name = "socket2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "socket2" version = "0.6.0" @@ -3197,6 +4648,16 @@ dependencies = [ "lock_api", ] +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der 0.6.1", +] + [[package]] name = "spki" version = "0.7.3" @@ -3204,7 +4665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der", + "der 0.7.10", ] [[package]] @@ -3456,6 +4917,27 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "strum" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "subtle" version = "2.6.1" @@ -3496,6 +4978,15 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + [[package]] name = "synstructure" version = "0.13.2" @@ -3584,6 +5075,15 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "thread_local" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +dependencies = [ + "cfg-if", +] + [[package]] name = "threadpool" version = "1.8.1" @@ -3657,6 +5157,34 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tips-audit" +version = "0.1.0" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-provider", + "alloy-rpc-types-mev", + "anyhow", + "async-trait", + "aws-config", + "aws-credential-types", + "aws-sdk-s3", + "bytes", + "clap", + "dotenvy", + "op-alloy-consensus", + "rdkafka", + "serde", + "serde_json", + "testcontainers", + "testcontainers-modules", + "tokio", + "tracing", + "tracing-subscriber", + "uuid", +] + [[package]] name = "tips-datastore" version = "0.1.0" @@ -3691,7 +5219,7 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "slab", - "socket2", + "socket2 0.6.0", "tokio-macros", "windows-sys 0.59.0", ] @@ -3707,13 +5235,33 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + [[package]] name = "tokio-rustls" version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" dependencies = [ - "rustls", + "rustls 0.23.31", "tokio", ] @@ -3726,6 +5274,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", + "tokio-util", ] [[package]] @@ -3773,6 +5322,45 @@ dependencies = [ "winnow", ] +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +dependencies = [ + "bitflags 2.9.4", + "bytes", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "iri-string", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + [[package]] name = "tower-service" version = "0.3.3" @@ -3809,6 +5397,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex-automata", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", ] [[package]] @@ -3898,12 +5516,24 @@ dependencies = [ "serde", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "utf8_iter" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "uuid" version = "1.18.1" @@ -3934,6 +5564,12 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + [[package]] name = "wait-timeout" version = "0.2.1" @@ -4000,6 +5636,19 @@ dependencies = [ "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca85039a9b469b38336411d6d6ced91f3fc87109a2a27b0c197663f5144dffe" +dependencies = [ + "cfg-if", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.101" @@ -4032,6 +5681,30 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "wasmtimer" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c598d6b99ea013e35844697fc4670d08339d5cda15588f193c6beedd12f644b" +dependencies = [ + "futures", + "js-sys", + "parking_lot", + "pin-utils", + "slab", + "wasm-bindgen", +] + +[[package]] +name = "web-sys" +version = "0.3.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77e4b637749ff0d92b8fad63aa1f7cff3cbe125fd49c175cd6345e7272638b12" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "whoami" version = "1.6.1" @@ -4391,6 +6064,12 @@ dependencies = [ "rustix", ] +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + [[package]] name = "yoke" version = "0.8.0" diff --git a/Cargo.toml b/Cargo.toml index b4bf333..79da4a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,9 +1,10 @@ [workspace] -members = ["crates/datastore"] +members = ["crates/datastore", "crates/audit"] resolver = "2" [workspace.dependencies] tips-datastore = { path = "crates/datastore" } +tips-audit = { path = "crates/audit" } jsonrpsee = { version = "0.26.0", features = ["server", "macros"] } @@ -47,7 +48,7 @@ serde_json = "1.0.143" dotenvy = "0.15.7" testcontainers = { version = "0.23.1", features = ["blocking"] } testcontainers-modules = { version = "0.11.2", features = ["postgres", "kafka", "minio"] } -futures-util = "0.3.32" +futures-util = "0.3.31" # Kafka and S3 dependencies rdkafka = { version = "0.37.0", features = ["libz-static"] } diff --git a/README.md b/README.md index 88122e3..99f43d2 100644 --- a/README.md +++ b/README.md @@ -11,4 +11,10 @@ The project consists of several components: ### 🗄️ Datastore (`crates/datastore`) -Postgres storage layer that provides API's to persist and retrieve bundles. \ No newline at end of file +Postgres storage layer that provides API's to persist and retrieve bundles. + +### 📊 Audit (`crates/audit`) +Event streaming and archival system that: +- Provides an API to publish bundle events to Kafka +- Archives bundle history to S3 for long-term storage +- See [S3 Storage Format](docs/AUDIT_S3_FORMAT.md) for data structure details diff --git a/crates/audit/Cargo.toml b/crates/audit/Cargo.toml new file mode 100644 index 0000000..18aad38 --- /dev/null +++ b/crates/audit/Cargo.toml @@ -0,0 +1,34 @@ +[package] +name = "tips-audit" +version = "0.1.0" +edition = "2021" + +[[bin]] +name = "tips-audit" +path = "src/bin/main.rs" + +[dependencies] +tokio = { workspace = true } +tracing = { workspace = true } +tracing-subscriber = { workspace = true } +anyhow = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +uuid = { workspace = true } +async-trait = { workspace = true } +alloy-primitives = { workspace = true } +alloy-consensus = { workspace = true } +alloy-provider = { workspace = true } +alloy-rpc-types-mev = { workspace = true } +op-alloy-consensus = { workspace = true } +clap = { workspace = true } +dotenvy = { workspace = true } +rdkafka = { workspace = true } +aws-config = { workspace = true } +aws-sdk-s3 = { workspace = true } +aws-credential-types = { workspace = true } +bytes = { workspace = true } + +[dev-dependencies] +testcontainers = { workspace = true } +testcontainers-modules = { workspace = true } \ No newline at end of file diff --git a/crates/audit/src/archiver.rs b/crates/audit/src/archiver.rs new file mode 100644 index 0000000..7bbb4ec --- /dev/null +++ b/crates/audit/src/archiver.rs @@ -0,0 +1,51 @@ +use crate::reader::MempoolEventReader; +use crate::storage::MempoolEventWriter; +use anyhow::Result; +use std::time::Duration; +use tokio::time::sleep; +use tracing::{error, info}; + +pub struct KafkaMempoolArchiver +where + R: MempoolEventReader, + W: MempoolEventWriter, +{ + reader: R, + writer: W, +} + +impl KafkaMempoolArchiver +where + R: MempoolEventReader, + W: MempoolEventWriter, +{ + pub fn new(reader: R, writer: W) -> Self { + Self { reader, writer } + } + + pub async fn run(&mut self) -> Result<()> { + info!("Starting Kafka mempool archiver"); + + loop { + match self.reader.read_event().await { + Ok(event) => { + if let Err(e) = self.writer.archive_event(event).await { + error!( + error = %e, + "Failed to write event" + ); + } else if let Err(e) = self.reader.commit().await { + error!( + error = %e, + "Failed to commit message" + ); + } + } + Err(e) => { + error!(error = %e, "Error reading events"); + sleep(Duration::from_secs(1)).await; + } + } + } + } +} diff --git a/crates/audit/src/bin/main.rs b/crates/audit/src/bin/main.rs new file mode 100644 index 0000000..b6a0b21 --- /dev/null +++ b/crates/audit/src/bin/main.rs @@ -0,0 +1,136 @@ +use anyhow::Result; +use aws_config::{BehaviorVersion, Region}; +use aws_credential_types::Credentials; +use aws_sdk_s3::{config::Builder as S3ConfigBuilder, Client as S3Client}; +use clap::{Parser, ValueEnum}; +use rdkafka::consumer::Consumer; +use tips_audit::{ + create_kafka_consumer, KafkaMempoolArchiver, KafkaMempoolReader, S3MempoolEventReaderWriter, +}; +use tracing::{info, warn}; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; + +#[derive(Debug, Clone, ValueEnum)] +enum S3ConfigType { + Aws, + Manual, +} + +#[derive(Parser, Debug)] +#[command(author, version, about, long_about = None)] +struct Args { + #[arg(long, env = "TIPS_AUDIT_KAFKA_BROKERS")] + kafka_brokers: String, + + #[arg(long, env = "TIPS_AUDIT_KAFKA_TOPIC")] + kafka_topic: String, + + #[arg(long, env = "TIPS_AUDIT_KAFKA_GROUP_ID")] + kafka_group_id: String, + + #[arg(long, env = "TIPS_AUDIT_S3_BUCKET")] + s3_bucket: String, + + #[arg(long, env = "TIPS_AUDIT_LOG_LEVEL", default_value = "info")] + log_level: String, + + #[arg(long, env = "TIPS_AUDIT_S3_CONFIG_TYPE", default_value = "aws")] + s3_config_type: S3ConfigType, + + #[arg(long, env = "TIPS_AUDIT_S3_ENDPOINT")] + s3_endpoint: Option, + + #[arg(long, env = "TIPS_AUDIT_S3_REGION", default_value = "us-east-1")] + s3_region: String, + + #[arg(long, env = "TIPS_AUDIT_S3_ACCESS_KEY_ID")] + s3_access_key_id: Option, + + #[arg(long, env = "TIPS_AUDIT_S3_SECRET_ACCESS_KEY")] + s3_secret_access_key: Option, +} + +#[tokio::main] +async fn main() -> Result<()> { + dotenvy::dotenv().ok(); + + let args = Args::parse(); + + let log_level = match args.log_level.to_lowercase().as_str() { + "trace" => tracing::Level::TRACE, + "debug" => tracing::Level::DEBUG, + "info" => tracing::Level::INFO, + "warn" => tracing::Level::WARN, + "error" => tracing::Level::ERROR, + _ => { + warn!( + "Invalid log level '{}', defaulting to 'info'", + args.log_level + ); + tracing::Level::INFO + } + }; + + tracing_subscriber::registry() + .with( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())), + ) + .with(tracing_subscriber::fmt::layer()) + .init(); + + info!( + kafka_brokers = %args.kafka_brokers, + kafka_topic = %args.kafka_topic, + kafka_group_id = %args.kafka_group_id, + s3_bucket = %args.s3_bucket, + "Starting audit archiver" + ); + + let consumer = create_kafka_consumer(&args.kafka_brokers, &args.kafka_group_id)?; + consumer.subscribe(&[&args.kafka_topic])?; + + let reader = KafkaMempoolReader::new(consumer, args.kafka_topic.clone())?; + + let s3_client = create_s3_client(&args).await?; + let s3_bucket = args.s3_bucket.clone(); + let writer = S3MempoolEventReaderWriter::new(s3_client, s3_bucket); + + let mut archiver = KafkaMempoolArchiver::new(reader, writer); + + info!("Audit archiver initialized, starting main loop"); + + archiver.run().await +} + +async fn create_s3_client(args: &Args) -> Result { + match args.s3_config_type { + S3ConfigType::Manual => { + let region = args.s3_region.clone(); + let mut config_builder = + aws_config::defaults(BehaviorVersion::latest()).region(Region::new(region)); + + if let Some(endpoint) = &args.s3_endpoint { + config_builder = config_builder.endpoint_url(endpoint); + } + + if let (Some(access_key), Some(secret_key)) = + (&args.s3_access_key_id, &args.s3_secret_access_key) + { + let credentials = Credentials::new(access_key, secret_key, None, None, "manual"); + config_builder = config_builder.credentials_provider(credentials); + } + + let config = config_builder.load().await; + let s3_config_builder = S3ConfigBuilder::from(&config).force_path_style(true); + + info!(message = "manually configuring s3 client"); + Ok(S3Client::from_conf(s3_config_builder.build())) + } + S3ConfigType::Aws => { + info!(message = "using aws s3 client"); + let config = aws_config::load_defaults(BehaviorVersion::latest()).await; + Ok(S3Client::new(&config)) + } + } +} diff --git a/crates/audit/src/lib.rs b/crates/audit/src/lib.rs new file mode 100644 index 0000000..cfa9c53 --- /dev/null +++ b/crates/audit/src/lib.rs @@ -0,0 +1,11 @@ +pub mod archiver; +pub mod publisher; +pub mod reader; +pub mod storage; +pub mod types; + +pub use archiver::*; +pub use publisher::*; +pub use reader::*; +pub use storage::*; +pub use types::*; diff --git a/crates/audit/src/publisher.rs b/crates/audit/src/publisher.rs new file mode 100644 index 0000000..f72c1f8 --- /dev/null +++ b/crates/audit/src/publisher.rs @@ -0,0 +1,64 @@ +use crate::types::MempoolEvent; +use anyhow::Result; +use async_trait::async_trait; +use rdkafka::producer::{FutureProducer, FutureRecord}; +use serde_json; +use tracing::{debug, error}; +use uuid::Uuid; + +#[async_trait] +pub trait MempoolEventPublisher: Send + Sync { + async fn publish(&self, event: MempoolEvent) -> Result<()>; +} + +#[derive(Clone)] +pub struct KafkaMempoolEventPublisher { + producer: FutureProducer, + topic: String, +} + +impl KafkaMempoolEventPublisher { + pub fn new(producer: FutureProducer, topic: String) -> Self { + Self { producer, topic } + } + + async fn send_event(&self, event: &MempoolEvent) -> Result<()> { + let bundle_id = event.bundle_id(); + let key = format!("{}-{}", bundle_id, Uuid::new_v4()); + let payload = serde_json::to_vec(event)?; + + let record = FutureRecord::to(&self.topic).key(&key).payload(&payload); + + match self + .producer + .send(record, tokio::time::Duration::from_secs(5)) + .await + { + Ok(_) => { + debug!( + bundle_id = %bundle_id, + topic = %self.topic, + payload_size = payload.len(), + "Successfully published event" + ); + Ok(()) + } + Err((err, _)) => { + error!( + bundle_id = %bundle_id, + topic = %self.topic, + error = %err, + "Failed to publish event" + ); + Err(anyhow::anyhow!("Failed to publish event: {}", err)) + } + } + } +} + +#[async_trait] +impl MempoolEventPublisher for KafkaMempoolEventPublisher { + async fn publish(&self, event: MempoolEvent) -> Result<()> { + self.send_event(&event).await + } +} diff --git a/crates/audit/src/reader.rs b/crates/audit/src/reader.rs new file mode 100644 index 0000000..1426b8c --- /dev/null +++ b/crates/audit/src/reader.rs @@ -0,0 +1,138 @@ +use crate::types::MempoolEvent; +use anyhow::Result; +use async_trait::async_trait; +use rdkafka::{ + config::ClientConfig, + consumer::{Consumer, StreamConsumer}, + message::Message, + Timestamp, TopicPartitionList, +}; +use std::time::{Duration, SystemTime, UNIX_EPOCH}; +use tokio::time::sleep; +use tracing::{debug, error}; + +pub fn create_kafka_consumer(kafka_brokers: &str, group_id: &str) -> Result { + let consumer: StreamConsumer = ClientConfig::new() + .set("group.id", group_id) + .set("bootstrap.servers", kafka_brokers) + .set("enable.partition.eof", "false") + .set("session.timeout.ms", "6000") + .set("enable.auto.commit", "false") + .set("auto.offset.reset", "earliest") + .set("fetch.wait.max.ms", "100") + .set("fetch.min.bytes", "1") + .create()?; + Ok(consumer) +} + +pub fn assign_topic_partition(consumer: &StreamConsumer, topic: &str) -> Result<()> { + let mut tpl = TopicPartitionList::new(); + tpl.add_partition(topic, 0); + consumer.assign(&tpl)?; + Ok(()) +} + +#[derive(Debug, Clone)] +pub struct Event { + pub key: String, + pub event: MempoolEvent, + pub timestamp: i64, +} + +#[async_trait] +pub trait MempoolEventReader { + async fn read_event(&mut self) -> Result; + async fn commit(&mut self) -> Result<()>; +} + +pub struct KafkaMempoolReader { + consumer: StreamConsumer, + topic: String, + last_message_offset: Option, + last_message_partition: Option, +} + +impl KafkaMempoolReader { + pub fn new(consumer: StreamConsumer, topic: String) -> Result { + consumer.subscribe(&[&topic])?; + Ok(Self { + consumer, + topic, + last_message_offset: None, + last_message_partition: None, + }) + } +} + +#[async_trait] +impl MempoolEventReader for KafkaMempoolReader { + async fn read_event(&mut self) -> Result { + match self.consumer.recv().await { + Ok(message) => { + let payload = message + .payload() + .ok_or_else(|| anyhow::anyhow!("Message has no payload"))?; + + // Extract Kafka timestamp, use current time as fallback + let timestamp = match message.timestamp() { + Timestamp::CreateTime(millis) => millis, + Timestamp::LogAppendTime(millis) => millis, + Timestamp::NotAvailable => SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64, + }; + + let event: MempoolEvent = serde_json::from_slice(payload)?; + + debug!( + bundle_id = %event.bundle_id(), + timestamp = timestamp, + offset = message.offset(), + partition = message.partition(), + "Received event with timestamp" + ); + + self.last_message_offset = Some(message.offset()); + self.last_message_partition = Some(message.partition()); + + let key = message + .key() + .map(|k| String::from_utf8_lossy(k).to_string()) + .ok_or_else(|| anyhow::anyhow!("Message missing required key"))?; + + let event_result = Event { + key, + event, + timestamp, + }; + + Ok(event_result) + } + Err(e) => { + println!("received error {:?}", e); + error!(error = %e, "Error receiving message from Kafka"); + sleep(Duration::from_secs(1)).await; + Err(e.into()) + } + } + } + + async fn commit(&mut self) -> Result<()> { + if let (Some(offset), Some(partition)) = + (self.last_message_offset, self.last_message_partition) + { + let mut tpl = TopicPartitionList::new(); + tpl.add_partition_offset(&self.topic, partition, rdkafka::Offset::Offset(offset + 1))?; + self.consumer + .commit(&tpl, rdkafka::consumer::CommitMode::Async)?; + } + Ok(()) + } +} + +impl KafkaMempoolReader { + pub fn topic(&self) -> &str { + &self.topic + } +} diff --git a/crates/audit/src/storage.rs b/crates/audit/src/storage.rs new file mode 100644 index 0000000..62501bd --- /dev/null +++ b/crates/audit/src/storage.rs @@ -0,0 +1,577 @@ +use crate::reader::Event; +use crate::types::{BundleId, DropReason, MempoolEvent, TransactionId}; +use alloy_primitives::TxHash; +use alloy_rpc_types_mev::EthSendBundle; +use anyhow::Result; +use async_trait::async_trait; +use aws_sdk_s3::error::SdkError; +use aws_sdk_s3::operation::get_object::GetObjectError; +use aws_sdk_s3::primitives::ByteStream; +use aws_sdk_s3::Client as S3Client; +use serde::{Deserialize, Serialize}; +use std::fmt; +use std::fmt::Debug; +use tracing::info; + +#[derive(Debug)] +pub enum S3Key { + Bundle(BundleId), + TransactionByHash(TxHash), +} + +impl fmt::Display for S3Key { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + S3Key::Bundle(bundle_id) => write!(f, "bundles/{}", bundle_id), + S3Key::TransactionByHash(hash) => write!(f, "transactions/by_hash/{}", hash), + } + } +} + +#[derive(Debug, Clone, Serialize, Deserialize, Default)] +pub struct TransactionMetadata { + pub bundle_ids: Vec, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(tag = "event", content = "data")] +pub enum BundleHistoryEvent { + Created { + key: String, + timestamp: i64, + bundle: EthSendBundle, + }, + Updated { + key: String, + timestamp: i64, + bundle: EthSendBundle, + }, + Cancelled { + key: String, + timestamp: i64, + }, + BuilderIncluded { + key: String, + timestamp: i64, + builder: String, + block_number: u64, + flashblock_index: u64, + }, + FlashblockIncluded { + key: String, + timestamp: i64, + block_number: u64, + flashblock_index: u64, + }, + BlockIncluded { + key: String, + timestamp: i64, + block_number: u64, + block_hash: TxHash, + }, + Dropped { + key: String, + timestamp: i64, + reason: DropReason, + }, +} + +impl BundleHistoryEvent { + pub fn key(&self) -> &str { + match self { + BundleHistoryEvent::Created { key, .. } => key, + BundleHistoryEvent::Updated { key, .. } => key, + BundleHistoryEvent::Cancelled { key, .. } => key, + BundleHistoryEvent::BuilderIncluded { key, .. } => key, + BundleHistoryEvent::FlashblockIncluded { key, .. } => key, + BundleHistoryEvent::BlockIncluded { key, .. } => key, + BundleHistoryEvent::Dropped { key, .. } => key, + } + } +} + +#[derive(Debug, Clone, Serialize, Deserialize, Default)] +pub struct BundleHistory { + pub history: Vec, +} + +fn update_bundle_history_transform( + bundle_history: BundleHistory, + event: &Event, +) -> Option { + let mut history = bundle_history.history; + let bundle_id = event.event.bundle_id(); + + // Check for deduplication - if event with same key already exists, skip + if history.iter().any(|h| h.key() == event.key) { + info!( + bundle_id = %bundle_id, + event_key = %event.key, + "Event already exists, skipping due to deduplication" + ); + return None; + } + + let history_event = match &event.event { + MempoolEvent::Created { bundle, .. } => BundleHistoryEvent::Created { + key: event.key.clone(), + timestamp: event.timestamp, + bundle: bundle.clone(), + }, + MempoolEvent::Updated { bundle, .. } => BundleHistoryEvent::Updated { + key: event.key.clone(), + timestamp: event.timestamp, + bundle: bundle.clone(), + }, + MempoolEvent::Cancelled { .. } => BundleHistoryEvent::Cancelled { + key: event.key.clone(), + timestamp: event.timestamp, + }, + MempoolEvent::BuilderIncluded { + builder, + block_number, + flashblock_index, + .. + } => BundleHistoryEvent::BuilderIncluded { + key: event.key.clone(), + timestamp: event.timestamp, + builder: builder.clone(), + block_number: *block_number, + flashblock_index: *flashblock_index, + }, + MempoolEvent::FlashblockIncluded { + block_number, + flashblock_index, + .. + } => BundleHistoryEvent::FlashblockIncluded { + key: event.key.clone(), + timestamp: event.timestamp, + block_number: *block_number, + flashblock_index: *flashblock_index, + }, + MempoolEvent::BlockIncluded { + block_number, + block_hash, + .. + } => BundleHistoryEvent::BlockIncluded { + key: event.key.clone(), + timestamp: event.timestamp, + block_number: *block_number, + block_hash: *block_hash, + }, + MempoolEvent::Dropped { reason, .. } => BundleHistoryEvent::Dropped { + key: event.key.clone(), + timestamp: event.timestamp, + reason: reason.clone(), + }, + }; + + history.push(history_event); + let bundle_history = BundleHistory { history }; + + info!( + bundle_id = %bundle_id, + event_count = bundle_history.history.len(), + "Updated bundle history" + ); + + Some(bundle_history) +} + +fn update_transaction_metadata_transform( + transaction_metadata: TransactionMetadata, + bundle_id: BundleId, +) -> Option { + let mut bundle_ids = transaction_metadata.bundle_ids; + + if bundle_ids.contains(&bundle_id) { + return None; + } + + bundle_ids.push(bundle_id); + Some(TransactionMetadata { bundle_ids }) +} + +#[async_trait] +pub trait MempoolEventWriter { + async fn archive_event(&self, event: Event) -> Result<()>; +} + +#[async_trait] +pub trait MempoolEventS3Reader { + async fn get_bundle_history(&self, bundle_id: BundleId) -> Result>; + async fn get_transaction_metadata( + &self, + tx_hash: TxHash, + ) -> Result>; +} + +#[derive(Clone)] +pub struct S3MempoolEventReaderWriter { + s3_client: S3Client, + bucket: String, +} + +impl S3MempoolEventReaderWriter { + pub fn new(s3_client: S3Client, bucket: String) -> Self { + Self { s3_client, bucket } + } + + async fn update_bundle_history(&self, event: Event) -> Result<()> { + let s3_key = S3Key::Bundle(event.event.bundle_id()).to_string(); + + self.idempotent_write::(&s3_key, |current_history| { + update_bundle_history_transform(current_history, &event) + }) + .await + } + + async fn update_transaction_by_hash_index( + &self, + tx_id: &TransactionId, + bundle_id: BundleId, + ) -> Result<()> { + let s3_key = S3Key::TransactionByHash(tx_id.hash); + let key = s3_key.to_string(); + + self.idempotent_write::(&key, |current_metadata| { + update_transaction_metadata_transform(current_metadata, bundle_id) + }) + .await + } + + async fn idempotent_write(&self, key: &str, mut transform_fn: F) -> Result<()> + where + T: for<'de> Deserialize<'de> + Serialize + Clone + Default + Debug, + F: FnMut(T) -> Option, + { + const MAX_RETRIES: usize = 5; + const BASE_DELAY_MS: u64 = 100; + + for attempt in 0..MAX_RETRIES { + let (current_value, etag) = self.get_object_with_etag::(key).await?; + let value = current_value.unwrap_or_default(); + + match transform_fn(value.clone()) { + Some(new_value) => { + let content = serde_json::to_string(&new_value)?; + + let mut put_request = self + .s3_client + .put_object() + .bucket(&self.bucket) + .key(key) + .body(ByteStream::from(content.into_bytes())); + + if let Some(etag) = etag { + put_request = put_request.if_match(etag); + } else { + put_request = put_request.if_none_match("*"); + } + + match put_request.send().await { + Ok(_) => { + info!( + s3_key = %key, + attempt = attempt + 1, + "Successfully wrote object with idempotent write" + ); + return Ok(()); + } + Err(e) => { + if attempt < MAX_RETRIES - 1 { + let delay = BASE_DELAY_MS * 2_u64.pow(attempt as u32); + info!( + s3_key = %key, + attempt = attempt + 1, + delay_ms = delay, + error = %e, + "Conflict detected, retrying with backoff" + ); + tokio::time::sleep(tokio::time::Duration::from_millis(delay)).await; + } else { + return Err(anyhow::anyhow!( + "Failed to write after {} attempts: {}", + MAX_RETRIES, + e + )); + } + } + } + } + None => { + info!( + s3_key = %key, + "Transform function returned None, no write required" + ); + return Ok(()); + } + } + } + + Err(anyhow::anyhow!("Exceeded maximum retry attempts")) + } + + async fn get_object_with_etag(&self, key: &str) -> Result<(Option, Option)> + where + T: for<'de> Deserialize<'de>, + { + match self + .s3_client + .get_object() + .bucket(&self.bucket) + .key(key) + .send() + .await + { + Ok(response) => { + let etag = response.e_tag().map(|s| s.to_string()); + let body = response.body.collect().await?; + let content = String::from_utf8(body.into_bytes().to_vec())?; + let value: T = serde_json::from_str(&content)?; + Ok((Some(value), etag)) + } + Err(e) => match &e { + SdkError::ServiceError(service_err) => match service_err.err() { + GetObjectError::NoSuchKey(_) => Ok((None, None)), + _ => Err(anyhow::anyhow!("Failed to get object: {}", e)), + }, + _ => { + let error_string = e.to_string(); + if error_string.contains("NoSuchKey") + || error_string.contains("NotFound") + || error_string.contains("404") + { + Ok((None, None)) + } else { + Err(anyhow::anyhow!("Failed to get object: {}", e)) + } + } + }, + } + } +} + +#[async_trait] +impl MempoolEventWriter for S3MempoolEventReaderWriter { + async fn archive_event(&self, event: Event) -> Result<()> { + let bundle_id = event.event.bundle_id(); + let transaction_ids = event.event.transaction_ids(); + + self.update_bundle_history(event.clone()).await?; + + for tx_id in &transaction_ids { + self.update_transaction_by_hash_index(tx_id, bundle_id) + .await?; + } + + Ok(()) + } +} + +#[async_trait] +impl MempoolEventS3Reader for S3MempoolEventReaderWriter { + async fn get_bundle_history(&self, bundle_id: BundleId) -> Result> { + let s3_key = S3Key::Bundle(bundle_id).to_string(); + let (bundle_history, _) = self.get_object_with_etag::(&s3_key).await?; + Ok(bundle_history) + } + + async fn get_transaction_metadata( + &self, + tx_hash: TxHash, + ) -> Result> { + let s3_key = S3Key::TransactionByHash(tx_hash).to_string(); + let (transaction_metadata, _) = self + .get_object_with_etag::(&s3_key) + .await?; + Ok(transaction_metadata) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::reader::Event; + use crate::types::{DropReason, MempoolEvent}; + use alloy_primitives::TxHash; + use alloy_rpc_types_mev::EthSendBundle; + use uuid::Uuid; + + fn create_test_bundle() -> EthSendBundle { + EthSendBundle::default() + } + + fn create_test_event(key: &str, timestamp: i64, mempool_event: MempoolEvent) -> Event { + Event { + key: key.to_string(), + timestamp, + event: mempool_event, + } + } + + #[test] + fn test_update_bundle_history_transform_adds_new_event() { + let bundle_history = BundleHistory { history: vec![] }; + let bundle = create_test_bundle(); + let bundle_id = Uuid::new_v4(); + let mempool_event = MempoolEvent::Created { + bundle_id, + bundle: bundle.clone(), + }; + let event = create_test_event("test-key", 1234567890, mempool_event); + + let result = update_bundle_history_transform(bundle_history, &event); + + assert!(result.is_some()); + let bundle_history = result.unwrap(); + assert_eq!(bundle_history.history.len(), 1); + + match &bundle_history.history[0] { + BundleHistoryEvent::Created { + key, + timestamp: ts, + bundle: b, + } => { + assert_eq!(key, "test-key"); + assert_eq!(*ts, 1234567890); + assert_eq!(b.block_number, bundle.block_number); + } + _ => panic!("Expected Created event"), + } + } + + #[test] + fn test_update_bundle_history_transform_skips_duplicate_key() { + let existing_event = BundleHistoryEvent::Created { + key: "duplicate-key".to_string(), + timestamp: 1111111111, + bundle: create_test_bundle(), + }; + let bundle_history = BundleHistory { + history: vec![existing_event], + }; + + let bundle = create_test_bundle(); + let bundle_id = Uuid::new_v4(); + let mempool_event = MempoolEvent::Updated { bundle_id, bundle }; + let event = create_test_event("duplicate-key", 1234567890, mempool_event); + + let result = update_bundle_history_transform(bundle_history, &event); + + assert!(result.is_none()); + } + + #[test] + fn test_update_bundle_history_transform_handles_all_event_types() { + let bundle_history = BundleHistory { history: vec![] }; + let bundle_id = Uuid::new_v4(); + + // Test Created + let bundle = create_test_bundle(); + let mempool_event = MempoolEvent::Created { + bundle_id, + bundle: bundle.clone(), + }; + let event = create_test_event("test-key", 1234567890, mempool_event); + let result = update_bundle_history_transform(bundle_history.clone(), &event); + assert!(result.is_some()); + + // Test Updated + let mempool_event = MempoolEvent::Updated { + bundle_id, + bundle: bundle.clone(), + }; + let event = create_test_event("test-key-2", 1234567890, mempool_event); + let result = update_bundle_history_transform(bundle_history.clone(), &event); + assert!(result.is_some()); + + // Test Cancelled + let mempool_event = MempoolEvent::Cancelled { bundle_id }; + let event = create_test_event("test-key-3", 1234567890, mempool_event); + let result = update_bundle_history_transform(bundle_history.clone(), &event); + assert!(result.is_some()); + + // Test BuilderIncluded + let mempool_event = MempoolEvent::BuilderIncluded { + bundle_id, + builder: "test-builder".to_string(), + block_number: 12345, + flashblock_index: 1, + }; + let event = create_test_event("test-key-4", 1234567890, mempool_event); + let result = update_bundle_history_transform(bundle_history.clone(), &event); + assert!(result.is_some()); + + // Test FlashblockIncluded + let mempool_event = MempoolEvent::FlashblockIncluded { + bundle_id, + block_number: 12345, + flashblock_index: 1, + }; + let event = create_test_event("test-key-5", 1234567890, mempool_event); + let result = update_bundle_history_transform(bundle_history.clone(), &event); + assert!(result.is_some()); + + // Test BlockIncluded + let mempool_event = MempoolEvent::BlockIncluded { + bundle_id, + block_number: 12345, + block_hash: TxHash::from([1u8; 32]), + }; + let event = create_test_event("test-key-6", 1234567890, mempool_event); + let result = update_bundle_history_transform(bundle_history.clone(), &event); + assert!(result.is_some()); + + // Test Dropped + let mempool_event = MempoolEvent::Dropped { + bundle_id, + reason: DropReason::TimedOut, + }; + let event = create_test_event("test-key-7", 1234567890, mempool_event); + let result = update_bundle_history_transform(bundle_history, &event); + assert!(result.is_some()); + } + + #[test] + fn test_update_transaction_metadata_transform_adds_new_bundle() { + let metadata = TransactionMetadata { bundle_ids: vec![] }; + let bundle_id = Uuid::new_v4(); + + let result = update_transaction_metadata_transform(metadata, bundle_id); + + assert!(result.is_some()); + let metadata = result.unwrap(); + assert_eq!(metadata.bundle_ids.len(), 1); + assert_eq!(metadata.bundle_ids[0], bundle_id); + } + + #[test] + fn test_update_transaction_metadata_transform_skips_existing_bundle() { + let bundle_id = Uuid::new_v4(); + let metadata = TransactionMetadata { + bundle_ids: vec![bundle_id], + }; + + let result = update_transaction_metadata_transform(metadata, bundle_id); + + assert!(result.is_none()); + } + + #[test] + fn test_update_transaction_metadata_transform_adds_to_existing_bundles() { + let existing_bundle_id = Uuid::new_v4(); + let new_bundle_id = Uuid::new_v4(); + let metadata = TransactionMetadata { + bundle_ids: vec![existing_bundle_id], + }; + + let result = update_transaction_metadata_transform(metadata, new_bundle_id); + + assert!(result.is_some()); + let metadata = result.unwrap(); + assert_eq!(metadata.bundle_ids.len(), 2); + assert!(metadata.bundle_ids.contains(&existing_bundle_id)); + assert!(metadata.bundle_ids.contains(&new_bundle_id)); + } +} diff --git a/crates/audit/src/types.rs b/crates/audit/src/types.rs new file mode 100644 index 0000000..add8114 --- /dev/null +++ b/crates/audit/src/types.rs @@ -0,0 +1,116 @@ +use alloy_consensus::transaction::{SignerRecoverable, Transaction as ConsensusTransaction}; +use alloy_primitives::{Address, TxHash, U256}; +use alloy_provider::network::eip2718::Decodable2718; +use alloy_rpc_types_mev::EthSendBundle; +use bytes::Bytes; +use op_alloy_consensus::OpTxEnvelope; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] +pub struct TransactionId { + pub sender: Address, + pub nonce: U256, + pub hash: TxHash, +} + +pub type BundleId = Uuid; + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub enum DropReason { + TimedOut, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct Bundle { + pub id: BundleId, + pub transactions: Vec, + pub metadata: serde_json::Value, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct Transaction { + pub id: TransactionId, + pub data: Bytes, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(tag = "event", content = "data")] +pub enum MempoolEvent { + Created { + bundle_id: BundleId, + bundle: EthSendBundle, + }, + Updated { + bundle_id: BundleId, + bundle: EthSendBundle, + }, + Cancelled { + bundle_id: BundleId, + }, + BuilderIncluded { + bundle_id: BundleId, + builder: String, + block_number: u64, + flashblock_index: u64, + }, + FlashblockIncluded { + bundle_id: BundleId, + block_number: u64, + flashblock_index: u64, + }, + BlockIncluded { + bundle_id: BundleId, + block_number: u64, + block_hash: TxHash, + }, + Dropped { + bundle_id: BundleId, + reason: DropReason, + }, +} + +impl MempoolEvent { + pub fn bundle_id(&self) -> BundleId { + match self { + MempoolEvent::Created { bundle_id, .. } => *bundle_id, + MempoolEvent::Updated { bundle_id, .. } => *bundle_id, + MempoolEvent::Cancelled { bundle_id, .. } => *bundle_id, + MempoolEvent::BuilderIncluded { bundle_id, .. } => *bundle_id, + MempoolEvent::FlashblockIncluded { bundle_id, .. } => *bundle_id, + MempoolEvent::BlockIncluded { bundle_id, .. } => *bundle_id, + MempoolEvent::Dropped { bundle_id, .. } => *bundle_id, + } + } + + pub fn transaction_ids(&self) -> Vec { + match self { + MempoolEvent::Created { bundle, .. } | MempoolEvent::Updated { bundle, .. } => { + bundle + .txs + .iter() + .filter_map(|tx_bytes| { + match OpTxEnvelope::decode_2718_exact(tx_bytes.iter().as_slice()) { + Ok(envelope) => { + match envelope.recover_signer() { + Ok(sender) => Some(TransactionId { + sender, + nonce: U256::from(envelope.nonce()), + hash: *envelope.hash(), + }), + Err(_) => None, // Skip invalid transactions + } + } + Err(_) => None, // Skip malformed transactions + } + }) + .collect() + } + MempoolEvent::Cancelled { .. } => vec![], + MempoolEvent::BuilderIncluded { .. } => vec![], + MempoolEvent::FlashblockIncluded { .. } => vec![], + MempoolEvent::BlockIncluded { .. } => vec![], + MempoolEvent::Dropped { .. } => vec![], + } + } +} diff --git a/crates/audit/tests/common/mod.rs b/crates/audit/tests/common/mod.rs new file mode 100644 index 0000000..46fa30b --- /dev/null +++ b/crates/audit/tests/common/mod.rs @@ -0,0 +1,78 @@ +use rdkafka::producer::FutureProducer; +use rdkafka::{consumer::StreamConsumer, ClientConfig}; +use testcontainers::runners::AsyncRunner; +use testcontainers_modules::{kafka, kafka::Kafka, minio::MinIO}; +use uuid::Uuid; + +pub struct TestHarness { + pub s3_client: aws_sdk_s3::Client, + pub bucket_name: String, + #[allow(dead_code)] // TODO is read + pub kafka_producer: FutureProducer, + #[allow(dead_code)] // TODO is read + pub kafka_consumer: StreamConsumer, + _minio_container: testcontainers::ContainerAsync, + _kafka_container: testcontainers::ContainerAsync, +} + +impl TestHarness { + pub async fn new() -> Result> { + let minio_container = MinIO::default().start().await?; + let s3_port = minio_container.get_host_port_ipv4(9000).await?; + let s3_endpoint = format!("http://127.0.0.1:{}", s3_port); + + let config = aws_config::defaults(aws_config::BehaviorVersion::latest()) + .region("us-east-1") + .endpoint_url(&s3_endpoint) + .credentials_provider(aws_sdk_s3::config::Credentials::new( + "minioadmin", + "minioadmin", + None, + None, + "test", + )) + .load() + .await; + + let s3_client = aws_sdk_s3::Client::new(&config); + let bucket_name = format!("test-bucket-{}", Uuid::new_v4()); + + s3_client + .create_bucket() + .bucket(&bucket_name) + .send() + .await?; + + let kafka_container = Kafka::default().start().await?; + let bootstrap_servers = format!( + "127.0.0.1:{}", + kafka_container + .get_host_port_ipv4(kafka::KAFKA_PORT) + .await? + ); + + let kafka_producer = ClientConfig::new() + .set("bootstrap.servers", &bootstrap_servers) + .set("message.timeout.ms", "5000") + .create::() + .expect("Failed to create Kafka FutureProducer"); + + let kafka_consumer = ClientConfig::new() + .set("group.id", "testcontainer-rs") + .set("bootstrap.servers", &bootstrap_servers) + .set("session.timeout.ms", "6000") + .set("enable.auto.commit", "false") + .set("auto.offset.reset", "earliest") + .create::() + .expect("Failed to create Kafka StreamConsumer"); + + Ok(TestHarness { + s3_client, + bucket_name, + kafka_producer, + kafka_consumer, + _minio_container: minio_container, + _kafka_container: kafka_container, + }) + } +} diff --git a/crates/audit/tests/integration_tests.rs b/crates/audit/tests/integration_tests.rs new file mode 100644 index 0000000..ba41479 --- /dev/null +++ b/crates/audit/tests/integration_tests.rs @@ -0,0 +1,73 @@ +use alloy_rpc_types_mev::EthSendBundle; +use std::time::Duration; +use tips_audit::{ + publisher::{KafkaMempoolEventPublisher, MempoolEventPublisher}, + storage::{MempoolEventS3Reader, S3MempoolEventReaderWriter}, + types::{DropReason, MempoolEvent}, + KafkaMempoolArchiver, KafkaMempoolReader, +}; +use uuid::Uuid; +mod common; +use common::TestHarness; + +#[tokio::test] +async fn test_kafka_publisher_s3_archiver_integration( +) -> Result<(), Box> { + let harness = TestHarness::new().await?; + let topic = "test-mempool-events"; + + let s3_writer = + S3MempoolEventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + + let test_bundle_id = Uuid::new_v4(); + let test_events = vec![ + MempoolEvent::Created { + bundle_id: test_bundle_id, + bundle: EthSendBundle::default(), + }, + MempoolEvent::Dropped { + bundle_id: test_bundle_id, + reason: DropReason::TimedOut, + }, + ]; + + let publisher = KafkaMempoolEventPublisher::new(harness.kafka_producer, topic.to_string()); + + for event in test_events.iter() { + publisher.publish(event.clone()).await?; + } + + let mut consumer = KafkaMempoolArchiver::new( + KafkaMempoolReader::new(harness.kafka_consumer, topic.to_string())?, + s3_writer.clone(), + ); + + tokio::spawn(async move { + consumer.run().await.expect("error running consumer"); + }); + + // Wait for the messages to be received + let mut counter = 0; + loop { + counter += 1; + if counter > 10 { + assert!(false, "unable to complete archiving within the deadline"); + } + + tokio::time::sleep(Duration::from_secs(1)).await; + let bundle_history = s3_writer.get_bundle_history(test_bundle_id).await?; + + if bundle_history.is_some() { + let history = bundle_history.unwrap(); + if history.history.len() != test_events.len() { + continue; + } else { + break; + } + } else { + continue; + } + } + + Ok(()) +} diff --git a/crates/audit/tests/s3_test.rs b/crates/audit/tests/s3_test.rs new file mode 100644 index 0000000..171da55 --- /dev/null +++ b/crates/audit/tests/s3_test.rs @@ -0,0 +1,273 @@ +use alloy_primitives::{b256, bytes, Bytes, TxHash}; +use alloy_rpc_types_mev::EthSendBundle; +use std::sync::Arc; +use tips_audit::{ + reader::Event, + storage::{MempoolEventS3Reader, MempoolEventWriter, S3MempoolEventReaderWriter}, + types::MempoolEvent, +}; +use tokio::task::JoinSet; +use uuid::Uuid; + +mod common; +use common::TestHarness; + +// https://basescan.org/tx/0x4f7ddfc911f5cf85dd15a413f4cbb2a0abe4f1ff275ed13581958c0bcf043c5e +const TXN_DATA: Bytes = bytes!("0x02f88f8221058304b6b3018315fb3883124f80948ff2f0a8d017c79454aa28509a19ab9753c2dd1480a476d58e1a0182426068c9ea5b00000000000000000002f84f00000000083e4fda54950000c080a086fbc7bbee41f441fb0f32f7aa274d2188c460fe6ac95095fa6331fa08ec4ce7a01aee3bcc3c28f7ba4e0c24da9ae85e9e0166c73cabb42c25ff7b5ecd424f3105"); +const TXN_HASH: TxHash = + b256!("0x4f7ddfc911f5cf85dd15a413f4cbb2a0abe4f1ff275ed13581958c0bcf043c5e"); + +fn create_test_bundle() -> EthSendBundle { + EthSendBundle { + txs: vec![TXN_DATA.clone()], + ..Default::default() + } +} + +fn create_test_event(key: &str, timestamp: i64, mempool_event: MempoolEvent) -> Event { + Event { + key: key.to_string(), + timestamp, + event: mempool_event, + } +} + +#[tokio::test] +async fn test_event_write_and_read() -> Result<(), Box> { + let harness = TestHarness::new().await?; + let writer = + S3MempoolEventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + + let bundle_id = Uuid::new_v4(); + let bundle = create_test_bundle(); + let event = create_test_event( + "test-key-1", + 1234567890, + MempoolEvent::Created { + bundle_id, + bundle: bundle.clone(), + }, + ); + + writer.archive_event(event).await?; + + let bundle_history = writer.get_bundle_history(bundle_id).await?; + assert!(bundle_history.is_some()); + + let history = bundle_history.unwrap(); + assert_eq!(history.history.len(), 1); + assert_eq!(history.history[0].key(), "test-key-1"); + + let metadata = writer.get_transaction_metadata(TXN_HASH).await?; + assert!(metadata.is_some()); + + if let Some(metadata) = metadata { + assert!(metadata.bundle_ids.contains(&bundle_id)); + } + + let bundle_id_two = Uuid::new_v4(); + let bundle = create_test_bundle(); + let event = create_test_event( + "test-key-2", + 1234567890, + MempoolEvent::Created { + bundle_id: bundle_id_two, + bundle: bundle.clone(), + }, + ); + + writer.archive_event(event).await?; + + let metadata = writer.get_transaction_metadata(TXN_HASH).await?; + assert!(metadata.is_some()); + + if let Some(metadata) = metadata { + assert!(metadata.bundle_ids.contains(&bundle_id)); + assert!(metadata.bundle_ids.contains(&bundle_id_two)); + } + + Ok(()) +} + +#[tokio::test] +async fn test_events_appended() -> Result<(), Box> { + let harness = TestHarness::new().await?; + let writer = + S3MempoolEventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + + let bundle_id = Uuid::new_v4(); + let bundle = create_test_bundle(); + + let events = vec![ + create_test_event( + "test-key-1", + 1234567890, + MempoolEvent::Created { + bundle_id, + bundle: bundle.clone(), + }, + ), + create_test_event( + "test-key-2", + 1234567891, + MempoolEvent::Updated { + bundle_id, + bundle: bundle.clone(), + }, + ), + create_test_event( + "test-key-3", + 1234567892, + MempoolEvent::Cancelled { bundle_id }, + ), + ]; + + for (idx, event) in events.iter().enumerate() { + writer.archive_event(event.clone()).await?; + + let bundle_history = writer.get_bundle_history(bundle_id).await?; + assert!(bundle_history.is_some()); + + let history = bundle_history.unwrap(); + assert_eq!(history.history.len(), idx + 1); + + let keys: Vec = history + .history + .iter() + .map(|e| e.key().to_string()) + .collect(); + assert_eq!( + keys, + events + .iter() + .map(|e| e.key.clone()) + .take(idx + 1) + .collect::>() + ); + } + + Ok(()) +} + +#[tokio::test] +async fn test_event_deduplication() -> Result<(), Box> { + let harness = TestHarness::new().await?; + let writer = + S3MempoolEventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + + let bundle_id = Uuid::new_v4(); + let bundle = create_test_bundle(); + let event = create_test_event( + "duplicate-key", + 1234567890, + MempoolEvent::Created { + bundle_id, + bundle: bundle.clone(), + }, + ); + + writer.archive_event(event.clone()).await?; + writer.archive_event(event).await?; + + let bundle_history = writer.get_bundle_history(bundle_id).await?; + assert!(bundle_history.is_some()); + + let history = bundle_history.unwrap(); + assert_eq!(history.history.len(), 1); + assert_eq!(history.history[0].key(), "duplicate-key"); + + Ok(()) +} + +#[tokio::test] +async fn test_nonexistent_data() -> Result<(), Box> { + let harness = TestHarness::new().await?; + let writer = + S3MempoolEventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + + let nonexistent_bundle_id = Uuid::new_v4(); + let bundle_history = writer.get_bundle_history(nonexistent_bundle_id).await?; + assert!(bundle_history.is_none()); + + let nonexistent_tx_hash = TxHash::from([255u8; 32]); + let metadata = writer.get_transaction_metadata(nonexistent_tx_hash).await?; + assert!(metadata.is_none()); + + Ok(()) +} + +#[tokio::test] +#[ignore = "TODO doesn't appear to work with minio, should test against a real S3 bucket"] +async fn test_concurrent_writes_for_bundle() -> Result<(), Box> +{ + let harness = TestHarness::new().await?; + let writer = Arc::new(S3MempoolEventReaderWriter::new( + harness.s3_client.clone(), + harness.bucket_name.clone(), + )); + + let bundle_id = Uuid::new_v4(); + let bundle = create_test_bundle(); + + let event = create_test_event( + "hello-dan", + 1234567889i64, + MempoolEvent::Created { + bundle_id, + bundle: bundle.clone(), + }, + ); + + writer.archive_event(event.clone()).await?; + + let mut join_set = JoinSet::new(); + + for i in 0..4 { + let writer_clone = writer.clone(); + let key = if i % 4 == 0 { + "shared-key".to_string() + } else { + format!("unique-key-{}", i) + }; + + let event = create_test_event( + &key, + 1234567890 + i as i64, + MempoolEvent::Created { + bundle_id, + bundle: bundle.clone(), + }, + ); + + join_set.spawn(async move { writer_clone.archive_event(event.clone()).await }); + } + + let tasks = join_set.join_all().await; + assert_eq!(tasks.len(), 4); + for t in tasks.iter() { + assert!(t.is_ok()); + } + + let bundle_history = writer.get_bundle_history(bundle_id).await?; + assert!(bundle_history.is_some()); + + let history = bundle_history.unwrap(); + + let shared_count = history + .history + .iter() + .filter(|e| e.key() == "shared-key") + .count(); + assert_eq!(shared_count, 1); + + let unique_count = history + .history + .iter() + .filter(|e| e.key().starts_with("unique-key-")) + .count(); + assert_eq!(unique_count, 3); + + assert_eq!(history.history.len(), 4); + + Ok(()) +} diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..6cff010 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,73 @@ +services: + kafka: + image: confluentinc/cp-kafka:7.5.0 + container_name: tips-kafka + ports: + - "9092:9092" + environment: + KAFKA_BROKER_ID: 1 + KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,CONTROLLER:PLAINTEXT + KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092 + KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:29092,CONTROLLER://0.0.0.0:9093,PLAINTEXT_HOST://0.0.0.0:9092 + KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT + KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER + KAFKA_ZOOKEEPER_CONNECT: ' ' + KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 + KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1 + KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1 + KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0 + KAFKA_PROCESS_ROLES: broker,controller + KAFKA_NODE_ID: 1 + KAFKA_CONTROLLER_QUORUM_VOTERS: 1@kafka:9093 + KAFKA_LOG_DIRS: /var/lib/kafka/data + CLUSTER_ID: 4L6g3nShT-eMCtK--X86sw + volumes: + - ./data/kafka:/var/lib/kafka/data + healthcheck: + test: ["CMD", "kafka-broker-api-versions", "--bootstrap-server", "localhost:9092"] + interval: 10s + timeout: 10s + retries: 5 + kafka-setup: + image: confluentinc/cp-kafka:7.5.0 + container_name: tips-kafka-setup + depends_on: + kafka: + condition: service_healthy + command: | + sh -c " + kafka-topics --create --if-not-exists --topic tips-audit --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 + kafka-topics --list --bootstrap-server kafka:29092 + " + + minio: + image: minio/minio:latest + container_name: tips-minio + environment: + MINIO_ROOT_USER: minioadmin + MINIO_ROOT_PASSWORD: minioadmin + ports: + - "7000:9000" + - "7001:9001" + command: server /data --console-address ":9001" + volumes: + - ./data/minio:/data + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] + interval: 30s + timeout: 20s + retries: 3 + minio-setup: + image: minio/mc + container_name: tips-minio-setup + depends_on: + minio: + condition: service_healthy + entrypoint: > + /bin/sh -c " + /usr/bin/mc alias set minio http://minio:9000 minioadmin minioadmin; + /usr/bin/mc mb minio/tips; + /usr/bin/mc anonymous set public minio/tips; + exit 0; + " + diff --git a/crates/datastore/migrations/init-db.sh b/docker/init-db.sh similarity index 100% rename from crates/datastore/migrations/init-db.sh rename to docker/init-db.sh diff --git a/docs/AUDIT_S3_FORMAT.md b/docs/AUDIT_S3_FORMAT.md new file mode 100644 index 0000000..e64ffd6 --- /dev/null +++ b/docs/AUDIT_S3_FORMAT.md @@ -0,0 +1,87 @@ +# S3 Storage Format + +This document describes the S3 storage format used by the audit system for archiving bundle lifecycle events and transaction lookups. + +## Storage Structure + +### Bundle History: `/bundles/` + +Each bundle is stored as a JSON object containing its complete lifecycle history: + +```json +{ + "history": [ + { + "event": "Created", + "timestamp": 1234567890, + "bundle": { + // EthSendBundle object + } + }, + { + "event": "Updated", + "timestamp": 1234567891, + "bundle": { + // EthSendBundle object + } + }, + { + "event": "Cancelled", + "timestamp": 1234567892 + }, + { + "event": "BuilderIncluded", + "builder": "builder-id", + "timestamp": 1234567893, + "blockNumber": 12345, + "flashblockIndex": 1 + }, + { + "event": "FlashblockIncluded", + "timestamp": 1234567894, + "blockNumber": 12345, + "flashblockIndex": 1 + }, + { + "event": "BlockIncluded", + "timestamp": 1234567895, + "blockNumber": 12345, + "blockHash": "0x..." + }, + { + "event": "Dropped", + "timestamp": 1234567896, + "reason": "TIMEOUT" + } + ] +} +``` + +### Transaction Lookup: `/transactions/by_hash/` + +Transaction hash to bundle mapping for efficient lookups: + +```json +{ + "bundle_ids": [ + "550e8400-e29b-41d4-a716-446655440000", + "6ba7b810-9dad-11d1-80b4-00c04fd430c8" + ] +} +``` + +## Event Types + +### Bundle Events + +- **Created**: Initial bundle creation with transaction list +- **Updated**: Bundle modification (transaction additions/removals) +- **Cancelled**: Bundle explicitly cancelled +- **BuilderIncluded**: Bundle included by builder in flashblock +- **FlashblockIncluded**: Flashblock containing bundle included in chain +- **BlockIncluded**: Final confirmation in blockchain +- **Dropped**: Bundle dropped from processing + +### Drop Reasons + +- `TIMEOUT`: Bundle expired without inclusion \ No newline at end of file diff --git a/justfile b/justfile index a874491..4481d50 100644 --- a/justfile +++ b/justfile @@ -1,3 +1,4 @@ +### DEVELOPMENT COMMANDS ### ci: cargo fmt --all -- --check cargo clippy -- -D warnings @@ -13,4 +14,16 @@ create-migration name: sync: ### DATABASE ### - cargo sqlx prepare -D postgresql://postgres:postgres@localhost:5432/postgres --workspace --all --no-dotenv \ No newline at end of file + cargo sqlx prepare -D postgresql://postgres:postgres@localhost:5432/postgres --workspace --all --no-dotenv + ### ENV ### + cp .env.example .env + +### RUN SERVICES ### +deps-reset: + docker compose down && docker compose rm && rm -rf data/ && mkdir -p data/postgres data/kafka data/minio && docker compose up -d + +deps: + docker compose down && docker compose rm && docker compose up -d + +audit: + cargo run --bin tips-audit \ No newline at end of file From 48a6bdf5cce11e15f7e3c819640576bc94cc0345 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Fri, 19 Sep 2025 10:52:36 -0500 Subject: [PATCH 005/117] prototype: Placeholder ingress service --- .env.example | 10 + Cargo.lock | 2409 ++++++++++++++++++++++++++++++--- Cargo.toml | 25 +- README.md | 3 + crates/ingress/Cargo.toml | 29 + crates/ingress/src/main.rs | 120 ++ crates/ingress/src/service.rs | 142 ++ docker-compose.yml | 18 + justfile | 5 +- 9 files changed, 2531 insertions(+), 230 deletions(-) create mode 100644 crates/ingress/Cargo.toml create mode 100644 crates/ingress/src/main.rs create mode 100644 crates/ingress/src/service.rs diff --git a/.env.example b/.env.example index 77d5e6b..45d0bb6 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,13 @@ +# Ingress +TIPS_INGRESS_ADDRESS=127.0.0.1 +TIPS_INGRESS_PORT=8080 +TIPS_INGRESS_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres +TIPS_INGRESS_RPC_MEMPOOL=http://localhost:2222 +TIPS_INGRESS_DUAL_WRITE_MEMPOOL=false +TIPS_INGRESS_KAFKA_BROKERS=localhost:9092 +TIPS_INGRESS_KAFKA_TOPIC=tips-audit +TIPS_INGRESS_LOG_LEVEL=info + # Audit service configuration TIPS_AUDIT_KAFKA_BROKERS=localhost:9092 TIPS_AUDIT_KAFKA_TOPIC=tips-audit diff --git a/Cargo.lock b/Cargo.lock index 1bedbc4..4bccb7a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,19 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" +[[package]] +name = "ahash" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" +dependencies = [ + "cfg-if", + "getrandom 0.3.3", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "1.1.3" @@ -34,20 +47,22 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy-chains" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8ff73a143281cb77c32006b04af9c047a6b8fe5860e85a88ad325328965355" +checksum = "8e4e355f312b270bca5144af5f003e7d238037e47a818766f9107f966cbecf52" dependencies = [ "alloy-primitives", + "alloy-rlp", "num_enum", + "serde", "strum", ] [[package]] name = "alloy-consensus" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a3bd0305a44fb457cae77de1e82856eadd42ea3cdf0dae29df32eb3b592979" +checksum = "b190875b4e4d8838a49e9c1489a27c07583232a269a1a625a8260049134bd6be" dependencies = [ "alloy-eips", "alloy-primitives", @@ -62,7 +77,7 @@ dependencies = [ "k256", "once_cell", "rand 0.8.5", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_with", "thiserror", @@ -70,9 +85,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a842b4023f571835e62ac39fb8d523d19fcdbacfa70bf796ff96e7e19586f50" +checksum = "545370c7dc047fa2c632a965b76bb429cc24674d2fcddacdcb0d998b09731b9e" dependencies = [ "alloy-consensus", "alloy-eips", @@ -121,9 +136,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cd749c57f38f8cbf433e651179fc5a676255e6b95044f467d49255d2b81725a" +checksum = "2a33d1723ecf64166c2a0371e25d1bce293b873527a7617688c9375384098ea1" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -137,10 +152,57 @@ dependencies = [ "either", "serde", "serde_with", - "sha2", + "sha2 0.10.9", + "thiserror", +] + +[[package]] +name = "alloy-evm" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dbe7c66c859b658d879b22e8aaa19546dab726b0639f4649a424ada3d99349e" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-hardforks", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-sol-types", + "auto_impl", + "derive_more", + "op-alloy-consensus 0.19.1", + "op-revm", + "revm", "thiserror", ] +[[package]] +name = "alloy-genesis" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3865dd77a0fcbe61a35f08171af54d54617372df0544d7626f9ee5a42103c825" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-serde", + "alloy-trie", + "serde", + "serde_with", +] + +[[package]] +name = "alloy-hardforks" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d66cfdf265bf52c0c4a952960c854c3683c71ff2fc02c9b8c317c691fd3bc28" +dependencies = [ + "alloy-chains", + "alloy-eip2124", + "alloy-primitives", + "auto_impl", + "dyn-clone", +] + [[package]] name = "alloy-json-abi" version = "1.3.1" @@ -155,9 +217,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f614019a029c8fec14ae661aa7d4302e6e66bdbfb869dab40e78dcfba935fc97" +checksum = "d24aba9adc7e22cec5ae396980cac73792f5cb5407dc1efc07292e7f96fb65d5" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -170,9 +232,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8b6d58e98803017bbfea01dde96c4d270a29e7aed3beb65c8d28b5ab464e0e" +checksum = "c3e52ba8f09d0c31765582cd7f39ede2dfba5afa159f1376afc29c9157564246" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -196,9 +258,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db489617bffe14847bf89f175b1c183e5dd7563ef84713936e2c34255cfbd845" +checksum = "f37bf78f46f2717973639c4f11e6330691fea62c4d116d720e0dcfd49080c126" dependencies = [ "alloy-consensus", "alloy-eips", @@ -219,8 +281,9 @@ dependencies = [ "const-hex", "derive_more", "foldhash", + "getrandom 0.3.3", "hashbrown 0.15.5", - "indexmap 2.11.0", + "indexmap 2.11.4", "itoa", "k256", "keccak-asm", @@ -228,7 +291,7 @@ dependencies = [ "proptest", "rand 0.9.2", "ruint", - "rustc-hash", + "rustc-hash 2.1.1", "serde", "sha3", "tiny-keccak", @@ -236,9 +299,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed90278374435e076a04dbddbb6d714bdd518eb274a64dbd70f65701429dd747" +checksum = "74580f7459337cd281a6bfa2c8f08a07051cb3900e0edaa27ccb21fb046041ed" dependencies = [ "alloy-chains", "alloy-consensus", @@ -297,9 +360,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33732242ca63f107f5f8284190244038905fb233280f4b7c41f641d4f584d40d" +checksum = "bca26070f1fc94d69e8d41fcde991b0556dbf8fac737dc09102d461d957a1bb9" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -318,22 +381,48 @@ dependencies = [ "wasmtimer", ] +[[package]] +name = "alloy-rpc-types-admin" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d56c8ce360ec766720d8a655fe448b94428ad1aea44aad488a3461ee4dc1f40" +dependencies = [ + "alloy-genesis", + "alloy-primitives", + "serde", + "serde_json", +] + [[package]] name = "alloy-rpc-types-any" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18f27c0c41a16cd0af4f5dbf791f7be2a60502ca8b0e840e0ad29803fac2d587" +checksum = "c14ba5de4025eb7ce19a5c19706b3c2fd86a0b4f9ad8c9ef0dce0d5e66be7157" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", "alloy-serde", ] +[[package]] +name = "alloy-rpc-types-engine" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "997de3fb8ad67674af70c123d2c6344e8fb0cbbd7fb96fde106ee9e45a2912d2" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "derive_more", + "strum", +] + [[package]] name = "alloy-rpc-types-eth" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f5812f81c3131abc2cd8953dc03c41999e180cff7252abbccaba68676e15027" +checksum = "7357279a96304232d37adbe2064a9392dddd9b0e8beca2a12a8fc0872c8a81dd" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -343,7 +432,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", - "itertools 0.13.0", + "itertools 0.14.0", "serde", "serde_json", "serde_with", @@ -352,9 +441,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f999c26193d08e4f4a748ef5f45fb626b2fc4c1cd4dc99c0ebe1032516d37cba" +checksum = "5a04717f44c5404b1ef497f221869f243d5c9ea5bdfd5da8c25d6736a9d2b2e1" dependencies = [ "alloy-consensus", "alloy-eips", @@ -365,11 +454,25 @@ dependencies = [ "serde_json", ] +[[package]] +name = "alloy-rpc-types-trace" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3741bce3ede19ed040d8f357a88a4aae8f714e4d07da7f2a11b77a698386d7e1" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "alloy-serde" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dfe41a47805a34b848c83448946ca96f3d36842e8c074bcf8fa0870e337d12" +checksum = "5f0ee5af728e144e0e5bde52114c7052249a9833d9fba79aeacfbdee1aad69e8" dependencies = [ "alloy-primitives", "serde", @@ -378,9 +481,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79237b4c1b0934d5869deea4a54e6f0a7425a8cd943a739d6293afdf893d847" +checksum = "0efbce76baf1b012e379a5e486822c71b0de0a957ddedd5410427789516a47b9" dependencies = [ "alloy-primitives", "async-trait", @@ -414,7 +517,7 @@ dependencies = [ "alloy-sol-macro-input", "const-hex", "heck", - "indexmap 2.11.0", + "indexmap 2.11.4", "proc-macro-error2", "proc-macro2", "quote", @@ -463,9 +566,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb43750e137fe3a69a325cd89a8f8e2bbf4f83e70c0f60fbe49f22511ca075e8" +checksum = "7200a72ccda236bc841df56964b1f816f451e317b172538ba3977357e789b8bd" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -487,9 +590,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9b42c7d8b666eed975739201f407afc3320d3cd2e4d807639c2918fc736ea67" +checksum = "70e4b8f9a796065824ef6cee4eef88a0887b03e963d6ad526f1c8de369a44472" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -518,9 +621,9 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e434e0917dce890f755ea774f59d6f12557bc8c7dd9fa06456af80cfe0f0181e" +checksum = "fb91a93165a8646618ae6366f301ec1edd52f452665c371e12201516593925a0" dependencies = [ "alloy-primitives", "darling 0.21.3", @@ -590,9 +693,68 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.99" +version = "1.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" + +[[package]] +name = "aquamarine" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f50776554130342de4836ba542aa85a4ddb361690d7e8df13774d7284c3d5c2" +dependencies = [ + "include_dir", + "itertools 0.10.5", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "ark-bls12-381" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3df4dcc01ff89867cd86b0da835f23c3f02738353aaee7dde7495af71363b8d5" +dependencies = [ + "ark-ec", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", +] + +[[package]] +name = "ark-bn254" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc" +dependencies = [ + "ark-ec", + "ark-ff 0.5.0", + "ark-r1cs-std", + "ark-std 0.5.0", +] + +[[package]] +name = "ark-ec" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" +checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce" +dependencies = [ + "ahash", + "ark-ff 0.5.0", + "ark-poly", + "ark-serialize 0.5.0", + "ark-std 0.5.0", + "educe", + "fnv", + "hashbrown 0.15.5", + "itertools 0.13.0", + "num-bigint", + "num-integer", + "num-traits", + "zeroize", +] [[package]] name = "ark-ff" @@ -632,6 +794,26 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ark-ff" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a177aba0ed1e0fbb62aa9f6d0502e9b46dad8c2eab04c14258a1212d2557ea70" +dependencies = [ + "ark-ff-asm 0.5.0", + "ark-ff-macros 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", + "arrayvec", + "digest 0.10.7", + "educe", + "itertools 0.13.0", + "num-bigint", + "num-traits", + "paste", + "zeroize", +] + [[package]] name = "ark-ff-asm" version = "0.3.0" @@ -652,6 +834,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-ff-asm" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" +dependencies = [ + "quote", + "syn 2.0.106", +] + [[package]] name = "ark-ff-macros" version = "0.3.0" @@ -677,6 +869,63 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-ff-macros" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09be120733ee33f7693ceaa202ca41accd5653b779563608f1234f78ae07c4b3" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "ark-poly" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27" +dependencies = [ + "ahash", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", + "educe", + "fnv", + "hashbrown 0.15.5", +] + +[[package]] +name = "ark-r1cs-std" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941551ef1df4c7a401de7068758db6503598e6f01850bdb2cfdb614a1f9dbea1" +dependencies = [ + "ark-ec", + "ark-ff 0.5.0", + "ark-relations", + "ark-std 0.5.0", + "educe", + "num-bigint", + "num-integer", + "num-traits", + "tracing", +] + +[[package]] +name = "ark-relations" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec46ddc93e7af44bcab5230937635b06fb5744464dd6a7e7b083e80ebd274384" +dependencies = [ + "ark-ff 0.5.0", + "ark-std 0.5.0", + "tracing", + "tracing-subscriber 0.2.25", +] + [[package]] name = "ark-serialize" version = "0.3.0" @@ -698,6 +947,30 @@ dependencies = [ "num-bigint", ] +[[package]] +name = "ark-serialize" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7" +dependencies = [ + "ark-serialize-derive", + "ark-std 0.5.0", + "arrayvec", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "ark-std" version = "0.3.0" @@ -718,6 +991,22 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "ark-std" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + [[package]] name = "arrayvec" version = "0.7.6" @@ -775,6 +1064,16 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +[[package]] +name = "aurora-engine-modexp" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "518bc5745a6264b5fd7b09dffb9667e400ee9e2bbe18555fac75e1fe9afa0df9" +dependencies = [ + "hex", + "num", +] + [[package]] name = "auto_impl" version = "1.3.0" @@ -836,9 +1135,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.14.0" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b8ff6c09cd57b16da53641caa860168b88c172a5ee163b0288d3d6eea12786" +checksum = "5c953fe1ba023e6b7730c0d4b031d06f267f23a46167dcbd40316644b10a17ba" dependencies = [ "aws-lc-sys", "zeroize", @@ -846,9 +1145,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.31.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e44d16778acaf6a9ec9899b92cebd65580b83f685446bf2e1f5d3d732f99dcd" +checksum = "dbfd150b5dbdb988bcc8fb1fe787eb6b7ee6180ca24da683b61ea5405f3d43ff" dependencies = [ "bindgen", "cc", @@ -911,7 +1210,7 @@ dependencies = [ "lru 0.12.5", "percent-encoding", "regex-lite", - "sha2", + "sha2 0.10.9", "tracing", "url", ] @@ -1001,10 +1300,10 @@ dependencies = [ "hmac", "http 0.2.12", "http 1.3.1", - "p256", + "p256 0.11.1", "percent-encoding", "ring", - "sha2", + "sha2 0.10.9", "subtle", "time", "tracing", @@ -1038,7 +1337,7 @@ dependencies = [ "md-5", "pin-project-lite", "sha1", - "sha2", + "sha2 0.10.9", "tracing", ] @@ -1099,7 +1398,7 @@ dependencies = [ "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.2", + "tokio-rustls 0.26.3", "tower", "tracing", ] @@ -1222,6 +1521,12 @@ dependencies = [ "tracing", ] +[[package]] +name = "az" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" + [[package]] name = "backtrace" version = "0.3.75" @@ -1279,22 +1584,25 @@ checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" [[package]] name = "bindgen" -version = "0.72.1" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ "bitflags 2.9.4", "cexpr", "clang-sys", - "itertools 0.13.0", + "itertools 0.12.1", + "lazy_static", + "lazycell", "log", "prettyplease", "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.106", + "which", ] [[package]] @@ -1351,10 +1659,20 @@ checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", + "serde", "tap", "wyz", ] +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -1480,11 +1798,10 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.36" +version = "1.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5252b3d2648e5eedbc1a6f501e3c795e07025c1e93bbf8bbdd6eef7f447a6d54" +checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af" dependencies = [ - "find-msvc-tools", "jobserver", "libc", "shlex", @@ -1505,6 +1822,12 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.42" @@ -1594,15 +1917,14 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dccd746bf9b1038c0507b7cec21eb2b11222db96a2902c96e8c185d6d20fb9c4" +checksum = "b6407bff74dea37e0fa3dc1c1c974e5d46405f0c987bf9997a0762adce71eda6" dependencies = [ "cfg-if", "cpufeatures", - "hex", "proptest", - "serde", + "serde_core", ] [[package]] @@ -1631,6 +1953,15 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "convert_case" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -1704,19 +2035,44 @@ dependencies = [ ] [[package]] -name = "crossbeam-queue" -version = "0.3.12" +name = "critical-section" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" + +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ + "crossbeam-epoch", "crossbeam-utils", ] [[package]] -name = "crossbeam-utils" -version = "0.8.21" +name = "crossbeam-epoch" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" @@ -1885,6 +2241,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive-where" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "derive_more" version = "2.0.1" @@ -1900,6 +2267,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" dependencies = [ + "convert_case", "proc-macro2", "quote", "syn 2.0.106", @@ -1921,7 +2289,7 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", + "block-buffer 0.10.4", "const-oid", "crypto-common", "subtle", @@ -1994,6 +2362,18 @@ dependencies = [ "spki 0.7.3", ] +[[package]] +name = "educe" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7bc049e1bd8cdeb31b68bbd586a9464ecf9f3944af3958a7a9d0f8b9799417" +dependencies = [ + "enum-ordinalize", + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "either" version = "1.15.0" @@ -2043,6 +2423,43 @@ dependencies = [ "zeroize", ] +[[package]] +name = "enr" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "851bd664a3d3a3c175cff92b2f0df02df3c541b4895d0ae307611827aae46152" +dependencies = [ + "alloy-rlp", + "base64 0.22.1", + "bytes", + "hex", + "log", + "rand 0.8.5", + "secp256k1 0.30.0", + "sha3", + "zeroize", +] + +[[package]] +name = "enum-ordinalize" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" +dependencies = [ + "enum-ordinalize-derive", +] + +[[package]] +name = "enum-ordinalize-derive" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "equivalent" version = "1.0.2" @@ -2051,12 +2468,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.0", ] [[package]] @@ -2151,12 +2568,6 @@ dependencies = [ "windows-sys 0.60.2", ] -[[package]] -name = "find-msvc-tools" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d" - [[package]] name = "fixed-hash" version = "0.8.0" @@ -2352,8 +2763,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.1+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -2363,9 +2776,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi", - "wasi 0.14.4+wasi-0.2.4", + "wasi 0.14.7+wasi-0.2.4", + "wasm-bindgen", ] [[package]] @@ -2380,6 +2795,16 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" +[[package]] +name = "gmp-mpfr-sys" +version = "1.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60f8970a75c006bb2f8ae79c6768a116dd215fa8346a87aed99bf9d82ca43394" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] + [[package]] name = "group" version = "0.12.1" @@ -2414,7 +2839,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.11.0", + "indexmap 2.11.4", "slab", "tokio", "tokio-util", @@ -2433,7 +2858,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.3.1", - "indexmap 2.11.0", + "indexmap 2.11.4", "slab", "tokio", "tokio-util", @@ -2446,6 +2871,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + [[package]] name = "hashbrown" version = "0.14.5" @@ -2464,6 +2895,12 @@ dependencies = [ "serde", ] +[[package]] +name = "hashbrown" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" + [[package]] name = "hashlink" version = "0.10.0" @@ -2490,9 +2927,6 @@ name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -dependencies = [ - "serde", -] [[package]] name = "hex-conservative" @@ -2689,7 +3123,7 @@ dependencies = [ "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.2", + "tokio-rustls 0.26.3", "tower-service", ] @@ -2711,9 +3145,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e" +checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" dependencies = [ "base64 0.22.1", "bytes", @@ -2750,9 +3184,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.63" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2905,6 +3339,25 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "include_dir" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "indenter" version = "0.3.4" @@ -2924,13 +3377,14 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.11.0" +version = "2.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9" +checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" dependencies = [ "equivalent", - "hashbrown 0.15.5", + "hashbrown 0.16.0", "serde", + "serde_core", ] [[package]] @@ -2975,6 +3429,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.13.0" @@ -2984,6 +3447,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.15" @@ -3002,14 +3474,105 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.78" +version = "0.3.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738" +checksum = "852f13bec5eba4ba9afbeb93fd7c13fe56147f055939ae21c43a29a0ecb2702e" dependencies = [ "once_cell", "wasm-bindgen", ] +[[package]] +name = "jsonrpsee" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3f48dc3e6b8bd21e15436c1ddd0bc22a6a54e8ec46fedd6adf3425f396ec6a" +dependencies = [ + "jsonrpsee-core", + "jsonrpsee-proc-macros", + "jsonrpsee-server", + "jsonrpsee-types", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "316c96719901f05d1137f19ba598b5fe9c9bc39f4335f67f6be8613921946480" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "jsonrpsee-types", + "parking_lot", + "pin-project", + "rand 0.9.2", + "rustc-hash 2.1.1", + "serde", + "serde_json", + "thiserror", + "tokio", + "tower", + "tracing", +] + +[[package]] +name = "jsonrpsee-proc-macros" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da3f8ab5ce1bb124b6d082e62dffe997578ceaf0aeb9f3174a214589dc00f07" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "jsonrpsee-server" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c51b7c290bb68ce3af2d029648148403863b982f138484a73f02a9dd52dbd7f" +dependencies = [ + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.7.0", + "hyper-util", + "jsonrpsee-core", + "jsonrpsee-types", + "pin-project", + "route-recognizer", + "serde", + "serde_json", + "soketto", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tracing", +] + +[[package]] +name = "jsonrpsee-types" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc88ff4688e43cc3fa9883a8a95c6fa27aa2e76c96e610b737b6554d650d7fd5" +dependencies = [ + "http 1.3.1", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "k256" version = "0.13.4" @@ -3021,7 +3584,7 @@ dependencies = [ "elliptic-curve 0.13.8", "once_cell", "serdect", - "sha2", + "sha2 0.10.9", ] [[package]] @@ -3052,6 +3615,12 @@ dependencies = [ "spin", ] +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + [[package]] name = "libc" version = "0.2.175" @@ -3076,15 +3645,61 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libredox" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" dependencies = [ "bitflags 2.9.4", "libc", "redox_syscall 0.5.17", ] +[[package]] +name = "libsecp256k1" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79019718125edc905a079a70cfa5f3820bc76139fc91d6f9abc27ea2a887139" +dependencies = [ + "arrayref", + "base64 0.22.1", + "digest 0.9.0", + "libsecp256k1-core", + "libsecp256k1-gen-ecmult", + "libsecp256k1-gen-genmult", + "rand 0.8.5", + "serde", + "sha2 0.9.9", +] + +[[package]] +name = "libsecp256k1-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" +dependencies = [ + "crunchy", + "digest 0.9.0", + "subtle", +] + +[[package]] +name = "libsecp256k1-gen-ecmult" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809" +dependencies = [ + "libsecp256k1-core", +] + +[[package]] +name = "libsecp256k1-gen-genmult" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c" +dependencies = [ + "libsecp256k1-core", +] + [[package]] name = "libsqlite3-sys" version = "0.30.1" @@ -3109,9 +3724,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.9.4" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "litemap" @@ -3153,6 +3774,12 @@ dependencies = [ "hashbrown 0.15.5", ] +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + [[package]] name = "macro-string" version = "0.1.4" @@ -3189,6 +3816,28 @@ version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +[[package]] +name = "metrics" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dea7ac8057892855ec285c440160265225438c3c45072613c25a4b26e98ef5" +dependencies = [ + "ahash", + "portable-atomic", +] + +[[package]] +name = "metrics-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3dbdd96ed57d565ec744cba02862d707acf373c5772d152abae6ec5c4e24f6c" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 2.0.106", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -3252,10 +3901,24 @@ dependencies = [ ] [[package]] -name = "num-bigint" -version = "0.4.6" +name = "num" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -3278,6 +3941,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + [[package]] name = "num-conv" version = "0.1.0" @@ -3304,6 +3976,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -3348,9 +4031,9 @@ dependencies = [ [[package]] name = "nybbles" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63cb50036b1ad148038105af40aaa70ff24d8a14fbc44ae5c914e1348533d12e" +checksum = "bfa11e84403164a9f12982ab728f3c67c6fd4ab5b5f0254ffc217bdbd3b28ab0" dependencies = [ "alloy-rlp", "cfg-if", @@ -3374,6 +4057,10 @@ name = "once_cell" version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +dependencies = [ + "critical-section", + "portable-atomic", +] [[package]] name = "once_cell_polyfill" @@ -3381,6 +4068,20 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" +[[package]] +name = "op-alloy-consensus" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9ade20c592484ba1ea538006e0454284174447a3adf9bb59fa99ed512f95493" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "derive_more", + "thiserror", +] + [[package]] name = "op-alloy-consensus" version = "0.20.0" @@ -3389,12 +4090,68 @@ checksum = "3a501241474c3118833d6195312ae7eb7cc90bbb0d5f524cbb0b06619e49ff67" dependencies = [ "alloy-consensus", "alloy-eips", + "alloy-network", "alloy-primitives", "alloy-rlp", + "alloy-rpc-types-eth", + "alloy-serde", + "derive_more", + "serde", + "thiserror", +] + +[[package]] +name = "op-alloy-network" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f80108e3b36901200a4c5df1db1ee9ef6ce685b59ea79d7be1713c845e3765da" +dependencies = [ + "alloy-consensus", + "alloy-network", + "alloy-primitives", + "alloy-provider", + "alloy-rpc-types-eth", + "alloy-signer", + "op-alloy-consensus 0.20.0", + "op-alloy-rpc-types", +] + +[[package]] +name = "op-alloy-rpc-types" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "753d6f6b03beca1ba9cbd344c05fee075a2ce715ee9d61981c10b9c764a824a2" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", "derive_more", + "op-alloy-consensus 0.20.0", + "serde", + "serde_json", "thiserror", ] +[[package]] +name = "op-revm" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ba21d705bbbfc947a423cba466d75e4af0c7d43ee89ba0a0f1cfa04963cede9" +dependencies = [ + "auto_impl", + "revm", + "serde", +] + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + [[package]] name = "openssl" version = "0.10.73" @@ -3453,7 +4210,19 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2", + "sha2 0.10.9", +] + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa 0.16.9", + "elliptic-curve 0.13.8", + "primeorder", + "sha2 0.10.9", ] [[package]] @@ -3561,15 +4330,58 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" +checksum = "21e0a3a33733faeaf8651dfee72dd0f388f0c8e5ad496a3478fa5a922f49cfa8" dependencies = [ "memchr", "thiserror", "ucd-trie", ] +[[package]] +name = "phf" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +dependencies = [ + "phf_macros", + "phf_shared", + "serde", +] + +[[package]] +name = "phf_generator" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +dependencies = [ + "phf_shared", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "phf_shared" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" version = "1.1.10" @@ -3639,6 +4451,12 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +[[package]] +name = "portable-atomic" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + [[package]] name = "potential_utf" version = "0.1.3" @@ -3673,6 +4491,15 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve 0.13.8", +] + [[package]] name = "primitive-types" version = "0.12.2" @@ -3686,9 +4513,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" +checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" dependencies = [ "toml_edit", ] @@ -3750,6 +4577,61 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quinn" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +dependencies = [ + "bytes", + "cfg_aliases", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.1.1", + "rustls 0.23.31", + "socket2 0.6.0", + "thiserror", + "tokio", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-proto" +version = "0.11.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +dependencies = [ + "bytes", + "getrandom 0.3.3", + "lru-slab", + "rand 0.9.2", + "ring", + "rustc-hash 2.1.1", + "rustls 0.23.31", + "rustls-pki-types", + "slab", + "thiserror", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2 0.6.0", + "tracing", + "windows-sys 0.60.2", +] + [[package]] name = "quote" version = "1.0.40" @@ -3842,6 +4724,26 @@ dependencies = [ "rand_core 0.9.3", ] +[[package]] +name = "rayon" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "rdkafka" version = "0.37.0" @@ -3923,62 +4825,886 @@ dependencies = [ ] [[package]] -name = "regex-automata" -version = "0.4.10" +name = "regex-automata" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-lite" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "943f41321c63ef1c92fd763bfe054d2668f7f225a5c29f0105903dc2fc04ba30" + +[[package]] +name = "regex-syntax" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" + +[[package]] +name = "reqwest" +version = "0.12.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.7.0", + "hyper-rustls 0.27.7", + "hyper-tls", + "hyper-util", + "js-sys", + "log", + "native-tls", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls 0.23.31", + "rustls-native-certs 0.8.1", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-native-tls", + "tokio-rustls 0.26.3", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "reth-chain-state" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "derive_more", + "metrics", + "parking_lot", + "pin-project", + "reth-chainspec", + "reth-errors", + "reth-ethereum-primitives", + "reth-execution-types", + "reth-metrics", + "reth-primitives-traits", + "reth-storage-api", + "reth-trie", + "revm-database", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "reth-chainspec" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-genesis", + "alloy-primitives", + "alloy-trie", + "auto_impl", + "derive_more", + "reth-ethereum-forks", + "reth-network-peers", + "reth-primitives-traits", + "serde_json", +] + +[[package]] +name = "reth-codecs-derive" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "reth-consensus" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "auto_impl", + "reth-execution-types", + "reth-primitives-traits", + "thiserror", +] + +[[package]] +name = "reth-db-models" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "reth-primitives-traits", +] + +[[package]] +name = "reth-errors" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "reth-consensus", + "reth-execution-errors", + "reth-storage-errors", + "thiserror", +] + +[[package]] +name = "reth-eth-wire-types" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-hardforks", + "alloy-primitives", + "alloy-rlp", + "bytes", + "derive_more", + "reth-chainspec", + "reth-codecs-derive", + "reth-ethereum-primitives", + "reth-primitives-traits", + "serde", + "thiserror", +] + +[[package]] +name = "reth-ethereum-forks" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-eip2124", + "alloy-hardforks", + "alloy-primitives", + "auto_impl", + "once_cell", + "rustc-hash 2.1.1", +] + +[[package]] +name = "reth-ethereum-primitives" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "reth-primitives-traits", + "reth-zstd-compressors", + "serde", + "serde_with", +] + +[[package]] +name = "reth-evm" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-primitives", + "auto_impl", + "derive_more", + "futures-util", + "reth-execution-errors", + "reth-execution-types", + "reth-primitives-traits", + "reth-storage-api", + "reth-storage-errors", + "reth-trie-common", + "revm", +] + +[[package]] +name = "reth-execution-errors" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-evm", + "alloy-primitives", + "alloy-rlp", + "nybbles", + "reth-storage-errors", + "thiserror", +] + +[[package]] +name = "reth-execution-types" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-primitives", + "derive_more", + "reth-ethereum-primitives", + "reth-primitives-traits", + "reth-trie-common", + "revm", + "serde", + "serde_with", +] + +[[package]] +name = "reth-fs-util" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "reth-metrics" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "metrics", + "metrics-derive", +] + +[[package]] +name = "reth-net-banlist" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-primitives", +] + +[[package]] +name = "reth-network-api" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-rpc-types-admin", + "alloy-rpc-types-eth", + "auto_impl", + "derive_more", + "enr", + "futures", + "reth-eth-wire-types", + "reth-ethereum-forks", + "reth-network-p2p", + "reth-network-peers", + "reth-network-types", + "reth-tokio-util", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "reth-network-p2p" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "auto_impl", + "derive_more", + "futures", + "reth-consensus", + "reth-eth-wire-types", + "reth-ethereum-primitives", + "reth-network-peers", + "reth-network-types", + "reth-primitives-traits", + "reth-storage-errors", + "tokio", + "tracing", +] + +[[package]] +name = "reth-network-peers" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "secp256k1 0.30.0", + "serde_with", + "thiserror", + "url", +] + +[[package]] +name = "reth-network-types" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-eip2124", + "reth-net-banlist", + "reth-network-peers", + "serde_json", + "tracing", +] + +[[package]] +name = "reth-primitives-traits" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-eth", + "alloy-trie", + "auto_impl", + "bytes", + "derive_more", + "once_cell", + "op-alloy-consensus 0.19.1", + "revm-bytecode", + "revm-primitives", + "revm-state", + "secp256k1 0.30.0", + "serde", + "serde_with", + "thiserror", +] + +[[package]] +name = "reth-prune-types" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-primitives", + "derive_more", + "serde", + "thiserror", +] + +[[package]] +name = "reth-revm" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-primitives", + "reth-primitives-traits", + "reth-storage-api", + "reth-storage-errors", + "revm", +] + +[[package]] +name = "reth-rpc-convert" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-json-rpc", + "alloy-network", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-signer", + "jsonrpsee-types", + "reth-ethereum-primitives", + "reth-evm", + "reth-primitives-traits", + "revm-context", + "thiserror", +] + +[[package]] +name = "reth-rpc-eth-types" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-network", + "alloy-primitives", + "alloy-rpc-client", + "alloy-rpc-types-eth", + "alloy-sol-types", + "alloy-transport", + "derive_more", + "futures", + "itertools 0.14.0", + "jsonrpsee-core", + "jsonrpsee-types", + "metrics", + "rand 0.9.2", + "reqwest", + "reth-chain-state", + "reth-chainspec", + "reth-errors", + "reth-ethereum-primitives", + "reth-evm", + "reth-execution-types", + "reth-metrics", + "reth-primitives-traits", + "reth-revm", + "reth-rpc-convert", + "reth-rpc-server-types", + "reth-storage-api", + "reth-tasks", + "reth-transaction-pool", + "reth-trie", + "revm", + "revm-inspectors", + "schnellru", + "serde", + "thiserror", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "reth-rpc-server-types" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "jsonrpsee-core", + "jsonrpsee-types", + "reth-errors", + "reth-network-api", + "serde", + "strum", +] + +[[package]] +name = "reth-stages-types" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-primitives", + "reth-trie-common", +] + +[[package]] +name = "reth-static-file-types" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-primitives", + "derive_more", + "serde", + "strum", +] + +[[package]] +name = "reth-storage-api" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "auto_impl", + "reth-chainspec", + "reth-db-models", + "reth-ethereum-primitives", + "reth-execution-types", + "reth-primitives-traits", + "reth-prune-types", + "reth-stages-types", + "reth-storage-errors", + "reth-trie-common", + "revm-database", +] + +[[package]] +name = "reth-storage-errors" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "derive_more", + "reth-primitives-traits", + "reth-prune-types", + "reth-static-file-types", + "revm-database-interface", + "thiserror", +] + +[[package]] +name = "reth-tasks" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "auto_impl", + "dyn-clone", + "futures-util", + "metrics", + "reth-metrics", + "thiserror", + "tokio", + "tracing", + "tracing-futures", +] + +[[package]] +name = "reth-tokio-util" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "reth-transaction-pool" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "aquamarine", + "auto_impl", + "bitflags 2.9.4", + "futures-util", + "metrics", + "parking_lot", + "pin-project", + "reth-chain-state", + "reth-chainspec", + "reth-eth-wire-types", + "reth-ethereum-primitives", + "reth-execution-types", + "reth-fs-util", + "reth-metrics", + "reth-primitives-traits", + "reth-storage-api", + "reth-tasks", + "revm-interpreter", + "revm-primitives", + "rustc-hash 2.1.1", + "schnellru", + "serde", + "serde_json", + "smallvec", + "thiserror", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "reth-trie" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-trie", + "auto_impl", + "itertools 0.14.0", + "reth-execution-errors", + "reth-primitives-traits", + "reth-stages-types", + "reth-storage-errors", + "reth-trie-common", + "reth-trie-sparse", + "revm-database", + "tracing", +] + +[[package]] +name = "reth-trie-common" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-trie", + "bytes", + "derive_more", + "itertools 0.14.0", + "nybbles", + "rayon", + "reth-primitives-traits", + "revm-database", + "serde", + "serde_with", +] + +[[package]] +name = "reth-trie-sparse" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "alloy-trie", + "auto_impl", + "reth-execution-errors", + "reth-primitives-traits", + "reth-trie-common", + "smallvec", + "tracing", +] + +[[package]] +name = "reth-zstd-compressors" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "zstd", +] + +[[package]] +name = "revm" +version = "29.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c278b6ee9bba9e25043e3fae648fdce632d1944d3ba16f5203069b43bddd57f" +dependencies = [ + "revm-bytecode", + "revm-context", + "revm-context-interface", + "revm-database", + "revm-database-interface", + "revm-handler", + "revm-inspector", + "revm-interpreter", + "revm-precompile", + "revm-primitives", + "revm-state", +] + +[[package]] +name = "revm-bytecode" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66c52031b73cae95d84cd1b07725808b5fd1500da3e5e24574a3b2dc13d9f16d" +dependencies = [ + "bitvec", + "phf", + "revm-primitives", + "serde", +] + +[[package]] +name = "revm-context" +version = "9.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fb02c5dab3b535aa5b18277b1d21c5117a25d42af717e6ce133df0ea56663e1" +dependencies = [ + "bitvec", + "cfg-if", + "derive-where", + "revm-bytecode", + "revm-context-interface", + "revm-database-interface", + "revm-primitives", + "revm-state", + "serde", +] + +[[package]] +name = "revm-context-interface" +version = "10.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b8e9311d27cf75fbf819e7ba4ca05abee1ae02e44ff6a17301c7ab41091b259" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702", + "auto_impl", + "either", + "revm-database-interface", + "revm-primitives", + "revm-state", + "serde", +] + +[[package]] +name = "revm-database" +version = "7.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a276ed142b4718dcf64bc9624f474373ed82ef20611025045c3fb23edbef9c" +dependencies = [ + "alloy-eips", + "revm-bytecode", + "revm-database-interface", + "revm-primitives", + "revm-state", + "serde", +] + +[[package]] +name = "revm-database-interface" +version = "7.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c523c77e74eeedbac5d6f7c092e3851dbe9c7fec6f418b85992bd79229db361" +dependencies = [ + "auto_impl", + "either", + "revm-primitives", + "revm-state", + "serde", +] + +[[package]] +name = "revm-handler" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528d2d81cc918d311b8231c35330fac5fba8b69766ddc538833e2b5593ee016e" +dependencies = [ + "auto_impl", + "derive-where", + "revm-bytecode", + "revm-context", + "revm-context-interface", + "revm-database-interface", + "revm-interpreter", + "revm-precompile", + "revm-primitives", + "revm-state", + "serde", +] + +[[package]] +name = "revm-inspector" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf443b664075999a14916b50c5ae9e35a7d71186873b8f8302943d50a672e5e0" +dependencies = [ + "auto_impl", + "either", + "revm-context", + "revm-database-interface", + "revm-handler", + "revm-interpreter", + "revm-primitives", + "revm-state", + "serde", + "serde_json", +] + +[[package]] +name = "revm-inspectors" +version = "0.29.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fdb678b03faa678a7007a7c761a78efa9ca9adcd9434ef3d1ad894aec6e43d1" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-rpc-types-trace", + "alloy-sol-types", + "anstyle", + "colorchoice", + "revm", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "revm-interpreter" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" +checksum = "53d6406b711fac73b4f13120f359ed8e65964380dd6182bd12c4c09ad0d4641f" dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", + "revm-bytecode", + "revm-context-interface", + "revm-primitives", + "serde", ] [[package]] -name = "regex-lite" -version = "0.1.7" +name = "revm-precompile" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943f41321c63ef1c92fd763bfe054d2668f7f225a5c29f0105903dc2fc04ba30" +checksum = "25b57d4bd9e6b5fe469da5452a8a137bc2d030a3cd47c46908efc615bbc699da" +dependencies = [ + "ark-bls12-381", + "ark-bn254", + "ark-ec", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", + "arrayref", + "aurora-engine-modexp", + "c-kzg", + "cfg-if", + "k256", + "libsecp256k1", + "p256 0.13.2", + "revm-primitives", + "ripemd", + "rug", + "secp256k1 0.31.1", + "sha2 0.10.9", +] [[package]] -name = "regex-syntax" -version = "0.8.6" +name = "revm-primitives" +version = "20.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" +checksum = "5aa29d9da06fe03b249b6419b33968ecdf92ad6428e2f012dc57bcd619b5d94e" +dependencies = [ + "alloy-primitives", + "num_enum", + "once_cell", + "serde", +] [[package]] -name = "reqwest" -version = "0.12.23" +name = "revm-state" +version = "7.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" +checksum = "1f64fbacb86008394aaebd3454f9643b7d5a782bd251135e17c5b33da592d84d" dependencies = [ - "base64 0.22.1", - "bytes", - "futures-core", - "http 1.3.1", - "http-body 1.0.1", - "http-body-util", - "hyper 1.7.0", - "hyper-tls", - "hyper-util", - "js-sys", - "log", - "native-tls", - "percent-encoding", - "pin-project-lite", - "rustls-pki-types", + "bitflags 2.9.4", + "revm-bytecode", + "revm-primitives", "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-native-tls", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", ] [[package]] @@ -4016,6 +5742,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "ripemd" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "rlp" version = "0.5.2" @@ -4026,6 +5761,12 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "route-recognizer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" + [[package]] name = "rsa" version = "0.9.8" @@ -4046,6 +5787,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rug" +version = "1.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58ad2e973fe3c3214251a840a621812a4f40468da814b1a3d6947d433c2af11f" +dependencies = [ + "az", + "gmp-mpfr-sys", + "libc", + "libm", +] + [[package]] name = "ruint" version = "1.16.0" @@ -4085,11 +5838,20 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc-hash" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" +dependencies = [ + "rand 0.8.5", +] [[package]] name = "rustc-hex" @@ -4112,20 +5874,33 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.26", + "semver 1.0.27", ] [[package]] name = "rustix" -version = "1.0.8" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ "bitflags 2.9.4", "errno", "libc", - "linux-raw-sys", - "windows-sys 0.60.2", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +dependencies = [ + "bitflags 2.9.4", + "errno", + "libc", + "linux-raw-sys 0.11.0", + "windows-sys 0.61.0", ] [[package]] @@ -4203,6 +5978,7 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" dependencies = [ + "web-time", "zeroize", ] @@ -4254,11 +6030,11 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "schannel" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.0", ] [[package]] @@ -4285,6 +6061,17 @@ dependencies = [ "serde_json", ] +[[package]] +name = "schnellru" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "356285bbf17bea63d9e52e96bd18f039672ac92b55b8cb997d6162a2a37d1649" +dependencies = [ + "ahash", + "cfg-if", + "hashbrown 0.13.2", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -4338,10 +6125,21 @@ checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ "bitcoin_hashes", "rand 0.8.5", - "secp256k1-sys", + "secp256k1-sys 0.10.1", "serde", ] +[[package]] +name = "secp256k1" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2" +dependencies = [ + "bitcoin_hashes", + "rand 0.9.2", + "secp256k1-sys 0.11.0", +] + [[package]] name = "secp256k1-sys" version = "0.10.1" @@ -4351,6 +6149,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -4398,9 +6205,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" [[package]] name = "semver-parser" @@ -4443,14 +6250,16 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.143" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ + "indexmap 2.11.4", "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -4486,7 +6295,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.11.0", + "indexmap 2.11.4", "schemars 0.9.0", "schemars 1.0.4", "serde", @@ -4529,6 +6338,19 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + [[package]] name = "sha2" version = "0.10.9" @@ -4604,6 +6426,12 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "slab" version = "0.4.11" @@ -4639,6 +6467,22 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "soketto" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e859df029d160cb88608f5d7df7fb4753fd20fdfb4de5644f3d8b8440841721" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures", + "http 1.3.1", + "httparse", + "log", + "rand 0.8.5", + "sha1", +] + [[package]] name = "spin" version = "0.9.8" @@ -4700,7 +6544,7 @@ dependencies = [ "futures-util", "hashbrown 0.15.5", "hashlink", - "indexmap 2.11.0", + "indexmap 2.11.4", "log", "memchr", "native-tls", @@ -4708,7 +6552,7 @@ dependencies = [ "percent-encoding", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "smallvec", "thiserror", "tokio", @@ -4746,7 +6590,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -4790,7 +6634,7 @@ dependencies = [ "rsa", "serde", "sha1", - "sha2", + "sha2 0.10.9", "smallvec", "sqlx-core", "stringprep", @@ -4829,7 +6673,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "smallvec", "sqlx-core", "stringprep", @@ -5006,15 +6850,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.21.0" +version = "3.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e" +checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53" dependencies = [ "fastrand", "getrandom 0.3.3", "once_cell", - "rustix", - "windows-sys 0.60.2", + "rustix 1.1.2", + "windows-sys 0.61.0", ] [[package]] @@ -5095,11 +6939,12 @@ dependencies = [ [[package]] name = "time" -version = "0.3.43" +version = "0.3.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ "deranged", + "itoa", "num-conv", "powerfmt", "serde", @@ -5173,7 +7018,7 @@ dependencies = [ "bytes", "clap", "dotenvy", - "op-alloy-consensus", + "op-alloy-consensus 0.20.0", "rdkafka", "serde", "serde_json", @@ -5181,7 +7026,7 @@ dependencies = [ "testcontainers-modules", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.3.20", "uuid", ] @@ -5195,7 +7040,7 @@ dependencies = [ "anyhow", "async-trait", "eyre", - "op-alloy-consensus", + "op-alloy-consensus 0.20.0", "sqlx", "testcontainers", "testcontainers-modules", @@ -5204,6 +7049,31 @@ dependencies = [ "uuid", ] +[[package]] +name = "tips-ingress" +version = "0.1.0" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-provider", + "alloy-rpc-types-mev", + "anyhow", + "clap", + "dotenvy", + "eyre", + "jsonrpsee", + "op-alloy-consensus 0.20.0", + "op-alloy-network", + "rdkafka", + "reth-rpc-eth-types", + "tips-audit", + "tips-datastore", + "tokio", + "tracing", + "tracing-subscriber 0.3.20", + "url", +] + [[package]] name = "tokio" version = "1.47.1" @@ -5257,9 +7127,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" +checksum = "05f63835928ca123f1bef57abbcd23bb2ba0ac9ae1235f1e65bda0d06e7786bd" dependencies = [ "rustls 0.23.31", "tokio", @@ -5300,6 +7170,7 @@ checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" dependencies = [ "bytes", "futures-core", + "futures-io", "futures-sink", "pin-project-lite", "tokio", @@ -5307,18 +7178,31 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1" +dependencies = [ + "serde_core", +] [[package]] name = "toml_edit" -version = "0.22.27" +version = "0.23.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +checksum = "f3effe7c0e86fdff4f69cdd2ccc1b96f933e24811c5441d44904e8683e27184b" dependencies = [ - "indexmap 2.11.0", + "indexmap 2.11.4", "toml_datetime", + "toml_parser", + "winnow", +] + +[[package]] +name = "toml_parser" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627" +dependencies = [ "winnow", ] @@ -5400,6 +7284,16 @@ dependencies = [ "valuable", ] +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + [[package]] name = "tracing-log" version = "0.2.0" @@ -5411,6 +7305,15 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-subscriber" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" +dependencies = [ + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.3.20" @@ -5473,9 +7376,9 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" [[package]] name = "unicode-normalization" @@ -5492,6 +7395,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + [[package]] name = "unicode-xid" version = "0.2.6" @@ -5596,9 +7505,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasi" -version = "0.14.4+wasi-0.2.4" +version = "0.14.7+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" +dependencies = [ + "wasip2", +] + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a5f4a424faf49c3c2c344f166f0662341d470ea185e939657aaff130f0ec4a" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ "wit-bindgen", ] @@ -5611,9 +7529,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.101" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b" +checksum = "ab10a69fbd0a177f5f649ad4d8d3305499c42bab9aef2f7ff592d0ec8f833819" dependencies = [ "cfg-if", "once_cell", @@ -5624,9 +7542,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.101" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb" +checksum = "0bb702423545a6007bbc368fde243ba47ca275e549c8a28617f56f6ba53b1d1c" dependencies = [ "bumpalo", "log", @@ -5638,9 +7556,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.51" +version = "0.4.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca85039a9b469b38336411d6d6ced91f3fc87109a2a27b0c197663f5144dffe" +checksum = "a0b221ff421256839509adbb55998214a70d829d3a28c69b4a6672e9d2a42f67" dependencies = [ "cfg-if", "js-sys", @@ -5651,9 +7569,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.101" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d" +checksum = "fc65f4f411d91494355917b605e1480033152658d71f722a90647f56a70c88a0" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5661,9 +7579,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.101" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa" +checksum = "ffc003a991398a8ee604a401e194b6b3a39677b3173d6e74495eb51b82e99a32" dependencies = [ "proc-macro2", "quote", @@ -5674,9 +7592,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.101" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1" +checksum = "293c37f4efa430ca14db3721dfbe48d8c33308096bd44d80ebaa775ab71ba1cf" dependencies = [ "unicode-ident", ] @@ -5697,14 +7615,36 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.78" +version = "0.3.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbe734895e869dc429d78c4b433f8d17d95f8d05317440b4fad5ab2d33e596dc" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e4b637749ff0d92b8fad63aa1f7cff3cbe125fd49c175cd6345e7272638b12" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", ] +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.44", +] + [[package]] name = "whoami" version = "1.6.1" @@ -5739,13 +7679,13 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.61.2" +version = "0.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +checksum = "57fe7168f7de578d2d8a05b07fd61870d2e73b4020e9f49aa00da8471723497c" dependencies = [ "windows-implement", "windows-interface", - "windows-link 0.1.3", + "windows-link 0.2.0", "windows-result", "windows-strings", ] @@ -5786,20 +7726,20 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" [[package]] name = "windows-result" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" dependencies = [ - "windows-link 0.1.3", + "windows-link 0.2.0", ] [[package]] name = "windows-strings" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" dependencies = [ - "windows-link 0.1.3", + "windows-link 0.2.0", ] [[package]] @@ -5838,6 +7778,15 @@ dependencies = [ "windows-targets 0.53.3", ] +[[package]] +name = "windows-sys" +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa" +dependencies = [ + "windows-link 0.2.0", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -6035,9 +7984,9 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.45.1" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "writeable" @@ -6061,7 +8010,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909" dependencies = [ "libc", - "rustix", + "rustix 1.1.2", ] [[package]] @@ -6187,3 +8136,31 @@ dependencies = [ "quote", "syn 2.0.106", ] + +[[package]] +name = "zstd" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.16+zstd.1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/Cargo.toml b/Cargo.toml index 79da4a8..5a784e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,28 +1,30 @@ [workspace] -members = ["crates/datastore", "crates/audit"] +members = ["crates/datastore", "crates/audit", "crates/ingress"] resolver = "2" [workspace.dependencies] tips-datastore = { path = "crates/datastore" } tips-audit = { path = "crates/audit" } -jsonrpsee = { version = "0.26.0", features = ["server", "macros"] } + +# Reth +reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" } # alloy alloy-primitives = { version = "1.3.1", default-features = false, features = [ "map-foldhash", "serde", ] } -alloy-rpc-types = { version = "1.0.32", default-features = false } -alloy-consensus = { version = "1.0.32" } -alloy-provider = { version = "1.0.32" } -alloy-rpc-client = { version = "1.0.32" } -alloy-rpc-types-mev = "1.0.32" -alloy-transport-http = "1.0.32" +alloy-rpc-types = { version = "1.0.30", default-features = false } +alloy-consensus = { version = "1.0.30" } +alloy-provider = { version = "1.0.30" } +alloy-rpc-client = { version = "1.0.30" } +alloy-rpc-types-mev = "1.0.30" +alloy-transport-http = "1.0.30" alloy-rlp = "0.3.12" # op-alloy -op-alloy-rpc-types = { version = "0.20.0" } op-alloy-consensus = { version = "0.20.0", features = ["k256"] } op-alloy-network = {version = "0.20.0"} @@ -41,14 +43,13 @@ sqlx = { version = "0.8.6", features = [ ]} uuid = { version = "1.18.1", features = ["v4", "serde"] } serde = { version = "1.0.219", features = ["derive"] } -chrono = { version = "0.4.42", features = ["serde"] } eyre = "0.6.12" async-trait = "0.1.89" serde_json = "1.0.143" dotenvy = "0.15.7" testcontainers = { version = "0.23.1", features = ["blocking"] } testcontainers-modules = { version = "0.11.2", features = ["postgres", "kafka", "minio"] } -futures-util = "0.3.31" +jsonrpsee = { version = "0.26.0", features = ["server", "macros"] } # Kafka and S3 dependencies rdkafka = { version = "0.37.0", features = ["libz-static"] } @@ -56,5 +57,3 @@ aws-config = "1.1.7" aws-sdk-s3 = "1.106.0" aws-credential-types = "1.1.7" bytes = { version = "1.8.0", features = ["serde"] } -md5 = "0.7.0" -base64 = "0.22.1" diff --git a/README.md b/README.md index 99f43d2..0904de9 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,6 @@ Event streaming and archival system that: - Provides an API to publish bundle events to Kafka - Archives bundle history to S3 for long-term storage - See [S3 Storage Format](docs/AUDIT_S3_FORMAT.md) for data structure details + +### 🔌 Ingress (`crates/ingress`) +The main entry point that provides a JSON-RPC API for receiving transactions and bundles. diff --git a/crates/ingress/Cargo.toml b/crates/ingress/Cargo.toml new file mode 100644 index 0000000..e346380 --- /dev/null +++ b/crates/ingress/Cargo.toml @@ -0,0 +1,29 @@ +[package] +name = "tips-ingress" +version = "0.1.0" +edition = "2024" + +[[bin]] +name = "tips-ingress" +path = "src/main.rs" + +[dependencies] +tips-datastore.workspace = true +tips-audit.workspace = true +jsonrpsee.workspace = true +alloy-rpc-types-mev.workspace = true +alloy-primitives.workspace = true +op-alloy-network.workspace = true +alloy-provider.workspace = true +tokio.workspace = true +tracing.workspace = true +tracing-subscriber.workspace = true +anyhow.workspace = true +clap.workspace = true +url.workspace = true +alloy-consensus.workspace = true +op-alloy-consensus.workspace = true +eyre.workspace = true +dotenvy.workspace = true +rdkafka.workspace = true +reth-rpc-eth-types.workspace = true \ No newline at end of file diff --git a/crates/ingress/src/main.rs b/crates/ingress/src/main.rs new file mode 100644 index 0000000..c38ab8b --- /dev/null +++ b/crates/ingress/src/main.rs @@ -0,0 +1,120 @@ +use alloy_provider::{ProviderBuilder, RootProvider}; +use clap::Parser; +use jsonrpsee::server::Server; +use op_alloy_network::Optimism; +use rdkafka::ClientConfig; +use rdkafka::producer::FutureProducer; +use std::net::IpAddr; +use tips_audit::KafkaMempoolEventPublisher; +use tracing::{info, warn}; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; +use url::Url; + +mod service; +use service::{IngressApiServer, IngressService}; +use tips_datastore::PostgresDatastore; + +#[derive(Parser, Debug)] +#[command(author, version, about, long_about = None)] +struct Config { + /// Address to bind the RPC server to + #[arg(long, env = "TIPS_INGRESS_ADDRESS", default_value = "127.0.0.1")] + address: IpAddr, + + /// Port to bind the RPC server to + #[arg(long, env = "TIPS_INGRESS_PORT", default_value = "8080")] + port: u16, + + /// URL of the mempool service to proxy transactions to + #[arg(long, env = "TIPS_INGRESS_RPC_MEMPOOL")] + mempool_url: Url, + + /// URL of the Postgres DB to store bundles in + #[arg(long, env = "TIPS_INGRESS_DATABASE_URL")] + database_url: String, + + /// Enable dual writing raw transactions to the mempool + #[arg(long, env = "TIPS_INGRESS_DUAL_WRITE_MEMPOOL", default_value = "false")] + dual_write_mempool: bool, + + /// Kafka brokers for publishing mempool events + #[arg(long, env = "TIPS_INGRESS_KAFKA_BROKERS")] + kafka_brokers: String, + + /// Kafka topic for publishing mempool events + #[arg( + long, + env = "TIPS_INGRESS_KAFKA_TOPIC", + default_value = "mempool-events" + )] + kafka_topic: String, + + #[arg(long, env = "TIPS_INGRESS_LOG_LEVEL", default_value = "info")] + log_level: String, +} + +#[tokio::main] +async fn main() -> anyhow::Result<()> { + dotenvy::dotenv().ok(); + + let config = Config::parse(); + + let log_level = match config.log_level.to_lowercase().as_str() { + "trace" => tracing::Level::TRACE, + "debug" => tracing::Level::DEBUG, + "info" => tracing::Level::INFO, + "warn" => tracing::Level::WARN, + "error" => tracing::Level::ERROR, + _ => { + warn!( + "Invalid log level '{}', defaulting to 'info'", + config.log_level + ); + tracing::Level::INFO + } + }; + + tracing_subscriber::registry() + .with( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())), + ) + .with(tracing_subscriber::fmt::layer()) + .init(); + info!( + message = "Starting ingress service", + address = %config.address, + port = config.port, + mempool_url = %config.mempool_url + ); + + let provider: RootProvider = ProviderBuilder::new() + .disable_recommended_fillers() + .network::() + .connect_http(config.mempool_url); + + let bundle_store = PostgresDatastore::connect(config.database_url).await?; + bundle_store.run_migrations().await?; + + let kafka_producer: FutureProducer = ClientConfig::new() + .set("bootstrap.servers", &config.kafka_brokers) + .set("message.timeout.ms", "5000") + .create()?; + + let publisher = KafkaMempoolEventPublisher::new(kafka_producer, config.kafka_topic); + + let service = IngressService::new(provider, bundle_store, config.dual_write_mempool, publisher); + let bind_addr = format!("{}:{}", config.address, config.port); + + let server = Server::builder().build(&bind_addr).await?; + let addr = server.local_addr()?; + let handle = server.start(service.into_rpc()); + + info!( + message = "Ingress RPC server started", + address = %addr + ); + + handle.stopped().await; + Ok(()) +} diff --git a/crates/ingress/src/service.rs b/crates/ingress/src/service.rs new file mode 100644 index 0000000..84ce628 --- /dev/null +++ b/crates/ingress/src/service.rs @@ -0,0 +1,142 @@ +use alloy_consensus::transaction::SignerRecoverable; +use alloy_primitives::{B256, Bytes}; +use alloy_provider::network::eip2718::Decodable2718; +use alloy_provider::{Provider, RootProvider}; +use alloy_rpc_types_mev::{EthBundleHash, EthCancelBundle, EthSendBundle}; +use jsonrpsee::types::ErrorObject; +use jsonrpsee::{ + core::{RpcResult, async_trait}, + proc_macros::rpc, +}; +use op_alloy_consensus::OpTxEnvelope; +use op_alloy_network::Optimism; +use reth_rpc_eth_types::EthApiError; +use tips_audit::{MempoolEvent, MempoolEventPublisher}; +use tips_datastore::BundleDatastore; +use tracing::{info, warn}; + +#[rpc(server, namespace = "eth")] +pub trait IngressApi { + /// `eth_sendBundle` can be used to send your bundles to the builder. + #[method(name = "sendBundle")] + async fn send_bundle(&self, bundle: EthSendBundle) -> RpcResult; + + /// `eth_cancelBundle` is used to prevent a submitted bundle from being included on-chain. + #[method(name = "cancelBundle")] + async fn cancel_bundle(&self, request: EthCancelBundle) -> RpcResult<()>; + + /// Handler for: `eth_sendRawTransaction` + #[method(name = "sendRawTransaction")] + async fn send_raw_transaction(&self, tx: Bytes) -> RpcResult; +} + +pub struct IngressService { + provider: RootProvider, + datastore: Store, + dual_write_mempool: bool, + publisher: Publisher, +} + +impl IngressService { + pub fn new( + provider: RootProvider, + datastore: Store, + dual_write_mempool: bool, + publisher: Publisher, + ) -> Self { + Self { + provider, + datastore, + dual_write_mempool, + publisher, + } + } +} + +#[async_trait] +impl IngressApiServer for IngressService +where + Store: BundleDatastore + Sync + Send + 'static, + Publisher: MempoolEventPublisher + Sync + Send + 'static, +{ + async fn send_bundle(&self, _bundle: EthSendBundle) -> RpcResult { + warn!( + message = "TODO: implement send_bundle", + method = "send_bundle" + ); + todo!("implement send_bundle") + } + + async fn cancel_bundle(&self, _request: EthCancelBundle) -> RpcResult<()> { + warn!( + message = "TODO: implement cancel_bundle", + method = "cancel_bundle" + ); + todo!("implement cancel_bundle") + } + + async fn send_raw_transaction(&self, data: Bytes) -> RpcResult { + if data.is_empty() { + return Err(EthApiError::EmptyRawTransactionData.into_rpc_err()); + } + + let envelope = OpTxEnvelope::decode_2718_exact(data.iter().as_slice()) + .map_err(|_| EthApiError::FailedToDecodeSignedTransaction.into_rpc_err())?; + + let transaction = envelope + .try_into_recovered() + .map_err(|_| EthApiError::FailedToDecodeSignedTransaction.into_rpc_err())?; + + // TODO: Validation and simulation + // TODO: parallelize DB and mempool setup + + let bundle = EthSendBundle { + txs: vec![data.clone()], + block_number: 0, + min_timestamp: None, + max_timestamp: None, + reverting_tx_hashes: vec![transaction.tx_hash()], + ..Default::default() + }; + + let result = self + .datastore + .insert_bundle(bundle.clone()) + .await + .map_err(|_e| ErrorObject::owned(11, "todo", Some(2)))?; + + info!(message="inserted singleton bundle", uuid=%result, txn_hash=%transaction.tx_hash()); + + if let Err(e) = self + .publisher + .publish(MempoolEvent::Created { + bundle_id: result, + bundle, + }) + .await + { + warn!(message = "Failed to publish MempoolEvent::Created", error = %e); + } + + if self.dual_write_mempool { + let response = self + .provider + .send_raw_transaction(data.iter().as_slice()) + .await; + + match response { + Ok(_) => { + info!(message = "sent transaction to the mempool", hash=%transaction.tx_hash()); + } + Err(e) => { + warn!( + message = "Failed to send raw transaction to mempool", + error = %e + ); + } + } + } + + Ok(transaction.tx_hash()) + } +} diff --git a/docker-compose.yml b/docker-compose.yml index 6cff010..2fbd453 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,22 @@ services: + postgres: + image: postgres:16 + container_name: tips-db + environment: + POSTGRES_PASSWORD: postgres + POSTGRES_DB: postgres + POSTGRES_USER: postgres + ports: + - "5432:5432" + volumes: + - ./data/postgres:/var/lib/postgresql/data + - ./docker/init-db.sh:/docker-entrypoint-initdb.d/init-db.sh + - ./crates/datastore/migrations:/migrations + healthcheck: + test: [ "CMD-SHELL", "pg_isready -U postgres" ] + interval: 5s + timeout: 5s + retries: 5 kafka: image: confluentinc/cp-kafka:7.5.0 container_name: tips-kafka diff --git a/justfile b/justfile index 4481d50..507c421 100644 --- a/justfile +++ b/justfile @@ -26,4 +26,7 @@ deps: docker compose down && docker compose rm && docker compose up -d audit: - cargo run --bin tips-audit \ No newline at end of file + cargo run --bin tips-audit + +ingress: + cargo run --bin tips-ingress \ No newline at end of file From 57ef10c2292d6637240006cc9af37c060dd3c708 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Fri, 19 Sep 2025 15:30:19 -0500 Subject: [PATCH 006/117] prototype: Placeholder maintenance job (#4) * prototype: Placeholder maintenance job that moves mined blocks out of the mempool * Readme fix * review feedback --- .env.example | 10 +- Cargo.lock | 32 ++++++ Cargo.toml | 3 +- README.md | 3 + crates/maintenance/Cargo.toml | 25 +++++ crates/maintenance/src/main.rs | 188 +++++++++++++++++++++++++++++++++ justfile | 5 +- 7 files changed, 263 insertions(+), 3 deletions(-) create mode 100644 crates/maintenance/Cargo.toml create mode 100644 crates/maintenance/src/main.rs diff --git a/.env.example b/.env.example index 45d0bb6..fdb4af6 100644 --- a/.env.example +++ b/.env.example @@ -18,4 +18,12 @@ TIPS_AUDIT_S3_CONFIG_TYPE=manual TIPS_AUDIT_S3_ENDPOINT=http://localhost:7000 TIPS_AUDIT_S3_REGION=us-east-1 TIPS_AUDIT_S3_ACCESS_KEY_ID=minioadmin -TIPS_AUDIT_S3_SECRET_ACCESS_KEY=minioadmin \ No newline at end of file +TIPS_AUDIT_S3_SECRET_ACCESS_KEY=minioadmin + +# Maintenance +TIPS_MAINTENANCE_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres +TIPS_MAINTENANCE_RPC_NODE=http://localhost:2222 +TIPS_MAINTENANCE_KAFKA_BROKERS=localhost:9092 +TIPS_MAINTENANCE_KAFKA_TOPIC=tips-audit +TIPS_MAINTENANCE_POLL_INTERVAL_MS=250 +TIPS_MAINTENANCE_LOG_LEVEL=info \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 4bccb7a..9c3376c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -381,6 +381,17 @@ dependencies = [ "wasmtimer", ] +[[package]] +name = "alloy-rpc-types" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c079797bbda28d6a5a2e89bcbf788bf85b4ae2a4f0e57eed9e2d66637fe78c58" +dependencies = [ + "alloy-primitives", + "alloy-serde", + "serde", +] + [[package]] name = "alloy-rpc-types-admin" version = "1.0.33" @@ -7074,6 +7085,27 @@ dependencies = [ "url", ] +[[package]] +name = "tips-maintenance" +version = "0.1.0" +dependencies = [ + "alloy-primitives", + "alloy-provider", + "alloy-rpc-types", + "anyhow", + "clap", + "dotenvy", + "op-alloy-network", + "rdkafka", + "serde_json", + "tips-audit", + "tips-datastore", + "tokio", + "tracing", + "tracing-subscriber 0.3.20", + "url", +] + [[package]] name = "tokio" version = "1.47.1" diff --git a/Cargo.toml b/Cargo.toml index 5a784e6..e0dd4b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,11 @@ [workspace] -members = ["crates/datastore", "crates/audit", "crates/ingress"] +members = ["crates/datastore", "crates/audit", "crates/ingress", "crates/maintenance"] resolver = "2" [workspace.dependencies] tips-datastore = { path = "crates/datastore" } tips-audit = { path = "crates/audit" } +tips-maintenance = { path = "crates/maintenance" } # Reth diff --git a/README.md b/README.md index 0904de9..cdf290c 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,6 @@ Event streaming and archival system that: ### 🔌 Ingress (`crates/ingress`) The main entry point that provides a JSON-RPC API for receiving transactions and bundles. + +### 🔨 Maintenance (`crates/maintenance`) +A service that maintains the health of the TIPS DataStore, by removing stale or included bundles. diff --git a/crates/maintenance/Cargo.toml b/crates/maintenance/Cargo.toml new file mode 100644 index 0000000..9d7eec6 --- /dev/null +++ b/crates/maintenance/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "tips-maintenance" +version = "0.1.0" +edition = "2024" + +[[bin]] +name = "tips-maintenance" +path = "src/main.rs" + +[dependencies] +tips-datastore.workspace = true +tips-audit.workspace = true +alloy-provider.workspace = true +alloy-primitives.workspace = true +alloy-rpc-types.workspace = true +op-alloy-network.workspace = true +tokio.workspace = true +tracing.workspace = true +tracing-subscriber.workspace = true +anyhow.workspace = true +clap.workspace = true +dotenvy.workspace = true +rdkafka.workspace = true +serde_json.workspace = true +url.workspace = true \ No newline at end of file diff --git a/crates/maintenance/src/main.rs b/crates/maintenance/src/main.rs new file mode 100644 index 0000000..a9c5460 --- /dev/null +++ b/crates/maintenance/src/main.rs @@ -0,0 +1,188 @@ +use alloy_provider::network::TransactionResponse; +use alloy_provider::network::primitives::BlockTransactions; +use alloy_provider::{Provider, ProviderBuilder, RootProvider}; +use anyhow::Result; +use clap::Parser; +use op_alloy_network::Optimism; +use rdkafka::ClientConfig; +use rdkafka::producer::FutureProducer; +use std::time::Duration; +use tips_audit::{KafkaMempoolEventPublisher, MempoolEvent, MempoolEventPublisher}; +use tips_datastore::{BundleDatastore, PostgresDatastore}; +use tokio::time::sleep; +use tracing::{error, info, warn}; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; +use url::Url; + +#[derive(Parser)] +#[command(author, version, about, long_about = None)] +struct Args { + #[arg(long, env = "TIPS_MAINTENANCE_RPC_NODE")] + node_url: Url, + + #[arg(long, env = "TIPS_MAINTENANCE_KAFKA_BROKERS")] + kafka_brokers: String, + + #[arg( + long, + env = "TIPS_MAINTENANCE_KAFKA_TOPIC", + default_value = "mempool-events" + )] + kafka_topic: String, + + #[arg(long, env = "TIPS_MAINTENANCE_DATABASE_URL")] + database_url: String, + + #[arg(long, env = "TIPS_MAINTENANCE_POLL_INTERVAL_MS", default_value = "250")] + poll_interval: u64, + + #[arg(long, env = "TIPS_MAINTENANCE_LOG_LEVEL", default_value = "info")] + log_level: String, +} + +#[tokio::main] +async fn main() -> Result<()> { + dotenvy::dotenv().ok(); + + let args = Args::parse(); + + let log_level = match args.log_level.to_lowercase().as_str() { + "trace" => tracing::Level::TRACE, + "debug" => tracing::Level::DEBUG, + "info" => tracing::Level::INFO, + "warn" => tracing::Level::WARN, + "error" => tracing::Level::ERROR, + _ => { + warn!( + "Invalid log level '{}', defaulting to 'info'", + args.log_level + ); + tracing::Level::INFO + } + }; + + tracing_subscriber::registry() + .with( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())), + ) + .with(tracing_subscriber::fmt::layer()) + .init(); + + info!("Starting maintenance service"); + + let provider: RootProvider = ProviderBuilder::new() + .disable_recommended_fillers() + .network::() + .connect_http(args.node_url); + + let datastore = PostgresDatastore::connect(args.database_url).await?; + + let kafka_producer: FutureProducer = ClientConfig::new() + .set("bootstrap.servers", &args.kafka_brokers) + .set("message.timeout.ms", "5000") + .create()?; + + let publisher = KafkaMempoolEventPublisher::new(kafka_producer, args.kafka_topic); + + let mut last_processed_block: Option = None; + + loop { + match process_new_blocks(&provider, &datastore, &publisher, &mut last_processed_block).await + { + Ok(_) => {} + Err(e) => { + error!(message = "Error processing blocks", error=%e); + } + } + + sleep(Duration::from_millis(args.poll_interval)).await; + } +} + +async fn process_new_blocks( + provider: &impl Provider, + datastore: &PostgresDatastore, + publisher: &KafkaMempoolEventPublisher, + last_processed_block: &mut Option, +) -> Result<()> { + let latest_block_number = provider.get_block_number().await?; + + let start_block = last_processed_block + .map(|n| n + 1) + .unwrap_or(latest_block_number); + + if start_block > latest_block_number { + return Ok(()); + } + + info!(message = "Processing blocks", from=%start_block, to=%latest_block_number); + + for block_number in start_block..=latest_block_number { + match process_block(provider, datastore, publisher, block_number).await { + Ok(_) => { + info!(message = "Successfully processed block", block=%block_number); + *last_processed_block = Some(block_number); + } + Err(e) => { + return Err(e); + } + } + } + + Ok(()) +} + +async fn process_block( + provider: &impl Provider, + datastore: &PostgresDatastore, + publisher: &KafkaMempoolEventPublisher, + block_number: u64, +) -> Result<()> { + let block = provider + .get_block_by_number(block_number.into()) + .full() + .await? + .ok_or_else(|| anyhow::anyhow!("Block {} not found", block_number))?; + + let block_hash = block.header.hash; + + let transactions = match &block.transactions { + BlockTransactions::Full(txs) => txs, + BlockTransactions::Hashes(_) => { + return Err(anyhow::anyhow!( + "Block transactions returned as hashes only, expected full transactions" + )); + } + BlockTransactions::Uncle => { + return Err(anyhow::anyhow!("Block contains uncle transactions")); + } + }; + + for tx in transactions { + let tx_hash = tx.tx_hash(); + info!(message = "Processing transaction", tx_hash=%tx_hash); + + match datastore.find_bundle_by_transaction_hash(tx_hash).await? { + Some(bundle_id) => { + info!(message = "Found bundle for transaction", bundle_id=%bundle_id, tx_hash=%tx_hash); + + let event = MempoolEvent::BlockIncluded { + bundle_id, + block_number, + block_hash, + }; + + publisher.publish(event).await?; + datastore.remove_bundle(bundle_id).await?; + + info!(message = "Removed bundle for transaction", bundle_id=%bundle_id, tx_hash=%tx_hash); + } + None => { + error!(message = "Transaction not part of tracked bundle", tx_hash=%tx_hash); + } + } + } + + Ok(()) +} diff --git a/justfile b/justfile index 507c421..52d4832 100644 --- a/justfile +++ b/justfile @@ -29,4 +29,7 @@ audit: cargo run --bin tips-audit ingress: - cargo run --bin tips-ingress \ No newline at end of file + cargo run --bin tips-ingress + +maintenance: + cargo run --bin tips-maintenance \ No newline at end of file From 74676cc77b2aaff58edb0de4373afe28246f2a0d Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Fri, 19 Sep 2025 16:20:28 -0500 Subject: [PATCH 007/117] prototype: Add debug UI for bundlestore and S3 (#5) * Add debug UI * Update GHA * Fixes * Add missing envvars --- .env.example | 11 +- .github/workflows/{ci.yml => rust.yml} | 4 +- .github/workflows/ui.yml | 54 + .gitignore | 10 +- README.md | 3 + justfile | 19 +- ui/.gitignore | 41 + ui/biome.json | 37 + ui/drizzle.config.ts | 12 + ui/next.config.ts | 7 + ui/package.json | 31 + ui/postcss.config.mjs | 5 + ui/src/app/api/bundle/[uuid]/route.ts | 34 + ui/src/app/api/bundles/all/route.ts | 15 + ui/src/app/api/bundles/route.ts | 27 + ui/src/app/api/txn/[hash]/route.ts | 73 + ui/src/app/bundles/[uuid]/page.tsx | 183 ++ ui/src/app/bundles/page.tsx | 129 ++ ui/src/app/globals.css | 26 + ui/src/app/layout.tsx | 34 + ui/src/app/page.tsx | 5 + ui/src/app/txn/[hash]/page.tsx | 79 + ui/src/db/index.ts | 9 + ui/src/db/relations.ts | 0 ui/src/db/schema.ts | 33 + ui/src/lib/s3.ts | 154 ++ ui/tsconfig.json | 27 + ui/yarn.lock | 2338 ++++++++++++++++++++++++ 28 files changed, 3395 insertions(+), 5 deletions(-) rename .github/workflows/{ci.yml => rust.yml} (96%) create mode 100644 .github/workflows/ui.yml create mode 100644 ui/.gitignore create mode 100644 ui/biome.json create mode 100644 ui/drizzle.config.ts create mode 100644 ui/next.config.ts create mode 100644 ui/package.json create mode 100644 ui/postcss.config.mjs create mode 100644 ui/src/app/api/bundle/[uuid]/route.ts create mode 100644 ui/src/app/api/bundles/all/route.ts create mode 100644 ui/src/app/api/bundles/route.ts create mode 100644 ui/src/app/api/txn/[hash]/route.ts create mode 100644 ui/src/app/bundles/[uuid]/page.tsx create mode 100644 ui/src/app/bundles/page.tsx create mode 100644 ui/src/app/globals.css create mode 100644 ui/src/app/layout.tsx create mode 100644 ui/src/app/page.tsx create mode 100644 ui/src/app/txn/[hash]/page.tsx create mode 100644 ui/src/db/index.ts create mode 100644 ui/src/db/relations.ts create mode 100644 ui/src/db/schema.ts create mode 100644 ui/src/lib/s3.ts create mode 100644 ui/tsconfig.json create mode 100644 ui/yarn.lock diff --git a/.env.example b/.env.example index fdb4af6..081ebbd 100644 --- a/.env.example +++ b/.env.example @@ -26,4 +26,13 @@ TIPS_MAINTENANCE_RPC_NODE=http://localhost:2222 TIPS_MAINTENANCE_KAFKA_BROKERS=localhost:9092 TIPS_MAINTENANCE_KAFKA_TOPIC=tips-audit TIPS_MAINTENANCE_POLL_INTERVAL_MS=250 -TIPS_MAINTENANCE_LOG_LEVEL=info \ No newline at end of file +TIPS_MAINTENANCE_LOG_LEVEL=info + +# TIPS UI +TIPS_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres +TIPS_UI_AWS_REGION=us-east-1 +TIPS_UI_S3_BUCKET_NAME=tips +TIPS_UI_S3_CONFIG_TYPE=manual +TIPS_UI_S3_ENDPOINT=http://localhost:7000 +TIPS_UI_S3_ACCESS_KEY_ID=minioadmin +TIPS_UI_S3_SECRET_ACCESS_KEY=minioadmin \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/rust.yml similarity index 96% rename from .github/workflows/ci.yml rename to .github/workflows/rust.yml index 02f45d4..ea699fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/rust.yml @@ -1,4 +1,6 @@ -name: CI +name: Rust +permissions: + contents: read on: push: diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml new file mode 100644 index 0000000..dfe6e60 --- /dev/null +++ b/.github/workflows/ui.yml @@ -0,0 +1,54 @@ +name: UI +permissions: + contents: read + +on: + push: + branches: [ master ] + paths: ['ui/**'] + pull_request: + branches: [ master ] + paths: ['ui/**'] + +jobs: + lint: + name: Lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: '20' + cache: 'yarn' + cache-dependency-path: ui/yarn.lock + - run: cp .env.example ui/.env + - run: cd ui && yarn install + - run: cd ui && yarn lint + + type-check: + name: Type Check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: '20' + cache: 'yarn' + cache-dependency-path: ui/yarn.lock + - run: cp .env.example ui/.env + - run: cd ui && yarn install + - run: cd ui && npx tsc --noEmit + + build: + name: Build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: '20' + cache: 'yarn' + cache-dependency-path: ui/yarn.lock + - run: cp .env.example ui/.env + - run: cd ui && yarn install + - run: cd ui && yarn build \ No newline at end of file diff --git a/.gitignore b/.gitignore index ed49a43..ed33ed8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ # Rust /target/ +# NextJS +/ui/.next +/ui/node_modules + # Local Dev /data/ @@ -14,4 +18,8 @@ Thumbs.db # Environment variables .env -.env.local \ No newline at end of file +/ui/.env + +# Claude +/.claude +/ui/.claude diff --git a/README.md b/README.md index cdf290c..0cccd18 100644 --- a/README.md +++ b/README.md @@ -24,3 +24,6 @@ The main entry point that provides a JSON-RPC API for receiving transactions and ### 🔨 Maintenance (`crates/maintenance`) A service that maintains the health of the TIPS DataStore, by removing stale or included bundles. + +### 🖥️ UI (`ui`) +A debug UI for viewing the state of the bundle store and S3. diff --git a/justfile b/justfile index 52d4832..041641d 100644 --- a/justfile +++ b/justfile @@ -1,22 +1,34 @@ ### DEVELOPMENT COMMANDS ### ci: + # Rust cargo fmt --all -- --check cargo clippy -- -D warnings cargo build cargo test + # UI + cd ui && npm run lint + cd ui && npm run build fix: + # Rust cargo fmt --all cargo clippy --fix --allow-dirty --allow-staged + # UI + cd ui && npx biome check --fix create-migration name: touch crates/datastore/migrations/$(date +%s)_{{ name }}.sql -sync: +sync: deps-reset ### DATABASE ### cargo sqlx prepare -D postgresql://postgres:postgres@localhost:5432/postgres --workspace --all --no-dotenv + cd ui && npx drizzle-kit pull --dialect=postgresql --url=postgresql://postgres:postgres@localhost:5432/postgres + cd ui && mv ./drizzle/relations.ts ./src/db/ + cd ui && mv ./drizzle/schema.ts ./src/db/ + cd ui && rm -rf ./drizzle ### ENV ### cp .env.example .env + cp .env.example ./ui/.env ### RUN SERVICES ### deps-reset: @@ -32,4 +44,7 @@ ingress: cargo run --bin tips-ingress maintenance: - cargo run --bin tips-maintenance \ No newline at end of file + cargo run --bin tips-maintenance + +ui: + cd ui && yarn dev \ No newline at end of file diff --git a/ui/.gitignore b/ui/.gitignore new file mode 100644 index 0000000..5ef6a52 --- /dev/null +++ b/ui/.gitignore @@ -0,0 +1,41 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.* +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/versions + +# testing +/coverage + +# next.js +/.next/ +/out/ + +# production +/build + +# misc +.DS_Store +*.pem + +# debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* +.pnpm-debug.log* + +# env files (can opt-in for committing if needed) +.env* + +# vercel +.vercel + +# typescript +*.tsbuildinfo +next-env.d.ts diff --git a/ui/biome.json b/ui/biome.json new file mode 100644 index 0000000..41b3b95 --- /dev/null +++ b/ui/biome.json @@ -0,0 +1,37 @@ +{ + "$schema": "https://biomejs.dev/schemas/2.2.0/schema.json", + "vcs": { + "enabled": true, + "clientKind": "git", + "useIgnoreFile": true + }, + "files": { + "ignoreUnknown": true, + "includes": ["**", "!node_modules", "!.next", "!dist", "!build"] + }, + "formatter": { + "enabled": true, + "indentStyle": "space", + "indentWidth": 2 + }, + "linter": { + "enabled": true, + "rules": { + "recommended": true, + "suspicious": { + "noUnknownAtRules": "off" + } + }, + "domains": { + "next": "recommended", + "react": "recommended" + } + }, + "assist": { + "actions": { + "source": { + "organizeImports": "on" + } + } + } +} diff --git a/ui/drizzle.config.ts b/ui/drizzle.config.ts new file mode 100644 index 0000000..2ae4233 --- /dev/null +++ b/ui/drizzle.config.ts @@ -0,0 +1,12 @@ +import { defineConfig } from "drizzle-kit"; + +export default defineConfig({ + schema: "./src/db/schema.ts", + out: "./drizzle", + dialect: "postgresql", + dbCredentials: { + url: + process.env.TIPS_DATABASE_URL || + "postgresql://postgres:postgres@localhost:5432/postgres", + }, +}); diff --git a/ui/next.config.ts b/ui/next.config.ts new file mode 100644 index 0000000..e9ffa30 --- /dev/null +++ b/ui/next.config.ts @@ -0,0 +1,7 @@ +import type { NextConfig } from "next"; + +const nextConfig: NextConfig = { + /* config options here */ +}; + +export default nextConfig; diff --git a/ui/package.json b/ui/package.json new file mode 100644 index 0000000..a44dcb4 --- /dev/null +++ b/ui/package.json @@ -0,0 +1,31 @@ +{ + "name": "ui", + "version": "0.1.0", + "private": true, + "scripts": { + "dev": "next dev --turbopack", + "build": "next build --turbopack", + "start": "next start", + "lint": "biome check", + "format": "biome format --write" + }, + "dependencies": { + "@aws-sdk/client-s3": "^3.888.0", + "drizzle-kit": "^0.31.4", + "drizzle-orm": "^0.44.5", + "next": "15.5.3", + "pg": "^8.16.3", + "react": "19.1.0", + "react-dom": "19.1.0" + }, + "devDependencies": { + "@biomejs/biome": "2.2.0", + "@tailwindcss/postcss": "^4", + "@types/node": "^20", + "@types/pg": "^8.15.5", + "@types/react": "^19", + "@types/react-dom": "^19", + "tailwindcss": "^4", + "typescript": "^5" + } +} diff --git a/ui/postcss.config.mjs b/ui/postcss.config.mjs new file mode 100644 index 0000000..c7bcb4b --- /dev/null +++ b/ui/postcss.config.mjs @@ -0,0 +1,5 @@ +const config = { + plugins: ["@tailwindcss/postcss"], +}; + +export default config; diff --git a/ui/src/app/api/bundle/[uuid]/route.ts b/ui/src/app/api/bundle/[uuid]/route.ts new file mode 100644 index 0000000..999dec3 --- /dev/null +++ b/ui/src/app/api/bundle/[uuid]/route.ts @@ -0,0 +1,34 @@ +import { type NextRequest, NextResponse } from "next/server"; +import { type BundleEvent, getBundleHistory } from "@/lib/s3"; + +export interface BundleHistoryResponse { + uuid: string; + history: BundleEvent[]; +} + +export async function GET( + _request: NextRequest, + { params }: { params: Promise<{ uuid: string }> }, +) { + try { + const { uuid } = await params; + + const bundle = await getBundleHistory(uuid); + if (!bundle) { + return NextResponse.json({ error: "Bundle not found" }, { status: 404 }); + } + + const response: BundleHistoryResponse = { + uuid, + history: bundle.history, + }; + + return NextResponse.json(response); + } catch (error) { + console.error("Error fetching bundle data:", error); + return NextResponse.json( + { error: "Internal server error" }, + { status: 500 }, + ); + } +} diff --git a/ui/src/app/api/bundles/all/route.ts b/ui/src/app/api/bundles/all/route.ts new file mode 100644 index 0000000..847cacf --- /dev/null +++ b/ui/src/app/api/bundles/all/route.ts @@ -0,0 +1,15 @@ +import { NextResponse } from "next/server"; +import { listAllBundleKeys } from "@/lib/s3"; + +export async function GET() { + try { + const bundleKeys = await listAllBundleKeys(); + return NextResponse.json(bundleKeys); + } catch (error) { + console.error("Error fetching all bundle keys:", error); + return NextResponse.json( + { error: "Internal server error" }, + { status: 500 }, + ); + } +} diff --git a/ui/src/app/api/bundles/route.ts b/ui/src/app/api/bundles/route.ts new file mode 100644 index 0000000..eb2a349 --- /dev/null +++ b/ui/src/app/api/bundles/route.ts @@ -0,0 +1,27 @@ +import { NextResponse } from "next/server"; +import { db } from "@/db"; +import { bundles } from "@/db/schema"; + +export interface Bundle { + id: string; + txnHashes: string[] | null; +} + +export async function GET() { + try { + const allBundles = await db + .select({ + id: bundles.id, + txnHashes: bundles.txnHashes, + }) + .from(bundles); + + return NextResponse.json(allBundles); + } catch (error) { + console.error("Error fetching bundles:", error); + return NextResponse.json( + { error: "Internal server error" }, + { status: 500 }, + ); + } +} diff --git a/ui/src/app/api/txn/[hash]/route.ts b/ui/src/app/api/txn/[hash]/route.ts new file mode 100644 index 0000000..44f6824 --- /dev/null +++ b/ui/src/app/api/txn/[hash]/route.ts @@ -0,0 +1,73 @@ +import { type NextRequest, NextResponse } from "next/server"; +import { + type BundleEvent, + getBundleHistory, + getTransactionMetadataByHash, +} from "@/lib/s3"; + +export interface TransactionEvent { + type: string; + data: { + bundle_id?: string; + transactions?: Array<{ + id: { + sender: string; + nonce: string; + hash: string; + }; + data: string; + }>; + transaction_ids?: Array<{ + sender: string; + nonce: string; + hash: string; + }>; + block_number?: number; + flashblock_index?: number; + block_hash?: string; + }; +} + +export interface TransactionHistoryResponse { + hash: string; + bundle_ids: string[]; + history: BundleEvent[]; +} + +export async function GET( + _request: NextRequest, + { params }: { params: Promise<{ hash: string }> }, +) { + try { + const { hash } = await params; + + const metadata = await getTransactionMetadataByHash(hash); + + if (!metadata) { + return NextResponse.json( + { error: "Transaction not found" }, + { status: 404 }, + ); + } + + // TODO: Can be in multiple bundles + const bundle = await getBundleHistory(metadata.bundle_ids[0]); + if (!bundle) { + return NextResponse.json({ error: "Bundle not found" }, { status: 404 }); + } + + const response: TransactionHistoryResponse = { + hash, + bundle_ids: metadata.bundle_ids, + history: bundle.history, + }; + + return NextResponse.json(response); + } catch (error) { + console.error("Error fetching transaction data:", error); + return NextResponse.json( + { error: "Internal server error" }, + { status: 500 }, + ); + } +} diff --git a/ui/src/app/bundles/[uuid]/page.tsx b/ui/src/app/bundles/[uuid]/page.tsx new file mode 100644 index 0000000..38b4286 --- /dev/null +++ b/ui/src/app/bundles/[uuid]/page.tsx @@ -0,0 +1,183 @@ +"use client"; + +import { useEffect, useState } from "react"; +import type { BundleHistoryResponse } from "@/app/api/bundle/[uuid]/route"; + +interface PageProps { + params: Promise<{ uuid: string }>; +} + +function formatEventType(eventType: string): string { + switch (eventType) { + case "ReceivedBundle": + return "Bundle Received"; + case "CancelledBundle": + return "Bundle Cancelled"; + case "BuilderMined": + return "Builder Mined"; + case "FlashblockInclusion": + return "Flashblock Inclusion"; + case "BlockInclusion": + return "Block Inclusion"; + default: + return eventType; + } +} + +function getEventStatus(eventType: string): { color: string; bgColor: string } { + switch (eventType) { + case "ReceivedBundle": + return { color: "text-blue-600", bgColor: "bg-blue-100" }; + case "CancelledBundle": + return { color: "text-red-600", bgColor: "bg-red-100" }; + case "BuilderMined": + return { color: "text-yellow-600", bgColor: "bg-yellow-100" }; + case "FlashblockInclusion": + return { color: "text-purple-600", bgColor: "bg-purple-100" }; + case "BlockInclusion": + return { color: "text-green-600", bgColor: "bg-green-100" }; + default: + return { color: "text-gray-600", bgColor: "bg-gray-100" }; + } +} + +export default function BundlePage({ params }: PageProps) { + const [uuid, setUuid] = useState(""); + const [data, setData] = useState(null); + const [loading, setLoading] = useState(true); + const [error, setError] = useState(null); + + useEffect(() => { + const initializeParams = async () => { + const resolvedParams = await params; + setUuid(resolvedParams.uuid); + }; + initializeParams(); + }, [params]); + + useEffect(() => { + if (!uuid) return; + + const fetchData = async () => { + try { + const response = await fetch(`/api/bundle/${uuid}`); + if (!response.ok) { + if (response.status === 404) { + setError("Bundle not found"); + } else { + setError("Failed to fetch bundle data"); + } + setData(null); + return; + } + const result = await response.json(); + setData(result); + setError(null); + } catch (_err) { + setError("Failed to fetch bundle data"); + setData(null); + } finally { + setLoading(false); + } + }; + + fetchData(); + + const interval = setInterval(fetchData, 400); + + return () => clearInterval(interval); + }, [uuid]); + + if (!uuid) { + return ( +
+
Loading...
+
+ ); + } + + return ( +
+
+

Bundle {uuid}

+ {loading && ( +
Loading bundle data...
+ )} + {error && ( +
{error}
+ )} +
+ + {data && ( +
+ {(() => { + const allTransactions = new Set(); + + data.history.forEach((event) => { + if (event.event === "Created") { + event.data?.bundle?.revertingTxHashes?.forEach((tx) => { + allTransactions.add(tx); + }); + } + }); + + const uniqueTransactions = Array.from(allTransactions.values()); + + return uniqueTransactions.length > 0 ? ( +
+

Transactions

+
    + {uniqueTransactions.map((tx) => ( +
  • {tx}
    • + ))} +
+
+ ) : null; + })()} + +
+

Bundle History

+ + {data.history.length > 0 ? ( +
+ {data.history.map((event, index) => { + const { color, bgColor } = getEventStatus(event.event); + return ( +
+
+
+ + {formatEventType(event.event)} + + + {event.data?.timestamp + ? new Date(event.data?.timestamp).toLocaleString() + : "No timestamp"} + +
+ + Event #{index + 1} + +
+
+ ); + })} +
+ ) : ( +

+ {loading + ? "Loading events..." + : "No events found for this bundle."} +

+ )} +
+
+ )} +
+ ); +} diff --git a/ui/src/app/bundles/page.tsx b/ui/src/app/bundles/page.tsx new file mode 100644 index 0000000..2be0c36 --- /dev/null +++ b/ui/src/app/bundles/page.tsx @@ -0,0 +1,129 @@ +"use client"; + +import Link from "next/link"; +import { useEffect, useState } from "react"; +import type { Bundle } from "@/app/api/bundles/route"; + +export default function BundlesPage() { + const [liveBundles, setLiveBundles] = useState([]); + const [allBundles, setAllBundles] = useState([]); + const [loading, setLoading] = useState(true); + const [error, setError] = useState(null); + + useEffect(() => { + const fetchLiveBundles = async () => { + try { + const response = await fetch("/api/bundles"); + if (!response.ok) { + setError("Failed to fetch live bundles"); + setLiveBundles([]); + return; + } + const result = await response.json(); + setLiveBundles(result); + setError(null); + } catch (_err) { + setError("Failed to fetch live bundles"); + setLiveBundles([]); + } + }; + + const fetchAllBundles = async () => { + try { + const response = await fetch("/api/bundles/all"); + if (!response.ok) { + console.error("Failed to fetch all bundles from S3"); + setAllBundles([]); + return; + } + const result = await response.json(); + setAllBundles(result); + } catch (_err) { + console.error("Failed to fetch all bundles from S3"); + setAllBundles([]); + } + }; + + const fetchData = async () => { + await Promise.all([fetchLiveBundles(), fetchAllBundles()]); + setLoading(false); + }; + + fetchData(); + + const interval = setInterval(fetchLiveBundles, 400); + + return () => clearInterval(interval); + }, []); + + if (loading) { + return ( +
+

BundleStore (fka Mempool)

+
Loading bundles...
+
+ ); + } + + return ( +
+
+

BundleStore (fka Mempool)

+ {error && ( +
{error}
+ )} +
+ +
+
+

Live Bundles

+ {liveBundles.length > 0 ? ( +
    + {liveBundles.map((bundle) => ( +
  • + + + {bundle.id} + {" ("} + {bundle.txnHashes?.join(", ") || "No transactions"} + {")"} + + +
    • + ))} +
+ ) : ( +

+ No live bundles found. +

+ )} +
+ +
+

All Bundles

+ {allBundles.length > 0 ? ( +
    + {allBundles.map((bundleId) => ( +
  • + + {bundleId} + +
    • + ))} +
+ ) : ( +

+ No bundles found in S3. +

+ )} +
+
+
+ ); +} diff --git a/ui/src/app/globals.css b/ui/src/app/globals.css new file mode 100644 index 0000000..a2dc41e --- /dev/null +++ b/ui/src/app/globals.css @@ -0,0 +1,26 @@ +@import "tailwindcss"; + +:root { + --background: #ffffff; + --foreground: #171717; +} + +@theme inline { + --color-background: var(--background); + --color-foreground: var(--foreground); + --font-sans: var(--font-geist-sans); + --font-mono: var(--font-geist-mono); +} + +@media (prefers-color-scheme: dark) { + :root { + --background: #0a0a0a; + --foreground: #ededed; + } +} + +body { + background: var(--background); + color: var(--foreground); + font-family: Arial, Helvetica, sans-serif; +} diff --git a/ui/src/app/layout.tsx b/ui/src/app/layout.tsx new file mode 100644 index 0000000..bc9a9f2 --- /dev/null +++ b/ui/src/app/layout.tsx @@ -0,0 +1,34 @@ +import type { Metadata } from "next"; +import { Geist, Geist_Mono } from "next/font/google"; +import "./globals.css"; + +const geistSans = Geist({ + variable: "--font-geist-sans", + subsets: ["latin"], +}); + +const geistMono = Geist_Mono({ + variable: "--font-geist-mono", + subsets: ["latin"], +}); + +export const metadata: Metadata = { + title: "TIPS", + description: "A beautiful UI for interacting with TIPS", +}; + +export default function RootLayout({ + children, +}: Readonly<{ + children: React.ReactNode; +}>) { + return ( + + + {children} + + + ); +} diff --git a/ui/src/app/page.tsx b/ui/src/app/page.tsx new file mode 100644 index 0000000..afe1146 --- /dev/null +++ b/ui/src/app/page.tsx @@ -0,0 +1,5 @@ +import { redirect } from "next/navigation"; + +export default function Home() { + redirect("/bundles"); +} diff --git a/ui/src/app/txn/[hash]/page.tsx b/ui/src/app/txn/[hash]/page.tsx new file mode 100644 index 0000000..76f1dda --- /dev/null +++ b/ui/src/app/txn/[hash]/page.tsx @@ -0,0 +1,79 @@ +"use client"; + +import { useRouter } from "next/navigation"; +import { useEffect, useState } from "react"; +import type { TransactionHistoryResponse } from "@/app/api/txn/[hash]/route"; + +interface PageProps { + params: Promise<{ hash: string }>; +} + +export default function TransactionRedirectPage({ params }: PageProps) { + const router = useRouter(); + const [hash, setHash] = useState(""); + const [loading, setLoading] = useState(true); + const [error, setError] = useState(null); + + useEffect(() => { + const initializeParams = async () => { + const resolvedParams = await params; + setHash(resolvedParams.hash); + }; + initializeParams(); + }, [params]); + + useEffect(() => { + if (!hash) return; + + const fetchAndRedirect = async () => { + try { + const response = await fetch(`/api/txn/${hash}`); + if (!response.ok) { + if (response.status === 404) { + setError("Transaction not found"); + } else { + setError("Failed to fetch transaction data"); + } + return; + } + const result: TransactionHistoryResponse = await response.json(); + + if (result.bundle_ids && result.bundle_ids.length > 0) { + router.push(`/bundles/${result.bundle_ids[0]}`); + } else { + setError("No bundle found for this transaction"); + } + } catch (_err) { + setError("Failed to fetch transaction data"); + } finally { + setLoading(false); + } + }; + + fetchAndRedirect(); + }, [hash, router]); + + if (!hash) { + return ( +
+
Loading...
+
+ ); + } + + return ( +
+
+

Transaction {hash}

+ {loading && ( +
+ Redirecting to bundle page... +
+ )} + {error && ( +
{error}
+ )} +
+
+ ); +} diff --git a/ui/src/db/index.ts b/ui/src/db/index.ts new file mode 100644 index 0000000..55c8a8f --- /dev/null +++ b/ui/src/db/index.ts @@ -0,0 +1,9 @@ +import { drizzle } from "drizzle-orm/node-postgres"; +import { Pool } from "pg"; +import * as schema from "./schema"; + +const pool = new Pool({ + connectionString: process.env.TIPS_DATABASE_URL, +}); + +export const db = drizzle(pool, { schema }); diff --git a/ui/src/db/relations.ts b/ui/src/db/relations.ts new file mode 100644 index 0000000..e69de29 diff --git a/ui/src/db/schema.ts b/ui/src/db/schema.ts new file mode 100644 index 0000000..38c9041 --- /dev/null +++ b/ui/src/db/schema.ts @@ -0,0 +1,33 @@ +import { + bigint, + char, + pgTable, + text, + timestamp, + uuid, +} from "drizzle-orm/pg-core"; + +export const bundles = pgTable("bundles", { + id: uuid().primaryKey().notNull(), + senders: char({ length: 42 }).array(), + // You can use { mode: "bigint" } if numbers are exceeding js number limitations + minimumBaseFee: bigint("minimum_base_fee", { mode: "number" }), + txnHashes: char("txn_hashes", { length: 66 }).array(), + txs: text().array().notNull(), + revertingTxHashes: char("reverting_tx_hashes", { length: 66 }).array(), + droppingTxHashes: char("dropping_tx_hashes", { length: 66 }).array(), + // You can use { mode: "bigint" } if numbers are exceeding js number limitations + blockNumber: bigint("block_number", { mode: "number" }), + // You can use { mode: "bigint" } if numbers are exceeding js number limitations + minTimestamp: bigint("min_timestamp", { mode: "number" }), + // You can use { mode: "bigint" } if numbers are exceeding js number limitations + maxTimestamp: bigint("max_timestamp", { mode: "number" }), + createdAt: timestamp("created_at", { + withTimezone: true, + mode: "string", + }).notNull(), + updatedAt: timestamp("updated_at", { + withTimezone: true, + mode: "string", + }).notNull(), +}); diff --git a/ui/src/lib/s3.ts b/ui/src/lib/s3.ts new file mode 100644 index 0000000..d79ff9d2 --- /dev/null +++ b/ui/src/lib/s3.ts @@ -0,0 +1,154 @@ +import { + GetObjectCommand, + ListObjectsV2Command, + S3Client, + type S3ClientConfig, +} from "@aws-sdk/client-s3"; + +function createS3Client(): S3Client { + const configType = process.env.TIPS_UI_S3_CONFIG_TYPE || "aws"; + const region = process.env.TIPS_UI_AWS_REGION || "us-east-1"; + + if (configType === "manual") { + console.log("Using Manual S3 configuration"); + const config: S3ClientConfig = { + region, + forcePathStyle: true, + }; + + if (process.env.TIPS_UI_S3_ENDPOINT) { + config.endpoint = process.env.TIPS_UI_S3_ENDPOINT; + } + + if ( + process.env.TIPS_UI_S3_ACCESS_KEY_ID && + process.env.TIPS_UI_S3_SECRET_ACCESS_KEY + ) { + config.credentials = { + accessKeyId: process.env.TIPS_UI_S3_ACCESS_KEY_ID, + secretAccessKey: process.env.TIPS_UI_S3_SECRET_ACCESS_KEY, + }; + } + + return new S3Client(config); + } + + console.log("Using AWS S3 configuration"); + return new S3Client({ + region, + }); +} + +const s3Client = createS3Client(); + +const BUCKET_NAME = process.env.TIPS_UI_S3_BUCKET_NAME; +if (process.env.TIPS_UI_S3_BUCKET_NAME === undefined) { + throw new Error("You must specify a valid bucket"); +} + +export interface TransactionMetadata { + bundle_ids: string[]; + sender: string; + nonce: string; +} + +async function getObjectContent(key: string): Promise { + try { + const command = new GetObjectCommand({ + Bucket: BUCKET_NAME, + Key: key, + }); + + const response = await s3Client.send(command); + const body = await response.Body?.transformToString(); + return body || null; + } catch (error) { + console.error(`Failed to get S3 object ${key}:`, error); + return null; + } +} + +export async function getTransactionMetadataByHash( + hash: string, +): Promise { + const key = `transactions/by_hash/${hash}`; + const content = await getObjectContent(key); + + if (!content) { + return null; + } + + try { + return JSON.parse(content) as TransactionMetadata; + } catch (error) { + console.error( + `Failed to parse transaction metadata for hash ${hash}:`, + error, + ); + return null; + } +} + +export interface BundleEvent { + event: string; + data?: { + bundle?: { + revertingTxHashes: Array; + }; + key: string; + timestamp: number; + }; +} + +export interface BundleHistory { + history: BundleEvent[]; +} + +export async function getBundleHistory( + bundleId: string, +): Promise { + const key = `bundles/${bundleId}`; + const content = await getObjectContent(key); + + if (!content) { + return null; + } + + try { + return JSON.parse(content) as BundleHistory; + } catch (error) { + console.error( + `Failed to parse bundle history for bundle ${bundleId}:`, + error, + ); + return null; + } +} + +export async function listAllBundleKeys(): Promise { + try { + const command = new ListObjectsV2Command({ + Bucket: BUCKET_NAME, + Prefix: "bundles/", + }); + + const response = await s3Client.send(command); + const bundleKeys: string[] = []; + + if (response.Contents) { + for (const object of response.Contents) { + if (object.Key?.startsWith("bundles/")) { + const bundleId = object.Key.replace("bundles/", ""); + if (bundleId) { + bundleKeys.push(bundleId); + } + } + } + } + + return bundleKeys; + } catch (error) { + console.error("Failed to list S3 bundle keys:", error); + return []; + } +} diff --git a/ui/tsconfig.json b/ui/tsconfig.json new file mode 100644 index 0000000..c133409 --- /dev/null +++ b/ui/tsconfig.json @@ -0,0 +1,27 @@ +{ + "compilerOptions": { + "target": "ES2017", + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": true, + "noEmit": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "bundler", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "incremental": true, + "plugins": [ + { + "name": "next" + } + ], + "paths": { + "@/*": ["./src/*"] + } + }, + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], + "exclude": ["node_modules"] +} diff --git a/ui/yarn.lock b/ui/yarn.lock new file mode 100644 index 0000000..f7601ef --- /dev/null +++ b/ui/yarn.lock @@ -0,0 +1,2338 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@alloc/quick-lru@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" + integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw== + +"@aws-crypto/crc32@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/crc32/-/crc32-5.2.0.tgz#cfcc22570949c98c6689cfcbd2d693d36cdae2e1" + integrity sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg== + dependencies: + "@aws-crypto/util" "^5.2.0" + "@aws-sdk/types" "^3.222.0" + tslib "^2.6.2" + +"@aws-crypto/crc32c@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz#4e34aab7f419307821509a98b9b08e84e0c1917e" + integrity sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag== + dependencies: + "@aws-crypto/util" "^5.2.0" + "@aws-sdk/types" "^3.222.0" + tslib "^2.6.2" + +"@aws-crypto/sha1-browser@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz#b0ee2d2821d3861f017e965ef3b4cb38e3b6a0f4" + integrity sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg== + dependencies: + "@aws-crypto/supports-web-crypto" "^5.2.0" + "@aws-crypto/util" "^5.2.0" + "@aws-sdk/types" "^3.222.0" + "@aws-sdk/util-locate-window" "^3.0.0" + "@smithy/util-utf8" "^2.0.0" + tslib "^2.6.2" + +"@aws-crypto/sha256-browser@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz#153895ef1dba6f9fce38af550e0ef58988eb649e" + integrity sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw== + dependencies: + "@aws-crypto/sha256-js" "^5.2.0" + "@aws-crypto/supports-web-crypto" "^5.2.0" + "@aws-crypto/util" "^5.2.0" + "@aws-sdk/types" "^3.222.0" + "@aws-sdk/util-locate-window" "^3.0.0" + "@smithy/util-utf8" "^2.0.0" + tslib "^2.6.2" + +"@aws-crypto/sha256-js@5.2.0", "@aws-crypto/sha256-js@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz#c4fdb773fdbed9a664fc1a95724e206cf3860042" + integrity sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA== + dependencies: + "@aws-crypto/util" "^5.2.0" + "@aws-sdk/types" "^3.222.0" + tslib "^2.6.2" + +"@aws-crypto/supports-web-crypto@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz#a1e399af29269be08e695109aa15da0a07b5b5fb" + integrity sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg== + dependencies: + tslib "^2.6.2" + +"@aws-crypto/util@5.2.0", "@aws-crypto/util@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-5.2.0.tgz#71284c9cffe7927ddadac793c14f14886d3876da" + integrity sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ== + dependencies: + "@aws-sdk/types" "^3.222.0" + "@smithy/util-utf8" "^2.0.0" + tslib "^2.6.2" + +"@aws-sdk/client-s3@^3.888.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-3.893.0.tgz#f67643e9dbec34377f62b0159c81543b284d07f6" + integrity sha512-/P74KDJhOijnIAQR93sq1DQn8vbU3WaPZDyy1XUMRJJIY6iEJnDo1toD9XY6AFDz5TRto8/8NbcXT30AMOUtJQ== + dependencies: + "@aws-crypto/sha1-browser" "5.2.0" + "@aws-crypto/sha256-browser" "5.2.0" + "@aws-crypto/sha256-js" "5.2.0" + "@aws-sdk/core" "3.893.0" + "@aws-sdk/credential-provider-node" "3.893.0" + "@aws-sdk/middleware-bucket-endpoint" "3.893.0" + "@aws-sdk/middleware-expect-continue" "3.893.0" + "@aws-sdk/middleware-flexible-checksums" "3.893.0" + "@aws-sdk/middleware-host-header" "3.893.0" + "@aws-sdk/middleware-location-constraint" "3.893.0" + "@aws-sdk/middleware-logger" "3.893.0" + "@aws-sdk/middleware-recursion-detection" "3.893.0" + "@aws-sdk/middleware-sdk-s3" "3.893.0" + "@aws-sdk/middleware-ssec" "3.893.0" + "@aws-sdk/middleware-user-agent" "3.893.0" + "@aws-sdk/region-config-resolver" "3.893.0" + "@aws-sdk/signature-v4-multi-region" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@aws-sdk/util-endpoints" "3.893.0" + "@aws-sdk/util-user-agent-browser" "3.893.0" + "@aws-sdk/util-user-agent-node" "3.893.0" + "@aws-sdk/xml-builder" "3.893.0" + "@smithy/config-resolver" "^4.2.2" + "@smithy/core" "^3.11.1" + "@smithy/eventstream-serde-browser" "^4.1.1" + "@smithy/eventstream-serde-config-resolver" "^4.2.1" + "@smithy/eventstream-serde-node" "^4.1.1" + "@smithy/fetch-http-handler" "^5.2.1" + "@smithy/hash-blob-browser" "^4.1.1" + "@smithy/hash-node" "^4.1.1" + "@smithy/hash-stream-node" "^4.1.1" + "@smithy/invalid-dependency" "^4.1.1" + "@smithy/md5-js" "^4.1.1" + "@smithy/middleware-content-length" "^4.1.1" + "@smithy/middleware-endpoint" "^4.2.3" + "@smithy/middleware-retry" "^4.2.4" + "@smithy/middleware-serde" "^4.1.1" + "@smithy/middleware-stack" "^4.1.1" + "@smithy/node-config-provider" "^4.2.2" + "@smithy/node-http-handler" "^4.2.1" + "@smithy/protocol-http" "^5.2.1" + "@smithy/smithy-client" "^4.6.3" + "@smithy/types" "^4.5.0" + "@smithy/url-parser" "^4.1.1" + "@smithy/util-base64" "^4.1.0" + "@smithy/util-body-length-browser" "^4.1.0" + "@smithy/util-body-length-node" "^4.1.0" + "@smithy/util-defaults-mode-browser" "^4.1.3" + "@smithy/util-defaults-mode-node" "^4.1.3" + "@smithy/util-endpoints" "^3.1.2" + "@smithy/util-middleware" "^4.1.1" + "@smithy/util-retry" "^4.1.2" + "@smithy/util-stream" "^4.3.2" + "@smithy/util-utf8" "^4.1.0" + "@smithy/util-waiter" "^4.1.1" + "@types/uuid" "^9.0.1" + tslib "^2.6.2" + uuid "^9.0.1" + +"@aws-sdk/client-sso@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.893.0.tgz#9ce6e0f08e8c4efc7c2f286c4399d64cb968d1f0" + integrity sha512-0+qRGq7H8UNfxI0F02ObyOgOiYxkN4DSlFfwQUQMPfqENDNYOrL++2H9X3EInyc1lUM/+aK8TZqSbh473gdxcg== + dependencies: + "@aws-crypto/sha256-browser" "5.2.0" + "@aws-crypto/sha256-js" "5.2.0" + "@aws-sdk/core" "3.893.0" + "@aws-sdk/middleware-host-header" "3.893.0" + "@aws-sdk/middleware-logger" "3.893.0" + "@aws-sdk/middleware-recursion-detection" "3.893.0" + "@aws-sdk/middleware-user-agent" "3.893.0" + "@aws-sdk/region-config-resolver" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@aws-sdk/util-endpoints" "3.893.0" + "@aws-sdk/util-user-agent-browser" "3.893.0" + "@aws-sdk/util-user-agent-node" "3.893.0" + "@smithy/config-resolver" "^4.2.2" + "@smithy/core" "^3.11.1" + "@smithy/fetch-http-handler" "^5.2.1" + "@smithy/hash-node" "^4.1.1" + "@smithy/invalid-dependency" "^4.1.1" + "@smithy/middleware-content-length" "^4.1.1" + "@smithy/middleware-endpoint" "^4.2.3" + "@smithy/middleware-retry" "^4.2.4" + "@smithy/middleware-serde" "^4.1.1" + "@smithy/middleware-stack" "^4.1.1" + "@smithy/node-config-provider" "^4.2.2" + "@smithy/node-http-handler" "^4.2.1" + "@smithy/protocol-http" "^5.2.1" + "@smithy/smithy-client" "^4.6.3" + "@smithy/types" "^4.5.0" + "@smithy/url-parser" "^4.1.1" + "@smithy/util-base64" "^4.1.0" + "@smithy/util-body-length-browser" "^4.1.0" + "@smithy/util-body-length-node" "^4.1.0" + "@smithy/util-defaults-mode-browser" "^4.1.3" + "@smithy/util-defaults-mode-node" "^4.1.3" + "@smithy/util-endpoints" "^3.1.2" + "@smithy/util-middleware" "^4.1.1" + "@smithy/util-retry" "^4.1.2" + "@smithy/util-utf8" "^4.1.0" + tslib "^2.6.2" + +"@aws-sdk/core@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.893.0.tgz#afe486bb1ec905a6f73cff99004dd37543986d05" + integrity sha512-E1NAWHOprBXIJ9CVb6oTsRD/tNOozrKBD/Sb4t7WZd3dpby6KpYfM6FaEGfRGcJBIcB4245hww8Rmg16qDMJWg== + dependencies: + "@aws-sdk/types" "3.893.0" + "@aws-sdk/xml-builder" "3.893.0" + "@smithy/core" "^3.11.1" + "@smithy/node-config-provider" "^4.2.2" + "@smithy/property-provider" "^4.1.1" + "@smithy/protocol-http" "^5.2.1" + "@smithy/signature-v4" "^5.2.1" + "@smithy/smithy-client" "^4.6.3" + "@smithy/types" "^4.5.0" + "@smithy/util-base64" "^4.1.0" + "@smithy/util-body-length-browser" "^4.1.0" + "@smithy/util-middleware" "^4.1.1" + "@smithy/util-utf8" "^4.1.0" + fast-xml-parser "5.2.5" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-env@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.893.0.tgz#89931e281c5e9c08f6f107bbb89c86a79334d070" + integrity sha512-h4sYNk1iDrSZQLqFfbuD1GWY6KoVCvourfqPl6JZCYj8Vmnox5y9+7taPxwlU2VVII0hiV8UUbO79P35oPBSyA== + dependencies: + "@aws-sdk/core" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@smithy/property-provider" "^4.1.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-http@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.893.0.tgz#b3c34d88203c0ae59b71a16435f471f9bbe81c5f" + integrity sha512-xYoC7DRr++zWZ9jG7/hvd6YjCbGDQzsAu2fBHHf91RVmSETXUgdEaP9rOdfCM02iIK/MYlwiWEIVBcBxWY/GQw== + dependencies: + "@aws-sdk/core" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@smithy/fetch-http-handler" "^5.2.1" + "@smithy/node-http-handler" "^4.2.1" + "@smithy/property-provider" "^4.1.1" + "@smithy/protocol-http" "^5.2.1" + "@smithy/smithy-client" "^4.6.3" + "@smithy/types" "^4.5.0" + "@smithy/util-stream" "^4.3.2" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-ini@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.893.0.tgz#617754f4c23e83baf8f1720e3824bfdc102a0f92" + integrity sha512-ZQWOl4jdLhJHHrHsOfNRjgpP98A5kw4YzkMOUoK+TgSQVLi7wjb957V0htvwpi6KmGr3f2F8J06D6u2OtIc62w== + dependencies: + "@aws-sdk/core" "3.893.0" + "@aws-sdk/credential-provider-env" "3.893.0" + "@aws-sdk/credential-provider-http" "3.893.0" + "@aws-sdk/credential-provider-process" "3.893.0" + "@aws-sdk/credential-provider-sso" "3.893.0" + "@aws-sdk/credential-provider-web-identity" "3.893.0" + "@aws-sdk/nested-clients" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@smithy/credential-provider-imds" "^4.1.2" + "@smithy/property-provider" "^4.1.1" + "@smithy/shared-ini-file-loader" "^4.2.0" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-node@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.893.0.tgz#e8d1bb203e8fb14dcac4f9d573db649320528631" + integrity sha512-NjvDUXciC2+EaQnbL/u/ZuCXj9PZQ/9ciPhI62LGCoJ3ft91lI1Z58Dgut0OFPpV6i16GhpFxzmbuf40wTgDbA== + dependencies: + "@aws-sdk/credential-provider-env" "3.893.0" + "@aws-sdk/credential-provider-http" "3.893.0" + "@aws-sdk/credential-provider-ini" "3.893.0" + "@aws-sdk/credential-provider-process" "3.893.0" + "@aws-sdk/credential-provider-sso" "3.893.0" + "@aws-sdk/credential-provider-web-identity" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@smithy/credential-provider-imds" "^4.1.2" + "@smithy/property-provider" "^4.1.1" + "@smithy/shared-ini-file-loader" "^4.2.0" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-process@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.893.0.tgz#83a09fcf58a917977e5d0d9765d09c9bbdeced9c" + integrity sha512-5XitkZdiQhjWJV71qWqrH7hMXwuK/TvIRwiwKs7Pj0sapGSk3YgD3Ykdlolz7sQOleoKWYYqgoq73fIPpTTmFA== + dependencies: + "@aws-sdk/core" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@smithy/property-provider" "^4.1.1" + "@smithy/shared-ini-file-loader" "^4.2.0" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-sso@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.893.0.tgz#738b6583512538a5c7db4636a2aa705bb48f50f1" + integrity sha512-ms8v13G1r0aHZh5PLcJu6AnQZPs23sRm3Ph0A7+GdqbPvWewP8M7jgZTKyTXi+oYXswdYECU1zPVur8zamhtLg== + dependencies: + "@aws-sdk/client-sso" "3.893.0" + "@aws-sdk/core" "3.893.0" + "@aws-sdk/token-providers" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@smithy/property-provider" "^4.1.1" + "@smithy/shared-ini-file-loader" "^4.2.0" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-web-identity@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.893.0.tgz#3c0b00127755b6a760c87742fd2d3c22473fdae0" + integrity sha512-wWD8r2ot4jf/CoogdPTl13HbwNLW4UheGUCu6gW7n9GoHh1JImYyooPHK8K7kD42hihydIA7OW7iFAf7//JYTw== + dependencies: + "@aws-sdk/core" "3.893.0" + "@aws-sdk/nested-clients" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@smithy/property-provider" "^4.1.1" + "@smithy/shared-ini-file-loader" "^4.2.0" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/middleware-bucket-endpoint@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.893.0.tgz#cf1b55edd6eb48a5e02cae57eddb2e467bb8ecd5" + integrity sha512-H+wMAoFC73T7M54OFIezdHXR9/lH8TZ3Cx1C3MEBb2ctlzQrVCd8LX8zmOtcGYC8plrRwV+8rNPe0FMqecLRew== + dependencies: + "@aws-sdk/types" "3.893.0" + "@aws-sdk/util-arn-parser" "3.893.0" + "@smithy/node-config-provider" "^4.2.2" + "@smithy/protocol-http" "^5.2.1" + "@smithy/types" "^4.5.0" + "@smithy/util-config-provider" "^4.1.0" + tslib "^2.6.2" + +"@aws-sdk/middleware-expect-continue@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.893.0.tgz#af9e96f24d9323afe833db1e6c03a7791a24dd09" + integrity sha512-PEZkvD6k0X9sacHkvkVF4t2QyQEAzd35OJ2bIrjWCfc862TwukMMJ1KErRmQ1WqKXHKF4L0ed5vtWaO/8jVLNA== + dependencies: + "@aws-sdk/types" "3.893.0" + "@smithy/protocol-http" "^5.2.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/middleware-flexible-checksums@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.893.0.tgz#5aedb154ddd9f9662b411d9d065895275b630670" + integrity sha512-2swRPpyGK6xpZwIFmmFSFKp10iuyBLZEouhrt1ycBVA8iHGmPkuJSCim6Vb+JoRKqINp5tizWeQwdg9boIxJPw== + dependencies: + "@aws-crypto/crc32" "5.2.0" + "@aws-crypto/crc32c" "5.2.0" + "@aws-crypto/util" "5.2.0" + "@aws-sdk/core" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@smithy/is-array-buffer" "^4.1.0" + "@smithy/node-config-provider" "^4.2.2" + "@smithy/protocol-http" "^5.2.1" + "@smithy/types" "^4.5.0" + "@smithy/util-middleware" "^4.1.1" + "@smithy/util-stream" "^4.3.2" + "@smithy/util-utf8" "^4.1.0" + tslib "^2.6.2" + +"@aws-sdk/middleware-host-header@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.893.0.tgz#1a4b14c11cff158b383e2b859be5c468d2c2c162" + integrity sha512-qL5xYRt80ahDfj9nDYLhpCNkDinEXvjLe/Qen/Y/u12+djrR2MB4DRa6mzBCkLkdXDtf0WAoW2EZsNCfGrmOEQ== + dependencies: + "@aws-sdk/types" "3.893.0" + "@smithy/protocol-http" "^5.2.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/middleware-location-constraint@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.893.0.tgz#4c032b7b4f7dab699ca78a47054551fd8e18dfb3" + integrity sha512-MlbBc7Ttb1ekbeeeFBU4DeEZOLb5s0Vl4IokvO17g6yJdLk4dnvZro9zdXl3e7NXK+kFxHRBFZe55p/42mVgDA== + dependencies: + "@aws-sdk/types" "3.893.0" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/middleware-logger@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.893.0.tgz#4ecb20ee0771a2f3afdc07c1310b97251d3854e2" + integrity sha512-ZqzMecjju5zkBquSIfVfCORI/3Mge21nUY4nWaGQy+NUXehqCGG4W7AiVpiHGOcY2cGJa7xeEkYcr2E2U9U0AA== + dependencies: + "@aws-sdk/types" "3.893.0" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/middleware-recursion-detection@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.893.0.tgz#9fde6f10e72fcbd8ce4f0eea629c07ca64ce86ba" + integrity sha512-H7Zotd9zUHQAr/wr3bcWHULYhEeoQrF54artgsoUGIf/9emv6LzY89QUccKIxYd6oHKNTrTyXm9F0ZZrzXNxlg== + dependencies: + "@aws-sdk/types" "3.893.0" + "@aws/lambda-invoke-store" "^0.0.1" + "@smithy/protocol-http" "^5.2.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/middleware-sdk-s3@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.893.0.tgz#2a49a828ddaad026348e40a0bd00b9959ebf81c1" + integrity sha512-J2v7jOoSlE4o416yQiuka6+cVJzyrU7mbJEQA9VFCb+TYT2cG3xQB0bDzE24QoHeonpeBDghbg/zamYMnt+GsQ== + dependencies: + "@aws-sdk/core" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@aws-sdk/util-arn-parser" "3.893.0" + "@smithy/core" "^3.11.1" + "@smithy/node-config-provider" "^4.2.2" + "@smithy/protocol-http" "^5.2.1" + "@smithy/signature-v4" "^5.2.1" + "@smithy/smithy-client" "^4.6.3" + "@smithy/types" "^4.5.0" + "@smithy/util-config-provider" "^4.1.0" + "@smithy/util-middleware" "^4.1.1" + "@smithy/util-stream" "^4.3.2" + "@smithy/util-utf8" "^4.1.0" + tslib "^2.6.2" + +"@aws-sdk/middleware-ssec@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-ssec/-/middleware-ssec-3.893.0.tgz#34ebc4e834d6412a64ce85376d7712a996b2d4db" + integrity sha512-e4ccCiAnczv9mMPheKjgKxZQN473mcup+3DPLVNnIw5GRbQoDqPSB70nUzfORKZvM7ar7xLMPxNR8qQgo1C8Rg== + dependencies: + "@aws-sdk/types" "3.893.0" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/middleware-user-agent@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.893.0.tgz#b6175e4df8d6bf85fb01fafab5b2794b345b32c8" + integrity sha512-n1vHj7bdC4ycIAKkny0rmgvgvGOIgYnGBAqfPAFPR26WuGWmCxH2cT9nQTNA+li8ofxX9F9FIFBTKkW92Pc8iQ== + dependencies: + "@aws-sdk/core" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@aws-sdk/util-endpoints" "3.893.0" + "@smithy/core" "^3.11.1" + "@smithy/protocol-http" "^5.2.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/nested-clients@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.893.0.tgz#96d469503c4bcbc41cda4e7a9f10b3096238ce26" + integrity sha512-HIUCyNtWkxvc0BmaJPUj/A0/29OapT/dzBNxr2sjgKNZgO81JuDFp+aXCmnf7vQoA2D1RzCsAIgEtfTExNFZqA== + dependencies: + "@aws-crypto/sha256-browser" "5.2.0" + "@aws-crypto/sha256-js" "5.2.0" + "@aws-sdk/core" "3.893.0" + "@aws-sdk/middleware-host-header" "3.893.0" + "@aws-sdk/middleware-logger" "3.893.0" + "@aws-sdk/middleware-recursion-detection" "3.893.0" + "@aws-sdk/middleware-user-agent" "3.893.0" + "@aws-sdk/region-config-resolver" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@aws-sdk/util-endpoints" "3.893.0" + "@aws-sdk/util-user-agent-browser" "3.893.0" + "@aws-sdk/util-user-agent-node" "3.893.0" + "@smithy/config-resolver" "^4.2.2" + "@smithy/core" "^3.11.1" + "@smithy/fetch-http-handler" "^5.2.1" + "@smithy/hash-node" "^4.1.1" + "@smithy/invalid-dependency" "^4.1.1" + "@smithy/middleware-content-length" "^4.1.1" + "@smithy/middleware-endpoint" "^4.2.3" + "@smithy/middleware-retry" "^4.2.4" + "@smithy/middleware-serde" "^4.1.1" + "@smithy/middleware-stack" "^4.1.1" + "@smithy/node-config-provider" "^4.2.2" + "@smithy/node-http-handler" "^4.2.1" + "@smithy/protocol-http" "^5.2.1" + "@smithy/smithy-client" "^4.6.3" + "@smithy/types" "^4.5.0" + "@smithy/url-parser" "^4.1.1" + "@smithy/util-base64" "^4.1.0" + "@smithy/util-body-length-browser" "^4.1.0" + "@smithy/util-body-length-node" "^4.1.0" + "@smithy/util-defaults-mode-browser" "^4.1.3" + "@smithy/util-defaults-mode-node" "^4.1.3" + "@smithy/util-endpoints" "^3.1.2" + "@smithy/util-middleware" "^4.1.1" + "@smithy/util-retry" "^4.1.2" + "@smithy/util-utf8" "^4.1.0" + tslib "^2.6.2" + +"@aws-sdk/region-config-resolver@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.893.0.tgz#570dfd2314b3f71eb263557bb06fea36b5188cd6" + integrity sha512-/cJvh3Zsa+Of0Zbg7vl9wp/kZtdb40yk/2+XcroAMVPO9hPvmS9r/UOm6tO7FeX4TtkRFwWaQJiTZTgSdsPY+Q== + dependencies: + "@aws-sdk/types" "3.893.0" + "@smithy/node-config-provider" "^4.2.2" + "@smithy/types" "^4.5.0" + "@smithy/util-config-provider" "^4.1.0" + "@smithy/util-middleware" "^4.1.1" + tslib "^2.6.2" + +"@aws-sdk/signature-v4-multi-region@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.893.0.tgz#dc68ffa431db24791d4c1faf458b651093001de9" + integrity sha512-pp4Bn8dL4i68P/mHgZ7sgkm8OSIpwjtGxP73oGseu9Cli0JRyJ1asTSsT60hUz3sbo+3oKk3hEobD6UxLUeGRA== + dependencies: + "@aws-sdk/middleware-sdk-s3" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@smithy/protocol-http" "^5.2.1" + "@smithy/signature-v4" "^5.2.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/token-providers@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.893.0.tgz#f4e08f1837f3a103a60c3c2261a48a66103e19bb" + integrity sha512-nkzuE910TxW4pnIwJ+9xDMx5m+A8iXGM16Oa838YKsds07cgkRp7sPnpH9B8NbGK2szskAAkXfj7t1f59EKd1Q== + dependencies: + "@aws-sdk/core" "3.893.0" + "@aws-sdk/nested-clients" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@smithy/property-provider" "^4.1.1" + "@smithy/shared-ini-file-loader" "^4.2.0" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/types@3.893.0", "@aws-sdk/types@^3.222.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.893.0.tgz#1afbdb9d62bf86caeac380e3cac11a051076400a" + integrity sha512-Aht1nn5SnA0N+Tjv0dzhAY7CQbxVtmq1bBR6xI0MhG7p2XYVh1wXuKTzrldEvQWwA3odOYunAfT9aBiKZx9qIg== + dependencies: + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/util-arn-parser@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-arn-parser/-/util-arn-parser-3.893.0.tgz#fcc9b792744b9da597662891c2422dda83881d8d" + integrity sha512-u8H4f2Zsi19DGnwj5FSZzDMhytYF/bCh37vAtBsn3cNDL3YG578X5oc+wSX54pM3tOxS+NY7tvOAo52SW7koUA== + dependencies: + tslib "^2.6.2" + +"@aws-sdk/util-endpoints@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.893.0.tgz#786874ece0b9daf3d75e2e0995de3830d56712ed" + integrity sha512-xeMcL31jXHKyxRwB3oeNjs8YEpyvMnSYWr2OwLydgzgTr0G349AHlJHwYGCF9xiJ2C27kDxVvXV/Hpdp0p7TWw== + dependencies: + "@aws-sdk/types" "3.893.0" + "@smithy/types" "^4.5.0" + "@smithy/url-parser" "^4.1.1" + "@smithy/util-endpoints" "^3.1.2" + tslib "^2.6.2" + +"@aws-sdk/util-locate-window@^3.0.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.893.0.tgz#5df15f24e1edbe12ff1fe8906f823b51cd53bae8" + integrity sha512-T89pFfgat6c8nMmpI8eKjBcDcgJq36+m9oiXbcUzeU55MP9ZuGgBomGjGnHaEyF36jenW9gmg3NfZDm0AO2XPg== + dependencies: + tslib "^2.6.2" + +"@aws-sdk/util-user-agent-browser@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.893.0.tgz#be0aac5c73a30c2a03aedb2e3501bb277bad79a1" + integrity sha512-PE9NtbDBW6Kgl1bG6A5fF3EPo168tnkj8TgMcT0sg4xYBWsBpq0bpJZRh+Jm5Bkwiw9IgTCLjEU7mR6xWaMB9w== + dependencies: + "@aws-sdk/types" "3.893.0" + "@smithy/types" "^4.5.0" + bowser "^2.11.0" + tslib "^2.6.2" + +"@aws-sdk/util-user-agent-node@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.893.0.tgz#19c1660f92630611435cba42a199e7cf9598523e" + integrity sha512-tTRkJo/fth9NPJ2AO/XLuJWVsOhbhejQRLyP0WXG3z0Waa5IWK5YBxBC1tWWATUCwsN748JQXU03C1aF9cRD9w== + dependencies: + "@aws-sdk/middleware-user-agent" "3.893.0" + "@aws-sdk/types" "3.893.0" + "@smithy/node-config-provider" "^4.2.2" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws-sdk/xml-builder@3.893.0": + version "3.893.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.893.0.tgz#6f91bd81462ad8a2ee1c563ba38b026b11414cd2" + integrity sha512-qKkJ2E0hU60iq0o2+hBSIWS8sf34xhqiRRGw5nbRhwEnE2MsWsWBpRoysmr32uq9dHMWUzII0c/fS29+wOSdMA== + dependencies: + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@aws/lambda-invoke-store@^0.0.1": + version "0.0.1" + resolved "https://registry.yarnpkg.com/@aws/lambda-invoke-store/-/lambda-invoke-store-0.0.1.tgz#92d792a7dda250dfcb902e13228f37a81be57c8f" + integrity sha512-ORHRQ2tmvnBXc8t/X9Z8IcSbBA4xTLKuN873FopzklHMeqBst7YG0d+AX97inkvDX+NChYtSr+qGfcqGFaI8Zw== + +"@biomejs/biome@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@biomejs/biome/-/biome-2.2.0.tgz#823ba77363651f310c47909747c879791ebd15c9" + integrity sha512-3On3RSYLsX+n9KnoSgfoYlckYBoU6VRM22cw1gB4Y0OuUVSYd/O/2saOJMrA4HFfA1Ff0eacOvMN1yAAvHtzIw== + optionalDependencies: + "@biomejs/cli-darwin-arm64" "2.2.0" + "@biomejs/cli-darwin-x64" "2.2.0" + "@biomejs/cli-linux-arm64" "2.2.0" + "@biomejs/cli-linux-arm64-musl" "2.2.0" + "@biomejs/cli-linux-x64" "2.2.0" + "@biomejs/cli-linux-x64-musl" "2.2.0" + "@biomejs/cli-win32-arm64" "2.2.0" + "@biomejs/cli-win32-x64" "2.2.0" + +"@biomejs/cli-darwin-arm64@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.2.0.tgz#1abf9508e7d0776871710687ddad36e692dce3bc" + integrity sha512-zKbwUUh+9uFmWfS8IFxmVD6XwqFcENjZvEyfOxHs1epjdH3wyyMQG80FGDsmauPwS2r5kXdEM0v/+dTIA9FXAg== + +"@biomejs/cli-darwin-x64@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.2.0.tgz#3a51aa569505fedd3a32bb914d608ec27d87f26d" + integrity sha512-+OmT4dsX2eTfhD5crUOPw3RPhaR+SKVspvGVmSdZ9y9O/AgL8pla6T4hOn1q+VAFBHuHhsdxDRJgFCSC7RaMOw== + +"@biomejs/cli-linux-arm64-musl@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.2.0.tgz#4d720930732a825b7a8c7cfe1741aec9e7d5ae1d" + integrity sha512-egKpOa+4FL9YO+SMUMLUvf543cprjevNc3CAgDNFLcjknuNMcZ0GLJYa3EGTCR2xIkIUJDVneBV3O9OcIlCEZQ== + +"@biomejs/cli-linux-arm64@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.2.0.tgz#d0a5c153ff9243b15600781947d70d6038226feb" + integrity sha512-6eoRdF2yW5FnW9Lpeivh7Mayhq0KDdaDMYOJnH9aT02KuSIX5V1HmWJCQQPwIQbhDh68Zrcpl8inRlTEan0SXw== + +"@biomejs/cli-linux-x64-musl@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.2.0.tgz#946095b0a444f395b2df9244153e1cd6b07404c0" + integrity sha512-I5J85yWwUWpgJyC1CcytNSGusu2p9HjDnOPAFG4Y515hwRD0jpR9sT9/T1cKHtuCvEQ/sBvx+6zhz9l9wEJGAg== + +"@biomejs/cli-linux-x64@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-x64/-/cli-linux-x64-2.2.0.tgz#ae01e0a70c7cd9f842c77dfb4ebd425734667a34" + integrity sha512-5UmQx/OZAfJfi25zAnAGHUMuOd+LOsliIt119x2soA2gLggQYrVPA+2kMUxR6Mw5M1deUF/AWWP2qpxgH7Nyfw== + +"@biomejs/cli-win32-arm64@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.2.0.tgz#09a3988b9d4bab8b8b3a41b4de9560bf70943964" + integrity sha512-n9a1/f2CwIDmNMNkFs+JI0ZjFnMO0jdOyGNtihgUNFnlmd84yIYY2KMTBmMV58ZlVHjgmY5Y6E1hVTnSRieggA== + +"@biomejs/cli-win32-x64@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@biomejs/cli-win32-x64/-/cli-win32-x64-2.2.0.tgz#5d2523b421d847b13fac146cf745436ea8a72b95" + integrity sha512-Nawu5nHjP/zPKTIryh2AavzTc/KEg4um/MxWdXW0A6P/RZOyIpa7+QSjeXwAwX/utJGaCoXRPWtF3m5U/bB3Ww== + +"@drizzle-team/brocli@^0.10.2": + version "0.10.2" + resolved "https://registry.yarnpkg.com/@drizzle-team/brocli/-/brocli-0.10.2.tgz#9757c006a43daaa6f45512e6cf5fabed36fb9da7" + integrity sha512-z33Il7l5dKjUgGULTqBsQBQwckHh5AbIuxhdsIxDDiZAzBOrZO6q9ogcWC65kU382AfynTfgNumVcNIjuIua6w== + +"@emnapi/core@^1.4.3", "@emnapi/core@^1.4.5": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.5.0.tgz#85cd84537ec989cebb2343606a1ee663ce4edaf0" + integrity sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg== + dependencies: + "@emnapi/wasi-threads" "1.1.0" + tslib "^2.4.0" + +"@emnapi/runtime@^1.4.3", "@emnapi/runtime@^1.4.5", "@emnapi/runtime@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.5.0.tgz#9aebfcb9b17195dce3ab53c86787a6b7d058db73" + integrity sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ== + dependencies: + tslib "^2.4.0" + +"@emnapi/wasi-threads@1.1.0", "@emnapi/wasi-threads@^1.0.4": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz#60b2102fddc9ccb78607e4a3cf8403ea69be41bf" + integrity sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ== + dependencies: + tslib "^2.4.0" + +"@esbuild-kit/core-utils@^3.3.2": + version "3.3.2" + resolved "https://registry.yarnpkg.com/@esbuild-kit/core-utils/-/core-utils-3.3.2.tgz#186b6598a5066f0413471d7c4d45828e399ba96c" + integrity sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ== + dependencies: + esbuild "~0.18.20" + source-map-support "^0.5.21" + +"@esbuild-kit/esm-loader@^2.5.5": + version "2.6.5" + resolved "https://registry.yarnpkg.com/@esbuild-kit/esm-loader/-/esm-loader-2.6.5.tgz#6eedee46095d7d13b1efc381e2211ed1c60e64ea" + integrity sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA== + dependencies: + "@esbuild-kit/core-utils" "^3.3.2" + get-tsconfig "^4.7.0" + +"@esbuild/aix-ppc64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz#ee6b7163a13528e099ecf562b972f2bcebe0aa97" + integrity sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw== + +"@esbuild/android-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622" + integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ== + +"@esbuild/android-arm64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.10.tgz#115fc76631e82dd06811bfaf2db0d4979c16e2cb" + integrity sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg== + +"@esbuild/android-arm@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682" + integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw== + +"@esbuild/android-arm@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.10.tgz#8d5811912da77f615398611e5bbc1333fe321aa9" + integrity sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w== + +"@esbuild/android-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2" + integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg== + +"@esbuild/android-x64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.10.tgz#e3e96516b2d50d74105bb92594c473e30ddc16b1" + integrity sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg== + +"@esbuild/darwin-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1" + integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA== + +"@esbuild/darwin-arm64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.10.tgz#6af6bb1d05887dac515de1b162b59dc71212ed76" + integrity sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA== + +"@esbuild/darwin-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d" + integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ== + +"@esbuild/darwin-x64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.10.tgz#99ae82347fbd336fc2d28ffd4f05694e6e5b723d" + integrity sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg== + +"@esbuild/freebsd-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54" + integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw== + +"@esbuild/freebsd-arm64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.10.tgz#0c6d5558a6322b0bdb17f7025c19bd7d2359437d" + integrity sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg== + +"@esbuild/freebsd-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e" + integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ== + +"@esbuild/freebsd-x64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.10.tgz#8c35873fab8c0857a75300a3dcce4324ca0b9844" + integrity sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA== + +"@esbuild/linux-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0" + integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA== + +"@esbuild/linux-arm64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.10.tgz#3edc2f87b889a15b4cedaf65f498c2bed7b16b90" + integrity sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ== + +"@esbuild/linux-arm@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0" + integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg== + +"@esbuild/linux-arm@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.10.tgz#86501cfdfb3d110176d80c41b27ed4611471cde7" + integrity sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg== + +"@esbuild/linux-ia32@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7" + integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA== + +"@esbuild/linux-ia32@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.10.tgz#e6589877876142537c6864680cd5d26a622b9d97" + integrity sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ== + +"@esbuild/linux-loong64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d" + integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg== + +"@esbuild/linux-loong64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.10.tgz#11119e18781f136d8083ea10eb6be73db7532de8" + integrity sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg== + +"@esbuild/linux-mips64el@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231" + integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ== + +"@esbuild/linux-mips64el@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.10.tgz#3052f5436b0c0c67a25658d5fc87f045e7def9e6" + integrity sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA== + +"@esbuild/linux-ppc64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb" + integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA== + +"@esbuild/linux-ppc64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.10.tgz#2f098920ee5be2ce799f35e367b28709925a8744" + integrity sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA== + +"@esbuild/linux-riscv64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6" + integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A== + +"@esbuild/linux-riscv64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.10.tgz#fa51d7fd0a22a62b51b4b94b405a3198cf7405dd" + integrity sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA== + +"@esbuild/linux-s390x@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071" + integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ== + +"@esbuild/linux-s390x@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.10.tgz#a27642e36fc282748fdb38954bd3ef4f85791e8a" + integrity sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew== + +"@esbuild/linux-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338" + integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w== + +"@esbuild/linux-x64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz#9d9b09c0033d17529570ced6d813f98315dfe4e9" + integrity sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA== + +"@esbuild/netbsd-arm64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.10.tgz#25c09a659c97e8af19e3f2afd1c9190435802151" + integrity sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A== + +"@esbuild/netbsd-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1" + integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A== + +"@esbuild/netbsd-x64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.10.tgz#7fa5f6ffc19be3a0f6f5fd32c90df3dc2506937a" + integrity sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig== + +"@esbuild/openbsd-arm64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.10.tgz#8faa6aa1afca0c6d024398321d6cb1c18e72a1c3" + integrity sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw== + +"@esbuild/openbsd-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae" + integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg== + +"@esbuild/openbsd-x64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.10.tgz#a42979b016f29559a8453d32440d3c8cd420af5e" + integrity sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw== + +"@esbuild/openharmony-arm64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.10.tgz#fd87bfeadd7eeb3aa384bbba907459ffa3197cb1" + integrity sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag== + +"@esbuild/sunos-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d" + integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ== + +"@esbuild/sunos-x64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.10.tgz#3a18f590e36cb78ae7397976b760b2b8c74407f4" + integrity sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ== + +"@esbuild/win32-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9" + integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg== + +"@esbuild/win32-arm64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.10.tgz#e71741a251e3fd971408827a529d2325551f530c" + integrity sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw== + +"@esbuild/win32-ia32@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102" + integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g== + +"@esbuild/win32-ia32@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.10.tgz#c6f010b5d3b943d8901a0c87ea55f93b8b54bf94" + integrity sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw== + +"@esbuild/win32-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d" + integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ== + +"@esbuild/win32-x64@0.25.10": + version "0.25.10" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.10.tgz#e4b3e255a1b4aea84f6e1d2ae0b73f826c3785bd" + integrity sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw== + +"@img/colour@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@img/colour/-/colour-1.0.0.tgz#d2fabb223455a793bf3bf9c70de3d28526aa8311" + integrity sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw== + +"@img/sharp-darwin-arm64@0.34.4": + version "0.34.4" + resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.4.tgz#8a0dcac9e621ff533fbf2e830f6a977b38d67a0c" + integrity sha512-sitdlPzDVyvmINUdJle3TNHl+AG9QcwiAMsXmccqsCOMZNIdW2/7S26w0LyU8euiLVzFBL3dXPwVCq/ODnf2vA== + optionalDependencies: + "@img/sharp-libvips-darwin-arm64" "1.2.3" + +"@img/sharp-darwin-x64@0.34.4": + version "0.34.4" + resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.4.tgz#0ba2bd9dbf07f7300fab73305b787e66156f7752" + integrity sha512-rZheupWIoa3+SOdF/IcUe1ah4ZDpKBGWcsPX6MT0lYniH9micvIU7HQkYTfrx5Xi8u+YqwLtxC/3vl8TQN6rMg== + optionalDependencies: + "@img/sharp-libvips-darwin-x64" "1.2.3" + +"@img/sharp-libvips-darwin-arm64@1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.3.tgz#f43c9aa3b74fd307e4318da63ebbe0ed4c34e744" + integrity sha512-QzWAKo7kpHxbuHqUC28DZ9pIKpSi2ts2OJnoIGI26+HMgq92ZZ4vk8iJd4XsxN+tYfNJxzH6W62X5eTcsBymHw== + +"@img/sharp-libvips-darwin-x64@1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.3.tgz#c42ff786d4a1f42ef8929dba4a989dd5df6417f0" + integrity sha512-Ju+g2xn1E2AKO6YBhxjj+ACcsPQRHT0bhpglxcEf+3uyPY+/gL8veniKoo96335ZaPo03bdDXMv0t+BBFAbmRA== + +"@img/sharp-libvips-linux-arm64@1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.3.tgz#c9073e5c4b629ee417f777db21c552910d84ed77" + integrity sha512-I4RxkXU90cpufazhGPyVujYwfIm9Nk1QDEmiIsaPwdnm013F7RIceaCc87kAH+oUB1ezqEvC6ga4m7MSlqsJvQ== + +"@img/sharp-libvips-linux-arm@1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.3.tgz#3cbc333fd6b8f224a14d69b03a1dd11df897c799" + integrity sha512-x1uE93lyP6wEwGvgAIV0gP6zmaL/a0tGzJs/BIDDG0zeBhMnuUPm7ptxGhUbcGs4okDJrk4nxgrmxpib9g6HpA== + +"@img/sharp-libvips-linux-ppc64@1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.3.tgz#68e0e0076299f43d838468675674fabcc7161d16" + integrity sha512-Y2T7IsQvJLMCBM+pmPbM3bKT/yYJvVtLJGfCs4Sp95SjvnFIjynbjzsa7dY1fRJX45FTSfDksbTp6AGWudiyCg== + +"@img/sharp-libvips-linux-s390x@1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.3.tgz#7da9ab11a50c0ca905979f0aae14a4ccffab27b2" + integrity sha512-RgWrs/gVU7f+K7P+KeHFaBAJlNkD1nIZuVXdQv6S+fNA6syCcoboNjsV2Pou7zNlVdNQoQUpQTk8SWDHUA3y/w== + +"@img/sharp-libvips-linux-x64@1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.3.tgz#3b162d6b190cf77926819040e09fb15eec42135e" + integrity sha512-3JU7LmR85K6bBiRzSUc/Ff9JBVIFVvq6bomKE0e63UXGeRw2HPVEjoJke1Yx+iU4rL7/7kUjES4dZ/81Qjhyxg== + +"@img/sharp-libvips-linuxmusl-arm64@1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.3.tgz#ac99576630dd8e33cb598d7c4586f6e0655912ea" + integrity sha512-F9q83RZ8yaCwENw1GieztSfj5msz7GGykG/BA+MOUefvER69K/ubgFHNeSyUu64amHIYKGDs4sRCMzXVj8sEyw== + +"@img/sharp-libvips-linuxmusl-x64@1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.3.tgz#93e9495af7bf6c4e0d41dd71d0196c35c3753a1c" + integrity sha512-U5PUY5jbc45ANM6tSJpsgqmBF/VsL6LnxJmIf11kB7J5DctHgqm0SkuXzVWtIY90GnJxKnC/JT251TDnk1fu/g== + +"@img/sharp-linux-arm64@0.34.4": + version "0.34.4" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.4.tgz#0570ff1a4fa6e1d6779456fca8b5e8c18a6a9cf2" + integrity sha512-YXU1F/mN/Wu786tl72CyJjP/Ngl8mGHN1hST4BGl+hiW5jhCnV2uRVTNOcaYPs73NeT/H8Upm3y9582JVuZHrQ== + optionalDependencies: + "@img/sharp-libvips-linux-arm64" "1.2.3" + +"@img/sharp-linux-arm@0.34.4": + version "0.34.4" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.4.tgz#5f020d933f54f3fc49203d32c3b7dd0ec11ffcdb" + integrity sha512-Xyam4mlqM0KkTHYVSuc6wXRmM7LGN0P12li03jAnZ3EJWZqj83+hi8Y9UxZUbxsgsK1qOEwg7O0Bc0LjqQVtxA== + optionalDependencies: + "@img/sharp-libvips-linux-arm" "1.2.3" + +"@img/sharp-linux-ppc64@0.34.4": + version "0.34.4" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.4.tgz#8d5775f6dc7e30ea3a1efa43798b7690bb5cb344" + integrity sha512-F4PDtF4Cy8L8hXA2p3TO6s4aDt93v+LKmpcYFLAVdkkD3hSxZzee0rh6/+94FpAynsuMpLX5h+LRsSG3rIciUQ== + optionalDependencies: + "@img/sharp-libvips-linux-ppc64" "1.2.3" + +"@img/sharp-linux-s390x@0.34.4": + version "0.34.4" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.4.tgz#740aa5b369188ee2c1913b1015e7f830f4dfdb50" + integrity sha512-qVrZKE9Bsnzy+myf7lFKvng6bQzhNUAYcVORq2P7bDlvmF6u2sCmK2KyEQEBdYk+u3T01pVsPrkj943T1aJAsw== + optionalDependencies: + "@img/sharp-libvips-linux-s390x" "1.2.3" + +"@img/sharp-linux-x64@0.34.4": + version "0.34.4" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.4.tgz#573ce4196b2d0771bba32acc13a37b7adc9b6212" + integrity sha512-ZfGtcp2xS51iG79c6Vhw9CWqQC8l2Ot8dygxoDoIQPTat/Ov3qAa8qpxSrtAEAJW+UjTXc4yxCjNfxm4h6Xm2A== + optionalDependencies: + "@img/sharp-libvips-linux-x64" "1.2.3" + +"@img/sharp-linuxmusl-arm64@0.34.4": + version "0.34.4" + resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.4.tgz#3c91bc8348cc3b42b43c6fca14f9dbb5cb47bd0d" + integrity sha512-8hDVvW9eu4yHWnjaOOR8kHVrew1iIX+MUgwxSuH2XyYeNRtLUe4VNioSqbNkB7ZYQJj9rUTT4PyRscyk2PXFKA== + optionalDependencies: + "@img/sharp-libvips-linuxmusl-arm64" "1.2.3" + +"@img/sharp-linuxmusl-x64@0.34.4": + version "0.34.4" + resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.4.tgz#33de7d476ac9e2db7ef654331b54cc679b806bda" + integrity sha512-lU0aA5L8QTlfKjpDCEFOZsTYGn3AEiO6db8W5aQDxj0nQkVrZWmN3ZP9sYKWJdtq3PWPhUNlqehWyXpYDcI9Sg== + optionalDependencies: + "@img/sharp-libvips-linuxmusl-x64" "1.2.3" + +"@img/sharp-wasm32@0.34.4": + version "0.34.4" + resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.34.4.tgz#d617f7b3f851f899802298f360667c20605c0198" + integrity sha512-33QL6ZO/qpRyG7woB/HUALz28WnTMI2W1jgX3Nu2bypqLIKx/QKMILLJzJjI+SIbvXdG9fUnmrxR7vbi1sTBeA== + dependencies: + "@emnapi/runtime" "^1.5.0" + +"@img/sharp-win32-arm64@0.34.4": + version "0.34.4" + resolved "https://registry.yarnpkg.com/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.4.tgz#38e2c8a88826eac647f7c3f99efefb39897a8f5c" + integrity sha512-2Q250do/5WXTwxW3zjsEuMSv5sUU4Tq9VThWKlU2EYLm4MB7ZeMwF+SFJutldYODXF6jzc6YEOC+VfX0SZQPqA== + +"@img/sharp-win32-ia32@0.34.4": + version "0.34.4" + resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.4.tgz#003a7eb0fdaba600790c3007cfd756e41a9cf749" + integrity sha512-3ZeLue5V82dT92CNL6rsal6I2weKw1cYu+rGKm8fOCCtJTR2gYeUfY3FqUnIJsMUPIH68oS5jmZ0NiJ508YpEw== + +"@img/sharp-win32-x64@0.34.4": + version "0.34.4" + resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.4.tgz#b19f1f88ace8bfc20784a0ad31767f3438e025d1" + integrity sha512-xIyj4wpYs8J18sVN3mSQjwrw7fKUqRw+Z5rnHNCy5fYTxigBz81u5mOMPmFumwjcn8+ld1ppptMBCLic1nz6ig== + +"@isaacs/fs-minipass@^4.0.0": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz#2d59ae3ab4b38fb4270bfa23d30f8e2e86c7fe32" + integrity sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w== + dependencies: + minipass "^7.0.4" + +"@jridgewell/gen-mapping@^0.3.5": + version "0.3.13" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f" + integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA== + dependencies: + "@jridgewell/sourcemap-codec" "^1.5.0" + "@jridgewell/trace-mapping" "^0.3.24" + +"@jridgewell/remapping@^2.3.4": + version "2.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/remapping/-/remapping-2.3.5.tgz#375c476d1972947851ba1e15ae8f123047445aa1" + integrity sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ== + dependencies: + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.24" + +"@jridgewell/resolve-uri@^3.1.0": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" + integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== + +"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0", "@jridgewell/sourcemap-codec@^1.5.5": + version "1.5.5" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba" + integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og== + +"@jridgewell/trace-mapping@^0.3.24": + version "0.3.31" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0" + integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw== + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + +"@napi-rs/wasm-runtime@^0.2.12": + version "0.2.12" + resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz#3e78a8b96e6c33a6c517e1894efbd5385a7cb6f2" + integrity sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ== + dependencies: + "@emnapi/core" "^1.4.3" + "@emnapi/runtime" "^1.4.3" + "@tybys/wasm-util" "^0.10.0" + +"@next/env@15.5.3": + version "15.5.3" + resolved "https://registry.yarnpkg.com/@next/env/-/env-15.5.3.tgz#59ab3143b370774464143731587318b067cc3f87" + integrity sha512-RSEDTRqyihYXygx/OJXwvVupfr9m04+0vH8vyy0HfZ7keRto6VX9BbEk0J2PUk0VGy6YhklJUSrgForov5F9pw== + +"@next/swc-darwin-arm64@15.5.3": + version "15.5.3" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.3.tgz#f1bd728baf9b0ed0b6261a2fbc6436906cf9472e" + integrity sha512-nzbHQo69+au9wJkGKTU9lP7PXv0d1J5ljFpvb+LnEomLtSbJkbZyEs6sbF3plQmiOB2l9OBtN2tNSvCH1nQ9Jg== + +"@next/swc-darwin-x64@15.5.3": + version "15.5.3" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.3.tgz#8aad9294398a693e418611f0d22a8db66e78fb6a" + integrity sha512-w83w4SkOOhekJOcA5HBvHyGzgV1W/XvOfpkrxIse4uPWhYTTRwtGEM4v/jiXwNSJvfRvah0H8/uTLBKRXlef8g== + +"@next/swc-linux-arm64-gnu@15.5.3": + version "15.5.3" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.3.tgz#44949d152340cc455365fa831abd85fbe1e21d4b" + integrity sha512-+m7pfIs0/yvgVu26ieaKrifV8C8yiLe7jVp9SpcIzg7XmyyNE7toC1fy5IOQozmr6kWl/JONC51osih2RyoXRw== + +"@next/swc-linux-arm64-musl@15.5.3": + version "15.5.3" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.3.tgz#5fd36263c09f460e55da566fb785ac4af0a98756" + integrity sha512-u3PEIzuguSenoZviZJahNLgCexGFhso5mxWCrrIMdvpZn6lkME5vc/ADZG8UUk5K1uWRy4hqSFECrON6UKQBbQ== + +"@next/swc-linux-x64-gnu@15.5.3": + version "15.5.3" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.3.tgz#b30ad14372b8266df70c799420133846273c9461" + integrity sha512-lDtOOScYDZxI2BENN9m0pfVPJDSuUkAD1YXSvlJF0DKwZt0WlA7T7o3wrcEr4Q+iHYGzEaVuZcsIbCps4K27sA== + +"@next/swc-linux-x64-musl@15.5.3": + version "15.5.3" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.3.tgz#572e6a9cfaf685148304298222c9bd73dc055a3a" + integrity sha512-9vWVUnsx9PrY2NwdVRJ4dUURAQ8Su0sLRPqcCCxtX5zIQUBES12eRVHq6b70bbfaVaxIDGJN2afHui0eDm+cLg== + +"@next/swc-win32-arm64-msvc@15.5.3": + version "15.5.3" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.3.tgz#d52e475b1c3be6e90be3657f54ed5561528850d7" + integrity sha512-1CU20FZzY9LFQigRi6jM45oJMU3KziA5/sSG+dXeVaTm661snQP6xu3ykGxxwU5sLG3sh14teO/IOEPVsQMRfA== + +"@next/swc-win32-x64-msvc@15.5.3": + version "15.5.3" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.3.tgz#d716c04efa8568680da1c14f5595d932268086f2" + integrity sha512-JMoLAq3n3y5tKXPQwCK5c+6tmwkuFDa2XAxz8Wm4+IVthdBZdZGh+lmiLUHg9f9IDwIQpUjp+ysd6OkYTyZRZw== + +"@smithy/abort-controller@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.1.1.tgz#9b3872ab6b2c061486175c281dadc0a853260533" + integrity sha512-vkzula+IwRvPR6oKQhMYioM3A/oX/lFCZiwuxkQbRhqJS2S4YRY2k7k/SyR2jMf3607HLtbEwlRxi0ndXHMjRg== + dependencies: + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/chunked-blob-reader-native@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.1.0.tgz#4d814dd07ebb1f579daf51671945389f9772400f" + integrity sha512-Bnv0B3nSlfB2mPO0WgM49I/prl7+kamF042rrf3ezJ3Z4C7csPYvyYgZfXTGXwXfj1mAwDWjE/ybIf49PzFzvA== + dependencies: + "@smithy/util-base64" "^4.1.0" + tslib "^2.6.2" + +"@smithy/chunked-blob-reader@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.1.0.tgz#48fa62c85b146be2a06525f0457ce58a46d69ab0" + integrity sha512-a36AtR7Q7XOhRPt6F/7HENmTWcB8kN7mDJcOFM/+FuKO6x88w8MQJfYCufMWh4fGyVkPjUh3Rrz/dnqFQdo6OQ== + dependencies: + tslib "^2.6.2" + +"@smithy/config-resolver@^4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.2.2.tgz#3f6a3c163f9b5b7f852d7d1817bc9e3b2136fa5f" + integrity sha512-IT6MatgBWagLybZl1xQcURXRICvqz1z3APSCAI9IqdvfCkrA7RaQIEfgC6G/KvfxnDfQUDqFV+ZlixcuFznGBQ== + dependencies: + "@smithy/node-config-provider" "^4.2.2" + "@smithy/types" "^4.5.0" + "@smithy/util-config-provider" "^4.1.0" + "@smithy/util-middleware" "^4.1.1" + tslib "^2.6.2" + +"@smithy/core@^3.11.1": + version "3.11.1" + resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.11.1.tgz#670067d5c9e81f860b6d4d1494520ec518b38f43" + integrity sha512-REH7crwORgdjSpYs15JBiIWOYjj0hJNC3aCecpJvAlMMaaqL5i2CLb1i6Hc4yevToTKSqslLMI9FKjhugEwALA== + dependencies: + "@smithy/middleware-serde" "^4.1.1" + "@smithy/protocol-http" "^5.2.1" + "@smithy/types" "^4.5.0" + "@smithy/util-base64" "^4.1.0" + "@smithy/util-body-length-browser" "^4.1.0" + "@smithy/util-middleware" "^4.1.1" + "@smithy/util-stream" "^4.3.2" + "@smithy/util-utf8" "^4.1.0" + "@types/uuid" "^9.0.1" + tslib "^2.6.2" + uuid "^9.0.1" + +"@smithy/credential-provider-imds@^4.1.2": + version "4.1.2" + resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.1.2.tgz#68662c873dbe812c13159cb2be3c4ba8aeb52149" + integrity sha512-JlYNq8TShnqCLg0h+afqe2wLAwZpuoSgOyzhYvTgbiKBWRov+uUve+vrZEQO6lkdLOWPh7gK5dtb9dS+KGendg== + dependencies: + "@smithy/node-config-provider" "^4.2.2" + "@smithy/property-provider" "^4.1.1" + "@smithy/types" "^4.5.0" + "@smithy/url-parser" "^4.1.1" + tslib "^2.6.2" + +"@smithy/eventstream-codec@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-4.1.1.tgz#637eb4bceecc3ef588b86c28506439a9cdd7a41f" + integrity sha512-PwkQw1hZwHTQB6X5hSUWz2OSeuj5Z6enWuAqke7DgWoP3t6vg3ktPpqPz3Erkn6w+tmsl8Oss6nrgyezoea2Iw== + dependencies: + "@aws-crypto/crc32" "5.2.0" + "@smithy/types" "^4.5.0" + "@smithy/util-hex-encoding" "^4.1.0" + tslib "^2.6.2" + +"@smithy/eventstream-serde-browser@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.1.1.tgz#f7df13ebd5a6028b12b496f12eecdd08c4c9b792" + integrity sha512-Q9QWdAzRaIuVkefupRPRFAasaG/droBqn1feiMnmLa+LLEUG45pqX1+FurHFmlqiCfobB3nUlgoJfeXZsr7MPA== + dependencies: + "@smithy/eventstream-serde-universal" "^4.1.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/eventstream-serde-config-resolver@^4.2.1": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.2.1.tgz#77333a110361bfe2749b685d31e01299ede87c40" + integrity sha512-oSUkF9zDN9zcOUBMtxp8RewJlh71E9NoHWU8jE3hU9JMYCsmW4assVTpgic/iS3/dM317j6hO5x18cc3XrfvEw== + dependencies: + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/eventstream-serde-node@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.1.1.tgz#635819a756cb8a69a7e3eb91ca9076284ea00939" + integrity sha512-tn6vulwf/ScY0vjhzptSJuDJJqlhNtUjkxJ4wiv9E3SPoEqTEKbaq6bfqRO7nvhTG29ALICRcvfFheOUPl8KNA== + dependencies: + "@smithy/eventstream-serde-universal" "^4.1.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/eventstream-serde-universal@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.1.1.tgz#803cdde6a17ac501cc700ce38400caf70715ecb1" + integrity sha512-uLOAiM/Dmgh2CbEXQx+6/ssK7fbzFhd+LjdyFxXid5ZBCbLHTFHLdD/QbXw5aEDsLxQhgzDxLLsZhsftAYwHJA== + dependencies: + "@smithy/eventstream-codec" "^4.1.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/fetch-http-handler@^5.2.1": + version "5.2.1" + resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.2.1.tgz#fe284a00f1b3a35edf9fba454d287b7f74ef20af" + integrity sha512-5/3wxKNtV3wO/hk1is+CZUhL8a1yy/U+9u9LKQ9kZTkMsHaQjJhc3stFfiujtMnkITjzWfndGA2f7g9Uh9vKng== + dependencies: + "@smithy/protocol-http" "^5.2.1" + "@smithy/querystring-builder" "^4.1.1" + "@smithy/types" "^4.5.0" + "@smithy/util-base64" "^4.1.0" + tslib "^2.6.2" + +"@smithy/hash-blob-browser@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/hash-blob-browser/-/hash-blob-browser-4.1.1.tgz#fbcab0008b973ccf370c698cd11ec8d9584607c8" + integrity sha512-avAtk++s1e/1VODf+rg7c9R2pB5G9y8yaJaGY4lPZI2+UIqVyuSDMikWjeWfBVmFZ3O7NpDxBbUCyGhThVUKWQ== + dependencies: + "@smithy/chunked-blob-reader" "^5.1.0" + "@smithy/chunked-blob-reader-native" "^4.1.0" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/hash-node@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.1.1.tgz#86ceca92487492267e944e4f4507106b731e7971" + integrity sha512-H9DIU9WBLhYrvPs9v4sYvnZ1PiAI0oc8CgNQUJ1rpN3pP7QADbTOUjchI2FB764Ub0DstH5xbTqcMJu1pnVqxA== + dependencies: + "@smithy/types" "^4.5.0" + "@smithy/util-buffer-from" "^4.1.0" + "@smithy/util-utf8" "^4.1.0" + tslib "^2.6.2" + +"@smithy/hash-stream-node@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/hash-stream-node/-/hash-stream-node-4.1.1.tgz#1d8e4485fa15c458d7a8248a50d0f5f91705cced" + integrity sha512-3ztT4pV0Moazs3JAYFdfKk11kYFDo4b/3R3+xVjIm6wY9YpJf+xfz+ocEnNKcWAdcmSMqi168i2EMaKmJHbJMA== + dependencies: + "@smithy/types" "^4.5.0" + "@smithy/util-utf8" "^4.1.0" + tslib "^2.6.2" + +"@smithy/invalid-dependency@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.1.1.tgz#2511335ff889944701c7d2a3b1e4a4d6fe9ddfab" + integrity sha512-1AqLyFlfrrDkyES8uhINRlJXmHA2FkG+3DY8X+rmLSqmFwk3DJnvhyGzyByPyewh2jbmV+TYQBEfngQax8IFGg== + dependencies: + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/is-array-buffer@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz#f84f0d9f9a36601a9ca9381688bd1b726fd39111" + integrity sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA== + dependencies: + tslib "^2.6.2" + +"@smithy/is-array-buffer@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-4.1.0.tgz#d18a2f22280e7173633cb91a9bdb6f3d8a6560b8" + integrity sha512-ePTYUOV54wMogio+he4pBybe8fwg4sDvEVDBU8ZlHOZXbXK3/C0XfJgUCu6qAZcawv05ZhZzODGUerFBPsPUDQ== + dependencies: + tslib "^2.6.2" + +"@smithy/md5-js@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/md5-js/-/md5-js-4.1.1.tgz#df81396bef83eb17bce531c871af935df986bdfc" + integrity sha512-MvWXKK743BuHjr/hnWuT6uStdKEaoqxHAQUvbKJPPZM5ZojTNFI5D+47BoQfBE5RgGlRRty05EbWA+NXDv+hIA== + dependencies: + "@smithy/types" "^4.5.0" + "@smithy/util-utf8" "^4.1.0" + tslib "^2.6.2" + +"@smithy/middleware-content-length@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.1.1.tgz#eaea7bd14c7a0b64aef87b8c372c2a04d7b9cb72" + integrity sha512-9wlfBBgTsRvC2JxLJxv4xDGNBrZuio3AgSl0lSFX7fneW2cGskXTYpFxCdRYD2+5yzmsiTuaAJD1Wp7gWt9y9w== + dependencies: + "@smithy/protocol-http" "^5.2.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/middleware-endpoint@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.2.3.tgz#6d64026923420971f2da937d6ea642011471f7a5" + integrity sha512-+1H5A28DeffRVrqmVmtqtRraEjoaC6JVap3xEQdVoBh2EagCVY7noPmcBcG4y7mnr9AJitR1ZAse2l+tEtK5vg== + dependencies: + "@smithy/core" "^3.11.1" + "@smithy/middleware-serde" "^4.1.1" + "@smithy/node-config-provider" "^4.2.2" + "@smithy/shared-ini-file-loader" "^4.2.0" + "@smithy/types" "^4.5.0" + "@smithy/url-parser" "^4.1.1" + "@smithy/util-middleware" "^4.1.1" + tslib "^2.6.2" + +"@smithy/middleware-retry@^4.2.4": + version "4.2.4" + resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.2.4.tgz#16334bf0f5b588a404255f5c827c79bb39888104" + integrity sha512-amyqYQFewnAviX3yy/rI/n1HqAgfvUdkEhc04kDjxsngAUREKuOI24iwqQUirrj6GtodWmR4iO5Zeyl3/3BwWg== + dependencies: + "@smithy/node-config-provider" "^4.2.2" + "@smithy/protocol-http" "^5.2.1" + "@smithy/service-error-classification" "^4.1.2" + "@smithy/smithy-client" "^4.6.3" + "@smithy/types" "^4.5.0" + "@smithy/util-middleware" "^4.1.1" + "@smithy/util-retry" "^4.1.2" + "@types/uuid" "^9.0.1" + tslib "^2.6.2" + uuid "^9.0.1" + +"@smithy/middleware-serde@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.1.1.tgz#cfb99f53c744d7730928235cbe66cc7ff8a8a9b2" + integrity sha512-lh48uQdbCoj619kRouev5XbWhCwRKLmphAif16c4J6JgJ4uXjub1PI6RL38d3BLliUvSso6klyB/LTNpWSNIyg== + dependencies: + "@smithy/protocol-http" "^5.2.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/middleware-stack@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.1.1.tgz#1d533fde4ccbb62d7fc0f0b8ac518b7e4791e311" + integrity sha512-ygRnniqNcDhHzs6QAPIdia26M7e7z9gpkIMUe/pK0RsrQ7i5MblwxY8078/QCnGq6AmlUUWgljK2HlelsKIb/A== + dependencies: + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/node-config-provider@^4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.2.2.tgz#ede9ac2f689cfdf26815a53fadf139e6aa77bdbb" + integrity sha512-SYGTKyPvyCfEzIN5rD8q/bYaOPZprYUPD2f5g9M7OjaYupWOoQFYJ5ho+0wvxIRf471i2SR4GoiZ2r94Jq9h6A== + dependencies: + "@smithy/property-provider" "^4.1.1" + "@smithy/shared-ini-file-loader" "^4.2.0" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/node-http-handler@^4.2.1": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.2.1.tgz#d7ab8e31659030d3d5a68f0982f15c00b1e67a0c" + integrity sha512-REyybygHlxo3TJICPF89N2pMQSf+p+tBJqpVe1+77Cfi9HBPReNjTgtZ1Vg73exq24vkqJskKDpfF74reXjxfw== + dependencies: + "@smithy/abort-controller" "^4.1.1" + "@smithy/protocol-http" "^5.2.1" + "@smithy/querystring-builder" "^4.1.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/property-provider@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.1.1.tgz#6e11ae6729840314afed05fd6ab48f62c654116b" + integrity sha512-gm3ZS7DHxUbzC2wr8MUCsAabyiXY0gaj3ROWnhSx/9sPMc6eYLMM4rX81w1zsMaObj2Lq3PZtNCC1J6lpEY7zg== + dependencies: + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/protocol-http@^5.2.1": + version "5.2.1" + resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.2.1.tgz#33f2b8e4e1082c3ae0372d1322577e6fa71d7824" + integrity sha512-T8SlkLYCwfT/6m33SIU/JOVGNwoelkrvGjFKDSDtVvAXj/9gOT78JVJEas5a+ETjOu4SVvpCstKgd0PxSu/aHw== + dependencies: + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/querystring-builder@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.1.1.tgz#4d35c1735de8214055424045a117fa5d1d5cdec1" + integrity sha512-J9b55bfimP4z/Jg1gNo+AT84hr90p716/nvxDkPGCD4W70MPms0h8KF50RDRgBGZeL83/u59DWNqJv6tEP/DHA== + dependencies: + "@smithy/types" "^4.5.0" + "@smithy/util-uri-escape" "^4.1.0" + tslib "^2.6.2" + +"@smithy/querystring-parser@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.1.1.tgz#21b861439b2db16abeb0a6789b126705fa25eea1" + integrity sha512-63TEp92YFz0oQ7Pj9IuI3IgnprP92LrZtRAkE3c6wLWJxfy/yOPRt39IOKerVr0JS770olzl0kGafXlAXZ1vng== + dependencies: + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/service-error-classification@^4.1.2": + version "4.1.2" + resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.1.2.tgz#06839c332f4620a4b80c78a0c32377732dc6697a" + integrity sha512-Kqd8wyfmBWHZNppZSMfrQFpc3M9Y/kjyN8n8P4DqJJtuwgK1H914R471HTw7+RL+T7+kI1f1gOnL7Vb5z9+NgQ== + dependencies: + "@smithy/types" "^4.5.0" + +"@smithy/shared-ini-file-loader@^4.2.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.2.0.tgz#e4717242686bf611bd1a5d6f79870abe480c1c99" + integrity sha512-OQTfmIEp2LLuWdxa8nEEPhZmiOREO6bcB6pjs0AySf4yiZhl6kMOfqmcwcY8BaBPX+0Tb+tG7/Ia/6mwpoZ7Pw== + dependencies: + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/signature-v4@^5.2.1": + version "5.2.1" + resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.2.1.tgz#0048489d2f1b3c888382595a085edd31967498f8" + integrity sha512-M9rZhWQLjlQVCCR37cSjHfhriGRN+FQ8UfgrYNufv66TJgk+acaggShl3KS5U/ssxivvZLlnj7QH2CUOKlxPyA== + dependencies: + "@smithy/is-array-buffer" "^4.1.0" + "@smithy/protocol-http" "^5.2.1" + "@smithy/types" "^4.5.0" + "@smithy/util-hex-encoding" "^4.1.0" + "@smithy/util-middleware" "^4.1.1" + "@smithy/util-uri-escape" "^4.1.0" + "@smithy/util-utf8" "^4.1.0" + tslib "^2.6.2" + +"@smithy/smithy-client@^4.6.3": + version "4.6.3" + resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.6.3.tgz#5ec0c2c993371c246e061ac29550ab4f63db99bc" + integrity sha512-K27LqywsaqKz4jusdUQYJh/YP2VbnbdskZ42zG8xfV+eovbTtMc2/ZatLWCfSkW0PDsTUXlpvlaMyu8925HsOw== + dependencies: + "@smithy/core" "^3.11.1" + "@smithy/middleware-endpoint" "^4.2.3" + "@smithy/middleware-stack" "^4.1.1" + "@smithy/protocol-http" "^5.2.1" + "@smithy/types" "^4.5.0" + "@smithy/util-stream" "^4.3.2" + tslib "^2.6.2" + +"@smithy/types@^4.5.0": + version "4.5.0" + resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.5.0.tgz#850e334662a1ef1286c35814940c80880400a370" + integrity sha512-RkUpIOsVlAwUIZXO1dsz8Zm+N72LClFfsNqf173catVlvRZiwPy0x2u0JLEA4byreOPKDZPGjmPDylMoP8ZJRg== + dependencies: + tslib "^2.6.2" + +"@smithy/url-parser@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.1.1.tgz#0e9a5e72b3cf9d7ab7305f9093af5528d9debaf6" + integrity sha512-bx32FUpkhcaKlEoOMbScvc93isaSiRM75pQ5IgIBaMkT7qMlIibpPRONyx/0CvrXHzJLpOn/u6YiDX2hcvs7Dg== + dependencies: + "@smithy/querystring-parser" "^4.1.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/util-base64@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-4.1.0.tgz#5965026081d9aef4a8246f5702807570abe538b2" + integrity sha512-RUGd4wNb8GeW7xk+AY5ghGnIwM96V0l2uzvs/uVHf+tIuVX2WSvynk5CxNoBCsM2rQRSZElAo9rt3G5mJ/gktQ== + dependencies: + "@smithy/util-buffer-from" "^4.1.0" + "@smithy/util-utf8" "^4.1.0" + tslib "^2.6.2" + +"@smithy/util-body-length-browser@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-4.1.0.tgz#636bdf4bc878c546627dab4b9b0e4db31b475be7" + integrity sha512-V2E2Iez+bo6bUMOTENPr6eEmepdY8Hbs+Uc1vkDKgKNA/brTJqOW/ai3JO1BGj9GbCeLqw90pbbH7HFQyFotGQ== + dependencies: + tslib "^2.6.2" + +"@smithy/util-body-length-node@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-4.1.0.tgz#646750e4af58f97254a5d5cfeaba7d992f0152ec" + integrity sha512-BOI5dYjheZdgR9XiEM3HJcEMCXSoqbzu7CzIgYrx0UtmvtC3tC2iDGpJLsSRFffUpy8ymsg2ARMP5fR8mtuUQQ== + dependencies: + tslib "^2.6.2" + +"@smithy/util-buffer-from@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz#6fc88585165ec73f8681d426d96de5d402021e4b" + integrity sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA== + dependencies: + "@smithy/is-array-buffer" "^2.2.0" + tslib "^2.6.2" + +"@smithy/util-buffer-from@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-4.1.0.tgz#21f9e644a0eb41226d92e4eff763f76a7db7e9cc" + integrity sha512-N6yXcjfe/E+xKEccWEKzK6M+crMrlwaCepKja0pNnlSkm6SjAeLKKA++er5Ba0I17gvKfN/ThV+ZOx/CntKTVw== + dependencies: + "@smithy/is-array-buffer" "^4.1.0" + tslib "^2.6.2" + +"@smithy/util-config-provider@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-4.1.0.tgz#6a07d73446c1e9a46d7a3c125f2a9301060bc957" + integrity sha512-swXz2vMjrP1ZusZWVTB/ai5gK+J8U0BWvP10v9fpcFvg+Xi/87LHvHfst2IgCs1i0v4qFZfGwCmeD/KNCdJZbQ== + dependencies: + tslib "^2.6.2" + +"@smithy/util-defaults-mode-browser@^4.1.3": + version "4.1.3" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.1.3.tgz#889e0999c6b1536e434c2814a97bb9e7a9febc60" + integrity sha512-5fm3i2laE95uhY6n6O6uGFxI5SVbqo3/RWEuS3YsT0LVmSZk+0eUqPhKd4qk0KxBRPaT5VNT/WEBUqdMyYoRgg== + dependencies: + "@smithy/property-provider" "^4.1.1" + "@smithy/smithy-client" "^4.6.3" + "@smithy/types" "^4.5.0" + bowser "^2.11.0" + tslib "^2.6.2" + +"@smithy/util-defaults-mode-node@^4.1.3": + version "4.1.3" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.1.3.tgz#7cc46d336dce27f716280a1979c51ca2bf5839ff" + integrity sha512-lwnMzlMslZ9GJNt+/wVjz6+fe9Wp5tqR1xAyQn+iywmP+Ymj0F6NhU/KfHM5jhGPQchRSCcau5weKhFdLIM4cA== + dependencies: + "@smithy/config-resolver" "^4.2.2" + "@smithy/credential-provider-imds" "^4.1.2" + "@smithy/node-config-provider" "^4.2.2" + "@smithy/property-provider" "^4.1.1" + "@smithy/smithy-client" "^4.6.3" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/util-endpoints@^3.1.2": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.1.2.tgz#be4005c8616923d453347048ef26a439267b2782" + integrity sha512-+AJsaaEGb5ySvf1SKMRrPZdYHRYSzMkCoK16jWnIMpREAnflVspMIDeCVSZJuj+5muZfgGpNpijE3mUNtjv01Q== + dependencies: + "@smithy/node-config-provider" "^4.2.2" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/util-hex-encoding@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-4.1.0.tgz#9b27cf0c25d0de2c8ebfe75cc20df84e5014ccc9" + integrity sha512-1LcueNN5GYC4tr8mo14yVYbh/Ur8jHhWOxniZXii+1+ePiIbsLZ5fEI0QQGtbRRP5mOhmooos+rLmVASGGoq5w== + dependencies: + tslib "^2.6.2" + +"@smithy/util-middleware@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.1.1.tgz#e19749a127499c9bdada713a8afd807d92d846e2" + integrity sha512-CGmZ72mL29VMfESz7S6dekqzCh8ZISj3B+w0g1hZFXaOjGTVaSqfAEFAq8EGp8fUL+Q2l8aqNmt8U1tglTikeg== + dependencies: + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/util-retry@^4.1.2": + version "4.1.2" + resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.1.2.tgz#8d28c27cf69643e173c75cc18ff0186deb7cefed" + integrity sha512-NCgr1d0/EdeP6U5PSZ9Uv5SMR5XRRYoVr1kRVtKZxWL3tixEL3UatrPIMFZSKwHlCcp2zPLDvMubVDULRqeunA== + dependencies: + "@smithy/service-error-classification" "^4.1.2" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@smithy/util-stream@^4.3.2": + version "4.3.2" + resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.3.2.tgz#7ce40c266b1e828d73c27e545959cda4f42fd61f" + integrity sha512-Ka+FA2UCC/Q1dEqUanCdpqwxOFdf5Dg2VXtPtB1qxLcSGh5C1HdzklIt18xL504Wiy9nNUKwDMRTVCbKGoK69g== + dependencies: + "@smithy/fetch-http-handler" "^5.2.1" + "@smithy/node-http-handler" "^4.2.1" + "@smithy/types" "^4.5.0" + "@smithy/util-base64" "^4.1.0" + "@smithy/util-buffer-from" "^4.1.0" + "@smithy/util-hex-encoding" "^4.1.0" + "@smithy/util-utf8" "^4.1.0" + tslib "^2.6.2" + +"@smithy/util-uri-escape@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-4.1.0.tgz#ed4a5c498f1da07122ca1e3df4ca3e2c67c6c18a" + integrity sha512-b0EFQkq35K5NHUYxU72JuoheM6+pytEVUGlTwiFxWFpmddA+Bpz3LgsPRIpBk8lnPE47yT7AF2Egc3jVnKLuPg== + dependencies: + tslib "^2.6.2" + +"@smithy/util-utf8@^2.0.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz#dd96d7640363259924a214313c3cf16e7dd329c5" + integrity sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A== + dependencies: + "@smithy/util-buffer-from" "^2.2.0" + tslib "^2.6.2" + +"@smithy/util-utf8@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-4.1.0.tgz#912c33c1a06913f39daa53da79cb8f7ab740d97b" + integrity sha512-mEu1/UIXAdNYuBcyEPbjScKi/+MQVXNIuY/7Cm5XLIWe319kDrT5SizBE95jqtmEXoDbGoZxKLCMttdZdqTZKQ== + dependencies: + "@smithy/util-buffer-from" "^4.1.0" + tslib "^2.6.2" + +"@smithy/util-waiter@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-4.1.1.tgz#5b74429ca9e37f61838800b919d0063b1a865bef" + integrity sha512-PJBmyayrlfxM7nbqjomF4YcT1sApQwZio0NHSsT0EzhJqljRmvhzqZua43TyEs80nJk2Cn2FGPg/N8phH6KeCQ== + dependencies: + "@smithy/abort-controller" "^4.1.1" + "@smithy/types" "^4.5.0" + tslib "^2.6.2" + +"@swc/helpers@0.5.15": + version "0.5.15" + resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.15.tgz#79efab344c5819ecf83a43f3f9f811fc84b516d7" + integrity sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g== + dependencies: + tslib "^2.8.0" + +"@tailwindcss/node@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/node/-/node-4.1.13.tgz#cecd0dfa4f573fd37fdbaf29403b8dba9d50f118" + integrity sha512-eq3ouolC1oEFOAvOMOBAmfCIqZBJuvWvvYWh5h5iOYfe1HFC6+GZ6EIL0JdM3/niGRJmnrOc+8gl9/HGUaaptw== + dependencies: + "@jridgewell/remapping" "^2.3.4" + enhanced-resolve "^5.18.3" + jiti "^2.5.1" + lightningcss "1.30.1" + magic-string "^0.30.18" + source-map-js "^1.2.1" + tailwindcss "4.1.13" + +"@tailwindcss/oxide-android-arm64@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.13.tgz#34e02dc9bbb3902c36800c75edad3f033cd33ce3" + integrity sha512-BrpTrVYyejbgGo57yc8ieE+D6VT9GOgnNdmh5Sac6+t0m+v+sKQevpFVpwX3pBrM2qKrQwJ0c5eDbtjouY/+ew== + +"@tailwindcss/oxide-darwin-arm64@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.13.tgz#f36dca1f6bc28ac6d81ea6072d9455aa2f5198bb" + integrity sha512-YP+Jksc4U0KHcu76UhRDHq9bx4qtBftp9ShK/7UGfq0wpaP96YVnnjFnj3ZFrUAjc5iECzODl/Ts0AN7ZPOANQ== + +"@tailwindcss/oxide-darwin-x64@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.13.tgz#259aa6d8c58c6d4fd01e856ea731924ba2afcab9" + integrity sha512-aAJ3bbwrn/PQHDxCto9sxwQfT30PzyYJFG0u/BWZGeVXi5Hx6uuUOQEI2Fa43qvmUjTRQNZnGqe9t0Zntexeuw== + +"@tailwindcss/oxide-freebsd-x64@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.13.tgz#b9987fb460ed24d4227392970e6af8e90784d434" + integrity sha512-Wt8KvASHwSXhKE/dJLCCWcTSVmBj3xhVhp/aF3RpAhGeZ3sVo7+NTfgiN8Vey/Fi8prRClDs6/f0KXPDTZE6nQ== + +"@tailwindcss/oxide-linux-arm-gnueabihf@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.13.tgz#ed157b7fa2ea79cc97f196383f461c9be1acc309" + integrity sha512-mbVbcAsW3Gkm2MGwA93eLtWrwajz91aXZCNSkGTx/R5eb6KpKD5q8Ueckkh9YNboU8RH7jiv+ol/I7ZyQ9H7Bw== + +"@tailwindcss/oxide-linux-arm64-gnu@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.13.tgz#5732ad1e5679d7d93999563e63728a813f3d121c" + integrity sha512-wdtfkmpXiwej/yoAkrCP2DNzRXCALq9NVLgLELgLim1QpSfhQM5+ZxQQF8fkOiEpuNoKLp4nKZ6RC4kmeFH0HQ== + +"@tailwindcss/oxide-linux-arm64-musl@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.13.tgz#987837bc5bf88ef84e2aef38c6cbebed0cf40d81" + integrity sha512-hZQrmtLdhyqzXHB7mkXfq0IYbxegaqTmfa1p9MBj72WPoDD3oNOh1Lnxf6xZLY9C3OV6qiCYkO1i/LrzEdW2mg== + +"@tailwindcss/oxide-linux-x64-gnu@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.13.tgz#a673731e1c8ae6e97bdacd6140ec08cdc23121fb" + integrity sha512-uaZTYWxSXyMWDJZNY1Ul7XkJTCBRFZ5Fo6wtjrgBKzZLoJNrG+WderJwAjPzuNZOnmdrVg260DKwXCFtJ/hWRQ== + +"@tailwindcss/oxide-linux-x64-musl@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.13.tgz#5201013bff73ab309ad5fe0ff0abe1ad51b2bd63" + integrity sha512-oXiPj5mi4Hdn50v5RdnuuIms0PVPI/EG4fxAfFiIKQh5TgQgX7oSuDWntHW7WNIi/yVLAiS+CRGW4RkoGSSgVQ== + +"@tailwindcss/oxide-wasm32-wasi@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.13.tgz#6af873b3417468670b88c70bcb3f6d5fa76fbaae" + integrity sha512-+LC2nNtPovtrDwBc/nqnIKYh/W2+R69FA0hgoeOn64BdCX522u19ryLh3Vf3F8W49XBcMIxSe665kwy21FkhvA== + dependencies: + "@emnapi/core" "^1.4.5" + "@emnapi/runtime" "^1.4.5" + "@emnapi/wasi-threads" "^1.0.4" + "@napi-rs/wasm-runtime" "^0.2.12" + "@tybys/wasm-util" "^0.10.0" + tslib "^2.8.0" + +"@tailwindcss/oxide-win32-arm64-msvc@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.13.tgz#feca2e628d6eac3fb156613e53c2a3d8006b7d16" + integrity sha512-dziTNeQXtoQ2KBXmrjCxsuPk3F3CQ/yb7ZNZNA+UkNTeiTGgfeh+gH5Pi7mRncVgcPD2xgHvkFCh/MhZWSgyQg== + +"@tailwindcss/oxide-win32-x64-msvc@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.13.tgz#20db1f2dabbc6b89bda9f4af5e1ab848079ea3dc" + integrity sha512-3+LKesjXydTkHk5zXX01b5KMzLV1xl2mcktBJkje7rhFUpUlYJy7IMOLqjIRQncLTa1WZZiFY/foAeB5nmaiTw== + +"@tailwindcss/oxide@4.1.13": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide/-/oxide-4.1.13.tgz#fc6d48fb2ea1d13d9ddba7ea6473716ad757a8fc" + integrity sha512-CPgsM1IpGRa880sMbYmG1s4xhAy3xEt1QULgTJGQmZUeNgXFR7s1YxYygmJyBGtou4SyEosGAGEeYqY7R53bIA== + dependencies: + detect-libc "^2.0.4" + tar "^7.4.3" + optionalDependencies: + "@tailwindcss/oxide-android-arm64" "4.1.13" + "@tailwindcss/oxide-darwin-arm64" "4.1.13" + "@tailwindcss/oxide-darwin-x64" "4.1.13" + "@tailwindcss/oxide-freebsd-x64" "4.1.13" + "@tailwindcss/oxide-linux-arm-gnueabihf" "4.1.13" + "@tailwindcss/oxide-linux-arm64-gnu" "4.1.13" + "@tailwindcss/oxide-linux-arm64-musl" "4.1.13" + "@tailwindcss/oxide-linux-x64-gnu" "4.1.13" + "@tailwindcss/oxide-linux-x64-musl" "4.1.13" + "@tailwindcss/oxide-wasm32-wasi" "4.1.13" + "@tailwindcss/oxide-win32-arm64-msvc" "4.1.13" + "@tailwindcss/oxide-win32-x64-msvc" "4.1.13" + +"@tailwindcss/postcss@^4": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/postcss/-/postcss-4.1.13.tgz#47a19ed4b2aa2517ebcfe658cfa3fc67fe4fdd71" + integrity sha512-HLgx6YSFKJT7rJqh9oJs/TkBFhxuMOfUKSBEPYwV+t78POOBsdQ7crhZLzwcH3T0UyUuOzU/GK5pk5eKr3wCiQ== + dependencies: + "@alloc/quick-lru" "^5.2.0" + "@tailwindcss/node" "4.1.13" + "@tailwindcss/oxide" "4.1.13" + postcss "^8.4.41" + tailwindcss "4.1.13" + +"@tybys/wasm-util@^0.10.0": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.1.tgz#ecddd3205cf1e2d5274649ff0eedd2991ed7f414" + integrity sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg== + dependencies: + tslib "^2.4.0" + +"@types/node@*": + version "24.5.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-24.5.2.tgz#52ceb83f50fe0fcfdfbd2a9fab6db2e9e7ef6446" + integrity sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ== + dependencies: + undici-types "~7.12.0" + +"@types/node@^20": + version "20.19.17" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.17.tgz#41b52697373aef8a43b3b92f33b43f329b2d674b" + integrity sha512-gfehUI8N1z92kygssiuWvLiwcbOB3IRktR6hTDgJlXMYh5OvkPSRmgfoBUmfZt+vhwJtX7v1Yw4KvvAf7c5QKQ== + dependencies: + undici-types "~6.21.0" + +"@types/pg@^8.15.5": + version "8.15.5" + resolved "https://registry.yarnpkg.com/@types/pg/-/pg-8.15.5.tgz#ef43e0f33b62dac95cae2f042888ec7980b30c09" + integrity sha512-LF7lF6zWEKxuT3/OR8wAZGzkg4ENGXFNyiV/JeOt9z5B+0ZVwbql9McqX5c/WStFq1GaGso7H1AzP/qSzmlCKQ== + dependencies: + "@types/node" "*" + pg-protocol "*" + pg-types "^2.2.0" + +"@types/react-dom@^19": + version "19.1.9" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.1.9.tgz#5ab695fce1e804184767932365ae6569c11b4b4b" + integrity sha512-qXRuZaOsAdXKFyOhRBg6Lqqc0yay13vN7KrIg4L7N4aaHN68ma9OK3NE1BoDFgFOTfM7zg+3/8+2n8rLUH3OKQ== + +"@types/react@^19": + version "19.1.13" + resolved "https://registry.yarnpkg.com/@types/react/-/react-19.1.13.tgz#fc650ffa680d739a25a530f5d7ebe00cdd771883" + integrity sha512-hHkbU/eoO3EG5/MZkuFSKmYqPbSVk5byPFa3e7y/8TybHiLMACgI8seVYlicwk7H5K/rI2px9xrQp/C+AUDTiQ== + dependencies: + csstype "^3.0.2" + +"@types/uuid@^9.0.1": + version "9.0.8" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.8.tgz#7545ba4fc3c003d6c756f651f3bf163d8f0f29ba" + integrity sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA== + +bowser@^2.11.0: + version "2.12.1" + resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.12.1.tgz#f9ad78d7aebc472feb63dd9635e3ce2337e0e2c1" + integrity sha512-z4rE2Gxh7tvshQ4hluIT7XcFrgLIQaw9X3A+kTTRdovCz5PMukm/0QC/BKSYPj3omF5Qfypn9O/c5kgpmvYUCw== + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +caniuse-lite@^1.0.30001579: + version "1.0.30001743" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001743.tgz#50ff91a991220a1ee2df5af00650dd5c308ea7cd" + integrity sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw== + +chownr@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-3.0.0.tgz#9855e64ecd240a9cc4267ce8a4aa5d24a1da15e4" + integrity sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g== + +client-only@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1" + integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA== + +csstype@^3.0.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" + integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== + +debug@^4.3.4: + version "4.4.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a" + integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA== + dependencies: + ms "^2.1.3" + +detect-libc@^2.0.3, detect-libc@^2.0.4, detect-libc@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.0.tgz#3ca811f60a7b504b0480e5008adacc660b0b8c4f" + integrity sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg== + +drizzle-kit@^0.31.4: + version "0.31.4" + resolved "https://registry.yarnpkg.com/drizzle-kit/-/drizzle-kit-0.31.4.tgz#b4a23fae0ab8d64b262184aaf07f8cbdc2222751" + integrity sha512-tCPWVZWZqWVx2XUsVpJRnH9Mx0ClVOf5YUHerZ5so1OKSlqww4zy1R5ksEdGRcO3tM3zj0PYN6V48TbQCL1RfA== + dependencies: + "@drizzle-team/brocli" "^0.10.2" + "@esbuild-kit/esm-loader" "^2.5.5" + esbuild "^0.25.4" + esbuild-register "^3.5.0" + +drizzle-orm@^0.44.5: + version "0.44.5" + resolved "https://registry.yarnpkg.com/drizzle-orm/-/drizzle-orm-0.44.5.tgz#e81a470631e95bfd1bf61bd853d013954cd5fa2b" + integrity sha512-jBe37K7d8ZSKptdKfakQFdeljtu3P2Cbo7tJoJSVZADzIKOBo9IAJPOmMsH2bZl90bZgh8FQlD8BjxXA/zuBkQ== + +enhanced-resolve@^5.18.3: + version "5.18.3" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44" + integrity sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + +esbuild-register@^3.5.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/esbuild-register/-/esbuild-register-3.6.0.tgz#cf270cfa677baebbc0010ac024b823cbf723a36d" + integrity sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg== + dependencies: + debug "^4.3.4" + +esbuild@^0.25.4: + version "0.25.10" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.10.tgz#37f5aa5cd14500f141be121c01b096ca83ac34a9" + integrity sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ== + optionalDependencies: + "@esbuild/aix-ppc64" "0.25.10" + "@esbuild/android-arm" "0.25.10" + "@esbuild/android-arm64" "0.25.10" + "@esbuild/android-x64" "0.25.10" + "@esbuild/darwin-arm64" "0.25.10" + "@esbuild/darwin-x64" "0.25.10" + "@esbuild/freebsd-arm64" "0.25.10" + "@esbuild/freebsd-x64" "0.25.10" + "@esbuild/linux-arm" "0.25.10" + "@esbuild/linux-arm64" "0.25.10" + "@esbuild/linux-ia32" "0.25.10" + "@esbuild/linux-loong64" "0.25.10" + "@esbuild/linux-mips64el" "0.25.10" + "@esbuild/linux-ppc64" "0.25.10" + "@esbuild/linux-riscv64" "0.25.10" + "@esbuild/linux-s390x" "0.25.10" + "@esbuild/linux-x64" "0.25.10" + "@esbuild/netbsd-arm64" "0.25.10" + "@esbuild/netbsd-x64" "0.25.10" + "@esbuild/openbsd-arm64" "0.25.10" + "@esbuild/openbsd-x64" "0.25.10" + "@esbuild/openharmony-arm64" "0.25.10" + "@esbuild/sunos-x64" "0.25.10" + "@esbuild/win32-arm64" "0.25.10" + "@esbuild/win32-ia32" "0.25.10" + "@esbuild/win32-x64" "0.25.10" + +esbuild@~0.18.20: + version "0.18.20" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.20.tgz#4709f5a34801b43b799ab7d6d82f7284a9b7a7a6" + integrity sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA== + optionalDependencies: + "@esbuild/android-arm" "0.18.20" + "@esbuild/android-arm64" "0.18.20" + "@esbuild/android-x64" "0.18.20" + "@esbuild/darwin-arm64" "0.18.20" + "@esbuild/darwin-x64" "0.18.20" + "@esbuild/freebsd-arm64" "0.18.20" + "@esbuild/freebsd-x64" "0.18.20" + "@esbuild/linux-arm" "0.18.20" + "@esbuild/linux-arm64" "0.18.20" + "@esbuild/linux-ia32" "0.18.20" + "@esbuild/linux-loong64" "0.18.20" + "@esbuild/linux-mips64el" "0.18.20" + "@esbuild/linux-ppc64" "0.18.20" + "@esbuild/linux-riscv64" "0.18.20" + "@esbuild/linux-s390x" "0.18.20" + "@esbuild/linux-x64" "0.18.20" + "@esbuild/netbsd-x64" "0.18.20" + "@esbuild/openbsd-x64" "0.18.20" + "@esbuild/sunos-x64" "0.18.20" + "@esbuild/win32-arm64" "0.18.20" + "@esbuild/win32-ia32" "0.18.20" + "@esbuild/win32-x64" "0.18.20" + +fast-xml-parser@5.2.5: + version "5.2.5" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz#4809fdfb1310494e341098c25cb1341a01a9144a" + integrity sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ== + dependencies: + strnum "^2.1.0" + +get-tsconfig@^4.7.0: + version "4.10.1" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.10.1.tgz#d34c1c01f47d65a606c37aa7a177bc3e56ab4b2e" + integrity sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ== + dependencies: + resolve-pkg-maps "^1.0.0" + +graceful-fs@^4.2.4: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== + +jiti@^2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.5.1.tgz#bd099c1c2be1c59bbea4e5adcd127363446759d0" + integrity sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w== + +lightningcss-darwin-arm64@1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.1.tgz#3d47ce5e221b9567c703950edf2529ca4a3700ae" + integrity sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ== + +lightningcss-darwin-x64@1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.1.tgz#e81105d3fd6330860c15fe860f64d39cff5fbd22" + integrity sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA== + +lightningcss-freebsd-x64@1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.1.tgz#a0e732031083ff9d625c5db021d09eb085af8be4" + integrity sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig== + +lightningcss-linux-arm-gnueabihf@1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.1.tgz#1f5ecca6095528ddb649f9304ba2560c72474908" + integrity sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q== + +lightningcss-linux-arm64-gnu@1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.1.tgz#eee7799726103bffff1e88993df726f6911ec009" + integrity sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw== + +lightningcss-linux-arm64-musl@1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.1.tgz#f2e4b53f42892feeef8f620cbb889f7c064a7dfe" + integrity sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ== + +lightningcss-linux-x64-gnu@1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.1.tgz#2fc7096224bc000ebb97eea94aea248c5b0eb157" + integrity sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw== + +lightningcss-linux-x64-musl@1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.1.tgz#66dca2b159fd819ea832c44895d07e5b31d75f26" + integrity sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ== + +lightningcss-win32-arm64-msvc@1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.1.tgz#7d8110a19d7c2d22bfdf2f2bb8be68e7d1b69039" + integrity sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA== + +lightningcss-win32-x64-msvc@1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.1.tgz#fd7dd008ea98494b85d24b4bea016793f2e0e352" + integrity sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg== + +lightningcss@1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.30.1.tgz#78e979c2d595bfcb90d2a8c0eb632fe6c5bfed5d" + integrity sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg== + dependencies: + detect-libc "^2.0.3" + optionalDependencies: + lightningcss-darwin-arm64 "1.30.1" + lightningcss-darwin-x64 "1.30.1" + lightningcss-freebsd-x64 "1.30.1" + lightningcss-linux-arm-gnueabihf "1.30.1" + lightningcss-linux-arm64-gnu "1.30.1" + lightningcss-linux-arm64-musl "1.30.1" + lightningcss-linux-x64-gnu "1.30.1" + lightningcss-linux-x64-musl "1.30.1" + lightningcss-win32-arm64-msvc "1.30.1" + lightningcss-win32-x64-msvc "1.30.1" + +magic-string@^0.30.18: + version "0.30.19" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.19.tgz#cebe9f104e565602e5d2098c5f2e79a77cc86da9" + integrity sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw== + dependencies: + "@jridgewell/sourcemap-codec" "^1.5.5" + +minipass@^7.0.4, minipass@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" + integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== + +minizlib@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-3.0.2.tgz#f33d638eb279f664439aa38dc5f91607468cb574" + integrity sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA== + dependencies: + minipass "^7.1.2" + +mkdirp@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50" + integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg== + +ms@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +nanoid@^3.3.11, nanoid@^3.3.6: + version "3.3.11" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b" + integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w== + +next@15.5.3: + version "15.5.3" + resolved "https://registry.yarnpkg.com/next/-/next-15.5.3.tgz#bfa6836eeed2bad28e2fcbdda8f07c871aea78d1" + integrity sha512-r/liNAx16SQj4D+XH/oI1dlpv9tdKJ6cONYPwwcCC46f2NjpaRWY+EKCzULfgQYV6YKXjHBchff2IZBSlZmJNw== + dependencies: + "@next/env" "15.5.3" + "@swc/helpers" "0.5.15" + caniuse-lite "^1.0.30001579" + postcss "8.4.31" + styled-jsx "5.1.6" + optionalDependencies: + "@next/swc-darwin-arm64" "15.5.3" + "@next/swc-darwin-x64" "15.5.3" + "@next/swc-linux-arm64-gnu" "15.5.3" + "@next/swc-linux-arm64-musl" "15.5.3" + "@next/swc-linux-x64-gnu" "15.5.3" + "@next/swc-linux-x64-musl" "15.5.3" + "@next/swc-win32-arm64-msvc" "15.5.3" + "@next/swc-win32-x64-msvc" "15.5.3" + sharp "^0.34.3" + +pg-cloudflare@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz#a1f3d226bab2c45ae75ea54d65ec05ac6cfafbef" + integrity sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg== + +pg-connection-string@^2.9.1: + version "2.9.1" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.9.1.tgz#bb1fd0011e2eb76ac17360dc8fa183b2d3465238" + integrity sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w== + +pg-int8@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" + integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== + +pg-pool@^3.10.1: + version "3.10.1" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.10.1.tgz#481047c720be2d624792100cac1816f8850d31b2" + integrity sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg== + +pg-protocol@*, pg-protocol@^1.10.3: + version "1.10.3" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.10.3.tgz#ac9e4778ad3f84d0c5670583bab976ea0a34f69f" + integrity sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ== + +pg-types@2.2.0, pg-types@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3" + integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA== + dependencies: + pg-int8 "1.0.1" + postgres-array "~2.0.0" + postgres-bytea "~1.0.0" + postgres-date "~1.0.4" + postgres-interval "^1.1.0" + +pg@^8.16.3: + version "8.16.3" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.16.3.tgz#160741d0b44fdf64680e45374b06d632e86c99fd" + integrity sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw== + dependencies: + pg-connection-string "^2.9.1" + pg-pool "^3.10.1" + pg-protocol "^1.10.3" + pg-types "2.2.0" + pgpass "1.0.5" + optionalDependencies: + pg-cloudflare "^1.2.7" + +pgpass@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d" + integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug== + dependencies: + split2 "^4.1.0" + +picocolors@^1.0.0, picocolors@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== + +postcss@8.4.31: + version "8.4.31" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" + integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== + dependencies: + nanoid "^3.3.6" + picocolors "^1.0.0" + source-map-js "^1.0.2" + +postcss@^8.4.41: + version "8.5.6" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.6.tgz#2825006615a619b4f62a9e7426cc120b349a8f3c" + integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg== + dependencies: + nanoid "^3.3.11" + picocolors "^1.1.1" + source-map-js "^1.2.1" + +postgres-array@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" + integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA== + +postgres-bytea@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" + integrity sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w== + +postgres-date@~1.0.4: + version "1.0.7" + resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8" + integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q== + +postgres-interval@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695" + integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ== + dependencies: + xtend "^4.0.0" + +react-dom@19.1.0: + version "19.1.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.1.0.tgz#133558deca37fa1d682708df8904b25186793623" + integrity sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g== + dependencies: + scheduler "^0.26.0" + +react@19.1.0: + version "19.1.0" + resolved "https://registry.yarnpkg.com/react/-/react-19.1.0.tgz#926864b6c48da7627f004795d6cce50e90793b75" + integrity sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg== + +resolve-pkg-maps@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" + integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== + +scheduler@^0.26.0: + version "0.26.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.26.0.tgz#4ce8a8c2a2095f13ea11bf9a445be50c555d6337" + integrity sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA== + +semver@^7.7.2: + version "7.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58" + integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA== + +sharp@^0.34.3: + version "0.34.4" + resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.34.4.tgz#73c2c5a425e98250b8b927e5537f711da8966e38" + integrity sha512-FUH39xp3SBPnxWvd5iib1X8XY7J0K0X7d93sie9CJg2PO8/7gmg89Nve6OjItK53/MlAushNNxteBYfM6DEuoA== + dependencies: + "@img/colour" "^1.0.0" + detect-libc "^2.1.0" + semver "^7.7.2" + optionalDependencies: + "@img/sharp-darwin-arm64" "0.34.4" + "@img/sharp-darwin-x64" "0.34.4" + "@img/sharp-libvips-darwin-arm64" "1.2.3" + "@img/sharp-libvips-darwin-x64" "1.2.3" + "@img/sharp-libvips-linux-arm" "1.2.3" + "@img/sharp-libvips-linux-arm64" "1.2.3" + "@img/sharp-libvips-linux-ppc64" "1.2.3" + "@img/sharp-libvips-linux-s390x" "1.2.3" + "@img/sharp-libvips-linux-x64" "1.2.3" + "@img/sharp-libvips-linuxmusl-arm64" "1.2.3" + "@img/sharp-libvips-linuxmusl-x64" "1.2.3" + "@img/sharp-linux-arm" "0.34.4" + "@img/sharp-linux-arm64" "0.34.4" + "@img/sharp-linux-ppc64" "0.34.4" + "@img/sharp-linux-s390x" "0.34.4" + "@img/sharp-linux-x64" "0.34.4" + "@img/sharp-linuxmusl-arm64" "0.34.4" + "@img/sharp-linuxmusl-x64" "0.34.4" + "@img/sharp-wasm32" "0.34.4" + "@img/sharp-win32-arm64" "0.34.4" + "@img/sharp-win32-ia32" "0.34.4" + "@img/sharp-win32-x64" "0.34.4" + +source-map-js@^1.0.2, source-map-js@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" + integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== + +source-map-support@^0.5.21: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +split2@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4" + integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg== + +strnum@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/strnum/-/strnum-2.1.1.tgz#cf2a6e0cf903728b8b2c4b971b7e36b4e82d46ab" + integrity sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw== + +styled-jsx@5.1.6: + version "5.1.6" + resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.6.tgz#83b90c077e6c6a80f7f5e8781d0f311b2fe41499" + integrity sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA== + dependencies: + client-only "0.0.1" + +tailwindcss@4.1.13, tailwindcss@^4: + version "4.1.13" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-4.1.13.tgz#ade3471fdfd0a2a86da3a679bfc10c623e645b09" + integrity sha512-i+zidfmTqtwquj4hMEwdjshYYgMbOrPzb9a0M3ZgNa0JMoZeFC6bxZvO8yr8ozS6ix2SDz0+mvryPeBs2TFE+w== + +tapable@^2.2.0: + version "2.2.3" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.3.tgz#4b67b635b2d97578a06a2713d2f04800c237e99b" + integrity sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg== + +tar@^7.4.3: + version "7.4.3" + resolved "https://registry.yarnpkg.com/tar/-/tar-7.4.3.tgz#88bbe9286a3fcd900e94592cda7a22b192e80571" + integrity sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw== + dependencies: + "@isaacs/fs-minipass" "^4.0.0" + chownr "^3.0.0" + minipass "^7.1.2" + minizlib "^3.0.1" + mkdirp "^3.0.1" + yallist "^5.0.0" + +tslib@^2.4.0, tslib@^2.6.2, tslib@^2.8.0: + version "2.8.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" + integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== + +typescript@^5: + version "5.9.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.2.tgz#d93450cddec5154a2d5cabe3b8102b83316fb2a6" + integrity sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A== + +undici-types@~6.21.0: + version "6.21.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" + integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ== + +undici-types@~7.12.0: + version "7.12.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.12.0.tgz#15c5c7475c2a3ba30659529f5cdb4674b622fafb" + integrity sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ== + +uuid@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" + integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== + +xtend@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +yallist@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-5.0.0.tgz#00e2de443639ed0d78fd87de0d27469fbcffb533" + integrity sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw== From 015a5d943368692896095f619e5707fa66da1d97 Mon Sep 17 00:00:00 2001 From: "stepsecurity-app[bot]" <188008098+stepsecurity-app[bot]@users.noreply.github.com> Date: Sat, 20 Sep 2025 19:22:32 -0500 Subject: [PATCH 008/117] [StepSecurity] Apply security best practices (#6) Signed-off-by: StepSecurity Bot Co-authored-by: stepsecurity-app[bot] <188008098+stepsecurity-app[bot]@users.noreply.github.com> --- .github/workflows/rust.yml | 45 +++++++++++++++++++++++++++++--------- .github/workflows/ui.yml | 27 ++++++++++++++++++----- 2 files changed, 56 insertions(+), 16 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ea699fe..9c157f1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -16,24 +16,39 @@ jobs: name: Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 + with: + egress-policy: audit + + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + - uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable - run: cargo check test: name: Test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 + with: + egress-policy: audit + + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + - uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable - run: cargo test fmt: name: Rustfmt runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 + with: + egress-policy: audit + + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + - uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable with: components: rustfmt - run: cargo fmt --all -- --check @@ -42,8 +57,13 @@ jobs: name: Clippy runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 + with: + egress-policy: audit + + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + - uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable with: components: clippy - run: cargo clippy -- -D warnings @@ -52,6 +72,11 @@ jobs: name: Build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 + with: + egress-policy: audit + + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + - uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable - run: cargo build --release \ No newline at end of file diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml index dfe6e60..86256b8 100644 --- a/.github/workflows/ui.yml +++ b/.github/workflows/ui.yml @@ -15,8 +15,13 @@ jobs: name: Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 + with: + egress-policy: audit + + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0 with: node-version: '20' cache: 'yarn' @@ -29,8 +34,13 @@ jobs: name: Type Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 + with: + egress-policy: audit + + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0 with: node-version: '20' cache: 'yarn' @@ -43,8 +53,13 @@ jobs: name: Build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 + with: + egress-policy: audit + + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0 with: node-version: '20' cache: 'yarn' From f21efc0962591440dd4105e3e7820a8e5cc503d1 Mon Sep 17 00:00:00 2001 From: William Law Date: Tue, 23 Sep 2025 10:46:17 -0400 Subject: [PATCH 009/117] [ingress] introduce buffer queue (#8) * spike queue * queue before datastore insert_bundle * remove unused dep * feedback * spike backoff logic * spike test --- .env.example | 1 + Cargo.lock | 27 ++++++++ Cargo.toml | 3 + crates/ingress/Cargo.toml | 6 +- crates/ingress/src/main.rs | 26 +++++++- crates/ingress/src/queue.rs | 113 ++++++++++++++++++++++++++++++++++ crates/ingress/src/service.rs | 19 +++++- docker-compose.yml | 1 + 8 files changed, 190 insertions(+), 6 deletions(-) create mode 100644 crates/ingress/src/queue.rs diff --git a/.env.example b/.env.example index 081ebbd..e4462d3 100644 --- a/.env.example +++ b/.env.example @@ -7,6 +7,7 @@ TIPS_INGRESS_DUAL_WRITE_MEMPOOL=false TIPS_INGRESS_KAFKA_BROKERS=localhost:9092 TIPS_INGRESS_KAFKA_TOPIC=tips-audit TIPS_INGRESS_LOG_LEVEL=info +TIPS_INGRESS_KAFKA_QUEUE_TOPIC=tips-ingress # Audit service configuration TIPS_AUDIT_KAFKA_BROKERS=localhost:9092 diff --git a/Cargo.lock b/Cargo.lock index 9c3376c..4fe9cb8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1538,6 +1538,17 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" +[[package]] +name = "backon" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "592277618714fbcecda9a02ba7a8781f319d26532a88553bbacc77ba5d2b3a8d" +dependencies = [ + "fastrand", + "gloo-timers", + "tokio", +] + [[package]] name = "backtrace" version = "0.3.75" @@ -2806,6 +2817,18 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "gmp-mpfr-sys" version = "1.6.8" @@ -7069,6 +7092,8 @@ dependencies = [ "alloy-provider", "alloy-rpc-types-mev", "anyhow", + "async-trait", + "backon", "clap", "dotenvy", "eyre", @@ -7077,6 +7102,8 @@ dependencies = [ "op-alloy-network", "rdkafka", "reth-rpc-eth-types", + "serde", + "serde_json", "tips-audit", "tips-datastore", "tokio", diff --git a/Cargo.toml b/Cargo.toml index e0dd4b0..32a3ffd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,3 +58,6 @@ aws-config = "1.1.7" aws-sdk-s3 = "1.106.0" aws-credential-types = "1.1.7" bytes = { version = "1.8.0", features = ["serde"] } + +# tips-ingress +backon = "1.5.2" diff --git a/crates/ingress/Cargo.toml b/crates/ingress/Cargo.toml index e346380..6950207 100644 --- a/crates/ingress/Cargo.toml +++ b/crates/ingress/Cargo.toml @@ -26,4 +26,8 @@ op-alloy-consensus.workspace = true eyre.workspace = true dotenvy.workspace = true rdkafka.workspace = true -reth-rpc-eth-types.workspace = true \ No newline at end of file +reth-rpc-eth-types.workspace = true +serde.workspace = true +serde_json.workspace = true +async-trait.workspace = true +backon.workspace = true diff --git a/crates/ingress/src/main.rs b/crates/ingress/src/main.rs index c38ab8b..00b1d3b 100644 --- a/crates/ingress/src/main.rs +++ b/crates/ingress/src/main.rs @@ -10,7 +10,9 @@ use tracing::{info, warn}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; use url::Url; +mod queue; mod service; +use queue::KafkaQueuePublisher; use service::{IngressApiServer, IngressService}; use tips_datastore::PostgresDatastore; @@ -49,6 +51,14 @@ struct Config { )] kafka_topic: String, + /// Kafka topic for queuing transactions before the DB Writer + #[arg( + long, + env = "TIPS_INGRESS_KAFKA_QUEUE_TOPIC", + default_value = "tips-ingress" + )] + queue_topic: String, + #[arg(long, env = "TIPS_INGRESS_LOG_LEVEL", default_value = "info")] log_level: String, } @@ -101,9 +111,21 @@ async fn main() -> anyhow::Result<()> { .set("message.timeout.ms", "5000") .create()?; - let publisher = KafkaMempoolEventPublisher::new(kafka_producer, config.kafka_topic); + let queue_producer: FutureProducer = ClientConfig::new() + .set("bootstrap.servers", &config.kafka_brokers) + .set("message.timeout.ms", "5000") + .create()?; - let service = IngressService::new(provider, bundle_store, config.dual_write_mempool, publisher); + let publisher = KafkaMempoolEventPublisher::new(kafka_producer, config.kafka_topic); + let queue = KafkaQueuePublisher::new(queue_producer, config.queue_topic); + + let service = IngressService::new( + provider, + bundle_store, + config.dual_write_mempool, + publisher, + queue, + ); let bind_addr = format!("{}:{}", config.address, config.port); let server = Server::builder().build(&bind_addr).await?; diff --git a/crates/ingress/src/queue.rs b/crates/ingress/src/queue.rs new file mode 100644 index 0000000..2a015aa --- /dev/null +++ b/crates/ingress/src/queue.rs @@ -0,0 +1,113 @@ +use alloy_primitives::Address; +use alloy_rpc_types_mev::EthSendBundle; +use anyhow::{Error, Result}; +use async_trait::async_trait; +use backon::{ExponentialBuilder, Retryable}; +use rdkafka::producer::{FutureProducer, FutureRecord}; +use tokio::time::Duration; +use tracing::{error, info}; + +/// A queue to buffer transactions +#[async_trait] +pub trait QueuePublisher: Send + Sync { + async fn publish(&self, bundle: &EthSendBundle, sender: Address) -> Result<()>; +} + +/// A queue to buffer transactions +pub struct KafkaQueuePublisher { + producer: FutureProducer, + topic: String, +} + +impl KafkaQueuePublisher { + pub fn new(producer: FutureProducer, topic: String) -> Self { + Self { producer, topic } + } + + pub async fn enqueue_bundle( + &self, + bundle: &EthSendBundle, + sender: Address, + ) -> Result<(), Error> { + let key = sender.to_string(); + let payload = serde_json::to_vec(bundle)?; + + let enqueue = || async { + let record = FutureRecord::to(&self.topic).key(&key).payload(&payload); + + match self.producer.send(record, Duration::from_secs(5)).await { + Ok((partition, offset)) => { + info!( + sender = %sender, + partition = partition, + offset = offset, + topic = %self.topic, + "Successfully enqueued bundle" + ); + Ok(()) + } + Err((err, _)) => { + error!( + sender = %sender, + error = %err, + topic = %self.topic, + "Failed to enqueue bundle" + ); + Err(anyhow::anyhow!("Failed to enqueue bundle: {}", err)) + } + } + }; + + enqueue + .retry( + &ExponentialBuilder::default() + .with_min_delay(Duration::from_millis(100)) + .with_max_delay(Duration::from_secs(5)) + .with_max_times(3), + ) + .notify(|err: &anyhow::Error, dur: Duration| { + info!("retrying to enqueue bundle {:?} after {:?}", err, dur); + }) + .await + } +} + +#[async_trait] +impl QueuePublisher for KafkaQueuePublisher { + async fn publish(&self, bundle: &EthSendBundle, sender: Address) -> Result<()> { + self.enqueue_bundle(bundle, sender).await + } +} + +#[cfg(test)] +mod tests { + use super::*; + use rdkafka::config::ClientConfig; + use tokio::time::{Duration, Instant}; + + fn create_test_bundle() -> EthSendBundle { + EthSendBundle::default() + } + + #[tokio::test] + async fn test_backoff_retry_logic() { + // use an invalid broker address to trigger the backoff logic + let producer = ClientConfig::new() + .set("bootstrap.servers", "localhost:9999") + .set("message.timeout.ms", "100") + .create() + .expect("Producer creation failed"); + + let publisher = KafkaQueuePublisher::new(producer, "tips-ingress".to_string()); + let bundle = create_test_bundle(); + let sender = Address::ZERO; + + let start = Instant::now(); + let result = publisher.enqueue_bundle(&bundle, sender).await; + let elapsed = start.elapsed(); + + // the backoff tries at minimum 100ms, so verify we tried at least once + assert!(result.is_err()); + assert!(elapsed >= Duration::from_millis(100)); + } +} diff --git a/crates/ingress/src/service.rs b/crates/ingress/src/service.rs index 84ce628..6c73b83 100644 --- a/crates/ingress/src/service.rs +++ b/crates/ingress/src/service.rs @@ -15,6 +15,8 @@ use tips_audit::{MempoolEvent, MempoolEventPublisher}; use tips_datastore::BundleDatastore; use tracing::{info, warn}; +use crate::queue::QueuePublisher; + #[rpc(server, namespace = "eth")] pub trait IngressApi { /// `eth_sendBundle` can be used to send your bundles to the builder. @@ -30,34 +32,38 @@ pub trait IngressApi { async fn send_raw_transaction(&self, tx: Bytes) -> RpcResult; } -pub struct IngressService { +pub struct IngressService { provider: RootProvider, datastore: Store, dual_write_mempool: bool, publisher: Publisher, + queue: Queue, } -impl IngressService { +impl IngressService { pub fn new( provider: RootProvider, datastore: Store, dual_write_mempool: bool, publisher: Publisher, + queue: Queue, ) -> Self { Self { provider, datastore, dual_write_mempool, publisher, + queue, } } } #[async_trait] -impl IngressApiServer for IngressService +impl IngressApiServer for IngressService where Store: BundleDatastore + Sync + Send + 'static, Publisher: MempoolEventPublisher + Sync + Send + 'static, + Queue: QueuePublisher + Sync + Send + 'static, { async fn send_bundle(&self, _bundle: EthSendBundle) -> RpcResult { warn!( @@ -99,6 +105,13 @@ where ..Default::default() }; + // queue the bundle + let sender = transaction.signer(); + if let Err(e) = self.queue.publish(&bundle, sender).await { + warn!(message = "Failed to publish Queue::enqueue_bundle", sender = %sender, error = %e); + } + + // TODO: have DB Writer consume from the queue and move the insert_bundle logic there let result = self .datastore .insert_bundle(bundle.clone()) diff --git a/docker-compose.yml b/docker-compose.yml index 2fbd453..72efb02 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,6 +55,7 @@ services: command: | sh -c " kafka-topics --create --if-not-exists --topic tips-audit --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 + kafka-topics --create --if-not-exists --topic tips-ingress --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 kafka-topics --list --bootstrap-server kafka:29092 " From 2a9ba9054cd028b2bc4cc70decf88add98cea58a Mon Sep 17 00:00:00 2001 From: William Law Date: Tue, 23 Sep 2025 10:46:38 -0400 Subject: [PATCH 010/117] chore: run just fix and just ci locally (#9) --- crates/audit/src/publisher.rs | 2 +- crates/audit/src/reader.rs | 2 +- crates/audit/src/storage.rs | 12 +++++------- crates/audit/tests/common/mod.rs | 2 +- crates/audit/tests/s3_test.rs | 2 +- crates/datastore/tests/datastore.rs | 2 +- crates/maintenance/src/main.rs | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/crates/audit/src/publisher.rs b/crates/audit/src/publisher.rs index f72c1f8..359666d 100644 --- a/crates/audit/src/publisher.rs +++ b/crates/audit/src/publisher.rs @@ -50,7 +50,7 @@ impl KafkaMempoolEventPublisher { error = %err, "Failed to publish event" ); - Err(anyhow::anyhow!("Failed to publish event: {}", err)) + Err(anyhow::anyhow!("Failed to publish event: {err}")) } } } diff --git a/crates/audit/src/reader.rs b/crates/audit/src/reader.rs index 1426b8c..52c9c45 100644 --- a/crates/audit/src/reader.rs +++ b/crates/audit/src/reader.rs @@ -110,7 +110,7 @@ impl MempoolEventReader for KafkaMempoolReader { Ok(event_result) } Err(e) => { - println!("received error {:?}", e); + println!("received error {e:?}"); error!(error = %e, "Error receiving message from Kafka"); sleep(Duration::from_secs(1)).await; Err(e.into()) diff --git a/crates/audit/src/storage.rs b/crates/audit/src/storage.rs index 62501bd..c2ac569 100644 --- a/crates/audit/src/storage.rs +++ b/crates/audit/src/storage.rs @@ -22,8 +22,8 @@ pub enum S3Key { impl fmt::Display for S3Key { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - S3Key::Bundle(bundle_id) => write!(f, "bundles/{}", bundle_id), - S3Key::TransactionByHash(hash) => write!(f, "transactions/by_hash/{}", hash), + S3Key::Bundle(bundle_id) => write!(f, "bundles/{bundle_id}"), + S3Key::TransactionByHash(hash) => write!(f, "transactions/by_hash/{hash}"), } } } @@ -291,9 +291,7 @@ impl S3MempoolEventReaderWriter { tokio::time::sleep(tokio::time::Duration::from_millis(delay)).await; } else { return Err(anyhow::anyhow!( - "Failed to write after {} attempts: {}", - MAX_RETRIES, - e + "Failed to write after {MAX_RETRIES} attempts: {e}" )); } } @@ -334,7 +332,7 @@ impl S3MempoolEventReaderWriter { Err(e) => match &e { SdkError::ServiceError(service_err) => match service_err.err() { GetObjectError::NoSuchKey(_) => Ok((None, None)), - _ => Err(anyhow::anyhow!("Failed to get object: {}", e)), + _ => Err(anyhow::anyhow!("Failed to get object: {e}")), }, _ => { let error_string = e.to_string(); @@ -344,7 +342,7 @@ impl S3MempoolEventReaderWriter { { Ok((None, None)) } else { - Err(anyhow::anyhow!("Failed to get object: {}", e)) + Err(anyhow::anyhow!("Failed to get object: {e}")) } } }, diff --git a/crates/audit/tests/common/mod.rs b/crates/audit/tests/common/mod.rs index 46fa30b..634f78a 100644 --- a/crates/audit/tests/common/mod.rs +++ b/crates/audit/tests/common/mod.rs @@ -19,7 +19,7 @@ impl TestHarness { pub async fn new() -> Result> { let minio_container = MinIO::default().start().await?; let s3_port = minio_container.get_host_port_ipv4(9000).await?; - let s3_endpoint = format!("http://127.0.0.1:{}", s3_port); + let s3_endpoint = format!("http://127.0.0.1:{s3_port}"); let config = aws_config::defaults(aws_config::BehaviorVersion::latest()) .region("us-east-1") diff --git a/crates/audit/tests/s3_test.rs b/crates/audit/tests/s3_test.rs index 171da55..37a0c3f 100644 --- a/crates/audit/tests/s3_test.rs +++ b/crates/audit/tests/s3_test.rs @@ -227,7 +227,7 @@ async fn test_concurrent_writes_for_bundle() -> Result<(), Box eyre::Result<()> { let insert_result = harness.data_store.insert_bundle(test_bundle.clone()).await; if let Err(ref err) = insert_result { - eprintln!("Insert failed with error: {:?}", err); + eprintln!("Insert failed with error: {err:?}"); } assert!(insert_result.is_ok()); let bundle_id = insert_result.unwrap(); diff --git a/crates/maintenance/src/main.rs b/crates/maintenance/src/main.rs index a9c5460..6e28a6d 100644 --- a/crates/maintenance/src/main.rs +++ b/crates/maintenance/src/main.rs @@ -143,7 +143,7 @@ async fn process_block( .get_block_by_number(block_number.into()) .full() .await? - .ok_or_else(|| anyhow::anyhow!("Block {} not found", block_number))?; + .ok_or_else(|| anyhow::anyhow!("Block {block_number} not found"))?; let block_hash = block.header.hash; From 660c3de6110e6dc695487f73c812848c57506b35 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Tue, 23 Sep 2025 15:29:31 -0500 Subject: [PATCH 011/117] Add dockerfiles / docker-compose file for all services (#11) * Add dockerfiles / docker-compose file for all services * Remove release mode for local dev speed, todo add as profiles in future * Add start except --- .dockerignore | 29 +++++++++++++++++++++++++ .env.example | 10 ++++----- .github/workflows/docker.yml | 18 ++++++++++++++++ .gitignore | 1 + crates/audit/Dockerfile | 20 ++++++++++++++++++ crates/ingress/Dockerfile | 21 ++++++++++++++++++ crates/ingress/src/main.rs | 2 +- crates/maintenance/Dockerfile | 19 +++++++++++++++++ docker-compose.tips.yml | 40 +++++++++++++++++++++++++++++++++++ docker-compose.yml | 10 ++++----- justfile | 40 +++++++++++++++++++++++++++++++++++ ui/Dockerfile | 39 ++++++++++++++++++++++++++++++++++ ui/next.config.ts | 2 +- ui/public/logo.svg | 12 +++++++++++ ui/src/db/relations.ts | 2 ++ ui/src/db/schema.ts | 1 + ui/src/lib/s3.ts | 5 +---- 17 files changed, 255 insertions(+), 16 deletions(-) create mode 100644 .dockerignore create mode 100644 .github/workflows/docker.yml create mode 100644 crates/audit/Dockerfile create mode 100644 crates/ingress/Dockerfile create mode 100644 crates/maintenance/Dockerfile create mode 100644 docker-compose.tips.yml create mode 100644 ui/Dockerfile create mode 100644 ui/public/logo.svg diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..7b0473f --- /dev/null +++ b/.dockerignore @@ -0,0 +1,29 @@ +/target/ +**/target/ +/ui/node_modules +/ui/.next +.git +/data +*.log +.env +.env.docker +/ui/.env +.idea/ +.vscode/ +*.swp +*.swo +*~ +docs/ +README.md +*.md +!CLAUDE.md +.DS_Store +Thumbs.db +Dockerfile* +docker-compose*.yml +.dockerignore +.gitignore +*.tmp +*.temp +.claude/ +**/*.orig \ No newline at end of file diff --git a/.env.example b/.env.example index e4462d3..cb5acd4 100644 --- a/.env.example +++ b/.env.example @@ -1,19 +1,19 @@ # Ingress -TIPS_INGRESS_ADDRESS=127.0.0.1 +TIPS_INGRESS_ADDRESS=0.0.0.0 TIPS_INGRESS_PORT=8080 TIPS_INGRESS_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres TIPS_INGRESS_RPC_MEMPOOL=http://localhost:2222 TIPS_INGRESS_DUAL_WRITE_MEMPOOL=false TIPS_INGRESS_KAFKA_BROKERS=localhost:9092 TIPS_INGRESS_KAFKA_TOPIC=tips-audit -TIPS_INGRESS_LOG_LEVEL=info +TIPS_INGRESS_LOG_LEVEL=debug TIPS_INGRESS_KAFKA_QUEUE_TOPIC=tips-ingress # Audit service configuration TIPS_AUDIT_KAFKA_BROKERS=localhost:9092 TIPS_AUDIT_KAFKA_TOPIC=tips-audit TIPS_AUDIT_KAFKA_GROUP_ID=local-audit -TIPS_AUDIT_LOG_LEVEL=info +TIPS_AUDIT_LOG_LEVEL=debug TIPS_AUDIT_S3_BUCKET=tips TIPS_AUDIT_S3_CONFIG_TYPE=manual TIPS_AUDIT_S3_ENDPOINT=http://localhost:7000 @@ -27,7 +27,7 @@ TIPS_MAINTENANCE_RPC_NODE=http://localhost:2222 TIPS_MAINTENANCE_KAFKA_BROKERS=localhost:9092 TIPS_MAINTENANCE_KAFKA_TOPIC=tips-audit TIPS_MAINTENANCE_POLL_INTERVAL_MS=250 -TIPS_MAINTENANCE_LOG_LEVEL=info +TIPS_MAINTENANCE_LOG_LEVEL=debug # TIPS UI TIPS_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres @@ -36,4 +36,4 @@ TIPS_UI_S3_BUCKET_NAME=tips TIPS_UI_S3_CONFIG_TYPE=manual TIPS_UI_S3_ENDPOINT=http://localhost:7000 TIPS_UI_S3_ACCESS_KEY_ID=minioadmin -TIPS_UI_S3_SECRET_ACCESS_KEY=minioadmin \ No newline at end of file +TIPS_UI_S3_SECRET_ACCESS_KEY=minioadmin diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000..ca329af --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,18 @@ +name: Docker Build +permissions: + contents: read + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + docker-build: + name: Docker Build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - run: cp .env.example .env.docker + - run: docker compose -f docker-compose.tips.yml build \ No newline at end of file diff --git a/.gitignore b/.gitignore index ed33ed8..f380f46 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ Thumbs.db # Environment variables .env +.env.docker /ui/.env # Claude diff --git a/crates/audit/Dockerfile b/crates/audit/Dockerfile new file mode 100644 index 0000000..2c72e9d --- /dev/null +++ b/crates/audit/Dockerfile @@ -0,0 +1,20 @@ +FROM rust:1-bookworm AS builder + +WORKDIR /app + +COPY Cargo.toml Cargo.lock ./ +COPY crates/ ./crates/ + +RUN cargo build --bin tips-audit + +FROM debian:bookworm + +RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/lib/apt/lists/* + +WORKDIR /app + +COPY --from=builder /app/target/debug/tips-audit /app/tips-audit + +EXPOSE 3001 + +CMD ["/app/tips-audit"] \ No newline at end of file diff --git a/crates/ingress/Dockerfile b/crates/ingress/Dockerfile new file mode 100644 index 0000000..a383fd9 --- /dev/null +++ b/crates/ingress/Dockerfile @@ -0,0 +1,21 @@ +FROM rust:1-bookworm AS builder + +WORKDIR /app + +COPY Cargo.toml Cargo.lock ./ +COPY crates/ ./crates/ +COPY .sqlx/ ./.sqlx/ + +RUN cargo build --bin tips-ingress + +FROM debian:bookworm + +RUN apt-get update && apt-get install -y libssl3 && rm -rf /var/lib/apt/lists/* + +WORKDIR /app + +COPY --from=builder /app/target/debug/tips-ingress /app/tips-ingress + +EXPOSE 3000 + +CMD ["/app/tips-ingress"] \ No newline at end of file diff --git a/crates/ingress/src/main.rs b/crates/ingress/src/main.rs index 00b1d3b..ede2714 100644 --- a/crates/ingress/src/main.rs +++ b/crates/ingress/src/main.rs @@ -20,7 +20,7 @@ use tips_datastore::PostgresDatastore; #[command(author, version, about, long_about = None)] struct Config { /// Address to bind the RPC server to - #[arg(long, env = "TIPS_INGRESS_ADDRESS", default_value = "127.0.0.1")] + #[arg(long, env = "TIPS_INGRESS_ADDRESS", default_value = "0.0.0.0")] address: IpAddr, /// Port to bind the RPC server to diff --git a/crates/maintenance/Dockerfile b/crates/maintenance/Dockerfile new file mode 100644 index 0000000..2b77800 --- /dev/null +++ b/crates/maintenance/Dockerfile @@ -0,0 +1,19 @@ +FROM rust:1-bookworm AS builder + +WORKDIR /app + +COPY Cargo.toml Cargo.lock ./ +COPY crates/ ./crates/ +COPY .sqlx/ ./.sqlx/ + +RUN cargo build --bin tips-maintenance + +FROM debian:bookworm + +RUN apt-get update && apt-get install -y libssl3 && rm -rf /var/lib/apt/lists/* + +WORKDIR /app + +COPY --from=builder /app/target/debug/tips-maintenance /app/tips-maintenance + +CMD ["/app/tips-maintenance"] \ No newline at end of file diff --git a/docker-compose.tips.yml b/docker-compose.tips.yml new file mode 100644 index 0000000..99c051e --- /dev/null +++ b/docker-compose.tips.yml @@ -0,0 +1,40 @@ +services: + ingress-rpc: + build: + context: . + dockerfile: crates/ingress/Dockerfile + container_name: tips-ingress + ports: + - "8080:8080" + env_file: + - .env.docker + restart: unless-stopped + + audit: + build: + context: . + dockerfile: crates/audit/Dockerfile + container_name: tips-audit + env_file: + - .env.docker + restart: unless-stopped + + maintenance: + build: + context: . + dockerfile: crates/maintenance/Dockerfile + container_name: tips-maintenance + env_file: + - .env.docker + restart: unless-stopped + + ui: + build: + context: . + dockerfile: ui/Dockerfile + ports: + - "3000:3000" + container_name: tips-ui + env_file: + - .env.docker + restart: unless-stopped \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 72efb02..72fd79e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,11 +22,12 @@ services: container_name: tips-kafka ports: - "9092:9092" + - "9094:9094" environment: KAFKA_BROKER_ID: 1 - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,CONTROLLER:PLAINTEXT - KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092 - KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:29092,CONTROLLER://0.0.0.0:9093,PLAINTEXT_HOST://0.0.0.0:9092 + KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,PLAINTEXT_DOCKER:PLAINTEXT,CONTROLLER:PLAINTEXT + KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092,PLAINTEXT_DOCKER://host.docker.internal:9094 + KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:29092,CONTROLLER://0.0.0.0:9093,PLAINTEXT_HOST://0.0.0.0:9092,PLAINTEXT_DOCKER://0.0.0.0:9094 KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER KAFKA_ZOOKEEPER_CONNECT: ' ' @@ -88,5 +89,4 @@ services: /usr/bin/mc mb minio/tips; /usr/bin/mc anonymous set public minio/tips; exit 0; - " - + " \ No newline at end of file diff --git a/justfile b/justfile index 041641d..811cbe6 100644 --- a/justfile +++ b/justfile @@ -27,8 +27,48 @@ sync: deps-reset cd ui && mv ./drizzle/schema.ts ./src/db/ cd ui && rm -rf ./drizzle ### ENV ### + just sync-env + ### REFORMAT ### + just fix + +sync-env: cp .env.example .env cp .env.example ./ui/.env + cp .env.example .env.docker + # Change kafka ports + sed -i '' 's/localhost:9092/host.docker.internal:9094/g' ./.env.docker + # Change other dependencies + sed -i '' 's/localhost/host.docker.internal/g' ./.env.docker + +stop-all: + export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && docker compose down && docker compose rm && rm -rf data/ + +# Start every service running in docker, useful for demos +start-all: stop-all + export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && mkdir -p data/postgres data/kafka data/minio && docker compose build && docker compose up -d + +# Start every service in docker, except the one you're currently working on. e.g. just start-except ui ingress-rpc +start-except programs: stop-all + #!/bin/bash + all_services=(postgres kafka kafka-setup minio minio-setup ingress-rpc audit maintenance ui) + exclude_services=({{ programs }}) + + # Create result array with services not in exclude list + result_services=() + for service in "${all_services[@]}"; do + skip=false + for exclude in "${exclude_services[@]}"; do + if [[ "$service" == "$exclude" ]]; then + skip=true + break + fi + done + if [[ "$skip" == false ]]; then + result_services+=("$service") + fi + done + + export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && mkdir -p data/postgres data/kafka data/minio && docker compose build && docker compose up -d ${result_services[@]} ### RUN SERVICES ### deps-reset: diff --git a/ui/Dockerfile b/ui/Dockerfile new file mode 100644 index 0000000..0fe1d58 --- /dev/null +++ b/ui/Dockerfile @@ -0,0 +1,39 @@ +FROM node:20-alpine AS deps +WORKDIR /app +COPY ui/package.json ui/yarn.lock ./ +RUN yarn install --frozen-lockfile + +FROM node:20-alpine AS builder +WORKDIR /app +COPY --from=deps /app/node_modules ./node_modules +COPY ./ui . + +ENV NEXT_TELEMETRY_DISABLED=1 + +RUN yarn build + +FROM node:20-alpine AS runner +WORKDIR /app + +ENV NODE_ENV=production +ENV NEXT_TELEMETRY_DISABLED=1 + +RUN addgroup --system --gid 1001 nodejs +RUN adduser --system --uid 1001 nextjs + + +RUN mkdir .next +RUN chown nextjs:nodejs .next + +COPY --from=builder /app/public ./public +COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ +COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static + +USER nextjs + +EXPOSE 3000 + +ENV PORT=3000 +ENV HOSTNAME="0.0.0.0" + +CMD ["node", "server.js"] \ No newline at end of file diff --git a/ui/next.config.ts b/ui/next.config.ts index e9ffa30..68a6c64 100644 --- a/ui/next.config.ts +++ b/ui/next.config.ts @@ -1,7 +1,7 @@ import type { NextConfig } from "next"; const nextConfig: NextConfig = { - /* config options here */ + output: "standalone", }; export default nextConfig; diff --git a/ui/public/logo.svg b/ui/public/logo.svg new file mode 100644 index 0000000..05f4921 --- /dev/null +++ b/ui/public/logo.svg @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/ui/src/db/relations.ts b/ui/src/db/relations.ts index e69de29..0ed80c7 100644 --- a/ui/src/db/relations.ts +++ b/ui/src/db/relations.ts @@ -0,0 +1,2 @@ +import { relations } from "drizzle-orm/relations"; +import {} from "./schema"; diff --git a/ui/src/db/schema.ts b/ui/src/db/schema.ts index 38c9041..1f88680 100644 --- a/ui/src/db/schema.ts +++ b/ui/src/db/schema.ts @@ -1,3 +1,4 @@ +import { sql } from "drizzle-orm"; import { bigint, char, diff --git a/ui/src/lib/s3.ts b/ui/src/lib/s3.ts index d79ff9d2..69a413e 100644 --- a/ui/src/lib/s3.ts +++ b/ui/src/lib/s3.ts @@ -41,10 +41,7 @@ function createS3Client(): S3Client { const s3Client = createS3Client(); -const BUCKET_NAME = process.env.TIPS_UI_S3_BUCKET_NAME; -if (process.env.TIPS_UI_S3_BUCKET_NAME === undefined) { - throw new Error("You must specify a valid bucket"); -} +const BUCKET_NAME = process.env.TIPS_UI_S3_BUCKET_NAME || "tips"; export interface TransactionMetadata { bundle_ids: string[]; From 14aed47d584f6c6a64ac1c3f17a5cd1b15a95df7 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Tue, 23 Sep 2025 15:30:07 -0500 Subject: [PATCH 012/117] Fix refresh all bundles (#12) --- ui/src/app/bundles/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/app/bundles/page.tsx b/ui/src/app/bundles/page.tsx index 2be0c36..f67b8df 100644 --- a/ui/src/app/bundles/page.tsx +++ b/ui/src/app/bundles/page.tsx @@ -51,7 +51,7 @@ export default function BundlesPage() { fetchData(); - const interval = setInterval(fetchLiveBundles, 400); + const interval = setInterval(fetchData, 400); return () => clearInterval(interval); }, []); From 5399c5fa1beadbee251ad093191fda2c0c2028e3 Mon Sep 17 00:00:00 2001 From: William Law Date: Tue, 23 Sep 2025 17:15:08 -0400 Subject: [PATCH 013/117] [writer] introduce `IngressWriter` (#10) * spike writer * have dbwriter consume from queue * add backoff retry * make ingresswriter own service * move publisher to ingresswriter * nits * move publish to own func * rename to ingress-rpc and ingress-writer * add ingress-writer dockerfile * remove unused dep * use TIPS_INGRESS_WRITER_ name --- .env.example | 10 +- Cargo.lock | 22 ++- Cargo.toml | 3 +- README.md | 5 +- crates/{ingress => ingress-rpc}/Cargo.toml | 4 +- crates/{ingress => ingress-rpc}/Dockerfile | 6 +- crates/{ingress => ingress-rpc}/src/main.rs | 25 +-- crates/{ingress => ingress-rpc}/src/queue.rs | 4 +- .../{ingress => ingress-rpc}/src/service.rs | 43 +---- crates/ingress-writer/Cargo.toml | 24 +++ crates/ingress-writer/Dockerfile | 19 ++ crates/ingress-writer/src/main.rs | 169 ++++++++++++++++++ docker-compose.tips.yml | 13 +- docker-compose.yml | 2 +- justfile | 7 +- 15 files changed, 278 insertions(+), 78 deletions(-) rename crates/{ingress => ingress-rpc}/Cargo.toml (93%) rename crates/{ingress => ingress-rpc}/Dockerfile (63%) rename crates/{ingress => ingress-rpc}/src/main.rs (81%) rename crates/{ingress => ingress-rpc}/src/queue.rs (98%) rename crates/{ingress => ingress-rpc}/src/service.rs (72%) create mode 100644 crates/ingress-writer/Cargo.toml create mode 100644 crates/ingress-writer/Dockerfile create mode 100644 crates/ingress-writer/src/main.rs diff --git a/.env.example b/.env.example index cb5acd4..62434d8 100644 --- a/.env.example +++ b/.env.example @@ -1,13 +1,12 @@ # Ingress TIPS_INGRESS_ADDRESS=0.0.0.0 TIPS_INGRESS_PORT=8080 -TIPS_INGRESS_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres TIPS_INGRESS_RPC_MEMPOOL=http://localhost:2222 TIPS_INGRESS_DUAL_WRITE_MEMPOOL=false TIPS_INGRESS_KAFKA_BROKERS=localhost:9092 TIPS_INGRESS_KAFKA_TOPIC=tips-audit TIPS_INGRESS_LOG_LEVEL=debug -TIPS_INGRESS_KAFKA_QUEUE_TOPIC=tips-ingress +TIPS_INGRESS_KAFKA_QUEUE_TOPIC=tips-ingress-rpc # Audit service configuration TIPS_AUDIT_KAFKA_BROKERS=localhost:9092 @@ -37,3 +36,10 @@ TIPS_UI_S3_CONFIG_TYPE=manual TIPS_UI_S3_ENDPOINT=http://localhost:7000 TIPS_UI_S3_ACCESS_KEY_ID=minioadmin TIPS_UI_S3_SECRET_ACCESS_KEY=minioadmin + +# Ingress Writer +TIPS_INGRESS_WRITER_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres +TIPS_INGRESS_WRITER_KAFKA_BROKERS=localhost:9092 +TIPS_INGRESS_WRITER_KAFKA_TOPIC=tips-ingress-rpc +TIPS_INGRESS_WRITER_KAFKA_GROUP_ID=local-writer +TIPS_INGRESS_WRITER_LOG_LEVEL=info diff --git a/Cargo.lock b/Cargo.lock index 4fe9cb8..359e0c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7084,7 +7084,7 @@ dependencies = [ ] [[package]] -name = "tips-ingress" +name = "tips-ingress-rpc" version = "0.1.0" dependencies = [ "alloy-consensus", @@ -7112,6 +7112,26 @@ dependencies = [ "url", ] +[[package]] +name = "tips-ingress-writer" +version = "0.1.0" +dependencies = [ + "alloy-rpc-types-mev", + "anyhow", + "async-trait", + "backon", + "clap", + "dotenvy", + "rdkafka", + "serde_json", + "tips-audit", + "tips-datastore", + "tokio", + "tracing", + "tracing-subscriber 0.3.20", + "uuid", +] + [[package]] name = "tips-maintenance" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 32a3ffd..4e907d1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,12 @@ [workspace] -members = ["crates/datastore", "crates/audit", "crates/ingress", "crates/maintenance"] +members = ["crates/datastore", "crates/audit", "crates/ingress-rpc", "crates/maintenance", "crates/ingress-writer"] resolver = "2" [workspace.dependencies] tips-datastore = { path = "crates/datastore" } tips-audit = { path = "crates/audit" } tips-maintenance = { path = "crates/maintenance" } +tips-ingress-writer = { path = "crates/ingress-writer" } # Reth diff --git a/README.md b/README.md index 0cccd18..0bc1969 100644 --- a/README.md +++ b/README.md @@ -19,11 +19,14 @@ Event streaming and archival system that: - Archives bundle history to S3 for long-term storage - See [S3 Storage Format](docs/AUDIT_S3_FORMAT.md) for data structure details -### 🔌 Ingress (`crates/ingress`) +### 🔌 Ingress RPC (`crates/ingress-rpc`) The main entry point that provides a JSON-RPC API for receiving transactions and bundles. ### 🔨 Maintenance (`crates/maintenance`) A service that maintains the health of the TIPS DataStore, by removing stale or included bundles. +### ✍️ Ingress Writer (`crates/ingress-writer`) +A service that consumes bundles from Kafka and persists them to the datastore. + ### 🖥️ UI (`ui`) A debug UI for viewing the state of the bundle store and S3. diff --git a/crates/ingress/Cargo.toml b/crates/ingress-rpc/Cargo.toml similarity index 93% rename from crates/ingress/Cargo.toml rename to crates/ingress-rpc/Cargo.toml index 6950207..e9fce75 100644 --- a/crates/ingress/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -1,10 +1,10 @@ [package] -name = "tips-ingress" +name = "tips-ingress-rpc" version = "0.1.0" edition = "2024" [[bin]] -name = "tips-ingress" +name = "tips-ingress-rpc" path = "src/main.rs" [dependencies] diff --git a/crates/ingress/Dockerfile b/crates/ingress-rpc/Dockerfile similarity index 63% rename from crates/ingress/Dockerfile rename to crates/ingress-rpc/Dockerfile index a383fd9..48f8669 100644 --- a/crates/ingress/Dockerfile +++ b/crates/ingress-rpc/Dockerfile @@ -6,7 +6,7 @@ COPY Cargo.toml Cargo.lock ./ COPY crates/ ./crates/ COPY .sqlx/ ./.sqlx/ -RUN cargo build --bin tips-ingress +RUN cargo build --bin tips-ingress-rpc FROM debian:bookworm @@ -14,8 +14,8 @@ RUN apt-get update && apt-get install -y libssl3 && rm -rf /var/lib/apt/lists/* WORKDIR /app -COPY --from=builder /app/target/debug/tips-ingress /app/tips-ingress +COPY --from=builder /app/target/debug/tips-ingress-rpc /app/tips-ingress-rpc EXPOSE 3000 -CMD ["/app/tips-ingress"] \ No newline at end of file +CMD ["/app/tips-ingress-rpc"] \ No newline at end of file diff --git a/crates/ingress/src/main.rs b/crates/ingress-rpc/src/main.rs similarity index 81% rename from crates/ingress/src/main.rs rename to crates/ingress-rpc/src/main.rs index ede2714..8512667 100644 --- a/crates/ingress/src/main.rs +++ b/crates/ingress-rpc/src/main.rs @@ -5,7 +5,6 @@ use op_alloy_network::Optimism; use rdkafka::ClientConfig; use rdkafka::producer::FutureProducer; use std::net::IpAddr; -use tips_audit::KafkaMempoolEventPublisher; use tracing::{info, warn}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; use url::Url; @@ -14,7 +13,6 @@ mod queue; mod service; use queue::KafkaQueuePublisher; use service::{IngressApiServer, IngressService}; -use tips_datastore::PostgresDatastore; #[derive(Parser, Debug)] #[command(author, version, about, long_about = None)] @@ -31,10 +29,6 @@ struct Config { #[arg(long, env = "TIPS_INGRESS_RPC_MEMPOOL")] mempool_url: Url, - /// URL of the Postgres DB to store bundles in - #[arg(long, env = "TIPS_INGRESS_DATABASE_URL")] - database_url: String, - /// Enable dual writing raw transactions to the mempool #[arg(long, env = "TIPS_INGRESS_DUAL_WRITE_MEMPOOL", default_value = "false")] dual_write_mempool: bool, @@ -55,7 +49,7 @@ struct Config { #[arg( long, env = "TIPS_INGRESS_KAFKA_QUEUE_TOPIC", - default_value = "tips-ingress" + default_value = "tips-ingress-rpc" )] queue_topic: String, @@ -103,29 +97,14 @@ async fn main() -> anyhow::Result<()> { .network::() .connect_http(config.mempool_url); - let bundle_store = PostgresDatastore::connect(config.database_url).await?; - bundle_store.run_migrations().await?; - - let kafka_producer: FutureProducer = ClientConfig::new() - .set("bootstrap.servers", &config.kafka_brokers) - .set("message.timeout.ms", "5000") - .create()?; - let queue_producer: FutureProducer = ClientConfig::new() .set("bootstrap.servers", &config.kafka_brokers) .set("message.timeout.ms", "5000") .create()?; - let publisher = KafkaMempoolEventPublisher::new(kafka_producer, config.kafka_topic); let queue = KafkaQueuePublisher::new(queue_producer, config.queue_topic); - let service = IngressService::new( - provider, - bundle_store, - config.dual_write_mempool, - publisher, - queue, - ); + let service = IngressService::new(provider, config.dual_write_mempool, queue); let bind_addr = format!("{}:{}", config.address, config.port); let server = Server::builder().build(&bind_addr).await?; diff --git a/crates/ingress/src/queue.rs b/crates/ingress-rpc/src/queue.rs similarity index 98% rename from crates/ingress/src/queue.rs rename to crates/ingress-rpc/src/queue.rs index 2a015aa..4a685de 100644 --- a/crates/ingress/src/queue.rs +++ b/crates/ingress-rpc/src/queue.rs @@ -53,7 +53,7 @@ impl KafkaQueuePublisher { topic = %self.topic, "Failed to enqueue bundle" ); - Err(anyhow::anyhow!("Failed to enqueue bundle: {}", err)) + Err(anyhow::anyhow!("Failed to enqueue bundle: {err}")) } } }; @@ -98,7 +98,7 @@ mod tests { .create() .expect("Producer creation failed"); - let publisher = KafkaQueuePublisher::new(producer, "tips-ingress".to_string()); + let publisher = KafkaQueuePublisher::new(producer, "tips-ingress-rpc".to_string()); let bundle = create_test_bundle(); let sender = Address::ZERO; diff --git a/crates/ingress/src/service.rs b/crates/ingress-rpc/src/service.rs similarity index 72% rename from crates/ingress/src/service.rs rename to crates/ingress-rpc/src/service.rs index 6c73b83..0e5986f 100644 --- a/crates/ingress/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -3,7 +3,6 @@ use alloy_primitives::{B256, Bytes}; use alloy_provider::network::eip2718::Decodable2718; use alloy_provider::{Provider, RootProvider}; use alloy_rpc_types_mev::{EthBundleHash, EthCancelBundle, EthSendBundle}; -use jsonrpsee::types::ErrorObject; use jsonrpsee::{ core::{RpcResult, async_trait}, proc_macros::rpc, @@ -11,8 +10,6 @@ use jsonrpsee::{ use op_alloy_consensus::OpTxEnvelope; use op_alloy_network::Optimism; use reth_rpc_eth_types::EthApiError; -use tips_audit::{MempoolEvent, MempoolEventPublisher}; -use tips_datastore::BundleDatastore; use tracing::{info, warn}; use crate::queue::QueuePublisher; @@ -32,37 +29,25 @@ pub trait IngressApi { async fn send_raw_transaction(&self, tx: Bytes) -> RpcResult; } -pub struct IngressService { +pub struct IngressService { provider: RootProvider, - datastore: Store, dual_write_mempool: bool, - publisher: Publisher, queue: Queue, } -impl IngressService { - pub fn new( - provider: RootProvider, - datastore: Store, - dual_write_mempool: bool, - publisher: Publisher, - queue: Queue, - ) -> Self { +impl IngressService { + pub fn new(provider: RootProvider, dual_write_mempool: bool, queue: Queue) -> Self { Self { provider, - datastore, dual_write_mempool, - publisher, queue, } } } #[async_trait] -impl IngressApiServer for IngressService +impl IngressApiServer for IngressService where - Store: BundleDatastore + Sync + Send + 'static, - Publisher: MempoolEventPublisher + Sync + Send + 'static, Queue: QueuePublisher + Sync + Send + 'static, { async fn send_bundle(&self, _bundle: EthSendBundle) -> RpcResult { @@ -111,25 +96,7 @@ where warn!(message = "Failed to publish Queue::enqueue_bundle", sender = %sender, error = %e); } - // TODO: have DB Writer consume from the queue and move the insert_bundle logic there - let result = self - .datastore - .insert_bundle(bundle.clone()) - .await - .map_err(|_e| ErrorObject::owned(11, "todo", Some(2)))?; - - info!(message="inserted singleton bundle", uuid=%result, txn_hash=%transaction.tx_hash()); - - if let Err(e) = self - .publisher - .publish(MempoolEvent::Created { - bundle_id: result, - bundle, - }) - .await - { - warn!(message = "Failed to publish MempoolEvent::Created", error = %e); - } + info!(message="queued singleton bundle", txn_hash=%transaction.tx_hash()); if self.dual_write_mempool { let response = self diff --git a/crates/ingress-writer/Cargo.toml b/crates/ingress-writer/Cargo.toml new file mode 100644 index 0000000..5a7ab1e --- /dev/null +++ b/crates/ingress-writer/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "tips-ingress-writer" +version = "0.1.0" +edition = "2024" + +[[bin]] +name = "tips-ingress-writer" +path = "src/main.rs" + +[dependencies] +tips-datastore.workspace = true +tips-audit.workspace=true +alloy-rpc-types-mev.workspace = true +tokio.workspace = true +tracing.workspace = true +tracing-subscriber.workspace = true +anyhow.workspace = true +clap.workspace = true +dotenvy.workspace = true +rdkafka.workspace = true +serde_json.workspace = true +async-trait.workspace = true +backon.workspace = true +uuid.workspace = true diff --git a/crates/ingress-writer/Dockerfile b/crates/ingress-writer/Dockerfile new file mode 100644 index 0000000..96f1abd --- /dev/null +++ b/crates/ingress-writer/Dockerfile @@ -0,0 +1,19 @@ +FROM rust:1-bookworm AS builder + +WORKDIR /app + +COPY Cargo.toml Cargo.lock ./ +COPY crates/ ./crates/ +COPY .sqlx/ ./.sqlx/ + +RUN cargo build --bin tips-ingress-writer + +FROM debian:bookworm + +RUN apt-get update && apt-get install -y libssl3 && rm -rf /var/lib/apt/lists/* + +WORKDIR /app + +COPY --from=builder /app/target/debug/tips-ingress-writer /app/tips-ingress-writer + +CMD ["/app/tips-ingress-writer"] \ No newline at end of file diff --git a/crates/ingress-writer/src/main.rs b/crates/ingress-writer/src/main.rs new file mode 100644 index 0000000..1309277 --- /dev/null +++ b/crates/ingress-writer/src/main.rs @@ -0,0 +1,169 @@ +use alloy_rpc_types_mev::EthSendBundle; +use anyhow::Result; +use backon::{ExponentialBuilder, Retryable}; +use clap::Parser; +use rdkafka::{ + config::ClientConfig, + consumer::{Consumer, StreamConsumer}, + message::Message, + producer::FutureProducer, +}; +use tips_audit::{KafkaMempoolEventPublisher, MempoolEvent, MempoolEventPublisher}; +use tips_datastore::{BundleDatastore, postgres::PostgresDatastore}; +use tokio::time::Duration; +use tracing::{debug, error, info, warn}; +use uuid::Uuid; + +#[derive(Parser)] +#[command(author, version, about, long_about = None)] +struct Args { + #[arg(long, env = "TIPS_INGRESS_WRITER_DATABASE_URL")] + database_url: String, + + #[arg(long, env = "TIPS_INGRESS_WRITER_KAFKA_BROKERS")] + kafka_brokers: String, + + #[arg( + long, + env = "TIPS_INGRESS_WRITER_KAFKA_TOPIC", + default_value = "tips-ingress-rpc" + )] + kafka_topic: String, + + #[arg(long, env = "TIPS_INGRESS_WRITER_KAFKA_GROUP_ID")] + kafka_group_id: String, + + #[arg(long, env = "TIPS_INGRESS_WRITER_LOG_LEVEL", default_value = "info")] + log_level: String, +} + +/// IngressWriter consumes bundles sent from the Ingress service and writes them to the datastore +pub struct IngressWriter { + queue_consumer: StreamConsumer, + datastore: Store, + publisher: Publisher, +} + +impl IngressWriter +where + Store: BundleDatastore + Send + Sync + 'static, + Publisher: MempoolEventPublisher + Sync + Send + 'static, +{ + pub fn new( + queue_consumer: StreamConsumer, + queue_topic: String, + datastore: Store, + publisher: Publisher, + ) -> Result { + queue_consumer.subscribe(&[queue_topic.as_str()])?; + Ok(Self { + queue_consumer, + datastore, + publisher, + }) + } + + async fn insert_bundle(&self) -> Result<(Uuid, EthSendBundle)> { + match self.queue_consumer.recv().await { + Ok(message) => { + let payload = message + .payload() + .ok_or_else(|| anyhow::anyhow!("Message has no payload"))?; + let bundle: EthSendBundle = serde_json::from_slice(payload)?; + debug!( + bundle = ?bundle, + offset = message.offset(), + partition = message.partition(), + "Received bundle from queue" + ); + + let insert = || async { + self.datastore + .insert_bundle(bundle.clone()) + .await + .map_err(|e| anyhow::anyhow!("Failed to insert bundle: {e}")) + }; + + let bundle_id = insert + .retry( + &ExponentialBuilder::default() + .with_min_delay(Duration::from_millis(100)) + .with_max_delay(Duration::from_secs(5)) + .with_max_times(3), + ) + .notify(|err: &anyhow::Error, dur: Duration| { + info!("Retrying to insert bundle {:?} after {:?}", err, dur); + }) + .await + .map_err(|e| anyhow::anyhow!("Failed to insert bundle after retries: {e}"))?; + + Ok((bundle_id, bundle)) + } + Err(e) => { + error!(error = %e, "Error receiving message from Kafka"); + Err(e.into()) + } + } + } + + async fn publish(&self, bundle_id: Uuid, bundle: &EthSendBundle) { + if let Err(e) = self + .publisher + .publish(MempoolEvent::Created { + bundle_id, + bundle: bundle.clone(), + }) + .await + { + warn!(error = %e, bundle_id = %bundle_id, "Failed to publish MempoolEvent::Created"); + } + } +} + +#[tokio::main] +async fn main() -> Result<()> { + dotenvy::dotenv().ok(); + let args = Args::parse(); + + tracing_subscriber::fmt() + .with_env_filter(&args.log_level) + .init(); + + let mut config = ClientConfig::new(); + config + .set("group.id", &args.kafka_group_id) + .set("bootstrap.servers", &args.kafka_brokers) + .set("auto.offset.reset", "earliest") + .set("enable.partition.eof", "false") + .set("session.timeout.ms", "6000") + .set("enable.auto.commit", "true"); + + let kafka_producer: FutureProducer = ClientConfig::new() + .set("bootstrap.servers", &args.kafka_brokers) + .set("message.timeout.ms", "5000") + .create()?; + + let publisher = KafkaMempoolEventPublisher::new(kafka_producer, "tips-audit".to_string()); + let consumer = config.create()?; + + let bundle_store = PostgresDatastore::connect(args.database_url).await?; + bundle_store.run_migrations().await?; + + let writer = IngressWriter::new(consumer, args.kafka_topic.clone(), bundle_store, publisher)?; + + info!( + "Ingress Writer service started, consuming from topic: {}", + args.kafka_topic + ); + loop { + match writer.insert_bundle().await { + Ok((bundle_id, bundle)) => { + info!(bundle_id = %bundle_id, "Successfully inserted bundle"); + writer.publish(bundle_id, &bundle).await; + } + Err(e) => { + error!(error = %e, "Failed to process bundle"); + } + } + } +} diff --git a/docker-compose.tips.yml b/docker-compose.tips.yml index 99c051e..cff7d7c 100644 --- a/docker-compose.tips.yml +++ b/docker-compose.tips.yml @@ -2,8 +2,8 @@ services: ingress-rpc: build: context: . - dockerfile: crates/ingress/Dockerfile - container_name: tips-ingress + dockerfile: crates/ingress-rpc/Dockerfile + container_name: tips-ingress-rpc ports: - "8080:8080" env_file: @@ -35,6 +35,15 @@ services: ports: - "3000:3000" container_name: tips-ui + env_file: + - .env.docker + restart: unless-stopped + + ingress-writer: + build: + context: . + dockerfile: crates/ingress-writer/Dockerfile + container_name: tips-ingress-writer env_file: - .env.docker restart: unless-stopped \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 72fd79e..cfeeedf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -56,7 +56,7 @@ services: command: | sh -c " kafka-topics --create --if-not-exists --topic tips-audit --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 - kafka-topics --create --if-not-exists --topic tips-ingress --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 + kafka-topics --create --if-not-exists --topic tips-ingress-rpc --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 kafka-topics --list --bootstrap-server kafka:29092 " diff --git a/justfile b/justfile index 811cbe6..c7e8771 100644 --- a/justfile +++ b/justfile @@ -80,11 +80,14 @@ deps: audit: cargo run --bin tips-audit -ingress: - cargo run --bin tips-ingress +ingress-rpc: + cargo run --bin tips-ingress-rpc maintenance: cargo run --bin tips-maintenance +ingress-writer: + cargo run --bin tips-ingress-writer + ui: cd ui && yarn dev \ No newline at end of file From 0a3c56d62f9ac25fe54d48f1ab8d4889be502d9d Mon Sep 17 00:00:00 2001 From: "stepsecurity-app[bot]" <188008098+stepsecurity-app[bot]@users.noreply.github.com> Date: Wed, 24 Sep 2025 08:44:33 -0500 Subject: [PATCH 014/117] [StepSecurity] Apply security best practices (#13) Signed-off-by: StepSecurity Bot Co-authored-by: stepsecurity-app[bot] <188008098+stepsecurity-app[bot]@users.noreply.github.com> --- .github/workflows/docker.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ca329af..ac22ab7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -13,6 +13,11 @@ jobs: name: Docker Build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 + with: + egress-policy: audit + + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - run: cp .env.example .env.docker - run: docker compose -f docker-compose.tips.yml build \ No newline at end of file From e50f64b4487a88cd187afc88af72b8d234ca533f Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Wed, 24 Sep 2025 13:44:23 -0500 Subject: [PATCH 015/117] chore: add state field to bundlestore (#14) --- ...5085bde3207756fe914837cef0cd12b864366.json | 38 +++++++++++++++++++ ...9cf31e808fa8dcbd701c75246dbdc95c58946.json | 23 ----------- .../1757444171_create_bundles_table.sql | 16 ++++++++ crates/datastore/src/postgres.rs | 23 +++++++++-- crates/datastore/tests/datastore.rs | 6 ++- justfile | 6 +-- ui/src/app/api/bundles/route.ts | 10 ++++- ui/src/app/bundles/page.tsx | 33 +++++++++++++--- ui/src/db/relations.ts | 2 - ui/src/db/schema.ts | 12 +++++- 10 files changed, 128 insertions(+), 41 deletions(-) create mode 100644 .sqlx/query-c279740d623e06b3e3add31a6c15085bde3207756fe914837cef0cd12b864366.json delete mode 100644 .sqlx/query-ca6a250821d4542720578da20aa9cf31e808fa8dcbd701c75246dbdc95c58946.json diff --git a/.sqlx/query-c279740d623e06b3e3add31a6c15085bde3207756fe914837cef0cd12b864366.json b/.sqlx/query-c279740d623e06b3e3add31a6c15085bde3207756fe914837cef0cd12b864366.json new file mode 100644 index 0000000..b3729a0 --- /dev/null +++ b/.sqlx/query-c279740d623e06b3e3add31a6c15085bde3207756fe914837cef0cd12b864366.json @@ -0,0 +1,38 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO bundles (\n id, \"state\", senders, minimum_base_fee, txn_hashes, \n txs, reverting_tx_hashes, dropping_tx_hashes, \n block_number, min_timestamp, max_timestamp,\n created_at, updated_at\n )\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, NOW(), NOW())\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + { + "Custom": { + "name": "bundle_state", + "kind": { + "Enum": [ + "Ready", + "BundleLimit", + "AccountLimits", + "GlobalLimits", + "IncludedInFlashblock", + "IncludedInBlock" + ] + } + } + }, + "BpcharArray", + "Int8", + "BpcharArray", + "TextArray", + "BpcharArray", + "BpcharArray", + "Int8", + "Int8", + "Int8" + ] + }, + "nullable": [] + }, + "hash": "c279740d623e06b3e3add31a6c15085bde3207756fe914837cef0cd12b864366" +} diff --git a/.sqlx/query-ca6a250821d4542720578da20aa9cf31e808fa8dcbd701c75246dbdc95c58946.json b/.sqlx/query-ca6a250821d4542720578da20aa9cf31e808fa8dcbd701c75246dbdc95c58946.json deleted file mode 100644 index ad77700..0000000 --- a/.sqlx/query-ca6a250821d4542720578da20aa9cf31e808fa8dcbd701c75246dbdc95c58946.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n INSERT INTO bundles (\n id, senders, minimum_base_fee, txn_hashes, \n txs, reverting_tx_hashes, dropping_tx_hashes, \n block_number, min_timestamp, max_timestamp,\n created_at, updated_at\n )\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, NOW(), NOW())\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Uuid", - "BpcharArray", - "Int8", - "BpcharArray", - "TextArray", - "BpcharArray", - "BpcharArray", - "Int8", - "Int8", - "Int8" - ] - }, - "nullable": [] - }, - "hash": "ca6a250821d4542720578da20aa9cf31e808fa8dcbd701c75246dbdc95c58946" -} diff --git a/crates/datastore/migrations/1757444171_create_bundles_table.sql b/crates/datastore/migrations/1757444171_create_bundles_table.sql index a5fcdf7..7fd2d6f 100644 --- a/crates/datastore/migrations/1757444171_create_bundles_table.sql +++ b/crates/datastore/migrations/1757444171_create_bundles_table.sql @@ -1,6 +1,22 @@ +DO $$ +BEGIN + IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'bundle_state') THEN + CREATE TYPE bundle_state AS ENUM ( + 'Ready', + 'BundleLimit', + 'AccountLimits', + 'GlobalLimits', + 'IncludedInFlashblock', + 'IncludedInBlock' + ); + END IF; +END$$; + + -- Create bundles table CREATE TABLE IF NOT EXISTS bundles ( id UUID PRIMARY KEY, + "state" bundle_state NOT NULL, senders CHAR(42)[], minimum_base_fee BIGINT, -- todo find a larger type diff --git a/crates/datastore/src/postgres.rs b/crates/datastore/src/postgres.rs index 88b75ad..0fea3b4 100644 --- a/crates/datastore/src/postgres.rs +++ b/crates/datastore/src/postgres.rs @@ -11,6 +11,17 @@ use sqlx::PgPool; use tracing::info; use uuid::Uuid; +#[derive(Debug, Clone, sqlx::Type)] +#[sqlx(type_name = "bundle_state", rename_all = "PascalCase")] +pub enum BundleState { + Ready, + BundleLimit, + AccountLimits, + GlobalLimits, + IncludedInFlashblock, + IncludedInBlock, +} + #[derive(sqlx::FromRow, Debug)] struct BundleRow { senders: Option>, @@ -22,6 +33,7 @@ struct BundleRow { block_number: Option, min_timestamp: Option, max_timestamp: Option, + state: BundleState, } /// Filter criteria for selecting bundles @@ -60,6 +72,7 @@ pub struct BundleWithMetadata { pub txn_hashes: Vec, pub senders: Vec
, pub min_base_fee: i64, + pub state: BundleState, } /// PostgreSQL implementation of the BundleDatastore trait @@ -137,6 +150,7 @@ impl PostgresDatastore { txn_hashes: parsed_txn_hashes?, senders: parsed_senders?, min_base_fee: row.minimum_base_fee.unwrap_or(0), + state: row.state, }) } @@ -198,14 +212,15 @@ impl BundleDatastore for PostgresDatastore { sqlx::query!( r#" INSERT INTO bundles ( - id, senders, minimum_base_fee, txn_hashes, + id, "state", senders, minimum_base_fee, txn_hashes, txs, reverting_tx_hashes, dropping_tx_hashes, block_number, min_timestamp, max_timestamp, created_at, updated_at ) - VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, NOW(), NOW()) + VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, NOW(), NOW()) "#, id, + BundleState::Ready as BundleState, &senders, minimum_base_fee, &txn_hashes, @@ -226,7 +241,7 @@ impl BundleDatastore for PostgresDatastore { let result = sqlx::query_as::<_, BundleRow>( r#" SELECT senders, minimum_base_fee, txn_hashes, txs, reverting_tx_hashes, - dropping_tx_hashes, block_number, min_timestamp, max_timestamp + dropping_tx_hashes, block_number, min_timestamp, max_timestamp, "state" FROM bundles WHERE id = $1 "#, @@ -266,7 +281,7 @@ impl BundleDatastore for PostgresDatastore { let rows = sqlx::query_as::<_, BundleRow>( r#" SELECT senders, minimum_base_fee, txn_hashes, txs, reverting_tx_hashes, - dropping_tx_hashes, block_number, min_timestamp, max_timestamp + dropping_tx_hashes, block_number, min_timestamp, max_timestamp, "state" FROM bundles WHERE minimum_base_fee >= $1 AND (block_number = $2 OR block_number IS NULL OR block_number = 0 OR $2 = 0) diff --git a/crates/datastore/tests/datastore.rs b/crates/datastore/tests/datastore.rs index 5e8c6a9..cf2a4af 100644 --- a/crates/datastore/tests/datastore.rs +++ b/crates/datastore/tests/datastore.rs @@ -5,7 +5,7 @@ use testcontainers_modules::{ postgres, testcontainers::{ContainerAsync, runners::AsyncRunner}, }; -use tips_datastore::postgres::BundleFilter; +use tips_datastore::postgres::{BundleFilter, BundleState}; use tips_datastore::{BundleDatastore, PostgresDatastore}; struct TestHarness { @@ -96,6 +96,10 @@ async fn insert_and_get() -> eyre::Result<()> { let metadata = retrieved_bundle_with_metadata.unwrap(); let retrieved_bundle = &metadata.bundle; + assert!( + matches!(metadata.state, BundleState::Ready), + "Bundle should default to Ready state" + ); assert_eq!(retrieved_bundle.txs.len(), test_bundle.txs.len()); assert_eq!(retrieved_bundle.block_number, test_bundle.block_number); assert_eq!(retrieved_bundle.min_timestamp, test_bundle.min_timestamp); diff --git a/justfile b/justfile index c7e8771..00e158f 100644 --- a/justfile +++ b/justfile @@ -14,7 +14,7 @@ fix: cargo fmt --all cargo clippy --fix --allow-dirty --allow-staged # UI - cd ui && npx biome check --fix + cd ui && npx biome check --write --unsafe create-migration name: touch crates/datastore/migrations/$(date +%s)_{{ name }}.sql @@ -72,10 +72,10 @@ start-except programs: stop-all ### RUN SERVICES ### deps-reset: - docker compose down && docker compose rm && rm -rf data/ && mkdir -p data/postgres data/kafka data/minio && docker compose up -d + COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml docker compose down && docker compose rm && rm -rf data/ && mkdir -p data/postgres data/kafka data/minio && docker compose up -d deps: - docker compose down && docker compose rm && docker compose up -d + COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml docker compose down && docker compose rm && docker compose up -d audit: cargo run --bin tips-audit diff --git a/ui/src/app/api/bundles/route.ts b/ui/src/app/api/bundles/route.ts index eb2a349..31bdba8 100644 --- a/ui/src/app/api/bundles/route.ts +++ b/ui/src/app/api/bundles/route.ts @@ -4,7 +4,14 @@ import { bundles } from "@/db/schema"; export interface Bundle { id: string; - txnHashes: string[] | null; + txnHashes: string[]; + state: + | "Ready" + | "BundleLimit" + | "AccountLimits" + | "GlobalLimits" + | "IncludedInFlashblock" + | "IncludedInBlock"; } export async function GET() { @@ -13,6 +20,7 @@ export async function GET() { .select({ id: bundles.id, txnHashes: bundles.txnHashes, + state: bundles.state, }) .from(bundles); diff --git a/ui/src/app/bundles/page.tsx b/ui/src/app/bundles/page.tsx index f67b8df..16c1c77 100644 --- a/ui/src/app/bundles/page.tsx +++ b/ui/src/app/bundles/page.tsx @@ -85,12 +85,33 @@ export default function BundlesPage() { href={`/bundles/${bundle.id}`} className="block p-3 border rounded-lg bg-white/5 hover:bg-white/10 transition-colors" > - - {bundle.id} - {" ("} - {bundle.txnHashes?.join(", ") || "No transactions"} - {")"} - +
+ {bundle.id} +
+ + {bundle.state} + + + {bundle.txnHashes?.join(", ") || "No transactions"} + +
+
))} diff --git a/ui/src/db/relations.ts b/ui/src/db/relations.ts index 0ed80c7..e69de29 100644 --- a/ui/src/db/relations.ts +++ b/ui/src/db/relations.ts @@ -1,2 +0,0 @@ -import { relations } from "drizzle-orm/relations"; -import {} from "./schema"; diff --git a/ui/src/db/schema.ts b/ui/src/db/schema.ts index 1f88680..b528617 100644 --- a/ui/src/db/schema.ts +++ b/ui/src/db/schema.ts @@ -1,15 +1,25 @@ -import { sql } from "drizzle-orm"; import { bigint, char, + pgEnum, pgTable, text, timestamp, uuid, } from "drizzle-orm/pg-core"; +export const bundleState = pgEnum("bundle_state", [ + "Ready", + "BundleLimit", + "AccountLimits", + "GlobalLimits", + "IncludedInFlashblock", + "IncludedInBlock", +]); + export const bundles = pgTable("bundles", { id: uuid().primaryKey().notNull(), + state: bundleState().notNull(), senders: char({ length: 42 }).array(), // You can use { mode: "bigint" } if numbers are exceeding js number limitations minimumBaseFee: bigint("minimum_base_fee", { mode: "number" }), From 746f3d7ac67b14e1e05eef355a274bc175e9fa5c Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Wed, 24 Sep 2025 14:05:36 -0500 Subject: [PATCH 016/117] chore: speed up docker (#15) --- crates/audit/Dockerfile | 25 ++++++++++++++++++++----- crates/ingress-rpc/Dockerfile | 28 +++++++++++++++++++++------- crates/ingress-writer/Dockerfile | 28 +++++++++++++++++++++------- crates/maintenance/Dockerfile | 28 +++++++++++++++++++++------- justfile | 2 +- ui/Dockerfile | 7 ++++--- 6 files changed, 88 insertions(+), 30 deletions(-) diff --git a/crates/audit/Dockerfile b/crates/audit/Dockerfile index 2c72e9d..b09a0fd 100644 --- a/crates/audit/Dockerfile +++ b/crates/audit/Dockerfile @@ -1,11 +1,26 @@ -FROM rust:1-bookworm AS builder +FROM rust:1-bookworm AS base +RUN cargo install cargo-chef --locked WORKDIR /app -COPY Cargo.toml Cargo.lock ./ -COPY crates/ ./crates/ +FROM base AS planner +COPY . . +RUN cargo chef prepare --recipe-path recipe.json -RUN cargo build --bin tips-audit +FROM base AS builder +COPY --from=planner /app/recipe.json recipe.json + +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=/usr/local/cargo/git \ + --mount=type=cache,target=/app/target \ + cargo chef cook --recipe-path recipe.json + +COPY . . +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=/usr/local/cargo/git \ + --mount=type=cache,target=/app/target \ + cargo build --bin tips-audit && \ + cp target/debug/tips-audit /tmp/tips-audit FROM debian:bookworm @@ -13,7 +28,7 @@ RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/ WORKDIR /app -COPY --from=builder /app/target/debug/tips-audit /app/tips-audit +COPY --from=builder /tmp/tips-audit /app/tips-audit EXPOSE 3001 diff --git a/crates/ingress-rpc/Dockerfile b/crates/ingress-rpc/Dockerfile index 48f8669..97c27d0 100644 --- a/crates/ingress-rpc/Dockerfile +++ b/crates/ingress-rpc/Dockerfile @@ -1,20 +1,34 @@ -FROM rust:1-bookworm AS builder +FROM rust:1-bookworm AS base +RUN cargo install cargo-chef --locked WORKDIR /app -COPY Cargo.toml Cargo.lock ./ -COPY crates/ ./crates/ -COPY .sqlx/ ./.sqlx/ +FROM base AS planner +COPY . . +RUN cargo chef prepare --recipe-path recipe.json -RUN cargo build --bin tips-ingress-rpc +FROM base AS builder +COPY --from=planner /app/recipe.json recipe.json + +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=/usr/local/cargo/git \ + --mount=type=cache,target=/app/target \ + cargo chef cook --recipe-path recipe.json + +COPY . . +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=/usr/local/cargo/git \ + --mount=type=cache,target=/app/target \ + cargo build --bin tips-ingress-rpc && \ + cp target/debug/tips-ingress-rpc /tmp/tips-ingress-rpc FROM debian:bookworm -RUN apt-get update && apt-get install -y libssl3 && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/lib/apt/lists/* WORKDIR /app -COPY --from=builder /app/target/debug/tips-ingress-rpc /app/tips-ingress-rpc +COPY --from=builder /tmp/tips-ingress-rpc /app/tips-ingress-rpc EXPOSE 3000 diff --git a/crates/ingress-writer/Dockerfile b/crates/ingress-writer/Dockerfile index 96f1abd..d44fe80 100644 --- a/crates/ingress-writer/Dockerfile +++ b/crates/ingress-writer/Dockerfile @@ -1,19 +1,33 @@ -FROM rust:1-bookworm AS builder +FROM rust:1-bookworm AS base +RUN cargo install cargo-chef --locked WORKDIR /app -COPY Cargo.toml Cargo.lock ./ -COPY crates/ ./crates/ -COPY .sqlx/ ./.sqlx/ +FROM base AS planner +COPY . . +RUN cargo chef prepare --recipe-path recipe.json -RUN cargo build --bin tips-ingress-writer +FROM base AS builder +COPY --from=planner /app/recipe.json recipe.json + +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=/usr/local/cargo/git \ + --mount=type=cache,target=/app/target \ + cargo chef cook --recipe-path recipe.json + +COPY . . +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=/usr/local/cargo/git \ + --mount=type=cache,target=/app/target \ + cargo build --bin tips-ingress-writer && \ + cp target/debug/tips-ingress-writer /tmp/tips-ingress-writer FROM debian:bookworm -RUN apt-get update && apt-get install -y libssl3 && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/lib/apt/lists/* WORKDIR /app -COPY --from=builder /app/target/debug/tips-ingress-writer /app/tips-ingress-writer +COPY --from=builder /tmp/tips-ingress-writer /app/tips-ingress-writer CMD ["/app/tips-ingress-writer"] \ No newline at end of file diff --git a/crates/maintenance/Dockerfile b/crates/maintenance/Dockerfile index 2b77800..b3e080f 100644 --- a/crates/maintenance/Dockerfile +++ b/crates/maintenance/Dockerfile @@ -1,19 +1,33 @@ -FROM rust:1-bookworm AS builder +FROM rust:1-bookworm AS base +RUN cargo install cargo-chef --locked WORKDIR /app -COPY Cargo.toml Cargo.lock ./ -COPY crates/ ./crates/ -COPY .sqlx/ ./.sqlx/ +FROM base AS planner +COPY . . +RUN cargo chef prepare --recipe-path recipe.json -RUN cargo build --bin tips-maintenance +FROM base AS builder +COPY --from=planner /app/recipe.json recipe.json + +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=/usr/local/cargo/git \ + --mount=type=cache,target=/app/target \ + cargo chef cook --recipe-path recipe.json + +COPY . . +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=/usr/local/cargo/git \ + --mount=type=cache,target=/app/target \ + cargo build --bin tips-maintenance && \ + cp target/debug/tips-maintenance /tmp/tips-maintenance FROM debian:bookworm -RUN apt-get update && apt-get install -y libssl3 && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/lib/apt/lists/* WORKDIR /app -COPY --from=builder /app/target/debug/tips-maintenance /app/tips-maintenance +COPY --from=builder /tmp/tips-maintenance /app/tips-maintenance CMD ["/app/tips-maintenance"] \ No newline at end of file diff --git a/justfile b/justfile index 00e158f..4c959b6 100644 --- a/justfile +++ b/justfile @@ -50,7 +50,7 @@ start-all: stop-all # Start every service in docker, except the one you're currently working on. e.g. just start-except ui ingress-rpc start-except programs: stop-all #!/bin/bash - all_services=(postgres kafka kafka-setup minio minio-setup ingress-rpc audit maintenance ui) + all_services=(postgres kafka kafka-setup minio minio-setup ingress-rpc ingres-writer audit maintenance ui) exclude_services=({{ programs }}) # Create result array with services not in exclude list diff --git a/ui/Dockerfile b/ui/Dockerfile index 0fe1d58..8615be8 100644 --- a/ui/Dockerfile +++ b/ui/Dockerfile @@ -1,7 +1,8 @@ FROM node:20-alpine AS deps WORKDIR /app COPY ui/package.json ui/yarn.lock ./ -RUN yarn install --frozen-lockfile +RUN --mount=type=cache,target=/root/.yarn \ + yarn install --frozen-lockfile FROM node:20-alpine AS builder WORKDIR /app @@ -10,7 +11,8 @@ COPY ./ui . ENV NEXT_TELEMETRY_DISABLED=1 -RUN yarn build +RUN --mount=type=cache,target=/app/.next/cache \ + yarn build FROM node:20-alpine AS runner WORKDIR /app @@ -21,7 +23,6 @@ ENV NEXT_TELEMETRY_DISABLED=1 RUN addgroup --system --gid 1001 nodejs RUN adduser --system --uid 1001 nextjs - RUN mkdir .next RUN chown nextjs:nodejs .next From ecef689e2d5dc5164713801782d54c2457dec33d Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Thu, 25 Sep 2025 22:03:03 -0500 Subject: [PATCH 017/117] First pass at documenting API behavior (#17) --- docs/API.md | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 docs/API.md diff --git a/docs/API.md b/docs/API.md new file mode 100644 index 0000000..bb6df4c --- /dev/null +++ b/docs/API.md @@ -0,0 +1,80 @@ +# API + +## Overview + +TIPS only processes bundles. Transactions sent via `eth_sendRawTransaction` are wrapped into a bundle (see: [EthSendBundle](https://github.com/alloy-rs/alloy/blob/25019adf54272a3372d75c6c44a6185e4be9dfa2/crates/rpc-types-mev/src/eth_calls.rs#L252)) +with a single transaction and sensible defaults. + +Bundles can be identified in two ways: +- Bundle UUID: Generated server-side on submission of a new bundle, globally unique +- Bundle Hash: `keccak(..bundle.txns)`, unique per set of transactions + +### Bundle Creates +Any bundle that's created as part of TIPS, will be deduplicated by bundle hash in the TIPS bundle store with the latest bundle +defining the fields. For example: +``` +Multiple Bundles inserted in the order of A, B, C, D + +# Single bundle transction +bundleA = (txA) +bundleStore = {bundleA} + +# Bundle with overlapping transactions +bundleB = (txA, txB) +bundleStore = {bundleA, bundleB} + +# Bundle with identical bundle hash +bundleC = (txA, txB) +bundleStore = {bundleA, bundleC} + +# Bundle with overlapping transactions +bundleD = (txC, txA) +bundleStore = {bundleA, bundleC, bundleD} +``` + +### Bundle Updates +There are two ways bundles can be updated, either via `eth_sendRawTransaction` (address, nonce) or `eth_sendBundle` (UUID), see below for more details. + +Bundle updates are **best effort**. For example: +``` +bundleA = createBundle(txA) +# In parrallel +includedByBuilder(bundleA) # bundleA is included in the current Flashblock +updateBundle(bundleA, [txB, txC]) # bundleA is updated to bundleA` +# Bundle A will have been removed from the bundle store +``` + +### Bundle Cancellation: +Bundles can be cancelled via `eth_cancelBundle`. Similar to bundle updates, cancellations are processed as **best effort**. + +## RPC Methods + +### eth_sendRawTransaction(Bytes) -> Hash +Transactions provided to this endpoint, are validated and then wrapped in a bundle (with defaults) and added to the bundle store. +Previously submitted transactions can be replaced by submitting a new transaction from the same address and nonce. These will +replace bundles with the same bundle hash submitted via this endpoint or `eth_sendBundle`. + +**Limitations:** +- 25 million gas per transaction + +### eth_sendBundle([EthSendBundle](https://github.com/alloy-rs/alloy/blob/25019adf54272a3372d75c6c44a6185e4be9dfa2/crates/rpc-types-mev/src/eth_calls.rs#L252)) -> UUID +If a replacement UUID is not provided, this will attempt to insert the bundle. If a bundle with the same bundle hash already exists +the bundle will be combined with the existing one. + +If a UUID is provided, this endpoint will only attempt to update a bundle, if that bundle is no longer in the bundle store, the +update will be dropped. + +**Limitations** +- 25 million gas per bundle +- Can only provide three transactions at once +- Revert protection is not supported, all transaction hashes must be in `reverting_tx_hashes` +- Partial transaction dropping is not supported, `dropping_tx_hashes` must be empty +- Refunds are not initially supported + - `refund_percent` must not be set + - `refund_receipient` must not be set + - `refund_tx_hashes` must be empty +- extra_fields must be empty + +### eth_cancelBundle([EthCancelBundle](https://github.com/alloy-rs/alloy/blob/25019adf54272a3372d75c6c44a6185e4be9dfa2/crates/rpc-types-mev/src/eth_calls.rs#L216)) +- Will cancel the bundle matching the UUID +- Cancellation is the best effort, if the builder has already included it is will go through \ No newline at end of file From c686a62be499280afd48a4745888dad4b1396c38 Mon Sep 17 00:00:00 2001 From: William Law Date: Mon, 29 Sep 2025 16:19:41 -0400 Subject: [PATCH 018/117] [ingress] add transaction validation (#16) * add basic checks * check for cross chain tx * add AccountInfoLookup trait + fix check latest nonce * op-checks * use txn and txn data * impl cost * move to own file * add err types * add async_trait * spike test * add more tests * add l1 test * [provider] implement `fetch_l1_block_info` for tx validation (#19) * wip * no more trait errors * impl into provider as trait * nits * add eip4844 test * add comments * dont throw hard error just warn for now * get block return full tx * standardize err * diff err on l1blockinfolookup * refactor fetch_l1_block_info --- Cargo.lock | 404 +++++++++++++++++++++--- Cargo.toml | 5 + crates/ingress-rpc/Cargo.toml | 5 + crates/ingress-rpc/src/main.rs | 1 + crates/ingress-rpc/src/service.rs | 13 +- crates/ingress-rpc/src/validation.rs | 450 +++++++++++++++++++++++++++ 6 files changed, 826 insertions(+), 52 deletions(-) create mode 100644 crates/ingress-rpc/src/validation.rs diff --git a/Cargo.lock b/Cargo.lock index 359e0c9..3747436 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -60,9 +60,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b190875b4e4d8838a49e9c1489a27c07583232a269a1a625a8260049134bd6be" +checksum = "0cd9d29a6a0bb8d4832ff7685dcbb430011b832f2ccec1af9571a0e75c1f7e9c" dependencies = [ "alloy-eips", "alloy-primitives", @@ -79,15 +79,16 @@ dependencies = [ "rand 0.8.5", "secp256k1 0.30.0", "serde", + "serde_json", "serde_with", "thiserror", ] [[package]] name = "alloy-consensus-any" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545370c7dc047fa2c632a965b76bb429cc24674d2fcddacdcb0d998b09731b9e" +checksum = "ce038cb325f9a85a10fb026fb1b70cb8c62a004d85d22f8516e5d173e3eec612" dependencies = [ "alloy-consensus", "alloy-eips", @@ -136,9 +137,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a33d1723ecf64166c2a0371e25d1bce293b873527a7617688c9375384098ea1" +checksum = "4bfec530782b30151e2564edf3c900f1fa6852128b7a993e458e8e3815d8b915" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -150,6 +151,8 @@ dependencies = [ "c-kzg", "derive_more", "either", + "ethereum_ssz", + "ethereum_ssz_derive", "serde", "serde_with", "sha2 0.10.9", @@ -192,9 +195,9 @@ dependencies = [ [[package]] name = "alloy-hardforks" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d66cfdf265bf52c0c4a952960c854c3683c71ff2fc02c9b8c317c691fd3bc28" +checksum = "889eb3949b58368a09d4f16931c660275ef5fb08e5fbd4a96573b19c7085c41f" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -217,9 +220,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24aba9adc7e22cec5ae396980cac73792f5cb5407dc1efc07292e7f96fb65d5" +checksum = "be436893c0d1f7a57d1d8f1b6b9af9db04174468410b7e6e1d1893e78110a3bc" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -232,9 +235,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e52ba8f09d0c31765582cd7f39ede2dfba5afa159f1376afc29c9157564246" +checksum = "f18959e1a1b40e05578e7a705f65ff4e6b354e38335da4b33ccbee876bde7c26" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -258,9 +261,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f37bf78f46f2717973639c4f11e6330691fea62c4d116d720e0dcfd49080c126" +checksum = "1da0037ac546c0cae2eb776bed53687b7bbf776f4e7aa2fea0b8b89e734c319b" dependencies = [ "alloy-consensus", "alloy-eips", @@ -269,6 +272,35 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-op-evm" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9b726869a13d5d958f2f78fbef7ce522689c4d40d613c16239f5e286fbeb1a" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-op-hardforks", + "alloy-primitives", + "auto_impl", + "op-alloy-consensus 0.19.1", + "op-revm", + "revm", +] + +[[package]] +name = "alloy-op-hardforks" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "599c1d7dfbccb66603cb93fde00980d12848d32fe5e814f50562104a92df6487" +dependencies = [ + "alloy-chains", + "alloy-hardforks", + "alloy-primitives", + "auto_impl", +] + [[package]] name = "alloy-primitives" version = "1.3.1" @@ -406,9 +438,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c14ba5de4025eb7ce19a5c19706b3c2fd86a0b4f9ad8c9ef0dce0d5e66be7157" +checksum = "65423baf6af0ff356e254d7824b3824aa34d8ca9bd857a4e298f74795cc4b69d" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -425,15 +457,19 @@ dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", + "alloy-serde", "derive_more", + "ethereum_ssz", + "ethereum_ssz_derive", + "serde", "strum", ] [[package]] name = "alloy-rpc-types-eth" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7357279a96304232d37adbe2064a9392dddd9b0e8beca2a12a8fc0872c8a81dd" +checksum = "848f8ea4063bed834443081d77f840f31075f68d0d49723027f5a209615150bf" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -481,9 +517,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0ee5af728e144e0e5bde52114c7052249a9833d9fba79aeacfbdee1aad69e8" +checksum = "19c3835bdc128f2f3418f5d6c76aec63a245d72973e0eaacc9720aa0787225c5" dependencies = [ "alloy-primitives", "serde", @@ -492,9 +528,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efbce76baf1b012e379a5e486822c71b0de0a957ddedd5410427789516a47b9" +checksum = "42084a7b455ef0b94ed201b7494392a759c3e20faac2d00ded5d5762fcf71dee" dependencies = [ "alloy-primitives", "async-trait", @@ -505,6 +541,22 @@ dependencies = [ "thiserror", ] +[[package]] +name = "alloy-signer-local" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6312ccc048a4a88aed7311fc448a2e23da55c60c2b3b6dcdb794f759d02e49d7" +dependencies = [ + "alloy-consensus", + "alloy-network", + "alloy-primitives", + "alloy-signer", + "async-trait", + "k256", + "rand 0.8.5", + "thiserror", +] + [[package]] name = "alloy-sol-macro" version = "1.3.1" @@ -632,9 +684,9 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb91a93165a8646618ae6366f301ec1edd52f452665c371e12201516593925a0" +checksum = "cc79013f9ac3a8ddeb60234d43da09e6d6abfc1c9dd29d3fe97adfbece3f4a08" dependencies = [ "alloy-primitives", "darling 0.21.3", @@ -2509,6 +2561,46 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "ethereum_serde_utils" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dc1355dbb41fbbd34ec28d4fb2a57d9a70c67ac3c19f6a5ca4d4a176b9e997a" +dependencies = [ + "alloy-primitives", + "hex", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "ethereum_ssz" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca8ba45b63c389c6e115b095ca16381534fdcc03cf58176a3f8554db2dbe19b" +dependencies = [ + "alloy-primitives", + "ethereum_serde_utils", + "itertools 0.13.0", + "serde", + "serde_derive", + "smallvec", + "typenum", +] + +[[package]] +name = "ethereum_ssz_derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd55d08012b4e0dfcc92b8d6081234df65f2986ad34cc76eeed69c5e2ce7506" +dependencies = [ + "darling 0.20.11", + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "event-listener" version = "5.4.1" @@ -3195,7 +3287,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.0", + "socket2 0.5.10", "tokio", "tower-service", "tracing", @@ -3668,7 +3760,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.53.3", + "windows-targets 0.48.5", ] [[package]] @@ -3898,6 +3990,27 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "modular-bitfield" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74" +dependencies = [ + "modular-bitfield-impl", + "static_assertions", +] + +[[package]] +name = "modular-bitfield-impl" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "native-tls" version = "0.2.14" @@ -4112,7 +4225,9 @@ dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", + "alloy-serde", "derive_more", + "serde", "thiserror", ] @@ -4147,7 +4262,26 @@ dependencies = [ "alloy-rpc-types-eth", "alloy-signer", "op-alloy-consensus 0.20.0", - "op-alloy-rpc-types", + "op-alloy-rpc-types 0.20.0", +] + +[[package]] +name = "op-alloy-rpc-types" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9076d4fcb8e260cec8ad01cd155200c0dbb562e62adb553af245914f30854e29" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "derive_more", + "op-alloy-consensus 0.19.1", + "serde", + "serde_json", + "thiserror", ] [[package]] @@ -4169,11 +4303,30 @@ dependencies = [ "thiserror", ] +[[package]] +name = "op-alloy-rpc-types-engine" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4256b1eda5766a9fa7de5874e54515994500bef632afda41e940aed015f9455" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-engine", + "derive_more", + "ethereum_ssz", + "ethereum_ssz_derive", + "op-alloy-consensus 0.19.1", + "snap", + "thiserror", +] + [[package]] name = "op-revm" -version = "10.0.0" +version = "10.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba21d705bbbfc947a423cba466d75e4af0c7d43ee89ba0a0f1cfa04963cede9" +checksum = "f9ba4f4693811e73449193c8bd656d3978f265871916882e6a51a487e4f96217" dependencies = [ "auto_impl", "revm", @@ -4624,7 +4777,7 @@ dependencies = [ "quinn-udp", "rustc-hash 2.1.1", "rustls 0.23.31", - "socket2 0.6.0", + "socket2 0.5.10", "thiserror", "tokio", "tracing", @@ -4661,7 +4814,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.0", + "socket2 0.5.10", "tracing", "windows-sys 0.60.2", ] @@ -4968,6 +5121,24 @@ dependencies = [ "serde_json", ] +[[package]] +name = "reth-codecs" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-primitives", + "alloy-trie", + "bytes", + "modular-bitfield", + "op-alloy-consensus 0.19.1", + "reth-codecs-derive", + "reth-zstd-compressors", + "serde", +] + [[package]] name = "reth-codecs-derive" version = "1.7.0" @@ -4992,6 +5163,18 @@ dependencies = [ "thiserror", ] +[[package]] +name = "reth-consensus-common" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "reth-chainspec", + "reth-consensus", + "reth-primitives-traits", +] + [[package]] name = "reth-db-models" version = "1.7.0" @@ -4999,7 +5182,9 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229 dependencies = [ "alloy-eips", "alloy-primitives", + "bytes", "reth-primitives-traits", + "serde", ] [[package]] @@ -5212,6 +5397,113 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-optimism-chainspec" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-hardforks", + "alloy-primitives", + "derive_more", + "miniz_oxide", + "op-alloy-consensus 0.19.1", + "op-alloy-rpc-types 0.19.1", + "reth-chainspec", + "reth-ethereum-forks", + "reth-network-peers", + "reth-optimism-forks", + "reth-optimism-primitives", + "reth-primitives-traits", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "reth-optimism-consensus" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-trie", + "reth-chainspec", + "reth-consensus", + "reth-consensus-common", + "reth-execution-types", + "reth-optimism-chainspec", + "reth-optimism-forks", + "reth-optimism-primitives", + "reth-primitives-traits", + "reth-storage-api", + "reth-storage-errors", + "reth-trie-common", + "revm", + "thiserror", + "tracing", +] + +[[package]] +name = "reth-optimism-evm" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-op-evm", + "alloy-primitives", + "op-alloy-consensus 0.19.1", + "op-alloy-rpc-types-engine", + "op-revm", + "reth-chainspec", + "reth-evm", + "reth-execution-errors", + "reth-execution-types", + "reth-optimism-chainspec", + "reth-optimism-consensus", + "reth-optimism-forks", + "reth-optimism-primitives", + "reth-primitives-traits", + "reth-storage-errors", + "revm", + "thiserror", +] + +[[package]] +name = "reth-optimism-forks" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-op-hardforks", + "alloy-primitives", + "once_cell", + "reth-ethereum-forks", +] + +[[package]] +name = "reth-optimism-primitives" +version = "1.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "bytes", + "op-alloy-consensus 0.19.1", + "reth-codecs", + "reth-primitives-traits", + "reth-zstd-compressors", + "serde", + "serde_with", +] + [[package]] name = "reth-primitives-traits" version = "1.7.0" @@ -5229,6 +5521,7 @@ dependencies = [ "derive_more", "once_cell", "op-alloy-consensus 0.19.1", + "reth-codecs", "revm-bytecode", "revm-primitives", "revm-state", @@ -5349,7 +5642,9 @@ version = "1.7.0" source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" dependencies = [ "alloy-primitives", + "bytes", "reth-trie-common", + "serde", ] [[package]] @@ -5536,9 +5831,9 @@ dependencies = [ [[package]] name = "revm" -version = "29.0.0" +version = "29.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c278b6ee9bba9e25043e3fae648fdce632d1944d3ba16f5203069b43bddd57f" +checksum = "718d90dce5f07e115d0e66450b1b8aa29694c1cf3f89ebddaddccc2ccbd2f13e" dependencies = [ "revm-bytecode", "revm-context", @@ -5567,9 +5862,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "9.0.2" +version = "9.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fb02c5dab3b535aa5b18277b1d21c5117a25d42af717e6ce133df0ea56663e1" +checksum = "5a20c98e7008591a6f012550c2a00aa36cba8c14cc88eb88dec32eb9102554b4" dependencies = [ "bitvec", "cfg-if", @@ -5584,9 +5879,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "10.1.0" +version = "10.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8e9311d27cf75fbf819e7ba4ca05abee1ae02e44ff6a17301c7ab41091b259" +checksum = "b50d241ed1ce647b94caf174fcd0239b7651318b2c4c06b825b59b973dfb8495" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -5627,9 +5922,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "10.0.0" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528d2d81cc918d311b8231c35330fac5fba8b69766ddc538833e2b5593ee016e" +checksum = "550331ea85c1d257686e672081576172fe3d5a10526248b663bbf54f1bef226a" dependencies = [ "auto_impl", "derive-where", @@ -5646,9 +5941,9 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "10.0.0" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf443b664075999a14916b50c5ae9e35a7d71186873b8f8302943d50a672e5e0" +checksum = "7c0a6e9ccc2ae006f5bed8bd80cd6f8d3832cd55c5e861b9402fdd556098512f" dependencies = [ "auto_impl", "either", @@ -5682,9 +5977,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "25.0.2" +version = "25.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d6406b711fac73b4f13120f359ed8e65964380dd6182bd12c4c09ad0d4641f" +checksum = "06575dc51b1d8f5091daa12a435733a90b4a132dca7ccee0666c7db3851bc30c" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -6254,9 +6549,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.225" +version = "1.0.227" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6c24dee235d0da097043389623fb913daddf92c76e9f5a1db88607a0bcbd1d" +checksum = "80ece43fc6fbed4eb5392ab50c07334d3e577cbf40997ee896fe7af40bba4245" dependencies = [ "serde_core", "serde_derive", @@ -6264,18 +6559,18 @@ dependencies = [ [[package]] name = "serde_core" -version = "1.0.225" +version = "1.0.227" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "659356f9a0cb1e529b24c01e43ad2bdf520ec4ceaf83047b83ddcc2251f96383" +checksum = "7a576275b607a2c86ea29e410193df32bc680303c82f31e275bbfcafe8b33be5" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.225" +version = "1.0.227" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea936adf78b1f766949a4977b91d2f5595825bd6ec079aa9543ad2685fc4516" +checksum = "51e694923b8824cf0e9b382adf0f60d4e05f348f357b38833a3fa5ed7c2ede04" dependencies = [ "proc-macro2", "quote", @@ -6481,6 +6776,12 @@ dependencies = [ "serde", ] +[[package]] +name = "snap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" + [[package]] name = "socket2" version = "0.5.10" @@ -7091,6 +7392,7 @@ dependencies = [ "alloy-primitives", "alloy-provider", "alloy-rpc-types-mev", + "alloy-signer-local", "anyhow", "async-trait", "backon", @@ -7100,8 +7402,12 @@ dependencies = [ "jsonrpsee", "op-alloy-consensus 0.20.0", "op-alloy-network", + "op-revm", "rdkafka", + "reth-errors", + "reth-optimism-evm", "reth-rpc-eth-types", + "revm-context-interface", "serde", "serde_json", "tips-audit", diff --git a/Cargo.toml b/Cargo.toml index 4e907d1..aff7e5c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,8 @@ tips-ingress-writer = { path = "crates/ingress-writer" } # Reth reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" } reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" } +reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" } +reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" } # alloy alloy-primitives = { version = "1.3.1", default-features = false, features = [ @@ -62,3 +64,6 @@ bytes = { version = "1.8.0", features = ["serde"] } # tips-ingress backon = "1.5.2" +op-revm = { version = "10.1.0", default-features = false } +revm-context-interface = "10.2.0" +alloy-signer-local = "1.0.36" diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index e9fce75..b76a1d4 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -31,3 +31,8 @@ serde.workspace = true serde_json.workspace = true async-trait.workspace = true backon.workspace = true +op-revm.workspace = true +revm-context-interface.workspace = true +alloy-signer-local.workspace = true +reth-optimism-evm.workspace = true +reth-errors.workspace = true diff --git a/crates/ingress-rpc/src/main.rs b/crates/ingress-rpc/src/main.rs index 8512667..4a4fd32 100644 --- a/crates/ingress-rpc/src/main.rs +++ b/crates/ingress-rpc/src/main.rs @@ -11,6 +11,7 @@ use url::Url; mod queue; mod service; +mod validation; use queue::KafkaQueuePublisher; use service::{IngressApiServer, IngressService}; diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 0e5986f..17a67a1 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -1,7 +1,7 @@ +use crate::validation::{AccountInfoLookup, L1BlockInfoLookup, validate_tx}; use alloy_consensus::transaction::SignerRecoverable; use alloy_primitives::{B256, Bytes}; -use alloy_provider::network::eip2718::Decodable2718; -use alloy_provider::{Provider, RootProvider}; +use alloy_provider::{Provider, RootProvider, network::eip2718::Decodable2718}; use alloy_rpc_types_mev::{EthBundleHash, EthCancelBundle, EthSendBundle}; use jsonrpsee::{ core::{RpcResult, async_trait}, @@ -75,10 +75,17 @@ where .map_err(|_| EthApiError::FailedToDecodeSignedTransaction.into_rpc_err())?; let transaction = envelope + .clone() .try_into_recovered() .map_err(|_| EthApiError::FailedToDecodeSignedTransaction.into_rpc_err())?; - // TODO: Validation and simulation + let mut l1_block_info = self.provider.fetch_l1_block_info().await?; + let account = self + .provider + .fetch_account_info(transaction.signer()) + .await?; + validate_tx(account, &transaction, &data, &mut l1_block_info).await?; + // TODO: parallelize DB and mempool setup let bundle = EthSendBundle { diff --git a/crates/ingress-rpc/src/validation.rs b/crates/ingress-rpc/src/validation.rs new file mode 100644 index 0000000..4d075e9 --- /dev/null +++ b/crates/ingress-rpc/src/validation.rs @@ -0,0 +1,450 @@ +use alloy_consensus::{Transaction, Typed2718, constants::KECCAK_EMPTY, transaction::Recovered}; +use alloy_primitives::{Address, B256, U256}; +use alloy_provider::{Provider, RootProvider}; +use async_trait::async_trait; +use jsonrpsee::core::RpcResult; +use op_alloy_consensus::interop::CROSS_L2_INBOX_ADDRESS; +use op_alloy_network::Optimism; +use op_revm::{OpSpecId, l1block::L1BlockInfo}; +use reth_errors::RethError; +use reth_optimism_evm::extract_l1_info_from_tx; +use reth_rpc_eth_types::{EthApiError, RpcInvalidTransactionError, SignError}; +use tracing::warn; + +/// Account info for a given address +pub struct AccountInfo { + pub balance: U256, + pub nonce: u64, + pub code_hash: B256, +} + +/// Interface for fetching account info for a given address +#[async_trait] +pub trait AccountInfoLookup: Send + Sync { + async fn fetch_account_info(&self, address: Address) -> RpcResult; +} + +/// Implementation of the `AccountInfoLookup` trait for the `RootProvider` +#[async_trait] +impl AccountInfoLookup for RootProvider { + async fn fetch_account_info(&self, address: Address) -> RpcResult { + let account = self + .get_account(address) + .await + .map_err(|_| EthApiError::Signing(SignError::NoAccount))?; + Ok(AccountInfo { + balance: account.balance, + nonce: account.nonce, + code_hash: account.code_hash, + }) + } +} + +/// Interface for fetching L1 block info for a given block number +#[async_trait] +pub trait L1BlockInfoLookup: Send + Sync { + async fn fetch_l1_block_info(&self) -> RpcResult; +} + +/// Implementation of the `L1BlockInfoLookup` trait for the `RootProvider` +#[async_trait] +impl L1BlockInfoLookup for RootProvider { + async fn fetch_l1_block_info(&self) -> RpcResult { + let block_number = self + .get_block_number() + .await + .map_err(|_| EthApiError::InternalEthError.into_rpc_err())?; + let block = self + .get_block_by_number(block_number.into()) + .full() + .await + .map_err(|_| EthApiError::InternalEthError.into_rpc_err())? + .ok_or_else(|| EthApiError::HeaderNotFound(block_number.into()).into_rpc_err())?; + + let txs = block.transactions.clone(); + let first_tx = txs.first_transaction().ok_or_else(|| { + EthApiError::Internal(RethError::msg("No full transactions found")).into_rpc_err() + })?; + + Ok(extract_l1_info_from_tx(&first_tx.clone()) + .map_err(|e| EthApiError::Internal(RethError::msg(e.to_string())))?) + } +} + +/// Helper function to validate a transaction. A valid transaction must satisfy the following criteria: +/// - If the transaction is not EIP-4844 +/// - If the transaction is not a cross chain tx +/// - If the transaction is a 7702 tx, then the account is a 7702 account +/// - If the transaction's nonce is the latest +/// - If the transaction's execution cost is less than the account's balance +/// - If the transaction's L1 gas cost is less than the account's balance +pub async fn validate_tx( + account: AccountInfo, + txn: &Recovered, + data: &[u8], + l1_block_info: &mut L1BlockInfo, +) -> RpcResult<()> { + // skip eip4844 transactions + if txn.is_eip4844() { + warn!(message = "EIP-4844 transactions are not supported"); + return Err(RpcInvalidTransactionError::TxTypeNotSupported.into_rpc_err()); + } + + // from: https://github.com/paradigmxyz/reth/blob/3b0d98f3464b504d96154b787a860b2488a61b3e/crates/optimism/txpool/src/supervisor/client.rs#L76-L84 + // it returns `None` if a tx is not cross chain, which is when `inbox_entries` is empty in the snippet above. + // we can do something similar where if the inbox_entries is non-empty then it is a cross chain tx and it's something we don't support + if let Some(access_list) = txn.access_list() { + let inbox_entries = access_list + .iter() + .filter(|entry| entry.address == CROSS_L2_INBOX_ADDRESS); + if inbox_entries.count() > 0 { + warn!(message = "Interop transactions are not supported"); + return Err(RpcInvalidTransactionError::TxTypeNotSupported.into_rpc_err()); + } + } + + // error if account is 7702 but tx is not 7702 + if account.code_hash != KECCAK_EMPTY && !txn.is_eip7702() { + return Err(EthApiError::InvalidTransaction( + RpcInvalidTransactionError::AuthorizationListInvalidFields, + ) + .into_rpc_err()); + } + + // error if tx nonce is not equal to or greater than the latest on chain + // https://github.com/paradigmxyz/reth/blob/a047a055ab996f85a399f5cfb2fe15e350356546/crates/transaction-pool/src/validate/eth.rs#L611 + if txn.nonce() < account.nonce { + return Err( + EthApiError::InvalidTransaction(RpcInvalidTransactionError::NonceTooLow { + tx: txn.nonce(), + state: account.nonce, + }) + .into_rpc_err(), + ); + } + + // For EIP-1559 transactions: `max_fee_per_gas * gas_limit + tx_value`. + // ref: https://github.com/paradigmxyz/reth/blob/main/crates/transaction-pool/src/traits.rs#L1186 + let max_fee = txn + .max_fee_per_gas() + .saturating_mul(txn.gas_limit() as u128); + let txn_cost = txn.value().saturating_add(U256::from(max_fee)); + + // error if execution cost costs more than balance + if txn_cost > account.balance { + warn!(message = "Insufficient funds for transfer"); + return Err(EthApiError::InvalidTransaction( + RpcInvalidTransactionError::InsufficientFundsForTransfer, + ) + .into_rpc_err()); + } + + // op-checks to see if sender can cover L1 gas cost + // from: https://github.com/paradigmxyz/reth/blob/6aa73f14808491aae77fc7c6eb4f0aa63bef7e6e/crates/optimism/txpool/src/validator.rs#L219 + let l1_cost_addition = l1_block_info.calculate_tx_l1_cost(data, OpSpecId::ISTHMUS); + let l1_cost = txn_cost.saturating_add(l1_cost_addition); + if l1_cost > account.balance { + warn!(message = "Insufficient funds for L1 gas"); + return Err(EthApiError::InvalidTransaction( + RpcInvalidTransactionError::InsufficientFundsForTransfer, + ) + .into_rpc_err()); + } + Ok(()) +} + +#[cfg(test)] +mod tests { + use super::*; + use alloy_consensus::SignableTransaction; + use alloy_consensus::{Transaction, constants::KECCAK_EMPTY, transaction::SignerRecoverable}; + use alloy_consensus::{TxEip1559, TxEip4844, TxEip7702}; + use alloy_primitives::{bytes, keccak256}; + use alloy_signer_local::PrivateKeySigner; + use op_alloy_consensus::OpTxEnvelope; + use op_alloy_network::TxSignerSync; + use revm_context_interface::transaction::{AccessList, AccessListItem}; + + fn create_account(nonce: u64, balance: U256) -> AccountInfo { + AccountInfo { + balance, + nonce, + code_hash: KECCAK_EMPTY, + } + } + + fn create_7702_account() -> AccountInfo { + AccountInfo { + balance: U256::from(1000000000000000000u128), + nonce: 0, + code_hash: keccak256(bytes!("1234567890")), + } + } + + fn create_l1_block_info() -> L1BlockInfo { + L1BlockInfo::default() + } + + #[tokio::test] + async fn test_valid_tx() { + // Create a sample EIP-1559 transaction + let signer = PrivateKeySigner::random(); + let mut tx = TxEip1559 { + chain_id: 1, + nonce: 0, + gas_limit: 21000, + max_fee_per_gas: 20000000000u128, + max_priority_fee_per_gas: 1000000000u128, + to: Address::random().into(), + value: U256::from(10000000000000u128), + access_list: Default::default(), + input: bytes!("").clone(), + }; + + let account = create_account(0, U256::from(1000000000000000000u128)); + let mut l1_block_info = create_l1_block_info(); + + let data = tx.input().to_vec(); + let signature = signer.sign_transaction_sync(&mut tx).unwrap(); + let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); + let recovered_tx = envelope.try_into_recovered().unwrap(); + assert!( + validate_tx(account, &recovered_tx, &data, &mut l1_block_info) + .await + .is_ok() + ); + } + + #[tokio::test] + async fn test_valid_7702_tx() { + let signer = PrivateKeySigner::random(); + let mut tx = TxEip7702 { + chain_id: 1, + nonce: 0, + gas_limit: 21000, + max_fee_per_gas: 20000000000u128, + max_priority_fee_per_gas: 1000000000u128, + to: Address::random(), + value: U256::from(10000000000000u128), + authorization_list: Default::default(), + access_list: Default::default(), + input: bytes!("").clone(), + }; + + let account = create_7702_account(); + let mut l1_block_info = create_l1_block_info(); + + let data = tx.input().to_vec(); + let signature = signer.sign_transaction_sync(&mut tx).unwrap(); + let envelope = OpTxEnvelope::Eip7702(tx.into_signed(signature)); + let recovered_tx = envelope.try_into_recovered().unwrap(); + assert!( + validate_tx(account, &recovered_tx, &data, &mut l1_block_info) + .await + .is_ok() + ); + } + + #[tokio::test] + async fn test_err_interop_tx() { + let signer = PrivateKeySigner::random(); + + let access_list = AccessList::from(vec![AccessListItem { + address: CROSS_L2_INBOX_ADDRESS, + storage_keys: vec![], + }]); + + let mut tx = TxEip1559 { + chain_id: 1, + nonce: 0, + gas_limit: 21000, + max_fee_per_gas: 20000000000u128, + max_priority_fee_per_gas: 1000000000u128, + to: Address::random().into(), + value: U256::from(10000000000000u128), + access_list, + input: bytes!("").clone(), + }; + + let account = create_account(0, U256::from(1000000000000000000u128)); + let mut l1_block_info = create_l1_block_info(); + + let data = tx.input().to_vec(); + let signature = signer.sign_transaction_sync(&mut tx).unwrap(); + let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); + let recovered_tx = envelope.try_into_recovered().unwrap(); + + assert_eq!( + validate_tx(account, &recovered_tx, &data, &mut l1_block_info).await, + Err(RpcInvalidTransactionError::TxTypeNotSupported.into_rpc_err()) + ); + } + + #[tokio::test] + async fn test_err_eip4844_tx() { + let signer = PrivateKeySigner::random(); + let mut tx = TxEip4844 { + chain_id: 1, + nonce: 0, + gas_limit: 21000, + max_fee_per_gas: 20000000000u128, + max_priority_fee_per_gas: 1000000000u128, + to: Address::random(), + value: U256::from(10000000000000u128), + access_list: Default::default(), + input: bytes!("").clone(), + blob_versioned_hashes: Default::default(), + max_fee_per_blob_gas: 20000000000u128, + }; + + let account = create_account(0, U256::from(1000000000000000000u128)); + let mut l1_block_info = create_l1_block_info(); + + let data = tx.input().to_vec(); + let signature = signer.sign_transaction_sync(&mut tx).unwrap(); + let recovered_tx = tx + .into_signed(signature) + .try_into_recovered() + .expect("failed to recover tx"); + assert_eq!( + validate_tx(account, &recovered_tx, &data, &mut l1_block_info).await, + Err(RpcInvalidTransactionError::TxTypeNotSupported.into_rpc_err()) + ); + } + + #[tokio::test] + async fn test_err_tx_not_7702() { + let signer = PrivateKeySigner::random(); + + let mut tx = TxEip1559 { + chain_id: 1, + nonce: 0, + gas_limit: 21000, + max_fee_per_gas: 20000000000u128, + max_priority_fee_per_gas: 1000000000u128, + to: Address::random().into(), + value: U256::from(10000000000000u128), + access_list: Default::default(), + input: bytes!("").clone(), + }; + + // account is 7702 + let account = create_7702_account(); + let mut l1_block_info = create_l1_block_info(); + + let data = tx.input().to_vec(); + let signature = signer.sign_transaction_sync(&mut tx).unwrap(); + let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); + let recovered_tx = envelope.try_into_recovered().unwrap(); + + assert_eq!( + validate_tx(account, &recovered_tx, &data, &mut l1_block_info).await, + Err(EthApiError::InvalidTransaction( + RpcInvalidTransactionError::AuthorizationListInvalidFields, + ) + .into_rpc_err()) + ); + } + + #[tokio::test] + async fn test_err_tx_nonce_too_low() { + let signer = PrivateKeySigner::random(); + let mut tx = TxEip1559 { + chain_id: 1, + nonce: 0, + gas_limit: 21000, + max_fee_per_gas: 20000000000u128, + max_priority_fee_per_gas: 1000000000u128, + to: Address::random().into(), + value: U256::from(10000000000000u128), + access_list: Default::default(), + input: bytes!("").clone(), + }; + + let account = create_account(1, U256::from(1000000000000000000u128)); + let mut l1_block_info = create_l1_block_info(); + + let nonce = account.nonce; + let tx_nonce = tx.nonce(); + + let data = tx.input().to_vec(); + let signature = signer.sign_transaction_sync(&mut tx).unwrap(); + let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); + let recovered_tx = envelope.try_into_recovered().unwrap(); + assert_eq!( + validate_tx(account, &recovered_tx, &data, &mut l1_block_info).await, + Err( + EthApiError::InvalidTransaction(RpcInvalidTransactionError::NonceTooLow { + tx: tx_nonce, + state: nonce, + }) + .into_rpc_err() + ) + ); + } + + #[tokio::test] + async fn test_err_tx_insufficient_funds() { + let signer = PrivateKeySigner::random(); + let mut tx = TxEip1559 { + chain_id: 1, + nonce: 0, + gas_limit: 21000, + max_fee_per_gas: 20000000000u128, + max_priority_fee_per_gas: 10000000000000u128, + to: Address::random().into(), + value: U256::from(10000000000000u128), + access_list: Default::default(), + input: bytes!("").clone(), + }; + + let account = create_account(0, U256::from(1000000u128)); + let mut l1_block_info = create_l1_block_info(); + + let data = tx.input().to_vec(); + let signature = signer.sign_transaction_sync(&mut tx).unwrap(); + let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); + let recovered_tx = envelope.try_into_recovered().unwrap(); + assert_eq!( + validate_tx(account, &recovered_tx, &data, &mut l1_block_info).await, + Err(EthApiError::InvalidTransaction( + RpcInvalidTransactionError::InsufficientFundsForTransfer, + ) + .into_rpc_err()) + ); + } + + #[tokio::test] + async fn test_err_tx_insufficient_funds_for_l1_gas() { + let signer = PrivateKeySigner::random(); + let mut tx = TxEip1559 { + chain_id: 1, + nonce: 0, + gas_limit: 21000, + max_fee_per_gas: 200000u128, + max_priority_fee_per_gas: 100000u128, + to: Address::random().into(), + value: U256::from(1000000u128), + access_list: Default::default(), + input: bytes!("").clone(), + }; + + // fund the account with enough funds to cover the txn cost but not enough to cover the l1 cost + let account = create_account(0, U256::from(4201000000u128)); + let mut l1_block_info = create_l1_block_info(); + l1_block_info.tx_l1_cost = Some(U256::from(1000000u128)); + + let data = tx.input().to_vec(); + let signature = signer.sign_transaction_sync(&mut tx).unwrap(); + let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); + let recovered_tx = envelope.try_into_recovered().unwrap(); + + assert_eq!( + validate_tx(account, &recovered_tx, &data, &mut l1_block_info).await, + Err(EthApiError::InvalidTransaction( + RpcInvalidTransactionError::InsufficientFundsForTransfer + ) + .into_rpc_err()) + ); + } +} From d5b9371e28b404c752ef7ad453d8a7fa553259b0 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Thu, 2 Oct 2025 18:42:19 -0500 Subject: [PATCH 019/117] feat: support flashblock state in maintenance job (#21) * Rework the maintenance job to support flashblocks * remove unused deps * remove redundant clone --- .env.example | 13 +- ...b652f7d67c3e78b2749b00ff5a3814ed6664f.json | 15 + ...9e6c5fbdde1083aff6e4dca20508f177df536.json | 14 + ...1f74c6ac9046b4ccad4f1fc9876a7355616b0.json | 14 + ...898572b4ea735f94ebd9df04b86b67eab713.json} | 10 +- ...0a34cd49c3e2826662fa3fe8af597d1e9e90b.json | 34 + ...8fdc5ab2ae76baab1082b4d2b4c4ef01d2f74.json | 32 + Cargo.lock | 7196 +++++++++++++++-- Cargo.toml | 31 +- crates/audit/Cargo.toml | 8 +- crates/audit/Dockerfile | 2 + crates/audit/src/archiver.rs | 14 +- crates/audit/src/bin/main.rs | 6 +- crates/audit/src/publisher.rs | 28 +- crates/audit/src/reader.rs | 12 +- crates/audit/src/storage.rs | 72 +- crates/audit/src/types.rs | 53 +- crates/audit/tests/common/mod.rs | 2 +- crates/audit/tests/integration_tests.rs | 18 +- crates/audit/tests/s3_test.rs | 44 +- crates/datastore/Cargo.toml | 9 +- .../1757444171_create_bundles_table.sql | 22 +- crates/datastore/src/postgres.rs | 340 +- crates/datastore/src/traits.rs | 44 +- crates/datastore/tests/datastore.rs | 253 +- crates/ingress-rpc/Cargo.toml | 13 +- crates/ingress-rpc/Dockerfile | 2 + crates/ingress-rpc/src/main.rs | 15 +- crates/ingress-rpc/src/service.rs | 18 +- crates/ingress-rpc/src/validation.rs | 9 +- crates/ingress-writer/Cargo.toml | 9 +- crates/ingress-writer/Dockerfile | 2 + crates/ingress-writer/src/main.rs | 10 +- crates/maintenance/Cargo.toml | 17 +- crates/maintenance/Dockerfile | 2 + crates/maintenance/src/job.rs | 487 ++ crates/maintenance/src/main.rs | 175 +- docs/AUDIT_S3_FORMAT.md | 67 +- docs/BUNDLE_STATES.md | 71 + ui/src/app/api/bundles/route.ts | 10 +- ui/src/app/bundles/page.tsx | 14 +- ui/src/db/schema.ts | 26 +- 42 files changed, 8148 insertions(+), 1085 deletions(-) create mode 100644 .sqlx/query-2a6e99270e35859fd7a4ce4deeeb652f7d67c3e78b2749b00ff5a3814ed6664f.json create mode 100644 .sqlx/query-7d72b87eddd39d131ce083dcbff9e6c5fbdde1083aff6e4dca20508f177df536.json create mode 100644 .sqlx/query-85798b03a3dff0196ee1c64b1b21f74c6ac9046b4ccad4f1fc9876a7355616b0.json rename .sqlx/{query-c279740d623e06b3e3add31a6c15085bde3207756fe914837cef0cd12b864366.json => query-92e3773f27ca3d15e43cd2a48c40898572b4ea735f94ebd9df04b86b67eab713.json} (50%) create mode 100644 .sqlx/query-9f1f7117bba639cdc922de4e6870a34cd49c3e2826662fa3fe8af597d1e9e90b.json create mode 100644 .sqlx/query-b2f3046a06d9b8a76c59a38122a8fdc5ab2ae76baab1082b4d2b4c4ef01d2f74.json create mode 100644 crates/maintenance/src/job.rs create mode 100644 docs/BUNDLE_STATES.md diff --git a/.env.example b/.env.example index 62434d8..63a3323 100644 --- a/.env.example +++ b/.env.example @@ -5,14 +5,15 @@ TIPS_INGRESS_RPC_MEMPOOL=http://localhost:2222 TIPS_INGRESS_DUAL_WRITE_MEMPOOL=false TIPS_INGRESS_KAFKA_BROKERS=localhost:9092 TIPS_INGRESS_KAFKA_TOPIC=tips-audit -TIPS_INGRESS_LOG_LEVEL=debug +TIPS_INGRESS_LOG_LEVEL=info TIPS_INGRESS_KAFKA_QUEUE_TOPIC=tips-ingress-rpc +TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS=10800 # Audit service configuration TIPS_AUDIT_KAFKA_BROKERS=localhost:9092 TIPS_AUDIT_KAFKA_TOPIC=tips-audit TIPS_AUDIT_KAFKA_GROUP_ID=local-audit -TIPS_AUDIT_LOG_LEVEL=debug +TIPS_AUDIT_LOG_LEVEL=info TIPS_AUDIT_S3_BUCKET=tips TIPS_AUDIT_S3_CONFIG_TYPE=manual TIPS_AUDIT_S3_ENDPOINT=http://localhost:7000 @@ -22,11 +23,13 @@ TIPS_AUDIT_S3_SECRET_ACCESS_KEY=minioadmin # Maintenance TIPS_MAINTENANCE_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres -TIPS_MAINTENANCE_RPC_NODE=http://localhost:2222 +TIPS_MAINTENANCE_RPC_URL=http://localhost:2222 +TIPS_MAINTENANCE_RPC_POLL_INTERVAL_MS=250 TIPS_MAINTENANCE_KAFKA_BROKERS=localhost:9092 +TIPS_MAINTENANCE_FLASHBLOCKS_WS=ws://localhost:1115/ws TIPS_MAINTENANCE_KAFKA_TOPIC=tips-audit -TIPS_MAINTENANCE_POLL_INTERVAL_MS=250 -TIPS_MAINTENANCE_LOG_LEVEL=debug +TIPS_MAINTENANCE_LOG_LEVEL=info +TIPS_MAINTENANCE_FINALIZATION_DEPTH=10 # TIPS UI TIPS_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres diff --git a/.sqlx/query-2a6e99270e35859fd7a4ce4deeeb652f7d67c3e78b2749b00ff5a3814ed6664f.json b/.sqlx/query-2a6e99270e35859fd7a4ce4deeeb652f7d67c3e78b2749b00ff5a3814ed6664f.json new file mode 100644 index 0000000..93237ba --- /dev/null +++ b/.sqlx/query-2a6e99270e35859fd7a4ce4deeeb652f7d67c3e78b2749b00ff5a3814ed6664f.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO maintenance (block_number, block_hash, finalized)\n VALUES ($1, $2, false)\n ON CONFLICT (block_number)\n DO UPDATE SET block_hash = EXCLUDED.block_hash, finalized = false\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8", + "Bpchar" + ] + }, + "nullable": [] + }, + "hash": "2a6e99270e35859fd7a4ce4deeeb652f7d67c3e78b2749b00ff5a3814ed6664f" +} diff --git a/.sqlx/query-7d72b87eddd39d131ce083dcbff9e6c5fbdde1083aff6e4dca20508f177df536.json b/.sqlx/query-7d72b87eddd39d131ce083dcbff9e6c5fbdde1083aff6e4dca20508f177df536.json new file mode 100644 index 0000000..6810f8a --- /dev/null +++ b/.sqlx/query-7d72b87eddd39d131ce083dcbff9e6c5fbdde1083aff6e4dca20508f177df536.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "DELETE FROM maintenance WHERE finalized = true AND block_number < $1", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [] + }, + "hash": "7d72b87eddd39d131ce083dcbff9e6c5fbdde1083aff6e4dca20508f177df536" +} diff --git a/.sqlx/query-85798b03a3dff0196ee1c64b1b21f74c6ac9046b4ccad4f1fc9876a7355616b0.json b/.sqlx/query-85798b03a3dff0196ee1c64b1b21f74c6ac9046b4ccad4f1fc9876a7355616b0.json new file mode 100644 index 0000000..e47d0c8 --- /dev/null +++ b/.sqlx/query-85798b03a3dff0196ee1c64b1b21f74c6ac9046b4ccad4f1fc9876a7355616b0.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE maintenance SET finalized = true WHERE block_number < $1 AND finalized = false", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [] + }, + "hash": "85798b03a3dff0196ee1c64b1b21f74c6ac9046b4ccad4f1fc9876a7355616b0" +} diff --git a/.sqlx/query-c279740d623e06b3e3add31a6c15085bde3207756fe914837cef0cd12b864366.json b/.sqlx/query-92e3773f27ca3d15e43cd2a48c40898572b4ea735f94ebd9df04b86b67eab713.json similarity index 50% rename from .sqlx/query-c279740d623e06b3e3add31a6c15085bde3207756fe914837cef0cd12b864366.json rename to .sqlx/query-92e3773f27ca3d15e43cd2a48c40898572b4ea735f94ebd9df04b86b67eab713.json index b3729a0..1f7bfdd 100644 --- a/.sqlx/query-c279740d623e06b3e3add31a6c15085bde3207756fe914837cef0cd12b864366.json +++ b/.sqlx/query-92e3773f27ca3d15e43cd2a48c40898572b4ea735f94ebd9df04b86b67eab713.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n INSERT INTO bundles (\n id, \"state\", senders, minimum_base_fee, txn_hashes, \n txs, reverting_tx_hashes, dropping_tx_hashes, \n block_number, min_timestamp, max_timestamp,\n created_at, updated_at\n )\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, NOW(), NOW())\n ", + "query": "\n INSERT INTO bundles (\n id, bundle_state, senders, minimum_base_fee, txn_hashes, \n txs, reverting_tx_hashes, dropping_tx_hashes, \n block_number, min_timestamp, max_timestamp,\n created_at, updated_at, state_changed_at\n )\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, NOW(), NOW(), NOW())\n ", "describe": { "columns": [], "parameters": { @@ -12,11 +12,7 @@ "kind": { "Enum": [ "Ready", - "BundleLimit", - "AccountLimits", - "GlobalLimits", - "IncludedInFlashblock", - "IncludedInBlock" + "IncludedByBuilder" ] } } @@ -34,5 +30,5 @@ }, "nullable": [] }, - "hash": "c279740d623e06b3e3add31a6c15085bde3207756fe914837cef0cd12b864366" + "hash": "92e3773f27ca3d15e43cd2a48c40898572b4ea735f94ebd9df04b86b67eab713" } diff --git a/.sqlx/query-9f1f7117bba639cdc922de4e6870a34cd49c3e2826662fa3fe8af597d1e9e90b.json b/.sqlx/query-9f1f7117bba639cdc922de4e6870a34cd49c3e2826662fa3fe8af597d1e9e90b.json new file mode 100644 index 0000000..36bb16f --- /dev/null +++ b/.sqlx/query-9f1f7117bba639cdc922de4e6870a34cd49c3e2826662fa3fe8af597d1e9e90b.json @@ -0,0 +1,34 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE bundles \n SET bundle_state = $1, updated_at = NOW(), state_changed_at = NOW()\n WHERE id = ANY($2) AND bundle_state::text = ANY($3)\n RETURNING id\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Uuid" + } + ], + "parameters": { + "Left": [ + { + "Custom": { + "name": "bundle_state", + "kind": { + "Enum": [ + "Ready", + "IncludedByBuilder" + ] + } + } + }, + "UuidArray", + "TextArray" + ] + }, + "nullable": [ + false + ] + }, + "hash": "9f1f7117bba639cdc922de4e6870a34cd49c3e2826662fa3fe8af597d1e9e90b" +} diff --git a/.sqlx/query-b2f3046a06d9b8a76c59a38122a8fdc5ab2ae76baab1082b4d2b4c4ef01d2f74.json b/.sqlx/query-b2f3046a06d9b8a76c59a38122a8fdc5ab2ae76baab1082b4d2b4c4ef01d2f74.json new file mode 100644 index 0000000..f81533d --- /dev/null +++ b/.sqlx/query-b2f3046a06d9b8a76c59a38122a8fdc5ab2ae76baab1082b4d2b4c4ef01d2f74.json @@ -0,0 +1,32 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT\n bundle_state::text as bundle_state_text,\n COUNT(*) as bundle_count,\n SUM(COALESCE(array_length(txn_hashes, 1), 0)) as transaction_count\n FROM bundles\n GROUP BY bundle_state\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "bundle_state_text", + "type_info": "Text" + }, + { + "ordinal": 1, + "name": "bundle_count", + "type_info": "Int8" + }, + { + "ordinal": 2, + "name": "transaction_count", + "type_info": "Int8" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + null, + null, + null + ] + }, + "hash": "b2f3046a06d9b8a76c59a38122a8fdc5ab2ae76baab1082b4d2b4c4ef01d2f74" +} diff --git a/Cargo.lock b/Cargo.lock index 3747436..4d4191a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "addr2line" -version = "0.24.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" dependencies = [ "gimli", ] @@ -17,6 +17,41 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + [[package]] name = "ahash" version = "0.8.12" @@ -39,6 +74,21 @@ dependencies = [ "memchr", ] +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "allocator-api2" version = "0.2.21" @@ -47,22 +97,22 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy-chains" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e4e355f312b270bca5144af5f003e7d238037e47a818766f9107f966cbecf52" +checksum = "bf01dd83a1ca5e4807d0ca0223c9615e211ce5db0a9fd1443c2778cacf89b546" dependencies = [ "alloy-primitives", "alloy-rlp", "num_enum", "serde", - "strum", + "strum 0.27.2", ] [[package]] name = "alloy-consensus" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cd9d29a6a0bb8d4832ff7685dcbb430011b832f2ccec1af9571a0e75c1f7e9c" +checksum = "59094911f05dbff1cf5b29046a00ef26452eccc8d47136d50a47c0cf22f00c85" dependencies = [ "alloy-eips", "alloy-primitives", @@ -81,14 +131,14 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 2.0.17", ] [[package]] name = "alloy-consensus-any" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce038cb325f9a85a10fb026fb1b70cb8c62a004d85d22f8516e5d173e3eec612" +checksum = "903cb8f728107ca27c816546f15be38c688df3c381d7bd1a4a9f215effc1ddb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -98,6 +148,23 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-dyn-abi" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6c2905bafc2df7ccd32ca3af13f0b0d82f2e2ff9dfbeb12196c0d978d5c0deb" +dependencies = [ + "alloy-json-abi", + "alloy-primitives", + "alloy-sol-type-parser", + "alloy-sol-types", + "derive_more", + "itoa", + "serde", + "serde_json", + "winnow", +] + [[package]] name = "alloy-eip2124" version = "0.2.0" @@ -108,7 +175,7 @@ dependencies = [ "alloy-rlp", "crc", "serde", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -132,14 +199,15 @@ dependencies = [ "alloy-rlp", "k256", "serde", - "thiserror", + "serde_with", + "thiserror 2.0.17", ] [[package]] name = "alloy-eips" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bfec530782b30151e2564edf3c900f1fa6852128b7a993e458e8e3815d8b915" +checksum = "ac7f1c9a1ccc7f3e03c36976455751a6166a4f0d2d2c530c3f87dfe7d0cdc836" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -156,34 +224,37 @@ dependencies = [ "serde", "serde_with", "sha2 0.10.9", - "thiserror", + "thiserror 2.0.17", ] [[package]] name = "alloy-evm" -version = "0.20.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbe7c66c859b658d879b22e8aaa19546dab726b0639f4649a424ada3d99349e" +checksum = "06a5f67ee74999aa4fe576a83be1996bdf74a30fce3d248bf2007d6fc7dae8aa" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-hardforks", + "alloy-op-hardforks", "alloy-primitives", + "alloy-rpc-types-engine", "alloy-rpc-types-eth", "alloy-sol-types", "auto_impl", "derive_more", - "op-alloy-consensus 0.19.1", + "op-alloy-consensus", + "op-alloy-rpc-types-engine", "op-revm", "revm", - "thiserror", + "thiserror 2.0.17", ] [[package]] name = "alloy-genesis" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3865dd77a0fcbe61a35f08171af54d54617372df0544d7626f9ee5a42103c825" +checksum = "1421f6c9d15e5b86afbfe5865ca84dea3b9f77173a0963c1a2ee4e626320ada9" dependencies = [ "alloy-eips", "alloy-primitives", @@ -204,13 +275,14 @@ dependencies = [ "alloy-primitives", "auto_impl", "dyn-clone", + "serde", ] [[package]] name = "alloy-json-abi" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "125a1c373261b252e53e04d6e92c37d881833afc1315fceab53fd46045695640" +checksum = "a2acb6637a9c0e1cdf8971e0ced8f3fa34c04c5e9dccf6bb184f6a64fe0e37d8" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -220,24 +292,24 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be436893c0d1f7a57d1d8f1b6b9af9db04174468410b7e6e1d1893e78110a3bc" +checksum = "65f763621707fa09cece30b73ecc607eb43fd7a72451fe3b46f645b905086926" dependencies = [ "alloy-primitives", "alloy-sol-types", "http 1.3.1", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", "tracing", ] [[package]] name = "alloy-network" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f18959e1a1b40e05578e7a705f65ff4e6b354e38335da4b33ccbee876bde7c26" +checksum = "2f59a869fa4b4c3a7f08b1c8cb79aec61c29febe6e24a24fe0fcfded8a9b5703" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -256,14 +328,14 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", ] [[package]] name = "alloy-network-primitives" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1da0037ac546c0cae2eb776bed53687b7bbf776f4e7aa2fea0b8b89e734c319b" +checksum = "46e9374c667c95c41177602ebe6f6a2edd455193844f011d973d374b65501b38" dependencies = [ "alloy-consensus", "alloy-eips", @@ -274,9 +346,9 @@ dependencies = [ [[package]] name = "alloy-op-evm" -version = "0.20.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9b726869a13d5d958f2f78fbef7ce522689c4d40d613c16239f5e286fbeb1a" +checksum = "17aaeb600740c181bf29c9f138f9b228d115ea74fa6d0f0343e1952f1a766968" dependencies = [ "alloy-consensus", "alloy-eips", @@ -284,7 +356,7 @@ dependencies = [ "alloy-op-hardforks", "alloy-primitives", "auto_impl", - "op-alloy-consensus 0.19.1", + "op-alloy-consensus", "op-revm", "revm", ] @@ -303,18 +375,18 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9485c56de23438127a731a6b4c87803d49faf1a7068dcd1d8768aca3a9edb9" +checksum = "5b77f7d5e60ad8ae6bd2200b8097919712a07a6db622a4b201e7ead6166f02e5" dependencies = [ "alloy-rlp", "bytes", "cfg-if", "const-hex", "derive_more", - "foldhash", + "foldhash 0.2.0", "getrandom 0.3.3", - "hashbrown 0.15.5", + "hashbrown 0.16.0", "indexmap 2.11.4", "itoa", "k256", @@ -331,9 +403,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74580f7459337cd281a6bfa2c8f08a07051cb3900e0edaa27ccb21fb046041ed" +checksum = "77818b7348bd5486491a5297579dbfe5f706a81f8e1f5976393025f1e22a7c7d" dependencies = [ "alloy-chains", "alloy-consensus", @@ -342,16 +414,19 @@ dependencies = [ "alloy-network", "alloy-network-primitives", "alloy-primitives", + "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types-eth", "alloy-signer", "alloy-sol-types", "alloy-transport", "alloy-transport-http", + "alloy-transport-ipc", + "alloy-transport-ws", "async-stream", "async-trait", "auto_impl", - "dashmap", + "dashmap 6.1.0", "either", "futures", "futures-utils-wasm", @@ -361,13 +436,35 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", "tokio", "tracing", "url", "wasmtimer", ] +[[package]] +name = "alloy-pubsub" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "249b45103a66c9ad60ad8176b076106d03a2399a37f0ee7b0e03692e6b354cb9" +dependencies = [ + "alloy-json-rpc", + "alloy-primitives", + "alloy-transport", + "auto_impl", + "bimap", + "futures", + "parking_lot", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tower 0.5.2", + "tracing", + "wasmtimer", +] + [[package]] name = "alloy-rlp" version = "0.3.12" @@ -392,14 +489,17 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca26070f1fc94d69e8d41fcde991b0556dbf8fac737dc09102d461d957a1bb9" +checksum = "2430d5623e428dd012c6c2156ae40b7fe638d6fca255e3244e0fba51fa698e93" dependencies = [ "alloy-json-rpc", "alloy-primitives", + "alloy-pubsub", "alloy-transport", "alloy-transport-http", + "alloy-transport-ipc", + "alloy-transport-ws", "futures", "pin-project", "reqwest", @@ -407,7 +507,7 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tower", + "tower 0.5.2", "tracing", "url", "wasmtimer", @@ -415,20 +515,22 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c079797bbda28d6a5a2e89bcbf788bf85b4ae2a4f0e57eed9e2d66637fe78c58" +checksum = "e9e131624d08a25cfc40557041e7dc42e1182fa1153e7592d120f769a1edce56" dependencies = [ "alloy-primitives", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", "alloy-serde", "serde", ] [[package]] name = "alloy-rpc-types-admin" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d56c8ce360ec766720d8a655fe448b94428ad1aea44aad488a3461ee4dc1f40" +checksum = "c59407723b1850ebaa49e46d10c2ba9c10c10b3aedf2f7e97015ee23c3f4e639" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -436,22 +538,65 @@ dependencies = [ "serde_json", ] +[[package]] +name = "alloy-rpc-types-anvil" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65e3266095e6d8e8028aab5f439c6b8736c5147314f7e606c61597e014cb8a0" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "serde", +] + [[package]] name = "alloy-rpc-types-any" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65423baf6af0ff356e254d7824b3824aa34d8ca9bd857a4e298f74795cc4b69d" +checksum = "07429a1099cd17227abcddb91b5e38c960aaeb02a6967467f5bb561fbe716ac6" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", "alloy-serde", ] +[[package]] +name = "alloy-rpc-types-beacon" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e0e876b20eb9debf316d3e875536f389070635250f22b5a678cf4632a3e0cf" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "ethereum_ssz", + "ethereum_ssz_derive", + "serde", + "serde_json", + "serde_with", + "thiserror 2.0.17", + "tree_hash", + "tree_hash_derive", +] + +[[package]] +name = "alloy-rpc-types-debug" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeff305b7d10cc1c888456d023e7bb8a5ea82e9e42b951e37619b88cc1a1486d" +dependencies = [ + "alloy-primitives", + "derive_more", + "serde", + "serde_with", +] + [[package]] name = "alloy-rpc-types-engine" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "997de3fb8ad67674af70c123d2c6344e8fb0cbbd7fb96fde106ee9e45a2912d2" +checksum = "222ecadcea6aac65e75e32b6735635ee98517aa63b111849ee01ae988a71d685" dependencies = [ "alloy-consensus", "alloy-eips", @@ -461,15 +606,17 @@ dependencies = [ "derive_more", "ethereum_ssz", "ethereum_ssz_derive", + "jsonwebtoken", + "rand 0.8.5", "serde", - "strum", + "strum 0.27.2", ] [[package]] name = "alloy-rpc-types-eth" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848f8ea4063bed834443081d77f840f31075f68d0d49723027f5a209615150bf" +checksum = "db46b0901ee16bbb68d986003c66dcb74a12f9d9b3c44f8e85d51974f2458f0f" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -483,14 +630,14 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 2.0.17", ] [[package]] name = "alloy-rpc-types-mev" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a04717f44c5404b1ef497f221869f243d5c9ea5bdfd5da8c25d6736a9d2b2e1" +checksum = "791a60d4baadd3f278faa4e2305cca095dfd4ab286e071b768ff09181d8ae215" dependencies = [ "alloy-consensus", "alloy-eips", @@ -503,23 +650,35 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3741bce3ede19ed040d8f357a88a4aae8f714e4d07da7f2a11b77a698386d7e1" +checksum = "36f10620724bd45f80c79668a8cdbacb6974f860686998abce28f6196ae79444" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", "alloy-serde", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", +] + +[[package]] +name = "alloy-rpc-types-txpool" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "864f41befa90102d4e02327679699a7e9510930e2924c529e31476086609fa89" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "serde", ] [[package]] name = "alloy-serde" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19c3835bdc128f2f3418f5d6c76aec63a245d72973e0eaacc9720aa0787225c5" +checksum = "5413814be7a22fbc81e0f04a2401fcc3eb25e56fd53b04683e8acecc6e1fe01b" dependencies = [ "alloy-primitives", "serde", @@ -528,9 +687,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42084a7b455ef0b94ed201b7494392a759c3e20faac2d00ded5d5762fcf71dee" +checksum = "53410a18a61916e2c073a6519499514e027b01e77eeaf96acd1df7cf96ef6bb2" dependencies = [ "alloy-primitives", "async-trait", @@ -538,14 +697,14 @@ dependencies = [ "either", "elliptic-curve 0.13.8", "k256", - "thiserror", + "thiserror 2.0.17", ] [[package]] name = "alloy-signer-local" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6312ccc048a4a88aed7311fc448a2e23da55c60c2b3b6dcdb794f759d02e49d7" +checksum = "e6006c4cbfa5d08cadec1fcabea6cb56dc585a30a9fce40bcf81e307d6a71c8e" dependencies = [ "alloy-consensus", "alloy-network", @@ -554,14 +713,14 @@ dependencies = [ "async-trait", "k256", "rand 0.8.5", - "thiserror", + "thiserror 2.0.17", ] [[package]] name = "alloy-sol-macro" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20d867dcf42019d4779519a1ceb55eba8d7f3d0e4f0a89bcba82b8f9eb01e48" +checksum = "78c84c3637bee9b5c4a4d2b93360ee16553d299c3b932712353caf1cea76d0e6" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -573,9 +732,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b74e91b0b553c115d14bd0ed41898309356dc85d0e3d4b9014c4e7715e48c8ad" +checksum = "a882aa4e1790063362434b9b40d358942b188477ac1c44cfb8a52816ffc0cc17" dependencies = [ "alloy-sol-macro-input", "const-hex", @@ -591,9 +750,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84194d31220803f5f62d0a00f583fd3a062b36382e2bea446f1af96727754565" +checksum = "18e5772107f9bb265d8d8c86e0733937bb20d0857ea5425b1b6ddf51a9804042" dependencies = [ "const-hex", "dunce", @@ -607,9 +766,9 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe8c27b3cf6b2bb8361904732f955bc7c05e00be5f469cec7e2280b6167f3ff0" +checksum = "e188b939aa4793edfaaa099cb1be4e620036a775b4bdf24fdc56f1cd6fd45890" dependencies = [ "serde", "winnow", @@ -617,9 +776,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5383d34ea00079e6dd89c652bcbdb764db160cef84e6250926961a0b2295d04" +checksum = "c3c8a9a909872097caffc05df134e5ef2253a1cdb56d3a9cf0052a042ac763f9" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -629,9 +788,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7200a72ccda236bc841df56964b1f816f451e317b172538ba3977357e789b8bd" +checksum = "d94ee404368a3d9910dfe61b203e888c6b0e151a50e147f95da8baff9f9c7763" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -643,9 +802,9 @@ dependencies = [ "parking_lot", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", "tokio", - "tower", + "tower 0.5.2", "tracing", "url", "wasmtimer", @@ -653,19 +812,57 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e4b8f9a796065824ef6cee4eef88a0887b03e963d6ad526f1c8de369a44472" +checksum = "a2f8a6338d594f6c6481292215ee8f2fd7b986c80aba23f3f44e761a8658de78" dependencies = [ "alloy-json-rpc", "alloy-transport", "reqwest", "serde_json", - "tower", + "tower 0.5.2", "tracing", "url", ] +[[package]] +name = "alloy-transport-ipc" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17a37a8ca18006fa0a58c7489645619ff58cfa073f2b29c4e052c9bd114b123a" +dependencies = [ + "alloy-json-rpc", + "alloy-pubsub", + "alloy-transport", + "bytes", + "futures", + "interprocess", + "pin-project", + "serde", + "serde_json", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "alloy-transport-ws" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "679b0122b7bca9d4dc5eb2c0549677a3c53153f6e232f23f4b3ba5575f74ebde" +dependencies = [ + "alloy-pubsub", + "alloy-transport", + "futures", + "http 1.3.1", + "rustls 0.23.31", + "serde_json", + "tokio", + "tokio-tungstenite", + "tracing", + "ws_stream_wasm", +] + [[package]] name = "alloy-trie" version = "0.9.1" @@ -684,9 +881,9 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc79013f9ac3a8ddeb60234d43da09e6d6abfc1c9dd29d3fe97adfbece3f4a08" +checksum = "e64c09ec565a90ed8390d82aa08cd3b22e492321b96cb4a3d4f58414683c9e2f" dependencies = [ "alloy-primitives", "darling 0.21.3", @@ -706,9 +903,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.20" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" dependencies = [ "anstyle", "anstyle-parse", @@ -721,9 +918,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" [[package]] name = "anstyle-parse" @@ -774,6 +971,12 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + [[package]] name = "ark-bls12-381" version = "0.5.0" @@ -1079,6 +1282,36 @@ dependencies = [ "serde", ] +[[package]] +name = "asn1_der" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" + +[[package]] +name = "async-compression" +version = "0.4.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a89bce6054c720275ac2432fbba080a66a2106a44a1b804553930ca6909f4e0" +dependencies = [ + "compression-codecs", + "compression-core", + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-lock" +version = "3.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" +dependencies = [ + "event-listener", + "event-listener-strategy", + "pin-project-lite", +] + [[package]] name = "async-stream" version = "0.3.6" @@ -1112,6 +1345,17 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "async_io_stream" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" +dependencies = [ + "futures", + "pharos", + "rustc_version 0.4.1", +] + [[package]] name = "atoi" version = "2.0.0" @@ -1212,7 +1456,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbfd150b5dbdb988bcc8fb1fe787eb6b7ee6180ca24da683b61ea5405f3d43ff" dependencies = [ - "bindgen", + "bindgen 0.69.5", "cc", "cmake", "dunce", @@ -1302,9 +1546,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.85.0" +version = "1.86.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e05f33b6c9026fecfe9b3b6740f34d41bc6ff641a6a32dabaab60209245b75" +checksum = "9d1cc7fb324aa12eb4404210e6381195c5b5e9d52c2682384f295f38716dd3c7" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1438,9 +1682,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-client" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147e8eea63a40315d704b97bf9bc9b8c1402ae94f89d5ad6f7550d963309da1b" +checksum = "734b4282fbb7372923ac339cc2222530f8180d9d4745e582de19a18cee409fd8" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -1461,8 +1705,8 @@ dependencies = [ "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.3", - "tower", + "tokio-rustls 0.26.4", + "tower 0.5.2", "tracing", ] @@ -1584,6 +1828,53 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower 0.5.2", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", +] + [[package]] name = "az" version = "1.2.1" @@ -1597,15 +1888,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "592277618714fbcecda9a02ba7a8781f319d26532a88553bbacc77ba5d2b3a8d" dependencies = [ "fastrand", - "gloo-timers", + "gloo-timers 0.3.0", "tokio", ] [[package]] name = "backtrace" -version = "0.3.75" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" +checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" dependencies = [ "addr2line", "cfg-if", @@ -1613,21 +1904,87 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets 0.52.6", + "windows-link 0.2.0", ] [[package]] -name = "base16ct" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +name = "base-reth-flashblocks-rpc" +version = "0.1.0" +source = "git+https://github.com/base/node-reth?rev=a1ae148a36354c88b356f80281fef12dad9f7737#a1ae148a36354c88b356f80281fef12dad9f7737" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-primitives", + "alloy-provider", + "alloy-rpc-client", + "alloy-rpc-types", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "arc-swap", + "brotli", + "eyre", + "futures-util", + "jsonrpsee 0.26.0", + "jsonrpsee-types 0.26.0", + "metrics", + "metrics-derive", + "op-alloy-consensus", + "op-alloy-network", + "op-alloy-rpc-types", + "reth", + "reth-evm", + "reth-exex", + "reth-optimism-chainspec", + "reth-optimism-cli", + "reth-optimism-evm", + "reth-optimism-node", + "reth-optimism-primitives", + "reth-optimism-rpc", + "reth-primitives", + "reth-primitives-traits", + "reth-provider", + "reth-rpc-convert", + "reth-rpc-eth-api", + "reth-tracing", + "rollup-boost", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tracing", + "url", +] [[package]] -name = "base16ct" +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + +[[package]] +name = "base16ct" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base256emoji" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e9430d9a245a77c92176e649af6e275f20839a48389859d1661e9a128d077c" +dependencies = [ + "const-str", + "match-lookup", +] + [[package]] name = "base64" version = "0.21.7" @@ -1656,6 +2013,21 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" +[[package]] +name = "bimap" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + [[package]] name = "bindgen" version = "0.69.5" @@ -1679,6 +2051,42 @@ dependencies = [ "which", ] +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags 2.9.4", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.106", +] + +[[package]] +name = "bindgen" +version = "0.72.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" +dependencies = [ + "bitflags 2.9.4", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "proc-macro2", + "quote", + "regex", + "rustc-hash 2.1.1", + "shlex", + "syn 2.0.106", +] + [[package]] name = "bit-set" version = "0.8.0" @@ -1756,11 +2164,20 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + [[package]] name = "blst" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fd49896f12ac9b6dcd7a5998466b9b58263a695a3dd1ecc1aaca2e12a90b080" +checksum = "dcdb4c7013139a150f9fc55d123186dbfaba0d912817466282c73ac49e71fb45" dependencies = [ "cc", "glob", @@ -1768,6 +2185,145 @@ dependencies = [ "zeroize", ] +[[package]] +name = "boa_ast" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c340fe0f0b267787095cbe35240c6786ff19da63ec7b69367ba338eace8169b" +dependencies = [ + "bitflags 2.9.4", + "boa_interner", + "boa_macros", + "boa_string", + "indexmap 2.11.4", + "num-bigint", + "rustc-hash 2.1.1", +] + +[[package]] +name = "boa_engine" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f620c3f06f51e65c0504ddf04978be1b814ac6586f0b45f6019801ab5efd37f9" +dependencies = [ + "arrayvec", + "bitflags 2.9.4", + "boa_ast", + "boa_gc", + "boa_interner", + "boa_macros", + "boa_parser", + "boa_profiler", + "boa_string", + "bytemuck", + "cfg-if", + "dashmap 6.1.0", + "fast-float2", + "hashbrown 0.15.5", + "icu_normalizer 1.5.0", + "indexmap 2.11.4", + "intrusive-collections", + "itertools 0.13.0", + "num-bigint", + "num-integer", + "num-traits", + "num_enum", + "once_cell", + "pollster", + "portable-atomic", + "rand 0.8.5", + "regress", + "rustc-hash 2.1.1", + "ryu-js", + "serde", + "serde_json", + "sptr", + "static_assertions", + "tap", + "thin-vec", + "thiserror 2.0.17", + "time", +] + +[[package]] +name = "boa_gc" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2425c0b7720d42d73eaa6a883fbb77a5c920da8694964a3d79a67597ac55cce2" +dependencies = [ + "boa_macros", + "boa_profiler", + "boa_string", + "hashbrown 0.15.5", + "thin-vec", +] + +[[package]] +name = "boa_interner" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42407a3b724cfaecde8f7d4af566df4b56af32a2f11f0956f5570bb974e7f749" +dependencies = [ + "boa_gc", + "boa_macros", + "hashbrown 0.15.5", + "indexmap 2.11.4", + "once_cell", + "phf", + "rustc-hash 2.1.1", + "static_assertions", +] + +[[package]] +name = "boa_macros" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fd3f870829131332587f607a7ff909f1af5fc523fd1b192db55fbbdf52e8d3c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", + "synstructure", +] + +[[package]] +name = "boa_parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cc142dac798cdc6e2dbccfddeb50f36d2523bb977a976e19bdb3ae19b740804" +dependencies = [ + "bitflags 2.9.4", + "boa_ast", + "boa_interner", + "boa_macros", + "boa_profiler", + "fast-float2", + "icu_properties 1.5.1", + "num-bigint", + "num-traits", + "regress", + "rustc-hash 2.1.1", +] + +[[package]] +name = "boa_profiler" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4064908e7cdf9b6317179e9b04dcb27f1510c1c144aeab4d0394014f37a0f922" + +[[package]] +name = "boa_string" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7debc13fbf7997bf38bf8e9b20f1ad5e2a7d27a900e1f6039fe244ce30f589b5" +dependencies = [ + "fast-float2", + "paste", + "rustc-hash 2.1.1", + "sptr", + "static_assertions", +] + [[package]] name = "bollard" version = "0.18.1" @@ -1799,7 +2355,7 @@ dependencies = [ "serde_json", "serde_repr", "serde_urlencoded", - "thiserror", + "thiserror 2.0.17", "tokio", "tokio-util", "tower-service", @@ -1818,6 +2374,45 @@ dependencies = [ "serde_with", ] +[[package]] +name = "boyer-moore-magiclen" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95e6233f2d926b5b123caf9d58e3885885255567fbe7776a7fdcae2a4d7241c4" +dependencies = [ + "debug-helper", +] + +[[package]] +name = "brotli" +version = "8.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + [[package]] name = "bumpalo" version = "3.19.0" @@ -1830,6 +2425,32 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d" +[[package]] +name = "bytecount" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e" + +[[package]] +name = "bytemuck" +version = "1.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "byteorder" version = "1.5.0" @@ -1857,9 +2478,9 @@ dependencies = [ [[package]] name = "c-kzg" -version = "2.1.1" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7318cfa722931cb5fe0838b98d3ce5621e75f6a6408abc21721d80de9223f2e4" +checksum = "e00bf4b112b07b505472dbefd19e37e53307e2bfed5a79e0cc161d58ccd0e687" dependencies = [ "blst", "cc", @@ -1870,6 +2491,66 @@ dependencies = [ "serde", ] +[[package]] +name = "camino" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" +dependencies = [ + "serde_core", +] + +[[package]] +name = "cargo-platform" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +dependencies = [ + "camino", + "cargo-platform", + "semver 1.0.27", + "serde", + "serde_json", +] + +[[package]] +name = "cargo_metadata" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" +dependencies = [ + "camino", + "cargo-platform", + "semver 1.0.27", + "serde", + "serde_json", + "thiserror 2.0.17", +] + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "castaway" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a" +dependencies = [ + "rustversion", +] + [[package]] name = "cc" version = "1.2.15" @@ -1881,6 +2562,12 @@ dependencies = [ "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cexpr" version = "0.6.0" @@ -1909,11 +2596,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ "iana-time-zone", + "js-sys", "num-traits", "serde", + "wasm-bindgen", "windows-link 0.2.0", ] +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "clang-sys" version = "1.8.1" @@ -1927,9 +2626,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.47" +version = "4.5.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931" +checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae" dependencies = [ "clap_builder", "clap_derive", @@ -1937,9 +2636,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.47" +version = "4.5.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6" +checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9" dependencies = [ "anstream", "anstyle", @@ -1981,19 +2680,83 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] -name = "concurrent-queue" -version = "2.5.0" +name = "combine" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ - "crossbeam-utils", + "bytes", + "memchr", ] [[package]] -name = "const-hex" -version = "1.16.0" +name = "comfy-table" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6407bff74dea37e0fa3dc1c1c974e5d46405f0c987bf9997a0762adce71eda6" +checksum = "b03b7db8e0b4b2fdad6c551e634134e99ec000e5c8c3b6856c65e8bbaded7a3b" +dependencies = [ + "crossterm 0.29.0", + "unicode-segmentation", + "unicode-width 0.2.0", +] + +[[package]] +name = "compact_str" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "rustversion", + "ryu", + "static_assertions", +] + +[[package]] +name = "compression-codecs" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef8a506ec4b81c460798f572caead636d57d3d7e940f998160f52bd254bf2d23" +dependencies = [ + "brotli", + "compression-core", + "flate2", + "memchr", + "zstd", + "zstd-safe", +] + +[[package]] +name = "compression-core" +version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb" + +[[package]] +name = "concat-kdf" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d72c1252426a83be2092dd5884a5f6e3b8e7180f6891b6263d2c21b92ec8816" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-hex" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6407bff74dea37e0fa3dc1c1c974e5d46405f0c987bf9997a0762adce71eda6" dependencies = [ "cfg-if", "cpufeatures", @@ -2007,6 +2770,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-str" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f421161cb492475f1661ddc9815a745a1c894592070661180fdec3d4872e9c3" + [[package]] name = "const_format" version = "0.2.34" @@ -2062,6 +2831,15 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + [[package]] name = "cpufeatures" version = "0.2.17" @@ -2114,6 +2892,15 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -2148,6 +2935,45 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.9.4", + "crossterm_winapi", + "mio", + "parking_lot", + "rustix 0.38.44", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" +dependencies = [ + "bitflags 2.9.4", + "crossterm_winapi", + "document-features", + "parking_lot", + "rustix 1.1.2", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + [[package]] name = "crunchy" version = "0.2.4" @@ -2185,9 +3011,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core 0.6.4", "typenum", ] +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "rustc_version 0.4.1", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "darling" version = "0.20.11" @@ -2259,6 +3122,19 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "dashmap" version = "6.1.0" @@ -2273,6 +3149,49 @@ dependencies = [ "parking_lot_core", ] +[[package]] +name = "data-encoding" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" + +[[package]] +name = "data-encoding-macro" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47ce6c96ea0102f01122a185683611bd5ac8d99e62bc59dd12e6bda344ee673d" +dependencies = [ + "data-encoding", + "data-encoding-macro-internal", +] + +[[package]] +name = "data-encoding-macro-internal" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976" +dependencies = [ + "data-encoding", + "syn 2.0.106", +] + +[[package]] +name = "debug-helper" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" + +[[package]] +name = "delay_map" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88e365f083a5cb5972d50ce8b1b2c9f125dc5ec0f50c0248cfb568ae59efcf0b" +dependencies = [ + "futures", + "tokio", + "tokio-util", +] + [[package]] name = "der" version = "0.6.1" @@ -2296,12 +3215,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc" +checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071" dependencies = [ "powerfmt", - "serde", + "serde_core", ] [[package]] @@ -2326,6 +3245,37 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "derive_builder" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +dependencies = [ + "darling 0.20.11", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", + "syn 2.0.106", +] + [[package]] name = "derive_more" version = "2.0.1" @@ -2348,6 +3298,12 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + [[package]] name = "digest" version = "0.9.0" @@ -2369,6 +3325,81 @@ dependencies = [ "subtle", ] +[[package]] +name = "dirs" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users 0.5.2", + "windows-sys 0.61.1", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users 0.4.6", + "winapi", +] + +[[package]] +name = "discv5" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4b4e7798d2ff74e29cee344dc490af947ae657d6ab5273dde35d58ce06a4d71" +dependencies = [ + "aes", + "aes-gcm", + "alloy-rlp", + "arrayvec", + "ctr", + "delay_map", + "enr", + "fnv", + "futures", + "hashlink 0.9.1", + "hex", + "hkdf", + "lazy_static", + "libp2p-identity", + "lru 0.12.5", + "more-asserts", + "multiaddr", + "parking_lot", + "rand 0.8.5", + "smallvec", + "socket2 0.5.10", + "tokio", + "tracing", + "uint 0.10.0", + "zeroize", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -2391,6 +3422,21 @@ dependencies = [ "serde_json", ] +[[package]] +name = "doctest-file" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" + +[[package]] +name = "document-features" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" +dependencies = [ + "litrs", +] + [[package]] name = "dotenvy" version = "0.15.7" @@ -2436,6 +3482,31 @@ dependencies = [ "spki 0.7.3", ] +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8 0.10.2", + "signature 2.2.0", +] + +[[package]] +name = "ed25519-dalek" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" +dependencies = [ + "curve25519-dalek", + "ed25519", + "rand_core 0.6.4", + "serde", + "sha2 0.10.9", + "subtle", + "zeroize", +] + [[package]] name = "educe" version = "0.6.0" @@ -2497,6 +3568,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + [[package]] name = "enr" version = "0.13.0" @@ -2506,14 +3583,29 @@ dependencies = [ "alloy-rlp", "base64 0.22.1", "bytes", + "ed25519-dalek", "hex", + "k256", "log", "rand 0.8.5", "secp256k1 0.30.0", + "serde", "sha3", "zeroize", ] +[[package]] +name = "enum-as-inner" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "enum-ordinalize" version = "4.3.0" @@ -2547,7 +3639,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.0", + "windows-sys 0.61.1", +] + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", ] [[package]] @@ -2561,6 +3662,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "ethereum_hashing" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c853bd72c9e5787f8aafc3df2907c2ed03cff3150c3acd94e2e53a98ab70a8ab" +dependencies = [ + "cpufeatures", + "ring", + "sha2 0.10.9", +] + [[package]] name = "ethereum_serde_utils" version = "0.8.0" @@ -2576,9 +3688,9 @@ dependencies = [ [[package]] name = "ethereum_ssz" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca8ba45b63c389c6e115b095ca16381534fdcc03cf58176a3f8554db2dbe19b" +checksum = "0dcddb2554d19cde19b099fadddde576929d7a4d0c1cd3512d1fd95cf174375c" dependencies = [ "alloy-primitives", "ethereum_serde_utils", @@ -2591,9 +3703,9 @@ dependencies = [ [[package]] name = "ethereum_ssz_derive" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd55d08012b4e0dfcc92b8d6081234df65f2986ad34cc76eeed69c5e2ce7506" +checksum = "a657b6b3b7e153637dc6bdc6566ad9279d9ee11a15b12cfb24a2e04360637e9f" dependencies = [ "darling 0.20.11", "proc-macro2", @@ -2612,6 +3724,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "eyre" version = "0.6.12" @@ -2622,6 +3744,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "fast-float2" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8eb564c5c7423d25c886fb561d1e4ee69f72354d16918afa32c08811f6b6a55" + [[package]] name = "fastrand" version = "2.3.0" @@ -2650,6 +3778,16 @@ dependencies = [ "bytes", ] +[[package]] +name = "fdlimit" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5" +dependencies = [ + "libc", + "thiserror 1.0.69", +] + [[package]] name = "ff" version = "0.12.1" @@ -2670,6 +3808,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + [[package]] name = "filetime" version = "0.2.26" @@ -2694,6 +3838,16 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "flate2" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "flume" version = "0.11.1" @@ -2717,6 +3871,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "foreign-types" version = "0.3.2" @@ -2747,6 +3907,15 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + [[package]] name = "funty" version = "2.0.0" @@ -2835,6 +4004,16 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" +dependencies = [ + "gloo-timers 0.2.6", + "send_wrapper 0.4.0", +] + [[package]] name = "futures-util" version = "0.3.31" @@ -2865,6 +4044,7 @@ version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ + "serde", "typenum", "version_check", "zeroize", @@ -2897,11 +4077,34 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + [[package]] name = "gimli" -version = "0.31.1" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" + +[[package]] +name = "git2" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110" +dependencies = [ + "bitflags 2.9.4", + "libc", + "libgit2-sys", + "log", + "url", +] [[package]] name = "glob" @@ -2909,6 +4112,39 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" +[[package]] +name = "gloo-net" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils", + "http 1.3.1", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror 1.0.69", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "gloo-timers" version = "0.3.0" @@ -2921,6 +4157,19 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gmp-mpfr-sys" version = "1.6.8" @@ -3008,6 +4257,9 @@ name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] [[package]] name = "hashbrown" @@ -3017,8 +4269,7 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "allocator-api2", "equivalent", - "foldhash", - "serde", + "foldhash 0.1.5", ] [[package]] @@ -3026,6 +4277,19 @@ name = "hashbrown" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +dependencies = [ + "foldhash 0.2.0", + "serde", +] + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] [[package]] name = "hashlink" @@ -3036,6 +4300,16 @@ dependencies = [ "hashbrown 0.15.5", ] +[[package]] +name = "hdrhistogram" +version = "7.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" +dependencies = [ + "byteorder", + "num-traits", +] + [[package]] name = "heck" version = "0.5.0" @@ -3063,6 +4337,54 @@ dependencies = [ "arrayvec", ] +[[package]] +name = "hickory-proto" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna", + "ipnet", + "once_cell", + "rand 0.9.2", + "ring", + "serde", + "thiserror 2.0.17", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "moka", + "once_cell", + "parking_lot", + "rand 0.9.2", + "resolv-conf", + "serde", + "smallvec", + "thiserror 2.0.17", + "tokio", + "tracing", +] + [[package]] name = "hkdf" version = "0.12.4" @@ -3146,6 +4468,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-range-header" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" + [[package]] name = "httparse" version = "1.10.1" @@ -3158,6 +4486,28 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +[[package]] +name = "human_bytes" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e" + +[[package]] +name = "humantime" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" + +[[package]] +name = "humantime-serde" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" +dependencies = [ + "humantime", + "serde", +] + [[package]] name = "hyper" version = "0.14.32" @@ -3245,11 +4595,26 @@ dependencies = [ "http 1.3.1", "hyper 1.7.0", "hyper-util", + "log", "rustls 0.23.31", "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.3", + "tokio-rustls 0.26.4", + "tower-service", + "webpki-roots 1.0.2", +] + +[[package]] +name = "hyper-timeout" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" +dependencies = [ + "hyper 1.7.0", + "hyper-util", + "pin-project-lite", + "tokio", "tower-service", ] @@ -3287,10 +4652,12 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.0", + "system-configuration", "tokio", "tower-service", "tracing", + "windows-registry", ] [[package]] @@ -3320,7 +4687,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core", + "windows-core 0.62.1", ] [[package]] @@ -3332,6 +4699,18 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke 0.7.5", + "zerofrom", + "zerovec 0.10.4", +] + [[package]] name = "icu_collections" version = "2.0.0" @@ -3340,9 +4719,9 @@ checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ "displaydoc", "potential_utf", - "yoke", + "yoke 0.8.0", "zerofrom", - "zerovec", + "zerovec 0.11.4", ] [[package]] @@ -3352,55 +4731,150 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" dependencies = [ "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", + "litemap 0.8.0", + "tinystr 0.8.1", + "writeable 0.6.1", + "zerovec 0.11.4", ] [[package]] -name = "icu_normalizer" -version = "2.0.0" +name = "icu_locid" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" dependencies = [ "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "zerovec", + "litemap 0.7.5", + "tinystr 0.7.6", + "writeable 0.5.5", + "zerovec 0.10.4", ] [[package]] -name = "icu_normalizer_data" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" - -[[package]] -name = "icu_properties" -version = "2.0.1" +name = "icu_locid_transform" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" dependencies = [ "displaydoc", - "icu_collections", - "icu_locale_core", - "icu_properties_data", - "icu_provider", - "potential_utf", - "zerotrie", - "zerovec", + "icu_locid", + "icu_locid_transform_data", + "icu_provider 1.5.0", + "tinystr 0.7.6", + "zerovec 0.10.4", ] [[package]] -name = "icu_properties_data" -version = "2.0.1" +name = "icu_locid_transform_data" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections 1.5.0", + "icu_normalizer_data 1.5.1", + "icu_properties 1.5.1", + "icu_provider 1.5.0", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_normalizer" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +dependencies = [ + "displaydoc", + "icu_collections 2.0.0", + "icu_normalizer_data 2.0.0", + "icu_properties 2.0.1", + "icu_provider 2.0.0", + "smallvec", + "zerovec 0.11.4", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" + +[[package]] +name = "icu_normalizer_data" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections 1.5.0", + "icu_locid_transform", + "icu_properties_data 1.5.1", + "icu_provider 1.5.0", + "tinystr 0.7.6", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_properties" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +dependencies = [ + "displaydoc", + "icu_collections 2.0.0", + "icu_locale_core", + "icu_properties_data 2.0.1", + "icu_provider 2.0.0", + "potential_utf", + "zerotrie", + "zerovec 0.11.4", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" + +[[package]] +name = "icu_properties_data" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr 0.7.6", + "writeable 0.5.5", + "yoke 0.7.5", + "zerofrom", + "zerovec 0.10.4", +] + [[package]] name = "icu_provider" version = "2.0.0" @@ -3410,12 +4884,23 @@ dependencies = [ "displaydoc", "icu_locale_core", "stable_deref_trait", - "tinystr", - "writeable", - "yoke", + "tinystr 0.8.1", + "writeable 0.6.1", + "yoke 0.8.0", "zerofrom", "zerotrie", - "zerovec", + "zerovec 0.11.4", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", ] [[package]] @@ -3441,8 +4926,18 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ - "icu_normalizer", - "icu_properties", + "icu_normalizer 2.0.0", + "icu_properties 2.0.1", +] + +[[package]] +name = "if-addrs" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b2eeee38fef3aa9b4cc5f1beea8a2444fc00e7377cafae396de3f5c2065e24" +dependencies = [ + "libc", + "windows-sys 0.59.0", ] [[package]] @@ -3513,6 +5008,79 @@ dependencies = [ "serde_core", ] +[[package]] +name = "indoc" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" + +[[package]] +name = "inotify" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" +dependencies = [ + "bitflags 2.9.4", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "inout" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "instability" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435d80800b936787d62688c927b6490e887c7ef5ff9ce922c6c6050fca75eb9a" +dependencies = [ + "darling 0.20.11", + "indoc", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "interprocess" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d941b405bd2322993887859a8ee6ac9134945a24ec5ec763a8a962fc64dfec2d" +dependencies = [ + "doctest-file", + "futures-core", + "libc", + "recvmsg", + "tokio", + "widestring", + "windows-sys 0.52.0", +] + +[[package]] +name = "intrusive-collections" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "189d0897e4cbe8c75efedf3502c18c887b05046e59d28404d4d8e46cbc4d1e86" +dependencies = [ + "memoffset", +] + [[package]] name = "io-uring" version = "0.7.10" @@ -3524,6 +5092,18 @@ dependencies = [ "libc", ] +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2 0.5.10", + "widestring", + "windows-sys 0.48.0", + "winreg", +] + [[package]] name = "ipnet" version = "2.11.0" @@ -3588,6 +5168,28 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "jobserver" version = "0.1.34" @@ -3600,25 +5202,92 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.80" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852f13bec5eba4ba9afbeb93fd7c13fe56147f055939ae21c43a29a0ecb2702e" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" dependencies = [ "once_cell", "wasm-bindgen", ] +[[package]] +name = "jsonrpsee" +version = "0.25.1" +source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" +dependencies = [ + "jsonrpsee-core 0.25.1", + "jsonrpsee-http-client 0.25.1", + "jsonrpsee-proc-macros 0.25.1", + "jsonrpsee-server 0.25.1", + "jsonrpsee-types 0.25.1", + "tokio", + "tracing", +] + [[package]] name = "jsonrpsee" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3f48dc3e6b8bd21e15436c1ddd0bc22a6a54e8ec46fedd6adf3425f396ec6a" dependencies = [ - "jsonrpsee-core", - "jsonrpsee-proc-macros", - "jsonrpsee-server", - "jsonrpsee-types", + "jsonrpsee-client-transport", + "jsonrpsee-core 0.26.0", + "jsonrpsee-http-client 0.26.0", + "jsonrpsee-proc-macros 0.26.0", + "jsonrpsee-server 0.26.0", + "jsonrpsee-types 0.26.0", + "jsonrpsee-wasm-client", + "jsonrpsee-ws-client", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-client-transport" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf36eb27f8e13fa93dcb50ccb44c417e25b818cfa1a481b5470cd07b19c60b98" +dependencies = [ + "base64 0.22.1", + "futures-channel", + "futures-util", + "gloo-net", + "http 1.3.1", + "jsonrpsee-core 0.26.0", + "pin-project", + "rustls 0.23.31", + "rustls-pki-types", + "rustls-platform-verifier", + "soketto", + "thiserror 2.0.17", + "tokio", + "tokio-rustls 0.26.4", + "tokio-util", + "tracing", + "url", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.25.1" +source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "jsonrpsee-types 0.25.1", + "parking_lot", + "pin-project", + "rand 0.9.2", + "rustc-hash 2.1.1", + "serde", + "serde_json", + "thiserror 2.0.17", "tokio", + "tower 0.5.2", "tracing", ] @@ -3630,21 +5299,81 @@ checksum = "316c96719901f05d1137f19ba598b5fe9c9bc39f4335f67f6be8613921946480" dependencies = [ "async-trait", "bytes", + "futures-timer", "futures-util", "http 1.3.1", "http-body 1.0.1", "http-body-util", - "jsonrpsee-types", + "jsonrpsee-types 0.26.0", "parking_lot", "pin-project", "rand 0.9.2", "rustc-hash 2.1.1", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", "tokio", - "tower", + "tokio-stream", + "tower 0.5.2", "tracing", + "wasm-bindgen-futures", +] + +[[package]] +name = "jsonrpsee-http-client" +version = "0.25.1" +source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" +dependencies = [ + "base64 0.22.1", + "http-body 1.0.1", + "hyper 1.7.0", + "hyper-rustls 0.27.7", + "hyper-util", + "jsonrpsee-core 0.25.1", + "jsonrpsee-types 0.25.1", + "rustls 0.23.31", + "rustls-platform-verifier", + "serde", + "serde_json", + "thiserror 2.0.17", + "tokio", + "tower 0.5.2", + "url", +] + +[[package]] +name = "jsonrpsee-http-client" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790bedefcec85321e007ff3af84b4e417540d5c87b3c9779b9e247d1bcc3dab8" +dependencies = [ + "base64 0.22.1", + "http-body 1.0.1", + "hyper 1.7.0", + "hyper-rustls 0.27.7", + "hyper-util", + "jsonrpsee-core 0.26.0", + "jsonrpsee-types 0.26.0", + "rustls 0.23.31", + "rustls-platform-verifier", + "serde", + "serde_json", + "thiserror 2.0.17", + "tokio", + "tower 0.5.2", + "url", +] + +[[package]] +name = "jsonrpsee-proc-macros" +version = "0.25.1" +source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.106", ] [[package]] @@ -3662,9 +5391,8 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c51b7c290bb68ce3af2d029648148403863b982f138484a73f02a9dd52dbd7f" +version = "0.25.1" +source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" dependencies = [ "futures-util", "http 1.3.1", @@ -3672,31 +5400,110 @@ dependencies = [ "http-body-util", "hyper 1.7.0", "hyper-util", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.25.1", + "jsonrpsee-types 0.25.1", "pin-project", "route-recognizer", "serde", "serde_json", "soketto", - "thiserror", + "thiserror 2.0.17", "tokio", "tokio-stream", "tokio-util", - "tower", + "tower 0.5.2", "tracing", ] [[package]] -name = "jsonrpsee-types" +name = "jsonrpsee-server" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc88ff4688e43cc3fa9883a8a95c6fa27aa2e76c96e610b737b6554d650d7fd5" +checksum = "4c51b7c290bb68ce3af2d029648148403863b982f138484a73f02a9dd52dbd7f" dependencies = [ + "futures-util", "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.7.0", + "hyper-util", + "jsonrpsee-core 0.26.0", + "jsonrpsee-types 0.26.0", + "pin-project", + "route-recognizer", "serde", "serde_json", - "thiserror", + "soketto", + "thiserror 2.0.17", + "tokio", + "tokio-stream", + "tokio-util", + "tower 0.5.2", + "tracing", +] + +[[package]] +name = "jsonrpsee-types" +version = "0.25.1" +source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" +dependencies = [ + "http 1.3.1", + "serde", + "serde_json", + "thiserror 2.0.17", +] + +[[package]] +name = "jsonrpsee-types" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc88ff4688e43cc3fa9883a8a95c6fa27aa2e76c96e610b737b6554d650d7fd5" +dependencies = [ + "http 1.3.1", + "serde", + "serde_json", + "thiserror 2.0.17", +] + +[[package]] +name = "jsonrpsee-wasm-client" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7902885de4779f711a95d82c8da2d7e5f9f3a7c7cfa44d51c067fd1c29d72a3c" +dependencies = [ + "jsonrpsee-client-transport", + "jsonrpsee-core 0.26.0", + "jsonrpsee-types 0.26.0", + "tower 0.5.2", +] + +[[package]] +name = "jsonrpsee-ws-client" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6fceceeb05301cc4c065ab3bd2fa990d41ff4eb44e4ca1b30fa99c057c3e79" +dependencies = [ + "http 1.3.1", + "jsonrpsee-client-transport", + "jsonrpsee-core 0.26.0", + "jsonrpsee-types 0.26.0", + "tower 0.5.2", + "url", +] + +[[package]] +name = "jsonwebtoken" +version = "9.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde" +dependencies = [ + "base64 0.22.1", + "js-sys", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", ] [[package]] @@ -3711,6 +5518,7 @@ dependencies = [ "once_cell", "serdect", "sha2 0.10.9", + "signature 2.2.0", ] [[package]] @@ -3732,6 +5540,26 @@ dependencies = [ "sha3-asm", ] +[[package]] +name = "kqueue" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -3749,18 +5577,30 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.175" +version = "0.2.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" +checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" + +[[package]] +name = "libgit2-sys" +version = "0.18.2+1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] [[package]] name = "libloading" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-link 0.2.0", ] [[package]] @@ -3769,6 +5609,36 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" +[[package]] +name = "libp2p-identity" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3104e13b51e4711ff5738caa1fb54467c8604c2e94d607e27745bcf709068774" +dependencies = [ + "asn1_der", + "bs58", + "ed25519-dalek", + "hkdf", + "k256", + "multihash", + "quick-protobuf", + "sha2 0.10.9", + "thiserror 2.0.17", + "tracing", + "zeroize", +] + +[[package]] +name = "libproc" +version = "0.14.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a54ad7278b8bc5301d5ffd2a94251c004feb971feba96c971ea4063645990757" +dependencies = [ + "bindgen 0.72.1", + "errno", + "libc", +] + [[package]] name = "libredox" version = "0.1.10" @@ -3848,6 +5718,22 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linked_hash_set" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bae85b5be22d9843c80e5fc80e9b64c8a3b1f98f867c709956eca3efff4e92e2" +dependencies = [ + "linked-hash-map", + "serde", +] + [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -3860,12 +5746,24 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" +[[package]] +name = "litemap" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" + [[package]] name = "litemap" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" +[[package]] +name = "litrs" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" + [[package]] name = "lock_api" version = "0.4.13" @@ -3874,6 +5772,7 @@ checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" dependencies = [ "autocfg", "scopeguard", + "serde", ] [[package]] @@ -3906,6 +5805,40 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" +[[package]] +name = "lz4" +version = "1.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20b523e860d03443e98350ceaac5e71c6ba89aea7d960769ec3ce37f4de5af4" +dependencies = [ + "lz4-sys", +] + +[[package]] +name = "lz4-sys" +version = "1.11.1+lz4-1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "lz4_flex" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a" + +[[package]] +name = "mach2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44" +dependencies = [ + "libc", +] + [[package]] name = "macro-string" version = "0.1.4" @@ -3917,6 +5850,17 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "match-lookup" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1265724d8cb29dbbc2b0f06fffb8bf1a8c0cf73a78eede9ba73a4a66c52a981e" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "matchers" version = "0.2.0" @@ -3926,6 +5870,12 @@ dependencies = [ "regex-automata", ] +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + [[package]] name = "md-5" version = "0.10.6" @@ -3938,9 +5888,27 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" + +[[package]] +name = "memmap2" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843a98750cd611cc2965a8213b53b43e715f13c37a9e096c6408e69990961db7" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] [[package]] name = "metrics" @@ -3964,6 +5932,94 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "metrics-exporter-prometheus" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7399781913e5393588a8d8c6a2867bf85fb38eaf2502fdce465aad2dc6f034" +dependencies = [ + "base64 0.22.1", + "http-body-util", + "hyper 1.7.0", + "hyper-rustls 0.27.7", + "hyper-util", + "indexmap 2.11.4", + "ipnet", + "metrics", + "metrics-util", + "quanta", + "thiserror 1.0.69", + "tokio", + "tracing", +] + +[[package]] +name = "metrics-process" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8499d118208b7b84f01597edd26438e3f015c7ff4b356fbc0df535668ded83bf" +dependencies = [ + "libc", + "libproc", + "mach2", + "metrics", + "once_cell", + "procfs", + "rlimit", + "windows 0.61.3", +] + +[[package]] +name = "metrics-util" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8496cc523d1f94c1385dd8f0f0c2c480b2b8aeccb5b7e4485ad6365523ae376" +dependencies = [ + "aho-corasick", + "crossbeam-epoch", + "crossbeam-utils", + "hashbrown 0.15.5", + "indexmap 2.11.4", + "metrics", + "ordered-float", + "quanta", + "radix_trie", + "rand 0.9.2", + "rand_xoshiro", + "sketches-ddsketch", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "mini-moka" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c325dfab65f261f386debee8b0969da215b3fa0037e74c8a1234db7ba986d803" +dependencies = [ + "crossbeam-channel", + "crossbeam-utils", + "dashmap 5.5.3", + "skeptic", + "smallvec", + "tagptr", + "triomphe", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -3986,6 +6042,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", + "log", "wasi 0.11.1+wasi-snapshot-preview1", "windows-sys 0.59.0", ] @@ -4012,39 +6069,149 @@ dependencies = [ ] [[package]] -name = "native-tls" -version = "0.2.14" +name = "moka" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +checksum = "8261cd88c312e0004c1d51baad2980c66528dfdb2bee62003e643a4d8f86b077" dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework 2.11.1", - "security-framework-sys", - "tempfile", + "async-lock", + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "equivalent", + "event-listener", + "futures-util", + "parking_lot", + "portable-atomic", + "rustc_version 0.4.1", + "smallvec", + "tagptr", + "uuid", ] [[package]] -name = "nom" -version = "7.1.3" +name = "more-asserts" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] +checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e" [[package]] -name = "nu-ansi-term" -version = "0.50.1" +name = "multiaddr" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +checksum = "fe6351f60b488e04c1d21bc69e56b89cb3f5e8f5d22557d6e8031bdfd79b6961" dependencies = [ - "windows-sys 0.52.0", + "arrayref", + "byteorder", + "data-encoding", + "libp2p-identity", + "multibase", + "multihash", + "percent-encoding", + "serde", + "static_assertions", + "unsigned-varint", + "url", +] + +[[package]] +name = "multibase" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8694bb4835f452b0e3bb06dbebb1d6fc5385b6ca1caf2e55fd165c042390ec77" +dependencies = [ + "base-x", + "base256emoji", + "data-encoding", + "data-encoding-macro", +] + +[[package]] +name = "multihash" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b430e7953c29dd6a09afc29ff0bb69c6e306329ee6794700aee27b76a1aea8d" +dependencies = [ + "core2", + "unsigned-varint", +] + +[[package]] +name = "native-tls" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework 2.11.1", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" +dependencies = [ + "bitflags 2.9.4", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "notify-types", + "walkdir", + "windows-sys 0.60.2", +] + +[[package]] +name = "notify-types" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.50.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +dependencies = [ + "windows-sys 0.52.0", ] [[package]] @@ -4069,6 +6236,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", + "serde", ] [[package]] @@ -4176,11 +6344,20 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + [[package]] name = "nybbles" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa11e84403164a9f12982ab728f3c67c6fd4ab5b5f0254ffc217bdbd3b28ab0" +checksum = "2c4b5ecbd0beec843101bffe848217f770e8b8da81d8355b7d6e226f2199b3dc" dependencies = [ "alloy-rlp", "cfg-if", @@ -4192,9 +6369,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.7" +version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "memchr", ] @@ -4215,22 +6392,6 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" -[[package]] -name = "op-alloy-consensus" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9ade20c592484ba1ea538006e0454284174447a3adf9bb59fa99ed512f95493" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-serde", - "derive_more", - "serde", - "thiserror", -] - [[package]] name = "op-alloy-consensus" version = "0.20.0" @@ -4246,9 +6407,16 @@ dependencies = [ "alloy-serde", "derive_more", "serde", - "thiserror", + "serde_with", + "thiserror 2.0.17", ] +[[package]] +name = "op-alloy-flz" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" + [[package]] name = "op-alloy-network" version = "0.20.0" @@ -4261,27 +6429,18 @@ dependencies = [ "alloy-provider", "alloy-rpc-types-eth", "alloy-signer", - "op-alloy-consensus 0.20.0", - "op-alloy-rpc-types 0.20.0", + "op-alloy-consensus", + "op-alloy-rpc-types", ] [[package]] -name = "op-alloy-rpc-types" -version = "0.19.1" +name = "op-alloy-rpc-jsonrpsee" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9076d4fcb8e260cec8ad01cd155200c0dbb562e62adb553af245914f30854e29" +checksum = "e8eb878fc5ea95adb5abe55fb97475b3eb0dcc77dfcd6f61bd626a68ae0bdba1" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network-primitives", "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "derive_more", - "op-alloy-consensus 0.19.1", - "serde", - "serde_json", - "thiserror", + "jsonrpsee 0.26.0", ] [[package]] @@ -4297,29 +6456,31 @@ dependencies = [ "alloy-rpc-types-eth", "alloy-serde", "derive_more", - "op-alloy-consensus 0.20.0", + "op-alloy-consensus", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", ] [[package]] name = "op-alloy-rpc-types-engine" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4256b1eda5766a9fa7de5874e54515994500bef632afda41e940aed015f9455" +checksum = "14e50c94013a1d036a529df259151991dbbd6cf8dc215e3b68b784f95eec60e6" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", + "alloy-serde", "derive_more", "ethereum_ssz", "ethereum_ssz_derive", - "op-alloy-consensus 0.19.1", + "op-alloy-consensus", + "serde", "snap", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -4383,6 +6544,107 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "opentelemetry" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "236e667b670a5cdf90c258f5a55794ec5ac5027e960c224bff8367a59e1e6426" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "pin-project-lite", + "thiserror 2.0.17", + "tracing", +] + +[[package]] +name = "opentelemetry-http" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8863faf2910030d139fb48715ad5ff2f35029fc5f244f6d5f689ddcf4d26253" +dependencies = [ + "async-trait", + "bytes", + "http 1.3.1", + "opentelemetry", + "reqwest", + "tracing", +] + +[[package]] +name = "opentelemetry-otlp" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bef114c6d41bea83d6dc60eb41720eedd0261a67af57b66dd2b84ac46c01d91" +dependencies = [ + "async-trait", + "futures-core", + "http 1.3.1", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-proto", + "opentelemetry_sdk", + "prost", + "reqwest", + "serde_json", + "thiserror 2.0.17", + "tokio", + "tonic", + "tracing", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f8870d3024727e99212eb3bb1762ec16e255e3e6f58eeb3dc8db1aa226746d" +dependencies = [ + "base64 0.22.1", + "hex", + "opentelemetry", + "opentelemetry_sdk", + "prost", + "serde", + "tonic", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84dfad6042089c7fc1f6118b7040dc2eb4ab520abbf410b79dc481032af39570" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "opentelemetry", + "percent-encoding", + "rand 0.8.5", + "serde_json", + "thiserror 2.0.17", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" +dependencies = [ + "num-traits", +] + [[package]] name = "outref" version = "0.5.2" @@ -4412,6 +6674,16 @@ dependencies = [ "sha2 0.10.9", ] +[[package]] +name = "page_size" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "parity-scale-codec" version = "3.7.5" @@ -4421,6 +6693,7 @@ dependencies = [ "arrayvec", "bitvec", "byte-slice-cast", + "bytes", "const_format", "impl-trait-for-tuples", "parity-scale-codec-derive", @@ -4500,6 +6773,16 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "pem" +version = "3.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3" +dependencies = [ + "base64 0.22.1", + "serde", +] + [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -4522,10 +6805,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21e0a3a33733faeaf8651dfee72dd0f388f0c8e5ad496a3478fa5a922f49cfa8" dependencies = [ "memchr", - "thiserror", + "thiserror 2.0.17", "ucd-trie", ] +[[package]] +name = "pharos" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" +dependencies = [ + "futures", + "rustc_version 0.4.1", +] + [[package]] name = "phf" version = "0.11.3" @@ -4638,6 +6931,24 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +[[package]] +name = "pollster" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3" + +[[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + [[package]] name = "portable-atomic" version = "1.11.1" @@ -4650,7 +6961,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" dependencies = [ - "zerovec", + "zerovec 0.11.4", ] [[package]] @@ -4668,6 +6979,16 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "pretty_assertions" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" +dependencies = [ + "diff", + "yansi", +] + [[package]] name = "prettyplease" version = "0.2.37" @@ -4695,7 +7016,7 @@ checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", "impl-codec", - "uint", + "uint 0.9.5", ] [[package]] @@ -4704,7 +7025,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" dependencies = [ - "toml_edit", + "toml_edit 0.23.6", ] [[package]] @@ -4738,11 +7059,36 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "procfs" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f" +dependencies = [ + "bitflags 2.9.4", + "chrono", + "flate2", + "hex", + "procfs-core", + "rustix 0.38.44", +] + +[[package]] +name = "procfs-core" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec" +dependencies = [ + "bitflags 2.9.4", + "chrono", + "hex", +] + [[package]] name = "proptest" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f" +checksum = "2bb0be07becd10686a0bb407298fb425360a5c44a663774406340c59a22de4ce" dependencies = [ "bit-set", "bit-vec", @@ -4759,26 +7105,84 @@ dependencies = [ ] [[package]] -name = "quick-error" -version = "1.2.3" +name = "prost" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" +dependencies = [ + "bytes", + "prost-derive", +] [[package]] -name = "quinn" -version = "0.11.9" +name = "prost-derive" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ - "bytes", - "cfg_aliases", + "anyhow", + "itertools 0.14.0", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "pulldown-cmark" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +dependencies = [ + "bitflags 2.9.4", + "memchr", + "unicase", +] + +[[package]] +name = "quanta" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi 0.11.1+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quick-protobuf" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f" +dependencies = [ + "byteorder", +] + +[[package]] +name = "quinn" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +dependencies = [ + "bytes", + "cfg_aliases", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash 2.1.1", "rustls 0.23.31", - "socket2 0.5.10", - "thiserror", + "socket2 0.6.0", + "thiserror 2.0.17", "tokio", "tracing", "web-time", @@ -4799,7 +7203,7 @@ dependencies = [ "rustls 0.23.31", "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.17", "tinyvec", "tracing", "web-time", @@ -4814,16 +7218,16 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.0", "tracing", "windows-sys 0.60.2", ] [[package]] name = "quote" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] @@ -4840,6 +7244,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] + [[package]] name = "rand" version = "0.8.5" @@ -4911,6 +7325,45 @@ dependencies = [ "rand_core 0.9.3", ] +[[package]] +name = "rand_xoshiro" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41" +dependencies = [ + "rand_core 0.9.3", +] + +[[package]] +name = "ratatui" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" +dependencies = [ + "bitflags 2.9.4", + "cassowary", + "compact_str", + "crossterm 0.28.1", + "indoc", + "instability", + "itertools 0.13.0", + "lru 0.12.5", + "paste", + "strum 0.26.3", + "unicode-segmentation", + "unicode-truncate", + "unicode-width 0.2.0", +] + +[[package]] +name = "raw-cpuid" +version = "11.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" +dependencies = [ + "bitflags 2.9.4", +] + [[package]] name = "rayon" version = "1.11.0" @@ -4961,6 +7414,12 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "recvmsg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" + [[package]] name = "redox_syscall" version = "0.3.5" @@ -4979,20 +7438,42 @@ dependencies = [ "bitflags 2.9.4", ] +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom 0.2.16", + "libredox", + "thiserror 1.0.69", +] + +[[package]] +name = "redox_users" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" +dependencies = [ + "getrandom 0.2.16", + "libredox", + "thiserror 2.0.17", +] + [[package]] name = "ref-cast" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", @@ -5001,9 +7482,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.2" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" +checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" dependencies = [ "aho-corasick", "memchr", @@ -5013,9 +7494,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" +checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" dependencies = [ "aho-corasick", "memchr", @@ -5034,6 +7515,16 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" +[[package]] +name = "regress" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "145bb27393fe455dd64d6cbc8d059adfa392590a45eadf079c01b11857e7b010" +dependencies = [ + "hashbrown 0.15.5", + "memchr", +] + [[package]] name = "reqwest" version = "0.12.23" @@ -5042,7 +7533,9 @@ checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" dependencies = [ "base64 0.22.1", "bytes", + "futures-channel", "futures-core", + "futures-util", "http 1.3.1", "http-body 1.0.1", "http-body-util", @@ -5065,20 +7558,99 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-native-tls", - "tokio-rustls 0.26.3", - "tower", + "tokio-rustls 0.26.4", + "tokio-util", + "tower 0.5.2", "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", + "webpki-roots 1.0.2", +] + +[[package]] +name = "resolv-conf" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3789b30bd25ba102de4beabd95d21ac45b69b1be7d14522bab988c526d6799" + +[[package]] +name = "reth" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-rpc-types", + "aquamarine", + "clap", + "eyre", + "reth-chainspec", + "reth-cli-runner", + "reth-cli-util", + "reth-consensus", + "reth-consensus-common", + "reth-db", + "reth-ethereum-cli", + "reth-ethereum-payload-builder", + "reth-ethereum-primitives", + "reth-evm", + "reth-network", + "reth-network-api", + "reth-node-api", + "reth-node-builder", + "reth-node-core", + "reth-node-ethereum", + "reth-node-metrics", + "reth-payload-builder", + "reth-payload-primitives", + "reth-primitives", + "reth-provider", + "reth-ress-protocol", + "reth-ress-provider", + "reth-revm", + "reth-rpc", + "reth-rpc-api", + "reth-rpc-builder", + "reth-rpc-convert", + "reth-rpc-eth-types", + "reth-rpc-server-types", + "reth-tasks", + "reth-tokio-util", + "reth-transaction-pool", + "tokio", + "tracing", +] + +[[package]] +name = "reth-basic-payload-builder" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "futures-core", + "futures-util", + "metrics", + "reth-chain-state", + "reth-metrics", + "reth-payload-builder", + "reth-payload-builder-primitives", + "reth-payload-primitives", + "reth-primitives-traits", + "reth-revm", + "reth-storage-api", + "reth-tasks", + "tokio", + "tracing", ] [[package]] name = "reth-chain-state" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5087,6 +7659,7 @@ dependencies = [ "metrics", "parking_lot", "pin-project", + "rand 0.9.2", "reth-chainspec", "reth-errors", "reth-ethereum-primitives", @@ -5096,6 +7669,8 @@ dependencies = [ "reth-storage-api", "reth-trie", "revm-database", + "revm-state", + "serde", "tokio", "tokio-stream", "tracing", @@ -5103,8 +7678,8 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5121,10 +7696,127 @@ dependencies = [ "serde_json", ] +[[package]] +name = "reth-cli" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-genesis", + "clap", + "eyre", + "reth-cli-runner", + "reth-db", + "serde_json", + "shellexpand", +] + +[[package]] +name = "reth-cli-commands" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "backon", + "clap", + "comfy-table", + "crossterm 0.28.1", + "eyre", + "fdlimit", + "futures", + "human_bytes", + "humantime", + "itertools 0.14.0", + "lz4", + "ratatui", + "reqwest", + "reth-chainspec", + "reth-cli", + "reth-cli-runner", + "reth-cli-util", + "reth-codecs", + "reth-config", + "reth-consensus", + "reth-db", + "reth-db-api", + "reth-db-common", + "reth-discv4", + "reth-discv5", + "reth-downloaders", + "reth-ecies", + "reth-era", + "reth-era-downloader", + "reth-era-utils", + "reth-eth-wire", + "reth-etl", + "reth-evm", + "reth-exex", + "reth-fs-util", + "reth-net-nat", + "reth-network", + "reth-network-p2p", + "reth-network-peers", + "reth-node-api", + "reth-node-builder", + "reth-node-core", + "reth-node-events", + "reth-node-metrics", + "reth-primitives-traits", + "reth-provider", + "reth-prune", + "reth-revm", + "reth-stages", + "reth-static-file", + "reth-static-file-types", + "reth-trie", + "reth-trie-common", + "reth-trie-db", + "secp256k1 0.30.0", + "serde", + "serde_json", + "tar", + "tokio", + "tokio-stream", + "toml", + "tracing", + "zstd", +] + +[[package]] +name = "reth-cli-runner" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "reth-tasks", + "tokio", + "tracing", +] + +[[package]] +name = "reth-cli-util" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "cfg-if", + "eyre", + "libc", + "rand 0.8.5", + "reth-fs-util", + "secp256k1 0.30.0", + "serde", + "thiserror 2.0.17", + "tikv-jemallocator", +] + [[package]] name = "reth-codecs" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5133,7 +7825,7 @@ dependencies = [ "alloy-trie", "bytes", "modular-bitfield", - "op-alloy-consensus 0.19.1", + "op-alloy-consensus", "reth-codecs-derive", "reth-zstd-compressors", "serde", @@ -5141,8 +7833,8 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "convert_case", "proc-macro2", @@ -5150,23 +7842,38 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "reth-config" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "eyre", + "humantime-serde", + "reth-network-types", + "reth-prune-types", + "reth-stages-types", + "serde", + "toml", + "url", +] + [[package]] name = "reth-consensus" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-primitives", "auto_impl", "reth-execution-types", "reth-primitives-traits", - "thiserror", + "thiserror 2.0.17", ] [[package]] name = "reth-consensus-common" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5176,388 +7883,2098 @@ dependencies = [ ] [[package]] -name = "reth-db-models" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-consensus-debug-client" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ + "alloy-consensus", "alloy-eips", + "alloy-json-rpc", "alloy-primitives", - "bytes", + "alloy-provider", + "alloy-rpc-types-engine", + "alloy-transport", + "auto_impl", + "derive_more", + "eyre", + "futures", + "reqwest", + "reth-node-api", "reth-primitives-traits", + "reth-tracing", + "ringbuffer", "serde", + "serde_json", + "tokio", ] [[package]] -name = "reth-errors" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-db" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "reth-consensus", - "reth-execution-errors", + "alloy-primitives", + "derive_more", + "eyre", + "metrics", + "page_size", + "reth-db-api", + "reth-fs-util", + "reth-libmdbx", + "reth-metrics", + "reth-nippy-jar", + "reth-static-file-types", "reth-storage-errors", - "thiserror", + "reth-tracing", + "rustc-hash 2.1.1", + "strum 0.27.2", + "sysinfo", + "thiserror 2.0.17", ] [[package]] -name = "reth-eth-wire-types" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-db-api" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-chains", "alloy-consensus", - "alloy-eips", - "alloy-hardforks", + "alloy-genesis", "alloy-primitives", - "alloy-rlp", "bytes", "derive_more", - "reth-chainspec", - "reth-codecs-derive", + "metrics", + "modular-bitfield", + "parity-scale-codec", + "reth-codecs", + "reth-db-models", "reth-ethereum-primitives", + "reth-optimism-primitives", "reth-primitives-traits", + "reth-prune-types", + "reth-stages-types", + "reth-storage-errors", + "reth-trie-common", + "roaring", "serde", - "thiserror", -] - -[[package]] -name = "reth-ethereum-forks" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" -dependencies = [ - "alloy-eip2124", - "alloy-hardforks", - "alloy-primitives", - "auto_impl", - "once_cell", - "rustc-hash 2.1.1", ] [[package]] -name = "reth-ethereum-primitives" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-db-common" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", - "alloy-eips", + "alloy-genesis", "alloy-primitives", - "alloy-rlp", + "boyer-moore-magiclen", + "eyre", + "reth-chainspec", + "reth-codecs", + "reth-config", + "reth-db-api", + "reth-etl", + "reth-execution-errors", + "reth-fs-util", + "reth-node-types", "reth-primitives-traits", - "reth-zstd-compressors", + "reth-provider", + "reth-stages-types", + "reth-static-file-types", + "reth-trie", + "reth-trie-db", "serde", - "serde_with", + "serde_json", + "thiserror 2.0.17", + "tracing", ] [[package]] -name = "reth-evm" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-db-models" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-consensus", "alloy-eips", - "alloy-evm", "alloy-primitives", - "auto_impl", - "derive_more", - "futures-util", - "reth-execution-errors", - "reth-execution-types", + "bytes", + "modular-bitfield", + "reth-codecs", "reth-primitives-traits", - "reth-storage-api", - "reth-storage-errors", - "reth-trie-common", - "revm", + "serde", ] [[package]] -name = "reth-execution-errors" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-discv4" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-evm", "alloy-primitives", "alloy-rlp", - "nybbles", - "reth-storage-errors", - "thiserror", + "discv5", + "enr", + "generic-array", + "itertools 0.14.0", + "parking_lot", + "rand 0.8.5", + "reth-ethereum-forks", + "reth-net-banlist", + "reth-net-nat", + "reth-network-peers", + "schnellru", + "secp256k1 0.30.0", + "serde", + "thiserror 2.0.17", + "tokio", + "tokio-stream", + "tracing", ] [[package]] -name = "reth-execution-types" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-discv5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-evm", "alloy-primitives", + "alloy-rlp", "derive_more", - "reth-ethereum-primitives", - "reth-primitives-traits", - "reth-trie-common", - "revm", - "serde", - "serde_with", -] - -[[package]] -name = "reth-fs-util" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" -dependencies = [ - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "reth-metrics" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" -dependencies = [ + "discv5", + "enr", + "futures", + "itertools 0.14.0", "metrics", - "metrics-derive", -] - -[[package]] -name = "reth-net-banlist" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" -dependencies = [ - "alloy-primitives", + "rand 0.9.2", + "reth-chainspec", + "reth-ethereum-forks", + "reth-metrics", + "reth-network-peers", + "secp256k1 0.30.0", + "thiserror 2.0.17", + "tokio", + "tracing", ] [[package]] -name = "reth-network-api" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-dns-discovery" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-consensus", "alloy-primitives", - "alloy-rpc-types-admin", - "alloy-rpc-types-eth", - "auto_impl", - "derive_more", + "data-encoding", "enr", - "futures", - "reth-eth-wire-types", + "hickory-resolver", + "linked_hash_set", + "parking_lot", "reth-ethereum-forks", - "reth-network-p2p", "reth-network-peers", - "reth-network-types", "reth-tokio-util", - "thiserror", + "schnellru", + "secp256k1 0.30.0", + "serde", + "serde_with", + "thiserror 2.0.17", "tokio", "tokio-stream", + "tracing", ] [[package]] -name = "reth-network-p2p" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-downloaders" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", - "auto_impl", - "derive_more", + "alloy-rlp", "futures", + "futures-util", + "itertools 0.14.0", + "metrics", + "pin-project", + "rayon", + "reth-config", "reth-consensus", - "reth-eth-wire-types", - "reth-ethereum-primitives", + "reth-metrics", + "reth-network-p2p", "reth-network-peers", - "reth-network-types", "reth-primitives-traits", - "reth-storage-errors", + "reth-storage-api", + "reth-tasks", + "thiserror 2.0.17", "tokio", + "tokio-stream", + "tokio-util", "tracing", ] [[package]] -name = "reth-network-peers" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-ecies" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ + "aes", "alloy-primitives", "alloy-rlp", - "secp256k1 0.30.0", - "serde_with", - "thiserror", - "url", -] - -[[package]] -name = "reth-network-types" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" -dependencies = [ - "alloy-eip2124", - "reth-net-banlist", + "block-padding", + "byteorder", + "cipher", + "concat-kdf", + "ctr", + "digest 0.10.7", + "futures", + "generic-array", + "hmac", + "pin-project", + "rand 0.8.5", "reth-network-peers", - "serde_json", + "secp256k1 0.30.0", + "sha2 0.10.9", + "sha3", + "thiserror 2.0.17", + "tokio", + "tokio-stream", + "tokio-util", "tracing", + "typenum", ] [[package]] -name = "reth-optimism-chainspec" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-engine-local" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-chains", "alloy-consensus", - "alloy-eips", - "alloy-genesis", - "alloy-hardforks", "alloy-primitives", - "derive_more", - "miniz_oxide", - "op-alloy-consensus 0.19.1", - "op-alloy-rpc-types 0.19.1", + "alloy-rpc-types-engine", + "eyre", + "futures-util", + "op-alloy-rpc-types-engine", "reth-chainspec", - "reth-ethereum-forks", - "reth-network-peers", - "reth-optimism-forks", - "reth-optimism-primitives", - "reth-primitives-traits", - "serde", - "serde_json", - "thiserror", + "reth-engine-primitives", + "reth-ethereum-engine-primitives", + "reth-optimism-chainspec", + "reth-payload-builder", + "reth-payload-primitives", + "reth-provider", + "reth-transaction-pool", + "tokio", + "tokio-stream", + "tracing", ] [[package]] -name = "reth-optimism-consensus" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-engine-primitives" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", - "alloy-trie", - "reth-chainspec", + "alloy-rpc-types-engine", + "auto_impl", + "futures", + "reth-chain-state", + "reth-errors", + "reth-ethereum-primitives", + "reth-evm", + "reth-execution-types", + "reth-payload-builder-primitives", + "reth-payload-primitives", + "reth-primitives-traits", + "reth-trie-common", + "serde", + "thiserror 2.0.17", + "tokio", +] + +[[package]] +name = "reth-engine-service" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "futures", + "pin-project", + "reth-chainspec", + "reth-consensus", + "reth-engine-primitives", + "reth-engine-tree", + "reth-ethereum-primitives", + "reth-evm", + "reth-network-p2p", + "reth-node-types", + "reth-payload-builder", + "reth-provider", + "reth-prune", + "reth-stages-api", + "reth-tasks", + "thiserror 2.0.17", +] + +[[package]] +name = "reth-engine-tree" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-engine", + "derive_more", + "futures", + "metrics", + "mini-moka", + "parking_lot", + "rayon", + "reth-chain-state", + "reth-consensus", + "reth-db", + "reth-engine-primitives", + "reth-errors", + "reth-ethereum-primitives", + "reth-evm", + "reth-execution-types", + "reth-metrics", + "reth-network-p2p", + "reth-payload-builder", + "reth-payload-primitives", + "reth-primitives-traits", + "reth-provider", + "reth-prune", + "reth-revm", + "reth-stages-api", + "reth-tasks", + "reth-trie", + "reth-trie-db", + "reth-trie-parallel", + "reth-trie-sparse", + "reth-trie-sparse-parallel", + "revm", + "revm-primitives", + "schnellru", + "smallvec", + "thiserror 2.0.17", + "tokio", + "tracing", +] + +[[package]] +name = "reth-engine-util" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-rpc-types-engine", + "eyre", + "futures", + "itertools 0.14.0", + "pin-project", + "reth-chainspec", + "reth-engine-primitives", + "reth-engine-tree", + "reth-errors", + "reth-evm", + "reth-fs-util", + "reth-payload-primitives", + "reth-primitives-traits", + "reth-revm", + "reth-storage-api", + "serde", + "serde_json", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "reth-era" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "ethereum_ssz", + "ethereum_ssz_derive", + "reth-ethereum-primitives", + "snap", + "thiserror 2.0.17", +] + +[[package]] +name = "reth-era-downloader" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-primitives", + "bytes", + "eyre", + "futures-util", + "reqwest", + "reth-fs-util", + "sha2 0.10.9", + "tokio", +] + +[[package]] +name = "reth-era-utils" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "eyre", + "futures-util", + "reth-db-api", + "reth-era", + "reth-era-downloader", + "reth-etl", + "reth-fs-util", + "reth-primitives-traits", + "reth-provider", + "reth-stages-types", + "reth-storage-api", + "tokio", + "tracing", +] + +[[package]] +name = "reth-errors" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "reth-consensus", + "reth-execution-errors", + "reth-storage-errors", + "thiserror 2.0.17", +] + +[[package]] +name = "reth-eth-wire" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-chains", + "alloy-primitives", + "alloy-rlp", + "bytes", + "derive_more", + "futures", + "pin-project", + "reth-codecs", + "reth-ecies", + "reth-eth-wire-types", + "reth-ethereum-forks", + "reth-metrics", + "reth-network-peers", + "reth-primitives-traits", + "serde", + "snap", + "thiserror 2.0.17", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", +] + +[[package]] +name = "reth-eth-wire-types" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-hardforks", + "alloy-primitives", + "alloy-rlp", + "bytes", + "derive_more", + "reth-chainspec", + "reth-codecs-derive", + "reth-ethereum-primitives", + "reth-primitives-traits", + "serde", + "thiserror 2.0.17", +] + +[[package]] +name = "reth-ethereum-cli" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "clap", + "eyre", + "reth-chainspec", + "reth-cli", + "reth-cli-commands", + "reth-cli-runner", + "reth-db", + "reth-node-api", + "reth-node-builder", + "reth-node-core", + "reth-node-ethereum", + "reth-node-metrics", + "reth-rpc-server-types", + "reth-tracing", + "tracing", +] + +[[package]] +name = "reth-ethereum-consensus" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "reth-chainspec", + "reth-consensus", + "reth-consensus-common", + "reth-execution-types", + "reth-primitives-traits", + "tracing", +] + +[[package]] +name = "reth-ethereum-engine-primitives" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-engine", + "reth-engine-primitives", + "reth-ethereum-primitives", + "reth-payload-primitives", + "reth-primitives-traits", + "serde", + "sha2 0.10.9", + "thiserror 2.0.17", +] + +[[package]] +name = "reth-ethereum-forks" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-eip2124", + "alloy-hardforks", + "alloy-primitives", + "auto_impl", + "once_cell", + "rustc-hash 2.1.1", +] + +[[package]] +name = "reth-ethereum-payload-builder" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-engine", + "reth-basic-payload-builder", + "reth-chainspec", + "reth-consensus-common", + "reth-errors", + "reth-ethereum-primitives", + "reth-evm", + "reth-evm-ethereum", + "reth-payload-builder", + "reth-payload-builder-primitives", + "reth-payload-primitives", + "reth-payload-validator", + "reth-primitives-traits", + "reth-revm", + "reth-storage-api", + "reth-transaction-pool", + "revm", + "tracing", +] + +[[package]] +name = "reth-ethereum-primitives" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-eth", + "alloy-serde", + "modular-bitfield", + "reth-codecs", + "reth-primitives-traits", + "reth-zstd-compressors", + "serde", + "serde_with", +] + +[[package]] +name = "reth-etl" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "rayon", + "reth-db-api", + "tempfile", +] + +[[package]] +name = "reth-evm" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-primitives", + "auto_impl", + "derive_more", + "futures-util", + "metrics", + "reth-execution-errors", + "reth-execution-types", + "reth-metrics", + "reth-primitives-traits", + "reth-storage-api", + "reth-storage-errors", + "reth-trie-common", + "revm", +] + +[[package]] +name = "reth-evm-ethereum" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-primitives", + "alloy-rpc-types-engine", + "reth-chainspec", + "reth-ethereum-forks", + "reth-ethereum-primitives", + "reth-evm", + "reth-execution-types", + "reth-primitives-traits", + "reth-storage-errors", + "revm", +] + +[[package]] +name = "reth-execution-errors" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-evm", + "alloy-primitives", + "alloy-rlp", + "nybbles", + "reth-storage-errors", + "thiserror 2.0.17", +] + +[[package]] +name = "reth-execution-types" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-primitives", + "derive_more", + "reth-ethereum-primitives", + "reth-primitives-traits", + "reth-trie-common", + "revm", + "serde", + "serde_with", +] + +[[package]] +name = "reth-exex" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "eyre", + "futures", + "itertools 0.14.0", + "metrics", + "parking_lot", + "reth-chain-state", + "reth-chainspec", + "reth-config", + "reth-ethereum-primitives", + "reth-evm", + "reth-exex-types", + "reth-fs-util", + "reth-metrics", + "reth-node-api", + "reth-node-core", + "reth-payload-builder", + "reth-primitives-traits", + "reth-provider", + "reth-prune-types", + "reth-revm", + "reth-stages-api", + "reth-tasks", + "reth-tracing", + "rmp-serde", + "thiserror 2.0.17", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "reth-exex-types" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "reth-chain-state", + "reth-execution-types", + "reth-primitives-traits", + "serde", + "serde_with", +] + +[[package]] +name = "reth-fs-util" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "serde", + "serde_json", + "thiserror 2.0.17", +] + +[[package]] +name = "reth-invalid-block-hooks" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-debug", + "eyre", + "futures", + "jsonrpsee 0.26.0", + "pretty_assertions", + "reth-engine-primitives", + "reth-evm", + "reth-primitives-traits", + "reth-provider", + "reth-revm", + "reth-rpc-api", + "reth-tracing", + "reth-trie", + "revm-bytecode", + "revm-database", + "serde", + "serde_json", +] + +[[package]] +name = "reth-ipc" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "bytes", + "futures", + "futures-util", + "interprocess", + "jsonrpsee 0.26.0", + "pin-project", + "serde_json", + "thiserror 2.0.17", + "tokio", + "tokio-stream", + "tokio-util", + "tower 0.5.2", + "tracing", +] + +[[package]] +name = "reth-libmdbx" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "bitflags 2.9.4", + "byteorder", + "dashmap 6.1.0", + "derive_more", + "parking_lot", + "reth-mdbx-sys", + "smallvec", + "thiserror 2.0.17", + "tracing", +] + +[[package]] +name = "reth-mdbx-sys" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "bindgen 0.70.1", + "cc", +] + +[[package]] +name = "reth-metrics" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "futures", + "metrics", + "metrics-derive", + "tokio", + "tokio-util", +] + +[[package]] +name = "reth-net-banlist" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-primitives", +] + +[[package]] +name = "reth-net-nat" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "futures-util", + "if-addrs", + "reqwest", + "serde_with", + "thiserror 2.0.17", + "tokio", + "tracing", +] + +[[package]] +name = "reth-network" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "aquamarine", + "auto_impl", + "derive_more", + "discv5", + "enr", + "futures", + "itertools 0.14.0", + "metrics", + "parking_lot", + "pin-project", + "rand 0.8.5", + "rand 0.9.2", + "reth-chainspec", + "reth-consensus", + "reth-discv4", + "reth-discv5", + "reth-dns-discovery", + "reth-ecies", + "reth-eth-wire", + "reth-eth-wire-types", + "reth-ethereum-forks", + "reth-ethereum-primitives", + "reth-fs-util", + "reth-metrics", + "reth-net-banlist", + "reth-network-api", + "reth-network-p2p", + "reth-network-peers", + "reth-network-types", + "reth-primitives-traits", + "reth-storage-api", + "reth-tasks", + "reth-tokio-util", + "reth-transaction-pool", + "rustc-hash 2.1.1", + "schnellru", + "secp256k1 0.30.0", + "serde", + "smallvec", + "thiserror 2.0.17", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", +] + +[[package]] +name = "reth-network-api" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-rpc-types-admin", + "alloy-rpc-types-eth", + "auto_impl", + "derive_more", + "enr", + "futures", + "reth-eth-wire-types", + "reth-ethereum-forks", + "reth-network-p2p", + "reth-network-peers", + "reth-network-types", + "reth-tokio-util", + "serde", + "thiserror 2.0.17", + "tokio", + "tokio-stream", +] + +[[package]] +name = "reth-network-p2p" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "auto_impl", + "derive_more", + "futures", + "reth-consensus", + "reth-eth-wire-types", + "reth-ethereum-primitives", + "reth-network-peers", + "reth-network-types", + "reth-primitives-traits", + "reth-storage-errors", + "tokio", + "tracing", +] + +[[package]] +name = "reth-network-peers" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "enr", + "secp256k1 0.30.0", + "serde_with", + "thiserror 2.0.17", + "tokio", + "url", +] + +[[package]] +name = "reth-network-types" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-eip2124", + "humantime-serde", + "reth-net-banlist", + "reth-network-peers", + "serde", + "serde_json", + "tracing", +] + +[[package]] +name = "reth-nippy-jar" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "anyhow", + "bincode", + "derive_more", + "lz4_flex", + "memmap2", + "reth-fs-util", + "serde", + "thiserror 2.0.17", + "tracing", + "zstd", +] + +[[package]] +name = "reth-node-api" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-rpc-types-engine", + "eyre", + "reth-basic-payload-builder", + "reth-consensus", + "reth-db-api", + "reth-engine-primitives", + "reth-evm", + "reth-network-api", + "reth-node-core", + "reth-node-types", + "reth-payload-builder", + "reth-payload-builder-primitives", + "reth-payload-primitives", + "reth-provider", + "reth-tasks", + "reth-tokio-util", + "reth-transaction-pool", +] + +[[package]] +name = "reth-node-builder" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-provider", + "alloy-rpc-types", + "alloy-rpc-types-engine", + "aquamarine", + "eyre", + "fdlimit", + "futures", + "jsonrpsee 0.26.0", + "rayon", + "reth-basic-payload-builder", + "reth-chain-state", + "reth-chainspec", + "reth-cli-util", + "reth-config", + "reth-consensus", + "reth-consensus-debug-client", + "reth-db", + "reth-db-api", + "reth-db-common", + "reth-downloaders", + "reth-engine-local", + "reth-engine-primitives", + "reth-engine-service", + "reth-engine-tree", + "reth-engine-util", + "reth-evm", + "reth-exex", + "reth-fs-util", + "reth-invalid-block-hooks", + "reth-network", + "reth-network-api", + "reth-network-p2p", + "reth-node-api", + "reth-node-core", + "reth-node-ethstats", + "reth-node-events", + "reth-node-metrics", + "reth-payload-builder", + "reth-primitives-traits", + "reth-provider", + "reth-prune", + "reth-rpc", + "reth-rpc-api", + "reth-rpc-builder", + "reth-rpc-engine-api", + "reth-rpc-eth-types", + "reth-rpc-layer", + "reth-stages", + "reth-static-file", + "reth-tasks", + "reth-tokio-util", + "reth-tracing", + "reth-transaction-pool", + "secp256k1 0.30.0", + "serde_json", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "reth-node-core" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "clap", + "derive_more", + "dirs-next", + "eyre", + "futures", + "humantime", + "rand 0.9.2", + "reth-chainspec", + "reth-cli-util", + "reth-config", + "reth-consensus", + "reth-db", + "reth-discv4", + "reth-discv5", + "reth-engine-local", + "reth-engine-primitives", + "reth-ethereum-forks", + "reth-net-nat", + "reth-network", + "reth-network-p2p", + "reth-network-peers", + "reth-primitives-traits", + "reth-prune-types", + "reth-rpc-convert", + "reth-rpc-eth-types", + "reth-rpc-server-types", + "reth-stages-types", + "reth-storage-api", + "reth-storage-errors", + "reth-tracing", + "reth-transaction-pool", + "secp256k1 0.30.0", + "serde", + "shellexpand", + "strum 0.27.2", + "thiserror 2.0.17", + "toml", + "tracing", + "url", + "vergen", + "vergen-git2", +] + +[[package]] +name = "reth-node-ethereum" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-eips", + "alloy-network", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "eyre", + "reth-chainspec", + "reth-engine-local", + "reth-engine-primitives", + "reth-ethereum-consensus", + "reth-ethereum-engine-primitives", + "reth-ethereum-payload-builder", + "reth-ethereum-primitives", + "reth-evm", + "reth-evm-ethereum", + "reth-network", + "reth-node-api", + "reth-node-builder", + "reth-payload-primitives", + "reth-primitives-traits", + "reth-provider", + "reth-revm", + "reth-rpc", + "reth-rpc-api", + "reth-rpc-builder", + "reth-rpc-eth-api", + "reth-rpc-eth-types", + "reth-rpc-server-types", + "reth-tracing", + "reth-transaction-pool", + "revm", + "tokio", +] + +[[package]] +name = "reth-node-ethstats" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "chrono", + "futures-util", + "reth-chain-state", + "reth-network-api", + "reth-primitives-traits", + "reth-storage-api", + "reth-transaction-pool", + "serde", + "serde_json", + "thiserror 2.0.17", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tracing", + "url", +] + +[[package]] +name = "reth-node-events" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "derive_more", + "futures", + "humantime", + "pin-project", + "reth-engine-primitives", + "reth-network-api", + "reth-primitives-traits", + "reth-prune-types", + "reth-stages", + "reth-static-file-types", + "reth-storage-api", + "tokio", + "tracing", +] + +[[package]] +name = "reth-node-metrics" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "eyre", + "http 1.3.1", + "jsonrpsee-server 0.26.0", + "metrics", + "metrics-exporter-prometheus", + "metrics-process", + "metrics-util", + "procfs", + "reth-metrics", + "reth-tasks", + "tikv-jemalloc-ctl", + "tokio", + "tower 0.5.2", + "tracing", +] + +[[package]] +name = "reth-node-types" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "reth-chainspec", + "reth-db-api", + "reth-engine-primitives", + "reth-payload-primitives", + "reth-primitives-traits", +] + +[[package]] +name = "reth-optimism-chainspec" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-hardforks", + "alloy-primitives", + "derive_more", + "miniz_oxide", + "op-alloy-consensus", + "op-alloy-rpc-types", + "paste", + "reth-chainspec", + "reth-ethereum-forks", + "reth-network-peers", + "reth-optimism-forks", + "reth-optimism-primitives", + "reth-primitives-traits", + "serde", + "serde_json", + "tar-no-std", + "thiserror 2.0.17", +] + +[[package]] +name = "reth-optimism-cli" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "clap", + "derive_more", + "eyre", + "futures-util", + "op-alloy-consensus", + "reth-chainspec", + "reth-cli", + "reth-cli-commands", + "reth-cli-runner", + "reth-consensus", + "reth-db", + "reth-db-api", + "reth-db-common", + "reth-downloaders", + "reth-execution-types", + "reth-fs-util", + "reth-node-builder", + "reth-node-core", + "reth-node-events", + "reth-node-metrics", + "reth-optimism-chainspec", + "reth-optimism-consensus", + "reth-optimism-evm", + "reth-optimism-node", + "reth-optimism-primitives", + "reth-primitives-traits", + "reth-provider", + "reth-prune", + "reth-rpc-server-types", + "reth-stages", + "reth-static-file", + "reth-static-file-types", + "reth-tracing", + "serde", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "reth-optimism-consensus" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-trie", + "reth-chainspec", + "reth-consensus", + "reth-consensus-common", + "reth-execution-types", + "reth-optimism-chainspec", + "reth-optimism-forks", + "reth-optimism-primitives", + "reth-primitives-traits", + "reth-storage-api", + "reth-storage-errors", + "reth-trie-common", + "revm", + "thiserror 2.0.17", + "tracing", +] + +[[package]] +name = "reth-optimism-evm" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-op-evm", + "alloy-primitives", + "op-alloy-consensus", + "op-alloy-rpc-types-engine", + "op-revm", + "reth-chainspec", + "reth-evm", + "reth-execution-errors", + "reth-execution-types", + "reth-optimism-chainspec", + "reth-optimism-consensus", + "reth-optimism-forks", + "reth-optimism-primitives", + "reth-primitives-traits", + "reth-rpc-eth-api", + "reth-storage-errors", + "revm", + "thiserror 2.0.17", +] + +[[package]] +name = "reth-optimism-flashblocks" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "alloy-serde", + "brotli", + "eyre", + "futures-util", + "reth-chain-state", + "reth-errors", + "reth-evm", + "reth-execution-types", + "reth-node-api", + "reth-optimism-evm", + "reth-optimism-payload-builder", + "reth-optimism-primitives", + "reth-primitives-traits", + "reth-revm", + "reth-rpc-eth-types", + "reth-storage-api", + "reth-tasks", + "ringbuffer", + "serde", + "serde_json", + "tokio", + "tokio-tungstenite", + "tracing", + "url", +] + +[[package]] +name = "reth-optimism-forks" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-op-hardforks", + "alloy-primitives", + "once_cell", + "reth-ethereum-forks", +] + +[[package]] +name = "reth-optimism-node" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "clap", + "eyre", + "op-alloy-consensus", + "op-alloy-rpc-types-engine", + "op-revm", + "reth-chainspec", "reth-consensus", - "reth-consensus-common", - "reth-execution-types", + "reth-engine-local", + "reth-evm", + "reth-network", + "reth-node-api", + "reth-node-builder", + "reth-node-core", "reth-optimism-chainspec", + "reth-optimism-consensus", + "reth-optimism-evm", + "reth-optimism-forks", + "reth-optimism-payload-builder", + "reth-optimism-primitives", + "reth-optimism-rpc", + "reth-optimism-storage", + "reth-optimism-txpool", + "reth-payload-builder", + "reth-primitives-traits", + "reth-provider", + "reth-rpc-api", + "reth-rpc-engine-api", + "reth-rpc-server-types", + "reth-tracing", + "reth-transaction-pool", + "reth-trie-common", + "revm", + "serde", + "tokio", + "url", +] + +[[package]] +name = "reth-optimism-payload-builder" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-debug", + "alloy-rpc-types-engine", + "derive_more", + "op-alloy-consensus", + "op-alloy-rpc-types-engine", + "reth-basic-payload-builder", + "reth-chain-state", + "reth-chainspec", + "reth-evm", + "reth-execution-types", + "reth-optimism-evm", + "reth-optimism-forks", + "reth-optimism-primitives", + "reth-optimism-txpool", + "reth-payload-builder", + "reth-payload-builder-primitives", + "reth-payload-primitives", + "reth-payload-util", + "reth-payload-validator", + "reth-primitives-traits", + "reth-revm", + "reth-storage-api", + "reth-transaction-pool", + "revm", + "serde", + "sha2 0.10.9", + "thiserror 2.0.17", + "tracing", +] + +[[package]] +name = "reth-optimism-primitives" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "bytes", + "modular-bitfield", + "op-alloy-consensus", + "reth-codecs", + "reth-primitives-traits", + "reth-zstd-compressors", + "serde", + "serde_with", +] + +[[package]] +name = "reth-optimism-rpc" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-primitives", + "alloy-rpc-client", + "alloy-rpc-types-debug", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "alloy-transport", + "alloy-transport-http", + "async-trait", + "derive_more", + "eyre", + "futures", + "jsonrpsee 0.26.0", + "jsonrpsee-core 0.26.0", + "jsonrpsee-types 0.26.0", + "metrics", + "op-alloy-consensus", + "op-alloy-network", + "op-alloy-rpc-jsonrpsee", + "op-alloy-rpc-types", + "op-alloy-rpc-types-engine", + "op-revm", + "reqwest", + "reth-chain-state", + "reth-chainspec", + "reth-evm", + "reth-metrics", + "reth-node-api", + "reth-node-builder", + "reth-optimism-evm", + "reth-optimism-flashblocks", + "reth-optimism-forks", + "reth-optimism-payload-builder", + "reth-optimism-primitives", + "reth-optimism-txpool", + "reth-primitives-traits", + "reth-rpc", + "reth-rpc-api", + "reth-rpc-convert", + "reth-rpc-engine-api", + "reth-rpc-eth-api", + "reth-rpc-eth-types", + "reth-rpc-server-types", + "reth-storage-api", + "reth-tasks", + "reth-transaction-pool", + "revm", + "serde_json", + "thiserror 2.0.17", + "tokio", + "tokio-stream", + "tower 0.5.2", + "tracing", +] + +[[package]] +name = "reth-optimism-storage" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "reth-optimism-primitives", + "reth-storage-api", +] + +[[package]] +name = "reth-optimism-txpool" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-primitives", + "alloy-rpc-client", + "alloy-rpc-types-eth", + "alloy-serde", + "c-kzg", + "derive_more", + "futures-util", + "metrics", + "op-alloy-consensus", + "op-alloy-flz", + "op-alloy-rpc-types", + "op-revm", + "parking_lot", + "reth-chain-state", + "reth-chainspec", + "reth-metrics", + "reth-optimism-evm", "reth-optimism-forks", "reth-optimism-primitives", "reth-primitives-traits", "reth-storage-api", + "reth-transaction-pool", + "serde", + "thiserror 2.0.17", + "tokio", + "tracing", +] + +[[package]] +name = "reth-payload-builder" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-rpc-types", + "futures-util", + "metrics", + "reth-chain-state", + "reth-ethereum-engine-primitives", + "reth-metrics", + "reth-payload-builder-primitives", + "reth-payload-primitives", + "reth-primitives-traits", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "reth-payload-builder-primitives" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "pin-project", + "reth-payload-primitives", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "reth-payload-primitives" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "auto_impl", + "either", + "op-alloy-rpc-types-engine", + "reth-chain-state", + "reth-chainspec", + "reth-errors", + "reth-primitives-traits", + "serde", + "thiserror 2.0.17", + "tokio", +] + +[[package]] +name = "reth-payload-util" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "reth-transaction-pool", +] + +[[package]] +name = "reth-payload-validator" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-rpc-types-engine", + "reth-primitives-traits", +] + +[[package]] +name = "reth-primitives" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "c-kzg", + "once_cell", + "reth-ethereum-forks", + "reth-ethereum-primitives", + "reth-primitives-traits", + "reth-static-file-types", +] + +[[package]] +name = "reth-primitives-traits" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-eth", + "alloy-trie", + "auto_impl", + "byteorder", + "bytes", + "derive_more", + "modular-bitfield", + "once_cell", + "op-alloy-consensus", + "rayon", + "reth-codecs", + "revm-bytecode", + "revm-primitives", + "revm-state", + "secp256k1 0.30.0", + "serde", + "serde_with", + "thiserror 2.0.17", +] + +[[package]] +name = "reth-provider" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "dashmap 6.1.0", + "eyre", + "itertools 0.14.0", + "metrics", + "notify", + "parking_lot", + "rayon", + "reth-chain-state", + "reth-chainspec", + "reth-codecs", + "reth-db", + "reth-db-api", + "reth-errors", + "reth-ethereum-primitives", + "reth-evm", + "reth-execution-types", + "reth-fs-util", + "reth-metrics", + "reth-nippy-jar", + "reth-node-types", + "reth-primitives-traits", + "reth-prune-types", + "reth-stages-types", + "reth-static-file-types", + "reth-storage-api", "reth-storage-errors", - "reth-trie-common", - "revm", - "thiserror", + "reth-trie", + "reth-trie-db", + "revm-database", + "strum 0.27.2", "tracing", ] [[package]] -name = "reth-optimism-evm" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-prune" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-evm", - "alloy-op-evm", "alloy-primitives", - "op-alloy-consensus 0.19.1", - "op-alloy-rpc-types-engine", - "op-revm", + "itertools 0.14.0", + "metrics", + "rayon", "reth-chainspec", - "reth-evm", - "reth-execution-errors", - "reth-execution-types", - "reth-optimism-chainspec", - "reth-optimism-consensus", - "reth-optimism-forks", - "reth-optimism-primitives", + "reth-config", + "reth-db-api", + "reth-errors", + "reth-exex-types", + "reth-metrics", "reth-primitives-traits", - "reth-storage-errors", - "revm", - "thiserror", + "reth-provider", + "reth-prune-types", + "reth-static-file-types", + "reth-tokio-util", + "rustc-hash 2.1.1", + "thiserror 2.0.17", + "tokio", + "tracing", ] [[package]] -name = "reth-optimism-forks" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-prune-types" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-op-hardforks", "alloy-primitives", - "once_cell", - "reth-ethereum-forks", + "derive_more", + "modular-bitfield", + "reth-codecs", + "serde", + "thiserror 2.0.17", ] [[package]] -name = "reth-optimism-primitives" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-ress-protocol" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", - "alloy-eips", "alloy-primitives", "alloy-rlp", - "bytes", - "op-alloy-consensus 0.19.1", - "reth-codecs", + "futures", + "reth-eth-wire", + "reth-ethereum-primitives", + "reth-network", + "reth-network-api", + "reth-storage-errors", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "reth-ress-provider" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "eyre", + "futures", + "parking_lot", + "reth-chain-state", + "reth-errors", + "reth-ethereum-primitives", + "reth-evm", + "reth-node-api", "reth-primitives-traits", - "reth-zstd-compressors", - "serde", - "serde_with", + "reth-ress-protocol", + "reth-revm", + "reth-storage-api", + "reth-tasks", + "reth-tokio-util", + "reth-trie", + "schnellru", + "tokio", + "tracing", ] [[package]] -name = "reth-primitives-traits" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-revm" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-primitives", + "reth-primitives-traits", + "reth-storage-api", + "reth-storage-errors", + "reth-trie", + "revm", +] + +[[package]] +name = "reth-rpc" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", + "alloy-dyn-abi", "alloy-eips", + "alloy-evm", "alloy-genesis", + "alloy-network", "alloy-primitives", "alloy-rlp", + "alloy-rpc-client", + "alloy-rpc-types", + "alloy-rpc-types-admin", + "alloy-rpc-types-beacon", + "alloy-rpc-types-debug", + "alloy-rpc-types-engine", "alloy-rpc-types-eth", - "alloy-trie", - "auto_impl", - "bytes", + "alloy-rpc-types-mev", + "alloy-rpc-types-trace", + "alloy-rpc-types-txpool", + "alloy-serde", + "alloy-signer", + "alloy-signer-local", + "async-trait", "derive_more", - "once_cell", - "op-alloy-consensus 0.19.1", - "reth-codecs", - "revm-bytecode", + "dyn-clone", + "futures", + "http 1.3.1", + "http-body 1.0.1", + "hyper 1.7.0", + "itertools 0.14.0", + "jsonrpsee 0.26.0", + "jsonrpsee-types 0.26.0", + "jsonwebtoken", + "parking_lot", + "pin-project", + "reth-chain-state", + "reth-chainspec", + "reth-consensus", + "reth-consensus-common", + "reth-engine-primitives", + "reth-errors", + "reth-evm", + "reth-evm-ethereum", + "reth-execution-types", + "reth-metrics", + "reth-network-api", + "reth-network-peers", + "reth-network-types", + "reth-node-api", + "reth-primitives-traits", + "reth-revm", + "reth-rpc-api", + "reth-rpc-convert", + "reth-rpc-engine-api", + "reth-rpc-eth-api", + "reth-rpc-eth-types", + "reth-rpc-server-types", + "reth-storage-api", + "reth-tasks", + "reth-transaction-pool", + "reth-trie-common", + "revm", + "revm-inspectors", "revm-primitives", - "revm-state", - "secp256k1 0.30.0", "serde", - "serde_with", - "thiserror", + "serde_json", + "sha2 0.10.9", + "thiserror 2.0.17", + "tokio", + "tokio-stream", + "tower 0.5.2", + "tracing", + "tracing-futures", ] [[package]] -name = "reth-prune-types" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-rpc-api" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ + "alloy-eips", + "alloy-genesis", + "alloy-json-rpc", "alloy-primitives", - "derive_more", - "serde", - "thiserror", + "alloy-rpc-types", + "alloy-rpc-types-admin", + "alloy-rpc-types-anvil", + "alloy-rpc-types-beacon", + "alloy-rpc-types-debug", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "alloy-rpc-types-mev", + "alloy-rpc-types-trace", + "alloy-rpc-types-txpool", + "alloy-serde", + "jsonrpsee 0.26.0", + "reth-chain-state", + "reth-engine-primitives", + "reth-network-peers", + "reth-rpc-eth-api", + "reth-trie-common", ] [[package]] -name = "reth-revm" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +name = "reth-rpc-builder" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-primitives", + "alloy-network", + "alloy-provider", + "dyn-clone", + "http 1.3.1", + "jsonrpsee 0.26.0", + "metrics", + "pin-project", + "reth-chain-state", + "reth-chainspec", + "reth-consensus", + "reth-evm", + "reth-ipc", + "reth-metrics", + "reth-network-api", + "reth-node-core", "reth-primitives-traits", + "reth-rpc", + "reth-rpc-api", + "reth-rpc-eth-api", + "reth-rpc-eth-types", + "reth-rpc-layer", + "reth-rpc-server-types", "reth-storage-api", - "reth-storage-errors", - "revm", + "reth-tasks", + "reth-transaction-pool", + "serde", + "thiserror 2.0.17", + "tokio", + "tokio-util", + "tower 0.5.2", + "tower-http", + "tracing", ] [[package]] name = "reth-rpc-convert" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-json-rpc", @@ -5565,18 +9982,100 @@ dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", "alloy-signer", - "jsonrpsee-types", + "auto_impl", + "dyn-clone", + "jsonrpsee-types 0.26.0", + "op-alloy-consensus", + "op-alloy-network", + "op-alloy-rpc-types", + "op-revm", "reth-ethereum-primitives", "reth-evm", + "reth-optimism-primitives", "reth-primitives-traits", + "reth-storage-api", "revm-context", - "thiserror", + "thiserror 2.0.17", +] + +[[package]] +name = "reth-rpc-engine-api" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "async-trait", + "jsonrpsee-core 0.26.0", + "jsonrpsee-types 0.26.0", + "metrics", + "parking_lot", + "reth-chainspec", + "reth-engine-primitives", + "reth-metrics", + "reth-payload-builder", + "reth-payload-builder-primitives", + "reth-payload-primitives", + "reth-primitives-traits", + "reth-rpc-api", + "reth-storage-api", + "reth-tasks", + "reth-transaction-pool", + "serde", + "thiserror 2.0.17", + "tokio", + "tracing", +] + +[[package]] +name = "reth-rpc-eth-api" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-dyn-abi", + "alloy-eips", + "alloy-evm", + "alloy-json-rpc", + "alloy-network", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-eth", + "alloy-rpc-types-mev", + "alloy-serde", + "async-trait", + "auto_impl", + "dyn-clone", + "futures", + "jsonrpsee 0.26.0", + "jsonrpsee-types 0.26.0", + "parking_lot", + "reth-chain-state", + "reth-chainspec", + "reth-errors", + "reth-evm", + "reth-network-api", + "reth-node-api", + "reth-primitives-traits", + "reth-revm", + "reth-rpc-convert", + "reth-rpc-eth-types", + "reth-rpc-server-types", + "reth-storage-api", + "reth-tasks", + "reth-transaction-pool", + "reth-trie-common", + "revm", + "revm-inspectors", + "tokio", + "tracing", ] [[package]] name = "reth-rpc-eth-types" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5590,8 +10089,8 @@ dependencies = [ "derive_more", "futures", "itertools 0.14.0", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.26.0", + "jsonrpsee-types 0.26.0", "metrics", "rand 0.9.2", "reqwest", @@ -5614,54 +10113,162 @@ dependencies = [ "revm-inspectors", "schnellru", "serde", - "thiserror", + "thiserror 2.0.17", "tokio", "tokio-stream", "tracing", ] +[[package]] +name = "reth-rpc-layer" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-rpc-types-engine", + "http 1.3.1", + "jsonrpsee-http-client 0.26.0", + "pin-project", + "tower 0.5.2", + "tower-http", + "tracing", +] + [[package]] name = "reth-rpc-server-types" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.26.0", + "jsonrpsee-types 0.26.0", "reth-errors", "reth-network-api", "serde", - "strum", + "strum 0.27.2", +] + +[[package]] +name = "reth-stages" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "bincode", + "eyre", + "futures-util", + "itertools 0.14.0", + "num-traits", + "rayon", + "reqwest", + "reth-codecs", + "reth-config", + "reth-consensus", + "reth-db", + "reth-db-api", + "reth-era", + "reth-era-downloader", + "reth-era-utils", + "reth-etl", + "reth-evm", + "reth-execution-types", + "reth-exex", + "reth-fs-util", + "reth-network-p2p", + "reth-primitives-traits", + "reth-provider", + "reth-prune", + "reth-prune-types", + "reth-revm", + "reth-stages-api", + "reth-static-file-types", + "reth-storage-errors", + "reth-trie", + "reth-trie-db", + "thiserror 2.0.17", + "tokio", + "tracing", +] + +[[package]] +name = "reth-stages-api" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "aquamarine", + "auto_impl", + "futures-util", + "metrics", + "reth-consensus", + "reth-errors", + "reth-metrics", + "reth-network-p2p", + "reth-primitives-traits", + "reth-provider", + "reth-prune", + "reth-stages-types", + "reth-static-file", + "reth-static-file-types", + "reth-tokio-util", + "thiserror 2.0.17", + "tokio", + "tracing", ] [[package]] name = "reth-stages-types" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-primitives", "bytes", + "modular-bitfield", + "reth-codecs", "reth-trie-common", "serde", ] +[[package]] +name = "reth-static-file" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-primitives", + "parking_lot", + "rayon", + "reth-codecs", + "reth-db-api", + "reth-primitives-traits", + "reth-provider", + "reth-prune-types", + "reth-stages-types", + "reth-static-file-types", + "reth-storage-errors", + "reth-tokio-util", + "tracing", +] + [[package]] name = "reth-static-file-types" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-primitives", + "clap", "derive_more", "serde", - "strum", + "strum 0.27.2", ] [[package]] name = "reth-storage-api" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5669,6 +10276,7 @@ dependencies = [ "alloy-rpc-types-engine", "auto_impl", "reth-chainspec", + "reth-db-api", "reth-db-models", "reth-ethereum-primitives", "reth-execution-types", @@ -5682,8 +10290,8 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5693,20 +10301,22 @@ dependencies = [ "reth-prune-types", "reth-static-file-types", "revm-database-interface", - "thiserror", + "thiserror 2.0.17", ] [[package]] name = "reth-tasks" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "auto_impl", "dyn-clone", "futures-util", "metrics", + "pin-project", + "rayon", "reth-metrics", - "thiserror", + "thiserror 2.0.17", "tokio", "tracing", "tracing-futures", @@ -5714,18 +10324,33 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "tokio", "tokio-stream", "tracing", ] +[[package]] +name = "reth-tracing" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "clap", + "eyre", + "rolling-file", + "tracing", + "tracing-appender", + "tracing-journald", + "tracing-logfmt", + "tracing-subscriber 0.3.20", +] + [[package]] name = "reth-transaction-pool" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5738,6 +10363,7 @@ dependencies = [ "metrics", "parking_lot", "pin-project", + "rand 0.9.2", "reth-chain-state", "reth-chainspec", "reth-eth-wire-types", @@ -5755,7 +10381,7 @@ dependencies = [ "serde", "serde_json", "smallvec", - "thiserror", + "thiserror 2.0.17", "tokio", "tokio-stream", "tracing", @@ -5763,8 +10389,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5773,7 +10399,9 @@ dependencies = [ "alloy-trie", "auto_impl", "itertools 0.14.0", + "metrics", "reth-execution-errors", + "reth-metrics", "reth-primitives-traits", "reth-stages-types", "reth-storage-errors", @@ -5785,8 +10413,8 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5799,32 +10427,92 @@ dependencies = [ "itertools 0.14.0", "nybbles", "rayon", + "reth-codecs", "reth-primitives-traits", "revm-database", "serde", "serde_with", ] +[[package]] +name = "reth-trie-db" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-primitives", + "reth-db-api", + "reth-execution-errors", + "reth-primitives-traits", + "reth-trie", + "tracing", +] + +[[package]] +name = "reth-trie-parallel" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "derive_more", + "itertools 0.14.0", + "metrics", + "rayon", + "reth-db-api", + "reth-execution-errors", + "reth-metrics", + "reth-provider", + "reth-storage-errors", + "reth-trie", + "reth-trie-common", + "reth-trie-db", + "reth-trie-sparse", + "thiserror 2.0.17", + "tokio", + "tracing", +] + [[package]] name = "reth-trie-sparse" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-primitives", "alloy-rlp", "alloy-trie", "auto_impl", + "metrics", + "rayon", "reth-execution-errors", + "reth-metrics", "reth-primitives-traits", "reth-trie-common", "smallvec", "tracing", ] +[[package]] +name = "reth-trie-sparse-parallel" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "alloy-trie", + "metrics", + "rayon", + "reth-execution-errors", + "reth-metrics", + "reth-trie-common", + "reth-trie-sparse", + "smallvec", + "tracing", +] + [[package]] name = "reth-zstd-compressors" -version = "1.7.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.7.0#9d56da53ec0ad60e229456a0c70b338501d923a5" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "zstd", ] @@ -5959,20 +10647,22 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.29.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fdb678b03faa678a7007a7c761a78efa9ca9adcd9434ef3d1ad894aec6e43d1" +checksum = "e9b329afcc0f9fd5adfa2c6349a7435a8558e82bcae203142103a9a95e2a63b6" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", + "boa_engine", + "boa_gc", "colorchoice", "revm", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -6000,6 +10690,7 @@ dependencies = [ "ark-serialize 0.5.0", "arrayref", "aurora-engine-modexp", + "blst", "c-kzg", "cfg-if", "k256", @@ -6071,6 +10762,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "ringbuffer" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3df6368f71f205ff9c33c076d170dd56ebf68e8161c733c0caa07a7a5509ed53" + [[package]] name = "ripemd" version = "0.1.3" @@ -6080,6 +10777,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "rlimit" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a" +dependencies = [ + "libc", +] + [[package]] name = "rlp" version = "0.5.2" @@ -6090,6 +10796,98 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "rmp" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + +[[package]] +name = "roaring" +version = "0.10.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e8d2cfa184d94d0726d650a9f4a1be7f9b76ac9fdb954219878dc00c1c1e7b" +dependencies = [ + "bytemuck", + "byteorder", +] + +[[package]] +name = "rolling-file" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8395b4f860856b740f20a296ea2cd4d823e81a2658cf05ef61be22916026a906" +dependencies = [ + "chrono", +] + +[[package]] +name = "rollup-boost" +version = "0.1.0" +source = "git+http://github.com/flashbots/rollup-boost?tag=rollup-boost%2Fv0.7.5#b86af43969557bee18f17ec1d6bcd3e984f910b2" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "alloy-serde", + "clap", + "dashmap 6.1.0", + "dotenvy", + "eyre", + "futures", + "http 1.3.1", + "http-body-util", + "hyper 1.7.0", + "hyper-rustls 0.27.7", + "hyper-util", + "jsonrpsee 0.25.1", + "metrics", + "metrics-derive", + "metrics-exporter-prometheus", + "metrics-util", + "moka", + "op-alloy-rpc-types-engine", + "opentelemetry", + "opentelemetry-otlp", + "opentelemetry_sdk", + "parking_lot", + "paste", + "reth-optimism-payload-builder", + "rustls 0.23.31", + "serde", + "serde_json", + "sha2 0.10.9", + "testcontainers", + "thiserror 2.0.17", + "tokio", + "tokio-tungstenite", + "tokio-util", + "tower 0.5.2", + "tower-http", + "tracing", + "tracing-opentelemetry", + "tracing-subscriber 0.3.20", + "url", + "vergen", + "vergen-git2", +] + [[package]] name = "route-recognizer" version = "0.3.1" @@ -6130,13 +10928,14 @@ dependencies = [ [[package]] name = "ruint" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecb38f82477f20c5c3d62ef52d7c4e536e38ea9b73fb570a20c5cae0e14bcf6" +checksum = "a68df0380e5c9d20ce49534f292a36a7514ae21350726efe1865bdb1fa91d278" dependencies = [ "alloy-rlp", "ark-ff 0.3.0", "ark-ff 0.4.2", + "ark-ff 0.5.0", "bytes", "fastrlp 0.3.1", "fastrlp 0.4.0", @@ -6150,7 +10949,7 @@ dependencies = [ "rand 0.9.2", "rlp", "ruint-macro", - "serde", + "serde_core", "valuable", "zeroize", ] @@ -6229,7 +11028,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.11.0", - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -6251,6 +11050,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc" dependencies = [ "aws-lc-rs", + "log", "once_cell", "ring", "rustls-pki-types", @@ -6280,7 +11080,7 @@ dependencies = [ "openssl-probe", "rustls-pki-types", "schannel", - "security-framework 3.4.0", + "security-framework 3.5.1", ] [[package]] @@ -6311,6 +11111,33 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.31", + "rustls-native-certs 0.8.1", + "rustls-platform-verifier-android", + "rustls-webpki 0.103.4", + "security-framework 3.5.1", + "security-framework-sys", + "webpki-root-certs 0.26.11", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -6357,13 +11184,28 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +[[package]] +name = "ryu-js" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd29631678d6fb0903b69223673e122c32e9ae559d0960a38d574695ebc0ea15" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "schannel" version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" dependencies = [ - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -6502,9 +11344,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.4.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b369d18893388b345804dc0007963c99b7d665ae71d275812d828c6f089640" +checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" dependencies = [ "bitflags 2.9.4", "core-foundation 0.10.1", @@ -6537,6 +11379,10 @@ name = "semver" version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +dependencies = [ + "serde", + "serde_core", +] [[package]] name = "semver-parser" @@ -6547,11 +11393,23 @@ dependencies = [ "pest", ] +[[package]] +name = "send_wrapper" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" + +[[package]] +name = "send_wrapper" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" + [[package]] name = "serde" -version = "1.0.227" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ece43fc6fbed4eb5392ab50c07334d3e577cbf40997ee896fe7af40bba4245" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ "serde_core", "serde_derive", @@ -6559,18 +11417,18 @@ dependencies = [ [[package]] name = "serde_core" -version = "1.0.227" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a576275b607a2c86ea29e410193df32bc680303c82f31e275bbfcafe8b33be5" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.227" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e694923b8824cf0e9b382adf0f60d4e05f348f357b38833a3fa5ed7c2ede04" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -6602,6 +11460,15 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "serde_spanned" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -6616,9 +11483,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.14.0" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5" +checksum = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e" dependencies = [ "base64 0.22.1", "chrono", @@ -6636,11 +11503,11 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.14.0" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f" +checksum = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e" dependencies = [ - "darling 0.20.11", + "darling 0.21.3", "proc-macro2", "quote", "syn 2.0.106", @@ -6720,12 +11587,42 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shellexpand" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb" +dependencies = [ + "dirs", +] + [[package]] name = "shlex" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + [[package]] name = "signal-hook-registry" version = "1.4.6" @@ -6755,12 +11652,45 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "simple_asn1" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror 2.0.17", + "time", +] + [[package]] name = "siphasher" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" +[[package]] +name = "skeptic" +version = "0.13.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" +dependencies = [ + "bytecount", + "cargo_metadata 0.14.2", + "error-chain", + "glob", + "pulldown-cmark", + "tempfile", + "walkdir", +] + +[[package]] +name = "sketches-ddsketch" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a" + [[package]] name = "slab" version = "0.4.11" @@ -6847,6 +11777,12 @@ dependencies = [ "der 0.7.10", ] +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + [[package]] name = "sqlx" version = "0.8.6" @@ -6878,7 +11814,7 @@ dependencies = [ "futures-io", "futures-util", "hashbrown 0.15.5", - "hashlink", + "hashlink 0.10.0", "indexmap 2.11.4", "log", "memchr", @@ -6889,7 +11825,7 @@ dependencies = [ "serde_json", "sha2 0.10.9", "smallvec", - "thiserror", + "thiserror 2.0.17", "tokio", "tokio-stream", "tracing", @@ -6973,7 +11909,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 2.0.17", "tracing", "uuid", "whoami", @@ -7012,7 +11948,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 2.0.17", "tracing", "uuid", "whoami", @@ -7038,7 +11974,7 @@ dependencies = [ "serde", "serde_urlencoded", "sqlx-core", - "thiserror", + "thiserror 2.0.17", "tracing", "url", "uuid", @@ -7096,13 +12032,35 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", +] + [[package]] name = "strum" version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" dependencies = [ - "strum_macros", + "strum_macros 0.27.2", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.106", ] [[package]] @@ -7147,9 +12105,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0b198d366dbec045acfcd97295eb653a7a2b40e4dc764ef1e79aafcad439d3c" +checksum = "2375c17f6067adc651d8c2c51658019cef32edfff4a982adaf1d7fd1c039f08b" dependencies = [ "paste", "proc-macro2", @@ -7177,23 +12135,85 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "sysinfo" +version = "0.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01" +dependencies = [ + "core-foundation-sys", + "libc", + "memchr", + "ntapi", + "windows 0.57.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.9.4", + "core-foundation 0.9.4", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + [[package]] name = "tap" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tar" +version = "0.4.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tar-no-std" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac9ee8b664c9f1740cd813fea422116f8ba29997bb7c878d1940424889802897" +dependencies = [ + "bitflags 2.9.4", + "log", + "num-traits", +] + [[package]] name = "tempfile" -version = "3.22.0" +version = "3.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ "fastrand", "getrandom 0.3.3", "once_cell", "rustix 1.1.2", - "windows-sys 0.61.0", + "windows-sys 0.61.1", ] [[package]] @@ -7217,7 +12237,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 2.0.17", "tokio", "tokio-stream", "tokio-tar", @@ -7234,20 +12254,46 @@ dependencies = [ "testcontainers", ] +[[package]] +name = "thin-vec" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d" + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + [[package]] name = "thiserror" -version = "2.0.16" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +dependencies = [ + "thiserror-impl 2.0.17", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn 2.0.106", ] [[package]] name = "thiserror-impl" -version = "2.0.16" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", @@ -7272,6 +12318,37 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "tikv-jemalloc-ctl" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21f216790c8df74ce3ab25b534e0718da5a1916719771d3fec23315c99e468b" +dependencies = [ + "libc", + "paste", + "tikv-jemalloc-sys", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + [[package]] name = "time" version = "0.3.44" @@ -7280,7 +12357,10 @@ checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ "deranged", "itoa", + "js-sys", + "libc", "num-conv", + "num_threads", "powerfmt", "serde", "time-core", @@ -7312,6 +12392,16 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec 0.10.4", +] + [[package]] name = "tinystr" version = "0.8.1" @@ -7319,7 +12409,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ "displaydoc", - "zerovec", + "zerovec 0.11.4", ] [[package]] @@ -7353,7 +12443,7 @@ dependencies = [ "bytes", "clap", "dotenvy", - "op-alloy-consensus 0.20.0", + "op-alloy-consensus", "rdkafka", "serde", "serde_json", @@ -7371,11 +12461,12 @@ version = "0.1.0" dependencies = [ "alloy-consensus", "alloy-primitives", + "alloy-provider", "alloy-rpc-types-mev", "anyhow", "async-trait", "eyre", - "op-alloy-consensus 0.20.0", + "op-alloy-consensus", "sqlx", "testcontainers", "testcontainers-modules", @@ -7398,20 +12489,15 @@ dependencies = [ "backon", "clap", "dotenvy", - "eyre", - "jsonrpsee", - "op-alloy-consensus 0.20.0", + "jsonrpsee 0.26.0", + "op-alloy-consensus", "op-alloy-network", "op-revm", "rdkafka", - "reth-errors", "reth-optimism-evm", "reth-rpc-eth-types", "revm-context-interface", - "serde", "serde_json", - "tips-audit", - "tips-datastore", "tokio", "tracing", "tracing-subscriber 0.3.20", @@ -7424,7 +12510,6 @@ version = "0.1.0" dependencies = [ "alloy-rpc-types-mev", "anyhow", - "async-trait", "backon", "clap", "dotenvy", @@ -7445,18 +12530,23 @@ dependencies = [ "alloy-primitives", "alloy-provider", "alloy-rpc-types", + "alloy-rpc-types-mev", "anyhow", + "base-reth-flashblocks-rpc", "clap", "dotenvy", + "op-alloy-consensus", "op-alloy-network", + "op-alloy-rpc-types", "rdkafka", - "serde_json", + "sqlx", "tips-audit", "tips-datastore", "tokio", "tracing", "tracing-subscriber 0.3.20", "url", + "uuid", ] [[package]] @@ -7512,9 +12602,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f63835928ca123f1bef57abbcd23bb2ba0ac9ae1235f1e65bda0d06e7786bd" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ "rustls 0.23.31", "tokio", @@ -7548,17 +12638,58 @@ dependencies = [ ] [[package]] -name = "tokio-util" -version = "0.7.16" +name = "tokio-tungstenite" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084" +dependencies = [ + "futures-util", + "log", + "native-tls", + "rustls 0.23.31", + "rustls-native-certs 0.8.1", + "rustls-pki-types", + "tokio", + "tokio-native-tls", + "tokio-rustls 0.26.4", + "tungstenite", + "webpki-roots 0.26.11", +] + +[[package]] +name = "tokio-util" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" +dependencies = [ + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "pin-project-lite", + "slab", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime 0.6.11", + "toml_edit 0.22.27", +] + +[[package]] +name = "toml_datetime" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "pin-project-lite", - "tokio", + "serde", ] [[package]] @@ -7570,6 +12701,20 @@ dependencies = [ "serde_core", ] +[[package]] +name = "toml_edit" +version = "0.22.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +dependencies = [ + "indexmap 2.11.4", + "serde", + "serde_spanned", + "toml_datetime 0.6.11", + "toml_write", + "winnow", +] + [[package]] name = "toml_edit" version = "0.23.6" @@ -7577,7 +12722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3effe7c0e86fdff4f69cdd2ccc1b96f933e24811c5441d44904e8683e27184b" dependencies = [ "indexmap 2.11.4", - "toml_datetime", + "toml_datetime 0.7.2", "toml_parser", "winnow", ] @@ -7591,6 +12736,62 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_write" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" + +[[package]] +name = "tonic" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.22.1", + "bytes", + "h2 0.4.12", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.7.0", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost", + "socket2 0.5.10", + "tokio", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand 0.8.5", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower" version = "0.5.2" @@ -7599,11 +12800,16 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", + "hdrhistogram", + "indexmap 2.11.4", "pin-project-lite", + "slab", "sync_wrapper", "tokio", + "tokio-util", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -7612,16 +12818,29 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" dependencies = [ + "async-compression", + "base64 0.22.1", "bitflags 2.9.4", "bytes", + "futures-core", "futures-util", "http 1.3.1", "http-body 1.0.1", + "http-body-util", + "http-range-header", + "httpdate", "iri-string", + "mime", + "mime_guess", + "percent-encoding", "pin-project-lite", - "tower", + "tokio", + "tokio-util", + "tower 0.5.2", "tower-layer", "tower-service", + "tracing", + "uuid", ] [[package]] @@ -7648,6 +12867,18 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror 1.0.69", + "time", + "tracing-subscriber 0.3.20", +] + [[package]] name = "tracing-attributes" version = "0.1.30" @@ -7679,6 +12910,17 @@ dependencies = [ "tracing", ] +[[package]] +name = "tracing-journald" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0b4143302cf1022dac868d521e36e8b27691f72c84b3311750d5188ebba657" +dependencies = [ + "libc", + "tracing-core", + "tracing-subscriber 0.3.20", +] + [[package]] name = "tracing-log" version = "0.2.0" @@ -7690,6 +12932,46 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-logfmt" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b1f47d22deb79c3f59fcf2a1f00f60cbdc05462bf17d1cd356c1fefa3f444bd" +dependencies = [ + "time", + "tracing", + "tracing-core", + "tracing-subscriber 0.3.20", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721f2d2569dce9f3dfbbddee5906941e953bfcdf736a62da3377f5751650cc36" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "smallvec", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber 0.3.20", + "web-time", +] + +[[package]] +name = "tracing-serde" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" +dependencies = [ + "serde", + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.2.25" @@ -7709,25 +12991,79 @@ dependencies = [ "nu-ansi-term", "once_cell", "regex-automata", + "serde", + "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log", + "tracing-serde", +] + +[[package]] +name = "tree_hash" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee44f4cef85f88b4dea21c0b1f58320bdf35715cf56d840969487cff00613321" +dependencies = [ + "alloy-primitives", + "ethereum_hashing", + "ethereum_ssz", + "smallvec", + "typenum", +] + +[[package]] +name = "tree_hash_derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bee2ea1551f90040ab0e34b6fb7f2fa3bad8acc925837ac654f2c78a13e3089" +dependencies = [ + "darling 0.20.11", + "proc-macro2", + "quote", + "syn 2.0.106", ] +[[package]] +name = "triomphe" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" + [[package]] name = "try-lock" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "tungstenite" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" +dependencies = [ + "bytes", + "data-encoding", + "http 1.3.1", + "httparse", + "log", + "native-tls", + "rand 0.9.2", + "rustls 0.23.31", + "rustls-pki-types", + "sha1", + "thiserror 2.0.17", + "utf-8", +] + [[package]] name = "typenum" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "ucd-trie" @@ -7747,12 +13083,30 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "uint" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909988d098b2f738727b161a106cfc7cab00c539c2687a8836f8e565976fb53e" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] + [[package]] name = "unarray" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" +[[package]] +name = "unicase" +version = "2.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" + [[package]] name = "unicode-bidi" version = "0.3.18" @@ -7786,12 +13140,51 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" +[[package]] +name = "unicode-truncate" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" +dependencies = [ + "itertools 0.13.0", + "unicode-segmentation", + "unicode-width 0.1.14", +] + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "unicode-xid" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "unsigned-varint" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" + [[package]] name = "untrusted" version = "0.9.0" @@ -7816,6 +13209,18 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + [[package]] name = "utf8_iter" version = "1.0.4" @@ -7852,6 +13257,47 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vergen" +version = "9.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b2bf58be11fc9414104c6d3a2e464163db5ef74b12296bda593cac37b6e4777" +dependencies = [ + "anyhow", + "cargo_metadata 0.19.2", + "derive_builder", + "regex", + "rustversion", + "time", + "vergen-lib", +] + +[[package]] +name = "vergen-git2" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f6ee511ec45098eabade8a0750e76eec671e7fb2d9360c563911336bea9cac1" +dependencies = [ + "anyhow", + "derive_builder", + "git2", + "rustversion", + "time", + "vergen", + "vergen-lib", +] + +[[package]] +name = "vergen-lib" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b07e6010c0f3e59fcb164e0163834597da68d1f864e2b8ca49f74de01e9c166" +dependencies = [ + "anyhow", + "derive_builder", + "rustversion", +] + [[package]] name = "version_check" version = "0.9.5" @@ -7873,6 +13319,16 @@ dependencies = [ "libc", ] +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -7914,9 +13370,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.103" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab10a69fbd0a177f5f649ad4d8d3305499c42bab9aef2f7ff592d0ec8f833819" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ "cfg-if", "once_cell", @@ -7927,9 +13383,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.103" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb702423545a6007bbc368fde243ba47ca275e549c8a28617f56f6ba53b1d1c" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" dependencies = [ "bumpalo", "log", @@ -7941,9 +13397,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.53" +version = "0.4.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0b221ff421256839509adbb55998214a70d829d3a28c69b4a6672e9d2a42f67" +checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c" dependencies = [ "cfg-if", "js-sys", @@ -7954,9 +13410,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.103" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc65f4f411d91494355917b605e1480033152658d71f722a90647f56a70c88a0" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7964,9 +13420,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.103" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc003a991398a8ee604a401e194b6b3a39677b3173d6e74495eb51b82e99a32" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", @@ -7977,13 +13433,26 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.103" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "293c37f4efa430ca14db3721dfbe48d8c33308096bd44d80ebaa775ab71ba1cf" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" dependencies = [ "unicode-ident", ] +[[package]] +name = "wasm-streams" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wasmtimer" version = "0.4.3" @@ -8000,9 +13469,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.80" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe734895e869dc429d78c4b433f8d17d95f8d05317440b4fad5ab2d33e596dc" +checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" dependencies = [ "js-sys", "wasm-bindgen", @@ -8018,6 +13487,42 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-root-certs" +version = "0.26.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e" +dependencies = [ + "webpki-root-certs 1.0.2", +] + +[[package]] +name = "webpki-root-certs" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4ffd8df1c57e87c325000a3d6ef93db75279dc3a231125aac571650f22b12a" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "webpki-roots" +version = "0.26.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +dependencies = [ + "webpki-roots 1.0.2", +] + +[[package]] +name = "webpki-roots" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "which" version = "4.4.2" @@ -8040,6 +13545,12 @@ dependencies = [ "wasite", ] +[[package]] +name = "widestring" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d" + [[package]] name = "winapi" version = "0.3.9" @@ -8056,30 +13567,129 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.1", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +dependencies = [ + "windows-core 0.57.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.61.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" +dependencies = [ + "windows-collections", + "windows-core 0.61.2", + "windows-future", + "windows-link 0.1.3", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +dependencies = [ + "windows-core 0.61.2", +] + +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement 0.57.0", + "windows-interface 0.57.0", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +dependencies = [ + "windows-implement 0.60.1", + "windows-interface 0.59.2", + "windows-link 0.1.3", + "windows-result 0.3.4", + "windows-strings 0.4.2", +] + [[package]] name = "windows-core" -version = "0.62.0" +version = "0.62.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fe7168f7de578d2d8a05b07fd61870d2e73b4020e9f49aa00da8471723497c" +checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9" dependencies = [ - "windows-implement", - "windows-interface", + "windows-implement 0.60.1", + "windows-interface 0.59.2", "windows-link 0.2.0", - "windows-result", - "windows-strings", + "windows-result 0.4.0", + "windows-strings 0.5.0", +] + +[[package]] +name = "windows-future" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +dependencies = [ + "windows-core 0.61.2", + "windows-link 0.1.3", + "windows-threading", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", ] [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb307e42a74fb6de9bf3a02d9712678b22399c87e6fa869d6dfcd8c1b7754e0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", @@ -8088,9 +13698,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "c0abd1ddbc6964ac14db11c7213d6532ef34bd9aa042c2e5935f59d7908b46a5" dependencies = [ "proc-macro2", "quote", @@ -8109,6 +13719,45 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" +[[package]] +name = "windows-numerics" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +dependencies = [ + "windows-core 0.61.2", + "windows-link 0.1.3", +] + +[[package]] +name = "windows-registry" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" +dependencies = [ + "windows-link 0.1.3", + "windows-result 0.3.4", + "windows-strings 0.4.2", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link 0.1.3", +] + [[package]] name = "windows-result" version = "0.4.0" @@ -8118,6 +13767,15 @@ dependencies = [ "windows-link 0.2.0", ] +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link 0.1.3", +] + [[package]] name = "windows-strings" version = "0.5.0" @@ -8127,6 +13785,15 @@ dependencies = [ "windows-link 0.2.0", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -8160,18 +13827,33 @@ version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.3", + "windows-targets 0.53.4", ] [[package]] name = "windows-sys" -version = "0.61.0" +version = "0.61.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa" +checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f" dependencies = [ "windows-link 0.2.0", ] +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -8205,11 +13887,11 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.3" +version = "0.53.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" +checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b" dependencies = [ - "windows-link 0.1.3", + "windows-link 0.2.0", "windows_aarch64_gnullvm 0.53.0", "windows_aarch64_msvc 0.53.0", "windows_i686_gnu 0.53.0", @@ -8220,6 +13902,21 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] +[[package]] +name = "windows-threading" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -8238,6 +13935,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -8256,6 +13959,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -8286,6 +13995,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -8304,6 +14019,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -8322,6 +14043,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -8340,6 +14067,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -8367,18 +14100,59 @@ dependencies = [ "memchr", ] +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wit-bindgen" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "writeable" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +[[package]] +name = "ws_stream_wasm" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c173014acad22e83f16403ee360115b38846fe754e735c5d9d3803fe70c6abc" +dependencies = [ + "async_io_stream", + "futures", + "js-sys", + "log", + "pharos", + "rustc_version 0.4.1", + "send_wrapper 0.6.0", + "thiserror 2.0.17", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wyz" version = "0.5.1" @@ -8390,9 +14164,9 @@ dependencies = [ [[package]] name = "xattr" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", "rustix 1.1.2", @@ -8404,6 +14178,24 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive 0.7.5", + "zerofrom", +] + [[package]] name = "yoke" version = "0.8.0" @@ -8412,10 +14204,22 @@ checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" dependencies = [ "serde", "stable_deref_trait", - "yoke-derive", + "yoke-derive 0.8.0", "zerofrom", ] +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", + "synstructure", +] + [[package]] name = "yoke-derive" version = "0.8.0" @@ -8471,9 +14275,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" dependencies = [ "zeroize_derive", ] @@ -8496,8 +14300,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" dependencies = [ "displaydoc", - "yoke", + "yoke 0.8.0", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke 0.7.5", "zerofrom", + "zerovec-derive 0.10.3", ] [[package]] @@ -8506,9 +14321,20 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" dependencies = [ - "yoke", + "yoke 0.8.0", "zerofrom", - "zerovec-derive", + "zerovec-derive 0.11.1", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index aff7e5c..b9bd004 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,11 @@ +[workspace.package] +version = "0.1.0" +edition = "2024" +rust-version = "1.88" +license = "MIT" +homepage = "https://github.com/base/tips" +repository = "https://github.com/base/tips" + [workspace] members = ["crates/datastore", "crates/audit", "crates/ingress-rpc", "crates/maintenance", "crates/ingress-writer"] resolver = "2" @@ -8,29 +16,26 @@ tips-audit = { path = "crates/audit" } tips-maintenance = { path = "crates/maintenance" } tips-ingress-writer = { path = "crates/ingress-writer" } - # Reth -reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" } -reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" } -reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.7.0" } +reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" } +reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" } +base-reth-flashblocks-rpc = { git = "https://github.com/base/node-reth", rev = "a1ae148a36354c88b356f80281fef12dad9f7737" } # alloy alloy-primitives = { version = "1.3.1", default-features = false, features = [ "map-foldhash", "serde", ] } -alloy-rpc-types = { version = "1.0.30", default-features = false } -alloy-consensus = { version = "1.0.30" } -alloy-provider = { version = "1.0.30" } -alloy-rpc-client = { version = "1.0.30" } -alloy-rpc-types-mev = "1.0.30" -alloy-transport-http = "1.0.30" -alloy-rlp = "0.3.12" +alloy-rpc-types = { version = "1.0.35", default-features = false } +alloy-consensus = { version = "1.0.35" } +alloy-provider = { version = "1.0.35" } +alloy-rpc-types-mev = "1.0.35" # op-alloy +op-alloy-rpc-types = { version = "0.20.0", default-features = false } +op-alloy-network = { version = "0.20.0", default-features = false } op-alloy-consensus = { version = "0.20.0", features = ["k256"] } -op-alloy-network = {version = "0.20.0"} tokio = { version = "1.47.1", features = ["full"] } tracing = "0.1.41" diff --git a/crates/audit/Cargo.toml b/crates/audit/Cargo.toml index 18aad38..0fb2ee4 100644 --- a/crates/audit/Cargo.toml +++ b/crates/audit/Cargo.toml @@ -1,7 +1,11 @@ [package] name = "tips-audit" -version = "0.1.0" -edition = "2021" +version.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +edition.workspace = true [[bin]] name = "tips-audit" diff --git a/crates/audit/Dockerfile b/crates/audit/Dockerfile index b09a0fd..1a1a817 100644 --- a/crates/audit/Dockerfile +++ b/crates/audit/Dockerfile @@ -1,5 +1,7 @@ FROM rust:1-bookworm AS base +RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config + RUN cargo install cargo-chef --locked WORKDIR /app diff --git a/crates/audit/src/archiver.rs b/crates/audit/src/archiver.rs index 7bbb4ec..652dd78 100644 --- a/crates/audit/src/archiver.rs +++ b/crates/audit/src/archiver.rs @@ -1,5 +1,5 @@ -use crate::reader::MempoolEventReader; -use crate::storage::MempoolEventWriter; +use crate::reader::EventReader; +use crate::storage::EventWriter; use anyhow::Result; use std::time::Duration; use tokio::time::sleep; @@ -7,8 +7,8 @@ use tracing::{error, info}; pub struct KafkaMempoolArchiver where - R: MempoolEventReader, - W: MempoolEventWriter, + R: EventReader, + W: EventWriter, { reader: R, writer: W, @@ -16,15 +16,15 @@ where impl KafkaMempoolArchiver where - R: MempoolEventReader, - W: MempoolEventWriter, + R: EventReader, + W: EventWriter, { pub fn new(reader: R, writer: W) -> Self { Self { reader, writer } } pub async fn run(&mut self) -> Result<()> { - info!("Starting Kafka mempool archiver"); + info!("Starting Kafka bundle archiver"); loop { match self.reader.read_event().await { diff --git a/crates/audit/src/bin/main.rs b/crates/audit/src/bin/main.rs index b6a0b21..ed06f71 100644 --- a/crates/audit/src/bin/main.rs +++ b/crates/audit/src/bin/main.rs @@ -1,11 +1,11 @@ use anyhow::Result; use aws_config::{BehaviorVersion, Region}; use aws_credential_types::Credentials; -use aws_sdk_s3::{config::Builder as S3ConfigBuilder, Client as S3Client}; +use aws_sdk_s3::{Client as S3Client, config::Builder as S3ConfigBuilder}; use clap::{Parser, ValueEnum}; use rdkafka::consumer::Consumer; use tips_audit::{ - create_kafka_consumer, KafkaMempoolArchiver, KafkaMempoolReader, S3MempoolEventReaderWriter, + KafkaMempoolArchiver, KafkaMempoolReader, S3EventReaderWriter, create_kafka_consumer, }; use tracing::{info, warn}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; @@ -94,7 +94,7 @@ async fn main() -> Result<()> { let s3_client = create_s3_client(&args).await?; let s3_bucket = args.s3_bucket.clone(); - let writer = S3MempoolEventReaderWriter::new(s3_client, s3_bucket); + let writer = S3EventReaderWriter::new(s3_client, s3_bucket); let mut archiver = KafkaMempoolArchiver::new(reader, writer); diff --git a/crates/audit/src/publisher.rs b/crates/audit/src/publisher.rs index 359666d..48367e7 100644 --- a/crates/audit/src/publisher.rs +++ b/crates/audit/src/publisher.rs @@ -1,30 +1,31 @@ -use crate::types::MempoolEvent; +use crate::types::BundleEvent; use anyhow::Result; use async_trait::async_trait; use rdkafka::producer::{FutureProducer, FutureRecord}; use serde_json; use tracing::{debug, error}; -use uuid::Uuid; #[async_trait] -pub trait MempoolEventPublisher: Send + Sync { - async fn publish(&self, event: MempoolEvent) -> Result<()>; +pub trait BundleEventPublisher: Send + Sync { + async fn publish(&self, event: BundleEvent) -> Result<()>; + + async fn publish_all(&self, events: Vec) -> Result<()>; } #[derive(Clone)] -pub struct KafkaMempoolEventPublisher { +pub struct KafkaBundleEventPublisher { producer: FutureProducer, topic: String, } -impl KafkaMempoolEventPublisher { +impl KafkaBundleEventPublisher { pub fn new(producer: FutureProducer, topic: String) -> Self { Self { producer, topic } } - async fn send_event(&self, event: &MempoolEvent) -> Result<()> { + async fn send_event(&self, event: &BundleEvent) -> Result<()> { let bundle_id = event.bundle_id(); - let key = format!("{}-{}", bundle_id, Uuid::new_v4()); + let key = event.generate_event_key(); let payload = serde_json::to_vec(event)?; let record = FutureRecord::to(&self.topic).key(&key).payload(&payload); @@ -57,8 +58,15 @@ impl KafkaMempoolEventPublisher { } #[async_trait] -impl MempoolEventPublisher for KafkaMempoolEventPublisher { - async fn publish(&self, event: MempoolEvent) -> Result<()> { +impl BundleEventPublisher for KafkaBundleEventPublisher { + async fn publish(&self, event: BundleEvent) -> Result<()> { self.send_event(&event).await } + + async fn publish_all(&self, events: Vec) -> Result<()> { + for event in events { + self.send_event(&event).await?; + } + Ok(()) + } } diff --git a/crates/audit/src/reader.rs b/crates/audit/src/reader.rs index 52c9c45..1449638 100644 --- a/crates/audit/src/reader.rs +++ b/crates/audit/src/reader.rs @@ -1,11 +1,11 @@ -use crate::types::MempoolEvent; +use crate::types::BundleEvent; use anyhow::Result; use async_trait::async_trait; use rdkafka::{ + Timestamp, TopicPartitionList, config::ClientConfig, consumer::{Consumer, StreamConsumer}, message::Message, - Timestamp, TopicPartitionList, }; use std::time::{Duration, SystemTime, UNIX_EPOCH}; use tokio::time::sleep; @@ -35,12 +35,12 @@ pub fn assign_topic_partition(consumer: &StreamConsumer, topic: &str) -> Result< #[derive(Debug, Clone)] pub struct Event { pub key: String, - pub event: MempoolEvent, + pub event: BundleEvent, pub timestamp: i64, } #[async_trait] -pub trait MempoolEventReader { +pub trait EventReader { async fn read_event(&mut self) -> Result; async fn commit(&mut self) -> Result<()>; } @@ -65,7 +65,7 @@ impl KafkaMempoolReader { } #[async_trait] -impl MempoolEventReader for KafkaMempoolReader { +impl EventReader for KafkaMempoolReader { async fn read_event(&mut self) -> Result { match self.consumer.recv().await { Ok(message) => { @@ -83,7 +83,7 @@ impl MempoolEventReader for KafkaMempoolReader { .as_millis() as i64, }; - let event: MempoolEvent = serde_json::from_slice(payload)?; + let event: BundleEvent = serde_json::from_slice(payload)?; debug!( bundle_id = %event.bundle_id(), diff --git a/crates/audit/src/storage.rs b/crates/audit/src/storage.rs index c2ac569..8cea6e0 100644 --- a/crates/audit/src/storage.rs +++ b/crates/audit/src/storage.rs @@ -1,13 +1,13 @@ use crate::reader::Event; -use crate::types::{BundleId, DropReason, MempoolEvent, TransactionId}; +use crate::types::{BundleEvent, BundleId, DropReason, TransactionId}; use alloy_primitives::TxHash; use alloy_rpc_types_mev::EthSendBundle; use anyhow::Result; use async_trait::async_trait; +use aws_sdk_s3::Client as S3Client; use aws_sdk_s3::error::SdkError; use aws_sdk_s3::operation::get_object::GetObjectError; use aws_sdk_s3::primitives::ByteStream; -use aws_sdk_s3::Client as S3Client; use serde::{Deserialize, Serialize}; use std::fmt; use std::fmt::Debug; @@ -113,21 +113,21 @@ fn update_bundle_history_transform( } let history_event = match &event.event { - MempoolEvent::Created { bundle, .. } => BundleHistoryEvent::Created { + BundleEvent::Created { bundle, .. } => BundleHistoryEvent::Created { key: event.key.clone(), timestamp: event.timestamp, bundle: bundle.clone(), }, - MempoolEvent::Updated { bundle, .. } => BundleHistoryEvent::Updated { + BundleEvent::Updated { bundle, .. } => BundleHistoryEvent::Updated { key: event.key.clone(), timestamp: event.timestamp, bundle: bundle.clone(), }, - MempoolEvent::Cancelled { .. } => BundleHistoryEvent::Cancelled { + BundleEvent::Cancelled { .. } => BundleHistoryEvent::Cancelled { key: event.key.clone(), timestamp: event.timestamp, }, - MempoolEvent::BuilderIncluded { + BundleEvent::BuilderIncluded { builder, block_number, flashblock_index, @@ -139,7 +139,7 @@ fn update_bundle_history_transform( block_number: *block_number, flashblock_index: *flashblock_index, }, - MempoolEvent::FlashblockIncluded { + BundleEvent::FlashblockIncluded { block_number, flashblock_index, .. @@ -149,7 +149,7 @@ fn update_bundle_history_transform( block_number: *block_number, flashblock_index: *flashblock_index, }, - MempoolEvent::BlockIncluded { + BundleEvent::BlockIncluded { block_number, block_hash, .. @@ -159,7 +159,7 @@ fn update_bundle_history_transform( block_number: *block_number, block_hash: *block_hash, }, - MempoolEvent::Dropped { reason, .. } => BundleHistoryEvent::Dropped { + BundleEvent::Dropped { reason, .. } => BundleHistoryEvent::Dropped { key: event.key.clone(), timestamp: event.timestamp, reason: reason.clone(), @@ -193,12 +193,12 @@ fn update_transaction_metadata_transform( } #[async_trait] -pub trait MempoolEventWriter { +pub trait EventWriter { async fn archive_event(&self, event: Event) -> Result<()>; } #[async_trait] -pub trait MempoolEventS3Reader { +pub trait BundleEventS3Reader { async fn get_bundle_history(&self, bundle_id: BundleId) -> Result>; async fn get_transaction_metadata( &self, @@ -207,12 +207,12 @@ pub trait MempoolEventS3Reader { } #[derive(Clone)] -pub struct S3MempoolEventReaderWriter { +pub struct S3EventReaderWriter { s3_client: S3Client, bucket: String, } -impl S3MempoolEventReaderWriter { +impl S3EventReaderWriter { pub fn new(s3_client: S3Client, bucket: String) -> Self { Self { s3_client, bucket } } @@ -351,7 +351,7 @@ impl S3MempoolEventReaderWriter { } #[async_trait] -impl MempoolEventWriter for S3MempoolEventReaderWriter { +impl EventWriter for S3EventReaderWriter { async fn archive_event(&self, event: Event) -> Result<()> { let bundle_id = event.event.bundle_id(); let transaction_ids = event.event.transaction_ids(); @@ -368,7 +368,7 @@ impl MempoolEventWriter for S3MempoolEventReaderWriter { } #[async_trait] -impl MempoolEventS3Reader for S3MempoolEventReaderWriter { +impl BundleEventS3Reader for S3EventReaderWriter { async fn get_bundle_history(&self, bundle_id: BundleId) -> Result> { let s3_key = S3Key::Bundle(bundle_id).to_string(); let (bundle_history, _) = self.get_object_with_etag::(&s3_key).await?; @@ -391,7 +391,7 @@ impl MempoolEventS3Reader for S3MempoolEventReaderWriter { mod tests { use super::*; use crate::reader::Event; - use crate::types::{DropReason, MempoolEvent}; + use crate::types::{BundleEvent, DropReason}; use alloy_primitives::TxHash; use alloy_rpc_types_mev::EthSendBundle; use uuid::Uuid; @@ -400,11 +400,11 @@ mod tests { EthSendBundle::default() } - fn create_test_event(key: &str, timestamp: i64, mempool_event: MempoolEvent) -> Event { + fn create_test_event(key: &str, timestamp: i64, bundle_event: BundleEvent) -> Event { Event { key: key.to_string(), timestamp, - event: mempool_event, + event: bundle_event, } } @@ -413,11 +413,11 @@ mod tests { let bundle_history = BundleHistory { history: vec![] }; let bundle = create_test_bundle(); let bundle_id = Uuid::new_v4(); - let mempool_event = MempoolEvent::Created { + let bundle_event = BundleEvent::Created { bundle_id, bundle: bundle.clone(), }; - let event = create_test_event("test-key", 1234567890, mempool_event); + let event = create_test_event("test-key", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history, &event); @@ -452,8 +452,8 @@ mod tests { let bundle = create_test_bundle(); let bundle_id = Uuid::new_v4(); - let mempool_event = MempoolEvent::Updated { bundle_id, bundle }; - let event = create_test_event("duplicate-key", 1234567890, mempool_event); + let bundle_event = BundleEvent::Updated { bundle_id, bundle }; + let event = create_test_event("duplicate-key", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history, &event); @@ -467,66 +467,66 @@ mod tests { // Test Created let bundle = create_test_bundle(); - let mempool_event = MempoolEvent::Created { + let bundle_event = BundleEvent::Created { bundle_id, bundle: bundle.clone(), }; - let event = create_test_event("test-key", 1234567890, mempool_event); + let event = create_test_event("test-key", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); // Test Updated - let mempool_event = MempoolEvent::Updated { + let bundle_event = BundleEvent::Updated { bundle_id, bundle: bundle.clone(), }; - let event = create_test_event("test-key-2", 1234567890, mempool_event); + let event = create_test_event("test-key-2", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); // Test Cancelled - let mempool_event = MempoolEvent::Cancelled { bundle_id }; - let event = create_test_event("test-key-3", 1234567890, mempool_event); + let bundle_event = BundleEvent::Cancelled { bundle_id }; + let event = create_test_event("test-key-3", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); // Test BuilderIncluded - let mempool_event = MempoolEvent::BuilderIncluded { + let bundle_event = BundleEvent::BuilderIncluded { bundle_id, builder: "test-builder".to_string(), block_number: 12345, flashblock_index: 1, }; - let event = create_test_event("test-key-4", 1234567890, mempool_event); + let event = create_test_event("test-key-4", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); // Test FlashblockIncluded - let mempool_event = MempoolEvent::FlashblockIncluded { + let bundle_event = BundleEvent::FlashblockIncluded { bundle_id, block_number: 12345, flashblock_index: 1, }; - let event = create_test_event("test-key-5", 1234567890, mempool_event); + let event = create_test_event("test-key-5", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); // Test BlockIncluded - let mempool_event = MempoolEvent::BlockIncluded { + let bundle_event = BundleEvent::BlockIncluded { bundle_id, block_number: 12345, block_hash: TxHash::from([1u8; 32]), }; - let event = create_test_event("test-key-6", 1234567890, mempool_event); + let event = create_test_event("test-key-6", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); // Test Dropped - let mempool_event = MempoolEvent::Dropped { + let bundle_event = BundleEvent::Dropped { bundle_id, reason: DropReason::TimedOut, }; - let event = create_test_event("test-key-7", 1234567890, mempool_event); + let event = create_test_event("test-key-7", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history, &event); assert!(result.is_some()); } diff --git a/crates/audit/src/types.rs b/crates/audit/src/types.rs index add8114..fce2a2b 100644 --- a/crates/audit/src/types.rs +++ b/crates/audit/src/types.rs @@ -36,7 +36,7 @@ pub struct Transaction { #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(tag = "event", content = "data")] -pub enum MempoolEvent { +pub enum BundleEvent { Created { bundle_id: BundleId, bundle: EthSendBundle, @@ -70,22 +70,22 @@ pub enum MempoolEvent { }, } -impl MempoolEvent { +impl BundleEvent { pub fn bundle_id(&self) -> BundleId { match self { - MempoolEvent::Created { bundle_id, .. } => *bundle_id, - MempoolEvent::Updated { bundle_id, .. } => *bundle_id, - MempoolEvent::Cancelled { bundle_id, .. } => *bundle_id, - MempoolEvent::BuilderIncluded { bundle_id, .. } => *bundle_id, - MempoolEvent::FlashblockIncluded { bundle_id, .. } => *bundle_id, - MempoolEvent::BlockIncluded { bundle_id, .. } => *bundle_id, - MempoolEvent::Dropped { bundle_id, .. } => *bundle_id, + BundleEvent::Created { bundle_id, .. } => *bundle_id, + BundleEvent::Updated { bundle_id, .. } => *bundle_id, + BundleEvent::Cancelled { bundle_id, .. } => *bundle_id, + BundleEvent::BuilderIncluded { bundle_id, .. } => *bundle_id, + BundleEvent::FlashblockIncluded { bundle_id, .. } => *bundle_id, + BundleEvent::BlockIncluded { bundle_id, .. } => *bundle_id, + BundleEvent::Dropped { bundle_id, .. } => *bundle_id, } } pub fn transaction_ids(&self) -> Vec { match self { - MempoolEvent::Created { bundle, .. } | MempoolEvent::Updated { bundle, .. } => { + BundleEvent::Created { bundle, .. } | BundleEvent::Updated { bundle, .. } => { bundle .txs .iter() @@ -106,11 +106,34 @@ impl MempoolEvent { }) .collect() } - MempoolEvent::Cancelled { .. } => vec![], - MempoolEvent::BuilderIncluded { .. } => vec![], - MempoolEvent::FlashblockIncluded { .. } => vec![], - MempoolEvent::BlockIncluded { .. } => vec![], - MempoolEvent::Dropped { .. } => vec![], + BundleEvent::Cancelled { .. } => vec![], + BundleEvent::BuilderIncluded { .. } => vec![], + BundleEvent::FlashblockIncluded { .. } => vec![], + BundleEvent::BlockIncluded { .. } => vec![], + BundleEvent::Dropped { .. } => vec![], + } + } + + pub fn generate_event_key(&self) -> String { + match self { + BundleEvent::BlockIncluded { + bundle_id, + block_hash, + .. + } => { + format!("{}-{}", bundle_id, block_hash) + } + BundleEvent::FlashblockIncluded { + bundle_id, + block_number, + flashblock_index, + .. + } => { + format!("{}-{}-{}", bundle_id, block_number, flashblock_index) + } + _ => { + format!("{}-{}", self.bundle_id(), Uuid::new_v4()) + } } } } diff --git a/crates/audit/tests/common/mod.rs b/crates/audit/tests/common/mod.rs index 634f78a..4c5a67a 100644 --- a/crates/audit/tests/common/mod.rs +++ b/crates/audit/tests/common/mod.rs @@ -1,5 +1,5 @@ use rdkafka::producer::FutureProducer; -use rdkafka::{consumer::StreamConsumer, ClientConfig}; +use rdkafka::{ClientConfig, consumer::StreamConsumer}; use testcontainers::runners::AsyncRunner; use testcontainers_modules::{kafka, kafka::Kafka, minio::MinIO}; use uuid::Uuid; diff --git a/crates/audit/tests/integration_tests.rs b/crates/audit/tests/integration_tests.rs index ba41479..cd1e1e7 100644 --- a/crates/audit/tests/integration_tests.rs +++ b/crates/audit/tests/integration_tests.rs @@ -1,37 +1,37 @@ use alloy_rpc_types_mev::EthSendBundle; use std::time::Duration; use tips_audit::{ - publisher::{KafkaMempoolEventPublisher, MempoolEventPublisher}, - storage::{MempoolEventS3Reader, S3MempoolEventReaderWriter}, - types::{DropReason, MempoolEvent}, KafkaMempoolArchiver, KafkaMempoolReader, + publisher::{BundleEventPublisher, KafkaBundleEventPublisher}, + storage::{BundleEventS3Reader, S3EventReaderWriter}, + types::{BundleEvent, DropReason}, }; use uuid::Uuid; mod common; use common::TestHarness; #[tokio::test] -async fn test_kafka_publisher_s3_archiver_integration( -) -> Result<(), Box> { +async fn test_kafka_publisher_s3_archiver_integration() +-> Result<(), Box> { let harness = TestHarness::new().await?; let topic = "test-mempool-events"; let s3_writer = - S3MempoolEventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); let test_bundle_id = Uuid::new_v4(); let test_events = vec![ - MempoolEvent::Created { + BundleEvent::Created { bundle_id: test_bundle_id, bundle: EthSendBundle::default(), }, - MempoolEvent::Dropped { + BundleEvent::Dropped { bundle_id: test_bundle_id, reason: DropReason::TimedOut, }, ]; - let publisher = KafkaMempoolEventPublisher::new(harness.kafka_producer, topic.to_string()); + let publisher = KafkaBundleEventPublisher::new(harness.kafka_producer, topic.to_string()); for event in test_events.iter() { publisher.publish(event.clone()).await?; diff --git a/crates/audit/tests/s3_test.rs b/crates/audit/tests/s3_test.rs index 37a0c3f..baeb30e 100644 --- a/crates/audit/tests/s3_test.rs +++ b/crates/audit/tests/s3_test.rs @@ -1,10 +1,10 @@ -use alloy_primitives::{b256, bytes, Bytes, TxHash}; +use alloy_primitives::{Bytes, TxHash, b256, bytes}; use alloy_rpc_types_mev::EthSendBundle; use std::sync::Arc; use tips_audit::{ reader::Event, - storage::{MempoolEventS3Reader, MempoolEventWriter, S3MempoolEventReaderWriter}, - types::MempoolEvent, + storage::{BundleEventS3Reader, EventWriter, S3EventReaderWriter}, + types::BundleEvent, }; use tokio::task::JoinSet; use uuid::Uuid; @@ -13,7 +13,9 @@ mod common; use common::TestHarness; // https://basescan.org/tx/0x4f7ddfc911f5cf85dd15a413f4cbb2a0abe4f1ff275ed13581958c0bcf043c5e -const TXN_DATA: Bytes = bytes!("0x02f88f8221058304b6b3018315fb3883124f80948ff2f0a8d017c79454aa28509a19ab9753c2dd1480a476d58e1a0182426068c9ea5b00000000000000000002f84f00000000083e4fda54950000c080a086fbc7bbee41f441fb0f32f7aa274d2188c460fe6ac95095fa6331fa08ec4ce7a01aee3bcc3c28f7ba4e0c24da9ae85e9e0166c73cabb42c25ff7b5ecd424f3105"); +const TXN_DATA: Bytes = bytes!( + "0x02f88f8221058304b6b3018315fb3883124f80948ff2f0a8d017c79454aa28509a19ab9753c2dd1480a476d58e1a0182426068c9ea5b00000000000000000002f84f00000000083e4fda54950000c080a086fbc7bbee41f441fb0f32f7aa274d2188c460fe6ac95095fa6331fa08ec4ce7a01aee3bcc3c28f7ba4e0c24da9ae85e9e0166c73cabb42c25ff7b5ecd424f3105" +); const TXN_HASH: TxHash = b256!("0x4f7ddfc911f5cf85dd15a413f4cbb2a0abe4f1ff275ed13581958c0bcf043c5e"); @@ -24,26 +26,25 @@ fn create_test_bundle() -> EthSendBundle { } } -fn create_test_event(key: &str, timestamp: i64, mempool_event: MempoolEvent) -> Event { +fn create_test_event(key: &str, timestamp: i64, bundle_event: BundleEvent) -> Event { Event { key: key.to_string(), timestamp, - event: mempool_event, + event: bundle_event, } } #[tokio::test] async fn test_event_write_and_read() -> Result<(), Box> { let harness = TestHarness::new().await?; - let writer = - S3MempoolEventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + let writer = S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); let bundle_id = Uuid::new_v4(); let bundle = create_test_bundle(); let event = create_test_event( "test-key-1", 1234567890, - MempoolEvent::Created { + BundleEvent::Created { bundle_id, bundle: bundle.clone(), }, @@ -70,7 +71,7 @@ async fn test_event_write_and_read() -> Result<(), Box Result<(), Box Result<(), Box> { let harness = TestHarness::new().await?; - let writer = - S3MempoolEventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + let writer = S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); let bundle_id = Uuid::new_v4(); let bundle = create_test_bundle(); @@ -102,7 +102,7 @@ async fn test_events_appended() -> Result<(), Box Result<(), Box Result<(), Box Result<(), Box Result<(), Box> { let harness = TestHarness::new().await?; - let writer = - S3MempoolEventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + let writer = S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); let bundle_id = Uuid::new_v4(); let bundle = create_test_bundle(); let event = create_test_event( "duplicate-key", 1234567890, - MempoolEvent::Created { + BundleEvent::Created { bundle_id, bundle: bundle.clone(), }, @@ -182,8 +181,7 @@ async fn test_event_deduplication() -> Result<(), Box Result<(), Box> { let harness = TestHarness::new().await?; - let writer = - S3MempoolEventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + let writer = S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); let nonexistent_bundle_id = Uuid::new_v4(); let bundle_history = writer.get_bundle_history(nonexistent_bundle_id).await?; @@ -201,7 +199,7 @@ async fn test_nonexistent_data() -> Result<(), Box Result<(), Box> { let harness = TestHarness::new().await?; - let writer = Arc::new(S3MempoolEventReaderWriter::new( + let writer = Arc::new(S3EventReaderWriter::new( harness.s3_client.clone(), harness.bucket_name.clone(), )); @@ -212,7 +210,7 @@ async fn test_concurrent_writes_for_bundle() -> Result<(), Box Result<(), Box>, minimum_base_fee: Option, txn_hashes: Option>, @@ -33,7 +33,9 @@ struct BundleRow { block_number: Option, min_timestamp: Option, max_timestamp: Option, + #[sqlx(rename = "bundle_state")] state: BundleState, + state_changed_at: DateTime, } /// Filter criteria for selecting bundles @@ -42,6 +44,9 @@ pub struct BundleFilter { pub base_fee: Option, pub block_number: Option, pub timestamp: Option, + pub max_time_before: Option, + pub status: Option, + pub txn_hashes: Option>, } impl BundleFilter { @@ -63,6 +68,21 @@ impl BundleFilter { self.timestamp = Some(timestamp); self } + + pub fn with_status(mut self, status: BundleState) -> Self { + self.status = Some(status); + self + } + + pub fn with_txn_hashes(mut self, txn_hashes: Vec) -> Self { + self.txn_hashes = Some(txn_hashes); + self + } + + pub fn with_max_time_before(mut self, timestamp: u64) -> Self { + self.max_time_before = Some(timestamp); + self + } } /// Extended bundle data that includes the original bundle plus extracted metadata @@ -73,6 +93,47 @@ pub struct BundleWithMetadata { pub senders: Vec
, pub min_base_fee: i64, pub state: BundleState, + pub state_changed_at: DateTime, +} + +/// Statistics about bundles and transactions grouped by state +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct BundleStats { + pub ready_bundles: u64, + pub ready_transactions: u64, + pub included_by_builder_bundles: u64, + pub included_by_builder_transactions: u64, + pub total_bundles: u64, + pub total_transactions: u64, +} + +#[derive(Debug, Clone)] +pub struct BlockInfoRecord { + pub block_number: u64, + pub block_hash: B256, + pub finalized: bool, +} + +#[derive(Debug, Clone)] +pub struct BlockInfo { + pub latest_block_number: u64, + pub latest_block_hash: B256, + pub latest_finalized_block_number: Option, + pub latest_finalized_block_hash: Option, +} + +#[derive(Debug, Clone)] +pub struct BlockInfoUpdate { + pub block_number: u64, + pub block_hash: B256, +} + +#[derive(sqlx::FromRow, Debug)] +struct BlockInfoRow { + latest_block_number: Option, + latest_block_hash: Option, + latest_finalized_block_number: Option, + latest_finalized_block_hash: Option, } /// PostgreSQL implementation of the BundleDatastore trait @@ -123,7 +184,7 @@ impl PostgresDatastore { min_timestamp: row.min_timestamp.map(|t| t as u64), max_timestamp: row.max_timestamp.map(|t| t as u64), reverting_tx_hashes: parsed_reverting_tx_hashes?, - replacement_uuid: None, + replacement_uuid: Some(row.id.to_string()), dropping_tx_hashes: parsed_dropping_tx_hashes?, refund_percent: None, refund_recipient: None, @@ -151,6 +212,7 @@ impl PostgresDatastore { senders: parsed_senders?, min_base_fee: row.minimum_base_fee.unwrap_or(0), state: row.state, + state_changed_at: row.state_changed_at, }) } @@ -212,12 +274,12 @@ impl BundleDatastore for PostgresDatastore { sqlx::query!( r#" INSERT INTO bundles ( - id, "state", senders, minimum_base_fee, txn_hashes, + id, bundle_state, senders, minimum_base_fee, txn_hashes, txs, reverting_tx_hashes, dropping_tx_hashes, block_number, min_timestamp, max_timestamp, - created_at, updated_at + created_at, updated_at, state_changed_at ) - VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, NOW(), NOW()) + VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, NOW(), NOW(), NOW()) "#, id, BundleState::Ready as BundleState, @@ -240,9 +302,9 @@ impl BundleDatastore for PostgresDatastore { async fn get_bundle(&self, id: Uuid) -> Result> { let result = sqlx::query_as::<_, BundleRow>( r#" - SELECT senders, minimum_base_fee, txn_hashes, txs, reverting_tx_hashes, - dropping_tx_hashes, block_number, min_timestamp, max_timestamp, "state" - FROM bundles + SELECT id, senders, minimum_base_fee, txn_hashes, txs, reverting_tx_hashes, + dropping_tx_hashes, block_number, min_timestamp, max_timestamp, bundle_state, state_changed_at + FROM bundles WHERE id = $1 "#, ) @@ -268,32 +330,32 @@ impl BundleDatastore for PostgresDatastore { } async fn select_bundles(&self, filter: BundleFilter) -> Result> { - let base_fee = filter.base_fee.unwrap_or(0); - let block_number = filter.block_number.unwrap_or(0) as i64; - - let (min_ts, max_ts) = if let Some(timestamp) = filter.timestamp { - (timestamp as i64, timestamp as i64) - } else { - // If not specified, set the parameters to be the whole range - (i64::MAX, 0i64) - }; + // Convert txn_hashes to string array for SQL binding + let txn_hash_strings: Option> = filter + .txn_hashes + .map(|hashes| hashes.iter().map(|h| h.encode_hex_with_prefix()).collect()); let rows = sqlx::query_as::<_, BundleRow>( r#" - SELECT senders, minimum_base_fee, txn_hashes, txs, reverting_tx_hashes, - dropping_tx_hashes, block_number, min_timestamp, max_timestamp, "state" - FROM bundles - WHERE minimum_base_fee >= $1 - AND (block_number = $2 OR block_number IS NULL OR block_number = 0 OR $2 = 0) - AND (min_timestamp <= $3 OR min_timestamp IS NULL) - AND (max_timestamp >= $4 OR max_timestamp IS NULL) + SELECT id, senders, minimum_base_fee, txn_hashes, txs, reverting_tx_hashes, + dropping_tx_hashes, block_number, min_timestamp, max_timestamp, bundle_state, state_changed_at + FROM bundles + WHERE ($1::bigint IS NULL OR minimum_base_fee >= $1) + AND ($2::bigint IS NULL OR block_number = $2 OR block_number IS NULL OR block_number = 0) + AND ($3::bigint IS NULL OR min_timestamp <= $3 OR min_timestamp IS NULL) + AND ($3::bigint IS NULL OR max_timestamp >= $3 OR max_timestamp IS NULL) + AND ($4::bundle_state IS NULL OR bundle_state = $4) + AND ($5::text[] IS NULL OR txn_hashes::text[] && $5) + AND ($6::bigint IS NULL OR max_timestamp < $6) ORDER BY minimum_base_fee DESC "#, ) - .bind(base_fee) - .bind(block_number) - .bind(min_ts) - .bind(max_ts) + .bind(filter.base_fee) + .bind(filter.block_number.map(|n| n as i64)) + .bind(filter.timestamp.map(|t| t as i64)) + .bind(filter.status) + .bind(txn_hash_strings) + .bind(filter.max_time_before.map(|t| t as i64)) .fetch_all(&self.pool) .await?; @@ -324,11 +386,213 @@ impl BundleDatastore for PostgresDatastore { Ok(result) } - async fn remove_bundle(&self, id: Uuid) -> Result<()> { - sqlx::query("DELETE FROM bundles WHERE id = $1") - .bind(id) + async fn remove_bundles(&self, ids: Vec) -> Result { + if ids.is_empty() { + return Ok(0); + } + + let result = sqlx::query("DELETE FROM bundles WHERE id = ANY($1)") + .bind(&ids) + .execute(&self.pool) + .await?; + Ok(result.rows_affected() as usize) + } + + async fn update_bundles_state( + &self, + uuids: Vec, + allowed_prev_states: Vec, + new_state: BundleState, + ) -> Result> { + let prev_states_sql: Vec = allowed_prev_states + .iter() + .map(|s| match s { + BundleState::Ready => "Ready".to_string(), + BundleState::IncludedByBuilder => "IncludedByBuilder".to_string(), + }) + .collect(); + let rows = sqlx::query!( + r#" + UPDATE bundles + SET bundle_state = $1, updated_at = NOW(), state_changed_at = NOW() + WHERE id = ANY($2) AND bundle_state::text = ANY($3) + RETURNING id + "#, + new_state as BundleState, + &uuids, + &prev_states_sql + ) + .fetch_all(&self.pool) + .await?; + + Ok(rows.into_iter().map(|row| row.id).collect()) + } + + async fn get_current_block_info(&self) -> Result> { + let row = sqlx::query_as::<_, BlockInfoRow>( + r#" + SELECT + (SELECT block_number FROM maintenance ORDER BY block_number DESC LIMIT 1) as latest_block_number, + (SELECT block_hash FROM maintenance ORDER BY block_number DESC LIMIT 1) as latest_block_hash, + (SELECT block_number FROM maintenance WHERE finalized = true ORDER BY block_number DESC LIMIT 1) as latest_finalized_block_number, + (SELECT block_hash FROM maintenance WHERE finalized = true ORDER BY block_number DESC LIMIT 1) as latest_finalized_block_hash + "# + ) + .fetch_one(&self.pool) + .await?; + + // If there's no latest block, return None + let (latest_block_number, latest_block_hash) = + match (row.latest_block_number, row.latest_block_hash) { + (Some(block_number), Some(hash_str)) => { + let hash = B256::from_hex(&hash_str) + .map_err(|e| anyhow::anyhow!("Failed to parse latest block hash: {}", e))?; + (block_number as u64, hash) + } + _ => return Ok(None), + }; + + let latest_finalized_block_hash = if let Some(hash_str) = row.latest_finalized_block_hash { + Some(B256::from_hex(&hash_str).map_err(|e| { + anyhow::anyhow!("Failed to parse latest finalized block hash: {}", e) + })?) + } else { + None + }; + + Ok(Some(BlockInfo { + latest_block_number, + latest_block_hash, + latest_finalized_block_number: row.latest_finalized_block_number.map(|n| n as u64), + latest_finalized_block_hash, + })) + } + + async fn commit_block_info(&self, blocks: Vec) -> Result<()> { + for block in blocks { + let block_hash_str = block.block_hash.encode_hex_with_prefix(); + + sqlx::query!( + r#" + INSERT INTO maintenance (block_number, block_hash, finalized) + VALUES ($1, $2, false) + ON CONFLICT (block_number) + DO UPDATE SET block_hash = EXCLUDED.block_hash, finalized = false + "#, + block.block_number as i64, + block_hash_str, + ) .execute(&self.pool) .await?; + } Ok(()) } + + async fn finalize_blocks_before(&self, block_number: u64) -> Result { + let result = sqlx::query!( + "UPDATE maintenance SET finalized = true WHERE block_number < $1 AND finalized = false", + block_number as i64 + ) + .execute(&self.pool) + .await?; + + Ok(result.rows_affected()) + } + + async fn prune_finalized_blocks(&self, before_block_number: u64) -> Result { + let result = sqlx::query!( + "DELETE FROM maintenance WHERE finalized = true AND block_number < $1", + before_block_number as i64 + ) + .execute(&self.pool) + .await?; + + Ok(result.rows_affected()) + } + + async fn get_stats(&self) -> Result { + let result = sqlx::query!( + r#" + SELECT + bundle_state::text as bundle_state_text, + COUNT(*) as bundle_count, + SUM(COALESCE(array_length(txn_hashes, 1), 0)) as transaction_count + FROM bundles + GROUP BY bundle_state + "# + ) + .fetch_all(&self.pool) + .await?; + + let mut stats = BundleStats { + ready_bundles: 0, + ready_transactions: 0, + included_by_builder_bundles: 0, + included_by_builder_transactions: 0, + total_bundles: 0, + total_transactions: 0, + }; + + for row in result { + let bundle_count = row.bundle_count.unwrap_or(0) as u64; + let transaction_count = row.transaction_count.unwrap_or(0) as u64; + + stats.total_bundles += bundle_count; + stats.total_transactions += transaction_count; + + if let Some(state_text) = row.bundle_state_text { + match state_text.as_str() { + "Ready" => { + stats.ready_bundles = bundle_count; + stats.ready_transactions = transaction_count; + } + "IncludedByBuilder" => { + stats.included_by_builder_bundles = bundle_count; + stats.included_by_builder_transactions = transaction_count; + } + _ => { + // Unknown state, just add to totals + } + } + } + } + + Ok(stats) + } + + async fn remove_timed_out_bundles(&self, current_time: u64) -> Result> { + let rows = sqlx::query_scalar::<_, Uuid>( + r#" + DELETE FROM bundles + WHERE bundle_state = 'Ready' + AND max_timestamp IS NOT NULL + AND max_timestamp < $1 + RETURNING id + "#, + ) + .bind(current_time as i64) + .fetch_all(&self.pool) + .await?; + + Ok(rows) + } + + async fn remove_old_included_bundles( + &self, + cutoff_timestamp: DateTime, + ) -> Result> { + let rows = sqlx::query_scalar::<_, Uuid>( + r#" + DELETE FROM bundles + WHERE bundle_state = 'IncludedByBuilder' + AND state_changed_at < $1 + RETURNING id + "#, + ) + .bind(cutoff_timestamp) + .fetch_all(&self.pool) + .await?; + + Ok(rows) + } } diff --git a/crates/datastore/src/traits.rs b/crates/datastore/src/traits.rs index e5e58f2..f58b2d9 100644 --- a/crates/datastore/src/traits.rs +++ b/crates/datastore/src/traits.rs @@ -1,7 +1,10 @@ -use crate::postgres::{BundleFilter, BundleWithMetadata}; +use crate::postgres::{ + BlockInfo, BlockInfoUpdate, BundleFilter, BundleState, BundleStats, BundleWithMetadata, +}; use alloy_primitives::TxHash; use alloy_rpc_types_mev::EthSendBundle; use anyhow::Result; +use sqlx::types::chrono::{DateTime, Utc}; use uuid::Uuid; /// Trait defining the interface for bundle datastore operations @@ -22,6 +25,41 @@ pub trait BundleDatastore: Send + Sync { /// Find bundle ID by transaction hash async fn find_bundle_by_transaction_hash(&self, tx_hash: TxHash) -> Result>; - /// Remove a bundle by ID - async fn remove_bundle(&self, id: Uuid) -> Result<()>; + /// Remove bundles by IDs + async fn remove_bundles(&self, ids: Vec) -> Result; + + /// Update bundle states for multiple bundles + /// Returns the number of rows that were actually updated + async fn update_bundles_state( + &self, + uuids: Vec, + allowed_prev_states: Vec, + new_state: BundleState, + ) -> Result>; + + /// Get the current block info (latest block and non finalized blocks) + async fn get_current_block_info(&self) -> Result>; + + /// Commit the latest block info (upsert vec of block nums/hashes should be non finalized) + async fn commit_block_info(&self, blocks: Vec) -> Result<()>; + + /// Finalize all blocks before the given block number (one-way operation) + async fn finalize_blocks_before(&self, block_number: u64) -> Result; + + /// Prune blocks that are finalized before block number X + async fn prune_finalized_blocks(&self, before_block_number: u64) -> Result; + + /// Get statistics about bundles and transactions grouped by state + async fn get_stats(&self) -> Result; + + /// Remove bundles that have timed out (max_timestamp < current_time) + /// Returns the UUIDs of bundles that were removed + async fn remove_timed_out_bundles(&self, current_time: u64) -> Result>; + + /// Remove old IncludedByBuilder bundles that were last updated before the given timestamp + /// Returns the UUIDs of bundles that were removed + async fn remove_old_included_bundles( + &self, + cutoff_timestamp: DateTime, + ) -> Result>; } diff --git a/crates/datastore/tests/datastore.rs b/crates/datastore/tests/datastore.rs index cf2a4af..8e71a3a 100644 --- a/crates/datastore/tests/datastore.rs +++ b/crates/datastore/tests/datastore.rs @@ -1,11 +1,12 @@ use alloy_primitives::{Address, Bytes, TxHash, address, b256, bytes}; use alloy_rpc_types_mev::EthSendBundle; use sqlx::PgPool; +use sqlx::types::chrono::Utc; use testcontainers_modules::{ postgres, testcontainers::{ContainerAsync, runners::AsyncRunner}, }; -use tips_datastore::postgres::{BundleFilter, BundleState}; +use tips_datastore::postgres::{BlockInfoUpdate, BundleFilter, BundleState}; use tips_datastore::{BundleDatastore, PostgresDatastore}; struct TestHarness { @@ -301,3 +302,253 @@ async fn cancel_bundle_workflow() -> eyre::Result<()> { Ok(()) } + +#[tokio::test] +async fn find_bundle_by_transaction_hash() -> eyre::Result<()> { + let harness = setup_datastore().await?; + let test_bundle = create_test_bundle_with_reverting_tx()?; + + let bundle_id = harness + .data_store + .insert_bundle(test_bundle) + .await + .expect("Failed to insert bundle"); + + let found_id = harness + .data_store + .find_bundle_by_transaction_hash(TX_HASH) + .await + .expect("Failed to find bundle by transaction hash"); + assert_eq!(found_id, Some(bundle_id)); + + let nonexistent_hash = + b256!("0x1234567890123456789012345678901234567890123456789012345678901234"); + let not_found = harness + .data_store + .find_bundle_by_transaction_hash(nonexistent_hash) + .await + .expect("Failed to search for nonexistent hash"); + assert_eq!(not_found, None); + + Ok(()) +} + +#[tokio::test] +async fn remove_bundles() -> eyre::Result<()> { + let harness = setup_datastore().await?; + + let bundle1 = create_test_bundle(100, None, None)?; + let bundle2 = create_test_bundle(200, None, None)?; + + let id1 = harness.data_store.insert_bundle(bundle1).await.unwrap(); + let id2 = harness.data_store.insert_bundle(bundle2).await.unwrap(); + + let removed_count = harness + .data_store + .remove_bundles(vec![id1, id2]) + .await + .unwrap(); + assert_eq!(removed_count, 2); + + assert!(harness.data_store.get_bundle(id1).await.unwrap().is_none()); + assert!(harness.data_store.get_bundle(id2).await.unwrap().is_none()); + + let empty_removal = harness.data_store.remove_bundles(vec![]).await.unwrap(); + assert_eq!(empty_removal, 0); + + Ok(()) +} + +#[tokio::test] +async fn update_bundles_state() -> eyre::Result<()> { + let harness = setup_datastore().await?; + + let bundle1 = create_test_bundle(100, None, None)?; + let bundle2 = create_test_bundle(200, None, None)?; + + let id1 = harness.data_store.insert_bundle(bundle1).await.unwrap(); + let id2 = harness.data_store.insert_bundle(bundle2).await.unwrap(); + + let updated_ids = harness + .data_store + .update_bundles_state( + vec![id1, id2], + vec![BundleState::Ready], + BundleState::IncludedByBuilder, + ) + .await + .unwrap(); + assert_eq!(updated_ids.len(), 2); + assert!(updated_ids.contains(&id1)); + assert!(updated_ids.contains(&id2)); + + let bundle1_meta = harness.data_store.get_bundle(id1).await.unwrap().unwrap(); + assert!(matches!(bundle1_meta.state, BundleState::IncludedByBuilder)); + + Ok(()) +} + +#[tokio::test] +async fn block_info_operations() -> eyre::Result<()> { + let harness = setup_datastore().await?; + + let initial_info = harness.data_store.get_current_block_info().await.unwrap(); + assert!(initial_info.is_none()); + + let blocks = vec![ + BlockInfoUpdate { + block_number: 100, + block_hash: b256!("0x1111111111111111111111111111111111111111111111111111111111111111"), + }, + BlockInfoUpdate { + block_number: 101, + block_hash: b256!("0x2222222222222222222222222222222222222222222222222222222222222222"), + }, + ]; + + harness.data_store.commit_block_info(blocks).await.unwrap(); + + let block_info = harness + .data_store + .get_current_block_info() + .await + .unwrap() + .unwrap(); + assert_eq!(block_info.latest_block_number, 101); + assert!(block_info.latest_finalized_block_number.is_none()); + + let finalized_count = harness + .data_store + .finalize_blocks_before(101) + .await + .unwrap(); + assert_eq!(finalized_count, 1); + + let updated_info = harness + .data_store + .get_current_block_info() + .await + .unwrap() + .unwrap(); + assert_eq!(updated_info.latest_finalized_block_number, Some(100)); + + let pruned_count = harness + .data_store + .prune_finalized_blocks(101) + .await + .unwrap(); + assert_eq!(pruned_count, 1); + + Ok(()) +} + +#[tokio::test] +async fn get_stats() -> eyre::Result<()> { + let harness = setup_datastore().await?; + + let stats = harness.data_store.get_stats().await.unwrap(); + assert_eq!(stats.total_bundles, 0); + assert_eq!(stats.total_transactions, 0); + + let bundle1 = create_test_bundle(100, None, None)?; + let bundle2 = create_test_bundle(200, None, None)?; + + let id1 = harness.data_store.insert_bundle(bundle1).await.unwrap(); + harness.data_store.insert_bundle(bundle2).await.unwrap(); + + harness + .data_store + .update_bundles_state( + vec![id1], + vec![BundleState::Ready], + BundleState::IncludedByBuilder, + ) + .await + .unwrap(); + + let updated_stats = harness.data_store.get_stats().await.unwrap(); + assert_eq!(updated_stats.total_bundles, 2); + assert_eq!(updated_stats.ready_bundles, 1); + assert_eq!(updated_stats.included_by_builder_bundles, 1); + + Ok(()) +} + +#[tokio::test] +async fn remove_timed_out_bundles() -> eyre::Result<()> { + let harness = setup_datastore().await?; + + let expired_bundle = create_test_bundle(100, None, Some(1000))?; + let valid_bundle = create_test_bundle(200, None, Some(2000))?; + let no_timestamp_bundle = create_test_bundle(300, None, None)?; + + harness + .data_store + .insert_bundle(expired_bundle) + .await + .unwrap(); + harness + .data_store + .insert_bundle(valid_bundle) + .await + .unwrap(); + harness + .data_store + .insert_bundle(no_timestamp_bundle) + .await + .unwrap(); + + let removed_ids = harness + .data_store + .remove_timed_out_bundles(1500) + .await + .unwrap(); + assert_eq!(removed_ids.len(), 1); + + let remaining_bundles = harness + .data_store + .select_bundles(BundleFilter::new()) + .await + .unwrap(); + assert_eq!(remaining_bundles.len(), 2); + + Ok(()) +} + +#[tokio::test] +async fn remove_old_included_bundles() -> eyre::Result<()> { + let harness = setup_datastore().await?; + + let bundle1 = create_test_bundle(100, None, None)?; + let bundle2 = create_test_bundle(200, None, None)?; + + let id1 = harness.data_store.insert_bundle(bundle1).await.unwrap(); + let id2 = harness.data_store.insert_bundle(bundle2).await.unwrap(); + + harness + .data_store + .update_bundles_state( + vec![id1, id2], + vec![BundleState::Ready], + BundleState::IncludedByBuilder, + ) + .await + .unwrap(); + + let cutoff = Utc::now(); + let removed_ids = harness + .data_store + .remove_old_included_bundles(cutoff) + .await + .unwrap(); + assert_eq!(removed_ids.len(), 2); + + let remaining_bundles = harness + .data_store + .select_bundles(BundleFilter::new()) + .await + .unwrap(); + assert_eq!(remaining_bundles.len(), 0); + + Ok(()) +} diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index b76a1d4..13a581b 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -1,15 +1,17 @@ [package] name = "tips-ingress-rpc" -version = "0.1.0" -edition = "2024" +version.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +edition.workspace = true [[bin]] name = "tips-ingress-rpc" path = "src/main.rs" [dependencies] -tips-datastore.workspace = true -tips-audit.workspace = true jsonrpsee.workspace = true alloy-rpc-types-mev.workspace = true alloy-primitives.workspace = true @@ -23,11 +25,9 @@ clap.workspace = true url.workspace = true alloy-consensus.workspace = true op-alloy-consensus.workspace = true -eyre.workspace = true dotenvy.workspace = true rdkafka.workspace = true reth-rpc-eth-types.workspace = true -serde.workspace = true serde_json.workspace = true async-trait.workspace = true backon.workspace = true @@ -35,4 +35,3 @@ op-revm.workspace = true revm-context-interface.workspace = true alloy-signer-local.workspace = true reth-optimism-evm.workspace = true -reth-errors.workspace = true diff --git a/crates/ingress-rpc/Dockerfile b/crates/ingress-rpc/Dockerfile index 97c27d0..0ec3bd8 100644 --- a/crates/ingress-rpc/Dockerfile +++ b/crates/ingress-rpc/Dockerfile @@ -1,5 +1,7 @@ FROM rust:1-bookworm AS base +RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config + RUN cargo install cargo-chef --locked WORKDIR /app diff --git a/crates/ingress-rpc/src/main.rs b/crates/ingress-rpc/src/main.rs index 4a4fd32..07e6c27 100644 --- a/crates/ingress-rpc/src/main.rs +++ b/crates/ingress-rpc/src/main.rs @@ -56,6 +56,14 @@ struct Config { #[arg(long, env = "TIPS_INGRESS_LOG_LEVEL", default_value = "info")] log_level: String, + + /// Default lifetime for sent transactions in seconds (default: 3 hours) + #[arg( + long, + env = "TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS", + default_value = "10800" + )] + send_transaction_default_lifetime_seconds: u64, } #[tokio::main] @@ -105,7 +113,12 @@ async fn main() -> anyhow::Result<()> { let queue = KafkaQueuePublisher::new(queue_producer, config.queue_topic); - let service = IngressService::new(provider, config.dual_write_mempool, queue); + let service = IngressService::new( + provider, + config.dual_write_mempool, + queue, + config.send_transaction_default_lifetime_seconds, + ); let bind_addr = format!("{}:{}", config.address, config.port); let server = Server::builder().build(&bind_addr).await?; diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 17a67a1..1cda9d9 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -10,6 +10,7 @@ use jsonrpsee::{ use op_alloy_consensus::OpTxEnvelope; use op_alloy_network::Optimism; use reth_rpc_eth_types::EthApiError; +use std::time::{SystemTime, UNIX_EPOCH}; use tracing::{info, warn}; use crate::queue::QueuePublisher; @@ -33,14 +34,21 @@ pub struct IngressService { provider: RootProvider, dual_write_mempool: bool, queue: Queue, + send_transaction_default_lifetime_seconds: u64, } impl IngressService { - pub fn new(provider: RootProvider, dual_write_mempool: bool, queue: Queue) -> Self { + pub fn new( + provider: RootProvider, + dual_write_mempool: bool, + queue: Queue, + send_transaction_default_lifetime_seconds: u64, + ) -> Self { Self { provider, dual_write_mempool, queue, + send_transaction_default_lifetime_seconds, } } } @@ -88,11 +96,17 @@ where // TODO: parallelize DB and mempool setup + let expiry_timestamp = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap() + .as_secs() + + self.send_transaction_default_lifetime_seconds; + let bundle = EthSendBundle { txs: vec![data.clone()], block_number: 0, min_timestamp: None, - max_timestamp: None, + max_timestamp: Some(expiry_timestamp), reverting_tx_hashes: vec![transaction.tx_hash()], ..Default::default() }; diff --git a/crates/ingress-rpc/src/validation.rs b/crates/ingress-rpc/src/validation.rs index 4d075e9..54d8a32 100644 --- a/crates/ingress-rpc/src/validation.rs +++ b/crates/ingress-rpc/src/validation.rs @@ -6,7 +6,6 @@ use jsonrpsee::core::RpcResult; use op_alloy_consensus::interop::CROSS_L2_INBOX_ADDRESS; use op_alloy_network::Optimism; use op_revm::{OpSpecId, l1block::L1BlockInfo}; -use reth_errors::RethError; use reth_optimism_evm::extract_l1_info_from_tx; use reth_rpc_eth_types::{EthApiError, RpcInvalidTransactionError, SignError}; use tracing::warn; @@ -62,12 +61,12 @@ impl L1BlockInfoLookup for RootProvider { .ok_or_else(|| EthApiError::HeaderNotFound(block_number.into()).into_rpc_err())?; let txs = block.transactions.clone(); - let first_tx = txs.first_transaction().ok_or_else(|| { - EthApiError::Internal(RethError::msg("No full transactions found")).into_rpc_err() - })?; + let first_tx = txs + .first_transaction() + .ok_or_else(|| EthApiError::InternalEthError.into_rpc_err())?; Ok(extract_l1_info_from_tx(&first_tx.clone()) - .map_err(|e| EthApiError::Internal(RethError::msg(e.to_string())))?) + .map_err(|_| EthApiError::InternalEthError.into_rpc_err())?) } } diff --git a/crates/ingress-writer/Cargo.toml b/crates/ingress-writer/Cargo.toml index 5a7ab1e..2eda385 100644 --- a/crates/ingress-writer/Cargo.toml +++ b/crates/ingress-writer/Cargo.toml @@ -1,7 +1,11 @@ [package] name = "tips-ingress-writer" -version = "0.1.0" -edition = "2024" +version.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +edition.workspace = true [[bin]] name = "tips-ingress-writer" @@ -19,6 +23,5 @@ clap.workspace = true dotenvy.workspace = true rdkafka.workspace = true serde_json.workspace = true -async-trait.workspace = true backon.workspace = true uuid.workspace = true diff --git a/crates/ingress-writer/Dockerfile b/crates/ingress-writer/Dockerfile index d44fe80..52adfe7 100644 --- a/crates/ingress-writer/Dockerfile +++ b/crates/ingress-writer/Dockerfile @@ -1,5 +1,7 @@ FROM rust:1-bookworm AS base +RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config + RUN cargo install cargo-chef --locked WORKDIR /app diff --git a/crates/ingress-writer/src/main.rs b/crates/ingress-writer/src/main.rs index 1309277..3e3f122 100644 --- a/crates/ingress-writer/src/main.rs +++ b/crates/ingress-writer/src/main.rs @@ -8,7 +8,7 @@ use rdkafka::{ message::Message, producer::FutureProducer, }; -use tips_audit::{KafkaMempoolEventPublisher, MempoolEvent, MempoolEventPublisher}; +use tips_audit::{BundleEvent, BundleEventPublisher, KafkaBundleEventPublisher}; use tips_datastore::{BundleDatastore, postgres::PostgresDatastore}; use tokio::time::Duration; use tracing::{debug, error, info, warn}; @@ -47,7 +47,7 @@ pub struct IngressWriter { impl IngressWriter where Store: BundleDatastore + Send + Sync + 'static, - Publisher: MempoolEventPublisher + Sync + Send + 'static, + Publisher: BundleEventPublisher + Sync + Send + 'static, { pub fn new( queue_consumer: StreamConsumer, @@ -109,13 +109,13 @@ where async fn publish(&self, bundle_id: Uuid, bundle: &EthSendBundle) { if let Err(e) = self .publisher - .publish(MempoolEvent::Created { + .publish(BundleEvent::Created { bundle_id, bundle: bundle.clone(), }) .await { - warn!(error = %e, bundle_id = %bundle_id, "Failed to publish MempoolEvent::Created"); + warn!(error = %e, bundle_id = %bundle_id, "Failed to publish BundleEvent::Created"); } } } @@ -143,7 +143,7 @@ async fn main() -> Result<()> { .set("message.timeout.ms", "5000") .create()?; - let publisher = KafkaMempoolEventPublisher::new(kafka_producer, "tips-audit".to_string()); + let publisher = KafkaBundleEventPublisher::new(kafka_producer, "tips-audit".to_string()); let consumer = config.create()?; let bundle_store = PostgresDatastore::connect(args.database_url).await?; diff --git a/crates/maintenance/Cargo.toml b/crates/maintenance/Cargo.toml index 9d7eec6..d94fd55 100644 --- a/crates/maintenance/Cargo.toml +++ b/crates/maintenance/Cargo.toml @@ -1,7 +1,11 @@ [package] name = "tips-maintenance" -version = "0.1.0" -edition = "2024" +version.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +edition.workspace = true [[bin]] name = "tips-maintenance" @@ -10,6 +14,7 @@ path = "src/main.rs" [dependencies] tips-datastore.workspace = true tips-audit.workspace = true +op-alloy-consensus.workspace = true alloy-provider.workspace = true alloy-primitives.workspace = true alloy-rpc-types.workspace = true @@ -21,5 +26,9 @@ anyhow.workspace = true clap.workspace = true dotenvy.workspace = true rdkafka.workspace = true -serde_json.workspace = true -url.workspace = true \ No newline at end of file +url.workspace = true +uuid.workspace = true +op-alloy-rpc-types.workspace = true +base-reth-flashblocks-rpc.workspace = true +alloy-rpc-types-mev.workspace = true +sqlx.workspace = true diff --git a/crates/maintenance/Dockerfile b/crates/maintenance/Dockerfile index b3e080f..ead4a07 100644 --- a/crates/maintenance/Dockerfile +++ b/crates/maintenance/Dockerfile @@ -1,5 +1,7 @@ FROM rust:1-bookworm AS base +RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config + RUN cargo install cargo-chef --locked WORKDIR /app diff --git a/crates/maintenance/src/job.rs b/crates/maintenance/src/job.rs new file mode 100644 index 0000000..835f1a7 --- /dev/null +++ b/crates/maintenance/src/job.rs @@ -0,0 +1,487 @@ +use crate::Args; +use alloy_primitives::TxHash; +use alloy_primitives::map::HashMap; +use alloy_provider::Provider; +use alloy_rpc_types::BlockId; +use alloy_rpc_types::BlockNumberOrTag::Latest; +use alloy_rpc_types::eth::Block; +use anyhow::Result; +use base_reth_flashblocks_rpc::subscription::{Flashblock, FlashblocksReceiver}; +use op_alloy_consensus::OpTxEnvelope; +use op_alloy_network::eip2718::Decodable2718; +use op_alloy_network::{Optimism, TransactionResponse}; +use op_alloy_rpc_types::Transaction; +use sqlx::types::chrono::Utc; +use std::collections::HashSet; +use std::time::Duration; +use tips_audit::{BundleEvent, BundleEventPublisher, DropReason}; +use tips_datastore::BundleDatastore; +use tips_datastore::postgres::{BundleFilter, BundleState, BundleWithMetadata}; +use tokio::sync::mpsc; +use tracing::{error, info, warn}; +use uuid::Uuid; + +pub struct MaintenanceJob, K: BundleEventPublisher> { + pub store: S, + pub node: P, + pub publisher: K, + pub args: Args, + fb_tx: mpsc::UnboundedSender, +} + +impl, K: BundleEventPublisher> MaintenanceJob { + pub fn new( + store: S, + node: P, + publisher: K, + args: Args, + fb_tx: mpsc::UnboundedSender, + ) -> Self { + Self { + store, + node, + publisher, + args, + fb_tx, + } + } + + async fn execute(&self) -> Result<()> { + let latest_block = self + .node + .get_block(BlockId::Number(Latest)) + .full() + .await? + .ok_or_else(|| anyhow::anyhow!("Failed to get latest block"))?; + + let block_info = self.store.get_current_block_info().await?; + + if let Some(current_block_info) = block_info { + if latest_block.header.number > current_block_info.latest_block_number { + // Process all blocks between stored latest and current latest + for block_num in + (current_block_info.latest_block_number + 1)..=latest_block.header.number + { + let block = self + .node + .get_block(BlockId::Number(alloy_rpc_types::BlockNumberOrTag::Number( + block_num, + ))) + .full() + .await? + .ok_or_else(|| anyhow::anyhow!("Failed to get block {}", block_num))?; + + self.on_new_block(block).await?; + } + } + } else { + warn!("No block info found in database, initializing with latest block as finalized"); + let block_update = tips_datastore::postgres::BlockInfoUpdate { + block_number: latest_block.header.number, + block_hash: latest_block.header.hash, + }; + self.store.commit_block_info(vec![block_update]).await?; + self.store + .finalize_blocks_before(latest_block.header.number + 1) + .await?; + } + + // Finalize blocks that are old enough + if latest_block.header.number > self.args.finalization_depth { + self.store + .finalize_blocks_before(latest_block.header.number - self.args.finalization_depth) + .await?; + } + + Ok(()) + } + + async fn periodic_maintenance(&self) -> Result<()> { + let cutoff_time = Utc::now() - Duration::from_secs(self.args.finalization_depth * 2); + + let removed_included_bundle_uuids = + self.store.remove_old_included_bundles(cutoff_time).await?; + + if !removed_included_bundle_uuids.is_empty() { + info!( + deleted_count = removed_included_bundle_uuids.len(), + "Removed old included bundles" + ); + } + + let current_time = Utc::now().timestamp() as u64; + + let expired_bundle_uuids = self.store.remove_timed_out_bundles(current_time).await?; + + if !expired_bundle_uuids.is_empty() { + let events: Vec = expired_bundle_uuids + .iter() + .map(|&bundle_id| BundleEvent::Dropped { + bundle_id, + reason: DropReason::TimedOut, + }) + .collect(); + + self.publisher.publish_all(events).await?; + + info!( + deleted_count = expired_bundle_uuids.len(), + "Deleted expired bundles with timeout" + ); + } + + Ok(()) + } + + pub async fn run(&self, mut fb_rx: mpsc::UnboundedReceiver) -> Result<()> { + let mut maintenance_interval = + tokio::time::interval(Duration::from_millis(self.args.maintenance_interval_ms)); + let mut execution_interval = + tokio::time::interval(Duration::from_millis(self.args.rpc_poll_interval)); + + loop { + tokio::select! { + _ = maintenance_interval.tick() => { + match self.periodic_maintenance().await { + Ok(_) => { + info!("Periodic maintenance completed"); + }, + Err(err) => { + error!("Error in periodic maintenance: {:?}", err); + } + + } + } + _ = execution_interval.tick() => { + match self.execute().await { + Ok(_) => { + info!("Successfully executed maintenance run"); + } + Err(e) => { + error!("Error executing maintenance run: {:?}", e); + } + } + } + Some(flashblock) = fb_rx.recv() => { + match self.process_flashblock(flashblock).await { + Ok(_) => { + info!("Successfully processed flashblock"); + } + Err(e) => { + error!("Error processing flashblock: {:?}", e); + } + } + } + } + } + } + + pub async fn process_transactions(&self, transaction_hashes: Vec) -> Result> { + let filter = BundleFilter::new() + .with_status(BundleState::Ready) + .with_txn_hashes(transaction_hashes.clone()); + + let bundles = self.store.select_bundles(filter).await?; + + if bundles.is_empty() { + return Ok(vec![]); + } + + let bundle_match = map_transactions_to_bundles(bundles, transaction_hashes); + Ok(bundle_match + .matched + .values() + .map(|uuid_str| Uuid::parse_str(uuid_str).unwrap()) + .collect()) + } + + pub async fn on_new_block(&self, block: Block) -> Result<()> { + let transaction_hashes: Vec = block + .transactions + .as_transactions() + .unwrap_or(&[]) + .iter() + .filter(|tx| !tx.inner.inner.is_deposit()) + .map(|tx| tx.tx_hash()) + .collect(); + + if transaction_hashes.is_empty() { + return Ok(()); + } + + let bundle_uuids = self.process_transactions(transaction_hashes).await?; + + if !bundle_uuids.is_empty() && self.args.update_included_by_builder { + let updated_uuids = self + .store + .update_bundles_state( + bundle_uuids.clone(), + vec![BundleState::Ready], + BundleState::IncludedByBuilder, + ) + .await?; + + info!( + updated_count = updated_uuids.len(), + block_hash = %block.header.hash, + "Updated bundle states to IncludedByBuilder" + ); + } + + let events: Vec = bundle_uuids + .into_iter() + .map(|bundle_id| BundleEvent::BlockIncluded { + bundle_id, + block_number: block.header.number, + block_hash: block.header.hash, + }) + .collect(); + + self.publisher.publish_all(events).await?; + + Ok(()) + } + + async fn process_flashblock(&self, flashblock: Flashblock) -> Result<()> { + let transaction_hashes: Vec = flashblock + .diff + .transactions + .iter() + .map(|tx| OpTxEnvelope::decode_2718_exact(tx).unwrap().tx_hash()) + .collect(); + + if transaction_hashes.is_empty() { + return Ok(()); + } + + let bundle_uuids = self.process_transactions(transaction_hashes).await?; + + let events: Vec = bundle_uuids + .into_iter() + .map(|bundle_id| BundleEvent::FlashblockIncluded { + bundle_id, + block_number: flashblock.metadata.block_number, + flashblock_index: flashblock.index, + }) + .collect(); + + self.publisher.publish_all(events).await?; + + Ok(()) + } +} + +impl, K: BundleEventPublisher> FlashblocksReceiver + for MaintenanceJob +{ + fn on_flashblock_received(&self, flashblock: Flashblock) { + if let Err(e) = self.fb_tx.send(flashblock) { + error!("Failed to send flashblock to queue: {:?}", e); + } + } +} + +struct BundleMatch { + matched: HashMap, + unmatched_transactions: HashSet, + unmatched_bundles: HashSet, +} + +struct TrieNode { + next: HashMap, + bundle_uuid: Option, +} + +impl TrieNode { + fn new() -> Self { + Self { + next: HashMap::default(), + bundle_uuid: None, + } + } + + fn get(&mut self, t: &TxHash) -> &mut TrieNode { + self.next.entry(*t).or_insert_with(TrieNode::new) + } + + fn adv(&self, t: &TxHash) -> Option<&TrieNode> { + self.next.get(t) + } + + fn has_further_items(&self) -> bool { + !self.next.is_empty() + } +} + +/// Map transactions that were included in a block, to the bundles +/// This method only supports two cases, non duplicate single bundle transactions (e.g. standard mempool) +/// or non ambiguous bundles, e.g. [(a,b), (a), (b)] is not supported +fn map_transactions_to_bundles( + bundles: Vec, + transactions: Vec, +) -> BundleMatch { + let bundle_uuids: Vec = bundles + .iter() + .map(|b| b.bundle.replacement_uuid.clone().unwrap()) + .collect(); + + let mut result = BundleMatch { + matched: HashMap::default(), + unmatched_transactions: transactions.iter().copied().collect(), + unmatched_bundles: bundle_uuids.iter().cloned().collect(), + }; + + let mut trie = TrieNode::new(); + for (bundle, uuid) in bundles.into_iter().zip(bundle_uuids.iter()) { + let mut trie_ptr = &mut trie; + for txn in &bundle.txn_hashes { + trie_ptr = trie_ptr.get(txn); + } + trie_ptr.bundle_uuid = Some(uuid.clone()); + } + + let mut i = 0; + while i < transactions.len() { + let mut trie_ptr = ≜ + let mut txn_path = Vec::new(); + let start_index = i; + + while i < transactions.len() { + let txn = transactions[i]; + + if let Some(next_node) = trie_ptr.adv(&txn) { + trie_ptr = next_node; + txn_path.push(txn); + i += 1; + + if let Some(ref bundle_uuid) = trie_ptr.bundle_uuid { + if trie_ptr.has_further_items() { + warn!(message = "ambiguous transaction, in multiple bundles", txn = %txn); + } + + for &path_txn in &txn_path { + result.matched.insert(path_txn, bundle_uuid.clone()); + result.unmatched_transactions.remove(&path_txn); + } + result.unmatched_bundles.remove(bundle_uuid); + break; + } + } else { + i = start_index + 1; + break; + } + } + } + + result +} + +#[cfg(test)] +mod tests { + use super::*; + use alloy_primitives::{TxHash, b256}; + use alloy_rpc_types_mev::EthSendBundle; + use sqlx::types::chrono::Utc; + use tips_datastore::postgres::BundleState; + + const TX_1: TxHash = b256!("1111111111111111111111111111111111111111111111111111111111111111"); + const TX_2: TxHash = b256!("2222222222222222222222222222222222222222222222222222222222222222"); + const TX_3: TxHash = b256!("3333333333333333333333333333333333333333333333333333333333333333"); + const TX_4: TxHash = b256!("4444444444444444444444444444444444444444444444444444444444444444"); + const TX_UNMATCHED: TxHash = + b256!("9999999999999999999999999999999999999999999999999999999999999999"); + + fn create_test_bundle(uuid: &str, txn_hashes: Vec) -> BundleWithMetadata { + let replacement_uuid = Some(uuid.to_string()); + let mut bundle = EthSendBundle::default(); + bundle.replacement_uuid = replacement_uuid; + + BundleWithMetadata { + bundle, + txn_hashes, + senders: vec![], + min_base_fee: 0, + state: BundleState::Ready, + state_changed_at: Utc::now(), + } + } + + #[test] + fn test_empty_inputs() { + let result = map_transactions_to_bundles(vec![], vec![]); + assert!(result.matched.is_empty()); + assert!(result.unmatched_transactions.is_empty()); + assert!(result.unmatched_bundles.is_empty()); + } + + #[test] + fn test_single_transaction_bundles() { + let bundles = vec![ + create_test_bundle("bundle1", vec![TX_1]), + create_test_bundle("bundle2", vec![TX_2]), + create_test_bundle("bundle3", vec![TX_3]), + ]; + let transactions = vec![TX_1, TX_3, TX_2, TX_UNMATCHED]; + + let result = map_transactions_to_bundles(bundles, transactions); + + assert_eq!(result.matched.len(), 3); + assert_eq!(result.unmatched_transactions.len(), 1); + assert!(result.unmatched_transactions.contains(&TX_UNMATCHED)); + assert!(result.unmatched_bundles.is_empty()); + + assert!(result.matched.contains_key(&TX_1)); + assert_eq!(result.matched.get(&TX_1).unwrap(), "bundle1"); + assert!(result.matched.contains_key(&TX_2)); + assert_eq!(result.matched.get(&TX_2).unwrap(), "bundle2"); + assert!(result.matched.contains_key(&TX_3)); + assert_eq!(result.matched.get(&TX_3).unwrap(), "bundle3"); + } + + #[test] + fn test_multi_transaction_bundles() { + let bundles = vec![ + create_test_bundle("bundle1", vec![TX_1, TX_2]), + create_test_bundle("bundle2", vec![TX_3]), + create_test_bundle("bundle3", vec![TX_4]), + ]; + let transactions = vec![TX_1, TX_2, TX_4, TX_3, TX_UNMATCHED]; + let result = map_transactions_to_bundles(bundles, transactions); + + assert_eq!(result.matched.len(), 4); + assert_eq!(result.matched.get(&TX_1).unwrap(), "bundle1"); + assert_eq!(result.matched.get(&TX_2).unwrap(), "bundle1"); + assert_eq!(result.matched.get(&TX_3).unwrap(), "bundle2"); + assert_eq!(result.matched.get(&TX_4).unwrap(), "bundle3"); + assert_eq!(result.unmatched_transactions.len(), 1); + assert!(result.unmatched_transactions.contains(&TX_UNMATCHED)); + } + + #[test] + fn test_partial_bundles_dont_match() { + let bundles = vec![create_test_bundle("bundle1", vec![TX_1, TX_2, TX_3])]; + let transactions = vec![TX_1, TX_2]; + + let result = map_transactions_to_bundles(bundles, transactions); + + assert_eq!(result.matched.len(), 0); + assert_eq!(result.unmatched_transactions.len(), 2); + assert_eq!(result.unmatched_bundles.len(), 1); + } + + #[test] + fn test_ambiguous_bundle_match() { + let bundles = vec![ + create_test_bundle("bundle1", vec![TX_1]), + create_test_bundle("bundle2", vec![TX_1, TX_2]), + ]; + let transactions = vec![TX_1, TX_2]; + + let result = map_transactions_to_bundles(bundles, transactions); + + assert_eq!(result.matched.len(), 1); + assert_eq!(result.matched.get(&TX_1).unwrap(), "bundle1"); + assert!(result.unmatched_transactions.contains(&TX_2)); + assert!(result.unmatched_bundles.contains("bundle2")); + } +} diff --git a/crates/maintenance/src/main.rs b/crates/maintenance/src/main.rs index 6e28a6d..ef10c03 100644 --- a/crates/maintenance/src/main.rs +++ b/crates/maintenance/src/main.rs @@ -1,43 +1,65 @@ -use alloy_provider::network::TransactionResponse; -use alloy_provider::network::primitives::BlockTransactions; -use alloy_provider::{Provider, ProviderBuilder, RootProvider}; +mod job; + +use crate::job::MaintenanceJob; + +use alloy_provider::{ProviderBuilder, RootProvider}; use anyhow::Result; +use base_reth_flashblocks_rpc::subscription::FlashblocksSubscriber; use clap::Parser; use op_alloy_network::Optimism; use rdkafka::ClientConfig; use rdkafka::producer::FutureProducer; -use std::time::Duration; -use tips_audit::{KafkaMempoolEventPublisher, MempoolEvent, MempoolEventPublisher}; -use tips_datastore::{BundleDatastore, PostgresDatastore}; -use tokio::time::sleep; -use tracing::{error, info, warn}; +use std::sync::Arc; +use tips_audit::KafkaBundleEventPublisher; +use tips_datastore::PostgresDatastore; +use tracing::{info, warn}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; use url::Url; -#[derive(Parser)] +#[derive(Parser, Clone)] #[command(author, version, about, long_about = None)] -struct Args { - #[arg(long, env = "TIPS_MAINTENANCE_RPC_NODE")] - node_url: Url, - +pub struct Args { #[arg(long, env = "TIPS_MAINTENANCE_KAFKA_BROKERS")] - kafka_brokers: String, + pub kafka_brokers: String, #[arg( long, env = "TIPS_MAINTENANCE_KAFKA_TOPIC", - default_value = "mempool-events" + default_value = "tips-audit" )] - kafka_topic: String, + pub kafka_topic: String, #[arg(long, env = "TIPS_MAINTENANCE_DATABASE_URL")] - database_url: String, + pub database_url: String, + + #[arg(long, env = "TIPS_MAINTENANCE_RPC_URL")] + pub rpc_url: Url, + + #[arg( + long, + env = "TIPS_MAINTENANCE_RPC_POLL_INTERVAL_MS", + default_value = "250" + )] + pub rpc_poll_interval: u64, - #[arg(long, env = "TIPS_MAINTENANCE_POLL_INTERVAL_MS", default_value = "250")] - poll_interval: u64, + #[arg(long, env = "TIPS_MAINTENANCE_FLASHBLOCKS_WS")] + pub flashblocks_ws: Url, #[arg(long, env = "TIPS_MAINTENANCE_LOG_LEVEL", default_value = "info")] - log_level: String, + pub log_level: String, + + #[arg(long, env = "TIPS_MAINTENANCE_FINALIZATION_DEPTH", default_value = "4")] + pub finalization_depth: u64, + + #[arg( + long, + env = "TIPS_MAINTENANCE_UPDATE_INCLUDED_BY_BUILDER", + default_value = "true" + )] + pub update_included_by_builder: bool, + + #[arg(long, env = "TIPS_MAINTENANCE_INTERVAL_MS", default_value = "2000")] + pub maintenance_interval_ms: u64, } #[tokio::main] @@ -74,115 +96,32 @@ async fn main() -> Result<()> { let provider: RootProvider = ProviderBuilder::new() .disable_recommended_fillers() .network::() - .connect_http(args.node_url); + .connect_http(args.rpc_url.clone()); - let datastore = PostgresDatastore::connect(args.database_url).await?; + let datastore = PostgresDatastore::connect(args.database_url.clone()).await?; let kafka_producer: FutureProducer = ClientConfig::new() .set("bootstrap.servers", &args.kafka_brokers) .set("message.timeout.ms", "5000") .create()?; - let publisher = KafkaMempoolEventPublisher::new(kafka_producer, args.kafka_topic); - - let mut last_processed_block: Option = None; + let publisher = KafkaBundleEventPublisher::new(kafka_producer, args.kafka_topic.clone()); - loop { - match process_new_blocks(&provider, &datastore, &publisher, &mut last_processed_block).await - { - Ok(_) => {} - Err(e) => { - error!(message = "Error processing blocks", error=%e); - } - } - - sleep(Duration::from_millis(args.poll_interval)).await; - } -} + let (fb_tx, fb_rx) = tokio::sync::mpsc::unbounded_channel(); -async fn process_new_blocks( - provider: &impl Provider, - datastore: &PostgresDatastore, - publisher: &KafkaMempoolEventPublisher, - last_processed_block: &mut Option, -) -> Result<()> { - let latest_block_number = provider.get_block_number().await?; - - let start_block = last_processed_block - .map(|n| n + 1) - .unwrap_or(latest_block_number); - - if start_block > latest_block_number { - return Ok(()); - } - - info!(message = "Processing blocks", from=%start_block, to=%latest_block_number); - - for block_number in start_block..=latest_block_number { - match process_block(provider, datastore, publisher, block_number).await { - Ok(_) => { - info!(message = "Successfully processed block", block=%block_number); - *last_processed_block = Some(block_number); - } - Err(e) => { - return Err(e); - } - } - } + let job = Arc::new(MaintenanceJob::new( + datastore, + provider, + publisher, + args.clone(), + fb_tx, + )); - Ok(()) -} + let mut flashblocks_client = + FlashblocksSubscriber::new(job.clone(), args.flashblocks_ws.clone()); + flashblocks_client.start(); -async fn process_block( - provider: &impl Provider, - datastore: &PostgresDatastore, - publisher: &KafkaMempoolEventPublisher, - block_number: u64, -) -> Result<()> { - let block = provider - .get_block_by_number(block_number.into()) - .full() - .await? - .ok_or_else(|| anyhow::anyhow!("Block {block_number} not found"))?; - - let block_hash = block.header.hash; - - let transactions = match &block.transactions { - BlockTransactions::Full(txs) => txs, - BlockTransactions::Hashes(_) => { - return Err(anyhow::anyhow!( - "Block transactions returned as hashes only, expected full transactions" - )); - } - BlockTransactions::Uncle => { - return Err(anyhow::anyhow!("Block contains uncle transactions")); - } - }; - - for tx in transactions { - let tx_hash = tx.tx_hash(); - info!(message = "Processing transaction", tx_hash=%tx_hash); - - match datastore.find_bundle_by_transaction_hash(tx_hash).await? { - Some(bundle_id) => { - info!(message = "Found bundle for transaction", bundle_id=%bundle_id, tx_hash=%tx_hash); - - let event = MempoolEvent::BlockIncluded { - bundle_id, - block_number, - block_hash, - }; - - publisher.publish(event).await?; - datastore.remove_bundle(bundle_id).await?; - - info!(message = "Removed bundle for transaction", bundle_id=%bundle_id, tx_hash=%tx_hash); - } - None => { - error!(message = "Transaction not part of tracked bundle", tx_hash=%tx_hash); - } - } - } + job.run(fb_rx).await?; Ok(()) } diff --git a/docs/AUDIT_S3_FORMAT.md b/docs/AUDIT_S3_FORMAT.md index e64ffd6..0ea21d5 100644 --- a/docs/AUDIT_S3_FORMAT.md +++ b/docs/AUDIT_S3_FORMAT.md @@ -6,52 +6,57 @@ This document describes the S3 storage format used by the audit system for archi ### Bundle History: `/bundles/` -Each bundle is stored as a JSON object containing its complete lifecycle history: +Each bundle is stored as a JSON object containing its complete lifecycle history. The history events in this object are +dervied from the events defined in the [bundle states](./BUNDLE_STATES.md). ```json { "history": [ { - "event": "Created", - "timestamp": 1234567890, - "bundle": { + "event": "Created", // Event type (see ./BUNDLE_STATES.md) + "timestamp": 1234567890, // timestamp event was written to kafka + "key": "-", // used to dedup events + "data": { + "bundle": { // EthSendBundle object + } } }, - { - "event": "Updated", - "timestamp": 1234567891, - "bundle": { - // EthSendBundle object - } - }, - { - "event": "Cancelled", - "timestamp": 1234567892 - }, { "event": "BuilderIncluded", - "builder": "builder-id", "timestamp": 1234567893, - "blockNumber": 12345, - "flashblockIndex": 1 + "key": "-", + "data": { + "blockNumber": 12345, + "flashblockIndex": 1, + "builderId": "builder-id" + } }, { "event": "FlashblockIncluded", "timestamp": 1234567894, - "blockNumber": 12345, - "flashblockIndex": 1 + "key": "-", + "data": { + "blockNumber": 12345, + "flashblockIndex": 1 + }, }, { "event": "BlockIncluded", "timestamp": 1234567895, - "blockNumber": 12345, - "blockHash": "0x..." + "key": "-", + "data": { + "blockNumber": 12345, + "blockHash": "0x..." + } }, { "event": "Dropped", "timestamp": 1234567896, - "reason": "TIMEOUT" + "key": "-", + "data": { + "reason": "TIMEOUT" + } } ] } @@ -69,19 +74,3 @@ Transaction hash to bundle mapping for efficient lookups: ] } ``` - -## Event Types - -### Bundle Events - -- **Created**: Initial bundle creation with transaction list -- **Updated**: Bundle modification (transaction additions/removals) -- **Cancelled**: Bundle explicitly cancelled -- **BuilderIncluded**: Bundle included by builder in flashblock -- **FlashblockIncluded**: Flashblock containing bundle included in chain -- **BlockIncluded**: Final confirmation in blockchain -- **Dropped**: Bundle dropped from processing - -### Drop Reasons - -- `TIMEOUT`: Bundle expired without inclusion \ No newline at end of file diff --git a/docs/BUNDLE_STATES.md b/docs/BUNDLE_STATES.md new file mode 100644 index 0000000..3105c89 --- /dev/null +++ b/docs/BUNDLE_STATES.md @@ -0,0 +1,71 @@ +# Bundle States + +## States +```mermaid +stateDiagram + [*] --> Ready + Ready --> Dropped + Ready --> IncludedByBuilder + IncludedByBuilder --> Ready: Reorg + IncludedByBuilder --> [*]: After X blocks + Dropped --> [*] +``` +_(this maybe extended to include a NonReady category for nonce gapped transactions etc.)_ + +The builder will load all `READY` transactions, which have a high enough minimum base fee +and are valid for the current block that is being built. + +## Bundle Events + +In addition to the states above, + +- **Received**: + - Received bundle event + - Arguments: (uuid) +- **Created**: + - Initial bundle creation with transaction list + - Arguments: (bundle) +- **Updated**: + - Bundle modification (transaction additions/removals) + - Arguments: (bundle) +- **Cancelled**: + - Bundle explicitly cancelled + - Arguments: (nonce | uuid) +- **IncludedByBuilder**: + - Bundle included by builder in flashblock + - Arguments: (flashblockNum, blockNum, builderId) +- **IncludedInFlashblock**: + - Flashblock containing bundle included in chain + - Arguments: (flashblockNum, blockNum) +- **IncludedInBlock**: + - Final confirmation in blockchain + - Arguments: (blockNum, blockHash) +- **Dropped**: + - Bundle dropped from processing + - Arguments: Why(enum Reason) + - "TIMEOUT": Bundle expired without inclusion + - "INCLUDED_BY_OTHER": Another bundle caused the transactions in this bundle to not be includable + +### Dropping Transactions +Transactions can be dropped because of multiple reasons, all of which are indicated on +the audit log for a transaction. The initial prototype has the following limits: + +- Included by other + - There are two bundles that overlap (e.g. bundleA=(txA, txB) and bundleB=(txA), if bundleB is included and txA in + bundleA is not allowed to be dropped, then bundleA will be marked as "Included By Other" and dropped. +- Bundle Limits + - Timeouts (block or flashblock) + - Block number +- Account Limits + - An account can only have a fixed number (TBD) of transactions in the mempool, + transactions will be dropped by descending nonce +- Global Limits + - When the mempool reaches a certain size (TBD), it will be pruned based on a combination of: + - Bundle age + - Low base fee + +### Maintenance Job +The limit enforcement and inclusion detection is managed by the maintenance job in +[`crates/maintenance`](https://github.com/base/tips/tree/master/crates/maintenance). It's designed to be idempotent so +that multiple jobs can execute concurrently. As this adds additional load to the BundleStore, it's preferable +to run a low number. \ No newline at end of file diff --git a/ui/src/app/api/bundles/route.ts b/ui/src/app/api/bundles/route.ts index 31bdba8..085a46a 100644 --- a/ui/src/app/api/bundles/route.ts +++ b/ui/src/app/api/bundles/route.ts @@ -5,13 +5,7 @@ import { bundles } from "@/db/schema"; export interface Bundle { id: string; txnHashes: string[]; - state: - | "Ready" - | "BundleLimit" - | "AccountLimits" - | "GlobalLimits" - | "IncludedInFlashblock" - | "IncludedInBlock"; + state: "Ready" | "IncludedByBuilder"; } export async function GET() { @@ -20,7 +14,7 @@ export async function GET() { .select({ id: bundles.id, txnHashes: bundles.txnHashes, - state: bundles.state, + state: bundles.bundleState, }) .from(bundles); diff --git a/ui/src/app/bundles/page.tsx b/ui/src/app/bundles/page.tsx index 16c1c77..cc34c79 100644 --- a/ui/src/app/bundles/page.tsx +++ b/ui/src/app/bundles/page.tsx @@ -92,17 +92,9 @@ export default function BundlesPage() { className={`px-2 py-1 rounded font-medium ${ bundle.state === "Ready" ? "bg-blue-100 text-blue-600" - : bundle.state === "BundleLimit" - ? "bg-yellow-100 text-yellow-600" - : bundle.state === "AccountLimits" - ? "bg-orange-100 text-orange-600" - : bundle.state === "GlobalLimits" - ? "bg-red-100 text-red-600" - : bundle.state === "IncludedInFlashblock" - ? "bg-purple-100 text-purple-600" - : bundle.state === "IncludedInBlock" - ? "bg-green-100 text-green-600" - : "bg-gray-100 text-gray-600" + : bundle.state === "IncludedByBuilder" + ? "bg-green-100 text-green-600" + : "bg-gray-100 text-gray-600" }`} > {bundle.state} diff --git a/ui/src/db/schema.ts b/ui/src/db/schema.ts index b528617..6b559a0 100644 --- a/ui/src/db/schema.ts +++ b/ui/src/db/schema.ts @@ -1,5 +1,6 @@ import { bigint, + boolean, char, pgEnum, pgTable, @@ -10,20 +11,31 @@ import { export const bundleState = pgEnum("bundle_state", [ "Ready", - "BundleLimit", - "AccountLimits", - "GlobalLimits", - "IncludedInFlashblock", - "IncludedInBlock", + "IncludedByBuilder", ]); +export const maintenance = pgTable("maintenance", { + // You can use { mode: "bigint" } if numbers are exceeding js number limitations + blockNumber: bigint("block_number", { mode: "number" }) + .primaryKey() + .notNull(), + blockHash: char("block_hash", { length: 66 }).notNull(), + finalized: boolean().default(false).notNull(), +}); + export const bundles = pgTable("bundles", { id: uuid().primaryKey().notNull(), - state: bundleState().notNull(), + bundleState: bundleState("bundle_state").notNull(), + stateChangedAt: timestamp("state_changed_at", { + withTimezone: true, + mode: "string", + }) + .defaultNow() + .notNull(), + txnHashes: char("txn_hashes", { length: 66 }).array(), senders: char({ length: 42 }).array(), // You can use { mode: "bigint" } if numbers are exceeding js number limitations minimumBaseFee: bigint("minimum_base_fee", { mode: "number" }), - txnHashes: char("txn_hashes", { length: 66 }).array(), txs: text().array().notNull(), revertingTxHashes: char("reverting_tx_hashes", { length: 66 }).array(), droppingTxHashes: char("dropping_tx_hashes", { length: 66 }).array(), From 8c82258a9752a79bbef7c5be4856b2c1abb2adfa Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Fri, 3 Oct 2025 15:17:45 -0500 Subject: [PATCH 020/117] chore: migrate to kafka props files for configs (#25) * migrate to kafka properties file * migrate other services to kafka properties file * fmt --- .env.example | 16 +++---- crates/audit/src/bin/main.rs | 12 ++--- crates/audit/src/reader.rs | 38 +++++++++------ crates/ingress-rpc/src/main.rs | 47 +++++++++++-------- crates/ingress-writer/src/main.rs | 64 ++++++++++++++++---------- crates/maintenance/src/main.rs | 30 +++++++++--- docker-compose.tips.yml | 8 ++++ docker-compose.yml | 2 +- docker/audit-kafka-properties | 10 ++++ docker/ingress-kafka-properties | 3 ++ docker/ingress-writer-kafka-properties | 8 ++++ docker/maintenance-kafka-properties | 3 ++ 12 files changed, 161 insertions(+), 80 deletions(-) create mode 100644 docker/audit-kafka-properties create mode 100644 docker/ingress-kafka-properties create mode 100644 docker/ingress-writer-kafka-properties create mode 100644 docker/maintenance-kafka-properties diff --git a/.env.example b/.env.example index 63a3323..96c945d 100644 --- a/.env.example +++ b/.env.example @@ -3,16 +3,14 @@ TIPS_INGRESS_ADDRESS=0.0.0.0 TIPS_INGRESS_PORT=8080 TIPS_INGRESS_RPC_MEMPOOL=http://localhost:2222 TIPS_INGRESS_DUAL_WRITE_MEMPOOL=false -TIPS_INGRESS_KAFKA_BROKERS=localhost:9092 -TIPS_INGRESS_KAFKA_TOPIC=tips-audit +TIPS_INGRESS_KAFKA_INGRESS_PROPERTIES_FILE=/app/docker/ingress-kafka-properties +TIPS_INGRESS_KAFKA_INGRESS_TOPIC=tips-ingress TIPS_INGRESS_LOG_LEVEL=info -TIPS_INGRESS_KAFKA_QUEUE_TOPIC=tips-ingress-rpc TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS=10800 # Audit service configuration -TIPS_AUDIT_KAFKA_BROKERS=localhost:9092 +TIPS_AUDIT_KAFKA_PROPERTIES_FILE=/app/docker/audit-kafka-properties TIPS_AUDIT_KAFKA_TOPIC=tips-audit -TIPS_AUDIT_KAFKA_GROUP_ID=local-audit TIPS_AUDIT_LOG_LEVEL=info TIPS_AUDIT_S3_BUCKET=tips TIPS_AUDIT_S3_CONFIG_TYPE=manual @@ -25,7 +23,7 @@ TIPS_AUDIT_S3_SECRET_ACCESS_KEY=minioadmin TIPS_MAINTENANCE_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres TIPS_MAINTENANCE_RPC_URL=http://localhost:2222 TIPS_MAINTENANCE_RPC_POLL_INTERVAL_MS=250 -TIPS_MAINTENANCE_KAFKA_BROKERS=localhost:9092 +TIPS_MAINTENANCE_KAFKA_PROPERTIES_FILE=/app/docker/maintenance-kafka-properties TIPS_MAINTENANCE_FLASHBLOCKS_WS=ws://localhost:1115/ws TIPS_MAINTENANCE_KAFKA_TOPIC=tips-audit TIPS_MAINTENANCE_LOG_LEVEL=info @@ -42,7 +40,7 @@ TIPS_UI_S3_SECRET_ACCESS_KEY=minioadmin # Ingress Writer TIPS_INGRESS_WRITER_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres -TIPS_INGRESS_WRITER_KAFKA_BROKERS=localhost:9092 -TIPS_INGRESS_WRITER_KAFKA_TOPIC=tips-ingress-rpc -TIPS_INGRESS_WRITER_KAFKA_GROUP_ID=local-writer +TIPS_INGRESS_WRITER_KAFKA_PROPERTIES_FILE=/app/docker/ingress-writer-kafka-properties +TIPS_INGRESS_KAFKA_TOPIC=tips-ingress +TIPS_INGRESS_WRITER_AUDIT_TOPIC=tips-audit TIPS_INGRESS_WRITER_LOG_LEVEL=info diff --git a/crates/audit/src/bin/main.rs b/crates/audit/src/bin/main.rs index ed06f71..f0e6b89 100644 --- a/crates/audit/src/bin/main.rs +++ b/crates/audit/src/bin/main.rs @@ -19,15 +19,12 @@ enum S3ConfigType { #[derive(Parser, Debug)] #[command(author, version, about, long_about = None)] struct Args { - #[arg(long, env = "TIPS_AUDIT_KAFKA_BROKERS")] - kafka_brokers: String, + #[arg(long, env = "TIPS_AUDIT_KAFKA_PROPERTIES_FILE")] + kafka_properties_file: String, #[arg(long, env = "TIPS_AUDIT_KAFKA_TOPIC")] kafka_topic: String, - #[arg(long, env = "TIPS_AUDIT_KAFKA_GROUP_ID")] - kafka_group_id: String, - #[arg(long, env = "TIPS_AUDIT_S3_BUCKET")] s3_bucket: String, @@ -80,14 +77,13 @@ async fn main() -> Result<()> { .init(); info!( - kafka_brokers = %args.kafka_brokers, + kafka_properties_file = %args.kafka_properties_file, kafka_topic = %args.kafka_topic, - kafka_group_id = %args.kafka_group_id, s3_bucket = %args.s3_bucket, "Starting audit archiver" ); - let consumer = create_kafka_consumer(&args.kafka_brokers, &args.kafka_group_id)?; + let consumer = create_kafka_consumer(&args.kafka_properties_file)?; consumer.subscribe(&[&args.kafka_topic])?; let reader = KafkaMempoolReader::new(consumer, args.kafka_topic.clone())?; diff --git a/crates/audit/src/reader.rs b/crates/audit/src/reader.rs index 1449638..b4ff0f4 100644 --- a/crates/audit/src/reader.rs +++ b/crates/audit/src/reader.rs @@ -7,24 +7,36 @@ use rdkafka::{ consumer::{Consumer, StreamConsumer}, message::Message, }; +use std::fs; use std::time::{Duration, SystemTime, UNIX_EPOCH}; use tokio::time::sleep; -use tracing::{debug, error}; - -pub fn create_kafka_consumer(kafka_brokers: &str, group_id: &str) -> Result { - let consumer: StreamConsumer = ClientConfig::new() - .set("group.id", group_id) - .set("bootstrap.servers", kafka_brokers) - .set("enable.partition.eof", "false") - .set("session.timeout.ms", "6000") - .set("enable.auto.commit", "false") - .set("auto.offset.reset", "earliest") - .set("fetch.wait.max.ms", "100") - .set("fetch.min.bytes", "1") - .create()?; +use tracing::{debug, error, info}; + +pub fn create_kafka_consumer(kafka_properties_file: &str) -> Result { + let client_config = load_kafka_config_from_file(kafka_properties_file)?; + let consumer: StreamConsumer = client_config.create()?; Ok(consumer) } +fn load_kafka_config_from_file(properties_file_path: &str) -> Result { + let kafka_properties = fs::read_to_string(properties_file_path)?; + info!("Kafka properties:\n{}", kafka_properties); + + let mut client_config = ClientConfig::new(); + + for line in kafka_properties.lines() { + let line = line.trim(); + if line.is_empty() || line.starts_with('#') { + continue; + } + if let Some((key, value)) = line.split_once('=') { + client_config.set(key.trim(), value.trim()); + } + } + + Ok(client_config) +} + pub fn assign_topic_partition(consumer: &StreamConsumer, topic: &str) -> Result<()> { let mut tpl = TopicPartitionList::new(); tpl.add_partition(topic, 0); diff --git a/crates/ingress-rpc/src/main.rs b/crates/ingress-rpc/src/main.rs index 07e6c27..6400bc0 100644 --- a/crates/ingress-rpc/src/main.rs +++ b/crates/ingress-rpc/src/main.rs @@ -4,6 +4,7 @@ use jsonrpsee::server::Server; use op_alloy_network::Optimism; use rdkafka::ClientConfig; use rdkafka::producer::FutureProducer; +use std::fs; use std::net::IpAddr; use tracing::{info, warn}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; @@ -35,24 +36,16 @@ struct Config { dual_write_mempool: bool, /// Kafka brokers for publishing mempool events - #[arg(long, env = "TIPS_INGRESS_KAFKA_BROKERS")] - kafka_brokers: String, - - /// Kafka topic for publishing mempool events - #[arg( - long, - env = "TIPS_INGRESS_KAFKA_TOPIC", - default_value = "mempool-events" - )] - kafka_topic: String, + #[arg(long, env = "TIPS_INGRESS_KAFKA_INGRESS_PROPERTIES_FILE")] + ingress_kafka_properties: String, /// Kafka topic for queuing transactions before the DB Writer #[arg( long, - env = "TIPS_INGRESS_KAFKA_QUEUE_TOPIC", - default_value = "tips-ingress-rpc" + env = "TIPS_INGRESS_KAFKA_INGRESS_TOPIC", + default_value = "tips-ingress" )] - queue_topic: String, + ingress_topic: String, #[arg(long, env = "TIPS_INGRESS_LOG_LEVEL", default_value = "info")] log_level: String, @@ -106,12 +99,11 @@ async fn main() -> anyhow::Result<()> { .network::() .connect_http(config.mempool_url); - let queue_producer: FutureProducer = ClientConfig::new() - .set("bootstrap.servers", &config.kafka_brokers) - .set("message.timeout.ms", "5000") - .create()?; + let client_config = load_kafka_config_from_file(&config.ingress_kafka_properties)?; + + let queue_producer: FutureProducer = client_config.create()?; - let queue = KafkaQueuePublisher::new(queue_producer, config.queue_topic); + let queue = KafkaQueuePublisher::new(queue_producer, config.ingress_topic); let service = IngressService::new( provider, @@ -133,3 +125,22 @@ async fn main() -> anyhow::Result<()> { handle.stopped().await; Ok(()) } + +fn load_kafka_config_from_file(properties_file_path: &str) -> anyhow::Result { + let kafka_properties = fs::read_to_string(properties_file_path)?; + info!("Kafka properties:\n{}", kafka_properties); + + let mut client_config = ClientConfig::new(); + + for line in kafka_properties.lines() { + let line = line.trim(); + if line.is_empty() || line.starts_with('#') { + continue; + } + if let Some((key, value)) = line.split_once('=') { + client_config.set(key.trim(), value.trim()); + } + } + + Ok(client_config) +} diff --git a/crates/ingress-writer/src/main.rs b/crates/ingress-writer/src/main.rs index 3e3f122..116aac5 100644 --- a/crates/ingress-writer/src/main.rs +++ b/crates/ingress-writer/src/main.rs @@ -8,6 +8,7 @@ use rdkafka::{ message::Message, producer::FutureProducer, }; +use std::fs; use tips_audit::{BundleEvent, BundleEventPublisher, KafkaBundleEventPublisher}; use tips_datastore::{BundleDatastore, postgres::PostgresDatastore}; use tokio::time::Duration; @@ -20,18 +21,18 @@ struct Args { #[arg(long, env = "TIPS_INGRESS_WRITER_DATABASE_URL")] database_url: String, - #[arg(long, env = "TIPS_INGRESS_WRITER_KAFKA_BROKERS")] - kafka_brokers: String, + #[arg(long, env = "TIPS_INGRESS_WRITER_KAFKA_PROPERTIES_FILE")] + kafka_properties_file: String, + + #[arg(long, env = "TIPS_INGRESS_KAFKA_TOPIC", default_value = "tips-ingress")] + ingress_topic: String, #[arg( long, - env = "TIPS_INGRESS_WRITER_KAFKA_TOPIC", - default_value = "tips-ingress-rpc" + env = "TIPS_INGRESS_WRITER_AUDIT_TOPIC", + default_value = "tips-audit" )] - kafka_topic: String, - - #[arg(long, env = "TIPS_INGRESS_WRITER_KAFKA_GROUP_ID")] - kafka_group_id: String, + audit_topic: String, #[arg(long, env = "TIPS_INGRESS_WRITER_LOG_LEVEL", default_value = "info")] log_level: String, @@ -129,31 +130,25 @@ async fn main() -> Result<()> { .with_env_filter(&args.log_level) .init(); - let mut config = ClientConfig::new(); - config - .set("group.id", &args.kafka_group_id) - .set("bootstrap.servers", &args.kafka_brokers) - .set("auto.offset.reset", "earliest") - .set("enable.partition.eof", "false") - .set("session.timeout.ms", "6000") - .set("enable.auto.commit", "true"); - - let kafka_producer: FutureProducer = ClientConfig::new() - .set("bootstrap.servers", &args.kafka_brokers) - .set("message.timeout.ms", "5000") - .create()?; - - let publisher = KafkaBundleEventPublisher::new(kafka_producer, "tips-audit".to_string()); + let config = load_kafka_config_from_file(&args.kafka_properties_file)?; + let kafka_producer: FutureProducer = config.create()?; + + let publisher = KafkaBundleEventPublisher::new(kafka_producer, args.audit_topic.clone()); let consumer = config.create()?; let bundle_store = PostgresDatastore::connect(args.database_url).await?; bundle_store.run_migrations().await?; - let writer = IngressWriter::new(consumer, args.kafka_topic.clone(), bundle_store, publisher)?; + let writer = IngressWriter::new( + consumer, + args.ingress_topic.clone(), + bundle_store, + publisher, + )?; info!( "Ingress Writer service started, consuming from topic: {}", - args.kafka_topic + args.ingress_topic ); loop { match writer.insert_bundle().await { @@ -167,3 +162,22 @@ async fn main() -> Result<()> { } } } + +fn load_kafka_config_from_file(properties_file_path: &str) -> Result { + let kafka_properties = fs::read_to_string(properties_file_path)?; + info!("Kafka properties:\n{}", kafka_properties); + + let mut client_config = ClientConfig::new(); + + for line in kafka_properties.lines() { + let line = line.trim(); + if line.is_empty() || line.starts_with('#') { + continue; + } + if let Some((key, value)) = line.split_once('=') { + client_config.set(key.trim(), value.trim()); + } + } + + Ok(client_config) +} diff --git a/crates/maintenance/src/main.rs b/crates/maintenance/src/main.rs index ef10c03..d9cc7a6 100644 --- a/crates/maintenance/src/main.rs +++ b/crates/maintenance/src/main.rs @@ -9,6 +9,7 @@ use clap::Parser; use op_alloy_network::Optimism; use rdkafka::ClientConfig; use rdkafka::producer::FutureProducer; +use std::fs; use std::sync::Arc; use tips_audit::KafkaBundleEventPublisher; use tips_datastore::PostgresDatastore; @@ -19,8 +20,8 @@ use url::Url; #[derive(Parser, Clone)] #[command(author, version, about, long_about = None)] pub struct Args { - #[arg(long, env = "TIPS_MAINTENANCE_KAFKA_BROKERS")] - pub kafka_brokers: String, + #[arg(long, env = "TIPS_MAINTENANCE_KAFKA_PROPERTIES_FILE")] + pub kafka_properties_file: String, #[arg( long, @@ -100,10 +101,8 @@ async fn main() -> Result<()> { let datastore = PostgresDatastore::connect(args.database_url.clone()).await?; - let kafka_producer: FutureProducer = ClientConfig::new() - .set("bootstrap.servers", &args.kafka_brokers) - .set("message.timeout.ms", "5000") - .create()?; + let client_config = load_kafka_config_from_file(&args.kafka_properties_file)?; + let kafka_producer: FutureProducer = client_config.create()?; let publisher = KafkaBundleEventPublisher::new(kafka_producer, args.kafka_topic.clone()); @@ -125,3 +124,22 @@ async fn main() -> Result<()> { Ok(()) } + +fn load_kafka_config_from_file(properties_file_path: &str) -> Result { + let kafka_properties = fs::read_to_string(properties_file_path)?; + info!("Kafka properties:\n{}", kafka_properties); + + let mut client_config = ClientConfig::new(); + + for line in kafka_properties.lines() { + let line = line.trim(); + if line.is_empty() || line.starts_with('#') { + continue; + } + if let Some((key, value)) = line.split_once('=') { + client_config.set(key.trim(), value.trim()); + } + } + + Ok(client_config) +} diff --git a/docker-compose.tips.yml b/docker-compose.tips.yml index cff7d7c..cbd9ab0 100644 --- a/docker-compose.tips.yml +++ b/docker-compose.tips.yml @@ -8,6 +8,8 @@ services: - "8080:8080" env_file: - .env.docker + volumes: + - ./docker/ingress-kafka-properties:/app/docker/ingress-kafka-properties:ro restart: unless-stopped audit: @@ -17,6 +19,8 @@ services: container_name: tips-audit env_file: - .env.docker + volumes: + - ./docker/audit-kafka-properties:/app/docker/audit-kafka-properties:ro restart: unless-stopped maintenance: @@ -26,6 +30,8 @@ services: container_name: tips-maintenance env_file: - .env.docker + volumes: + - ./docker/maintenance-kafka-properties:/app/docker/maintenance-kafka-properties:ro restart: unless-stopped ui: @@ -46,4 +52,6 @@ services: container_name: tips-ingress-writer env_file: - .env.docker + volumes: + - ./docker/ingress-writer-kafka-properties:/app/docker/ingress-writer-kafka-properties:ro restart: unless-stopped \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index cfeeedf..72fd79e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -56,7 +56,7 @@ services: command: | sh -c " kafka-topics --create --if-not-exists --topic tips-audit --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 - kafka-topics --create --if-not-exists --topic tips-ingress-rpc --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 + kafka-topics --create --if-not-exists --topic tips-ingress --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 kafka-topics --list --bootstrap-server kafka:29092 " diff --git a/docker/audit-kafka-properties b/docker/audit-kafka-properties new file mode 100644 index 0000000..d0ede9b --- /dev/null +++ b/docker/audit-kafka-properties @@ -0,0 +1,10 @@ +# Kafka configuration properties for audit service +bootstrap.servers=host.docker.internal:9094 +message.timeout.ms=5000 +group.id=local-audit +enable.partition.eof=false +session.timeout.ms=6000 +enable.auto.commit=false +auto.offset.reset=earliest +fetch.wait.max.ms=100 +fetch.min.bytes=1 \ No newline at end of file diff --git a/docker/ingress-kafka-properties b/docker/ingress-kafka-properties new file mode 100644 index 0000000..6b7899a --- /dev/null +++ b/docker/ingress-kafka-properties @@ -0,0 +1,3 @@ +# Kafka configuration properties for ingress service +bootstrap.servers=host.docker.internal:9094 +message.timeout.ms=5000 \ No newline at end of file diff --git a/docker/ingress-writer-kafka-properties b/docker/ingress-writer-kafka-properties new file mode 100644 index 0000000..03e42bb --- /dev/null +++ b/docker/ingress-writer-kafka-properties @@ -0,0 +1,8 @@ +# Kafka configuration properties for ingress writer service +bootstrap.servers=host.docker.internal:9094 +message.timeout.ms=5000 +group.id=local-writer +auto.offset.reset=earliest +enable.partition.eof=false +session.timeout.ms=6000 +enable.auto.commit=true \ No newline at end of file diff --git a/docker/maintenance-kafka-properties b/docker/maintenance-kafka-properties new file mode 100644 index 0000000..a361ef7 --- /dev/null +++ b/docker/maintenance-kafka-properties @@ -0,0 +1,3 @@ +# Kafka configuration properties for maintenance service +bootstrap.servers=host.docker.internal:9094 +message.timeout.ms=5000 \ No newline at end of file From b4e29279e4226703c76948ca77ad2d01a26d666f Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Mon, 6 Oct 2025 07:49:25 -0500 Subject: [PATCH 021/117] chore: enable ssl for kafka (#26) * chore: enable ssl for kafka * move to single image --- Cargo.lock | 186 ++++++++++-------- Cargo.toml | 2 +- .../ingress-writer/Dockerfile => Dockerfile | 16 +- crates/audit/Dockerfile | 37 ---- crates/ingress-rpc/Dockerfile | 37 ---- crates/maintenance/Dockerfile | 35 ---- docker-compose.tips.yml | 16 +- 7 files changed, 127 insertions(+), 202 deletions(-) rename crates/ingress-writer/Dockerfile => Dockerfile (68%) delete mode 100644 crates/audit/Dockerfile delete mode 100644 crates/ingress-rpc/Dockerfile delete mode 100644 crates/maintenance/Dockerfile diff --git a/Cargo.lock b/Cargo.lock index 4d4191a..4d6f59f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1400,9 +1400,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-config" -version = "1.8.6" +version = "1.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bc1b40fb26027769f16960d2f4a6bc20c4bb755d403e552c8c1a73af433c246" +checksum = "04b37ddf8d2e9744a0b9c19ce0b78efe4795339a90b66b7bae77987092cd2e69" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1430,9 +1430,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.6" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d025db5d9f52cbc413b167136afb3d8aeea708c0d8884783cf6253be5e22f6f2" +checksum = "799a1290207254984cb7c05245111bc77958b92a3c9bb449598044b36341cce6" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -1465,9 +1465,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.5.10" +version = "1.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c034a1bc1d70e16e7f4e4caf7e9f7693e4c9c24cd91cf17c2a0b21abaebc7c8b" +checksum = "2e1ed337dabcf765ad5f2fb426f13af22d576328aaf09eac8f70953530798ec0" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -1490,9 +1490,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.106.0" +version = "1.107.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c230530df49ed3f2b7b4d9c8613b72a04cdac6452eede16d587fc62addfabac" +checksum = "adb9118b3454ba89b30df55931a1fa7605260fc648e070b5aab402c24b375b1f" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1524,9 +1524,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.84.0" +version = "1.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357a841807f6b52cb26123878b3326921e2a25faca412fabdd32bd35b7edd5d3" +checksum = "2f2c741e2e439f07b5d1b33155e246742353d82167c785a2ff547275b7e32483" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1546,9 +1546,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.86.0" +version = "1.87.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1cc7fb324aa12eb4404210e6381195c5b5e9d52c2682384f295f38716dd3c7" +checksum = "6428ae5686b18c0ee99f6f3c39d94ae3f8b42894cdc35c35d8fb2470e9db2d4c" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1568,9 +1568,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.86.0" +version = "1.87.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d835f123f307cafffca7b9027c14979f1d403b417d8541d67cf252e8a21e35" +checksum = "5871bec9a79a3e8d928c7788d654f135dde0e71d2dd98089388bab36b37ef607" dependencies = [ "aws-credential-types", "aws-runtime", @@ -2433,18 +2433,18 @@ checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e" [[package]] name = "bytemuck" -version = "1.23.2" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" +checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", @@ -3840,9 +3840,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.1.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" +checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9" dependencies = [ "crc32fast", "miniz_oxide", @@ -5647,7 +5647,7 @@ checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" dependencies = [ "bitflags 2.9.4", "libc", - "redox_syscall 0.5.17", + "redox_syscall 0.5.18", ] [[package]] @@ -5766,11 +5766,10 @@ checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" [[package]] name = "lock_api" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ - "autocfg", "scopeguard", "serde", ] @@ -5832,9 +5831,9 @@ checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a" [[package]] name = "mach2" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44" +checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea" dependencies = [ "libc", ] @@ -5955,18 +5954,18 @@ dependencies = [ [[package]] name = "metrics-process" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8499d118208b7b84f01597edd26438e3f015c7ff4b356fbc0df535668ded83bf" +checksum = "f615e08e049bd14a44c4425415782efb9bcd479fc1e19ddeb971509074c060d0" dependencies = [ "libc", "libproc", "mach2", "metrics", "once_cell", - "procfs", + "procfs 0.18.0", "rlimit", - "windows 0.61.3", + "windows 0.62.1", ] [[package]] @@ -6033,6 +6032,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -6532,6 +6532,15 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" +[[package]] +name = "openssl-src" +version = "300.5.3+3.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc6bad8cd0233b63971e232cc9c5e83039375b8586d2312f31fda85db8f888c2" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.109" @@ -6540,6 +6549,7 @@ checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -6721,9 +6731,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", "parking_lot_core", @@ -6731,15 +6741,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.17", + "redox_syscall 0.5.18", "smallvec", - "windows-targets 0.52.6", + "windows-link 0.2.0", ] [[package]] @@ -6800,12 +6810,11 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.2" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e0a3a33733faeaf8651dfee72dd0f388f0c8e5ad496a3478fa5a922f49cfa8" +checksum = "989e7521a040efde50c3ab6bbadafbe15ab6dc042686926be59ac35d74607df4" dependencies = [ "memchr", - "thiserror 2.0.17", "ucd-trie", ] @@ -7069,10 +7078,21 @@ dependencies = [ "chrono", "flate2", "hex", - "procfs-core", + "procfs-core 0.17.0", "rustix 0.38.44", ] +[[package]] +name = "procfs" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" +dependencies = [ + "bitflags 2.9.4", + "procfs-core 0.18.0", + "rustix 1.1.2", +] + [[package]] name = "procfs-core" version = "0.17.0" @@ -7084,6 +7104,16 @@ dependencies = [ "hex", ] +[[package]] +name = "procfs-core" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" +dependencies = [ + "bitflags 2.9.4", + "hex", +] + [[package]] name = "proptest" version = "1.8.0" @@ -7411,6 +7441,7 @@ dependencies = [ "libc", "libz-sys", "num_enum", + "openssl-sys", "pkg-config", ] @@ -7431,9 +7462,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.17" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ "bitflags 2.9.4", ] @@ -9158,7 +9189,7 @@ dependencies = [ "metrics-exporter-prometheus", "metrics-process", "metrics-util", - "procfs", + "procfs 0.17.0", "reth-metrics", "reth-tasks", "tikv-jemalloc-ctl", @@ -11168,9 +11199,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "rusty-fork" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2" dependencies = [ "fnv", "quick-error", @@ -11483,9 +11514,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.14.1" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e" +checksum = "6093cd8c01b25262b84927e0f7151692158fab02d961e04c979d3903eba7ecc5" dependencies = [ "base64 0.22.1", "chrono", @@ -11494,8 +11525,7 @@ dependencies = [ "indexmap 2.11.4", "schemars 0.9.0", "schemars 1.0.4", - "serde", - "serde_derive", + "serde_core", "serde_json", "serde_with_macros", "time", @@ -11503,9 +11533,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.14.1" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e" +checksum = "a7e6c180db0816026a61afa1cff5344fb7ebded7e4d3062772179f2501481c27" dependencies = [ "darling 0.21.3", "proc-macro2", @@ -11652,6 +11682,12 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "simple_asn1" version = "0.6.3" @@ -13594,24 +13630,23 @@ dependencies = [ [[package]] name = "windows" -version = "0.61.3" +version = "0.62.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" +checksum = "49e6c4a1f363c8210c6f77ba24f645c61c6fb941eccf013da691f7e09515b8ac" dependencies = [ "windows-collections", - "windows-core 0.61.2", + "windows-core 0.62.1", "windows-future", - "windows-link 0.1.3", "windows-numerics", ] [[package]] name = "windows-collections" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +checksum = "123e712f464a8a60ce1a13f4c446d2d43ab06464cb5842ff68f5c71b6fb7852e" dependencies = [ - "windows-core 0.61.2", + "windows-core 0.62.1", ] [[package]] @@ -13626,19 +13661,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-core" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" -dependencies = [ - "windows-implement 0.60.1", - "windows-interface 0.59.2", - "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", -] - [[package]] name = "windows-core" version = "0.62.1" @@ -13654,12 +13676,12 @@ dependencies = [ [[package]] name = "windows-future" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +checksum = "68f3db6b24b120200d649cd4811b4947188ed3a8d2626f7075146c5d178a9a4a" dependencies = [ - "windows-core 0.61.2", - "windows-link 0.1.3", + "windows-core 0.62.1", + "windows-link 0.2.0", "windows-threading", ] @@ -13721,12 +13743,12 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" [[package]] name = "windows-numerics" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +checksum = "2ce3498fe0aba81e62e477408383196b4b0363db5e0c27646f932676283b43d8" dependencies = [ - "windows-core 0.61.2", - "windows-link 0.1.3", + "windows-core 0.62.1", + "windows-link 0.2.0", ] [[package]] @@ -13904,11 +13926,11 @@ dependencies = [ [[package]] name = "windows-threading" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +checksum = "ab47f085ad6932defa48855254c758cdd0e2f2d48e62a34118a268d8f345e118" dependencies = [ - "windows-link 0.1.3", + "windows-link 0.2.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b9bd004..9114e9f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,7 +61,7 @@ testcontainers-modules = { version = "0.11.2", features = ["postgres", "kafka", jsonrpsee = { version = "0.26.0", features = ["server", "macros"] } # Kafka and S3 dependencies -rdkafka = { version = "0.37.0", features = ["libz-static"] } +rdkafka = { version = "0.37.0", features = ["libz-static", "ssl-vendored"] } aws-config = "1.1.7" aws-sdk-s3 = "1.106.0" aws-credential-types = "1.1.7" diff --git a/crates/ingress-writer/Dockerfile b/Dockerfile similarity index 68% rename from crates/ingress-writer/Dockerfile rename to Dockerfile index 52adfe7..6ef4440 100644 --- a/crates/ingress-writer/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM rust:1-bookworm AS base -RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config +RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config libsasl2-dev libssl-dev RUN cargo install cargo-chef --locked WORKDIR /app @@ -21,8 +21,11 @@ COPY . . RUN --mount=type=cache,target=/usr/local/cargo/registry \ --mount=type=cache,target=/usr/local/cargo/git \ --mount=type=cache,target=/app/target \ - cargo build --bin tips-ingress-writer && \ - cp target/debug/tips-ingress-writer /tmp/tips-ingress-writer + cargo build && \ + cp target/debug/tips-maintenance /tmp/tips-maintenance && \ + cp target/debug/tips-ingress-rpc /tmp/tips-ingress-rpc && \ + cp target/debug/tips-ingress-writer /tmp/tips-ingress-writer && \ + cp target/debug/tips-audit /tmp/tips-audit FROM debian:bookworm @@ -30,6 +33,7 @@ RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/ WORKDIR /app -COPY --from=builder /tmp/tips-ingress-writer /app/tips-ingress-writer - -CMD ["/app/tips-ingress-writer"] \ No newline at end of file +COPY --from=builder /tmp/tips-maintenance /app/tips-maintenance +COPY --from=builder /tmp/tips-audit /app/tips-audit +COPY --from=builder /tmp/tips-ingress-rpc /app/tips-ingress-rpc +COPY --from=builder /tmp/tips-ingress-writer /app/tips-ingress-writer \ No newline at end of file diff --git a/crates/audit/Dockerfile b/crates/audit/Dockerfile deleted file mode 100644 index 1a1a817..0000000 --- a/crates/audit/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM rust:1-bookworm AS base - -RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config - -RUN cargo install cargo-chef --locked -WORKDIR /app - -FROM base AS planner -COPY . . -RUN cargo chef prepare --recipe-path recipe.json - -FROM base AS builder -COPY --from=planner /app/recipe.json recipe.json - -RUN --mount=type=cache,target=/usr/local/cargo/registry \ - --mount=type=cache,target=/usr/local/cargo/git \ - --mount=type=cache,target=/app/target \ - cargo chef cook --recipe-path recipe.json - -COPY . . -RUN --mount=type=cache,target=/usr/local/cargo/registry \ - --mount=type=cache,target=/usr/local/cargo/git \ - --mount=type=cache,target=/app/target \ - cargo build --bin tips-audit && \ - cp target/debug/tips-audit /tmp/tips-audit - -FROM debian:bookworm - -RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/lib/apt/lists/* - -WORKDIR /app - -COPY --from=builder /tmp/tips-audit /app/tips-audit - -EXPOSE 3001 - -CMD ["/app/tips-audit"] \ No newline at end of file diff --git a/crates/ingress-rpc/Dockerfile b/crates/ingress-rpc/Dockerfile deleted file mode 100644 index 0ec3bd8..0000000 --- a/crates/ingress-rpc/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM rust:1-bookworm AS base - -RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config - -RUN cargo install cargo-chef --locked -WORKDIR /app - -FROM base AS planner -COPY . . -RUN cargo chef prepare --recipe-path recipe.json - -FROM base AS builder -COPY --from=planner /app/recipe.json recipe.json - -RUN --mount=type=cache,target=/usr/local/cargo/registry \ - --mount=type=cache,target=/usr/local/cargo/git \ - --mount=type=cache,target=/app/target \ - cargo chef cook --recipe-path recipe.json - -COPY . . -RUN --mount=type=cache,target=/usr/local/cargo/registry \ - --mount=type=cache,target=/usr/local/cargo/git \ - --mount=type=cache,target=/app/target \ - cargo build --bin tips-ingress-rpc && \ - cp target/debug/tips-ingress-rpc /tmp/tips-ingress-rpc - -FROM debian:bookworm - -RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/lib/apt/lists/* - -WORKDIR /app - -COPY --from=builder /tmp/tips-ingress-rpc /app/tips-ingress-rpc - -EXPOSE 3000 - -CMD ["/app/tips-ingress-rpc"] \ No newline at end of file diff --git a/crates/maintenance/Dockerfile b/crates/maintenance/Dockerfile deleted file mode 100644 index ead4a07..0000000 --- a/crates/maintenance/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM rust:1-bookworm AS base - -RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config - -RUN cargo install cargo-chef --locked -WORKDIR /app - -FROM base AS planner -COPY . . -RUN cargo chef prepare --recipe-path recipe.json - -FROM base AS builder -COPY --from=planner /app/recipe.json recipe.json - -RUN --mount=type=cache,target=/usr/local/cargo/registry \ - --mount=type=cache,target=/usr/local/cargo/git \ - --mount=type=cache,target=/app/target \ - cargo chef cook --recipe-path recipe.json - -COPY . . -RUN --mount=type=cache,target=/usr/local/cargo/registry \ - --mount=type=cache,target=/usr/local/cargo/git \ - --mount=type=cache,target=/app/target \ - cargo build --bin tips-maintenance && \ - cp target/debug/tips-maintenance /tmp/tips-maintenance - -FROM debian:bookworm - -RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/lib/apt/lists/* - -WORKDIR /app - -COPY --from=builder /tmp/tips-maintenance /app/tips-maintenance - -CMD ["/app/tips-maintenance"] \ No newline at end of file diff --git a/docker-compose.tips.yml b/docker-compose.tips.yml index cbd9ab0..4eb72dc 100644 --- a/docker-compose.tips.yml +++ b/docker-compose.tips.yml @@ -2,7 +2,9 @@ services: ingress-rpc: build: context: . - dockerfile: crates/ingress-rpc/Dockerfile + dockerfile: Dockerfile + command: + - "/app/tips-ingress-rpc" container_name: tips-ingress-rpc ports: - "8080:8080" @@ -15,7 +17,9 @@ services: audit: build: context: . - dockerfile: crates/audit/Dockerfile + dockerfile: Dockerfile + command: + - "/app/tips-audit" container_name: tips-audit env_file: - .env.docker @@ -26,7 +30,9 @@ services: maintenance: build: context: . - dockerfile: crates/maintenance/Dockerfile + dockerfile: Dockerfile + command: + - "/app/tips-maintenance" container_name: tips-maintenance env_file: - .env.docker @@ -48,7 +54,9 @@ services: ingress-writer: build: context: . - dockerfile: crates/ingress-writer/Dockerfile + dockerfile: Dockerfile + command: + - "/app/tips-ingress-writer" container_name: tips-ingress-writer env_file: - .env.docker From 3e70d939a3873bf5672ca925c191130f25111bd7 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Sat, 11 Oct 2025 11:37:48 -0500 Subject: [PATCH 022/117] fix: misc fixes + logging (#27) * fix: connecting to rds pg cluster * add error logging * add additional logging * add logging * persist to db --- crates/ingress-rpc/src/validation.rs | 32 ++++++++++++++----------- crates/maintenance/src/job.rs | 35 +++++++++++++++++++++------- ui/src/db/index.ts | 4 ++++ 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/crates/ingress-rpc/src/validation.rs b/crates/ingress-rpc/src/validation.rs index 54d8a32..cacc66d 100644 --- a/crates/ingress-rpc/src/validation.rs +++ b/crates/ingress-rpc/src/validation.rs @@ -1,3 +1,4 @@ +use alloy_consensus::private::alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_consensus::{Transaction, Typed2718, constants::KECCAK_EMPTY, transaction::Recovered}; use alloy_primitives::{Address, B256, U256}; use alloy_provider::{Provider, RootProvider}; @@ -49,24 +50,29 @@ pub trait L1BlockInfoLookup: Send + Sync { #[async_trait] impl L1BlockInfoLookup for RootProvider { async fn fetch_l1_block_info(&self) -> RpcResult { - let block_number = self - .get_block_number() - .await - .map_err(|_| EthApiError::InternalEthError.into_rpc_err())?; let block = self - .get_block_by_number(block_number.into()) + .get_block(BlockId::Number(BlockNumberOrTag::Latest)) .full() .await - .map_err(|_| EthApiError::InternalEthError.into_rpc_err())? - .ok_or_else(|| EthApiError::HeaderNotFound(block_number.into()).into_rpc_err())?; + .map_err(|e| { + warn!(message = "failed to fetch latest block", err = %e); + EthApiError::InternalEthError.into_rpc_err() + })? + .ok_or_else(|| { + warn!(message = "empty latest block returned"); + EthApiError::InternalEthError.into_rpc_err() + })?; let txs = block.transactions.clone(); - let first_tx = txs - .first_transaction() - .ok_or_else(|| EthApiError::InternalEthError.into_rpc_err())?; - - Ok(extract_l1_info_from_tx(&first_tx.clone()) - .map_err(|_| EthApiError::InternalEthError.into_rpc_err())?) + let first_tx = txs.first_transaction().ok_or_else(|| { + warn!(message = "block contains no transactions"); + EthApiError::InternalEthError.into_rpc_err() + })?; + + Ok(extract_l1_info_from_tx(&first_tx.clone()).map_err(|e| { + warn!(message = "failed to extract l1_info from tx", err = %e); + EthApiError::InternalEthError.into_rpc_err() + })?) } } diff --git a/crates/maintenance/src/job.rs b/crates/maintenance/src/job.rs index 835f1a7..386bf3e 100644 --- a/crates/maintenance/src/job.rs +++ b/crates/maintenance/src/job.rs @@ -16,9 +16,9 @@ use std::collections::HashSet; use std::time::Duration; use tips_audit::{BundleEvent, BundleEventPublisher, DropReason}; use tips_datastore::BundleDatastore; -use tips_datastore::postgres::{BundleFilter, BundleState, BundleWithMetadata}; +use tips_datastore::postgres::{BlockInfoUpdate, BundleFilter, BundleState, BundleWithMetadata}; use tokio::sync::mpsc; -use tracing::{error, info, warn}; +use tracing::{debug, error, info, warn}; use uuid::Uuid; pub struct MaintenanceJob, K: BundleEventPublisher> { @@ -54,6 +54,11 @@ impl, K: BundleEventPublisher> Mainten .await? .ok_or_else(|| anyhow::anyhow!("Failed to get latest block"))?; + debug!( + message = "Executing up to latest block", + block_number = latest_block.number() + ); + let block_info = self.store.get_current_block_info().await?; if let Some(current_block_info) = block_info { @@ -62,6 +67,8 @@ impl, K: BundleEventPublisher> Mainten for block_num in (current_block_info.latest_block_number + 1)..=latest_block.header.number { + debug!(message = "Fetching block number", ?latest_block); + let block = self .node .get_block(BlockId::Number(alloy_rpc_types::BlockNumberOrTag::Number( @@ -71,12 +78,19 @@ impl, K: BundleEventPublisher> Mainten .await? .ok_or_else(|| anyhow::anyhow!("Failed to get block {}", block_num))?; + let hash = block.hash(); self.on_new_block(block).await?; + self.store + .commit_block_info(vec![BlockInfoUpdate { + block_number: block_num, + block_hash: hash, + }]) + .await?; } } } else { warn!("No block info found in database, initializing with latest block as finalized"); - let block_update = tips_datastore::postgres::BlockInfoUpdate { + let block_update = BlockInfoUpdate { block_number: latest_block.header.number, block_hash: latest_block.header.hash, }; @@ -142,33 +156,36 @@ impl, K: BundleEventPublisher> Mainten loop { tokio::select! { _ = maintenance_interval.tick() => { + info!(message = "starting maintenance"); match self.periodic_maintenance().await { Ok(_) => { - info!("Periodic maintenance completed"); + info!(message = "Periodic maintenance completed"); }, Err(err) => { - error!("Error in periodic maintenance: {:?}", err); + error!(message = "Error in periodic maintenance", error = %err); } } } _ = execution_interval.tick() => { + info!(message = "starting execution run"); match self.execute().await { Ok(_) => { - info!("Successfully executed maintenance run"); + info!(message = "Successfully executed maintenance run"); } Err(e) => { - error!("Error executing maintenance run: {:?}", e); + error!(message = "Error executing maintenance run", error = %e); } } } Some(flashblock) = fb_rx.recv() => { + info!(message = "starting flashblock processing"); match self.process_flashblock(flashblock).await { Ok(_) => { - info!("Successfully processed flashblock"); + info!(message = "Successfully processed flashblock"); } Err(e) => { - error!("Error processing flashblock: {:?}", e); + error!(message = "Error processing flashblock", error = %e); } } } diff --git a/ui/src/db/index.ts b/ui/src/db/index.ts index 55c8a8f..284ca5a 100644 --- a/ui/src/db/index.ts +++ b/ui/src/db/index.ts @@ -4,6 +4,10 @@ import * as schema from "./schema"; const pool = new Pool({ connectionString: process.env.TIPS_DATABASE_URL, + ssl: { + requestCert: false, + rejectUnauthorized: false, + }, }); export const db = drizzle(pool, { schema }); From abc3d3351361fa8065f2129d125cd58d1020cd5b Mon Sep 17 00:00:00 2001 From: William Law Date: Mon, 13 Oct 2025 17:00:19 -0400 Subject: [PATCH 023/117] make clippy happy (#23) --- crates/audit/src/types.rs | 4 ++-- crates/datastore/src/postgres.rs | 17 +++++++++-------- crates/ingress-rpc/src/service.rs | 2 -- crates/maintenance/src/job.rs | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/crates/audit/src/types.rs b/crates/audit/src/types.rs index fce2a2b..74866ef 100644 --- a/crates/audit/src/types.rs +++ b/crates/audit/src/types.rs @@ -121,7 +121,7 @@ impl BundleEvent { block_hash, .. } => { - format!("{}-{}", bundle_id, block_hash) + format!("{bundle_id}-{block_hash}") } BundleEvent::FlashblockIncluded { bundle_id, @@ -129,7 +129,7 @@ impl BundleEvent { flashblock_index, .. } => { - format!("{}-{}-{}", bundle_id, block_number, flashblock_index) + format!("{bundle_id}-{block_number}-{flashblock_index}") } _ => { format!("{}-{}", self.bundle_id(), Uuid::new_v4()) diff --git a/crates/datastore/src/postgres.rs b/crates/datastore/src/postgres.rs index 1852eda..9250801 100644 --- a/crates/datastore/src/postgres.rs +++ b/crates/datastore/src/postgres.rs @@ -446,19 +446,20 @@ impl BundleDatastore for PostgresDatastore { match (row.latest_block_number, row.latest_block_hash) { (Some(block_number), Some(hash_str)) => { let hash = B256::from_hex(&hash_str) - .map_err(|e| anyhow::anyhow!("Failed to parse latest block hash: {}", e))?; + .map_err(|e| anyhow::anyhow!("Failed to parse latest block hash: {e}"))?; (block_number as u64, hash) } _ => return Ok(None), }; - let latest_finalized_block_hash = if let Some(hash_str) = row.latest_finalized_block_hash { - Some(B256::from_hex(&hash_str).map_err(|e| { - anyhow::anyhow!("Failed to parse latest finalized block hash: {}", e) - })?) - } else { - None - }; + let latest_finalized_block_hash = + if let Some(hash_str) = row.latest_finalized_block_hash { + Some(B256::from_hex(&hash_str).map_err(|e| { + anyhow::anyhow!("Failed to parse latest finalized block hash: {e}") + })?) + } else { + None + }; Ok(Some(BlockInfo { latest_block_number, diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 1cda9d9..a48841d 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -94,8 +94,6 @@ where .await?; validate_tx(account, &transaction, &data, &mut l1_block_info).await?; - // TODO: parallelize DB and mempool setup - let expiry_timestamp = SystemTime::now() .duration_since(UNIX_EPOCH) .unwrap() diff --git a/crates/maintenance/src/job.rs b/crates/maintenance/src/job.rs index 386bf3e..cbc09f1 100644 --- a/crates/maintenance/src/job.rs +++ b/crates/maintenance/src/job.rs @@ -76,7 +76,7 @@ impl, K: BundleEventPublisher> Mainten ))) .full() .await? - .ok_or_else(|| anyhow::anyhow!("Failed to get block {}", block_num))?; + .ok_or_else(|| anyhow::anyhow!("Failed to get block {block_num}"))?; let hash = block.hash(); self.on_new_block(block).await?; From 6b9196672ce8e15bdda444b8ef129187f8b09041 Mon Sep 17 00:00:00 2001 From: William Law Date: Tue, 14 Oct 2025 10:26:33 -0400 Subject: [PATCH 024/117] ci: enforce clippy warnings to be same as locally (#24) * enforce clippy warnings to be same as locally * try another approach * one more time --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 9c157f1..462805c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -66,7 +66,7 @@ jobs: - uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable with: components: clippy - - run: cargo clippy -- -D warnings + - run: cargo clippy -- -D warnings -W clippy::uninlined_format_args build: name: Build From edfa3621706234da91478da8c4794bb1ac39969d Mon Sep 17 00:00:00 2001 From: William Law Date: Wed, 15 Oct 2025 17:01:18 -0400 Subject: [PATCH 025/117] feat: search by txn hash in UI (#28) --- ui/src/app/bundles/page.tsx | 114 ++++++++++++++++++++++++++++++++---- 1 file changed, 104 insertions(+), 10 deletions(-) diff --git a/ui/src/app/bundles/page.tsx b/ui/src/app/bundles/page.tsx index cc34c79..9896655 100644 --- a/ui/src/app/bundles/page.tsx +++ b/ui/src/app/bundles/page.tsx @@ -1,7 +1,7 @@ "use client"; import Link from "next/link"; -import { useEffect, useState } from "react"; +import { useCallback, useEffect, useRef, useState } from "react"; import type { Bundle } from "@/app/api/bundles/route"; export default function BundlesPage() { @@ -9,6 +9,49 @@ export default function BundlesPage() { const [allBundles, setAllBundles] = useState([]); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); + const [searchHash, setSearchHash] = useState(""); + const [filteredLiveBundles, setFilteredLiveBundles] = useState([]); + const [filteredAllBundles, setFilteredAllBundles] = useState([]); + const debounceTimeoutRef = useRef(null); + + const filterBundles = useCallback( + async (searchTerm: string, live: Bundle[], all: string[]) => { + if (!searchTerm.trim()) { + setFilteredLiveBundles(live); + setFilteredAllBundles(all); + return; + } + + // Filter live bundles immediately for better UX + const liveBundlesWithTx = live.filter((bundle) => + bundle.txnHashes?.some((hash) => + hash.toLowerCase().includes(searchTerm.toLowerCase()), + ), + ); + + let allBundlesWithTx: string[] = []; + + try { + const response = await fetch(`/api/txn/${searchTerm.trim()}`); + + if (response.ok) { + const txnData = await response.json(); + const bundleIds = txnData.bundle_ids || []; + + allBundlesWithTx = all.filter((bundleId) => + bundleIds.includes(bundleId), + ); + } + } catch (err) { + console.error("Error filtering bundles:", err); + } + + // Batch all state updates together to prevent jitter + setFilteredLiveBundles(liveBundlesWithTx); + setFilteredAllBundles(allBundlesWithTx); + }, + [], + ); useEffect(() => { const fetchLiveBundles = async () => { @@ -56,6 +99,28 @@ export default function BundlesPage() { return () => clearInterval(interval); }, []); + useEffect(() => { + if (debounceTimeoutRef.current) { + clearTimeout(debounceTimeoutRef.current); + } + + if (!searchHash.trim()) { + // No debounce for clearing search + filterBundles(searchHash, liveBundles, allBundles); + } else { + // Debounce API calls for non-empty search + debounceTimeoutRef.current = setTimeout(() => { + filterBundles(searchHash, liveBundles, allBundles); + }, 300); + } + + return () => { + if (debounceTimeoutRef.current) { + clearTimeout(debounceTimeoutRef.current); + } + }; + }, [searchHash, liveBundles, allBundles, filterBundles]); + if (loading) { return (
@@ -68,7 +133,18 @@ export default function BundlesPage() { return (
-

BundleStore (fka Mempool)

+
+

BundleStore (fka Mempool)

+
+ setSearchHash(e.target.value)} + className="px-3 py-2 border rounded-lg bg-white/5 border-gray-300 dark:border-gray-600 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent placeholder-gray-500 dark:placeholder-gray-400 text-sm min-w-[300px]" + /> +
+
{error && (
{error}
)} @@ -76,10 +152,17 @@ export default function BundlesPage() {
-

Live Bundles

- {liveBundles.length > 0 ? ( +

+ Live Bundles + {searchHash.trim() && ( + + ({filteredLiveBundles.length} found) + + )} +

+ {filteredLiveBundles.length > 0 ? (
    - {liveBundles.map((bundle) => ( + {filteredLiveBundles.map((bundle) => (
  • ) : (

    - No live bundles found. + {searchHash.trim() + ? "No live bundles found matching this transaction hash." + : "No live bundles found."}

    )}
-

All Bundles

- {allBundles.length > 0 ? ( +

+ All Bundles + {searchHash.trim() && ( + + ({filteredAllBundles.length} found) + + )} +

+ {filteredAllBundles.length > 0 ? (
    - {allBundles.map((bundleId) => ( + {filteredAllBundles.map((bundleId) => (
  • ) : (

    - No bundles found in S3. + {searchHash.trim() + ? "No bundles found in S3 matching this transaction hash." + : "No bundles found in S3."}

    )}
From 5b88139ebc7e1900ff44f34e29ecfda3c8098e52 Mon Sep 17 00:00:00 2001 From: William Law Date: Thu, 23 Oct 2025 15:51:06 -0400 Subject: [PATCH 026/117] feat: introduce `eth_sendBundle` (#34) * spike * use bundle hash as key * validate txs in bundle * refactor validate_tx * refactor validate_bundle * add unit tests * make clippy happy * crate::validate_bundle doesnt need async * combine publish/enqueue fns --- crates/ingress-rpc/src/queue.rs | 32 +++----- crates/ingress-rpc/src/service.rs | 98 +++++++++++++++++------- crates/ingress-rpc/src/validation.rs | 110 +++++++++++++++++++++++++++ 3 files changed, 192 insertions(+), 48 deletions(-) diff --git a/crates/ingress-rpc/src/queue.rs b/crates/ingress-rpc/src/queue.rs index 4a685de..94654bb 100644 --- a/crates/ingress-rpc/src/queue.rs +++ b/crates/ingress-rpc/src/queue.rs @@ -1,6 +1,6 @@ -use alloy_primitives::Address; +use alloy_primitives::B256; use alloy_rpc_types_mev::EthSendBundle; -use anyhow::{Error, Result}; +use anyhow::Result; use async_trait::async_trait; use backon::{ExponentialBuilder, Retryable}; use rdkafka::producer::{FutureProducer, FutureRecord}; @@ -10,7 +10,7 @@ use tracing::{error, info}; /// A queue to buffer transactions #[async_trait] pub trait QueuePublisher: Send + Sync { - async fn publish(&self, bundle: &EthSendBundle, sender: Address) -> Result<()>; + async fn publish(&self, bundle: &EthSendBundle, bundle_hash: &B256) -> Result<()>; } /// A queue to buffer transactions @@ -23,13 +23,12 @@ impl KafkaQueuePublisher { pub fn new(producer: FutureProducer, topic: String) -> Self { Self { producer, topic } } +} - pub async fn enqueue_bundle( - &self, - bundle: &EthSendBundle, - sender: Address, - ) -> Result<(), Error> { - let key = sender.to_string(); +#[async_trait] +impl QueuePublisher for KafkaQueuePublisher { + async fn publish(&self, bundle: &EthSendBundle, bundle_hash: &B256) -> Result<()> { + let key = bundle_hash.to_string(); let payload = serde_json::to_vec(bundle)?; let enqueue = || async { @@ -38,7 +37,7 @@ impl KafkaQueuePublisher { match self.producer.send(record, Duration::from_secs(5)).await { Ok((partition, offset)) => { info!( - sender = %sender, + bundle_hash = %bundle_hash, partition = partition, offset = offset, topic = %self.topic, @@ -48,7 +47,7 @@ impl KafkaQueuePublisher { } Err((err, _)) => { error!( - sender = %sender, + bundle_hash = %bundle_hash, error = %err, topic = %self.topic, "Failed to enqueue bundle" @@ -72,13 +71,6 @@ impl KafkaQueuePublisher { } } -#[async_trait] -impl QueuePublisher for KafkaQueuePublisher { - async fn publish(&self, bundle: &EthSendBundle, sender: Address) -> Result<()> { - self.enqueue_bundle(bundle, sender).await - } -} - #[cfg(test)] mod tests { use super::*; @@ -100,10 +92,10 @@ mod tests { let publisher = KafkaQueuePublisher::new(producer, "tips-ingress-rpc".to_string()); let bundle = create_test_bundle(); - let sender = Address::ZERO; + let bundle_hash = bundle.bundle_hash(); let start = Instant::now(); - let result = publisher.enqueue_bundle(&bundle, sender).await; + let result = publisher.publish(&bundle, &bundle_hash).await; let elapsed = start.elapsed(); // the backoff tries at minimum 100ms, so verify we tried at least once diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index a48841d..a7991bd 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -1,5 +1,5 @@ -use crate::validation::{AccountInfoLookup, L1BlockInfoLookup, validate_tx}; -use alloy_consensus::transaction::SignerRecoverable; +use alloy_consensus::transaction::Recovered; +use alloy_consensus::{Transaction, transaction::SignerRecoverable}; use alloy_primitives::{B256, Bytes}; use alloy_provider::{Provider, RootProvider, network::eip2718::Decodable2718}; use alloy_rpc_types_mev::{EthBundleHash, EthCancelBundle, EthSendBundle}; @@ -14,6 +14,7 @@ use std::time::{SystemTime, UNIX_EPOCH}; use tracing::{info, warn}; use crate::queue::QueuePublisher; +use crate::validation::{AccountInfoLookup, L1BlockInfoLookup, validate_bundle, validate_tx}; #[rpc(server, namespace = "eth")] pub trait IngressApi { @@ -58,12 +59,25 @@ impl IngressApiServer for IngressService where Queue: QueuePublisher + Sync + Send + 'static, { - async fn send_bundle(&self, _bundle: EthSendBundle) -> RpcResult { - warn!( - message = "TODO: implement send_bundle", - method = "send_bundle" + async fn send_bundle(&self, bundle: EthSendBundle) -> RpcResult { + self.validate_bundle(&bundle).await?; + + // Queue the bundle + let bundle_hash = bundle.bundle_hash(); + if let Err(e) = self.queue.publish(&bundle, &bundle_hash).await { + warn!(message = "Failed to publish bundle to queue", bundle_hash = %bundle_hash, error = %e); + return Err(EthApiError::InvalidParams("Failed to queue bundle".into()).into_rpc_err()); + } + + info!( + message = "queued bundle", + bundle_hash = %bundle_hash, + tx_count = bundle.txs.len(), ); - todo!("implement send_bundle") + + Ok(EthBundleHash { + bundle_hash: bundle.bundle_hash(), + }) } async fn cancel_bundle(&self, _request: EthCancelBundle) -> RpcResult<()> { @@ -75,24 +89,7 @@ where } async fn send_raw_transaction(&self, data: Bytes) -> RpcResult { - if data.is_empty() { - return Err(EthApiError::EmptyRawTransactionData.into_rpc_err()); - } - - let envelope = OpTxEnvelope::decode_2718_exact(data.iter().as_slice()) - .map_err(|_| EthApiError::FailedToDecodeSignedTransaction.into_rpc_err())?; - - let transaction = envelope - .clone() - .try_into_recovered() - .map_err(|_| EthApiError::FailedToDecodeSignedTransaction.into_rpc_err())?; - - let mut l1_block_info = self.provider.fetch_l1_block_info().await?; - let account = self - .provider - .fetch_account_info(transaction.signer()) - .await?; - validate_tx(account, &transaction, &data, &mut l1_block_info).await?; + let transaction = self.validate_tx(&data).await?; let expiry_timestamp = SystemTime::now() .duration_since(UNIX_EPOCH) @@ -110,9 +107,9 @@ where }; // queue the bundle - let sender = transaction.signer(); - if let Err(e) = self.queue.publish(&bundle, sender).await { - warn!(message = "Failed to publish Queue::enqueue_bundle", sender = %sender, error = %e); + let bundle_hash = bundle.bundle_hash(); + if let Err(e) = self.queue.publish(&bundle, &bundle_hash).await { + warn!(message = "Failed to publish Queue::enqueue_bundle", bundle_hash = %bundle_hash, error = %e); } info!(message="queued singleton bundle", txn_hash=%transaction.tx_hash()); @@ -139,3 +136,48 @@ where Ok(transaction.tx_hash()) } } + +impl IngressService +where + Queue: QueuePublisher + Sync + Send + 'static, +{ + async fn validate_tx(&self, data: &Bytes) -> RpcResult> { + if data.is_empty() { + return Err(EthApiError::EmptyRawTransactionData.into_rpc_err()); + } + + let envelope = OpTxEnvelope::decode_2718_exact(data.iter().as_slice()) + .map_err(|_| EthApiError::FailedToDecodeSignedTransaction.into_rpc_err())?; + + let transaction = envelope + .clone() + .try_into_recovered() + .map_err(|_| EthApiError::FailedToDecodeSignedTransaction.into_rpc_err())?; + + let mut l1_block_info = self.provider.fetch_l1_block_info().await?; + let account = self + .provider + .fetch_account_info(transaction.signer()) + .await?; + validate_tx(account, &transaction, data, &mut l1_block_info).await?; + + Ok(transaction) + } + + async fn validate_bundle(&self, bundle: &EthSendBundle) -> RpcResult<()> { + if bundle.txs.is_empty() { + return Err( + EthApiError::InvalidParams("Bundle cannot have empty transactions".into()) + .into_rpc_err(), + ); + } + + let mut total_gas = 0u64; + for tx_data in &bundle.txs { + let transaction = self.validate_tx(tx_data).await?; + total_gas = total_gas.saturating_add(transaction.gas_limit()); + } + + validate_bundle(bundle, total_gas) + } +} diff --git a/crates/ingress-rpc/src/validation.rs b/crates/ingress-rpc/src/validation.rs index cacc66d..b9d1d2e 100644 --- a/crates/ingress-rpc/src/validation.rs +++ b/crates/ingress-rpc/src/validation.rs @@ -2,6 +2,7 @@ use alloy_consensus::private::alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_consensus::{Transaction, Typed2718, constants::KECCAK_EMPTY, transaction::Recovered}; use alloy_primitives::{Address, B256, U256}; use alloy_provider::{Provider, RootProvider}; +use alloy_rpc_types_mev::EthSendBundle; use async_trait::async_trait; use jsonrpsee::core::RpcResult; use op_alloy_consensus::interop::CROSS_L2_INBOX_ADDRESS; @@ -9,8 +10,12 @@ use op_alloy_network::Optimism; use op_revm::{OpSpecId, l1block::L1BlockInfo}; use reth_optimism_evm::extract_l1_info_from_tx; use reth_rpc_eth_types::{EthApiError, RpcInvalidTransactionError, SignError}; +use std::time::{Duration, SystemTime, UNIX_EPOCH}; use tracing::warn; +// TODO: make this configurable +const MAX_BUNDLE_GAS: u64 = 30_000_000; + /// Account info for a given address pub struct AccountInfo { pub balance: U256, @@ -158,17 +163,51 @@ pub async fn validate_tx( Ok(()) } +/// Helper function to validate propeties of a bundle. A bundle is valid if it satisfies the following criteria: +/// - The bundle's max_timestamp is not more than 1 hour in the future +/// - The bundle's gas limit is not greater than the maximum allowed gas limit +pub fn validate_bundle(bundle: &EthSendBundle, bundle_gas: u64) -> RpcResult<()> { + // Don't allow bundles to be submitted over 1 hour into the future + // TODO: make the window configurable + let valid_timestamp_window = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap() + .as_secs() + + Duration::from_secs(3600).as_secs(); + if let Some(max_timestamp) = bundle.max_timestamp + && max_timestamp > valid_timestamp_window + { + return Err(EthApiError::InvalidParams( + "Bundle cannot be more than 1 hour in the future".into(), + ) + .into_rpc_err()); + } + + // Check max gas limit for the entire bundle + if bundle_gas > MAX_BUNDLE_GAS { + return Err( + EthApiError::InvalidParams("Bundle gas limit exceeds maximum allowed".into()) + .into_rpc_err(), + ); + } + + Ok(()) +} + #[cfg(test)] mod tests { use super::*; use alloy_consensus::SignableTransaction; use alloy_consensus::{Transaction, constants::KECCAK_EMPTY, transaction::SignerRecoverable}; use alloy_consensus::{TxEip1559, TxEip4844, TxEip7702}; + use alloy_primitives::Bytes; use alloy_primitives::{bytes, keccak256}; use alloy_signer_local::PrivateKeySigner; use op_alloy_consensus::OpTxEnvelope; use op_alloy_network::TxSignerSync; + use op_alloy_network::eip2718::Encodable2718; use revm_context_interface::transaction::{AccessList, AccessListItem}; + use std::time::{SystemTime, UNIX_EPOCH}; fn create_account(nonce: u64, balance: U256) -> AccountInfo { AccountInfo { @@ -452,4 +491,75 @@ mod tests { .into_rpc_err()) ); } + + #[tokio::test] + async fn test_err_bundle_max_timestamp_too_far_in_the_future() { + let current_time = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap() + .as_secs(); + let too_far_in_the_future = current_time + 3601; + let bundle = EthSendBundle { + txs: vec![], + max_timestamp: Some(too_far_in_the_future), + ..Default::default() + }; + assert_eq!( + validate_bundle(&bundle, 0), + Err(EthApiError::InvalidParams( + "Bundle cannot be more than 1 hour in the future".into() + ) + .into_rpc_err()) + ); + } + + #[tokio::test] + async fn test_err_bundle_max_gas_limit_too_high() { + let signer = PrivateKeySigner::random(); + let mut encoded_txs = vec![]; + + // Create transactions that collectively exceed MAX_BUNDLE_GAS (30M) + // Each transaction uses 4M gas, so 8 transactions = 32M gas > 30M limit + let gas = 4_000_000; + let mut total_gas = 0u64; + for _ in 0..8 { + let mut tx = TxEip1559 { + chain_id: 1, + nonce: 0, + gas_limit: gas, + max_fee_per_gas: 200000u128, + max_priority_fee_per_gas: 100000u128, + to: Address::random().into(), + value: U256::from(1000000u128), + access_list: Default::default(), + input: bytes!("").clone(), + }; + total_gas = total_gas.saturating_add(gas); + + let signature = signer.sign_transaction_sync(&mut tx).unwrap(); + let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); + + // Encode the transaction + let mut encoded = vec![]; + envelope.encode_2718(&mut encoded); + encoded_txs.push(Bytes::from(encoded)); + } + + let bundle = EthSendBundle { + txs: encoded_txs, + block_number: 0, + min_timestamp: None, + max_timestamp: None, + reverting_tx_hashes: vec![], + ..Default::default() + }; + + // Test should fail due to exceeding gas limit + let result = validate_bundle(&bundle, total_gas); + assert!(result.is_err()); + if let Err(e) = result { + let error_message = format!("{e:?}"); + assert!(error_message.contains("Bundle gas limit exceeds maximum allowed")); + } + } } From 96462f2fca41961f9d806c83afaf357dbd2833b5 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Sun, 26 Oct 2025 17:32:29 -0500 Subject: [PATCH 027/117] chore: run GHA on PRs to any base branch (#40) --- .github/workflows/docker.yml | 1 - .github/workflows/rust.yml | 1 - .github/workflows/ui.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ac22ab7..bd11ca8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -6,7 +6,6 @@ on: push: branches: [ master ] pull_request: - branches: [ master ] jobs: docker-build: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 462805c..051baf6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -6,7 +6,6 @@ on: push: branches: [ master ] pull_request: - branches: [ master ] env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml index 86256b8..f4559b9 100644 --- a/.github/workflows/ui.yml +++ b/.github/workflows/ui.yml @@ -7,7 +7,6 @@ on: branches: [ master ] paths: ['ui/**'] pull_request: - branches: [ master ] paths: ['ui/**'] jobs: From 95992ec59fd182aa225b279bbff5e9f77a75ed5d Mon Sep 17 00:00:00 2001 From: William Law Date: Sun, 26 Oct 2025 18:46:37 -0400 Subject: [PATCH 028/117] feat: queue `BundleWithMetadata` instead of `EthSendBundle` (#37) * intro tips-common * queue bundleWithMetadata * remove unused dep --- Cargo.lock | 22 +++++++-- Cargo.toml | 4 +- crates/common/Cargo.toml | 19 +++++++ crates/common/src/lib.rs | 64 ++++++++++++++++++++++++ crates/datastore/Cargo.toml | 5 +- crates/datastore/src/postgres.rs | 77 +++++++---------------------- crates/datastore/src/traits.rs | 9 ++-- crates/datastore/tests/datastore.rs | 51 +++++++++++-------- crates/ingress-rpc/Cargo.toml | 1 + crates/ingress-rpc/src/queue.rs | 15 +++--- crates/ingress-rpc/src/service.rs | 24 +++++++-- crates/ingress-writer/Cargo.toml | 2 +- crates/ingress-writer/src/main.rs | 10 ++-- crates/maintenance/Cargo.toml | 1 + crates/maintenance/src/job.rs | 5 +- 15 files changed, 197 insertions(+), 112 deletions(-) create mode 100644 crates/common/Cargo.toml create mode 100644 crates/common/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 4d6f59f..bd70e20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12492,7 +12492,7 @@ dependencies = [ ] [[package]] -name = "tips-datastore" +name = "tips-common" version = "0.1.0" dependencies = [ "alloy-consensus", @@ -12500,12 +12500,24 @@ dependencies = [ "alloy-provider", "alloy-rpc-types-mev", "anyhow", - "async-trait", - "eyre", + "chrono", "op-alloy-consensus", + "serde", + "sqlx", +] + +[[package]] +name = "tips-datastore" +version = "0.1.0" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-mev", + "anyhow", + "async-trait", "sqlx", "testcontainers", "testcontainers-modules", + "tips-common", "tokio", "tracing", "uuid", @@ -12534,6 +12546,7 @@ dependencies = [ "reth-rpc-eth-types", "revm-context-interface", "serde_json", + "tips-common", "tokio", "tracing", "tracing-subscriber 0.3.20", @@ -12544,7 +12557,6 @@ dependencies = [ name = "tips-ingress-writer" version = "0.1.0" dependencies = [ - "alloy-rpc-types-mev", "anyhow", "backon", "clap", @@ -12552,6 +12564,7 @@ dependencies = [ "rdkafka", "serde_json", "tips-audit", + "tips-common", "tips-datastore", "tokio", "tracing", @@ -12577,6 +12590,7 @@ dependencies = [ "rdkafka", "sqlx", "tips-audit", + "tips-common", "tips-datastore", "tokio", "tracing", diff --git a/Cargo.toml b/Cargo.toml index 9114e9f..fd631ba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://github.com/base/tips" repository = "https://github.com/base/tips" [workspace] -members = ["crates/datastore", "crates/audit", "crates/ingress-rpc", "crates/maintenance", "crates/ingress-writer"] +members = ["crates/datastore", "crates/audit", "crates/ingress-rpc", "crates/maintenance", "crates/ingress-writer", "crates/common"] resolver = "2" [workspace.dependencies] @@ -15,6 +15,7 @@ tips-datastore = { path = "crates/datastore" } tips-audit = { path = "crates/audit" } tips-maintenance = { path = "crates/maintenance" } tips-ingress-writer = { path = "crates/ingress-writer" } +tips-common = { path = "crates/common" } # Reth reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" } @@ -59,6 +60,7 @@ dotenvy = "0.15.7" testcontainers = { version = "0.23.1", features = ["blocking"] } testcontainers-modules = { version = "0.11.2", features = ["postgres", "kafka", "minio"] } jsonrpsee = { version = "0.26.0", features = ["server", "macros"] } +chrono = { version = "0.4.42", features = ["serde"] } # Kafka and S3 dependencies rdkafka = { version = "0.37.0", features = ["libz-static", "ssl-vendored"] } diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml new file mode 100644 index 0000000..c9b76c4 --- /dev/null +++ b/crates/common/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "tips-common" +version.workspace = true +edition.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +alloy-rpc-types-mev.workspace = true +alloy-primitives.workspace = true +sqlx.workspace = true +anyhow.workspace = true +op-alloy-consensus.workspace = true +alloy-provider.workspace = true +alloy-consensus.workspace = true +serde.workspace = true +chrono.workspace = true diff --git a/crates/common/src/lib.rs b/crates/common/src/lib.rs new file mode 100644 index 0000000..fc3616e --- /dev/null +++ b/crates/common/src/lib.rs @@ -0,0 +1,64 @@ +use alloy_consensus::Transaction; +use alloy_consensus::transaction::SignerRecoverable; +use alloy_primitives::{Address, TxHash}; +use alloy_provider::network::eip2718::Decodable2718; +use alloy_rpc_types_mev::EthSendBundle; +use anyhow::Result; +use chrono::{DateTime, Utc}; +use op_alloy_consensus::OpTxEnvelope; +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Clone, sqlx::Type, Serialize, Deserialize)] +#[sqlx(type_name = "bundle_state", rename_all = "PascalCase")] +pub enum BundleState { + Ready, + IncludedByBuilder, +} + +/// Extended bundle data that includes the original bundle plus extracted metadata +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct BundleWithMetadata { + pub bundle: EthSendBundle, + pub txn_hashes: Vec, + pub senders: Vec
, + pub min_base_fee: i64, + pub state: BundleState, + pub state_changed_at: DateTime, +} + +impl BundleWithMetadata { + pub fn new(bundle: &EthSendBundle) -> Result { + let mut senders = Vec::new(); + let mut txn_hashes = Vec::new(); + + let mut min_base_fee = i64::MAX; + + for tx_bytes in &bundle.txs { + let envelope = OpTxEnvelope::decode_2718_exact(tx_bytes)?; + txn_hashes.push(*envelope.hash()); + + let sender = match envelope.recover_signer() { + Ok(signer) => signer, + Err(err) => return Err(err.into()), + }; + + senders.push(sender); + min_base_fee = min_base_fee.min(envelope.max_fee_per_gas() as i64); // todo type and todo not right + } + + let minimum_base_fee = if min_base_fee == i64::MAX { + 0 + } else { + min_base_fee + }; + + Ok(Self { + bundle: bundle.clone(), + txn_hashes, + senders, + min_base_fee: minimum_base_fee, + state: BundleState::Ready, + state_changed_at: Utc::now(), + }) + } +} diff --git a/crates/datastore/Cargo.toml b/crates/datastore/Cargo.toml index ca6fd4a..4687a3f 100644 --- a/crates/datastore/Cargo.toml +++ b/crates/datastore/Cargo.toml @@ -15,11 +15,8 @@ anyhow.workspace = true async-trait.workspace = true alloy-rpc-types-mev.workspace = true alloy-primitives.workspace = true -alloy-consensus.workspace = true -alloy-provider.workspace = true -op-alloy-consensus.workspace = true -eyre.workspace = true tracing.workspace = true +tips-common.workspace = true [dev-dependencies] testcontainers.workspace = true diff --git a/crates/datastore/src/postgres.rs b/crates/datastore/src/postgres.rs index 9250801..700dbcb 100644 --- a/crates/datastore/src/postgres.rs +++ b/crates/datastore/src/postgres.rs @@ -1,12 +1,8 @@ use crate::traits::BundleDatastore; -use alloy_consensus::Transaction; -use alloy_consensus::transaction::SignerRecoverable; use alloy_primitives::hex::{FromHex, ToHexExt}; use alloy_primitives::{Address, B256, TxHash}; -use alloy_provider::network::eip2718::Decodable2718; use alloy_rpc_types_mev::EthSendBundle; use anyhow::Result; -use op_alloy_consensus::OpTxEnvelope; use sqlx::{ PgPool, types::chrono::{DateTime, Utc}, @@ -14,12 +10,7 @@ use sqlx::{ use tracing::info; use uuid::Uuid; -#[derive(Debug, Clone, sqlx::Type)] -#[sqlx(type_name = "bundle_state", rename_all = "PascalCase")] -pub enum BundleState { - Ready, - IncludedByBuilder, -} +use tips_common::{BundleState, BundleWithMetadata}; #[derive(sqlx::FromRow, Debug)] struct BundleRow { @@ -85,17 +76,6 @@ impl BundleFilter { } } -/// Extended bundle data that includes the original bundle plus extracted metadata -#[derive(Debug, Clone)] -pub struct BundleWithMetadata { - pub bundle: EthSendBundle, - pub txn_hashes: Vec, - pub senders: Vec
, - pub min_base_fee: i64, - pub state: BundleState, - pub state_changed_at: DateTime, -} - /// Statistics about bundles and transactions grouped by state #[derive(Debug, Clone, PartialEq, Eq)] pub struct BundleStats { @@ -215,57 +195,38 @@ impl PostgresDatastore { state_changed_at: row.state_changed_at, }) } - - fn extract_bundle_metadata( - &self, - bundle: &EthSendBundle, - ) -> Result<(Vec, i64, Vec)> { - let mut senders = Vec::new(); - let mut txn_hashes = Vec::new(); - - let mut min_base_fee = i64::MAX; - - for tx_bytes in &bundle.txs { - let envelope = OpTxEnvelope::decode_2718_exact(tx_bytes)?; - txn_hashes.push(envelope.hash().encode_hex_with_prefix()); - - let sender = match envelope.recover_signer() { - Ok(signer) => signer, - Err(err) => return Err(err.into()), - }; - - senders.push(sender.encode_hex_with_prefix()); - min_base_fee = min_base_fee.min(envelope.max_fee_per_gas() as i64); // todo type and todo not right - } - - let minimum_base_fee = if min_base_fee == i64::MAX { - 0 - } else { - min_base_fee - }; - - Ok((senders, minimum_base_fee, txn_hashes)) - } } #[async_trait::async_trait] impl BundleDatastore for PostgresDatastore { - async fn insert_bundle(&self, bundle: EthSendBundle) -> Result { + async fn insert_bundle(&self, bundle: BundleWithMetadata) -> Result { let id = Uuid::new_v4(); - let (senders, minimum_base_fee, txn_hashes) = self.extract_bundle_metadata(&bundle)?; + let senders: Vec = bundle + .senders + .iter() + .map(|s| s.encode_hex_with_prefix()) + .collect(); + let txn_hashes: Vec = bundle + .txn_hashes + .iter() + .map(|h| h.encode_hex_with_prefix()) + .collect(); let txs: Vec = bundle + .bundle .txs .iter() .map(|tx| tx.encode_hex_upper_with_prefix()) .collect(); let reverting_tx_hashes: Vec = bundle + .bundle .reverting_tx_hashes .iter() .map(|h| h.encode_hex_with_prefix()) .collect(); let dropping_tx_hashes: Vec = bundle + .bundle .dropping_tx_hashes .iter() .map(|h| h.encode_hex_with_prefix()) @@ -284,14 +245,14 @@ impl BundleDatastore for PostgresDatastore { id, BundleState::Ready as BundleState, &senders, - minimum_base_fee, + bundle.min_base_fee, &txn_hashes, &txs, &reverting_tx_hashes, &dropping_tx_hashes, - bundle.block_number as i64, - bundle.min_timestamp.map(|t| t as i64), - bundle.max_timestamp.map(|t| t as i64), + bundle.bundle.block_number as i64, + bundle.bundle.min_timestamp.map(|t| t as i64), + bundle.bundle.max_timestamp.map(|t| t as i64), ) .execute(&self.pool) .await?; diff --git a/crates/datastore/src/traits.rs b/crates/datastore/src/traits.rs index f58b2d9..65a9390 100644 --- a/crates/datastore/src/traits.rs +++ b/crates/datastore/src/traits.rs @@ -1,17 +1,16 @@ -use crate::postgres::{ - BlockInfo, BlockInfoUpdate, BundleFilter, BundleState, BundleStats, BundleWithMetadata, -}; +use crate::postgres::{BlockInfo, BlockInfoUpdate, BundleFilter, BundleStats}; use alloy_primitives::TxHash; -use alloy_rpc_types_mev::EthSendBundle; use anyhow::Result; use sqlx::types::chrono::{DateTime, Utc}; use uuid::Uuid; +use tips_common::{BundleState, BundleWithMetadata}; + /// Trait defining the interface for bundle datastore operations #[async_trait::async_trait] pub trait BundleDatastore: Send + Sync { /// Insert a new bundle into the datastore - async fn insert_bundle(&self, bundle: EthSendBundle) -> Result; + async fn insert_bundle(&self, bundle: BundleWithMetadata) -> Result; /// Fetch a bundle with metadata by its ID async fn get_bundle(&self, id: Uuid) -> Result>; diff --git a/crates/datastore/tests/datastore.rs b/crates/datastore/tests/datastore.rs index 8e71a3a..b46a588 100644 --- a/crates/datastore/tests/datastore.rs +++ b/crates/datastore/tests/datastore.rs @@ -6,7 +6,8 @@ use testcontainers_modules::{ postgres, testcontainers::{ContainerAsync, runners::AsyncRunner}, }; -use tips_datastore::postgres::{BlockInfoUpdate, BundleFilter, BundleState}; +use tips_common::{BundleState, BundleWithMetadata}; +use tips_datastore::postgres::{BlockInfoUpdate, BundleFilter}; use tips_datastore::{BundleDatastore, PostgresDatastore}; struct TestHarness { @@ -14,7 +15,7 @@ struct TestHarness { data_store: PostgresDatastore, } -async fn setup_datastore() -> eyre::Result { +async fn setup_datastore() -> anyhow::Result { let postgres_instance = postgres::Postgres::default().start().await?; let connection_string = format!( "postgres://postgres:postgres@{}:{}/postgres", @@ -38,8 +39,8 @@ const TX_DATA: Bytes = bytes!( const TX_HASH: TxHash = b256!("0x3ea7e1482485387e61150ee8e5c8cad48a14591789ac02cc2504046d96d0a5f4"); const TX_SENDER: Address = address!("0x24ae36512421f1d9f6e074f00ff5b8393f5dd925"); -fn create_test_bundle_with_reverting_tx() -> eyre::Result { - Ok(EthSendBundle { +fn create_test_bundle_with_reverting_tx() -> anyhow::Result { + let bundle = EthSendBundle { txs: vec![TX_DATA], block_number: 12345, min_timestamp: Some(1640995200), @@ -51,15 +52,18 @@ fn create_test_bundle_with_reverting_tx() -> eyre::Result { refund_recipient: None, refund_tx_hashes: vec![], extra_fields: Default::default(), - }) + }; + + let bundle_with_metadata = BundleWithMetadata::new(&bundle)?; + Ok(bundle_with_metadata) } fn create_test_bundle( block_number: u64, min_timestamp: Option, max_timestamp: Option, -) -> eyre::Result { - Ok(EthSendBundle { +) -> anyhow::Result { + let bundle = EthSendBundle { txs: vec![TX_DATA], block_number, min_timestamp, @@ -71,15 +75,22 @@ fn create_test_bundle( refund_recipient: None, refund_tx_hashes: vec![], extra_fields: Default::default(), - }) + }; + + let bundle_with_metadata = BundleWithMetadata::new(&bundle)?; + Ok(bundle_with_metadata) } #[tokio::test] -async fn insert_and_get() -> eyre::Result<()> { +async fn insert_and_get() -> anyhow::Result<()> { let harness = setup_datastore().await?; - let test_bundle = create_test_bundle_with_reverting_tx()?; + let test_bundle_with_metadata = create_test_bundle_with_reverting_tx()?; + let test_bundle = test_bundle_with_metadata.bundle.clone(); - let insert_result = harness.data_store.insert_bundle(test_bundle.clone()).await; + let insert_result = harness + .data_store + .insert_bundle(test_bundle_with_metadata) + .await; if let Err(ref err) = insert_result { eprintln!("Insert failed with error: {err:?}"); } @@ -140,7 +151,7 @@ async fn insert_and_get() -> eyre::Result<()> { } #[tokio::test] -async fn select_bundles_comprehensive() -> eyre::Result<()> { +async fn select_bundles_comprehensive() -> anyhow::Result<()> { let harness = setup_datastore().await?; let bundle1 = create_test_bundle(100, Some(1000), Some(2000))?; @@ -237,7 +248,7 @@ async fn select_bundles_comprehensive() -> eyre::Result<()> { } #[tokio::test] -async fn cancel_bundle_workflow() -> eyre::Result<()> { +async fn cancel_bundle_workflow() -> anyhow::Result<()> { let harness = setup_datastore().await?; let bundle1 = create_test_bundle(100, Some(1000), Some(2000))?; @@ -304,7 +315,7 @@ async fn cancel_bundle_workflow() -> eyre::Result<()> { } #[tokio::test] -async fn find_bundle_by_transaction_hash() -> eyre::Result<()> { +async fn find_bundle_by_transaction_hash() -> anyhow::Result<()> { let harness = setup_datastore().await?; let test_bundle = create_test_bundle_with_reverting_tx()?; @@ -334,7 +345,7 @@ async fn find_bundle_by_transaction_hash() -> eyre::Result<()> { } #[tokio::test] -async fn remove_bundles() -> eyre::Result<()> { +async fn remove_bundles() -> anyhow::Result<()> { let harness = setup_datastore().await?; let bundle1 = create_test_bundle(100, None, None)?; @@ -360,7 +371,7 @@ async fn remove_bundles() -> eyre::Result<()> { } #[tokio::test] -async fn update_bundles_state() -> eyre::Result<()> { +async fn update_bundles_state() -> anyhow::Result<()> { let harness = setup_datastore().await?; let bundle1 = create_test_bundle(100, None, None)?; @@ -389,7 +400,7 @@ async fn update_bundles_state() -> eyre::Result<()> { } #[tokio::test] -async fn block_info_operations() -> eyre::Result<()> { +async fn block_info_operations() -> anyhow::Result<()> { let harness = setup_datastore().await?; let initial_info = harness.data_store.get_current_block_info().await.unwrap(); @@ -443,7 +454,7 @@ async fn block_info_operations() -> eyre::Result<()> { } #[tokio::test] -async fn get_stats() -> eyre::Result<()> { +async fn get_stats() -> anyhow::Result<()> { let harness = setup_datastore().await?; let stats = harness.data_store.get_stats().await.unwrap(); @@ -475,7 +486,7 @@ async fn get_stats() -> eyre::Result<()> { } #[tokio::test] -async fn remove_timed_out_bundles() -> eyre::Result<()> { +async fn remove_timed_out_bundles() -> anyhow::Result<()> { let harness = setup_datastore().await?; let expired_bundle = create_test_bundle(100, None, Some(1000))?; @@ -516,7 +527,7 @@ async fn remove_timed_out_bundles() -> eyre::Result<()> { } #[tokio::test] -async fn remove_old_included_bundles() -> eyre::Result<()> { +async fn remove_old_included_bundles() -> anyhow::Result<()> { let harness = setup_datastore().await?; let bundle1 = create_test_bundle(100, None, None)?; diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index 13a581b..e4ce0fa 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -35,3 +35,4 @@ op-revm.workspace = true revm-context-interface.workspace = true alloy-signer-local.workspace = true reth-optimism-evm.workspace = true +tips-common.workspace = true diff --git a/crates/ingress-rpc/src/queue.rs b/crates/ingress-rpc/src/queue.rs index 94654bb..a02a3e2 100644 --- a/crates/ingress-rpc/src/queue.rs +++ b/crates/ingress-rpc/src/queue.rs @@ -1,16 +1,16 @@ use alloy_primitives::B256; -use alloy_rpc_types_mev::EthSendBundle; use anyhow::Result; use async_trait::async_trait; use backon::{ExponentialBuilder, Retryable}; use rdkafka::producer::{FutureProducer, FutureRecord}; +use tips_common::BundleWithMetadata; use tokio::time::Duration; use tracing::{error, info}; /// A queue to buffer transactions #[async_trait] pub trait QueuePublisher: Send + Sync { - async fn publish(&self, bundle: &EthSendBundle, bundle_hash: &B256) -> Result<()>; + async fn publish(&self, bundle: &BundleWithMetadata, bundle_hash: &B256) -> Result<()>; } /// A queue to buffer transactions @@ -27,9 +27,9 @@ impl KafkaQueuePublisher { #[async_trait] impl QueuePublisher for KafkaQueuePublisher { - async fn publish(&self, bundle: &EthSendBundle, bundle_hash: &B256) -> Result<()> { + async fn publish(&self, bundle: &BundleWithMetadata, bundle_hash: &B256) -> Result<()> { let key = bundle_hash.to_string(); - let payload = serde_json::to_vec(bundle)?; + let payload = serde_json::to_vec(&bundle)?; let enqueue = || async { let record = FutureRecord::to(&self.topic).key(&key).payload(&payload); @@ -74,11 +74,12 @@ impl QueuePublisher for KafkaQueuePublisher { #[cfg(test)] mod tests { use super::*; + use alloy_rpc_types_mev::EthSendBundle; use rdkafka::config::ClientConfig; use tokio::time::{Duration, Instant}; - fn create_test_bundle() -> EthSendBundle { - EthSendBundle::default() + fn create_test_bundle() -> BundleWithMetadata { + BundleWithMetadata::new(&EthSendBundle::default()).unwrap() } #[tokio::test] @@ -92,7 +93,7 @@ mod tests { let publisher = KafkaQueuePublisher::new(producer, "tips-ingress-rpc".to_string()); let bundle = create_test_bundle(); - let bundle_hash = bundle.bundle_hash(); + let bundle_hash = bundle.bundle.bundle_hash(); let start = Instant::now(); let result = publisher.publish(&bundle, &bundle_hash).await; diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index a7991bd..789bf9d 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -11,6 +11,7 @@ use op_alloy_consensus::OpTxEnvelope; use op_alloy_network::Optimism; use reth_rpc_eth_types::EthApiError; use std::time::{SystemTime, UNIX_EPOCH}; +use tips_common::BundleWithMetadata; use tracing::{info, warn}; use crate::queue::QueuePublisher; @@ -60,11 +61,15 @@ where Queue: QueuePublisher + Sync + Send + 'static, { async fn send_bundle(&self, bundle: EthSendBundle) -> RpcResult { - self.validate_bundle(&bundle).await?; + let bundle_with_metadata = self.validate_bundle(&bundle).await?; // Queue the bundle let bundle_hash = bundle.bundle_hash(); - if let Err(e) = self.queue.publish(&bundle, &bundle_hash).await { + if let Err(e) = self + .queue + .publish(&bundle_with_metadata, &bundle_hash) + .await + { warn!(message = "Failed to publish bundle to queue", bundle_hash = %bundle_hash, error = %e); return Err(EthApiError::InvalidParams("Failed to queue bundle".into()).into_rpc_err()); } @@ -107,8 +112,14 @@ where }; // queue the bundle + let bundle_with_metadata = BundleWithMetadata::new(&bundle) + .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; let bundle_hash = bundle.bundle_hash(); - if let Err(e) = self.queue.publish(&bundle, &bundle_hash).await { + if let Err(e) = self + .queue + .publish(&bundle_with_metadata, &bundle_hash) + .await + { warn!(message = "Failed to publish Queue::enqueue_bundle", bundle_hash = %bundle_hash, error = %e); } @@ -164,7 +175,7 @@ where Ok(transaction) } - async fn validate_bundle(&self, bundle: &EthSendBundle) -> RpcResult<()> { + async fn validate_bundle(&self, bundle: &EthSendBundle) -> RpcResult { if bundle.txs.is_empty() { return Err( EthApiError::InvalidParams("Bundle cannot have empty transactions".into()) @@ -177,7 +188,10 @@ where let transaction = self.validate_tx(tx_data).await?; total_gas = total_gas.saturating_add(transaction.gas_limit()); } + validate_bundle(bundle, total_gas)?; - validate_bundle(bundle, total_gas) + let bundle_with_metadata = BundleWithMetadata::new(bundle) + .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; + Ok(bundle_with_metadata) } } diff --git a/crates/ingress-writer/Cargo.toml b/crates/ingress-writer/Cargo.toml index 2eda385..e6528b7 100644 --- a/crates/ingress-writer/Cargo.toml +++ b/crates/ingress-writer/Cargo.toml @@ -14,7 +14,6 @@ path = "src/main.rs" [dependencies] tips-datastore.workspace = true tips-audit.workspace=true -alloy-rpc-types-mev.workspace = true tokio.workspace = true tracing.workspace = true tracing-subscriber.workspace = true @@ -25,3 +24,4 @@ rdkafka.workspace = true serde_json.workspace = true backon.workspace = true uuid.workspace = true +tips-common.workspace = true diff --git a/crates/ingress-writer/src/main.rs b/crates/ingress-writer/src/main.rs index 116aac5..a64542b 100644 --- a/crates/ingress-writer/src/main.rs +++ b/crates/ingress-writer/src/main.rs @@ -1,4 +1,3 @@ -use alloy_rpc_types_mev::EthSendBundle; use anyhow::Result; use backon::{ExponentialBuilder, Retryable}; use clap::Parser; @@ -10,6 +9,7 @@ use rdkafka::{ }; use std::fs; use tips_audit::{BundleEvent, BundleEventPublisher, KafkaBundleEventPublisher}; +use tips_common::BundleWithMetadata; use tips_datastore::{BundleDatastore, postgres::PostgresDatastore}; use tokio::time::Duration; use tracing::{debug, error, info, warn}; @@ -64,13 +64,13 @@ where }) } - async fn insert_bundle(&self) -> Result<(Uuid, EthSendBundle)> { + async fn insert_bundle(&self) -> Result<(Uuid, BundleWithMetadata)> { match self.queue_consumer.recv().await { Ok(message) => { let payload = message .payload() .ok_or_else(|| anyhow::anyhow!("Message has no payload"))?; - let bundle: EthSendBundle = serde_json::from_slice(payload)?; + let bundle: BundleWithMetadata = serde_json::from_slice(payload)?; debug!( bundle = ?bundle, offset = message.offset(), @@ -107,12 +107,12 @@ where } } - async fn publish(&self, bundle_id: Uuid, bundle: &EthSendBundle) { + async fn publish(&self, bundle_id: Uuid, bundle: &BundleWithMetadata) { if let Err(e) = self .publisher .publish(BundleEvent::Created { bundle_id, - bundle: bundle.clone(), + bundle: bundle.bundle.clone(), }) .await { diff --git a/crates/maintenance/Cargo.toml b/crates/maintenance/Cargo.toml index d94fd55..3037add 100644 --- a/crates/maintenance/Cargo.toml +++ b/crates/maintenance/Cargo.toml @@ -32,3 +32,4 @@ op-alloy-rpc-types.workspace = true base-reth-flashblocks-rpc.workspace = true alloy-rpc-types-mev.workspace = true sqlx.workspace = true +tips-common.workspace = true diff --git a/crates/maintenance/src/job.rs b/crates/maintenance/src/job.rs index cbc09f1..1c14b99 100644 --- a/crates/maintenance/src/job.rs +++ b/crates/maintenance/src/job.rs @@ -15,8 +15,9 @@ use sqlx::types::chrono::Utc; use std::collections::HashSet; use std::time::Duration; use tips_audit::{BundleEvent, BundleEventPublisher, DropReason}; +use tips_common::{BundleState, BundleWithMetadata}; use tips_datastore::BundleDatastore; -use tips_datastore::postgres::{BlockInfoUpdate, BundleFilter, BundleState, BundleWithMetadata}; +use tips_datastore::postgres::{BlockInfoUpdate, BundleFilter}; use tokio::sync::mpsc; use tracing::{debug, error, info, warn}; use uuid::Uuid; @@ -399,7 +400,7 @@ mod tests { use alloy_primitives::{TxHash, b256}; use alloy_rpc_types_mev::EthSendBundle; use sqlx::types::chrono::Utc; - use tips_datastore::postgres::BundleState; + use tips_common::BundleState; const TX_1: TxHash = b256!("1111111111111111111111111111111111111111111111111111111111111111"); const TX_2: TxHash = b256!("2222222222222222222222222222222222222222222222222222222222222222"); From 64502703faaa92c7f0844384b4b65a4b381a5d8f Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Mon, 27 Oct 2025 11:25:49 -0500 Subject: [PATCH 029/117] chore: remove postgres bundle store (#38) * chore: remove postgres bundle store * remove db files * Remove addition props files --- .env.example | 18 - ...b652f7d67c3e78b2749b00ff5a3814ed6664f.json | 15 - ...9e6c5fbdde1083aff6e4dca20508f177df536.json | 14 - ...1f74c6ac9046b4ccad4f1fc9876a7355616b0.json | 14 - ...0898572b4ea735f94ebd9df04b86b67eab713.json | 34 - ...0a34cd49c3e2826662fa3fe8af597d1e9e90b.json | 34 - ...8fdc5ab2ae76baab1082b4d2b4c4ef01d2f74.json | 32 - Cargo.lock | 7640 ++--------------- Cargo.toml | 7 +- Dockerfile | 6 +- README.md | 6 - crates/audit/src/storage.rs | 33 - crates/audit/src/types.rs | 15 - crates/datastore/Cargo.toml | 23 - .../1757444171_create_bundles_table.sql | 38 - crates/datastore/src/lib.rs | 4 - crates/datastore/src/postgres.rs | 560 -- crates/datastore/src/traits.rs | 64 - crates/datastore/tests/datastore.rs | 565 -- crates/ingress-writer/Cargo.toml | 27 - crates/ingress-writer/src/main.rs | 183 - crates/maintenance/Cargo.toml | 35 - crates/maintenance/src/job.rs | 505 -- crates/maintenance/src/main.rs | 145 - docker-compose.tips.yml | 26 - docker-compose.yml | 18 - docker/ingress-writer-kafka-properties | 8 - docker/init-db.sh | 13 - docker/maintenance-kafka-properties | 3 - docs/AUDIT_S3_FORMAT.md | 11 +- docs/BUNDLE_STATES.md | 34 +- justfile | 14 +- ui/drizzle.config.ts | 12 - ui/package.json | 4 - ui/src/app/api/bundles/route.ts | 20 +- ui/src/app/bundles/page.tsx | 102 +- ui/src/db/index.ts | 13 - ui/src/db/relations.ts | 0 ui/src/db/schema.ts | 56 - ui/yarn.lock | 2488 +++--- 40 files changed, 1776 insertions(+), 11063 deletions(-) delete mode 100644 .sqlx/query-2a6e99270e35859fd7a4ce4deeeb652f7d67c3e78b2749b00ff5a3814ed6664f.json delete mode 100644 .sqlx/query-7d72b87eddd39d131ce083dcbff9e6c5fbdde1083aff6e4dca20508f177df536.json delete mode 100644 .sqlx/query-85798b03a3dff0196ee1c64b1b21f74c6ac9046b4ccad4f1fc9876a7355616b0.json delete mode 100644 .sqlx/query-92e3773f27ca3d15e43cd2a48c40898572b4ea735f94ebd9df04b86b67eab713.json delete mode 100644 .sqlx/query-9f1f7117bba639cdc922de4e6870a34cd49c3e2826662fa3fe8af597d1e9e90b.json delete mode 100644 .sqlx/query-b2f3046a06d9b8a76c59a38122a8fdc5ab2ae76baab1082b4d2b4c4ef01d2f74.json delete mode 100644 crates/datastore/Cargo.toml delete mode 100644 crates/datastore/migrations/1757444171_create_bundles_table.sql delete mode 100644 crates/datastore/src/lib.rs delete mode 100644 crates/datastore/src/postgres.rs delete mode 100644 crates/datastore/src/traits.rs delete mode 100644 crates/datastore/tests/datastore.rs delete mode 100644 crates/ingress-writer/Cargo.toml delete mode 100644 crates/ingress-writer/src/main.rs delete mode 100644 crates/maintenance/Cargo.toml delete mode 100644 crates/maintenance/src/job.rs delete mode 100644 crates/maintenance/src/main.rs delete mode 100644 docker/ingress-writer-kafka-properties delete mode 100755 docker/init-db.sh delete mode 100644 docker/maintenance-kafka-properties delete mode 100644 ui/drizzle.config.ts delete mode 100644 ui/src/db/index.ts delete mode 100644 ui/src/db/relations.ts delete mode 100644 ui/src/db/schema.ts diff --git a/.env.example b/.env.example index 96c945d..8788158 100644 --- a/.env.example +++ b/.env.example @@ -19,28 +19,10 @@ TIPS_AUDIT_S3_REGION=us-east-1 TIPS_AUDIT_S3_ACCESS_KEY_ID=minioadmin TIPS_AUDIT_S3_SECRET_ACCESS_KEY=minioadmin -# Maintenance -TIPS_MAINTENANCE_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres -TIPS_MAINTENANCE_RPC_URL=http://localhost:2222 -TIPS_MAINTENANCE_RPC_POLL_INTERVAL_MS=250 -TIPS_MAINTENANCE_KAFKA_PROPERTIES_FILE=/app/docker/maintenance-kafka-properties -TIPS_MAINTENANCE_FLASHBLOCKS_WS=ws://localhost:1115/ws -TIPS_MAINTENANCE_KAFKA_TOPIC=tips-audit -TIPS_MAINTENANCE_LOG_LEVEL=info -TIPS_MAINTENANCE_FINALIZATION_DEPTH=10 - # TIPS UI -TIPS_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres TIPS_UI_AWS_REGION=us-east-1 TIPS_UI_S3_BUCKET_NAME=tips TIPS_UI_S3_CONFIG_TYPE=manual TIPS_UI_S3_ENDPOINT=http://localhost:7000 TIPS_UI_S3_ACCESS_KEY_ID=minioadmin TIPS_UI_S3_SECRET_ACCESS_KEY=minioadmin - -# Ingress Writer -TIPS_INGRESS_WRITER_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres -TIPS_INGRESS_WRITER_KAFKA_PROPERTIES_FILE=/app/docker/ingress-writer-kafka-properties -TIPS_INGRESS_KAFKA_TOPIC=tips-ingress -TIPS_INGRESS_WRITER_AUDIT_TOPIC=tips-audit -TIPS_INGRESS_WRITER_LOG_LEVEL=info diff --git a/.sqlx/query-2a6e99270e35859fd7a4ce4deeeb652f7d67c3e78b2749b00ff5a3814ed6664f.json b/.sqlx/query-2a6e99270e35859fd7a4ce4deeeb652f7d67c3e78b2749b00ff5a3814ed6664f.json deleted file mode 100644 index 93237ba..0000000 --- a/.sqlx/query-2a6e99270e35859fd7a4ce4deeeb652f7d67c3e78b2749b00ff5a3814ed6664f.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n INSERT INTO maintenance (block_number, block_hash, finalized)\n VALUES ($1, $2, false)\n ON CONFLICT (block_number)\n DO UPDATE SET block_hash = EXCLUDED.block_hash, finalized = false\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int8", - "Bpchar" - ] - }, - "nullable": [] - }, - "hash": "2a6e99270e35859fd7a4ce4deeeb652f7d67c3e78b2749b00ff5a3814ed6664f" -} diff --git a/.sqlx/query-7d72b87eddd39d131ce083dcbff9e6c5fbdde1083aff6e4dca20508f177df536.json b/.sqlx/query-7d72b87eddd39d131ce083dcbff9e6c5fbdde1083aff6e4dca20508f177df536.json deleted file mode 100644 index 6810f8a..0000000 --- a/.sqlx/query-7d72b87eddd39d131ce083dcbff9e6c5fbdde1083aff6e4dca20508f177df536.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "DELETE FROM maintenance WHERE finalized = true AND block_number < $1", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int8" - ] - }, - "nullable": [] - }, - "hash": "7d72b87eddd39d131ce083dcbff9e6c5fbdde1083aff6e4dca20508f177df536" -} diff --git a/.sqlx/query-85798b03a3dff0196ee1c64b1b21f74c6ac9046b4ccad4f1fc9876a7355616b0.json b/.sqlx/query-85798b03a3dff0196ee1c64b1b21f74c6ac9046b4ccad4f1fc9876a7355616b0.json deleted file mode 100644 index e47d0c8..0000000 --- a/.sqlx/query-85798b03a3dff0196ee1c64b1b21f74c6ac9046b4ccad4f1fc9876a7355616b0.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "UPDATE maintenance SET finalized = true WHERE block_number < $1 AND finalized = false", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int8" - ] - }, - "nullable": [] - }, - "hash": "85798b03a3dff0196ee1c64b1b21f74c6ac9046b4ccad4f1fc9876a7355616b0" -} diff --git a/.sqlx/query-92e3773f27ca3d15e43cd2a48c40898572b4ea735f94ebd9df04b86b67eab713.json b/.sqlx/query-92e3773f27ca3d15e43cd2a48c40898572b4ea735f94ebd9df04b86b67eab713.json deleted file mode 100644 index 1f7bfdd..0000000 --- a/.sqlx/query-92e3773f27ca3d15e43cd2a48c40898572b4ea735f94ebd9df04b86b67eab713.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n INSERT INTO bundles (\n id, bundle_state, senders, minimum_base_fee, txn_hashes, \n txs, reverting_tx_hashes, dropping_tx_hashes, \n block_number, min_timestamp, max_timestamp,\n created_at, updated_at, state_changed_at\n )\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, NOW(), NOW(), NOW())\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Uuid", - { - "Custom": { - "name": "bundle_state", - "kind": { - "Enum": [ - "Ready", - "IncludedByBuilder" - ] - } - } - }, - "BpcharArray", - "Int8", - "BpcharArray", - "TextArray", - "BpcharArray", - "BpcharArray", - "Int8", - "Int8", - "Int8" - ] - }, - "nullable": [] - }, - "hash": "92e3773f27ca3d15e43cd2a48c40898572b4ea735f94ebd9df04b86b67eab713" -} diff --git a/.sqlx/query-9f1f7117bba639cdc922de4e6870a34cd49c3e2826662fa3fe8af597d1e9e90b.json b/.sqlx/query-9f1f7117bba639cdc922de4e6870a34cd49c3e2826662fa3fe8af597d1e9e90b.json deleted file mode 100644 index 36bb16f..0000000 --- a/.sqlx/query-9f1f7117bba639cdc922de4e6870a34cd49c3e2826662fa3fe8af597d1e9e90b.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n UPDATE bundles \n SET bundle_state = $1, updated_at = NOW(), state_changed_at = NOW()\n WHERE id = ANY($2) AND bundle_state::text = ANY($3)\n RETURNING id\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Uuid" - } - ], - "parameters": { - "Left": [ - { - "Custom": { - "name": "bundle_state", - "kind": { - "Enum": [ - "Ready", - "IncludedByBuilder" - ] - } - } - }, - "UuidArray", - "TextArray" - ] - }, - "nullable": [ - false - ] - }, - "hash": "9f1f7117bba639cdc922de4e6870a34cd49c3e2826662fa3fe8af597d1e9e90b" -} diff --git a/.sqlx/query-b2f3046a06d9b8a76c59a38122a8fdc5ab2ae76baab1082b4d2b4c4ef01d2f74.json b/.sqlx/query-b2f3046a06d9b8a76c59a38122a8fdc5ab2ae76baab1082b4d2b4c4ef01d2f74.json deleted file mode 100644 index f81533d..0000000 --- a/.sqlx/query-b2f3046a06d9b8a76c59a38122a8fdc5ab2ae76baab1082b4d2b4c4ef01d2f74.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n SELECT\n bundle_state::text as bundle_state_text,\n COUNT(*) as bundle_count,\n SUM(COALESCE(array_length(txn_hashes, 1), 0)) as transaction_count\n FROM bundles\n GROUP BY bundle_state\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "bundle_state_text", - "type_info": "Text" - }, - { - "ordinal": 1, - "name": "bundle_count", - "type_info": "Int8" - }, - { - "ordinal": 2, - "name": "transaction_count", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [] - }, - "nullable": [ - null, - null, - null - ] - }, - "hash": "b2f3046a06d9b8a76c59a38122a8fdc5ab2ae76baab1082b4d2b4c4ef01d2f74" -} diff --git a/Cargo.lock b/Cargo.lock index bd70e20..9730249 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,56 +2,12 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "addr2line" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" -dependencies = [ - "gimli", -] - [[package]] name = "adler2" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "aes-gcm" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - [[package]] name = "ahash" version = "0.8.12" @@ -59,7 +15,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", - "getrandom 0.3.3", + "getrandom 0.3.4", "once_cell", "version_check", "zerocopy", @@ -74,21 +30,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - [[package]] name = "allocator-api2" version = "0.2.21" @@ -97,22 +38,22 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy-chains" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf01dd83a1ca5e4807d0ca0223c9615e211ce5db0a9fd1443c2778cacf89b546" +checksum = "0bbb778f50ecb0cebfb5c05580948501927508da7bd628833a8c4bd8545e23e2" dependencies = [ "alloy-primitives", "alloy-rlp", "num_enum", "serde", - "strum 0.27.2", + "strum", ] [[package]] name = "alloy-consensus" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59094911f05dbff1cf5b29046a00ef26452eccc8d47136d50a47c0cf22f00c85" +checksum = "b9b151e38e42f1586a01369ec52a6934702731d07e8509a7307331b09f6c46dc" dependencies = [ "alloy-eips", "alloy-primitives", @@ -131,14 +72,14 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror 2.0.17", + "thiserror", ] [[package]] name = "alloy-consensus-any" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903cb8f728107ca27c816546f15be38c688df3c381d7bd1a4a9f215effc1ddb4" +checksum = "6e2d5e8668ef6215efdb7dcca6f22277b4e483a5650e05f5de22b2350971f4b8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -148,23 +89,6 @@ dependencies = [ "serde", ] -[[package]] -name = "alloy-dyn-abi" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6c2905bafc2df7ccd32ca3af13f0b0d82f2e2ff9dfbeb12196c0d978d5c0deb" -dependencies = [ - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-type-parser", - "alloy-sol-types", - "derive_more", - "itoa", - "serde", - "serde_json", - "winnow", -] - [[package]] name = "alloy-eip2124" version = "0.2.0" @@ -175,7 +99,7 @@ dependencies = [ "alloy-rlp", "crc", "serde", - "thiserror 2.0.17", + "thiserror", ] [[package]] @@ -199,15 +123,14 @@ dependencies = [ "alloy-rlp", "k256", "serde", - "serde_with", - "thiserror 2.0.17", + "thiserror", ] [[package]] name = "alloy-eips" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac7f1c9a1ccc7f3e03c36976455751a6166a4f0d2d2c530c3f87dfe7d0cdc836" +checksum = "e5434834adaf64fa20a6fb90877bc1d33214c41b055cc49f82189c98614368cc" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -224,14 +147,14 @@ dependencies = [ "serde", "serde_with", "sha2 0.10.9", - "thiserror 2.0.17", + "thiserror", ] [[package]] name = "alloy-evm" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a5f67ee74999aa4fe576a83be1996bdf74a30fce3d248bf2007d6fc7dae8aa" +checksum = "2f1bfade4de9f464719b5aca30cf5bb02b9fda7036f0cf43addc3a0e66a0340c" dependencies = [ "alloy-consensus", "alloy-eips", @@ -247,14 +170,14 @@ dependencies = [ "op-alloy-rpc-types-engine", "op-revm", "revm", - "thiserror 2.0.17", + "thiserror", ] [[package]] name = "alloy-genesis" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1421f6c9d15e5b86afbfe5865ca84dea3b9f77173a0963c1a2ee4e626320ada9" +checksum = "919a8471cfbed7bcd8cf1197a57dda583ce0e10c6385f6ff4e8b41304b223392" dependencies = [ "alloy-eips", "alloy-primitives", @@ -275,14 +198,13 @@ dependencies = [ "alloy-primitives", "auto_impl", "dyn-clone", - "serde", ] [[package]] name = "alloy-json-abi" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2acb6637a9c0e1cdf8971e0ced8f3fa34c04c5e9dccf6bb184f6a64fe0e37d8" +checksum = "5513d5e6bd1cba6bdcf5373470f559f320c05c8c59493b6e98912fbe6733943f" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -292,24 +214,24 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f763621707fa09cece30b73ecc607eb43fd7a72451fe3b46f645b905086926" +checksum = "d7c69f6c9c68a1287c9d5ff903d0010726934de0dac10989be37b75a29190d55" dependencies = [ "alloy-primitives", "alloy-sol-types", "http 1.3.1", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror", "tracing", ] [[package]] name = "alloy-network" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f59a869fa4b4c3a7f08b1c8cb79aec61c29febe6e24a24fe0fcfded8a9b5703" +checksum = "8eaf2ae05219e73e0979cb2cf55612aafbab191d130f203079805eaf881cca58" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -328,14 +250,14 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror", ] [[package]] name = "alloy-network-primitives" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46e9374c667c95c41177602ebe6f6a2edd455193844f011d973d374b65501b38" +checksum = "e58f4f345cef483eab7374f2b6056973c7419ffe8ad35e994b7a7f5d8e0c7ba4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -346,9 +268,9 @@ dependencies = [ [[package]] name = "alloy-op-evm" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17aaeb600740c181bf29c9f138f9b228d115ea74fa6d0f0343e1952f1a766968" +checksum = "d0b6679dc8854285d6c34ef6a9f9ade06dec1f5db8aab96e941d99b8abcefb72" dependencies = [ "alloy-consensus", "alloy-eips", @@ -375,9 +297,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b77f7d5e60ad8ae6bd2200b8097919712a07a6db622a4b201e7ead6166f02e5" +checksum = "355bf68a433e0fd7f7d33d5a9fc2583fde70bf5c530f63b80845f8da5505cf28" dependencies = [ "alloy-rlp", "bytes", @@ -385,9 +307,9 @@ dependencies = [ "const-hex", "derive_more", "foldhash 0.2.0", - "getrandom 0.3.3", + "getrandom 0.3.4", "hashbrown 0.16.0", - "indexmap 2.11.4", + "indexmap 2.12.0", "itoa", "k256", "keccak-asm", @@ -395,7 +317,7 @@ dependencies = [ "proptest", "rand 0.9.2", "ruint", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "sha3", "tiny-keccak", @@ -403,9 +325,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77818b7348bd5486491a5297579dbfe5f706a81f8e1f5976393025f1e22a7c7d" +checksum = "de2597751539b1cc8fe4204e5325f9a9ed83fcacfb212018dfcfa7877e76de21" dependencies = [ "alloy-chains", "alloy-consensus", @@ -414,19 +336,16 @@ dependencies = [ "alloy-network", "alloy-network-primitives", "alloy-primitives", - "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types-eth", "alloy-signer", "alloy-sol-types", "alloy-transport", "alloy-transport-http", - "alloy-transport-ipc", - "alloy-transport-ws", "async-stream", "async-trait", "auto_impl", - "dashmap 6.1.0", + "dashmap", "either", "futures", "futures-utils-wasm", @@ -436,35 +355,13 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror", "tokio", "tracing", "url", "wasmtimer", ] -[[package]] -name = "alloy-pubsub" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "249b45103a66c9ad60ad8176b076106d03a2399a37f0ee7b0e03692e6b354cb9" -dependencies = [ - "alloy-json-rpc", - "alloy-primitives", - "alloy-transport", - "auto_impl", - "bimap", - "futures", - "parking_lot", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "tower 0.5.2", - "tracing", - "wasmtimer", -] - [[package]] name = "alloy-rlp" version = "0.3.12" @@ -484,22 +381,19 @@ checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] name = "alloy-rpc-client" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2430d5623e428dd012c6c2156ae40b7fe638d6fca255e3244e0fba51fa698e93" +checksum = "edf8eb8be597cfa8c312934d2566ec4516f066d69164f9212d7a148979fdcfd8" dependencies = [ "alloy-json-rpc", "alloy-primitives", - "alloy-pubsub", "alloy-transport", "alloy-transport-http", - "alloy-transport-ipc", - "alloy-transport-ws", "futures", "pin-project", "reqwest", @@ -507,30 +401,17 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tower 0.5.2", + "tower", "tracing", "url", "wasmtimer", ] -[[package]] -name = "alloy-rpc-types" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e131624d08a25cfc40557041e7dc42e1182fa1153e7592d120f769a1edce56" -dependencies = [ - "alloy-primitives", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", - "alloy-serde", - "serde", -] - [[package]] name = "alloy-rpc-types-admin" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59407723b1850ebaa49e46d10c2ba9c10c10b3aedf2f7e97015ee23c3f4e639" +checksum = "19b33cdc0483d236cdfff763dae799ccef9646e94fb549a74f7adac6a7f7bb86" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -538,65 +419,22 @@ dependencies = [ "serde_json", ] -[[package]] -name = "alloy-rpc-types-anvil" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65e3266095e6d8e8028aab5f439c6b8736c5147314f7e606c61597e014cb8a0" -dependencies = [ - "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "serde", -] - [[package]] name = "alloy-rpc-types-any" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07429a1099cd17227abcddb91b5e38c960aaeb02a6967467f5bb561fbe716ac6" +checksum = "fbde0801a32d21c5f111f037bee7e22874836fba7add34ed4a6919932dd7cf23" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", "alloy-serde", ] -[[package]] -name = "alloy-rpc-types-beacon" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e0e876b20eb9debf316d3e875536f389070635250f22b5a678cf4632a3e0cf" -dependencies = [ - "alloy-eips", - "alloy-primitives", - "alloy-rpc-types-engine", - "ethereum_ssz", - "ethereum_ssz_derive", - "serde", - "serde_json", - "serde_with", - "thiserror 2.0.17", - "tree_hash", - "tree_hash_derive", -] - -[[package]] -name = "alloy-rpc-types-debug" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeff305b7d10cc1c888456d023e7bb8a5ea82e9e42b951e37619b88cc1a1486d" -dependencies = [ - "alloy-primitives", - "derive_more", - "serde", - "serde_with", -] - [[package]] name = "alloy-rpc-types-engine" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222ecadcea6aac65e75e32b6735635ee98517aa63b111849ee01ae988a71d685" +checksum = "605ec375d91073851f566a3082548af69a28dca831b27a8be7c1b4c49f5c6ca2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -606,17 +444,15 @@ dependencies = [ "derive_more", "ethereum_ssz", "ethereum_ssz_derive", - "jsonwebtoken", - "rand 0.8.5", "serde", - "strum 0.27.2", + "strum", ] [[package]] name = "alloy-rpc-types-eth" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db46b0901ee16bbb68d986003c66dcb74a12f9d9b3c44f8e85d51974f2458f0f" +checksum = "361cd87ead4ba7659bda8127902eda92d17fa7ceb18aba1676f7be10f7222487" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -630,14 +466,14 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror 2.0.17", + "thiserror", ] [[package]] name = "alloy-rpc-types-mev" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a60d4baadd3f278faa4e2305cca095dfd4ab286e071b768ff09181d8ae215" +checksum = "1397926d8d06a2531578bafc3e0ec78f97a02f0e6d1631c67d80d22af6a3af02" dependencies = [ "alloy-consensus", "alloy-eips", @@ -650,35 +486,23 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f10620724bd45f80c79668a8cdbacb6974f860686998abce28f6196ae79444" +checksum = "de4e95fb0572b97b17751d0fdf5cdc42b0050f9dd9459eddd1bf2e2fbfed0a33" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", "alloy-serde", "serde", "serde_json", - "thiserror 2.0.17", -] - -[[package]] -name = "alloy-rpc-types-txpool" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864f41befa90102d4e02327679699a7e9510930e2924c529e31476086609fa89" -dependencies = [ - "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "serde", + "thiserror", ] [[package]] name = "alloy-serde" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5413814be7a22fbc81e0f04a2401fcc3eb25e56fd53b04683e8acecc6e1fe01b" +checksum = "64600fc6c312b7e0ba76f73a381059af044f4f21f43e07f51f1fa76c868fe302" dependencies = [ "alloy-primitives", "serde", @@ -687,9 +511,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53410a18a61916e2c073a6519499514e027b01e77eeaf96acd1df7cf96ef6bb2" +checksum = "5772858492b26f780468ae693405f895d6a27dea6e3eab2c36b6217de47c2647" dependencies = [ "alloy-primitives", "async-trait", @@ -697,14 +521,14 @@ dependencies = [ "either", "elliptic-curve 0.13.8", "k256", - "thiserror 2.0.17", + "thiserror", ] [[package]] name = "alloy-signer-local" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6006c4cbfa5d08cadec1fcabea6cb56dc585a30a9fce40bcf81e307d6a71c8e" +checksum = "f4195b803d0a992d8dbaab2ca1986fc86533d4bc80967c0cce7668b26ad99ef9" dependencies = [ "alloy-consensus", "alloy-network", @@ -713,46 +537,46 @@ dependencies = [ "async-trait", "k256", "rand 0.8.5", - "thiserror 2.0.17", + "thiserror", ] [[package]] name = "alloy-sol-macro" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c84c3637bee9b5c4a4d2b93360ee16553d299c3b932712353caf1cea76d0e6" +checksum = "f3ce480400051b5217f19d6e9a82d9010cdde20f1ae9c00d53591e4a1afbb312" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] name = "alloy-sol-macro-expander" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a882aa4e1790063362434b9b40d358942b188477ac1c44cfb8a52816ffc0cc17" +checksum = "6d792e205ed3b72f795a8044c52877d2e6b6e9b1d13f431478121d8d4eaa9028" dependencies = [ "alloy-sol-macro-input", "const-hex", "heck", - "indexmap 2.11.4", + "indexmap 2.12.0", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", "syn-solidity", "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e5772107f9bb265d8d8c86e0733937bb20d0857ea5425b1b6ddf51a9804042" +checksum = "0bd1247a8f90b465ef3f1207627547ec16940c35597875cdc09c49d58b19693c" dependencies = [ "const-hex", "dunce", @@ -760,15 +584,15 @@ dependencies = [ "macro-string", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e188b939aa4793edfaaa099cb1be4e620036a775b4bdf24fdc56f1cd6fd45890" +checksum = "954d1b2533b9b2c7959652df3076954ecb1122a28cc740aa84e7b0a49f6ac0a9" dependencies = [ "serde", "winnow", @@ -776,9 +600,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c8a9a909872097caffc05df134e5ef2253a1cdb56d3a9cf0052a042ac763f9" +checksum = "70319350969a3af119da6fb3e9bddb1bce66c9ea933600cb297c8b1850ad2a3c" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -788,9 +612,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d94ee404368a3d9910dfe61b203e888c6b0e151a50e147f95da8baff9f9c7763" +checksum = "025a940182bddaeb594c26fe3728525ae262d0806fe6a4befdf5d7bc13d54bce" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -802,9 +626,9 @@ dependencies = [ "parking_lot", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror", "tokio", - "tower 0.5.2", + "tower", "tracing", "url", "wasmtimer", @@ -812,57 +636,19 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f8a6338d594f6c6481292215ee8f2fd7b986c80aba23f3f44e761a8658de78" +checksum = "e3b5064d1e1e1aabc918b5954e7fb8154c39e77ec6903a581b973198b26628fa" dependencies = [ "alloy-json-rpc", "alloy-transport", "reqwest", "serde_json", - "tower 0.5.2", + "tower", "tracing", "url", ] -[[package]] -name = "alloy-transport-ipc" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17a37a8ca18006fa0a58c7489645619ff58cfa073f2b29c4e052c9bd114b123a" -dependencies = [ - "alloy-json-rpc", - "alloy-pubsub", - "alloy-transport", - "bytes", - "futures", - "interprocess", - "pin-project", - "serde", - "serde_json", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "alloy-transport-ws" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "679b0122b7bca9d4dc5eb2c0549677a3c53153f6e232f23f4b3ba5575f74ebde" -dependencies = [ - "alloy-pubsub", - "alloy-transport", - "futures", - "http 1.3.1", - "rustls 0.23.31", - "serde_json", - "tokio", - "tokio-tungstenite", - "tracing", - "ws_stream_wasm", -] - [[package]] name = "alloy-trie" version = "0.9.1" @@ -881,15 +667,15 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64c09ec565a90ed8390d82aa08cd3b22e492321b96cb4a3d4f58414683c9e2f" +checksum = "f8e52276fdb553d3c11563afad2898f4085165e4093604afe3d78b69afbf408f" dependencies = [ "alloy-primitives", "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -968,15 +754,9 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - [[package]] name = "ark-bls12-381" version = "0.5.0" @@ -1107,7 +887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -1145,7 +925,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -1234,7 +1014,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -1282,36 +1062,6 @@ dependencies = [ "serde", ] -[[package]] -name = "asn1_der" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" - -[[package]] -name = "async-compression" -version = "0.4.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a89bce6054c720275ac2432fbba080a66a2106a44a1b804553930ca6909f4e0" -dependencies = [ - "compression-codecs", - "compression-core", - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-lock" -version = "3.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" -dependencies = [ - "event-listener", - "event-listener-strategy", - "pin-project-lite", -] - [[package]] name = "async-stream" version = "0.3.6" @@ -1331,7 +1081,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -1342,18 +1092,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", -] - -[[package]] -name = "async_io_stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" -dependencies = [ - "futures", - "pharos", - "rustc_version 0.4.1", + "syn 2.0.108", ] [[package]] @@ -1389,7 +1128,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -1400,9 +1139,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-config" -version = "1.8.7" +version = "1.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04b37ddf8d2e9744a0b9c19ce0b78efe4795339a90b66b7bae77987092cd2e69" +checksum = "37cf2b6af2a95a20e266782b4f76f1a5e12bf412a9db2de9c1e9123b9d8c0ad8" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1430,9 +1169,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.7" +version = "1.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799a1290207254984cb7c05245111bc77958b92a3c9bb449598044b36341cce6" +checksum = "faf26925f4a5b59eb76722b63c2892b1d70d06fa053c72e4a100ec308c1d47bc" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -1442,9 +1181,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.13.3" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c953fe1ba023e6b7730c0d4b031d06f267f23a46167dcbd40316644b10a17ba" +checksum = "879b6c89592deb404ba4dc0ae6b58ffd1795c78991cbb5b8bc441c48a070440d" dependencies = [ "aws-lc-sys", "zeroize", @@ -1452,11 +1191,11 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.30.0" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbfd150b5dbdb988bcc8fb1fe787eb6b7ee6180ca24da683b61ea5405f3d43ff" +checksum = "107a4e9d9cab9963e04e84bb8dee0e25f2a987f9a8bad5ed054abd439caa8f8c" dependencies = [ - "bindgen 0.69.5", + "bindgen", "cc", "cmake", "dunce", @@ -1465,9 +1204,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.5.11" +version = "1.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e1ed337dabcf765ad5f2fb426f13af22d576328aaf09eac8f70953530798ec0" +checksum = "bfa006bb32360ed90ac51203feafb9d02e3d21046e1fd3a450a404b90ea73e5d" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -1490,9 +1229,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.107.0" +version = "1.108.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9118b3454ba89b30df55931a1fa7605260fc648e070b5aab402c24b375b1f" +checksum = "200be4aed61e3c0669f7268bacb768f283f1c32a7014ce57225e1160be2f6ccb" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1524,9 +1263,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.85.0" +version = "1.86.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f2c741e2e439f07b5d1b33155e246742353d82167c785a2ff547275b7e32483" +checksum = "4a0abbfab841446cce6e87af853a3ba2cc1bc9afcd3f3550dd556c43d434c86d" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1546,9 +1285,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.87.0" +version = "1.89.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6428ae5686b18c0ee99f6f3c39d94ae3f8b42894cdc35c35d8fb2470e9db2d4c" +checksum = "695dc67bb861ccb8426c9129b91c30e266a0e3d85650cafdf62fcca14c8fd338" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1568,9 +1307,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.87.0" +version = "1.88.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5871bec9a79a3e8d928c7788d654f135dde0e71d2dd98089388bab36b37ef607" +checksum = "d30990923f4f675523c51eb1c0dec9b752fb267b36a61e83cbc219c9d86da715" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1591,9 +1330,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.3.4" +version = "1.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084c34162187d39e3740cb635acd73c4e3a551a36146ad6fe8883c929c9f876c" +checksum = "bffc03068fbb9c8dd5ce1c6fb240678a5cffb86fb2b7b1985c999c4b83c8df68" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -1619,9 +1358,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.2.5" +version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e190749ea56f8c42bf15dd76c65e14f8f765233e6df9b0506d9d934ebef867c" +checksum = "127fcfad33b7dfc531141fda7e1c402ac65f88aca5511a4d31e2e3d2cd01ce9c" dependencies = [ "futures-util", "pin-project-lite", @@ -1630,9 +1369,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.63.8" +version = "0.63.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d2df0314b8e307995a3b86d44565dfe9de41f876901a7d71886c756a25979f" +checksum = "165d8583d8d906e2fb5511d29201d447cc710864f075debcdd9c31c265412806" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -1650,9 +1389,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.60.11" +version = "0.60.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "182b03393e8c677347fb5705a04a9392695d47d20ef0a2f8cfe28c8e6b9b9778" +checksum = "9656b85088f8d9dc7ad40f9a6c7228e1e8447cdf4b046c87e152e0805dea02fa" dependencies = [ "aws-smithy-types", "bytes", @@ -1661,9 +1400,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.62.3" +version = "0.62.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c4dacf2d38996cf729f55e7a762b30918229917eca115de45dfa8dfb97796c9" +checksum = "3feafd437c763db26aa04e0cc7591185d0961e64c61885bece0fb9d50ceac671" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -1682,9 +1421,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-client" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "734b4282fbb7372923ac339cc2222530f8180d9d4745e582de19a18cee409fd8" +checksum = "1053b5e587e6fa40ce5a79ea27957b04ba660baa02b28b7436f64850152234f1" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -1701,38 +1440,38 @@ dependencies = [ "hyper-util", "pin-project-lite", "rustls 0.21.12", - "rustls 0.23.31", - "rustls-native-certs 0.8.1", + "rustls 0.23.34", + "rustls-native-certs 0.8.2", "rustls-pki-types", "tokio", "tokio-rustls 0.26.4", - "tower 0.5.2", + "tower", "tracing", ] [[package]] name = "aws-smithy-json" -version = "0.61.5" +version = "0.61.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa31b350998e703e9826b2104dd6f63be0508666e1aba88137af060e8944047" +checksum = "cff418fc8ec5cadf8173b10125f05c2e7e1d46771406187b2c878557d4503390" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-observability" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9364d5989ac4dd918e5cc4c4bdcc61c9be17dcd2586ea7f69e348fc7c6cab393" +checksum = "2d1881b1ea6d313f9890710d65c158bdab6fb08c91ea825f74c1c8c357baf4cc" dependencies = [ "aws-smithy-runtime-api", ] [[package]] name = "aws-smithy-query" -version = "0.60.7" +version = "0.60.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" +checksum = "d28a63441360c477465f80c7abac3b9c4d075ca638f982e605b7dc2a2c7156c9" dependencies = [ "aws-smithy-types", "urlencoding", @@ -1740,9 +1479,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa63ad37685ceb7762fa4d73d06f1d5493feb88e3f27259b9ed277f4c01b185" +checksum = "40ab99739082da5347660c556689256438defae3bcefd66c52b095905730e404" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -1764,9 +1503,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07f5e0fc8a6b3f2303f331b94504bbf754d85488f402d6f1dd7a6080f99afe56" +checksum = "3683c5b152d2ad753607179ed71988e8cfd52964443b4f74fd8e552d0bbfeb46" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -1781,9 +1520,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d498595448e43de7f4296b7b7a18a8a02c61ec9349128c80a368f7c3b4ab11a8" +checksum = "9f5b3a7486f6690ba25952cabf1e7d75e34d69eaff5081904a47bc79074d6457" dependencies = [ "base64-simd", "bytes", @@ -1807,18 +1546,18 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.10" +version = "0.60.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db87b96cb1b16c024980f133968d52882ca0daaee3a086c6decc500f6c99728" +checksum = "e9c34127e8c624bc2999f3b657e749c1393bedc9cd97b92a804db8ced4d2e163" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "1.3.8" +version = "1.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b069d19bf01e46298eaedd7c6f283fe565a59263e53eebec945f3e6398f42390" +checksum = "e2fd329bf0e901ff3f60425691410c69094dc2a1f34b331f37bfc4e9ac1565a1" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -1829,140 +1568,22 @@ dependencies = [ ] [[package]] -name = "axum" -version = "0.7.9" +name = "az" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" -dependencies = [ - "async-trait", - "axum-core", - "bytes", - "futures-util", - "http 1.3.1", - "http-body 1.0.1", - "http-body-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower 0.5.2", - "tower-layer", - "tower-service", -] +checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] -name = "axum-core" -version = "0.4.5" +name = "backon" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +checksum = "cffb0e931875b666fc4fcb20fee52e9bbd1ef836fd9e9e04ec21555f9f85f7ef" dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 1.3.1", - "http-body 1.0.1", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper", - "tower-layer", - "tower-service", + "fastrand", + "gloo-timers", + "tokio", ] -[[package]] -name = "az" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" - -[[package]] -name = "backon" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592277618714fbcecda9a02ba7a8781f319d26532a88553bbacc77ba5d2b3a8d" -dependencies = [ - "fastrand", - "gloo-timers 0.3.0", - "tokio", -] - -[[package]] -name = "backtrace" -version = "0.3.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-link 0.2.0", -] - -[[package]] -name = "base-reth-flashblocks-rpc" -version = "0.1.0" -source = "git+https://github.com/base/node-reth?rev=a1ae148a36354c88b356f80281fef12dad9f7737#a1ae148a36354c88b356f80281fef12dad9f7737" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-genesis", - "alloy-primitives", - "alloy-provider", - "alloy-rpc-client", - "alloy-rpc-types", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", - "arc-swap", - "brotli", - "eyre", - "futures-util", - "jsonrpsee 0.26.0", - "jsonrpsee-types 0.26.0", - "metrics", - "metrics-derive", - "op-alloy-consensus", - "op-alloy-network", - "op-alloy-rpc-types", - "reth", - "reth-evm", - "reth-exex", - "reth-optimism-chainspec", - "reth-optimism-cli", - "reth-optimism-evm", - "reth-optimism-node", - "reth-optimism-primitives", - "reth-optimism-rpc", - "reth-primitives", - "reth-primitives-traits", - "reth-provider", - "reth-rpc-convert", - "reth-rpc-eth-api", - "reth-tracing", - "rollup-boost", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "tokio-tungstenite", - "tracing", - "url", -] - -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - [[package]] name = "base16ct" version = "0.1.1" @@ -1975,16 +1596,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base256emoji" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e9430d9a245a77c92176e649af6e275f20839a48389859d1661e9a128d077c" -dependencies = [ - "const-str", - "match-lookup", -] - [[package]] name = "base64" version = "0.21.7" @@ -2013,78 +1624,24 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" -[[package]] -name = "bimap" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bindgen" -version = "0.69.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" -dependencies = [ - "bitflags 2.9.4", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.106", - "which", -] - -[[package]] -name = "bindgen" -version = "0.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" -dependencies = [ - "bitflags 2.9.4", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.106", -] - [[package]] name = "bindgen" version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ - "bitflags 2.9.4", + "bitflags 2.10.0", "cexpr", "clang-sys", "itertools 0.13.0", + "log", + "prettyplease", "proc-macro2", "quote", "regex", - "rustc-hash 2.1.1", + "rustc-hash", "shlex", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -2126,11 +1683,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.4" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -2164,15 +1721,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - [[package]] name = "blst" version = "0.3.16" @@ -2185,145 +1733,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "boa_ast" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c340fe0f0b267787095cbe35240c6786ff19da63ec7b69367ba338eace8169b" -dependencies = [ - "bitflags 2.9.4", - "boa_interner", - "boa_macros", - "boa_string", - "indexmap 2.11.4", - "num-bigint", - "rustc-hash 2.1.1", -] - -[[package]] -name = "boa_engine" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f620c3f06f51e65c0504ddf04978be1b814ac6586f0b45f6019801ab5efd37f9" -dependencies = [ - "arrayvec", - "bitflags 2.9.4", - "boa_ast", - "boa_gc", - "boa_interner", - "boa_macros", - "boa_parser", - "boa_profiler", - "boa_string", - "bytemuck", - "cfg-if", - "dashmap 6.1.0", - "fast-float2", - "hashbrown 0.15.5", - "icu_normalizer 1.5.0", - "indexmap 2.11.4", - "intrusive-collections", - "itertools 0.13.0", - "num-bigint", - "num-integer", - "num-traits", - "num_enum", - "once_cell", - "pollster", - "portable-atomic", - "rand 0.8.5", - "regress", - "rustc-hash 2.1.1", - "ryu-js", - "serde", - "serde_json", - "sptr", - "static_assertions", - "tap", - "thin-vec", - "thiserror 2.0.17", - "time", -] - -[[package]] -name = "boa_gc" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2425c0b7720d42d73eaa6a883fbb77a5c920da8694964a3d79a67597ac55cce2" -dependencies = [ - "boa_macros", - "boa_profiler", - "boa_string", - "hashbrown 0.15.5", - "thin-vec", -] - -[[package]] -name = "boa_interner" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42407a3b724cfaecde8f7d4af566df4b56af32a2f11f0956f5570bb974e7f749" -dependencies = [ - "boa_gc", - "boa_macros", - "hashbrown 0.15.5", - "indexmap 2.11.4", - "once_cell", - "phf", - "rustc-hash 2.1.1", - "static_assertions", -] - -[[package]] -name = "boa_macros" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd3f870829131332587f607a7ff909f1af5fc523fd1b192db55fbbdf52e8d3c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", - "synstructure", -] - -[[package]] -name = "boa_parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cc142dac798cdc6e2dbccfddeb50f36d2523bb977a976e19bdb3ae19b740804" -dependencies = [ - "bitflags 2.9.4", - "boa_ast", - "boa_interner", - "boa_macros", - "boa_profiler", - "fast-float2", - "icu_properties 1.5.1", - "num-bigint", - "num-traits", - "regress", - "rustc-hash 2.1.1", -] - -[[package]] -name = "boa_profiler" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4064908e7cdf9b6317179e9b04dcb27f1510c1c144aeab4d0394014f37a0f922" - -[[package]] -name = "boa_string" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7debc13fbf7997bf38bf8e9b20f1ad5e2a7d27a900e1f6039fe244ce30f589b5" -dependencies = [ - "fast-float2", - "paste", - "rustc-hash 2.1.1", - "sptr", - "static_assertions", -] - [[package]] name = "bollard" version = "0.18.1" @@ -2346,8 +1755,8 @@ dependencies = [ "hyperlocal", "log", "pin-project-lite", - "rustls 0.23.31", - "rustls-native-certs 0.8.1", + "rustls 0.23.34", + "rustls-native-certs 0.8.2", "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", @@ -2355,7 +1764,7 @@ dependencies = [ "serde_json", "serde_repr", "serde_urlencoded", - "thiserror 2.0.17", + "thiserror", "tokio", "tokio-util", "tower-service", @@ -2374,45 +1783,6 @@ dependencies = [ "serde_with", ] -[[package]] -name = "boyer-moore-magiclen" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e6233f2d926b5b123caf9d58e3885885255567fbe7776a7fdcae2a4d7241c4" -dependencies = [ - "debug-helper", -] - -[[package]] -name = "brotli" -version = "8.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bs58" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" -dependencies = [ - "tinyvec", -] - [[package]] name = "bumpalo" version = "3.19.0" @@ -2425,32 +1795,6 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d" -[[package]] -name = "bytecount" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e" - -[[package]] -name = "bytemuck" -version = "1.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "byteorder" version = "1.5.0" @@ -2492,106 +1836,41 @@ dependencies = [ ] [[package]] -name = "camino" -version = "1.2.1" +name = "cc" +version = "1.2.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" +checksum = "739eb0f94557554b3ca9a86d2d37bebd49c5e6d0c1d2bda35ba5bdac830befc2" dependencies = [ - "serde_core", + "find-msvc-tools", + "jobserver", + "libc", + "shlex", ] [[package]] -name = "cargo-platform" -version = "0.1.9" +name = "cexpr" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "serde", + "nom", ] [[package]] -name = "cargo_metadata" -version = "0.14.2" +name = "cfg-if" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver 1.0.27", - "serde", - "serde_json", -] +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] -name = "cargo_metadata" -version = "0.19.2" +name = "cfg_aliases" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" -dependencies = [ - "camino", - "cargo-platform", - "semver 1.0.27", - "serde", - "serde_json", - "thiserror 2.0.17", -] +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] -name = "cassowary" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - -[[package]] -name = "castaway" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a" -dependencies = [ - "rustversion", -] - -[[package]] -name = "cc" -version = "1.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af" -dependencies = [ - "jobserver", - "libc", - "shlex", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "chrono" -version = "0.4.42" +name = "chrono" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ @@ -2600,17 +1879,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-link 0.2.0", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", + "windows-link", ] [[package]] @@ -2626,9 +1895,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.48" +version = "4.5.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae" +checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623" dependencies = [ "clap_builder", "clap_derive", @@ -2636,9 +1905,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.48" +version = "4.5.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9" +checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0" dependencies = [ "anstream", "anstyle", @@ -2648,21 +1917,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.47" +version = "4.5.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c" +checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] name = "clap_lex" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" +checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "cmake" @@ -2679,70 +1948,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "comfy-table" -version = "7.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03b7db8e0b4b2fdad6c551e634134e99ec000e5c8c3b6856c65e8bbaded7a3b" -dependencies = [ - "crossterm 0.29.0", - "unicode-segmentation", - "unicode-width 0.2.0", -] - -[[package]] -name = "compact_str" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32" -dependencies = [ - "castaway", - "cfg-if", - "itoa", - "rustversion", - "ryu", - "static_assertions", -] - -[[package]] -name = "compression-codecs" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8a506ec4b81c460798f572caead636d57d3d7e940f998160f52bd254bf2d23" -dependencies = [ - "brotli", - "compression-core", - "flate2", - "memchr", - "zstd", - "zstd-safe", -] - -[[package]] -name = "compression-core" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb" - -[[package]] -name = "concat-kdf" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d72c1252426a83be2092dd5884a5f6e3b8e7180f6891b6263d2c21b92ec8816" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "concurrent-queue" version = "2.5.0" @@ -2754,9 +1959,9 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6407bff74dea37e0fa3dc1c1c974e5d46405f0c987bf9997a0762adce71eda6" +checksum = "3bb320cac8a0750d7f25280aa97b09c26edfe161164238ecbbb31092b079e735" dependencies = [ "cfg-if", "cpufeatures", @@ -2770,17 +1975,11 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "const-str" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f421161cb492475f1661ddc9815a745a1c894592070661180fdec3d4872e9c3" - [[package]] name = "const_format" -version = "0.2.34" +version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" +checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad" dependencies = [ "const_format_proc_macros", ] @@ -2831,15 +2030,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "core2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" -dependencies = [ - "memchr", -] - [[package]] name = "cpufeatures" version = "0.2.17" @@ -2892,15 +2082,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" -[[package]] -name = "crossbeam-channel" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -2935,45 +2116,6 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" -[[package]] -name = "crossterm" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" -dependencies = [ - "bitflags 2.9.4", - "crossterm_winapi", - "mio", - "parking_lot", - "rustix 0.38.44", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" -dependencies = [ - "bitflags 2.9.4", - "crossterm_winapi", - "document-features", - "parking_lot", - "rustix 1.1.2", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - [[package]] name = "crunchy" version = "0.2.4" @@ -3011,46 +2153,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", "typenum", ] -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest 0.10.7", - "fiat-crypto", - "rustc_version 0.4.1", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "darling" version = "0.20.11" @@ -3082,7 +2187,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -3097,7 +2202,7 @@ dependencies = [ "quote", "serde", "strsim", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -3108,7 +2213,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core 0.20.11", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -3119,20 +2224,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core 0.21.3", "quote", - "syn 2.0.106", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", + "syn 2.0.108", ] [[package]] @@ -3149,49 +2241,6 @@ dependencies = [ "parking_lot_core", ] -[[package]] -name = "data-encoding" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" - -[[package]] -name = "data-encoding-macro" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47ce6c96ea0102f01122a185683611bd5ac8d99e62bc59dd12e6bda344ee673d" -dependencies = [ - "data-encoding", - "data-encoding-macro-internal", -] - -[[package]] -name = "data-encoding-macro-internal" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976" -dependencies = [ - "data-encoding", - "syn 2.0.106", -] - -[[package]] -name = "debug-helper" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" - -[[package]] -name = "delay_map" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e365f083a5cb5972d50ce8b1b2c9f125dc5ec0f50c0248cfb568ae59efcf0b" -dependencies = [ - "futures", - "tokio", - "tokio-util", -] - [[package]] name = "der" version = "0.6.1" @@ -3215,9 +2264,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", "serde_core", @@ -3242,38 +2291,7 @@ checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", -] - -[[package]] -name = "derive_builder" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" -dependencies = [ - "darling 0.20.11", - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" -dependencies = [ - "derive_builder_core", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -3294,16 +2312,10 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", "unicode-xid", ] -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - [[package]] name = "digest" version = "0.9.0" @@ -3326,140 +2338,50 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "6.0.0" +name = "displaydoc" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ - "dirs-sys", + "proc-macro2", + "quote", + "syn 2.0.108", ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "docker_credential" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "1d89dfcba45b4afad7450a99b39e751590463e45c04728cf555d36bb66940de8" dependencies = [ - "cfg-if", - "dirs-sys-next", + "base64 0.21.7", + "serde", + "serde_json", ] [[package]] -name = "dirs-sys" -version = "0.5.0" +name = "dotenvy" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" -dependencies = [ - "libc", - "option-ext", - "redox_users 0.5.2", - "windows-sys 0.61.1", -] +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "dunce" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users 0.4.6", - "winapi", -] +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] -name = "discv5" -version = "0.9.1" +name = "dyn-clone" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4b4e7798d2ff74e29cee344dc490af947ae657d6ab5273dde35d58ce06a4d71" -dependencies = [ - "aes", - "aes-gcm", - "alloy-rlp", - "arrayvec", - "ctr", - "delay_map", - "enr", - "fnv", - "futures", - "hashlink 0.9.1", - "hex", - "hkdf", - "lazy_static", - "libp2p-identity", - "lru 0.12.5", - "more-asserts", - "multiaddr", - "parking_lot", - "rand 0.8.5", - "smallvec", - "socket2 0.5.10", - "tokio", - "tracing", - "uint 0.10.0", - "zeroize", -] - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "docker_credential" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d89dfcba45b4afad7450a99b39e751590463e45c04728cf555d36bb66940de8" -dependencies = [ - "base64 0.21.7", - "serde", - "serde_json", -] - -[[package]] -name = "doctest-file" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" - -[[package]] -name = "document-features" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" -dependencies = [ - "litrs", -] - -[[package]] -name = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - -[[package]] -name = "dyn-clone" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" - -[[package]] -name = "ecdsa" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + +[[package]] +name = "ecdsa" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ "der 0.6.1", "elliptic-curve 0.12.3", @@ -3482,31 +2404,6 @@ dependencies = [ "spki 0.7.3", ] -[[package]] -name = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8 0.10.2", - "signature 2.2.0", -] - -[[package]] -name = "ed25519-dalek" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand_core 0.6.4", - "serde", - "sha2 0.10.9", - "subtle", - "zeroize", -] - [[package]] name = "educe" version = "0.6.0" @@ -3516,7 +2413,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -3568,12 +2465,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - [[package]] name = "enr" version = "0.13.0" @@ -3583,29 +2474,14 @@ dependencies = [ "alloy-rlp", "base64 0.22.1", "bytes", - "ed25519-dalek", "hex", - "k256", "log", "rand 0.8.5", "secp256k1 0.30.0", - "serde", "sha3", "zeroize", ] -[[package]] -name = "enum-as-inner" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "enum-ordinalize" version = "4.3.0" @@ -3623,7 +2499,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -3639,16 +2515,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.1", -] - -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "version_check", + "windows-sys 0.61.2", ] [[package]] @@ -3662,17 +2529,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "ethereum_hashing" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c853bd72c9e5787f8aafc3df2907c2ed03cff3150c3acd94e2e53a98ab70a8ab" -dependencies = [ - "cpufeatures", - "ring", - "sha2 0.10.9", -] - [[package]] name = "ethereum_serde_utils" version = "0.8.0" @@ -3710,7 +2566,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -3724,32 +2580,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "event-listener-strategy" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" -dependencies = [ - "event-listener", - "pin-project-lite", -] - -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fast-float2" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8eb564c5c7423d25c886fb561d1e4ee69f72354d16918afa32c08811f6b6a55" - [[package]] name = "fastrand" version = "2.3.0" @@ -3778,16 +2608,6 @@ dependencies = [ "bytes", ] -[[package]] -name = "fdlimit" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5" -dependencies = [ - "libc", - "thiserror 1.0.69", -] - [[package]] name = "ff" version = "0.12.1" @@ -3808,12 +2628,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - [[package]] name = "filetime" version = "0.2.26" @@ -3826,6 +2640,12 @@ dependencies = [ "windows-sys 0.60.2", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + [[package]] name = "fixed-hash" version = "0.8.0" @@ -3838,16 +2658,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "flate2" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - [[package]] name = "flume" version = "0.11.1" @@ -3907,15 +2717,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - [[package]] name = "funty" version = "2.0.0" @@ -3989,7 +2790,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -4004,16 +2805,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" -dependencies = [ - "gloo-timers 0.2.6", - "send_wrapper 0.4.0", -] - [[package]] name = "futures-util" version = "0.3.31" @@ -4040,11 +2831,10 @@ checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" [[package]] name = "generic-array" -version = "0.14.7" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" dependencies = [ - "serde", "typenum", "version_check", "zeroize", @@ -4059,92 +2849,30 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "js-sys", "libc", "r-efi", - "wasi 0.14.7+wasi-0.2.4", + "wasip2", "wasm-bindgen", ] -[[package]] -name = "ghash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gimli" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" - -[[package]] -name = "git2" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110" -dependencies = [ - "bitflags 2.9.4", - "libc", - "libgit2-sys", - "log", - "url", -] - [[package]] name = "glob" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" -[[package]] -name = "gloo-net" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "gloo-utils", - "http 1.3.1", - "js-sys", - "pin-project", - "serde", - "serde_json", - "thiserror 1.0.69", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "gloo-timers" version = "0.3.0" @@ -4157,19 +2885,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "gloo-utils" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gmp-mpfr-sys" version = "1.6.8" @@ -4214,7 +2929,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.11.4", + "indexmap 2.12.0", "slab", "tokio", "tokio-util", @@ -4233,7 +2948,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.3.1", - "indexmap 2.11.4", + "indexmap 2.12.0", "slab", "tokio", "tokio-util", @@ -4257,9 +2972,6 @@ name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", -] [[package]] name = "hashbrown" @@ -4282,15 +2994,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hashlink" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" -dependencies = [ - "hashbrown 0.14.5", -] - [[package]] name = "hashlink" version = "0.10.0" @@ -4300,16 +3003,6 @@ dependencies = [ "hashbrown 0.15.5", ] -[[package]] -name = "hdrhistogram" -version = "7.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" -dependencies = [ - "byteorder", - "num-traits", -] - [[package]] name = "heck" version = "0.5.0" @@ -4338,58 +3031,10 @@ dependencies = [ ] [[package]] -name = "hickory-proto" -version = "0.25.2" +name = "hkdf" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna", - "ipnet", - "once_cell", - "rand 0.9.2", - "ring", - "serde", - "thiserror 2.0.17", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "hickory-resolver" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a" -dependencies = [ - "cfg-if", - "futures-util", - "hickory-proto", - "ipconfig", - "moka", - "once_cell", - "parking_lot", - "rand 0.9.2", - "resolv-conf", - "serde", - "smallvec", - "thiserror 2.0.17", - "tokio", - "tracing", -] - -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac", ] @@ -4405,11 +3050,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4468,12 +3113,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" - [[package]] name = "httparse" version = "1.10.1" @@ -4486,28 +3125,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "human_bytes" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e" - -[[package]] -name = "humantime" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" - -[[package]] -name = "humantime-serde" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" -dependencies = [ - "humantime", - "serde", -] - [[package]] name = "hyper" version = "0.14.32" @@ -4595,27 +3212,12 @@ dependencies = [ "http 1.3.1", "hyper 1.7.0", "hyper-util", - "log", - "rustls 0.23.31", - "rustls-native-certs 0.8.1", + "rustls 0.23.34", + "rustls-native-certs 0.8.2", "rustls-pki-types", "tokio", "tokio-rustls 0.26.4", "tower-service", - "webpki-roots 1.0.2", -] - -[[package]] -name = "hyper-timeout" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" -dependencies = [ - "hyper 1.7.0", - "hyper-util", - "pin-project-lite", - "tokio", - "tower-service", ] [[package]] @@ -4652,12 +3254,10 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.0", - "system-configuration", + "socket2 0.6.1", "tokio", "tower-service", "tracing", - "windows-registry", ] [[package]] @@ -4687,7 +3287,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.1", + "windows-core", ] [[package]] @@ -4699,18 +3299,6 @@ dependencies = [ "cc", ] -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke 0.7.5", - "zerofrom", - "zerovec 0.10.4", -] - [[package]] name = "icu_collections" version = "2.0.0" @@ -4719,9 +3307,9 @@ checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ "displaydoc", "potential_utf", - "yoke 0.8.0", + "yoke", "zerofrom", - "zerovec 0.11.4", + "zerovec", ] [[package]] @@ -4731,61 +3319,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" dependencies = [ "displaydoc", - "litemap 0.8.0", - "tinystr 0.8.1", - "writeable 0.6.1", - "zerovec 0.11.4", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap 0.7.5", - "tinystr 0.7.6", - "writeable 0.5.5", - "zerovec 0.10.4", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider 1.5.0", - "tinystr 0.7.6", - "zerovec 0.10.4", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections 1.5.0", - "icu_normalizer_data 1.5.1", - "icu_properties 1.5.1", - "icu_provider 1.5.0", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec 0.10.4", + "litemap", + "tinystr", + "writeable", + "zerovec", ] [[package]] @@ -4795,41 +3332,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" dependencies = [ "displaydoc", - "icu_collections 2.0.0", - "icu_normalizer_data 2.0.0", - "icu_properties 2.0.1", - "icu_provider 2.0.0", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", "smallvec", - "zerovec 0.11.4", + "zerovec", ] -[[package]] -name = "icu_normalizer_data" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" - [[package]] name = "icu_normalizer_data" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" -[[package]] -name = "icu_properties" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" -dependencies = [ - "displaydoc", - "icu_collections 1.5.0", - "icu_locid_transform", - "icu_properties_data 1.5.1", - "icu_provider 1.5.0", - "tinystr 0.7.6", - "zerovec 0.10.4", -] - [[package]] name = "icu_properties" version = "2.0.1" @@ -4837,44 +3353,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" dependencies = [ "displaydoc", - "icu_collections 2.0.0", + "icu_collections", "icu_locale_core", - "icu_properties_data 2.0.1", - "icu_provider 2.0.0", + "icu_properties_data", + "icu_provider", "potential_utf", "zerotrie", - "zerovec 0.11.4", + "zerovec", ] -[[package]] -name = "icu_properties_data" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" - [[package]] name = "icu_properties_data" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr 0.7.6", - "writeable 0.5.5", - "yoke 0.7.5", - "zerofrom", - "zerovec 0.10.4", -] - [[package]] name = "icu_provider" version = "2.0.0" @@ -4884,23 +3377,12 @@ dependencies = [ "displaydoc", "icu_locale_core", "stable_deref_trait", - "tinystr 0.8.1", - "writeable 0.6.1", - "yoke 0.8.0", + "tinystr", + "writeable", + "yoke", "zerofrom", "zerotrie", - "zerovec 0.11.4", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", + "zerovec", ] [[package]] @@ -4926,18 +3408,8 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ - "icu_normalizer 2.0.0", - "icu_properties 2.0.1", -] - -[[package]] -name = "if-addrs" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b2eeee38fef3aa9b4cc5f1beea8a2444fc00e7377cafae396de3f5c2065e24" -dependencies = [ - "libc", - "windows-sys 0.59.0", + "icu_normalizer", + "icu_properties", ] [[package]] @@ -4957,7 +3429,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -4979,12 +3451,6 @@ dependencies = [ "quote", ] -[[package]] -name = "indenter" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "964de6e86d545b246d84badc0fef527924ace5134f30641c203ef52ba83f58d5" - [[package]] name = "indexmap" version = "1.9.3" @@ -4998,9 +3464,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.11.4" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", "hashbrown 0.16.0", @@ -5008,102 +3474,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "indoc" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" - -[[package]] -name = "inotify" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" -dependencies = [ - "bitflags 2.9.4", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "inout" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" -dependencies = [ - "block-padding", - "generic-array", -] - -[[package]] -name = "instability" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435d80800b936787d62688c927b6490e887c7ef5ff9ce922c6c6050fca75eb9a" -dependencies = [ - "darling 0.20.11", - "indoc", - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "interprocess" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d941b405bd2322993887859a8ee6ac9134945a24ec5ec763a8a962fc64dfec2d" -dependencies = [ - "doctest-file", - "futures-core", - "libc", - "recvmsg", - "tokio", - "widestring", - "windows-sys 0.52.0", -] - -[[package]] -name = "intrusive-collections" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "189d0897e4cbe8c75efedf3502c18c887b05046e59d28404d4d8e46cbc4d1e86" -dependencies = [ - "memoffset", -] - -[[package]] -name = "io-uring" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" -dependencies = [ - "bitflags 2.9.4", - "cfg-if", - "libc", -] - -[[package]] -name = "ipconfig" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" -dependencies = [ - "socket2 0.5.10", - "widestring", - "windows-sys 0.48.0", - "winreg", -] - [[package]] name = "ipnet" version = "2.11.0" @@ -5122,9 +3492,9 @@ dependencies = [ [[package]] name = "is_terminal_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itertools" @@ -5135,15 +3505,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -5168,35 +3529,13 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror 1.0.69", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - [[package]] name = "jobserver" version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "libc", ] @@ -5210,67 +3549,25 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonrpsee" -version = "0.25.1" -source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" -dependencies = [ - "jsonrpsee-core 0.25.1", - "jsonrpsee-http-client 0.25.1", - "jsonrpsee-proc-macros 0.25.1", - "jsonrpsee-server 0.25.1", - "jsonrpsee-types 0.25.1", - "tokio", - "tracing", -] - [[package]] name = "jsonrpsee" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3f48dc3e6b8bd21e15436c1ddd0bc22a6a54e8ec46fedd6adf3425f396ec6a" dependencies = [ - "jsonrpsee-client-transport", - "jsonrpsee-core 0.26.0", - "jsonrpsee-http-client 0.26.0", - "jsonrpsee-proc-macros 0.26.0", - "jsonrpsee-server 0.26.0", - "jsonrpsee-types 0.26.0", - "jsonrpsee-wasm-client", - "jsonrpsee-ws-client", + "jsonrpsee-core", + "jsonrpsee-proc-macros", + "jsonrpsee-server", + "jsonrpsee-types", "tokio", "tracing", ] [[package]] -name = "jsonrpsee-client-transport" +name = "jsonrpsee-core" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf36eb27f8e13fa93dcb50ccb44c417e25b818cfa1a481b5470cd07b19c60b98" -dependencies = [ - "base64 0.22.1", - "futures-channel", - "futures-util", - "gloo-net", - "http 1.3.1", - "jsonrpsee-core 0.26.0", - "pin-project", - "rustls 0.23.31", - "rustls-pki-types", - "rustls-platform-verifier", - "soketto", - "thiserror 2.0.17", - "tokio", - "tokio-rustls 0.26.4", - "tokio-util", - "tracing", - "url", -] - -[[package]] -name = "jsonrpsee-core" -version = "0.25.1" -source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" +checksum = "316c96719901f05d1137f19ba598b5fe9c9bc39f4335f67f6be8613921946480" dependencies = [ "async-trait", "bytes", @@ -5278,141 +3575,30 @@ dependencies = [ "http 1.3.1", "http-body 1.0.1", "http-body-util", - "jsonrpsee-types 0.25.1", + "jsonrpsee-types", "parking_lot", "pin-project", "rand 0.9.2", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror", "tokio", - "tower 0.5.2", + "tower", "tracing", ] [[package]] -name = "jsonrpsee-core" +name = "jsonrpsee-proc-macros" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "316c96719901f05d1137f19ba598b5fe9c9bc39f4335f67f6be8613921946480" -dependencies = [ - "async-trait", - "bytes", - "futures-timer", - "futures-util", - "http 1.3.1", - "http-body 1.0.1", - "http-body-util", - "jsonrpsee-types 0.26.0", - "parking_lot", - "pin-project", - "rand 0.9.2", - "rustc-hash 2.1.1", - "serde", - "serde_json", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tower 0.5.2", - "tracing", - "wasm-bindgen-futures", -] - -[[package]] -name = "jsonrpsee-http-client" -version = "0.25.1" -source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" -dependencies = [ - "base64 0.22.1", - "http-body 1.0.1", - "hyper 1.7.0", - "hyper-rustls 0.27.7", - "hyper-util", - "jsonrpsee-core 0.25.1", - "jsonrpsee-types 0.25.1", - "rustls 0.23.31", - "rustls-platform-verifier", - "serde", - "serde_json", - "thiserror 2.0.17", - "tokio", - "tower 0.5.2", - "url", -] - -[[package]] -name = "jsonrpsee-http-client" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "790bedefcec85321e007ff3af84b4e417540d5c87b3c9779b9e247d1bcc3dab8" -dependencies = [ - "base64 0.22.1", - "http-body 1.0.1", - "hyper 1.7.0", - "hyper-rustls 0.27.7", - "hyper-util", - "jsonrpsee-core 0.26.0", - "jsonrpsee-types 0.26.0", - "rustls 0.23.31", - "rustls-platform-verifier", - "serde", - "serde_json", - "thiserror 2.0.17", - "tokio", - "tower 0.5.2", - "url", -] - -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.25.1" -source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" -dependencies = [ - "heck", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da3f8ab5ce1bb124b6d082e62dffe997578ceaf0aeb9f3174a214589dc00f07" +checksum = "2da3f8ab5ce1bb124b6d082e62dffe997578ceaf0aeb9f3174a214589dc00f07" dependencies = [ "heck", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.106", -] - -[[package]] -name = "jsonrpsee-server" -version = "0.25.1" -source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" -dependencies = [ - "futures-util", - "http 1.3.1", - "http-body 1.0.1", - "http-body-util", - "hyper 1.7.0", - "hyper-util", - "jsonrpsee-core 0.25.1", - "jsonrpsee-types 0.25.1", - "pin-project", - "route-recognizer", - "serde", - "serde_json", - "soketto", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tokio-util", - "tower 0.5.2", - "tracing", + "syn 2.0.108", ] [[package]] @@ -5427,32 +3613,21 @@ dependencies = [ "http-body-util", "hyper 1.7.0", "hyper-util", - "jsonrpsee-core 0.26.0", - "jsonrpsee-types 0.26.0", + "jsonrpsee-core", + "jsonrpsee-types", "pin-project", "route-recognizer", "serde", "serde_json", "soketto", - "thiserror 2.0.17", + "thiserror", "tokio", "tokio-stream", "tokio-util", - "tower 0.5.2", + "tower", "tracing", ] -[[package]] -name = "jsonrpsee-types" -version = "0.25.1" -source = "git+https://github.com/paritytech/jsonrpsee?rev=f04afa740e55db60dce20d9839758792f035ffff#f04afa740e55db60dce20d9839758792f035ffff" -dependencies = [ - "http 1.3.1", - "serde", - "serde_json", - "thiserror 2.0.17", -] - [[package]] name = "jsonrpsee-types" version = "0.26.0" @@ -5462,48 +3637,7 @@ dependencies = [ "http 1.3.1", "serde", "serde_json", - "thiserror 2.0.17", -] - -[[package]] -name = "jsonrpsee-wasm-client" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7902885de4779f711a95d82c8da2d7e5f9f3a7c7cfa44d51c067fd1c29d72a3c" -dependencies = [ - "jsonrpsee-client-transport", - "jsonrpsee-core 0.26.0", - "jsonrpsee-types 0.26.0", - "tower 0.5.2", -] - -[[package]] -name = "jsonrpsee-ws-client" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6fceceeb05301cc4c065ab3bd2fa990d41ff4eb44e4ca1b30fa99c057c3e79" -dependencies = [ - "http 1.3.1", - "jsonrpsee-client-transport", - "jsonrpsee-core 0.26.0", - "jsonrpsee-types 0.26.0", - "tower 0.5.2", - "url", -] - -[[package]] -name = "jsonwebtoken" -version = "9.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde" -dependencies = [ - "base64 0.22.1", - "js-sys", - "pem", - "ring", - "serde", - "serde_json", - "simple_asn1", + "thiserror", ] [[package]] @@ -5518,7 +3652,6 @@ dependencies = [ "once_cell", "serdect", "sha2 0.10.9", - "signature 2.2.0", ] [[package]] @@ -5540,26 +3673,6 @@ dependencies = [ "sha3-asm", ] -[[package]] -name = "kqueue" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - [[package]] name = "lazy_static" version = "1.5.0" @@ -5569,29 +3682,11 @@ dependencies = [ "spin", ] -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" -version = "0.2.176" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" - -[[package]] -name = "libgit2-sys" -version = "0.18.2+1.9.1" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libloading" @@ -5600,7 +3695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-link 0.2.0", + "windows-link", ] [[package]] @@ -5609,43 +3704,13 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" -[[package]] -name = "libp2p-identity" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3104e13b51e4711ff5738caa1fb54467c8604c2e94d607e27745bcf709068774" -dependencies = [ - "asn1_der", - "bs58", - "ed25519-dalek", - "hkdf", - "k256", - "multihash", - "quick-protobuf", - "sha2 0.10.9", - "thiserror 2.0.17", - "tracing", - "zeroize", -] - -[[package]] -name = "libproc" -version = "0.14.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a54ad7278b8bc5301d5ffd2a94251c004feb971feba96c971ea4063645990757" -dependencies = [ - "bindgen 0.72.1", - "errno", - "libc", -] - [[package]] name = "libredox" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" dependencies = [ - "bitflags 2.9.4", + "bitflags 2.10.0", "libc", "redox_syscall 0.5.18", ] @@ -5718,52 +3783,18 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linked_hash_set" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae85b5be22d9843c80e5fc80e9b64c8a3b1f98f867c709956eca3efff4e92e2" -dependencies = [ - "linked-hash-map", - "serde", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - [[package]] name = "linux-raw-sys" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" -[[package]] -name = "litemap" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" - [[package]] name = "litemap" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" -[[package]] -name = "litrs" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" - [[package]] name = "lock_api" version = "0.4.14" @@ -5771,7 +3802,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ "scopeguard", - "serde", ] [[package]] @@ -5804,40 +3834,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" -[[package]] -name = "lz4" -version = "1.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20b523e860d03443e98350ceaac5e71c6ba89aea7d960769ec3ce37f4de5af4" -dependencies = [ - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.11.1+lz4-1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "lz4_flex" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a" - -[[package]] -name = "mach2" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea" -dependencies = [ - "libc", -] - [[package]] name = "macro-string" version = "0.1.4" @@ -5846,18 +3842,7 @@ checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", -] - -[[package]] -name = "match-lookup" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1265724d8cb29dbbc2b0f06fffb8bf1a8c0cf73a78eede9ba73a4a66c52a981e" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "syn 2.0.108", ] [[package]] @@ -5869,12 +3854,6 @@ dependencies = [ "regex-automata", ] -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - [[package]] name = "md-5" version = "0.10.6" @@ -5891,24 +3870,6 @@ version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" -[[package]] -name = "memmap2" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843a98750cd611cc2965a8213b53b43e715f13c37a9e096c6408e69990961db7" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - [[package]] name = "metrics" version = "0.24.2" @@ -5928,128 +3889,38 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] -name = "metrics-exporter-prometheus" -version = "0.16.2" +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7399781913e5393588a8d8c6a2867bf85fb38eaf2502fdce465aad2dc6f034" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ - "base64 0.22.1", - "http-body-util", - "hyper 1.7.0", - "hyper-rustls 0.27.7", - "hyper-util", - "indexmap 2.11.4", - "ipnet", - "metrics", - "metrics-util", - "quanta", - "thiserror 1.0.69", - "tokio", - "tracing", + "adler2", ] [[package]] -name = "metrics-process" -version = "2.4.2" +name = "mio" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f615e08e049bd14a44c4425415782efb9bcd479fc1e19ddeb971509074c060d0" +checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" dependencies = [ "libc", - "libproc", - "mach2", - "metrics", - "once_cell", - "procfs 0.18.0", - "rlimit", - "windows 0.62.1", + "wasi", + "windows-sys 0.61.2", ] [[package]] -name = "metrics-util" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8496cc523d1f94c1385dd8f0f0c2c480b2b8aeccb5b7e4485ad6365523ae376" -dependencies = [ - "aho-corasick", - "crossbeam-epoch", - "crossbeam-utils", - "hashbrown 0.15.5", - "indexmap 2.11.4", - "metrics", - "ordered-float", - "quanta", - "radix_trie", - "rand 0.9.2", - "rand_xoshiro", - "sketches-ddsketch", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "mini-moka" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c325dfab65f261f386debee8b0969da215b3fa0037e74c8a1234db7ba986d803" -dependencies = [ - "crossbeam-channel", - "crossbeam-utils", - "dashmap 5.5.3", - "skeptic", - "smallvec", - "tagptr", - "triomphe", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" -dependencies = [ - "adler2", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" -dependencies = [ - "libc", - "log", - "wasi 0.11.1+wasi-snapshot-preview1", - "windows-sys 0.59.0", -] - -[[package]] -name = "modular-bitfield" -version = "0.11.2" +name = "modular-bitfield" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74" dependencies = [ @@ -6068,74 +3939,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "moka" -version = "0.12.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8261cd88c312e0004c1d51baad2980c66528dfdb2bee62003e643a4d8f86b077" -dependencies = [ - "async-lock", - "crossbeam-channel", - "crossbeam-epoch", - "crossbeam-utils", - "equivalent", - "event-listener", - "futures-util", - "parking_lot", - "portable-atomic", - "rustc_version 0.4.1", - "smallvec", - "tagptr", - "uuid", -] - -[[package]] -name = "more-asserts" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e" - -[[package]] -name = "multiaddr" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe6351f60b488e04c1d21bc69e56b89cb3f5e8f5d22557d6e8031bdfd79b6961" -dependencies = [ - "arrayref", - "byteorder", - "data-encoding", - "libp2p-identity", - "multibase", - "multihash", - "percent-encoding", - "serde", - "static_assertions", - "unsigned-varint", - "url", -] - -[[package]] -name = "multibase" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8694bb4835f452b0e3bb06dbebb1d6fc5385b6ca1caf2e55fd165c042390ec77" -dependencies = [ - "base-x", - "base256emoji", - "data-encoding", - "data-encoding-macro", -] - -[[package]] -name = "multihash" -version = "0.19.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b430e7953c29dd6a09afc29ff0bb69c6e306329ee6794700aee27b76a1aea8d" -dependencies = [ - "core2", - "unsigned-varint", -] - [[package]] name = "native-tls" version = "0.2.14" @@ -6153,15 +3956,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - [[package]] name = "nom" version = "7.1.3" @@ -6172,46 +3966,13 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "notify" -version = "8.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" -dependencies = [ - "bitflags 2.9.4", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "notify-types", - "walkdir", - "windows-sys 0.60.2", -] - -[[package]] -name = "notify-types" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - [[package]] name = "nu-ansi-term" -version = "0.50.1" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -6236,7 +3997,6 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", - "serde", ] [[package]] @@ -6324,9 +4084,9 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" +checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" dependencies = [ "num_enum_derive", "rustversion", @@ -6334,23 +4094,14 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" +checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.106", -] - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", + "syn 2.0.108", ] [[package]] @@ -6367,15 +4118,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "object" -version = "0.37.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.21.3" @@ -6388,9 +4130,9 @@ dependencies = [ [[package]] name = "once_cell_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "op-alloy-consensus" @@ -6407,16 +4149,9 @@ dependencies = [ "alloy-serde", "derive_more", "serde", - "serde_with", - "thiserror 2.0.17", + "thiserror", ] -[[package]] -name = "op-alloy-flz" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" - [[package]] name = "op-alloy-network" version = "0.20.0" @@ -6433,16 +4168,6 @@ dependencies = [ "op-alloy-rpc-types", ] -[[package]] -name = "op-alloy-rpc-jsonrpsee" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8eb878fc5ea95adb5abe55fb97475b3eb0dcc77dfcd6f61bd626a68ae0bdba1" -dependencies = [ - "alloy-primitives", - "jsonrpsee 0.26.0", -] - [[package]] name = "op-alloy-rpc-types" version = "0.20.0" @@ -6459,7 +4184,7 @@ dependencies = [ "op-alloy-consensus", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror", ] [[package]] @@ -6473,21 +4198,19 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", - "alloy-serde", "derive_more", "ethereum_ssz", "ethereum_ssz_derive", "op-alloy-consensus", - "serde", "snap", - "thiserror 2.0.17", + "thiserror", ] [[package]] name = "op-revm" -version = "10.1.0" +version = "10.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ba4f4693811e73449193c8bd656d3978f265871916882e6a51a487e4f96217" +checksum = "826f43a5b1613c224f561847c152bfbaefcb593a9ae2c612ff4dc4661c6e625f" dependencies = [ "auto_impl", "revm", @@ -6502,11 +4225,11 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.73" +version = "0.10.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" +checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654" dependencies = [ - "bitflags 2.9.4", + "bitflags 2.10.0", "cfg-if", "foreign-types", "libc", @@ -6523,7 +4246,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -6534,18 +4257,18 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-src" -version = "300.5.3+3.5.4" +version = "300.5.4+3.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6bad8cd0233b63971e232cc9c5e83039375b8586d2312f31fda85db8f888c2" +checksum = "a507b3792995dae9b0df8a1c1e3771e8418b7c2d9f0baeba32e6fe8b06c7cb72" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.109" +version = "0.9.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" +checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2" dependencies = [ "cc", "libc", @@ -6554,107 +4277,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "opentelemetry" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236e667b670a5cdf90c258f5a55794ec5ac5027e960c224bff8367a59e1e6426" -dependencies = [ - "futures-core", - "futures-sink", - "js-sys", - "pin-project-lite", - "thiserror 2.0.17", - "tracing", -] - -[[package]] -name = "opentelemetry-http" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8863faf2910030d139fb48715ad5ff2f35029fc5f244f6d5f689ddcf4d26253" -dependencies = [ - "async-trait", - "bytes", - "http 1.3.1", - "opentelemetry", - "reqwest", - "tracing", -] - -[[package]] -name = "opentelemetry-otlp" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bef114c6d41bea83d6dc60eb41720eedd0261a67af57b66dd2b84ac46c01d91" -dependencies = [ - "async-trait", - "futures-core", - "http 1.3.1", - "opentelemetry", - "opentelemetry-http", - "opentelemetry-proto", - "opentelemetry_sdk", - "prost", - "reqwest", - "serde_json", - "thiserror 2.0.17", - "tokio", - "tonic", - "tracing", -] - -[[package]] -name = "opentelemetry-proto" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f8870d3024727e99212eb3bb1762ec16e255e3e6f58eeb3dc8db1aa226746d" -dependencies = [ - "base64 0.22.1", - "hex", - "opentelemetry", - "opentelemetry_sdk", - "prost", - "serde", - "tonic", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84dfad6042089c7fc1f6118b7040dc2eb4ab520abbf410b79dc481032af39570" -dependencies = [ - "async-trait", - "futures-channel", - "futures-executor", - "futures-util", - "glob", - "opentelemetry", - "percent-encoding", - "rand 0.8.5", - "serde_json", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tracing", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-float" -version = "4.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" -dependencies = [ - "num-traits", -] - [[package]] name = "outref" version = "0.5.2" @@ -6684,16 +4306,6 @@ dependencies = [ "sha2 0.10.9", ] -[[package]] -name = "page_size" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "parity-scale-codec" version = "3.7.5" @@ -6703,7 +4315,6 @@ dependencies = [ "arrayvec", "bitvec", "byte-slice-cast", - "bytes", "const_format", "impl-trait-for-tuples", "parity-scale-codec-derive", @@ -6720,7 +4331,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -6749,7 +4360,7 @@ dependencies = [ "libc", "redox_syscall 0.5.18", "smallvec", - "windows-link 0.2.0", + "windows-link", ] [[package]] @@ -6774,7 +4385,7 @@ dependencies = [ "regex", "regex-syntax", "structmeta", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -6783,16 +4394,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pem" -version = "3.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3" -dependencies = [ - "base64 0.22.1", - "serde", -] - [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -6818,16 +4419,6 @@ dependencies = [ "ucd-trie", ] -[[package]] -name = "pharos" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" -dependencies = [ - "futures", - "rustc_version 0.4.1", -] - [[package]] name = "phf" version = "0.11.3" @@ -6859,7 +4450,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -6888,7 +4479,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -6940,24 +4531,6 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" -[[package]] -name = "pollster" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3" - -[[package]] -name = "polyval" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - [[package]] name = "portable-atomic" version = "1.11.1" @@ -6970,7 +4543,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" dependencies = [ - "zerovec 0.11.4", + "zerovec", ] [[package]] @@ -6988,16 +4561,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "pretty_assertions" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" -dependencies = [ - "diff", - "yansi", -] - [[package]] name = "prettyplease" version = "0.2.37" @@ -7005,7 +4568,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -7025,7 +4588,7 @@ checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", "impl-codec", - "uint 0.9.5", + "uint", ] [[package]] @@ -7034,7 +4597,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" dependencies = [ - "toml_edit 0.23.6", + "toml_edit", ] [[package]] @@ -7056,74 +4619,27 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] name = "proc-macro2" -version = "1.0.101" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] -[[package]] -name = "procfs" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f" -dependencies = [ - "bitflags 2.9.4", - "chrono", - "flate2", - "hex", - "procfs-core 0.17.0", - "rustix 0.38.44", -] - -[[package]] -name = "procfs" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" -dependencies = [ - "bitflags 2.9.4", - "procfs-core 0.18.0", - "rustix 1.1.2", -] - -[[package]] -name = "procfs-core" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec" -dependencies = [ - "bitflags 2.9.4", - "chrono", - "hex", -] - -[[package]] -name = "procfs-core" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" -dependencies = [ - "bitflags 2.9.4", - "hex", -] - [[package]] name = "proptest" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb0be07becd10686a0bb407298fb425360a5c44a663774406340c59a22de4ce" +checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.9.4", - "lazy_static", + "bitflags 2.10.0", "num-traits", "rand 0.9.2", "rand_chacha 0.9.0", @@ -7134,70 +4650,12 @@ dependencies = [ "unarray", ] -[[package]] -name = "prost" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" -dependencies = [ - "anyhow", - "itertools 0.14.0", - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "pulldown-cmark" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" -dependencies = [ - "bitflags 2.9.4", - "memchr", - "unicase", -] - -[[package]] -name = "quanta" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi 0.11.1+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - [[package]] name = "quick-error" version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quick-protobuf" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f" -dependencies = [ - "byteorder", -] - [[package]] name = "quinn" version = "0.11.9" @@ -7209,10 +4667,10 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.1.1", - "rustls 0.23.31", - "socket2 0.6.0", - "thiserror 2.0.17", + "rustc-hash", + "rustls 0.23.34", + "socket2 0.6.1", + "thiserror", "tokio", "tracing", "web-time", @@ -7225,15 +4683,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ "bytes", - "getrandom 0.3.3", + "getrandom 0.3.4", "lru-slab", "rand 0.9.2", "ring", - "rustc-hash 2.1.1", - "rustls 0.23.31", + "rustc-hash", + "rustls 0.23.34", "rustls-pki-types", "slab", - "thiserror 2.0.17", + "thiserror", "tinyvec", "tracing", "web-time", @@ -7248,7 +4706,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.0", + "socket2 0.6.1", "tracing", "windows-sys 0.60.2", ] @@ -7274,16 +4732,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - [[package]] name = "rand" version = "0.8.5" @@ -7342,7 +4790,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "serde", ] @@ -7355,45 +4803,6 @@ dependencies = [ "rand_core 0.9.3", ] -[[package]] -name = "rand_xoshiro" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41" -dependencies = [ - "rand_core 0.9.3", -] - -[[package]] -name = "ratatui" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" -dependencies = [ - "bitflags 2.9.4", - "cassowary", - "compact_str", - "crossterm 0.28.1", - "indoc", - "instability", - "itertools 0.13.0", - "lru 0.12.5", - "paste", - "strum 0.26.3", - "unicode-segmentation", - "unicode-truncate", - "unicode-width 0.2.0", -] - -[[package]] -name = "raw-cpuid" -version = "11.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" -dependencies = [ - "bitflags 2.9.4", -] - [[package]] name = "rayon" version = "1.11.0" @@ -7445,12 +4854,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "recvmsg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" - [[package]] name = "redox_syscall" version = "0.3.5" @@ -7466,29 +4869,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.9.4", -] - -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom 0.2.16", - "libredox", - "thiserror 1.0.69", -] - -[[package]] -name = "redox_users" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" -dependencies = [ - "getrandom 0.2.16", - "libredox", - "thiserror 2.0.17", + "bitflags 2.10.0", ] [[package]] @@ -7508,14 +4889,14 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] name = "regex" -version = "1.11.3" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -7525,9 +4906,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -7536,37 +4917,25 @@ dependencies = [ [[package]] name = "regex-lite" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943f41321c63ef1c92fd763bfe054d2668f7f225a5c29f0105903dc2fc04ba30" +checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da" [[package]] name = "regex-syntax" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" - -[[package]] -name = "regress" -version = "0.10.4" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145bb27393fe455dd64d6cbc8d059adfa392590a45eadf079c01b11857e7b010" -dependencies = [ - "hashbrown 0.15.5", - "memchr", -] +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" -version = "0.12.23" +version = "0.12.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" +checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" dependencies = [ "base64 0.22.1", "bytes", - "futures-channel", "futures-core", - "futures-util", "http 1.3.1", "http-body 1.0.1", "http-body-util", @@ -7580,8 +4949,8 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.31", - "rustls-native-certs 0.8.1", + "rustls 0.23.34", + "rustls-native-certs 0.8.2", "rustls-pki-types", "serde", "serde_json", @@ -7590,92 +4959,13 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls 0.26.4", - "tokio-util", - "tower 0.5.2", + "tower", "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams", "web-sys", - "webpki-roots 1.0.2", -] - -[[package]] -name = "resolv-conf" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3789b30bd25ba102de4beabd95d21ac45b69b1be7d14522bab988c526d6799" - -[[package]] -name = "reth" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-rpc-types", - "aquamarine", - "clap", - "eyre", - "reth-chainspec", - "reth-cli-runner", - "reth-cli-util", - "reth-consensus", - "reth-consensus-common", - "reth-db", - "reth-ethereum-cli", - "reth-ethereum-payload-builder", - "reth-ethereum-primitives", - "reth-evm", - "reth-network", - "reth-network-api", - "reth-node-api", - "reth-node-builder", - "reth-node-core", - "reth-node-ethereum", - "reth-node-metrics", - "reth-payload-builder", - "reth-payload-primitives", - "reth-primitives", - "reth-provider", - "reth-ress-protocol", - "reth-ress-provider", - "reth-revm", - "reth-rpc", - "reth-rpc-api", - "reth-rpc-builder", - "reth-rpc-convert", - "reth-rpc-eth-types", - "reth-rpc-server-types", - "reth-tasks", - "reth-tokio-util", - "reth-transaction-pool", - "tokio", - "tracing", -] - -[[package]] -name = "reth-basic-payload-builder" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "futures-core", - "futures-util", - "metrics", - "reth-chain-state", - "reth-metrics", - "reth-payload-builder", - "reth-payload-builder-primitives", - "reth-payload-primitives", - "reth-primitives-traits", - "reth-revm", - "reth-storage-api", - "reth-tasks", - "tokio", - "tracing", ] [[package]] @@ -7690,7 +4980,6 @@ dependencies = [ "metrics", "parking_lot", "pin-project", - "rand 0.9.2", "reth-chainspec", "reth-errors", "reth-ethereum-primitives", @@ -7700,8 +4989,6 @@ dependencies = [ "reth-storage-api", "reth-trie", "revm-database", - "revm-state", - "serde", "tokio", "tokio-stream", "tracing", @@ -7728,2379 +5015,459 @@ dependencies = [ ] [[package]] -name = "reth-cli" +name = "reth-codecs" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ + "alloy-consensus", + "alloy-eips", "alloy-genesis", - "clap", - "eyre", - "reth-cli-runner", - "reth-db", - "serde_json", - "shellexpand", + "alloy-primitives", + "alloy-trie", + "bytes", + "modular-bitfield", + "op-alloy-consensus", + "reth-codecs-derive", + "reth-zstd-compressors", + "serde", ] [[package]] -name = "reth-cli-commands" +name = "reth-codecs-derive" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "reth-consensus" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-chains", "alloy-consensus", - "alloy-eips", "alloy-primitives", - "alloy-rlp", - "backon", - "clap", - "comfy-table", - "crossterm 0.28.1", - "eyre", - "fdlimit", - "futures", - "human_bytes", - "humantime", - "itertools 0.14.0", - "lz4", - "ratatui", - "reqwest", - "reth-chainspec", - "reth-cli", - "reth-cli-runner", - "reth-cli-util", - "reth-codecs", - "reth-config", - "reth-consensus", - "reth-db", - "reth-db-api", - "reth-db-common", - "reth-discv4", - "reth-discv5", - "reth-downloaders", - "reth-ecies", - "reth-era", - "reth-era-downloader", - "reth-era-utils", - "reth-eth-wire", - "reth-etl", - "reth-evm", - "reth-exex", - "reth-fs-util", - "reth-net-nat", - "reth-network", - "reth-network-p2p", - "reth-network-peers", - "reth-node-api", - "reth-node-builder", - "reth-node-core", - "reth-node-events", - "reth-node-metrics", + "auto_impl", + "reth-execution-types", "reth-primitives-traits", - "reth-provider", - "reth-prune", - "reth-revm", - "reth-stages", - "reth-static-file", - "reth-static-file-types", - "reth-trie", - "reth-trie-common", - "reth-trie-db", - "secp256k1 0.30.0", - "serde", - "serde_json", - "tar", - "tokio", - "tokio-stream", - "toml", - "tracing", - "zstd", + "thiserror", ] [[package]] -name = "reth-cli-runner" +name = "reth-consensus-common" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "reth-tasks", - "tokio", - "tracing", + "alloy-consensus", + "alloy-eips", + "reth-chainspec", + "reth-consensus", + "reth-primitives-traits", ] [[package]] -name = "reth-cli-util" +name = "reth-db-models" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-eips", "alloy-primitives", - "cfg-if", - "eyre", - "libc", - "rand 0.8.5", - "reth-fs-util", - "secp256k1 0.30.0", + "bytes", + "reth-primitives-traits", "serde", - "thiserror 2.0.17", - "tikv-jemallocator", ] [[package]] -name = "reth-codecs" +name = "reth-errors" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-genesis", - "alloy-primitives", - "alloy-trie", - "bytes", - "modular-bitfield", - "op-alloy-consensus", - "reth-codecs-derive", - "reth-zstd-compressors", - "serde", -] - -[[package]] -name = "reth-codecs-derive" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "syn 2.0.106", + "reth-consensus", + "reth-execution-errors", + "reth-storage-errors", + "thiserror", ] [[package]] -name = "reth-config" +name = "reth-eth-wire-types" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "eyre", - "humantime-serde", - "reth-network-types", - "reth-prune-types", - "reth-stages-types", + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-hardforks", + "alloy-primitives", + "alloy-rlp", + "bytes", + "derive_more", + "reth-chainspec", + "reth-codecs-derive", + "reth-ethereum-primitives", + "reth-primitives-traits", "serde", - "toml", - "url", + "thiserror", ] [[package]] -name = "reth-consensus" +name = "reth-ethereum-forks" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-consensus", + "alloy-eip2124", + "alloy-hardforks", "alloy-primitives", "auto_impl", - "reth-execution-types", - "reth-primitives-traits", - "thiserror 2.0.17", + "once_cell", + "rustc-hash", ] [[package]] -name = "reth-consensus-common" +name = "reth-ethereum-primitives" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", - "reth-chainspec", - "reth-consensus", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-eth", + "alloy-serde", "reth-primitives-traits", + "reth-zstd-compressors", + "serde", + "serde_with", ] [[package]] -name = "reth-consensus-debug-client" +name = "reth-evm" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-json-rpc", + "alloy-evm", "alloy-primitives", - "alloy-provider", - "alloy-rpc-types-engine", - "alloy-transport", "auto_impl", "derive_more", - "eyre", - "futures", - "reqwest", - "reth-node-api", + "futures-util", + "reth-execution-errors", + "reth-execution-types", "reth-primitives-traits", - "reth-tracing", - "ringbuffer", - "serde", - "serde_json", - "tokio", + "reth-storage-api", + "reth-storage-errors", + "reth-trie-common", + "revm", ] [[package]] -name = "reth-db" +name = "reth-execution-errors" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ + "alloy-evm", "alloy-primitives", - "derive_more", - "eyre", - "metrics", - "page_size", - "reth-db-api", - "reth-fs-util", - "reth-libmdbx", - "reth-metrics", - "reth-nippy-jar", - "reth-static-file-types", + "alloy-rlp", + "nybbles", "reth-storage-errors", - "reth-tracing", - "rustc-hash 2.1.1", - "strum 0.27.2", - "sysinfo", - "thiserror 2.0.17", + "thiserror", ] [[package]] -name = "reth-db-api" +name = "reth-execution-types" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", - "alloy-genesis", + "alloy-eips", + "alloy-evm", "alloy-primitives", - "bytes", "derive_more", - "metrics", - "modular-bitfield", - "parity-scale-codec", - "reth-codecs", - "reth-db-models", "reth-ethereum-primitives", - "reth-optimism-primitives", "reth-primitives-traits", - "reth-prune-types", - "reth-stages-types", - "reth-storage-errors", "reth-trie-common", - "roaring", + "revm", "serde", + "serde_with", ] [[package]] -name = "reth-db-common" +name = "reth-fs-util" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-consensus", - "alloy-genesis", - "alloy-primitives", - "boyer-moore-magiclen", - "eyre", - "reth-chainspec", - "reth-codecs", - "reth-config", - "reth-db-api", - "reth-etl", - "reth-execution-errors", - "reth-fs-util", - "reth-node-types", - "reth-primitives-traits", - "reth-provider", - "reth-stages-types", - "reth-static-file-types", - "reth-trie", - "reth-trie-db", "serde", "serde_json", - "thiserror 2.0.17", - "tracing", + "thiserror", ] [[package]] -name = "reth-db-models" +name = "reth-metrics" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-eips", - "alloy-primitives", - "bytes", - "modular-bitfield", - "reth-codecs", - "reth-primitives-traits", - "serde", + "metrics", + "metrics-derive", ] [[package]] -name = "reth-discv4" +name = "reth-net-banlist" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-primitives", - "alloy-rlp", - "discv5", - "enr", - "generic-array", - "itertools 0.14.0", - "parking_lot", - "rand 0.8.5", - "reth-ethereum-forks", - "reth-net-banlist", - "reth-net-nat", - "reth-network-peers", - "schnellru", - "secp256k1 0.30.0", - "serde", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tracing", ] [[package]] -name = "reth-discv5" +name = "reth-network-api" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ + "alloy-consensus", "alloy-primitives", - "alloy-rlp", + "alloy-rpc-types-admin", + "alloy-rpc-types-eth", + "auto_impl", "derive_more", - "discv5", "enr", "futures", - "itertools 0.14.0", - "metrics", - "rand 0.9.2", - "reth-chainspec", - "reth-ethereum-forks", - "reth-metrics", - "reth-network-peers", - "secp256k1 0.30.0", - "thiserror 2.0.17", - "tokio", - "tracing", -] - -[[package]] -name = "reth-dns-discovery" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-primitives", - "data-encoding", - "enr", - "hickory-resolver", - "linked_hash_set", - "parking_lot", + "reth-eth-wire-types", "reth-ethereum-forks", + "reth-network-p2p", "reth-network-peers", + "reth-network-types", "reth-tokio-util", - "schnellru", - "secp256k1 0.30.0", - "serde", - "serde_with", - "thiserror 2.0.17", + "thiserror", "tokio", "tokio-stream", - "tracing", ] [[package]] -name = "reth-downloaders" +name = "reth-network-p2p" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", - "alloy-rlp", + "auto_impl", + "derive_more", "futures", - "futures-util", - "itertools 0.14.0", - "metrics", - "pin-project", - "rayon", - "reth-config", "reth-consensus", - "reth-metrics", - "reth-network-p2p", + "reth-eth-wire-types", + "reth-ethereum-primitives", "reth-network-peers", + "reth-network-types", "reth-primitives-traits", - "reth-storage-api", - "reth-tasks", - "thiserror 2.0.17", + "reth-storage-errors", "tokio", - "tokio-stream", - "tokio-util", "tracing", ] [[package]] -name = "reth-ecies" +name = "reth-network-peers" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "aes", "alloy-primitives", "alloy-rlp", - "block-padding", - "byteorder", - "cipher", - "concat-kdf", - "ctr", - "digest 0.10.7", - "futures", - "generic-array", - "hmac", - "pin-project", - "rand 0.8.5", - "reth-network-peers", "secp256k1 0.30.0", - "sha2 0.10.9", - "sha3", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", - "typenum", + "serde_with", + "thiserror", + "url", ] [[package]] -name = "reth-engine-local" +name = "reth-network-types" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-consensus", - "alloy-primitives", - "alloy-rpc-types-engine", - "eyre", - "futures-util", - "op-alloy-rpc-types-engine", - "reth-chainspec", - "reth-engine-primitives", - "reth-ethereum-engine-primitives", - "reth-optimism-chainspec", - "reth-payload-builder", - "reth-payload-primitives", - "reth-provider", - "reth-transaction-pool", - "tokio", - "tokio-stream", + "alloy-eip2124", + "reth-net-banlist", + "reth-network-peers", + "serde_json", "tracing", ] [[package]] -name = "reth-engine-primitives" +name = "reth-optimism-chainspec" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ + "alloy-chains", "alloy-consensus", "alloy-eips", + "alloy-genesis", + "alloy-hardforks", "alloy-primitives", - "alloy-rpc-types-engine", - "auto_impl", - "futures", - "reth-chain-state", - "reth-errors", - "reth-ethereum-primitives", - "reth-evm", - "reth-execution-types", - "reth-payload-builder-primitives", - "reth-payload-primitives", + "derive_more", + "miniz_oxide", + "op-alloy-consensus", + "op-alloy-rpc-types", + "reth-chainspec", + "reth-ethereum-forks", + "reth-network-peers", + "reth-optimism-forks", + "reth-optimism-primitives", "reth-primitives-traits", - "reth-trie-common", "serde", - "thiserror 2.0.17", - "tokio", + "serde_json", + "thiserror", ] [[package]] -name = "reth-engine-service" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "futures", - "pin-project", - "reth-chainspec", - "reth-consensus", - "reth-engine-primitives", - "reth-engine-tree", - "reth-ethereum-primitives", - "reth-evm", - "reth-network-p2p", - "reth-node-types", - "reth-payload-builder", - "reth-provider", - "reth-prune", - "reth-stages-api", - "reth-tasks", - "thiserror 2.0.17", -] - -[[package]] -name = "reth-engine-tree" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-evm", - "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types-engine", - "derive_more", - "futures", - "metrics", - "mini-moka", - "parking_lot", - "rayon", - "reth-chain-state", - "reth-consensus", - "reth-db", - "reth-engine-primitives", - "reth-errors", - "reth-ethereum-primitives", - "reth-evm", - "reth-execution-types", - "reth-metrics", - "reth-network-p2p", - "reth-payload-builder", - "reth-payload-primitives", - "reth-primitives-traits", - "reth-provider", - "reth-prune", - "reth-revm", - "reth-stages-api", - "reth-tasks", - "reth-trie", - "reth-trie-db", - "reth-trie-parallel", - "reth-trie-sparse", - "reth-trie-sparse-parallel", - "revm", - "revm-primitives", - "schnellru", - "smallvec", - "thiserror 2.0.17", - "tokio", - "tracing", -] - -[[package]] -name = "reth-engine-util" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-rpc-types-engine", - "eyre", - "futures", - "itertools 0.14.0", - "pin-project", - "reth-chainspec", - "reth-engine-primitives", - "reth-engine-tree", - "reth-errors", - "reth-evm", - "reth-fs-util", - "reth-payload-primitives", - "reth-primitives-traits", - "reth-revm", - "reth-storage-api", - "serde", - "serde_json", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "reth-era" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "ethereum_ssz", - "ethereum_ssz_derive", - "reth-ethereum-primitives", - "snap", - "thiserror 2.0.17", -] - -[[package]] -name = "reth-era-downloader" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-primitives", - "bytes", - "eyre", - "futures-util", - "reqwest", - "reth-fs-util", - "sha2 0.10.9", - "tokio", -] - -[[package]] -name = "reth-era-utils" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-primitives", - "eyre", - "futures-util", - "reth-db-api", - "reth-era", - "reth-era-downloader", - "reth-etl", - "reth-fs-util", - "reth-primitives-traits", - "reth-provider", - "reth-stages-types", - "reth-storage-api", - "tokio", - "tracing", -] - -[[package]] -name = "reth-errors" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "reth-consensus", - "reth-execution-errors", - "reth-storage-errors", - "thiserror 2.0.17", -] - -[[package]] -name = "reth-eth-wire" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-chains", - "alloy-primitives", - "alloy-rlp", - "bytes", - "derive_more", - "futures", - "pin-project", - "reth-codecs", - "reth-ecies", - "reth-eth-wire-types", - "reth-ethereum-forks", - "reth-metrics", - "reth-network-peers", - "reth-primitives-traits", - "serde", - "snap", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", -] - -[[package]] -name = "reth-eth-wire-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-chains", - "alloy-consensus", - "alloy-eips", - "alloy-hardforks", - "alloy-primitives", - "alloy-rlp", - "bytes", - "derive_more", - "reth-chainspec", - "reth-codecs-derive", - "reth-ethereum-primitives", - "reth-primitives-traits", - "serde", - "thiserror 2.0.17", -] - -[[package]] -name = "reth-ethereum-cli" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "clap", - "eyre", - "reth-chainspec", - "reth-cli", - "reth-cli-commands", - "reth-cli-runner", - "reth-db", - "reth-node-api", - "reth-node-builder", - "reth-node-core", - "reth-node-ethereum", - "reth-node-metrics", - "reth-rpc-server-types", - "reth-tracing", - "tracing", -] - -[[package]] -name = "reth-ethereum-consensus" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "reth-chainspec", - "reth-consensus", - "reth-consensus-common", - "reth-execution-types", - "reth-primitives-traits", - "tracing", -] - -[[package]] -name = "reth-ethereum-engine-primitives" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types-engine", - "reth-engine-primitives", - "reth-ethereum-primitives", - "reth-payload-primitives", - "reth-primitives-traits", - "serde", - "sha2 0.10.9", - "thiserror 2.0.17", -] - -[[package]] -name = "reth-ethereum-forks" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-eip2124", - "alloy-hardforks", - "alloy-primitives", - "auto_impl", - "once_cell", - "rustc-hash 2.1.1", -] - -[[package]] -name = "reth-ethereum-payload-builder" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types-engine", - "reth-basic-payload-builder", - "reth-chainspec", - "reth-consensus-common", - "reth-errors", - "reth-ethereum-primitives", - "reth-evm", - "reth-evm-ethereum", - "reth-payload-builder", - "reth-payload-builder-primitives", - "reth-payload-primitives", - "reth-payload-validator", - "reth-primitives-traits", - "reth-revm", - "reth-storage-api", - "reth-transaction-pool", - "revm", - "tracing", -] - -[[package]] -name = "reth-ethereum-primitives" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types-eth", - "alloy-serde", - "modular-bitfield", - "reth-codecs", - "reth-primitives-traits", - "reth-zstd-compressors", - "serde", - "serde_with", -] - -[[package]] -name = "reth-etl" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "rayon", - "reth-db-api", - "tempfile", -] - -[[package]] -name = "reth-evm" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-evm", - "alloy-primitives", - "auto_impl", - "derive_more", - "futures-util", - "metrics", - "reth-execution-errors", - "reth-execution-types", - "reth-metrics", - "reth-primitives-traits", - "reth-storage-api", - "reth-storage-errors", - "reth-trie-common", - "revm", -] - -[[package]] -name = "reth-evm-ethereum" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-evm", - "alloy-primitives", - "alloy-rpc-types-engine", - "reth-chainspec", - "reth-ethereum-forks", - "reth-ethereum-primitives", - "reth-evm", - "reth-execution-types", - "reth-primitives-traits", - "reth-storage-errors", - "revm", -] - -[[package]] -name = "reth-execution-errors" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-evm", - "alloy-primitives", - "alloy-rlp", - "nybbles", - "reth-storage-errors", - "thiserror 2.0.17", -] - -[[package]] -name = "reth-execution-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-evm", - "alloy-primitives", - "derive_more", - "reth-ethereum-primitives", - "reth-primitives-traits", - "reth-trie-common", - "revm", - "serde", - "serde_with", -] - -[[package]] -name = "reth-exex" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "eyre", - "futures", - "itertools 0.14.0", - "metrics", - "parking_lot", - "reth-chain-state", - "reth-chainspec", - "reth-config", - "reth-ethereum-primitives", - "reth-evm", - "reth-exex-types", - "reth-fs-util", - "reth-metrics", - "reth-node-api", - "reth-node-core", - "reth-payload-builder", - "reth-primitives-traits", - "reth-provider", - "reth-prune-types", - "reth-revm", - "reth-stages-api", - "reth-tasks", - "reth-tracing", - "rmp-serde", - "thiserror 2.0.17", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "reth-exex-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-eips", - "alloy-primitives", - "reth-chain-state", - "reth-execution-types", - "reth-primitives-traits", - "serde", - "serde_with", -] - -[[package]] -name = "reth-fs-util" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "serde", - "serde_json", - "thiserror 2.0.17", -] - -[[package]] -name = "reth-invalid-block-hooks" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types-debug", - "eyre", - "futures", - "jsonrpsee 0.26.0", - "pretty_assertions", - "reth-engine-primitives", - "reth-evm", - "reth-primitives-traits", - "reth-provider", - "reth-revm", - "reth-rpc-api", - "reth-tracing", - "reth-trie", - "revm-bytecode", - "revm-database", - "serde", - "serde_json", -] - -[[package]] -name = "reth-ipc" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "bytes", - "futures", - "futures-util", - "interprocess", - "jsonrpsee 0.26.0", - "pin-project", - "serde_json", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tokio-util", - "tower 0.5.2", - "tracing", -] - -[[package]] -name = "reth-libmdbx" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "bitflags 2.9.4", - "byteorder", - "dashmap 6.1.0", - "derive_more", - "parking_lot", - "reth-mdbx-sys", - "smallvec", - "thiserror 2.0.17", - "tracing", -] - -[[package]] -name = "reth-mdbx-sys" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "bindgen 0.70.1", - "cc", -] - -[[package]] -name = "reth-metrics" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "futures", - "metrics", - "metrics-derive", - "tokio", - "tokio-util", -] - -[[package]] -name = "reth-net-banlist" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-primitives", -] - -[[package]] -name = "reth-net-nat" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "futures-util", - "if-addrs", - "reqwest", - "serde_with", - "thiserror 2.0.17", - "tokio", - "tracing", -] - -[[package]] -name = "reth-network" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "aquamarine", - "auto_impl", - "derive_more", - "discv5", - "enr", - "futures", - "itertools 0.14.0", - "metrics", - "parking_lot", - "pin-project", - "rand 0.8.5", - "rand 0.9.2", - "reth-chainspec", - "reth-consensus", - "reth-discv4", - "reth-discv5", - "reth-dns-discovery", - "reth-ecies", - "reth-eth-wire", - "reth-eth-wire-types", - "reth-ethereum-forks", - "reth-ethereum-primitives", - "reth-fs-util", - "reth-metrics", - "reth-net-banlist", - "reth-network-api", - "reth-network-p2p", - "reth-network-peers", - "reth-network-types", - "reth-primitives-traits", - "reth-storage-api", - "reth-tasks", - "reth-tokio-util", - "reth-transaction-pool", - "rustc-hash 2.1.1", - "schnellru", - "secp256k1 0.30.0", - "serde", - "smallvec", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", -] - -[[package]] -name = "reth-network-api" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-primitives", - "alloy-rpc-types-admin", - "alloy-rpc-types-eth", - "auto_impl", - "derive_more", - "enr", - "futures", - "reth-eth-wire-types", - "reth-ethereum-forks", - "reth-network-p2p", - "reth-network-peers", - "reth-network-types", - "reth-tokio-util", - "serde", - "thiserror 2.0.17", - "tokio", - "tokio-stream", -] - -[[package]] -name = "reth-network-p2p" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "auto_impl", - "derive_more", - "futures", - "reth-consensus", - "reth-eth-wire-types", - "reth-ethereum-primitives", - "reth-network-peers", - "reth-network-types", - "reth-primitives-traits", - "reth-storage-errors", - "tokio", - "tracing", -] - -[[package]] -name = "reth-network-peers" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "enr", - "secp256k1 0.30.0", - "serde_with", - "thiserror 2.0.17", - "tokio", - "url", -] - -[[package]] -name = "reth-network-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-eip2124", - "humantime-serde", - "reth-net-banlist", - "reth-network-peers", - "serde", - "serde_json", - "tracing", -] - -[[package]] -name = "reth-nippy-jar" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "anyhow", - "bincode", - "derive_more", - "lz4_flex", - "memmap2", - "reth-fs-util", - "serde", - "thiserror 2.0.17", - "tracing", - "zstd", -] - -[[package]] -name = "reth-node-api" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-rpc-types-engine", - "eyre", - "reth-basic-payload-builder", - "reth-consensus", - "reth-db-api", - "reth-engine-primitives", - "reth-evm", - "reth-network-api", - "reth-node-core", - "reth-node-types", - "reth-payload-builder", - "reth-payload-builder-primitives", - "reth-payload-primitives", - "reth-provider", - "reth-tasks", - "reth-tokio-util", - "reth-transaction-pool", -] - -[[package]] -name = "reth-node-builder" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-provider", - "alloy-rpc-types", - "alloy-rpc-types-engine", - "aquamarine", - "eyre", - "fdlimit", - "futures", - "jsonrpsee 0.26.0", - "rayon", - "reth-basic-payload-builder", - "reth-chain-state", - "reth-chainspec", - "reth-cli-util", - "reth-config", - "reth-consensus", - "reth-consensus-debug-client", - "reth-db", - "reth-db-api", - "reth-db-common", - "reth-downloaders", - "reth-engine-local", - "reth-engine-primitives", - "reth-engine-service", - "reth-engine-tree", - "reth-engine-util", - "reth-evm", - "reth-exex", - "reth-fs-util", - "reth-invalid-block-hooks", - "reth-network", - "reth-network-api", - "reth-network-p2p", - "reth-node-api", - "reth-node-core", - "reth-node-ethstats", - "reth-node-events", - "reth-node-metrics", - "reth-payload-builder", - "reth-primitives-traits", - "reth-provider", - "reth-prune", - "reth-rpc", - "reth-rpc-api", - "reth-rpc-builder", - "reth-rpc-engine-api", - "reth-rpc-eth-types", - "reth-rpc-layer", - "reth-stages", - "reth-static-file", - "reth-tasks", - "reth-tokio-util", - "reth-tracing", - "reth-transaction-pool", - "secp256k1 0.30.0", - "serde_json", - "tokio", - "tokio-stream", - "tracing", -] - -[[package]] -name = "reth-node-core" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rpc-types-engine", - "clap", - "derive_more", - "dirs-next", - "eyre", - "futures", - "humantime", - "rand 0.9.2", - "reth-chainspec", - "reth-cli-util", - "reth-config", - "reth-consensus", - "reth-db", - "reth-discv4", - "reth-discv5", - "reth-engine-local", - "reth-engine-primitives", - "reth-ethereum-forks", - "reth-net-nat", - "reth-network", - "reth-network-p2p", - "reth-network-peers", - "reth-primitives-traits", - "reth-prune-types", - "reth-rpc-convert", - "reth-rpc-eth-types", - "reth-rpc-server-types", - "reth-stages-types", - "reth-storage-api", - "reth-storage-errors", - "reth-tracing", - "reth-transaction-pool", - "secp256k1 0.30.0", - "serde", - "shellexpand", - "strum 0.27.2", - "thiserror 2.0.17", - "toml", - "tracing", - "url", - "vergen", - "vergen-git2", -] - -[[package]] -name = "reth-node-ethereum" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-eips", - "alloy-network", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", - "eyre", - "reth-chainspec", - "reth-engine-local", - "reth-engine-primitives", - "reth-ethereum-consensus", - "reth-ethereum-engine-primitives", - "reth-ethereum-payload-builder", - "reth-ethereum-primitives", - "reth-evm", - "reth-evm-ethereum", - "reth-network", - "reth-node-api", - "reth-node-builder", - "reth-payload-primitives", - "reth-primitives-traits", - "reth-provider", - "reth-revm", - "reth-rpc", - "reth-rpc-api", - "reth-rpc-builder", - "reth-rpc-eth-api", - "reth-rpc-eth-types", - "reth-rpc-server-types", - "reth-tracing", - "reth-transaction-pool", - "revm", - "tokio", -] - -[[package]] -name = "reth-node-ethstats" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-primitives", - "chrono", - "futures-util", - "reth-chain-state", - "reth-network-api", - "reth-primitives-traits", - "reth-storage-api", - "reth-transaction-pool", - "serde", - "serde_json", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tokio-tungstenite", - "tracing", - "url", -] - -[[package]] -name = "reth-node-events" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rpc-types-engine", - "derive_more", - "futures", - "humantime", - "pin-project", - "reth-engine-primitives", - "reth-network-api", - "reth-primitives-traits", - "reth-prune-types", - "reth-stages", - "reth-static-file-types", - "reth-storage-api", - "tokio", - "tracing", -] - -[[package]] -name = "reth-node-metrics" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "eyre", - "http 1.3.1", - "jsonrpsee-server 0.26.0", - "metrics", - "metrics-exporter-prometheus", - "metrics-process", - "metrics-util", - "procfs 0.17.0", - "reth-metrics", - "reth-tasks", - "tikv-jemalloc-ctl", - "tokio", - "tower 0.5.2", - "tracing", -] - -[[package]] -name = "reth-node-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "reth-chainspec", - "reth-db-api", - "reth-engine-primitives", - "reth-payload-primitives", - "reth-primitives-traits", -] - -[[package]] -name = "reth-optimism-chainspec" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-chains", - "alloy-consensus", - "alloy-eips", - "alloy-genesis", - "alloy-hardforks", - "alloy-primitives", - "derive_more", - "miniz_oxide", - "op-alloy-consensus", - "op-alloy-rpc-types", - "paste", - "reth-chainspec", - "reth-ethereum-forks", - "reth-network-peers", - "reth-optimism-forks", - "reth-optimism-primitives", - "reth-primitives-traits", - "serde", - "serde_json", - "tar-no-std", - "thiserror 2.0.17", -] - -[[package]] -name = "reth-optimism-cli" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "clap", - "derive_more", - "eyre", - "futures-util", - "op-alloy-consensus", - "reth-chainspec", - "reth-cli", - "reth-cli-commands", - "reth-cli-runner", - "reth-consensus", - "reth-db", - "reth-db-api", - "reth-db-common", - "reth-downloaders", - "reth-execution-types", - "reth-fs-util", - "reth-node-builder", - "reth-node-core", - "reth-node-events", - "reth-node-metrics", - "reth-optimism-chainspec", - "reth-optimism-consensus", - "reth-optimism-evm", - "reth-optimism-node", - "reth-optimism-primitives", - "reth-primitives-traits", - "reth-provider", - "reth-prune", - "reth-rpc-server-types", - "reth-stages", - "reth-static-file", - "reth-static-file-types", - "reth-tracing", - "serde", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "reth-optimism-consensus" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-trie", - "reth-chainspec", - "reth-consensus", - "reth-consensus-common", - "reth-execution-types", - "reth-optimism-chainspec", - "reth-optimism-forks", - "reth-optimism-primitives", - "reth-primitives-traits", - "reth-storage-api", - "reth-storage-errors", - "reth-trie-common", - "revm", - "thiserror 2.0.17", - "tracing", -] - -[[package]] -name = "reth-optimism-evm" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-evm", - "alloy-op-evm", - "alloy-primitives", - "op-alloy-consensus", - "op-alloy-rpc-types-engine", - "op-revm", - "reth-chainspec", - "reth-evm", - "reth-execution-errors", - "reth-execution-types", - "reth-optimism-chainspec", - "reth-optimism-consensus", - "reth-optimism-forks", - "reth-optimism-primitives", - "reth-primitives-traits", - "reth-rpc-eth-api", - "reth-storage-errors", - "revm", - "thiserror 2.0.17", -] - -[[package]] -name = "reth-optimism-flashblocks" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rpc-types-engine", - "alloy-serde", - "brotli", - "eyre", - "futures-util", - "reth-chain-state", - "reth-errors", - "reth-evm", - "reth-execution-types", - "reth-node-api", - "reth-optimism-evm", - "reth-optimism-payload-builder", - "reth-optimism-primitives", - "reth-primitives-traits", - "reth-revm", - "reth-rpc-eth-types", - "reth-storage-api", - "reth-tasks", - "ringbuffer", - "serde", - "serde_json", - "tokio", - "tokio-tungstenite", - "tracing", - "url", -] - -[[package]] -name = "reth-optimism-forks" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-op-hardforks", - "alloy-primitives", - "once_cell", - "reth-ethereum-forks", -] - -[[package]] -name = "reth-optimism-node" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-primitives", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", - "clap", - "eyre", - "op-alloy-consensus", - "op-alloy-rpc-types-engine", - "op-revm", - "reth-chainspec", - "reth-consensus", - "reth-engine-local", - "reth-evm", - "reth-network", - "reth-node-api", - "reth-node-builder", - "reth-node-core", - "reth-optimism-chainspec", - "reth-optimism-consensus", - "reth-optimism-evm", - "reth-optimism-forks", - "reth-optimism-payload-builder", - "reth-optimism-primitives", - "reth-optimism-rpc", - "reth-optimism-storage", - "reth-optimism-txpool", - "reth-payload-builder", - "reth-primitives-traits", - "reth-provider", - "reth-rpc-api", - "reth-rpc-engine-api", - "reth-rpc-server-types", - "reth-tracing", - "reth-transaction-pool", - "reth-trie-common", - "revm", - "serde", - "tokio", - "url", -] - -[[package]] -name = "reth-optimism-payload-builder" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types-debug", - "alloy-rpc-types-engine", - "derive_more", - "op-alloy-consensus", - "op-alloy-rpc-types-engine", - "reth-basic-payload-builder", - "reth-chain-state", - "reth-chainspec", - "reth-evm", - "reth-execution-types", - "reth-optimism-evm", - "reth-optimism-forks", - "reth-optimism-primitives", - "reth-optimism-txpool", - "reth-payload-builder", - "reth-payload-builder-primitives", - "reth-payload-primitives", - "reth-payload-util", - "reth-payload-validator", - "reth-primitives-traits", - "reth-revm", - "reth-storage-api", - "reth-transaction-pool", - "revm", - "serde", - "sha2 0.10.9", - "thiserror 2.0.17", - "tracing", -] - -[[package]] -name = "reth-optimism-primitives" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "bytes", - "modular-bitfield", - "op-alloy-consensus", - "reth-codecs", - "reth-primitives-traits", - "reth-zstd-compressors", - "serde", - "serde_with", -] - -[[package]] -name = "reth-optimism-rpc" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-primitives", - "alloy-rpc-client", - "alloy-rpc-types-debug", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", - "alloy-transport", - "alloy-transport-http", - "async-trait", - "derive_more", - "eyre", - "futures", - "jsonrpsee 0.26.0", - "jsonrpsee-core 0.26.0", - "jsonrpsee-types 0.26.0", - "metrics", - "op-alloy-consensus", - "op-alloy-network", - "op-alloy-rpc-jsonrpsee", - "op-alloy-rpc-types", - "op-alloy-rpc-types-engine", - "op-revm", - "reqwest", - "reth-chain-state", - "reth-chainspec", - "reth-evm", - "reth-metrics", - "reth-node-api", - "reth-node-builder", - "reth-optimism-evm", - "reth-optimism-flashblocks", - "reth-optimism-forks", - "reth-optimism-payload-builder", - "reth-optimism-primitives", - "reth-optimism-txpool", - "reth-primitives-traits", - "reth-rpc", - "reth-rpc-api", - "reth-rpc-convert", - "reth-rpc-engine-api", - "reth-rpc-eth-api", - "reth-rpc-eth-types", - "reth-rpc-server-types", - "reth-storage-api", - "reth-tasks", - "reth-transaction-pool", - "revm", - "serde_json", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tower 0.5.2", - "tracing", -] - -[[package]] -name = "reth-optimism-storage" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "reth-optimism-primitives", - "reth-storage-api", -] - -[[package]] -name = "reth-optimism-txpool" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-primitives", - "alloy-rpc-client", - "alloy-rpc-types-eth", - "alloy-serde", - "c-kzg", - "derive_more", - "futures-util", - "metrics", - "op-alloy-consensus", - "op-alloy-flz", - "op-alloy-rpc-types", - "op-revm", - "parking_lot", - "reth-chain-state", - "reth-chainspec", - "reth-metrics", - "reth-optimism-evm", - "reth-optimism-forks", - "reth-optimism-primitives", - "reth-primitives-traits", - "reth-storage-api", - "reth-transaction-pool", - "serde", - "thiserror 2.0.17", - "tokio", - "tracing", -] - -[[package]] -name = "reth-payload-builder" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-primitives", - "alloy-rpc-types", - "futures-util", - "metrics", - "reth-chain-state", - "reth-ethereum-engine-primitives", - "reth-metrics", - "reth-payload-builder-primitives", - "reth-payload-primitives", - "reth-primitives-traits", - "tokio", - "tokio-stream", - "tracing", -] - -[[package]] -name = "reth-payload-builder-primitives" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "pin-project", - "reth-payload-primitives", - "tokio", - "tokio-stream", - "tracing", -] - -[[package]] -name = "reth-payload-primitives" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-eips", - "alloy-primitives", - "alloy-rpc-types-engine", - "auto_impl", - "either", - "op-alloy-rpc-types-engine", - "reth-chain-state", - "reth-chainspec", - "reth-errors", - "reth-primitives-traits", - "serde", - "thiserror 2.0.17", - "tokio", -] - -[[package]] -name = "reth-payload-util" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-primitives", - "reth-transaction-pool", -] - -[[package]] -name = "reth-payload-validator" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-rpc-types-engine", - "reth-primitives-traits", -] - -[[package]] -name = "reth-primitives" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "c-kzg", - "once_cell", - "reth-ethereum-forks", - "reth-ethereum-primitives", - "reth-primitives-traits", - "reth-static-file-types", -] - -[[package]] -name = "reth-primitives-traits" +name = "reth-optimism-consensus" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-genesis", "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types-eth", "alloy-trie", - "auto_impl", - "byteorder", - "bytes", - "derive_more", - "modular-bitfield", - "once_cell", - "op-alloy-consensus", - "rayon", - "reth-codecs", - "revm-bytecode", - "revm-primitives", - "revm-state", - "secp256k1 0.30.0", - "serde", - "serde_with", - "thiserror 2.0.17", -] - -[[package]] -name = "reth-provider" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rpc-types-engine", - "dashmap 6.1.0", - "eyre", - "itertools 0.14.0", - "metrics", - "notify", - "parking_lot", - "rayon", - "reth-chain-state", - "reth-chainspec", - "reth-codecs", - "reth-db", - "reth-db-api", - "reth-errors", - "reth-ethereum-primitives", - "reth-evm", - "reth-execution-types", - "reth-fs-util", - "reth-metrics", - "reth-nippy-jar", - "reth-node-types", - "reth-primitives-traits", - "reth-prune-types", - "reth-stages-types", - "reth-static-file-types", - "reth-storage-api", - "reth-storage-errors", - "reth-trie", - "reth-trie-db", - "revm-database", - "strum 0.27.2", - "tracing", -] - -[[package]] -name = "reth-prune" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "itertools 0.14.0", - "metrics", - "rayon", "reth-chainspec", - "reth-config", - "reth-db-api", - "reth-errors", - "reth-exex-types", - "reth-metrics", - "reth-primitives-traits", - "reth-provider", - "reth-prune-types", - "reth-static-file-types", - "reth-tokio-util", - "rustc-hash 2.1.1", - "thiserror 2.0.17", - "tokio", - "tracing", -] - -[[package]] -name = "reth-prune-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-primitives", - "derive_more", - "modular-bitfield", - "reth-codecs", - "serde", - "thiserror 2.0.17", -] - -[[package]] -name = "reth-ress-protocol" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-primitives", - "alloy-rlp", - "futures", - "reth-eth-wire", - "reth-ethereum-primitives", - "reth-network", - "reth-network-api", - "reth-storage-errors", - "tokio", - "tokio-stream", - "tracing", -] - -[[package]] -name = "reth-ress-provider" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-primitives", - "eyre", - "futures", - "parking_lot", - "reth-chain-state", - "reth-errors", - "reth-ethereum-primitives", - "reth-evm", - "reth-node-api", - "reth-primitives-traits", - "reth-ress-protocol", - "reth-revm", - "reth-storage-api", - "reth-tasks", - "reth-tokio-util", - "reth-trie", - "schnellru", - "tokio", - "tracing", -] - -[[package]] -name = "reth-revm" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-primitives", + "reth-consensus", + "reth-consensus-common", + "reth-execution-types", + "reth-optimism-chainspec", + "reth-optimism-forks", + "reth-optimism-primitives", "reth-primitives-traits", "reth-storage-api", "reth-storage-errors", - "reth-trie", + "reth-trie-common", "revm", + "thiserror", + "tracing", ] [[package]] -name = "reth-rpc" +name = "reth-optimism-evm" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", - "alloy-dyn-abi", "alloy-eips", "alloy-evm", - "alloy-genesis", - "alloy-network", + "alloy-op-evm", "alloy-primitives", - "alloy-rlp", - "alloy-rpc-client", - "alloy-rpc-types", - "alloy-rpc-types-admin", - "alloy-rpc-types-beacon", - "alloy-rpc-types-debug", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", - "alloy-rpc-types-mev", - "alloy-rpc-types-trace", - "alloy-rpc-types-txpool", - "alloy-serde", - "alloy-signer", - "alloy-signer-local", - "async-trait", - "derive_more", - "dyn-clone", - "futures", - "http 1.3.1", - "http-body 1.0.1", - "hyper 1.7.0", - "itertools 0.14.0", - "jsonrpsee 0.26.0", - "jsonrpsee-types 0.26.0", - "jsonwebtoken", - "parking_lot", - "pin-project", - "reth-chain-state", + "op-alloy-consensus", + "op-alloy-rpc-types-engine", + "op-revm", "reth-chainspec", - "reth-consensus", - "reth-consensus-common", - "reth-engine-primitives", - "reth-errors", "reth-evm", - "reth-evm-ethereum", + "reth-execution-errors", "reth-execution-types", - "reth-metrics", - "reth-network-api", - "reth-network-peers", - "reth-network-types", - "reth-node-api", + "reth-optimism-chainspec", + "reth-optimism-consensus", + "reth-optimism-forks", + "reth-optimism-primitives", "reth-primitives-traits", - "reth-revm", - "reth-rpc-api", - "reth-rpc-convert", - "reth-rpc-engine-api", - "reth-rpc-eth-api", - "reth-rpc-eth-types", - "reth-rpc-server-types", - "reth-storage-api", - "reth-tasks", - "reth-transaction-pool", - "reth-trie-common", + "reth-storage-errors", "revm", - "revm-inspectors", - "revm-primitives", - "serde", - "serde_json", - "sha2 0.10.9", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tower 0.5.2", - "tracing", - "tracing-futures", + "thiserror", ] [[package]] -name = "reth-rpc-api" +name = "reth-optimism-forks" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-eips", - "alloy-genesis", - "alloy-json-rpc", + "alloy-op-hardforks", "alloy-primitives", - "alloy-rpc-types", - "alloy-rpc-types-admin", - "alloy-rpc-types-anvil", - "alloy-rpc-types-beacon", - "alloy-rpc-types-debug", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", - "alloy-rpc-types-mev", - "alloy-rpc-types-trace", - "alloy-rpc-types-txpool", - "alloy-serde", - "jsonrpsee 0.26.0", - "reth-chain-state", - "reth-engine-primitives", - "reth-network-peers", - "reth-rpc-eth-api", - "reth-trie-common", + "once_cell", + "reth-ethereum-forks", ] [[package]] -name = "reth-rpc-builder" +name = "reth-optimism-primitives" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-network", - "alloy-provider", - "dyn-clone", - "http 1.3.1", - "jsonrpsee 0.26.0", - "metrics", - "pin-project", - "reth-chain-state", - "reth-chainspec", - "reth-consensus", - "reth-evm", - "reth-ipc", - "reth-metrics", - "reth-network-api", - "reth-node-core", + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "bytes", + "op-alloy-consensus", + "reth-codecs", "reth-primitives-traits", - "reth-rpc", - "reth-rpc-api", - "reth-rpc-eth-api", - "reth-rpc-eth-types", - "reth-rpc-layer", - "reth-rpc-server-types", - "reth-storage-api", - "reth-tasks", - "reth-transaction-pool", + "reth-zstd-compressors", "serde", - "thiserror 2.0.17", - "tokio", - "tokio-util", - "tower 0.5.2", - "tower-http", - "tracing", + "serde_with", ] [[package]] -name = "reth-rpc-convert" +name = "reth-primitives-traits" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", - "alloy-json-rpc", - "alloy-network", + "alloy-eips", + "alloy-genesis", "alloy-primitives", + "alloy-rlp", "alloy-rpc-types-eth", - "alloy-signer", + "alloy-trie", "auto_impl", - "dyn-clone", - "jsonrpsee-types 0.26.0", + "bytes", + "derive_more", + "once_cell", "op-alloy-consensus", - "op-alloy-network", - "op-alloy-rpc-types", - "op-revm", - "reth-ethereum-primitives", - "reth-evm", - "reth-optimism-primitives", - "reth-primitives-traits", - "reth-storage-api", - "revm-context", - "thiserror 2.0.17", + "reth-codecs", + "revm-bytecode", + "revm-primitives", + "revm-state", + "secp256k1 0.30.0", + "serde", + "serde_with", + "thiserror", ] [[package]] -name = "reth-rpc-engine-api" +name = "reth-prune-types" +version = "1.8.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +dependencies = [ + "alloy-primitives", + "derive_more", + "serde", + "thiserror", +] + +[[package]] +name = "reth-revm" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ - "alloy-eips", "alloy-primitives", - "alloy-rpc-types-engine", - "async-trait", - "jsonrpsee-core 0.26.0", - "jsonrpsee-types 0.26.0", - "metrics", - "parking_lot", - "reth-chainspec", - "reth-engine-primitives", - "reth-metrics", - "reth-payload-builder", - "reth-payload-builder-primitives", - "reth-payload-primitives", "reth-primitives-traits", - "reth-rpc-api", "reth-storage-api", - "reth-tasks", - "reth-transaction-pool", - "serde", - "thiserror 2.0.17", - "tokio", - "tracing", + "reth-storage-errors", + "revm", ] [[package]] -name = "reth-rpc-eth-api" +name = "reth-rpc-convert" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-consensus", - "alloy-dyn-abi", - "alloy-eips", - "alloy-evm", "alloy-json-rpc", "alloy-network", "alloy-primitives", - "alloy-rlp", "alloy-rpc-types-eth", - "alloy-rpc-types-mev", - "alloy-serde", - "async-trait", + "alloy-signer", "auto_impl", "dyn-clone", - "futures", - "jsonrpsee 0.26.0", - "jsonrpsee-types 0.26.0", - "parking_lot", - "reth-chain-state", - "reth-chainspec", - "reth-errors", + "jsonrpsee-types", + "reth-ethereum-primitives", "reth-evm", - "reth-network-api", - "reth-node-api", "reth-primitives-traits", - "reth-revm", - "reth-rpc-convert", - "reth-rpc-eth-types", - "reth-rpc-server-types", - "reth-storage-api", - "reth-tasks", - "reth-transaction-pool", - "reth-trie-common", - "revm", - "revm-inspectors", - "tokio", - "tracing", + "revm-context", + "thiserror", ] [[package]] @@ -10120,135 +5487,50 @@ dependencies = [ "derive_more", "futures", "itertools 0.14.0", - "jsonrpsee-core 0.26.0", - "jsonrpsee-types 0.26.0", + "jsonrpsee-core", + "jsonrpsee-types", "metrics", "rand 0.9.2", "reqwest", "reth-chain-state", - "reth-chainspec", - "reth-errors", - "reth-ethereum-primitives", - "reth-evm", - "reth-execution-types", - "reth-metrics", - "reth-primitives-traits", - "reth-revm", - "reth-rpc-convert", - "reth-rpc-server-types", - "reth-storage-api", - "reth-tasks", - "reth-transaction-pool", - "reth-trie", - "revm", - "revm-inspectors", - "schnellru", - "serde", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tracing", -] - -[[package]] -name = "reth-rpc-layer" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-rpc-types-engine", - "http 1.3.1", - "jsonrpsee-http-client 0.26.0", - "pin-project", - "tower 0.5.2", - "tower-http", - "tracing", -] - -[[package]] -name = "reth-rpc-server-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-eips", - "alloy-primitives", - "alloy-rpc-types-engine", - "jsonrpsee-core 0.26.0", - "jsonrpsee-types 0.26.0", - "reth-errors", - "reth-network-api", - "serde", - "strum 0.27.2", -] - -[[package]] -name = "reth-stages" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "bincode", - "eyre", - "futures-util", - "itertools 0.14.0", - "num-traits", - "rayon", - "reqwest", - "reth-codecs", - "reth-config", - "reth-consensus", - "reth-db", - "reth-db-api", - "reth-era", - "reth-era-downloader", - "reth-era-utils", - "reth-etl", + "reth-chainspec", + "reth-errors", + "reth-ethereum-primitives", "reth-evm", "reth-execution-types", - "reth-exex", - "reth-fs-util", - "reth-network-p2p", + "reth-metrics", "reth-primitives-traits", - "reth-provider", - "reth-prune", - "reth-prune-types", "reth-revm", - "reth-stages-api", - "reth-static-file-types", - "reth-storage-errors", + "reth-rpc-convert", + "reth-rpc-server-types", + "reth-storage-api", + "reth-tasks", + "reth-transaction-pool", "reth-trie", - "reth-trie-db", - "thiserror 2.0.17", + "revm", + "revm-inspectors", + "schnellru", + "serde", + "thiserror", "tokio", + "tokio-stream", "tracing", ] [[package]] -name = "reth-stages-api" +name = "reth-rpc-server-types" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-eips", "alloy-primitives", - "aquamarine", - "auto_impl", - "futures-util", - "metrics", - "reth-consensus", + "alloy-rpc-types-engine", + "jsonrpsee-core", + "jsonrpsee-types", "reth-errors", - "reth-metrics", - "reth-network-p2p", - "reth-primitives-traits", - "reth-provider", - "reth-prune", - "reth-stages-types", - "reth-static-file", - "reth-static-file-types", - "reth-tokio-util", - "thiserror 2.0.17", - "tokio", - "tracing", + "reth-network-api", + "serde", + "strum", ] [[package]] @@ -10258,42 +5540,19 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e dependencies = [ "alloy-primitives", "bytes", - "modular-bitfield", - "reth-codecs", "reth-trie-common", "serde", ] -[[package]] -name = "reth-static-file" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-primitives", - "parking_lot", - "rayon", - "reth-codecs", - "reth-db-api", - "reth-primitives-traits", - "reth-provider", - "reth-prune-types", - "reth-stages-types", - "reth-static-file-types", - "reth-storage-errors", - "reth-tokio-util", - "tracing", -] - [[package]] name = "reth-static-file-types" version = "1.8.1" source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" dependencies = [ "alloy-primitives", - "clap", "derive_more", "serde", - "strum 0.27.2", + "strum", ] [[package]] @@ -10307,7 +5566,6 @@ dependencies = [ "alloy-rpc-types-engine", "auto_impl", "reth-chainspec", - "reth-db-api", "reth-db-models", "reth-ethereum-primitives", "reth-execution-types", @@ -10332,7 +5590,7 @@ dependencies = [ "reth-prune-types", "reth-static-file-types", "revm-database-interface", - "thiserror 2.0.17", + "thiserror", ] [[package]] @@ -10344,10 +5602,8 @@ dependencies = [ "dyn-clone", "futures-util", "metrics", - "pin-project", - "rayon", "reth-metrics", - "thiserror 2.0.17", + "thiserror", "tokio", "tracing", "tracing-futures", @@ -10363,21 +5619,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "reth-tracing" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "clap", - "eyre", - "rolling-file", - "tracing", - "tracing-appender", - "tracing-journald", - "tracing-logfmt", - "tracing-subscriber 0.3.20", -] - [[package]] name = "reth-transaction-pool" version = "1.8.1" @@ -10389,12 +5630,11 @@ dependencies = [ "alloy-rlp", "aquamarine", "auto_impl", - "bitflags 2.9.4", + "bitflags 2.10.0", "futures-util", "metrics", "parking_lot", "pin-project", - "rand 0.9.2", "reth-chain-state", "reth-chainspec", "reth-eth-wire-types", @@ -10407,12 +5647,12 @@ dependencies = [ "reth-tasks", "revm-interpreter", "revm-primitives", - "rustc-hash 2.1.1", + "rustc-hash", "schnellru", "serde", "serde_json", "smallvec", - "thiserror 2.0.17", + "thiserror", "tokio", "tokio-stream", "tracing", @@ -10430,9 +5670,7 @@ dependencies = [ "alloy-trie", "auto_impl", "itertools 0.14.0", - "metrics", "reth-execution-errors", - "reth-metrics", "reth-primitives-traits", "reth-stages-types", "reth-storage-errors", @@ -10458,51 +5696,12 @@ dependencies = [ "itertools 0.14.0", "nybbles", "rayon", - "reth-codecs", "reth-primitives-traits", "revm-database", "serde", "serde_with", ] -[[package]] -name = "reth-trie-db" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-primitives", - "reth-db-api", - "reth-execution-errors", - "reth-primitives-traits", - "reth-trie", - "tracing", -] - -[[package]] -name = "reth-trie-parallel" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "derive_more", - "itertools 0.14.0", - "metrics", - "rayon", - "reth-db-api", - "reth-execution-errors", - "reth-metrics", - "reth-provider", - "reth-storage-errors", - "reth-trie", - "reth-trie-common", - "reth-trie-db", - "reth-trie-sparse", - "thiserror 2.0.17", - "tokio", - "tracing", -] - [[package]] name = "reth-trie-sparse" version = "1.8.1" @@ -10512,34 +5711,13 @@ dependencies = [ "alloy-rlp", "alloy-trie", "auto_impl", - "metrics", - "rayon", "reth-execution-errors", - "reth-metrics", "reth-primitives-traits", "reth-trie-common", "smallvec", "tracing", ] -[[package]] -name = "reth-trie-sparse-parallel" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "alloy-trie", - "metrics", - "rayon", - "reth-execution-errors", - "reth-metrics", - "reth-trie-common", - "reth-trie-sparse", - "smallvec", - "tracing", -] - [[package]] name = "reth-zstd-compressors" version = "1.8.1" @@ -10678,22 +5856,20 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b329afcc0f9fd5adfa2c6349a7435a8558e82bcae203142103a9a95e2a63b6" +checksum = "de23199c4b6181a6539e4131cf7e31cde4df05e1192bcdce491c34a511241588" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", - "boa_engine", - "boa_gc", "colorchoice", "revm", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror", ] [[package]] @@ -10721,7 +5897,6 @@ dependencies = [ "ark-serialize 0.5.0", "arrayref", "aurora-engine-modexp", - "blst", "c-kzg", "cfg-if", "k256", @@ -10752,7 +5927,7 @@ version = "7.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f64fbacb86008394aaebd3454f9643b7d5a782bd251135e17c5b33da592d84d" dependencies = [ - "bitflags 2.9.4", + "bitflags 2.10.0", "revm-bytecode", "revm-primitives", "serde", @@ -10793,12 +5968,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "ringbuffer" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6368f71f205ff9c33c076d170dd56ebf68e8161c733c0caa07a7a5509ed53" - [[package]] name = "ripemd" version = "0.1.3" @@ -10808,15 +5977,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "rlimit" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a" -dependencies = [ - "libc", -] - [[package]] name = "rlp" version = "0.5.2" @@ -10827,98 +5987,6 @@ dependencies = [ "rustc-hex", ] -[[package]] -name = "rmp" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "roaring" -version = "0.10.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e8d2cfa184d94d0726d650a9f4a1be7f9b76ac9fdb954219878dc00c1c1e7b" -dependencies = [ - "bytemuck", - "byteorder", -] - -[[package]] -name = "rolling-file" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8395b4f860856b740f20a296ea2cd4d823e81a2658cf05ef61be22916026a906" -dependencies = [ - "chrono", -] - -[[package]] -name = "rollup-boost" -version = "0.1.0" -source = "git+http://github.com/flashbots/rollup-boost?tag=rollup-boost%2Fv0.7.5#b86af43969557bee18f17ec1d6bcd3e984f910b2" -dependencies = [ - "alloy-primitives", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", - "alloy-serde", - "clap", - "dashmap 6.1.0", - "dotenvy", - "eyre", - "futures", - "http 1.3.1", - "http-body-util", - "hyper 1.7.0", - "hyper-rustls 0.27.7", - "hyper-util", - "jsonrpsee 0.25.1", - "metrics", - "metrics-derive", - "metrics-exporter-prometheus", - "metrics-util", - "moka", - "op-alloy-rpc-types-engine", - "opentelemetry", - "opentelemetry-otlp", - "opentelemetry_sdk", - "parking_lot", - "paste", - "reth-optimism-payload-builder", - "rustls 0.23.31", - "serde", - "serde_json", - "sha2 0.10.9", - "testcontainers", - "thiserror 2.0.17", - "tokio", - "tokio-tungstenite", - "tokio-util", - "tower 0.5.2", - "tower-http", - "tracing", - "tracing-opentelemetry", - "tracing-subscriber 0.3.20", - "url", - "vergen", - "vergen-git2", -] - [[package]] name = "route-recognizer" version = "0.3.1" @@ -10991,18 +6059,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" -[[package]] -name = "rustc-demangle" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hash" version = "2.1.1" @@ -11036,30 +6092,17 @@ dependencies = [ "semver 1.0.27", ] -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags 2.9.4", - "errno", - "libc", - "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", -] - [[package]] name = "rustix" version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ - "bitflags 2.9.4", + "bitflags 2.10.0", "errno", "libc", - "linux-raw-sys 0.11.0", - "windows-sys 0.61.1", + "linux-raw-sys", + "windows-sys 0.61.2", ] [[package]] @@ -11076,16 +6119,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.31" +version = "0.23.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc" +checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7" dependencies = [ "aws-lc-rs", - "log", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.4", + "rustls-webpki 0.103.7", "subtle", "zeroize", ] @@ -11104,9 +6146,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" +checksum = "9980d917ebb0c0536119ba501e90834767bffc3d60641457fd84a1f3fd337923" dependencies = [ "openssl-probe", "rustls-pki-types", @@ -11142,33 +6184,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-platform-verifier" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1" -dependencies = [ - "core-foundation 0.10.1", - "core-foundation-sys", - "jni", - "log", - "once_cell", - "rustls 0.23.31", - "rustls-native-certs 0.8.1", - "rustls-platform-verifier-android", - "rustls-webpki 0.103.4", - "security-framework 3.5.1", - "security-framework-sys", - "webpki-root-certs 0.26.11", - "windows-sys 0.59.0", -] - -[[package]] -name = "rustls-platform-verifier-android" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" - [[package]] name = "rustls-webpki" version = "0.101.7" @@ -11181,9 +6196,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.4" +version = "0.103.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" +checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf" dependencies = [ "aws-lc-rs", "ring", @@ -11215,28 +6230,13 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" -[[package]] -name = "ryu-js" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd29631678d6fb0903b69223673e122c32e9ae559d0960a38d574695ebc0ea15" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "schannel" version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" dependencies = [ - "windows-sys 0.61.1", + "windows-sys 0.61.2", ] [[package]] @@ -11366,7 +6366,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.9.4", + "bitflags 2.10.0", "core-foundation 0.9.4", "core-foundation-sys", "libc", @@ -11379,7 +6379,7 @@ version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" dependencies = [ - "bitflags 2.9.4", + "bitflags 2.10.0", "core-foundation 0.10.1", "core-foundation-sys", "libc", @@ -11410,10 +6410,6 @@ name = "semver" version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" -dependencies = [ - "serde", - "serde_core", -] [[package]] name = "semver-parser" @@ -11424,18 +6420,6 @@ dependencies = [ "pest", ] -[[package]] -name = "send_wrapper" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" - -[[package]] -name = "send_wrapper" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" - [[package]] name = "serde" version = "1.0.228" @@ -11463,7 +6447,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -11472,7 +6456,7 @@ version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.12.0", "itoa", "memchr", "ryu", @@ -11488,16 +6472,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", -] - -[[package]] -name = "serde_spanned" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" -dependencies = [ - "serde", + "syn 2.0.108", ] [[package]] @@ -11514,15 +6489,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.15.0" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093cd8c01b25262b84927e0f7151692158fab02d961e04c979d3903eba7ecc5" +checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.11.4", + "indexmap 2.12.0", "schemars 0.9.0", "schemars 1.0.4", "serde_core", @@ -11533,14 +6508,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.15.0" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e6c180db0816026a61afa1cff5344fb7ebded7e4d3062772179f2501481c27" +checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955" dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -11617,42 +6592,12 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shellexpand" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb" -dependencies = [ - "dirs", -] - [[package]] name = "shlex" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "signal-hook" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - [[package]] name = "signal-hook-registry" version = "1.4.6" @@ -11682,51 +6627,12 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simple_asn1" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror 2.0.17", - "time", -] - [[package]] name = "siphasher" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" -[[package]] -name = "skeptic" -version = "0.13.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" -dependencies = [ - "bytecount", - "cargo_metadata 0.14.2", - "error-chain", - "glob", - "pulldown-cmark", - "tempfile", - "walkdir", -] - -[[package]] -name = "sketches-ddsketch" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a" - [[package]] name = "slab" version = "0.4.11" @@ -11760,12 +6666,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -11813,12 +6719,6 @@ dependencies = [ "der 0.7.10", ] -[[package]] -name = "sptr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" - [[package]] name = "sqlx" version = "0.8.6" @@ -11850,8 +6750,8 @@ dependencies = [ "futures-io", "futures-util", "hashbrown 0.15.5", - "hashlink 0.10.0", - "indexmap 2.11.4", + "hashlink", + "indexmap 2.12.0", "log", "memchr", "native-tls", @@ -11861,7 +6761,7 @@ dependencies = [ "serde_json", "sha2 0.10.9", "smallvec", - "thiserror 2.0.17", + "thiserror", "tokio", "tokio-stream", "tracing", @@ -11879,7 +6779,7 @@ dependencies = [ "quote", "sqlx-core", "sqlx-macros-core", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -11902,7 +6802,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 2.0.106", + "syn 2.0.108", "tokio", "url", ] @@ -11915,7 +6815,7 @@ checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" dependencies = [ "atoi", "base64 0.22.1", - "bitflags 2.9.4", + "bitflags 2.10.0", "byteorder", "bytes", "chrono", @@ -11945,7 +6845,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.17", + "thiserror", "tracing", "uuid", "whoami", @@ -11959,7 +6859,7 @@ checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46" dependencies = [ "atoi", "base64 0.22.1", - "bitflags 2.9.4", + "bitflags 2.10.0", "byteorder", "chrono", "crc", @@ -11984,7 +6884,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.17", + "thiserror", "tracing", "uuid", "whoami", @@ -12010,7 +6910,7 @@ dependencies = [ "serde", "serde_urlencoded", "sqlx-core", - "thiserror 2.0.17", + "thiserror", "tracing", "url", "uuid", @@ -12018,9 +6918,9 @@ dependencies = [ [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "static_assertions" @@ -12054,7 +6954,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -12065,16 +6965,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", -] - -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros 0.26.4", + "syn 2.0.108", ] [[package]] @@ -12083,20 +6974,7 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" dependencies = [ - "strum_macros 0.27.2", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.106", + "strum_macros", ] [[package]] @@ -12108,7 +6986,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -12130,9 +7008,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.106" +version = "2.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" +checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" dependencies = [ "proc-macro2", "quote", @@ -12141,14 +7019,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2375c17f6067adc651d8c2c51658019cef32edfff4a982adaf1d7fd1c039f08b" +checksum = "ff790eb176cc81bb8936aed0f7b9f14fc4670069a2d371b3e3b0ecce908b2cb3" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -12168,77 +7046,15 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", -] - -[[package]] -name = "sysinfo" -version = "0.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01" -dependencies = [ - "core-foundation-sys", - "libc", - "memchr", - "ntapi", - "windows 0.57.0", -] - -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags 2.9.4", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", + "syn 2.0.108", ] -[[package]] -name = "tagptr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" - [[package]] name = "tap" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "tar" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tar-no-std" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac9ee8b664c9f1740cd813fea422116f8ba29997bb7c878d1940424889802897" -dependencies = [ - "bitflags 2.9.4", - "log", - "num-traits", -] - [[package]] name = "tempfile" version = "3.23.0" @@ -12246,10 +7062,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ "fastrand", - "getrandom 0.3.3", + "getrandom 0.3.4", "once_cell", - "rustix 1.1.2", - "windows-sys 0.61.1", + "rustix", + "windows-sys 0.61.2", ] [[package]] @@ -12273,7 +7089,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror 2.0.17", + "thiserror", "tokio", "tokio-stream", "tokio-tar", @@ -12290,39 +7106,13 @@ dependencies = [ "testcontainers", ] -[[package]] -name = "thin-vec" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d" - -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - [[package]] name = "thiserror" version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.17", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", + "thiserror-impl", ] [[package]] @@ -12333,7 +7123,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -12354,37 +7144,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "tikv-jemalloc-ctl" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21f216790c8df74ce3ab25b534e0718da5a1916719771d3fec23315c99e468b" -dependencies = [ - "libc", - "paste", - "tikv-jemalloc-sys", -] - -[[package]] -name = "tikv-jemalloc-sys" -version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - [[package]] name = "time" version = "0.3.44" @@ -12393,10 +7152,7 @@ checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ "deranged", "itoa", - "js-sys", - "libc", "num-conv", - "num_threads", "powerfmt", "serde", "time-core", @@ -12428,16 +7184,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "zerovec 0.10.4", -] - [[package]] name = "tinystr" version = "0.8.1" @@ -12445,7 +7191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ "displaydoc", - "zerovec 0.11.4", + "zerovec", ] [[package]] @@ -12506,23 +7252,6 @@ dependencies = [ "sqlx", ] -[[package]] -name = "tips-datastore" -version = "0.1.0" -dependencies = [ - "alloy-primitives", - "alloy-rpc-types-mev", - "anyhow", - "async-trait", - "sqlx", - "testcontainers", - "testcontainers-modules", - "tips-common", - "tokio", - "tracing", - "uuid", -] - [[package]] name = "tips-ingress-rpc" version = "0.1.0" @@ -12537,7 +7266,7 @@ dependencies = [ "backon", "clap", "dotenvy", - "jsonrpsee 0.26.0", + "jsonrpsee", "op-alloy-consensus", "op-alloy-network", "op-revm", @@ -12553,81 +7282,32 @@ dependencies = [ "url", ] -[[package]] -name = "tips-ingress-writer" -version = "0.1.0" -dependencies = [ - "anyhow", - "backon", - "clap", - "dotenvy", - "rdkafka", - "serde_json", - "tips-audit", - "tips-common", - "tips-datastore", - "tokio", - "tracing", - "tracing-subscriber 0.3.20", - "uuid", -] - -[[package]] -name = "tips-maintenance" -version = "0.1.0" -dependencies = [ - "alloy-primitives", - "alloy-provider", - "alloy-rpc-types", - "alloy-rpc-types-mev", - "anyhow", - "base-reth-flashblocks-rpc", - "clap", - "dotenvy", - "op-alloy-consensus", - "op-alloy-network", - "op-alloy-rpc-types", - "rdkafka", - "sqlx", - "tips-audit", - "tips-common", - "tips-datastore", - "tokio", - "tracing", - "tracing-subscriber 0.3.20", - "url", - "uuid", -] - [[package]] name = "tokio" -version = "1.47.1" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "backtrace", "bytes", - "io-uring", "libc", "mio", "parking_lot", "pin-project-lite", "signal-hook-registry", - "slab", - "socket2 0.6.0", + "socket2 0.6.1", "tokio-macros", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -12656,7 +7336,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ - "rustls 0.23.31", + "rustls 0.23.34", "tokio", ] @@ -12687,25 +7367,6 @@ dependencies = [ "xattr", ] -[[package]] -name = "tokio-tungstenite" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084" -dependencies = [ - "futures-util", - "log", - "native-tls", - "rustls 0.23.31", - "rustls-native-certs 0.8.1", - "rustls-pki-types", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.26.4", - "tungstenite", - "webpki-roots 0.26.11", -] - [[package]] name = "tokio-util" version = "0.7.16" @@ -12716,132 +7377,40 @@ dependencies = [ "futures-core", "futures-io", "futures-sink", - "pin-project-lite", - "slab", - "tokio", -] - -[[package]] -name = "toml" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime 0.6.11", - "toml_edit 0.22.27", -] - -[[package]] -name = "toml_datetime" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_datetime" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1" -dependencies = [ - "serde_core", + "pin-project-lite", + "tokio", ] [[package]] -name = "toml_edit" -version = "0.22.27" +name = "toml_datetime" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" dependencies = [ - "indexmap 2.11.4", - "serde", - "serde_spanned", - "toml_datetime 0.6.11", - "toml_write", - "winnow", + "serde_core", ] [[package]] name = "toml_edit" -version = "0.23.6" +version = "0.23.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3effe7c0e86fdff4f69cdd2ccc1b96f933e24811c5441d44904e8683e27184b" +checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" dependencies = [ - "indexmap 2.11.4", - "toml_datetime 0.7.2", + "indexmap 2.12.0", + "toml_datetime", "toml_parser", "winnow", ] [[package]] name = "toml_parser" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627" +checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" dependencies = [ "winnow", ] -[[package]] -name = "toml_write" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" - -[[package]] -name = "tonic" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.22.1", - "bytes", - "h2 0.4.12", - "http 1.3.1", - "http-body 1.0.1", - "http-body-util", - "hyper 1.7.0", - "hyper-timeout", - "hyper-util", - "percent-encoding", - "pin-project", - "prost", - "socket2 0.5.10", - "tokio", - "tokio-stream", - "tower 0.4.13", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand 0.8.5", - "slab", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower" version = "0.5.2" @@ -12850,16 +7419,11 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", - "hdrhistogram", - "indexmap 2.11.4", "pin-project-lite", - "slab", "sync_wrapper", "tokio", - "tokio-util", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -12868,29 +7432,16 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" dependencies = [ - "async-compression", - "base64 0.22.1", - "bitflags 2.9.4", + "bitflags 2.10.0", "bytes", - "futures-core", "futures-util", "http 1.3.1", "http-body 1.0.1", - "http-body-util", - "http-range-header", - "httpdate", "iri-string", - "mime", - "mime_guess", - "percent-encoding", "pin-project-lite", - "tokio", - "tokio-util", - "tower 0.5.2", + "tower", "tower-layer", "tower-service", - "tracing", - "uuid", ] [[package]] @@ -12917,18 +7468,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-appender" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" -dependencies = [ - "crossbeam-channel", - "thiserror 1.0.69", - "time", - "tracing-subscriber 0.3.20", -] - [[package]] name = "tracing-attributes" version = "0.1.30" @@ -12937,7 +7476,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -12960,17 +7499,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tracing-journald" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0b4143302cf1022dac868d521e36e8b27691f72c84b3311750d5188ebba657" -dependencies = [ - "libc", - "tracing-core", - "tracing-subscriber 0.3.20", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -12982,46 +7510,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-logfmt" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1f47d22deb79c3f59fcf2a1f00f60cbdc05462bf17d1cd356c1fefa3f444bd" -dependencies = [ - "time", - "tracing", - "tracing-core", - "tracing-subscriber 0.3.20", -] - -[[package]] -name = "tracing-opentelemetry" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721f2d2569dce9f3dfbbddee5906941e953bfcdf736a62da3377f5751650cc36" -dependencies = [ - "js-sys", - "once_cell", - "opentelemetry", - "opentelemetry_sdk", - "smallvec", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber 0.3.20", - "web-time", -] - -[[package]] -name = "tracing-serde" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" -dependencies = [ - "serde", - "tracing-core", -] - [[package]] name = "tracing-subscriber" version = "0.2.25" @@ -13041,74 +7529,20 @@ dependencies = [ "nu-ansi-term", "once_cell", "regex-automata", - "serde", - "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log", - "tracing-serde", -] - -[[package]] -name = "tree_hash" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee44f4cef85f88b4dea21c0b1f58320bdf35715cf56d840969487cff00613321" -dependencies = [ - "alloy-primitives", - "ethereum_hashing", - "ethereum_ssz", - "smallvec", - "typenum", -] - -[[package]] -name = "tree_hash_derive" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bee2ea1551f90040ab0e34b6fb7f2fa3bad8acc925837ac654f2c78a13e3089" -dependencies = [ - "darling 0.20.11", - "proc-macro2", - "quote", - "syn 2.0.106", ] -[[package]] -name = "triomphe" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" - [[package]] name = "try-lock" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "tungstenite" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" -dependencies = [ - "bytes", - "data-encoding", - "http 1.3.1", - "httparse", - "log", - "native-tls", - "rand 0.9.2", - "rustls 0.23.31", - "rustls-pki-types", - "sha1", - "thiserror 2.0.17", - "utf-8", -] - [[package]] name = "typenum" version = "1.19.0" @@ -13133,30 +7567,12 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "uint" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909988d098b2f738727b161a106cfc7cab00c539c2687a8836f8e565976fb53e" -dependencies = [ - "byteorder", - "crunchy", - "hex", - "static_assertions", -] - [[package]] name = "unarray" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" -[[package]] -name = "unicase" -version = "2.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" - [[package]] name = "unicode-bidi" version = "0.3.18" @@ -13165,9 +7581,9 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" +checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06" [[package]] name = "unicode-normalization" @@ -13190,51 +7606,12 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" -[[package]] -name = "unicode-truncate" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" -dependencies = [ - "itertools 0.13.0", - "unicode-segmentation", - "unicode-width 0.1.14", -] - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unicode-width" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" - [[package]] name = "unicode-xid" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - -[[package]] -name = "unsigned-varint" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" - [[package]] name = "untrusted" version = "0.9.0" @@ -13259,18 +7636,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -13289,7 +7654,7 @@ version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "js-sys", "serde", "wasm-bindgen", @@ -13307,47 +7672,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vergen" -version = "9.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b2bf58be11fc9414104c6d3a2e464163db5ef74b12296bda593cac37b6e4777" -dependencies = [ - "anyhow", - "cargo_metadata 0.19.2", - "derive_builder", - "regex", - "rustversion", - "time", - "vergen-lib", -] - -[[package]] -name = "vergen-git2" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6ee511ec45098eabade8a0750e76eec671e7fb2d9360c563911336bea9cac1" -dependencies = [ - "anyhow", - "derive_builder", - "git2", - "rustversion", - "time", - "vergen", - "vergen-lib", -] - -[[package]] -name = "vergen-lib" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b07e6010c0f3e59fcb164e0163834597da68d1f864e2b8ca49f74de01e9c166" -dependencies = [ - "anyhow", - "derive_builder", - "rustversion", -] - [[package]] name = "version_check" version = "0.9.5" @@ -13369,16 +7693,6 @@ dependencies = [ "libc", ] -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "want" version = "0.3.1" @@ -13394,15 +7708,6 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" -[[package]] -name = "wasi" -version = "0.14.7+wasi-0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" -dependencies = [ - "wasip2", -] - [[package]] name = "wasip2" version = "1.0.1+wasi-0.2.4" @@ -13441,7 +7746,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", "wasm-bindgen-shared", ] @@ -13476,7 +7781,7 @@ checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -13486,21 +7791,8 @@ name = "wasm-bindgen-shared" version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "wasm-streams" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", +dependencies = [ + "unicode-ident", ] [[package]] @@ -13537,54 +7829,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-root-certs" -version = "0.26.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e" -dependencies = [ - "webpki-root-certs 1.0.2", -] - -[[package]] -name = "webpki-root-certs" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4ffd8df1c57e87c325000a3d6ef93db75279dc3a231125aac571650f22b12a" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "webpki-roots" -version = "0.26.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" -dependencies = [ - "webpki-roots 1.0.2", -] - -[[package]] -name = "webpki-roots" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.44", -] - [[package]] name = "whoami" version = "1.6.1" @@ -13595,12 +7839,6 @@ dependencies = [ "wasite", ] -[[package]] -name = "widestring" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d" - [[package]] name = "winapi" version = "0.3.9" @@ -13617,217 +7855,69 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" -dependencies = [ - "windows-sys 0.61.1", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" -dependencies = [ - "windows-core 0.57.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows" -version = "0.62.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e6c4a1f363c8210c6f77ba24f645c61c6fb941eccf013da691f7e09515b8ac" -dependencies = [ - "windows-collections", - "windows-core 0.62.1", - "windows-future", - "windows-numerics", -] - -[[package]] -name = "windows-collections" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123e712f464a8a60ce1a13f4c446d2d43ab06464cb5842ff68f5c71b6fb7852e" -dependencies = [ - "windows-core 0.62.1", -] - -[[package]] -name = "windows-core" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" -dependencies = [ - "windows-implement 0.57.0", - "windows-interface 0.57.0", - "windows-result 0.1.2", - "windows-targets 0.52.6", -] - [[package]] name = "windows-core" -version = "0.62.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9" -dependencies = [ - "windows-implement 0.60.1", - "windows-interface 0.59.2", - "windows-link 0.2.0", - "windows-result 0.4.0", - "windows-strings 0.5.0", -] - -[[package]] -name = "windows-future" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f3db6b24b120200d649cd4811b4947188ed3a8d2626f7075146c5d178a9a4a" -dependencies = [ - "windows-core 0.62.1", - "windows-link 0.2.0", - "windows-threading", -] - -[[package]] -name = "windows-implement" -version = "0.57.0" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", ] [[package]] name = "windows-implement" -version = "0.60.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb307e42a74fb6de9bf3a02d9712678b22399c87e6fa869d6dfcd8c1b7754e0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "windows-interface" -version = "0.57.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] name = "windows-interface" -version = "0.59.2" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0abd1ddbc6964ac14db11c7213d6532ef34bd9aa042c2e5935f59d7908b46a5" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - -[[package]] -name = "windows-link" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" - -[[package]] -name = "windows-numerics" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ce3498fe0aba81e62e477408383196b4b0363db5e0c27646f932676283b43d8" -dependencies = [ - "windows-core 0.62.1", - "windows-link 0.2.0", -] - -[[package]] -name = "windows-registry" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" -dependencies = [ - "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", -] - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.3.4" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" -dependencies = [ - "windows-link 0.1.3", -] +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-result" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" -dependencies = [ - "windows-link 0.2.0", -] - -[[package]] -name = "windows-strings" -version = "0.4.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link 0.1.3", + "windows-link", ] [[package]] name = "windows-strings" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" -dependencies = [ - "windows-link 0.2.0", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-targets 0.42.2", + "windows-link", ] [[package]] @@ -13848,46 +7938,22 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-sys" version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.4", + "windows-targets 0.53.5", ] [[package]] name = "windows-sys" -version = "0.61.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f" -dependencies = [ - "windows-link 0.2.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-link", ] [[package]] @@ -13923,36 +7989,21 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b" -dependencies = [ - "windows-link 0.2.0", - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", -] - -[[package]] -name = "windows-threading" -version = "0.2.0" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab47f085ad6932defa48855254c758cdd0e2f2d48e62a34118a268d8f345e118" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows-link 0.2.0", + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -13967,15 +8018,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" @@ -13991,15 +8036,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_aarch64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" @@ -14015,9 +8054,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" [[package]] name = "windows_i686_gnullvm" @@ -14027,15 +8066,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" @@ -14051,15 +8084,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_i686_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" @@ -14075,15 +8102,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" @@ -14099,15 +8120,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" @@ -14123,9 +8138,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "windows_x86_64_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" @@ -14136,59 +8151,18 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "wit-bindgen" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - [[package]] name = "writeable" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" -[[package]] -name = "ws_stream_wasm" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c173014acad22e83f16403ee360115b38846fe754e735c5d9d3803fe70c6abc" -dependencies = [ - "async_io_stream", - "futures", - "js-sys", - "log", - "pharos", - "rustc_version 0.4.1", - "send_wrapper 0.6.0", - "thiserror 2.0.17", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "wyz" version = "0.5.1" @@ -14205,7 +8179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", - "rustix 1.1.2", + "rustix", ] [[package]] @@ -14214,24 +8188,6 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" -[[package]] -name = "yansi" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" - -[[package]] -name = "yoke" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive 0.7.5", - "zerofrom", -] - [[package]] name = "yoke" version = "0.8.0" @@ -14240,22 +8196,10 @@ checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" dependencies = [ "serde", "stable_deref_trait", - "yoke-derive 0.8.0", + "yoke-derive", "zerofrom", ] -[[package]] -name = "yoke-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", - "synstructure", -] - [[package]] name = "yoke-derive" version = "0.8.0" @@ -14264,7 +8208,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", "synstructure", ] @@ -14285,7 +8229,7 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -14305,7 +8249,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", "synstructure", ] @@ -14326,7 +8270,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -14336,19 +8280,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" dependencies = [ "displaydoc", - "yoke 0.8.0", - "zerofrom", -] - -[[package]] -name = "zerovec" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" -dependencies = [ - "yoke 0.7.5", + "yoke", "zerofrom", - "zerovec-derive 0.10.3", ] [[package]] @@ -14357,20 +8290,9 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" dependencies = [ - "yoke 0.8.0", + "yoke", "zerofrom", - "zerovec-derive 0.11.1", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", + "zerovec-derive", ] [[package]] @@ -14381,7 +8303,7 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index fd631ba..5b0f610 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,15 +7,12 @@ homepage = "https://github.com/base/tips" repository = "https://github.com/base/tips" [workspace] -members = ["crates/datastore", "crates/audit", "crates/ingress-rpc", "crates/maintenance", "crates/ingress-writer", "crates/common"] +members = ["crates/audit", "crates/ingress-rpc", "crates/common"] resolver = "2" [workspace.dependencies] -tips-datastore = { path = "crates/datastore" } -tips-audit = { path = "crates/audit" } -tips-maintenance = { path = "crates/maintenance" } -tips-ingress-writer = { path = "crates/ingress-writer" } tips-common = { path = "crates/common" } +tips-audit = { path = "crates/audit" } # Reth reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" } diff --git a/Dockerfile b/Dockerfile index 6ef4440..366b286 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,9 +22,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ --mount=type=cache,target=/usr/local/cargo/git \ --mount=type=cache,target=/app/target \ cargo build && \ - cp target/debug/tips-maintenance /tmp/tips-maintenance && \ cp target/debug/tips-ingress-rpc /tmp/tips-ingress-rpc && \ - cp target/debug/tips-ingress-writer /tmp/tips-ingress-writer && \ cp target/debug/tips-audit /tmp/tips-audit FROM debian:bookworm @@ -33,7 +31,5 @@ RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/ WORKDIR /app -COPY --from=builder /tmp/tips-maintenance /app/tips-maintenance COPY --from=builder /tmp/tips-audit /app/tips-audit -COPY --from=builder /tmp/tips-ingress-rpc /app/tips-ingress-rpc -COPY --from=builder /tmp/tips-ingress-writer /app/tips-ingress-writer \ No newline at end of file +COPY --from=builder /tmp/tips-ingress-rpc /app/tips-ingress-rpc \ No newline at end of file diff --git a/README.md b/README.md index 0bc1969..a4363b3 100644 --- a/README.md +++ b/README.md @@ -22,11 +22,5 @@ Event streaming and archival system that: ### 🔌 Ingress RPC (`crates/ingress-rpc`) The main entry point that provides a JSON-RPC API for receiving transactions and bundles. -### 🔨 Maintenance (`crates/maintenance`) -A service that maintains the health of the TIPS DataStore, by removing stale or included bundles. - -### ✍️ Ingress Writer (`crates/ingress-writer`) -A service that consumes bundles from Kafka and persists them to the datastore. - ### 🖥️ UI (`ui`) A debug UI for viewing the state of the bundle store and S3. diff --git a/crates/audit/src/storage.rs b/crates/audit/src/storage.rs index 8cea6e0..bb69618 100644 --- a/crates/audit/src/storage.rs +++ b/crates/audit/src/storage.rs @@ -57,12 +57,6 @@ pub enum BundleHistoryEvent { block_number: u64, flashblock_index: u64, }, - FlashblockIncluded { - key: String, - timestamp: i64, - block_number: u64, - flashblock_index: u64, - }, BlockIncluded { key: String, timestamp: i64, @@ -83,7 +77,6 @@ impl BundleHistoryEvent { BundleHistoryEvent::Updated { key, .. } => key, BundleHistoryEvent::Cancelled { key, .. } => key, BundleHistoryEvent::BuilderIncluded { key, .. } => key, - BundleHistoryEvent::FlashblockIncluded { key, .. } => key, BundleHistoryEvent::BlockIncluded { key, .. } => key, BundleHistoryEvent::Dropped { key, .. } => key, } @@ -139,16 +132,6 @@ fn update_bundle_history_transform( block_number: *block_number, flashblock_index: *flashblock_index, }, - BundleEvent::FlashblockIncluded { - block_number, - flashblock_index, - .. - } => BundleHistoryEvent::FlashblockIncluded { - key: event.key.clone(), - timestamp: event.timestamp, - block_number: *block_number, - flashblock_index: *flashblock_index, - }, BundleEvent::BlockIncluded { block_number, block_hash, @@ -465,7 +448,6 @@ mod tests { let bundle_history = BundleHistory { history: vec![] }; let bundle_id = Uuid::new_v4(); - // Test Created let bundle = create_test_bundle(); let bundle_event = BundleEvent::Created { bundle_id, @@ -475,7 +457,6 @@ mod tests { let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); - // Test Updated let bundle_event = BundleEvent::Updated { bundle_id, bundle: bundle.clone(), @@ -484,13 +465,11 @@ mod tests { let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); - // Test Cancelled let bundle_event = BundleEvent::Cancelled { bundle_id }; let event = create_test_event("test-key-3", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); - // Test BuilderIncluded let bundle_event = BundleEvent::BuilderIncluded { bundle_id, builder: "test-builder".to_string(), @@ -501,17 +480,6 @@ mod tests { let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); - // Test FlashblockIncluded - let bundle_event = BundleEvent::FlashblockIncluded { - bundle_id, - block_number: 12345, - flashblock_index: 1, - }; - let event = create_test_event("test-key-5", 1234567890, bundle_event); - let result = update_bundle_history_transform(bundle_history.clone(), &event); - assert!(result.is_some()); - - // Test BlockIncluded let bundle_event = BundleEvent::BlockIncluded { bundle_id, block_number: 12345, @@ -521,7 +489,6 @@ mod tests { let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); - // Test Dropped let bundle_event = BundleEvent::Dropped { bundle_id, reason: DropReason::TimedOut, diff --git a/crates/audit/src/types.rs b/crates/audit/src/types.rs index 74866ef..70f96ac 100644 --- a/crates/audit/src/types.rs +++ b/crates/audit/src/types.rs @@ -54,11 +54,6 @@ pub enum BundleEvent { block_number: u64, flashblock_index: u64, }, - FlashblockIncluded { - bundle_id: BundleId, - block_number: u64, - flashblock_index: u64, - }, BlockIncluded { bundle_id: BundleId, block_number: u64, @@ -77,7 +72,6 @@ impl BundleEvent { BundleEvent::Updated { bundle_id, .. } => *bundle_id, BundleEvent::Cancelled { bundle_id, .. } => *bundle_id, BundleEvent::BuilderIncluded { bundle_id, .. } => *bundle_id, - BundleEvent::FlashblockIncluded { bundle_id, .. } => *bundle_id, BundleEvent::BlockIncluded { bundle_id, .. } => *bundle_id, BundleEvent::Dropped { bundle_id, .. } => *bundle_id, } @@ -108,7 +102,6 @@ impl BundleEvent { } BundleEvent::Cancelled { .. } => vec![], BundleEvent::BuilderIncluded { .. } => vec![], - BundleEvent::FlashblockIncluded { .. } => vec![], BundleEvent::BlockIncluded { .. } => vec![], BundleEvent::Dropped { .. } => vec![], } @@ -123,14 +116,6 @@ impl BundleEvent { } => { format!("{bundle_id}-{block_hash}") } - BundleEvent::FlashblockIncluded { - bundle_id, - block_number, - flashblock_index, - .. - } => { - format!("{bundle_id}-{block_number}-{flashblock_index}") - } _ => { format!("{}-{}", self.bundle_id(), Uuid::new_v4()) } diff --git a/crates/datastore/Cargo.toml b/crates/datastore/Cargo.toml deleted file mode 100644 index 4687a3f..0000000 --- a/crates/datastore/Cargo.toml +++ /dev/null @@ -1,23 +0,0 @@ -[package] -name = "tips-datastore" -version.workspace = true -rust-version.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true -edition.workspace = true - -[dependencies] -sqlx.workspace = true -uuid.workspace = true -tokio.workspace = true -anyhow.workspace = true -async-trait.workspace = true -alloy-rpc-types-mev.workspace = true -alloy-primitives.workspace = true -tracing.workspace = true -tips-common.workspace = true - -[dev-dependencies] -testcontainers.workspace = true -testcontainers-modules.workspace = true diff --git a/crates/datastore/migrations/1757444171_create_bundles_table.sql b/crates/datastore/migrations/1757444171_create_bundles_table.sql deleted file mode 100644 index 33fd7e3..0000000 --- a/crates/datastore/migrations/1757444171_create_bundles_table.sql +++ /dev/null @@ -1,38 +0,0 @@ -DO $$ -BEGIN - IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'bundle_state') THEN - CREATE TYPE bundle_state AS ENUM ( - 'Ready', - 'IncludedByBuilder' - ); - END IF; -END$$; - --- Table for maintenance job, that can be walked back on hash mismatches -CREATE TABLE IF NOT EXISTS maintenance ( - block_number BIGINT PRIMARY KEY, - block_hash CHAR(66) NOT NULL, - finalized BOOL NOT NULL DEFAULT false -); - --- Create bundles table -CREATE TABLE IF NOT EXISTS bundles ( - id UUID PRIMARY KEY, - bundle_state bundle_state NOT NULL, - state_changed_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), - - txn_hashes CHAR(66)[], - senders CHAR(42)[], - minimum_base_fee BIGINT, -- todo use numeric - - txs TEXT[] NOT NULL, - reverting_tx_hashes CHAR(66)[], - dropping_tx_hashes CHAR(66)[], - - block_number BIGINT, - min_timestamp BIGINT, - max_timestamp BIGINT, - created_at TIMESTAMPTZ NOT NULL, - updated_at TIMESTAMPTZ NOT NULL -); - diff --git a/crates/datastore/src/lib.rs b/crates/datastore/src/lib.rs deleted file mode 100644 index 25abc97..0000000 --- a/crates/datastore/src/lib.rs +++ /dev/null @@ -1,4 +0,0 @@ -pub mod postgres; -pub mod traits; -pub use postgres::PostgresDatastore; -pub use traits::BundleDatastore; diff --git a/crates/datastore/src/postgres.rs b/crates/datastore/src/postgres.rs deleted file mode 100644 index 700dbcb..0000000 --- a/crates/datastore/src/postgres.rs +++ /dev/null @@ -1,560 +0,0 @@ -use crate::traits::BundleDatastore; -use alloy_primitives::hex::{FromHex, ToHexExt}; -use alloy_primitives::{Address, B256, TxHash}; -use alloy_rpc_types_mev::EthSendBundle; -use anyhow::Result; -use sqlx::{ - PgPool, - types::chrono::{DateTime, Utc}, -}; -use tracing::info; -use uuid::Uuid; - -use tips_common::{BundleState, BundleWithMetadata}; - -#[derive(sqlx::FromRow, Debug)] -struct BundleRow { - id: Uuid, - senders: Option>, - minimum_base_fee: Option, - txn_hashes: Option>, - txs: Vec, - reverting_tx_hashes: Option>, - dropping_tx_hashes: Option>, - block_number: Option, - min_timestamp: Option, - max_timestamp: Option, - #[sqlx(rename = "bundle_state")] - state: BundleState, - state_changed_at: DateTime, -} - -/// Filter criteria for selecting bundles -#[derive(Debug, Clone, Default)] -pub struct BundleFilter { - pub base_fee: Option, - pub block_number: Option, - pub timestamp: Option, - pub max_time_before: Option, - pub status: Option, - pub txn_hashes: Option>, -} - -impl BundleFilter { - pub fn new() -> Self { - Self::default() - } - - pub fn with_base_fee(mut self, base_fee: i64) -> Self { - self.base_fee = Some(base_fee); - self - } - - pub fn valid_for_block(mut self, block_number: u64) -> Self { - self.block_number = Some(block_number); - self - } - - pub fn valid_for_timestamp(mut self, timestamp: u64) -> Self { - self.timestamp = Some(timestamp); - self - } - - pub fn with_status(mut self, status: BundleState) -> Self { - self.status = Some(status); - self - } - - pub fn with_txn_hashes(mut self, txn_hashes: Vec) -> Self { - self.txn_hashes = Some(txn_hashes); - self - } - - pub fn with_max_time_before(mut self, timestamp: u64) -> Self { - self.max_time_before = Some(timestamp); - self - } -} - -/// Statistics about bundles and transactions grouped by state -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct BundleStats { - pub ready_bundles: u64, - pub ready_transactions: u64, - pub included_by_builder_bundles: u64, - pub included_by_builder_transactions: u64, - pub total_bundles: u64, - pub total_transactions: u64, -} - -#[derive(Debug, Clone)] -pub struct BlockInfoRecord { - pub block_number: u64, - pub block_hash: B256, - pub finalized: bool, -} - -#[derive(Debug, Clone)] -pub struct BlockInfo { - pub latest_block_number: u64, - pub latest_block_hash: B256, - pub latest_finalized_block_number: Option, - pub latest_finalized_block_hash: Option, -} - -#[derive(Debug, Clone)] -pub struct BlockInfoUpdate { - pub block_number: u64, - pub block_hash: B256, -} - -#[derive(sqlx::FromRow, Debug)] -struct BlockInfoRow { - latest_block_number: Option, - latest_block_hash: Option, - latest_finalized_block_number: Option, - latest_finalized_block_hash: Option, -} - -/// PostgreSQL implementation of the BundleDatastore trait -#[derive(Debug, Clone)] -pub struct PostgresDatastore { - pool: PgPool, -} - -impl PostgresDatastore { - pub async fn run_migrations(&self) -> Result<()> { - info!(message = "running migrations"); - sqlx::migrate!("./migrations").run(&self.pool).await?; - info!(message = "migrations complete"); - Ok(()) - } - - pub async fn connect(url: String) -> Result { - let pool = PgPool::connect(&url).await?; - Ok(Self::new(pool)) - } - - /// Create a new PostgreSQL datastore instance - pub fn new(pool: PgPool) -> Self { - Self { pool } - } - - fn row_to_bundle_with_metadata(&self, row: BundleRow) -> Result { - let parsed_txs: Result, _> = - row.txs.into_iter().map(|tx_hex| tx_hex.parse()).collect(); - - let parsed_reverting_tx_hashes: Result, _> = row - .reverting_tx_hashes - .unwrap_or_default() - .into_iter() - .map(TxHash::from_hex) - .collect(); - - let parsed_dropping_tx_hashes: Result, _> = row - .dropping_tx_hashes - .unwrap_or_default() - .into_iter() - .map(TxHash::from_hex) - .collect(); - - let bundle = EthSendBundle { - txs: parsed_txs?, - block_number: row.block_number.unwrap_or(0) as u64, - min_timestamp: row.min_timestamp.map(|t| t as u64), - max_timestamp: row.max_timestamp.map(|t| t as u64), - reverting_tx_hashes: parsed_reverting_tx_hashes?, - replacement_uuid: Some(row.id.to_string()), - dropping_tx_hashes: parsed_dropping_tx_hashes?, - refund_percent: None, - refund_recipient: None, - refund_tx_hashes: Vec::new(), - extra_fields: Default::default(), - }; - - let parsed_txn_hashes: Result, _> = row - .txn_hashes - .unwrap_or_default() - .into_iter() - .map(TxHash::from_hex) - .collect(); - - let parsed_senders: Result, _> = row - .senders - .unwrap_or_default() - .into_iter() - .map(Address::from_hex) - .collect(); - - Ok(BundleWithMetadata { - bundle, - txn_hashes: parsed_txn_hashes?, - senders: parsed_senders?, - min_base_fee: row.minimum_base_fee.unwrap_or(0), - state: row.state, - state_changed_at: row.state_changed_at, - }) - } -} - -#[async_trait::async_trait] -impl BundleDatastore for PostgresDatastore { - async fn insert_bundle(&self, bundle: BundleWithMetadata) -> Result { - let id = Uuid::new_v4(); - - let senders: Vec = bundle - .senders - .iter() - .map(|s| s.encode_hex_with_prefix()) - .collect(); - let txn_hashes: Vec = bundle - .txn_hashes - .iter() - .map(|h| h.encode_hex_with_prefix()) - .collect(); - - let txs: Vec = bundle - .bundle - .txs - .iter() - .map(|tx| tx.encode_hex_upper_with_prefix()) - .collect(); - let reverting_tx_hashes: Vec = bundle - .bundle - .reverting_tx_hashes - .iter() - .map(|h| h.encode_hex_with_prefix()) - .collect(); - let dropping_tx_hashes: Vec = bundle - .bundle - .dropping_tx_hashes - .iter() - .map(|h| h.encode_hex_with_prefix()) - .collect(); - - sqlx::query!( - r#" - INSERT INTO bundles ( - id, bundle_state, senders, minimum_base_fee, txn_hashes, - txs, reverting_tx_hashes, dropping_tx_hashes, - block_number, min_timestamp, max_timestamp, - created_at, updated_at, state_changed_at - ) - VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, NOW(), NOW(), NOW()) - "#, - id, - BundleState::Ready as BundleState, - &senders, - bundle.min_base_fee, - &txn_hashes, - &txs, - &reverting_tx_hashes, - &dropping_tx_hashes, - bundle.bundle.block_number as i64, - bundle.bundle.min_timestamp.map(|t| t as i64), - bundle.bundle.max_timestamp.map(|t| t as i64), - ) - .execute(&self.pool) - .await?; - - Ok(id) - } - - async fn get_bundle(&self, id: Uuid) -> Result> { - let result = sqlx::query_as::<_, BundleRow>( - r#" - SELECT id, senders, minimum_base_fee, txn_hashes, txs, reverting_tx_hashes, - dropping_tx_hashes, block_number, min_timestamp, max_timestamp, bundle_state, state_changed_at - FROM bundles - WHERE id = $1 - "#, - ) - .bind(id) - .fetch_optional(&self.pool) - .await?; - - match result { - Some(row) => { - let bundle_with_metadata = self.row_to_bundle_with_metadata(row)?; - Ok(Some(bundle_with_metadata)) - } - None => Ok(None), - } - } - - async fn cancel_bundle(&self, id: Uuid) -> Result<()> { - sqlx::query("DELETE FROM bundles WHERE id = $1") - .bind(id) - .execute(&self.pool) - .await?; - Ok(()) - } - - async fn select_bundles(&self, filter: BundleFilter) -> Result> { - // Convert txn_hashes to string array for SQL binding - let txn_hash_strings: Option> = filter - .txn_hashes - .map(|hashes| hashes.iter().map(|h| h.encode_hex_with_prefix()).collect()); - - let rows = sqlx::query_as::<_, BundleRow>( - r#" - SELECT id, senders, minimum_base_fee, txn_hashes, txs, reverting_tx_hashes, - dropping_tx_hashes, block_number, min_timestamp, max_timestamp, bundle_state, state_changed_at - FROM bundles - WHERE ($1::bigint IS NULL OR minimum_base_fee >= $1) - AND ($2::bigint IS NULL OR block_number = $2 OR block_number IS NULL OR block_number = 0) - AND ($3::bigint IS NULL OR min_timestamp <= $3 OR min_timestamp IS NULL) - AND ($3::bigint IS NULL OR max_timestamp >= $3 OR max_timestamp IS NULL) - AND ($4::bundle_state IS NULL OR bundle_state = $4) - AND ($5::text[] IS NULL OR txn_hashes::text[] && $5) - AND ($6::bigint IS NULL OR max_timestamp < $6) - ORDER BY minimum_base_fee DESC - "#, - ) - .bind(filter.base_fee) - .bind(filter.block_number.map(|n| n as i64)) - .bind(filter.timestamp.map(|t| t as i64)) - .bind(filter.status) - .bind(txn_hash_strings) - .bind(filter.max_time_before.map(|t| t as i64)) - .fetch_all(&self.pool) - .await?; - - let mut bundles = Vec::new(); - for row in rows { - let bundle_with_metadata = self.row_to_bundle_with_metadata(row)?; - bundles.push(bundle_with_metadata); - } - - Ok(bundles) - } - - async fn find_bundle_by_transaction_hash(&self, tx_hash: TxHash) -> Result> { - let tx_hash_str = tx_hash.encode_hex_with_prefix(); - - let result = sqlx::query_scalar::<_, Uuid>( - r#" - SELECT id - FROM bundles - WHERE $1 = ANY(txn_hashes) - LIMIT 1 - "#, - ) - .bind(&tx_hash_str) - .fetch_optional(&self.pool) - .await?; - - Ok(result) - } - - async fn remove_bundles(&self, ids: Vec) -> Result { - if ids.is_empty() { - return Ok(0); - } - - let result = sqlx::query("DELETE FROM bundles WHERE id = ANY($1)") - .bind(&ids) - .execute(&self.pool) - .await?; - Ok(result.rows_affected() as usize) - } - - async fn update_bundles_state( - &self, - uuids: Vec, - allowed_prev_states: Vec, - new_state: BundleState, - ) -> Result> { - let prev_states_sql: Vec = allowed_prev_states - .iter() - .map(|s| match s { - BundleState::Ready => "Ready".to_string(), - BundleState::IncludedByBuilder => "IncludedByBuilder".to_string(), - }) - .collect(); - let rows = sqlx::query!( - r#" - UPDATE bundles - SET bundle_state = $1, updated_at = NOW(), state_changed_at = NOW() - WHERE id = ANY($2) AND bundle_state::text = ANY($3) - RETURNING id - "#, - new_state as BundleState, - &uuids, - &prev_states_sql - ) - .fetch_all(&self.pool) - .await?; - - Ok(rows.into_iter().map(|row| row.id).collect()) - } - - async fn get_current_block_info(&self) -> Result> { - let row = sqlx::query_as::<_, BlockInfoRow>( - r#" - SELECT - (SELECT block_number FROM maintenance ORDER BY block_number DESC LIMIT 1) as latest_block_number, - (SELECT block_hash FROM maintenance ORDER BY block_number DESC LIMIT 1) as latest_block_hash, - (SELECT block_number FROM maintenance WHERE finalized = true ORDER BY block_number DESC LIMIT 1) as latest_finalized_block_number, - (SELECT block_hash FROM maintenance WHERE finalized = true ORDER BY block_number DESC LIMIT 1) as latest_finalized_block_hash - "# - ) - .fetch_one(&self.pool) - .await?; - - // If there's no latest block, return None - let (latest_block_number, latest_block_hash) = - match (row.latest_block_number, row.latest_block_hash) { - (Some(block_number), Some(hash_str)) => { - let hash = B256::from_hex(&hash_str) - .map_err(|e| anyhow::anyhow!("Failed to parse latest block hash: {e}"))?; - (block_number as u64, hash) - } - _ => return Ok(None), - }; - - let latest_finalized_block_hash = - if let Some(hash_str) = row.latest_finalized_block_hash { - Some(B256::from_hex(&hash_str).map_err(|e| { - anyhow::anyhow!("Failed to parse latest finalized block hash: {e}") - })?) - } else { - None - }; - - Ok(Some(BlockInfo { - latest_block_number, - latest_block_hash, - latest_finalized_block_number: row.latest_finalized_block_number.map(|n| n as u64), - latest_finalized_block_hash, - })) - } - - async fn commit_block_info(&self, blocks: Vec) -> Result<()> { - for block in blocks { - let block_hash_str = block.block_hash.encode_hex_with_prefix(); - - sqlx::query!( - r#" - INSERT INTO maintenance (block_number, block_hash, finalized) - VALUES ($1, $2, false) - ON CONFLICT (block_number) - DO UPDATE SET block_hash = EXCLUDED.block_hash, finalized = false - "#, - block.block_number as i64, - block_hash_str, - ) - .execute(&self.pool) - .await?; - } - Ok(()) - } - - async fn finalize_blocks_before(&self, block_number: u64) -> Result { - let result = sqlx::query!( - "UPDATE maintenance SET finalized = true WHERE block_number < $1 AND finalized = false", - block_number as i64 - ) - .execute(&self.pool) - .await?; - - Ok(result.rows_affected()) - } - - async fn prune_finalized_blocks(&self, before_block_number: u64) -> Result { - let result = sqlx::query!( - "DELETE FROM maintenance WHERE finalized = true AND block_number < $1", - before_block_number as i64 - ) - .execute(&self.pool) - .await?; - - Ok(result.rows_affected()) - } - - async fn get_stats(&self) -> Result { - let result = sqlx::query!( - r#" - SELECT - bundle_state::text as bundle_state_text, - COUNT(*) as bundle_count, - SUM(COALESCE(array_length(txn_hashes, 1), 0)) as transaction_count - FROM bundles - GROUP BY bundle_state - "# - ) - .fetch_all(&self.pool) - .await?; - - let mut stats = BundleStats { - ready_bundles: 0, - ready_transactions: 0, - included_by_builder_bundles: 0, - included_by_builder_transactions: 0, - total_bundles: 0, - total_transactions: 0, - }; - - for row in result { - let bundle_count = row.bundle_count.unwrap_or(0) as u64; - let transaction_count = row.transaction_count.unwrap_or(0) as u64; - - stats.total_bundles += bundle_count; - stats.total_transactions += transaction_count; - - if let Some(state_text) = row.bundle_state_text { - match state_text.as_str() { - "Ready" => { - stats.ready_bundles = bundle_count; - stats.ready_transactions = transaction_count; - } - "IncludedByBuilder" => { - stats.included_by_builder_bundles = bundle_count; - stats.included_by_builder_transactions = transaction_count; - } - _ => { - // Unknown state, just add to totals - } - } - } - } - - Ok(stats) - } - - async fn remove_timed_out_bundles(&self, current_time: u64) -> Result> { - let rows = sqlx::query_scalar::<_, Uuid>( - r#" - DELETE FROM bundles - WHERE bundle_state = 'Ready' - AND max_timestamp IS NOT NULL - AND max_timestamp < $1 - RETURNING id - "#, - ) - .bind(current_time as i64) - .fetch_all(&self.pool) - .await?; - - Ok(rows) - } - - async fn remove_old_included_bundles( - &self, - cutoff_timestamp: DateTime, - ) -> Result> { - let rows = sqlx::query_scalar::<_, Uuid>( - r#" - DELETE FROM bundles - WHERE bundle_state = 'IncludedByBuilder' - AND state_changed_at < $1 - RETURNING id - "#, - ) - .bind(cutoff_timestamp) - .fetch_all(&self.pool) - .await?; - - Ok(rows) - } -} diff --git a/crates/datastore/src/traits.rs b/crates/datastore/src/traits.rs deleted file mode 100644 index 65a9390..0000000 --- a/crates/datastore/src/traits.rs +++ /dev/null @@ -1,64 +0,0 @@ -use crate::postgres::{BlockInfo, BlockInfoUpdate, BundleFilter, BundleStats}; -use alloy_primitives::TxHash; -use anyhow::Result; -use sqlx::types::chrono::{DateTime, Utc}; -use uuid::Uuid; - -use tips_common::{BundleState, BundleWithMetadata}; - -/// Trait defining the interface for bundle datastore operations -#[async_trait::async_trait] -pub trait BundleDatastore: Send + Sync { - /// Insert a new bundle into the datastore - async fn insert_bundle(&self, bundle: BundleWithMetadata) -> Result; - - /// Fetch a bundle with metadata by its ID - async fn get_bundle(&self, id: Uuid) -> Result>; - - /// Cancel a bundle by UUID - async fn cancel_bundle(&self, id: Uuid) -> Result<()>; - - /// Select the candidate bundles to include in the next Flashblock - async fn select_bundles(&self, filter: BundleFilter) -> Result>; - - /// Find bundle ID by transaction hash - async fn find_bundle_by_transaction_hash(&self, tx_hash: TxHash) -> Result>; - - /// Remove bundles by IDs - async fn remove_bundles(&self, ids: Vec) -> Result; - - /// Update bundle states for multiple bundles - /// Returns the number of rows that were actually updated - async fn update_bundles_state( - &self, - uuids: Vec, - allowed_prev_states: Vec, - new_state: BundleState, - ) -> Result>; - - /// Get the current block info (latest block and non finalized blocks) - async fn get_current_block_info(&self) -> Result>; - - /// Commit the latest block info (upsert vec of block nums/hashes should be non finalized) - async fn commit_block_info(&self, blocks: Vec) -> Result<()>; - - /// Finalize all blocks before the given block number (one-way operation) - async fn finalize_blocks_before(&self, block_number: u64) -> Result; - - /// Prune blocks that are finalized before block number X - async fn prune_finalized_blocks(&self, before_block_number: u64) -> Result; - - /// Get statistics about bundles and transactions grouped by state - async fn get_stats(&self) -> Result; - - /// Remove bundles that have timed out (max_timestamp < current_time) - /// Returns the UUIDs of bundles that were removed - async fn remove_timed_out_bundles(&self, current_time: u64) -> Result>; - - /// Remove old IncludedByBuilder bundles that were last updated before the given timestamp - /// Returns the UUIDs of bundles that were removed - async fn remove_old_included_bundles( - &self, - cutoff_timestamp: DateTime, - ) -> Result>; -} diff --git a/crates/datastore/tests/datastore.rs b/crates/datastore/tests/datastore.rs deleted file mode 100644 index b46a588..0000000 --- a/crates/datastore/tests/datastore.rs +++ /dev/null @@ -1,565 +0,0 @@ -use alloy_primitives::{Address, Bytes, TxHash, address, b256, bytes}; -use alloy_rpc_types_mev::EthSendBundle; -use sqlx::PgPool; -use sqlx::types::chrono::Utc; -use testcontainers_modules::{ - postgres, - testcontainers::{ContainerAsync, runners::AsyncRunner}, -}; -use tips_common::{BundleState, BundleWithMetadata}; -use tips_datastore::postgres::{BlockInfoUpdate, BundleFilter}; -use tips_datastore::{BundleDatastore, PostgresDatastore}; - -struct TestHarness { - _postgres_instance: ContainerAsync, - data_store: PostgresDatastore, -} - -async fn setup_datastore() -> anyhow::Result { - let postgres_instance = postgres::Postgres::default().start().await?; - let connection_string = format!( - "postgres://postgres:postgres@{}:{}/postgres", - postgres_instance.get_host().await?, - postgres_instance.get_host_port_ipv4(5432).await? - ); - - let pool = PgPool::connect(&connection_string).await?; - let data_store = PostgresDatastore::new(pool); - - assert!(data_store.run_migrations().await.is_ok()); - Ok(TestHarness { - _postgres_instance: postgres_instance, - data_store, - }) -} - -const TX_DATA: Bytes = bytes!( - "0x02f8bf8221058304f8c782038c83d2a76b833d0900942e85c218afcdeb3d3b3f0f72941b4861f915bbcf80b85102000e0000000bb800001010c78c430a094eb7ae67d41a7cca25cdb9315e63baceb03bf4529e57a6b1b900010001f4000a101010110111101111011011faa7efc8e6aa13b029547eecbf5d370b4e1e52eec080a009fc02a6612877cec7e1223f0a14f9a9507b82ef03af41fcf14bf5018ccf2242a0338b46da29a62d28745c828077327588dc82c03a4b0210e3ee1fd62c608f8fcd" -); -const TX_HASH: TxHash = b256!("0x3ea7e1482485387e61150ee8e5c8cad48a14591789ac02cc2504046d96d0a5f4"); -const TX_SENDER: Address = address!("0x24ae36512421f1d9f6e074f00ff5b8393f5dd925"); - -fn create_test_bundle_with_reverting_tx() -> anyhow::Result { - let bundle = EthSendBundle { - txs: vec![TX_DATA], - block_number: 12345, - min_timestamp: Some(1640995200), - max_timestamp: Some(1640995260), - reverting_tx_hashes: vec![TX_HASH], - replacement_uuid: None, - dropping_tx_hashes: vec![], - refund_percent: None, - refund_recipient: None, - refund_tx_hashes: vec![], - extra_fields: Default::default(), - }; - - let bundle_with_metadata = BundleWithMetadata::new(&bundle)?; - Ok(bundle_with_metadata) -} - -fn create_test_bundle( - block_number: u64, - min_timestamp: Option, - max_timestamp: Option, -) -> anyhow::Result { - let bundle = EthSendBundle { - txs: vec![TX_DATA], - block_number, - min_timestamp, - max_timestamp, - reverting_tx_hashes: vec![], - replacement_uuid: None, - dropping_tx_hashes: vec![], - refund_percent: None, - refund_recipient: None, - refund_tx_hashes: vec![], - extra_fields: Default::default(), - }; - - let bundle_with_metadata = BundleWithMetadata::new(&bundle)?; - Ok(bundle_with_metadata) -} - -#[tokio::test] -async fn insert_and_get() -> anyhow::Result<()> { - let harness = setup_datastore().await?; - let test_bundle_with_metadata = create_test_bundle_with_reverting_tx()?; - let test_bundle = test_bundle_with_metadata.bundle.clone(); - - let insert_result = harness - .data_store - .insert_bundle(test_bundle_with_metadata) - .await; - if let Err(ref err) = insert_result { - eprintln!("Insert failed with error: {err:?}"); - } - assert!(insert_result.is_ok()); - let bundle_id = insert_result.unwrap(); - - let query_result = harness.data_store.get_bundle(bundle_id).await; - assert!(query_result.is_ok()); - let retrieved_bundle_with_metadata = query_result.unwrap(); - - assert!( - retrieved_bundle_with_metadata.is_some(), - "Bundle should be found" - ); - let metadata = retrieved_bundle_with_metadata.unwrap(); - let retrieved_bundle = &metadata.bundle; - - assert!( - matches!(metadata.state, BundleState::Ready), - "Bundle should default to Ready state" - ); - assert_eq!(retrieved_bundle.txs.len(), test_bundle.txs.len()); - assert_eq!(retrieved_bundle.block_number, test_bundle.block_number); - assert_eq!(retrieved_bundle.min_timestamp, test_bundle.min_timestamp); - assert_eq!(retrieved_bundle.max_timestamp, test_bundle.max_timestamp); - assert_eq!( - retrieved_bundle.reverting_tx_hashes.len(), - test_bundle.reverting_tx_hashes.len() - ); - assert_eq!( - retrieved_bundle.dropping_tx_hashes.len(), - test_bundle.dropping_tx_hashes.len() - ); - - assert!( - !metadata.txn_hashes.is_empty(), - "Transaction hashes should not be empty" - ); - assert!(!metadata.senders.is_empty(), "Senders should not be empty"); - assert_eq!( - metadata.txn_hashes.len(), - 1, - "Should have one transaction hash" - ); - assert_eq!(metadata.senders.len(), 1, "Should have one sender"); - assert!( - metadata.min_base_fee >= 0, - "Min base fee should be non-negative" - ); - - assert_eq!( - metadata.txn_hashes[0], TX_HASH, - "Transaction hash should match" - ); - assert_eq!(metadata.senders[0], TX_SENDER, "Sender should match"); - - Ok(()) -} - -#[tokio::test] -async fn select_bundles_comprehensive() -> anyhow::Result<()> { - let harness = setup_datastore().await?; - - let bundle1 = create_test_bundle(100, Some(1000), Some(2000))?; - let bundle2 = create_test_bundle(200, Some(1500), Some(2500))?; - let bundle3 = create_test_bundle(300, None, None)?; // valid for all times - let bundle4 = create_test_bundle(0, Some(500), Some(3000))?; // valid for all blocks - - harness - .data_store - .insert_bundle(bundle1) - .await - .expect("Failed to insert bundle1"); - harness - .data_store - .insert_bundle(bundle2) - .await - .expect("Failed to insert bundle2"); - harness - .data_store - .insert_bundle(bundle3) - .await - .expect("Failed to insert bundle3"); - harness - .data_store - .insert_bundle(bundle4) - .await - .expect("Failed to insert bundle4"); - - let empty_filter = BundleFilter::new(); - let all_bundles = harness - .data_store - .select_bundles(empty_filter) - .await - .expect("Failed to select bundles with empty filter"); - assert_eq!( - all_bundles.len(), - 4, - "Should return all 4 bundles with empty filter" - ); - - let block_filter = BundleFilter::new().valid_for_block(200); - let filtered_bundles = harness - .data_store - .select_bundles(block_filter) - .await - .expect("Failed to select bundles with block filter"); - assert_eq!( - filtered_bundles.len(), - 2, - "Should return 2 bundles for block 200 (bundle2 + bundle4 with block 0)" - ); - assert_eq!(filtered_bundles[0].bundle.block_number, 200); - - let timestamp_filter = BundleFilter::new().valid_for_timestamp(1500); - let timestamp_filtered = harness - .data_store - .select_bundles(timestamp_filter) - .await - .expect("Failed to select bundles with timestamp filter"); - assert_eq!( - timestamp_filtered.len(), - 4, - "Should return all 4 bundles (all contain timestamp 1500: bundle1[1000-2000], bundle2[1500-2500], bundle3[NULL-NULL], bundle4[500-3000])" - ); - - let combined_filter = BundleFilter::new() - .valid_for_block(200) - .valid_for_timestamp(2000); - let combined_filtered = harness - .data_store - .select_bundles(combined_filter) - .await - .expect("Failed to select bundles with combined filter"); - assert_eq!( - combined_filtered.len(), - 2, - "Should return 2 bundles (bundle2: block=200 and timestamp range 1500-2500 contains 2000; bundle4: block=0 matches all blocks and timestamp range 500-3000 contains 2000)" - ); - assert_eq!(combined_filtered[0].bundle.block_number, 200); - - let no_match_filter = BundleFilter::new().valid_for_block(999); - let no_matches = harness - .data_store - .select_bundles(no_match_filter) - .await - .expect("Failed to select bundles with no match filter"); - assert_eq!( - no_matches.len(), - 1, - "Should return 1 bundle for non-existent block (bundle4 with block 0 is valid for all blocks)" - ); - - Ok(()) -} - -#[tokio::test] -async fn cancel_bundle_workflow() -> anyhow::Result<()> { - let harness = setup_datastore().await?; - - let bundle1 = create_test_bundle(100, Some(1000), Some(2000))?; - let bundle2 = create_test_bundle(200, Some(1500), Some(2500))?; - - let bundle1_id = harness - .data_store - .insert_bundle(bundle1) - .await - .expect("Failed to insert bundle1"); - let bundle2_id = harness - .data_store - .insert_bundle(bundle2) - .await - .expect("Failed to insert bundle2"); - - let retrieved_bundle1 = harness - .data_store - .get_bundle(bundle1_id) - .await - .expect("Failed to get bundle1"); - assert!( - retrieved_bundle1.is_some(), - "Bundle1 should exist before cancellation" - ); - - let retrieved_bundle2 = harness - .data_store - .get_bundle(bundle2_id) - .await - .expect("Failed to get bundle2"); - assert!( - retrieved_bundle2.is_some(), - "Bundle2 should exist before cancellation" - ); - - harness - .data_store - .cancel_bundle(bundle1_id) - .await - .expect("Failed to cancel bundle1"); - - let cancelled_bundle1 = harness - .data_store - .get_bundle(bundle1_id) - .await - .expect("Failed to get bundle1 after cancellation"); - assert!( - cancelled_bundle1.is_none(), - "Bundle1 should not exist after cancellation" - ); - - let still_exists_bundle2 = harness - .data_store - .get_bundle(bundle2_id) - .await - .expect("Failed to get bundle2 after bundle1 cancellation"); - assert!( - still_exists_bundle2.is_some(), - "Bundle2 should still exist after bundle1 cancellation" - ); - - Ok(()) -} - -#[tokio::test] -async fn find_bundle_by_transaction_hash() -> anyhow::Result<()> { - let harness = setup_datastore().await?; - let test_bundle = create_test_bundle_with_reverting_tx()?; - - let bundle_id = harness - .data_store - .insert_bundle(test_bundle) - .await - .expect("Failed to insert bundle"); - - let found_id = harness - .data_store - .find_bundle_by_transaction_hash(TX_HASH) - .await - .expect("Failed to find bundle by transaction hash"); - assert_eq!(found_id, Some(bundle_id)); - - let nonexistent_hash = - b256!("0x1234567890123456789012345678901234567890123456789012345678901234"); - let not_found = harness - .data_store - .find_bundle_by_transaction_hash(nonexistent_hash) - .await - .expect("Failed to search for nonexistent hash"); - assert_eq!(not_found, None); - - Ok(()) -} - -#[tokio::test] -async fn remove_bundles() -> anyhow::Result<()> { - let harness = setup_datastore().await?; - - let bundle1 = create_test_bundle(100, None, None)?; - let bundle2 = create_test_bundle(200, None, None)?; - - let id1 = harness.data_store.insert_bundle(bundle1).await.unwrap(); - let id2 = harness.data_store.insert_bundle(bundle2).await.unwrap(); - - let removed_count = harness - .data_store - .remove_bundles(vec![id1, id2]) - .await - .unwrap(); - assert_eq!(removed_count, 2); - - assert!(harness.data_store.get_bundle(id1).await.unwrap().is_none()); - assert!(harness.data_store.get_bundle(id2).await.unwrap().is_none()); - - let empty_removal = harness.data_store.remove_bundles(vec![]).await.unwrap(); - assert_eq!(empty_removal, 0); - - Ok(()) -} - -#[tokio::test] -async fn update_bundles_state() -> anyhow::Result<()> { - let harness = setup_datastore().await?; - - let bundle1 = create_test_bundle(100, None, None)?; - let bundle2 = create_test_bundle(200, None, None)?; - - let id1 = harness.data_store.insert_bundle(bundle1).await.unwrap(); - let id2 = harness.data_store.insert_bundle(bundle2).await.unwrap(); - - let updated_ids = harness - .data_store - .update_bundles_state( - vec![id1, id2], - vec![BundleState::Ready], - BundleState::IncludedByBuilder, - ) - .await - .unwrap(); - assert_eq!(updated_ids.len(), 2); - assert!(updated_ids.contains(&id1)); - assert!(updated_ids.contains(&id2)); - - let bundle1_meta = harness.data_store.get_bundle(id1).await.unwrap().unwrap(); - assert!(matches!(bundle1_meta.state, BundleState::IncludedByBuilder)); - - Ok(()) -} - -#[tokio::test] -async fn block_info_operations() -> anyhow::Result<()> { - let harness = setup_datastore().await?; - - let initial_info = harness.data_store.get_current_block_info().await.unwrap(); - assert!(initial_info.is_none()); - - let blocks = vec![ - BlockInfoUpdate { - block_number: 100, - block_hash: b256!("0x1111111111111111111111111111111111111111111111111111111111111111"), - }, - BlockInfoUpdate { - block_number: 101, - block_hash: b256!("0x2222222222222222222222222222222222222222222222222222222222222222"), - }, - ]; - - harness.data_store.commit_block_info(blocks).await.unwrap(); - - let block_info = harness - .data_store - .get_current_block_info() - .await - .unwrap() - .unwrap(); - assert_eq!(block_info.latest_block_number, 101); - assert!(block_info.latest_finalized_block_number.is_none()); - - let finalized_count = harness - .data_store - .finalize_blocks_before(101) - .await - .unwrap(); - assert_eq!(finalized_count, 1); - - let updated_info = harness - .data_store - .get_current_block_info() - .await - .unwrap() - .unwrap(); - assert_eq!(updated_info.latest_finalized_block_number, Some(100)); - - let pruned_count = harness - .data_store - .prune_finalized_blocks(101) - .await - .unwrap(); - assert_eq!(pruned_count, 1); - - Ok(()) -} - -#[tokio::test] -async fn get_stats() -> anyhow::Result<()> { - let harness = setup_datastore().await?; - - let stats = harness.data_store.get_stats().await.unwrap(); - assert_eq!(stats.total_bundles, 0); - assert_eq!(stats.total_transactions, 0); - - let bundle1 = create_test_bundle(100, None, None)?; - let bundle2 = create_test_bundle(200, None, None)?; - - let id1 = harness.data_store.insert_bundle(bundle1).await.unwrap(); - harness.data_store.insert_bundle(bundle2).await.unwrap(); - - harness - .data_store - .update_bundles_state( - vec![id1], - vec![BundleState::Ready], - BundleState::IncludedByBuilder, - ) - .await - .unwrap(); - - let updated_stats = harness.data_store.get_stats().await.unwrap(); - assert_eq!(updated_stats.total_bundles, 2); - assert_eq!(updated_stats.ready_bundles, 1); - assert_eq!(updated_stats.included_by_builder_bundles, 1); - - Ok(()) -} - -#[tokio::test] -async fn remove_timed_out_bundles() -> anyhow::Result<()> { - let harness = setup_datastore().await?; - - let expired_bundle = create_test_bundle(100, None, Some(1000))?; - let valid_bundle = create_test_bundle(200, None, Some(2000))?; - let no_timestamp_bundle = create_test_bundle(300, None, None)?; - - harness - .data_store - .insert_bundle(expired_bundle) - .await - .unwrap(); - harness - .data_store - .insert_bundle(valid_bundle) - .await - .unwrap(); - harness - .data_store - .insert_bundle(no_timestamp_bundle) - .await - .unwrap(); - - let removed_ids = harness - .data_store - .remove_timed_out_bundles(1500) - .await - .unwrap(); - assert_eq!(removed_ids.len(), 1); - - let remaining_bundles = harness - .data_store - .select_bundles(BundleFilter::new()) - .await - .unwrap(); - assert_eq!(remaining_bundles.len(), 2); - - Ok(()) -} - -#[tokio::test] -async fn remove_old_included_bundles() -> anyhow::Result<()> { - let harness = setup_datastore().await?; - - let bundle1 = create_test_bundle(100, None, None)?; - let bundle2 = create_test_bundle(200, None, None)?; - - let id1 = harness.data_store.insert_bundle(bundle1).await.unwrap(); - let id2 = harness.data_store.insert_bundle(bundle2).await.unwrap(); - - harness - .data_store - .update_bundles_state( - vec![id1, id2], - vec![BundleState::Ready], - BundleState::IncludedByBuilder, - ) - .await - .unwrap(); - - let cutoff = Utc::now(); - let removed_ids = harness - .data_store - .remove_old_included_bundles(cutoff) - .await - .unwrap(); - assert_eq!(removed_ids.len(), 2); - - let remaining_bundles = harness - .data_store - .select_bundles(BundleFilter::new()) - .await - .unwrap(); - assert_eq!(remaining_bundles.len(), 0); - - Ok(()) -} diff --git a/crates/ingress-writer/Cargo.toml b/crates/ingress-writer/Cargo.toml deleted file mode 100644 index e6528b7..0000000 --- a/crates/ingress-writer/Cargo.toml +++ /dev/null @@ -1,27 +0,0 @@ -[package] -name = "tips-ingress-writer" -version.workspace = true -rust-version.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true -edition.workspace = true - -[[bin]] -name = "tips-ingress-writer" -path = "src/main.rs" - -[dependencies] -tips-datastore.workspace = true -tips-audit.workspace=true -tokio.workspace = true -tracing.workspace = true -tracing-subscriber.workspace = true -anyhow.workspace = true -clap.workspace = true -dotenvy.workspace = true -rdkafka.workspace = true -serde_json.workspace = true -backon.workspace = true -uuid.workspace = true -tips-common.workspace = true diff --git a/crates/ingress-writer/src/main.rs b/crates/ingress-writer/src/main.rs deleted file mode 100644 index a64542b..0000000 --- a/crates/ingress-writer/src/main.rs +++ /dev/null @@ -1,183 +0,0 @@ -use anyhow::Result; -use backon::{ExponentialBuilder, Retryable}; -use clap::Parser; -use rdkafka::{ - config::ClientConfig, - consumer::{Consumer, StreamConsumer}, - message::Message, - producer::FutureProducer, -}; -use std::fs; -use tips_audit::{BundleEvent, BundleEventPublisher, KafkaBundleEventPublisher}; -use tips_common::BundleWithMetadata; -use tips_datastore::{BundleDatastore, postgres::PostgresDatastore}; -use tokio::time::Duration; -use tracing::{debug, error, info, warn}; -use uuid::Uuid; - -#[derive(Parser)] -#[command(author, version, about, long_about = None)] -struct Args { - #[arg(long, env = "TIPS_INGRESS_WRITER_DATABASE_URL")] - database_url: String, - - #[arg(long, env = "TIPS_INGRESS_WRITER_KAFKA_PROPERTIES_FILE")] - kafka_properties_file: String, - - #[arg(long, env = "TIPS_INGRESS_KAFKA_TOPIC", default_value = "tips-ingress")] - ingress_topic: String, - - #[arg( - long, - env = "TIPS_INGRESS_WRITER_AUDIT_TOPIC", - default_value = "tips-audit" - )] - audit_topic: String, - - #[arg(long, env = "TIPS_INGRESS_WRITER_LOG_LEVEL", default_value = "info")] - log_level: String, -} - -/// IngressWriter consumes bundles sent from the Ingress service and writes them to the datastore -pub struct IngressWriter { - queue_consumer: StreamConsumer, - datastore: Store, - publisher: Publisher, -} - -impl IngressWriter -where - Store: BundleDatastore + Send + Sync + 'static, - Publisher: BundleEventPublisher + Sync + Send + 'static, -{ - pub fn new( - queue_consumer: StreamConsumer, - queue_topic: String, - datastore: Store, - publisher: Publisher, - ) -> Result { - queue_consumer.subscribe(&[queue_topic.as_str()])?; - Ok(Self { - queue_consumer, - datastore, - publisher, - }) - } - - async fn insert_bundle(&self) -> Result<(Uuid, BundleWithMetadata)> { - match self.queue_consumer.recv().await { - Ok(message) => { - let payload = message - .payload() - .ok_or_else(|| anyhow::anyhow!("Message has no payload"))?; - let bundle: BundleWithMetadata = serde_json::from_slice(payload)?; - debug!( - bundle = ?bundle, - offset = message.offset(), - partition = message.partition(), - "Received bundle from queue" - ); - - let insert = || async { - self.datastore - .insert_bundle(bundle.clone()) - .await - .map_err(|e| anyhow::anyhow!("Failed to insert bundle: {e}")) - }; - - let bundle_id = insert - .retry( - &ExponentialBuilder::default() - .with_min_delay(Duration::from_millis(100)) - .with_max_delay(Duration::from_secs(5)) - .with_max_times(3), - ) - .notify(|err: &anyhow::Error, dur: Duration| { - info!("Retrying to insert bundle {:?} after {:?}", err, dur); - }) - .await - .map_err(|e| anyhow::anyhow!("Failed to insert bundle after retries: {e}"))?; - - Ok((bundle_id, bundle)) - } - Err(e) => { - error!(error = %e, "Error receiving message from Kafka"); - Err(e.into()) - } - } - } - - async fn publish(&self, bundle_id: Uuid, bundle: &BundleWithMetadata) { - if let Err(e) = self - .publisher - .publish(BundleEvent::Created { - bundle_id, - bundle: bundle.bundle.clone(), - }) - .await - { - warn!(error = %e, bundle_id = %bundle_id, "Failed to publish BundleEvent::Created"); - } - } -} - -#[tokio::main] -async fn main() -> Result<()> { - dotenvy::dotenv().ok(); - let args = Args::parse(); - - tracing_subscriber::fmt() - .with_env_filter(&args.log_level) - .init(); - - let config = load_kafka_config_from_file(&args.kafka_properties_file)?; - let kafka_producer: FutureProducer = config.create()?; - - let publisher = KafkaBundleEventPublisher::new(kafka_producer, args.audit_topic.clone()); - let consumer = config.create()?; - - let bundle_store = PostgresDatastore::connect(args.database_url).await?; - bundle_store.run_migrations().await?; - - let writer = IngressWriter::new( - consumer, - args.ingress_topic.clone(), - bundle_store, - publisher, - )?; - - info!( - "Ingress Writer service started, consuming from topic: {}", - args.ingress_topic - ); - loop { - match writer.insert_bundle().await { - Ok((bundle_id, bundle)) => { - info!(bundle_id = %bundle_id, "Successfully inserted bundle"); - writer.publish(bundle_id, &bundle).await; - } - Err(e) => { - error!(error = %e, "Failed to process bundle"); - } - } - } -} - -fn load_kafka_config_from_file(properties_file_path: &str) -> Result { - let kafka_properties = fs::read_to_string(properties_file_path)?; - info!("Kafka properties:\n{}", kafka_properties); - - let mut client_config = ClientConfig::new(); - - for line in kafka_properties.lines() { - let line = line.trim(); - if line.is_empty() || line.starts_with('#') { - continue; - } - if let Some((key, value)) = line.split_once('=') { - client_config.set(key.trim(), value.trim()); - } - } - - Ok(client_config) -} diff --git a/crates/maintenance/Cargo.toml b/crates/maintenance/Cargo.toml deleted file mode 100644 index 3037add..0000000 --- a/crates/maintenance/Cargo.toml +++ /dev/null @@ -1,35 +0,0 @@ -[package] -name = "tips-maintenance" -version.workspace = true -rust-version.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true -edition.workspace = true - -[[bin]] -name = "tips-maintenance" -path = "src/main.rs" - -[dependencies] -tips-datastore.workspace = true -tips-audit.workspace = true -op-alloy-consensus.workspace = true -alloy-provider.workspace = true -alloy-primitives.workspace = true -alloy-rpc-types.workspace = true -op-alloy-network.workspace = true -tokio.workspace = true -tracing.workspace = true -tracing-subscriber.workspace = true -anyhow.workspace = true -clap.workspace = true -dotenvy.workspace = true -rdkafka.workspace = true -url.workspace = true -uuid.workspace = true -op-alloy-rpc-types.workspace = true -base-reth-flashblocks-rpc.workspace = true -alloy-rpc-types-mev.workspace = true -sqlx.workspace = true -tips-common.workspace = true diff --git a/crates/maintenance/src/job.rs b/crates/maintenance/src/job.rs deleted file mode 100644 index 1c14b99..0000000 --- a/crates/maintenance/src/job.rs +++ /dev/null @@ -1,505 +0,0 @@ -use crate::Args; -use alloy_primitives::TxHash; -use alloy_primitives::map::HashMap; -use alloy_provider::Provider; -use alloy_rpc_types::BlockId; -use alloy_rpc_types::BlockNumberOrTag::Latest; -use alloy_rpc_types::eth::Block; -use anyhow::Result; -use base_reth_flashblocks_rpc::subscription::{Flashblock, FlashblocksReceiver}; -use op_alloy_consensus::OpTxEnvelope; -use op_alloy_network::eip2718::Decodable2718; -use op_alloy_network::{Optimism, TransactionResponse}; -use op_alloy_rpc_types::Transaction; -use sqlx::types::chrono::Utc; -use std::collections::HashSet; -use std::time::Duration; -use tips_audit::{BundleEvent, BundleEventPublisher, DropReason}; -use tips_common::{BundleState, BundleWithMetadata}; -use tips_datastore::BundleDatastore; -use tips_datastore::postgres::{BlockInfoUpdate, BundleFilter}; -use tokio::sync::mpsc; -use tracing::{debug, error, info, warn}; -use uuid::Uuid; - -pub struct MaintenanceJob, K: BundleEventPublisher> { - pub store: S, - pub node: P, - pub publisher: K, - pub args: Args, - fb_tx: mpsc::UnboundedSender, -} - -impl, K: BundleEventPublisher> MaintenanceJob { - pub fn new( - store: S, - node: P, - publisher: K, - args: Args, - fb_tx: mpsc::UnboundedSender, - ) -> Self { - Self { - store, - node, - publisher, - args, - fb_tx, - } - } - - async fn execute(&self) -> Result<()> { - let latest_block = self - .node - .get_block(BlockId::Number(Latest)) - .full() - .await? - .ok_or_else(|| anyhow::anyhow!("Failed to get latest block"))?; - - debug!( - message = "Executing up to latest block", - block_number = latest_block.number() - ); - - let block_info = self.store.get_current_block_info().await?; - - if let Some(current_block_info) = block_info { - if latest_block.header.number > current_block_info.latest_block_number { - // Process all blocks between stored latest and current latest - for block_num in - (current_block_info.latest_block_number + 1)..=latest_block.header.number - { - debug!(message = "Fetching block number", ?latest_block); - - let block = self - .node - .get_block(BlockId::Number(alloy_rpc_types::BlockNumberOrTag::Number( - block_num, - ))) - .full() - .await? - .ok_or_else(|| anyhow::anyhow!("Failed to get block {block_num}"))?; - - let hash = block.hash(); - self.on_new_block(block).await?; - self.store - .commit_block_info(vec![BlockInfoUpdate { - block_number: block_num, - block_hash: hash, - }]) - .await?; - } - } - } else { - warn!("No block info found in database, initializing with latest block as finalized"); - let block_update = BlockInfoUpdate { - block_number: latest_block.header.number, - block_hash: latest_block.header.hash, - }; - self.store.commit_block_info(vec![block_update]).await?; - self.store - .finalize_blocks_before(latest_block.header.number + 1) - .await?; - } - - // Finalize blocks that are old enough - if latest_block.header.number > self.args.finalization_depth { - self.store - .finalize_blocks_before(latest_block.header.number - self.args.finalization_depth) - .await?; - } - - Ok(()) - } - - async fn periodic_maintenance(&self) -> Result<()> { - let cutoff_time = Utc::now() - Duration::from_secs(self.args.finalization_depth * 2); - - let removed_included_bundle_uuids = - self.store.remove_old_included_bundles(cutoff_time).await?; - - if !removed_included_bundle_uuids.is_empty() { - info!( - deleted_count = removed_included_bundle_uuids.len(), - "Removed old included bundles" - ); - } - - let current_time = Utc::now().timestamp() as u64; - - let expired_bundle_uuids = self.store.remove_timed_out_bundles(current_time).await?; - - if !expired_bundle_uuids.is_empty() { - let events: Vec = expired_bundle_uuids - .iter() - .map(|&bundle_id| BundleEvent::Dropped { - bundle_id, - reason: DropReason::TimedOut, - }) - .collect(); - - self.publisher.publish_all(events).await?; - - info!( - deleted_count = expired_bundle_uuids.len(), - "Deleted expired bundles with timeout" - ); - } - - Ok(()) - } - - pub async fn run(&self, mut fb_rx: mpsc::UnboundedReceiver) -> Result<()> { - let mut maintenance_interval = - tokio::time::interval(Duration::from_millis(self.args.maintenance_interval_ms)); - let mut execution_interval = - tokio::time::interval(Duration::from_millis(self.args.rpc_poll_interval)); - - loop { - tokio::select! { - _ = maintenance_interval.tick() => { - info!(message = "starting maintenance"); - match self.periodic_maintenance().await { - Ok(_) => { - info!(message = "Periodic maintenance completed"); - }, - Err(err) => { - error!(message = "Error in periodic maintenance", error = %err); - } - - } - } - _ = execution_interval.tick() => { - info!(message = "starting execution run"); - match self.execute().await { - Ok(_) => { - info!(message = "Successfully executed maintenance run"); - } - Err(e) => { - error!(message = "Error executing maintenance run", error = %e); - } - } - } - Some(flashblock) = fb_rx.recv() => { - info!(message = "starting flashblock processing"); - match self.process_flashblock(flashblock).await { - Ok(_) => { - info!(message = "Successfully processed flashblock"); - } - Err(e) => { - error!(message = "Error processing flashblock", error = %e); - } - } - } - } - } - } - - pub async fn process_transactions(&self, transaction_hashes: Vec) -> Result> { - let filter = BundleFilter::new() - .with_status(BundleState::Ready) - .with_txn_hashes(transaction_hashes.clone()); - - let bundles = self.store.select_bundles(filter).await?; - - if bundles.is_empty() { - return Ok(vec![]); - } - - let bundle_match = map_transactions_to_bundles(bundles, transaction_hashes); - Ok(bundle_match - .matched - .values() - .map(|uuid_str| Uuid::parse_str(uuid_str).unwrap()) - .collect()) - } - - pub async fn on_new_block(&self, block: Block) -> Result<()> { - let transaction_hashes: Vec = block - .transactions - .as_transactions() - .unwrap_or(&[]) - .iter() - .filter(|tx| !tx.inner.inner.is_deposit()) - .map(|tx| tx.tx_hash()) - .collect(); - - if transaction_hashes.is_empty() { - return Ok(()); - } - - let bundle_uuids = self.process_transactions(transaction_hashes).await?; - - if !bundle_uuids.is_empty() && self.args.update_included_by_builder { - let updated_uuids = self - .store - .update_bundles_state( - bundle_uuids.clone(), - vec![BundleState::Ready], - BundleState::IncludedByBuilder, - ) - .await?; - - info!( - updated_count = updated_uuids.len(), - block_hash = %block.header.hash, - "Updated bundle states to IncludedByBuilder" - ); - } - - let events: Vec = bundle_uuids - .into_iter() - .map(|bundle_id| BundleEvent::BlockIncluded { - bundle_id, - block_number: block.header.number, - block_hash: block.header.hash, - }) - .collect(); - - self.publisher.publish_all(events).await?; - - Ok(()) - } - - async fn process_flashblock(&self, flashblock: Flashblock) -> Result<()> { - let transaction_hashes: Vec = flashblock - .diff - .transactions - .iter() - .map(|tx| OpTxEnvelope::decode_2718_exact(tx).unwrap().tx_hash()) - .collect(); - - if transaction_hashes.is_empty() { - return Ok(()); - } - - let bundle_uuids = self.process_transactions(transaction_hashes).await?; - - let events: Vec = bundle_uuids - .into_iter() - .map(|bundle_id| BundleEvent::FlashblockIncluded { - bundle_id, - block_number: flashblock.metadata.block_number, - flashblock_index: flashblock.index, - }) - .collect(); - - self.publisher.publish_all(events).await?; - - Ok(()) - } -} - -impl, K: BundleEventPublisher> FlashblocksReceiver - for MaintenanceJob -{ - fn on_flashblock_received(&self, flashblock: Flashblock) { - if let Err(e) = self.fb_tx.send(flashblock) { - error!("Failed to send flashblock to queue: {:?}", e); - } - } -} - -struct BundleMatch { - matched: HashMap, - unmatched_transactions: HashSet, - unmatched_bundles: HashSet, -} - -struct TrieNode { - next: HashMap, - bundle_uuid: Option, -} - -impl TrieNode { - fn new() -> Self { - Self { - next: HashMap::default(), - bundle_uuid: None, - } - } - - fn get(&mut self, t: &TxHash) -> &mut TrieNode { - self.next.entry(*t).or_insert_with(TrieNode::new) - } - - fn adv(&self, t: &TxHash) -> Option<&TrieNode> { - self.next.get(t) - } - - fn has_further_items(&self) -> bool { - !self.next.is_empty() - } -} - -/// Map transactions that were included in a block, to the bundles -/// This method only supports two cases, non duplicate single bundle transactions (e.g. standard mempool) -/// or non ambiguous bundles, e.g. [(a,b), (a), (b)] is not supported -fn map_transactions_to_bundles( - bundles: Vec, - transactions: Vec, -) -> BundleMatch { - let bundle_uuids: Vec = bundles - .iter() - .map(|b| b.bundle.replacement_uuid.clone().unwrap()) - .collect(); - - let mut result = BundleMatch { - matched: HashMap::default(), - unmatched_transactions: transactions.iter().copied().collect(), - unmatched_bundles: bundle_uuids.iter().cloned().collect(), - }; - - let mut trie = TrieNode::new(); - for (bundle, uuid) in bundles.into_iter().zip(bundle_uuids.iter()) { - let mut trie_ptr = &mut trie; - for txn in &bundle.txn_hashes { - trie_ptr = trie_ptr.get(txn); - } - trie_ptr.bundle_uuid = Some(uuid.clone()); - } - - let mut i = 0; - while i < transactions.len() { - let mut trie_ptr = ≜ - let mut txn_path = Vec::new(); - let start_index = i; - - while i < transactions.len() { - let txn = transactions[i]; - - if let Some(next_node) = trie_ptr.adv(&txn) { - trie_ptr = next_node; - txn_path.push(txn); - i += 1; - - if let Some(ref bundle_uuid) = trie_ptr.bundle_uuid { - if trie_ptr.has_further_items() { - warn!(message = "ambiguous transaction, in multiple bundles", txn = %txn); - } - - for &path_txn in &txn_path { - result.matched.insert(path_txn, bundle_uuid.clone()); - result.unmatched_transactions.remove(&path_txn); - } - result.unmatched_bundles.remove(bundle_uuid); - break; - } - } else { - i = start_index + 1; - break; - } - } - } - - result -} - -#[cfg(test)] -mod tests { - use super::*; - use alloy_primitives::{TxHash, b256}; - use alloy_rpc_types_mev::EthSendBundle; - use sqlx::types::chrono::Utc; - use tips_common::BundleState; - - const TX_1: TxHash = b256!("1111111111111111111111111111111111111111111111111111111111111111"); - const TX_2: TxHash = b256!("2222222222222222222222222222222222222222222222222222222222222222"); - const TX_3: TxHash = b256!("3333333333333333333333333333333333333333333333333333333333333333"); - const TX_4: TxHash = b256!("4444444444444444444444444444444444444444444444444444444444444444"); - const TX_UNMATCHED: TxHash = - b256!("9999999999999999999999999999999999999999999999999999999999999999"); - - fn create_test_bundle(uuid: &str, txn_hashes: Vec) -> BundleWithMetadata { - let replacement_uuid = Some(uuid.to_string()); - let mut bundle = EthSendBundle::default(); - bundle.replacement_uuid = replacement_uuid; - - BundleWithMetadata { - bundle, - txn_hashes, - senders: vec![], - min_base_fee: 0, - state: BundleState::Ready, - state_changed_at: Utc::now(), - } - } - - #[test] - fn test_empty_inputs() { - let result = map_transactions_to_bundles(vec![], vec![]); - assert!(result.matched.is_empty()); - assert!(result.unmatched_transactions.is_empty()); - assert!(result.unmatched_bundles.is_empty()); - } - - #[test] - fn test_single_transaction_bundles() { - let bundles = vec![ - create_test_bundle("bundle1", vec![TX_1]), - create_test_bundle("bundle2", vec![TX_2]), - create_test_bundle("bundle3", vec![TX_3]), - ]; - let transactions = vec![TX_1, TX_3, TX_2, TX_UNMATCHED]; - - let result = map_transactions_to_bundles(bundles, transactions); - - assert_eq!(result.matched.len(), 3); - assert_eq!(result.unmatched_transactions.len(), 1); - assert!(result.unmatched_transactions.contains(&TX_UNMATCHED)); - assert!(result.unmatched_bundles.is_empty()); - - assert!(result.matched.contains_key(&TX_1)); - assert_eq!(result.matched.get(&TX_1).unwrap(), "bundle1"); - assert!(result.matched.contains_key(&TX_2)); - assert_eq!(result.matched.get(&TX_2).unwrap(), "bundle2"); - assert!(result.matched.contains_key(&TX_3)); - assert_eq!(result.matched.get(&TX_3).unwrap(), "bundle3"); - } - - #[test] - fn test_multi_transaction_bundles() { - let bundles = vec![ - create_test_bundle("bundle1", vec![TX_1, TX_2]), - create_test_bundle("bundle2", vec![TX_3]), - create_test_bundle("bundle3", vec![TX_4]), - ]; - let transactions = vec![TX_1, TX_2, TX_4, TX_3, TX_UNMATCHED]; - let result = map_transactions_to_bundles(bundles, transactions); - - assert_eq!(result.matched.len(), 4); - assert_eq!(result.matched.get(&TX_1).unwrap(), "bundle1"); - assert_eq!(result.matched.get(&TX_2).unwrap(), "bundle1"); - assert_eq!(result.matched.get(&TX_3).unwrap(), "bundle2"); - assert_eq!(result.matched.get(&TX_4).unwrap(), "bundle3"); - assert_eq!(result.unmatched_transactions.len(), 1); - assert!(result.unmatched_transactions.contains(&TX_UNMATCHED)); - } - - #[test] - fn test_partial_bundles_dont_match() { - let bundles = vec![create_test_bundle("bundle1", vec![TX_1, TX_2, TX_3])]; - let transactions = vec![TX_1, TX_2]; - - let result = map_transactions_to_bundles(bundles, transactions); - - assert_eq!(result.matched.len(), 0); - assert_eq!(result.unmatched_transactions.len(), 2); - assert_eq!(result.unmatched_bundles.len(), 1); - } - - #[test] - fn test_ambiguous_bundle_match() { - let bundles = vec![ - create_test_bundle("bundle1", vec![TX_1]), - create_test_bundle("bundle2", vec![TX_1, TX_2]), - ]; - let transactions = vec![TX_1, TX_2]; - - let result = map_transactions_to_bundles(bundles, transactions); - - assert_eq!(result.matched.len(), 1); - assert_eq!(result.matched.get(&TX_1).unwrap(), "bundle1"); - assert!(result.unmatched_transactions.contains(&TX_2)); - assert!(result.unmatched_bundles.contains("bundle2")); - } -} diff --git a/crates/maintenance/src/main.rs b/crates/maintenance/src/main.rs deleted file mode 100644 index d9cc7a6..0000000 --- a/crates/maintenance/src/main.rs +++ /dev/null @@ -1,145 +0,0 @@ -mod job; - -use crate::job::MaintenanceJob; - -use alloy_provider::{ProviderBuilder, RootProvider}; -use anyhow::Result; -use base_reth_flashblocks_rpc::subscription::FlashblocksSubscriber; -use clap::Parser; -use op_alloy_network::Optimism; -use rdkafka::ClientConfig; -use rdkafka::producer::FutureProducer; -use std::fs; -use std::sync::Arc; -use tips_audit::KafkaBundleEventPublisher; -use tips_datastore::PostgresDatastore; -use tracing::{info, warn}; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; -use url::Url; - -#[derive(Parser, Clone)] -#[command(author, version, about, long_about = None)] -pub struct Args { - #[arg(long, env = "TIPS_MAINTENANCE_KAFKA_PROPERTIES_FILE")] - pub kafka_properties_file: String, - - #[arg( - long, - env = "TIPS_MAINTENANCE_KAFKA_TOPIC", - default_value = "tips-audit" - )] - pub kafka_topic: String, - - #[arg(long, env = "TIPS_MAINTENANCE_DATABASE_URL")] - pub database_url: String, - - #[arg(long, env = "TIPS_MAINTENANCE_RPC_URL")] - pub rpc_url: Url, - - #[arg( - long, - env = "TIPS_MAINTENANCE_RPC_POLL_INTERVAL_MS", - default_value = "250" - )] - pub rpc_poll_interval: u64, - - #[arg(long, env = "TIPS_MAINTENANCE_FLASHBLOCKS_WS")] - pub flashblocks_ws: Url, - - #[arg(long, env = "TIPS_MAINTENANCE_LOG_LEVEL", default_value = "info")] - pub log_level: String, - - #[arg(long, env = "TIPS_MAINTENANCE_FINALIZATION_DEPTH", default_value = "4")] - pub finalization_depth: u64, - - #[arg( - long, - env = "TIPS_MAINTENANCE_UPDATE_INCLUDED_BY_BUILDER", - default_value = "true" - )] - pub update_included_by_builder: bool, - - #[arg(long, env = "TIPS_MAINTENANCE_INTERVAL_MS", default_value = "2000")] - pub maintenance_interval_ms: u64, -} - -#[tokio::main] -async fn main() -> Result<()> { - dotenvy::dotenv().ok(); - - let args = Args::parse(); - - let log_level = match args.log_level.to_lowercase().as_str() { - "trace" => tracing::Level::TRACE, - "debug" => tracing::Level::DEBUG, - "info" => tracing::Level::INFO, - "warn" => tracing::Level::WARN, - "error" => tracing::Level::ERROR, - _ => { - warn!( - "Invalid log level '{}', defaulting to 'info'", - args.log_level - ); - tracing::Level::INFO - } - }; - - tracing_subscriber::registry() - .with( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())), - ) - .with(tracing_subscriber::fmt::layer()) - .init(); - - info!("Starting maintenance service"); - - let provider: RootProvider = ProviderBuilder::new() - .disable_recommended_fillers() - .network::() - .connect_http(args.rpc_url.clone()); - - let datastore = PostgresDatastore::connect(args.database_url.clone()).await?; - - let client_config = load_kafka_config_from_file(&args.kafka_properties_file)?; - let kafka_producer: FutureProducer = client_config.create()?; - - let publisher = KafkaBundleEventPublisher::new(kafka_producer, args.kafka_topic.clone()); - - let (fb_tx, fb_rx) = tokio::sync::mpsc::unbounded_channel(); - - let job = Arc::new(MaintenanceJob::new( - datastore, - provider, - publisher, - args.clone(), - fb_tx, - )); - - let mut flashblocks_client = - FlashblocksSubscriber::new(job.clone(), args.flashblocks_ws.clone()); - flashblocks_client.start(); - - job.run(fb_rx).await?; - - Ok(()) -} - -fn load_kafka_config_from_file(properties_file_path: &str) -> Result { - let kafka_properties = fs::read_to_string(properties_file_path)?; - info!("Kafka properties:\n{}", kafka_properties); - - let mut client_config = ClientConfig::new(); - - for line in kafka_properties.lines() { - let line = line.trim(); - if line.is_empty() || line.starts_with('#') { - continue; - } - if let Some((key, value)) = line.split_once('=') { - client_config.set(key.trim(), value.trim()); - } - } - - Ok(client_config) -} diff --git a/docker-compose.tips.yml b/docker-compose.tips.yml index 4eb72dc..6b5d01c 100644 --- a/docker-compose.tips.yml +++ b/docker-compose.tips.yml @@ -27,19 +27,6 @@ services: - ./docker/audit-kafka-properties:/app/docker/audit-kafka-properties:ro restart: unless-stopped - maintenance: - build: - context: . - dockerfile: Dockerfile - command: - - "/app/tips-maintenance" - container_name: tips-maintenance - env_file: - - .env.docker - volumes: - - ./docker/maintenance-kafka-properties:/app/docker/maintenance-kafka-properties:ro - restart: unless-stopped - ui: build: context: . @@ -49,17 +36,4 @@ services: container_name: tips-ui env_file: - .env.docker - restart: unless-stopped - - ingress-writer: - build: - context: . - dockerfile: Dockerfile - command: - - "/app/tips-ingress-writer" - container_name: tips-ingress-writer - env_file: - - .env.docker - volumes: - - ./docker/ingress-writer-kafka-properties:/app/docker/ingress-writer-kafka-properties:ro restart: unless-stopped \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 72fd79e..5791426 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,22 +1,4 @@ services: - postgres: - image: postgres:16 - container_name: tips-db - environment: - POSTGRES_PASSWORD: postgres - POSTGRES_DB: postgres - POSTGRES_USER: postgres - ports: - - "5432:5432" - volumes: - - ./data/postgres:/var/lib/postgresql/data - - ./docker/init-db.sh:/docker-entrypoint-initdb.d/init-db.sh - - ./crates/datastore/migrations:/migrations - healthcheck: - test: [ "CMD-SHELL", "pg_isready -U postgres" ] - interval: 5s - timeout: 5s - retries: 5 kafka: image: confluentinc/cp-kafka:7.5.0 container_name: tips-kafka diff --git a/docker/ingress-writer-kafka-properties b/docker/ingress-writer-kafka-properties deleted file mode 100644 index 03e42bb..0000000 --- a/docker/ingress-writer-kafka-properties +++ /dev/null @@ -1,8 +0,0 @@ -# Kafka configuration properties for ingress writer service -bootstrap.servers=host.docker.internal:9094 -message.timeout.ms=5000 -group.id=local-writer -auto.offset.reset=earliest -enable.partition.eof=false -session.timeout.ms=6000 -enable.auto.commit=true \ No newline at end of file diff --git a/docker/init-db.sh b/docker/init-db.sh deleted file mode 100755 index ac13ad2..0000000 --- a/docker/init-db.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -e - -echo "Running database migrations..." - -for file in /migrations/*.sql; do - if [ -f "$file" ]; then - echo "Applying migration: $(basename "$file")" - psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < "$file" - fi -done - -echo "Database initialization completed successfully" \ No newline at end of file diff --git a/docker/maintenance-kafka-properties b/docker/maintenance-kafka-properties deleted file mode 100644 index a361ef7..0000000 --- a/docker/maintenance-kafka-properties +++ /dev/null @@ -1,3 +0,0 @@ -# Kafka configuration properties for maintenance service -bootstrap.servers=host.docker.internal:9094 -message.timeout.ms=5000 \ No newline at end of file diff --git a/docs/AUDIT_S3_FORMAT.md b/docs/AUDIT_S3_FORMAT.md index 0ea21d5..4ce309c 100644 --- a/docs/AUDIT_S3_FORMAT.md +++ b/docs/AUDIT_S3_FORMAT.md @@ -13,7 +13,7 @@ dervied from the events defined in the [bundle states](./BUNDLE_STATES.md). { "history": [ { - "event": "Created", // Event type (see ./BUNDLE_STATES.md) + "event": "Created", // Event type "timestamp": 1234567890, // timestamp event was written to kafka "key": "-", // used to dedup events "data": { @@ -32,15 +32,6 @@ dervied from the events defined in the [bundle states](./BUNDLE_STATES.md). "builderId": "builder-id" } }, - { - "event": "FlashblockIncluded", - "timestamp": 1234567894, - "key": "-", - "data": { - "blockNumber": 12345, - "flashblockIndex": 1 - }, - }, { "event": "BlockIncluded", "timestamp": 1234567895, diff --git a/docs/BUNDLE_STATES.md b/docs/BUNDLE_STATES.md index 3105c89..7b68f28 100644 --- a/docs/BUNDLE_STATES.md +++ b/docs/BUNDLE_STATES.md @@ -1,27 +1,5 @@ # Bundle States -## States -```mermaid -stateDiagram - [*] --> Ready - Ready --> Dropped - Ready --> IncludedByBuilder - IncludedByBuilder --> Ready: Reorg - IncludedByBuilder --> [*]: After X blocks - Dropped --> [*] -``` -_(this maybe extended to include a NonReady category for nonce gapped transactions etc.)_ - -The builder will load all `READY` transactions, which have a high enough minimum base fee -and are valid for the current block that is being built. - -## Bundle Events - -In addition to the states above, - -- **Received**: - - Received bundle event - - Arguments: (uuid) - **Created**: - Initial bundle creation with transaction list - Arguments: (bundle) @@ -34,9 +12,6 @@ In addition to the states above, - **IncludedByBuilder**: - Bundle included by builder in flashblock - Arguments: (flashblockNum, blockNum, builderId) -- **IncludedInFlashblock**: - - Flashblock containing bundle included in chain - - Arguments: (flashblockNum, blockNum) - **IncludedInBlock**: - Final confirmation in blockchain - Arguments: (blockNum, blockHash) @@ -45,6 +20,7 @@ In addition to the states above, - Arguments: Why(enum Reason) - "TIMEOUT": Bundle expired without inclusion - "INCLUDED_BY_OTHER": Another bundle caused the transactions in this bundle to not be includable + - "REVERTED": A transaction reverted which was not allowed to ### Dropping Transactions Transactions can be dropped because of multiple reasons, all of which are indicated on @@ -62,10 +38,4 @@ the audit log for a transaction. The initial prototype has the following limits: - Global Limits - When the mempool reaches a certain size (TBD), it will be pruned based on a combination of: - Bundle age - - Low base fee - -### Maintenance Job -The limit enforcement and inclusion detection is managed by the maintenance job in -[`crates/maintenance`](https://github.com/base/tips/tree/master/crates/maintenance). It's designed to be idempotent so -that multiple jobs can execute concurrently. As this adds additional load to the BundleStore, it's preferable -to run a low number. \ No newline at end of file + - Low base fee \ No newline at end of file diff --git a/justfile b/justfile index 4c959b6..8dbeaf5 100644 --- a/justfile +++ b/justfile @@ -20,12 +20,6 @@ create-migration name: touch crates/datastore/migrations/$(date +%s)_{{ name }}.sql sync: deps-reset - ### DATABASE ### - cargo sqlx prepare -D postgresql://postgres:postgres@localhost:5432/postgres --workspace --all --no-dotenv - cd ui && npx drizzle-kit pull --dialect=postgresql --url=postgresql://postgres:postgres@localhost:5432/postgres - cd ui && mv ./drizzle/relations.ts ./src/db/ - cd ui && mv ./drizzle/schema.ts ./src/db/ - cd ui && rm -rf ./drizzle ### ENV ### just sync-env ### REFORMAT ### @@ -45,12 +39,12 @@ stop-all: # Start every service running in docker, useful for demos start-all: stop-all - export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && mkdir -p data/postgres data/kafka data/minio && docker compose build && docker compose up -d + export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && mkdir -p data/kafka data/minio && docker compose build && docker compose up -d # Start every service in docker, except the one you're currently working on. e.g. just start-except ui ingress-rpc start-except programs: stop-all #!/bin/bash - all_services=(postgres kafka kafka-setup minio minio-setup ingress-rpc ingres-writer audit maintenance ui) + all_services=(kafka kafka-setup minio minio-setup ingress-rpc audit ui) exclude_services=({{ programs }}) # Create result array with services not in exclude list @@ -68,11 +62,11 @@ start-except programs: stop-all fi done - export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && mkdir -p data/postgres data/kafka data/minio && docker compose build && docker compose up -d ${result_services[@]} + export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && mkdir -p data/kafka data/minio && docker compose build && docker compose up -d ${result_services[@]} ### RUN SERVICES ### deps-reset: - COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml docker compose down && docker compose rm && rm -rf data/ && mkdir -p data/postgres data/kafka data/minio && docker compose up -d + COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml docker compose down && docker compose rm && rm -rf data/ && mkdir -p data/kafka data/minio && docker compose up -d deps: COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml docker compose down && docker compose rm && docker compose up -d diff --git a/ui/drizzle.config.ts b/ui/drizzle.config.ts deleted file mode 100644 index 2ae4233..0000000 --- a/ui/drizzle.config.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { defineConfig } from "drizzle-kit"; - -export default defineConfig({ - schema: "./src/db/schema.ts", - out: "./drizzle", - dialect: "postgresql", - dbCredentials: { - url: - process.env.TIPS_DATABASE_URL || - "postgresql://postgres:postgres@localhost:5432/postgres", - }, -}); diff --git a/ui/package.json b/ui/package.json index a44dcb4..4bb79b1 100644 --- a/ui/package.json +++ b/ui/package.json @@ -11,10 +11,7 @@ }, "dependencies": { "@aws-sdk/client-s3": "^3.888.0", - "drizzle-kit": "^0.31.4", - "drizzle-orm": "^0.44.5", "next": "15.5.3", - "pg": "^8.16.3", "react": "19.1.0", "react-dom": "19.1.0" }, @@ -22,7 +19,6 @@ "@biomejs/biome": "2.2.0", "@tailwindcss/postcss": "^4", "@types/node": "^20", - "@types/pg": "^8.15.5", "@types/react": "^19", "@types/react-dom": "^19", "tailwindcss": "^4", diff --git a/ui/src/app/api/bundles/route.ts b/ui/src/app/api/bundles/route.ts index 085a46a..a927f56 100644 --- a/ui/src/app/api/bundles/route.ts +++ b/ui/src/app/api/bundles/route.ts @@ -1,24 +1,10 @@ import { NextResponse } from "next/server"; -import { db } from "@/db"; -import { bundles } from "@/db/schema"; - -export interface Bundle { - id: string; - txnHashes: string[]; - state: "Ready" | "IncludedByBuilder"; -} +import { listAllBundleKeys } from "@/lib/s3"; export async function GET() { try { - const allBundles = await db - .select({ - id: bundles.id, - txnHashes: bundles.txnHashes, - state: bundles.bundleState, - }) - .from(bundles); - - return NextResponse.json(allBundles); + const bundleKeys = await listAllBundleKeys(); + return NextResponse.json(bundleKeys); } catch (error) { console.error("Error fetching bundles:", error); return NextResponse.json( diff --git a/ui/src/app/bundles/page.tsx b/ui/src/app/bundles/page.tsx index 9896655..17a4226 100644 --- a/ui/src/app/bundles/page.tsx +++ b/ui/src/app/bundles/page.tsx @@ -2,33 +2,22 @@ import Link from "next/link"; import { useCallback, useEffect, useRef, useState } from "react"; -import type { Bundle } from "@/app/api/bundles/route"; export default function BundlesPage() { - const [liveBundles, setLiveBundles] = useState([]); const [allBundles, setAllBundles] = useState([]); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); const [searchHash, setSearchHash] = useState(""); - const [filteredLiveBundles, setFilteredLiveBundles] = useState([]); const [filteredAllBundles, setFilteredAllBundles] = useState([]); const debounceTimeoutRef = useRef(null); const filterBundles = useCallback( - async (searchTerm: string, live: Bundle[], all: string[]) => { + async (searchTerm: string, all: string[]) => { if (!searchTerm.trim()) { - setFilteredLiveBundles(live); setFilteredAllBundles(all); return; } - // Filter live bundles immediately for better UX - const liveBundlesWithTx = live.filter((bundle) => - bundle.txnHashes?.some((hash) => - hash.toLowerCase().includes(searchTerm.toLowerCase()), - ), - ); - let allBundlesWithTx: string[] = []; try { @@ -46,49 +35,31 @@ export default function BundlesPage() { console.error("Error filtering bundles:", err); } - // Batch all state updates together to prevent jitter - setFilteredLiveBundles(liveBundlesWithTx); setFilteredAllBundles(allBundlesWithTx); }, [], ); useEffect(() => { - const fetchLiveBundles = async () => { - try { - const response = await fetch("/api/bundles"); - if (!response.ok) { - setError("Failed to fetch live bundles"); - setLiveBundles([]); - return; - } - const result = await response.json(); - setLiveBundles(result); - setError(null); - } catch (_err) { - setError("Failed to fetch live bundles"); - setLiveBundles([]); - } - }; - const fetchAllBundles = async () => { try { - const response = await fetch("/api/bundles/all"); + const response = await fetch("/api/bundles"); if (!response.ok) { - console.error("Failed to fetch all bundles from S3"); + setError("Failed to fetch bundles"); setAllBundles([]); return; } const result = await response.json(); setAllBundles(result); + setError(null); } catch (_err) { - console.error("Failed to fetch all bundles from S3"); + setError("Failed to fetch bundles"); setAllBundles([]); } }; const fetchData = async () => { - await Promise.all([fetchLiveBundles(), fetchAllBundles()]); + await fetchAllBundles(); setLoading(false); }; @@ -105,12 +76,10 @@ export default function BundlesPage() { } if (!searchHash.trim()) { - // No debounce for clearing search - filterBundles(searchHash, liveBundles, allBundles); + filterBundles(searchHash, allBundles); } else { - // Debounce API calls for non-empty search debounceTimeoutRef.current = setTimeout(() => { - filterBundles(searchHash, liveBundles, allBundles); + filterBundles(searchHash, allBundles); }, 300); } @@ -119,7 +88,7 @@ export default function BundlesPage() { clearTimeout(debounceTimeoutRef.current); } }; - }, [searchHash, liveBundles, allBundles, filterBundles]); + }, [searchHash, allBundles, filterBundles]); if (loading) { return ( @@ -151,55 +120,6 @@ export default function BundlesPage() {
-
-

- Live Bundles - {searchHash.trim() && ( - - ({filteredLiveBundles.length} found) - - )} -

- {filteredLiveBundles.length > 0 ? ( -
    - {filteredLiveBundles.map((bundle) => ( -
  • - -
    - {bundle.id} -
    - - {bundle.state} - - - {bundle.txnHashes?.join(", ") || "No transactions"} - -
    -
    - -
    • - ))} -
- ) : ( -

- {searchHash.trim() - ? "No live bundles found matching this transaction hash." - : "No live bundles found."} -

- )} -
-

All Bundles @@ -225,8 +145,8 @@ export default function BundlesPage() { ) : (

{searchHash.trim() - ? "No bundles found in S3 matching this transaction hash." - : "No bundles found in S3."} + ? "No bundles found matching this transaction hash." + : "No bundles found."}

)}

diff --git a/ui/src/db/index.ts b/ui/src/db/index.ts deleted file mode 100644 index 284ca5a..0000000 --- a/ui/src/db/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { drizzle } from "drizzle-orm/node-postgres"; -import { Pool } from "pg"; -import * as schema from "./schema"; - -const pool = new Pool({ - connectionString: process.env.TIPS_DATABASE_URL, - ssl: { - requestCert: false, - rejectUnauthorized: false, - }, -}); - -export const db = drizzle(pool, { schema }); diff --git a/ui/src/db/relations.ts b/ui/src/db/relations.ts deleted file mode 100644 index e69de29..0000000 diff --git a/ui/src/db/schema.ts b/ui/src/db/schema.ts deleted file mode 100644 index 6b559a0..0000000 --- a/ui/src/db/schema.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { - bigint, - boolean, - char, - pgEnum, - pgTable, - text, - timestamp, - uuid, -} from "drizzle-orm/pg-core"; - -export const bundleState = pgEnum("bundle_state", [ - "Ready", - "IncludedByBuilder", -]); - -export const maintenance = pgTable("maintenance", { - // You can use { mode: "bigint" } if numbers are exceeding js number limitations - blockNumber: bigint("block_number", { mode: "number" }) - .primaryKey() - .notNull(), - blockHash: char("block_hash", { length: 66 }).notNull(), - finalized: boolean().default(false).notNull(), -}); - -export const bundles = pgTable("bundles", { - id: uuid().primaryKey().notNull(), - bundleState: bundleState("bundle_state").notNull(), - stateChangedAt: timestamp("state_changed_at", { - withTimezone: true, - mode: "string", - }) - .defaultNow() - .notNull(), - txnHashes: char("txn_hashes", { length: 66 }).array(), - senders: char({ length: 42 }).array(), - // You can use { mode: "bigint" } if numbers are exceeding js number limitations - minimumBaseFee: bigint("minimum_base_fee", { mode: "number" }), - txs: text().array().notNull(), - revertingTxHashes: char("reverting_tx_hashes", { length: 66 }).array(), - droppingTxHashes: char("dropping_tx_hashes", { length: 66 }).array(), - // You can use { mode: "bigint" } if numbers are exceeding js number limitations - blockNumber: bigint("block_number", { mode: "number" }), - // You can use { mode: "bigint" } if numbers are exceeding js number limitations - minTimestamp: bigint("min_timestamp", { mode: "number" }), - // You can use { mode: "bigint" } if numbers are exceeding js number limitations - maxTimestamp: bigint("max_timestamp", { mode: "number" }), - createdAt: timestamp("created_at", { - withTimezone: true, - mode: "string", - }).notNull(), - updatedAt: timestamp("updated_at", { - withTimezone: true, - mode: "string", - }).notNull(), -}); diff --git a/ui/yarn.lock b/ui/yarn.lock index f7601ef..6eb1375 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -76,447 +76,442 @@ tslib "^2.6.2" "@aws-sdk/client-s3@^3.888.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-3.893.0.tgz#f67643e9dbec34377f62b0159c81543b284d07f6" - integrity sha512-/P74KDJhOijnIAQR93sq1DQn8vbU3WaPZDyy1XUMRJJIY6iEJnDo1toD9XY6AFDz5TRto8/8NbcXT30AMOUtJQ== + version "3.917.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-3.917.0.tgz#835ead98d5a6ddad5662d0f133d377febf43de1e" + integrity sha512-3L73mDCpH7G0koFv3p3WkkEKqC5wn2EznKtNMrJ6hczPIr2Cu6DJz8VHeTZp9wFZLPrIBmh3ZW1KiLujT5Fd2w== dependencies: "@aws-crypto/sha1-browser" "5.2.0" "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.893.0" - "@aws-sdk/credential-provider-node" "3.893.0" - "@aws-sdk/middleware-bucket-endpoint" "3.893.0" - "@aws-sdk/middleware-expect-continue" "3.893.0" - "@aws-sdk/middleware-flexible-checksums" "3.893.0" - "@aws-sdk/middleware-host-header" "3.893.0" - "@aws-sdk/middleware-location-constraint" "3.893.0" - "@aws-sdk/middleware-logger" "3.893.0" - "@aws-sdk/middleware-recursion-detection" "3.893.0" - "@aws-sdk/middleware-sdk-s3" "3.893.0" - "@aws-sdk/middleware-ssec" "3.893.0" - "@aws-sdk/middleware-user-agent" "3.893.0" - "@aws-sdk/region-config-resolver" "3.893.0" - "@aws-sdk/signature-v4-multi-region" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@aws-sdk/util-endpoints" "3.893.0" - "@aws-sdk/util-user-agent-browser" "3.893.0" - "@aws-sdk/util-user-agent-node" "3.893.0" - "@aws-sdk/xml-builder" "3.893.0" - "@smithy/config-resolver" "^4.2.2" - "@smithy/core" "^3.11.1" - "@smithy/eventstream-serde-browser" "^4.1.1" - "@smithy/eventstream-serde-config-resolver" "^4.2.1" - "@smithy/eventstream-serde-node" "^4.1.1" - "@smithy/fetch-http-handler" "^5.2.1" - "@smithy/hash-blob-browser" "^4.1.1" - "@smithy/hash-node" "^4.1.1" - "@smithy/hash-stream-node" "^4.1.1" - "@smithy/invalid-dependency" "^4.1.1" - "@smithy/md5-js" "^4.1.1" - "@smithy/middleware-content-length" "^4.1.1" - "@smithy/middleware-endpoint" "^4.2.3" - "@smithy/middleware-retry" "^4.2.4" - "@smithy/middleware-serde" "^4.1.1" - "@smithy/middleware-stack" "^4.1.1" - "@smithy/node-config-provider" "^4.2.2" - "@smithy/node-http-handler" "^4.2.1" - "@smithy/protocol-http" "^5.2.1" - "@smithy/smithy-client" "^4.6.3" - "@smithy/types" "^4.5.0" - "@smithy/url-parser" "^4.1.1" - "@smithy/util-base64" "^4.1.0" - "@smithy/util-body-length-browser" "^4.1.0" - "@smithy/util-body-length-node" "^4.1.0" - "@smithy/util-defaults-mode-browser" "^4.1.3" - "@smithy/util-defaults-mode-node" "^4.1.3" - "@smithy/util-endpoints" "^3.1.2" - "@smithy/util-middleware" "^4.1.1" - "@smithy/util-retry" "^4.1.2" - "@smithy/util-stream" "^4.3.2" - "@smithy/util-utf8" "^4.1.0" - "@smithy/util-waiter" "^4.1.1" - "@types/uuid" "^9.0.1" - tslib "^2.6.2" - uuid "^9.0.1" - -"@aws-sdk/client-sso@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.893.0.tgz#9ce6e0f08e8c4efc7c2f286c4399d64cb968d1f0" - integrity sha512-0+qRGq7H8UNfxI0F02ObyOgOiYxkN4DSlFfwQUQMPfqENDNYOrL++2H9X3EInyc1lUM/+aK8TZqSbh473gdxcg== + "@aws-sdk/core" "3.916.0" + "@aws-sdk/credential-provider-node" "3.917.0" + "@aws-sdk/middleware-bucket-endpoint" "3.914.0" + "@aws-sdk/middleware-expect-continue" "3.917.0" + "@aws-sdk/middleware-flexible-checksums" "3.916.0" + "@aws-sdk/middleware-host-header" "3.914.0" + "@aws-sdk/middleware-location-constraint" "3.914.0" + "@aws-sdk/middleware-logger" "3.914.0" + "@aws-sdk/middleware-recursion-detection" "3.914.0" + "@aws-sdk/middleware-sdk-s3" "3.916.0" + "@aws-sdk/middleware-ssec" "3.914.0" + "@aws-sdk/middleware-user-agent" "3.916.0" + "@aws-sdk/region-config-resolver" "3.914.0" + "@aws-sdk/signature-v4-multi-region" "3.916.0" + "@aws-sdk/types" "3.914.0" + "@aws-sdk/util-endpoints" "3.916.0" + "@aws-sdk/util-user-agent-browser" "3.914.0" + "@aws-sdk/util-user-agent-node" "3.916.0" + "@aws-sdk/xml-builder" "3.914.0" + "@smithy/config-resolver" "^4.4.0" + "@smithy/core" "^3.17.1" + "@smithy/eventstream-serde-browser" "^4.2.3" + "@smithy/eventstream-serde-config-resolver" "^4.3.3" + "@smithy/eventstream-serde-node" "^4.2.3" + "@smithy/fetch-http-handler" "^5.3.4" + "@smithy/hash-blob-browser" "^4.2.4" + "@smithy/hash-node" "^4.2.3" + "@smithy/hash-stream-node" "^4.2.3" + "@smithy/invalid-dependency" "^4.2.3" + "@smithy/md5-js" "^4.2.3" + "@smithy/middleware-content-length" "^4.2.3" + "@smithy/middleware-endpoint" "^4.3.5" + "@smithy/middleware-retry" "^4.4.5" + "@smithy/middleware-serde" "^4.2.3" + "@smithy/middleware-stack" "^4.2.3" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/node-http-handler" "^4.4.3" + "@smithy/protocol-http" "^5.3.3" + "@smithy/smithy-client" "^4.9.1" + "@smithy/types" "^4.8.0" + "@smithy/url-parser" "^4.2.3" + "@smithy/util-base64" "^4.3.0" + "@smithy/util-body-length-browser" "^4.2.0" + "@smithy/util-body-length-node" "^4.2.1" + "@smithy/util-defaults-mode-browser" "^4.3.4" + "@smithy/util-defaults-mode-node" "^4.2.6" + "@smithy/util-endpoints" "^3.2.3" + "@smithy/util-middleware" "^4.2.3" + "@smithy/util-retry" "^4.2.3" + "@smithy/util-stream" "^4.5.4" + "@smithy/util-utf8" "^4.2.0" + "@smithy/util-waiter" "^4.2.3" + "@smithy/uuid" "^1.1.0" + tslib "^2.6.2" + +"@aws-sdk/client-sso@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.916.0.tgz#627792ab588a004fc0874a060b3466e21328b5b6" + integrity sha512-Eu4PtEUL1MyRvboQnoq5YKg0Z9vAni3ccebykJy615xokVZUdA3di2YxHM/hykDQX7lcUC62q9fVIvh0+UNk/w== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.893.0" - "@aws-sdk/middleware-host-header" "3.893.0" - "@aws-sdk/middleware-logger" "3.893.0" - "@aws-sdk/middleware-recursion-detection" "3.893.0" - "@aws-sdk/middleware-user-agent" "3.893.0" - "@aws-sdk/region-config-resolver" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@aws-sdk/util-endpoints" "3.893.0" - "@aws-sdk/util-user-agent-browser" "3.893.0" - "@aws-sdk/util-user-agent-node" "3.893.0" - "@smithy/config-resolver" "^4.2.2" - "@smithy/core" "^3.11.1" - "@smithy/fetch-http-handler" "^5.2.1" - "@smithy/hash-node" "^4.1.1" - "@smithy/invalid-dependency" "^4.1.1" - "@smithy/middleware-content-length" "^4.1.1" - "@smithy/middleware-endpoint" "^4.2.3" - "@smithy/middleware-retry" "^4.2.4" - "@smithy/middleware-serde" "^4.1.1" - "@smithy/middleware-stack" "^4.1.1" - "@smithy/node-config-provider" "^4.2.2" - "@smithy/node-http-handler" "^4.2.1" - "@smithy/protocol-http" "^5.2.1" - "@smithy/smithy-client" "^4.6.3" - "@smithy/types" "^4.5.0" - "@smithy/url-parser" "^4.1.1" - "@smithy/util-base64" "^4.1.0" - "@smithy/util-body-length-browser" "^4.1.0" - "@smithy/util-body-length-node" "^4.1.0" - "@smithy/util-defaults-mode-browser" "^4.1.3" - "@smithy/util-defaults-mode-node" "^4.1.3" - "@smithy/util-endpoints" "^3.1.2" - "@smithy/util-middleware" "^4.1.1" - "@smithy/util-retry" "^4.1.2" - "@smithy/util-utf8" "^4.1.0" - tslib "^2.6.2" - -"@aws-sdk/core@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.893.0.tgz#afe486bb1ec905a6f73cff99004dd37543986d05" - integrity sha512-E1NAWHOprBXIJ9CVb6oTsRD/tNOozrKBD/Sb4t7WZd3dpby6KpYfM6FaEGfRGcJBIcB4245hww8Rmg16qDMJWg== - dependencies: - "@aws-sdk/types" "3.893.0" - "@aws-sdk/xml-builder" "3.893.0" - "@smithy/core" "^3.11.1" - "@smithy/node-config-provider" "^4.2.2" - "@smithy/property-provider" "^4.1.1" - "@smithy/protocol-http" "^5.2.1" - "@smithy/signature-v4" "^5.2.1" - "@smithy/smithy-client" "^4.6.3" - "@smithy/types" "^4.5.0" - "@smithy/util-base64" "^4.1.0" - "@smithy/util-body-length-browser" "^4.1.0" - "@smithy/util-middleware" "^4.1.1" - "@smithy/util-utf8" "^4.1.0" - fast-xml-parser "5.2.5" - tslib "^2.6.2" - -"@aws-sdk/credential-provider-env@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.893.0.tgz#89931e281c5e9c08f6f107bbb89c86a79334d070" - integrity sha512-h4sYNk1iDrSZQLqFfbuD1GWY6KoVCvourfqPl6JZCYj8Vmnox5y9+7taPxwlU2VVII0hiV8UUbO79P35oPBSyA== - dependencies: - "@aws-sdk/core" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@smithy/property-provider" "^4.1.1" - "@smithy/types" "^4.5.0" - tslib "^2.6.2" - -"@aws-sdk/credential-provider-http@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.893.0.tgz#b3c34d88203c0ae59b71a16435f471f9bbe81c5f" - integrity sha512-xYoC7DRr++zWZ9jG7/hvd6YjCbGDQzsAu2fBHHf91RVmSETXUgdEaP9rOdfCM02iIK/MYlwiWEIVBcBxWY/GQw== - dependencies: - "@aws-sdk/core" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@smithy/fetch-http-handler" "^5.2.1" - "@smithy/node-http-handler" "^4.2.1" - "@smithy/property-provider" "^4.1.1" - "@smithy/protocol-http" "^5.2.1" - "@smithy/smithy-client" "^4.6.3" - "@smithy/types" "^4.5.0" - "@smithy/util-stream" "^4.3.2" - tslib "^2.6.2" - -"@aws-sdk/credential-provider-ini@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.893.0.tgz#617754f4c23e83baf8f1720e3824bfdc102a0f92" - integrity sha512-ZQWOl4jdLhJHHrHsOfNRjgpP98A5kw4YzkMOUoK+TgSQVLi7wjb957V0htvwpi6KmGr3f2F8J06D6u2OtIc62w== - dependencies: - "@aws-sdk/core" "3.893.0" - "@aws-sdk/credential-provider-env" "3.893.0" - "@aws-sdk/credential-provider-http" "3.893.0" - "@aws-sdk/credential-provider-process" "3.893.0" - "@aws-sdk/credential-provider-sso" "3.893.0" - "@aws-sdk/credential-provider-web-identity" "3.893.0" - "@aws-sdk/nested-clients" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@smithy/credential-provider-imds" "^4.1.2" - "@smithy/property-provider" "^4.1.1" - "@smithy/shared-ini-file-loader" "^4.2.0" - "@smithy/types" "^4.5.0" - tslib "^2.6.2" - -"@aws-sdk/credential-provider-node@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.893.0.tgz#e8d1bb203e8fb14dcac4f9d573db649320528631" - integrity sha512-NjvDUXciC2+EaQnbL/u/ZuCXj9PZQ/9ciPhI62LGCoJ3ft91lI1Z58Dgut0OFPpV6i16GhpFxzmbuf40wTgDbA== - dependencies: - "@aws-sdk/credential-provider-env" "3.893.0" - "@aws-sdk/credential-provider-http" "3.893.0" - "@aws-sdk/credential-provider-ini" "3.893.0" - "@aws-sdk/credential-provider-process" "3.893.0" - "@aws-sdk/credential-provider-sso" "3.893.0" - "@aws-sdk/credential-provider-web-identity" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@smithy/credential-provider-imds" "^4.1.2" - "@smithy/property-provider" "^4.1.1" - "@smithy/shared-ini-file-loader" "^4.2.0" - "@smithy/types" "^4.5.0" - tslib "^2.6.2" - -"@aws-sdk/credential-provider-process@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.893.0.tgz#83a09fcf58a917977e5d0d9765d09c9bbdeced9c" - integrity sha512-5XitkZdiQhjWJV71qWqrH7hMXwuK/TvIRwiwKs7Pj0sapGSk3YgD3Ykdlolz7sQOleoKWYYqgoq73fIPpTTmFA== - dependencies: - "@aws-sdk/core" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@smithy/property-provider" "^4.1.1" - "@smithy/shared-ini-file-loader" "^4.2.0" - "@smithy/types" "^4.5.0" - tslib "^2.6.2" - -"@aws-sdk/credential-provider-sso@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.893.0.tgz#738b6583512538a5c7db4636a2aa705bb48f50f1" - integrity sha512-ms8v13G1r0aHZh5PLcJu6AnQZPs23sRm3Ph0A7+GdqbPvWewP8M7jgZTKyTXi+oYXswdYECU1zPVur8zamhtLg== - dependencies: - "@aws-sdk/client-sso" "3.893.0" - "@aws-sdk/core" "3.893.0" - "@aws-sdk/token-providers" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@smithy/property-provider" "^4.1.1" - "@smithy/shared-ini-file-loader" "^4.2.0" - "@smithy/types" "^4.5.0" - tslib "^2.6.2" - -"@aws-sdk/credential-provider-web-identity@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.893.0.tgz#3c0b00127755b6a760c87742fd2d3c22473fdae0" - integrity sha512-wWD8r2ot4jf/CoogdPTl13HbwNLW4UheGUCu6gW7n9GoHh1JImYyooPHK8K7kD42hihydIA7OW7iFAf7//JYTw== - dependencies: - "@aws-sdk/core" "3.893.0" - "@aws-sdk/nested-clients" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@smithy/property-provider" "^4.1.1" - "@smithy/shared-ini-file-loader" "^4.2.0" - "@smithy/types" "^4.5.0" - tslib "^2.6.2" - -"@aws-sdk/middleware-bucket-endpoint@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.893.0.tgz#cf1b55edd6eb48a5e02cae57eddb2e467bb8ecd5" - integrity sha512-H+wMAoFC73T7M54OFIezdHXR9/lH8TZ3Cx1C3MEBb2ctlzQrVCd8LX8zmOtcGYC8plrRwV+8rNPe0FMqecLRew== - dependencies: - "@aws-sdk/types" "3.893.0" + "@aws-sdk/core" "3.916.0" + "@aws-sdk/middleware-host-header" "3.914.0" + "@aws-sdk/middleware-logger" "3.914.0" + "@aws-sdk/middleware-recursion-detection" "3.914.0" + "@aws-sdk/middleware-user-agent" "3.916.0" + "@aws-sdk/region-config-resolver" "3.914.0" + "@aws-sdk/types" "3.914.0" + "@aws-sdk/util-endpoints" "3.916.0" + "@aws-sdk/util-user-agent-browser" "3.914.0" + "@aws-sdk/util-user-agent-node" "3.916.0" + "@smithy/config-resolver" "^4.4.0" + "@smithy/core" "^3.17.1" + "@smithy/fetch-http-handler" "^5.3.4" + "@smithy/hash-node" "^4.2.3" + "@smithy/invalid-dependency" "^4.2.3" + "@smithy/middleware-content-length" "^4.2.3" + "@smithy/middleware-endpoint" "^4.3.5" + "@smithy/middleware-retry" "^4.4.5" + "@smithy/middleware-serde" "^4.2.3" + "@smithy/middleware-stack" "^4.2.3" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/node-http-handler" "^4.4.3" + "@smithy/protocol-http" "^5.3.3" + "@smithy/smithy-client" "^4.9.1" + "@smithy/types" "^4.8.0" + "@smithy/url-parser" "^4.2.3" + "@smithy/util-base64" "^4.3.0" + "@smithy/util-body-length-browser" "^4.2.0" + "@smithy/util-body-length-node" "^4.2.1" + "@smithy/util-defaults-mode-browser" "^4.3.4" + "@smithy/util-defaults-mode-node" "^4.2.6" + "@smithy/util-endpoints" "^3.2.3" + "@smithy/util-middleware" "^4.2.3" + "@smithy/util-retry" "^4.2.3" + "@smithy/util-utf8" "^4.2.0" + tslib "^2.6.2" + +"@aws-sdk/core@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.916.0.tgz#ea11b485f837f1773e174f8a4ed82ecce9f163f7" + integrity sha512-1JHE5s6MD5PKGovmx/F1e01hUbds/1y3X8rD+Gvi/gWVfdg5noO7ZCerpRsWgfzgvCMZC9VicopBqNHCKLykZA== + dependencies: + "@aws-sdk/types" "3.914.0" + "@aws-sdk/xml-builder" "3.914.0" + "@smithy/core" "^3.17.1" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/property-provider" "^4.2.3" + "@smithy/protocol-http" "^5.3.3" + "@smithy/signature-v4" "^5.3.3" + "@smithy/smithy-client" "^4.9.1" + "@smithy/types" "^4.8.0" + "@smithy/util-base64" "^4.3.0" + "@smithy/util-middleware" "^4.2.3" + "@smithy/util-utf8" "^4.2.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-env@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.916.0.tgz#c76861ec87f9edf227af62474411bf54ca04805d" + integrity sha512-3gDeqOXcBRXGHScc6xb7358Lyf64NRG2P08g6Bu5mv1Vbg9PKDyCAZvhKLkG7hkdfAM8Yc6UJNhbFxr1ud/tCQ== + dependencies: + "@aws-sdk/core" "3.916.0" + "@aws-sdk/types" "3.914.0" + "@smithy/property-provider" "^4.2.3" + "@smithy/types" "^4.8.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-http@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.916.0.tgz#b46e51c5cc65364c5fde752b4d016b5b747c6d89" + integrity sha512-NmooA5Z4/kPFJdsyoJgDxuqXC1C6oPMmreJjbOPqcwo6E/h2jxaG8utlQFgXe5F9FeJsMx668dtxVxSYnAAqHQ== + dependencies: + "@aws-sdk/core" "3.916.0" + "@aws-sdk/types" "3.914.0" + "@smithy/fetch-http-handler" "^5.3.4" + "@smithy/node-http-handler" "^4.4.3" + "@smithy/property-provider" "^4.2.3" + "@smithy/protocol-http" "^5.3.3" + "@smithy/smithy-client" "^4.9.1" + "@smithy/types" "^4.8.0" + "@smithy/util-stream" "^4.5.4" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-ini@3.917.0": + version "3.917.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.917.0.tgz#d9255ffeaab2326e94e84a830668aa4182317294" + integrity sha512-rvQ0QamLySRq+Okc0ZqFHZ3Fbvj3tYuWNIlzyEKklNmw5X5PM1idYKlOJflY2dvUGkIqY3lUC9SC2WL+1s7KIw== + dependencies: + "@aws-sdk/core" "3.916.0" + "@aws-sdk/credential-provider-env" "3.916.0" + "@aws-sdk/credential-provider-http" "3.916.0" + "@aws-sdk/credential-provider-process" "3.916.0" + "@aws-sdk/credential-provider-sso" "3.916.0" + "@aws-sdk/credential-provider-web-identity" "3.917.0" + "@aws-sdk/nested-clients" "3.916.0" + "@aws-sdk/types" "3.914.0" + "@smithy/credential-provider-imds" "^4.2.3" + "@smithy/property-provider" "^4.2.3" + "@smithy/shared-ini-file-loader" "^4.3.3" + "@smithy/types" "^4.8.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-node@3.917.0": + version "3.917.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.917.0.tgz#a508038c12dc5ba177cc27ff0c26ea48d3702125" + integrity sha512-n7HUJ+TgU9wV/Z46yR1rqD9hUjfG50AKi+b5UXTlaDlVD8bckg40i77ROCllp53h32xQj/7H0yBIYyphwzLtmg== + dependencies: + "@aws-sdk/credential-provider-env" "3.916.0" + "@aws-sdk/credential-provider-http" "3.916.0" + "@aws-sdk/credential-provider-ini" "3.917.0" + "@aws-sdk/credential-provider-process" "3.916.0" + "@aws-sdk/credential-provider-sso" "3.916.0" + "@aws-sdk/credential-provider-web-identity" "3.917.0" + "@aws-sdk/types" "3.914.0" + "@smithy/credential-provider-imds" "^4.2.3" + "@smithy/property-provider" "^4.2.3" + "@smithy/shared-ini-file-loader" "^4.3.3" + "@smithy/types" "^4.8.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-process@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.916.0.tgz#7c5aa9642a0e1c2a2791d85fe1bedfecae73672e" + integrity sha512-SXDyDvpJ1+WbotZDLJW1lqP6gYGaXfZJrgFSXIuZjHb75fKeNRgPkQX/wZDdUvCwdrscvxmtyJorp2sVYkMcvA== + dependencies: + "@aws-sdk/core" "3.916.0" + "@aws-sdk/types" "3.914.0" + "@smithy/property-provider" "^4.2.3" + "@smithy/shared-ini-file-loader" "^4.3.3" + "@smithy/types" "^4.8.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-sso@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.916.0.tgz#b99ff591e758a56eefe7b05f1e77efe8f28f8c16" + integrity sha512-gu9D+c+U/Dp1AKBcVxYHNNoZF9uD4wjAKYCjgSN37j4tDsazwMEylbbZLuRNuxfbXtizbo4/TiaxBXDbWM7AkQ== + dependencies: + "@aws-sdk/client-sso" "3.916.0" + "@aws-sdk/core" "3.916.0" + "@aws-sdk/token-providers" "3.916.0" + "@aws-sdk/types" "3.914.0" + "@smithy/property-provider" "^4.2.3" + "@smithy/shared-ini-file-loader" "^4.3.3" + "@smithy/types" "^4.8.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-web-identity@3.917.0": + version "3.917.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.917.0.tgz#4a9bdc3dae13f5802aaa2d6e51249dfed029d9d6" + integrity sha512-pZncQhFbwW04pB0jcD5OFv3x2gAddDYCVxyJVixgyhSw7bKCYxqu6ramfq1NxyVpmm+qsw+ijwi/3cCmhUHF/A== + dependencies: + "@aws-sdk/core" "3.916.0" + "@aws-sdk/nested-clients" "3.916.0" + "@aws-sdk/types" "3.914.0" + "@smithy/property-provider" "^4.2.3" + "@smithy/shared-ini-file-loader" "^4.3.3" + "@smithy/types" "^4.8.0" + tslib "^2.6.2" + +"@aws-sdk/middleware-bucket-endpoint@3.914.0": + version "3.914.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.914.0.tgz#4500425660d45af30e1bb66d8ce9362e040b9c7d" + integrity sha512-mHLsVnPPp4iq3gL2oEBamfpeETFV0qzxRHmcnCfEP3hualV8YF8jbXGmwPCPopUPQDpbYDBHYtXaoClZikCWPQ== + dependencies: + "@aws-sdk/types" "3.914.0" "@aws-sdk/util-arn-parser" "3.893.0" - "@smithy/node-config-provider" "^4.2.2" - "@smithy/protocol-http" "^5.2.1" - "@smithy/types" "^4.5.0" - "@smithy/util-config-provider" "^4.1.0" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/protocol-http" "^5.3.3" + "@smithy/types" "^4.8.0" + "@smithy/util-config-provider" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/middleware-expect-continue@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.893.0.tgz#af9e96f24d9323afe833db1e6c03a7791a24dd09" - integrity sha512-PEZkvD6k0X9sacHkvkVF4t2QyQEAzd35OJ2bIrjWCfc862TwukMMJ1KErRmQ1WqKXHKF4L0ed5vtWaO/8jVLNA== +"@aws-sdk/middleware-expect-continue@3.917.0": + version "3.917.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.917.0.tgz#f0e0cacad99d048c46cdce8f9dbe47351e59a0f5" + integrity sha512-UPBq1ZP2CaxwbncWSbVqkhYXQrmfNiqAtHyBxi413hjRVZ4JhQ1UyH7pz5yqiG8zx2/+Po8cUD4SDUwJgda4nw== dependencies: - "@aws-sdk/types" "3.893.0" - "@smithy/protocol-http" "^5.2.1" - "@smithy/types" "^4.5.0" + "@aws-sdk/types" "3.914.0" + "@smithy/protocol-http" "^5.3.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@aws-sdk/middleware-flexible-checksums@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.893.0.tgz#5aedb154ddd9f9662b411d9d065895275b630670" - integrity sha512-2swRPpyGK6xpZwIFmmFSFKp10iuyBLZEouhrt1ycBVA8iHGmPkuJSCim6Vb+JoRKqINp5tizWeQwdg9boIxJPw== +"@aws-sdk/middleware-flexible-checksums@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.916.0.tgz#ecbec3baf54e79dae04f1fd19f21041482928239" + integrity sha512-CBRRg6slHHBYAm26AWY/pECHK0vVO/peDoNhZiAzUNt4jV6VftotjszEJ904pKGOr7/86CfZxtCnP3CCs3lQjA== dependencies: "@aws-crypto/crc32" "5.2.0" "@aws-crypto/crc32c" "5.2.0" "@aws-crypto/util" "5.2.0" - "@aws-sdk/core" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@smithy/is-array-buffer" "^4.1.0" - "@smithy/node-config-provider" "^4.2.2" - "@smithy/protocol-http" "^5.2.1" - "@smithy/types" "^4.5.0" - "@smithy/util-middleware" "^4.1.1" - "@smithy/util-stream" "^4.3.2" - "@smithy/util-utf8" "^4.1.0" - tslib "^2.6.2" - -"@aws-sdk/middleware-host-header@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.893.0.tgz#1a4b14c11cff158b383e2b859be5c468d2c2c162" - integrity sha512-qL5xYRt80ahDfj9nDYLhpCNkDinEXvjLe/Qen/Y/u12+djrR2MB4DRa6mzBCkLkdXDtf0WAoW2EZsNCfGrmOEQ== - dependencies: - "@aws-sdk/types" "3.893.0" - "@smithy/protocol-http" "^5.2.1" - "@smithy/types" "^4.5.0" - tslib "^2.6.2" - -"@aws-sdk/middleware-location-constraint@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.893.0.tgz#4c032b7b4f7dab699ca78a47054551fd8e18dfb3" - integrity sha512-MlbBc7Ttb1ekbeeeFBU4DeEZOLb5s0Vl4IokvO17g6yJdLk4dnvZro9zdXl3e7NXK+kFxHRBFZe55p/42mVgDA== - dependencies: - "@aws-sdk/types" "3.893.0" - "@smithy/types" "^4.5.0" + "@aws-sdk/core" "3.916.0" + "@aws-sdk/types" "3.914.0" + "@smithy/is-array-buffer" "^4.2.0" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/protocol-http" "^5.3.3" + "@smithy/types" "^4.8.0" + "@smithy/util-middleware" "^4.2.3" + "@smithy/util-stream" "^4.5.4" + "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/middleware-logger@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.893.0.tgz#4ecb20ee0771a2f3afdc07c1310b97251d3854e2" - integrity sha512-ZqzMecjju5zkBquSIfVfCORI/3Mge21nUY4nWaGQy+NUXehqCGG4W7AiVpiHGOcY2cGJa7xeEkYcr2E2U9U0AA== +"@aws-sdk/middleware-host-header@3.914.0": + version "3.914.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.914.0.tgz#7e962c3d18c1ecc98606eab09a98dcf1b3402835" + integrity sha512-7r9ToySQ15+iIgXMF/h616PcQStByylVkCshmQqcdeynD/lCn2l667ynckxW4+ql0Q+Bo/URljuhJRxVJzydNA== dependencies: - "@aws-sdk/types" "3.893.0" - "@smithy/types" "^4.5.0" + "@aws-sdk/types" "3.914.0" + "@smithy/protocol-http" "^5.3.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@aws-sdk/middleware-recursion-detection@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.893.0.tgz#9fde6f10e72fcbd8ce4f0eea629c07ca64ce86ba" - integrity sha512-H7Zotd9zUHQAr/wr3bcWHULYhEeoQrF54artgsoUGIf/9emv6LzY89QUccKIxYd6oHKNTrTyXm9F0ZZrzXNxlg== +"@aws-sdk/middleware-location-constraint@3.914.0": + version "3.914.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.914.0.tgz#ee877bdaa54746f65919fa54685ef392256bfb19" + integrity sha512-Mpd0Sm9+GN7TBqGnZg1+dO5QZ/EOYEcDTo7KfvoyrXScMlxvYm9fdrUVMmLdPn/lntweZGV3uNrs+huasGOOTA== dependencies: - "@aws-sdk/types" "3.893.0" - "@aws/lambda-invoke-store" "^0.0.1" - "@smithy/protocol-http" "^5.2.1" - "@smithy/types" "^4.5.0" + "@aws-sdk/types" "3.914.0" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@aws-sdk/middleware-sdk-s3@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.893.0.tgz#2a49a828ddaad026348e40a0bd00b9959ebf81c1" - integrity sha512-J2v7jOoSlE4o416yQiuka6+cVJzyrU7mbJEQA9VFCb+TYT2cG3xQB0bDzE24QoHeonpeBDghbg/zamYMnt+GsQ== +"@aws-sdk/middleware-logger@3.914.0": + version "3.914.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.914.0.tgz#222d50ec69447715d6954eb6db0029f11576227b" + integrity sha512-/gaW2VENS5vKvJbcE1umV4Ag3NuiVzpsANxtrqISxT3ovyro29o1RezW/Avz/6oJqjnmgz8soe9J1t65jJdiNg== dependencies: - "@aws-sdk/core" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@aws-sdk/util-arn-parser" "3.893.0" - "@smithy/core" "^3.11.1" - "@smithy/node-config-provider" "^4.2.2" - "@smithy/protocol-http" "^5.2.1" - "@smithy/signature-v4" "^5.2.1" - "@smithy/smithy-client" "^4.6.3" - "@smithy/types" "^4.5.0" - "@smithy/util-config-provider" "^4.1.0" - "@smithy/util-middleware" "^4.1.1" - "@smithy/util-stream" "^4.3.2" - "@smithy/util-utf8" "^4.1.0" - tslib "^2.6.2" - -"@aws-sdk/middleware-ssec@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-ssec/-/middleware-ssec-3.893.0.tgz#34ebc4e834d6412a64ce85376d7712a996b2d4db" - integrity sha512-e4ccCiAnczv9mMPheKjgKxZQN473mcup+3DPLVNnIw5GRbQoDqPSB70nUzfORKZvM7ar7xLMPxNR8qQgo1C8Rg== - dependencies: - "@aws-sdk/types" "3.893.0" - "@smithy/types" "^4.5.0" + "@aws-sdk/types" "3.914.0" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.893.0.tgz#b6175e4df8d6bf85fb01fafab5b2794b345b32c8" - integrity sha512-n1vHj7bdC4ycIAKkny0rmgvgvGOIgYnGBAqfPAFPR26WuGWmCxH2cT9nQTNA+li8ofxX9F9FIFBTKkW92Pc8iQ== +"@aws-sdk/middleware-recursion-detection@3.914.0": + version "3.914.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.914.0.tgz#bf65759cf303f271b22770e7f9675034b4ced946" + integrity sha512-yiAjQKs5S2JKYc+GrkvGMwkUvhepXDigEXpSJqUseR/IrqHhvGNuOxDxq+8LbDhM4ajEW81wkiBbU+Jl9G82yQ== dependencies: - "@aws-sdk/core" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@aws-sdk/util-endpoints" "3.893.0" - "@smithy/core" "^3.11.1" - "@smithy/protocol-http" "^5.2.1" - "@smithy/types" "^4.5.0" + "@aws-sdk/types" "3.914.0" + "@aws/lambda-invoke-store" "^0.0.1" + "@smithy/protocol-http" "^5.3.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@aws-sdk/nested-clients@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.893.0.tgz#96d469503c4bcbc41cda4e7a9f10b3096238ce26" - integrity sha512-HIUCyNtWkxvc0BmaJPUj/A0/29OapT/dzBNxr2sjgKNZgO81JuDFp+aXCmnf7vQoA2D1RzCsAIgEtfTExNFZqA== +"@aws-sdk/middleware-sdk-s3@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.916.0.tgz#5c1cc4645186b3c0f7ac5f6a897885af0b62198e" + integrity sha512-pjmzzjkEkpJObzmTthqJPq/P13KoNFuEi/x5PISlzJtHofCNcyXeVAQ90yvY2dQ6UXHf511Rh1/ytiKy2A8M0g== dependencies: - "@aws-crypto/sha256-browser" "5.2.0" - "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.893.0" - "@aws-sdk/middleware-host-header" "3.893.0" - "@aws-sdk/middleware-logger" "3.893.0" - "@aws-sdk/middleware-recursion-detection" "3.893.0" - "@aws-sdk/middleware-user-agent" "3.893.0" - "@aws-sdk/region-config-resolver" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@aws-sdk/util-endpoints" "3.893.0" - "@aws-sdk/util-user-agent-browser" "3.893.0" - "@aws-sdk/util-user-agent-node" "3.893.0" - "@smithy/config-resolver" "^4.2.2" - "@smithy/core" "^3.11.1" - "@smithy/fetch-http-handler" "^5.2.1" - "@smithy/hash-node" "^4.1.1" - "@smithy/invalid-dependency" "^4.1.1" - "@smithy/middleware-content-length" "^4.1.1" - "@smithy/middleware-endpoint" "^4.2.3" - "@smithy/middleware-retry" "^4.2.4" - "@smithy/middleware-serde" "^4.1.1" - "@smithy/middleware-stack" "^4.1.1" - "@smithy/node-config-provider" "^4.2.2" - "@smithy/node-http-handler" "^4.2.1" - "@smithy/protocol-http" "^5.2.1" - "@smithy/smithy-client" "^4.6.3" - "@smithy/types" "^4.5.0" - "@smithy/url-parser" "^4.1.1" - "@smithy/util-base64" "^4.1.0" - "@smithy/util-body-length-browser" "^4.1.0" - "@smithy/util-body-length-node" "^4.1.0" - "@smithy/util-defaults-mode-browser" "^4.1.3" - "@smithy/util-defaults-mode-node" "^4.1.3" - "@smithy/util-endpoints" "^3.1.2" - "@smithy/util-middleware" "^4.1.1" - "@smithy/util-retry" "^4.1.2" - "@smithy/util-utf8" "^4.1.0" - tslib "^2.6.2" - -"@aws-sdk/region-config-resolver@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.893.0.tgz#570dfd2314b3f71eb263557bb06fea36b5188cd6" - integrity sha512-/cJvh3Zsa+Of0Zbg7vl9wp/kZtdb40yk/2+XcroAMVPO9hPvmS9r/UOm6tO7FeX4TtkRFwWaQJiTZTgSdsPY+Q== - dependencies: - "@aws-sdk/types" "3.893.0" - "@smithy/node-config-provider" "^4.2.2" - "@smithy/types" "^4.5.0" - "@smithy/util-config-provider" "^4.1.0" - "@smithy/util-middleware" "^4.1.1" + "@aws-sdk/core" "3.916.0" + "@aws-sdk/types" "3.914.0" + "@aws-sdk/util-arn-parser" "3.893.0" + "@smithy/core" "^3.17.1" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/protocol-http" "^5.3.3" + "@smithy/signature-v4" "^5.3.3" + "@smithy/smithy-client" "^4.9.1" + "@smithy/types" "^4.8.0" + "@smithy/util-config-provider" "^4.2.0" + "@smithy/util-middleware" "^4.2.3" + "@smithy/util-stream" "^4.5.4" + "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/signature-v4-multi-region@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.893.0.tgz#dc68ffa431db24791d4c1faf458b651093001de9" - integrity sha512-pp4Bn8dL4i68P/mHgZ7sgkm8OSIpwjtGxP73oGseu9Cli0JRyJ1asTSsT60hUz3sbo+3oKk3hEobD6UxLUeGRA== +"@aws-sdk/middleware-ssec@3.914.0": + version "3.914.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-ssec/-/middleware-ssec-3.914.0.tgz#4042dfed7a4d4234e37a84bab9d1cd9998a22180" + integrity sha512-V1Oae/oLVbpNb9uWs+v80GKylZCdsbqs2c2Xb1FsAUPtYeSnxFuAWsF3/2AEMSSpFe0dTC5KyWr/eKl2aim9VQ== dependencies: - "@aws-sdk/middleware-sdk-s3" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@smithy/protocol-http" "^5.2.1" - "@smithy/signature-v4" "^5.2.1" - "@smithy/types" "^4.5.0" + "@aws-sdk/types" "3.914.0" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@aws-sdk/token-providers@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.893.0.tgz#f4e08f1837f3a103a60c3c2261a48a66103e19bb" - integrity sha512-nkzuE910TxW4pnIwJ+9xDMx5m+A8iXGM16Oa838YKsds07cgkRp7sPnpH9B8NbGK2szskAAkXfj7t1f59EKd1Q== +"@aws-sdk/middleware-user-agent@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.916.0.tgz#a0894ae6d70d7a81b2572ee69ed0d3049d39dfce" + integrity sha512-mzF5AdrpQXc2SOmAoaQeHpDFsK2GE6EGcEACeNuoESluPI2uYMpuuNMYrUufdnIAIyqgKlis0NVxiahA5jG42w== dependencies: - "@aws-sdk/core" "3.893.0" - "@aws-sdk/nested-clients" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@smithy/property-provider" "^4.1.1" - "@smithy/shared-ini-file-loader" "^4.2.0" - "@smithy/types" "^4.5.0" + "@aws-sdk/core" "3.916.0" + "@aws-sdk/types" "3.914.0" + "@aws-sdk/util-endpoints" "3.916.0" + "@smithy/core" "^3.17.1" + "@smithy/protocol-http" "^5.3.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@aws-sdk/types@3.893.0", "@aws-sdk/types@^3.222.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.893.0.tgz#1afbdb9d62bf86caeac380e3cac11a051076400a" - integrity sha512-Aht1nn5SnA0N+Tjv0dzhAY7CQbxVtmq1bBR6xI0MhG7p2XYVh1wXuKTzrldEvQWwA3odOYunAfT9aBiKZx9qIg== +"@aws-sdk/nested-clients@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.916.0.tgz#2f79b924dd6c25cc3c40f6a0453097ae7a512702" + integrity sha512-tgg8e8AnVAer0rcgeWucFJ/uNN67TbTiDHfD+zIOPKep0Z61mrHEoeT/X8WxGIOkEn4W6nMpmS4ii8P42rNtnA== dependencies: - "@smithy/types" "^4.5.0" + "@aws-crypto/sha256-browser" "5.2.0" + "@aws-crypto/sha256-js" "5.2.0" + "@aws-sdk/core" "3.916.0" + "@aws-sdk/middleware-host-header" "3.914.0" + "@aws-sdk/middleware-logger" "3.914.0" + "@aws-sdk/middleware-recursion-detection" "3.914.0" + "@aws-sdk/middleware-user-agent" "3.916.0" + "@aws-sdk/region-config-resolver" "3.914.0" + "@aws-sdk/types" "3.914.0" + "@aws-sdk/util-endpoints" "3.916.0" + "@aws-sdk/util-user-agent-browser" "3.914.0" + "@aws-sdk/util-user-agent-node" "3.916.0" + "@smithy/config-resolver" "^4.4.0" + "@smithy/core" "^3.17.1" + "@smithy/fetch-http-handler" "^5.3.4" + "@smithy/hash-node" "^4.2.3" + "@smithy/invalid-dependency" "^4.2.3" + "@smithy/middleware-content-length" "^4.2.3" + "@smithy/middleware-endpoint" "^4.3.5" + "@smithy/middleware-retry" "^4.4.5" + "@smithy/middleware-serde" "^4.2.3" + "@smithy/middleware-stack" "^4.2.3" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/node-http-handler" "^4.4.3" + "@smithy/protocol-http" "^5.3.3" + "@smithy/smithy-client" "^4.9.1" + "@smithy/types" "^4.8.0" + "@smithy/url-parser" "^4.2.3" + "@smithy/util-base64" "^4.3.0" + "@smithy/util-body-length-browser" "^4.2.0" + "@smithy/util-body-length-node" "^4.2.1" + "@smithy/util-defaults-mode-browser" "^4.3.4" + "@smithy/util-defaults-mode-node" "^4.2.6" + "@smithy/util-endpoints" "^3.2.3" + "@smithy/util-middleware" "^4.2.3" + "@smithy/util-retry" "^4.2.3" + "@smithy/util-utf8" "^4.2.0" + tslib "^2.6.2" + +"@aws-sdk/region-config-resolver@3.914.0": + version "3.914.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.914.0.tgz#b6d2825081195ce1c634b8c92b1e19b08f140008" + integrity sha512-KlmHhRbn1qdwXUdsdrJ7S/MAkkC1jLpQ11n+XvxUUUCGAJd1gjC7AjxPZUM7ieQ2zcb8bfEzIU7al+Q3ZT0u7Q== + dependencies: + "@aws-sdk/types" "3.914.0" + "@smithy/config-resolver" "^4.4.0" + "@smithy/types" "^4.8.0" + tslib "^2.6.2" + +"@aws-sdk/signature-v4-multi-region@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.916.0.tgz#d70e3dc9ca2cb3f65923283600a0a6e9a6c4ec7f" + integrity sha512-fuzUMo6xU7e0NBzBA6TQ4FUf1gqNbg4woBSvYfxRRsIfKmSMn9/elXXn4sAE5UKvlwVQmYnb6p7dpVRPyFvnQA== + dependencies: + "@aws-sdk/middleware-sdk-s3" "3.916.0" + "@aws-sdk/types" "3.914.0" + "@smithy/protocol-http" "^5.3.3" + "@smithy/signature-v4" "^5.3.3" + "@smithy/types" "^4.8.0" + tslib "^2.6.2" + +"@aws-sdk/token-providers@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.916.0.tgz#e824fd44a553c4047b769caf22a94fd2705c9f1d" + integrity sha512-13GGOEgq5etbXulFCmYqhWtpcEQ6WI6U53dvXbheW0guut8fDFJZmEv7tKMTJgiybxh7JHd0rWcL9JQND8DwoQ== + dependencies: + "@aws-sdk/core" "3.916.0" + "@aws-sdk/nested-clients" "3.916.0" + "@aws-sdk/types" "3.914.0" + "@smithy/property-provider" "^4.2.3" + "@smithy/shared-ini-file-loader" "^4.3.3" + "@smithy/types" "^4.8.0" + tslib "^2.6.2" + +"@aws-sdk/types@3.914.0", "@aws-sdk/types@^3.222.0": + version "3.914.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.914.0.tgz#175cf9a4b2267aafbb110fe1316e6827de951fdb" + integrity sha512-kQWPsRDmom4yvAfyG6L1lMmlwnTzm1XwMHOU+G5IFlsP4YEaMtXidDzW/wiivY0QFrhfCz/4TVmu0a2aPU57ug== + dependencies: + "@smithy/types" "^4.8.0" tslib "^2.6.2" "@aws-sdk/util-arn-parser@3.893.0": @@ -526,15 +521,15 @@ dependencies: tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.893.0.tgz#786874ece0b9daf3d75e2e0995de3830d56712ed" - integrity sha512-xeMcL31jXHKyxRwB3oeNjs8YEpyvMnSYWr2OwLydgzgTr0G349AHlJHwYGCF9xiJ2C27kDxVvXV/Hpdp0p7TWw== +"@aws-sdk/util-endpoints@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.916.0.tgz#ab54249b8090cd66fe14aa8518097107a2595196" + integrity sha512-bAgUQwvixdsiGNcuZSDAOWbyHlnPtg8G8TyHD6DTfTmKTHUW6tAn+af/ZYJPXEzXhhpwgJqi58vWnsiDhmr7NQ== dependencies: - "@aws-sdk/types" "3.893.0" - "@smithy/types" "^4.5.0" - "@smithy/url-parser" "^4.1.1" - "@smithy/util-endpoints" "^3.1.2" + "@aws-sdk/types" "3.914.0" + "@smithy/types" "^4.8.0" + "@smithy/url-parser" "^4.2.3" + "@smithy/util-endpoints" "^3.2.3" tslib "^2.6.2" "@aws-sdk/util-locate-window@^3.0.0": @@ -544,33 +539,34 @@ dependencies: tslib "^2.6.2" -"@aws-sdk/util-user-agent-browser@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.893.0.tgz#be0aac5c73a30c2a03aedb2e3501bb277bad79a1" - integrity sha512-PE9NtbDBW6Kgl1bG6A5fF3EPo168tnkj8TgMcT0sg4xYBWsBpq0bpJZRh+Jm5Bkwiw9IgTCLjEU7mR6xWaMB9w== +"@aws-sdk/util-user-agent-browser@3.914.0": + version "3.914.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.914.0.tgz#ed29fd87f6ffba6f53615894a5e969cb9013af59" + integrity sha512-rMQUrM1ECH4kmIwlGl9UB0BtbHy6ZuKdWFrIknu8yGTRI/saAucqNTh5EI1vWBxZ0ElhK5+g7zOnUuhSmVQYUA== dependencies: - "@aws-sdk/types" "3.893.0" - "@smithy/types" "^4.5.0" + "@aws-sdk/types" "3.914.0" + "@smithy/types" "^4.8.0" bowser "^2.11.0" tslib "^2.6.2" -"@aws-sdk/util-user-agent-node@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.893.0.tgz#19c1660f92630611435cba42a199e7cf9598523e" - integrity sha512-tTRkJo/fth9NPJ2AO/XLuJWVsOhbhejQRLyP0WXG3z0Waa5IWK5YBxBC1tWWATUCwsN748JQXU03C1aF9cRD9w== +"@aws-sdk/util-user-agent-node@3.916.0": + version "3.916.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.916.0.tgz#3ab5fdb9f45345f19f426941ece71988b31bf58d" + integrity sha512-CwfWV2ch6UdjuSV75ZU99N03seEUb31FIUrXBnwa6oONqj/xqXwrxtlUMLx6WH3OJEE4zI3zt5PjlTdGcVwf4g== dependencies: - "@aws-sdk/middleware-user-agent" "3.893.0" - "@aws-sdk/types" "3.893.0" - "@smithy/node-config-provider" "^4.2.2" - "@smithy/types" "^4.5.0" + "@aws-sdk/middleware-user-agent" "3.916.0" + "@aws-sdk/types" "3.914.0" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@aws-sdk/xml-builder@3.893.0": - version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.893.0.tgz#6f91bd81462ad8a2ee1c563ba38b026b11414cd2" - integrity sha512-qKkJ2E0hU60iq0o2+hBSIWS8sf34xhqiRRGw5nbRhwEnE2MsWsWBpRoysmr32uq9dHMWUzII0c/fS29+wOSdMA== +"@aws-sdk/xml-builder@3.914.0": + version "3.914.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.914.0.tgz#4e98b479856113db877d055e7b008065c50266d4" + integrity sha512-k75evsBD5TcIjedycYS7QXQ98AmOtbnxRJOPtCo0IwYRmy7UvqgS/gBL5SmrIqeV6FDSYRQMgdBxSMp6MLmdew== dependencies: - "@smithy/types" "^4.5.0" + "@smithy/types" "^4.8.0" + fast-xml-parser "5.2.5" tslib "^2.6.2" "@aws/lambda-invoke-store@^0.0.1": @@ -632,289 +628,28 @@ resolved "https://registry.yarnpkg.com/@biomejs/cli-win32-x64/-/cli-win32-x64-2.2.0.tgz#5d2523b421d847b13fac146cf745436ea8a72b95" integrity sha512-Nawu5nHjP/zPKTIryh2AavzTc/KEg4um/MxWdXW0A6P/RZOyIpa7+QSjeXwAwX/utJGaCoXRPWtF3m5U/bB3Ww== -"@drizzle-team/brocli@^0.10.2": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@drizzle-team/brocli/-/brocli-0.10.2.tgz#9757c006a43daaa6f45512e6cf5fabed36fb9da7" - integrity sha512-z33Il7l5dKjUgGULTqBsQBQwckHh5AbIuxhdsIxDDiZAzBOrZO6q9ogcWC65kU382AfynTfgNumVcNIjuIua6w== - -"@emnapi/core@^1.4.3", "@emnapi/core@^1.4.5": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.5.0.tgz#85cd84537ec989cebb2343606a1ee663ce4edaf0" - integrity sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg== +"@emnapi/core@^1.5.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.6.0.tgz#517f65d1c8270d5d5aa1aad660d5acb897430dca" + integrity sha512-zq/ay+9fNIJJtJiZxdTnXS20PllcYMX3OE23ESc4HK/bdYu3cOWYVhsOhVnXALfU/uqJIxn5NBPd9z4v+SfoSg== dependencies: "@emnapi/wasi-threads" "1.1.0" tslib "^2.4.0" -"@emnapi/runtime@^1.4.3", "@emnapi/runtime@^1.4.5", "@emnapi/runtime@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.5.0.tgz#9aebfcb9b17195dce3ab53c86787a6b7d058db73" - integrity sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ== +"@emnapi/runtime@^1.5.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.6.0.tgz#8fe297e0090f6e89a57a1f31f1c440bdbc3c01d8" + integrity sha512-obtUmAHTMjll499P+D9A3axeJFlhdjOWdKUNs/U6QIGT7V5RjcUW1xToAzjvmgTSQhDbYn/NwfTRoJcQ2rNBxA== dependencies: tslib "^2.4.0" -"@emnapi/wasi-threads@1.1.0", "@emnapi/wasi-threads@^1.0.4": +"@emnapi/wasi-threads@1.1.0", "@emnapi/wasi-threads@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz#60b2102fddc9ccb78607e4a3cf8403ea69be41bf" integrity sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ== dependencies: tslib "^2.4.0" -"@esbuild-kit/core-utils@^3.3.2": - version "3.3.2" - resolved "https://registry.yarnpkg.com/@esbuild-kit/core-utils/-/core-utils-3.3.2.tgz#186b6598a5066f0413471d7c4d45828e399ba96c" - integrity sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ== - dependencies: - esbuild "~0.18.20" - source-map-support "^0.5.21" - -"@esbuild-kit/esm-loader@^2.5.5": - version "2.6.5" - resolved "https://registry.yarnpkg.com/@esbuild-kit/esm-loader/-/esm-loader-2.6.5.tgz#6eedee46095d7d13b1efc381e2211ed1c60e64ea" - integrity sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA== - dependencies: - "@esbuild-kit/core-utils" "^3.3.2" - get-tsconfig "^4.7.0" - -"@esbuild/aix-ppc64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz#ee6b7163a13528e099ecf562b972f2bcebe0aa97" - integrity sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw== - -"@esbuild/android-arm64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622" - integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ== - -"@esbuild/android-arm64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.10.tgz#115fc76631e82dd06811bfaf2db0d4979c16e2cb" - integrity sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg== - -"@esbuild/android-arm@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682" - integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw== - -"@esbuild/android-arm@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.10.tgz#8d5811912da77f615398611e5bbc1333fe321aa9" - integrity sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w== - -"@esbuild/android-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2" - integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg== - -"@esbuild/android-x64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.10.tgz#e3e96516b2d50d74105bb92594c473e30ddc16b1" - integrity sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg== - -"@esbuild/darwin-arm64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1" - integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA== - -"@esbuild/darwin-arm64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.10.tgz#6af6bb1d05887dac515de1b162b59dc71212ed76" - integrity sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA== - -"@esbuild/darwin-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d" - integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ== - -"@esbuild/darwin-x64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.10.tgz#99ae82347fbd336fc2d28ffd4f05694e6e5b723d" - integrity sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg== - -"@esbuild/freebsd-arm64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54" - integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw== - -"@esbuild/freebsd-arm64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.10.tgz#0c6d5558a6322b0bdb17f7025c19bd7d2359437d" - integrity sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg== - -"@esbuild/freebsd-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e" - integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ== - -"@esbuild/freebsd-x64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.10.tgz#8c35873fab8c0857a75300a3dcce4324ca0b9844" - integrity sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA== - -"@esbuild/linux-arm64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0" - integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA== - -"@esbuild/linux-arm64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.10.tgz#3edc2f87b889a15b4cedaf65f498c2bed7b16b90" - integrity sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ== - -"@esbuild/linux-arm@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0" - integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg== - -"@esbuild/linux-arm@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.10.tgz#86501cfdfb3d110176d80c41b27ed4611471cde7" - integrity sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg== - -"@esbuild/linux-ia32@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7" - integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA== - -"@esbuild/linux-ia32@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.10.tgz#e6589877876142537c6864680cd5d26a622b9d97" - integrity sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ== - -"@esbuild/linux-loong64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d" - integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg== - -"@esbuild/linux-loong64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.10.tgz#11119e18781f136d8083ea10eb6be73db7532de8" - integrity sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg== - -"@esbuild/linux-mips64el@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231" - integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ== - -"@esbuild/linux-mips64el@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.10.tgz#3052f5436b0c0c67a25658d5fc87f045e7def9e6" - integrity sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA== - -"@esbuild/linux-ppc64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb" - integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA== - -"@esbuild/linux-ppc64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.10.tgz#2f098920ee5be2ce799f35e367b28709925a8744" - integrity sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA== - -"@esbuild/linux-riscv64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6" - integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A== - -"@esbuild/linux-riscv64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.10.tgz#fa51d7fd0a22a62b51b4b94b405a3198cf7405dd" - integrity sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA== - -"@esbuild/linux-s390x@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071" - integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ== - -"@esbuild/linux-s390x@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.10.tgz#a27642e36fc282748fdb38954bd3ef4f85791e8a" - integrity sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew== - -"@esbuild/linux-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338" - integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w== - -"@esbuild/linux-x64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz#9d9b09c0033d17529570ced6d813f98315dfe4e9" - integrity sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA== - -"@esbuild/netbsd-arm64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.10.tgz#25c09a659c97e8af19e3f2afd1c9190435802151" - integrity sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A== - -"@esbuild/netbsd-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1" - integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A== - -"@esbuild/netbsd-x64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.10.tgz#7fa5f6ffc19be3a0f6f5fd32c90df3dc2506937a" - integrity sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig== - -"@esbuild/openbsd-arm64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.10.tgz#8faa6aa1afca0c6d024398321d6cb1c18e72a1c3" - integrity sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw== - -"@esbuild/openbsd-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae" - integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg== - -"@esbuild/openbsd-x64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.10.tgz#a42979b016f29559a8453d32440d3c8cd420af5e" - integrity sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw== - -"@esbuild/openharmony-arm64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.10.tgz#fd87bfeadd7eeb3aa384bbba907459ffa3197cb1" - integrity sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag== - -"@esbuild/sunos-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d" - integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ== - -"@esbuild/sunos-x64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.10.tgz#3a18f590e36cb78ae7397976b760b2b8c74407f4" - integrity sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ== - -"@esbuild/win32-arm64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9" - integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg== - -"@esbuild/win32-arm64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.10.tgz#e71741a251e3fd971408827a529d2325551f530c" - integrity sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw== - -"@esbuild/win32-ia32@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102" - integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g== - -"@esbuild/win32-ia32@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.10.tgz#c6f010b5d3b943d8901a0c87ea55f93b8b54bf94" - integrity sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw== - -"@esbuild/win32-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d" - integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ== - -"@esbuild/win32-x64@0.25.10": - version "0.25.10" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.10.tgz#e4b3e255a1b4aea84f6e1d2ae0b73f826c3785bd" - integrity sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw== - "@img/colour@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@img/colour/-/colour-1.0.0.tgz#d2fabb223455a793bf3bf9c70de3d28526aa8311" @@ -1050,13 +785,6 @@ resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.4.tgz#b19f1f88ace8bfc20784a0ad31767f3438e025d1" integrity sha512-xIyj4wpYs8J18sVN3mSQjwrw7fKUqRw+Z5rnHNCy5fYTxigBz81u5mOMPmFumwjcn8+ld1ppptMBCLic1nz6ig== -"@isaacs/fs-minipass@^4.0.0": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz#2d59ae3ab4b38fb4270bfa23d30f8e2e86c7fe32" - integrity sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w== - dependencies: - minipass "^7.0.4" - "@jridgewell/gen-mapping@^0.3.5": version "0.3.13" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f" @@ -1091,14 +819,14 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@napi-rs/wasm-runtime@^0.2.12": - version "0.2.12" - resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz#3e78a8b96e6c33a6c517e1894efbd5385a7cb6f2" - integrity sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ== +"@napi-rs/wasm-runtime@^1.0.7": + version "1.0.7" + resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.0.7.tgz#dcfea99a75f06209a235f3d941e3460a51e9b14c" + integrity sha512-SeDnOO0Tk7Okiq6DbXmmBODgOAb9dp9gjlphokTUxmt8U3liIP1ZsozBahH69j/RJv+Rfs6IwUKHTgQYJ/HBAw== dependencies: - "@emnapi/core" "^1.4.3" - "@emnapi/runtime" "^1.4.3" - "@tybys/wasm-util" "^0.10.0" + "@emnapi/core" "^1.5.0" + "@emnapi/runtime" "^1.5.0" + "@tybys/wasm-util" "^0.10.1" "@next/env@15.5.3": version "15.5.3" @@ -1145,159 +873,159 @@ resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.3.tgz#d716c04efa8568680da1c14f5595d932268086f2" integrity sha512-JMoLAq3n3y5tKXPQwCK5c+6tmwkuFDa2XAxz8Wm4+IVthdBZdZGh+lmiLUHg9f9IDwIQpUjp+ysd6OkYTyZRZw== -"@smithy/abort-controller@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.1.1.tgz#9b3872ab6b2c061486175c281dadc0a853260533" - integrity sha512-vkzula+IwRvPR6oKQhMYioM3A/oX/lFCZiwuxkQbRhqJS2S4YRY2k7k/SyR2jMf3607HLtbEwlRxi0ndXHMjRg== +"@smithy/abort-controller@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.2.3.tgz#4615da3012b580ac3d1f0ee7b57ed7d7880bb29b" + integrity sha512-xWL9Mf8b7tIFuAlpjKtRPnHrR8XVrwTj5NPYO/QwZPtc0SDLsPxb56V5tzi5yspSMytISHybifez+4jlrx0vkQ== dependencies: - "@smithy/types" "^4.5.0" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/chunked-blob-reader-native@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.1.0.tgz#4d814dd07ebb1f579daf51671945389f9772400f" - integrity sha512-Bnv0B3nSlfB2mPO0WgM49I/prl7+kamF042rrf3ezJ3Z4C7csPYvyYgZfXTGXwXfj1mAwDWjE/ybIf49PzFzvA== +"@smithy/chunked-blob-reader-native@^4.2.1": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.2.1.tgz#380266951d746b522b4ab2b16bfea6b451147b41" + integrity sha512-lX9Ay+6LisTfpLid2zZtIhSEjHMZoAR5hHCR4H7tBz/Zkfr5ea8RcQ7Tk4mi0P76p4cN+Btz16Ffno7YHpKXnQ== dependencies: - "@smithy/util-base64" "^4.1.0" + "@smithy/util-base64" "^4.3.0" tslib "^2.6.2" -"@smithy/chunked-blob-reader@^5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.1.0.tgz#48fa62c85b146be2a06525f0457ce58a46d69ab0" - integrity sha512-a36AtR7Q7XOhRPt6F/7HENmTWcB8kN7mDJcOFM/+FuKO6x88w8MQJfYCufMWh4fGyVkPjUh3Rrz/dnqFQdo6OQ== +"@smithy/chunked-blob-reader@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.2.0.tgz#776fec5eaa5ab5fa70d0d0174b7402420b24559c" + integrity sha512-WmU0TnhEAJLWvfSeMxBNe5xtbselEO8+4wG0NtZeL8oR21WgH1xiO37El+/Y+H/Ie4SCwBy3MxYWmOYaGgZueA== dependencies: tslib "^2.6.2" -"@smithy/config-resolver@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.2.2.tgz#3f6a3c163f9b5b7f852d7d1817bc9e3b2136fa5f" - integrity sha512-IT6MatgBWagLybZl1xQcURXRICvqz1z3APSCAI9IqdvfCkrA7RaQIEfgC6G/KvfxnDfQUDqFV+ZlixcuFznGBQ== +"@smithy/config-resolver@^4.4.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.4.0.tgz#9a33b7dd9b7e0475802acef53f41555257e104cd" + integrity sha512-Kkmz3Mup2PGp/HNJxhCWkLNdlajJORLSjwkcfrj0E7nu6STAEdcMR1ir5P9/xOmncx8xXfru0fbUYLlZog/cFg== dependencies: - "@smithy/node-config-provider" "^4.2.2" - "@smithy/types" "^4.5.0" - "@smithy/util-config-provider" "^4.1.0" - "@smithy/util-middleware" "^4.1.1" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/types" "^4.8.0" + "@smithy/util-config-provider" "^4.2.0" + "@smithy/util-endpoints" "^3.2.3" + "@smithy/util-middleware" "^4.2.3" tslib "^2.6.2" -"@smithy/core@^3.11.1": - version "3.11.1" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.11.1.tgz#670067d5c9e81f860b6d4d1494520ec518b38f43" - integrity sha512-REH7crwORgdjSpYs15JBiIWOYjj0hJNC3aCecpJvAlMMaaqL5i2CLb1i6Hc4yevToTKSqslLMI9FKjhugEwALA== +"@smithy/core@^3.17.1": + version "3.17.1" + resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.17.1.tgz#644aa4046b31c82d2c17276bcef2c6b78245dfeb" + integrity sha512-V4Qc2CIb5McABYfaGiIYLTmo/vwNIK7WXI5aGveBd9UcdhbOMwcvIMxIw/DJj1S9QgOMa/7FBkarMdIC0EOTEQ== dependencies: - "@smithy/middleware-serde" "^4.1.1" - "@smithy/protocol-http" "^5.2.1" - "@smithy/types" "^4.5.0" - "@smithy/util-base64" "^4.1.0" - "@smithy/util-body-length-browser" "^4.1.0" - "@smithy/util-middleware" "^4.1.1" - "@smithy/util-stream" "^4.3.2" - "@smithy/util-utf8" "^4.1.0" - "@types/uuid" "^9.0.1" + "@smithy/middleware-serde" "^4.2.3" + "@smithy/protocol-http" "^5.3.3" + "@smithy/types" "^4.8.0" + "@smithy/util-base64" "^4.3.0" + "@smithy/util-body-length-browser" "^4.2.0" + "@smithy/util-middleware" "^4.2.3" + "@smithy/util-stream" "^4.5.4" + "@smithy/util-utf8" "^4.2.0" + "@smithy/uuid" "^1.1.0" tslib "^2.6.2" - uuid "^9.0.1" -"@smithy/credential-provider-imds@^4.1.2": - version "4.1.2" - resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.1.2.tgz#68662c873dbe812c13159cb2be3c4ba8aeb52149" - integrity sha512-JlYNq8TShnqCLg0h+afqe2wLAwZpuoSgOyzhYvTgbiKBWRov+uUve+vrZEQO6lkdLOWPh7gK5dtb9dS+KGendg== +"@smithy/credential-provider-imds@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.3.tgz#b35d0d1f1b28f415e06282999eba2d53eb10a1c5" + integrity sha512-hA1MQ/WAHly4SYltJKitEsIDVsNmXcQfYBRv2e+q04fnqtAX5qXaybxy/fhUeAMCnQIdAjaGDb04fMHQefWRhw== dependencies: - "@smithy/node-config-provider" "^4.2.2" - "@smithy/property-provider" "^4.1.1" - "@smithy/types" "^4.5.0" - "@smithy/url-parser" "^4.1.1" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/property-provider" "^4.2.3" + "@smithy/types" "^4.8.0" + "@smithy/url-parser" "^4.2.3" tslib "^2.6.2" -"@smithy/eventstream-codec@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-4.1.1.tgz#637eb4bceecc3ef588b86c28506439a9cdd7a41f" - integrity sha512-PwkQw1hZwHTQB6X5hSUWz2OSeuj5Z6enWuAqke7DgWoP3t6vg3ktPpqPz3Erkn6w+tmsl8Oss6nrgyezoea2Iw== +"@smithy/eventstream-codec@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-4.2.3.tgz#dd65d9050c322f0805ba62749a3801985a2f5394" + integrity sha512-rcr0VH0uNoMrtgKuY7sMfyKqbHc4GQaQ6Yp4vwgm+Z6psPuOgL+i/Eo/QWdXRmMinL3EgFM0Z1vkfyPyfzLmjw== dependencies: "@aws-crypto/crc32" "5.2.0" - "@smithy/types" "^4.5.0" - "@smithy/util-hex-encoding" "^4.1.0" + "@smithy/types" "^4.8.0" + "@smithy/util-hex-encoding" "^4.2.0" tslib "^2.6.2" -"@smithy/eventstream-serde-browser@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.1.1.tgz#f7df13ebd5a6028b12b496f12eecdd08c4c9b792" - integrity sha512-Q9QWdAzRaIuVkefupRPRFAasaG/droBqn1feiMnmLa+LLEUG45pqX1+FurHFmlqiCfobB3nUlgoJfeXZsr7MPA== +"@smithy/eventstream-serde-browser@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.2.3.tgz#57fb9c10daac12647a0b97ef04330d706cbe9494" + integrity sha512-EcS0kydOr2qJ3vV45y7nWnTlrPmVIMbUFOZbMG80+e2+xePQISX9DrcbRpVRFTS5Nqz3FiEbDcTCAV0or7bqdw== dependencies: - "@smithy/eventstream-serde-universal" "^4.1.1" - "@smithy/types" "^4.5.0" + "@smithy/eventstream-serde-universal" "^4.2.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/eventstream-serde-config-resolver@^4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.2.1.tgz#77333a110361bfe2749b685d31e01299ede87c40" - integrity sha512-oSUkF9zDN9zcOUBMtxp8RewJlh71E9NoHWU8jE3hU9JMYCsmW4assVTpgic/iS3/dM317j6hO5x18cc3XrfvEw== +"@smithy/eventstream-serde-config-resolver@^4.3.3": + version "4.3.3" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.3.3.tgz#ca1a7d272ae939aee303da40aa476656d785f75f" + integrity sha512-GewKGZ6lIJ9APjHFqR2cUW+Efp98xLu1KmN0jOWxQ1TN/gx3HTUPVbLciFD8CfScBj2IiKifqh9vYFRRXrYqXA== dependencies: - "@smithy/types" "^4.5.0" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/eventstream-serde-node@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.1.1.tgz#635819a756cb8a69a7e3eb91ca9076284ea00939" - integrity sha512-tn6vulwf/ScY0vjhzptSJuDJJqlhNtUjkxJ4wiv9E3SPoEqTEKbaq6bfqRO7nvhTG29ALICRcvfFheOUPl8KNA== +"@smithy/eventstream-serde-node@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.2.3.tgz#f1b33bb576bf7222b6bd6bc2ad845068ccf53f16" + integrity sha512-uQobOTQq2FapuSOlmGLUeGTpvcBLE5Fc7XjERUSk4dxEi4AhTwuyHYZNAvL4EMUp7lzxxkKDFaJ1GY0ovrj0Kg== dependencies: - "@smithy/eventstream-serde-universal" "^4.1.1" - "@smithy/types" "^4.5.0" + "@smithy/eventstream-serde-universal" "^4.2.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/eventstream-serde-universal@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.1.1.tgz#803cdde6a17ac501cc700ce38400caf70715ecb1" - integrity sha512-uLOAiM/Dmgh2CbEXQx+6/ssK7fbzFhd+LjdyFxXid5ZBCbLHTFHLdD/QbXw5aEDsLxQhgzDxLLsZhsftAYwHJA== +"@smithy/eventstream-serde-universal@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.2.3.tgz#86194daa2cd2496e413723465360d80f32ad7252" + integrity sha512-QIvH/CKOk1BZPz/iwfgbh1SQD5Y0lpaw2kLA8zpLRRtYMPXeYUEWh+moTaJyqDaKlbrB174kB7FSRFiZ735tWw== dependencies: - "@smithy/eventstream-codec" "^4.1.1" - "@smithy/types" "^4.5.0" + "@smithy/eventstream-codec" "^4.2.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/fetch-http-handler@^5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.2.1.tgz#fe284a00f1b3a35edf9fba454d287b7f74ef20af" - integrity sha512-5/3wxKNtV3wO/hk1is+CZUhL8a1yy/U+9u9LKQ9kZTkMsHaQjJhc3stFfiujtMnkITjzWfndGA2f7g9Uh9vKng== +"@smithy/fetch-http-handler@^5.3.4": + version "5.3.4" + resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.4.tgz#af6dd2f63550494c84ef029a5ceda81ef46965d3" + integrity sha512-bwigPylvivpRLCm+YK9I5wRIYjFESSVwl8JQ1vVx/XhCw0PtCi558NwTnT2DaVCl5pYlImGuQTSwMsZ+pIavRw== dependencies: - "@smithy/protocol-http" "^5.2.1" - "@smithy/querystring-builder" "^4.1.1" - "@smithy/types" "^4.5.0" - "@smithy/util-base64" "^4.1.0" + "@smithy/protocol-http" "^5.3.3" + "@smithy/querystring-builder" "^4.2.3" + "@smithy/types" "^4.8.0" + "@smithy/util-base64" "^4.3.0" tslib "^2.6.2" -"@smithy/hash-blob-browser@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/hash-blob-browser/-/hash-blob-browser-4.1.1.tgz#fbcab0008b973ccf370c698cd11ec8d9584607c8" - integrity sha512-avAtk++s1e/1VODf+rg7c9R2pB5G9y8yaJaGY4lPZI2+UIqVyuSDMikWjeWfBVmFZ3O7NpDxBbUCyGhThVUKWQ== +"@smithy/hash-blob-browser@^4.2.4": + version "4.2.4" + resolved "https://registry.yarnpkg.com/@smithy/hash-blob-browser/-/hash-blob-browser-4.2.4.tgz#c7226d2ba2a394acf6e90510d08f7c3003f516d1" + integrity sha512-W7eIxD+rTNsLB/2ynjmbdeP7TgxRXprfvqQxKFEfy9HW2HeD7t+g+KCIrY0pIn/GFjA6/fIpH+JQnfg5TTk76Q== dependencies: - "@smithy/chunked-blob-reader" "^5.1.0" - "@smithy/chunked-blob-reader-native" "^4.1.0" - "@smithy/types" "^4.5.0" + "@smithy/chunked-blob-reader" "^5.2.0" + "@smithy/chunked-blob-reader-native" "^4.2.1" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/hash-node@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.1.1.tgz#86ceca92487492267e944e4f4507106b731e7971" - integrity sha512-H9DIU9WBLhYrvPs9v4sYvnZ1PiAI0oc8CgNQUJ1rpN3pP7QADbTOUjchI2FB764Ub0DstH5xbTqcMJu1pnVqxA== +"@smithy/hash-node@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.2.3.tgz#c85711fca84e022f05c71b921f98cb6a0f48e5ca" + integrity sha512-6+NOdZDbfuU6s1ISp3UOk5Rg953RJ2aBLNLLBEcamLjHAg1Po9Ha7QIB5ZWhdRUVuOUrT8BVFR+O2KIPmw027g== dependencies: - "@smithy/types" "^4.5.0" - "@smithy/util-buffer-from" "^4.1.0" - "@smithy/util-utf8" "^4.1.0" + "@smithy/types" "^4.8.0" + "@smithy/util-buffer-from" "^4.2.0" + "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@smithy/hash-stream-node@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/hash-stream-node/-/hash-stream-node-4.1.1.tgz#1d8e4485fa15c458d7a8248a50d0f5f91705cced" - integrity sha512-3ztT4pV0Moazs3JAYFdfKk11kYFDo4b/3R3+xVjIm6wY9YpJf+xfz+ocEnNKcWAdcmSMqi168i2EMaKmJHbJMA== +"@smithy/hash-stream-node@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/hash-stream-node/-/hash-stream-node-4.2.3.tgz#8ddae1f5366513cbbec3acb6f54e3ec1b332db88" + integrity sha512-EXMSa2yiStVII3x/+BIynyOAZlS7dGvI7RFrzXa/XssBgck/7TXJIvnjnCu328GY/VwHDC4VeDyP1S4rqwpYag== dependencies: - "@smithy/types" "^4.5.0" - "@smithy/util-utf8" "^4.1.0" + "@smithy/types" "^4.8.0" + "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@smithy/invalid-dependency@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.1.1.tgz#2511335ff889944701c7d2a3b1e4a4d6fe9ddfab" - integrity sha512-1AqLyFlfrrDkyES8uhINRlJXmHA2FkG+3DY8X+rmLSqmFwk3DJnvhyGzyByPyewh2jbmV+TYQBEfngQax8IFGg== +"@smithy/invalid-dependency@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.2.3.tgz#4f126ddde90fe3d69d522fc37256ee853246c1ec" + integrity sha512-Cc9W5DwDuebXEDMpOpl4iERo8I0KFjTnomK2RMdhhR87GwrSmUmwMxS4P5JdRf+LsjOdIqumcerwRgYMr/tZ9Q== dependencies: - "@smithy/types" "^4.5.0" + "@smithy/types" "^4.8.0" tslib "^2.6.2" "@smithy/is-array-buffer@^2.2.0": @@ -1307,210 +1035,209 @@ dependencies: tslib "^2.6.2" -"@smithy/is-array-buffer@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-4.1.0.tgz#d18a2f22280e7173633cb91a9bdb6f3d8a6560b8" - integrity sha512-ePTYUOV54wMogio+he4pBybe8fwg4sDvEVDBU8ZlHOZXbXK3/C0XfJgUCu6qAZcawv05ZhZzODGUerFBPsPUDQ== +"@smithy/is-array-buffer@^4.2.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-4.2.0.tgz#b0f874c43887d3ad44f472a0f3f961bcce0550c2" + integrity sha512-DZZZBvC7sjcYh4MazJSGiWMI2L7E0oCiRHREDzIxi/M2LY79/21iXt6aPLHge82wi5LsuRF5A06Ds3+0mlh6CQ== dependencies: tslib "^2.6.2" -"@smithy/md5-js@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/md5-js/-/md5-js-4.1.1.tgz#df81396bef83eb17bce531c871af935df986bdfc" - integrity sha512-MvWXKK743BuHjr/hnWuT6uStdKEaoqxHAQUvbKJPPZM5ZojTNFI5D+47BoQfBE5RgGlRRty05EbWA+NXDv+hIA== +"@smithy/md5-js@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/md5-js/-/md5-js-4.2.3.tgz#a89c324ff61c64c25b4895fa16d9358f7e3cc746" + integrity sha512-5+4bUEJQi/NRgzdA5SVXvAwyvEnD0ZAiKzV3yLO6dN5BG8ScKBweZ8mxXXUtdxq+Dx5k6EshKk0XJ7vgvIPSnA== dependencies: - "@smithy/types" "^4.5.0" - "@smithy/util-utf8" "^4.1.0" + "@smithy/types" "^4.8.0" + "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@smithy/middleware-content-length@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.1.1.tgz#eaea7bd14c7a0b64aef87b8c372c2a04d7b9cb72" - integrity sha512-9wlfBBgTsRvC2JxLJxv4xDGNBrZuio3AgSl0lSFX7fneW2cGskXTYpFxCdRYD2+5yzmsiTuaAJD1Wp7gWt9y9w== +"@smithy/middleware-content-length@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.2.3.tgz#b7d1d79ae674dad17e35e3518db4b1f0adc08964" + integrity sha512-/atXLsT88GwKtfp5Jr0Ks1CSa4+lB+IgRnkNrrYP0h1wL4swHNb0YONEvTceNKNdZGJsye+W2HH8W7olbcPUeA== dependencies: - "@smithy/protocol-http" "^5.2.1" - "@smithy/types" "^4.5.0" + "@smithy/protocol-http" "^5.3.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/middleware-endpoint@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.2.3.tgz#6d64026923420971f2da937d6ea642011471f7a5" - integrity sha512-+1H5A28DeffRVrqmVmtqtRraEjoaC6JVap3xEQdVoBh2EagCVY7noPmcBcG4y7mnr9AJitR1ZAse2l+tEtK5vg== +"@smithy/middleware-endpoint@^4.3.5": + version "4.3.5" + resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.3.5.tgz#c22f82f83f0b5cc6c0866a2a87b65bc2e79af352" + integrity sha512-SIzKVTvEudFWJbxAaq7f2GvP3jh2FHDpIFI6/VAf4FOWGFZy0vnYMPSRj8PGYI8Hjt29mvmwSRgKuO3bK4ixDw== dependencies: - "@smithy/core" "^3.11.1" - "@smithy/middleware-serde" "^4.1.1" - "@smithy/node-config-provider" "^4.2.2" - "@smithy/shared-ini-file-loader" "^4.2.0" - "@smithy/types" "^4.5.0" - "@smithy/url-parser" "^4.1.1" - "@smithy/util-middleware" "^4.1.1" + "@smithy/core" "^3.17.1" + "@smithy/middleware-serde" "^4.2.3" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/shared-ini-file-loader" "^4.3.3" + "@smithy/types" "^4.8.0" + "@smithy/url-parser" "^4.2.3" + "@smithy/util-middleware" "^4.2.3" tslib "^2.6.2" -"@smithy/middleware-retry@^4.2.4": - version "4.2.4" - resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.2.4.tgz#16334bf0f5b588a404255f5c827c79bb39888104" - integrity sha512-amyqYQFewnAviX3yy/rI/n1HqAgfvUdkEhc04kDjxsngAUREKuOI24iwqQUirrj6GtodWmR4iO5Zeyl3/3BwWg== +"@smithy/middleware-retry@^4.4.5": + version "4.4.5" + resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.4.5.tgz#5bdb6ba1be6a97272b79fdac99db40c5e7ab81e0" + integrity sha512-DCaXbQqcZ4tONMvvdz+zccDE21sLcbwWoNqzPLFlZaxt1lDtOE2tlVpRSwcTOJrjJSUThdgEYn7HrX5oLGlK9A== dependencies: - "@smithy/node-config-provider" "^4.2.2" - "@smithy/protocol-http" "^5.2.1" - "@smithy/service-error-classification" "^4.1.2" - "@smithy/smithy-client" "^4.6.3" - "@smithy/types" "^4.5.0" - "@smithy/util-middleware" "^4.1.1" - "@smithy/util-retry" "^4.1.2" - "@types/uuid" "^9.0.1" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/protocol-http" "^5.3.3" + "@smithy/service-error-classification" "^4.2.3" + "@smithy/smithy-client" "^4.9.1" + "@smithy/types" "^4.8.0" + "@smithy/util-middleware" "^4.2.3" + "@smithy/util-retry" "^4.2.3" + "@smithy/uuid" "^1.1.0" tslib "^2.6.2" - uuid "^9.0.1" -"@smithy/middleware-serde@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.1.1.tgz#cfb99f53c744d7730928235cbe66cc7ff8a8a9b2" - integrity sha512-lh48uQdbCoj619kRouev5XbWhCwRKLmphAif16c4J6JgJ4uXjub1PI6RL38d3BLliUvSso6klyB/LTNpWSNIyg== +"@smithy/middleware-serde@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.2.3.tgz#a827e9c4ea9e51c79cca4d6741d582026a8b53eb" + integrity sha512-8g4NuUINpYccxiCXM5s1/V+uLtts8NcX4+sPEbvYQDZk4XoJfDpq5y2FQxfmUL89syoldpzNzA0R9nhzdtdKnQ== dependencies: - "@smithy/protocol-http" "^5.2.1" - "@smithy/types" "^4.5.0" + "@smithy/protocol-http" "^5.3.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/middleware-stack@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.1.1.tgz#1d533fde4ccbb62d7fc0f0b8ac518b7e4791e311" - integrity sha512-ygRnniqNcDhHzs6QAPIdia26M7e7z9gpkIMUe/pK0RsrQ7i5MblwxY8078/QCnGq6AmlUUWgljK2HlelsKIb/A== +"@smithy/middleware-stack@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.2.3.tgz#5a315aa9d0fd4faaa248780297c8cbacc31c2eba" + integrity sha512-iGuOJkH71faPNgOj/gWuEGS6xvQashpLwWB1HjHq1lNNiVfbiJLpZVbhddPuDbx9l4Cgl0vPLq5ltRfSaHfspA== dependencies: - "@smithy/types" "^4.5.0" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/node-config-provider@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.2.2.tgz#ede9ac2f689cfdf26815a53fadf139e6aa77bdbb" - integrity sha512-SYGTKyPvyCfEzIN5rD8q/bYaOPZprYUPD2f5g9M7OjaYupWOoQFYJ5ho+0wvxIRf471i2SR4GoiZ2r94Jq9h6A== +"@smithy/node-config-provider@^4.3.3": + version "4.3.3" + resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.3.3.tgz#44140a1e6bc666bcf16faf68c35d3dae4ba8cad5" + integrity sha512-NzI1eBpBSViOav8NVy1fqOlSfkLgkUjUTlohUSgAEhHaFWA3XJiLditvavIP7OpvTjDp5u2LhtlBhkBlEisMwA== dependencies: - "@smithy/property-provider" "^4.1.1" - "@smithy/shared-ini-file-loader" "^4.2.0" - "@smithy/types" "^4.5.0" + "@smithy/property-provider" "^4.2.3" + "@smithy/shared-ini-file-loader" "^4.3.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/node-http-handler@^4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.2.1.tgz#d7ab8e31659030d3d5a68f0982f15c00b1e67a0c" - integrity sha512-REyybygHlxo3TJICPF89N2pMQSf+p+tBJqpVe1+77Cfi9HBPReNjTgtZ1Vg73exq24vkqJskKDpfF74reXjxfw== +"@smithy/node-http-handler@^4.4.3": + version "4.4.3" + resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.4.3.tgz#fb2d16719cb4e8df0c189e8bde60e837df5c0c5b" + integrity sha512-MAwltrDB0lZB/H6/2M5PIsISSwdI5yIh6DaBB9r0Flo9nx3y0dzl/qTMJPd7tJvPdsx6Ks/cwVzheGNYzXyNbQ== dependencies: - "@smithy/abort-controller" "^4.1.1" - "@smithy/protocol-http" "^5.2.1" - "@smithy/querystring-builder" "^4.1.1" - "@smithy/types" "^4.5.0" + "@smithy/abort-controller" "^4.2.3" + "@smithy/protocol-http" "^5.3.3" + "@smithy/querystring-builder" "^4.2.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/property-provider@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.1.1.tgz#6e11ae6729840314afed05fd6ab48f62c654116b" - integrity sha512-gm3ZS7DHxUbzC2wr8MUCsAabyiXY0gaj3ROWnhSx/9sPMc6eYLMM4rX81w1zsMaObj2Lq3PZtNCC1J6lpEY7zg== +"@smithy/property-provider@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.2.3.tgz#a6c82ca0aa1c57f697464bee496f3fec58660864" + integrity sha512-+1EZ+Y+njiefCohjlhyOcy1UNYjT+1PwGFHCxA/gYctjg3DQWAU19WigOXAco/Ql8hZokNehpzLd0/+3uCreqQ== dependencies: - "@smithy/types" "^4.5.0" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/protocol-http@^5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.2.1.tgz#33f2b8e4e1082c3ae0372d1322577e6fa71d7824" - integrity sha512-T8SlkLYCwfT/6m33SIU/JOVGNwoelkrvGjFKDSDtVvAXj/9gOT78JVJEas5a+ETjOu4SVvpCstKgd0PxSu/aHw== +"@smithy/protocol-http@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.3.3.tgz#55b35c18bdc0f6d86e78f63961e50ba4ff1c5d73" + integrity sha512-Mn7f/1aN2/jecywDcRDvWWWJF4uwg/A0XjFMJtj72DsgHTByfjRltSqcT9NyE9RTdBSN6X1RSXrhn/YWQl8xlw== dependencies: - "@smithy/types" "^4.5.0" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/querystring-builder@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.1.1.tgz#4d35c1735de8214055424045a117fa5d1d5cdec1" - integrity sha512-J9b55bfimP4z/Jg1gNo+AT84hr90p716/nvxDkPGCD4W70MPms0h8KF50RDRgBGZeL83/u59DWNqJv6tEP/DHA== +"@smithy/querystring-builder@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.2.3.tgz#ca273ae8c21fce01a52632202679c0f9e2acf41a" + integrity sha512-LOVCGCmwMahYUM/P0YnU/AlDQFjcu+gWbFJooC417QRB/lDJlWSn8qmPSDp+s4YVAHOgtgbNG4sR+SxF/VOcJQ== dependencies: - "@smithy/types" "^4.5.0" - "@smithy/util-uri-escape" "^4.1.0" + "@smithy/types" "^4.8.0" + "@smithy/util-uri-escape" "^4.2.0" tslib "^2.6.2" -"@smithy/querystring-parser@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.1.1.tgz#21b861439b2db16abeb0a6789b126705fa25eea1" - integrity sha512-63TEp92YFz0oQ7Pj9IuI3IgnprP92LrZtRAkE3c6wLWJxfy/yOPRt39IOKerVr0JS770olzl0kGafXlAXZ1vng== +"@smithy/querystring-parser@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.2.3.tgz#b6d7d5cd300b4083c62d9bd30915f782d01f503e" + integrity sha512-cYlSNHcTAX/wc1rpblli3aUlLMGgKZ/Oqn8hhjFASXMCXjIqeuQBei0cnq2JR8t4RtU9FpG6uyl6PxyArTiwKA== dependencies: - "@smithy/types" "^4.5.0" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/service-error-classification@^4.1.2": - version "4.1.2" - resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.1.2.tgz#06839c332f4620a4b80c78a0c32377732dc6697a" - integrity sha512-Kqd8wyfmBWHZNppZSMfrQFpc3M9Y/kjyN8n8P4DqJJtuwgK1H914R471HTw7+RL+T7+kI1f1gOnL7Vb5z9+NgQ== +"@smithy/service-error-classification@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.2.3.tgz#ecb41dd514841eebb93e91012ae5e343040f6828" + integrity sha512-NkxsAxFWwsPsQiwFG2MzJ/T7uIR6AQNh1SzcxSUnmmIqIQMlLRQDKhc17M7IYjiuBXhrQRjQTo3CxX+DobS93g== dependencies: - "@smithy/types" "^4.5.0" + "@smithy/types" "^4.8.0" -"@smithy/shared-ini-file-loader@^4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.2.0.tgz#e4717242686bf611bd1a5d6f79870abe480c1c99" - integrity sha512-OQTfmIEp2LLuWdxa8nEEPhZmiOREO6bcB6pjs0AySf4yiZhl6kMOfqmcwcY8BaBPX+0Tb+tG7/Ia/6mwpoZ7Pw== +"@smithy/shared-ini-file-loader@^4.3.3": + version "4.3.3" + resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.3.3.tgz#1d5162cd3a14f57e4fde56f65aa188e8138c1248" + integrity sha512-9f9Ixej0hFhroOK2TxZfUUDR13WVa8tQzhSzPDgXe5jGL3KmaM9s8XN7RQwqtEypI82q9KHnKS71CJ+q/1xLtQ== dependencies: - "@smithy/types" "^4.5.0" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/signature-v4@^5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.2.1.tgz#0048489d2f1b3c888382595a085edd31967498f8" - integrity sha512-M9rZhWQLjlQVCCR37cSjHfhriGRN+FQ8UfgrYNufv66TJgk+acaggShl3KS5U/ssxivvZLlnj7QH2CUOKlxPyA== +"@smithy/signature-v4@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.3.3.tgz#5ff13cfaa29cb531061c2582cb599b39e040e52e" + integrity sha512-CmSlUy+eEYbIEYN5N3vvQTRfqt0lJlQkaQUIf+oizu7BbDut0pozfDjBGecfcfWf7c62Yis4JIEgqQ/TCfodaA== dependencies: - "@smithy/is-array-buffer" "^4.1.0" - "@smithy/protocol-http" "^5.2.1" - "@smithy/types" "^4.5.0" - "@smithy/util-hex-encoding" "^4.1.0" - "@smithy/util-middleware" "^4.1.1" - "@smithy/util-uri-escape" "^4.1.0" - "@smithy/util-utf8" "^4.1.0" + "@smithy/is-array-buffer" "^4.2.0" + "@smithy/protocol-http" "^5.3.3" + "@smithy/types" "^4.8.0" + "@smithy/util-hex-encoding" "^4.2.0" + "@smithy/util-middleware" "^4.2.3" + "@smithy/util-uri-escape" "^4.2.0" + "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@smithy/smithy-client@^4.6.3": - version "4.6.3" - resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.6.3.tgz#5ec0c2c993371c246e061ac29550ab4f63db99bc" - integrity sha512-K27LqywsaqKz4jusdUQYJh/YP2VbnbdskZ42zG8xfV+eovbTtMc2/ZatLWCfSkW0PDsTUXlpvlaMyu8925HsOw== +"@smithy/smithy-client@^4.9.1": + version "4.9.1" + resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.9.1.tgz#a36e456e837121b2ded6f7d5f1f30b205c446e20" + integrity sha512-Ngb95ryR5A9xqvQFT5mAmYkCwbXvoLavLFwmi7zVg/IowFPCfiqRfkOKnbc/ZRL8ZKJ4f+Tp6kSu6wjDQb8L/g== dependencies: - "@smithy/core" "^3.11.1" - "@smithy/middleware-endpoint" "^4.2.3" - "@smithy/middleware-stack" "^4.1.1" - "@smithy/protocol-http" "^5.2.1" - "@smithy/types" "^4.5.0" - "@smithy/util-stream" "^4.3.2" + "@smithy/core" "^3.17.1" + "@smithy/middleware-endpoint" "^4.3.5" + "@smithy/middleware-stack" "^4.2.3" + "@smithy/protocol-http" "^5.3.3" + "@smithy/types" "^4.8.0" + "@smithy/util-stream" "^4.5.4" tslib "^2.6.2" -"@smithy/types@^4.5.0": - version "4.5.0" - resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.5.0.tgz#850e334662a1ef1286c35814940c80880400a370" - integrity sha512-RkUpIOsVlAwUIZXO1dsz8Zm+N72LClFfsNqf173catVlvRZiwPy0x2u0JLEA4byreOPKDZPGjmPDylMoP8ZJRg== +"@smithy/types@^4.8.0": + version "4.8.0" + resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.8.0.tgz#e6f65e712478910b74747081e6046e68159f767d" + integrity sha512-QpELEHLO8SsQVtqP+MkEgCYTFW0pleGozfs3cZ183ZBj9z3VC1CX1/wtFMK64p+5bhtZo41SeLK1rBRtd25nHQ== dependencies: tslib "^2.6.2" -"@smithy/url-parser@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.1.1.tgz#0e9a5e72b3cf9d7ab7305f9093af5528d9debaf6" - integrity sha512-bx32FUpkhcaKlEoOMbScvc93isaSiRM75pQ5IgIBaMkT7qMlIibpPRONyx/0CvrXHzJLpOn/u6YiDX2hcvs7Dg== +"@smithy/url-parser@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.2.3.tgz#82508f273a3f074d47d0919f7ce08028c6575c2f" + integrity sha512-I066AigYvY3d9VlU3zG9XzZg1yT10aNqvCaBTw9EPgu5GrsEl1aUkcMvhkIXascYH1A8W0LQo3B1Kr1cJNcQEw== dependencies: - "@smithy/querystring-parser" "^4.1.1" - "@smithy/types" "^4.5.0" + "@smithy/querystring-parser" "^4.2.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/util-base64@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-4.1.0.tgz#5965026081d9aef4a8246f5702807570abe538b2" - integrity sha512-RUGd4wNb8GeW7xk+AY5ghGnIwM96V0l2uzvs/uVHf+tIuVX2WSvynk5CxNoBCsM2rQRSZElAo9rt3G5mJ/gktQ== +"@smithy/util-base64@^4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-4.3.0.tgz#5e287b528793aa7363877c1a02cd880d2e76241d" + integrity sha512-GkXZ59JfyxsIwNTWFnjmFEI8kZpRNIBfxKjv09+nkAWPt/4aGaEWMM04m4sxgNVWkbt2MdSvE3KF/PfX4nFedQ== dependencies: - "@smithy/util-buffer-from" "^4.1.0" - "@smithy/util-utf8" "^4.1.0" + "@smithy/util-buffer-from" "^4.2.0" + "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@smithy/util-body-length-browser@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-4.1.0.tgz#636bdf4bc878c546627dab4b9b0e4db31b475be7" - integrity sha512-V2E2Iez+bo6bUMOTENPr6eEmepdY8Hbs+Uc1vkDKgKNA/brTJqOW/ai3JO1BGj9GbCeLqw90pbbH7HFQyFotGQ== +"@smithy/util-body-length-browser@^4.2.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.0.tgz#04e9fc51ee7a3e7f648a4b4bcdf96c350cfa4d61" + integrity sha512-Fkoh/I76szMKJnBXWPdFkQJl2r9SjPt3cMzLdOB6eJ4Pnpas8hVoWPYemX/peO0yrrvldgCUVJqOAjUrOLjbxg== dependencies: tslib "^2.6.2" -"@smithy/util-body-length-node@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-4.1.0.tgz#646750e4af58f97254a5d5cfeaba7d992f0152ec" - integrity sha512-BOI5dYjheZdgR9XiEM3HJcEMCXSoqbzu7CzIgYrx0UtmvtC3tC2iDGpJLsSRFffUpy8ymsg2ARMP5fR8mtuUQQ== +"@smithy/util-body-length-node@^4.2.1": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-4.2.1.tgz#79c8a5d18e010cce6c42d5cbaf6c1958523e6fec" + integrity sha512-h53dz/pISVrVrfxV1iqXlx5pRg3V2YWFcSQyPyXZRrZoZj4R4DeWRDo1a7dd3CPTcFi3kE+98tuNyD2axyZReA== dependencies: tslib "^2.6.2" @@ -1522,96 +1249,95 @@ "@smithy/is-array-buffer" "^2.2.0" tslib "^2.6.2" -"@smithy/util-buffer-from@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-4.1.0.tgz#21f9e644a0eb41226d92e4eff763f76a7db7e9cc" - integrity sha512-N6yXcjfe/E+xKEccWEKzK6M+crMrlwaCepKja0pNnlSkm6SjAeLKKA++er5Ba0I17gvKfN/ThV+ZOx/CntKTVw== +"@smithy/util-buffer-from@^4.2.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-4.2.0.tgz#7abd12c4991b546e7cee24d1e8b4bfaa35c68a9d" + integrity sha512-kAY9hTKulTNevM2nlRtxAG2FQ3B2OR6QIrPY3zE5LqJy1oxzmgBGsHLWTcNhWXKchgA0WHW+mZkQrng/pgcCew== dependencies: - "@smithy/is-array-buffer" "^4.1.0" + "@smithy/is-array-buffer" "^4.2.0" tslib "^2.6.2" -"@smithy/util-config-provider@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-4.1.0.tgz#6a07d73446c1e9a46d7a3c125f2a9301060bc957" - integrity sha512-swXz2vMjrP1ZusZWVTB/ai5gK+J8U0BWvP10v9fpcFvg+Xi/87LHvHfst2IgCs1i0v4qFZfGwCmeD/KNCdJZbQ== +"@smithy/util-config-provider@^4.2.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-4.2.0.tgz#2e4722937f8feda4dcb09672c59925a4e6286cfc" + integrity sha512-YEjpl6XJ36FTKmD+kRJJWYvrHeUvm5ykaUS5xK+6oXffQPHeEM4/nXlZPe+Wu0lsgRUcNZiliYNh/y7q9c2y6Q== dependencies: tslib "^2.6.2" -"@smithy/util-defaults-mode-browser@^4.1.3": - version "4.1.3" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.1.3.tgz#889e0999c6b1536e434c2814a97bb9e7a9febc60" - integrity sha512-5fm3i2laE95uhY6n6O6uGFxI5SVbqo3/RWEuS3YsT0LVmSZk+0eUqPhKd4qk0KxBRPaT5VNT/WEBUqdMyYoRgg== +"@smithy/util-defaults-mode-browser@^4.3.4": + version "4.3.4" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.4.tgz#ed96651c32ac0de55b066fcb07a296837373212f" + integrity sha512-qI5PJSW52rnutos8Bln8nwQZRpyoSRN6k2ajyoUHNMUzmWqHnOJCnDELJuV6m5PML0VkHI+XcXzdB+6awiqYUw== dependencies: - "@smithy/property-provider" "^4.1.1" - "@smithy/smithy-client" "^4.6.3" - "@smithy/types" "^4.5.0" - bowser "^2.11.0" + "@smithy/property-provider" "^4.2.3" + "@smithy/smithy-client" "^4.9.1" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/util-defaults-mode-node@^4.1.3": - version "4.1.3" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.1.3.tgz#7cc46d336dce27f716280a1979c51ca2bf5839ff" - integrity sha512-lwnMzlMslZ9GJNt+/wVjz6+fe9Wp5tqR1xAyQn+iywmP+Ymj0F6NhU/KfHM5jhGPQchRSCcau5weKhFdLIM4cA== +"@smithy/util-defaults-mode-node@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.6.tgz#01b7ff4605f6f981972083fee22d036e5dc4be38" + integrity sha512-c6M/ceBTm31YdcFpgfgQAJaw3KbaLuRKnAz91iMWFLSrgxRpYm03c3bu5cpYojNMfkV9arCUelelKA7XQT36SQ== dependencies: - "@smithy/config-resolver" "^4.2.2" - "@smithy/credential-provider-imds" "^4.1.2" - "@smithy/node-config-provider" "^4.2.2" - "@smithy/property-provider" "^4.1.1" - "@smithy/smithy-client" "^4.6.3" - "@smithy/types" "^4.5.0" + "@smithy/config-resolver" "^4.4.0" + "@smithy/credential-provider-imds" "^4.2.3" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/property-provider" "^4.2.3" + "@smithy/smithy-client" "^4.9.1" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/util-endpoints@^3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.1.2.tgz#be4005c8616923d453347048ef26a439267b2782" - integrity sha512-+AJsaaEGb5ySvf1SKMRrPZdYHRYSzMkCoK16jWnIMpREAnflVspMIDeCVSZJuj+5muZfgGpNpijE3mUNtjv01Q== +"@smithy/util-endpoints@^3.2.3": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.2.3.tgz#8bbb80f1ad5769d9f73992c5979eea3b74d7baa9" + integrity sha512-aCfxUOVv0CzBIkU10TubdgKSx5uRvzH064kaiPEWfNIvKOtNpu642P4FP1hgOFkjQIkDObrfIDnKMKkeyrejvQ== dependencies: - "@smithy/node-config-provider" "^4.2.2" - "@smithy/types" "^4.5.0" + "@smithy/node-config-provider" "^4.3.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/util-hex-encoding@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-4.1.0.tgz#9b27cf0c25d0de2c8ebfe75cc20df84e5014ccc9" - integrity sha512-1LcueNN5GYC4tr8mo14yVYbh/Ur8jHhWOxniZXii+1+ePiIbsLZ5fEI0QQGtbRRP5mOhmooos+rLmVASGGoq5w== +"@smithy/util-hex-encoding@^4.2.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.0.tgz#1c22ea3d1e2c3a81ff81c0a4f9c056a175068a7b" + integrity sha512-CCQBwJIvXMLKxVbO88IukazJD9a4kQ9ZN7/UMGBjBcJYvatpWk+9g870El4cB8/EJxfe+k+y0GmR9CAzkF+Nbw== dependencies: tslib "^2.6.2" -"@smithy/util-middleware@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.1.1.tgz#e19749a127499c9bdada713a8afd807d92d846e2" - integrity sha512-CGmZ72mL29VMfESz7S6dekqzCh8ZISj3B+w0g1hZFXaOjGTVaSqfAEFAq8EGp8fUL+Q2l8aqNmt8U1tglTikeg== +"@smithy/util-middleware@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.2.3.tgz#7c73416a6e3d3207a2d34a1eadd9f2b6a9811bd6" + integrity sha512-v5ObKlSe8PWUHCqEiX2fy1gNv6goiw6E5I/PN2aXg3Fb/hse0xeaAnSpXDiWl7x6LamVKq7senB+m5LOYHUAHw== dependencies: - "@smithy/types" "^4.5.0" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/util-retry@^4.1.2": - version "4.1.2" - resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.1.2.tgz#8d28c27cf69643e173c75cc18ff0186deb7cefed" - integrity sha512-NCgr1d0/EdeP6U5PSZ9Uv5SMR5XRRYoVr1kRVtKZxWL3tixEL3UatrPIMFZSKwHlCcp2zPLDvMubVDULRqeunA== +"@smithy/util-retry@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.2.3.tgz#b1e5c96d96aaf971b68323ff8ba8754f914f22a0" + integrity sha512-lLPWnakjC0q9z+OtiXk+9RPQiYPNAovt2IXD3CP4LkOnd9NpUsxOjMx1SnoUVB7Orb7fZp67cQMtTBKMFDvOGg== dependencies: - "@smithy/service-error-classification" "^4.1.2" - "@smithy/types" "^4.5.0" + "@smithy/service-error-classification" "^4.2.3" + "@smithy/types" "^4.8.0" tslib "^2.6.2" -"@smithy/util-stream@^4.3.2": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.3.2.tgz#7ce40c266b1e828d73c27e545959cda4f42fd61f" - integrity sha512-Ka+FA2UCC/Q1dEqUanCdpqwxOFdf5Dg2VXtPtB1qxLcSGh5C1HdzklIt18xL504Wiy9nNUKwDMRTVCbKGoK69g== +"@smithy/util-stream@^4.5.4": + version "4.5.4" + resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.5.4.tgz#bfc60e2714c2065b8e7e91ca921cc31c73efdbd4" + integrity sha512-+qDxSkiErejw1BAIXUFBSfM5xh3arbz1MmxlbMCKanDDZtVEQ7PSKW9FQS0Vud1eI/kYn0oCTVKyNzRlq+9MUw== dependencies: - "@smithy/fetch-http-handler" "^5.2.1" - "@smithy/node-http-handler" "^4.2.1" - "@smithy/types" "^4.5.0" - "@smithy/util-base64" "^4.1.0" - "@smithy/util-buffer-from" "^4.1.0" - "@smithy/util-hex-encoding" "^4.1.0" - "@smithy/util-utf8" "^4.1.0" + "@smithy/fetch-http-handler" "^5.3.4" + "@smithy/node-http-handler" "^4.4.3" + "@smithy/types" "^4.8.0" + "@smithy/util-base64" "^4.3.0" + "@smithy/util-buffer-from" "^4.2.0" + "@smithy/util-hex-encoding" "^4.2.0" + "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@smithy/util-uri-escape@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-4.1.0.tgz#ed4a5c498f1da07122ca1e3df4ca3e2c67c6c18a" - integrity sha512-b0EFQkq35K5NHUYxU72JuoheM6+pytEVUGlTwiFxWFpmddA+Bpz3LgsPRIpBk8lnPE47yT7AF2Egc3jVnKLuPg== +"@smithy/util-uri-escape@^4.2.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-4.2.0.tgz#096a4cec537d108ac24a68a9c60bee73fc7e3a9e" + integrity sha512-igZpCKV9+E/Mzrpq6YacdTQ0qTiLm85gD6N/IrmyDvQFA4UnU3d5g3m8tMT/6zG/vVkWSU+VxeUyGonL62DuxA== dependencies: tslib "^2.6.2" @@ -1623,21 +1349,28 @@ "@smithy/util-buffer-from" "^2.2.0" tslib "^2.6.2" -"@smithy/util-utf8@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-4.1.0.tgz#912c33c1a06913f39daa53da79cb8f7ab740d97b" - integrity sha512-mEu1/UIXAdNYuBcyEPbjScKi/+MQVXNIuY/7Cm5XLIWe319kDrT5SizBE95jqtmEXoDbGoZxKLCMttdZdqTZKQ== +"@smithy/util-utf8@^4.2.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-4.2.0.tgz#8b19d1514f621c44a3a68151f3d43e51087fed9d" + integrity sha512-zBPfuzoI8xyBtR2P6WQj63Rz8i3AmfAaJLuNG8dWsfvPe8lO4aCPYLn879mEgHndZH1zQ2oXmG8O1GGzzaoZiw== dependencies: - "@smithy/util-buffer-from" "^4.1.0" + "@smithy/util-buffer-from" "^4.2.0" tslib "^2.6.2" -"@smithy/util-waiter@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-4.1.1.tgz#5b74429ca9e37f61838800b919d0063b1a865bef" - integrity sha512-PJBmyayrlfxM7nbqjomF4YcT1sApQwZio0NHSsT0EzhJqljRmvhzqZua43TyEs80nJk2Cn2FGPg/N8phH6KeCQ== +"@smithy/util-waiter@^4.2.3": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-4.2.3.tgz#4c662009db101bc60aed07815d359e90904caef2" + integrity sha512-5+nU///E5sAdD7t3hs4uwvCTWQtTR8JwKwOCSJtBRx0bY1isDo1QwH87vRK86vlFLBTISqoDA2V6xvP6nF1isQ== + dependencies: + "@smithy/abort-controller" "^4.2.3" + "@smithy/types" "^4.8.0" + tslib "^2.6.2" + +"@smithy/uuid@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@smithy/uuid/-/uuid-1.1.0.tgz#9fd09d3f91375eab94f478858123387df1cda987" + integrity sha512-4aUIteuyxtBUhVdiQqcDhKFitwfd9hqoSDYY2KRXiWtgoWJ9Bmise+KfEPDiVHWeJepvF8xJO9/9+WDIciMFFw== dependencies: - "@smithy/abort-controller" "^4.1.1" - "@smithy/types" "^4.5.0" tslib "^2.6.2" "@swc/helpers@0.5.15": @@ -1647,184 +1380,150 @@ dependencies: tslib "^2.8.0" -"@tailwindcss/node@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/node/-/node-4.1.13.tgz#cecd0dfa4f573fd37fdbaf29403b8dba9d50f118" - integrity sha512-eq3ouolC1oEFOAvOMOBAmfCIqZBJuvWvvYWh5h5iOYfe1HFC6+GZ6EIL0JdM3/niGRJmnrOc+8gl9/HGUaaptw== +"@tailwindcss/node@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/node/-/node-4.1.16.tgz#4d0ca77955a7d03ed6afd68ebd798aed897298e0" + integrity sha512-BX5iaSsloNuvKNHRN3k2RcCuTEgASTo77mofW0vmeHkfrDWaoFAFvNHpEgtu0eqyypcyiBkDWzSMxJhp3AUVcw== dependencies: "@jridgewell/remapping" "^2.3.4" enhanced-resolve "^5.18.3" - jiti "^2.5.1" - lightningcss "1.30.1" - magic-string "^0.30.18" + jiti "^2.6.1" + lightningcss "1.30.2" + magic-string "^0.30.19" source-map-js "^1.2.1" - tailwindcss "4.1.13" - -"@tailwindcss/oxide-android-arm64@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.13.tgz#34e02dc9bbb3902c36800c75edad3f033cd33ce3" - integrity sha512-BrpTrVYyejbgGo57yc8ieE+D6VT9GOgnNdmh5Sac6+t0m+v+sKQevpFVpwX3pBrM2qKrQwJ0c5eDbtjouY/+ew== - -"@tailwindcss/oxide-darwin-arm64@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.13.tgz#f36dca1f6bc28ac6d81ea6072d9455aa2f5198bb" - integrity sha512-YP+Jksc4U0KHcu76UhRDHq9bx4qtBftp9ShK/7UGfq0wpaP96YVnnjFnj3ZFrUAjc5iECzODl/Ts0AN7ZPOANQ== - -"@tailwindcss/oxide-darwin-x64@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.13.tgz#259aa6d8c58c6d4fd01e856ea731924ba2afcab9" - integrity sha512-aAJ3bbwrn/PQHDxCto9sxwQfT30PzyYJFG0u/BWZGeVXi5Hx6uuUOQEI2Fa43qvmUjTRQNZnGqe9t0Zntexeuw== - -"@tailwindcss/oxide-freebsd-x64@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.13.tgz#b9987fb460ed24d4227392970e6af8e90784d434" - integrity sha512-Wt8KvASHwSXhKE/dJLCCWcTSVmBj3xhVhp/aF3RpAhGeZ3sVo7+NTfgiN8Vey/Fi8prRClDs6/f0KXPDTZE6nQ== - -"@tailwindcss/oxide-linux-arm-gnueabihf@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.13.tgz#ed157b7fa2ea79cc97f196383f461c9be1acc309" - integrity sha512-mbVbcAsW3Gkm2MGwA93eLtWrwajz91aXZCNSkGTx/R5eb6KpKD5q8Ueckkh9YNboU8RH7jiv+ol/I7ZyQ9H7Bw== - -"@tailwindcss/oxide-linux-arm64-gnu@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.13.tgz#5732ad1e5679d7d93999563e63728a813f3d121c" - integrity sha512-wdtfkmpXiwej/yoAkrCP2DNzRXCALq9NVLgLELgLim1QpSfhQM5+ZxQQF8fkOiEpuNoKLp4nKZ6RC4kmeFH0HQ== - -"@tailwindcss/oxide-linux-arm64-musl@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.13.tgz#987837bc5bf88ef84e2aef38c6cbebed0cf40d81" - integrity sha512-hZQrmtLdhyqzXHB7mkXfq0IYbxegaqTmfa1p9MBj72WPoDD3oNOh1Lnxf6xZLY9C3OV6qiCYkO1i/LrzEdW2mg== - -"@tailwindcss/oxide-linux-x64-gnu@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.13.tgz#a673731e1c8ae6e97bdacd6140ec08cdc23121fb" - integrity sha512-uaZTYWxSXyMWDJZNY1Ul7XkJTCBRFZ5Fo6wtjrgBKzZLoJNrG+WderJwAjPzuNZOnmdrVg260DKwXCFtJ/hWRQ== - -"@tailwindcss/oxide-linux-x64-musl@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.13.tgz#5201013bff73ab309ad5fe0ff0abe1ad51b2bd63" - integrity sha512-oXiPj5mi4Hdn50v5RdnuuIms0PVPI/EG4fxAfFiIKQh5TgQgX7oSuDWntHW7WNIi/yVLAiS+CRGW4RkoGSSgVQ== - -"@tailwindcss/oxide-wasm32-wasi@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.13.tgz#6af873b3417468670b88c70bcb3f6d5fa76fbaae" - integrity sha512-+LC2nNtPovtrDwBc/nqnIKYh/W2+R69FA0hgoeOn64BdCX522u19ryLh3Vf3F8W49XBcMIxSe665kwy21FkhvA== - dependencies: - "@emnapi/core" "^1.4.5" - "@emnapi/runtime" "^1.4.5" - "@emnapi/wasi-threads" "^1.0.4" - "@napi-rs/wasm-runtime" "^0.2.12" - "@tybys/wasm-util" "^0.10.0" - tslib "^2.8.0" + tailwindcss "4.1.16" + +"@tailwindcss/oxide-android-arm64@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.16.tgz#9bd16c0a08db20d7c93907a9bd1564e0255307eb" + integrity sha512-8+ctzkjHgwDJ5caq9IqRSgsP70xhdhJvm+oueS/yhD5ixLhqTw9fSL1OurzMUhBwE5zK26FXLCz2f/RtkISqHA== + +"@tailwindcss/oxide-darwin-arm64@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.16.tgz#72ac362b2c30a3912f8f0e8acbd4838918a1d11a" + integrity sha512-C3oZy5042v2FOALBZtY0JTDnGNdS6w7DxL/odvSny17ORUnaRKhyTse8xYi3yKGyfnTUOdavRCdmc8QqJYwFKA== + +"@tailwindcss/oxide-darwin-x64@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.16.tgz#6193bafbb1a885795702f12bbef9cc5eb4cc550b" + integrity sha512-vjrl/1Ub9+JwU6BP0emgipGjowzYZMjbWCDqwA2Z4vCa+HBSpP4v6U2ddejcHsolsYxwL5r4bPNoamlV0xDdLg== + +"@tailwindcss/oxide-freebsd-x64@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.16.tgz#0e2b064d71ba87a9001ac963be2752a8ddb64349" + integrity sha512-TSMpPYpQLm+aR1wW5rKuUuEruc/oOX3C7H0BTnPDn7W/eMw8W+MRMpiypKMkXZfwH8wqPIRKppuZoedTtNj2tg== + +"@tailwindcss/oxide-linux-arm-gnueabihf@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.16.tgz#8e80c959eeda81a08ed955e23eb6d228287b9672" + integrity sha512-p0GGfRg/w0sdsFKBjMYvvKIiKy/LNWLWgV/plR4lUgrsxFAoQBFrXkZ4C0w8IOXfslB9vHK/JGASWD2IefIpvw== + +"@tailwindcss/oxide-linux-arm64-gnu@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.16.tgz#d5f54910920fc5808122515f5208c5ecc1a40545" + integrity sha512-DoixyMmTNO19rwRPdqviTrG1rYzpxgyYJl8RgQvdAQUzxC1ToLRqtNJpU/ATURSKgIg6uerPw2feW0aS8SNr/w== + +"@tailwindcss/oxide-linux-arm64-musl@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.16.tgz#67cdb932230ac47bf3bf5415ccc92417b27020ee" + integrity sha512-H81UXMa9hJhWhaAUca6bU2wm5RRFpuHImrwXBUvPbYb+3jo32I9VIwpOX6hms0fPmA6f2pGVlybO6qU8pF4fzQ== + +"@tailwindcss/oxide-linux-x64-gnu@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.16.tgz#80ae0cfd8ebc970f239060ecdfdd07f6f6b14dce" + integrity sha512-ZGHQxDtFC2/ruo7t99Qo2TTIvOERULPl5l0K1g0oK6b5PGqjYMga+FcY1wIUnrUxY56h28FxybtDEla+ICOyew== + +"@tailwindcss/oxide-linux-x64-musl@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.16.tgz#524e5b87e8e79a712de3d9bbb94d2fc2fa44391c" + integrity sha512-Oi1tAaa0rcKf1Og9MzKeINZzMLPbhxvm7rno5/zuP1WYmpiG0bEHq4AcRUiG2165/WUzvxkW4XDYCscZWbTLZw== + +"@tailwindcss/oxide-wasm32-wasi@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.16.tgz#dc31d6bc1f6c1e8119a335ae3f28deb4d7c560f2" + integrity sha512-B01u/b8LteGRwucIBmCQ07FVXLzImWESAIMcUU6nvFt/tYsQ6IHz8DmZ5KtvmwxD+iTYBtM1xwoGXswnlu9v0Q== + dependencies: + "@emnapi/core" "^1.5.0" + "@emnapi/runtime" "^1.5.0" + "@emnapi/wasi-threads" "^1.1.0" + "@napi-rs/wasm-runtime" "^1.0.7" + "@tybys/wasm-util" "^0.10.1" + tslib "^2.4.0" -"@tailwindcss/oxide-win32-arm64-msvc@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.13.tgz#feca2e628d6eac3fb156613e53c2a3d8006b7d16" - integrity sha512-dziTNeQXtoQ2KBXmrjCxsuPk3F3CQ/yb7ZNZNA+UkNTeiTGgfeh+gH5Pi7mRncVgcPD2xgHvkFCh/MhZWSgyQg== +"@tailwindcss/oxide-win32-arm64-msvc@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.16.tgz#f1f810cdb49dae8071d5edf0db5cc0da2ec6a7e8" + integrity sha512-zX+Q8sSkGj6HKRTMJXuPvOcP8XfYON24zJBRPlszcH1Np7xuHXhWn8qfFjIujVzvH3BHU+16jBXwgpl20i+v9A== -"@tailwindcss/oxide-win32-x64-msvc@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.13.tgz#20db1f2dabbc6b89bda9f4af5e1ab848079ea3dc" - integrity sha512-3+LKesjXydTkHk5zXX01b5KMzLV1xl2mcktBJkje7rhFUpUlYJy7IMOLqjIRQncLTa1WZZiFY/foAeB5nmaiTw== +"@tailwindcss/oxide-win32-x64-msvc@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.16.tgz#76dcda613578f06569c0a6015f39f12746a24dce" + integrity sha512-m5dDFJUEejbFqP+UXVstd4W/wnxA4F61q8SoL+mqTypId2T2ZpuxosNSgowiCnLp2+Z+rivdU0AqpfgiD7yCBg== -"@tailwindcss/oxide@4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide/-/oxide-4.1.13.tgz#fc6d48fb2ea1d13d9ddba7ea6473716ad757a8fc" - integrity sha512-CPgsM1IpGRa880sMbYmG1s4xhAy3xEt1QULgTJGQmZUeNgXFR7s1YxYygmJyBGtou4SyEosGAGEeYqY7R53bIA== - dependencies: - detect-libc "^2.0.4" - tar "^7.4.3" +"@tailwindcss/oxide@4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide/-/oxide-4.1.16.tgz#6e94fa039eeddc173a9dc6ba5f8c5f54766b25cf" + integrity sha512-2OSv52FRuhdlgyOQqgtQHuCgXnS8nFSYRp2tJ+4WZXKgTxqPy7SMSls8c3mPT5pkZ17SBToGM5LHEJBO7miEdg== optionalDependencies: - "@tailwindcss/oxide-android-arm64" "4.1.13" - "@tailwindcss/oxide-darwin-arm64" "4.1.13" - "@tailwindcss/oxide-darwin-x64" "4.1.13" - "@tailwindcss/oxide-freebsd-x64" "4.1.13" - "@tailwindcss/oxide-linux-arm-gnueabihf" "4.1.13" - "@tailwindcss/oxide-linux-arm64-gnu" "4.1.13" - "@tailwindcss/oxide-linux-arm64-musl" "4.1.13" - "@tailwindcss/oxide-linux-x64-gnu" "4.1.13" - "@tailwindcss/oxide-linux-x64-musl" "4.1.13" - "@tailwindcss/oxide-wasm32-wasi" "4.1.13" - "@tailwindcss/oxide-win32-arm64-msvc" "4.1.13" - "@tailwindcss/oxide-win32-x64-msvc" "4.1.13" + "@tailwindcss/oxide-android-arm64" "4.1.16" + "@tailwindcss/oxide-darwin-arm64" "4.1.16" + "@tailwindcss/oxide-darwin-x64" "4.1.16" + "@tailwindcss/oxide-freebsd-x64" "4.1.16" + "@tailwindcss/oxide-linux-arm-gnueabihf" "4.1.16" + "@tailwindcss/oxide-linux-arm64-gnu" "4.1.16" + "@tailwindcss/oxide-linux-arm64-musl" "4.1.16" + "@tailwindcss/oxide-linux-x64-gnu" "4.1.16" + "@tailwindcss/oxide-linux-x64-musl" "4.1.16" + "@tailwindcss/oxide-wasm32-wasi" "4.1.16" + "@tailwindcss/oxide-win32-arm64-msvc" "4.1.16" + "@tailwindcss/oxide-win32-x64-msvc" "4.1.16" "@tailwindcss/postcss@^4": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@tailwindcss/postcss/-/postcss-4.1.13.tgz#47a19ed4b2aa2517ebcfe658cfa3fc67fe4fdd71" - integrity sha512-HLgx6YSFKJT7rJqh9oJs/TkBFhxuMOfUKSBEPYwV+t78POOBsdQ7crhZLzwcH3T0UyUuOzU/GK5pk5eKr3wCiQ== + version "4.1.16" + resolved "https://registry.yarnpkg.com/@tailwindcss/postcss/-/postcss-4.1.16.tgz#775a0531d377a595a70df4afacc6fc67f391a753" + integrity sha512-Qn3SFGPXYQMKR/UtqS+dqvPrzEeBZHrFA92maT4zijCVggdsXnDBMsPFJo1eArX3J+O+Gi+8pV4PkqjLCNBk3A== dependencies: "@alloc/quick-lru" "^5.2.0" - "@tailwindcss/node" "4.1.13" - "@tailwindcss/oxide" "4.1.13" + "@tailwindcss/node" "4.1.16" + "@tailwindcss/oxide" "4.1.16" postcss "^8.4.41" - tailwindcss "4.1.13" + tailwindcss "4.1.16" -"@tybys/wasm-util@^0.10.0": +"@tybys/wasm-util@^0.10.1": version "0.10.1" resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.1.tgz#ecddd3205cf1e2d5274649ff0eedd2991ed7f414" integrity sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg== dependencies: tslib "^2.4.0" -"@types/node@*": - version "24.5.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-24.5.2.tgz#52ceb83f50fe0fcfdfbd2a9fab6db2e9e7ef6446" - integrity sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ== - dependencies: - undici-types "~7.12.0" - "@types/node@^20": - version "20.19.17" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.17.tgz#41b52697373aef8a43b3b92f33b43f329b2d674b" - integrity sha512-gfehUI8N1z92kygssiuWvLiwcbOB3IRktR6hTDgJlXMYh5OvkPSRmgfoBUmfZt+vhwJtX7v1Yw4KvvAf7c5QKQ== + version "20.19.23" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.23.tgz#7de99389c814071cca78656a3243f224fed7453d" + integrity sha512-yIdlVVVHXpmqRhtyovZAcSy0MiPcYWGkoO4CGe/+jpP0hmNuihm4XhHbADpK++MsiLHP5MVlv+bcgdF99kSiFQ== dependencies: undici-types "~6.21.0" -"@types/pg@^8.15.5": - version "8.15.5" - resolved "https://registry.yarnpkg.com/@types/pg/-/pg-8.15.5.tgz#ef43e0f33b62dac95cae2f042888ec7980b30c09" - integrity sha512-LF7lF6zWEKxuT3/OR8wAZGzkg4ENGXFNyiV/JeOt9z5B+0ZVwbql9McqX5c/WStFq1GaGso7H1AzP/qSzmlCKQ== - dependencies: - "@types/node" "*" - pg-protocol "*" - pg-types "^2.2.0" - "@types/react-dom@^19": - version "19.1.9" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.1.9.tgz#5ab695fce1e804184767932365ae6569c11b4b4b" - integrity sha512-qXRuZaOsAdXKFyOhRBg6Lqqc0yay13vN7KrIg4L7N4aaHN68ma9OK3NE1BoDFgFOTfM7zg+3/8+2n8rLUH3OKQ== + version "19.2.2" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.2.2.tgz#a4cc874797b7ddc9cb180ef0d5dc23f596fc2332" + integrity sha512-9KQPoO6mZCi7jcIStSnlOWn2nEF3mNmyr3rIAsGnAbQKYbRLyqmeSc39EVgtxXVia+LMT8j3knZLAZAh+xLmrw== "@types/react@^19": - version "19.1.13" - resolved "https://registry.yarnpkg.com/@types/react/-/react-19.1.13.tgz#fc650ffa680d739a25a530f5d7ebe00cdd771883" - integrity sha512-hHkbU/eoO3EG5/MZkuFSKmYqPbSVk5byPFa3e7y/8TybHiLMACgI8seVYlicwk7H5K/rI2px9xrQp/C+AUDTiQ== + version "19.2.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-19.2.2.tgz#ba123a75d4c2a51158697160a4ea2ff70aa6bf36" + integrity sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA== dependencies: csstype "^3.0.2" -"@types/uuid@^9.0.1": - version "9.0.8" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.8.tgz#7545ba4fc3c003d6c756f651f3bf163d8f0f29ba" - integrity sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA== - bowser@^2.11.0: version "2.12.1" resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.12.1.tgz#f9ad78d7aebc472feb63dd9635e3ce2337e0e2c1" integrity sha512-z4rE2Gxh7tvshQ4hluIT7XcFrgLIQaw9X3A+kTTRdovCz5PMukm/0QC/BKSYPj3omF5Qfypn9O/c5kgpmvYUCw== -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - caniuse-lite@^1.0.30001579: - version "1.0.30001743" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001743.tgz#50ff91a991220a1ee2df5af00650dd5c308ea7cd" - integrity sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw== - -chownr@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-3.0.0.tgz#9855e64ecd240a9cc4267ce8a4aa5d24a1da15e4" - integrity sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g== + version "1.0.30001751" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001751.tgz#dacd5d9f4baeea841641640139d2b2a4df4226ad" + integrity sha512-A0QJhug0Ly64Ii3eIqHu5X51ebln3k4yTUkY1j8drqpWHVreg/VLijN48cZ1bYPiqOQuqpkIKnzr/Ul8V+p6Cw== client-only@0.0.1: version "0.0.1" @@ -1836,32 +1535,10 @@ csstype@^3.0.2: resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== -debug@^4.3.4: - version "4.4.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a" - integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA== - dependencies: - ms "^2.1.3" - -detect-libc@^2.0.3, detect-libc@^2.0.4, detect-libc@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.0.tgz#3ca811f60a7b504b0480e5008adacc660b0b8c4f" - integrity sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg== - -drizzle-kit@^0.31.4: - version "0.31.4" - resolved "https://registry.yarnpkg.com/drizzle-kit/-/drizzle-kit-0.31.4.tgz#b4a23fae0ab8d64b262184aaf07f8cbdc2222751" - integrity sha512-tCPWVZWZqWVx2XUsVpJRnH9Mx0ClVOf5YUHerZ5so1OKSlqww4zy1R5ksEdGRcO3tM3zj0PYN6V48TbQCL1RfA== - dependencies: - "@drizzle-team/brocli" "^0.10.2" - "@esbuild-kit/esm-loader" "^2.5.5" - esbuild "^0.25.4" - esbuild-register "^3.5.0" - -drizzle-orm@^0.44.5: - version "0.44.5" - resolved "https://registry.yarnpkg.com/drizzle-orm/-/drizzle-orm-0.44.5.tgz#e81a470631e95bfd1bf61bd853d013954cd5fa2b" - integrity sha512-jBe37K7d8ZSKptdKfakQFdeljtu3P2Cbo7tJoJSVZADzIKOBo9IAJPOmMsH2bZl90bZgh8FQlD8BjxXA/zuBkQ== +detect-libc@^2.0.3, detect-libc@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad" + integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ== enhanced-resolve@^5.18.3: version "5.18.3" @@ -1871,73 +1548,6 @@ enhanced-resolve@^5.18.3: graceful-fs "^4.2.4" tapable "^2.2.0" -esbuild-register@^3.5.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/esbuild-register/-/esbuild-register-3.6.0.tgz#cf270cfa677baebbc0010ac024b823cbf723a36d" - integrity sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg== - dependencies: - debug "^4.3.4" - -esbuild@^0.25.4: - version "0.25.10" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.10.tgz#37f5aa5cd14500f141be121c01b096ca83ac34a9" - integrity sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ== - optionalDependencies: - "@esbuild/aix-ppc64" "0.25.10" - "@esbuild/android-arm" "0.25.10" - "@esbuild/android-arm64" "0.25.10" - "@esbuild/android-x64" "0.25.10" - "@esbuild/darwin-arm64" "0.25.10" - "@esbuild/darwin-x64" "0.25.10" - "@esbuild/freebsd-arm64" "0.25.10" - "@esbuild/freebsd-x64" "0.25.10" - "@esbuild/linux-arm" "0.25.10" - "@esbuild/linux-arm64" "0.25.10" - "@esbuild/linux-ia32" "0.25.10" - "@esbuild/linux-loong64" "0.25.10" - "@esbuild/linux-mips64el" "0.25.10" - "@esbuild/linux-ppc64" "0.25.10" - "@esbuild/linux-riscv64" "0.25.10" - "@esbuild/linux-s390x" "0.25.10" - "@esbuild/linux-x64" "0.25.10" - "@esbuild/netbsd-arm64" "0.25.10" - "@esbuild/netbsd-x64" "0.25.10" - "@esbuild/openbsd-arm64" "0.25.10" - "@esbuild/openbsd-x64" "0.25.10" - "@esbuild/openharmony-arm64" "0.25.10" - "@esbuild/sunos-x64" "0.25.10" - "@esbuild/win32-arm64" "0.25.10" - "@esbuild/win32-ia32" "0.25.10" - "@esbuild/win32-x64" "0.25.10" - -esbuild@~0.18.20: - version "0.18.20" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.20.tgz#4709f5a34801b43b799ab7d6d82f7284a9b7a7a6" - integrity sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA== - optionalDependencies: - "@esbuild/android-arm" "0.18.20" - "@esbuild/android-arm64" "0.18.20" - "@esbuild/android-x64" "0.18.20" - "@esbuild/darwin-arm64" "0.18.20" - "@esbuild/darwin-x64" "0.18.20" - "@esbuild/freebsd-arm64" "0.18.20" - "@esbuild/freebsd-x64" "0.18.20" - "@esbuild/linux-arm" "0.18.20" - "@esbuild/linux-arm64" "0.18.20" - "@esbuild/linux-ia32" "0.18.20" - "@esbuild/linux-loong64" "0.18.20" - "@esbuild/linux-mips64el" "0.18.20" - "@esbuild/linux-ppc64" "0.18.20" - "@esbuild/linux-riscv64" "0.18.20" - "@esbuild/linux-s390x" "0.18.20" - "@esbuild/linux-x64" "0.18.20" - "@esbuild/netbsd-x64" "0.18.20" - "@esbuild/openbsd-x64" "0.18.20" - "@esbuild/sunos-x64" "0.18.20" - "@esbuild/win32-arm64" "0.18.20" - "@esbuild/win32-ia32" "0.18.20" - "@esbuild/win32-x64" "0.18.20" - fast-xml-parser@5.2.5: version "5.2.5" resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz#4809fdfb1310494e341098c25cb1341a01a9144a" @@ -1945,120 +1555,97 @@ fast-xml-parser@5.2.5: dependencies: strnum "^2.1.0" -get-tsconfig@^4.7.0: - version "4.10.1" - resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.10.1.tgz#d34c1c01f47d65a606c37aa7a177bc3e56ab4b2e" - integrity sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ== - dependencies: - resolve-pkg-maps "^1.0.0" - graceful-fs@^4.2.4: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== -jiti@^2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.5.1.tgz#bd099c1c2be1c59bbea4e5adcd127363446759d0" - integrity sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w== - -lightningcss-darwin-arm64@1.30.1: - version "1.30.1" - resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.1.tgz#3d47ce5e221b9567c703950edf2529ca4a3700ae" - integrity sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ== - -lightningcss-darwin-x64@1.30.1: - version "1.30.1" - resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.1.tgz#e81105d3fd6330860c15fe860f64d39cff5fbd22" - integrity sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA== - -lightningcss-freebsd-x64@1.30.1: - version "1.30.1" - resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.1.tgz#a0e732031083ff9d625c5db021d09eb085af8be4" - integrity sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig== - -lightningcss-linux-arm-gnueabihf@1.30.1: - version "1.30.1" - resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.1.tgz#1f5ecca6095528ddb649f9304ba2560c72474908" - integrity sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q== - -lightningcss-linux-arm64-gnu@1.30.1: - version "1.30.1" - resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.1.tgz#eee7799726103bffff1e88993df726f6911ec009" - integrity sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw== - -lightningcss-linux-arm64-musl@1.30.1: - version "1.30.1" - resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.1.tgz#f2e4b53f42892feeef8f620cbb889f7c064a7dfe" - integrity sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ== - -lightningcss-linux-x64-gnu@1.30.1: - version "1.30.1" - resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.1.tgz#2fc7096224bc000ebb97eea94aea248c5b0eb157" - integrity sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw== - -lightningcss-linux-x64-musl@1.30.1: - version "1.30.1" - resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.1.tgz#66dca2b159fd819ea832c44895d07e5b31d75f26" - integrity sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ== - -lightningcss-win32-arm64-msvc@1.30.1: - version "1.30.1" - resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.1.tgz#7d8110a19d7c2d22bfdf2f2bb8be68e7d1b69039" - integrity sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA== - -lightningcss-win32-x64-msvc@1.30.1: - version "1.30.1" - resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.1.tgz#fd7dd008ea98494b85d24b4bea016793f2e0e352" - integrity sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg== - -lightningcss@1.30.1: - version "1.30.1" - resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.30.1.tgz#78e979c2d595bfcb90d2a8c0eb632fe6c5bfed5d" - integrity sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg== +jiti@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.6.1.tgz#178ef2fc9a1a594248c20627cd820187a4d78d92" + integrity sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ== + +lightningcss-android-arm64@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/lightningcss-android-arm64/-/lightningcss-android-arm64-1.30.2.tgz#6966b7024d39c94994008b548b71ab360eb3a307" + integrity sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A== + +lightningcss-darwin-arm64@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz#a5fa946d27c029e48c7ff929e6e724a7de46eb2c" + integrity sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA== + +lightningcss-darwin-x64@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.2.tgz#5ce87e9cd7c4f2dcc1b713f5e8ee185c88d9b7cd" + integrity sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ== + +lightningcss-freebsd-x64@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.2.tgz#6ae1d5e773c97961df5cff57b851807ef33692a5" + integrity sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA== + +lightningcss-linux-arm-gnueabihf@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.2.tgz#62c489610c0424151a6121fa99d77731536cdaeb" + integrity sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA== + +lightningcss-linux-arm64-gnu@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.2.tgz#2a3661b56fe95a0cafae90be026fe0590d089298" + integrity sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A== + +lightningcss-linux-arm64-musl@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.2.tgz#d7ddd6b26959245e026bc1ad9eb6aa983aa90e6b" + integrity sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA== + +lightningcss-linux-x64-gnu@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.2.tgz#5a89814c8e63213a5965c3d166dff83c36152b1a" + integrity sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w== + +lightningcss-linux-x64-musl@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.2.tgz#808c2e91ce0bf5d0af0e867c6152e5378c049728" + integrity sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA== + +lightningcss-win32-arm64-msvc@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.2.tgz#ab4a8a8a2e6a82a4531e8bbb6bf0ff161ee6625a" + integrity sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ== + +lightningcss-win32-x64-msvc@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.2.tgz#f01f382c8e0a27e1c018b0bee316d210eac43b6e" + integrity sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw== + +lightningcss@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.30.2.tgz#4ade295f25d140f487d37256f4cd40dc607696d0" + integrity sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ== dependencies: detect-libc "^2.0.3" optionalDependencies: - lightningcss-darwin-arm64 "1.30.1" - lightningcss-darwin-x64 "1.30.1" - lightningcss-freebsd-x64 "1.30.1" - lightningcss-linux-arm-gnueabihf "1.30.1" - lightningcss-linux-arm64-gnu "1.30.1" - lightningcss-linux-arm64-musl "1.30.1" - lightningcss-linux-x64-gnu "1.30.1" - lightningcss-linux-x64-musl "1.30.1" - lightningcss-win32-arm64-msvc "1.30.1" - lightningcss-win32-x64-msvc "1.30.1" - -magic-string@^0.30.18: - version "0.30.19" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.19.tgz#cebe9f104e565602e5d2098c5f2e79a77cc86da9" - integrity sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw== + lightningcss-android-arm64 "1.30.2" + lightningcss-darwin-arm64 "1.30.2" + lightningcss-darwin-x64 "1.30.2" + lightningcss-freebsd-x64 "1.30.2" + lightningcss-linux-arm-gnueabihf "1.30.2" + lightningcss-linux-arm64-gnu "1.30.2" + lightningcss-linux-arm64-musl "1.30.2" + lightningcss-linux-x64-gnu "1.30.2" + lightningcss-linux-x64-musl "1.30.2" + lightningcss-win32-arm64-msvc "1.30.2" + lightningcss-win32-x64-msvc "1.30.2" + +magic-string@^0.30.19: + version "0.30.21" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91" + integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ== dependencies: "@jridgewell/sourcemap-codec" "^1.5.5" -minipass@^7.0.4, minipass@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" - integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== - -minizlib@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-3.0.2.tgz#f33d638eb279f664439aa38dc5f91607468cb574" - integrity sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA== - dependencies: - minipass "^7.1.2" - -mkdirp@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50" - integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg== - -ms@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - nanoid@^3.3.11, nanoid@^3.3.6: version "3.3.11" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b" @@ -2085,62 +1672,6 @@ next@15.5.3: "@next/swc-win32-x64-msvc" "15.5.3" sharp "^0.34.3" -pg-cloudflare@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz#a1f3d226bab2c45ae75ea54d65ec05ac6cfafbef" - integrity sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg== - -pg-connection-string@^2.9.1: - version "2.9.1" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.9.1.tgz#bb1fd0011e2eb76ac17360dc8fa183b2d3465238" - integrity sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w== - -pg-int8@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" - integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== - -pg-pool@^3.10.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.10.1.tgz#481047c720be2d624792100cac1816f8850d31b2" - integrity sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg== - -pg-protocol@*, pg-protocol@^1.10.3: - version "1.10.3" - resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.10.3.tgz#ac9e4778ad3f84d0c5670583bab976ea0a34f69f" - integrity sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ== - -pg-types@2.2.0, pg-types@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3" - integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA== - dependencies: - pg-int8 "1.0.1" - postgres-array "~2.0.0" - postgres-bytea "~1.0.0" - postgres-date "~1.0.4" - postgres-interval "^1.1.0" - -pg@^8.16.3: - version "8.16.3" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.16.3.tgz#160741d0b44fdf64680e45374b06d632e86c99fd" - integrity sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw== - dependencies: - pg-connection-string "^2.9.1" - pg-pool "^3.10.1" - pg-protocol "^1.10.3" - pg-types "2.2.0" - pgpass "1.0.5" - optionalDependencies: - pg-cloudflare "^1.2.7" - -pgpass@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d" - integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug== - dependencies: - split2 "^4.1.0" - picocolors@^1.0.0, picocolors@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" @@ -2164,28 +1695,6 @@ postcss@^8.4.41: picocolors "^1.1.1" source-map-js "^1.2.1" -postgres-array@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" - integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA== - -postgres-bytea@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" - integrity sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w== - -postgres-date@~1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8" - integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q== - -postgres-interval@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695" - integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ== - dependencies: - xtend "^4.0.0" - react-dom@19.1.0: version "19.1.0" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.1.0.tgz#133558deca37fa1d682708df8904b25186793623" @@ -2198,20 +1707,15 @@ react@19.1.0: resolved "https://registry.yarnpkg.com/react/-/react-19.1.0.tgz#926864b6c48da7627f004795d6cce50e90793b75" integrity sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg== -resolve-pkg-maps@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" - integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== - scheduler@^0.26.0: version "0.26.0" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.26.0.tgz#4ce8a8c2a2095f13ea11bf9a445be50c555d6337" integrity sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA== semver@^7.7.2: - version "7.7.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58" - integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA== + version "7.7.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946" + integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q== sharp@^0.34.3: version "0.34.4" @@ -2250,24 +1754,6 @@ source-map-js@^1.0.2, source-map-js@^1.2.1: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== -source-map-support@^0.5.21: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@^0.6.0: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -split2@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4" - integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg== - strnum@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/strnum/-/strnum-2.1.1.tgz#cf2a6e0cf903728b8b2c4b971b7e36b4e82d46ab" @@ -2280,27 +1766,15 @@ styled-jsx@5.1.6: dependencies: client-only "0.0.1" -tailwindcss@4.1.13, tailwindcss@^4: - version "4.1.13" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-4.1.13.tgz#ade3471fdfd0a2a86da3a679bfc10c623e645b09" - integrity sha512-i+zidfmTqtwquj4hMEwdjshYYgMbOrPzb9a0M3ZgNa0JMoZeFC6bxZvO8yr8ozS6ix2SDz0+mvryPeBs2TFE+w== +tailwindcss@4.1.16, tailwindcss@^4: + version "4.1.16" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-4.1.16.tgz#c32179f98725eb551e5c1189813a3db437ad5a7f" + integrity sha512-pONL5awpaQX4LN5eiv7moSiSPd/DLDzKVRJz8Q9PgzmAdd1R4307GQS2ZpfiN7ZmekdQrfhZZiSE5jkLR4WNaA== tapable@^2.2.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.3.tgz#4b67b635b2d97578a06a2713d2f04800c237e99b" - integrity sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg== - -tar@^7.4.3: - version "7.4.3" - resolved "https://registry.yarnpkg.com/tar/-/tar-7.4.3.tgz#88bbe9286a3fcd900e94592cda7a22b192e80571" - integrity sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw== - dependencies: - "@isaacs/fs-minipass" "^4.0.0" - chownr "^3.0.0" - minipass "^7.1.2" - minizlib "^3.0.1" - mkdirp "^3.0.1" - yallist "^5.0.0" + version "2.3.0" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.3.0.tgz#7e3ea6d5ca31ba8e078b560f0d83ce9a14aa8be6" + integrity sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg== tslib@^2.4.0, tslib@^2.6.2, tslib@^2.8.0: version "2.8.1" @@ -2308,31 +1782,11 @@ tslib@^2.4.0, tslib@^2.6.2, tslib@^2.8.0: integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== typescript@^5: - version "5.9.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.2.tgz#d93450cddec5154a2d5cabe3b8102b83316fb2a6" - integrity sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A== + version "5.9.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f" + integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw== undici-types@~6.21.0: version "6.21.0" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ== - -undici-types@~7.12.0: - version "7.12.0" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.12.0.tgz#15c5c7475c2a3ba30659529f5cdb4674b622fafb" - integrity sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ== - -uuid@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" - integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== - -xtend@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - -yallist@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-5.0.0.tgz#00e2de443639ed0d78fd87de0d27469fbcffb533" - integrity sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw== From 6c290d935fce8e28bbc4f81d4bf5075b56fded54 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Mon, 27 Oct 2025 11:35:15 -0500 Subject: [PATCH 030/117] chore: setup an in memory bundle store (#39) --- Cargo.lock | 702 ++++++----------------- Cargo.toml | 27 +- crates/audit/Cargo.toml | 2 +- crates/audit/src/publisher.rs | 36 +- crates/audit/src/storage.rs | 16 +- crates/audit/src/types.rs | 14 +- crates/audit/tests/integration_tests.rs | 4 +- crates/audit/tests/s3_test.rs | 6 +- crates/bundle-pool/Cargo.toml | 28 + crates/bundle-pool/src/lib.rs | 4 + crates/bundle-pool/src/pool.rs | 214 +++++++ crates/common/Cargo.toml | 19 - crates/common/src/lib.rs | 64 --- crates/core/Cargo.toml | 27 + crates/core/src/lib.rs | 6 + crates/core/src/test_utils.rs | 43 ++ crates/core/src/types.rs | 205 +++++++ crates/ingress-rpc/Cargo.toml | 5 +- crates/ingress-rpc/src/{ => bin}/main.rs | 8 +- crates/ingress-rpc/src/lib.rs | 3 + crates/ingress-rpc/src/queue.rs | 15 +- crates/ingress-rpc/src/service.rs | 42 +- crates/ingress-rpc/src/validation.rs | 8 +- 23 files changed, 791 insertions(+), 707 deletions(-) create mode 100644 crates/bundle-pool/Cargo.toml create mode 100644 crates/bundle-pool/src/lib.rs create mode 100644 crates/bundle-pool/src/pool.rs delete mode 100644 crates/common/Cargo.toml delete mode 100644 crates/common/src/lib.rs create mode 100644 crates/core/Cargo.toml create mode 100644 crates/core/src/lib.rs create mode 100644 crates/core/src/test_utils.rs create mode 100644 crates/core/src/types.rs rename crates/ingress-rpc/src/{ => bin}/main.rs (97%) create mode 100644 crates/ingress-rpc/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 9730249..6d280dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -166,7 +166,7 @@ dependencies = [ "alloy-sol-types", "auto_impl", "derive_more", - "op-alloy-consensus", + "op-alloy-consensus 0.20.0", "op-alloy-rpc-types-engine", "op-revm", "revm", @@ -278,7 +278,7 @@ dependencies = [ "alloy-op-hardforks", "alloy-primitives", "auto_impl", - "op-alloy-consensus", + "op-alloy-consensus 0.20.0", "op-revm", "revm", ] @@ -469,21 +469,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "alloy-rpc-types-mev" -version = "1.0.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1397926d8d06a2531578bafc3e0ec78f97a02f0e6d1631c67d80d22af6a3af02" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "serde", - "serde_json", -] - [[package]] name = "alloy-rpc-types-trace" version = "1.0.41" @@ -1095,15 +1080,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - [[package]] name = "atomic-waker" version = "1.1.2" @@ -1875,10 +1851,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ "iana-time-zone", - "js-sys", "num-traits", "serde", - "wasm-bindgen", "windows-link", ] @@ -1948,15 +1922,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "const-hex" version = "1.17.0" @@ -2101,15 +2066,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-queue" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.21" @@ -2258,7 +2214,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ "const-oid", - "pem-rfc7468", "zeroize", ] @@ -2569,17 +2524,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "event-listener" -version = "5.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - [[package]] name = "fastrand" version = "2.3.0" @@ -2658,17 +2602,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "flume" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" -dependencies = [ - "futures-core", - "futures-sink", - "spin", -] - [[package]] name = "fnv" version = "1.0.7" @@ -2765,17 +2698,6 @@ dependencies = [ "futures-util", ] -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - [[package]] name = "futures-io" version = "0.3.31" @@ -2994,15 +2916,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hashlink" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" -dependencies = [ - "hashbrown 0.15.5", -] - [[package]] name = "heck" version = "0.5.0" @@ -3030,15 +2943,6 @@ dependencies = [ "arrayvec", ] -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - [[package]] name = "hmac" version = "0.12.1" @@ -3678,9 +3582,6 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin", -] [[package]] name = "libc" @@ -3761,16 +3662,6 @@ dependencies = [ "libsecp256k1-core", ] -[[package]] -name = "libsqlite3-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" -dependencies = [ - "pkg-config", - "vcpkg", -] - [[package]] name = "libz-sys" version = "1.1.22" @@ -3999,23 +3890,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "smallvec", - "zeroize", -] - [[package]] name = "num-complex" version = "0.4.6" @@ -4139,6 +4013,22 @@ name = "op-alloy-consensus" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a501241474c3118833d6195312ae7eb7cc90bbb0d5f524cbb0b06619e49ff67" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "derive_more", + "serde", + "thiserror", +] + +[[package]] +name = "op-alloy-consensus" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1fc8aa0e2f5b136d101630be009e4e6dbdd1f17bc3ce670f431511600d2930" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4154,9 +4044,9 @@ dependencies = [ [[package]] name = "op-alloy-network" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f80108e3b36901200a4c5df1db1ee9ef6ce685b59ea79d7be1713c845e3765da" +checksum = "7c5cca341184dbfcb49dbc124e5958e6a857499f04782907e5d969abb644e0b6" dependencies = [ "alloy-consensus", "alloy-network", @@ -4164,8 +4054,8 @@ dependencies = [ "alloy-provider", "alloy-rpc-types-eth", "alloy-signer", - "op-alloy-consensus", - "op-alloy-rpc-types", + "op-alloy-consensus 0.21.0", + "op-alloy-rpc-types 0.21.0", ] [[package]] @@ -4181,7 +4071,26 @@ dependencies = [ "alloy-rpc-types-eth", "alloy-serde", "derive_more", - "op-alloy-consensus", + "op-alloy-consensus 0.20.0", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "op-alloy-rpc-types" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "274972c3c5e911b6675f6794ea0476b05e0bc1ea7e464f99ec2dc01b76d2eeb6" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "derive_more", + "op-alloy-consensus 0.21.0", "serde", "serde_json", "thiserror", @@ -4201,7 +4110,7 @@ dependencies = [ "derive_more", "ethereum_ssz", "ethereum_ssz_derive", - "op-alloy-consensus", + "op-alloy-consensus 0.20.0", "snap", "thiserror", ] @@ -4334,12 +4243,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "parking" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" - [[package]] name = "parking_lot" version = "0.12.5" @@ -4394,15 +4297,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - [[package]] name = "percent-encoding" version = "2.3.2" @@ -4494,17 +4388,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der 0.7.10", - "pkcs8 0.10.2", - "spki 0.7.3", -] - [[package]] name = "pkcs8" version = "0.9.0" @@ -4970,8 +4853,8 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4996,8 +4879,8 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5016,8 +4899,8 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5026,7 +4909,7 @@ dependencies = [ "alloy-trie", "bytes", "modular-bitfield", - "op-alloy-consensus", + "op-alloy-consensus 0.20.0", "reth-codecs-derive", "reth-zstd-compressors", "serde", @@ -5034,8 +4917,8 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "convert_case", "proc-macro2", @@ -5045,8 +4928,8 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5058,8 +4941,8 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5070,8 +4953,8 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5082,8 +4965,8 @@ dependencies = [ [[package]] name = "reth-errors" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -5093,8 +4976,8 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5114,8 +4997,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -5127,8 +5010,8 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5144,8 +5027,8 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5165,8 +5048,8 @@ dependencies = [ [[package]] name = "reth-execution-errors" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-evm", "alloy-primitives", @@ -5178,8 +5061,8 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5196,8 +5079,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "serde", "serde_json", @@ -5206,8 +5089,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "metrics", "metrics-derive", @@ -5215,16 +5098,16 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-primitives", ] [[package]] name = "reth-network-api" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5247,8 +5130,8 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5269,8 +5152,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5282,8 +5165,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-eip2124", "reth-net-banlist", @@ -5294,8 +5177,8 @@ dependencies = [ [[package]] name = "reth-optimism-chainspec" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5305,8 +5188,8 @@ dependencies = [ "alloy-primitives", "derive_more", "miniz_oxide", - "op-alloy-consensus", - "op-alloy-rpc-types", + "op-alloy-consensus 0.20.0", + "op-alloy-rpc-types 0.20.0", "reth-chainspec", "reth-ethereum-forks", "reth-network-peers", @@ -5320,8 +5203,8 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5345,15 +5228,15 @@ dependencies = [ [[package]] name = "reth-optimism-evm" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-evm", "alloy-op-evm", "alloy-primitives", - "op-alloy-consensus", + "op-alloy-consensus 0.20.0", "op-alloy-rpc-types-engine", "op-revm", "reth-chainspec", @@ -5372,8 +5255,8 @@ dependencies = [ [[package]] name = "reth-optimism-forks" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-op-hardforks", "alloy-primitives", @@ -5383,15 +5266,15 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", "bytes", - "op-alloy-consensus", + "op-alloy-consensus 0.20.0", "reth-codecs", "reth-primitives-traits", "reth-zstd-compressors", @@ -5401,8 +5284,8 @@ dependencies = [ [[package]] name = "reth-primitives-traits" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5415,7 +5298,7 @@ dependencies = [ "bytes", "derive_more", "once_cell", - "op-alloy-consensus", + "op-alloy-consensus 0.20.0", "reth-codecs", "revm-bytecode", "revm-primitives", @@ -5428,8 +5311,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-primitives", "derive_more", @@ -5439,8 +5322,8 @@ dependencies = [ [[package]] name = "reth-revm" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-primitives", "reth-primitives-traits", @@ -5451,8 +5334,8 @@ dependencies = [ [[package]] name = "reth-rpc-convert" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-json-rpc", @@ -5472,8 +5355,8 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5519,8 +5402,8 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5535,8 +5418,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-primitives", "bytes", @@ -5546,8 +5429,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-primitives", "derive_more", @@ -5557,8 +5440,8 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5579,8 +5462,8 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5595,8 +5478,8 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "auto_impl", "dyn-clone", @@ -5611,8 +5494,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "tokio", "tokio-stream", @@ -5621,8 +5504,8 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5660,8 +5543,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5682,8 +5565,8 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5704,8 +5587,8 @@ dependencies = [ [[package]] name = "reth-trie-sparse" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5720,8 +5603,8 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "1.8.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.1#e6608be51ea34424b8e3693cf1f946a3eb224736" +version = "1.8.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" dependencies = [ "zstd", ] @@ -5993,26 +5876,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" -[[package]] -name = "rsa" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b" -dependencies = [ - "const-oid", - "digest 0.10.7", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8 0.10.2", - "rand_core 0.6.4", - "signature 2.2.0", - "spki 0.7.3", - "subtle", - "zeroize", -] - [[package]] name = "rug" version = "1.28.0" @@ -6690,15 +6553,6 @@ dependencies = [ "sha1", ] -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - [[package]] name = "spki" version = "0.6.0" @@ -6719,203 +6573,6 @@ dependencies = [ "der 0.7.10", ] -[[package]] -name = "sqlx" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6" -dependencies = [ - "base64 0.22.1", - "bytes", - "chrono", - "crc", - "crossbeam-queue", - "either", - "event-listener", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashbrown 0.15.5", - "hashlink", - "indexmap 2.12.0", - "log", - "memchr", - "native-tls", - "once_cell", - "percent-encoding", - "serde", - "serde_json", - "sha2 0.10.9", - "smallvec", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "url", - "uuid", -] - -[[package]] -name = "sqlx-macros" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 2.0.108", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b" -dependencies = [ - "dotenvy", - "either", - "heck", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2 0.10.9", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", - "syn 2.0.108", - "tokio", - "url", -] - -[[package]] -name = "sqlx-mysql" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" -dependencies = [ - "atoi", - "base64 0.22.1", - "bitflags 2.10.0", - "byteorder", - "bytes", - "chrono", - "crc", - "digest 0.10.7", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand 0.8.5", - "rsa", - "serde", - "sha1", - "sha2 0.10.9", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "uuid", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46" -dependencies = [ - "atoi", - "base64 0.22.1", - "bitflags 2.10.0", - "byteorder", - "chrono", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "rand 0.8.5", - "serde", - "serde_json", - "sha2 0.10.9", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "uuid", - "whoami", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea" -dependencies = [ - "atoi", - "chrono", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "serde_urlencoded", - "sqlx-core", - "thiserror", - "tracing", - "url", - "uuid", -] - [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -6928,17 +6585,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stringprep" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", - "unicode-properties", -] - [[package]] name = "strsim" version = "0.11.1" @@ -7216,7 +6862,6 @@ dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-provider", - "alloy-rpc-types-mev", "anyhow", "async-trait", "aws-config", @@ -7225,12 +6870,13 @@ dependencies = [ "bytes", "clap", "dotenvy", - "op-alloy-consensus", + "op-alloy-consensus 0.21.0", "rdkafka", "serde", "serde_json", "testcontainers", "testcontainers-modules", + "tips-core", "tokio", "tracing", "tracing-subscriber 0.3.20", @@ -7238,18 +6884,39 @@ dependencies = [ ] [[package]] -name = "tips-common" +name = "tips-bundle-pool" version = "0.1.0" dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-provider", - "alloy-rpc-types-mev", + "alloy-signer", + "alloy-signer-local", "anyhow", - "chrono", - "op-alloy-consensus", + "async-trait", + "op-alloy-consensus 0.21.0", + "op-alloy-rpc-types 0.21.0", + "tips-audit", + "tips-core", + "tokio", + "tracing", + "uuid", +] + +[[package]] +name = "tips-core" +version = "0.1.0" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-provider", + "alloy-serde", + "alloy-signer-local", + "op-alloy-consensus 0.21.0", + "op-alloy-rpc-types 0.21.0", "serde", - "sqlx", + "tracing", + "uuid", ] [[package]] @@ -7259,7 +6926,6 @@ dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-provider", - "alloy-rpc-types-mev", "alloy-signer-local", "anyhow", "async-trait", @@ -7267,7 +6933,7 @@ dependencies = [ "clap", "dotenvy", "jsonrpsee", - "op-alloy-consensus", + "op-alloy-consensus 0.21.0", "op-alloy-network", "op-revm", "rdkafka", @@ -7275,7 +6941,7 @@ dependencies = [ "reth-rpc-eth-types", "revm-context-interface", "serde_json", - "tips-common", + "tips-core", "tokio", "tracing", "tracing-subscriber 0.3.20", @@ -7462,7 +7128,6 @@ version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -7573,33 +7238,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" -[[package]] -name = "unicode-bidi" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" - [[package]] name = "unicode-ident" version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06" -[[package]] -name = "unicode-normalization" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-properties" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" - [[package]] name = "unicode-segmentation" version = "1.12.0" @@ -7717,12 +7361,6 @@ dependencies = [ "wit-bindgen", ] -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - [[package]] name = "wasm-bindgen" version = "0.2.104" @@ -7829,16 +7467,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "whoami" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" -dependencies = [ - "libredox", - "wasite", -] - [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/Cargo.toml index 5b0f610..2f4008a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,18 +7,18 @@ homepage = "https://github.com/base/tips" repository = "https://github.com/base/tips" [workspace] -members = ["crates/audit", "crates/ingress-rpc", "crates/common"] +members = ["crates/audit", "crates/ingress-rpc", "crates/bundle-pool", "crates/core"] resolver = "2" [workspace.dependencies] -tips-common = { path = "crates/common" } tips-audit = { path = "crates/audit" } +tips-bundle-pool = { path = "crates/bundle-pool" } +tips-core = { path = "crates/core" } # Reth -reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" } -reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.1" } -base-reth-flashblocks-rpc = { git = "https://github.com/base/node-reth", rev = "a1ae148a36354c88b356f80281fef12dad9f7737" } +reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" } +reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" } # alloy alloy-primitives = { version = "1.3.1", default-features = false, features = [ @@ -28,12 +28,11 @@ alloy-primitives = { version = "1.3.1", default-features = false, features = [ alloy-rpc-types = { version = "1.0.35", default-features = false } alloy-consensus = { version = "1.0.35" } alloy-provider = { version = "1.0.35" } -alloy-rpc-types-mev = "1.0.35" # op-alloy -op-alloy-rpc-types = { version = "0.20.0", default-features = false } -op-alloy-network = { version = "0.20.0", default-features = false } -op-alloy-consensus = { version = "0.20.0", features = ["k256"] } +op-alloy-network = { version = "0.21.0", default-features = false } +op-alloy-consensus = { version = "0.21.0", features = ["k256"] } +op-alloy-rpc-types = { version = "0.21.0", default-features = true} tokio = { version = "1.47.1", features = ["full"] } tracing = "0.1.41" @@ -41,16 +40,8 @@ tracing-subscriber = { version = "0.3.20", features = ["env-filter"] } anyhow = "1.0.99" clap = { version = "4.5.47", features = ["derive", "env"] } url = "2.5.7" -sqlx = { version = "0.8.6", features = [ - "runtime-tokio-native-tls", - "postgres", - "uuid", - "chrono", - "json", -]} uuid = { version = "1.18.1", features = ["v4", "serde"] } serde = { version = "1.0.219", features = ["derive"] } -eyre = "0.6.12" async-trait = "0.1.89" serde_json = "1.0.143" dotenvy = "0.15.7" diff --git a/crates/audit/Cargo.toml b/crates/audit/Cargo.toml index 0fb2ee4..5fd0ef2 100644 --- a/crates/audit/Cargo.toml +++ b/crates/audit/Cargo.toml @@ -12,6 +12,7 @@ name = "tips-audit" path = "src/bin/main.rs" [dependencies] +tips-core = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } tracing-subscriber = { workspace = true } @@ -23,7 +24,6 @@ async-trait = { workspace = true } alloy-primitives = { workspace = true } alloy-consensus = { workspace = true } alloy-provider = { workspace = true } -alloy-rpc-types-mev = { workspace = true } op-alloy-consensus = { workspace = true } clap = { workspace = true } dotenvy = { workspace = true } diff --git a/crates/audit/src/publisher.rs b/crates/audit/src/publisher.rs index 48367e7..0d31391 100644 --- a/crates/audit/src/publisher.rs +++ b/crates/audit/src/publisher.rs @@ -3,7 +3,7 @@ use anyhow::Result; use async_trait::async_trait; use rdkafka::producer::{FutureProducer, FutureRecord}; use serde_json; -use tracing::{debug, error}; +use tracing::{debug, error, info}; #[async_trait] pub trait BundleEventPublisher: Send + Sync { @@ -70,3 +70,37 @@ impl BundleEventPublisher for KafkaBundleEventPublisher { Ok(()) } } + +#[derive(Clone)] +pub struct LoggingBundleEventPublisher; + +impl LoggingBundleEventPublisher { + pub fn new() -> Self { + Self + } +} + +impl Default for LoggingBundleEventPublisher { + fn default() -> Self { + Self::new() + } +} + +#[async_trait] +impl BundleEventPublisher for LoggingBundleEventPublisher { + async fn publish(&self, event: BundleEvent) -> Result<()> { + info!( + bundle_id = %event.bundle_id(), + event = ?event, + "Received bundle event" + ); + Ok(()) + } + + async fn publish_all(&self, events: Vec) -> Result<()> { + for event in events { + self.publish(event).await?; + } + Ok(()) + } +} diff --git a/crates/audit/src/storage.rs b/crates/audit/src/storage.rs index bb69618..ed5d947 100644 --- a/crates/audit/src/storage.rs +++ b/crates/audit/src/storage.rs @@ -1,7 +1,6 @@ use crate::reader::Event; use crate::types::{BundleEvent, BundleId, DropReason, TransactionId}; use alloy_primitives::TxHash; -use alloy_rpc_types_mev::EthSendBundle; use anyhow::Result; use async_trait::async_trait; use aws_sdk_s3::Client as S3Client; @@ -11,6 +10,7 @@ use aws_sdk_s3::primitives::ByteStream; use serde::{Deserialize, Serialize}; use std::fmt; use std::fmt::Debug; +use tips_core::Bundle; use tracing::info; #[derive(Debug)] @@ -39,12 +39,12 @@ pub enum BundleHistoryEvent { Created { key: String, timestamp: i64, - bundle: EthSendBundle, + bundle: Bundle, }, Updated { key: String, timestamp: i64, - bundle: EthSendBundle, + bundle: Bundle, }, Cancelled { key: String, @@ -376,11 +376,11 @@ mod tests { use crate::reader::Event; use crate::types::{BundleEvent, DropReason}; use alloy_primitives::TxHash; - use alloy_rpc_types_mev::EthSendBundle; + use tips_core::Bundle; use uuid::Uuid; - fn create_test_bundle() -> EthSendBundle { - EthSendBundle::default() + fn create_test_bundle() -> Bundle { + Bundle::default() } fn create_test_event(key: &str, timestamp: i64, bundle_event: BundleEvent) -> Event { @@ -485,7 +485,7 @@ mod tests { block_number: 12345, block_hash: TxHash::from([1u8; 32]), }; - let event = create_test_event("test-key-6", 1234567890, bundle_event); + let event = create_test_event("test-key-5", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); @@ -493,7 +493,7 @@ mod tests { bundle_id, reason: DropReason::TimedOut, }; - let event = create_test_event("test-key-7", 1234567890, bundle_event); + let event = create_test_event("test-key-6", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history, &event); assert!(result.is_some()); } diff --git a/crates/audit/src/types.rs b/crates/audit/src/types.rs index 70f96ac..a29ac2f 100644 --- a/crates/audit/src/types.rs +++ b/crates/audit/src/types.rs @@ -1,10 +1,10 @@ use alloy_consensus::transaction::{SignerRecoverable, Transaction as ConsensusTransaction}; use alloy_primitives::{Address, TxHash, U256}; use alloy_provider::network::eip2718::Decodable2718; -use alloy_rpc_types_mev::EthSendBundle; use bytes::Bytes; use op_alloy_consensus::OpTxEnvelope; use serde::{Deserialize, Serialize}; +use tips_core::Bundle; use uuid::Uuid; #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] @@ -19,13 +19,7 @@ pub type BundleId = Uuid; #[derive(Debug, Clone, Serialize, Deserialize)] pub enum DropReason { TimedOut, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct Bundle { - pub id: BundleId, - pub transactions: Vec, - pub metadata: serde_json::Value, + Reverted, } #[derive(Debug, Clone, Serialize, Deserialize)] @@ -39,11 +33,11 @@ pub struct Transaction { pub enum BundleEvent { Created { bundle_id: BundleId, - bundle: EthSendBundle, + bundle: Bundle, }, Updated { bundle_id: BundleId, - bundle: EthSendBundle, + bundle: Bundle, }, Cancelled { bundle_id: BundleId, diff --git a/crates/audit/tests/integration_tests.rs b/crates/audit/tests/integration_tests.rs index cd1e1e7..d3d809c 100644 --- a/crates/audit/tests/integration_tests.rs +++ b/crates/audit/tests/integration_tests.rs @@ -1,4 +1,3 @@ -use alloy_rpc_types_mev::EthSendBundle; use std::time::Duration; use tips_audit::{ KafkaMempoolArchiver, KafkaMempoolReader, @@ -6,6 +5,7 @@ use tips_audit::{ storage::{BundleEventS3Reader, S3EventReaderWriter}, types::{BundleEvent, DropReason}, }; +use tips_core::Bundle; use uuid::Uuid; mod common; use common::TestHarness; @@ -23,7 +23,7 @@ async fn test_kafka_publisher_s3_archiver_integration() let test_events = vec![ BundleEvent::Created { bundle_id: test_bundle_id, - bundle: EthSendBundle::default(), + bundle: Bundle::default(), }, BundleEvent::Dropped { bundle_id: test_bundle_id, diff --git a/crates/audit/tests/s3_test.rs b/crates/audit/tests/s3_test.rs index baeb30e..f637d61 100644 --- a/crates/audit/tests/s3_test.rs +++ b/crates/audit/tests/s3_test.rs @@ -1,11 +1,11 @@ use alloy_primitives::{Bytes, TxHash, b256, bytes}; -use alloy_rpc_types_mev::EthSendBundle; use std::sync::Arc; use tips_audit::{ reader::Event, storage::{BundleEventS3Reader, EventWriter, S3EventReaderWriter}, types::BundleEvent, }; +use tips_core::Bundle; use tokio::task::JoinSet; use uuid::Uuid; @@ -19,8 +19,8 @@ const TXN_DATA: Bytes = bytes!( const TXN_HASH: TxHash = b256!("0x4f7ddfc911f5cf85dd15a413f4cbb2a0abe4f1ff275ed13581958c0bcf043c5e"); -fn create_test_bundle() -> EthSendBundle { - EthSendBundle { +fn create_test_bundle() -> Bundle { + Bundle { txs: vec![TXN_DATA.clone()], ..Default::default() } diff --git a/crates/bundle-pool/Cargo.toml b/crates/bundle-pool/Cargo.toml new file mode 100644 index 0000000..3c7bece --- /dev/null +++ b/crates/bundle-pool/Cargo.toml @@ -0,0 +1,28 @@ +[package] +name = "tips-bundle-pool" +version.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +edition.workspace = true + +[dependencies] +tips-core = { workspace = true } +tips-audit.workspace = true +uuid.workspace = true +alloy-primitives.workspace = true + +tracing.workspace = true +tokio.workspace = true +anyhow.workspace = true +async-trait.workspace = true + +[dev-dependencies] +tips-core = { workspace = true, features = ["test-utils"] } +alloy-consensus.workspace = true +alloy-provider.workspace = true +alloy-signer = "1.0.41" +alloy-signer-local = "1.0.41" +op-alloy-consensus.workspace = true +op-alloy-rpc-types.workspace = true diff --git a/crates/bundle-pool/src/lib.rs b/crates/bundle-pool/src/lib.rs new file mode 100644 index 0000000..70065dc --- /dev/null +++ b/crates/bundle-pool/src/lib.rs @@ -0,0 +1,4 @@ +pub mod pool; + +pub use pool::{BundleStore, InMemoryBundlePool}; +pub use tips_core::{Bundle, BundleHash, BundleWithMetadata, CancelBundle}; diff --git a/crates/bundle-pool/src/pool.rs b/crates/bundle-pool/src/pool.rs new file mode 100644 index 0000000..40abfe7 --- /dev/null +++ b/crates/bundle-pool/src/pool.rs @@ -0,0 +1,214 @@ +use alloy_primitives::map::HashMap; +use tips_audit::{BundleEvent, DropReason}; +use tips_core::BundleWithMetadata; +use tokio::sync::mpsc; +use tracing::warn; +use uuid::Uuid; + +#[derive(Debug, Clone)] +pub enum Action { + Included, + Dropped, +} + +#[derive(Debug, Clone)] +pub struct ProcessedBundle { + pub bundle_uuid: Uuid, + pub action: Action, +} + +pub trait BundleStore { + fn add_bundle(&mut self, bundle: BundleWithMetadata); + fn get_bundles(&self) -> Vec; + fn built_flashblock( + &mut self, + block_number: u64, + flashblock_index: u64, + processed: Vec, + ); +} + +pub struct InMemoryBundlePool { + bundles: HashMap, + audit_log: mpsc::UnboundedSender, + builder_id: String, +} + +impl InMemoryBundlePool { + pub fn new(audit_log: mpsc::UnboundedSender, builder_id: String) -> Self { + InMemoryBundlePool { + bundles: Default::default(), + audit_log, + builder_id, + } + } +} + +impl BundleStore for InMemoryBundlePool { + fn add_bundle(&mut self, bundle: BundleWithMetadata) { + self.bundles.insert(*bundle.uuid(), bundle); + } + + fn get_bundles(&self) -> Vec { + self.bundles.values().cloned().collect() + } + + fn built_flashblock( + &mut self, + block_number: u64, + flashblock_index: u64, + processed: Vec, + ) { + for p in &processed { + let event = match p.action { + Action::Included => BundleEvent::BuilderIncluded { + bundle_id: p.bundle_uuid, + builder: self.builder_id.clone(), + block_number, + flashblock_index, + }, + Action::Dropped => BundleEvent::Dropped { + bundle_id: p.bundle_uuid, + reason: DropReason::Reverted, + }, + }; + + if let Err(e) = self.audit_log.send(event) { + warn!(error = %e, "Failed to send event to audit log"); + } + } + + for p in processed { + self.bundles.remove(&p.bundle_uuid); + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + use alloy_signer_local::PrivateKeySigner; + use tips_audit::BundleEvent; + use tips_core::test_utils::{create_test_bundle, create_transaction}; + + #[tokio::test] + async fn test_operations() { + let alice = PrivateKeySigner::random(); + let bob = PrivateKeySigner::random(); + + let t1 = create_transaction(alice.clone(), 1, bob.address()); + let t2 = create_transaction(alice.clone(), 2, bob.address()); + let t3 = create_transaction(alice, 3, bob.address()); + + let (event_tx, _event_rx) = mpsc::unbounded_channel::(); + let mut pool = InMemoryBundlePool::new(event_tx, "test-builder".to_string()); + let bundle1 = create_test_bundle(vec![t1], None, None, None); + let bundle2 = create_test_bundle(vec![t2], None, None, None); + let bundle3 = create_test_bundle(vec![t3], None, None, None); + + let uuid1 = *bundle1.uuid(); + let uuid2 = *bundle2.uuid(); + let uuid3 = *bundle3.uuid(); + + pool.add_bundle(bundle1); + pool.add_bundle(bundle2); + pool.add_bundle(bundle3); + + let bundles = pool.get_bundles(); + assert_eq!(bundles.len(), 3); + + pool.built_flashblock( + 1, + 0, + vec![ + ProcessedBundle { + bundle_uuid: uuid1, + action: Action::Included, + }, + ProcessedBundle { + bundle_uuid: uuid2, + action: Action::Dropped, + }, + ], + ); + + let bundles = pool.get_bundles(); + assert_eq!(bundles.len(), 1); + assert_eq!(*bundles[0].uuid(), uuid3); + } + + #[tokio::test] + async fn test_with_audit() { + let alice = PrivateKeySigner::random(); + let bob = PrivateKeySigner::random(); + + let t1 = create_transaction(alice.clone(), 1, bob.address()); + let t2 = create_transaction(alice.clone(), 2, bob.address()); + let t3 = create_transaction(alice, 3, bob.address()); + + let (event_tx, mut event_rx) = mpsc::unbounded_channel::(); + let mut pool = InMemoryBundlePool::new(event_tx, "test-builder".to_string()); + + let bundle1 = create_test_bundle(vec![t1], None, None, None); + let bundle2 = create_test_bundle(vec![t2], None, None, None); + let bundle3 = create_test_bundle(vec![t3], None, None, None); + + let uuid1 = *bundle1.uuid(); + let uuid2 = *bundle2.uuid(); + let uuid3 = *bundle3.uuid(); + + pool.add_bundle(bundle1); + pool.add_bundle(bundle2); + pool.add_bundle(bundle3); + + let bundles = pool.get_bundles(); + assert_eq!(bundles.len(), 3); + + pool.built_flashblock( + 100, + 5, + vec![ + ProcessedBundle { + bundle_uuid: uuid1, + action: Action::Included, + }, + ProcessedBundle { + bundle_uuid: uuid2, + action: Action::Dropped, + }, + ], + ); + + let event1 = event_rx.recv().await.unwrap(); + let event2 = event_rx.recv().await.unwrap(); + + match &event1 { + BundleEvent::BuilderIncluded { + bundle_id, + builder, + block_number, + flashblock_index, + } => { + assert_eq!(*bundle_id, uuid1); + assert_eq!(builder, "test-builder"); + assert_eq!(*block_number, 100); + assert_eq!(*flashblock_index, 5); + } + _ => panic!("Expected BuilderIncluded event"), + } + + match &event2 { + BundleEvent::Dropped { + bundle_id, + reason: _, + } => { + assert_eq!(*bundle_id, uuid2); + } + _ => panic!("Expected Dropped event"), + } + + let bundles = pool.get_bundles(); + assert_eq!(bundles.len(), 1); + assert_eq!(*bundles[0].uuid(), uuid3); + } +} diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml deleted file mode 100644 index c9b76c4..0000000 --- a/crates/common/Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -[package] -name = "tips-common" -version.workspace = true -edition.workspace = true -rust-version.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true - -[dependencies] -alloy-rpc-types-mev.workspace = true -alloy-primitives.workspace = true -sqlx.workspace = true -anyhow.workspace = true -op-alloy-consensus.workspace = true -alloy-provider.workspace = true -alloy-consensus.workspace = true -serde.workspace = true -chrono.workspace = true diff --git a/crates/common/src/lib.rs b/crates/common/src/lib.rs deleted file mode 100644 index fc3616e..0000000 --- a/crates/common/src/lib.rs +++ /dev/null @@ -1,64 +0,0 @@ -use alloy_consensus::Transaction; -use alloy_consensus::transaction::SignerRecoverable; -use alloy_primitives::{Address, TxHash}; -use alloy_provider::network::eip2718::Decodable2718; -use alloy_rpc_types_mev::EthSendBundle; -use anyhow::Result; -use chrono::{DateTime, Utc}; -use op_alloy_consensus::OpTxEnvelope; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, Clone, sqlx::Type, Serialize, Deserialize)] -#[sqlx(type_name = "bundle_state", rename_all = "PascalCase")] -pub enum BundleState { - Ready, - IncludedByBuilder, -} - -/// Extended bundle data that includes the original bundle plus extracted metadata -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct BundleWithMetadata { - pub bundle: EthSendBundle, - pub txn_hashes: Vec, - pub senders: Vec
, - pub min_base_fee: i64, - pub state: BundleState, - pub state_changed_at: DateTime, -} - -impl BundleWithMetadata { - pub fn new(bundle: &EthSendBundle) -> Result { - let mut senders = Vec::new(); - let mut txn_hashes = Vec::new(); - - let mut min_base_fee = i64::MAX; - - for tx_bytes in &bundle.txs { - let envelope = OpTxEnvelope::decode_2718_exact(tx_bytes)?; - txn_hashes.push(*envelope.hash()); - - let sender = match envelope.recover_signer() { - Ok(signer) => signer, - Err(err) => return Err(err.into()), - }; - - senders.push(sender); - min_base_fee = min_base_fee.min(envelope.max_fee_per_gas() as i64); // todo type and todo not right - } - - let minimum_base_fee = if min_base_fee == i64::MAX { - 0 - } else { - min_base_fee - }; - - Ok(Self { - bundle: bundle.clone(), - txn_hashes, - senders, - min_base_fee: minimum_base_fee, - state: BundleState::Ready, - state_changed_at: Utc::now(), - }) - } -} diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml new file mode 100644 index 0000000..c0afd40 --- /dev/null +++ b/crates/core/Cargo.toml @@ -0,0 +1,27 @@ +[package] +name = "tips-core" +version.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +edition.workspace = true + +[features] +test-utils = ["dep:alloy-signer-local", "dep:op-alloy-rpc-types"] + +[dependencies] +uuid.workspace = true +alloy-primitives.workspace = true +alloy-consensus.workspace = true +alloy-provider.workspace = true +op-alloy-consensus.workspace = true +serde = { version = "1.0.228", default-features = false, features = ["alloc", "derive"] } +alloy-serde = { version = "1.0.41", default-features = false } +alloy-signer-local = { workspace = true, optional = true } +op-alloy-rpc-types = { workspace = true, optional = true } +tracing.workspace = true + +[dev-dependencies] +alloy-signer-local.workspace = true +op-alloy-rpc-types.workspace = true diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs new file mode 100644 index 0000000..3b737b7 --- /dev/null +++ b/crates/core/src/lib.rs @@ -0,0 +1,6 @@ +pub mod types; + +#[cfg(any(test, feature = "test-utils"))] +pub mod test_utils; + +pub use types::{Bundle, BundleHash, BundleWithMetadata, CancelBundle}; diff --git a/crates/core/src/test_utils.rs b/crates/core/src/test_utils.rs new file mode 100644 index 0000000..a576354 --- /dev/null +++ b/crates/core/src/test_utils.rs @@ -0,0 +1,43 @@ +use crate::{Bundle, BundleWithMetadata}; +use alloy_consensus::SignableTransaction; +use alloy_primitives::{Address, U256}; +use alloy_provider::network::TxSignerSync; +use alloy_provider::network::eip2718::Encodable2718; +use alloy_signer_local::PrivateKeySigner; +use op_alloy_consensus::OpTxEnvelope; +use op_alloy_rpc_types::OpTransactionRequest; + +pub fn create_transaction(from: PrivateKeySigner, nonce: u64, to: Address) -> OpTxEnvelope { + let mut txn = OpTransactionRequest::default() + .value(U256::from(10_000)) + .gas_limit(21_000) + .max_fee_per_gas(200) + .max_priority_fee_per_gas(100) + .from(from.address()) + .to(to) + .nonce(nonce) + .build_typed_tx() + .unwrap(); + + let sig = from.sign_transaction_sync(&mut txn).unwrap(); + OpTxEnvelope::Eip1559(txn.eip1559().cloned().unwrap().into_signed(sig).clone()) +} + +pub fn create_test_bundle( + txns: Vec, + block_number: Option, + min_timestamp: Option, + max_timestamp: Option, +) -> BundleWithMetadata { + let txs = txns.iter().map(|t| t.encoded_2718().into()).collect(); + + let bundle = Bundle { + txs, + block_number: block_number.unwrap_or(0), + min_timestamp, + max_timestamp, + ..Default::default() + }; + + BundleWithMetadata::load(bundle).unwrap() +} diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs new file mode 100644 index 0000000..9e6e645 --- /dev/null +++ b/crates/core/src/types.rs @@ -0,0 +1,205 @@ +use alloy_consensus::transaction::SignerRecoverable; +use alloy_primitives::{Address, B256, Bytes, TxHash, keccak256}; +use alloy_provider::network::eip2718::Decodable2718; +use op_alloy_consensus::OpTxEnvelope; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +#[derive(Default, Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] +#[serde(rename_all = "camelCase")] +pub struct Bundle { + pub txs: Vec, + + #[serde(with = "alloy_serde::quantity")] + pub block_number: u64, + + #[serde( + default, + deserialize_with = "alloy_serde::quantity::opt::deserialize", + skip_serializing_if = "Option::is_none" + )] + pub flashblock_number_min: Option, + + #[serde( + default, + deserialize_with = "alloy_serde::quantity::opt::deserialize", + skip_serializing_if = "Option::is_none" + )] + pub flashblock_number_max: Option, + + #[serde( + default, + deserialize_with = "alloy_serde::quantity::opt::deserialize", + skip_serializing_if = "Option::is_none" + )] + pub min_timestamp: Option, + + #[serde( + default, + deserialize_with = "alloy_serde::quantity::opt::deserialize", + skip_serializing_if = "Option::is_none" + )] + pub max_timestamp: Option, + + #[serde(default, skip_serializing_if = "Vec::is_empty")] + pub reverting_tx_hashes: Vec, + + #[serde(default, skip_serializing_if = "Option::is_none")] + pub replacement_uuid: Option, + + #[serde(default, skip_serializing_if = "Vec::is_empty")] + pub dropping_tx_hashes: Vec, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct BundleHash { + pub bundle_hash: B256, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct CancelBundle { + pub replacement_uuid: String, +} + +#[derive(Debug, Clone)] +pub struct BundleWithMetadata { + bundle: Bundle, + uuid: Uuid, + transactions: Vec, +} + +impl BundleWithMetadata { + pub fn load(mut bundle: Bundle) -> Result { + let uuid = bundle + .replacement_uuid + .clone() + .unwrap_or_else(|| Uuid::new_v4().to_string()); + + let uuid = Uuid::parse_str(uuid.as_str()).map_err(|_| format!("Invalid UUID: {uuid}"))?; + + bundle.replacement_uuid = Some(uuid.to_string()); + + let transactions: Vec = bundle + .txs + .iter() + .map(|b| { + OpTxEnvelope::decode_2718_exact(b) + .map_err(|e| format!("failed to decode transaction: {e}")) + }) + .collect::, _>>()?; + + Ok(BundleWithMetadata { + bundle, + transactions, + uuid, + }) + } + + pub fn transactions(&self) -> &[OpTxEnvelope] { + self.transactions.as_slice() + } + + pub fn uuid(&self) -> &Uuid { + &self.uuid + } + + pub fn bundle_hash(&self) -> B256 { + let mut concatenated = Vec::new(); + for tx in self.transactions() { + concatenated.extend_from_slice(tx.tx_hash().as_slice()); + } + keccak256(&concatenated) + } + + pub fn txn_hashes(&self) -> Vec { + self.transactions().iter().map(|t| t.tx_hash()).collect() + } + + pub fn bundle(&self) -> &Bundle { + &self.bundle + } + + pub fn senders(&self) -> Vec
{ + self.transactions() + .iter() + .map(|t| t.recover_signer().unwrap()) + .collect() + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::test_utils::create_transaction; + use alloy_primitives::Keccak256; + use alloy_provider::network::eip2718::Encodable2718; + use alloy_signer_local::PrivateKeySigner; + + #[test] + fn test_bundle_types() { + let alice = PrivateKeySigner::random(); + let bob = PrivateKeySigner::random(); + + let tx1 = create_transaction(alice.clone(), 1, bob.address()); + let tx2 = create_transaction(alice.clone(), 2, bob.address()); + + let tx1_bytes = tx1.encoded_2718(); + let tx2_bytes = tx2.encoded_2718(); + + let bundle = BundleWithMetadata::load(Bundle { + replacement_uuid: None, + txs: vec![tx1_bytes.clone().into()], + block_number: 1, + ..Default::default() + }) + .unwrap(); + + assert!(!bundle.uuid().is_nil()); + assert_eq!( + bundle.bundle.replacement_uuid, + Some(bundle.uuid().to_string()) + ); + assert_eq!(bundle.txn_hashes().len(), 1); + assert_eq!(bundle.txn_hashes()[0], tx1.tx_hash()); + assert_eq!(bundle.senders().len(), 1); + assert_eq!(bundle.senders()[0], alice.address()); + + // Bundle hashes are keccack256(...txnHashes) + let expected_bundle_hash_single = { + let mut hasher = Keccak256::default(); + hasher.update(keccak256(&tx1_bytes)); + hasher.finalize() + }; + + assert_eq!(bundle.bundle_hash(), expected_bundle_hash_single); + + let uuid = Uuid::new_v4(); + let bundle = BundleWithMetadata::load(Bundle { + replacement_uuid: Some(uuid.to_string()), + txs: vec![tx1_bytes.clone().into(), tx2_bytes.clone().into()], + block_number: 1, + ..Default::default() + }) + .unwrap(); + + assert_eq!(*bundle.uuid(), uuid); + assert_eq!(bundle.bundle.replacement_uuid, Some(uuid.to_string())); + assert_eq!(bundle.txn_hashes().len(), 2); + assert_eq!(bundle.txn_hashes()[0], tx1.tx_hash()); + assert_eq!(bundle.txn_hashes()[1], tx2.tx_hash()); + assert_eq!(bundle.senders().len(), 2); + assert_eq!(bundle.senders()[0], alice.address()); + assert_eq!(bundle.senders()[1], alice.address()); + + let expected_bundle_hash_double = { + let mut hasher = Keccak256::default(); + hasher.update(keccak256(&tx1_bytes)); + hasher.update(keccak256(&tx2_bytes)); + hasher.finalize() + }; + + assert_eq!(bundle.bundle_hash(), expected_bundle_hash_double); + } +} diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index e4ce0fa..e1c0e2f 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -9,11 +9,11 @@ edition.workspace = true [[bin]] name = "tips-ingress-rpc" -path = "src/main.rs" +path = "src/bin/main.rs" [dependencies] +tips-core.workspace = true jsonrpsee.workspace = true -alloy-rpc-types-mev.workspace = true alloy-primitives.workspace = true op-alloy-network.workspace = true alloy-provider.workspace = true @@ -35,4 +35,3 @@ op-revm.workspace = true revm-context-interface.workspace = true alloy-signer-local.workspace = true reth-optimism-evm.workspace = true -tips-common.workspace = true diff --git a/crates/ingress-rpc/src/main.rs b/crates/ingress-rpc/src/bin/main.rs similarity index 97% rename from crates/ingress-rpc/src/main.rs rename to crates/ingress-rpc/src/bin/main.rs index 6400bc0..ecf43c1 100644 --- a/crates/ingress-rpc/src/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -6,16 +6,12 @@ use rdkafka::ClientConfig; use rdkafka::producer::FutureProducer; use std::fs; use std::net::IpAddr; +use tips_ingress_rpc::queue::KafkaQueuePublisher; +use tips_ingress_rpc::service::{IngressApiServer, IngressService}; use tracing::{info, warn}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; use url::Url; -mod queue; -mod service; -mod validation; -use queue::KafkaQueuePublisher; -use service::{IngressApiServer, IngressService}; - #[derive(Parser, Debug)] #[command(author, version, about, long_about = None)] struct Config { diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs new file mode 100644 index 0000000..f3f3c92 --- /dev/null +++ b/crates/ingress-rpc/src/lib.rs @@ -0,0 +1,3 @@ +pub mod queue; +pub mod service; +pub mod validation; diff --git a/crates/ingress-rpc/src/queue.rs b/crates/ingress-rpc/src/queue.rs index a02a3e2..e470e3f 100644 --- a/crates/ingress-rpc/src/queue.rs +++ b/crates/ingress-rpc/src/queue.rs @@ -3,14 +3,14 @@ use anyhow::Result; use async_trait::async_trait; use backon::{ExponentialBuilder, Retryable}; use rdkafka::producer::{FutureProducer, FutureRecord}; -use tips_common::BundleWithMetadata; +use tips_core::Bundle; use tokio::time::Duration; use tracing::{error, info}; /// A queue to buffer transactions #[async_trait] pub trait QueuePublisher: Send + Sync { - async fn publish(&self, bundle: &BundleWithMetadata, bundle_hash: &B256) -> Result<()>; + async fn publish(&self, bundle: &Bundle, bundle_hash: &B256) -> Result<()>; } /// A queue to buffer transactions @@ -27,7 +27,7 @@ impl KafkaQueuePublisher { #[async_trait] impl QueuePublisher for KafkaQueuePublisher { - async fn publish(&self, bundle: &BundleWithMetadata, bundle_hash: &B256) -> Result<()> { + async fn publish(&self, bundle: &Bundle, bundle_hash: &B256) -> Result<()> { let key = bundle_hash.to_string(); let payload = serde_json::to_vec(&bundle)?; @@ -74,12 +74,12 @@ impl QueuePublisher for KafkaQueuePublisher { #[cfg(test)] mod tests { use super::*; - use alloy_rpc_types_mev::EthSendBundle; use rdkafka::config::ClientConfig; + use tips_core::BundleWithMetadata; use tokio::time::{Duration, Instant}; - fn create_test_bundle() -> BundleWithMetadata { - BundleWithMetadata::new(&EthSendBundle::default()).unwrap() + fn create_test_bundle() -> Bundle { + Bundle::default() } #[tokio::test] @@ -93,7 +93,8 @@ mod tests { let publisher = KafkaQueuePublisher::new(producer, "tips-ingress-rpc".to_string()); let bundle = create_test_bundle(); - let bundle_hash = bundle.bundle.bundle_hash(); + let bundle_with_metadata = BundleWithMetadata::load(bundle.clone()).unwrap(); + let bundle_hash = bundle_with_metadata.bundle_hash(); let start = Instant::now(); let result = publisher.publish(&bundle, &bundle_hash).await; diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 789bf9d..44c46d0 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -2,7 +2,6 @@ use alloy_consensus::transaction::Recovered; use alloy_consensus::{Transaction, transaction::SignerRecoverable}; use alloy_primitives::{B256, Bytes}; use alloy_provider::{Provider, RootProvider, network::eip2718::Decodable2718}; -use alloy_rpc_types_mev::{EthBundleHash, EthCancelBundle, EthSendBundle}; use jsonrpsee::{ core::{RpcResult, async_trait}, proc_macros::rpc, @@ -11,7 +10,7 @@ use op_alloy_consensus::OpTxEnvelope; use op_alloy_network::Optimism; use reth_rpc_eth_types::EthApiError; use std::time::{SystemTime, UNIX_EPOCH}; -use tips_common::BundleWithMetadata; +use tips_core::{Bundle, BundleHash, BundleWithMetadata, CancelBundle}; use tracing::{info, warn}; use crate::queue::QueuePublisher; @@ -21,11 +20,11 @@ use crate::validation::{AccountInfoLookup, L1BlockInfoLookup, validate_bundle, v pub trait IngressApi { /// `eth_sendBundle` can be used to send your bundles to the builder. #[method(name = "sendBundle")] - async fn send_bundle(&self, bundle: EthSendBundle) -> RpcResult; + async fn send_bundle(&self, bundle: Bundle) -> RpcResult; /// `eth_cancelBundle` is used to prevent a submitted bundle from being included on-chain. #[method(name = "cancelBundle")] - async fn cancel_bundle(&self, request: EthCancelBundle) -> RpcResult<()>; + async fn cancel_bundle(&self, request: CancelBundle) -> RpcResult<()>; /// Handler for: `eth_sendRawTransaction` #[method(name = "sendRawTransaction")] @@ -60,14 +59,13 @@ impl IngressApiServer for IngressService where Queue: QueuePublisher + Sync + Send + 'static, { - async fn send_bundle(&self, bundle: EthSendBundle) -> RpcResult { - let bundle_with_metadata = self.validate_bundle(&bundle).await?; + async fn send_bundle(&self, bundle: Bundle) -> RpcResult { + let bundle_with_metadata = self.validate_bundle(bundle).await?; - // Queue the bundle - let bundle_hash = bundle.bundle_hash(); + let bundle_hash = bundle_with_metadata.bundle_hash(); if let Err(e) = self .queue - .publish(&bundle_with_metadata, &bundle_hash) + .publish(bundle_with_metadata.bundle(), &bundle_hash) .await { warn!(message = "Failed to publish bundle to queue", bundle_hash = %bundle_hash, error = %e); @@ -77,15 +75,13 @@ where info!( message = "queued bundle", bundle_hash = %bundle_hash, - tx_count = bundle.txs.len(), + tx_count = bundle_with_metadata.transactions().len(), ); - Ok(EthBundleHash { - bundle_hash: bundle.bundle_hash(), - }) + Ok(BundleHash { bundle_hash }) } - async fn cancel_bundle(&self, _request: EthCancelBundle) -> RpcResult<()> { + async fn cancel_bundle(&self, _request: CancelBundle) -> RpcResult<()> { warn!( message = "TODO: implement cancel_bundle", method = "cancel_bundle" @@ -102,22 +98,19 @@ where .as_secs() + self.send_transaction_default_lifetime_seconds; - let bundle = EthSendBundle { + let bundle = Bundle { txs: vec![data.clone()], - block_number: 0, - min_timestamp: None, max_timestamp: Some(expiry_timestamp), reverting_tx_hashes: vec![transaction.tx_hash()], ..Default::default() }; - // queue the bundle - let bundle_with_metadata = BundleWithMetadata::new(&bundle) + let bundle_with_metadata = BundleWithMetadata::load(bundle) .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; - let bundle_hash = bundle.bundle_hash(); + let bundle_hash = bundle_with_metadata.bundle_hash(); if let Err(e) = self .queue - .publish(&bundle_with_metadata, &bundle_hash) + .publish(bundle_with_metadata.bundle(), &bundle_hash) .await { warn!(message = "Failed to publish Queue::enqueue_bundle", bundle_hash = %bundle_hash, error = %e); @@ -175,7 +168,7 @@ where Ok(transaction) } - async fn validate_bundle(&self, bundle: &EthSendBundle) -> RpcResult { + async fn validate_bundle(&self, bundle: Bundle) -> RpcResult { if bundle.txs.is_empty() { return Err( EthApiError::InvalidParams("Bundle cannot have empty transactions".into()) @@ -188,10 +181,11 @@ where let transaction = self.validate_tx(tx_data).await?; total_gas = total_gas.saturating_add(transaction.gas_limit()); } - validate_bundle(bundle, total_gas)?; + validate_bundle(&bundle, total_gas)?; - let bundle_with_metadata = BundleWithMetadata::new(bundle) + let bundle_with_metadata = BundleWithMetadata::load(bundle) .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; + Ok(bundle_with_metadata) } } diff --git a/crates/ingress-rpc/src/validation.rs b/crates/ingress-rpc/src/validation.rs index b9d1d2e..9d5f4ba 100644 --- a/crates/ingress-rpc/src/validation.rs +++ b/crates/ingress-rpc/src/validation.rs @@ -2,7 +2,6 @@ use alloy_consensus::private::alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_consensus::{Transaction, Typed2718, constants::KECCAK_EMPTY, transaction::Recovered}; use alloy_primitives::{Address, B256, U256}; use alloy_provider::{Provider, RootProvider}; -use alloy_rpc_types_mev::EthSendBundle; use async_trait::async_trait; use jsonrpsee::core::RpcResult; use op_alloy_consensus::interop::CROSS_L2_INBOX_ADDRESS; @@ -11,6 +10,7 @@ use op_revm::{OpSpecId, l1block::L1BlockInfo}; use reth_optimism_evm::extract_l1_info_from_tx; use reth_rpc_eth_types::{EthApiError, RpcInvalidTransactionError, SignError}; use std::time::{Duration, SystemTime, UNIX_EPOCH}; +use tips_core::Bundle; use tracing::warn; // TODO: make this configurable @@ -166,7 +166,7 @@ pub async fn validate_tx( /// Helper function to validate propeties of a bundle. A bundle is valid if it satisfies the following criteria: /// - The bundle's max_timestamp is not more than 1 hour in the future /// - The bundle's gas limit is not greater than the maximum allowed gas limit -pub fn validate_bundle(bundle: &EthSendBundle, bundle_gas: u64) -> RpcResult<()> { +pub fn validate_bundle(bundle: &Bundle, bundle_gas: u64) -> RpcResult<()> { // Don't allow bundles to be submitted over 1 hour into the future // TODO: make the window configurable let valid_timestamp_window = SystemTime::now() @@ -499,7 +499,7 @@ mod tests { .unwrap() .as_secs(); let too_far_in_the_future = current_time + 3601; - let bundle = EthSendBundle { + let bundle = Bundle { txs: vec![], max_timestamp: Some(too_far_in_the_future), ..Default::default() @@ -545,7 +545,7 @@ mod tests { encoded_txs.push(Bytes::from(encoded)); } - let bundle = EthSendBundle { + let bundle = Bundle { txs: encoded_txs, block_number: 0, min_timestamp: None, From 4306216ec04242c9899e9b320c6c73f80aede7e6 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Mon, 27 Oct 2025 12:22:41 -0500 Subject: [PATCH 031/117] chore: kafka bundle consumer / clean up (#41) * chore: kafka bundle consumer / clean up * Add helper methods to connect queues/publishers --- Cargo.lock | 6 ++ crates/audit/src/archiver.rs | 4 +- crates/audit/src/bin/main.rs | 33 ++----- crates/audit/src/lib.rs | 17 ++++ crates/audit/src/reader.rs | 34 ++----- crates/audit/tests/integration_tests.rs | 6 +- crates/bundle-pool/Cargo.toml | 5 + crates/bundle-pool/src/lib.rs | 31 ++++++ crates/bundle-pool/src/source.rs | 81 +++++++++++++++ crates/bundle-pool/tests/integration_tests.rs | 98 +++++++++++++++++++ crates/core/Cargo.toml | 1 + crates/core/src/kafka.rs | 22 +++++ crates/core/src/lib.rs | 2 + crates/core/src/logger.rs | 24 +++++ crates/ingress-rpc/src/bin/main.rs | 53 ++-------- 15 files changed, 314 insertions(+), 103 deletions(-) create mode 100644 crates/bundle-pool/src/source.rs create mode 100644 crates/bundle-pool/tests/integration_tests.rs create mode 100644 crates/core/src/kafka.rs create mode 100644 crates/core/src/logger.rs diff --git a/Cargo.lock b/Cargo.lock index 6d280dd..1f42420 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6896,6 +6896,11 @@ dependencies = [ "async-trait", "op-alloy-consensus 0.21.0", "op-alloy-rpc-types 0.21.0", + "rdkafka", + "serde", + "serde_json", + "testcontainers", + "testcontainers-modules", "tips-audit", "tips-core", "tokio", @@ -6916,6 +6921,7 @@ dependencies = [ "op-alloy-rpc-types 0.21.0", "serde", "tracing", + "tracing-subscriber 0.3.20", "uuid", ] diff --git a/crates/audit/src/archiver.rs b/crates/audit/src/archiver.rs index 652dd78..b5a645c 100644 --- a/crates/audit/src/archiver.rs +++ b/crates/audit/src/archiver.rs @@ -5,7 +5,7 @@ use std::time::Duration; use tokio::time::sleep; use tracing::{error, info}; -pub struct KafkaMempoolArchiver +pub struct KafkaAuditArchiver where R: EventReader, W: EventWriter, @@ -14,7 +14,7 @@ where writer: W, } -impl KafkaMempoolArchiver +impl KafkaAuditArchiver where R: EventReader, W: EventWriter, diff --git a/crates/audit/src/bin/main.rs b/crates/audit/src/bin/main.rs index f0e6b89..c79852c 100644 --- a/crates/audit/src/bin/main.rs +++ b/crates/audit/src/bin/main.rs @@ -5,10 +5,10 @@ use aws_sdk_s3::{Client as S3Client, config::Builder as S3ConfigBuilder}; use clap::{Parser, ValueEnum}; use rdkafka::consumer::Consumer; use tips_audit::{ - KafkaMempoolArchiver, KafkaMempoolReader, S3EventReaderWriter, create_kafka_consumer, + KafkaAuditArchiver, KafkaAuditLogReader, S3EventReaderWriter, create_kafka_consumer, }; -use tracing::{info, warn}; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; +use tips_core::logger::init_logger; +use tracing::info; #[derive(Debug, Clone, ValueEnum)] enum S3ConfigType { @@ -53,28 +53,7 @@ async fn main() -> Result<()> { let args = Args::parse(); - let log_level = match args.log_level.to_lowercase().as_str() { - "trace" => tracing::Level::TRACE, - "debug" => tracing::Level::DEBUG, - "info" => tracing::Level::INFO, - "warn" => tracing::Level::WARN, - "error" => tracing::Level::ERROR, - _ => { - warn!( - "Invalid log level '{}', defaulting to 'info'", - args.log_level - ); - tracing::Level::INFO - } - }; - - tracing_subscriber::registry() - .with( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())), - ) - .with(tracing_subscriber::fmt::layer()) - .init(); + init_logger(&args.log_level); info!( kafka_properties_file = %args.kafka_properties_file, @@ -86,13 +65,13 @@ async fn main() -> Result<()> { let consumer = create_kafka_consumer(&args.kafka_properties_file)?; consumer.subscribe(&[&args.kafka_topic])?; - let reader = KafkaMempoolReader::new(consumer, args.kafka_topic.clone())?; + let reader = KafkaAuditLogReader::new(consumer, args.kafka_topic.clone())?; let s3_client = create_s3_client(&args).await?; let s3_bucket = args.s3_bucket.clone(); let writer = S3EventReaderWriter::new(s3_client, s3_bucket); - let mut archiver = KafkaMempoolArchiver::new(reader, writer); + let mut archiver = KafkaAuditArchiver::new(reader, writer); info!("Audit archiver initialized, starting main loop"); diff --git a/crates/audit/src/lib.rs b/crates/audit/src/lib.rs index cfa9c53..4286e71 100644 --- a/crates/audit/src/lib.rs +++ b/crates/audit/src/lib.rs @@ -4,8 +4,25 @@ pub mod reader; pub mod storage; pub mod types; +use tokio::sync::mpsc; +use tracing::error; + pub use archiver::*; pub use publisher::*; pub use reader::*; pub use storage::*; pub use types::*; + +pub fn connect_audit_to_publisher

(event_rx: mpsc::UnboundedReceiver, publisher: P) +where + P: BundleEventPublisher + 'static, +{ + tokio::spawn(async move { + let mut event_rx = event_rx; + while let Some(event) = event_rx.recv().await { + if let Err(e) = publisher.publish(event).await { + error!(error = %e, "Failed to publish bundle event"); + } + } + }); +} diff --git a/crates/audit/src/reader.rs b/crates/audit/src/reader.rs index b4ff0f4..207b8ac 100644 --- a/crates/audit/src/reader.rs +++ b/crates/audit/src/reader.rs @@ -7,36 +7,18 @@ use rdkafka::{ consumer::{Consumer, StreamConsumer}, message::Message, }; -use std::fs; use std::time::{Duration, SystemTime, UNIX_EPOCH}; +use tips_core::kafka::load_kafka_config_from_file; use tokio::time::sleep; -use tracing::{debug, error, info}; +use tracing::{debug, error}; pub fn create_kafka_consumer(kafka_properties_file: &str) -> Result { - let client_config = load_kafka_config_from_file(kafka_properties_file)?; + let client_config = + ClientConfig::from_iter(load_kafka_config_from_file(kafka_properties_file)?); let consumer: StreamConsumer = client_config.create()?; Ok(consumer) } -fn load_kafka_config_from_file(properties_file_path: &str) -> Result { - let kafka_properties = fs::read_to_string(properties_file_path)?; - info!("Kafka properties:\n{}", kafka_properties); - - let mut client_config = ClientConfig::new(); - - for line in kafka_properties.lines() { - let line = line.trim(); - if line.is_empty() || line.starts_with('#') { - continue; - } - if let Some((key, value)) = line.split_once('=') { - client_config.set(key.trim(), value.trim()); - } - } - - Ok(client_config) -} - pub fn assign_topic_partition(consumer: &StreamConsumer, topic: &str) -> Result<()> { let mut tpl = TopicPartitionList::new(); tpl.add_partition(topic, 0); @@ -57,14 +39,14 @@ pub trait EventReader { async fn commit(&mut self) -> Result<()>; } -pub struct KafkaMempoolReader { +pub struct KafkaAuditLogReader { consumer: StreamConsumer, topic: String, last_message_offset: Option, last_message_partition: Option, } -impl KafkaMempoolReader { +impl KafkaAuditLogReader { pub fn new(consumer: StreamConsumer, topic: String) -> Result { consumer.subscribe(&[&topic])?; Ok(Self { @@ -77,7 +59,7 @@ impl KafkaMempoolReader { } #[async_trait] -impl EventReader for KafkaMempoolReader { +impl EventReader for KafkaAuditLogReader { async fn read_event(&mut self) -> Result { match self.consumer.recv().await { Ok(message) => { @@ -143,7 +125,7 @@ impl EventReader for KafkaMempoolReader { } } -impl KafkaMempoolReader { +impl KafkaAuditLogReader { pub fn topic(&self) -> &str { &self.topic } diff --git a/crates/audit/tests/integration_tests.rs b/crates/audit/tests/integration_tests.rs index d3d809c..f219677 100644 --- a/crates/audit/tests/integration_tests.rs +++ b/crates/audit/tests/integration_tests.rs @@ -1,6 +1,6 @@ use std::time::Duration; use tips_audit::{ - KafkaMempoolArchiver, KafkaMempoolReader, + KafkaAuditArchiver, KafkaAuditLogReader, publisher::{BundleEventPublisher, KafkaBundleEventPublisher}, storage::{BundleEventS3Reader, S3EventReaderWriter}, types::{BundleEvent, DropReason}, @@ -37,8 +37,8 @@ async fn test_kafka_publisher_s3_archiver_integration() publisher.publish(event.clone()).await?; } - let mut consumer = KafkaMempoolArchiver::new( - KafkaMempoolReader::new(harness.kafka_consumer, topic.to_string())?, + let mut consumer = KafkaAuditArchiver::new( + KafkaAuditLogReader::new(harness.kafka_consumer, topic.to_string())?, s3_writer.clone(), ); diff --git a/crates/bundle-pool/Cargo.toml b/crates/bundle-pool/Cargo.toml index 3c7bece..26babb5 100644 --- a/crates/bundle-pool/Cargo.toml +++ b/crates/bundle-pool/Cargo.toml @@ -17,6 +17,8 @@ tracing.workspace = true tokio.workspace = true anyhow.workspace = true async-trait.workspace = true +rdkafka.workspace = true +serde_json.workspace = true [dev-dependencies] tips-core = { workspace = true, features = ["test-utils"] } @@ -26,3 +28,6 @@ alloy-signer = "1.0.41" alloy-signer-local = "1.0.41" op-alloy-consensus.workspace = true op-alloy-rpc-types.workspace = true +testcontainers.workspace = true +testcontainers-modules.workspace = true +serde.workspace = true diff --git a/crates/bundle-pool/src/lib.rs b/crates/bundle-pool/src/lib.rs index 70065dc..0d775be 100644 --- a/crates/bundle-pool/src/lib.rs +++ b/crates/bundle-pool/src/lib.rs @@ -1,4 +1,35 @@ pub mod pool; +pub mod source; + +use source::BundleSource; +use std::sync::{Arc, Mutex}; +use tokio::sync::mpsc; +use tracing::error; pub use pool::{BundleStore, InMemoryBundlePool}; +pub use source::KafkaBundleSource; pub use tips_core::{Bundle, BundleHash, BundleWithMetadata, CancelBundle}; + +pub fn connect_sources_to_pool( + sources: Vec, + bundle_rx: mpsc::UnboundedReceiver, + pool: Arc>, +) where + S: BundleSource + Send + 'static, + P: BundleStore + Send + 'static, +{ + for source in sources { + tokio::spawn(async move { + if let Err(e) = source.run().await { + error!(error = %e, "Bundle source failed"); + } + }); + } + + tokio::spawn(async move { + let mut bundle_rx = bundle_rx; + while let Some(bundle) = bundle_rx.recv().await { + pool.lock().unwrap().add_bundle(bundle); + } + }); +} diff --git a/crates/bundle-pool/src/source.rs b/crates/bundle-pool/src/source.rs new file mode 100644 index 0000000..65592f9 --- /dev/null +++ b/crates/bundle-pool/src/source.rs @@ -0,0 +1,81 @@ +use anyhow::Result; +use async_trait::async_trait; +use rdkafka::consumer::{Consumer, StreamConsumer}; +use rdkafka::{ClientConfig, Message}; +use tips_core::{Bundle, BundleWithMetadata}; +use tokio::sync::mpsc; +use tracing::{debug, error}; + +#[async_trait] +pub trait BundleSource { + async fn run(&self) -> Result<()>; +} + +pub struct KafkaBundleSource { + queue_consumer: StreamConsumer, + publisher: mpsc::UnboundedSender, +} + +impl KafkaBundleSource { + pub fn new( + client_config: ClientConfig, + topic: String, + publisher: mpsc::UnboundedSender, + ) -> Result { + let queue_consumer: StreamConsumer = client_config.create()?; + queue_consumer.subscribe(&[topic.as_str()])?; + Ok(Self { + queue_consumer, + publisher, + }) + } +} + +#[async_trait] +impl BundleSource for KafkaBundleSource { + async fn run(&self) -> Result<()> { + loop { + match self.queue_consumer.recv().await { + Ok(message) => { + let payload = match message.payload() { + Some(p) => p, + None => { + error!("Message has no payload"); + continue; + } + }; + + let bundle: Bundle = match serde_json::from_slice(payload) { + Ok(b) => b, + Err(e) => { + error!(error = %e, "Failed to deserialize bundle"); + continue; + } + }; + + debug!( + bundle = ?bundle, + offset = message.offset(), + partition = message.partition(), + "Received bundle from Kafka" + ); + + let bundle_with_metadata = match BundleWithMetadata::load(bundle) { + Ok(b) => b, + Err(e) => { + error!(error = %e, "Failed to load bundle"); + continue; + } + }; + + if let Err(e) = self.publisher.send(bundle_with_metadata) { + error!(error = ?e, "Failed to publish bundle to queue"); + } + } + Err(e) => { + error!(error = %e, "Error receiving message from Kafka"); + } + } + } + } +} diff --git a/crates/bundle-pool/tests/integration_tests.rs b/crates/bundle-pool/tests/integration_tests.rs new file mode 100644 index 0000000..3386612 --- /dev/null +++ b/crates/bundle-pool/tests/integration_tests.rs @@ -0,0 +1,98 @@ +use alloy_signer_local::PrivateKeySigner; +use rdkafka::ClientConfig; +use rdkafka::producer::{FutureProducer, FutureRecord}; +use std::sync::{Arc, Mutex}; +use std::time::Duration; +use testcontainers::runners::AsyncRunner; +use testcontainers_modules::testcontainers::ContainerAsync; +use testcontainers_modules::{kafka, kafka::Kafka}; +use tips_audit::BundleEvent; +use tips_bundle_pool::{ + BundleStore, InMemoryBundlePool, KafkaBundleSource, connect_sources_to_pool, +}; +use tips_core::{ + BundleWithMetadata, + test_utils::{create_test_bundle, create_transaction}, +}; +use tokio::sync::mpsc; + +async fn setup_kafka() +-> Result<(ContainerAsync, FutureProducer, ClientConfig), Box> { + let kafka_container = Kafka::default().start().await?; + let bootstrap_servers = format!( + "127.0.0.1:{}", + kafka_container + .get_host_port_ipv4(kafka::KAFKA_PORT) + .await? + ); + + let kafka_producer = ClientConfig::new() + .set("bootstrap.servers", &bootstrap_servers) + .set("message.timeout.ms", "5000") + .create::()?; + + let mut kafka_consumer_config = ClientConfig::new(); + kafka_consumer_config + .set("group.id", "bundle-pool-test-source") + .set("bootstrap.servers", &bootstrap_servers) + .set("session.timeout.ms", "6000") + .set("enable.auto.commit", "false") + .set("auto.offset.reset", "earliest"); + + Ok((kafka_container, kafka_producer, kafka_consumer_config)) +} + +#[tokio::test] +async fn test_kafka_bundle_source_to_pool_integration() -> Result<(), Box> { + let topic = "test-bundles"; + let (_kafka_container, kafka_producer, kafka_consumer_config) = setup_kafka().await?; + + let (bundle_tx, bundle_rx) = mpsc::unbounded_channel::(); + + let kafka_source = KafkaBundleSource::new(kafka_consumer_config, topic.to_string(), bundle_tx)?; + + let (audit_tx, _audit_rx) = mpsc::unbounded_channel::(); + let pool = Arc::new(Mutex::new(InMemoryBundlePool::new( + audit_tx, + "test-builder".to_string(), + ))); + + connect_sources_to_pool(vec![kafka_source], bundle_rx, pool.clone()); + + let alice = PrivateKeySigner::random(); + let bob = PrivateKeySigner::random(); + let tx1 = create_transaction(alice.clone(), 1, bob.address()); + let test_bundle = create_test_bundle(vec![tx1], Some(100), None, None); + let test_bundle_uuid = *test_bundle.uuid(); + + let bundle_payload = serde_json::to_string(test_bundle.bundle())?; + + kafka_producer + .send( + FutureRecord::to(topic) + .payload(&bundle_payload) + .key("test-key"), + Duration::from_secs(5), + ) + .await + .map_err(|(e, _)| e)?; + + let mut counter = 0; + loop { + counter += 1; + assert!(counter < 10); + + tokio::time::sleep(Duration::from_millis(500)).await; + + let bundles = pool.lock().unwrap().get_bundles(); + if bundles.is_empty() { + continue; + } + + assert_eq!(bundles.len(), 1); + assert_eq!(*bundles[0].uuid(), test_bundle_uuid); + break; + } + + Ok(()) +} diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index c0afd40..8774956 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -21,6 +21,7 @@ alloy-serde = { version = "1.0.41", default-features = false } alloy-signer-local = { workspace = true, optional = true } op-alloy-rpc-types = { workspace = true, optional = true } tracing.workspace = true +tracing-subscriber.workspace = true [dev-dependencies] alloy-signer-local.workspace = true diff --git a/crates/core/src/kafka.rs b/crates/core/src/kafka.rs new file mode 100644 index 0000000..a5230ee --- /dev/null +++ b/crates/core/src/kafka.rs @@ -0,0 +1,22 @@ +use std::collections::HashMap; +use std::fs; + +pub fn load_kafka_config_from_file( + properties_file_path: &str, +) -> Result, std::io::Error> { + let kafka_properties = fs::read_to_string(properties_file_path)?; + + let mut config = HashMap::new(); + + for line in kafka_properties.lines() { + let line = line.trim(); + if line.is_empty() || line.starts_with('#') { + continue; + } + if let Some((key, value)) = line.split_once('=') { + config.insert(key.trim().to_string(), value.trim().to_string()); + } + } + + Ok(config) +} diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index 3b737b7..0b01900 100644 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -1,3 +1,5 @@ +pub mod kafka; +pub mod logger; pub mod types; #[cfg(any(test, feature = "test-utils"))] diff --git a/crates/core/src/logger.rs b/crates/core/src/logger.rs new file mode 100644 index 0000000..2f859ec --- /dev/null +++ b/crates/core/src/logger.rs @@ -0,0 +1,24 @@ +use tracing::warn; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; + +pub fn init_logger(log_level: &str) { + let level = match log_level.to_lowercase().as_str() { + "trace" => tracing::Level::TRACE, + "debug" => tracing::Level::DEBUG, + "info" => tracing::Level::INFO, + "warn" => tracing::Level::WARN, + "error" => tracing::Level::ERROR, + _ => { + warn!("Invalid log level '{}', defaulting to 'info'", log_level); + tracing::Level::INFO + } + }; + + tracing_subscriber::registry() + .with( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(level.to_string())), + ) + .with(tracing_subscriber::fmt::layer()) + .init(); +} diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index ecf43c1..64d6fae 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -4,12 +4,12 @@ use jsonrpsee::server::Server; use op_alloy_network::Optimism; use rdkafka::ClientConfig; use rdkafka::producer::FutureProducer; -use std::fs; use std::net::IpAddr; +use tips_core::kafka::load_kafka_config_from_file; +use tips_core::logger::init_logger; use tips_ingress_rpc::queue::KafkaQueuePublisher; use tips_ingress_rpc::service::{IngressApiServer, IngressService}; -use tracing::{info, warn}; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; +use tracing::info; use url::Url; #[derive(Parser, Debug)] @@ -61,28 +61,8 @@ async fn main() -> anyhow::Result<()> { let config = Config::parse(); - let log_level = match config.log_level.to_lowercase().as_str() { - "trace" => tracing::Level::TRACE, - "debug" => tracing::Level::DEBUG, - "info" => tracing::Level::INFO, - "warn" => tracing::Level::WARN, - "error" => tracing::Level::ERROR, - _ => { - warn!( - "Invalid log level '{}', defaulting to 'info'", - config.log_level - ); - tracing::Level::INFO - } - }; - - tracing_subscriber::registry() - .with( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())), - ) - .with(tracing_subscriber::fmt::layer()) - .init(); + init_logger(&config.log_level); + info!( message = "Starting ingress service", address = %config.address, @@ -95,7 +75,9 @@ async fn main() -> anyhow::Result<()> { .network::() .connect_http(config.mempool_url); - let client_config = load_kafka_config_from_file(&config.ingress_kafka_properties)?; + let client_config = ClientConfig::from_iter(load_kafka_config_from_file( + &config.ingress_kafka_properties, + )?); let queue_producer: FutureProducer = client_config.create()?; @@ -121,22 +103,3 @@ async fn main() -> anyhow::Result<()> { handle.stopped().await; Ok(()) } - -fn load_kafka_config_from_file(properties_file_path: &str) -> anyhow::Result { - let kafka_properties = fs::read_to_string(properties_file_path)?; - info!("Kafka properties:\n{}", kafka_properties); - - let mut client_config = ClientConfig::new(); - - for line in kafka_properties.lines() { - let line = line.trim(); - if line.is_empty() || line.starts_with('#') { - continue; - } - if let Some((key, value)) = line.split_once('=') { - client_config.set(key.trim(), value.trim()); - } - } - - Ok(client_config) -} From f04c52c16bf01f076e037d1e73afbfc5565d725f Mon Sep 17 00:00:00 2001 From: William Law Date: Mon, 27 Oct 2025 14:48:23 -0400 Subject: [PATCH 032/117] feat: extend `validate_bundle` criteria (#35) * 25m gas per bundle * max 3 txs for now * partial tx not supported * extra fields must be empty * no refunds * add reverting_tx_check * comments * use bundlewmetadata * no more empty fields * no refund * remove unused dep + fix test * fmt * compare using set * nit --- Cargo.lock | 1 - Cargo.toml | 2 + crates/ingress-rpc/Cargo.toml | 1 - crates/ingress-rpc/src/service.rs | 9 +- crates/ingress-rpc/src/validation.rs | 165 +++++++++++++++++++++++++-- 5 files changed, 165 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f42420..837f78d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6950,7 +6950,6 @@ dependencies = [ "tips-core", "tokio", "tracing", - "tracing-subscriber 0.3.20", "url", ] diff --git a/Cargo.toml b/Cargo.toml index 2f4008a..cb8ff2f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,6 +28,8 @@ alloy-primitives = { version = "1.3.1", default-features = false, features = [ alloy-rpc-types = { version = "1.0.35", default-features = false } alloy-consensus = { version = "1.0.35" } alloy-provider = { version = "1.0.35" } +alloy-rpc-types-mev = "1.0.35" +alloy-serde = "1.0.41" # op-alloy op-alloy-network = { version = "0.21.0", default-features = false } diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index e1c0e2f..120aa1e 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -19,7 +19,6 @@ op-alloy-network.workspace = true alloy-provider.workspace = true tokio.workspace = true tracing.workspace = true -tracing-subscriber.workspace = true anyhow.workspace = true clap.workspace = true url.workspace = true diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 44c46d0..dafd085 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -176,15 +176,16 @@ where ); } + let bundle_with_metadata = BundleWithMetadata::load(bundle.clone()) + .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; + let tx_hashes = bundle_with_metadata.txn_hashes(); + let mut total_gas = 0u64; for tx_data in &bundle.txs { let transaction = self.validate_tx(tx_data).await?; total_gas = total_gas.saturating_add(transaction.gas_limit()); } - validate_bundle(&bundle, total_gas)?; - - let bundle_with_metadata = BundleWithMetadata::load(bundle) - .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; + validate_bundle(&bundle, total_gas, tx_hashes)?; Ok(bundle_with_metadata) } diff --git a/crates/ingress-rpc/src/validation.rs b/crates/ingress-rpc/src/validation.rs index 9d5f4ba..4ff4946 100644 --- a/crates/ingress-rpc/src/validation.rs +++ b/crates/ingress-rpc/src/validation.rs @@ -9,12 +9,12 @@ use op_alloy_network::Optimism; use op_revm::{OpSpecId, l1block::L1BlockInfo}; use reth_optimism_evm::extract_l1_info_from_tx; use reth_rpc_eth_types::{EthApiError, RpcInvalidTransactionError, SignError}; +use std::collections::HashSet; use std::time::{Duration, SystemTime, UNIX_EPOCH}; use tips_core::Bundle; use tracing::warn; -// TODO: make this configurable -const MAX_BUNDLE_GAS: u64 = 30_000_000; +const MAX_BUNDLE_GAS: u64 = 25_000_000; /// Account info for a given address pub struct AccountInfo { @@ -166,7 +166,10 @@ pub async fn validate_tx( /// Helper function to validate propeties of a bundle. A bundle is valid if it satisfies the following criteria: /// - The bundle's max_timestamp is not more than 1 hour in the future /// - The bundle's gas limit is not greater than the maximum allowed gas limit -pub fn validate_bundle(bundle: &Bundle, bundle_gas: u64) -> RpcResult<()> { +/// - The bundle can only contain 3 transactions at once +/// - Partial transaction dropping is not supported, `dropping_tx_hashes` must be empty +/// - revert protection is not supported, all transaction hashes must be in `reverting_tx_hashes` +pub fn validate_bundle(bundle: &Bundle, bundle_gas: u64, tx_hashes: Vec) -> RpcResult<()> { // Don't allow bundles to be submitted over 1 hour into the future // TODO: make the window configurable let valid_timestamp_window = SystemTime::now() @@ -191,6 +194,33 @@ pub fn validate_bundle(bundle: &Bundle, bundle_gas: u64) -> RpcResult<()> { ); } + // Can only provide 3 transactions at once + if bundle.txs.len() > 3 { + return Err( + EthApiError::InvalidParams("Bundle can only contain 3 transactions".into()) + .into_rpc_err(), + ); + } + + // Partial transaction dropping is not supported, `dropping_tx_hashes` must be empty + if !bundle.dropping_tx_hashes.is_empty() { + return Err(EthApiError::InvalidParams( + "Partial transaction dropping is not supported".into(), + ) + .into_rpc_err()); + } + + // revert protection: all transaction hashes must be in `reverting_tx_hashes` + let reverting_tx_hashes_set: HashSet<_> = bundle.reverting_tx_hashes.iter().collect(); + let tx_hashes_set: HashSet<_> = tx_hashes.iter().collect(); + if reverting_tx_hashes_set != tx_hashes_set { + return Err(EthApiError::InvalidParams( + "Revert protection is not supported. reverting_tx_hashes must include all hashes" + .into(), + ) + .into_rpc_err()); + } + Ok(()) } @@ -505,7 +535,7 @@ mod tests { ..Default::default() }; assert_eq!( - validate_bundle(&bundle, 0), + validate_bundle(&bundle, 0, vec![]), Err(EthApiError::InvalidParams( "Bundle cannot be more than 1 hour in the future".into() ) @@ -517,9 +547,10 @@ mod tests { async fn test_err_bundle_max_gas_limit_too_high() { let signer = PrivateKeySigner::random(); let mut encoded_txs = vec![]; + let mut tx_hashes = vec![]; - // Create transactions that collectively exceed MAX_BUNDLE_GAS (30M) - // Each transaction uses 4M gas, so 8 transactions = 32M gas > 30M limit + // Create transactions that collectively exceed MAX_BUNDLE_GAS (25M) + // Each transaction uses 4M gas, so 8 transactions = 32M gas > 25M limit let gas = 4_000_000; let mut total_gas = 0u64; for _ in 0..8 { @@ -538,6 +569,8 @@ mod tests { let signature = signer.sign_transaction_sync(&mut tx).unwrap(); let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); + let tx_hash = envelope.clone().try_into_recovered().unwrap().tx_hash(); + tx_hashes.push(tx_hash); // Encode the transaction let mut encoded = vec![]; @@ -555,11 +588,129 @@ mod tests { }; // Test should fail due to exceeding gas limit - let result = validate_bundle(&bundle, total_gas); + let result = validate_bundle(&bundle, total_gas, tx_hashes); assert!(result.is_err()); if let Err(e) = result { let error_message = format!("{e:?}"); assert!(error_message.contains("Bundle gas limit exceeds maximum allowed")); } } + + #[tokio::test] + async fn test_err_bundle_too_many_transactions() { + let signer = PrivateKeySigner::random(); + let mut encoded_txs = vec![]; + let mut tx_hashes = vec![]; + + let gas = 4_000_000; + let mut total_gas = 0u64; + for _ in 0..4 { + let mut tx = TxEip1559 { + chain_id: 1, + nonce: 0, + gas_limit: gas, + max_fee_per_gas: 200000u128, + max_priority_fee_per_gas: 100000u128, + to: Address::random().into(), + value: U256::from(1000000u128), + access_list: Default::default(), + input: bytes!("").clone(), + }; + total_gas = total_gas.saturating_add(gas); + + let signature = signer.sign_transaction_sync(&mut tx).unwrap(); + let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); + let tx_hash = envelope.clone().try_into_recovered().unwrap().tx_hash(); + tx_hashes.push(tx_hash); + + // Encode the transaction + let mut encoded = vec![]; + envelope.encode_2718(&mut encoded); + encoded_txs.push(Bytes::from(encoded)); + } + + let bundle = Bundle { + txs: encoded_txs, + block_number: 0, + min_timestamp: None, + max_timestamp: None, + reverting_tx_hashes: vec![], + ..Default::default() + }; + + // Test should fail due to exceeding gas limit + let result = validate_bundle(&bundle, total_gas, tx_hashes); + assert!(result.is_err()); + if let Err(e) = result { + let error_message = format!("{e:?}"); + assert!(error_message.contains("Bundle can only contain 3 transactions")); + } + } + + #[tokio::test] + async fn test_err_bundle_partial_transaction_dropping_not_supported() { + let bundle = Bundle { + txs: vec![], + dropping_tx_hashes: vec![B256::random()], + ..Default::default() + }; + assert_eq!( + validate_bundle(&bundle, 0, vec![]), + Err( + EthApiError::InvalidParams("Partial transaction dropping is not supported".into()) + .into_rpc_err() + ) + ); + } + + #[tokio::test] + async fn test_err_bundle_not_all_tx_hashes_in_reverting_tx_hashes() { + let signer = PrivateKeySigner::random(); + let mut encoded_txs = vec![]; + let mut tx_hashes = vec![]; + + let gas = 4_000_000; + let mut total_gas = 0u64; + for _ in 0..4 { + let mut tx = TxEip1559 { + chain_id: 1, + nonce: 0, + gas_limit: gas, + max_fee_per_gas: 200000u128, + max_priority_fee_per_gas: 100000u128, + to: Address::random().into(), + value: U256::from(1000000u128), + access_list: Default::default(), + input: bytes!("").clone(), + }; + total_gas = total_gas.saturating_add(gas); + + let signature = signer.sign_transaction_sync(&mut tx).unwrap(); + let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); + let tx_hash = envelope.clone().try_into_recovered().unwrap().tx_hash(); + tx_hashes.push(tx_hash); + + // Encode the transaction + let mut encoded = vec![]; + envelope.encode_2718(&mut encoded); + encoded_txs.push(Bytes::from(encoded)); + } + + let bundle = Bundle { + txs: encoded_txs, + block_number: 0, + min_timestamp: None, + max_timestamp: None, + reverting_tx_hashes: tx_hashes[..2].to_vec(), + ..Default::default() + }; + + // Test should fail due to exceeding gas limit + let result = validate_bundle(&bundle, total_gas, tx_hashes); + assert!(result.is_err()); + if let Err(e) = result { + let error_message = format!("{e:?}"); + assert!(error_message.contains("Bundle can only contain 3 transactions")); + } + } } From 27674ae051a86033ece61ae24434aeacdb28ce73 Mon Sep 17 00:00:00 2001 From: Niran Babalola Date: Tue, 28 Oct 2025 13:03:46 -0500 Subject: [PATCH 033/117] feat: add metering bundle types (#45) Add TransactionResult and MeterBundleResponse types to support bundle execution metering with resource tracking. --- crates/core/src/types.rs | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index 9e6e645..2937bd4 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -129,6 +129,35 @@ impl BundleWithMetadata { } } +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct TransactionResult { + pub coinbase_diff: String, + pub eth_sent_to_coinbase: String, + pub from_address: Address, + pub gas_fees: String, + pub gas_price: String, + pub gas_used: u64, + pub to_address: Option

, + pub tx_hash: TxHash, + pub value: String, + pub execution_time_us: u128, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct MeterBundleResponse { + pub bundle_gas_price: String, + pub bundle_hash: B256, + pub coinbase_diff: String, + pub eth_sent_to_coinbase: String, + pub gas_fees: String, + pub results: Vec, + pub state_block_number: u64, + pub total_gas_used: u64, + pub total_execution_time_us: u128, +} + #[cfg(test)] mod tests { use super::*; From e59327bec565808e0505d3fb3a64749dfc61a41a Mon Sep 17 00:00:00 2001 From: Niran Babalola Date: Tue, 28 Oct 2025 14:38:51 -0500 Subject: [PATCH 034/117] feat: add state root time to meter bundle response (#47) Add state_root_time_us field to MeterBundleResponse to expose state root calculation time in the metering RPC response. This enables clients to track the performance of state root calculations separately from total execution time. --- crates/core/src/types.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index 2937bd4..42baac9 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -156,6 +156,7 @@ pub struct MeterBundleResponse { pub state_block_number: u64, pub total_gas_used: u64, pub total_execution_time_us: u128, + pub state_root_time_us: u128, } #[cfg(test)] From 7aab20f63df9530cc8f4bca171eedd498302947f Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Wed, 29 Oct 2025 12:40:20 -0500 Subject: [PATCH 035/117] chore: emit audit logs from ingress-rpc (#48) --- .env.example | 4 +- Cargo.lock | 81 +++++++------------ Cargo.toml | 13 ++- crates/audit/src/storage.rs | 43 +++------- crates/audit/src/types.rs | 11 +-- crates/audit/tests/integration_tests.rs | 2 +- crates/audit/tests/s3_test.rs | 20 ++--- crates/bundle-pool/src/pool.rs | 1 + crates/bundle-pool/src/source.rs | 11 ++- crates/core/Cargo.toml | 1 + crates/core/src/types.rs | 15 +++- crates/ingress-rpc/Cargo.toml | 1 + crates/ingress-rpc/src/bin/main.rs | 25 +++++- crates/ingress-rpc/src/service.rs | 39 +++++++-- docker-compose.tips.yml | 3 +- docker/ingress-audit-kafka-properties | 3 + ...rties => ingress-bundles-kafka-properties} | 0 justfile | 28 ++++++- ui/src/app/bundles/[uuid]/page.tsx | 55 ++----------- 19 files changed, 175 insertions(+), 181 deletions(-) create mode 100644 docker/ingress-audit-kafka-properties rename docker/{ingress-kafka-properties => ingress-bundles-kafka-properties} (100%) diff --git a/.env.example b/.env.example index 8788158..69b1a01 100644 --- a/.env.example +++ b/.env.example @@ -3,8 +3,10 @@ TIPS_INGRESS_ADDRESS=0.0.0.0 TIPS_INGRESS_PORT=8080 TIPS_INGRESS_RPC_MEMPOOL=http://localhost:2222 TIPS_INGRESS_DUAL_WRITE_MEMPOOL=false -TIPS_INGRESS_KAFKA_INGRESS_PROPERTIES_FILE=/app/docker/ingress-kafka-properties +TIPS_INGRESS_KAFKA_INGRESS_PROPERTIES_FILE=/app/docker/ingress-bundles-kafka-properties TIPS_INGRESS_KAFKA_INGRESS_TOPIC=tips-ingress +TIPS_INGRESS_KAFKA_AUDIT_PROPERTIES_FILE=/app/docker/ingress-audit-kafka-properties +TIPS_INGRESS_KAFKA_AUDIT_TOPIC=tips-audit TIPS_INGRESS_LOG_LEVEL=info TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS=10800 diff --git a/Cargo.lock b/Cargo.lock index 837f78d..b93bed8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -166,7 +166,7 @@ dependencies = [ "alloy-sol-types", "auto_impl", "derive_more", - "op-alloy-consensus 0.20.0", + "op-alloy-consensus", "op-alloy-rpc-types-engine", "op-revm", "revm", @@ -278,7 +278,7 @@ dependencies = [ "alloy-op-hardforks", "alloy-primitives", "auto_impl", - "op-alloy-consensus 0.20.0", + "op-alloy-consensus", "op-revm", "revm", ] @@ -4016,8 +4016,10 @@ checksum = "3a501241474c3118833d6195312ae7eb7cc90bbb0d5f524cbb0b06619e49ff67" dependencies = [ "alloy-consensus", "alloy-eips", + "alloy-network", "alloy-primitives", "alloy-rlp", + "alloy-rpc-types-eth", "alloy-serde", "derive_more", "serde", @@ -4025,28 +4027,16 @@ dependencies = [ ] [[package]] -name = "op-alloy-consensus" -version = "0.21.0" +name = "op-alloy-flz" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1fc8aa0e2f5b136d101630be009e4e6dbdd1f17bc3ce670f431511600d2930" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network", - "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types-eth", - "alloy-serde", - "derive_more", - "serde", - "thiserror", -] +checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" [[package]] name = "op-alloy-network" -version = "0.21.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5cca341184dbfcb49dbc124e5958e6a857499f04782907e5d969abb644e0b6" +checksum = "f80108e3b36901200a4c5df1db1ee9ef6ce685b59ea79d7be1713c845e3765da" dependencies = [ "alloy-consensus", "alloy-network", @@ -4054,8 +4044,8 @@ dependencies = [ "alloy-provider", "alloy-rpc-types-eth", "alloy-signer", - "op-alloy-consensus 0.21.0", - "op-alloy-rpc-types 0.21.0", + "op-alloy-consensus", + "op-alloy-rpc-types", ] [[package]] @@ -4071,26 +4061,7 @@ dependencies = [ "alloy-rpc-types-eth", "alloy-serde", "derive_more", - "op-alloy-consensus 0.20.0", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "op-alloy-rpc-types" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "274972c3c5e911b6675f6794ea0476b05e0bc1ea7e464f99ec2dc01b76d2eeb6" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network-primitives", - "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "derive_more", - "op-alloy-consensus 0.21.0", + "op-alloy-consensus", "serde", "serde_json", "thiserror", @@ -4110,7 +4081,7 @@ dependencies = [ "derive_more", "ethereum_ssz", "ethereum_ssz_derive", - "op-alloy-consensus 0.20.0", + "op-alloy-consensus", "snap", "thiserror", ] @@ -4909,7 +4880,7 @@ dependencies = [ "alloy-trie", "bytes", "modular-bitfield", - "op-alloy-consensus 0.20.0", + "op-alloy-consensus", "reth-codecs-derive", "reth-zstd-compressors", "serde", @@ -5188,8 +5159,8 @@ dependencies = [ "alloy-primitives", "derive_more", "miniz_oxide", - "op-alloy-consensus 0.20.0", - "op-alloy-rpc-types 0.20.0", + "op-alloy-consensus", + "op-alloy-rpc-types", "reth-chainspec", "reth-ethereum-forks", "reth-network-peers", @@ -5236,7 +5207,7 @@ dependencies = [ "alloy-evm", "alloy-op-evm", "alloy-primitives", - "op-alloy-consensus 0.20.0", + "op-alloy-consensus", "op-alloy-rpc-types-engine", "op-revm", "reth-chainspec", @@ -5274,7 +5245,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "bytes", - "op-alloy-consensus 0.20.0", + "op-alloy-consensus", "reth-codecs", "reth-primitives-traits", "reth-zstd-compressors", @@ -5298,7 +5269,7 @@ dependencies = [ "bytes", "derive_more", "once_cell", - "op-alloy-consensus 0.20.0", + "op-alloy-consensus", "reth-codecs", "revm-bytecode", "revm-primitives", @@ -6870,7 +6841,7 @@ dependencies = [ "bytes", "clap", "dotenvy", - "op-alloy-consensus 0.21.0", + "op-alloy-consensus", "rdkafka", "serde", "serde_json", @@ -6894,8 +6865,8 @@ dependencies = [ "alloy-signer-local", "anyhow", "async-trait", - "op-alloy-consensus 0.21.0", - "op-alloy-rpc-types 0.21.0", + "op-alloy-consensus", + "op-alloy-rpc-types", "rdkafka", "serde", "serde_json", @@ -6917,8 +6888,9 @@ dependencies = [ "alloy-provider", "alloy-serde", "alloy-signer-local", - "op-alloy-consensus 0.21.0", - "op-alloy-rpc-types 0.21.0", + "op-alloy-consensus", + "op-alloy-flz", + "op-alloy-rpc-types", "serde", "tracing", "tracing-subscriber 0.3.20", @@ -6939,7 +6911,7 @@ dependencies = [ "clap", "dotenvy", "jsonrpsee", - "op-alloy-consensus 0.21.0", + "op-alloy-consensus", "op-alloy-network", "op-revm", "rdkafka", @@ -6947,6 +6919,7 @@ dependencies = [ "reth-rpc-eth-types", "revm-context-interface", "serde_json", + "tips-audit", "tips-core", "tokio", "tracing", diff --git a/Cargo.toml b/Cargo.toml index cb8ff2f..d2029ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,16 +25,15 @@ alloy-primitives = { version = "1.3.1", default-features = false, features = [ "map-foldhash", "serde", ] } -alloy-rpc-types = { version = "1.0.35", default-features = false } -alloy-consensus = { version = "1.0.35" } -alloy-provider = { version = "1.0.35" } -alloy-rpc-types-mev = "1.0.35" +alloy-consensus = { version = "1.0.37" } +alloy-provider = { version = "1.0.37" } alloy-serde = "1.0.41" # op-alloy -op-alloy-network = { version = "0.21.0", default-features = false } -op-alloy-consensus = { version = "0.21.0", features = ["k256"] } -op-alloy-rpc-types = { version = "0.21.0", default-features = true} +op-alloy-network = { version = "0.20.0", default-features = false } +op-alloy-consensus = { version = "0.20.0", features = ["k256"] } +op-alloy-rpc-types = { version = "0.20.0", default-features = true} +op-alloy-flz = { version = "0.13.1" } tokio = { version = "1.47.1", features = ["full"] } tracing = "0.1.41" diff --git a/crates/audit/src/storage.rs b/crates/audit/src/storage.rs index ed5d947..59d9ae0 100644 --- a/crates/audit/src/storage.rs +++ b/crates/audit/src/storage.rs @@ -36,12 +36,7 @@ pub struct TransactionMetadata { #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(tag = "event", content = "data")] pub enum BundleHistoryEvent { - Created { - key: String, - timestamp: i64, - bundle: Bundle, - }, - Updated { + Received { key: String, timestamp: i64, bundle: Bundle, @@ -73,8 +68,7 @@ pub enum BundleHistoryEvent { impl BundleHistoryEvent { pub fn key(&self) -> &str { match self { - BundleHistoryEvent::Created { key, .. } => key, - BundleHistoryEvent::Updated { key, .. } => key, + BundleHistoryEvent::Received { key, .. } => key, BundleHistoryEvent::Cancelled { key, .. } => key, BundleHistoryEvent::BuilderIncluded { key, .. } => key, BundleHistoryEvent::BlockIncluded { key, .. } => key, @@ -106,12 +100,7 @@ fn update_bundle_history_transform( } let history_event = match &event.event { - BundleEvent::Created { bundle, .. } => BundleHistoryEvent::Created { - key: event.key.clone(), - timestamp: event.timestamp, - bundle: bundle.clone(), - }, - BundleEvent::Updated { bundle, .. } => BundleHistoryEvent::Updated { + BundleEvent::Received { bundle, .. } => BundleHistoryEvent::Received { key: event.key.clone(), timestamp: event.timestamp, bundle: bundle.clone(), @@ -396,7 +385,7 @@ mod tests { let bundle_history = BundleHistory { history: vec![] }; let bundle = create_test_bundle(); let bundle_id = Uuid::new_v4(); - let bundle_event = BundleEvent::Created { + let bundle_event = BundleEvent::Received { bundle_id, bundle: bundle.clone(), }; @@ -409,7 +398,7 @@ mod tests { assert_eq!(bundle_history.history.len(), 1); match &bundle_history.history[0] { - BundleHistoryEvent::Created { + BundleHistoryEvent::Received { key, timestamp: ts, bundle: b, @@ -424,7 +413,7 @@ mod tests { #[test] fn test_update_bundle_history_transform_skips_duplicate_key() { - let existing_event = BundleHistoryEvent::Created { + let existing_event = BundleHistoryEvent::Received { key: "duplicate-key".to_string(), timestamp: 1111111111, bundle: create_test_bundle(), @@ -435,7 +424,7 @@ mod tests { let bundle = create_test_bundle(); let bundle_id = Uuid::new_v4(); - let bundle_event = BundleEvent::Updated { bundle_id, bundle }; + let bundle_event = BundleEvent::Received { bundle_id, bundle }; let event = create_test_event("duplicate-key", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history, &event); @@ -449,7 +438,7 @@ mod tests { let bundle_id = Uuid::new_v4(); let bundle = create_test_bundle(); - let bundle_event = BundleEvent::Created { + let bundle_event = BundleEvent::Received { bundle_id, bundle: bundle.clone(), }; @@ -457,16 +446,8 @@ mod tests { let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); - let bundle_event = BundleEvent::Updated { - bundle_id, - bundle: bundle.clone(), - }; - let event = create_test_event("test-key-2", 1234567890, bundle_event); - let result = update_bundle_history_transform(bundle_history.clone(), &event); - assert!(result.is_some()); - let bundle_event = BundleEvent::Cancelled { bundle_id }; - let event = create_test_event("test-key-3", 1234567890, bundle_event); + let event = create_test_event("test-key-2", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); @@ -476,7 +457,7 @@ mod tests { block_number: 12345, flashblock_index: 1, }; - let event = create_test_event("test-key-4", 1234567890, bundle_event); + let event = create_test_event("test-key-3", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); @@ -485,7 +466,7 @@ mod tests { block_number: 12345, block_hash: TxHash::from([1u8; 32]), }; - let event = create_test_event("test-key-5", 1234567890, bundle_event); + let event = create_test_event("test-key-4", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); @@ -493,7 +474,7 @@ mod tests { bundle_id, reason: DropReason::TimedOut, }; - let event = create_test_event("test-key-6", 1234567890, bundle_event); + let event = create_test_event("test-key-5", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history, &event); assert!(result.is_some()); } diff --git a/crates/audit/src/types.rs b/crates/audit/src/types.rs index a29ac2f..4208b3b 100644 --- a/crates/audit/src/types.rs +++ b/crates/audit/src/types.rs @@ -31,11 +31,7 @@ pub struct Transaction { #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(tag = "event", content = "data")] pub enum BundleEvent { - Created { - bundle_id: BundleId, - bundle: Bundle, - }, - Updated { + Received { bundle_id: BundleId, bundle: Bundle, }, @@ -62,8 +58,7 @@ pub enum BundleEvent { impl BundleEvent { pub fn bundle_id(&self) -> BundleId { match self { - BundleEvent::Created { bundle_id, .. } => *bundle_id, - BundleEvent::Updated { bundle_id, .. } => *bundle_id, + BundleEvent::Received { bundle_id, .. } => *bundle_id, BundleEvent::Cancelled { bundle_id, .. } => *bundle_id, BundleEvent::BuilderIncluded { bundle_id, .. } => *bundle_id, BundleEvent::BlockIncluded { bundle_id, .. } => *bundle_id, @@ -73,7 +68,7 @@ impl BundleEvent { pub fn transaction_ids(&self) -> Vec { match self { - BundleEvent::Created { bundle, .. } | BundleEvent::Updated { bundle, .. } => { + BundleEvent::Received { bundle, .. } => { bundle .txs .iter() diff --git a/crates/audit/tests/integration_tests.rs b/crates/audit/tests/integration_tests.rs index f219677..d2bb0fe 100644 --- a/crates/audit/tests/integration_tests.rs +++ b/crates/audit/tests/integration_tests.rs @@ -21,7 +21,7 @@ async fn test_kafka_publisher_s3_archiver_integration() let test_bundle_id = Uuid::new_v4(); let test_events = vec![ - BundleEvent::Created { + BundleEvent::Received { bundle_id: test_bundle_id, bundle: Bundle::default(), }, diff --git a/crates/audit/tests/s3_test.rs b/crates/audit/tests/s3_test.rs index f637d61..55c8f87 100644 --- a/crates/audit/tests/s3_test.rs +++ b/crates/audit/tests/s3_test.rs @@ -44,7 +44,7 @@ async fn test_event_write_and_read() -> Result<(), Box Result<(), Box Result<(), Box Result<(), Box Result<(), Box Result<(), Box Result<(), Box, audit_log: mpsc::UnboundedSender, diff --git a/crates/bundle-pool/src/source.rs b/crates/bundle-pool/src/source.rs index 65592f9..aa0f1e5 100644 --- a/crates/bundle-pool/src/source.rs +++ b/crates/bundle-pool/src/source.rs @@ -2,9 +2,10 @@ use anyhow::Result; use async_trait::async_trait; use rdkafka::consumer::{Consumer, StreamConsumer}; use rdkafka::{ClientConfig, Message}; +use std::fmt::Debug; use tips_core::{Bundle, BundleWithMetadata}; use tokio::sync::mpsc; -use tracing::{debug, error}; +use tracing::{error, trace}; #[async_trait] pub trait BundleSource { @@ -16,6 +17,12 @@ pub struct KafkaBundleSource { publisher: mpsc::UnboundedSender, } +impl Debug for KafkaBundleSource { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "KafkaBundleSource") + } +} + impl KafkaBundleSource { pub fn new( client_config: ClientConfig, @@ -53,7 +60,7 @@ impl BundleSource for KafkaBundleSource { } }; - debug!( + trace!( bundle = ?bundle, offset = message.offset(), partition = message.partition(), diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 8774956..cfe431b 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -22,6 +22,7 @@ alloy-signer-local = { workspace = true, optional = true } op-alloy-rpc-types = { workspace = true, optional = true } tracing.workspace = true tracing-subscriber.workspace = true +op-alloy-flz.workspace = true [dev-dependencies] alloy-signer-local.workspace = true diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index 42baac9..b8135a9 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -1,7 +1,9 @@ +use alloy_consensus::Transaction; use alloy_consensus::transaction::SignerRecoverable; use alloy_primitives::{Address, B256, Bytes, TxHash, keccak256}; -use alloy_provider::network::eip2718::Decodable2718; +use alloy_provider::network::eip2718::{Decodable2718, Encodable2718}; use op_alloy_consensus::OpTxEnvelope; +use op_alloy_flz::tx_estimated_size_fjord_bytes; use serde::{Deserialize, Serialize}; use uuid::Uuid; @@ -127,6 +129,17 @@ impl BundleWithMetadata { .map(|t| t.recover_signer().unwrap()) .collect() } + + pub fn gas_limit(&self) -> u64 { + self.transactions.iter().map(|t| t.gas_limit()).sum() + } + + pub fn da_size(&self) -> u64 { + self.transactions + .iter() + .map(|t| tx_estimated_size_fjord_bytes(&t.encoded_2718())) + .sum() + } } #[derive(Debug, Clone, Serialize, Deserialize)] diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index 120aa1e..5df7ec6 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -13,6 +13,7 @@ path = "src/bin/main.rs" [dependencies] tips-core.workspace = true +tips-audit.workspace = true jsonrpsee.workspace = true alloy-primitives.workspace = true op-alloy-network.workspace = true diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 64d6fae..0ea590b 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -5,6 +5,7 @@ use op_alloy_network::Optimism; use rdkafka::ClientConfig; use rdkafka::producer::FutureProducer; use std::net::IpAddr; +use tips_audit::KafkaBundleEventPublisher; use tips_core::kafka::load_kafka_config_from_file; use tips_core::logger::init_logger; use tips_ingress_rpc::queue::KafkaQueuePublisher; @@ -43,6 +44,18 @@ struct Config { )] ingress_topic: String, + /// Kafka properties file for audit events + #[arg(long, env = "TIPS_INGRESS_KAFKA_AUDIT_PROPERTIES_FILE")] + audit_kafka_properties: String, + + /// Kafka topic for audit events + #[arg( + long, + env = "TIPS_INGRESS_KAFKA_AUDIT_TOPIC", + default_value = "tips-audit" + )] + audit_topic: String, + #[arg(long, env = "TIPS_INGRESS_LOG_LEVEL", default_value = "info")] log_level: String, @@ -75,18 +88,26 @@ async fn main() -> anyhow::Result<()> { .network::() .connect_http(config.mempool_url); - let client_config = ClientConfig::from_iter(load_kafka_config_from_file( + let ingress_client_config = ClientConfig::from_iter(load_kafka_config_from_file( &config.ingress_kafka_properties, )?); - let queue_producer: FutureProducer = client_config.create()?; + let queue_producer: FutureProducer = ingress_client_config.create()?; let queue = KafkaQueuePublisher::new(queue_producer, config.ingress_topic); + let audit_client_config = + ClientConfig::from_iter(load_kafka_config_from_file(&config.audit_kafka_properties)?); + + let audit_producer: FutureProducer = audit_client_config.create()?; + + let audit_publisher = KafkaBundleEventPublisher::new(audit_producer, config.audit_topic); + let service = IngressService::new( provider, config.dual_write_mempool, queue, + audit_publisher, config.send_transaction_default_lifetime_seconds, ); let bind_addr = format!("{}:{}", config.address, config.port); diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index dafd085..811788a 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -10,6 +10,7 @@ use op_alloy_consensus::OpTxEnvelope; use op_alloy_network::Optimism; use reth_rpc_eth_types::EthApiError; use std::time::{SystemTime, UNIX_EPOCH}; +use tips_audit::{BundleEvent, BundleEventPublisher}; use tips_core::{Bundle, BundleHash, BundleWithMetadata, CancelBundle}; use tracing::{info, warn}; @@ -31,40 +32,44 @@ pub trait IngressApi { async fn send_raw_transaction(&self, tx: Bytes) -> RpcResult; } -pub struct IngressService { +pub struct IngressService { provider: RootProvider, dual_write_mempool: bool, - queue: Queue, + bundle_queue: Queue, + audit_publisher: Audit, send_transaction_default_lifetime_seconds: u64, } -impl IngressService { +impl IngressService { pub fn new( provider: RootProvider, dual_write_mempool: bool, queue: Queue, + audit_publisher: Audit, send_transaction_default_lifetime_seconds: u64, ) -> Self { Self { provider, dual_write_mempool, - queue, + bundle_queue: queue, + audit_publisher, send_transaction_default_lifetime_seconds, } } } #[async_trait] -impl IngressApiServer for IngressService +impl IngressApiServer for IngressService where Queue: QueuePublisher + Sync + Send + 'static, + Audit: BundleEventPublisher + Sync + Send + 'static, { async fn send_bundle(&self, bundle: Bundle) -> RpcResult { let bundle_with_metadata = self.validate_bundle(bundle).await?; let bundle_hash = bundle_with_metadata.bundle_hash(); if let Err(e) = self - .queue + .bundle_queue .publish(bundle_with_metadata.bundle(), &bundle_hash) .await { @@ -78,6 +83,14 @@ where tx_count = bundle_with_metadata.transactions().len(), ); + let audit_event = BundleEvent::Received { + bundle_id: *bundle_with_metadata.uuid(), + bundle: bundle_with_metadata.bundle().clone(), + }; + if let Err(e) = self.audit_publisher.publish(audit_event).await { + warn!(message = "Failed to publish audit event", bundle_id = %bundle_with_metadata.uuid(), error = %e); + } + Ok(BundleHash { bundle_hash }) } @@ -108,8 +121,9 @@ where let bundle_with_metadata = BundleWithMetadata::load(bundle) .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; let bundle_hash = bundle_with_metadata.bundle_hash(); + if let Err(e) = self - .queue + .bundle_queue .publish(bundle_with_metadata.bundle(), &bundle_hash) .await { @@ -137,13 +151,22 @@ where } } + let audit_event = BundleEvent::Received { + bundle_id: *bundle_with_metadata.uuid(), + bundle: bundle_with_metadata.bundle().clone(), + }; + if let Err(e) = self.audit_publisher.publish(audit_event).await { + warn!(message = "Failed to publish audit event", bundle_id = %bundle_with_metadata.uuid(), error = %e); + } + Ok(transaction.tx_hash()) } } -impl IngressService +impl IngressService where Queue: QueuePublisher + Sync + Send + 'static, + Audit: BundleEventPublisher + Sync + Send + 'static, { async fn validate_tx(&self, data: &Bytes) -> RpcResult> { if data.is_empty() { diff --git a/docker-compose.tips.yml b/docker-compose.tips.yml index 6b5d01c..e4613f7 100644 --- a/docker-compose.tips.yml +++ b/docker-compose.tips.yml @@ -11,7 +11,8 @@ services: env_file: - .env.docker volumes: - - ./docker/ingress-kafka-properties:/app/docker/ingress-kafka-properties:ro + - ./docker/ingress-bundles-kafka-properties:/app/docker/ingress-bundles-kafka-properties:ro + - ./docker/ingress-audit-kafka-properties:/app/docker/ingress-audit-kafka-properties:ro restart: unless-stopped audit: diff --git a/docker/ingress-audit-kafka-properties b/docker/ingress-audit-kafka-properties new file mode 100644 index 0000000..d9606ff --- /dev/null +++ b/docker/ingress-audit-kafka-properties @@ -0,0 +1,3 @@ +# Kafka configuration properties for ingress audit events +bootstrap.servers=host.docker.internal:9094 +message.timeout.ms=5000 diff --git a/docker/ingress-kafka-properties b/docker/ingress-bundles-kafka-properties similarity index 100% rename from docker/ingress-kafka-properties rename to docker/ingress-bundles-kafka-properties diff --git a/justfile b/justfile index 8dbeaf5..ebac294 100644 --- a/justfile +++ b/justfile @@ -16,9 +16,6 @@ fix: # UI cd ui && npx biome check --write --unsafe -create-migration name: - touch crates/datastore/migrations/$(date +%s)_{{ name }}.sql - sync: deps-reset ### ENV ### just sync-env @@ -84,4 +81,27 @@ ingress-writer: cargo run --bin tips-ingress-writer ui: - cd ui && yarn dev \ No newline at end of file + cd ui && yarn dev + +sequencer_url := "http://localhost:8547" +builder_url := "http://localhost:2222" +ingress_url := "http://localhost:8080" + +get-blocks: + echo "Sequencer" + cast bn -r {{ sequencer_url }} + echo "Builder" + cast bn -r {{ builder_url }} + +sender := "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266" +sender_key := "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" + +send-txn: + #!/usr/bin/env bash + set -euxo pipefail + echo "sending txn" + nonce=$(cast nonce {{ sender }} -r {{ builder_url }}) + txn=$(cast mktx --private-key {{ sender_key }} 0x0000000000000000000000000000000000000000 --value 0.01ether --nonce $nonce --chain-id 13 -r {{ builder_url }}) + hash=$(curl -s {{ ingress_url }} -X POST -H "Content-Type: application/json" --data "{\"method\":\"eth_sendRawTransaction\",\"params\":[\"$txn\"],\"id\":1,\"jsonrpc\":\"2.0\"}" | jq -r ".result") + cast receipt $hash -r {{ sequencer_url }} | grep status + cast receipt $hash -r {{ builder_url }} | grep status \ No newline at end of file diff --git a/ui/src/app/bundles/[uuid]/page.tsx b/ui/src/app/bundles/[uuid]/page.tsx index 38b4286..83e1df2 100644 --- a/ui/src/app/bundles/[uuid]/page.tsx +++ b/ui/src/app/bundles/[uuid]/page.tsx @@ -7,40 +7,6 @@ interface PageProps { params: Promise<{ uuid: string }>; } -function formatEventType(eventType: string): string { - switch (eventType) { - case "ReceivedBundle": - return "Bundle Received"; - case "CancelledBundle": - return "Bundle Cancelled"; - case "BuilderMined": - return "Builder Mined"; - case "FlashblockInclusion": - return "Flashblock Inclusion"; - case "BlockInclusion": - return "Block Inclusion"; - default: - return eventType; - } -} - -function getEventStatus(eventType: string): { color: string; bgColor: string } { - switch (eventType) { - case "ReceivedBundle": - return { color: "text-blue-600", bgColor: "bg-blue-100" }; - case "CancelledBundle": - return { color: "text-red-600", bgColor: "bg-red-100" }; - case "BuilderMined": - return { color: "text-yellow-600", bgColor: "bg-yellow-100" }; - case "FlashblockInclusion": - return { color: "text-purple-600", bgColor: "bg-purple-100" }; - case "BlockInclusion": - return { color: "text-green-600", bgColor: "bg-green-100" }; - default: - return { color: "text-gray-600", bgColor: "bg-gray-100" }; - } -} - export default function BundlePage({ params }: PageProps) { const [uuid, setUuid] = useState(""); const [data, setData] = useState(null); @@ -111,23 +77,19 @@ export default function BundlePage({ params }: PageProps) { {data && (
{(() => { - const allTransactions = new Set(); + const transactions = new Set(); data.history.forEach((event) => { - if (event.event === "Created") { - event.data?.bundle?.revertingTxHashes?.forEach((tx) => { - allTransactions.add(tx); - }); - } + event.data?.bundle?.revertingTxHashes?.forEach((tx) => { + transactions.add(tx); + }); }); - const uniqueTransactions = Array.from(allTransactions.values()); - - return uniqueTransactions.length > 0 ? ( + return transactions.size > 0 ? (

Transactions

    - {uniqueTransactions.map((tx) => ( + {Array.from(transactions).map((tx) => (
  • {tx}
    • ))}
@@ -141,7 +103,6 @@ export default function BundlePage({ params }: PageProps) { {data.history.length > 0 ? (
{data.history.map((event, index) => { - const { color, bgColor } = getEventStatus(event.event); return (
- {formatEventType(event.event)} + {event.event} {event.data?.timestamp From 86b275c0fd63226c3fb85ac5512033f99b67d0f5 Mon Sep 17 00:00:00 2001 From: Niran Babalola Date: Thu, 30 Oct 2025 01:01:40 -0500 Subject: [PATCH 036/117] feat: add state_flashblock_index to MeterBundleResponse (#49) Add optional state_flashblock_index field to MeterBundleResponse to expose the flashblock index in the metering RPC response. This enables clients to track which flashblock a bundle was metered in, alongside the canonical block number. --- Cargo.lock | 1 + crates/core/Cargo.toml | 1 + crates/core/src/types.rs | 77 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index b93bed8..bb461bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6892,6 +6892,7 @@ dependencies = [ "op-alloy-flz", "op-alloy-rpc-types", "serde", + "serde_json", "tracing", "tracing-subscriber 0.3.20", "uuid", diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index cfe431b..3219ef6 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -27,3 +27,4 @@ op-alloy-flz.workspace = true [dev-dependencies] alloy-signer-local.workspace = true op-alloy-rpc-types.workspace = true +serde_json.workspace = true diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index b8135a9..f0c42b1 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -167,6 +167,12 @@ pub struct MeterBundleResponse { pub gas_fees: String, pub results: Vec, pub state_block_number: u64, + #[serde( + default, + deserialize_with = "alloy_serde::quantity::opt::deserialize", + skip_serializing_if = "Option::is_none" + )] + pub state_flashblock_index: Option, pub total_gas_used: u64, pub total_execution_time_us: u128, pub state_root_time_us: u128, @@ -245,4 +251,75 @@ mod tests { assert_eq!(bundle.bundle_hash(), expected_bundle_hash_double); } + + #[test] + fn test_meter_bundle_response_serialization() { + let response = MeterBundleResponse { + bundle_gas_price: "1000000000".to_string(), + bundle_hash: B256::default(), + coinbase_diff: "100".to_string(), + eth_sent_to_coinbase: "0".to_string(), + gas_fees: "100".to_string(), + results: vec![], + state_block_number: 12345, + state_flashblock_index: Some(42), + total_gas_used: 21000, + total_execution_time_us: 1000, + state_root_time_us: 500, + }; + + let json = serde_json::to_string(&response).unwrap(); + assert!(json.contains("\"stateFlashblockIndex\":42")); + assert!(json.contains("\"stateBlockNumber\":12345")); + + let deserialized: MeterBundleResponse = serde_json::from_str(&json).unwrap(); + assert_eq!(deserialized.state_flashblock_index, Some(42)); + assert_eq!(deserialized.state_block_number, 12345); + } + + #[test] + fn test_meter_bundle_response_without_flashblock_index() { + let response = MeterBundleResponse { + bundle_gas_price: "1000000000".to_string(), + bundle_hash: B256::default(), + coinbase_diff: "100".to_string(), + eth_sent_to_coinbase: "0".to_string(), + gas_fees: "100".to_string(), + results: vec![], + state_block_number: 12345, + state_flashblock_index: None, + total_gas_used: 21000, + total_execution_time_us: 1000, + state_root_time_us: 500, + }; + + let json = serde_json::to_string(&response).unwrap(); + assert!(!json.contains("stateFlashblockIndex")); + assert!(json.contains("\"stateBlockNumber\":12345")); + + let deserialized: MeterBundleResponse = serde_json::from_str(&json).unwrap(); + assert_eq!(deserialized.state_flashblock_index, None); + assert_eq!(deserialized.state_block_number, 12345); + } + + #[test] + fn test_meter_bundle_response_deserialization_without_flashblock() { + let json = r#"{ + "bundleGasPrice": "1000000000", + "bundleHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "coinbaseDiff": "100", + "ethSentToCoinbase": "0", + "gasFees": "100", + "results": [], + "stateBlockNumber": 12345, + "totalGasUsed": 21000, + "totalExecutionTimeUs": 1000, + "stateRootTimeUs": 500 + }"#; + + let deserialized: MeterBundleResponse = serde_json::from_str(json).unwrap(); + assert_eq!(deserialized.state_flashblock_index, None); + assert_eq!(deserialized.state_block_number, 12345); + assert_eq!(deserialized.total_gas_used, 21000); + } } From 4079b167920d4432e6a9b8d1f77f6b66a901de84 Mon Sep 17 00:00:00 2001 From: William Law Date: Thu, 30 Oct 2025 15:56:53 -0400 Subject: [PATCH 037/117] fix: add back bundleWithMetadata (#52) * add back bundleWithMetadata * fix integration test --- crates/bundle-pool/src/source.rs | 27 +++++++------------ crates/bundle-pool/tests/integration_tests.rs | 2 +- crates/core/src/types.rs | 2 +- crates/ingress-rpc/src/queue.rs | 10 +++---- crates/ingress-rpc/src/service.rs | 4 +-- 5 files changed, 19 insertions(+), 26 deletions(-) diff --git a/crates/bundle-pool/src/source.rs b/crates/bundle-pool/src/source.rs index aa0f1e5..db6df07 100644 --- a/crates/bundle-pool/src/source.rs +++ b/crates/bundle-pool/src/source.rs @@ -3,7 +3,7 @@ use async_trait::async_trait; use rdkafka::consumer::{Consumer, StreamConsumer}; use rdkafka::{ClientConfig, Message}; use std::fmt::Debug; -use tips_core::{Bundle, BundleWithMetadata}; +use tips_core::BundleWithMetadata; use tokio::sync::mpsc; use tracing::{error, trace}; @@ -52,29 +52,22 @@ impl BundleSource for KafkaBundleSource { } }; - let bundle: Bundle = match serde_json::from_slice(payload) { - Ok(b) => b, - Err(e) => { - error!(error = %e, "Failed to deserialize bundle"); - continue; - } - }; + let bundle_with_metadata: BundleWithMetadata = + match serde_json::from_slice(payload) { + Ok(b) => b, + Err(e) => { + error!(error = %e, "Failed to deserialize bundle"); + continue; + } + }; trace!( - bundle = ?bundle, + bundle = ?bundle_with_metadata, offset = message.offset(), partition = message.partition(), "Received bundle from Kafka" ); - let bundle_with_metadata = match BundleWithMetadata::load(bundle) { - Ok(b) => b, - Err(e) => { - error!(error = %e, "Failed to load bundle"); - continue; - } - }; - if let Err(e) = self.publisher.send(bundle_with_metadata) { error!(error = ?e, "Failed to publish bundle to queue"); } diff --git a/crates/bundle-pool/tests/integration_tests.rs b/crates/bundle-pool/tests/integration_tests.rs index 3386612..2765e62 100644 --- a/crates/bundle-pool/tests/integration_tests.rs +++ b/crates/bundle-pool/tests/integration_tests.rs @@ -65,7 +65,7 @@ async fn test_kafka_bundle_source_to_pool_integration() -> Result<(), Box Result<()>; + async fn publish(&self, bundle: &BundleWithMetadata, bundle_hash: &B256) -> Result<()>; } /// A queue to buffer transactions @@ -27,7 +27,7 @@ impl KafkaQueuePublisher { #[async_trait] impl QueuePublisher for KafkaQueuePublisher { - async fn publish(&self, bundle: &Bundle, bundle_hash: &B256) -> Result<()> { + async fn publish(&self, bundle: &BundleWithMetadata, bundle_hash: &B256) -> Result<()> { let key = bundle_hash.to_string(); let payload = serde_json::to_vec(&bundle)?; @@ -75,7 +75,7 @@ impl QueuePublisher for KafkaQueuePublisher { mod tests { use super::*; use rdkafka::config::ClientConfig; - use tips_core::BundleWithMetadata; + use tips_core::{Bundle, BundleWithMetadata}; use tokio::time::{Duration, Instant}; fn create_test_bundle() -> Bundle { @@ -97,7 +97,7 @@ mod tests { let bundle_hash = bundle_with_metadata.bundle_hash(); let start = Instant::now(); - let result = publisher.publish(&bundle, &bundle_hash).await; + let result = publisher.publish(&bundle_with_metadata, &bundle_hash).await; let elapsed = start.elapsed(); // the backoff tries at minimum 100ms, so verify we tried at least once diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 811788a..3ea0408 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -70,7 +70,7 @@ where let bundle_hash = bundle_with_metadata.bundle_hash(); if let Err(e) = self .bundle_queue - .publish(bundle_with_metadata.bundle(), &bundle_hash) + .publish(&bundle_with_metadata, &bundle_hash) .await { warn!(message = "Failed to publish bundle to queue", bundle_hash = %bundle_hash, error = %e); @@ -124,7 +124,7 @@ where if let Err(e) = self .bundle_queue - .publish(bundle_with_metadata.bundle(), &bundle_hash) + .publish(&bundle_with_metadata, &bundle_hash) .await { warn!(message = "Failed to publish Queue::enqueue_bundle", bundle_hash = %bundle_hash, error = %e); From 857899ba89d93e33a74c2bfd5e50b4888d5e1e77 Mon Sep 17 00:00:00 2001 From: William Law Date: Thu, 30 Oct 2025 17:22:19 -0400 Subject: [PATCH 038/117] feat: simulate bundles in ingress-rpc (#46) * spike * use tips-core * comments + add meterbundleres to bundlewmetadata * make meter_response not optional * make it a fn not default --- crates/core/src/lib.rs | 4 ++- crates/core/src/test_utils.rs | 23 +++++++++++++--- crates/core/src/types.rs | 42 +++++++++++++++++++---------- crates/ingress-rpc/src/queue.rs | 5 ++-- crates/ingress-rpc/src/service.rs | 45 ++++++++++++++++++++++++------- 5 files changed, 89 insertions(+), 30 deletions(-) diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index 0b01900..5b7906c 100644 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -5,4 +5,6 @@ pub mod types; #[cfg(any(test, feature = "test-utils"))] pub mod test_utils; -pub use types::{Bundle, BundleHash, BundleWithMetadata, CancelBundle}; +pub use types::{ + BLOCK_TIME, Bundle, BundleHash, BundleWithMetadata, CancelBundle, MeterBundleResponse, +}; diff --git a/crates/core/src/test_utils.rs b/crates/core/src/test_utils.rs index a576354..cb2c5ee 100644 --- a/crates/core/src/test_utils.rs +++ b/crates/core/src/test_utils.rs @@ -1,6 +1,6 @@ -use crate::{Bundle, BundleWithMetadata}; +use crate::{Bundle, BundleWithMetadata, MeterBundleResponse}; use alloy_consensus::SignableTransaction; -use alloy_primitives::{Address, U256}; +use alloy_primitives::{Address, B256, U256}; use alloy_provider::network::TxSignerSync; use alloy_provider::network::eip2718::Encodable2718; use alloy_signer_local::PrivateKeySigner; @@ -38,6 +38,23 @@ pub fn create_test_bundle( max_timestamp, ..Default::default() }; + let meter_bundle_response = create_test_meter_bundle_response(); - BundleWithMetadata::load(bundle).unwrap() + BundleWithMetadata::load(bundle, meter_bundle_response).unwrap() +} + +pub fn create_test_meter_bundle_response() -> MeterBundleResponse { + MeterBundleResponse { + bundle_gas_price: "0".to_string(), + bundle_hash: B256::default(), + coinbase_diff: "0".to_string(), + eth_sent_to_coinbase: "0".to_string(), + gas_fees: "0".to_string(), + results: vec![], + state_block_number: 0, + state_flashblock_index: None, + total_gas_used: 0, + total_execution_time_us: 0, + state_root_time_us: 0, + } } diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index f79a5ab..97ca168 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -7,6 +7,9 @@ use op_alloy_flz::tx_estimated_size_fjord_bytes; use serde::{Deserialize, Serialize}; use uuid::Uuid; +/// Block time in microseconds +pub const BLOCK_TIME: u128 = 2_000_000; + #[derive(Default, Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] #[serde(rename_all = "camelCase")] pub struct Bundle { @@ -70,10 +73,14 @@ pub struct BundleWithMetadata { bundle: Bundle, uuid: Uuid, transactions: Vec, + meter_bundle_response: MeterBundleResponse, } impl BundleWithMetadata { - pub fn load(mut bundle: Bundle) -> Result { + pub fn load( + mut bundle: Bundle, + meter_bundle_response: MeterBundleResponse, + ) -> Result { let uuid = bundle .replacement_uuid .clone() @@ -96,6 +103,7 @@ impl BundleWithMetadata { bundle, transactions, uuid, + meter_bundle_response, }) } @@ -181,7 +189,7 @@ pub struct MeterBundleResponse { #[cfg(test)] mod tests { use super::*; - use crate::test_utils::create_transaction; + use crate::test_utils::{create_test_meter_bundle_response, create_transaction}; use alloy_primitives::Keccak256; use alloy_provider::network::eip2718::Encodable2718; use alloy_signer_local::PrivateKeySigner; @@ -197,12 +205,15 @@ mod tests { let tx1_bytes = tx1.encoded_2718(); let tx2_bytes = tx2.encoded_2718(); - let bundle = BundleWithMetadata::load(Bundle { - replacement_uuid: None, - txs: vec![tx1_bytes.clone().into()], - block_number: 1, - ..Default::default() - }) + let bundle = BundleWithMetadata::load( + Bundle { + replacement_uuid: None, + txs: vec![tx1_bytes.clone().into()], + block_number: 1, + ..Default::default() + }, + create_test_meter_bundle_response(), + ) .unwrap(); assert!(!bundle.uuid().is_nil()); @@ -225,12 +236,15 @@ mod tests { assert_eq!(bundle.bundle_hash(), expected_bundle_hash_single); let uuid = Uuid::new_v4(); - let bundle = BundleWithMetadata::load(Bundle { - replacement_uuid: Some(uuid.to_string()), - txs: vec![tx1_bytes.clone().into(), tx2_bytes.clone().into()], - block_number: 1, - ..Default::default() - }) + let bundle = BundleWithMetadata::load( + Bundle { + replacement_uuid: Some(uuid.to_string()), + txs: vec![tx1_bytes.clone().into(), tx2_bytes.clone().into()], + block_number: 1, + ..Default::default() + }, + create_test_meter_bundle_response(), + ) .unwrap(); assert_eq!(*bundle.uuid(), uuid); diff --git a/crates/ingress-rpc/src/queue.rs b/crates/ingress-rpc/src/queue.rs index 28a7093..0f60520 100644 --- a/crates/ingress-rpc/src/queue.rs +++ b/crates/ingress-rpc/src/queue.rs @@ -75,7 +75,7 @@ impl QueuePublisher for KafkaQueuePublisher { mod tests { use super::*; use rdkafka::config::ClientConfig; - use tips_core::{Bundle, BundleWithMetadata}; + use tips_core::{Bundle, BundleWithMetadata, test_utils::create_test_meter_bundle_response}; use tokio::time::{Duration, Instant}; fn create_test_bundle() -> Bundle { @@ -93,7 +93,8 @@ mod tests { let publisher = KafkaQueuePublisher::new(producer, "tips-ingress-rpc".to_string()); let bundle = create_test_bundle(); - let bundle_with_metadata = BundleWithMetadata::load(bundle.clone()).unwrap(); + let bundle_with_metadata = + BundleWithMetadata::load(bundle.clone(), create_test_meter_bundle_response()).unwrap(); let bundle_hash = bundle_with_metadata.bundle_hash(); let start = Instant::now(); diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 3ea0408..db38b86 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -11,7 +11,9 @@ use op_alloy_network::Optimism; use reth_rpc_eth_types::EthApiError; use std::time::{SystemTime, UNIX_EPOCH}; use tips_audit::{BundleEvent, BundleEventPublisher}; -use tips_core::{Bundle, BundleHash, BundleWithMetadata, CancelBundle}; +use tips_core::{ + BLOCK_TIME, Bundle, BundleHash, BundleWithMetadata, CancelBundle, MeterBundleResponse, +}; use tracing::{info, warn}; use crate::queue::QueuePublisher; @@ -65,7 +67,10 @@ where Audit: BundleEventPublisher + Sync + Send + 'static, { async fn send_bundle(&self, bundle: Bundle) -> RpcResult { - let bundle_with_metadata = self.validate_bundle(bundle).await?; + self.validate_bundle(&bundle).await?; + let meter_bundle_response = self.meter_bundle(&bundle).await?; + let bundle_with_metadata = BundleWithMetadata::load(bundle, meter_bundle_response) + .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; let bundle_hash = bundle_with_metadata.bundle_hash(); if let Err(e) = self @@ -117,8 +122,9 @@ where reverting_tx_hashes: vec![transaction.tx_hash()], ..Default::default() }; + let meter_bundle_response = self.meter_bundle(&bundle).await?; - let bundle_with_metadata = BundleWithMetadata::load(bundle) + let bundle_with_metadata = BundleWithMetadata::load(bundle, meter_bundle_response) .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; let bundle_hash = bundle_with_metadata.bundle_hash(); @@ -191,7 +197,7 @@ where Ok(transaction) } - async fn validate_bundle(&self, bundle: Bundle) -> RpcResult { + async fn validate_bundle(&self, bundle: &Bundle) -> RpcResult<()> { if bundle.txs.is_empty() { return Err( EthApiError::InvalidParams("Bundle cannot have empty transactions".into()) @@ -199,17 +205,36 @@ where ); } - let bundle_with_metadata = BundleWithMetadata::load(bundle.clone()) - .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; - let tx_hashes = bundle_with_metadata.txn_hashes(); - let mut total_gas = 0u64; + let mut tx_hashes = Vec::new(); for tx_data in &bundle.txs { let transaction = self.validate_tx(tx_data).await?; total_gas = total_gas.saturating_add(transaction.gas_limit()); + tx_hashes.push(transaction.tx_hash()); } - validate_bundle(&bundle, total_gas, tx_hashes)?; + validate_bundle(bundle, total_gas, tx_hashes)?; - Ok(bundle_with_metadata) + Ok(()) + } + + /// `meter_bundle` is used to determine how long a bundle will take to execute. A bundle that + /// is within `BLOCK_TIME` will return the `MeterBundleResponse` that can be passed along + /// to the builder. + async fn meter_bundle(&self, bundle: &Bundle) -> RpcResult { + let res: MeterBundleResponse = self + .provider + .client() + .request("base_meterBundle", (bundle,)) + .await + .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; + + // we can save some builder payload building computation by not including bundles + // that we know will take longer than the block time to execute + if res.total_execution_time_us > BLOCK_TIME { + return Err( + EthApiError::InvalidParams("Bundle simulation took too long".into()).into_rpc_err(), + ); + } + Ok(res) } } From 44e6bef8d655eea005245f53ad47ec02450f72b0 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Tue, 4 Nov 2025 14:20:40 -0600 Subject: [PATCH 039/117] chore: updates to get local devnet working (#55) * builder setup * update helper * misc fixes * fix tests --- .env.example | 1 + crates/bundle-pool/src/lib.rs | 2 +- crates/bundle-pool/src/pool.rs | 88 +++++++++++++++++++++++---- crates/core/src/test_utils.rs | 1 - crates/core/src/types.rs | 3 - crates/ingress-rpc/src/bin/main.rs | 13 +++- crates/ingress-rpc/src/service.rs | 5 +- justfile | 9 ++- ui/src/app/api/bundle/[uuid]/route.ts | 5 ++ ui/src/lib/s3.ts | 6 +- 10 files changed, 108 insertions(+), 25 deletions(-) diff --git a/.env.example b/.env.example index 69b1a01..a171ead 100644 --- a/.env.example +++ b/.env.example @@ -9,6 +9,7 @@ TIPS_INGRESS_KAFKA_AUDIT_PROPERTIES_FILE=/app/docker/ingress-audit-kafka-propert TIPS_INGRESS_KAFKA_AUDIT_TOPIC=tips-audit TIPS_INGRESS_LOG_LEVEL=info TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS=10800 +TIPS_INGRESS_RPC_SIMULATION=http://localhost:8549 # Audit service configuration TIPS_AUDIT_KAFKA_PROPERTIES_FILE=/app/docker/audit-kafka-properties diff --git a/crates/bundle-pool/src/lib.rs b/crates/bundle-pool/src/lib.rs index 0d775be..6aeb248 100644 --- a/crates/bundle-pool/src/lib.rs +++ b/crates/bundle-pool/src/lib.rs @@ -6,7 +6,7 @@ use std::sync::{Arc, Mutex}; use tokio::sync::mpsc; use tracing::error; -pub use pool::{BundleStore, InMemoryBundlePool}; +pub use pool::{Action, BundleStore, InMemoryBundlePool, ProcessedBundle}; pub use source::KafkaBundleSource; pub use tips_core::{Bundle, BundleHash, BundleWithMetadata, CancelBundle}; diff --git a/crates/bundle-pool/src/pool.rs b/crates/bundle-pool/src/pool.rs index f7682bb..fe972e4 100644 --- a/crates/bundle-pool/src/pool.rs +++ b/crates/bundle-pool/src/pool.rs @@ -1,4 +1,7 @@ +use alloy_primitives::TxHash; use alloy_primitives::map::HashMap; +use std::fmt::Debug; +use std::sync::{Arc, Mutex}; use tips_audit::{BundleEvent, DropReason}; use tips_core::BundleWithMetadata; use tokio::sync::mpsc; @@ -8,6 +11,7 @@ use uuid::Uuid; #[derive(Debug, Clone)] pub enum Action { Included, + Skipped, Dropped, } @@ -17,6 +21,15 @@ pub struct ProcessedBundle { pub action: Action, } +impl ProcessedBundle { + pub fn new(bundle_uuid: Uuid, action: Action) -> Self { + Self { + bundle_uuid, + action, + } + } +} + pub trait BundleStore { fn add_bundle(&mut self, bundle: BundleWithMetadata); fn get_bundles(&self) -> Vec; @@ -26,19 +39,37 @@ pub trait BundleStore { flashblock_index: u64, processed: Vec, ); + fn on_new_block(&mut self, number: u64, hash: TxHash); } -#[derive(Debug)] -pub struct InMemoryBundlePool { +struct BundleData { + flashblocks_in_block: HashMap>, bundles: HashMap, +} + +#[derive(Clone)] +pub struct InMemoryBundlePool { + inner: Arc>, audit_log: mpsc::UnboundedSender, builder_id: String, } +impl Debug for InMemoryBundlePool { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("InMemoryBundlePool") + .field("builder_id", &self.builder_id) + .field("bundle_count", &self.inner.lock().unwrap().bundles.len()) + .finish() + } +} + impl InMemoryBundlePool { pub fn new(audit_log: mpsc::UnboundedSender, builder_id: String) -> Self { InMemoryBundlePool { - bundles: Default::default(), + inner: Arc::new(Mutex::new(BundleData { + flashblocks_in_block: Default::default(), + bundles: Default::default(), + })), audit_log, builder_id, } @@ -47,11 +78,13 @@ impl InMemoryBundlePool { impl BundleStore for InMemoryBundlePool { fn add_bundle(&mut self, bundle: BundleWithMetadata) { - self.bundles.insert(*bundle.uuid(), bundle); + let mut inner = self.inner.lock().unwrap(); + inner.bundles.insert(*bundle.uuid(), bundle); } fn get_bundles(&self) -> Vec { - self.bundles.values().cloned().collect() + let inner = self.inner.lock().unwrap(); + inner.bundles.values().cloned().collect() } fn built_flashblock( @@ -60,28 +93,59 @@ impl BundleStore for InMemoryBundlePool { flashblock_index: u64, processed: Vec, ) { + let mut inner = self.inner.lock().unwrap(); + for p in &processed { let event = match p.action { - Action::Included => BundleEvent::BuilderIncluded { + Action::Included => Some(BundleEvent::BuilderIncluded { bundle_id: p.bundle_uuid, builder: self.builder_id.clone(), block_number, flashblock_index, - }, - Action::Dropped => BundleEvent::Dropped { + }), + Action::Dropped => Some(BundleEvent::Dropped { bundle_id: p.bundle_uuid, reason: DropReason::Reverted, - }, + }), + _ => None, }; - if let Err(e) = self.audit_log.send(event) { + if let Some(event) = event + && let Err(e) = self.audit_log.send(event) + { warn!(error = %e, "Failed to send event to audit log"); } } - for p in processed { - self.bundles.remove(&p.bundle_uuid); + for p in processed.iter() { + inner.bundles.remove(&p.bundle_uuid); + } + + let flashblocks_for_block = inner.flashblocks_in_block.entry(block_number).or_default(); + flashblocks_for_block.extend(processed); + } + + fn on_new_block(&mut self, number: u64, hash: TxHash) { + let mut inner = self.inner.lock().unwrap(); + + let flashblocks_for_block = inner.flashblocks_in_block.entry(number).or_default(); + for p in flashblocks_for_block.iter() { + let event = match p.action { + Action::Included => Some(BundleEvent::BlockIncluded { + bundle_id: p.bundle_uuid, + block_number: number, + block_hash: hash, + }), + _ => None, + }; + + if let Some(event) = event + && let Err(e) = self.audit_log.send(event) + { + warn!(error = %e, "Failed to send event to audit log"); + } } + inner.flashblocks_in_block.remove(&number); } } diff --git a/crates/core/src/test_utils.rs b/crates/core/src/test_utils.rs index cb2c5ee..d3f6f8d 100644 --- a/crates/core/src/test_utils.rs +++ b/crates/core/src/test_utils.rs @@ -55,6 +55,5 @@ pub fn create_test_meter_bundle_response() -> MeterBundleResponse { state_flashblock_index: None, total_gas_used: 0, total_execution_time_us: 0, - state_root_time_us: 0, } } diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index 97ca168..a38abf4 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -183,7 +183,6 @@ pub struct MeterBundleResponse { pub state_flashblock_index: Option, pub total_gas_used: u64, pub total_execution_time_us: u128, - pub state_root_time_us: u128, } #[cfg(test)] @@ -279,7 +278,6 @@ mod tests { state_flashblock_index: Some(42), total_gas_used: 21000, total_execution_time_us: 1000, - state_root_time_us: 500, }; let json = serde_json::to_string(&response).unwrap(); @@ -304,7 +302,6 @@ mod tests { state_flashblock_index: None, total_gas_used: 21000, total_execution_time_us: 1000, - state_root_time_us: 500, }; let json = serde_json::to_string(&response).unwrap(); diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 0ea590b..01f821e 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -66,6 +66,10 @@ struct Config { default_value = "10800" )] send_transaction_default_lifetime_seconds: u64, + + /// URL of the simulation RPC service for bundle metering + #[arg(long, env = "TIPS_INGRESS_RPC_SIMULATION")] + simulation_rpc: Url, } #[tokio::main] @@ -80,7 +84,8 @@ async fn main() -> anyhow::Result<()> { message = "Starting ingress service", address = %config.address, port = config.port, - mempool_url = %config.mempool_url + mempool_url = %config.mempool_url, + simulation_rpc = %config.simulation_rpc ); let provider: RootProvider = ProviderBuilder::new() @@ -88,6 +93,11 @@ async fn main() -> anyhow::Result<()> { .network::() .connect_http(config.mempool_url); + let simulation_provider: RootProvider = ProviderBuilder::new() + .disable_recommended_fillers() + .network::() + .connect_http(config.simulation_rpc); + let ingress_client_config = ClientConfig::from_iter(load_kafka_config_from_file( &config.ingress_kafka_properties, )?); @@ -105,6 +115,7 @@ async fn main() -> anyhow::Result<()> { let service = IngressService::new( provider, + simulation_provider, config.dual_write_mempool, queue, audit_publisher, diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index db38b86..fe3ce65 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -36,6 +36,7 @@ pub trait IngressApi { pub struct IngressService { provider: RootProvider, + simulation_provider: RootProvider, dual_write_mempool: bool, bundle_queue: Queue, audit_publisher: Audit, @@ -45,6 +46,7 @@ pub struct IngressService { impl IngressService { pub fn new( provider: RootProvider, + simulation_provider: RootProvider, dual_write_mempool: bool, queue: Queue, audit_publisher: Audit, @@ -52,6 +54,7 @@ impl IngressService { ) -> Self { Self { provider, + simulation_provider, dual_write_mempool, bundle_queue: queue, audit_publisher, @@ -222,7 +225,7 @@ where /// to the builder. async fn meter_bundle(&self, bundle: &Bundle) -> RpcResult { let res: MeterBundleResponse = self - .provider + .simulation_provider .client() .request("base_meterBundle", (bundle,)) .await diff --git a/justfile b/justfile index ebac294..2d4398e 100644 --- a/justfile +++ b/justfile @@ -84,17 +84,20 @@ ui: cd ui && yarn dev sequencer_url := "http://localhost:8547" +validator_url := "http://localhost:8549" builder_url := "http://localhost:2222" ingress_url := "http://localhost:8080" get-blocks: echo "Sequencer" cast bn -r {{ sequencer_url }} + echo "Validator" + cast bn -r {{ validator_url }} echo "Builder" cast bn -r {{ builder_url }} -sender := "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266" -sender_key := "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" +sender := "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" +sender_key := "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d" send-txn: #!/usr/bin/env bash @@ -104,4 +107,4 @@ send-txn: txn=$(cast mktx --private-key {{ sender_key }} 0x0000000000000000000000000000000000000000 --value 0.01ether --nonce $nonce --chain-id 13 -r {{ builder_url }}) hash=$(curl -s {{ ingress_url }} -X POST -H "Content-Type: application/json" --data "{\"method\":\"eth_sendRawTransaction\",\"params\":[\"$txn\"],\"id\":1,\"jsonrpc\":\"2.0\"}" | jq -r ".result") cast receipt $hash -r {{ sequencer_url }} | grep status - cast receipt $hash -r {{ builder_url }} | grep status \ No newline at end of file + cast receipt $hash -r {{ builder_url }} | grep status diff --git a/ui/src/app/api/bundle/[uuid]/route.ts b/ui/src/app/api/bundle/[uuid]/route.ts index 999dec3..6be37d6 100644 --- a/ui/src/app/api/bundle/[uuid]/route.ts +++ b/ui/src/app/api/bundle/[uuid]/route.ts @@ -18,6 +18,11 @@ export async function GET( return NextResponse.json({ error: "Bundle not found" }, { status: 404 }); } + const history = bundle.history; + history.sort((lhs, rhs) => + lhs.data.timestamp < rhs.data.timestamp ? -1 : 1, + ); + const response: BundleHistoryResponse = { uuid, history: bundle.history, diff --git a/ui/src/lib/s3.ts b/ui/src/lib/s3.ts index 69a413e..10a7b13 100644 --- a/ui/src/lib/s3.ts +++ b/ui/src/lib/s3.ts @@ -88,12 +88,12 @@ export async function getTransactionMetadataByHash( export interface BundleEvent { event: string; - data?: { + data: { + key: string; + timestamp: number; bundle?: { revertingTxHashes: Array; }; - key: string; - timestamp: number; }; } From 2ff559556c5acf98a56c207c9be881552874a246 Mon Sep 17 00:00:00 2001 From: William Law Date: Wed, 5 Nov 2025 12:21:52 -0500 Subject: [PATCH 040/117] refactor: add bundle helpers (#54) * spike * spike from * remove transactions * fix test * bundle params * fmt * txs helper * err type * spike new types * better err handling * reduce diff * more diff reduce * comments and diff * reduce clones * naming * fmt * fmt + parsed + change fn to new * accept bundle is err free * fix * no redudant closure --- Cargo.toml | 2 +- crates/audit/Cargo.toml | 2 +- crates/audit/src/storage.rs | 27 +- crates/audit/src/types.rs | 27 +- crates/audit/tests/integration_tests.rs | 6 +- crates/audit/tests/s3_test.rs | 42 +-- crates/bundle-pool/src/lib.rs | 4 +- crates/bundle-pool/src/pool.rs | 12 +- crates/bundle-pool/src/source.rs | 25 +- crates/bundle-pool/tests/integration_tests.rs | 4 +- crates/core/Cargo.toml | 2 +- crates/core/src/lib.rs | 3 +- crates/core/src/test_utils.rs | 28 +- crates/core/src/types.rs | 250 +++++++++++++----- crates/ingress-rpc/src/queue.rs | 20 +- crates/ingress-rpc/src/service.rs | 41 +-- 16 files changed, 310 insertions(+), 185 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d2029ef..040cf38 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ alloy-serde = "1.0.41" # op-alloy op-alloy-network = { version = "0.20.0", default-features = false } -op-alloy-consensus = { version = "0.20.0", features = ["k256"] } +op-alloy-consensus = { version = "0.20.0", features = ["k256", "serde"] } op-alloy-rpc-types = { version = "0.20.0", default-features = true} op-alloy-flz = { version = "0.13.1" } diff --git a/crates/audit/Cargo.toml b/crates/audit/Cargo.toml index 5fd0ef2..25cf7e3 100644 --- a/crates/audit/Cargo.toml +++ b/crates/audit/Cargo.toml @@ -12,7 +12,7 @@ name = "tips-audit" path = "src/bin/main.rs" [dependencies] -tips-core = { workspace = true } +tips-core = { workspace = true, features = ["test-utils"] } tokio = { workspace = true } tracing = { workspace = true } tracing-subscriber = { workspace = true } diff --git a/crates/audit/src/storage.rs b/crates/audit/src/storage.rs index 59d9ae0..c8b619f 100644 --- a/crates/audit/src/storage.rs +++ b/crates/audit/src/storage.rs @@ -10,7 +10,7 @@ use aws_sdk_s3::primitives::ByteStream; use serde::{Deserialize, Serialize}; use std::fmt; use std::fmt::Debug; -use tips_core::Bundle; +use tips_core::AcceptedBundle; use tracing::info; #[derive(Debug)] @@ -39,7 +39,7 @@ pub enum BundleHistoryEvent { Received { key: String, timestamp: i64, - bundle: Bundle, + bundle: Box, }, Cancelled { key: String, @@ -365,13 +365,9 @@ mod tests { use crate::reader::Event; use crate::types::{BundleEvent, DropReason}; use alloy_primitives::TxHash; - use tips_core::Bundle; + use tips_core::test_utils::create_bundle_from_txn_data; use uuid::Uuid; - fn create_test_bundle() -> Bundle { - Bundle::default() - } - fn create_test_event(key: &str, timestamp: i64, bundle_event: BundleEvent) -> Event { Event { key: key.to_string(), @@ -383,11 +379,11 @@ mod tests { #[test] fn test_update_bundle_history_transform_adds_new_event() { let bundle_history = BundleHistory { history: vec![] }; - let bundle = create_test_bundle(); + let bundle = create_bundle_from_txn_data(); let bundle_id = Uuid::new_v4(); let bundle_event = BundleEvent::Received { bundle_id, - bundle: bundle.clone(), + bundle: Box::new(bundle.clone()), }; let event = create_test_event("test-key", 1234567890, bundle_event); @@ -416,15 +412,18 @@ mod tests { let existing_event = BundleHistoryEvent::Received { key: "duplicate-key".to_string(), timestamp: 1111111111, - bundle: create_test_bundle(), + bundle: Box::new(create_bundle_from_txn_data()), }; let bundle_history = BundleHistory { history: vec![existing_event], }; - let bundle = create_test_bundle(); + let bundle = create_bundle_from_txn_data(); let bundle_id = Uuid::new_v4(); - let bundle_event = BundleEvent::Received { bundle_id, bundle }; + let bundle_event = BundleEvent::Received { + bundle_id, + bundle: Box::new(bundle), + }; let event = create_test_event("duplicate-key", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history, &event); @@ -437,10 +436,10 @@ mod tests { let bundle_history = BundleHistory { history: vec![] }; let bundle_id = Uuid::new_v4(); - let bundle = create_test_bundle(); + let bundle = create_bundle_from_txn_data(); let bundle_event = BundleEvent::Received { bundle_id, - bundle: bundle.clone(), + bundle: Box::new(bundle), }; let event = create_test_event("test-key", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history.clone(), &event); diff --git a/crates/audit/src/types.rs b/crates/audit/src/types.rs index 4208b3b..6b0d7d1 100644 --- a/crates/audit/src/types.rs +++ b/crates/audit/src/types.rs @@ -1,10 +1,8 @@ use alloy_consensus::transaction::{SignerRecoverable, Transaction as ConsensusTransaction}; use alloy_primitives::{Address, TxHash, U256}; -use alloy_provider::network::eip2718::Decodable2718; use bytes::Bytes; -use op_alloy_consensus::OpTxEnvelope; use serde::{Deserialize, Serialize}; -use tips_core::Bundle; +use tips_core::AcceptedBundle; use uuid::Uuid; #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] @@ -33,7 +31,7 @@ pub struct Transaction { pub enum BundleEvent { Received { bundle_id: BundleId, - bundle: Bundle, + bundle: Box, }, Cancelled { bundle_id: BundleId, @@ -72,19 +70,14 @@ impl BundleEvent { bundle .txs .iter() - .filter_map(|tx_bytes| { - match OpTxEnvelope::decode_2718_exact(tx_bytes.iter().as_slice()) { - Ok(envelope) => { - match envelope.recover_signer() { - Ok(sender) => Some(TransactionId { - sender, - nonce: U256::from(envelope.nonce()), - hash: *envelope.hash(), - }), - Err(_) => None, // Skip invalid transactions - } - } - Err(_) => None, // Skip malformed transactions + .filter_map(|envelope| { + match envelope.recover_signer() { + Ok(sender) => Some(TransactionId { + sender, + nonce: U256::from(envelope.nonce()), + hash: *envelope.hash(), + }), + Err(_) => None, // Skip invalid transactions } }) .collect() diff --git a/crates/audit/tests/integration_tests.rs b/crates/audit/tests/integration_tests.rs index d2bb0fe..bb79d24 100644 --- a/crates/audit/tests/integration_tests.rs +++ b/crates/audit/tests/integration_tests.rs @@ -5,7 +5,7 @@ use tips_audit::{ storage::{BundleEventS3Reader, S3EventReaderWriter}, types::{BundleEvent, DropReason}, }; -use tips_core::Bundle; +use tips_core::test_utils::create_bundle_from_txn_data; use uuid::Uuid; mod common; use common::TestHarness; @@ -20,10 +20,10 @@ async fn test_kafka_publisher_s3_archiver_integration() S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); let test_bundle_id = Uuid::new_v4(); - let test_events = vec![ + let test_events = [ BundleEvent::Received { bundle_id: test_bundle_id, - bundle: Bundle::default(), + bundle: Box::new(create_bundle_from_txn_data()), }, BundleEvent::Dropped { bundle_id: test_bundle_id, diff --git a/crates/audit/tests/s3_test.rs b/crates/audit/tests/s3_test.rs index 55c8f87..53b1a72 100644 --- a/crates/audit/tests/s3_test.rs +++ b/crates/audit/tests/s3_test.rs @@ -1,30 +1,16 @@ -use alloy_primitives::{Bytes, TxHash, b256, bytes}; +use alloy_primitives::TxHash; use std::sync::Arc; use tips_audit::{ reader::Event, storage::{BundleEventS3Reader, EventWriter, S3EventReaderWriter}, types::BundleEvent, }; -use tips_core::Bundle; use tokio::task::JoinSet; use uuid::Uuid; mod common; use common::TestHarness; - -// https://basescan.org/tx/0x4f7ddfc911f5cf85dd15a413f4cbb2a0abe4f1ff275ed13581958c0bcf043c5e -const TXN_DATA: Bytes = bytes!( - "0x02f88f8221058304b6b3018315fb3883124f80948ff2f0a8d017c79454aa28509a19ab9753c2dd1480a476d58e1a0182426068c9ea5b00000000000000000002f84f00000000083e4fda54950000c080a086fbc7bbee41f441fb0f32f7aa274d2188c460fe6ac95095fa6331fa08ec4ce7a01aee3bcc3c28f7ba4e0c24da9ae85e9e0166c73cabb42c25ff7b5ecd424f3105" -); -const TXN_HASH: TxHash = - b256!("0x4f7ddfc911f5cf85dd15a413f4cbb2a0abe4f1ff275ed13581958c0bcf043c5e"); - -fn create_test_bundle() -> Bundle { - Bundle { - txs: vec![TXN_DATA.clone()], - ..Default::default() - } -} +use tips_core::test_utils::{TXN_HASH, create_bundle_from_txn_data}; fn create_test_event(key: &str, timestamp: i64, bundle_event: BundleEvent) -> Event { Event { @@ -40,13 +26,13 @@ async fn test_event_write_and_read() -> Result<(), Box Result<(), Box Result<(), Box Result<(), Box Result<(), Box Result<(), Box( sources: Vec, - bundle_rx: mpsc::UnboundedReceiver, + bundle_rx: mpsc::UnboundedReceiver, pool: Arc>, ) where S: BundleSource + Send + 'static, diff --git a/crates/bundle-pool/src/pool.rs b/crates/bundle-pool/src/pool.rs index fe972e4..4a529c9 100644 --- a/crates/bundle-pool/src/pool.rs +++ b/crates/bundle-pool/src/pool.rs @@ -3,7 +3,7 @@ use alloy_primitives::map::HashMap; use std::fmt::Debug; use std::sync::{Arc, Mutex}; use tips_audit::{BundleEvent, DropReason}; -use tips_core::BundleWithMetadata; +use tips_core::AcceptedBundle; use tokio::sync::mpsc; use tracing::warn; use uuid::Uuid; @@ -31,8 +31,8 @@ impl ProcessedBundle { } pub trait BundleStore { - fn add_bundle(&mut self, bundle: BundleWithMetadata); - fn get_bundles(&self) -> Vec; + fn add_bundle(&mut self, bundle: AcceptedBundle); + fn get_bundles(&self) -> Vec; fn built_flashblock( &mut self, block_number: u64, @@ -44,7 +44,7 @@ pub trait BundleStore { struct BundleData { flashblocks_in_block: HashMap>, - bundles: HashMap, + bundles: HashMap, } #[derive(Clone)] @@ -77,12 +77,12 @@ impl InMemoryBundlePool { } impl BundleStore for InMemoryBundlePool { - fn add_bundle(&mut self, bundle: BundleWithMetadata) { + fn add_bundle(&mut self, bundle: AcceptedBundle) { let mut inner = self.inner.lock().unwrap(); inner.bundles.insert(*bundle.uuid(), bundle); } - fn get_bundles(&self) -> Vec { + fn get_bundles(&self) -> Vec { let inner = self.inner.lock().unwrap(); inner.bundles.values().cloned().collect() } diff --git a/crates/bundle-pool/src/source.rs b/crates/bundle-pool/src/source.rs index db6df07..e81bcbb 100644 --- a/crates/bundle-pool/src/source.rs +++ b/crates/bundle-pool/src/source.rs @@ -3,7 +3,7 @@ use async_trait::async_trait; use rdkafka::consumer::{Consumer, StreamConsumer}; use rdkafka::{ClientConfig, Message}; use std::fmt::Debug; -use tips_core::BundleWithMetadata; +use tips_core::AcceptedBundle; use tokio::sync::mpsc; use tracing::{error, trace}; @@ -14,7 +14,7 @@ pub trait BundleSource { pub struct KafkaBundleSource { queue_consumer: StreamConsumer, - publisher: mpsc::UnboundedSender, + publisher: mpsc::UnboundedSender, } impl Debug for KafkaBundleSource { @@ -27,7 +27,7 @@ impl KafkaBundleSource { pub fn new( client_config: ClientConfig, topic: String, - publisher: mpsc::UnboundedSender, + publisher: mpsc::UnboundedSender, ) -> Result { let queue_consumer: StreamConsumer = client_config.create()?; queue_consumer.subscribe(&[topic.as_str()])?; @@ -52,23 +52,22 @@ impl BundleSource for KafkaBundleSource { } }; - let bundle_with_metadata: BundleWithMetadata = - match serde_json::from_slice(payload) { - Ok(b) => b, - Err(e) => { - error!(error = %e, "Failed to deserialize bundle"); - continue; - } - }; + let accepted_bundle: AcceptedBundle = match serde_json::from_slice(payload) { + Ok(b) => b, + Err(e) => { + error!(error = %e, "Failed to deserialize bundle"); + continue; + } + }; trace!( - bundle = ?bundle_with_metadata, + bundle = ?accepted_bundle, offset = message.offset(), partition = message.partition(), "Received bundle from Kafka" ); - if let Err(e) = self.publisher.send(bundle_with_metadata) { + if let Err(e) = self.publisher.send(accepted_bundle) { error!(error = ?e, "Failed to publish bundle to queue"); } } diff --git a/crates/bundle-pool/tests/integration_tests.rs b/crates/bundle-pool/tests/integration_tests.rs index 2765e62..b622e31 100644 --- a/crates/bundle-pool/tests/integration_tests.rs +++ b/crates/bundle-pool/tests/integration_tests.rs @@ -11,7 +11,7 @@ use tips_bundle_pool::{ BundleStore, InMemoryBundlePool, KafkaBundleSource, connect_sources_to_pool, }; use tips_core::{ - BundleWithMetadata, + AcceptedBundle, test_utils::{create_test_bundle, create_transaction}, }; use tokio::sync::mpsc; @@ -47,7 +47,7 @@ async fn test_kafka_bundle_source_to_pool_integration() -> Result<(), Box(); + let (bundle_tx, bundle_rx) = mpsc::unbounded_channel::(); let kafka_source = KafkaBundleSource::new(kafka_consumer_config, topic.to_string(), bundle_tx)?; diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 3219ef6..ecc135a 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -16,13 +16,13 @@ alloy-primitives.workspace = true alloy-consensus.workspace = true alloy-provider.workspace = true op-alloy-consensus.workspace = true -serde = { version = "1.0.228", default-features = false, features = ["alloc", "derive"] } alloy-serde = { version = "1.0.41", default-features = false } alloy-signer-local = { workspace = true, optional = true } op-alloy-rpc-types = { workspace = true, optional = true } tracing.workspace = true tracing-subscriber.workspace = true op-alloy-flz.workspace = true +serde.workspace = true [dev-dependencies] alloy-signer-local.workspace = true diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index 5b7906c..c8e1515 100644 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -6,5 +6,6 @@ pub mod types; pub mod test_utils; pub use types::{ - BLOCK_TIME, Bundle, BundleHash, BundleWithMetadata, CancelBundle, MeterBundleResponse, + AcceptedBundle, BLOCK_TIME, Bundle, BundleExtensions, BundleHash, BundleTxs, CancelBundle, + MeterBundleResponse, }; diff --git a/crates/core/src/test_utils.rs b/crates/core/src/test_utils.rs index d3f6f8d..edf3b8e 100644 --- a/crates/core/src/test_utils.rs +++ b/crates/core/src/test_utils.rs @@ -1,12 +1,32 @@ -use crate::{Bundle, BundleWithMetadata, MeterBundleResponse}; +use crate::{AcceptedBundle, Bundle, MeterBundleResponse}; use alloy_consensus::SignableTransaction; -use alloy_primitives::{Address, B256, U256}; +use alloy_primitives::{Address, B256, Bytes, TxHash, U256, b256, bytes}; use alloy_provider::network::TxSignerSync; use alloy_provider::network::eip2718::Encodable2718; use alloy_signer_local::PrivateKeySigner; use op_alloy_consensus::OpTxEnvelope; use op_alloy_rpc_types::OpTransactionRequest; +// https://basescan.org/tx/0x4f7ddfc911f5cf85dd15a413f4cbb2a0abe4f1ff275ed13581958c0bcf043c5e +pub const TXN_DATA: Bytes = bytes!( + "0x02f88f8221058304b6b3018315fb3883124f80948ff2f0a8d017c79454aa28509a19ab9753c2dd1480a476d58e1a0182426068c9ea5b00000000000000000002f84f00000000083e4fda54950000c080a086fbc7bbee41f441fb0f32f7aa274d2188c460fe6ac95095fa6331fa08ec4ce7a01aee3bcc3c28f7ba4e0c24da9ae85e9e0166c73cabb42c25ff7b5ecd424f3105" +); + +pub const TXN_HASH: TxHash = + b256!("0x4f7ddfc911f5cf85dd15a413f4cbb2a0abe4f1ff275ed13581958c0bcf043c5e"); + +pub fn create_bundle_from_txn_data() -> AcceptedBundle { + AcceptedBundle::new( + Bundle { + txs: vec![TXN_DATA.clone()], + ..Default::default() + } + .try_into() + .unwrap(), + create_test_meter_bundle_response(), + ) +} + pub fn create_transaction(from: PrivateKeySigner, nonce: u64, to: Address) -> OpTxEnvelope { let mut txn = OpTransactionRequest::default() .value(U256::from(10_000)) @@ -28,7 +48,7 @@ pub fn create_test_bundle( block_number: Option, min_timestamp: Option, max_timestamp: Option, -) -> BundleWithMetadata { +) -> AcceptedBundle { let txs = txns.iter().map(|t| t.encoded_2718().into()).collect(); let bundle = Bundle { @@ -40,7 +60,7 @@ pub fn create_test_bundle( }; let meter_bundle_response = create_test_meter_bundle_response(); - BundleWithMetadata::load(bundle, meter_bundle_response).unwrap() + AcceptedBundle::new(bundle.try_into().unwrap(), meter_bundle_response) } pub fn create_test_meter_bundle_response() -> MeterBundleResponse { diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index a38abf4..7b3572d 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -1,4 +1,5 @@ use alloy_consensus::Transaction; +use alloy_consensus::transaction::Recovered; use alloy_consensus::transaction::SignerRecoverable; use alloy_primitives::{Address, B256, Bytes, TxHash, keccak256}; use alloy_provider::network::eip2718::{Decodable2718, Encodable2718}; @@ -10,6 +11,7 @@ use uuid::Uuid; /// Block time in microseconds pub const BLOCK_TIME: u128 = 2_000_000; +/// `Bundle` is the type that mirrors `EthSendBundle` and is used for the API. #[derive(Default, Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] #[serde(rename_all = "camelCase")] pub struct Bundle { @@ -56,6 +58,74 @@ pub struct Bundle { pub dropping_tx_hashes: Vec, } +/// `ParsedBundle` is the type that contains utility methods for the `Bundle` type. +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +pub struct ParsedBundle { + pub txs: Vec>, + pub block_number: u64, + pub flashblock_number_min: Option, + pub flashblock_number_max: Option, + pub min_timestamp: Option, + pub max_timestamp: Option, + pub reverting_tx_hashes: Vec, + pub replacement_uuid: Option, + pub dropping_tx_hashes: Vec, +} + +impl TryFrom for ParsedBundle { + type Error = String; + fn try_from(bundle: Bundle) -> Result { + let txs: Vec> = bundle + .txs + .into_iter() + .map(|tx| { + OpTxEnvelope::decode_2718_exact(tx.iter().as_slice()) + .map_err(|e| format!("Failed to decode transaction: {e:?}")) + .and_then(|tx| { + tx.try_into_recovered().map_err(|e| { + format!("Failed to convert transaction to recovered: {e:?}") + }) + }) + }) + .collect::>, String>>()?; + + let uuid = bundle + .replacement_uuid + .clone() + .unwrap_or_else(|| Uuid::new_v4().to_string()); + + let uuid = Uuid::parse_str(uuid.as_str()).map_err(|_| format!("Invalid UUID: {uuid}"))?; + + Ok(ParsedBundle { + txs, + block_number: bundle.block_number, + flashblock_number_min: bundle.flashblock_number_min, + flashblock_number_max: bundle.flashblock_number_max, + min_timestamp: bundle.min_timestamp, + max_timestamp: bundle.max_timestamp, + reverting_tx_hashes: bundle.reverting_tx_hashes, + replacement_uuid: Some(uuid), + dropping_tx_hashes: bundle.dropping_tx_hashes, + }) + } +} + +impl From for ParsedBundle { + fn from(accepted_bundle: AcceptedBundle) -> Self { + Self { + txs: accepted_bundle.txs, + block_number: accepted_bundle.block_number, + flashblock_number_min: accepted_bundle.flashblock_number_min, + flashblock_number_max: accepted_bundle.flashblock_number_max, + min_timestamp: accepted_bundle.min_timestamp, + max_timestamp: accepted_bundle.max_timestamp, + reverting_tx_hashes: accepted_bundle.reverting_tx_hashes, + replacement_uuid: accepted_bundle.replacement_uuid, + dropping_tx_hashes: accepted_bundle.dropping_tx_hashes, + } + } +} + #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct BundleHash { @@ -68,89 +138,136 @@ pub struct CancelBundle { pub replacement_uuid: String, } +/// `AcceptedBundle` is the type that is sent over the wire. #[derive(Debug, Clone, Serialize, Deserialize)] -pub struct BundleWithMetadata { - bundle: Bundle, - uuid: Uuid, - transactions: Vec, - meter_bundle_response: MeterBundleResponse, -} +pub struct AcceptedBundle { + pub uuid: Uuid, -impl BundleWithMetadata { - pub fn load( - mut bundle: Bundle, - meter_bundle_response: MeterBundleResponse, - ) -> Result { - let uuid = bundle - .replacement_uuid - .clone() - .unwrap_or_else(|| Uuid::new_v4().to_string()); + pub txs: Vec>, - let uuid = Uuid::parse_str(uuid.as_str()).map_err(|_| format!("Invalid UUID: {uuid}"))?; + #[serde(with = "alloy_serde::quantity")] + pub block_number: u64, - bundle.replacement_uuid = Some(uuid.to_string()); + #[serde( + default, + deserialize_with = "alloy_serde::quantity::opt::deserialize", + skip_serializing_if = "Option::is_none" + )] + pub flashblock_number_min: Option, - let transactions: Vec = bundle - .txs - .iter() - .map(|b| { - OpTxEnvelope::decode_2718_exact(b) - .map_err(|e| format!("failed to decode transaction: {e}")) - }) - .collect::, _>>()?; + #[serde( + default, + deserialize_with = "alloy_serde::quantity::opt::deserialize", + skip_serializing_if = "Option::is_none" + )] + pub flashblock_number_max: Option, - Ok(BundleWithMetadata { - bundle, - transactions, - uuid, - meter_bundle_response, - }) - } + #[serde( + default, + deserialize_with = "alloy_serde::quantity::opt::deserialize", + skip_serializing_if = "Option::is_none" + )] + pub min_timestamp: Option, - pub fn transactions(&self) -> &[OpTxEnvelope] { - self.transactions.as_slice() - } + #[serde( + default, + deserialize_with = "alloy_serde::quantity::opt::deserialize", + skip_serializing_if = "Option::is_none" + )] + pub max_timestamp: Option, - pub fn uuid(&self) -> &Uuid { - &self.uuid - } + #[serde(default, skip_serializing_if = "Vec::is_empty")] + pub reverting_tx_hashes: Vec, + + #[serde(default, skip_serializing_if = "Option::is_none")] + pub replacement_uuid: Option, + + #[serde(default, skip_serializing_if = "Vec::is_empty")] + pub dropping_tx_hashes: Vec, + + pub meter_bundle_response: MeterBundleResponse, +} + +pub trait BundleTxs { + fn transactions(&self) -> &Vec>; +} + +pub trait BundleExtensions { + fn bundle_hash(&self) -> B256; + fn txn_hashes(&self) -> Vec; + fn senders(&self) -> Vec
; + fn gas_limit(&self) -> u64; + fn da_size(&self) -> u64; +} - pub fn bundle_hash(&self) -> B256 { +impl BundleExtensions for T { + fn bundle_hash(&self) -> B256 { + let parsed = self.transactions(); let mut concatenated = Vec::new(); - for tx in self.transactions() { + for tx in parsed { concatenated.extend_from_slice(tx.tx_hash().as_slice()); } keccak256(&concatenated) } - pub fn txn_hashes(&self) -> Vec { + fn txn_hashes(&self) -> Vec { self.transactions().iter().map(|t| t.tx_hash()).collect() } - pub fn bundle(&self) -> &Bundle { - &self.bundle - } - - pub fn senders(&self) -> Vec
{ + fn senders(&self) -> Vec
{ self.transactions() .iter() .map(|t| t.recover_signer().unwrap()) .collect() } - pub fn gas_limit(&self) -> u64 { - self.transactions.iter().map(|t| t.gas_limit()).sum() + fn gas_limit(&self) -> u64 { + self.transactions().iter().map(|t| t.gas_limit()).sum() } - pub fn da_size(&self) -> u64 { - self.transactions + fn da_size(&self) -> u64 { + self.transactions() .iter() .map(|t| tx_estimated_size_fjord_bytes(&t.encoded_2718())) .sum() } } -#[derive(Debug, Clone, Serialize, Deserialize)] +impl BundleTxs for ParsedBundle { + fn transactions(&self) -> &Vec> { + &self.txs + } +} + +impl BundleTxs for AcceptedBundle { + fn transactions(&self) -> &Vec> { + &self.txs + } +} + +impl AcceptedBundle { + pub fn new(bundle: ParsedBundle, meter_bundle_response: MeterBundleResponse) -> Self { + AcceptedBundle { + uuid: bundle.replacement_uuid.unwrap_or_else(Uuid::new_v4), + txs: bundle.txs, + block_number: bundle.block_number, + flashblock_number_min: bundle.flashblock_number_min, + flashblock_number_max: bundle.flashblock_number_max, + min_timestamp: bundle.min_timestamp, + max_timestamp: bundle.max_timestamp, + reverting_tx_hashes: bundle.reverting_tx_hashes, + replacement_uuid: bundle.replacement_uuid, + dropping_tx_hashes: bundle.dropping_tx_hashes, + meter_bundle_response, + } + } + + pub fn uuid(&self) -> &Uuid { + &self.uuid + } +} + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] #[serde(rename_all = "camelCase")] pub struct TransactionResult { pub coinbase_diff: String, @@ -165,7 +282,7 @@ pub struct TransactionResult { pub execution_time_us: u128, } -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] #[serde(rename_all = "camelCase")] pub struct MeterBundleResponse { pub bundle_gas_price: String, @@ -204,22 +321,20 @@ mod tests { let tx1_bytes = tx1.encoded_2718(); let tx2_bytes = tx2.encoded_2718(); - let bundle = BundleWithMetadata::load( + let bundle = AcceptedBundle::new( Bundle { - replacement_uuid: None, txs: vec![tx1_bytes.clone().into()], block_number: 1, + replacement_uuid: None, ..Default::default() - }, + } + .try_into() + .unwrap(), create_test_meter_bundle_response(), - ) - .unwrap(); + ); assert!(!bundle.uuid().is_nil()); - assert_eq!( - bundle.bundle.replacement_uuid, - Some(bundle.uuid().to_string()) - ); + assert_eq!(bundle.replacement_uuid, Some(*bundle.uuid())); assert_eq!(bundle.txn_hashes().len(), 1); assert_eq!(bundle.txn_hashes()[0], tx1.tx_hash()); assert_eq!(bundle.senders().len(), 1); @@ -235,19 +350,20 @@ mod tests { assert_eq!(bundle.bundle_hash(), expected_bundle_hash_single); let uuid = Uuid::new_v4(); - let bundle = BundleWithMetadata::load( + let bundle = AcceptedBundle::new( Bundle { - replacement_uuid: Some(uuid.to_string()), txs: vec![tx1_bytes.clone().into(), tx2_bytes.clone().into()], block_number: 1, + replacement_uuid: Some(uuid.to_string()), ..Default::default() - }, + } + .try_into() + .unwrap(), create_test_meter_bundle_response(), - ) - .unwrap(); + ); assert_eq!(*bundle.uuid(), uuid); - assert_eq!(bundle.bundle.replacement_uuid, Some(uuid.to_string())); + assert_eq!(bundle.replacement_uuid, Some(uuid)); assert_eq!(bundle.txn_hashes().len(), 2); assert_eq!(bundle.txn_hashes()[0], tx1.tx_hash()); assert_eq!(bundle.txn_hashes()[1], tx2.tx_hash()); diff --git a/crates/ingress-rpc/src/queue.rs b/crates/ingress-rpc/src/queue.rs index 0f60520..a13ad4f 100644 --- a/crates/ingress-rpc/src/queue.rs +++ b/crates/ingress-rpc/src/queue.rs @@ -3,14 +3,14 @@ use anyhow::Result; use async_trait::async_trait; use backon::{ExponentialBuilder, Retryable}; use rdkafka::producer::{FutureProducer, FutureRecord}; -use tips_core::BundleWithMetadata; +use tips_core::AcceptedBundle; use tokio::time::Duration; use tracing::{error, info}; /// A queue to buffer transactions #[async_trait] pub trait QueuePublisher: Send + Sync { - async fn publish(&self, bundle: &BundleWithMetadata, bundle_hash: &B256) -> Result<()>; + async fn publish(&self, bundle: &AcceptedBundle, bundle_hash: &B256) -> Result<()>; } /// A queue to buffer transactions @@ -27,7 +27,7 @@ impl KafkaQueuePublisher { #[async_trait] impl QueuePublisher for KafkaQueuePublisher { - async fn publish(&self, bundle: &BundleWithMetadata, bundle_hash: &B256) -> Result<()> { + async fn publish(&self, bundle: &AcceptedBundle, bundle_hash: &B256) -> Result<()> { let key = bundle_hash.to_string(); let payload = serde_json::to_vec(&bundle)?; @@ -75,7 +75,9 @@ impl QueuePublisher for KafkaQueuePublisher { mod tests { use super::*; use rdkafka::config::ClientConfig; - use tips_core::{Bundle, BundleWithMetadata, test_utils::create_test_meter_bundle_response}; + use tips_core::{ + AcceptedBundle, Bundle, BundleExtensions, test_utils::create_test_meter_bundle_response, + }; use tokio::time::{Duration, Instant}; fn create_test_bundle() -> Bundle { @@ -93,12 +95,14 @@ mod tests { let publisher = KafkaQueuePublisher::new(producer, "tips-ingress-rpc".to_string()); let bundle = create_test_bundle(); - let bundle_with_metadata = - BundleWithMetadata::load(bundle.clone(), create_test_meter_bundle_response()).unwrap(); - let bundle_hash = bundle_with_metadata.bundle_hash(); + let accepted_bundle = AcceptedBundle::new( + bundle.try_into().unwrap(), + create_test_meter_bundle_response(), + ); + let bundle_hash = &accepted_bundle.bundle_hash(); let start = Instant::now(); - let result = publisher.publish(&bundle_with_metadata, &bundle_hash).await; + let result = publisher.publish(&accepted_bundle, bundle_hash).await; let elapsed = start.elapsed(); // the backoff tries at minimum 100ms, so verify we tried at least once diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index fe3ce65..233c2ad 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -11,8 +11,10 @@ use op_alloy_network::Optimism; use reth_rpc_eth_types::EthApiError; use std::time::{SystemTime, UNIX_EPOCH}; use tips_audit::{BundleEvent, BundleEventPublisher}; +use tips_core::types::ParsedBundle; use tips_core::{ - BLOCK_TIME, Bundle, BundleHash, BundleWithMetadata, CancelBundle, MeterBundleResponse, + AcceptedBundle, BLOCK_TIME, Bundle, BundleExtensions, BundleHash, CancelBundle, + MeterBundleResponse, }; use tracing::{info, warn}; @@ -72,13 +74,15 @@ where async fn send_bundle(&self, bundle: Bundle) -> RpcResult { self.validate_bundle(&bundle).await?; let meter_bundle_response = self.meter_bundle(&bundle).await?; - let bundle_with_metadata = BundleWithMetadata::load(bundle, meter_bundle_response) - .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; + let parsed_bundle: ParsedBundle = bundle + .try_into() + .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; + let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response); - let bundle_hash = bundle_with_metadata.bundle_hash(); + let bundle_hash = &accepted_bundle.bundle_hash(); if let Err(e) = self .bundle_queue - .publish(&bundle_with_metadata, &bundle_hash) + .publish(&accepted_bundle, bundle_hash) .await { warn!(message = "Failed to publish bundle to queue", bundle_hash = %bundle_hash, error = %e); @@ -88,18 +92,19 @@ where info!( message = "queued bundle", bundle_hash = %bundle_hash, - tx_count = bundle_with_metadata.transactions().len(), ); let audit_event = BundleEvent::Received { - bundle_id: *bundle_with_metadata.uuid(), - bundle: bundle_with_metadata.bundle().clone(), + bundle_id: *accepted_bundle.uuid(), + bundle: Box::new(accepted_bundle.clone()), }; if let Err(e) = self.audit_publisher.publish(audit_event).await { - warn!(message = "Failed to publish audit event", bundle_id = %bundle_with_metadata.uuid(), error = %e); + warn!(message = "Failed to publish audit event", bundle_id = %accepted_bundle.uuid(), error = %e); } - Ok(BundleHash { bundle_hash }) + Ok(BundleHash { + bundle_hash: *bundle_hash, + }) } async fn cancel_bundle(&self, _request: CancelBundle) -> RpcResult<()> { @@ -127,13 +132,15 @@ where }; let meter_bundle_response = self.meter_bundle(&bundle).await?; - let bundle_with_metadata = BundleWithMetadata::load(bundle, meter_bundle_response) - .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; - let bundle_hash = bundle_with_metadata.bundle_hash(); + let parsed_bundle: ParsedBundle = bundle + .try_into() + .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; + let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response); + let bundle_hash = &accepted_bundle.bundle_hash(); if let Err(e) = self .bundle_queue - .publish(&bundle_with_metadata, &bundle_hash) + .publish(&accepted_bundle, bundle_hash) .await { warn!(message = "Failed to publish Queue::enqueue_bundle", bundle_hash = %bundle_hash, error = %e); @@ -161,11 +168,11 @@ where } let audit_event = BundleEvent::Received { - bundle_id: *bundle_with_metadata.uuid(), - bundle: bundle_with_metadata.bundle().clone(), + bundle_id: *accepted_bundle.uuid(), + bundle: accepted_bundle.clone().into(), }; if let Err(e) = self.audit_publisher.publish(audit_event).await { - warn!(message = "Failed to publish audit event", bundle_id = %bundle_with_metadata.uuid(), error = %e); + warn!(message = "Failed to publish audit event", bundle_id = %accepted_bundle.uuid(), error = %e); } Ok(transaction.tx_hash()) From c3c087d262ad1d721522ccefa684a20eaa3b1b34 Mon Sep 17 00:00:00 2001 From: William Law Date: Wed, 5 Nov 2025 12:32:51 -0500 Subject: [PATCH 041/117] fix: don't always generate new uuid on ParsedBundle (#56) --- crates/core/src/types.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index 7b3572d..14af27f 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -91,10 +91,9 @@ impl TryFrom for ParsedBundle { let uuid = bundle .replacement_uuid - .clone() - .unwrap_or_else(|| Uuid::new_v4().to_string()); - - let uuid = Uuid::parse_str(uuid.as_str()).map_err(|_| format!("Invalid UUID: {uuid}"))?; + .map(|x| Uuid::parse_str(x.as_ref())) + .transpose() + .map_err(|e| format!("Invalid UUID: {e:?}"))?; Ok(ParsedBundle { txs, @@ -104,7 +103,7 @@ impl TryFrom for ParsedBundle { min_timestamp: bundle.min_timestamp, max_timestamp: bundle.max_timestamp, reverting_tx_hashes: bundle.reverting_tx_hashes, - replacement_uuid: Some(uuid), + replacement_uuid: uuid, dropping_tx_hashes: bundle.dropping_tx_hashes, }) } From d84ce4ed77f5569b8f945561ed13863bd56bb493 Mon Sep 17 00:00:00 2001 From: William Law Date: Wed, 5 Nov 2025 13:55:24 -0500 Subject: [PATCH 042/117] fix: types test (#57) * fix types test * allow none --- crates/core/src/types.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index 14af27f..10945f8 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -333,7 +333,7 @@ mod tests { ); assert!(!bundle.uuid().is_nil()); - assert_eq!(bundle.replacement_uuid, Some(*bundle.uuid())); + assert_eq!(bundle.replacement_uuid, None); // we're fine with bundles that don't have a replacement UUID assert_eq!(bundle.txn_hashes().len(), 1); assert_eq!(bundle.txn_hashes()[0], tx1.tx_hash()); assert_eq!(bundle.senders().len(), 1); From 98c9ab49419e62352fe29cf79873141aaa3eb956 Mon Sep 17 00:00:00 2001 From: William Law Date: Wed, 5 Nov 2025 14:06:33 -0500 Subject: [PATCH 043/117] bump reth to 1.9 (#59) --- Cargo.lock | 537 ++++++++++++++++++++++++++++------------------------- Cargo.toml | 14 +- 2 files changed, 293 insertions(+), 258 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bb461bd..2d02a77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -146,15 +146,15 @@ dependencies = [ "ethereum_ssz_derive", "serde", "serde_with", - "sha2 0.10.9", + "sha2", "thiserror", ] [[package]] name = "alloy-evm" -version = "0.21.3" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f1bfade4de9f464719b5aca30cf5bb02b9fda7036f0cf43addc3a0e66a0340c" +checksum = "428b58c17ab5f9f71765dc5f116acb6580f599ce243b8ce391de3ba859670c61" dependencies = [ "alloy-consensus", "alloy-eips", @@ -189,9 +189,9 @@ dependencies = [ [[package]] name = "alloy-hardforks" -version = "0.3.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "889eb3949b58368a09d4f16931c660275ef5fb08e5fbd4a96573b19c7085c41f" +checksum = "1e29d7eacf42f89c21d7f089916d0bdb4f36139a31698790e8837d2dbbd4b2c3" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -268,9 +268,9 @@ dependencies = [ [[package]] name = "alloy-op-evm" -version = "0.21.3" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b6679dc8854285d6c34ef6a9f9ade06dec1f5db8aab96e941d99b8abcefb72" +checksum = "eaa49899e2b0e59a5325e2042a6c5bd4c17e1255fce1e66a9312816f52e886f1" dependencies = [ "alloy-consensus", "alloy-eips", @@ -281,13 +281,14 @@ dependencies = [ "op-alloy-consensus", "op-revm", "revm", + "thiserror", ] [[package]] name = "alloy-op-hardforks" -version = "0.3.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599c1d7dfbccb66603cb93fde00980d12848d32fe5e814f50562104a92df6487" +checksum = "95ac97adaba4c26e17192d81f49186ac20c1e844e35a00e169c8d3d58bc84e6b" dependencies = [ "alloy-chains", "alloy-hardforks", @@ -1232,7 +1233,7 @@ dependencies = [ "lru 0.12.5", "percent-encoding", "regex-lite", - "sha2 0.10.9", + "sha2", "tracing", "url", ] @@ -1325,7 +1326,7 @@ dependencies = [ "p256 0.11.1", "percent-encoding", "ring", - "sha2 0.10.9", + "sha2", "subtle", "time", "tracing", @@ -1359,7 +1360,7 @@ dependencies = [ "md-5", "pin-project-lite", "sha1", - "sha2 0.10.9", + "sha2", "tracing", ] @@ -1679,15 +1680,6 @@ dependencies = [ "wyz", ] -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -2286,7 +2278,7 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "const-oid", "crypto-common", "subtle", @@ -3555,7 +3547,7 @@ dependencies = [ "elliptic-curve 0.13.8", "once_cell", "serdect", - "sha2 0.10.9", + "sha2", ] [[package]] @@ -3616,52 +3608,6 @@ dependencies = [ "redox_syscall 0.5.18", ] -[[package]] -name = "libsecp256k1" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79019718125edc905a079a70cfa5f3820bc76139fc91d6f9abc27ea2a887139" -dependencies = [ - "arrayref", - "base64 0.22.1", - "digest 0.9.0", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", - "rand 0.8.5", - "serde", - "sha2 0.9.9", -] - -[[package]] -name = "libsecp256k1-core" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" -dependencies = [ - "crunchy", - "digest 0.9.0", - "subtle", -] - -[[package]] -name = "libsecp256k1-gen-ecmult" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809" -dependencies = [ - "libsecp256k1-core", -] - -[[package]] -name = "libsecp256k1-gen-genmult" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c" -dependencies = [ - "libsecp256k1-core", -] - [[package]] name = "libz-sys" version = "1.1.22" @@ -4010,9 +3956,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "op-alloy-consensus" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a501241474c3118833d6195312ae7eb7cc90bbb0d5f524cbb0b06619e49ff67" +checksum = "e42e9de945efe3c2fbd207e69720c9c1af2b8caa6872aee0e216450c25a3ca70" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4034,9 +3980,9 @@ checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" [[package]] name = "op-alloy-network" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f80108e3b36901200a4c5df1db1ee9ef6ce685b59ea79d7be1713c845e3765da" +checksum = "9c9da49a2812a0189dd05e81e4418c3ae13fd607a92654107f02ebad8e91ed9e" dependencies = [ "alloy-consensus", "alloy-network", @@ -4050,9 +3996,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "753d6f6b03beca1ba9cbd344c05fee075a2ce715ee9d61981c10b9c764a824a2" +checksum = "9cd1eb7bddd2232856ba9d259320a094f9edf2b9061acfe5966e7960208393e6" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4069,9 +4015,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e50c94013a1d036a529df259151991dbbd6cf8dc215e3b68b784f95eec60e6" +checksum = "5429622150d18d8e6847a701135082622413e2451b64d03f979415d764566bef" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4088,21 +4034,15 @@ dependencies = [ [[package]] name = "op-revm" -version = "10.1.1" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826f43a5b1613c224f561847c152bfbaefcb593a9ae2c612ff4dc4661c6e625f" +checksum = "9e599c71e91670fb922e3cdcb04783caed1226352da19d674bd001b3bf2bc433" dependencies = [ "auto_impl", "revm", "serde", ] -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - [[package]] name = "openssl" version = "0.10.74" @@ -4171,7 +4111,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.9", + "sha2", ] [[package]] @@ -4183,7 +4123,7 @@ dependencies = [ "ecdsa 0.16.9", "elliptic-curve 0.13.8", "primeorder", - "sha2 0.10.9", + "sha2", ] [[package]] @@ -4290,8 +4230,18 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ - "phf_macros", - "phf_shared", + "phf_macros 0.11.3", + "phf_shared 0.11.3", +] + +[[package]] +name = "phf" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" +dependencies = [ + "phf_macros 0.13.1", + "phf_shared 0.13.1", "serde", ] @@ -4301,18 +4251,41 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ - "phf_shared", + "phf_shared 0.11.3", "rand 0.8.5", ] +[[package]] +name = "phf_generator" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" +dependencies = [ + "fastrand", + "phf_shared 0.13.1", +] + [[package]] name = "phf_macros" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.11.3", + "phf_shared 0.11.3", + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "phf_macros" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" +dependencies = [ + "phf_generator 0.13.1", + "phf_shared 0.13.1", "proc-macro2", "quote", "syn 2.0.108", @@ -4327,6 +4300,15 @@ dependencies = [ "siphasher", ] +[[package]] +name = "phf_shared" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" version = "1.1.10" @@ -4824,8 +4806,8 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4850,8 +4832,8 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-chains", "alloy-consensus", @@ -4870,8 +4852,8 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4888,10 +4870,9 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ - "convert_case", "proc-macro2", "quote", "syn 2.0.108", @@ -4899,8 +4880,8 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -4912,8 +4893,8 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4924,8 +4905,8 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-eips", "alloy-primitives", @@ -4936,8 +4917,8 @@ dependencies = [ [[package]] name = "reth-errors" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -4947,8 +4928,8 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-chains", "alloy-consensus", @@ -4968,8 +4949,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -4981,8 +4962,8 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4998,8 +4979,8 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5019,8 +5000,8 @@ dependencies = [ [[package]] name = "reth-execution-errors" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-evm", "alloy-primitives", @@ -5032,8 +5013,8 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5050,8 +5031,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "serde", "serde_json", @@ -5060,8 +5041,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "metrics", "metrics-derive", @@ -5069,16 +5050,16 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-primitives", ] [[package]] name = "reth-network-api" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5101,8 +5082,8 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5123,8 +5104,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5136,8 +5117,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-eip2124", "reth-net-banlist", @@ -5148,8 +5129,8 @@ dependencies = [ [[package]] name = "reth-optimism-chainspec" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5174,8 +5155,8 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5199,8 +5180,8 @@ dependencies = [ [[package]] name = "reth-optimism-evm" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5226,8 +5207,8 @@ dependencies = [ [[package]] name = "reth-optimism-forks" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-op-hardforks", "alloy-primitives", @@ -5237,8 +5218,8 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5255,8 +5236,8 @@ dependencies = [ [[package]] name = "reth-primitives-traits" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5271,9 +5252,9 @@ dependencies = [ "once_cell", "op-alloy-consensus", "reth-codecs", - "revm-bytecode", - "revm-primitives", - "revm-state", + "revm-bytecode 7.1.0", + "revm-primitives 21.0.1", + "revm-state 8.1.0", "secp256k1 0.30.0", "serde", "serde_with", @@ -5282,19 +5263,20 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-primitives", "derive_more", "serde", + "strum", "thiserror", ] [[package]] name = "reth-revm" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-primitives", "reth-primitives-traits", @@ -5305,8 +5287,8 @@ dependencies = [ [[package]] name = "reth-rpc-convert" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-json-rpc", @@ -5326,8 +5308,8 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5373,8 +5355,8 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5389,8 +5371,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-primitives", "bytes", @@ -5400,8 +5382,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-primitives", "derive_more", @@ -5411,8 +5393,8 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5433,8 +5415,8 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5443,14 +5425,14 @@ dependencies = [ "reth-primitives-traits", "reth-prune-types", "reth-static-file-types", - "revm-database-interface", + "revm-database-interface 8.0.4", "thiserror", ] [[package]] name = "reth-tasks" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "auto_impl", "dyn-clone", @@ -5465,8 +5447,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "tokio", "tokio-stream", @@ -5475,8 +5457,8 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5500,7 +5482,7 @@ dependencies = [ "reth-storage-api", "reth-tasks", "revm-interpreter", - "revm-primitives", + "revm-primitives 21.0.1", "rustc-hash", "schnellru", "serde", @@ -5514,8 +5496,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5536,8 +5518,8 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5545,6 +5527,7 @@ dependencies = [ "alloy-rpc-types-eth", "alloy-serde", "alloy-trie", + "arrayvec", "bytes", "derive_more", "itertools 0.14.0", @@ -5558,8 +5541,8 @@ dependencies = [ [[package]] name = "reth-trie-sparse" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5574,29 +5557,29 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "1.8.2" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.8.2#9c30bf7af5e0d45deaf5917375c9922c16654b28" +version = "1.9.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "29.0.1" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718d90dce5f07e115d0e66450b1b8aa29694c1cf3f89ebddaddccc2ccbd2f13e" +checksum = "f7bba993ce958f0b6eb23d2644ea8360982cb60baffedf961441e36faba6a2ca" dependencies = [ - "revm-bytecode", + "revm-bytecode 7.1.0", "revm-context", - "revm-context-interface", + "revm-context-interface 12.0.0", "revm-database", - "revm-database-interface", + "revm-database-interface 8.0.4", "revm-handler", "revm-inspector", "revm-interpreter", "revm-precompile", - "revm-primitives", - "revm-state", + "revm-primitives 21.0.1", + "revm-state 8.1.0", ] [[package]] @@ -5606,25 +5589,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66c52031b73cae95d84cd1b07725808b5fd1500da3e5e24574a3b2dc13d9f16d" dependencies = [ "bitvec", - "phf", - "revm-primitives", + "phf 0.11.3", + "revm-primitives 20.2.1", + "serde", +] + +[[package]] +name = "revm-bytecode" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f2b51c414b7e79edd4a0569d06e2c4c029f8b60e5f3ee3e2fa21dc6c3717ee3" +dependencies = [ + "bitvec", + "phf 0.13.1", + "revm-primitives 21.0.1", "serde", ] [[package]] name = "revm-context" -version = "9.1.0" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a20c98e7008591a6f012550c2a00aa36cba8c14cc88eb88dec32eb9102554b4" +checksum = "f69efee45130bd9e5b0a7af27552fddc70bc161dafed533c2f818a2d1eb654e6" dependencies = [ "bitvec", "cfg-if", "derive-where", - "revm-bytecode", - "revm-context-interface", - "revm-database-interface", - "revm-primitives", - "revm-state", + "revm-bytecode 7.1.0", + "revm-context-interface 12.0.0", + "revm-database-interface 8.0.4", + "revm-primitives 21.0.1", + "revm-state 8.1.0", "serde", ] @@ -5638,23 +5633,39 @@ dependencies = [ "alloy-eip7702", "auto_impl", "either", - "revm-database-interface", - "revm-primitives", - "revm-state", + "revm-database-interface 7.0.5", + "revm-primitives 20.2.1", + "revm-state 7.0.5", + "serde", +] + +[[package]] +name = "revm-context-interface" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce2525e93db0ae2a3ec7dcde5443dfdb6fbf321c5090380d775730c67bc6cee" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702", + "auto_impl", + "either", + "revm-database-interface 8.0.4", + "revm-primitives 21.0.1", + "revm-state 8.1.0", "serde", ] [[package]] name = "revm-database" -version = "7.0.5" +version = "9.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a276ed142b4718dcf64bc9624f474373ed82ef20611025045c3fb23edbef9c" +checksum = "c2602625aa11ab1eda8e208e96b652c0bfa989b86c104a36537a62b081228af9" dependencies = [ "alloy-eips", - "revm-bytecode", - "revm-database-interface", - "revm-primitives", - "revm-state", + "revm-bytecode 7.1.0", + "revm-database-interface 8.0.4", + "revm-primitives 21.0.1", + "revm-state 8.1.0", "serde", ] @@ -5666,53 +5677,66 @@ checksum = "8c523c77e74eeedbac5d6f7c092e3851dbe9c7fec6f418b85992bd79229db361" dependencies = [ "auto_impl", "either", - "revm-primitives", - "revm-state", + "revm-primitives 20.2.1", + "revm-state 7.0.5", + "serde", +] + +[[package]] +name = "revm-database-interface" +version = "8.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58a4621143d6515e32f969306d9c85797ae0d3fe0c74784f1fda02ba441e5a08" +dependencies = [ + "auto_impl", + "either", + "revm-primitives 21.0.1", + "revm-state 8.1.0", "serde", ] [[package]] name = "revm-handler" -version = "10.0.1" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "550331ea85c1d257686e672081576172fe3d5a10526248b663bbf54f1bef226a" +checksum = "e756198d43b6c4c5886548ffbc4594412d1a82b81723525c6e85ed6da0e91c5f" dependencies = [ "auto_impl", "derive-where", - "revm-bytecode", + "revm-bytecode 7.1.0", "revm-context", - "revm-context-interface", - "revm-database-interface", + "revm-context-interface 12.0.0", + "revm-database-interface 8.0.4", "revm-interpreter", "revm-precompile", - "revm-primitives", - "revm-state", + "revm-primitives 21.0.1", + "revm-state 8.1.0", "serde", ] [[package]] name = "revm-inspector" -version = "10.0.1" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c0a6e9ccc2ae006f5bed8bd80cd6f8d3832cd55c5e861b9402fdd556098512f" +checksum = "c3fdd1e74cc99c6173c8692b6e480291e2ad0c21c716d9dc16e937ab2e0da219" dependencies = [ "auto_impl", "either", "revm-context", - "revm-database-interface", + "revm-database-interface 8.0.4", "revm-handler", "revm-interpreter", - "revm-primitives", - "revm-state", + "revm-primitives 21.0.1", + "revm-state 8.1.0", "serde", "serde_json", ] [[package]] name = "revm-inspectors" -version = "0.30.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de23199c4b6181a6539e4131cf7e31cde4df05e1192bcdce491c34a511241588" +checksum = "21caa99f22184a6818946362778cccd3ff02f743c1e085bee87700671570ecb7" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -5728,21 +5752,22 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "25.0.3" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06575dc51b1d8f5091daa12a435733a90b4a132dca7ccee0666c7db3851bc30c" +checksum = "44efb7c2f4034a5bfd3d71ebfed076e48ac75e4972f1c117f2a20befac7716cd" dependencies = [ - "revm-bytecode", - "revm-context-interface", - "revm-primitives", + "revm-bytecode 7.1.0", + "revm-context-interface 12.0.0", + "revm-primitives 21.0.1", + "revm-state 8.1.0", "serde", ] [[package]] name = "revm-precompile" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b57d4bd9e6b5fe469da5452a8a137bc2d030a3cd47c46908efc615bbc699da" +checksum = "585098ede6d84d6fc6096ba804b8e221c44dc77679571d32664a55e665aa236b" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -5754,13 +5779,12 @@ dependencies = [ "c-kzg", "cfg-if", "k256", - "libsecp256k1", "p256 0.13.2", - "revm-primitives", + "revm-primitives 21.0.1", "ripemd", "rug", "secp256k1 0.31.1", - "sha2 0.10.9", + "sha2", ] [[package]] @@ -5775,6 +5799,18 @@ dependencies = [ "serde", ] +[[package]] +name = "revm-primitives" +version = "21.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "536f30e24c3c2bf0d3d7d20fa9cf99b93040ed0f021fd9301c78cddb0dacda13" +dependencies = [ + "alloy-primitives", + "num_enum", + "once_cell", + "serde", +] + [[package]] name = "revm-state" version = "7.0.5" @@ -5782,8 +5818,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f64fbacb86008394aaebd3454f9643b7d5a782bd251135e17c5b33da592d84d" dependencies = [ "bitflags 2.10.0", - "revm-bytecode", - "revm-primitives", + "revm-bytecode 6.2.2", + "revm-primitives 20.2.1", + "serde", +] + +[[package]] +name = "revm-state" +version = "8.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a0b4873815e31cbc3e5b183b9128b86c09a487c027aaf8cc5cf4b9688878f9b" +dependencies = [ + "bitflags 2.10.0", + "revm-bytecode 7.1.0", + "revm-primitives 21.0.1", "serde", ] @@ -6373,19 +6421,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha2" version = "0.10.9" @@ -6918,7 +6953,7 @@ dependencies = [ "rdkafka", "reth-optimism-evm", "reth-rpc-eth-types", - "revm-context-interface", + "revm-context-interface 10.2.0", "serde_json", "tips-audit", "tips-core", diff --git a/Cargo.toml b/Cargo.toml index 040cf38..2709a2b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,9 +16,9 @@ tips-bundle-pool = { path = "crates/bundle-pool" } tips-core = { path = "crates/core" } # Reth -reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" } -reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" } +reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" } +reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" } # alloy alloy-primitives = { version = "1.3.1", default-features = false, features = [ @@ -30,9 +30,9 @@ alloy-provider = { version = "1.0.37" } alloy-serde = "1.0.41" # op-alloy -op-alloy-network = { version = "0.20.0", default-features = false } -op-alloy-consensus = { version = "0.20.0", features = ["k256", "serde"] } -op-alloy-rpc-types = { version = "0.20.0", default-features = true} +op-alloy-network = { version = "0.22.0", default-features = false } +op-alloy-consensus = { version = "0.22.0", features = ["k256", "serde"] } +op-alloy-rpc-types = { version = "0.22.0", default-features = true} op-alloy-flz = { version = "0.13.1" } tokio = { version = "1.47.1", features = ["full"] } @@ -60,6 +60,6 @@ bytes = { version = "1.8.0", features = ["serde"] } # tips-ingress backon = "1.5.2" -op-revm = { version = "10.1.0", default-features = false } +op-revm = { version = "12.0.0", default-features = false } revm-context-interface = "10.2.0" alloy-signer-local = "1.0.36" From 65c15215b16d19acb89983d5d47df93b5de72432 Mon Sep 17 00:00:00 2001 From: William Law Date: Wed, 5 Nov 2025 17:43:32 -0500 Subject: [PATCH 044/117] docs: add setup steps to run locally (#58) * add docs * nits * more nits * feedback --- README.md | 4 ++ SETUP.md | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 SETUP.md diff --git a/README.md b/README.md index a4363b3..2dae6fe 100644 --- a/README.md +++ b/README.md @@ -24,3 +24,7 @@ The main entry point that provides a JSON-RPC API for receiving transactions and ### 🖥️ UI (`ui`) A debug UI for viewing the state of the bundle store and S3. + +## Running TIPS locally + +See the [setup instructions](./SETUP.md) for how to run the TIPS system locally. diff --git a/SETUP.md b/SETUP.md new file mode 100644 index 0000000..c0d62f6 --- /dev/null +++ b/SETUP.md @@ -0,0 +1,138 @@ +# TIPS Local Development Setup + +This guide walks you through setting up and running TIPS locally with all required dependencies. + +## Prerequisites + +- Docker and Docker Compose +- Rust (latest stable) +- Go (1.21+) +- Just command runner (`cargo install just`) +- Git + +## Step 1: Clone Required Repositories + +Clone the three repositories you'll need: + +```bash +# Clone TIPS (this repository) +git clone https://github.com/base/tips.git + +# Clone builder-playground in a separate directory +git clone https://github.com/flashbots/builder-playground.git +cd builder-playground +git remote add danyal git@github.com:danyalprout/builder-playground.git # TODO: change this once it's upstreamed +git checkout danyal/base-overlay + +# Clone op-rbuilder in a separate directory +git clone https://github.com/base/op-rbuilder.git +cd op-rbuilder +git checkout tips-prototype +``` + +## Step 2: Start TIPS Infrastructure + +```bash +cd tips + +# Sync (and load env vars) and start all TIPS services +just sync +just start-all +``` + +This will: +- Reset and start Docker containers (Kafka, MinIO, node-reth services) +- Start the TIPS ingress RPC service +- Start the audit service +- Start the bundle pool service +- Start the UI + +## Step 3: Start builder-playground + +The builder-playground provides the L1/L2 blockchain infrastructure. + +```bash +cd builder-playground + +# Start the playground +go run main.go cook opstack --external-builder http://host.docker.internal:4444/ --enable-latest-fork 0 --flashblocks --base-overlay --flashblocks-builder ws://host.docker.internal:1111/ws +``` + +Keep this terminal running. The playground will: +- Start L1 and L2 nodes +- Provide blockchain infrastructure for TIPS +- Expose services on various ports + +## Step 4: Start op-rbuilder + +The op-rbuilder handles block building for the L2. + +```bash +cd op-rbuilder + +# Start the builder (ensure you're on tips-prototype branch) +just run-playground +``` + +Keep this terminal running. The builder will: +- Connect to the builder-playground infrastructure +- Handle block building requests +- Expose builder API on port 4444 + +## Step 5: Access the UI and send a test transaction + +Once everything is running, you can test the system: + +```bash +cd tips + +# Send a test transaction +just send-txn +``` + +This will: +- Submit a transaction bundle to TIPS +- Process it through the ingress → audit → bundle pool pipeline +- Send it to the builder for inclusion in blocks + +## Ports Reference + +| Service | Port | Description | +|---------|------|-------------| +| TIPS Ingress RPC | 8080 | Main RPC endpoint for bundle submission | +| TIPS UI | 3000 | Web interface | +| MinIO Console | 7001 | Object storage UI | +| MinIO API | 7000 | Object storage API | +| Kafka | 9092 | Message broker | +| op-rbuilder | 4444 | Block builder API | +| builder-playground | Various | L1/L2 blockchain infrastructure | + +If you want to get information regarding the sequencer, validator, and builder, you can run: + +```bash +just get-blocks +``` + +## Development Workflow + +For active development: + +1. Keep builder-playground and op-rbuilder running +2. Use `just start-all` to restart TIPS services after code changes +3. Use `just send-txn` to test transaction flow +4. Monitor logs with `docker logs -f ` +5. Access TIPS UI at http://localhost:3000 for debugging + +## Stopping Services + +To stop everything: + +```bash +# Stop TIPS services +cd tips +just stop-all + +# Stop op-rbuilder (Ctrl+C in terminal) + +# Stop builder-playground (Ctrl+C in terminal) +``` From 055f635eceb814e111d6041fabeb70342a9d13bb Mon Sep 17 00:00:00 2001 From: William Law Date: Fri, 7 Nov 2025 10:16:17 -0500 Subject: [PATCH 045/117] feat: add metrics to `ingress-rpc` (#61) * add rpc timing * add more metrics * naming * spike promethesus server * wip 2 * working --- .env.example | 1 + Cargo.lock | 79 ++++++++++++++++++++++++++++ Cargo.toml | 5 ++ crates/ingress-rpc/Cargo.toml | 3 ++ crates/ingress-rpc/src/bin/main.rs | 16 +++++- crates/ingress-rpc/src/lib.rs | 1 + crates/ingress-rpc/src/metrics.rs | 40 ++++++++++++++ crates/ingress-rpc/src/service.rs | 18 +++++++ crates/ingress-rpc/src/validation.rs | 8 +++ docker-compose.tips.yml | 1 + 10 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 crates/ingress-rpc/src/metrics.rs diff --git a/.env.example b/.env.example index a171ead..63f8bca 100644 --- a/.env.example +++ b/.env.example @@ -10,6 +10,7 @@ TIPS_INGRESS_KAFKA_AUDIT_TOPIC=tips-audit TIPS_INGRESS_LOG_LEVEL=info TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS=10800 TIPS_INGRESS_RPC_SIMULATION=http://localhost:8549 +TIPS_INGRESS_METRICS_ADDR=0.0.0.0:9002 # Audit service configuration TIPS_AUDIT_KAFKA_PROPERTIES_FILE=/app/docker/audit-kafka-properties diff --git a/Cargo.lock b/Cargo.lock index 2d02a77..df78ce3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3729,6 +3729,43 @@ dependencies = [ "syn 2.0.108", ] +[[package]] +name = "metrics-exporter-prometheus" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b166dea96003ee2531cf14833efedced545751d800f03535801d833313f8c15" +dependencies = [ + "base64 0.22.1", + "http-body-util", + "hyper 1.7.0", + "hyper-rustls 0.27.7", + "hyper-util", + "indexmap 2.12.0", + "ipnet", + "metrics", + "metrics-util", + "quanta", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "metrics-util" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe8db7a05415d0f919ffb905afa37784f71901c9a773188876984b4f769ab986" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", + "hashbrown 0.15.5", + "metrics", + "quanta", + "rand 0.9.2", + "rand_xoshiro", + "sketches-ddsketch", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -4486,6 +4523,21 @@ dependencies = [ "unarray", ] +[[package]] +name = "quanta" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -4639,6 +4691,24 @@ dependencies = [ "rand_core 0.9.3", ] +[[package]] +name = "rand_xoshiro" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41" +dependencies = [ + "rand_core 0.9.3", +] + +[[package]] +name = "raw-cpuid" +version = "11.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" +dependencies = [ + "bitflags 2.10.0", +] + [[package]] name = "rayon" version = "1.11.0" @@ -6502,6 +6572,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" +[[package]] +name = "sketches-ddsketch" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a" + [[package]] name = "slab" version = "0.4.11" @@ -6947,6 +7023,9 @@ dependencies = [ "clap", "dotenvy", "jsonrpsee", + "metrics", + "metrics-derive", + "metrics-exporter-prometheus", "op-alloy-consensus", "op-alloy-network", "op-revm", diff --git a/Cargo.toml b/Cargo.toml index 2709a2b..b882b45 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,3 +63,8 @@ backon = "1.5.2" op-revm = { version = "12.0.0", default-features = false } revm-context-interface = "10.2.0" alloy-signer-local = "1.0.36" + +# Misc +metrics = "0.24.1" +metrics-derive = "0.1" +metrics-exporter-prometheus = { version = "0.17.0", features = ["http-listener"]} diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index 5df7ec6..5099da8 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -35,3 +35,6 @@ op-revm.workspace = true revm-context-interface.workspace = true alloy-signer-local.workspace = true reth-optimism-evm.workspace = true +metrics.workspace = true +metrics-derive.workspace = true +metrics-exporter-prometheus.workspace = true diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 01f821e..0d4ebca 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -4,10 +4,11 @@ use jsonrpsee::server::Server; use op_alloy_network::Optimism; use rdkafka::ClientConfig; use rdkafka::producer::FutureProducer; -use std::net::IpAddr; +use std::net::{IpAddr, SocketAddr}; use tips_audit::KafkaBundleEventPublisher; use tips_core::kafka::load_kafka_config_from_file; use tips_core::logger::init_logger; +use tips_ingress_rpc::metrics::init_prometheus_exporter; use tips_ingress_rpc::queue::KafkaQueuePublisher; use tips_ingress_rpc::service::{IngressApiServer, IngressService}; use tracing::info; @@ -70,6 +71,14 @@ struct Config { /// URL of the simulation RPC service for bundle metering #[arg(long, env = "TIPS_INGRESS_RPC_SIMULATION")] simulation_rpc: Url, + + /// Port to bind the Prometheus metrics server to + #[arg( + long, + env = "TIPS_INGRESS_METRICS_ADDR", + default_value = "0.0.0.0:9002" + )] + metrics_addr: SocketAddr, } #[tokio::main] @@ -80,12 +89,15 @@ async fn main() -> anyhow::Result<()> { init_logger(&config.log_level); + init_prometheus_exporter(config.metrics_addr).expect("Failed to install Prometheus exporter"); + info!( message = "Starting ingress service", address = %config.address, port = config.port, mempool_url = %config.mempool_url, - simulation_rpc = %config.simulation_rpc + simulation_rpc = %config.simulation_rpc, + metrics_address = %config.metrics_addr, ); let provider: RootProvider = ProviderBuilder::new() diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index f3f3c92..db50bc2 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -1,3 +1,4 @@ +pub mod metrics; pub mod queue; pub mod service; pub mod validation; diff --git a/crates/ingress-rpc/src/metrics.rs b/crates/ingress-rpc/src/metrics.rs new file mode 100644 index 0000000..eb2e34c --- /dev/null +++ b/crates/ingress-rpc/src/metrics.rs @@ -0,0 +1,40 @@ +use metrics::Histogram; +use metrics_derive::Metrics; +use metrics_exporter_prometheus::PrometheusBuilder; +use std::net::SocketAddr; +use tokio::time::Duration; + +/// `record_histogram` lets us record with tags. +pub fn record_histogram(rpc_latency: Duration, rpc: String) { + metrics::histogram!("tips_ingress_rpc_rpc_latency", "rpc" => rpc) + .record(rpc_latency.as_secs_f64()); +} + +/// Metrics for the `tips_ingress_rpc` component. +/// Conventions: +/// - Durations are recorded in seconds (histograms). +/// - Counters are monotonic event counts. +/// - Gauges reflect the current value/state. +#[derive(Metrics, Clone)] +#[metrics(scope = "tips_ingress_rpc")] +pub struct Metrics { + #[metric(describe = "Duration of validate_tx")] + pub validate_tx_duration: Histogram, + + #[metric(describe = "Duration of validate_bundle")] + pub validate_bundle_duration: Histogram, + + #[metric(describe = "Duration of meter_bundle")] + pub meter_bundle_duration: Histogram, + + #[metric(describe = "Duration of send_raw_transaction")] + pub send_raw_transaction_duration: Histogram, +} + +/// Initialize Prometheus metrics exporter +pub fn init_prometheus_exporter(addr: SocketAddr) -> Result<(), Box> { + PrometheusBuilder::new() + .with_http_listener(addr) + .install() + .map_err(|e| Box::new(e) as Box) +} diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 233c2ad..f53cdc6 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -16,8 +16,10 @@ use tips_core::{ AcceptedBundle, BLOCK_TIME, Bundle, BundleExtensions, BundleHash, CancelBundle, MeterBundleResponse, }; +use tokio::time::Instant; use tracing::{info, warn}; +use crate::metrics::{Metrics, record_histogram}; use crate::queue::QueuePublisher; use crate::validation::{AccountInfoLookup, L1BlockInfoLookup, validate_bundle, validate_tx}; @@ -43,6 +45,7 @@ pub struct IngressService { bundle_queue: Queue, audit_publisher: Audit, send_transaction_default_lifetime_seconds: u64, + metrics: Metrics, } impl IngressService { @@ -61,6 +64,7 @@ impl IngressService { bundle_queue: queue, audit_publisher, send_transaction_default_lifetime_seconds, + metrics: Metrics::default(), } } } @@ -116,6 +120,7 @@ where } async fn send_raw_transaction(&self, data: Bytes) -> RpcResult { + let start = Instant::now(); let transaction = self.validate_tx(&data).await?; let expiry_timestamp = SystemTime::now() @@ -175,6 +180,9 @@ where warn!(message = "Failed to publish audit event", bundle_id = %accepted_bundle.uuid(), error = %e); } + self.metrics + .send_raw_transaction_duration + .record(start.elapsed().as_secs_f64()); Ok(transaction.tx_hash()) } } @@ -185,6 +193,7 @@ where Audit: BundleEventPublisher + Sync + Send + 'static, { async fn validate_tx(&self, data: &Bytes) -> RpcResult> { + let start = Instant::now(); if data.is_empty() { return Err(EthApiError::EmptyRawTransactionData.into_rpc_err()); } @@ -204,10 +213,14 @@ where .await?; validate_tx(account, &transaction, data, &mut l1_block_info).await?; + self.metrics + .validate_tx_duration + .record(start.elapsed().as_secs_f64()); Ok(transaction) } async fn validate_bundle(&self, bundle: &Bundle) -> RpcResult<()> { + let start = Instant::now(); if bundle.txs.is_empty() { return Err( EthApiError::InvalidParams("Bundle cannot have empty transactions".into()) @@ -224,6 +237,9 @@ where } validate_bundle(bundle, total_gas, tx_hashes)?; + self.metrics + .validate_bundle_duration + .record(start.elapsed().as_secs_f64()); Ok(()) } @@ -231,12 +247,14 @@ where /// is within `BLOCK_TIME` will return the `MeterBundleResponse` that can be passed along /// to the builder. async fn meter_bundle(&self, bundle: &Bundle) -> RpcResult { + let start = Instant::now(); let res: MeterBundleResponse = self .simulation_provider .client() .request("base_meterBundle", (bundle,)) .await .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; + record_histogram(start.elapsed(), "base_meterBundle".to_string()); // we can save some builder payload building computation by not including bundles // that we know will take longer than the block time to execute diff --git a/crates/ingress-rpc/src/validation.rs b/crates/ingress-rpc/src/validation.rs index 4ff4946..6411d42 100644 --- a/crates/ingress-rpc/src/validation.rs +++ b/crates/ingress-rpc/src/validation.rs @@ -12,8 +12,11 @@ use reth_rpc_eth_types::{EthApiError, RpcInvalidTransactionError, SignError}; use std::collections::HashSet; use std::time::{Duration, SystemTime, UNIX_EPOCH}; use tips_core::Bundle; +use tokio::time::Instant; use tracing::warn; +use crate::metrics::record_histogram; + const MAX_BUNDLE_GAS: u64 = 25_000_000; /// Account info for a given address @@ -33,10 +36,13 @@ pub trait AccountInfoLookup: Send + Sync { #[async_trait] impl AccountInfoLookup for RootProvider { async fn fetch_account_info(&self, address: Address) -> RpcResult { + let start = Instant::now(); let account = self .get_account(address) .await .map_err(|_| EthApiError::Signing(SignError::NoAccount))?; + record_histogram(start.elapsed(), "eth_getAccount".to_string()); + Ok(AccountInfo { balance: account.balance, nonce: account.nonce, @@ -55,6 +61,7 @@ pub trait L1BlockInfoLookup: Send + Sync { #[async_trait] impl L1BlockInfoLookup for RootProvider { async fn fetch_l1_block_info(&self) -> RpcResult { + let start = Instant::now(); let block = self .get_block(BlockId::Number(BlockNumberOrTag::Latest)) .full() @@ -67,6 +74,7 @@ impl L1BlockInfoLookup for RootProvider { warn!(message = "empty latest block returned"); EthApiError::InternalEthError.into_rpc_err() })?; + record_histogram(start.elapsed(), "eth_getBlockByNumber".to_string()); let txs = block.transactions.clone(); let first_tx = txs.first_transaction().ok_or_else(|| { diff --git a/docker-compose.tips.yml b/docker-compose.tips.yml index e4613f7..97fccb9 100644 --- a/docker-compose.tips.yml +++ b/docker-compose.tips.yml @@ -8,6 +8,7 @@ services: container_name: tips-ingress-rpc ports: - "8080:8080" + - "9002:9002" env_file: - .env.docker volumes: From b113b3114fcd15904b2b9a70e79533ab25813910 Mon Sep 17 00:00:00 2001 From: William Law Date: Fri, 7 Nov 2025 10:19:42 -0500 Subject: [PATCH 046/117] feat: make metering threshold configurable (#62) * configurable block time * ms --- .env.example | 1 + crates/core/src/lib.rs | 2 +- crates/core/src/types.rs | 3 --- crates/ingress-rpc/src/bin/main.rs | 9 +++++++++ crates/ingress-rpc/src/service.rs | 11 +++++++---- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.env.example b/.env.example index 63f8bca..4f4f9a5 100644 --- a/.env.example +++ b/.env.example @@ -11,6 +11,7 @@ TIPS_INGRESS_LOG_LEVEL=info TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS=10800 TIPS_INGRESS_RPC_SIMULATION=http://localhost:8549 TIPS_INGRESS_METRICS_ADDR=0.0.0.0:9002 +TIPS_INGRESS_BLOCK_TIME_MILLISECONDS=2000 # Audit service configuration TIPS_AUDIT_KAFKA_PROPERTIES_FILE=/app/docker/audit-kafka-properties diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index c8e1515..a319dd0 100644 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -6,6 +6,6 @@ pub mod types; pub mod test_utils; pub use types::{ - AcceptedBundle, BLOCK_TIME, Bundle, BundleExtensions, BundleHash, BundleTxs, CancelBundle, + AcceptedBundle, Bundle, BundleExtensions, BundleHash, BundleTxs, CancelBundle, MeterBundleResponse, }; diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index 10945f8..536098c 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -8,9 +8,6 @@ use op_alloy_flz::tx_estimated_size_fjord_bytes; use serde::{Deserialize, Serialize}; use uuid::Uuid; -/// Block time in microseconds -pub const BLOCK_TIME: u128 = 2_000_000; - /// `Bundle` is the type that mirrors `EthSendBundle` and is used for the API. #[derive(Default, Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] #[serde(rename_all = "camelCase")] diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 0d4ebca..7a6445c 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -79,6 +79,14 @@ struct Config { default_value = "0.0.0.0:9002" )] metrics_addr: SocketAddr, + + /// Configurable block time in milliseconds (default: 2000 milliseconds) + #[arg( + long, + env = "TIPS_INGRESS_BLOCK_TIME_MILLISECONDS", + default_value = "2000" + )] + block_time_milliseconds: u64, } #[tokio::main] @@ -132,6 +140,7 @@ async fn main() -> anyhow::Result<()> { queue, audit_publisher, config.send_transaction_default_lifetime_seconds, + config.block_time_milliseconds, ); let bind_addr = format!("{}:{}", config.address, config.port); diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index f53cdc6..d717306 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -13,8 +13,7 @@ use std::time::{SystemTime, UNIX_EPOCH}; use tips_audit::{BundleEvent, BundleEventPublisher}; use tips_core::types::ParsedBundle; use tips_core::{ - AcceptedBundle, BLOCK_TIME, Bundle, BundleExtensions, BundleHash, CancelBundle, - MeterBundleResponse, + AcceptedBundle, Bundle, BundleExtensions, BundleHash, CancelBundle, MeterBundleResponse, }; use tokio::time::Instant; use tracing::{info, warn}; @@ -46,6 +45,7 @@ pub struct IngressService { audit_publisher: Audit, send_transaction_default_lifetime_seconds: u64, metrics: Metrics, + block_time_milliseconds: u64, } impl IngressService { @@ -56,6 +56,7 @@ impl IngressService { queue: Queue, audit_publisher: Audit, send_transaction_default_lifetime_seconds: u64, + block_time_milliseconds: u64, ) -> Self { Self { provider, @@ -65,6 +66,7 @@ impl IngressService { audit_publisher, send_transaction_default_lifetime_seconds, metrics: Metrics::default(), + block_time_milliseconds, } } } @@ -244,7 +246,7 @@ where } /// `meter_bundle` is used to determine how long a bundle will take to execute. A bundle that - /// is within `BLOCK_TIME` will return the `MeterBundleResponse` that can be passed along + /// is within `block_time_milliseconds` will return the `MeterBundleResponse` that can be passed along /// to the builder. async fn meter_bundle(&self, bundle: &Bundle) -> RpcResult { let start = Instant::now(); @@ -258,7 +260,8 @@ where // we can save some builder payload building computation by not including bundles // that we know will take longer than the block time to execute - if res.total_execution_time_us > BLOCK_TIME { + let total_execution_time = (res.total_execution_time_us / 1_000) as u64; + if total_execution_time > self.block_time_milliseconds { return Err( EthApiError::InvalidParams("Bundle simulation took too long".into()).into_rpc_err(), ); From e31f12bc2a4d189ed73a5084ecd5784237ebf3ad Mon Sep 17 00:00:00 2001 From: William Law Date: Fri, 7 Nov 2025 15:31:17 -0500 Subject: [PATCH 047/117] feat: publish to audit kafka async (#63) * wip * works * make status text black * use helper * move init chan in main * reduce diffs --- crates/ingress-rpc/src/bin/main.rs | 7 +++++-- crates/ingress-rpc/src/service.rs | 33 +++++++++++++++++------------- ui/src/app/bundles/[uuid]/page.tsx | 2 +- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 7a6445c..e5eff11 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -5,12 +5,13 @@ use op_alloy_network::Optimism; use rdkafka::ClientConfig; use rdkafka::producer::FutureProducer; use std::net::{IpAddr, SocketAddr}; -use tips_audit::KafkaBundleEventPublisher; +use tips_audit::{BundleEvent, KafkaBundleEventPublisher, connect_audit_to_publisher}; use tips_core::kafka::load_kafka_config_from_file; use tips_core::logger::init_logger; use tips_ingress_rpc::metrics::init_prometheus_exporter; use tips_ingress_rpc::queue::KafkaQueuePublisher; use tips_ingress_rpc::service::{IngressApiServer, IngressService}; +use tokio::sync::mpsc; use tracing::info; use url::Url; @@ -132,13 +133,15 @@ async fn main() -> anyhow::Result<()> { let audit_producer: FutureProducer = audit_client_config.create()?; let audit_publisher = KafkaBundleEventPublisher::new(audit_producer, config.audit_topic); + let (audit_tx, audit_rx) = mpsc::unbounded_channel::(); + connect_audit_to_publisher(audit_rx, audit_publisher); let service = IngressService::new( provider, simulation_provider, config.dual_write_mempool, queue, - audit_publisher, + audit_tx, config.send_transaction_default_lifetime_seconds, config.block_time_milliseconds, ); diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index d717306..e6db39d 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -10,11 +10,12 @@ use op_alloy_consensus::OpTxEnvelope; use op_alloy_network::Optimism; use reth_rpc_eth_types::EthApiError; use std::time::{SystemTime, UNIX_EPOCH}; -use tips_audit::{BundleEvent, BundleEventPublisher}; +use tips_audit::BundleEvent; use tips_core::types::ParsedBundle; use tips_core::{ AcceptedBundle, Bundle, BundleExtensions, BundleHash, CancelBundle, MeterBundleResponse, }; +use tokio::sync::mpsc; use tokio::time::Instant; use tracing::{info, warn}; @@ -37,24 +38,24 @@ pub trait IngressApi { async fn send_raw_transaction(&self, tx: Bytes) -> RpcResult; } -pub struct IngressService { +pub struct IngressService { provider: RootProvider, simulation_provider: RootProvider, dual_write_mempool: bool, bundle_queue: Queue, - audit_publisher: Audit, + audit_channel: mpsc::UnboundedSender, send_transaction_default_lifetime_seconds: u64, metrics: Metrics, block_time_milliseconds: u64, } -impl IngressService { +impl IngressService { pub fn new( provider: RootProvider, simulation_provider: RootProvider, dual_write_mempool: bool, queue: Queue, - audit_publisher: Audit, + audit_channel: mpsc::UnboundedSender, send_transaction_default_lifetime_seconds: u64, block_time_milliseconds: u64, ) -> Self { @@ -63,7 +64,7 @@ impl IngressService { simulation_provider, dual_write_mempool, bundle_queue: queue, - audit_publisher, + audit_channel, send_transaction_default_lifetime_seconds, metrics: Metrics::default(), block_time_milliseconds, @@ -72,10 +73,9 @@ impl IngressService { } #[async_trait] -impl IngressApiServer for IngressService +impl IngressApiServer for IngressService where Queue: QueuePublisher + Sync + Send + 'static, - Audit: BundleEventPublisher + Sync + Send + 'static, { async fn send_bundle(&self, bundle: Bundle) -> RpcResult { self.validate_bundle(&bundle).await?; @@ -104,8 +104,11 @@ where bundle_id: *accepted_bundle.uuid(), bundle: Box::new(accepted_bundle.clone()), }; - if let Err(e) = self.audit_publisher.publish(audit_event).await { - warn!(message = "Failed to publish audit event", bundle_id = %accepted_bundle.uuid(), error = %e); + if let Err(e) = self.audit_channel.send(audit_event) { + warn!(message = "Failed to send audit event", error = %e); + return Err( + EthApiError::InvalidParams("Failed to send audit event".into()).into_rpc_err(), + ); } Ok(BundleHash { @@ -178,8 +181,11 @@ where bundle_id: *accepted_bundle.uuid(), bundle: accepted_bundle.clone().into(), }; - if let Err(e) = self.audit_publisher.publish(audit_event).await { - warn!(message = "Failed to publish audit event", bundle_id = %accepted_bundle.uuid(), error = %e); + if let Err(e) = self.audit_channel.send(audit_event) { + warn!(message = "Failed to send audit event", error = %e); + return Err( + EthApiError::InvalidParams("Failed to send audit event".into()).into_rpc_err(), + ); } self.metrics @@ -189,10 +195,9 @@ where } } -impl IngressService +impl IngressService where Queue: QueuePublisher + Sync + Send + 'static, - Audit: BundleEventPublisher + Sync + Send + 'static, { async fn validate_tx(&self, data: &Bytes) -> RpcResult> { let start = Instant::now(); diff --git a/ui/src/app/bundles/[uuid]/page.tsx b/ui/src/app/bundles/[uuid]/page.tsx index 83e1df2..b194f49 100644 --- a/ui/src/app/bundles/[uuid]/page.tsx +++ b/ui/src/app/bundles/[uuid]/page.tsx @@ -111,7 +111,7 @@ export default function BundlePage({ params }: PageProps) {
{event.event} From ed8cfcce29228bbd3c204a86902bd87a95cbb443 Mon Sep 17 00:00:00 2001 From: William Law Date: Fri, 7 Nov 2025 16:04:52 -0500 Subject: [PATCH 048/117] feat: timeout request metering (#64) * spike * add comment * update .env * add unit test * refactor cfg * add warn * fmt --- .env.example | 1 + crates/ingress-rpc/src/bin/main.rs | 90 ++--------------------- crates/ingress-rpc/src/lib.rs | 87 ++++++++++++++++++++++ crates/ingress-rpc/src/service.rs | 112 ++++++++++++++++++++++++----- 4 files changed, 185 insertions(+), 105 deletions(-) diff --git a/.env.example b/.env.example index 4f4f9a5..ed4777e 100644 --- a/.env.example +++ b/.env.example @@ -12,6 +12,7 @@ TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS=10800 TIPS_INGRESS_RPC_SIMULATION=http://localhost:8549 TIPS_INGRESS_METRICS_ADDR=0.0.0.0:9002 TIPS_INGRESS_BLOCK_TIME_MILLISECONDS=2000 +TIPS_INGRESS_METER_BUNDLE_TIMEOUT_MS=2000 # Audit service configuration TIPS_AUDIT_KAFKA_PROPERTIES_FILE=/app/docker/audit-kafka-properties diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index e5eff11..5e091f1 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -4,97 +4,23 @@ use jsonrpsee::server::Server; use op_alloy_network::Optimism; use rdkafka::ClientConfig; use rdkafka::producer::FutureProducer; -use std::net::{IpAddr, SocketAddr}; use tips_audit::{BundleEvent, KafkaBundleEventPublisher, connect_audit_to_publisher}; use tips_core::kafka::load_kafka_config_from_file; use tips_core::logger::init_logger; +use tips_ingress_rpc::Config; use tips_ingress_rpc::metrics::init_prometheus_exporter; use tips_ingress_rpc::queue::KafkaQueuePublisher; use tips_ingress_rpc::service::{IngressApiServer, IngressService}; use tokio::sync::mpsc; use tracing::info; -use url::Url; - -#[derive(Parser, Debug)] -#[command(author, version, about, long_about = None)] -struct Config { - /// Address to bind the RPC server to - #[arg(long, env = "TIPS_INGRESS_ADDRESS", default_value = "0.0.0.0")] - address: IpAddr, - - /// Port to bind the RPC server to - #[arg(long, env = "TIPS_INGRESS_PORT", default_value = "8080")] - port: u16, - - /// URL of the mempool service to proxy transactions to - #[arg(long, env = "TIPS_INGRESS_RPC_MEMPOOL")] - mempool_url: Url, - - /// Enable dual writing raw transactions to the mempool - #[arg(long, env = "TIPS_INGRESS_DUAL_WRITE_MEMPOOL", default_value = "false")] - dual_write_mempool: bool, - - /// Kafka brokers for publishing mempool events - #[arg(long, env = "TIPS_INGRESS_KAFKA_INGRESS_PROPERTIES_FILE")] - ingress_kafka_properties: String, - - /// Kafka topic for queuing transactions before the DB Writer - #[arg( - long, - env = "TIPS_INGRESS_KAFKA_INGRESS_TOPIC", - default_value = "tips-ingress" - )] - ingress_topic: String, - - /// Kafka properties file for audit events - #[arg(long, env = "TIPS_INGRESS_KAFKA_AUDIT_PROPERTIES_FILE")] - audit_kafka_properties: String, - - /// Kafka topic for audit events - #[arg( - long, - env = "TIPS_INGRESS_KAFKA_AUDIT_TOPIC", - default_value = "tips-audit" - )] - audit_topic: String, - - #[arg(long, env = "TIPS_INGRESS_LOG_LEVEL", default_value = "info")] - log_level: String, - - /// Default lifetime for sent transactions in seconds (default: 3 hours) - #[arg( - long, - env = "TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS", - default_value = "10800" - )] - send_transaction_default_lifetime_seconds: u64, - - /// URL of the simulation RPC service for bundle metering - #[arg(long, env = "TIPS_INGRESS_RPC_SIMULATION")] - simulation_rpc: Url, - - /// Port to bind the Prometheus metrics server to - #[arg( - long, - env = "TIPS_INGRESS_METRICS_ADDR", - default_value = "0.0.0.0:9002" - )] - metrics_addr: SocketAddr, - - /// Configurable block time in milliseconds (default: 2000 milliseconds) - #[arg( - long, - env = "TIPS_INGRESS_BLOCK_TIME_MILLISECONDS", - default_value = "2000" - )] - block_time_milliseconds: u64, -} #[tokio::main] async fn main() -> anyhow::Result<()> { dotenvy::dotenv().ok(); let config = Config::parse(); + // clone once instead of cloning each field before passing to `IngressService::new` + let cfg = config.clone(); init_logger(&config.log_level); @@ -136,15 +62,7 @@ async fn main() -> anyhow::Result<()> { let (audit_tx, audit_rx) = mpsc::unbounded_channel::(); connect_audit_to_publisher(audit_rx, audit_publisher); - let service = IngressService::new( - provider, - simulation_provider, - config.dual_write_mempool, - queue, - audit_tx, - config.send_transaction_default_lifetime_seconds, - config.block_time_milliseconds, - ); + let service = IngressService::new(provider, simulation_provider, queue, audit_tx, cfg); let bind_addr = format!("{}:{}", config.address, config.port); let server = Server::builder().build(&bind_addr).await?; diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index db50bc2..ee036b9 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -2,3 +2,90 @@ pub mod metrics; pub mod queue; pub mod service; pub mod validation; + +use clap::Parser; +use std::net::{IpAddr, SocketAddr}; +use url::Url; + +#[derive(Parser, Debug, Clone)] +#[command(author, version, about, long_about = None)] +pub struct Config { + /// Address to bind the RPC server to + #[arg(long, env = "TIPS_INGRESS_ADDRESS", default_value = "0.0.0.0")] + pub address: IpAddr, + + /// Port to bind the RPC server to + #[arg(long, env = "TIPS_INGRESS_PORT", default_value = "8080")] + pub port: u16, + + /// URL of the mempool service to proxy transactions to + #[arg(long, env = "TIPS_INGRESS_RPC_MEMPOOL")] + pub mempool_url: Url, + + /// Enable dual writing raw transactions to the mempool + #[arg(long, env = "TIPS_INGRESS_DUAL_WRITE_MEMPOOL", default_value = "false")] + pub dual_write_mempool: bool, + + /// Kafka brokers for publishing mempool events + #[arg(long, env = "TIPS_INGRESS_KAFKA_INGRESS_PROPERTIES_FILE")] + pub ingress_kafka_properties: String, + + /// Kafka topic for queuing transactions before the DB Writer + #[arg( + long, + env = "TIPS_INGRESS_KAFKA_INGRESS_TOPIC", + default_value = "tips-ingress" + )] + pub ingress_topic: String, + + /// Kafka properties file for audit events + #[arg(long, env = "TIPS_INGRESS_KAFKA_AUDIT_PROPERTIES_FILE")] + pub audit_kafka_properties: String, + + /// Kafka topic for audit events + #[arg( + long, + env = "TIPS_INGRESS_KAFKA_AUDIT_TOPIC", + default_value = "tips-audit" + )] + pub audit_topic: String, + + #[arg(long, env = "TIPS_INGRESS_LOG_LEVEL", default_value = "info")] + pub log_level: String, + + /// Default lifetime for sent transactions in seconds (default: 3 hours) + #[arg( + long, + env = "TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS", + default_value = "10800" + )] + pub send_transaction_default_lifetime_seconds: u64, + + /// URL of the simulation RPC service for bundle metering + #[arg(long, env = "TIPS_INGRESS_RPC_SIMULATION")] + pub simulation_rpc: Url, + + /// Port to bind the Prometheus metrics server to + #[arg( + long, + env = "TIPS_INGRESS_METRICS_ADDR", + default_value = "0.0.0.0:9002" + )] + pub metrics_addr: SocketAddr, + + /// Configurable block time in milliseconds (default: 2000 milliseconds) + #[arg( + long, + env = "TIPS_INGRESS_BLOCK_TIME_MILLISECONDS", + default_value = "2000" + )] + pub block_time_milliseconds: u64, + + /// Timeout for bundle metering in milliseconds (default: 2000 milliseconds) + #[arg( + long, + env = "TIPS_INGRESS_METER_BUNDLE_TIMEOUT_MS", + default_value = "2000" + )] + pub meter_bundle_timeout_ms: u64, +} diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index e6db39d..5fcd0d1 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -16,9 +16,10 @@ use tips_core::{ AcceptedBundle, Bundle, BundleExtensions, BundleHash, CancelBundle, MeterBundleResponse, }; use tokio::sync::mpsc; -use tokio::time::Instant; +use tokio::time::{Duration, Instant, timeout}; use tracing::{info, warn}; +use crate::Config; use crate::metrics::{Metrics, record_histogram}; use crate::queue::QueuePublisher; use crate::validation::{AccountInfoLookup, L1BlockInfoLookup, validate_bundle, validate_tx}; @@ -47,27 +48,28 @@ pub struct IngressService { send_transaction_default_lifetime_seconds: u64, metrics: Metrics, block_time_milliseconds: u64, + meter_bundle_timeout_ms: u64, } impl IngressService { pub fn new( provider: RootProvider, simulation_provider: RootProvider, - dual_write_mempool: bool, queue: Queue, audit_channel: mpsc::UnboundedSender, - send_transaction_default_lifetime_seconds: u64, - block_time_milliseconds: u64, + config: Config, ) -> Self { Self { provider, simulation_provider, - dual_write_mempool, + dual_write_mempool: config.dual_write_mempool, bundle_queue: queue, audit_channel, - send_transaction_default_lifetime_seconds, + send_transaction_default_lifetime_seconds: config + .send_transaction_default_lifetime_seconds, metrics: Metrics::default(), - block_time_milliseconds, + block_time_milliseconds: config.block_time_milliseconds, + meter_bundle_timeout_ms: config.meter_bundle_timeout_ms, } } } @@ -79,13 +81,14 @@ where { async fn send_bundle(&self, bundle: Bundle) -> RpcResult { self.validate_bundle(&bundle).await?; - let meter_bundle_response = self.meter_bundle(&bundle).await?; let parsed_bundle: ParsedBundle = bundle + .clone() .try_into() .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; + let bundle_hash = &parsed_bundle.bundle_hash(); + let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await?; let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response); - let bundle_hash = &accepted_bundle.bundle_hash(); if let Err(e) = self .bundle_queue .publish(&accepted_bundle, bundle_hash) @@ -140,13 +143,15 @@ where reverting_tx_hashes: vec![transaction.tx_hash()], ..Default::default() }; - let meter_bundle_response = self.meter_bundle(&bundle).await?; - let parsed_bundle: ParsedBundle = bundle + .clone() .try_into() .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; + + let bundle_hash = &parsed_bundle.bundle_hash(); + let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await?; + let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response); - let bundle_hash = &accepted_bundle.bundle_hash(); if let Err(e) = self .bundle_queue @@ -253,14 +258,32 @@ where /// `meter_bundle` is used to determine how long a bundle will take to execute. A bundle that /// is within `block_time_milliseconds` will return the `MeterBundleResponse` that can be passed along /// to the builder. - async fn meter_bundle(&self, bundle: &Bundle) -> RpcResult { + async fn meter_bundle( + &self, + bundle: &Bundle, + bundle_hash: &B256, + ) -> RpcResult { let start = Instant::now(); - let res: MeterBundleResponse = self - .simulation_provider - .client() - .request("base_meterBundle", (bundle,)) - .await - .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; + let timeout_duration = Duration::from_millis(self.meter_bundle_timeout_ms); + + // The future we await has the nested type: + // Result< + // RpcResult, // 1. The inner operation's result + // tokio::time::error::Elapsed // 2. The outer timeout's result + // > + let res: MeterBundleResponse = timeout( + timeout_duration, + self.simulation_provider + .client() + .request("base_meterBundle", (bundle,)), + ) + .await + .map_err(|_| { + warn!(message = "Timed out on requesting metering", bundle_hash = %bundle_hash); + EthApiError::InvalidParams("Timeout on requesting metering".into()).into_rpc_err() + })? + .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; + record_histogram(start.elapsed(), "base_meterBundle".to_string()); // we can save some builder payload building computation by not including bundles @@ -274,3 +297,54 @@ where Ok(res) } } + +#[cfg(test)] +mod tests { + use super::*; + use tips_core::test_utils::create_test_meter_bundle_response; + + #[tokio::test] + async fn test_timeout_logic() { + let timeout_duration = Duration::from_millis(100); + + // Test a future that takes longer than the timeout + let slow_future = async { + tokio::time::sleep(Duration::from_millis(200)).await; + Ok::(create_test_meter_bundle_response()) + }; + + let result = timeout(timeout_duration, slow_future) + .await + .map_err(|_| { + EthApiError::InvalidParams("Timeout on requesting metering".into()).into_rpc_err() + }) + .map_err(|e| e.to_string()); + + assert!(result.is_err()); + let error_string = format!("{:?}", result.unwrap_err()); + assert!(error_string.contains("Timeout on requesting metering")); + } + + #[tokio::test] + async fn test_timeout_logic_success() { + let timeout_duration = Duration::from_millis(200); + + // Test a future that completes within the timeout + let fast_future = async { + tokio::time::sleep(Duration::from_millis(50)).await; + Ok::(create_test_meter_bundle_response()) + }; + + let result = timeout(timeout_duration, fast_future) + .await + .map_err(|_| { + EthApiError::InvalidParams("Timeout on requesting metering".into()).into_rpc_err() + }) + .map_err(|e| e.to_string()); + + assert!(result.is_ok()); + // we're assumging that `base_meterBundle` will not error hence the second unwrap + let res = result.unwrap().unwrap(); + assert_eq!(res, create_test_meter_bundle_response()); + } +} From 0b7738ce9425e5f0920429fb5401fcac4e91401e Mon Sep 17 00:00:00 2001 From: William Law Date: Mon, 10 Nov 2025 13:33:53 -0500 Subject: [PATCH 049/117] feat: replace `dual_write` with a `TxSubmissionMethod` (#65) * spike * move bundle logic inside * support both * better naming * default kafka --- .env.example | 2 +- crates/ingress-rpc/src/lib.rs | 33 ++++++++++- crates/ingress-rpc/src/service.rs | 98 ++++++++++++++++--------------- 3 files changed, 82 insertions(+), 51 deletions(-) diff --git a/.env.example b/.env.example index ed4777e..316b71d 100644 --- a/.env.example +++ b/.env.example @@ -2,7 +2,7 @@ TIPS_INGRESS_ADDRESS=0.0.0.0 TIPS_INGRESS_PORT=8080 TIPS_INGRESS_RPC_MEMPOOL=http://localhost:2222 -TIPS_INGRESS_DUAL_WRITE_MEMPOOL=false +TIPS_INGRESS_TX_SUBMISSION_METHOD=kafka TIPS_INGRESS_KAFKA_INGRESS_PROPERTIES_FILE=/app/docker/ingress-bundles-kafka-properties TIPS_INGRESS_KAFKA_INGRESS_TOPIC=tips-ingress TIPS_INGRESS_KAFKA_AUDIT_PROPERTIES_FILE=/app/docker/ingress-audit-kafka-properties diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index ee036b9..082f8f0 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -5,8 +5,31 @@ pub mod validation; use clap::Parser; use std::net::{IpAddr, SocketAddr}; +use std::str::FromStr; use url::Url; +#[derive(Debug, Clone, Copy)] +pub enum TxSubmissionMethod { + Mempool, + Kafka, + MempoolAndKafka, +} + +impl FromStr for TxSubmissionMethod { + type Err = String; + + fn from_str(s: &str) -> Result { + match s { + "mempool" => Ok(TxSubmissionMethod::Mempool), + "kafka" => Ok(TxSubmissionMethod::Kafka), + "mempool,kafka" | "kafka,mempool" => Ok(TxSubmissionMethod::MempoolAndKafka), + _ => Err(format!( + "Invalid submission method: '{s}'. Valid options: mempool, kafka, mempool,kafka, kafka,mempool" + )), + } + } +} + #[derive(Parser, Debug, Clone)] #[command(author, version, about, long_about = None)] pub struct Config { @@ -22,9 +45,13 @@ pub struct Config { #[arg(long, env = "TIPS_INGRESS_RPC_MEMPOOL")] pub mempool_url: Url, - /// Enable dual writing raw transactions to the mempool - #[arg(long, env = "TIPS_INGRESS_DUAL_WRITE_MEMPOOL", default_value = "false")] - pub dual_write_mempool: bool, + /// Method to submit transactions to the mempool + #[arg( + long, + env = "TIPS_INGRESS_TX_SUBMISSION_METHOD", + default_value = "mempool" + )] + pub tx_submission_method: TxSubmissionMethod, /// Kafka brokers for publishing mempool events #[arg(long, env = "TIPS_INGRESS_KAFKA_INGRESS_PROPERTIES_FILE")] diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 5fcd0d1..8398bfb 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -19,10 +19,10 @@ use tokio::sync::mpsc; use tokio::time::{Duration, Instant, timeout}; use tracing::{info, warn}; -use crate::Config; use crate::metrics::{Metrics, record_histogram}; use crate::queue::QueuePublisher; use crate::validation::{AccountInfoLookup, L1BlockInfoLookup, validate_bundle, validate_tx}; +use crate::{Config, TxSubmissionMethod}; #[rpc(server, namespace = "eth")] pub trait IngressApi { @@ -42,7 +42,7 @@ pub trait IngressApi { pub struct IngressService { provider: RootProvider, simulation_provider: RootProvider, - dual_write_mempool: bool, + tx_submission_method: TxSubmissionMethod, bundle_queue: Queue, audit_channel: mpsc::UnboundedSender, send_transaction_default_lifetime_seconds: u64, @@ -62,7 +62,7 @@ impl IngressService { Self { provider, simulation_provider, - dual_write_mempool: config.dual_write_mempool, + tx_submission_method: config.tx_submission_method, bundle_queue: queue, audit_channel, send_transaction_default_lifetime_seconds: config @@ -131,68 +131,72 @@ where let start = Instant::now(); let transaction = self.validate_tx(&data).await?; - let expiry_timestamp = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_secs() - + self.send_transaction_default_lifetime_seconds; - - let bundle = Bundle { - txs: vec![data.clone()], - max_timestamp: Some(expiry_timestamp), - reverting_tx_hashes: vec![transaction.tx_hash()], - ..Default::default() - }; - let parsed_bundle: ParsedBundle = bundle - .clone() - .try_into() - .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; + let send_to_kafka = matches!( + self.tx_submission_method, + TxSubmissionMethod::Kafka | TxSubmissionMethod::MempoolAndKafka + ); + let send_to_mempool = matches!( + self.tx_submission_method, + TxSubmissionMethod::Mempool | TxSubmissionMethod::MempoolAndKafka + ); - let bundle_hash = &parsed_bundle.bundle_hash(); - let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await?; + if send_to_kafka { + let expiry_timestamp = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap() + .as_secs() + + self.send_transaction_default_lifetime_seconds; + + let bundle = Bundle { + txs: vec![data.clone()], + max_timestamp: Some(expiry_timestamp), + reverting_tx_hashes: vec![transaction.tx_hash()], + ..Default::default() + }; + let parsed_bundle: ParsedBundle = bundle + .clone() + .try_into() + .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; + + let bundle_hash = &parsed_bundle.bundle_hash(); + let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await?; + + let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response); + + if let Err(e) = self + .bundle_queue + .publish(&accepted_bundle, bundle_hash) + .await + { + warn!(message = "Failed to publish Queue::enqueue_bundle", bundle_hash = %bundle_hash, error = %e); + } - let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response); + info!(message="queued singleton bundle", txn_hash=%transaction.tx_hash()); - if let Err(e) = self - .bundle_queue - .publish(&accepted_bundle, bundle_hash) - .await - { - warn!(message = "Failed to publish Queue::enqueue_bundle", bundle_hash = %bundle_hash, error = %e); + let audit_event = BundleEvent::Received { + bundle_id: *accepted_bundle.uuid(), + bundle: accepted_bundle.clone().into(), + }; + if let Err(e) = self.audit_channel.send(audit_event) { + warn!(message = "Failed to send audit event", error = %e); + } } - info!(message="queued singleton bundle", txn_hash=%transaction.tx_hash()); - - if self.dual_write_mempool { + if send_to_mempool { let response = self .provider .send_raw_transaction(data.iter().as_slice()) .await; - match response { Ok(_) => { info!(message = "sent transaction to the mempool", hash=%transaction.tx_hash()); } Err(e) => { - warn!( - message = "Failed to send raw transaction to mempool", - error = %e - ); + warn!(message = "Failed to send raw transaction to mempool", error = %e); } } } - let audit_event = BundleEvent::Received { - bundle_id: *accepted_bundle.uuid(), - bundle: accepted_bundle.clone().into(), - }; - if let Err(e) = self.audit_channel.send(audit_event) { - warn!(message = "Failed to send audit event", error = %e); - return Err( - EthApiError::InvalidParams("Failed to send audit event".into()).into_rpc_err(), - ); - } - self.metrics .send_raw_transaction_duration .record(start.elapsed().as_secs_f64()); From 82cd4d2299cf833453e268fdb5ad126c42f77114 Mon Sep 17 00:00:00 2001 From: William Law Date: Wed, 12 Nov 2025 14:44:44 -0500 Subject: [PATCH 050/117] feat: write metering information to the builders (#66) * spike * add builder rpc * add config flag * e2e testing fixes --------- Co-authored-by: Danyal Prout --- .env.example | 4 +- Cargo.lock | 999 +++++++++++++---------------- Cargo.toml | 16 +- crates/ingress-rpc/src/bin/main.rs | 19 +- crates/ingress-rpc/src/lib.rs | 46 ++ crates/ingress-rpc/src/service.rs | 80 ++- 6 files changed, 570 insertions(+), 594 deletions(-) diff --git a/.env.example b/.env.example index 316b71d..39132ab 100644 --- a/.env.example +++ b/.env.example @@ -2,7 +2,7 @@ TIPS_INGRESS_ADDRESS=0.0.0.0 TIPS_INGRESS_PORT=8080 TIPS_INGRESS_RPC_MEMPOOL=http://localhost:2222 -TIPS_INGRESS_TX_SUBMISSION_METHOD=kafka +TIPS_INGRESS_TX_SUBMISSION_METHOD=mempool TIPS_INGRESS_KAFKA_INGRESS_PROPERTIES_FILE=/app/docker/ingress-bundles-kafka-properties TIPS_INGRESS_KAFKA_INGRESS_TOPIC=tips-ingress TIPS_INGRESS_KAFKA_AUDIT_PROPERTIES_FILE=/app/docker/ingress-audit-kafka-properties @@ -13,6 +13,8 @@ TIPS_INGRESS_RPC_SIMULATION=http://localhost:8549 TIPS_INGRESS_METRICS_ADDR=0.0.0.0:9002 TIPS_INGRESS_BLOCK_TIME_MILLISECONDS=2000 TIPS_INGRESS_METER_BUNDLE_TIMEOUT_MS=2000 +TIPS_INGRESS_MAX_BUFFERED_METER_BUNDLE_RESPONSES=100 +TIPS_INGRESS_BUILDER_RPC=http://localhost:2222 # Audit service configuration TIPS_AUDIT_KAFKA_PROPERTIES_FILE=/app/docker/audit-kafka-properties diff --git a/Cargo.lock b/Cargo.lock index df78ce3..72e9344 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -38,9 +38,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy-chains" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bbb778f50ecb0cebfb5c05580948501927508da7bd628833a8c4bd8545e23e2" +checksum = "bfaa9ea039a6f9304b4a593d780b1f23e1ae183acdee938b11b38795acacc9f1" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -51,9 +51,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b151e38e42f1586a01369ec52a6934702731d07e8509a7307331b09f6c46dc" +checksum = "90d103d3e440ad6f703dd71a5b58a6abd24834563bde8a5fabe706e00242f810" dependencies = [ "alloy-eips", "alloy-primitives", @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2d5e8668ef6215efdb7dcca6f22277b4e483a5650e05f5de22b2350971f4b8" +checksum = "48ead76c8c84ab3a50c31c56bc2c748c2d64357ad2131c32f9b10ab790a25e1a" dependencies = [ "alloy-consensus", "alloy-eips", @@ -104,23 +104,25 @@ dependencies = [ [[package]] name = "alloy-eip2930" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b82752a889170df67bbb36d42ca63c531eb16274f0d7299ae2a680facba17bd" +checksum = "9441120fa82df73e8959ae0e4ab8ade03de2aaae61be313fbf5746277847ce25" dependencies = [ "alloy-primitives", "alloy-rlp", + "borsh", "serde", ] [[package]] name = "alloy-eip7702" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d4769c6ffddca380b0070d71c8b7f30bed375543fe76bb2f74ec0acf4b7cd16" +checksum = "2919c5a56a1007492da313e7a3b6d45ef5edc5d33416fdec63c0d7a2702a0d20" dependencies = [ "alloy-primitives", "alloy-rlp", + "borsh", "k256", "serde", "thiserror", @@ -128,9 +130,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5434834adaf64fa20a6fb90877bc1d33214c41b055cc49f82189c98614368cc" +checksum = "7bdbec74583d0067798d77afa43d58f00d93035335d7ceaa5d3f93857d461bb9" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -152,9 +154,9 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.23.1" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428b58c17ab5f9f71765dc5f116acb6580f599ce243b8ce391de3ba859670c61" +checksum = "527b47dc39850c6168002ddc1f7a2063e15d26137c1bb5330f6065a7524c1aa9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -175,9 +177,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919a8471cfbed7bcd8cf1197a57dda583ce0e10c6385f6ff4e8b41304b223392" +checksum = "c25d5acb35706e683df1ea333c862bdb6b7c5548836607cd5bb56e501cca0b4f" dependencies = [ "alloy-eips", "alloy-primitives", @@ -214,9 +216,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c69f6c9c68a1287c9d5ff903d0010726934de0dac10989be37b75a29190d55" +checksum = "31b67c5a702121e618217f7a86f314918acb2622276d0273490e2d4534490bc0" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -229,9 +231,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf2ae05219e73e0979cb2cf55612aafbab191d130f203079805eaf881cca58" +checksum = "612296e6b723470bb1101420a73c63dfd535aa9bf738ce09951aedbd4ab7292e" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -255,9 +257,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58f4f345cef483eab7374f2b6056973c7419ffe8ad35e994b7a7f5d8e0c7ba4" +checksum = "a0e7918396eecd69d9c907046ec8a93fb09b89e2f325d5e7ea9c4e3929aa0dd2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -268,9 +270,9 @@ dependencies = [ [[package]] name = "alloy-op-evm" -version = "0.23.1" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa49899e2b0e59a5325e2042a6c5bd4c17e1255fce1e66a9312816f52e886f1" +checksum = "6eea81517a852d9e3b03979c10febe00aacc3d50fbd34c5c30281051773285f7" dependencies = [ "alloy-consensus", "alloy-eips", @@ -326,9 +328,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de2597751539b1cc8fe4204e5325f9a9ed83fcacfb212018dfcfa7877e76de21" +checksum = "55c1313a527a2e464d067c031f3c2ec073754ef615cc0eabca702fd0fe35729c" dependencies = [ "alloy-chains", "alloy-consensus", @@ -382,14 +384,14 @@ checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] name = "alloy-rpc-client" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf8eb8be597cfa8c312934d2566ec4516f066d69164f9212d7a148979fdcfd8" +checksum = "45f802228273056528dfd6cc8845cc91a7c7e0c6fc1a66d19e8673743dacdc7e" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -410,9 +412,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b33cdc0483d236cdfff763dae799ccef9646e94fb549a74f7adac6a7f7bb86" +checksum = "00e11a40c917c704888aa5aa6ffa563395123b732868d2e072ec7dd46c3d4672" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -422,9 +424,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbde0801a32d21c5f111f037bee7e22874836fba7add34ed4a6919932dd7cf23" +checksum = "cdbf6d1766ca41e90ac21c4bc5cbc5e9e965978a25873c3f90b3992d905db4cb" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -433,9 +435,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "605ec375d91073851f566a3082548af69a28dca831b27a8be7c1b4c49f5c6ca2" +checksum = "07da696cc7fbfead4b1dda8afe408685cae80975cbb024f843ba74d9639cd0d3" dependencies = [ "alloy-consensus", "alloy-eips", @@ -451,9 +453,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "361cd87ead4ba7659bda8127902eda92d17fa7ceb18aba1676f7be10f7222487" +checksum = "a15e4831b71eea9d20126a411c1c09facf1d01d5cac84fd51d532d3c429cfc26" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -472,9 +474,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de4e95fb0572b97b17751d0fdf5cdc42b0050f9dd9459eddd1bf2e2fbfed0a33" +checksum = "fb0c800e2ce80829fca1491b3f9063c29092850dc6cf19249d5f678f0ce71bb0" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -486,9 +488,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64600fc6c312b7e0ba76f73a381059af044f4f21f43e07f51f1fa76c868fe302" +checksum = "751d1887f7d202514a82c5b3caf28ee8bd4a2ad9549e4f498b6f0bff99b52add" dependencies = [ "alloy-primitives", "serde", @@ -497,9 +499,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5772858492b26f780468ae693405f895d6a27dea6e3eab2c36b6217de47c2647" +checksum = "9cf0b42ffbf558badfecf1dde0c3c5ed91f29bb7e97876d0bed008c3d5d67171" dependencies = [ "alloy-primitives", "async-trait", @@ -512,9 +514,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4195b803d0a992d8dbaab2ca1986fc86533d4bc80967c0cce7668b26ad99ef9" +checksum = "3e7d555ee5f27be29af4ae312be014b57c6cff9acb23fe2cf008500be6ca7e33" dependencies = [ "alloy-consensus", "alloy-network", @@ -537,7 +539,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -553,7 +555,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", "syn-solidity", "tiny-keccak", ] @@ -570,7 +572,7 @@ dependencies = [ "macro-string", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", "syn-solidity", ] @@ -598,12 +600,11 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025a940182bddaeb594c26fe3728525ae262d0806fe6a4befdf5d7bc13d54bce" +checksum = "71b3deee699d6f271eab587624a9fa84d02d0755db7a95a043d52a6488d16ebe" dependencies = [ "alloy-json-rpc", - "alloy-primitives", "auto_impl", "base64 0.22.1", "derive_more", @@ -622,9 +623,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5064d1e1e1aabc918b5954e7fb8154c39e77ec6903a581b973198b26628fa" +checksum = "1720bd2ba8fe7e65138aca43bb0f680e4e0bcbd3ca39bf9d3035c9d7d2757f24" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -653,15 +654,14 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.0.41" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8e52276fdb553d3c11563afad2898f4085165e4093604afe3d78b69afbf408f" +checksum = "cd7ce8ed34106acd6e21942022b6a15be6454c2c3ead4d76811d3bdcd63cf771" dependencies = [ - "alloy-primitives", "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -740,7 +740,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -873,7 +873,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -911,7 +911,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -1000,7 +1000,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -1067,7 +1067,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -1078,7 +1078,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -1105,7 +1105,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -1116,9 +1116,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-config" -version = "1.8.8" +version = "1.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37cf2b6af2a95a20e266782b4f76f1a5e12bf412a9db2de9c1e9123b9d8c0ad8" +checksum = "1856b1b48b65f71a4dd940b1c0931f9a7b646d4a924b9828ffefc1454714668a" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1146,9 +1146,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.8" +version = "1.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf26925f4a5b59eb76722b63c2892b1d70d06fa053c72e4a100ec308c1d47bc" +checksum = "86590e57ea40121d47d3f2e131bfd873dea15d78dc2f4604f4734537ad9e56c4" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -1158,9 +1158,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.14.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879b6c89592deb404ba4dc0ae6b58ffd1795c78991cbb5b8bc441c48a070440d" +checksum = "5932a7d9d28b0d2ea34c6b3779d35e3dd6f6345317c34e73438c4f1f29144151" dependencies = [ "aws-lc-sys", "zeroize", @@ -1168,9 +1168,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "107a4e9d9cab9963e04e84bb8dee0e25f2a987f9a8bad5ed054abd439caa8f8c" +checksum = "1826f2e4cfc2cd19ee53c42fbf68e2f81ec21108e0b7ecf6a71cf062137360fc" dependencies = [ "bindgen", "cc", @@ -1181,9 +1181,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.5.12" +version = "1.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa006bb32360ed90ac51203feafb9d02e3d21046e1fd3a450a404b90ea73e5d" +checksum = "8fe0fd441565b0b318c76e7206c8d1d0b0166b3e986cf30e890b61feb6192045" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -1206,9 +1206,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.108.0" +version = "1.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200be4aed61e3c0669f7268bacb768f283f1c32a7014ce57225e1160be2f6ccb" +checksum = "eee73a27721035c46da0572b390a69fbdb333d0177c24f3d8f7ff952eeb96690" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1240,9 +1240,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.86.0" +version = "1.89.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0abbfab841446cce6e87af853a3ba2cc1bc9afcd3f3550dd556c43d434c86d" +checksum = "a9c1b1af02288f729e95b72bd17988c009aa72e26dcb59b3200f86d7aea726c9" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1262,9 +1262,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.89.0" +version = "1.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695dc67bb861ccb8426c9129b91c30e266a0e3d85650cafdf62fcca14c8fd338" +checksum = "4e8122301558dc7c6c68e878af918880b82ff41897a60c8c4e18e4dc4d93e9f1" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1284,9 +1284,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.88.0" +version = "1.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d30990923f4f675523c51eb1c0dec9b752fb267b36a61e83cbc219c9d86da715" +checksum = "a0c7808adcff8333eaa76a849e6de926c6ac1a1268b9fd6afe32de9c29ef29d2" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1307,9 +1307,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.3.5" +version = "1.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffc03068fbb9c8dd5ce1c6fb240678a5cffb86fb2b7b1985c999c4b83c8df68" +checksum = "c35452ec3f001e1f2f6db107b6373f1f48f05ec63ba2c5c9fa91f07dad32af11" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -1346,9 +1346,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.63.9" +version = "0.63.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165d8583d8d906e2fb5511d29201d447cc710864f075debcdd9c31c265412806" +checksum = "95bd108f7b3563598e4dc7b62e1388c9982324a2abd622442167012690184591" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -1366,9 +1366,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.60.12" +version = "0.60.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9656b85088f8d9dc7ad40f9a6c7228e1e8447cdf4b046c87e152e0805dea02fa" +checksum = "e29a304f8319781a39808847efb39561351b1bb76e933da7aa90232673638658" dependencies = [ "aws-smithy-types", "bytes", @@ -1377,9 +1377,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.62.4" +version = "0.62.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3feafd437c763db26aa04e0cc7591185d0961e64c61885bece0fb9d50ceac671" +checksum = "445d5d720c99eed0b4aa674ed00d835d9b1427dd73e04adaf2f94c6b2d6f9fca" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -1387,6 +1387,7 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", + "futures-util", "http 0.2.12", "http 1.3.1", "http-body 0.4.6", @@ -1398,9 +1399,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-client" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1053b5e587e6fa40ce5a79ea27957b04ba660baa02b28b7436f64850152234f1" +checksum = "623254723e8dfd535f566ee7b2381645f8981da086b5c4aa26c0c41582bb1d2c" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -1411,13 +1412,13 @@ dependencies = [ "http 1.3.1", "http-body 0.4.6", "hyper 0.14.32", - "hyper 1.7.0", + "hyper 1.8.0", "hyper-rustls 0.24.2", "hyper-rustls 0.27.7", "hyper-util", "pin-project-lite", "rustls 0.21.12", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-native-certs 0.8.2", "rustls-pki-types", "tokio", @@ -1428,9 +1429,9 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.61.6" +version = "0.61.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff418fc8ec5cadf8173b10125f05c2e7e1d46771406187b2c878557d4503390" +checksum = "2db31f727935fc63c6eeae8b37b438847639ec330a9161ece694efba257e0c54" dependencies = [ "aws-smithy-types", ] @@ -1456,9 +1457,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ab99739082da5347660c556689256438defae3bcefd66c52b095905730e404" +checksum = "0bbe9d018d646b96c7be063dd07987849862b0e6d07c778aad7d93d1be6c1ef0" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -1480,9 +1481,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3683c5b152d2ad753607179ed71988e8cfd52964443b4f74fd8e552d0bbfeb46" +checksum = "ec7204f9fd94749a7c53b26da1b961b4ac36bf070ef1e0b94bb09f79d4f6c193" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -1497,9 +1498,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.3.3" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f5b3a7486f6690ba25952cabf1e7d75e34d69eaff5081904a47bc79074d6457" +checksum = "25f535879a207fce0db74b679cfc3e91a3159c8144d717d55f5832aea9eef46e" dependencies = [ "base64-simd", "bytes", @@ -1523,18 +1524,18 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.11" +version = "0.60.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9c34127e8c624bc2999f3b657e749c1393bedc9cd97b92a804db8ced4d2e163" +checksum = "eab77cdd036b11056d2a30a7af7b775789fb024bf216acc13884c6c97752ae56" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "1.3.9" +version = "1.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2fd329bf0e901ff3f60425691410c69094dc2a1f34b331f37bfc4e9ac1565a1" +checksum = "d79fb68e3d7fe5d4833ea34dc87d2e97d26d3086cb3da660bb6b1f76d98680b6" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -1618,7 +1619,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -1716,14 +1717,14 @@ dependencies = [ "home", "http 1.3.1", "http-body-util", - "hyper 1.7.0", + "hyper 1.8.0", "hyper-named-pipe", "hyper-rustls 0.27.7", "hyper-util", "hyperlocal", "log", "pin-project-lite", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-native-certs 0.8.2", "rustls-pemfile 2.2.0", "rustls-pki-types", @@ -1751,6 +1752,29 @@ dependencies = [ "serde_with", ] +[[package]] +name = "borsh" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.110", +] + [[package]] name = "bumpalo" version = "3.19.0" @@ -1805,9 +1829,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.43" +version = "1.2.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739eb0f94557554b3ca9a86d2d37bebd49c5e6d0c1d2bda35ba5bdac830befc2" +checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" dependencies = [ "find-msvc-tools", "jobserver", @@ -1861,9 +1885,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.50" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623" +checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" dependencies = [ "clap_builder", "clap_derive", @@ -1871,9 +1895,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.50" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0" +checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" dependencies = [ "anstream", "anstyle", @@ -1890,7 +1914,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2013,15 +2037,15 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc-fast" -version = "1.3.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf62af4cc77d8fe1c22dde4e721d87f2f54056139d8c412e1366b740305f56f" +checksum = "6ddc2d09feefeee8bd78101665bd8645637828fa9317f9f292496dbbd8c65ff3" dependencies = [ "crc", "digest 0.10.7", - "libc", "rand 0.9.2", "regex", + "rustversion", ] [[package]] @@ -2135,7 +2159,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2150,7 +2174,7 @@ dependencies = [ "quote", "serde", "strsim", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2161,7 +2185,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core 0.20.11", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2172,7 +2196,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core 0.21.3", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2238,7 +2262,7 @@ checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2259,7 +2283,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", "unicode-xid", ] @@ -2292,7 +2316,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2360,7 +2384,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2431,22 +2455,22 @@ dependencies = [ [[package]] name = "enum-ordinalize" -version = "4.3.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" +checksum = "4a1091a7bb1f8f2c4b28f1fe2cef4980ca2d410a3d727d67ecc3178c9b0800f0" dependencies = [ "enum-ordinalize-derive", ] [[package]] name = "enum-ordinalize-derive" -version = "4.3.1" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" +checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2513,7 +2537,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2704,7 +2728,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -3047,9 +3071,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" +checksum = "1744436df46f0bde35af3eda22aeaba453aada65d8f1c171cd8a5f59030bd69f" dependencies = [ "atomic-waker", "bytes", @@ -3075,7 +3099,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" dependencies = [ "hex", - "hyper 1.7.0", + "hyper 1.8.0", "hyper-util", "pin-project-lite", "tokio", @@ -3106,9 +3130,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ "http 1.3.1", - "hyper 1.7.0", + "hyper 1.8.0", "hyper-util", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-native-certs 0.8.2", "rustls-pki-types", "tokio", @@ -3124,7 +3148,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.7.0", + "hyper 1.8.0", "hyper-util", "native-tls", "tokio", @@ -3145,7 +3169,7 @@ dependencies = [ "futures-util", "http 1.3.1", "http-body 1.0.1", - "hyper 1.7.0", + "hyper 1.8.0", "ipnet", "libc", "percent-encoding", @@ -3164,7 +3188,7 @@ checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" dependencies = [ "hex", "http-body-util", - "hyper 1.7.0", + "hyper 1.8.0", "hyper-util", "pin-project-lite", "tokio", @@ -3197,9 +3221,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", "potential_utf", @@ -3210,9 +3234,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -3223,11 +3247,10 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ - "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", @@ -3238,42 +3261,38 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" dependencies = [ - "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", "icu_provider", - "potential_utf", "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" +checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" [[package]] name = "icu_provider" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", - "stable_deref_trait", - "tinystr", "writeable", "yoke", "zerofrom", @@ -3325,7 +3344,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -3378,9 +3397,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iri-string" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" dependencies = [ "memchr", "serde", @@ -3437,9 +3456,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.81" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" +checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" dependencies = [ "once_cell", "wasm-bindgen", @@ -3494,7 +3513,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -3507,7 +3526,7 @@ dependencies = [ "http 1.3.1", "http-body 1.0.1", "http-body-util", - "hyper 1.7.0", + "hyper 1.8.0", "hyper-util", "jsonrpsee-core", "jsonrpsee-types", @@ -3610,9 +3629,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.22" +version = "1.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" +checksum = "15d118bbf3771060e7311cc7bb0545b01d08a8b4a7de949198dec1fa0ca1c0f7" dependencies = [ "cc", "libc", @@ -3628,9 +3647,9 @@ checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "litemap" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "lock_api" @@ -3679,7 +3698,7 @@ checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -3726,7 +3745,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -3737,7 +3756,7 @@ checksum = "2b166dea96003ee2531cf14833efedced545751d800f03535801d833313f8c15" dependencies = [ "base64 0.22.1", "http-body-util", - "hyper 1.7.0", + "hyper 1.8.0", "hyper-rustls 0.27.7", "hyper-util", "indexmap 2.12.0", @@ -3958,7 +3977,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -3993,9 +4012,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "op-alloy-consensus" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42e9de945efe3c2fbd207e69720c9c1af2b8caa6872aee0e216450c25a3ca70" +checksum = "a0d7ec388eb83a3e6c71774131dbbb2ba9c199b6acac7dce172ed8de2f819e91" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4017,9 +4036,9 @@ checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" [[package]] name = "op-alloy-network" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9da49a2812a0189dd05e81e4418c3ae13fd607a92654107f02ebad8e91ed9e" +checksum = "979fe768bbb571d1d0bd7f84bc35124243b4db17f944b94698872a4701e743a0" dependencies = [ "alloy-consensus", "alloy-network", @@ -4033,9 +4052,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd1eb7bddd2232856ba9d259320a094f9edf2b9061acfe5966e7960208393e6" +checksum = "cc252b5fa74dbd33aa2f9a40e5ff9cfe34ed2af9b9b235781bc7cc8ec7d6aca8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4052,9 +4071,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5429622150d18d8e6847a701135082622413e2451b64d03f979415d764566bef" +checksum = "c1abe694cd6718b8932da3f824f46778be0f43289e4103c88abc505c63533a04" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4071,9 +4090,9 @@ dependencies = [ [[package]] name = "op-revm" -version = "12.0.0" +version = "12.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e599c71e91670fb922e3cdcb04783caed1226352da19d674bd001b3bf2bc433" +checksum = "e31622d03b29c826e48800f4c8f389c8a9c440eb796a3e35203561a288f12985" dependencies = [ "auto_impl", "revm", @@ -4082,9 +4101,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.74" +version = "0.10.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654" +checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" dependencies = [ "bitflags 2.10.0", "cfg-if", @@ -4103,7 +4122,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -4123,9 +4142,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.110" +version = "0.9.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2" +checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" dependencies = [ "cc", "libc", @@ -4188,7 +4207,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -4236,7 +4255,7 @@ dependencies = [ "regex", "regex-syntax", "structmeta", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -4261,37 +4280,17 @@ dependencies = [ "ucd-trie", ] -[[package]] -name = "phf" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" -dependencies = [ - "phf_macros 0.11.3", - "phf_shared 0.11.3", -] - [[package]] name = "phf" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" dependencies = [ - "phf_macros 0.13.1", - "phf_shared 0.13.1", + "phf_macros", + "phf_shared", "serde", ] -[[package]] -name = "phf_generator" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" -dependencies = [ - "phf_shared 0.11.3", - "rand 0.8.5", -] - [[package]] name = "phf_generator" version = "0.13.1" @@ -4299,20 +4298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" dependencies = [ "fastrand", - "phf_shared 0.13.1", -] - -[[package]] -name = "phf_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" -dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", - "proc-macro2", - "quote", - "syn 2.0.108", + "phf_shared", ] [[package]] @@ -4321,20 +4307,11 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" dependencies = [ - "phf_generator 0.13.1", - "phf_shared 0.13.1", + "phf_generator", + "phf_shared", "proc-macro2", "quote", - "syn 2.0.108", -] - -[[package]] -name = "phf_shared" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" -dependencies = [ - "siphasher", + "syn 2.0.110", ] [[package]] @@ -4363,7 +4340,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -4412,9 +4389,9 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "potential_utf" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ "zerovec", ] @@ -4441,7 +4418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -4492,7 +4469,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -4556,7 +4533,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.34", + "rustls 0.23.35", "socket2 0.6.1", "thiserror", "tokio", @@ -4576,7 +4553,7 @@ dependencies = [ "rand 0.9.2", "ring", "rustc-hash", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-pki-types", "slab", "thiserror", @@ -4601,9 +4578,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.41" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -4795,7 +4772,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -4845,7 +4822,7 @@ dependencies = [ "http 1.3.1", "http-body 1.0.1", "http-body-util", - "hyper 1.7.0", + "hyper 1.8.0", "hyper-rustls 0.27.7", "hyper-tls", "hyper-util", @@ -4855,7 +4832,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.34", + "rustls 0.23.35", "rustls-native-certs 0.8.2", "rustls-pki-types", "serde", @@ -4876,8 +4853,8 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4902,8 +4879,8 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-chains", "alloy-consensus", @@ -4922,8 +4899,8 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4940,18 +4917,18 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] name = "reth-consensus" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -4963,8 +4940,8 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4975,8 +4952,8 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-eips", "alloy-primitives", @@ -4987,8 +4964,8 @@ dependencies = [ [[package]] name = "reth-errors" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -4998,8 +4975,8 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5019,8 +4996,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -5032,8 +5009,8 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5049,8 +5026,8 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5070,8 +5047,8 @@ dependencies = [ [[package]] name = "reth-execution-errors" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-evm", "alloy-primitives", @@ -5083,8 +5060,8 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5101,8 +5078,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "serde", "serde_json", @@ -5111,8 +5088,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "metrics", "metrics-derive", @@ -5120,16 +5097,16 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-primitives", ] [[package]] name = "reth-network-api" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5152,8 +5129,8 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5174,8 +5151,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5187,8 +5164,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-eip2124", "reth-net-banlist", @@ -5199,8 +5176,8 @@ dependencies = [ [[package]] name = "reth-optimism-chainspec" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5225,8 +5202,8 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5250,8 +5227,8 @@ dependencies = [ [[package]] name = "reth-optimism-evm" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5277,8 +5254,8 @@ dependencies = [ [[package]] name = "reth-optimism-forks" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-op-hardforks", "alloy-primitives", @@ -5288,8 +5265,8 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5306,8 +5283,8 @@ dependencies = [ [[package]] name = "reth-primitives-traits" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5322,9 +5299,9 @@ dependencies = [ "once_cell", "op-alloy-consensus", "reth-codecs", - "revm-bytecode 7.1.0", - "revm-primitives 21.0.1", - "revm-state 8.1.0", + "revm-bytecode", + "revm-primitives", + "revm-state", "secp256k1 0.30.0", "serde", "serde_with", @@ -5333,8 +5310,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-primitives", "derive_more", @@ -5345,8 +5322,8 @@ dependencies = [ [[package]] name = "reth-revm" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-primitives", "reth-primitives-traits", @@ -5357,8 +5334,8 @@ dependencies = [ [[package]] name = "reth-rpc-convert" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-json-rpc", @@ -5378,8 +5355,8 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5425,8 +5402,8 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5441,8 +5418,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-primitives", "bytes", @@ -5452,8 +5429,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-primitives", "derive_more", @@ -5463,8 +5440,8 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5485,8 +5462,8 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5495,14 +5472,14 @@ dependencies = [ "reth-primitives-traits", "reth-prune-types", "reth-static-file-types", - "revm-database-interface 8.0.4", + "revm-database-interface", "thiserror", ] [[package]] name = "reth-tasks" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "auto_impl", "dyn-clone", @@ -5517,8 +5494,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "tokio", "tokio-stream", @@ -5527,8 +5504,8 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5552,7 +5529,7 @@ dependencies = [ "reth-storage-api", "reth-tasks", "revm-interpreter", - "revm-primitives 21.0.1", + "revm-primitives", "rustc-hash", "schnellru", "serde", @@ -5566,8 +5543,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5588,8 +5565,8 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5611,8 +5588,8 @@ dependencies = [ [[package]] name = "reth-trie-sparse" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5627,177 +5604,136 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "1.9.0" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.0#84785f025eac5eed123997454998db77a299e1e5" +version = "1.9.1" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "31.0.0" +version = "31.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7bba993ce958f0b6eb23d2644ea8360982cb60baffedf961441e36faba6a2ca" +checksum = "bb67a5223602113cae59a305acde2d9936bc18f2478dda879a6124b267cebfb6" dependencies = [ - "revm-bytecode 7.1.0", + "revm-bytecode", "revm-context", - "revm-context-interface 12.0.0", + "revm-context-interface", "revm-database", - "revm-database-interface 8.0.4", + "revm-database-interface", "revm-handler", "revm-inspector", "revm-interpreter", "revm-precompile", - "revm-primitives 21.0.1", - "revm-state 8.1.0", + "revm-primitives", + "revm-state", ] [[package]] name = "revm-bytecode" -version = "6.2.2" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c52031b73cae95d84cd1b07725808b5fd1500da3e5e24574a3b2dc13d9f16d" +checksum = "e2c6b5e6e8dd1e28a4a60e5f46615d4ef0809111c9e63208e55b5c7058200fb0" dependencies = [ "bitvec", - "phf 0.11.3", - "revm-primitives 20.2.1", - "serde", -] - -[[package]] -name = "revm-bytecode" -version = "7.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2b51c414b7e79edd4a0569d06e2c4c029f8b60e5f3ee3e2fa21dc6c3717ee3" -dependencies = [ - "bitvec", - "phf 0.13.1", - "revm-primitives 21.0.1", + "phf", + "revm-primitives", "serde", ] [[package]] name = "revm-context" -version = "11.0.0" +version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f69efee45130bd9e5b0a7af27552fddc70bc161dafed533c2f818a2d1eb654e6" +checksum = "92850e150f4f99d46c05a20ad0cd09286a7ad4ee21866fffb87101de6e602231" dependencies = [ "bitvec", "cfg-if", "derive-where", - "revm-bytecode 7.1.0", - "revm-context-interface 12.0.0", - "revm-database-interface 8.0.4", - "revm-primitives 21.0.1", - "revm-state 8.1.0", + "revm-bytecode", + "revm-context-interface", + "revm-database-interface", + "revm-primitives", + "revm-state", "serde", ] [[package]] name = "revm-context-interface" -version = "10.2.0" +version = "12.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b50d241ed1ce647b94caf174fcd0239b7651318b2c4c06b825b59b973dfb8495" +checksum = "f6d701e2c2347d65216b066489ab22a0a8e1f7b2568256110d73a7d5eff3385c" dependencies = [ "alloy-eip2930", "alloy-eip7702", "auto_impl", "either", - "revm-database-interface 7.0.5", - "revm-primitives 20.2.1", - "revm-state 7.0.5", - "serde", -] - -[[package]] -name = "revm-context-interface" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce2525e93db0ae2a3ec7dcde5443dfdb6fbf321c5090380d775730c67bc6cee" -dependencies = [ - "alloy-eip2930", - "alloy-eip7702", - "auto_impl", - "either", - "revm-database-interface 8.0.4", - "revm-primitives 21.0.1", - "revm-state 8.1.0", + "revm-database-interface", + "revm-primitives", + "revm-state", "serde", ] [[package]] name = "revm-database" -version = "9.0.3" +version = "9.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2602625aa11ab1eda8e208e96b652c0bfa989b86c104a36537a62b081228af9" +checksum = "7b6c15bb255481fcf29f5ef7c97f00ed4c28a6ab6c490d77b990d73603031569" dependencies = [ "alloy-eips", - "revm-bytecode 7.1.0", - "revm-database-interface 8.0.4", - "revm-primitives 21.0.1", - "revm-state 8.1.0", - "serde", -] - -[[package]] -name = "revm-database-interface" -version = "7.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c523c77e74eeedbac5d6f7c092e3851dbe9c7fec6f418b85992bd79229db361" -dependencies = [ - "auto_impl", - "either", - "revm-primitives 20.2.1", - "revm-state 7.0.5", + "revm-bytecode", + "revm-database-interface", + "revm-primitives", + "revm-state", "serde", ] [[package]] name = "revm-database-interface" -version = "8.0.4" +version = "8.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58a4621143d6515e32f969306d9c85797ae0d3fe0c74784f1fda02ba441e5a08" +checksum = "8cce03e3780287b07abe58faf4a7f5d8be7e81321f93ccf3343c8f7755602bae" dependencies = [ "auto_impl", "either", - "revm-primitives 21.0.1", - "revm-state 8.1.0", + "revm-primitives", + "revm-state", "serde", ] [[package]] name = "revm-handler" -version = "12.0.0" +version = "12.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e756198d43b6c4c5886548ffbc4594412d1a82b81723525c6e85ed6da0e91c5f" +checksum = "b45418ed95cfdf0cb19effdbb7633cf2144cab7fb0e6ffd6b0eb9117a50adff6" dependencies = [ "auto_impl", "derive-where", - "revm-bytecode 7.1.0", + "revm-bytecode", "revm-context", - "revm-context-interface 12.0.0", - "revm-database-interface 8.0.4", + "revm-context-interface", + "revm-database-interface", "revm-interpreter", "revm-precompile", - "revm-primitives 21.0.1", - "revm-state 8.1.0", + "revm-primitives", + "revm-state", "serde", ] [[package]] name = "revm-inspector" -version = "12.0.0" +version = "12.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fdd1e74cc99c6173c8692b6e480291e2ad0c21c716d9dc16e937ab2e0da219" +checksum = "c99801eac7da06cc112df2244bd5a64024f4ef21240e923b26e73c4b4a0e5da6" dependencies = [ "auto_impl", "either", "revm-context", - "revm-database-interface 8.0.4", + "revm-database-interface", "revm-handler", "revm-interpreter", - "revm-primitives 21.0.1", - "revm-state 8.1.0", + "revm-primitives", + "revm-state", "serde", "serde_json", ] @@ -5822,22 +5758,22 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "29.0.0" +version = "29.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44efb7c2f4034a5bfd3d71ebfed076e48ac75e4972f1c117f2a20befac7716cd" +checksum = "22789ce92c5808c70185e3bc49732f987dc6fd907f77828c8d3470b2299c9c65" dependencies = [ - "revm-bytecode 7.1.0", - "revm-context-interface 12.0.0", - "revm-primitives 21.0.1", - "revm-state 8.1.0", + "revm-bytecode", + "revm-context-interface", + "revm-primitives", + "revm-state", "serde", ] [[package]] name = "revm-precompile" -version = "29.0.0" +version = "29.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585098ede6d84d6fc6096ba804b8e221c44dc77679571d32664a55e665aa236b" +checksum = "968b124028960201abf6d6bf8e223f15fadebb4307df6b7dc9244a0aab5d2d05" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -5850,7 +5786,7 @@ dependencies = [ "cfg-if", "k256", "p256 0.13.2", - "revm-primitives 21.0.1", + "revm-primitives", "ripemd", "rug", "secp256k1 0.31.1", @@ -5859,9 +5795,9 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "20.2.1" +version = "21.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa29d9da06fe03b249b6419b33968ecdf92ad6428e2f012dc57bcd619b5d94e" +checksum = "29e161db429d465c09ba9cbff0df49e31049fe6b549e28eb0b7bd642fcbd4412" dependencies = [ "alloy-primitives", "num_enum", @@ -5869,39 +5805,15 @@ dependencies = [ "serde", ] -[[package]] -name = "revm-primitives" -version = "21.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536f30e24c3c2bf0d3d7d20fa9cf99b93040ed0f021fd9301c78cddb0dacda13" -dependencies = [ - "alloy-primitives", - "num_enum", - "once_cell", - "serde", -] - -[[package]] -name = "revm-state" -version = "7.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f64fbacb86008394aaebd3454f9643b7d5a782bd251135e17c5b33da592d84d" -dependencies = [ - "bitflags 2.10.0", - "revm-bytecode 6.2.2", - "revm-primitives 20.2.1", - "serde", -] - [[package]] name = "revm-state" -version = "8.1.0" +version = "8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0b4873815e31cbc3e5b183b9128b86c09a487c027aaf8cc5cf4b9688878f9b" +checksum = "7d8be953b7e374dbdea0773cf360debed8df394ea8d82a8b240a6b5da37592fc" dependencies = [ "bitflags 2.10.0", - "revm-bytecode 7.1.0", - "revm-primitives 21.0.1", + "revm-bytecode", + "revm-primitives", "serde", ] @@ -6071,15 +5983,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.34" +version = "0.23.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7" +checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" dependencies = [ "aws-lc-rs", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.7", + "rustls-webpki 0.103.8", "subtle", "zeroize", ] @@ -6128,9 +6040,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" dependencies = [ "web-time", "zeroize", @@ -6148,9 +6060,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.7" +version = "0.103.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" dependencies = [ "aws-lc-rs", "ring", @@ -6205,9 +6117,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" +checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289" dependencies = [ "dyn-clone", "ref-cast", @@ -6399,7 +6311,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -6424,7 +6336,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -6451,7 +6363,7 @@ dependencies = [ "indexmap 1.9.3", "indexmap 2.12.0", "schemars 0.9.0", - "schemars 1.0.4", + "schemars 1.1.0", "serde_core", "serde_json", "serde_with_macros", @@ -6467,7 +6379,7 @@ dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -6682,7 +6594,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -6693,7 +6605,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -6714,7 +6626,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -6736,9 +6648,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.108" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -6754,7 +6666,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -6774,7 +6686,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -6851,7 +6763,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -6914,9 +6826,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -7032,7 +6944,7 @@ dependencies = [ "rdkafka", "reth-optimism-evm", "reth-rpc-eth-types", - "revm-context-interface 10.2.0", + "revm-context-interface", "serde_json", "tips-audit", "tips-core", @@ -7066,7 +6978,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -7095,7 +7007,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ - "rustls 0.23.34", + "rustls 0.23.35", "tokio", ] @@ -7128,9 +7040,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" +checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" dependencies = [ "bytes", "futures-core", @@ -7234,7 +7146,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -7333,9 +7245,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-segmentation" @@ -7456,9 +7368,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" dependencies = [ "cfg-if", "once_cell", @@ -7467,25 +7379,11 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn 2.0.108", - "wasm-bindgen-shared", -] - [[package]] name = "wasm-bindgen-futures" -version = "0.4.54" +version = "0.4.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c" +checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" dependencies = [ "cfg-if", "js-sys", @@ -7496,9 +7394,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7506,22 +7404,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" dependencies = [ + "bumpalo", "proc-macro2", "quote", - "syn 2.0.108", - "wasm-bindgen-backend", + "syn 2.0.110", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" dependencies = [ "unicode-ident", ] @@ -7542,9 +7440,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.81" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" +checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" dependencies = [ "js-sys", "wasm-bindgen", @@ -7603,7 +7501,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -7614,7 +7512,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -7880,9 +7778,9 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "writeable" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "wyz" @@ -7911,11 +7809,10 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "yoke" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ - "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -7923,13 +7820,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", "synstructure", ] @@ -7950,7 +7847,7 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -7970,7 +7867,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", "synstructure", ] @@ -7991,14 +7888,14 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] name = "zerotrie" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", "yoke", @@ -8007,9 +7904,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -8018,13 +7915,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b882b45..c4a154f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,17 +16,17 @@ tips-bundle-pool = { path = "crates/bundle-pool" } tips-core = { path = "crates/core" } # Reth -reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" } -reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" } +reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.1" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.1" } +reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.1" } # alloy -alloy-primitives = { version = "1.3.1", default-features = false, features = [ +alloy-primitives = { version = "1.4.1", default-features = false, features = [ "map-foldhash", "serde", ] } -alloy-consensus = { version = "1.0.37" } -alloy-provider = { version = "1.0.37" } +alloy-consensus = { version = "1.0.41" } +alloy-provider = { version = "1.0.41" } alloy-serde = "1.0.41" # op-alloy @@ -61,8 +61,8 @@ bytes = { version = "1.8.0", features = ["serde"] } # tips-ingress backon = "1.5.2" op-revm = { version = "12.0.0", default-features = false } -revm-context-interface = "10.2.0" -alloy-signer-local = "1.0.36" +revm-context-interface = "12.0.0" +alloy-signer-local = "1.0.41" # Misc metrics = "0.24.1" diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 5e091f1..7524109 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -5,13 +5,15 @@ use op_alloy_network::Optimism; use rdkafka::ClientConfig; use rdkafka::producer::FutureProducer; use tips_audit::{BundleEvent, KafkaBundleEventPublisher, connect_audit_to_publisher}; +use tips_core::MeterBundleResponse; use tips_core::kafka::load_kafka_config_from_file; use tips_core::logger::init_logger; use tips_ingress_rpc::Config; +use tips_ingress_rpc::connect_ingress_to_builder; use tips_ingress_rpc::metrics::init_prometheus_exporter; use tips_ingress_rpc::queue::KafkaQueuePublisher; use tips_ingress_rpc::service::{IngressApiServer, IngressService}; -use tokio::sync::mpsc; +use tokio::sync::{broadcast, mpsc}; use tracing::info; #[tokio::main] @@ -62,7 +64,20 @@ async fn main() -> anyhow::Result<()> { let (audit_tx, audit_rx) = mpsc::unbounded_channel::(); connect_audit_to_publisher(audit_rx, audit_publisher); - let service = IngressService::new(provider, simulation_provider, queue, audit_tx, cfg); + // TODO: when we have multiple builders we can make `builder_rx` mutable and do `.subscribe()` to have multiple consumers + // of this channel. + let (builder_tx, builder_rx) = + broadcast::channel::(config.max_buffered_meter_bundle_responses); + connect_ingress_to_builder(builder_rx, config.builder_rpc); + + let service = IngressService::new( + provider, + simulation_provider, + queue, + audit_tx, + builder_tx, + cfg, + ); let bind_addr = format!("{}:{}", config.address, config.port); let server = Server::builder().build(&bind_addr).await?; diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index 082f8f0..e1b0564 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -3,9 +3,15 @@ pub mod queue; pub mod service; pub mod validation; +use alloy_primitives::TxHash; +use alloy_provider::{Provider, ProviderBuilder, RootProvider}; use clap::Parser; +use op_alloy_network::Optimism; use std::net::{IpAddr, SocketAddr}; use std::str::FromStr; +use tips_core::MeterBundleResponse; +use tokio::sync::broadcast; +use tracing::error; use url::Url; #[derive(Debug, Clone, Copy)] @@ -115,4 +121,44 @@ pub struct Config { default_value = "2000" )] pub meter_bundle_timeout_ms: u64, + + /// URL of the builder RPC service for setting metering information + #[arg(long, env = "TIPS_INGRESS_BUILDER_RPC")] + pub builder_rpc: Url, + + /// Maximum number of `MeterBundleResponse`s to buffer in memory + #[arg( + long, + env = "TIPS_INGRESS_MAX_BUFFERED_METER_BUNDLE_RESPONSES", + default_value = "100" + )] + pub max_buffered_meter_bundle_responses: usize, +} + +pub fn connect_ingress_to_builder( + event_rx: broadcast::Receiver, + builder_rpc: Url, +) { + tokio::spawn(async move { + let builder: RootProvider = ProviderBuilder::new() + .disable_recommended_fillers() + .network::() + .connect_http(builder_rpc); + + let mut event_rx = event_rx; + while let Ok(event) = event_rx.recv().await { + // we only support one transaction per bundle for now + let tx_hash = event.results[0].tx_hash; + if let Err(e) = builder + .client() + .request::<(TxHash, MeterBundleResponse), ()>( + "base_setMeteringInformation", + (tx_hash, event), + ) + .await + { + error!(error = %e, "Failed to set metering information for tx hash: {tx_hash}"); + } + } + }); } diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 8398bfb..c0862a5 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -15,7 +15,7 @@ use tips_core::types::ParsedBundle; use tips_core::{ AcceptedBundle, Bundle, BundleExtensions, BundleHash, CancelBundle, MeterBundleResponse, }; -use tokio::sync::mpsc; +use tokio::sync::{broadcast, mpsc}; use tokio::time::{Duration, Instant, timeout}; use tracing::{info, warn}; @@ -49,6 +49,7 @@ pub struct IngressService { metrics: Metrics, block_time_milliseconds: u64, meter_bundle_timeout_ms: u64, + builder_tx: broadcast::Sender, } impl IngressService { @@ -57,6 +58,7 @@ impl IngressService { simulation_provider: RootProvider, queue: Queue, audit_channel: mpsc::UnboundedSender, + builder_tx: broadcast::Sender, config: Config, ) -> Self { Self { @@ -70,6 +72,7 @@ impl IngressService { metrics: Metrics::default(), block_time_milliseconds: config.block_time_milliseconds, meter_bundle_timeout_ms: config.meter_bundle_timeout_ms, + builder_tx, } } } @@ -80,6 +83,7 @@ where Queue: QueuePublisher + Sync + Send + 'static, { async fn send_bundle(&self, bundle: Bundle) -> RpcResult { + // validate the bundle and consume the `bundle` to get an `AcceptedBundle` self.validate_bundle(&bundle).await?; let parsed_bundle: ParsedBundle = bundle .clone() @@ -87,8 +91,14 @@ where .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; let bundle_hash = &parsed_bundle.bundle_hash(); let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await?; - let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response); + let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response.clone()); + // asynchronously send the meter bundle response to the builder + self.builder_tx + .send(meter_bundle_response) + .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; + + // publish the bundle to the queue if let Err(e) = self .bundle_queue .publish(&accepted_bundle, bundle_hash) @@ -103,6 +113,7 @@ where bundle_hash = %bundle_hash, ); + // asynchronously send the audit event to the audit channel let audit_event = BundleEvent::Received { bundle_id: *accepted_bundle.uuid(), bundle: Box::new(accepted_bundle.clone()), @@ -140,29 +151,33 @@ where TxSubmissionMethod::Mempool | TxSubmissionMethod::MempoolAndKafka ); - if send_to_kafka { - let expiry_timestamp = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_secs() - + self.send_transaction_default_lifetime_seconds; - - let bundle = Bundle { - txs: vec![data.clone()], - max_timestamp: Some(expiry_timestamp), - reverting_tx_hashes: vec![transaction.tx_hash()], - ..Default::default() - }; - let parsed_bundle: ParsedBundle = bundle - .clone() - .try_into() - .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; - - let bundle_hash = &parsed_bundle.bundle_hash(); - let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await?; - - let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response); + let expiry_timestamp = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap() + .as_secs() + + self.send_transaction_default_lifetime_seconds; + + let bundle = Bundle { + txs: vec![data.clone()], + max_timestamp: Some(expiry_timestamp), + reverting_tx_hashes: vec![transaction.tx_hash()], + ..Default::default() + }; + let parsed_bundle: ParsedBundle = bundle + .clone() + .try_into() + .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; + + let bundle_hash = &parsed_bundle.bundle_hash(); + let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await?; + + let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response.clone()); + + self.builder_tx + .send(meter_bundle_response) + .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; + if send_to_kafka { if let Err(e) = self .bundle_queue .publish(&accepted_bundle, bundle_hash) @@ -172,14 +187,6 @@ where } info!(message="queued singleton bundle", txn_hash=%transaction.tx_hash()); - - let audit_event = BundleEvent::Received { - bundle_id: *accepted_bundle.uuid(), - bundle: accepted_bundle.clone().into(), - }; - if let Err(e) = self.audit_channel.send(audit_event) { - warn!(message = "Failed to send audit event", error = %e); - } } if send_to_mempool { @@ -197,9 +204,18 @@ where } } + let audit_event = BundleEvent::Received { + bundle_id: *accepted_bundle.uuid(), + bundle: accepted_bundle.clone().into(), + }; + if let Err(e) = self.audit_channel.send(audit_event) { + warn!(message = "Failed to send audit event", error = %e); + } + self.metrics .send_raw_transaction_duration .record(start.elapsed().as_secs_f64()); + Ok(transaction.tx_hash()) } } From d9dfa41140d98b560a211ef779fc54f16d3830b1 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Wed, 12 Nov 2025 14:14:19 -0600 Subject: [PATCH 051/117] chore: delete unused bundle pool (#67) --- Cargo.lock | 25 -- Cargo.toml | 2 +- crates/bundle-pool/Cargo.toml | 33 --- crates/bundle-pool/src/lib.rs | 35 --- crates/bundle-pool/src/pool.rs | 279 ------------------ crates/bundle-pool/src/source.rs | 80 ----- crates/bundle-pool/tests/integration_tests.rs | 98 ------ 7 files changed, 1 insertion(+), 551 deletions(-) delete mode 100644 crates/bundle-pool/Cargo.toml delete mode 100644 crates/bundle-pool/src/lib.rs delete mode 100644 crates/bundle-pool/src/pool.rs delete mode 100644 crates/bundle-pool/src/source.rs delete mode 100644 crates/bundle-pool/tests/integration_tests.rs diff --git a/Cargo.lock b/Cargo.lock index 72e9344..3c1cfbf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6877,31 +6877,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "tips-bundle-pool" -version = "0.1.0" -dependencies = [ - "alloy-consensus", - "alloy-primitives", - "alloy-provider", - "alloy-signer", - "alloy-signer-local", - "anyhow", - "async-trait", - "op-alloy-consensus", - "op-alloy-rpc-types", - "rdkafka", - "serde", - "serde_json", - "testcontainers", - "testcontainers-modules", - "tips-audit", - "tips-core", - "tokio", - "tracing", - "uuid", -] - [[package]] name = "tips-core" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index c4a154f..5467e3a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://github.com/base/tips" repository = "https://github.com/base/tips" [workspace] -members = ["crates/audit", "crates/ingress-rpc", "crates/bundle-pool", "crates/core"] +members = ["crates/audit", "crates/ingress-rpc", "crates/core"] resolver = "2" [workspace.dependencies] diff --git a/crates/bundle-pool/Cargo.toml b/crates/bundle-pool/Cargo.toml deleted file mode 100644 index 26babb5..0000000 --- a/crates/bundle-pool/Cargo.toml +++ /dev/null @@ -1,33 +0,0 @@ -[package] -name = "tips-bundle-pool" -version.workspace = true -rust-version.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true -edition.workspace = true - -[dependencies] -tips-core = { workspace = true } -tips-audit.workspace = true -uuid.workspace = true -alloy-primitives.workspace = true - -tracing.workspace = true -tokio.workspace = true -anyhow.workspace = true -async-trait.workspace = true -rdkafka.workspace = true -serde_json.workspace = true - -[dev-dependencies] -tips-core = { workspace = true, features = ["test-utils"] } -alloy-consensus.workspace = true -alloy-provider.workspace = true -alloy-signer = "1.0.41" -alloy-signer-local = "1.0.41" -op-alloy-consensus.workspace = true -op-alloy-rpc-types.workspace = true -testcontainers.workspace = true -testcontainers-modules.workspace = true -serde.workspace = true diff --git a/crates/bundle-pool/src/lib.rs b/crates/bundle-pool/src/lib.rs deleted file mode 100644 index 14f002c..0000000 --- a/crates/bundle-pool/src/lib.rs +++ /dev/null @@ -1,35 +0,0 @@ -pub mod pool; -pub mod source; - -use source::BundleSource; -use std::sync::{Arc, Mutex}; -use tokio::sync::mpsc; -use tracing::error; - -pub use pool::{Action, BundleStore, InMemoryBundlePool, ProcessedBundle}; -pub use source::KafkaBundleSource; -pub use tips_core::{AcceptedBundle, Bundle, CancelBundle}; - -pub fn connect_sources_to_pool( - sources: Vec, - bundle_rx: mpsc::UnboundedReceiver, - pool: Arc>, -) where - S: BundleSource + Send + 'static, - P: BundleStore + Send + 'static, -{ - for source in sources { - tokio::spawn(async move { - if let Err(e) = source.run().await { - error!(error = %e, "Bundle source failed"); - } - }); - } - - tokio::spawn(async move { - let mut bundle_rx = bundle_rx; - while let Some(bundle) = bundle_rx.recv().await { - pool.lock().unwrap().add_bundle(bundle); - } - }); -} diff --git a/crates/bundle-pool/src/pool.rs b/crates/bundle-pool/src/pool.rs deleted file mode 100644 index 4a529c9..0000000 --- a/crates/bundle-pool/src/pool.rs +++ /dev/null @@ -1,279 +0,0 @@ -use alloy_primitives::TxHash; -use alloy_primitives::map::HashMap; -use std::fmt::Debug; -use std::sync::{Arc, Mutex}; -use tips_audit::{BundleEvent, DropReason}; -use tips_core::AcceptedBundle; -use tokio::sync::mpsc; -use tracing::warn; -use uuid::Uuid; - -#[derive(Debug, Clone)] -pub enum Action { - Included, - Skipped, - Dropped, -} - -#[derive(Debug, Clone)] -pub struct ProcessedBundle { - pub bundle_uuid: Uuid, - pub action: Action, -} - -impl ProcessedBundle { - pub fn new(bundle_uuid: Uuid, action: Action) -> Self { - Self { - bundle_uuid, - action, - } - } -} - -pub trait BundleStore { - fn add_bundle(&mut self, bundle: AcceptedBundle); - fn get_bundles(&self) -> Vec; - fn built_flashblock( - &mut self, - block_number: u64, - flashblock_index: u64, - processed: Vec, - ); - fn on_new_block(&mut self, number: u64, hash: TxHash); -} - -struct BundleData { - flashblocks_in_block: HashMap>, - bundles: HashMap, -} - -#[derive(Clone)] -pub struct InMemoryBundlePool { - inner: Arc>, - audit_log: mpsc::UnboundedSender, - builder_id: String, -} - -impl Debug for InMemoryBundlePool { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - f.debug_struct("InMemoryBundlePool") - .field("builder_id", &self.builder_id) - .field("bundle_count", &self.inner.lock().unwrap().bundles.len()) - .finish() - } -} - -impl InMemoryBundlePool { - pub fn new(audit_log: mpsc::UnboundedSender, builder_id: String) -> Self { - InMemoryBundlePool { - inner: Arc::new(Mutex::new(BundleData { - flashblocks_in_block: Default::default(), - bundles: Default::default(), - })), - audit_log, - builder_id, - } - } -} - -impl BundleStore for InMemoryBundlePool { - fn add_bundle(&mut self, bundle: AcceptedBundle) { - let mut inner = self.inner.lock().unwrap(); - inner.bundles.insert(*bundle.uuid(), bundle); - } - - fn get_bundles(&self) -> Vec { - let inner = self.inner.lock().unwrap(); - inner.bundles.values().cloned().collect() - } - - fn built_flashblock( - &mut self, - block_number: u64, - flashblock_index: u64, - processed: Vec, - ) { - let mut inner = self.inner.lock().unwrap(); - - for p in &processed { - let event = match p.action { - Action::Included => Some(BundleEvent::BuilderIncluded { - bundle_id: p.bundle_uuid, - builder: self.builder_id.clone(), - block_number, - flashblock_index, - }), - Action::Dropped => Some(BundleEvent::Dropped { - bundle_id: p.bundle_uuid, - reason: DropReason::Reverted, - }), - _ => None, - }; - - if let Some(event) = event - && let Err(e) = self.audit_log.send(event) - { - warn!(error = %e, "Failed to send event to audit log"); - } - } - - for p in processed.iter() { - inner.bundles.remove(&p.bundle_uuid); - } - - let flashblocks_for_block = inner.flashblocks_in_block.entry(block_number).or_default(); - flashblocks_for_block.extend(processed); - } - - fn on_new_block(&mut self, number: u64, hash: TxHash) { - let mut inner = self.inner.lock().unwrap(); - - let flashblocks_for_block = inner.flashblocks_in_block.entry(number).or_default(); - for p in flashblocks_for_block.iter() { - let event = match p.action { - Action::Included => Some(BundleEvent::BlockIncluded { - bundle_id: p.bundle_uuid, - block_number: number, - block_hash: hash, - }), - _ => None, - }; - - if let Some(event) = event - && let Err(e) = self.audit_log.send(event) - { - warn!(error = %e, "Failed to send event to audit log"); - } - } - inner.flashblocks_in_block.remove(&number); - } -} - -#[cfg(test)] -mod tests { - use super::*; - use alloy_signer_local::PrivateKeySigner; - use tips_audit::BundleEvent; - use tips_core::test_utils::{create_test_bundle, create_transaction}; - - #[tokio::test] - async fn test_operations() { - let alice = PrivateKeySigner::random(); - let bob = PrivateKeySigner::random(); - - let t1 = create_transaction(alice.clone(), 1, bob.address()); - let t2 = create_transaction(alice.clone(), 2, bob.address()); - let t3 = create_transaction(alice, 3, bob.address()); - - let (event_tx, _event_rx) = mpsc::unbounded_channel::(); - let mut pool = InMemoryBundlePool::new(event_tx, "test-builder".to_string()); - let bundle1 = create_test_bundle(vec![t1], None, None, None); - let bundle2 = create_test_bundle(vec![t2], None, None, None); - let bundle3 = create_test_bundle(vec![t3], None, None, None); - - let uuid1 = *bundle1.uuid(); - let uuid2 = *bundle2.uuid(); - let uuid3 = *bundle3.uuid(); - - pool.add_bundle(bundle1); - pool.add_bundle(bundle2); - pool.add_bundle(bundle3); - - let bundles = pool.get_bundles(); - assert_eq!(bundles.len(), 3); - - pool.built_flashblock( - 1, - 0, - vec![ - ProcessedBundle { - bundle_uuid: uuid1, - action: Action::Included, - }, - ProcessedBundle { - bundle_uuid: uuid2, - action: Action::Dropped, - }, - ], - ); - - let bundles = pool.get_bundles(); - assert_eq!(bundles.len(), 1); - assert_eq!(*bundles[0].uuid(), uuid3); - } - - #[tokio::test] - async fn test_with_audit() { - let alice = PrivateKeySigner::random(); - let bob = PrivateKeySigner::random(); - - let t1 = create_transaction(alice.clone(), 1, bob.address()); - let t2 = create_transaction(alice.clone(), 2, bob.address()); - let t3 = create_transaction(alice, 3, bob.address()); - - let (event_tx, mut event_rx) = mpsc::unbounded_channel::(); - let mut pool = InMemoryBundlePool::new(event_tx, "test-builder".to_string()); - - let bundle1 = create_test_bundle(vec![t1], None, None, None); - let bundle2 = create_test_bundle(vec![t2], None, None, None); - let bundle3 = create_test_bundle(vec![t3], None, None, None); - - let uuid1 = *bundle1.uuid(); - let uuid2 = *bundle2.uuid(); - let uuid3 = *bundle3.uuid(); - - pool.add_bundle(bundle1); - pool.add_bundle(bundle2); - pool.add_bundle(bundle3); - - let bundles = pool.get_bundles(); - assert_eq!(bundles.len(), 3); - - pool.built_flashblock( - 100, - 5, - vec![ - ProcessedBundle { - bundle_uuid: uuid1, - action: Action::Included, - }, - ProcessedBundle { - bundle_uuid: uuid2, - action: Action::Dropped, - }, - ], - ); - - let event1 = event_rx.recv().await.unwrap(); - let event2 = event_rx.recv().await.unwrap(); - - match &event1 { - BundleEvent::BuilderIncluded { - bundle_id, - builder, - block_number, - flashblock_index, - } => { - assert_eq!(*bundle_id, uuid1); - assert_eq!(builder, "test-builder"); - assert_eq!(*block_number, 100); - assert_eq!(*flashblock_index, 5); - } - _ => panic!("Expected BuilderIncluded event"), - } - - match &event2 { - BundleEvent::Dropped { - bundle_id, - reason: _, - } => { - assert_eq!(*bundle_id, uuid2); - } - _ => panic!("Expected Dropped event"), - } - - let bundles = pool.get_bundles(); - assert_eq!(bundles.len(), 1); - assert_eq!(*bundles[0].uuid(), uuid3); - } -} diff --git a/crates/bundle-pool/src/source.rs b/crates/bundle-pool/src/source.rs deleted file mode 100644 index e81bcbb..0000000 --- a/crates/bundle-pool/src/source.rs +++ /dev/null @@ -1,80 +0,0 @@ -use anyhow::Result; -use async_trait::async_trait; -use rdkafka::consumer::{Consumer, StreamConsumer}; -use rdkafka::{ClientConfig, Message}; -use std::fmt::Debug; -use tips_core::AcceptedBundle; -use tokio::sync::mpsc; -use tracing::{error, trace}; - -#[async_trait] -pub trait BundleSource { - async fn run(&self) -> Result<()>; -} - -pub struct KafkaBundleSource { - queue_consumer: StreamConsumer, - publisher: mpsc::UnboundedSender, -} - -impl Debug for KafkaBundleSource { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "KafkaBundleSource") - } -} - -impl KafkaBundleSource { - pub fn new( - client_config: ClientConfig, - topic: String, - publisher: mpsc::UnboundedSender, - ) -> Result { - let queue_consumer: StreamConsumer = client_config.create()?; - queue_consumer.subscribe(&[topic.as_str()])?; - Ok(Self { - queue_consumer, - publisher, - }) - } -} - -#[async_trait] -impl BundleSource for KafkaBundleSource { - async fn run(&self) -> Result<()> { - loop { - match self.queue_consumer.recv().await { - Ok(message) => { - let payload = match message.payload() { - Some(p) => p, - None => { - error!("Message has no payload"); - continue; - } - }; - - let accepted_bundle: AcceptedBundle = match serde_json::from_slice(payload) { - Ok(b) => b, - Err(e) => { - error!(error = %e, "Failed to deserialize bundle"); - continue; - } - }; - - trace!( - bundle = ?accepted_bundle, - offset = message.offset(), - partition = message.partition(), - "Received bundle from Kafka" - ); - - if let Err(e) = self.publisher.send(accepted_bundle) { - error!(error = ?e, "Failed to publish bundle to queue"); - } - } - Err(e) => { - error!(error = %e, "Error receiving message from Kafka"); - } - } - } - } -} diff --git a/crates/bundle-pool/tests/integration_tests.rs b/crates/bundle-pool/tests/integration_tests.rs deleted file mode 100644 index b622e31..0000000 --- a/crates/bundle-pool/tests/integration_tests.rs +++ /dev/null @@ -1,98 +0,0 @@ -use alloy_signer_local::PrivateKeySigner; -use rdkafka::ClientConfig; -use rdkafka::producer::{FutureProducer, FutureRecord}; -use std::sync::{Arc, Mutex}; -use std::time::Duration; -use testcontainers::runners::AsyncRunner; -use testcontainers_modules::testcontainers::ContainerAsync; -use testcontainers_modules::{kafka, kafka::Kafka}; -use tips_audit::BundleEvent; -use tips_bundle_pool::{ - BundleStore, InMemoryBundlePool, KafkaBundleSource, connect_sources_to_pool, -}; -use tips_core::{ - AcceptedBundle, - test_utils::{create_test_bundle, create_transaction}, -}; -use tokio::sync::mpsc; - -async fn setup_kafka() --> Result<(ContainerAsync, FutureProducer, ClientConfig), Box> { - let kafka_container = Kafka::default().start().await?; - let bootstrap_servers = format!( - "127.0.0.1:{}", - kafka_container - .get_host_port_ipv4(kafka::KAFKA_PORT) - .await? - ); - - let kafka_producer = ClientConfig::new() - .set("bootstrap.servers", &bootstrap_servers) - .set("message.timeout.ms", "5000") - .create::()?; - - let mut kafka_consumer_config = ClientConfig::new(); - kafka_consumer_config - .set("group.id", "bundle-pool-test-source") - .set("bootstrap.servers", &bootstrap_servers) - .set("session.timeout.ms", "6000") - .set("enable.auto.commit", "false") - .set("auto.offset.reset", "earliest"); - - Ok((kafka_container, kafka_producer, kafka_consumer_config)) -} - -#[tokio::test] -async fn test_kafka_bundle_source_to_pool_integration() -> Result<(), Box> { - let topic = "test-bundles"; - let (_kafka_container, kafka_producer, kafka_consumer_config) = setup_kafka().await?; - - let (bundle_tx, bundle_rx) = mpsc::unbounded_channel::(); - - let kafka_source = KafkaBundleSource::new(kafka_consumer_config, topic.to_string(), bundle_tx)?; - - let (audit_tx, _audit_rx) = mpsc::unbounded_channel::(); - let pool = Arc::new(Mutex::new(InMemoryBundlePool::new( - audit_tx, - "test-builder".to_string(), - ))); - - connect_sources_to_pool(vec![kafka_source], bundle_rx, pool.clone()); - - let alice = PrivateKeySigner::random(); - let bob = PrivateKeySigner::random(); - let tx1 = create_transaction(alice.clone(), 1, bob.address()); - let test_bundle = create_test_bundle(vec![tx1], Some(100), None, None); - let test_bundle_uuid = *test_bundle.uuid(); - - let bundle_payload = serde_json::to_string(&test_bundle)?; - - kafka_producer - .send( - FutureRecord::to(topic) - .payload(&bundle_payload) - .key("test-key"), - Duration::from_secs(5), - ) - .await - .map_err(|(e, _)| e)?; - - let mut counter = 0; - loop { - counter += 1; - assert!(counter < 10); - - tokio::time::sleep(Duration::from_millis(500)).await; - - let bundles = pool.lock().unwrap().get_bundles(); - if bundles.is_empty() { - continue; - } - - assert_eq!(bundles.len(), 1); - assert_eq!(*bundles[0].uuid(), test_bundle_uuid); - break; - } - - Ok(()) -} From 106bc7ffd87ddbd7f606ee47764d9e2c24692933 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Wed, 12 Nov 2025 14:23:53 -0600 Subject: [PATCH 052/117] chore: change types to u256 (#68) --- crates/core/src/test_utils.rs | 8 ++++---- crates/core/src/types.rs | 29 ++++++++++++++++------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/crates/core/src/test_utils.rs b/crates/core/src/test_utils.rs index edf3b8e..34a95db 100644 --- a/crates/core/src/test_utils.rs +++ b/crates/core/src/test_utils.rs @@ -65,11 +65,11 @@ pub fn create_test_bundle( pub fn create_test_meter_bundle_response() -> MeterBundleResponse { MeterBundleResponse { - bundle_gas_price: "0".to_string(), + bundle_gas_price: U256::from(0), bundle_hash: B256::default(), - coinbase_diff: "0".to_string(), - eth_sent_to_coinbase: "0".to_string(), - gas_fees: "0".to_string(), + coinbase_diff: U256::from(0), + eth_sent_to_coinbase: U256::from(0), + gas_fees: U256::from(0), results: vec![], state_block_number: 0, state_flashblock_index: None, diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index 536098c..a56d8ab 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -1,7 +1,7 @@ use alloy_consensus::Transaction; use alloy_consensus::transaction::Recovered; use alloy_consensus::transaction::SignerRecoverable; -use alloy_primitives::{Address, B256, Bytes, TxHash, keccak256}; +use alloy_primitives::{Address, B256, Bytes, TxHash, U256, keccak256}; use alloy_provider::network::eip2718::{Decodable2718, Encodable2718}; use op_alloy_consensus::OpTxEnvelope; use op_alloy_flz::tx_estimated_size_fjord_bytes; @@ -281,11 +281,11 @@ pub struct TransactionResult { #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] #[serde(rename_all = "camelCase")] pub struct MeterBundleResponse { - pub bundle_gas_price: String, + pub bundle_gas_price: U256, pub bundle_hash: B256, - pub coinbase_diff: String, - pub eth_sent_to_coinbase: String, - pub gas_fees: String, + pub coinbase_diff: U256, + pub eth_sent_to_coinbase: U256, + pub gas_fees: U256, pub results: Vec, pub state_block_number: u64, #[serde( @@ -380,11 +380,11 @@ mod tests { #[test] fn test_meter_bundle_response_serialization() { let response = MeterBundleResponse { - bundle_gas_price: "1000000000".to_string(), + bundle_gas_price: U256::from(1000000000), bundle_hash: B256::default(), - coinbase_diff: "100".to_string(), - eth_sent_to_coinbase: "0".to_string(), - gas_fees: "100".to_string(), + coinbase_diff: U256::from(100), + eth_sent_to_coinbase: U256::from(0), + gas_fees: U256::from(100), results: vec![], state_block_number: 12345, state_flashblock_index: Some(42), @@ -404,11 +404,11 @@ mod tests { #[test] fn test_meter_bundle_response_without_flashblock_index() { let response = MeterBundleResponse { - bundle_gas_price: "1000000000".to_string(), + bundle_gas_price: U256::from(1000000000), bundle_hash: B256::default(), - coinbase_diff: "100".to_string(), - eth_sent_to_coinbase: "0".to_string(), - gas_fees: "100".to_string(), + coinbase_diff: U256::from(100), + eth_sent_to_coinbase: U256::from(0), + gas_fees: U256::from(100), results: vec![], state_block_number: 12345, state_flashblock_index: None, @@ -441,6 +441,9 @@ mod tests { }"#; let deserialized: MeterBundleResponse = serde_json::from_str(json).unwrap(); + assert_eq!(deserialized.bundle_gas_price, U256::from(1000000000)); + assert_eq!(deserialized.coinbase_diff, U256::from(100)); + assert_eq!(deserialized.eth_sent_to_coinbase, U256::from(0)); assert_eq!(deserialized.state_flashblock_index, None); assert_eq!(deserialized.state_block_number, 12345); assert_eq!(deserialized.total_gas_used, 21000); From a21ee492dede17f31eea108c12c669a8190f31aa Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Wed, 12 Nov 2025 14:46:37 -0600 Subject: [PATCH 053/117] chore: change types to u256 (part 2) (#69) --- crates/core/src/types.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index a56d8ab..35fd522 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -266,15 +266,15 @@ impl AcceptedBundle { #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] #[serde(rename_all = "camelCase")] pub struct TransactionResult { - pub coinbase_diff: String, - pub eth_sent_to_coinbase: String, + pub coinbase_diff: U256, + pub eth_sent_to_coinbase: U256, pub from_address: Address, - pub gas_fees: String, - pub gas_price: String, + pub gas_fees: U256, + pub gas_price: U256, pub gas_used: u64, pub to_address: Option
, pub tx_hash: TxHash, - pub value: String, + pub value: U256, pub execution_time_us: u128, } From 25dce739cc5dc748cccc0f64226f3274349631c6 Mon Sep 17 00:00:00 2001 From: William Law Date: Thu, 13 Nov 2025 13:28:55 -0500 Subject: [PATCH 054/117] chore: have multiple builders listen to channel for MeterBundleResponse (#70) --- .env.example | 2 +- crates/ingress-rpc/src/bin/main.rs | 9 +++++---- crates/ingress-rpc/src/lib.rs | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.env.example b/.env.example index 39132ab..2cc30d6 100644 --- a/.env.example +++ b/.env.example @@ -14,7 +14,7 @@ TIPS_INGRESS_METRICS_ADDR=0.0.0.0:9002 TIPS_INGRESS_BLOCK_TIME_MILLISECONDS=2000 TIPS_INGRESS_METER_BUNDLE_TIMEOUT_MS=2000 TIPS_INGRESS_MAX_BUFFERED_METER_BUNDLE_RESPONSES=100 -TIPS_INGRESS_BUILDER_RPC=http://localhost:2222 +TIPS_INGRESS_BUILDER_RPCS=http://localhost:2222 # Audit service configuration TIPS_AUDIT_KAFKA_PROPERTIES_FILE=/app/docker/audit-kafka-properties diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 7524109..83aa8a0 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -64,11 +64,12 @@ async fn main() -> anyhow::Result<()> { let (audit_tx, audit_rx) = mpsc::unbounded_channel::(); connect_audit_to_publisher(audit_rx, audit_publisher); - // TODO: when we have multiple builders we can make `builder_rx` mutable and do `.subscribe()` to have multiple consumers - // of this channel. - let (builder_tx, builder_rx) = + let (builder_tx, _) = broadcast::channel::(config.max_buffered_meter_bundle_responses); - connect_ingress_to_builder(builder_rx, config.builder_rpc); + config.builder_rpcs.iter().for_each(|builder_rpc| { + let builder_rx = builder_tx.subscribe(); + connect_ingress_to_builder(builder_rx, builder_rpc.clone()); + }); let service = IngressService::new( provider, diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index e1b0564..970ab76 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -122,9 +122,9 @@ pub struct Config { )] pub meter_bundle_timeout_ms: u64, - /// URL of the builder RPC service for setting metering information - #[arg(long, env = "TIPS_INGRESS_BUILDER_RPC")] - pub builder_rpc: Url, + /// URLs of the builder RPC service for setting metering information + #[arg(long, env = "TIPS_INGRESS_BUILDER_RPCS")] + pub builder_rpcs: Vec, /// Maximum number of `MeterBundleResponse`s to buffer in memory #[arg( From fc2351d84c193064ddfb7e7b5c22ce68636b1152 Mon Sep 17 00:00:00 2001 From: William Law Date: Fri, 14 Nov 2025 14:39:14 -0500 Subject: [PATCH 055/117] fix (#72) --- .env.example | 2 +- crates/ingress-rpc/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index 2cc30d6..ab604f9 100644 --- a/.env.example +++ b/.env.example @@ -14,7 +14,7 @@ TIPS_INGRESS_METRICS_ADDR=0.0.0.0:9002 TIPS_INGRESS_BLOCK_TIME_MILLISECONDS=2000 TIPS_INGRESS_METER_BUNDLE_TIMEOUT_MS=2000 TIPS_INGRESS_MAX_BUFFERED_METER_BUNDLE_RESPONSES=100 -TIPS_INGRESS_BUILDER_RPCS=http://localhost:2222 +TIPS_INGRESS_BUILDER_RPCS=http://localhost:2222,http://localhost:2222,http://localhost:2222 # Audit service configuration TIPS_AUDIT_KAFKA_PROPERTIES_FILE=/app/docker/audit-kafka-properties diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index 970ab76..3da7d9b 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -123,7 +123,7 @@ pub struct Config { pub meter_bundle_timeout_ms: u64, /// URLs of the builder RPC service for setting metering information - #[arg(long, env = "TIPS_INGRESS_BUILDER_RPCS")] + #[arg(long, env = "TIPS_INGRESS_BUILDER_RPCS", value_delimiter = ',')] pub builder_rpcs: Vec, /// Maximum number of `MeterBundleResponse`s to buffer in memory From c08eaa4fe10c26de8911609b41ddab4918698325 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Tue, 18 Nov 2025 13:16:49 -0600 Subject: [PATCH 056/117] chore: bump reth to 1.9.3 (#74) --- Cargo.lock | 172 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 6 +- 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c1cfbf..67b8d59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4853,8 +4853,8 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4879,8 +4879,8 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-chains", "alloy-consensus", @@ -4899,8 +4899,8 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4917,8 +4917,8 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "proc-macro2", "quote", @@ -4927,8 +4927,8 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -4940,8 +4940,8 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4952,8 +4952,8 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-eips", "alloy-primitives", @@ -4964,8 +4964,8 @@ dependencies = [ [[package]] name = "reth-errors" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -4975,8 +4975,8 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-chains", "alloy-consensus", @@ -4996,8 +4996,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -5009,8 +5009,8 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5026,8 +5026,8 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5047,8 +5047,8 @@ dependencies = [ [[package]] name = "reth-execution-errors" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-evm", "alloy-primitives", @@ -5060,8 +5060,8 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5078,8 +5078,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "serde", "serde_json", @@ -5088,8 +5088,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "metrics", "metrics-derive", @@ -5097,16 +5097,16 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-primitives", ] [[package]] name = "reth-network-api" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5129,8 +5129,8 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5151,8 +5151,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5164,8 +5164,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-eip2124", "reth-net-banlist", @@ -5176,8 +5176,8 @@ dependencies = [ [[package]] name = "reth-optimism-chainspec" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5202,8 +5202,8 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5227,8 +5227,8 @@ dependencies = [ [[package]] name = "reth-optimism-evm" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5254,8 +5254,8 @@ dependencies = [ [[package]] name = "reth-optimism-forks" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-op-hardforks", "alloy-primitives", @@ -5265,8 +5265,8 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5283,8 +5283,8 @@ dependencies = [ [[package]] name = "reth-primitives-traits" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5310,8 +5310,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-primitives", "derive_more", @@ -5322,8 +5322,8 @@ dependencies = [ [[package]] name = "reth-revm" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-primitives", "reth-primitives-traits", @@ -5334,8 +5334,8 @@ dependencies = [ [[package]] name = "reth-rpc-convert" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-json-rpc", @@ -5355,8 +5355,8 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5402,8 +5402,8 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5418,8 +5418,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-primitives", "bytes", @@ -5429,8 +5429,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-primitives", "derive_more", @@ -5440,8 +5440,8 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5462,8 +5462,8 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5478,8 +5478,8 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "auto_impl", "dyn-clone", @@ -5494,8 +5494,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "tokio", "tokio-stream", @@ -5504,8 +5504,8 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5543,8 +5543,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5565,8 +5565,8 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5588,8 +5588,8 @@ dependencies = [ [[package]] name = "reth-trie-sparse" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5604,8 +5604,8 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "1.9.1" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.1#3afe69a5738459a7cb5f46c598c7f541a1510f32" +version = "1.9.3" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea84c5751776ecabdd069646" dependencies = [ "zstd", ] diff --git a/Cargo.toml b/Cargo.toml index 5467e3a..3a4d208 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,9 +16,9 @@ tips-bundle-pool = { path = "crates/bundle-pool" } tips-core = { path = "crates/core" } # Reth -reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.1" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.1" } -reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.1" } +reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } +reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } # alloy alloy-primitives = { version = "1.4.1", default-features = false, features = [ From d7a988a689fc6cbff7ddde4f43644ff3ff314aa5 Mon Sep 17 00:00:00 2001 From: William Law Date: Wed, 26 Nov 2025 11:43:14 -0500 Subject: [PATCH 057/117] chore: remove `validate_tx` (#76) --- crates/ingress-rpc/src/service.rs | 20 +- crates/ingress-rpc/src/validation.rs | 378 +-------------------------- 2 files changed, 9 insertions(+), 389 deletions(-) diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index c0862a5..d98946e 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -21,7 +21,7 @@ use tracing::{info, warn}; use crate::metrics::{Metrics, record_histogram}; use crate::queue::QueuePublisher; -use crate::validation::{AccountInfoLookup, L1BlockInfoLookup, validate_bundle, validate_tx}; +use crate::validation::validate_bundle; use crate::{Config, TxSubmissionMethod}; #[rpc(server, namespace = "eth")] @@ -140,7 +140,7 @@ where async fn send_raw_transaction(&self, data: Bytes) -> RpcResult { let start = Instant::now(); - let transaction = self.validate_tx(&data).await?; + let transaction = self.get_tx(&data).await?; let send_to_kafka = matches!( self.tx_submission_method, @@ -224,8 +224,7 @@ impl IngressService where Queue: QueuePublisher + Sync + Send + 'static, { - async fn validate_tx(&self, data: &Bytes) -> RpcResult> { - let start = Instant::now(); + async fn get_tx(&self, data: &Bytes) -> RpcResult> { if data.is_empty() { return Err(EthApiError::EmptyRawTransactionData.into_rpc_err()); } @@ -237,17 +236,6 @@ where .clone() .try_into_recovered() .map_err(|_| EthApiError::FailedToDecodeSignedTransaction.into_rpc_err())?; - - let mut l1_block_info = self.provider.fetch_l1_block_info().await?; - let account = self - .provider - .fetch_account_info(transaction.signer()) - .await?; - validate_tx(account, &transaction, data, &mut l1_block_info).await?; - - self.metrics - .validate_tx_duration - .record(start.elapsed().as_secs_f64()); Ok(transaction) } @@ -263,7 +251,7 @@ where let mut total_gas = 0u64; let mut tx_hashes = Vec::new(); for tx_data in &bundle.txs { - let transaction = self.validate_tx(tx_data).await?; + let transaction = self.get_tx(tx_data).await?; total_gas = total_gas.saturating_add(transaction.gas_limit()); tx_hashes.push(transaction.tx_hash()); } diff --git a/crates/ingress-rpc/src/validation.rs b/crates/ingress-rpc/src/validation.rs index 6411d42..b6bae98 100644 --- a/crates/ingress-rpc/src/validation.rs +++ b/crates/ingress-rpc/src/validation.rs @@ -1,14 +1,12 @@ use alloy_consensus::private::alloy_eips::{BlockId, BlockNumberOrTag}; -use alloy_consensus::{Transaction, Typed2718, constants::KECCAK_EMPTY, transaction::Recovered}; use alloy_primitives::{Address, B256, U256}; use alloy_provider::{Provider, RootProvider}; use async_trait::async_trait; use jsonrpsee::core::RpcResult; -use op_alloy_consensus::interop::CROSS_L2_INBOX_ADDRESS; use op_alloy_network::Optimism; -use op_revm::{OpSpecId, l1block::L1BlockInfo}; +use op_revm::l1block::L1BlockInfo; use reth_optimism_evm::extract_l1_info_from_tx; -use reth_rpc_eth_types::{EthApiError, RpcInvalidTransactionError, SignError}; +use reth_rpc_eth_types::{EthApiError, SignError}; use std::collections::HashSet; use std::time::{Duration, SystemTime, UNIX_EPOCH}; use tips_core::Bundle; @@ -89,88 +87,6 @@ impl L1BlockInfoLookup for RootProvider { } } -/// Helper function to validate a transaction. A valid transaction must satisfy the following criteria: -/// - If the transaction is not EIP-4844 -/// - If the transaction is not a cross chain tx -/// - If the transaction is a 7702 tx, then the account is a 7702 account -/// - If the transaction's nonce is the latest -/// - If the transaction's execution cost is less than the account's balance -/// - If the transaction's L1 gas cost is less than the account's balance -pub async fn validate_tx( - account: AccountInfo, - txn: &Recovered, - data: &[u8], - l1_block_info: &mut L1BlockInfo, -) -> RpcResult<()> { - // skip eip4844 transactions - if txn.is_eip4844() { - warn!(message = "EIP-4844 transactions are not supported"); - return Err(RpcInvalidTransactionError::TxTypeNotSupported.into_rpc_err()); - } - - // from: https://github.com/paradigmxyz/reth/blob/3b0d98f3464b504d96154b787a860b2488a61b3e/crates/optimism/txpool/src/supervisor/client.rs#L76-L84 - // it returns `None` if a tx is not cross chain, which is when `inbox_entries` is empty in the snippet above. - // we can do something similar where if the inbox_entries is non-empty then it is a cross chain tx and it's something we don't support - if let Some(access_list) = txn.access_list() { - let inbox_entries = access_list - .iter() - .filter(|entry| entry.address == CROSS_L2_INBOX_ADDRESS); - if inbox_entries.count() > 0 { - warn!(message = "Interop transactions are not supported"); - return Err(RpcInvalidTransactionError::TxTypeNotSupported.into_rpc_err()); - } - } - - // error if account is 7702 but tx is not 7702 - if account.code_hash != KECCAK_EMPTY && !txn.is_eip7702() { - return Err(EthApiError::InvalidTransaction( - RpcInvalidTransactionError::AuthorizationListInvalidFields, - ) - .into_rpc_err()); - } - - // error if tx nonce is not equal to or greater than the latest on chain - // https://github.com/paradigmxyz/reth/blob/a047a055ab996f85a399f5cfb2fe15e350356546/crates/transaction-pool/src/validate/eth.rs#L611 - if txn.nonce() < account.nonce { - return Err( - EthApiError::InvalidTransaction(RpcInvalidTransactionError::NonceTooLow { - tx: txn.nonce(), - state: account.nonce, - }) - .into_rpc_err(), - ); - } - - // For EIP-1559 transactions: `max_fee_per_gas * gas_limit + tx_value`. - // ref: https://github.com/paradigmxyz/reth/blob/main/crates/transaction-pool/src/traits.rs#L1186 - let max_fee = txn - .max_fee_per_gas() - .saturating_mul(txn.gas_limit() as u128); - let txn_cost = txn.value().saturating_add(U256::from(max_fee)); - - // error if execution cost costs more than balance - if txn_cost > account.balance { - warn!(message = "Insufficient funds for transfer"); - return Err(EthApiError::InvalidTransaction( - RpcInvalidTransactionError::InsufficientFundsForTransfer, - ) - .into_rpc_err()); - } - - // op-checks to see if sender can cover L1 gas cost - // from: https://github.com/paradigmxyz/reth/blob/6aa73f14808491aae77fc7c6eb4f0aa63bef7e6e/crates/optimism/txpool/src/validator.rs#L219 - let l1_cost_addition = l1_block_info.calculate_tx_l1_cost(data, OpSpecId::ISTHMUS); - let l1_cost = txn_cost.saturating_add(l1_cost_addition); - if l1_cost > account.balance { - warn!(message = "Insufficient funds for L1 gas"); - return Err(EthApiError::InvalidTransaction( - RpcInvalidTransactionError::InsufficientFundsForTransfer, - ) - .into_rpc_err()); - } - Ok(()) -} - /// Helper function to validate propeties of a bundle. A bundle is valid if it satisfies the following criteria: /// - The bundle's max_timestamp is not more than 1 hour in the future /// - The bundle's gas limit is not greater than the maximum allowed gas limit @@ -236,300 +152,16 @@ pub fn validate_bundle(bundle: &Bundle, bundle_gas: u64, tx_hashes: Vec) - mod tests { use super::*; use alloy_consensus::SignableTransaction; - use alloy_consensus::{Transaction, constants::KECCAK_EMPTY, transaction::SignerRecoverable}; - use alloy_consensus::{TxEip1559, TxEip4844, TxEip7702}; + use alloy_consensus::TxEip1559; + use alloy_consensus::transaction::SignerRecoverable; use alloy_primitives::Bytes; - use alloy_primitives::{bytes, keccak256}; + use alloy_primitives::bytes; use alloy_signer_local::PrivateKeySigner; use op_alloy_consensus::OpTxEnvelope; use op_alloy_network::TxSignerSync; use op_alloy_network::eip2718::Encodable2718; - use revm_context_interface::transaction::{AccessList, AccessListItem}; use std::time::{SystemTime, UNIX_EPOCH}; - fn create_account(nonce: u64, balance: U256) -> AccountInfo { - AccountInfo { - balance, - nonce, - code_hash: KECCAK_EMPTY, - } - } - - fn create_7702_account() -> AccountInfo { - AccountInfo { - balance: U256::from(1000000000000000000u128), - nonce: 0, - code_hash: keccak256(bytes!("1234567890")), - } - } - - fn create_l1_block_info() -> L1BlockInfo { - L1BlockInfo::default() - } - - #[tokio::test] - async fn test_valid_tx() { - // Create a sample EIP-1559 transaction - let signer = PrivateKeySigner::random(); - let mut tx = TxEip1559 { - chain_id: 1, - nonce: 0, - gas_limit: 21000, - max_fee_per_gas: 20000000000u128, - max_priority_fee_per_gas: 1000000000u128, - to: Address::random().into(), - value: U256::from(10000000000000u128), - access_list: Default::default(), - input: bytes!("").clone(), - }; - - let account = create_account(0, U256::from(1000000000000000000u128)); - let mut l1_block_info = create_l1_block_info(); - - let data = tx.input().to_vec(); - let signature = signer.sign_transaction_sync(&mut tx).unwrap(); - let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); - let recovered_tx = envelope.try_into_recovered().unwrap(); - assert!( - validate_tx(account, &recovered_tx, &data, &mut l1_block_info) - .await - .is_ok() - ); - } - - #[tokio::test] - async fn test_valid_7702_tx() { - let signer = PrivateKeySigner::random(); - let mut tx = TxEip7702 { - chain_id: 1, - nonce: 0, - gas_limit: 21000, - max_fee_per_gas: 20000000000u128, - max_priority_fee_per_gas: 1000000000u128, - to: Address::random(), - value: U256::from(10000000000000u128), - authorization_list: Default::default(), - access_list: Default::default(), - input: bytes!("").clone(), - }; - - let account = create_7702_account(); - let mut l1_block_info = create_l1_block_info(); - - let data = tx.input().to_vec(); - let signature = signer.sign_transaction_sync(&mut tx).unwrap(); - let envelope = OpTxEnvelope::Eip7702(tx.into_signed(signature)); - let recovered_tx = envelope.try_into_recovered().unwrap(); - assert!( - validate_tx(account, &recovered_tx, &data, &mut l1_block_info) - .await - .is_ok() - ); - } - - #[tokio::test] - async fn test_err_interop_tx() { - let signer = PrivateKeySigner::random(); - - let access_list = AccessList::from(vec![AccessListItem { - address: CROSS_L2_INBOX_ADDRESS, - storage_keys: vec![], - }]); - - let mut tx = TxEip1559 { - chain_id: 1, - nonce: 0, - gas_limit: 21000, - max_fee_per_gas: 20000000000u128, - max_priority_fee_per_gas: 1000000000u128, - to: Address::random().into(), - value: U256::from(10000000000000u128), - access_list, - input: bytes!("").clone(), - }; - - let account = create_account(0, U256::from(1000000000000000000u128)); - let mut l1_block_info = create_l1_block_info(); - - let data = tx.input().to_vec(); - let signature = signer.sign_transaction_sync(&mut tx).unwrap(); - let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); - let recovered_tx = envelope.try_into_recovered().unwrap(); - - assert_eq!( - validate_tx(account, &recovered_tx, &data, &mut l1_block_info).await, - Err(RpcInvalidTransactionError::TxTypeNotSupported.into_rpc_err()) - ); - } - - #[tokio::test] - async fn test_err_eip4844_tx() { - let signer = PrivateKeySigner::random(); - let mut tx = TxEip4844 { - chain_id: 1, - nonce: 0, - gas_limit: 21000, - max_fee_per_gas: 20000000000u128, - max_priority_fee_per_gas: 1000000000u128, - to: Address::random(), - value: U256::from(10000000000000u128), - access_list: Default::default(), - input: bytes!("").clone(), - blob_versioned_hashes: Default::default(), - max_fee_per_blob_gas: 20000000000u128, - }; - - let account = create_account(0, U256::from(1000000000000000000u128)); - let mut l1_block_info = create_l1_block_info(); - - let data = tx.input().to_vec(); - let signature = signer.sign_transaction_sync(&mut tx).unwrap(); - let recovered_tx = tx - .into_signed(signature) - .try_into_recovered() - .expect("failed to recover tx"); - assert_eq!( - validate_tx(account, &recovered_tx, &data, &mut l1_block_info).await, - Err(RpcInvalidTransactionError::TxTypeNotSupported.into_rpc_err()) - ); - } - - #[tokio::test] - async fn test_err_tx_not_7702() { - let signer = PrivateKeySigner::random(); - - let mut tx = TxEip1559 { - chain_id: 1, - nonce: 0, - gas_limit: 21000, - max_fee_per_gas: 20000000000u128, - max_priority_fee_per_gas: 1000000000u128, - to: Address::random().into(), - value: U256::from(10000000000000u128), - access_list: Default::default(), - input: bytes!("").clone(), - }; - - // account is 7702 - let account = create_7702_account(); - let mut l1_block_info = create_l1_block_info(); - - let data = tx.input().to_vec(); - let signature = signer.sign_transaction_sync(&mut tx).unwrap(); - let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); - let recovered_tx = envelope.try_into_recovered().unwrap(); - - assert_eq!( - validate_tx(account, &recovered_tx, &data, &mut l1_block_info).await, - Err(EthApiError::InvalidTransaction( - RpcInvalidTransactionError::AuthorizationListInvalidFields, - ) - .into_rpc_err()) - ); - } - - #[tokio::test] - async fn test_err_tx_nonce_too_low() { - let signer = PrivateKeySigner::random(); - let mut tx = TxEip1559 { - chain_id: 1, - nonce: 0, - gas_limit: 21000, - max_fee_per_gas: 20000000000u128, - max_priority_fee_per_gas: 1000000000u128, - to: Address::random().into(), - value: U256::from(10000000000000u128), - access_list: Default::default(), - input: bytes!("").clone(), - }; - - let account = create_account(1, U256::from(1000000000000000000u128)); - let mut l1_block_info = create_l1_block_info(); - - let nonce = account.nonce; - let tx_nonce = tx.nonce(); - - let data = tx.input().to_vec(); - let signature = signer.sign_transaction_sync(&mut tx).unwrap(); - let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); - let recovered_tx = envelope.try_into_recovered().unwrap(); - assert_eq!( - validate_tx(account, &recovered_tx, &data, &mut l1_block_info).await, - Err( - EthApiError::InvalidTransaction(RpcInvalidTransactionError::NonceTooLow { - tx: tx_nonce, - state: nonce, - }) - .into_rpc_err() - ) - ); - } - - #[tokio::test] - async fn test_err_tx_insufficient_funds() { - let signer = PrivateKeySigner::random(); - let mut tx = TxEip1559 { - chain_id: 1, - nonce: 0, - gas_limit: 21000, - max_fee_per_gas: 20000000000u128, - max_priority_fee_per_gas: 10000000000000u128, - to: Address::random().into(), - value: U256::from(10000000000000u128), - access_list: Default::default(), - input: bytes!("").clone(), - }; - - let account = create_account(0, U256::from(1000000u128)); - let mut l1_block_info = create_l1_block_info(); - - let data = tx.input().to_vec(); - let signature = signer.sign_transaction_sync(&mut tx).unwrap(); - let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); - let recovered_tx = envelope.try_into_recovered().unwrap(); - assert_eq!( - validate_tx(account, &recovered_tx, &data, &mut l1_block_info).await, - Err(EthApiError::InvalidTransaction( - RpcInvalidTransactionError::InsufficientFundsForTransfer, - ) - .into_rpc_err()) - ); - } - - #[tokio::test] - async fn test_err_tx_insufficient_funds_for_l1_gas() { - let signer = PrivateKeySigner::random(); - let mut tx = TxEip1559 { - chain_id: 1, - nonce: 0, - gas_limit: 21000, - max_fee_per_gas: 200000u128, - max_priority_fee_per_gas: 100000u128, - to: Address::random().into(), - value: U256::from(1000000u128), - access_list: Default::default(), - input: bytes!("").clone(), - }; - - // fund the account with enough funds to cover the txn cost but not enough to cover the l1 cost - let account = create_account(0, U256::from(4201000000u128)); - let mut l1_block_info = create_l1_block_info(); - l1_block_info.tx_l1_cost = Some(U256::from(1000000u128)); - - let data = tx.input().to_vec(); - let signature = signer.sign_transaction_sync(&mut tx).unwrap(); - let envelope = OpTxEnvelope::Eip1559(tx.into_signed(signature)); - let recovered_tx = envelope.try_into_recovered().unwrap(); - - assert_eq!( - validate_tx(account, &recovered_tx, &data, &mut l1_block_info).await, - Err(EthApiError::InvalidTransaction( - RpcInvalidTransactionError::InsufficientFundsForTransfer - ) - .into_rpc_err()) - ); - } - #[tokio::test] async fn test_err_bundle_max_timestamp_too_far_in_the_future() { let current_time = SystemTime::now() From ac0b1b490414aa1e70d3bf893d4cb54048da6861 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Wed, 26 Nov 2025 13:48:17 -0600 Subject: [PATCH 058/117] chore: add structured logging params (#77) --- .env.example | 2 + Cargo.lock | 13 ++++++ Cargo.toml | 3 +- crates/audit/src/bin/main.rs | 7 +++- crates/core/src/logger.rs | 65 ++++++++++++++++++++++++++---- crates/ingress-rpc/src/bin/main.rs | 4 +- crates/ingress-rpc/src/lib.rs | 3 ++ 7 files changed, 83 insertions(+), 14 deletions(-) diff --git a/.env.example b/.env.example index ab604f9..512cf66 100644 --- a/.env.example +++ b/.env.example @@ -8,6 +8,7 @@ TIPS_INGRESS_KAFKA_INGRESS_TOPIC=tips-ingress TIPS_INGRESS_KAFKA_AUDIT_PROPERTIES_FILE=/app/docker/ingress-audit-kafka-properties TIPS_INGRESS_KAFKA_AUDIT_TOPIC=tips-audit TIPS_INGRESS_LOG_LEVEL=info +TIPS_INGRESS_LOG_FORMAT=pretty TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS=10800 TIPS_INGRESS_RPC_SIMULATION=http://localhost:8549 TIPS_INGRESS_METRICS_ADDR=0.0.0.0:9002 @@ -20,6 +21,7 @@ TIPS_INGRESS_BUILDER_RPCS=http://localhost:2222,http://localhost:2222,http://loc TIPS_AUDIT_KAFKA_PROPERTIES_FILE=/app/docker/audit-kafka-properties TIPS_AUDIT_KAFKA_TOPIC=tips-audit TIPS_AUDIT_LOG_LEVEL=info +TIPS_AUDIT_LOG_FORMAT=pretty TIPS_AUDIT_S3_BUCKET=tips TIPS_AUDIT_S3_CONFIG_TYPE=manual TIPS_AUDIT_S3_ENDPOINT=http://localhost:7000 diff --git a/Cargo.lock b/Cargo.lock index 67b8d59..7ff2a4c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7155,6 +7155,16 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-serde" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" +dependencies = [ + "serde", + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.2.25" @@ -7174,12 +7184,15 @@ dependencies = [ "nu-ansi-term", "once_cell", "regex-automata", + "serde", + "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log", + "tracing-serde", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3a4d208..1a5b93d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,6 @@ resolver = "2" [workspace.dependencies] tips-audit = { path = "crates/audit" } -tips-bundle-pool = { path = "crates/bundle-pool" } tips-core = { path = "crates/core" } # Reth @@ -37,7 +36,7 @@ op-alloy-flz = { version = "0.13.1" } tokio = { version = "1.47.1", features = ["full"] } tracing = "0.1.41" -tracing-subscriber = { version = "0.3.20", features = ["env-filter"] } +tracing-subscriber = { version = "0.3.20", features = ["env-filter", "json"] } anyhow = "1.0.99" clap = { version = "4.5.47", features = ["derive", "env"] } url = "2.5.7" diff --git a/crates/audit/src/bin/main.rs b/crates/audit/src/bin/main.rs index c79852c..19ac1bf 100644 --- a/crates/audit/src/bin/main.rs +++ b/crates/audit/src/bin/main.rs @@ -7,7 +7,7 @@ use rdkafka::consumer::Consumer; use tips_audit::{ KafkaAuditArchiver, KafkaAuditLogReader, S3EventReaderWriter, create_kafka_consumer, }; -use tips_core::logger::init_logger; +use tips_core::logger::init_logger_with_format; use tracing::info; #[derive(Debug, Clone, ValueEnum)] @@ -31,6 +31,9 @@ struct Args { #[arg(long, env = "TIPS_AUDIT_LOG_LEVEL", default_value = "info")] log_level: String, + #[arg(long, env = "TIPS_AUDIT_LOG_FORMAT", default_value = "pretty")] + log_format: tips_core::logger::LogFormat, + #[arg(long, env = "TIPS_AUDIT_S3_CONFIG_TYPE", default_value = "aws")] s3_config_type: S3ConfigType, @@ -53,7 +56,7 @@ async fn main() -> Result<()> { let args = Args::parse(); - init_logger(&args.log_level); + init_logger_with_format(&args.log_level, args.log_format); info!( kafka_properties_file = %args.kafka_properties_file, diff --git a/crates/core/src/logger.rs b/crates/core/src/logger.rs index 2f859ec..c90c731 100644 --- a/crates/core/src/logger.rs +++ b/crates/core/src/logger.rs @@ -1,7 +1,35 @@ +use std::str::FromStr; use tracing::warn; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; +use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt}; + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum LogFormat { + Pretty, + Json, + Compact, +} + +impl FromStr for LogFormat { + type Err = String; + + fn from_str(s: &str) -> Result { + match s.to_lowercase().as_str() { + "json" => Ok(LogFormat::Json), + "compact" => Ok(LogFormat::Compact), + "pretty" => Ok(LogFormat::Pretty), + _ => { + warn!("Invalid log format '{}', defaulting to 'pretty'", s); + Ok(LogFormat::Pretty) + } + } + } +} pub fn init_logger(log_level: &str) { + init_logger_with_format(log_level, LogFormat::Pretty); +} + +pub fn init_logger_with_format(log_level: &str, format: LogFormat) { let level = match log_level.to_lowercase().as_str() { "trace" => tracing::Level::TRACE, "debug" => tracing::Level::DEBUG, @@ -14,11 +42,32 @@ pub fn init_logger(log_level: &str) { } }; - tracing_subscriber::registry() - .with( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(level.to_string())), - ) - .with(tracing_subscriber::fmt::layer()) - .init(); + let env_filter = tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(level.to_string())); + + match format { + LogFormat::Json => { + tracing_subscriber::registry() + .with(env_filter) + .with( + fmt::layer() + .json() + .flatten_event(true) + .with_current_span(true), + ) + .init(); + } + LogFormat::Compact => { + tracing_subscriber::registry() + .with(env_filter) + .with(fmt::layer().compact()) + .init(); + } + LogFormat::Pretty => { + tracing_subscriber::registry() + .with(env_filter) + .with(fmt::layer().pretty()) + .init(); + } + } } diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 83aa8a0..40d65e8 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -7,7 +7,7 @@ use rdkafka::producer::FutureProducer; use tips_audit::{BundleEvent, KafkaBundleEventPublisher, connect_audit_to_publisher}; use tips_core::MeterBundleResponse; use tips_core::kafka::load_kafka_config_from_file; -use tips_core::logger::init_logger; +use tips_core::logger::init_logger_with_format; use tips_ingress_rpc::Config; use tips_ingress_rpc::connect_ingress_to_builder; use tips_ingress_rpc::metrics::init_prometheus_exporter; @@ -24,7 +24,7 @@ async fn main() -> anyhow::Result<()> { // clone once instead of cloning each field before passing to `IngressService::new` let cfg = config.clone(); - init_logger(&config.log_level); + init_logger_with_format(&config.log_level, config.log_format); init_prometheus_exporter(config.metrics_addr).expect("Failed to install Prometheus exporter"); diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index 3da7d9b..922d010 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -86,6 +86,9 @@ pub struct Config { #[arg(long, env = "TIPS_INGRESS_LOG_LEVEL", default_value = "info")] pub log_level: String, + #[arg(long, env = "TIPS_INGRESS_LOG_FORMAT", default_value = "pretty")] + pub log_format: tips_core::logger::LogFormat, + /// Default lifetime for sent transactions in seconds (default: 3 hours) #[arg( long, From 1f17fcfcd22269a994e8be16fe5df91bec531bab Mon Sep 17 00:00:00 2001 From: Rayyan Alam <62478924+rayyan224@users.noreply.github.com> Date: Fri, 28 Nov 2025 14:55:58 -0500 Subject: [PATCH 059/117] Create Scafolding for Eth Send User Operation (#79) * feat: create inital types * feat: implement user operation method * feat: create cargo queue * feat: create send user operation * feat: create basic handler service * feat: update client to use types from alloy * chore: fix cargo service * chore: run format * chore: update formating * chore: fix build * chore: update services --------- Co-authored-by: Rayyan Alam --- Cargo.lock | 87 +++++++++++++++---- Cargo.toml | 1 + crates/core/Cargo.toml | 2 + crates/core/src/lib.rs | 4 +- crates/core/src/user_ops_types.rs | 139 ++++++++++++++++++++++++++++++ crates/ingress-rpc/src/queue.rs | 1 - crates/ingress-rpc/src/service.rs | 23 +++++ 7 files changed, 238 insertions(+), 19 deletions(-) create mode 100644 crates/core/src/user_ops_types.rs diff --git a/Cargo.lock b/Cargo.lock index 7ff2a4c..03c60e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -51,9 +51,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90d103d3e440ad6f703dd71a5b58a6abd24834563bde8a5fabe706e00242f810" +checksum = "8b6440213a22df93a87ed512d2f668e7dc1d62a05642d107f82d61edc9e12370" dependencies = [ "alloy-eips", "alloy-primitives", @@ -62,6 +62,7 @@ dependencies = [ "alloy-trie", "alloy-tx-macros", "auto_impl", + "borsh", "c-kzg", "derive_more", "either", @@ -77,9 +78,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ead76c8c84ab3a50c31c56bc2c748c2d64357ad2131c32f9b10ab790a25e1a" +checksum = "15d0bea09287942405c4f9d2a4f22d1e07611c2dbd9d5bf94b75366340f9e6e0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -130,9 +131,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bdbec74583d0067798d77afa43d58f00d93035335d7ceaa5d3f93857d461bb9" +checksum = "4bd2c7ae05abcab4483ce821f12f285e01c0b33804e6883dd9ca1569a87ee2be" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -141,6 +142,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "auto_impl", + "borsh", "c-kzg", "derive_more", "either", @@ -257,9 +259,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0e7918396eecd69d9c907046ec8a93fb09b89e2f325d5e7ea9c4e3929aa0dd2" +checksum = "7805124ad69e57bbae7731c9c344571700b2a18d351bda9e0eba521c991d1bcb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -410,6 +412,19 @@ dependencies = [ "wasmtimer", ] +[[package]] +name = "alloy-rpc-types" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e279e6d40ee40fe8f76753b678d8d5d260cb276dc6c8a8026099b16d2b43f4" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "alloy-serde", + "serde", +] + [[package]] name = "alloy-rpc-types-admin" version = "1.1.0" @@ -435,9 +450,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07da696cc7fbfead4b1dda8afe408685cae80975cbb024f843ba74d9639cd0d3" +checksum = "d9c4c53a8b0905d931e7921774a1830609713bd3e8222347963172b03a3ecc68" dependencies = [ "alloy-consensus", "alloy-eips", @@ -447,15 +462,17 @@ dependencies = [ "derive_more", "ethereum_ssz", "ethereum_ssz_derive", + "jsonwebtoken", + "rand 0.8.5", "serde", "strum", ] [[package]] name = "alloy-rpc-types-eth" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15e4831b71eea9d20126a411c1c09facf1d01d5cac84fd51d532d3c429cfc26" +checksum = "ed5fafb741c19b3cca4cdd04fa215c89413491f9695a3e928dee2ae5657f607e" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -488,9 +505,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751d1887f7d202514a82c5b3caf28ee8bd4a2ad9549e4f498b6f0bff99b52add" +checksum = "a6f180c399ca7c1e2fe17ea58343910cad0090878a696ff5a50241aee12fc529" dependencies = [ "alloy-primitives", "serde", @@ -654,9 +671,9 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7ce8ed34106acd6e21942022b6a15be6454c2c3ead4d76811d3bdcd63cf771" +checksum = "ae109e33814b49fc0a62f2528993aa8a2dd346c26959b151f05441dc0b9da292" dependencies = [ "darling 0.21.3", "proc-macro2", @@ -3555,6 +3572,21 @@ dependencies = [ "thiserror", ] +[[package]] +name = "jsonwebtoken" +version = "9.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde" +dependencies = [ + "base64 0.22.1", + "js-sys", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", +] + [[package]] name = "k256" version = "0.13.4" @@ -4264,6 +4296,16 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "pem" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" +dependencies = [ + "base64 0.22.1", + "serde_core", +] + [[package]] name = "percent-encoding" version = "2.3.2" @@ -6478,6 +6520,18 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "simple_asn1" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + [[package]] name = "siphasher" version = "1.0.1" @@ -6884,6 +6938,7 @@ dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-provider", + "alloy-rpc-types", "alloy-serde", "alloy-signer-local", "op-alloy-consensus", diff --git a/Cargo.toml b/Cargo.toml index 1a5b93d..0b4ba56 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,6 +27,7 @@ alloy-primitives = { version = "1.4.1", default-features = false, features = [ alloy-consensus = { version = "1.0.41" } alloy-provider = { version = "1.0.41" } alloy-serde = "1.0.41" +alloy-rpc-types = "1.1.2" # op-alloy op-alloy-network = { version = "0.22.0", default-features = false } diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index ecc135a..4543f47 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -23,6 +23,8 @@ tracing.workspace = true tracing-subscriber.workspace = true op-alloy-flz.workspace = true serde.workspace = true +alloy-rpc-types.workspace = true + [dev-dependencies] alloy-signer-local.workspace = true diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index a319dd0..168115a 100644 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -1,9 +1,9 @@ pub mod kafka; pub mod logger; -pub mod types; - #[cfg(any(test, feature = "test-utils"))] pub mod test_utils; +pub mod types; +pub mod user_ops_types; pub use types::{ AcceptedBundle, Bundle, BundleExtensions, BundleHash, BundleTxs, CancelBundle, diff --git a/crates/core/src/user_ops_types.rs b/crates/core/src/user_ops_types.rs new file mode 100644 index 0000000..837e51f --- /dev/null +++ b/crates/core/src/user_ops_types.rs @@ -0,0 +1,139 @@ +use alloy_rpc_types::erc4337; +use serde::{Deserialize, Serialize}; + +// Re-export SendUserOperationResponse +pub use alloy_rpc_types::erc4337::SendUserOperationResponse; + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +#[serde(tag = "type")] +pub enum UserOperationRequest { + EntryPointV06(erc4337::UserOperation), + EntryPointV07(erc4337::PackedUserOperation), +} + +// Tests +#[cfg(test)] +mod tests { + use std::str::FromStr; + + use super::*; + use alloy_primitives::{Address, Bytes, Uint}; + #[test] + fn should_throw_error_when_deserializing_invalid() { + const TEST_INVALID_USER_OPERATION: &str = r#" + { + "type": "EntryPointV06", + "sender": "0x1111111111111111111111111111111111111111", + "nonce": "0x0", + "callGasLimit": "0x5208" + } + "#; + let user_operation: Result = + serde_json::from_str::(TEST_INVALID_USER_OPERATION); + assert!(user_operation.is_err()); + } + + #[test] + fn should_deserialize_v06() { + const TEST_USER_OPERATION: &str = r#" + { + "type": "EntryPointV06", + "sender": "0x1111111111111111111111111111111111111111", + "nonce": "0x0", + "initCode": "0x", + "callData": "0x", + "callGasLimit": "0x5208", + "verificationGasLimit": "0x100000", + "preVerificationGas": "0x10000", + "maxFeePerGas": "0x59682f10", + "maxPriorityFeePerGas": "0x3b9aca00", + "paymasterAndData": "0x", + "signature": "0x01" + } + "#; + let user_operation: Result = + serde_json::from_str::(TEST_USER_OPERATION); + if user_operation.is_err() { + panic!("Error: {:?}", user_operation.err()); + } + let user_operation = user_operation.unwrap(); + match user_operation { + UserOperationRequest::EntryPointV06(user_operation) => { + assert_eq!( + user_operation.sender, + Address::from_str("0x1111111111111111111111111111111111111111").unwrap() + ); + assert_eq!(user_operation.nonce, Uint::from(0)); + assert_eq!(user_operation.init_code, Bytes::from_str("0x").unwrap()); + assert_eq!(user_operation.call_data, Bytes::from_str("0x").unwrap()); + assert_eq!(user_operation.call_gas_limit, Uint::from(0x5208)); + assert_eq!(user_operation.verification_gas_limit, Uint::from(0x100000)); + assert_eq!(user_operation.pre_verification_gas, Uint::from(0x10000)); + assert_eq!(user_operation.max_fee_per_gas, Uint::from(0x59682f10)); + assert_eq!( + user_operation.max_priority_fee_per_gas, + Uint::from(0x3b9aca00) + ); + assert_eq!( + user_operation.paymaster_and_data, + Bytes::from_str("0x").unwrap() + ); + assert_eq!(user_operation.signature, Bytes::from_str("0x01").unwrap()); + } + _ => { + panic!("Expected EntryPointV06, got {:?}", user_operation); + } + } + } + + #[test] + fn should_deserialize_v07() { + const TEST_PACKED_USER_OPERATION: &str = r#" + { + "type": "EntryPointV07", + "sender": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + "nonce": "0x1", + "factory": "0x2222222222222222222222222222222222222222", + "factoryData": "0xabcdef1234560000000000000000000000000000000000000000000000000000", + "callData": "0xb61d27f600000000000000000000000000000000000000000000000000000000000000c8", + "callGasLimit": "0x2dc6c0", + "verificationGasLimit": "0x1e8480", + "preVerificationGas": "0x186a0", + "maxFeePerGas": "0x77359400", + "maxPriorityFeePerGas": "0x3b9aca00", + "paymaster": "0x3333333333333333333333333333333333333333", + "paymasterVerificationGasLimit": "0x186a0", + "paymasterPostOpGasLimit": "0x27100", + "paymasterData": "0xfafb00000000000000000000000000000000000000000000000000000000000064", + "signature": "0xa3c5f1b90014e68abbbdc42e4b77b9accc0b7e1c5d0b5bcde1a47ba8faba00ff55c9a7de12e98b731766e35f6c51ab25c9b58cc0e7c4a33f25e75c51c6ad3c3a" + } + "#; + let user_operation: Result = + serde_json::from_str::(TEST_PACKED_USER_OPERATION); + if user_operation.is_err() { + panic!("Error: {:?}", user_operation.err()); + } + let user_operation = user_operation.unwrap(); + match user_operation { + UserOperationRequest::EntryPointV07(user_operation) => { + assert_eq!( + user_operation.sender, + Address::from_str("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48").unwrap() + ); + assert_eq!(user_operation.nonce, Uint::from(1)); + assert_eq!( + user_operation.call_data, + alloy_primitives::bytes!( + "0xb61d27f600000000000000000000000000000000000000000000000000000000000000c8" + ) + ); + assert_eq!(user_operation.call_gas_limit, Uint::from(0x2dc6c0)); + assert_eq!(user_operation.verification_gas_limit, Uint::from(0x1e8480)); + assert_eq!(user_operation.pre_verification_gas, Uint::from(0x186a0)); + } + _ => { + panic!("Expected EntryPointV07, got {:?}", user_operation); + } + } + } +} diff --git a/crates/ingress-rpc/src/queue.rs b/crates/ingress-rpc/src/queue.rs index a13ad4f..c3df12a 100644 --- a/crates/ingress-rpc/src/queue.rs +++ b/crates/ingress-rpc/src/queue.rs @@ -12,7 +12,6 @@ use tracing::{error, info}; pub trait QueuePublisher: Send + Sync { async fn publish(&self, bundle: &AcceptedBundle, bundle_hash: &B256) -> Result<()>; } - /// A queue to buffer transactions pub struct KafkaQueuePublisher { producer: FutureProducer, diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index d98946e..b93eaa7 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -14,6 +14,7 @@ use tips_audit::BundleEvent; use tips_core::types::ParsedBundle; use tips_core::{ AcceptedBundle, Bundle, BundleExtensions, BundleHash, CancelBundle, MeterBundleResponse, + user_ops_types::{SendUserOperationResponse, UserOperationRequest}, }; use tokio::sync::{broadcast, mpsc}; use tokio::time::{Duration, Instant, timeout}; @@ -37,6 +38,13 @@ pub trait IngressApi { /// Handler for: `eth_sendRawTransaction` #[method(name = "sendRawTransaction")] async fn send_raw_transaction(&self, tx: Bytes) -> RpcResult; + + /// Handler for: `eth_sendUserOperation` + #[method(name = "sendUserOperation")] + async fn send_user_operation( + &self, + user_operation: UserOperationRequest, + ) -> RpcResult; } pub struct IngressService { @@ -218,6 +226,21 @@ where Ok(transaction.tx_hash()) } + + async fn send_user_operation( + &self, + user_operation: UserOperationRequest, + ) -> RpcResult { + dbg!(&user_operation); + + // STEPS: + // 1. Reputation Service Validate + // 2. Base Node Validate User Operation + // 3. Send to Kafka + // Send Hash + // todo!("not yet implemented send_user_operation"); + todo!("not yet implemented send_user_operation"); + } } impl IngressService From 4d3331ec50115b4a7bafb5be09b7b0cf4fda8ab4 Mon Sep 17 00:00:00 2001 From: Rayyan Alam <62478924+rayyan224@users.noreply.github.com> Date: Mon, 1 Dec 2025 09:48:30 -0500 Subject: [PATCH 060/117] chore: update setup md (#80) --- SETUP.md | 1 - 1 file changed, 1 deletion(-) diff --git a/SETUP.md b/SETUP.md index c0d62f6..8af0129 100644 --- a/SETUP.md +++ b/SETUP.md @@ -27,7 +27,6 @@ git checkout danyal/base-overlay # Clone op-rbuilder in a separate directory git clone https://github.com/base/op-rbuilder.git cd op-rbuilder -git checkout tips-prototype ``` ## Step 2: Start TIPS Infrastructure From 6fd48f548261eb407bb1dc403f7c68690e70ef97 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Mon, 1 Dec 2025 20:00:17 -0600 Subject: [PATCH 061/117] chore: add healthchecks to the ui/ingress-rpc (#84) --- .env.example | 1 + Cargo.lock | 78 ++++++++++++++++++++++++++++++ Cargo.toml | 1 + crates/ingress-rpc/Cargo.toml | 1 + crates/ingress-rpc/src/bin/main.rs | 11 +++++ crates/ingress-rpc/src/health.rs | 31 ++++++++++++ crates/ingress-rpc/src/lib.rs | 9 ++++ docker-compose.tips.yml | 1 + ui/src/app/api/health/route.ts | 5 ++ 9 files changed, 138 insertions(+) create mode 100644 crates/ingress-rpc/src/health.rs create mode 100644 ui/src/app/api/health/route.ts diff --git a/.env.example b/.env.example index 512cf66..0ff9039 100644 --- a/.env.example +++ b/.env.example @@ -12,6 +12,7 @@ TIPS_INGRESS_LOG_FORMAT=pretty TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS=10800 TIPS_INGRESS_RPC_SIMULATION=http://localhost:8549 TIPS_INGRESS_METRICS_ADDR=0.0.0.0:9002 +TIPS_INGRESS_HEALTH_CHECK_ADDR=0.0.0.0:8081 TIPS_INGRESS_BLOCK_TIME_MILLISECONDS=2000 TIPS_INGRESS_METER_BUNDLE_TIMEOUT_MS=2000 TIPS_INGRESS_MAX_BUFFERED_METER_BUNDLE_RESPONSES=100 diff --git a/Cargo.lock b/Cargo.lock index 03c60e6..12ae8a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1562,6 +1562,58 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425" +dependencies = [ + "axum-core", + "bytes", + "form_urlencoded", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.8.0", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde_core", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22" +dependencies = [ + "bytes", + "futures-core", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "sync_wrapper", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "az" version = "1.2.1" @@ -3742,6 +3794,12 @@ dependencies = [ "regex-automata", ] +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "md-5" version = "0.10.6" @@ -3817,6 +3875,12 @@ dependencies = [ "sketches-ddsketch", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -6370,6 +6434,17 @@ dependencies = [ "serde_core", ] +[[package]] +name = "serde_path_to_error" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" +dependencies = [ + "itoa", + "serde", + "serde_core", +] + [[package]] name = "serde_repr" version = "0.1.20" @@ -6961,6 +7036,7 @@ dependencies = [ "alloy-signer-local", "anyhow", "async-trait", + "axum", "backon", "clap", "dotenvy", @@ -7125,6 +7201,7 @@ dependencies = [ "tokio", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -7163,6 +7240,7 @@ version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", diff --git a/Cargo.toml b/Cargo.toml index 0b4ba56..fd18eaa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,6 +50,7 @@ testcontainers = { version = "0.23.1", features = ["blocking"] } testcontainers-modules = { version = "0.11.2", features = ["postgres", "kafka", "minio"] } jsonrpsee = { version = "0.26.0", features = ["server", "macros"] } chrono = { version = "0.4.42", features = ["serde"] } +axum = "0.8.3" # Kafka and S3 dependencies rdkafka = { version = "0.37.0", features = ["libz-static", "ssl-vendored"] } diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index 5099da8..6e7f427 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -38,3 +38,4 @@ reth-optimism-evm.workspace = true metrics.workspace = true metrics-derive.workspace = true metrics-exporter-prometheus.workspace = true +axum.workspace = true diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 40d65e8..4d0f2b2 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -10,6 +10,7 @@ use tips_core::kafka::load_kafka_config_from_file; use tips_core::logger::init_logger_with_format; use tips_ingress_rpc::Config; use tips_ingress_rpc::connect_ingress_to_builder; +use tips_ingress_rpc::health::bind_health_server; use tips_ingress_rpc::metrics::init_prometheus_exporter; use tips_ingress_rpc::queue::KafkaQueuePublisher; use tips_ingress_rpc::service::{IngressApiServer, IngressService}; @@ -35,6 +36,7 @@ async fn main() -> anyhow::Result<()> { mempool_url = %config.mempool_url, simulation_rpc = %config.simulation_rpc, metrics_address = %config.metrics_addr, + health_check_address = %config.health_check_addr, ); let provider: RootProvider = ProviderBuilder::new() @@ -71,6 +73,13 @@ async fn main() -> anyhow::Result<()> { connect_ingress_to_builder(builder_rx, builder_rpc.clone()); }); + let health_check_addr = config.health_check_addr; + let (bound_health_addr, health_handle) = bind_health_server(health_check_addr).await?; + info!( + message = "Health check server started", + address = %bound_health_addr + ); + let service = IngressService::new( provider, simulation_provider, @@ -91,5 +100,7 @@ async fn main() -> anyhow::Result<()> { ); handle.stopped().await; + health_handle.abort(); + Ok(()) } diff --git a/crates/ingress-rpc/src/health.rs b/crates/ingress-rpc/src/health.rs new file mode 100644 index 0000000..314fc49 --- /dev/null +++ b/crates/ingress-rpc/src/health.rs @@ -0,0 +1,31 @@ +use axum::{Router, http::StatusCode, response::IntoResponse, routing::get}; +use std::net::SocketAddr; +use tracing::info; + +/// Health check handler that always returns 200 OK +async fn health() -> impl IntoResponse { + StatusCode::OK +} + +/// Bind and start the health check server on the specified address. +/// Returns a handle that can be awaited to run the server. +pub async fn bind_health_server( + addr: SocketAddr, +) -> anyhow::Result<(SocketAddr, tokio::task::JoinHandle>)> { + let app = Router::new().route("/health", get(health)); + + let listener = tokio::net::TcpListener::bind(addr).await?; + let bound_addr = listener.local_addr()?; + + info!( + message = "Health check server bound successfully", + address = %bound_addr + ); + + let handle = tokio::spawn(async move { + axum::serve(listener, app).await?; + Ok(()) + }); + + Ok((bound_addr, handle)) +} diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index 922d010..f84fa63 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -1,3 +1,4 @@ +pub mod health; pub mod metrics; pub mod queue; pub mod service; @@ -136,6 +137,14 @@ pub struct Config { default_value = "100" )] pub max_buffered_meter_bundle_responses: usize, + + /// Address to bind the health check server to + #[arg( + long, + env = "TIPS_INGRESS_HEALTH_CHECK_ADDR", + default_value = "0.0.0.0:8081" + )] + pub health_check_addr: SocketAddr, } pub fn connect_ingress_to_builder( diff --git a/docker-compose.tips.yml b/docker-compose.tips.yml index 97fccb9..666802a 100644 --- a/docker-compose.tips.yml +++ b/docker-compose.tips.yml @@ -8,6 +8,7 @@ services: container_name: tips-ingress-rpc ports: - "8080:8080" + - "8081:8081" - "9002:9002" env_file: - .env.docker diff --git a/ui/src/app/api/health/route.ts b/ui/src/app/api/health/route.ts new file mode 100644 index 0000000..35adb41 --- /dev/null +++ b/ui/src/app/api/health/route.ts @@ -0,0 +1,5 @@ +import { NextResponse } from "next/server"; + +export async function GET() { + return NextResponse.json({ status: "ok" }, { status: 200 }); +} From 9b7aab4af5f9d473504ac8e3f1ad132d51bf857b Mon Sep 17 00:00:00 2001 From: cody-wang-cb Date: Tue, 2 Dec 2025 12:58:18 -0500 Subject: [PATCH 062/117] feat(ingress-rpc): Add eth_sendBackrunBundle RPC method with op-rbuilder integration (#78) --- .env.example | 1 + crates/ingress-rpc/src/bin/main.rs | 9 ++- crates/ingress-rpc/src/lib.rs | 43 ++++++++--- crates/ingress-rpc/src/metrics.rs | 8 ++- crates/ingress-rpc/src/service.rs | 111 +++++++++++++++++++++-------- justfile | 67 +++++++++++++++++ 6 files changed, 197 insertions(+), 42 deletions(-) diff --git a/.env.example b/.env.example index 0ff9039..66c83c5 100644 --- a/.env.example +++ b/.env.example @@ -17,6 +17,7 @@ TIPS_INGRESS_BLOCK_TIME_MILLISECONDS=2000 TIPS_INGRESS_METER_BUNDLE_TIMEOUT_MS=2000 TIPS_INGRESS_MAX_BUFFERED_METER_BUNDLE_RESPONSES=100 TIPS_INGRESS_BUILDER_RPCS=http://localhost:2222,http://localhost:2222,http://localhost:2222 +TIPS_INGRESS_BACKRUN_ENABLED=true # Audit service configuration TIPS_AUDIT_KAFKA_PROPERTIES_FILE=/app/docker/audit-kafka-properties diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 4d0f2b2..d5fd543 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -5,9 +5,9 @@ use op_alloy_network::Optimism; use rdkafka::ClientConfig; use rdkafka::producer::FutureProducer; use tips_audit::{BundleEvent, KafkaBundleEventPublisher, connect_audit_to_publisher}; -use tips_core::MeterBundleResponse; use tips_core::kafka::load_kafka_config_from_file; use tips_core::logger::init_logger_with_format; +use tips_core::{Bundle, MeterBundleResponse}; use tips_ingress_rpc::Config; use tips_ingress_rpc::connect_ingress_to_builder; use tips_ingress_rpc::health::bind_health_server; @@ -68,9 +68,11 @@ async fn main() -> anyhow::Result<()> { let (builder_tx, _) = broadcast::channel::(config.max_buffered_meter_bundle_responses); + let (builder_backrun_tx, _) = broadcast::channel::(config.max_buffered_backrun_bundles); config.builder_rpcs.iter().for_each(|builder_rpc| { - let builder_rx = builder_tx.subscribe(); - connect_ingress_to_builder(builder_rx, builder_rpc.clone()); + let metering_rx = builder_tx.subscribe(); + let backrun_rx = builder_backrun_tx.subscribe(); + connect_ingress_to_builder(metering_rx, backrun_rx, builder_rpc.clone()); }); let health_check_addr = config.health_check_addr; @@ -86,6 +88,7 @@ async fn main() -> anyhow::Result<()> { queue, audit_tx, builder_tx, + builder_backrun_tx, cfg, ); let bind_addr = format!("{}:{}", config.address, config.port); diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index f84fa63..8115f28 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -138,6 +138,14 @@ pub struct Config { )] pub max_buffered_meter_bundle_responses: usize, + /// Maximum number of backrun bundles to buffer in memory + #[arg( + long, + env = "TIPS_INGRESS_MAX_BUFFERED_BACKRUN_BUNDLES", + default_value = "100" + )] + pub max_buffered_backrun_bundles: usize, + /// Address to bind the health check server to #[arg( long, @@ -145,23 +153,29 @@ pub struct Config { default_value = "0.0.0.0:8081" )] pub health_check_addr: SocketAddr, + + /// Enable backrun bundle submission to op-rbuilder + #[arg(long, env = "TIPS_INGRESS_BACKRUN_ENABLED", default_value = "false")] + pub backrun_enabled: bool, } pub fn connect_ingress_to_builder( - event_rx: broadcast::Receiver, + metering_rx: broadcast::Receiver, + backrun_rx: broadcast::Receiver, builder_rpc: Url, ) { - tokio::spawn(async move { - let builder: RootProvider = ProviderBuilder::new() - .disable_recommended_fillers() - .network::() - .connect_http(builder_rpc); + let builder: RootProvider = ProviderBuilder::new() + .disable_recommended_fillers() + .network::() + .connect_http(builder_rpc); - let mut event_rx = event_rx; + let metering_builder = builder.clone(); + tokio::spawn(async move { + let mut event_rx = metering_rx; while let Ok(event) = event_rx.recv().await { // we only support one transaction per bundle for now let tx_hash = event.results[0].tx_hash; - if let Err(e) = builder + if let Err(e) = metering_builder .client() .request::<(TxHash, MeterBundleResponse), ()>( "base_setMeteringInformation", @@ -173,4 +187,17 @@ pub fn connect_ingress_to_builder( } } }); + + tokio::spawn(async move { + let mut event_rx = backrun_rx; + while let Ok(bundle) = event_rx.recv().await { + if let Err(e) = builder + .client() + .request::<(tips_core::Bundle,), ()>("base_sendBackrunBundle", (bundle,)) + .await + { + error!(error = %e, "Failed to send backrun bundle to builder"); + } + } + }); } diff --git a/crates/ingress-rpc/src/metrics.rs b/crates/ingress-rpc/src/metrics.rs index eb2e34c..b41eb01 100644 --- a/crates/ingress-rpc/src/metrics.rs +++ b/crates/ingress-rpc/src/metrics.rs @@ -1,4 +1,4 @@ -use metrics::Histogram; +use metrics::{Counter, Histogram}; use metrics_derive::Metrics; use metrics_exporter_prometheus::PrometheusBuilder; use std::net::SocketAddr; @@ -29,6 +29,12 @@ pub struct Metrics { #[metric(describe = "Duration of send_raw_transaction")] pub send_raw_transaction_duration: Histogram, + + #[metric(describe = "Total backrun bundles received")] + pub backrun_bundles_received_total: Counter, + + #[metric(describe = "Duration to send backrun bundle to op-rbuilder")] + pub backrun_bundles_sent_duration: Histogram, } /// Initialize Prometheus metrics exporter diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index b93eaa7..c26d971 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -31,6 +31,9 @@ pub trait IngressApi { #[method(name = "sendBundle")] async fn send_bundle(&self, bundle: Bundle) -> RpcResult; + #[method(name = "sendBackrunBundle")] + async fn send_backrun_bundle(&self, bundle: Bundle) -> RpcResult; + /// `eth_cancelBundle` is used to prevent a submitted bundle from being included on-chain. #[method(name = "cancelBundle")] async fn cancel_bundle(&self, request: CancelBundle) -> RpcResult<()>; @@ -58,6 +61,8 @@ pub struct IngressService { block_time_milliseconds: u64, meter_bundle_timeout_ms: u64, builder_tx: broadcast::Sender, + backrun_enabled: bool, + builder_backrun_tx: broadcast::Sender, } impl IngressService { @@ -67,6 +72,7 @@ impl IngressService { queue: Queue, audit_channel: mpsc::UnboundedSender, builder_tx: broadcast::Sender, + builder_backrun_tx: broadcast::Sender, config: Config, ) -> Self { Self { @@ -81,6 +87,8 @@ impl IngressService { block_time_milliseconds: config.block_time_milliseconds, meter_bundle_timeout_ms: config.meter_bundle_timeout_ms, builder_tx, + backrun_enabled: config.backrun_enabled, + builder_backrun_tx, } } } @@ -90,16 +98,45 @@ impl IngressApiServer for IngressService where Queue: QueuePublisher + Sync + Send + 'static, { + async fn send_backrun_bundle(&self, bundle: Bundle) -> RpcResult { + if !self.backrun_enabled { + info!( + message = "Backrun bundle submission is disabled", + backrun_enabled = self.backrun_enabled + ); + return Err( + EthApiError::InvalidParams("Backrun bundle submission is disabled".into()) + .into_rpc_err(), + ); + } + + let start = Instant::now(); + let (accepted_bundle, bundle_hash) = self.validate_parse_and_meter_bundle(&bundle).await?; + + self.metrics.backrun_bundles_received_total.increment(1); + + if let Err(e) = self.builder_backrun_tx.send(bundle) { + warn!( + message = "Failed to send backrun bundle to builders", + bundle_hash = %bundle_hash, + error = %e + ); + } + + self.send_audit_event(&accepted_bundle, bundle_hash); + + self.metrics + .backrun_bundles_sent_duration + .record(start.elapsed().as_secs_f64()); + + Ok(BundleHash { bundle_hash }) + } + async fn send_bundle(&self, bundle: Bundle) -> RpcResult { - // validate the bundle and consume the `bundle` to get an `AcceptedBundle` - self.validate_bundle(&bundle).await?; - let parsed_bundle: ParsedBundle = bundle - .clone() - .try_into() - .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; - let bundle_hash = &parsed_bundle.bundle_hash(); - let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await?; - let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response.clone()); + let (accepted_bundle, bundle_hash) = self.validate_parse_and_meter_bundle(&bundle).await?; + + // Get meter_bundle_response for builder broadcast + let meter_bundle_response = accepted_bundle.meter_bundle_response.clone(); // asynchronously send the meter bundle response to the builder self.builder_tx @@ -109,7 +146,7 @@ where // publish the bundle to the queue if let Err(e) = self .bundle_queue - .publish(&accepted_bundle, bundle_hash) + .publish(&accepted_bundle, &bundle_hash) .await { warn!(message = "Failed to publish bundle to queue", bundle_hash = %bundle_hash, error = %e); @@ -122,20 +159,9 @@ where ); // asynchronously send the audit event to the audit channel - let audit_event = BundleEvent::Received { - bundle_id: *accepted_bundle.uuid(), - bundle: Box::new(accepted_bundle.clone()), - }; - if let Err(e) = self.audit_channel.send(audit_event) { - warn!(message = "Failed to send audit event", error = %e); - return Err( - EthApiError::InvalidParams("Failed to send audit event".into()).into_rpc_err(), - ); - } + self.send_audit_event(&accepted_bundle, bundle_hash); - Ok(BundleHash { - bundle_hash: *bundle_hash, - }) + Ok(BundleHash { bundle_hash }) } async fn cancel_bundle(&self, _request: CancelBundle) -> RpcResult<()> { @@ -212,13 +238,7 @@ where } } - let audit_event = BundleEvent::Received { - bundle_id: *accepted_bundle.uuid(), - bundle: accepted_bundle.clone().into(), - }; - if let Err(e) = self.audit_channel.send(audit_event) { - warn!(message = "Failed to send audit event", error = %e); - } + self.send_audit_event(&accepted_bundle, transaction.tx_hash()); self.metrics .send_raw_transaction_duration @@ -327,6 +347,37 @@ where } Ok(res) } + + /// Helper method to validate, parse, and meter a bundle + async fn validate_parse_and_meter_bundle( + &self, + bundle: &Bundle, + ) -> RpcResult<(AcceptedBundle, B256)> { + self.validate_bundle(bundle).await?; + let parsed_bundle: ParsedBundle = bundle + .clone() + .try_into() + .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; + let bundle_hash = parsed_bundle.bundle_hash(); + let meter_bundle_response = self.meter_bundle(bundle, &bundle_hash).await?; + let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response.clone()); + Ok((accepted_bundle, bundle_hash)) + } + + /// Helper method to send audit event for a bundle + fn send_audit_event(&self, accepted_bundle: &AcceptedBundle, bundle_hash: B256) { + let audit_event = BundleEvent::Received { + bundle_id: *accepted_bundle.uuid(), + bundle: Box::new(accepted_bundle.clone()), + }; + if let Err(e) = self.audit_channel.send(audit_event) { + warn!( + message = "Failed to send audit event", + bundle_hash = %bundle_hash, + error = %e + ); + } + } } #[cfg(test)] diff --git a/justfile b/justfile index 2d4398e..4c30a66 100644 --- a/justfile +++ b/justfile @@ -99,6 +99,9 @@ get-blocks: sender := "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" sender_key := "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d" +backrunner := "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC" +backrunner_key := "0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a" + send-txn: #!/usr/bin/env bash set -euxo pipefail @@ -108,3 +111,67 @@ send-txn: hash=$(curl -s {{ ingress_url }} -X POST -H "Content-Type: application/json" --data "{\"method\":\"eth_sendRawTransaction\",\"params\":[\"$txn\"],\"id\":1,\"jsonrpc\":\"2.0\"}" | jq -r ".result") cast receipt $hash -r {{ sequencer_url }} | grep status cast receipt $hash -r {{ builder_url }} | grep status + +send-txn-with-backrun: + #!/usr/bin/env bash + set -euxo pipefail + + # 1. Get nonce and send target transaction from sender account + nonce=$(cast nonce {{ sender }} -r {{ builder_url }}) + echo "Sending target transaction from sender (nonce=$nonce)..." + target_txn=$(cast mktx --private-key {{ sender_key }} \ + 0x0000000000000000000000000000000000000000 \ + --value 0.01ether \ + --nonce $nonce \ + --chain-id 13 \ + -r {{ builder_url }}) + + target_hash=$(curl -s {{ ingress_url }} -X POST \ + -H "Content-Type: application/json" \ + --data "{\"method\":\"eth_sendRawTransaction\",\"params\":[\"$target_txn\"],\"id\":1,\"jsonrpc\":\"2.0\"}" \ + | jq -r ".result") + echo "Target tx sent: $target_hash" + + # 2. Build backrun transaction from backrunner account (different account!) + backrun_nonce=$(cast nonce {{ backrunner }} -r {{ builder_url }}) + echo "Building backrun transaction from backrunner (nonce=$backrun_nonce)..." + backrun_txn=$(cast mktx --private-key {{ backrunner_key }} \ + 0x0000000000000000000000000000000000000001 \ + --value 0.001ether \ + --nonce $backrun_nonce \ + --chain-id 13 \ + -r {{ builder_url }}) + + # 3. Compute tx hashes for reverting_tx_hashes + backrun_hash_computed=$(cast keccak $backrun_txn) + echo "Target tx hash: $target_hash" + echo "Backrun tx hash: $backrun_hash_computed" + + # 4. Construct and send bundle with reverting_tx_hashes + echo "Sending backrun bundle..." + bundle_json=$(jq -n \ + --arg target "$target_txn" \ + --arg backrun "$backrun_txn" \ + --arg target_hash "$target_hash" \ + --arg backrun_hash "$backrun_hash_computed" \ + '{ + txs: [$target, $backrun], + blockNumber: 0, + revertingTxHashes: [$target_hash, $backrun_hash] + }') + + bundle_hash=$(curl -s {{ ingress_url }} -X POST \ + -H "Content-Type: application/json" \ + --data "{\"method\":\"eth_sendBackrunBundle\",\"params\":[$bundle_json],\"id\":1,\"jsonrpc\":\"2.0\"}" \ + | jq -r ".result") + echo "Bundle sent: $bundle_hash" + + # 5. Wait and verify both transactions + echo "Waiting for transactions to land..." + sleep 5 + + echo "=== Target transaction (from sender) ===" + cast receipt $target_hash -r {{ sequencer_url }} | grep -E "(status|blockNumber|transactionIndex)" + + echo "=== Backrun transaction (from backrunner) ===" + cast receipt $backrun_hash_computed -r {{ sequencer_url }} | grep -E "(status|blockNumber|transactionIndex)" || echo "Backrun tx not found yet" From 39395f2360be37138515ffa07bd38215be25625e Mon Sep 17 00:00:00 2001 From: Rayyan Alam <62478924+rayyan224@users.noreply.github.com> Date: Tue, 2 Dec 2025 13:37:51 -0500 Subject: [PATCH 063/117] Add account abstraction core crate and wire up communication with base_sendUserOperation (#86) * feat: create inital types * feat: implement user operation method * feat: create cargo queue * feat: create send user operation * feat: create basic handler service * feat: update client to use types from alloy * chore: fix cargo service * chore: run format * chore: update formating * chore: fix build * chore: update services * feat: extract out core for folder structure * feat: setup service for simmulating user ops * feat: wire up account abstraction services * chore: clean up * chore: clean up warnings * chore: merge master * chore: format * chore: clean up aa * chore: clean up * chore: clean up --------- Co-authored-by: Rayyan Alam --- Cargo.lock | 70 +++++++ Cargo.toml | 4 +- crates/account-abstraction-core/Cargo.toml | 29 +++ .../core/src/account_abstraction_service.rs | 188 ++++++++++++++++++ .../account-abstraction-core/core/src/lib.rs | 5 + .../core/src/types.rs | 147 ++++++++++++++ crates/core/src/lib.rs | 1 - crates/ingress-rpc/Cargo.toml | 1 + crates/ingress-rpc/src/lib.rs | 7 + crates/ingress-rpc/src/service.rs | 21 +- 10 files changed, 468 insertions(+), 5 deletions(-) create mode 100644 crates/account-abstraction-core/Cargo.toml create mode 100644 crates/account-abstraction-core/core/src/account_abstraction_service.rs create mode 100644 crates/account-abstraction-core/core/src/lib.rs create mode 100644 crates/account-abstraction-core/core/src/types.rs diff --git a/Cargo.lock b/Cargo.lock index 12ae8a6..13aa174 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,24 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "account-abstraction-core" +version = "0.1.0" +dependencies = [ + "alloy-primitives", + "alloy-provider", + "alloy-rpc-types", + "alloy-serde", + "async-trait", + "jsonrpsee", + "op-alloy-network", + "reth-rpc-eth-types", + "serde", + "serde_json", + "tokio", + "wiremock", +] + [[package]] name = "adler2" version = "2.0.1" @@ -1065,6 +1083,16 @@ dependencies = [ "serde", ] +[[package]] +name = "assert-json-diff" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "async-stream" version = "0.3.6" @@ -2282,6 +2310,24 @@ dependencies = [ "parking_lot_core", ] +[[package]] +name = "deadpool" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0be2b1d1d6ec8d846f05e137292d0b89133caf95ef33695424c09568bdd39b1b" +dependencies = [ + "deadpool-runtime", + "lazy_static", + "num_cpus", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" + [[package]] name = "der" version = "0.6.1" @@ -7030,6 +7076,7 @@ dependencies = [ name = "tips-ingress-rpc" version = "0.1.0" dependencies = [ + "account-abstraction-core", "alloy-consensus", "alloy-primitives", "alloy-provider", @@ -7891,6 +7938,29 @@ dependencies = [ "memchr", ] +[[package]] +name = "wiremock" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08db1edfb05d9b3c1542e521aea074442088292f00b5f28e435c714a98f85031" +dependencies = [ + "assert-json-diff", + "base64 0.22.1", + "deadpool", + "futures", + "http 1.3.1", + "http-body-util", + "hyper 1.8.0", + "hyper-util", + "log", + "once_cell", + "regex", + "serde", + "serde_json", + "tokio", + "url", +] + [[package]] name = "wit-bindgen" version = "0.46.0" diff --git a/Cargo.toml b/Cargo.toml index fd18eaa..12e034e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,12 +7,13 @@ homepage = "https://github.com/base/tips" repository = "https://github.com/base/tips" [workspace] -members = ["crates/audit", "crates/ingress-rpc", "crates/core"] +members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core"] resolver = "2" [workspace.dependencies] tips-audit = { path = "crates/audit" } tips-core = { path = "crates/core" } +account-abstraction-core = { path = "crates/account-abstraction-core" } # Reth reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } @@ -50,6 +51,7 @@ testcontainers = { version = "0.23.1", features = ["blocking"] } testcontainers-modules = { version = "0.11.2", features = ["postgres", "kafka", "minio"] } jsonrpsee = { version = "0.26.0", features = ["server", "macros"] } chrono = { version = "0.4.42", features = ["serde"] } +wiremock = "0.6.2" axum = "0.8.3" # Kafka and S3 dependencies diff --git a/crates/account-abstraction-core/Cargo.toml b/crates/account-abstraction-core/Cargo.toml new file mode 100644 index 0000000..a16a79d --- /dev/null +++ b/crates/account-abstraction-core/Cargo.toml @@ -0,0 +1,29 @@ +[package] +name = "account-abstraction-core" +version.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +edition.workspace = true + +[lib] +path = "core/src/lib.rs" + +[dependencies] +alloy-serde = { version = "1.0.41", default-features = false } +serde.workspace = true +alloy-rpc-types.workspace = true +alloy-provider.workspace = true +op-alloy-network.workspace = true +alloy-primitives = { workspace = true } +reth-rpc-eth-types.workspace = true +tokio.workspace = true +jsonrpsee.workspace = true +async-trait = { workspace = true } + +[dev-dependencies] +alloy-primitives.workspace = true +serde_json.workspace = true +wiremock.workspace = true + diff --git a/crates/account-abstraction-core/core/src/account_abstraction_service.rs b/crates/account-abstraction-core/core/src/account_abstraction_service.rs new file mode 100644 index 0000000..0cba40d --- /dev/null +++ b/crates/account-abstraction-core/core/src/account_abstraction_service.rs @@ -0,0 +1,188 @@ +use crate::types::{UserOperationRequest, UserOperationRequestValidationResult}; +use alloy_provider::{Provider, RootProvider}; +use async_trait::async_trait; +use jsonrpsee::core::RpcResult; +use op_alloy_network::Optimism; +use reth_rpc_eth_types::EthApiError; +use std::sync::Arc; +use tokio::time::{Duration, timeout}; +#[async_trait] +pub trait AccountAbstractionService: Send + Sync { + async fn validate_user_operation( + &self, + user_operation: UserOperationRequest, + ) -> RpcResult; +} + +#[derive(Debug, Clone)] +pub struct AccountAbstractionServiceImpl { + simulation_provider: Arc>, + validate_user_operation_timeout: u64, +} + +#[async_trait] +impl AccountAbstractionService for AccountAbstractionServiceImpl { + async fn validate_user_operation( + &self, + user_operation: UserOperationRequest, + ) -> RpcResult { + // Steps: Reputation Service Validate + // Steps: Base Node Validate User Operation + self.base_node_validate_user_operation(user_operation).await + } +} + +impl AccountAbstractionServiceImpl { + pub fn new( + simulation_provider: Arc>, + validate_user_operation_timeout: u64, + ) -> Self { + Self { + simulation_provider, + validate_user_operation_timeout, + } + } + + pub async fn base_node_validate_user_operation( + &self, + user_operation: UserOperationRequest, + ) -> RpcResult { + let result = timeout( + Duration::from_secs(self.validate_user_operation_timeout), + self.simulation_provider + .client() + .request("base_validateUserOperation", (user_operation,)), + ) + .await; + + let validation_result: UserOperationRequestValidationResult = match result { + Err(_) => { + return Err( + EthApiError::InvalidParams("Timeout on requesting validation".into()) + .into_rpc_err(), + ); + } + Ok(Err(e)) => { + return Err(EthApiError::InvalidParams(e.to_string()).into_rpc_err()); // likewise, map RPC error to your error type + } + Ok(Ok(v)) => v, + }; + + Ok(validation_result) + } +} + +#[cfg(test)] +mod tests { + use super::*; + + use alloy_primitives::{Address, Bytes, U256}; + use alloy_rpc_types::erc4337::UserOperation; + use tokio::time::Duration; + use wiremock::{Mock, MockServer, ResponseTemplate, matchers::method}; + + const VALIDATION_TIMEOUT_SECS: u64 = 1; + const LONG_DELAY_SECS: u64 = 3; + + async fn setup_mock_server() -> MockServer { + MockServer::start().await + } + + fn new_test_user_operation_v06() -> UserOperationRequest { + UserOperationRequest::EntryPointV06(UserOperation { + sender: Address::ZERO, + nonce: U256::from(0), + init_code: Bytes::default(), + call_data: Bytes::default(), + call_gas_limit: U256::from(21_000), + verification_gas_limit: U256::from(100_000), + pre_verification_gas: U256::from(21_000), + max_fee_per_gas: U256::from(1_000_000_000), + max_priority_fee_per_gas: U256::from(1_000_000_000), + paymaster_and_data: Bytes::default(), + signature: Bytes::default(), + }) + } + + fn new_service(mock_server: &MockServer) -> AccountAbstractionServiceImpl { + let provider: RootProvider = + RootProvider::new_http(mock_server.uri().parse().unwrap()); + let simulation_provider = Arc::new(provider); + AccountAbstractionServiceImpl::new(simulation_provider, VALIDATION_TIMEOUT_SECS) + } + + #[tokio::test] + async fn base_node_validate_user_operation_times_out() { + let mock_server = setup_mock_server().await; + + Mock::given(method("POST")) + .respond_with( + ResponseTemplate::new(200).set_delay(Duration::from_secs(LONG_DELAY_SECS)), + ) + .mount(&mock_server) + .await; + + let service = new_service(&mock_server); + let user_operation = new_test_user_operation_v06(); + + let result = service + .base_node_validate_user_operation(user_operation) + .await; + + assert!(result.is_err()); + assert!(result.unwrap_err().to_string().contains("Timeout")); + } + + #[tokio::test] + async fn should_propagate_error_from_base_node() { + let mock_server = setup_mock_server().await; + + Mock::given(method("POST")) + .respond_with(ResponseTemplate::new(500).set_body_json(serde_json::json!({ + "jsonrpc": "2.0", + "id": 1, + "error": { + "code": -32000, + "message": "Internal error" + } + }))) + .mount(&mock_server) + .await; + + let service = new_service(&mock_server); + let user_operation = new_test_user_operation_v06(); + + let result = service + .base_node_validate_user_operation(user_operation) + .await; + assert!(result.is_err()); + assert!(result.unwrap_err().to_string().contains("Internal error")); + } + #[tokio::test] + async fn base_node_validate_user_operation_succeeds() { + let mock_server = setup_mock_server().await; + + Mock::given(method("POST")) + .respond_with(ResponseTemplate::new(200).set_body_json(serde_json::json!({ + "jsonrpc": "2.0", + "id": 1, + "result": { + "expirationTimestamp": 1000, + "gasUsed": "10000" + } + }))) + .mount(&mock_server) + .await; + + let service = new_service(&mock_server); + let user_operation = new_test_user_operation_v06(); + + let result = service + .base_node_validate_user_operation(user_operation) + .await + .unwrap(); + + assert_eq!(result.expiration_timestamp, 1000); + assert_eq!(result.gas_used, U256::from(10_000)); + } +} diff --git a/crates/account-abstraction-core/core/src/lib.rs b/crates/account-abstraction-core/core/src/lib.rs new file mode 100644 index 0000000..bb2abc3 --- /dev/null +++ b/crates/account-abstraction-core/core/src/lib.rs @@ -0,0 +1,5 @@ +pub mod account_abstraction_service; +pub mod types; + +pub use account_abstraction_service::{AccountAbstractionService, AccountAbstractionServiceImpl}; +pub use types::{SendUserOperationResponse, UserOperationRequest}; diff --git a/crates/account-abstraction-core/core/src/types.rs b/crates/account-abstraction-core/core/src/types.rs new file mode 100644 index 0000000..27e6303 --- /dev/null +++ b/crates/account-abstraction-core/core/src/types.rs @@ -0,0 +1,147 @@ +use alloy_primitives::U256; +use alloy_rpc_types::erc4337; +use serde::{Deserialize, Serialize}; + +// Re-export SendUserOperationResponse +pub use alloy_rpc_types::erc4337::SendUserOperationResponse; + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +#[serde(tag = "type")] +pub enum UserOperationRequest { + EntryPointV06(erc4337::UserOperation), + EntryPointV07(erc4337::PackedUserOperation), +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct UserOperationRequestValidationResult { + pub expiration_timestamp: u64, + pub gas_used: U256, +} + +// Tests +#[cfg(test)] +mod tests { + use std::str::FromStr; + + use super::*; + use alloy_primitives::{Address, Bytes, Uint}; + #[test] + fn should_throw_error_when_deserializing_invalid() { + const TEST_INVALID_USER_OPERATION: &str = r#" + { + "type": "EntryPointV06", + "sender": "0x1111111111111111111111111111111111111111", + "nonce": "0x0", + "callGasLimit": "0x5208" + } + "#; + let user_operation: Result = + serde_json::from_str::(TEST_INVALID_USER_OPERATION); + assert!(user_operation.is_err()); + } + + #[test] + fn should_deserialize_v06() { + const TEST_USER_OPERATION: &str = r#" + { + "type": "EntryPointV06", + "sender": "0x1111111111111111111111111111111111111111", + "nonce": "0x0", + "initCode": "0x", + "callData": "0x", + "callGasLimit": "0x5208", + "verificationGasLimit": "0x100000", + "preVerificationGas": "0x10000", + "maxFeePerGas": "0x59682f10", + "maxPriorityFeePerGas": "0x3b9aca00", + "paymasterAndData": "0x", + "signature": "0x01" + } + "#; + let user_operation: Result = + serde_json::from_str::(TEST_USER_OPERATION); + if user_operation.is_err() { + panic!("Error: {:?}", user_operation.err()); + } + let user_operation = user_operation.unwrap(); + match user_operation { + UserOperationRequest::EntryPointV06(user_operation) => { + assert_eq!( + user_operation.sender, + Address::from_str("0x1111111111111111111111111111111111111111").unwrap() + ); + assert_eq!(user_operation.nonce, Uint::from(0)); + assert_eq!(user_operation.init_code, Bytes::from_str("0x").unwrap()); + assert_eq!(user_operation.call_data, Bytes::from_str("0x").unwrap()); + assert_eq!(user_operation.call_gas_limit, Uint::from(0x5208)); + assert_eq!(user_operation.verification_gas_limit, Uint::from(0x100000)); + assert_eq!(user_operation.pre_verification_gas, Uint::from(0x10000)); + assert_eq!(user_operation.max_fee_per_gas, Uint::from(0x59682f10)); + assert_eq!( + user_operation.max_priority_fee_per_gas, + Uint::from(0x3b9aca00) + ); + assert_eq!( + user_operation.paymaster_and_data, + Bytes::from_str("0x").unwrap() + ); + assert_eq!(user_operation.signature, Bytes::from_str("0x01").unwrap()); + } + _ => { + panic!("Expected EntryPointV06, got {:?}", user_operation); + } + } + } + + #[test] + fn should_deserialize_v07() { + const TEST_PACKED_USER_OPERATION: &str = r#" + { + "type": "EntryPointV07", + "sender": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + "nonce": "0x1", + "factory": "0x2222222222222222222222222222222222222222", + "factoryData": "0xabcdef1234560000000000000000000000000000000000000000000000000000", + "callData": "0xb61d27f600000000000000000000000000000000000000000000000000000000000000c8", + "callGasLimit": "0x2dc6c0", + "verificationGasLimit": "0x1e8480", + "preVerificationGas": "0x186a0", + "maxFeePerGas": "0x77359400", + "maxPriorityFeePerGas": "0x3b9aca00", + "paymaster": "0x3333333333333333333333333333333333333333", + "paymasterVerificationGasLimit": "0x186a0", + "paymasterPostOpGasLimit": "0x27100", + "paymasterData": "0xfafb00000000000000000000000000000000000000000000000000000000000064", + "signature": "0xa3c5f1b90014e68abbbdc42e4b77b9accc0b7e1c5d0b5bcde1a47ba8faba00ff55c9a7de12e98b731766e35f6c51ab25c9b58cc0e7c4a33f25e75c51c6ad3c3a" + } + "#; + let user_operation: Result = + serde_json::from_str::(TEST_PACKED_USER_OPERATION); + if user_operation.is_err() { + panic!("Error: {:?}", user_operation.err()); + } + let user_operation = user_operation.unwrap(); + match user_operation { + UserOperationRequest::EntryPointV07(user_operation) => { + assert_eq!( + user_operation.sender, + Address::from_str("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48").unwrap() + ); + assert_eq!(user_operation.nonce, Uint::from(1)); + assert_eq!( + user_operation.call_data, + alloy_primitives::bytes!( + "0xb61d27f600000000000000000000000000000000000000000000000000000000000000c8" + ) + ); + assert_eq!(user_operation.call_gas_limit, Uint::from(0x2dc6c0)); + assert_eq!(user_operation.verification_gas_limit, Uint::from(0x1e8480)); + assert_eq!(user_operation.pre_verification_gas, Uint::from(0x186a0)); + } + _ => { + panic!("Expected EntryPointV07, got {:?}", user_operation); + } + } + } +} diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index 168115a..dedeb11 100644 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -3,7 +3,6 @@ pub mod logger; #[cfg(any(test, feature = "test-utils"))] pub mod test_utils; pub mod types; -pub mod user_ops_types; pub use types::{ AcceptedBundle, Bundle, BundleExtensions, BundleHash, BundleTxs, CancelBundle, diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index 6e7f427..462ef28 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -14,6 +14,7 @@ path = "src/bin/main.rs" [dependencies] tips-core.workspace = true tips-audit.workspace = true +account-abstraction-core.workspace=true jsonrpsee.workspace = true alloy-primitives.workspace = true op-alloy-network.workspace = true diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index 8115f28..9401400 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -126,6 +126,13 @@ pub struct Config { )] pub meter_bundle_timeout_ms: u64, + #[arg( + long, + env = "TIPS_INGRESS_VALIDATE_USER_OPERATION_TIMEOUT_MS", + default_value = "2000" + )] + pub validate_user_operation_timeout_ms: u64, + /// URLs of the builder RPC service for setting metering information #[arg(long, env = "TIPS_INGRESS_BUILDER_RPCS", value_delimiter = ',')] pub builder_rpcs: Vec, diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index c26d971..0755e35 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -14,7 +14,6 @@ use tips_audit::BundleEvent; use tips_core::types::ParsedBundle; use tips_core::{ AcceptedBundle, Bundle, BundleExtensions, BundleHash, CancelBundle, MeterBundleResponse, - user_ops_types::{SendUserOperationResponse, UserOperationRequest}, }; use tokio::sync::{broadcast, mpsc}; use tokio::time::{Duration, Instant, timeout}; @@ -24,6 +23,9 @@ use crate::metrics::{Metrics, record_histogram}; use crate::queue::QueuePublisher; use crate::validation::validate_bundle; use crate::{Config, TxSubmissionMethod}; +use account_abstraction_core::types::{SendUserOperationResponse, UserOperationRequest}; +use account_abstraction_core::{AccountAbstractionService, AccountAbstractionServiceImpl}; +use std::sync::Arc; #[rpc(server, namespace = "eth")] pub trait IngressApi { @@ -51,8 +53,9 @@ pub trait IngressApi { } pub struct IngressService { - provider: RootProvider, - simulation_provider: RootProvider, + provider: Arc>, + simulation_provider: Arc>, + account_abstraction_service: AccountAbstractionServiceImpl, tx_submission_method: TxSubmissionMethod, bundle_queue: Queue, audit_channel: mpsc::UnboundedSender, @@ -75,9 +78,17 @@ impl IngressService { builder_backrun_tx: broadcast::Sender, config: Config, ) -> Self { + let provider = Arc::new(provider); + let simulation_provider = Arc::new(simulation_provider); + let account_abstraction_service: AccountAbstractionServiceImpl = + AccountAbstractionServiceImpl::new( + simulation_provider.clone(), + config.validate_user_operation_timeout_ms, + ); Self { provider, simulation_provider, + account_abstraction_service, tx_submission_method: config.tx_submission_method, bundle_queue: queue, audit_channel, @@ -256,6 +267,10 @@ where // STEPS: // 1. Reputation Service Validate // 2. Base Node Validate User Operation + let _ = self + .account_abstraction_service + .validate_user_operation(user_operation) + .await?; // 3. Send to Kafka // Send Hash // todo!("not yet implemented send_user_operation"); From 336e9eed65404da752aab0b56f1efc5edf948e2c Mon Sep 17 00:00:00 2001 From: William Law Date: Tue, 2 Dec 2025 14:09:22 -0500 Subject: [PATCH 064/117] feat: enable producer side compression for kafka (#82) * bincode msgs * use lz4 * bump --- Cargo.lock | 16 ++++++++++++++++ Cargo.toml | 1 + crates/audit/Cargo.toml | 1 + crates/audit/src/publisher.rs | 3 ++- crates/audit/src/reader.rs | 4 +++- crates/core/src/user_ops_types.rs | 4 ++-- 6 files changed, 25 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 13aa174..2db75e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3820,6 +3820,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" +[[package]] +name = "lz4_flex" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab6473172471198271ff72e9379150e9dfd70d8e533e0752a27e515b48dd375e" +dependencies = [ + "twox-hash", +] + [[package]] name = "macro-string" version = "0.1.4" @@ -7039,6 +7048,7 @@ dependencies = [ "bytes", "clap", "dotenvy", + "lz4_flex", "op-alloy-consensus", "rdkafka", "serde", @@ -7381,6 +7391,12 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "twox-hash" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" + [[package]] name = "typenum" version = "1.19.0" diff --git a/Cargo.toml b/Cargo.toml index 12e034e..3a85042 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,6 +60,7 @@ aws-config = "1.1.7" aws-sdk-s3 = "1.106.0" aws-credential-types = "1.1.7" bytes = { version = "1.8.0", features = ["serde"] } +lz4_flex = "0.12" # tips-ingress backon = "1.5.2" diff --git a/crates/audit/Cargo.toml b/crates/audit/Cargo.toml index 25cf7e3..aa8c1b3 100644 --- a/crates/audit/Cargo.toml +++ b/crates/audit/Cargo.toml @@ -32,6 +32,7 @@ aws-config = { workspace = true } aws-sdk-s3 = { workspace = true } aws-credential-types = { workspace = true } bytes = { workspace = true } +lz4_flex = { workspace = true } [dev-dependencies] testcontainers = { workspace = true } diff --git a/crates/audit/src/publisher.rs b/crates/audit/src/publisher.rs index 0d31391..4807fc0 100644 --- a/crates/audit/src/publisher.rs +++ b/crates/audit/src/publisher.rs @@ -26,7 +26,8 @@ impl KafkaBundleEventPublisher { async fn send_event(&self, event: &BundleEvent) -> Result<()> { let bundle_id = event.bundle_id(); let key = event.generate_event_key(); - let payload = serde_json::to_vec(event)?; + let json_bytes = serde_json::to_vec(event)?; + let payload = lz4_flex::compress_prepend_size(&json_bytes); let record = FutureRecord::to(&self.topic).key(&key).payload(&payload); diff --git a/crates/audit/src/reader.rs b/crates/audit/src/reader.rs index 207b8ac..329dd9c 100644 --- a/crates/audit/src/reader.rs +++ b/crates/audit/src/reader.rs @@ -77,7 +77,9 @@ impl EventReader for KafkaAuditLogReader { .as_millis() as i64, }; - let event: BundleEvent = serde_json::from_slice(payload)?; + let json_bytes = lz4_flex::decompress_size_prepended(payload) + .map_err(|e| anyhow::anyhow!("Failed to decompress LZ4: {e}"))?; + let event: BundleEvent = serde_json::from_slice(&json_bytes)?; debug!( bundle_id = %event.bundle_id(), diff --git a/crates/core/src/user_ops_types.rs b/crates/core/src/user_ops_types.rs index 837e51f..95780a6 100644 --- a/crates/core/src/user_ops_types.rs +++ b/crates/core/src/user_ops_types.rs @@ -81,7 +81,7 @@ mod tests { assert_eq!(user_operation.signature, Bytes::from_str("0x01").unwrap()); } _ => { - panic!("Expected EntryPointV06, got {:?}", user_operation); + panic!("Expected EntryPointV06, got {user_operation:?}"); } } } @@ -132,7 +132,7 @@ mod tests { assert_eq!(user_operation.pre_verification_gas, Uint::from(0x186a0)); } _ => { - panic!("Expected EntryPointV07, got {:?}", user_operation); + panic!("Expected EntryPointV07, got {user_operation:?}"); } } } From c609003a4433bce394f57aa4054ccb1b8c82a837 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Wed, 3 Dec 2025 09:48:28 -0600 Subject: [PATCH 065/117] feat: show simulation info on tips-ui / styling (#89) * feat: show simulation details for bundle * links to block explorers * fix lints --- .env.example | 1 + ui/src/app/api/bundles/all/route.ts | 15 - ui/src/app/api/bundles/route.ts | 15 - ui/src/app/bundles/[uuid]/page.tsx | 587 +++++++++++++++++++++++----- ui/src/app/bundles/page.tsx | 156 -------- ui/src/app/page.tsx | 73 +++- ui/src/lib/s3.ts | 86 ++-- ui/tsconfig.json | 2 +- 8 files changed, 625 insertions(+), 310 deletions(-) delete mode 100644 ui/src/app/api/bundles/all/route.ts delete mode 100644 ui/src/app/api/bundles/route.ts delete mode 100644 ui/src/app/bundles/page.tsx diff --git a/.env.example b/.env.example index 66c83c5..05d227f 100644 --- a/.env.example +++ b/.env.example @@ -32,6 +32,7 @@ TIPS_AUDIT_S3_ACCESS_KEY_ID=minioadmin TIPS_AUDIT_S3_SECRET_ACCESS_KEY=minioadmin # TIPS UI +NEXT_PUBLIC_BLOCK_EXPLORER_URL=https://base.blockscout.com TIPS_UI_AWS_REGION=us-east-1 TIPS_UI_S3_BUCKET_NAME=tips TIPS_UI_S3_CONFIG_TYPE=manual diff --git a/ui/src/app/api/bundles/all/route.ts b/ui/src/app/api/bundles/all/route.ts deleted file mode 100644 index 847cacf..0000000 --- a/ui/src/app/api/bundles/all/route.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NextResponse } from "next/server"; -import { listAllBundleKeys } from "@/lib/s3"; - -export async function GET() { - try { - const bundleKeys = await listAllBundleKeys(); - return NextResponse.json(bundleKeys); - } catch (error) { - console.error("Error fetching all bundle keys:", error); - return NextResponse.json( - { error: "Internal server error" }, - { status: 500 }, - ); - } -} diff --git a/ui/src/app/api/bundles/route.ts b/ui/src/app/api/bundles/route.ts deleted file mode 100644 index a927f56..0000000 --- a/ui/src/app/api/bundles/route.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NextResponse } from "next/server"; -import { listAllBundleKeys } from "@/lib/s3"; - -export async function GET() { - try { - const bundleKeys = await listAllBundleKeys(); - return NextResponse.json(bundleKeys); - } catch (error) { - console.error("Error fetching bundles:", error); - return NextResponse.json( - { error: "Internal server error" }, - { status: 500 }, - ); - } -} diff --git a/ui/src/app/bundles/[uuid]/page.tsx b/ui/src/app/bundles/[uuid]/page.tsx index b194f49..5cab893 100644 --- a/ui/src/app/bundles/[uuid]/page.tsx +++ b/ui/src/app/bundles/[uuid]/page.tsx @@ -1,12 +1,388 @@ "use client"; +import Link from "next/link"; import { useEffect, useState } from "react"; import type { BundleHistoryResponse } from "@/app/api/bundle/[uuid]/route"; +import type { BundleTransaction, MeterBundleResponse } from "@/lib/s3"; + +const WEI_PER_GWEI = 10n ** 9n; +const WEI_PER_ETH = 10n ** 18n; +const BLOCK_EXPLORER_URL = process.env.NEXT_PUBLIC_BLOCK_EXPLORER_URL; interface PageProps { params: Promise<{ uuid: string }>; } +function formatBigInt(value: bigint, decimals: number, scale: bigint): string { + const whole = value / scale; + const frac = ((value % scale) * 10n ** BigInt(decimals)) / scale; + return `${whole}.${frac.toString().padStart(decimals, "0")}`; +} + +function formatHexValue(hex: string): string { + const value = BigInt(hex); + if (value >= WEI_PER_ETH / 10000n) { + return `${formatBigInt(value, 6, WEI_PER_ETH)} ETH`; + } + if (value >= WEI_PER_GWEI / 100n) { + return `${formatBigInt(value, 4, WEI_PER_GWEI)} Gwei`; + } + return `${value.toString()} Wei`; +} + +function formatGasPrice(hex: string): string { + const value = BigInt(hex); + return `${formatBigInt(value, 2, WEI_PER_GWEI)} Gwei`; +} + +function ExplorerLink({ + type, + value, + children, + className = "", +}: { + type: "tx" | "address"; + value: string; + children: React.ReactNode; + className?: string; +}) { + if (!BLOCK_EXPLORER_URL) { + return {children}; + } + + const path = type === "tx" ? `/tx/${value}` : `/address/${value}`; + return ( + + {children} + + ); +} + +function CopyButton({ text }: { text: string }) { + const [copied, setCopied] = useState(false); + + const handleCopy = async () => { + await navigator.clipboard.writeText(text); + setCopied(true); + setTimeout(() => setCopied(false), 2000); + }; + + return ( + + ); +} + +function Badge({ + children, + variant = "default", +}: { + children: React.ReactNode; + variant?: "default" | "success" | "warning" | "error"; +}) { + const variants = { + default: "bg-blue-50 text-blue-700 ring-blue-600/20", + success: "bg-emerald-50 text-emerald-700 ring-emerald-600/20", + warning: "bg-amber-50 text-amber-700 ring-amber-600/20", + error: "bg-red-50 text-red-700 ring-red-600/20", + }; + + return ( + + {children} + + ); +} + +function Card({ + children, + className = "", +}: { + children: React.ReactNode; + className?: string; +}) { + return ( +
+ {children} +
+ ); +} + +function TransactionDetails({ + tx, + index, + isReverting, +}: { + tx: BundleTransaction; + index: number; + isReverting: boolean; +}) { + const [expanded, setExpanded] = useState(index === 0); + + return ( +
+ + + {expanded && ( + <> +
+ + + + + + + + + + + + + + + +
Hash + + + {tx.hash} + + + +
From + + + {tx.signer} + + + +
To + + + {tx.to} + + + +
+
+
+
+ Nonce + {parseInt(tx.nonce, 16)} +
+
+ Max Fee + + {formatGasPrice(tx.maxFeePerGas)} + +
+
+ Priority Fee + + {formatGasPrice(tx.maxPriorityFeePerGas)} + +
+
+ Type + + {tx.type === "0x2" ? "EIP-1559" : tx.type} + +
+
+ + )} +
+ ); +} + +function SimulationCard({ meter }: { meter: MeterBundleResponse }) { + return ( + +
+
+
+
Total Gas
+
+ {meter.totalGasUsed.toLocaleString()} +
+
+
+
Execution Time
+
+ {meter.totalExecutionTimeUs}μs +
+
+
+
Gas Price
+
+ {formatGasPrice(meter.bundleGasPrice)} +
+
+
+
Coinbase Diff
+
+ {formatHexValue(meter.coinbaseDiff)} +
+
+
+
+
+
+ State Block + #{meter.stateBlockNumber} +
+
+ Gas Fees + + {formatHexValue(meter.gasFees)} + +
+
+ ETH to Coinbase + + {formatHexValue(meter.ethSentToCoinbase)} + +
+
+ + ); +} + +function Timeline({ events }: { events: BundleHistoryResponse["history"] }) { + if (events.length === 0) return null; + + return ( +
+ {events.map((event, index) => ( +
+
+
+
+
+ {event.event} + +
+
+ ))} +
+ ); +} + +function SectionTitle({ children }: { children: React.ReactNode }) { + return ( +

{children}

+ ); +} + export default function BundlePage({ params }: PageProps) { const [uuid, setUuid] = useState(""); const [data, setData] = useState(null); @@ -14,11 +390,7 @@ export default function BundlePage({ params }: PageProps) { const [error, setError] = useState(null); useEffect(() => { - const initializeParams = async () => { - const resolvedParams = await params; - setUuid(resolvedParams.uuid); - }; - initializeParams(); + params.then((p) => setUuid(p.uuid)); }, [params]); useEffect(() => { @@ -28,18 +400,17 @@ export default function BundlePage({ params }: PageProps) { try { const response = await fetch(`/api/bundle/${uuid}`); if (!response.ok) { - if (response.status === 404) { - setError("Bundle not found"); - } else { - setError("Failed to fetch bundle data"); - } + setError( + response.status === 404 + ? "Bundle not found" + : "Failed to fetch bundle data", + ); setData(null); return; } - const result = await response.json(); - setData(result); + setData(await response.json()); setError(null); - } catch (_err) { + } catch { setError("Failed to fetch bundle data"); setData(null); } finally { @@ -48,97 +419,135 @@ export default function BundlePage({ params }: PageProps) { }; fetchData(); - - const interval = setInterval(fetchData, 400); - + const interval = setInterval(fetchData, 5000); return () => clearInterval(interval); }, [uuid]); - if (!uuid) { + if (!uuid || (loading && !data)) { return ( -
-
Loading...
+
+
+
+ Loading bundle... +
); } + const latestBundle = data?.history + .filter((e) => e.data?.bundle) + .map((e) => e.data.bundle) + .pop(); + const revertingHashes = new Set(latestBundle?.reverting_tx_hashes || []); + return ( -
-
-

Bundle {uuid}

- {loading && ( -
Loading bundle data...
- )} +
+
+
+
+ + + Back + + + +
+ + TIPS + +
+
+ + {uuid} + + +
+
+
+ +
{error && ( -
{error}
+ +
+
+ + Error + + +
+
+

Error

+

{error}

+
+
+ )} -
- {data && ( -
- {(() => { - const transactions = new Set(); - - data.history.forEach((event) => { - event.data?.bundle?.revertingTxHashes?.forEach((tx) => { - transactions.add(tx); - }); - }); - - return transactions.size > 0 ? ( -
-

Transactions

-
    - {Array.from(transactions).map((tx) => ( -
  • {tx}
    • - ))} -
-
- ) : null; - })()} - -
-

Bundle History

- - {data.history.length > 0 ? ( -
- {data.history.map((event, index) => { - return ( -
-
-
- - {event.event} - - - {event.data?.timestamp - ? new Date(event.data?.timestamp).toLocaleString() - : "No timestamp"} - -
- - Event #{index + 1} - -
-
- ); - })} + {data && latestBundle && ( +
+
+ Transactions +
+ {latestBundle.txs.map((tx, index) => ( + + ))}
- ) : ( -

- {loading - ? "Loading events..." - : "No events found for this bundle."} -

+
+ + {latestBundle.meter_bundle_response && ( +
+ Simulation Results + +
)} + +
+ Event History + + {data.history.length > 0 ? ( + + ) : ( +
+ No events recorded yet. +
+ )} + +
-
- )} + )} +
); } diff --git a/ui/src/app/bundles/page.tsx b/ui/src/app/bundles/page.tsx deleted file mode 100644 index 17a4226..0000000 --- a/ui/src/app/bundles/page.tsx +++ /dev/null @@ -1,156 +0,0 @@ -"use client"; - -import Link from "next/link"; -import { useCallback, useEffect, useRef, useState } from "react"; - -export default function BundlesPage() { - const [allBundles, setAllBundles] = useState([]); - const [loading, setLoading] = useState(true); - const [error, setError] = useState(null); - const [searchHash, setSearchHash] = useState(""); - const [filteredAllBundles, setFilteredAllBundles] = useState([]); - const debounceTimeoutRef = useRef(null); - - const filterBundles = useCallback( - async (searchTerm: string, all: string[]) => { - if (!searchTerm.trim()) { - setFilteredAllBundles(all); - return; - } - - let allBundlesWithTx: string[] = []; - - try { - const response = await fetch(`/api/txn/${searchTerm.trim()}`); - - if (response.ok) { - const txnData = await response.json(); - const bundleIds = txnData.bundle_ids || []; - - allBundlesWithTx = all.filter((bundleId) => - bundleIds.includes(bundleId), - ); - } - } catch (err) { - console.error("Error filtering bundles:", err); - } - - setFilteredAllBundles(allBundlesWithTx); - }, - [], - ); - - useEffect(() => { - const fetchAllBundles = async () => { - try { - const response = await fetch("/api/bundles"); - if (!response.ok) { - setError("Failed to fetch bundles"); - setAllBundles([]); - return; - } - const result = await response.json(); - setAllBundles(result); - setError(null); - } catch (_err) { - setError("Failed to fetch bundles"); - setAllBundles([]); - } - }; - - const fetchData = async () => { - await fetchAllBundles(); - setLoading(false); - }; - - fetchData(); - - const interval = setInterval(fetchData, 400); - - return () => clearInterval(interval); - }, []); - - useEffect(() => { - if (debounceTimeoutRef.current) { - clearTimeout(debounceTimeoutRef.current); - } - - if (!searchHash.trim()) { - filterBundles(searchHash, allBundles); - } else { - debounceTimeoutRef.current = setTimeout(() => { - filterBundles(searchHash, allBundles); - }, 300); - } - - return () => { - if (debounceTimeoutRef.current) { - clearTimeout(debounceTimeoutRef.current); - } - }; - }, [searchHash, allBundles, filterBundles]); - - if (loading) { - return ( -
-

BundleStore (fka Mempool)

-
Loading bundles...
-
- ); - } - - return ( -
-
-
-

BundleStore (fka Mempool)

-
- setSearchHash(e.target.value)} - className="px-3 py-2 border rounded-lg bg-white/5 border-gray-300 dark:border-gray-600 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent placeholder-gray-500 dark:placeholder-gray-400 text-sm min-w-[300px]" - /> -
-
- {error && ( -
{error}
- )} -
- -
-
-

- All Bundles - {searchHash.trim() && ( - - ({filteredAllBundles.length} found) - - )} -

- {filteredAllBundles.length > 0 ? ( -
    - {filteredAllBundles.map((bundleId) => ( -
  • - - {bundleId} - -
    • - ))} -
- ) : ( -

- {searchHash.trim() - ? "No bundles found matching this transaction hash." - : "No bundles found."} -

- )} -
-
-
- ); -} diff --git a/ui/src/app/page.tsx b/ui/src/app/page.tsx index afe1146..0c74aee 100644 --- a/ui/src/app/page.tsx +++ b/ui/src/app/page.tsx @@ -1,5 +1,74 @@ -import { redirect } from "next/navigation"; +"use client"; + +import { useRouter } from "next/navigation"; +import { useState } from "react"; export default function Home() { - redirect("/bundles"); + const router = useRouter(); + const [searchHash, setSearchHash] = useState(""); + const [error, setError] = useState(null); + const [loading, setLoading] = useState(false); + + const handleSearch = async (e: React.FormEvent) => { + e.preventDefault(); + const hash = searchHash.trim(); + if (!hash) return; + + setLoading(true); + setError(null); + + try { + const response = await fetch(`/api/txn/${hash}`); + if (!response.ok) { + if (response.status === 404) { + setError("Transaction not found"); + } else { + setError("Failed to fetch transaction data"); + } + return; + } + const result = await response.json(); + + if (result.bundle_ids && result.bundle_ids.length > 0) { + router.push(`/bundles/${result.bundle_ids[0]}`); + } else { + setError("No bundle found for this transaction"); + } + } catch (_err) { + setError("Failed to fetch transaction data"); + } finally { + setLoading(false); + } + }; + + return ( +
+
+

TIPS

+

+ Transaction Inclusion Prioritization Stack +

+
+ setSearchHash(e.target.value)} + className="w-full px-4 py-3 border rounded-lg bg-white/5 border-gray-300 dark:border-gray-600 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent placeholder-gray-500 dark:placeholder-gray-400 text-center" + disabled={loading} + /> + +
+ {error && ( +
{error}
+ )} +
+
+ ); } diff --git a/ui/src/lib/s3.ts b/ui/src/lib/s3.ts index 10a7b13..873d405 100644 --- a/ui/src/lib/s3.ts +++ b/ui/src/lib/s3.ts @@ -1,6 +1,5 @@ import { GetObjectCommand, - ListObjectsV2Command, S3Client, type S3ClientConfig, } from "@aws-sdk/client-s3"; @@ -86,14 +85,65 @@ export async function getTransactionMetadataByHash( } } +export interface BundleTransaction { + signer: string; + type: string; + chainId: string; + nonce: string; + gas: string; + maxFeePerGas: string; + maxPriorityFeePerGas: string; + to: string; + value: string; + accessList: unknown[]; + input: string; + r: string; + s: string; + yParity: string; + v: string; + hash: string; +} + +export interface MeterBundleResult { + coinbaseDiff: string; + ethSentToCoinbase: string; + fromAddress: string; + gasFees: string; + gasPrice: string; + gasUsed: number; + toAddress: string; + txHash: string; + value: string; + executionTimeUs: number; +} + +export interface MeterBundleResponse { + bundleGasPrice: string; + bundleHash: string; + coinbaseDiff: string; + ethSentToCoinbase: string; + gasFees: string; + results: MeterBundleResult[]; + stateBlockNumber: number; + totalGasUsed: number; + totalExecutionTimeUs: number; +} + +export interface BundleData { + uuid: string; + txs: BundleTransaction[]; + block_number: string; + max_timestamp: number; + reverting_tx_hashes: string[]; + meter_bundle_response: MeterBundleResponse; +} + export interface BundleEvent { event: string; data: { key: string; timestamp: number; - bundle?: { - revertingTxHashes: Array; - }; + bundle?: BundleData; }; } @@ -121,31 +171,3 @@ export async function getBundleHistory( return null; } } - -export async function listAllBundleKeys(): Promise { - try { - const command = new ListObjectsV2Command({ - Bucket: BUCKET_NAME, - Prefix: "bundles/", - }); - - const response = await s3Client.send(command); - const bundleKeys: string[] = []; - - if (response.Contents) { - for (const object of response.Contents) { - if (object.Key?.startsWith("bundles/")) { - const bundleId = object.Key.replace("bundles/", ""); - if (bundleId) { - bundleKeys.push(bundleId); - } - } - } - } - - return bundleKeys; - } catch (error) { - console.error("Failed to list S3 bundle keys:", error); - return []; - } -} diff --git a/ui/tsconfig.json b/ui/tsconfig.json index c133409..d7e05e5 100644 --- a/ui/tsconfig.json +++ b/ui/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "ES2017", + "target": "ES2020", "lib": ["dom", "dom.iterable", "esnext"], "allowJs": true, "skipLibCheck": true, From 664f2079ff056203e06a3712b6f8f4c371699ea4 Mon Sep 17 00:00:00 2001 From: William Law Date: Wed, 3 Dec 2025 11:01:19 -0500 Subject: [PATCH 066/117] chore: dont err if we cant simulate (#87) * dont err if we cant simulate * use Default trait * add unit test --- Cargo.lock | 1 + crates/core/src/types.rs | 2 +- crates/ingress-rpc/Cargo.toml | 4 ++ crates/ingress-rpc/src/service.rs | 103 +++++++++++++++++++++++++++++- 4 files changed, 108 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2db75e8..dc5c850 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7114,6 +7114,7 @@ dependencies = [ "tokio", "tracing", "url", + "wiremock", ] [[package]] diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index 35fd522..ae00f36 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -278,7 +278,7 @@ pub struct TransactionResult { pub execution_time_us: u128, } -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)] #[serde(rename_all = "camelCase")] pub struct MeterBundleResponse { pub bundle_gas_price: U256, diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index 462ef28..e1e460f 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -40,3 +40,7 @@ metrics.workspace = true metrics-derive.workspace = true metrics-exporter-prometheus.workspace = true axum.workspace = true + +[dev-dependencies] +wiremock.workspace = true +serde_json.workspace = true diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 0755e35..a883636 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -214,7 +214,12 @@ where .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; let bundle_hash = &parsed_bundle.bundle_hash(); - let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await?; + let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await + .unwrap_or_else(|_| { + // TODO: in the future, we should return the error + warn!(message = "Bundle simulation failed, using default response", bundle_hash = %bundle_hash); + MeterBundleResponse::default() + }); let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response.clone()); @@ -398,7 +403,54 @@ where #[cfg(test)] mod tests { use super::*; + use crate::{Config, TxSubmissionMethod, queue::QueuePublisher}; + use alloy_provider::RootProvider; + use async_trait::async_trait; + use std::net::{IpAddr, SocketAddr}; + use std::sync::Arc; use tips_core::test_utils::create_test_meter_bundle_response; + use tokio::sync::{broadcast, mpsc}; + use url::Url; + use wiremock::{Mock, MockServer, ResponseTemplate, matchers::method}; + + struct MockQueue; + + #[async_trait] + impl QueuePublisher for MockQueue { + async fn publish( + &self, + _bundle: &tips_core::AcceptedBundle, + _bundle_hash: &B256, + ) -> anyhow::Result<()> { + Ok(()) + } + } + + fn create_test_config(mock_server: &MockServer) -> Config { + Config { + address: IpAddr::from([127, 0, 0, 1]), + port: 8080, + mempool_url: Url::parse("http://localhost:3000").unwrap(), + tx_submission_method: TxSubmissionMethod::Mempool, + ingress_kafka_properties: String::new(), + ingress_topic: String::new(), + audit_kafka_properties: String::new(), + audit_topic: String::new(), + log_level: String::from("info"), + log_format: tips_core::logger::LogFormat::Pretty, + send_transaction_default_lifetime_seconds: 300, + simulation_rpc: mock_server.uri().parse().unwrap(), + metrics_addr: SocketAddr::from(([127, 0, 0, 1], 9002)), + block_time_milliseconds: 1000, + meter_bundle_timeout_ms: 5000, + validate_user_operation_timeout_ms: 2000, + builder_rpcs: vec![], + max_buffered_meter_bundle_responses: 100, + max_buffered_backrun_bundles: 100, + health_check_addr: SocketAddr::from(([127, 0, 0, 1], 8081)), + backrun_enabled: false, + } + } #[tokio::test] async fn test_timeout_logic() { @@ -444,4 +496,53 @@ mod tests { let res = result.unwrap().unwrap(); assert_eq!(res, create_test_meter_bundle_response()); } + + // Replicate a failed `meter_bundle` request and instead of returning an error, we return a default `MeterBundleResponse` + #[tokio::test] + async fn test_meter_bundle_success() { + let mock_server = MockServer::start().await; + + // Mock error response from base_meterBundle + Mock::given(method("POST")) + .respond_with(ResponseTemplate::new(500).set_body_json(serde_json::json!({ + "jsonrpc": "2.0", + "id": 1, + "error": { + "code": -32000, + "message": "Simulation failed" + } + }))) + .mount(&mock_server) + .await; + + let config = create_test_config(&mock_server); + + let provider: RootProvider = + RootProvider::new_http(mock_server.uri().parse().unwrap()); + let simulation_provider = Arc::new(provider.clone()); + + let (audit_tx, _audit_rx) = mpsc::unbounded_channel(); + let (builder_tx, _builder_rx) = broadcast::channel(1); + let (backrun_tx, _backrun_rx) = broadcast::channel(1); + + let service = IngressService::new( + provider, + simulation_provider.as_ref().clone(), + MockQueue, + audit_tx, + builder_tx, + backrun_tx, + config, + ); + + let bundle = Bundle::default(); + let bundle_hash = B256::default(); + + let result = service.meter_bundle(&bundle, &bundle_hash).await; + + // Test that meter_bundle returns an error, but we handle it gracefully + assert!(result.is_err()); + let response = result.unwrap_or_else(|_| MeterBundleResponse::default()); + assert_eq!(response, MeterBundleResponse::default()); + } } From eae04d2f443617084276e494f964b7755ff6d7b1 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Wed, 3 Dec 2025 11:33:30 -0600 Subject: [PATCH 067/117] chore: add GHA for stale PRs/issues (#92) * chore: add GHA for stale PRs/issues * fix labels --- .github/workflows/stale.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 0000000..bca290f --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,32 @@ +name: Mark stale issues and PRs + +on: + schedule: + - cron: '30 0 * * *' + workflow_dispatch: +permissions: + contents: read + +jobs: + stale: + runs-on: ubuntu-latest + permissions: + actions: write + issues: write + pull-requests: write + steps: + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2 + with: + egress-policy: audit + + - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0 + with: + days-before-stale: 14 + days-before-close: 5 + stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.' + stale-pr-message: 'This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.' + close-issue-message: 'This issue was closed because it has been inactive for 5 days since being marked as stale.' + close-pr-message: 'This pull request was closed because it has been inactive for 5 days since being marked as stale.' + exempt-issue-labels: keep-open + exempt-pr-labels: keep-open From bd4776880aadff0d4f403bb6553731496ed0f013 Mon Sep 17 00:00:00 2001 From: William Law Date: Wed, 3 Dec 2025 13:14:13 -0500 Subject: [PATCH 068/117] chore: use rdkafka compression (#90) * Revert "feat: enable producer side compression for kafka (#82)" This reverts commit 336e9eed65404da752aab0b56f1efc5edf948e2c. * zstd --- Cargo.lock | 18 ++---------------- Cargo.toml | 3 +-- crates/audit/Cargo.toml | 1 - crates/audit/src/publisher.rs | 3 +-- crates/audit/src/reader.rs | 4 +--- crates/core/src/user_ops_types.rs | 4 ++-- docker/ingress-audit-kafka-properties | 1 + 7 files changed, 8 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc5c850..a7938a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3820,15 +3820,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" -[[package]] -name = "lz4_flex" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab6473172471198271ff72e9379150e9dfd70d8e533e0752a27e515b48dd375e" -dependencies = [ - "twox-hash", -] - [[package]] name = "macro-string" version = "0.1.4" @@ -4896,6 +4887,7 @@ dependencies = [ "num_enum", "openssl-sys", "pkg-config", + "zstd-sys", ] [[package]] @@ -7048,7 +7040,6 @@ dependencies = [ "bytes", "clap", "dotenvy", - "lz4_flex", "op-alloy-consensus", "rdkafka", "serde", @@ -7392,12 +7383,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "twox-hash" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" - [[package]] name = "typenum" version = "1.19.0" @@ -8156,6 +8141,7 @@ version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ + "bindgen", "cc", "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index 3a85042..1195c3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,12 +55,11 @@ wiremock = "0.6.2" axum = "0.8.3" # Kafka and S3 dependencies -rdkafka = { version = "0.37.0", features = ["libz-static", "ssl-vendored"] } +rdkafka = { version = "0.37.0", features = ["zstd", "ssl-vendored"] } aws-config = "1.1.7" aws-sdk-s3 = "1.106.0" aws-credential-types = "1.1.7" bytes = { version = "1.8.0", features = ["serde"] } -lz4_flex = "0.12" # tips-ingress backon = "1.5.2" diff --git a/crates/audit/Cargo.toml b/crates/audit/Cargo.toml index aa8c1b3..25cf7e3 100644 --- a/crates/audit/Cargo.toml +++ b/crates/audit/Cargo.toml @@ -32,7 +32,6 @@ aws-config = { workspace = true } aws-sdk-s3 = { workspace = true } aws-credential-types = { workspace = true } bytes = { workspace = true } -lz4_flex = { workspace = true } [dev-dependencies] testcontainers = { workspace = true } diff --git a/crates/audit/src/publisher.rs b/crates/audit/src/publisher.rs index 4807fc0..0d31391 100644 --- a/crates/audit/src/publisher.rs +++ b/crates/audit/src/publisher.rs @@ -26,8 +26,7 @@ impl KafkaBundleEventPublisher { async fn send_event(&self, event: &BundleEvent) -> Result<()> { let bundle_id = event.bundle_id(); let key = event.generate_event_key(); - let json_bytes = serde_json::to_vec(event)?; - let payload = lz4_flex::compress_prepend_size(&json_bytes); + let payload = serde_json::to_vec(event)?; let record = FutureRecord::to(&self.topic).key(&key).payload(&payload); diff --git a/crates/audit/src/reader.rs b/crates/audit/src/reader.rs index 329dd9c..207b8ac 100644 --- a/crates/audit/src/reader.rs +++ b/crates/audit/src/reader.rs @@ -77,9 +77,7 @@ impl EventReader for KafkaAuditLogReader { .as_millis() as i64, }; - let json_bytes = lz4_flex::decompress_size_prepended(payload) - .map_err(|e| anyhow::anyhow!("Failed to decompress LZ4: {e}"))?; - let event: BundleEvent = serde_json::from_slice(&json_bytes)?; + let event: BundleEvent = serde_json::from_slice(payload)?; debug!( bundle_id = %event.bundle_id(), diff --git a/crates/core/src/user_ops_types.rs b/crates/core/src/user_ops_types.rs index 95780a6..837e51f 100644 --- a/crates/core/src/user_ops_types.rs +++ b/crates/core/src/user_ops_types.rs @@ -81,7 +81,7 @@ mod tests { assert_eq!(user_operation.signature, Bytes::from_str("0x01").unwrap()); } _ => { - panic!("Expected EntryPointV06, got {user_operation:?}"); + panic!("Expected EntryPointV06, got {:?}", user_operation); } } } @@ -132,7 +132,7 @@ mod tests { assert_eq!(user_operation.pre_verification_gas, Uint::from(0x186a0)); } _ => { - panic!("Expected EntryPointV07, got {user_operation:?}"); + panic!("Expected EntryPointV07, got {:?}", user_operation); } } } diff --git a/docker/ingress-audit-kafka-properties b/docker/ingress-audit-kafka-properties index d9606ff..2f58fc9 100644 --- a/docker/ingress-audit-kafka-properties +++ b/docker/ingress-audit-kafka-properties @@ -1,3 +1,4 @@ # Kafka configuration properties for ingress audit events bootstrap.servers=host.docker.internal:9094 message.timeout.ms=5000 +compression.type=zstd \ No newline at end of file From be37779027be3ac79584cd5eeb9182e1b6a96207 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Wed, 3 Dec 2025 12:15:26 -0600 Subject: [PATCH 069/117] feat: add block view and per block execution info (#91) * feat: block listing & overview * fixes * downgrade viem * fix lints --- .env.example | 1 + ui/biome.json | 8 +- ui/package.json | 21 +- ui/src/app/api/block/[hash]/route.ts | 134 ++ ui/src/app/api/blocks/route.ts | 105 ++ ui/src/app/block/[hash]/page.tsx | 431 ++++++ ui/src/app/bundles/[uuid]/page.tsx | 46 +- ui/src/app/page.tsx | 249 ++- ui/src/lib/s3.ts | 88 +- ui/yarn.lock | 2154 ++++++++++++++------------ 10 files changed, 2175 insertions(+), 1062 deletions(-) create mode 100644 ui/src/app/api/block/[hash]/route.ts create mode 100644 ui/src/app/api/blocks/route.ts create mode 100644 ui/src/app/block/[hash]/page.tsx diff --git a/.env.example b/.env.example index 05d227f..bb4a66a 100644 --- a/.env.example +++ b/.env.example @@ -33,6 +33,7 @@ TIPS_AUDIT_S3_SECRET_ACCESS_KEY=minioadmin # TIPS UI NEXT_PUBLIC_BLOCK_EXPLORER_URL=https://base.blockscout.com +TIPS_UI_RPC_URL=http://localhost:8549 TIPS_UI_AWS_REGION=us-east-1 TIPS_UI_S3_BUCKET_NAME=tips TIPS_UI_S3_CONFIG_TYPE=manual diff --git a/ui/biome.json b/ui/biome.json index 41b3b95..31bf9c5 100644 --- a/ui/biome.json +++ b/ui/biome.json @@ -1,5 +1,5 @@ { - "$schema": "https://biomejs.dev/schemas/2.2.0/schema.json", + "$schema": "https://biomejs.dev/schemas/2.3.8/schema.json", "vcs": { "enabled": true, "clientKind": "git", @@ -9,6 +9,12 @@ "ignoreUnknown": true, "includes": ["**", "!node_modules", "!.next", "!dist", "!build"] }, + "css": { + "parser": { + "cssModules": true, + "tailwindDirectives": true + } + }, "formatter": { "enabled": true, "indentStyle": "space", diff --git a/ui/package.json b/ui/package.json index 4bb79b1..ad050ec 100644 --- a/ui/package.json +++ b/ui/package.json @@ -10,18 +10,19 @@ "format": "biome format --write" }, "dependencies": { - "@aws-sdk/client-s3": "^3.888.0", - "next": "15.5.3", + "@aws-sdk/client-s3": "3.940.0", + "next": "15.5.6", "react": "19.1.0", - "react-dom": "19.1.0" + "react-dom": "19.1.0", + "viem": "2.40.3" }, "devDependencies": { - "@biomejs/biome": "2.2.0", - "@tailwindcss/postcss": "^4", - "@types/node": "^20", - "@types/react": "^19", - "@types/react-dom": "^19", - "tailwindcss": "^4", - "typescript": "^5" + "@biomejs/biome": "2.3.8", + "@tailwindcss/postcss": "4.1.17", + "@types/node": "20.19.25", + "@types/react": "19.1.2", + "@types/react-dom": "19.1.2", + "tailwindcss": "4.1.17", + "typescript": "5.9.3" } } diff --git a/ui/src/app/api/block/[hash]/route.ts b/ui/src/app/api/block/[hash]/route.ts new file mode 100644 index 0000000..919591b --- /dev/null +++ b/ui/src/app/api/block/[hash]/route.ts @@ -0,0 +1,134 @@ +import { type NextRequest, NextResponse } from "next/server"; +import { type Block, createPublicClient, type Hash, http } from "viem"; +import { mainnet } from "viem/chains"; +import { + type BlockData, + type BlockTransaction, + cacheBlockData, + getBlockFromCache, + getBundleHistory, + getTransactionMetadataByHash, + type MeterBundleResult, +} from "@/lib/s3"; + +function serializeBlockData(block: BlockData) { + return { + ...block, + number: block.number.toString(), + timestamp: block.timestamp.toString(), + gasUsed: block.gasUsed.toString(), + gasLimit: block.gasLimit.toString(), + transactions: block.transactions.map((tx) => ({ + ...tx, + gasUsed: tx.gasUsed.toString(), + })), + }; +} + +const RPC_URL = process.env.TIPS_UI_RPC_URL || "http://localhost:8545"; + +const client = createPublicClient({ + chain: mainnet, + transport: http(RPC_URL), +}); + +async function fetchBlockFromRpc( + blockHash: string, +): Promise | null> { + try { + const block = await client.getBlock({ + blockHash: blockHash as Hash, + includeTransactions: true, + }); + return block; + } catch (error) { + console.error("Failed to fetch block from RPC:", error); + return null; + } +} + +async function enrichTransactionWithBundleData( + txHash: string, +): Promise<{ bundleId: string | null; executionTimeUs: number | null }> { + const metadata = await getTransactionMetadataByHash(txHash); + if (!metadata || metadata.bundle_ids.length === 0) { + return { bundleId: null, executionTimeUs: null }; + } + + const bundleId = metadata.bundle_ids[0]; + const bundleHistory = await getBundleHistory(bundleId); + if (!bundleHistory) { + return { bundleId, executionTimeUs: null }; + } + + const receivedEvent = bundleHistory.history.find( + (e) => e.event === "Received", + ); + if (!receivedEvent?.data?.bundle?.meter_bundle_response?.results) { + return { bundleId, executionTimeUs: null }; + } + + const txResult = receivedEvent.data.bundle.meter_bundle_response.results.find( + (r: MeterBundleResult) => r.txHash.toLowerCase() === txHash.toLowerCase(), + ); + + return { + bundleId, + executionTimeUs: txResult?.executionTimeUs ?? null, + }; +} + +export async function GET( + _request: NextRequest, + { params }: { params: Promise<{ hash: string }> }, +) { + try { + const { hash } = await params; + + const cachedBlock = await getBlockFromCache(hash); + if (cachedBlock) { + return NextResponse.json(serializeBlockData(cachedBlock)); + } + + const rpcBlock = await fetchBlockFromRpc(hash); + if (!rpcBlock || !rpcBlock.hash || !rpcBlock.number) { + return NextResponse.json({ error: "Block not found" }, { status: 404 }); + } + + const transactions: BlockTransaction[] = await Promise.all( + rpcBlock.transactions.map(async (tx, index) => { + const { bundleId, executionTimeUs } = + await enrichTransactionWithBundleData(tx.hash); + return { + hash: tx.hash, + from: tx.from, + to: tx.to, + gasUsed: tx.gas, + executionTimeUs, + bundleId, + index, + }; + }), + ); + + const blockData: BlockData = { + hash: rpcBlock.hash, + number: rpcBlock.number, + timestamp: rpcBlock.timestamp, + transactions, + gasUsed: rpcBlock.gasUsed, + gasLimit: rpcBlock.gasLimit, + cachedAt: Date.now(), + }; + + await cacheBlockData(blockData); + + return NextResponse.json(serializeBlockData(blockData)); + } catch (error) { + console.error("Error fetching block data:", error); + return NextResponse.json( + { error: "Internal server error" }, + { status: 500 }, + ); + } +} diff --git a/ui/src/app/api/blocks/route.ts b/ui/src/app/api/blocks/route.ts new file mode 100644 index 0000000..919256a --- /dev/null +++ b/ui/src/app/api/blocks/route.ts @@ -0,0 +1,105 @@ +import { NextResponse } from "next/server"; + +const RPC_URL = process.env.TIPS_UI_RPC_URL || "http://localhost:8545"; + +export interface BlockSummary { + hash: string; + number: number; + timestamp: number; + transactionCount: number; +} + +export interface BlocksResponse { + blocks: BlockSummary[]; +} + +async function fetchLatestBlockNumber(): Promise { + try { + const response = await fetch(RPC_URL, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + jsonrpc: "2.0", + method: "eth_blockNumber", + params: [], + id: 1, + }), + }); + + const data = await response.json(); + if (data.error || !data.result) { + return null; + } + + return parseInt(data.result, 16); + } catch (error) { + console.error("Failed to fetch latest block number:", error); + return null; + } +} + +async function fetchBlockByNumber( + blockNumber: number, +): Promise { + try { + const response = await fetch(RPC_URL, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + jsonrpc: "2.0", + method: "eth_getBlockByNumber", + params: [`0x${blockNumber.toString(16)}`, false], + id: 1, + }), + }); + + const data = await response.json(); + if (data.error || !data.result) { + return null; + } + + const block = data.result; + return { + hash: block.hash, + number: parseInt(block.number, 16), + timestamp: parseInt(block.timestamp, 16), + transactionCount: block.transactions?.length ?? 0, + }; + } catch (error) { + console.error(`Failed to fetch block ${blockNumber}:`, error); + return null; + } +} + +export async function GET() { + try { + const latestBlockNumber = await fetchLatestBlockNumber(); + if (latestBlockNumber === null) { + return NextResponse.json( + { error: "Failed to fetch latest block" }, + { status: 500 }, + ); + } + + const blockNumbers = Array.from( + { length: 10 }, + (_, i) => latestBlockNumber - i, + ).filter((n) => n >= 0); + + const blocks = await Promise.all(blockNumbers.map(fetchBlockByNumber)); + + const validBlocks = blocks.filter( + (block): block is BlockSummary => block !== null, + ); + + const response: BlocksResponse = { blocks: validBlocks }; + + return NextResponse.json(response); + } catch (error) { + console.error("Error fetching blocks:", error); + return NextResponse.json( + { error: "Internal server error" }, + { status: 500 }, + ); + } +} diff --git a/ui/src/app/block/[hash]/page.tsx b/ui/src/app/block/[hash]/page.tsx new file mode 100644 index 0000000..939d9f7 --- /dev/null +++ b/ui/src/app/block/[hash]/page.tsx @@ -0,0 +1,431 @@ +"use client"; + +import Link from "next/link"; +import { useEffect, useState } from "react"; +import type { BlockData, BlockTransaction } from "@/lib/s3"; + +const BLOCK_EXPLORER_URL = process.env.NEXT_PUBLIC_BLOCK_EXPLORER_URL; + +interface PageProps { + params: Promise<{ hash: string }>; +} + +function CopyButton({ text }: { text: string }) { + const [copied, setCopied] = useState(false); + + const handleCopy = async () => { + await navigator.clipboard.writeText(text); + setCopied(true); + setTimeout(() => setCopied(false), 2000); + }; + + return ( + + ); +} + +function Card({ + children, + className = "", +}: { + children: React.ReactNode; + className?: string; +}) { + return ( +
+ {children} +
+ ); +} + +function getHeatmapStyle( + executionTimeUs: number, + maxTime: number, +): { bg: string; text: string } { + if (maxTime === 0) return { bg: "bg-amber-50", text: "text-amber-700" }; + const ratio = Math.min(executionTimeUs / maxTime, 1); + if (ratio < 0.2) return { bg: "bg-amber-100", text: "text-amber-800" }; + if (ratio < 0.4) return { bg: "bg-amber-200", text: "text-amber-900" }; + if (ratio < 0.6) return { bg: "bg-orange-200", text: "text-orange-900" }; + if (ratio < 0.8) return { bg: "bg-orange-300", text: "text-orange-950" }; + return { bg: "bg-red-300", text: "text-red-950" }; +} + +function TransactionRow({ + tx, + maxExecutionTime, +}: { + tx: BlockTransaction; + maxExecutionTime: number; +}) { + const hasBundle = tx.bundleId !== null; + const hasExecutionTime = tx.executionTimeUs !== null; + const executionTime = tx.executionTimeUs ?? 0; + const heatmapStyle = hasExecutionTime + ? getHeatmapStyle(executionTime, maxExecutionTime) + : null; + + const content = ( +
+
+ {tx.index} +
+
+
+ {BLOCK_EXPLORER_URL ? ( + e.stopPropagation()} + > + {tx.hash.slice(0, 10)}...{tx.hash.slice(-8)} + + ) : ( + + {tx.hash.slice(0, 10)}...{tx.hash.slice(-8)} + + )} + {hasBundle && ( + + Bundle + + )} +
+
+ {tx.from.slice(0, 6)}...{tx.from.slice(-4)} + {tx.to && ( + <> + {" → "} + {tx.to.slice(0, 6)}...{tx.to.slice(-4)} + + )} +
+
+
+ {hasExecutionTime && heatmapStyle ? ( + + {executionTime.toLocaleString()}μs + + ) : ( +
—
+ )} +
+ {tx.gasUsed.toLocaleString()} gas +
+
+
+ ); + + if (hasBundle) { + return {content}; + } + + return content; +} + +function BlockStats({ block }: { block: BlockData }) { + const txsWithTime = block.transactions.filter( + (tx) => tx.executionTimeUs !== null, + ); + const totalExecutionTime = txsWithTime.reduce( + (sum, tx) => sum + (tx.executionTimeUs ?? 0), + 0, + ); + const bundleCount = block.transactions.filter( + (tx) => tx.bundleId !== null, + ).length; + + return ( + +
+
+
+
Block Number
+
+ #{block.number.toLocaleString()} +
+
+
+
Transactions
+
+ {block.transactions.length} +
+
+
+
Bundles
+
+ {bundleCount} +
+
+
+
Total Exec Time
+
+ {totalExecutionTime > 0 + ? `${totalExecutionTime.toLocaleString()}μs` + : "—"} +
+
+
+
+
+
+ Gas Used + + {block.gasUsed.toLocaleString()} + +
+
+ Gas Limit + + {block.gasLimit.toLocaleString()} + +
+
+ Timestamp + + {new Date(Number(block.timestamp) * 1000).toLocaleString()} + +
+
+ + ); +} + +export default function BlockPage({ params }: PageProps) { + const [hash, setHash] = useState(""); + const [data, setData] = useState(null); + const [loading, setLoading] = useState(true); + const [error, setError] = useState(null); + + useEffect(() => { + params.then((p) => setHash(p.hash)); + }, [params]); + + useEffect(() => { + if (!hash) return; + + const fetchData = async () => { + try { + const response = await fetch(`/api/block/${hash}`); + if (!response.ok) { + setError( + response.status === 404 + ? "Block not found" + : "Failed to fetch block data", + ); + setData(null); + return; + } + setData(await response.json()); + setError(null); + } catch { + setError("Failed to fetch block data"); + setData(null); + } finally { + setLoading(false); + } + }; + + fetchData(); + }, [hash]); + + if (!hash || loading) { + return ( +
+
+
+ Loading block... +
+
+ ); + } + + const maxExecutionTime = data + ? Math.max( + ...data.transactions + .filter((tx) => tx.executionTimeUs !== null) + .map((tx) => tx.executionTimeUs ?? 0), + 0, + ) + : 0; + + return ( +
+
+
+
+ + + Back + + + +
+ + TIPS + +
+
+ + {hash.slice(0, 10)}...{hash.slice(-8)} + + + {BLOCK_EXPLORER_URL && ( + + + External link + + + + )} +
+
+
+ +
+ {error && ( + +
+
+ + Error + + +
+
+

Error

+

{error}

+
+
+ + )} + + {data && ( +
+
+

+ Block Overview +

+ +
+ +
+

+ Transactions +

+ +
+
#
+
Transaction
+
Execution
+
+
+ {data.transactions.map((tx) => ( + + ))} +
+ {data.transactions.length === 0 && ( +
+ No transactions in this block +
+ )} + +
+
+ )} +
+
+ ); +} diff --git a/ui/src/app/bundles/[uuid]/page.tsx b/ui/src/app/bundles/[uuid]/page.tsx index 5cab893..95187f3 100644 --- a/ui/src/app/bundles/[uuid]/page.tsx +++ b/ui/src/app/bundles/[uuid]/page.tsx @@ -311,7 +311,7 @@ function SimulationCard({ meter }: { meter: MeterBundleResponse }) {
Execution Time
- {meter.totalExecutionTimeUs}μs + {meter.results.reduce((sum, r) => sum + r.executionTimeUs, 0)}μs
@@ -350,6 +350,48 @@ function SimulationCard({ meter }: { meter: MeterBundleResponse }) { ); } +function TimelineEventDetails({ + event, +}: { + event: BundleHistoryResponse["history"][0]; +}) { + if (event.event === "BlockIncluded" && event.data?.block_hash) { + return ( +
+ {event.event} + + Block #{event.data.block_number} + +
+ ); + } + + if (event.event === "BuilderIncluded" && event.data?.builder) { + return ( +
+ {event.event} + + {event.data.builder} (flashblock #{event.data.flashblock_index}) + +
+ ); + } + + if (event.event === "Dropped" && event.data?.reason) { + return ( +
+ {event.event} + {event.data.reason} +
+ ); + } + + return {event.event}; +} + function Timeline({ events }: { events: BundleHistoryResponse["history"] }) { if (events.length === 0) return null; @@ -364,7 +406,7 @@ function Timeline({ events }: { events: BundleHistoryResponse["history"] }) {
- {event.event} +
-
-

TIPS

-

- Transaction Inclusion Prioritization Stack -

-
- setSearchHash(e.target.value)} - className="w-full px-4 py-3 border rounded-lg bg-white/5 border-gray-300 dark:border-gray-600 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent placeholder-gray-500 dark:placeholder-gray-400 text-center" - disabled={loading} + + setSearchHash(e.target.value)} + className="w-64 lg:w-80 px-3 py-1.5 text-sm border rounded-lg bg-white border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent placeholder-gray-400" + disabled={loading} + /> + +
+ ); +} + +function BlockRow({ block, index }: { block: BlockSummary; index: number }) { + const opacity = Math.max(0.3, 1 - index * 0.08); + const timeSince = Math.floor(Date.now() / 1000 - block.timestamp); + const timeAgo = + timeSince <= 0 + ? "now" + : timeSince < 60 + ? `${timeSince}s ago` + : timeSince < 3600 + ? `${Math.floor(timeSince / 60)}m ago` + : `${Math.floor(timeSince / 3600)}h ago`; + + return ( + +
+ + Block + - - + +
+
+
+ + #{block.number.toLocaleString()} + + {timeAgo} +
+
+ {block.hash} +
+
+
+
+ {block.transactionCount} +
+
txns
+
+ + View + + + + ); +} + +function Card({ + children, + className = "", +}: { + children: React.ReactNode; + className?: string; +}) { + return ( +
+ {children} +
+ ); +} + +export default function Home() { + const [error, setError] = useState(null); + const [blocks, setBlocks] = useState([]); + const [loading, setLoading] = useState(true); + + useEffect(() => { + const fetchBlocks = async () => { + try { + const response = await fetch("/api/blocks"); + if (response.ok) { + const data: BlocksResponse = await response.json(); + setBlocks(data.blocks); + } + } catch { + console.error("Failed to fetch blocks"); + } finally { + setLoading(false); + } + }; + + fetchBlocks(); + const interval = setInterval(fetchBlocks, 2000); + return () => clearInterval(interval); + }, []); + + return ( +
+
+
+ TIPS + +
+
+ +
{error && ( -
{error}
+ +
+ + Error + + + {error} + +
+ )} -
+ +
+

+ Latest Blocks +

+ + + {loading ? ( +
+
+
+ Loading blocks... +
+
+ ) : blocks.length > 0 ? ( +
+ {blocks.map((block, index) => ( + + ))} +
+ ) : ( +
+ No blocks available +
+ )} + +
+
); } diff --git a/ui/src/lib/s3.ts b/ui/src/lib/s3.ts index 873d405..229fdad 100644 --- a/ui/src/lib/s3.ts +++ b/ui/src/lib/s3.ts @@ -1,5 +1,6 @@ import { GetObjectCommand, + PutObjectCommand, S3Client, type S3ClientConfig, } from "@aws-sdk/client-s3"; @@ -138,13 +139,20 @@ export interface BundleData { meter_bundle_response: MeterBundleResponse; } +export interface BundleEventData { + key: string; + timestamp: number; + bundle?: BundleData; + block_number?: number; + block_hash?: string; + builder?: string; + flashblock_index?: number; + reason?: string; +} + export interface BundleEvent { event: string; - data: { - key: string; - timestamp: number; - bundle?: BundleData; - }; + data: BundleEventData; } export interface BundleHistory { @@ -171,3 +179,73 @@ export async function getBundleHistory( return null; } } + +export interface BlockTransaction { + hash: string; + from: string; + to: string | null; + gasUsed: bigint; + executionTimeUs: number | null; + bundleId: string | null; + index: number; +} + +export interface BlockData { + hash: string; + number: bigint; + timestamp: bigint; + transactions: BlockTransaction[]; + gasUsed: bigint; + gasLimit: bigint; + cachedAt: number; +} + +export async function getBlockFromCache( + blockHash: string, +): Promise { + const key = `blocks/${blockHash}`; + const content = await getObjectContent(key); + + if (!content) { + return null; + } + + try { + const parsed = JSON.parse(content); + return { + ...parsed, + number: BigInt(parsed.number), + timestamp: BigInt(parsed.timestamp), + gasUsed: BigInt(parsed.gasUsed), + gasLimit: BigInt(parsed.gasLimit), + transactions: parsed.transactions.map( + (tx: BlockTransaction & { gasUsed: string }) => ({ + ...tx, + gasUsed: BigInt(tx.gasUsed), + }), + ), + } as BlockData; + } catch (error) { + console.error(`Failed to parse block data for hash ${blockHash}:`, error); + return null; + } +} + +export async function cacheBlockData(blockData: BlockData): Promise { + const key = `blocks/${blockData.hash}`; + + try { + const command = new PutObjectCommand({ + Bucket: BUCKET_NAME, + Key: key, + Body: JSON.stringify(blockData, (_, value) => + typeof value === "bigint" ? value.toString() : value, + ), + ContentType: "application/json", + }); + + await s3Client.send(command); + } catch (error) { + console.error(`Failed to cache block data for ${blockData.hash}:`, error); + } +} diff --git a/ui/yarn.lock b/ui/yarn.lock index 6eb1375..abecb19 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@adraffy/ens-normalize@^1.11.0": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.11.1.tgz#6c2d657d4b2dfb37f8ea811dcb3e60843d4ac24a" + integrity sha512-nhCBV3quEgesuf7c7KYfperqSS14T8bYuvJ8PcLJp6znkZpFc0AuW4qBtr8eKVyPPe/8RSr7sglCWPU5eaxwKQ== + "@alloc/quick-lru@^5.2.0": version "5.2.0" resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" @@ -75,443 +80,457 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.6.2" -"@aws-sdk/client-s3@^3.888.0": - version "3.917.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-3.917.0.tgz#835ead98d5a6ddad5662d0f133d377febf43de1e" - integrity sha512-3L73mDCpH7G0koFv3p3WkkEKqC5wn2EznKtNMrJ6hczPIr2Cu6DJz8VHeTZp9wFZLPrIBmh3ZW1KiLujT5Fd2w== +"@aws-sdk/client-s3@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-3.940.0.tgz#23446a4bb8f9b6efa5d19cf6e051587996a1ac7b" + integrity sha512-Wi4qnBT6shRRMXuuTgjMFTU5mu2KFWisgcigEMPptjPGUtJvBVi4PTGgS64qsLoUk/obqDAyOBOfEtRZ2ddC2w== dependencies: "@aws-crypto/sha1-browser" "5.2.0" "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.916.0" - "@aws-sdk/credential-provider-node" "3.917.0" - "@aws-sdk/middleware-bucket-endpoint" "3.914.0" - "@aws-sdk/middleware-expect-continue" "3.917.0" - "@aws-sdk/middleware-flexible-checksums" "3.916.0" - "@aws-sdk/middleware-host-header" "3.914.0" - "@aws-sdk/middleware-location-constraint" "3.914.0" - "@aws-sdk/middleware-logger" "3.914.0" - "@aws-sdk/middleware-recursion-detection" "3.914.0" - "@aws-sdk/middleware-sdk-s3" "3.916.0" - "@aws-sdk/middleware-ssec" "3.914.0" - "@aws-sdk/middleware-user-agent" "3.916.0" - "@aws-sdk/region-config-resolver" "3.914.0" - "@aws-sdk/signature-v4-multi-region" "3.916.0" - "@aws-sdk/types" "3.914.0" - "@aws-sdk/util-endpoints" "3.916.0" - "@aws-sdk/util-user-agent-browser" "3.914.0" - "@aws-sdk/util-user-agent-node" "3.916.0" - "@aws-sdk/xml-builder" "3.914.0" - "@smithy/config-resolver" "^4.4.0" - "@smithy/core" "^3.17.1" - "@smithy/eventstream-serde-browser" "^4.2.3" - "@smithy/eventstream-serde-config-resolver" "^4.3.3" - "@smithy/eventstream-serde-node" "^4.2.3" - "@smithy/fetch-http-handler" "^5.3.4" - "@smithy/hash-blob-browser" "^4.2.4" - "@smithy/hash-node" "^4.2.3" - "@smithy/hash-stream-node" "^4.2.3" - "@smithy/invalid-dependency" "^4.2.3" - "@smithy/md5-js" "^4.2.3" - "@smithy/middleware-content-length" "^4.2.3" - "@smithy/middleware-endpoint" "^4.3.5" - "@smithy/middleware-retry" "^4.4.5" - "@smithy/middleware-serde" "^4.2.3" - "@smithy/middleware-stack" "^4.2.3" - "@smithy/node-config-provider" "^4.3.3" - "@smithy/node-http-handler" "^4.4.3" - "@smithy/protocol-http" "^5.3.3" - "@smithy/smithy-client" "^4.9.1" - "@smithy/types" "^4.8.0" - "@smithy/url-parser" "^4.2.3" + "@aws-sdk/core" "3.940.0" + "@aws-sdk/credential-provider-node" "3.940.0" + "@aws-sdk/middleware-bucket-endpoint" "3.936.0" + "@aws-sdk/middleware-expect-continue" "3.936.0" + "@aws-sdk/middleware-flexible-checksums" "3.940.0" + "@aws-sdk/middleware-host-header" "3.936.0" + "@aws-sdk/middleware-location-constraint" "3.936.0" + "@aws-sdk/middleware-logger" "3.936.0" + "@aws-sdk/middleware-recursion-detection" "3.936.0" + "@aws-sdk/middleware-sdk-s3" "3.940.0" + "@aws-sdk/middleware-ssec" "3.936.0" + "@aws-sdk/middleware-user-agent" "3.940.0" + "@aws-sdk/region-config-resolver" "3.936.0" + "@aws-sdk/signature-v4-multi-region" "3.940.0" + "@aws-sdk/types" "3.936.0" + "@aws-sdk/util-endpoints" "3.936.0" + "@aws-sdk/util-user-agent-browser" "3.936.0" + "@aws-sdk/util-user-agent-node" "3.940.0" + "@smithy/config-resolver" "^4.4.3" + "@smithy/core" "^3.18.5" + "@smithy/eventstream-serde-browser" "^4.2.5" + "@smithy/eventstream-serde-config-resolver" "^4.3.5" + "@smithy/eventstream-serde-node" "^4.2.5" + "@smithy/fetch-http-handler" "^5.3.6" + "@smithy/hash-blob-browser" "^4.2.6" + "@smithy/hash-node" "^4.2.5" + "@smithy/hash-stream-node" "^4.2.5" + "@smithy/invalid-dependency" "^4.2.5" + "@smithy/md5-js" "^4.2.5" + "@smithy/middleware-content-length" "^4.2.5" + "@smithy/middleware-endpoint" "^4.3.12" + "@smithy/middleware-retry" "^4.4.12" + "@smithy/middleware-serde" "^4.2.6" + "@smithy/middleware-stack" "^4.2.5" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/node-http-handler" "^4.4.5" + "@smithy/protocol-http" "^5.3.5" + "@smithy/smithy-client" "^4.9.8" + "@smithy/types" "^4.9.0" + "@smithy/url-parser" "^4.2.5" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.4" - "@smithy/util-defaults-mode-node" "^4.2.6" - "@smithy/util-endpoints" "^3.2.3" - "@smithy/util-middleware" "^4.2.3" - "@smithy/util-retry" "^4.2.3" - "@smithy/util-stream" "^4.5.4" + "@smithy/util-defaults-mode-browser" "^4.3.11" + "@smithy/util-defaults-mode-node" "^4.2.14" + "@smithy/util-endpoints" "^3.2.5" + "@smithy/util-middleware" "^4.2.5" + "@smithy/util-retry" "^4.2.5" + "@smithy/util-stream" "^4.5.6" "@smithy/util-utf8" "^4.2.0" - "@smithy/util-waiter" "^4.2.3" - "@smithy/uuid" "^1.1.0" + "@smithy/util-waiter" "^4.2.5" tslib "^2.6.2" -"@aws-sdk/client-sso@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.916.0.tgz#627792ab588a004fc0874a060b3466e21328b5b6" - integrity sha512-Eu4PtEUL1MyRvboQnoq5YKg0Z9vAni3ccebykJy615xokVZUdA3di2YxHM/hykDQX7lcUC62q9fVIvh0+UNk/w== +"@aws-sdk/client-sso@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.940.0.tgz#23a6b156d9ba0144c01eb1d0c1654600b35fc708" + integrity sha512-SdqJGWVhmIURvCSgkDditHRO+ozubwZk9aCX9MK8qxyOndhobCndW1ozl3hX9psvMAo9Q4bppjuqy/GHWpjB+A== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.916.0" - "@aws-sdk/middleware-host-header" "3.914.0" - "@aws-sdk/middleware-logger" "3.914.0" - "@aws-sdk/middleware-recursion-detection" "3.914.0" - "@aws-sdk/middleware-user-agent" "3.916.0" - "@aws-sdk/region-config-resolver" "3.914.0" - "@aws-sdk/types" "3.914.0" - "@aws-sdk/util-endpoints" "3.916.0" - "@aws-sdk/util-user-agent-browser" "3.914.0" - "@aws-sdk/util-user-agent-node" "3.916.0" - "@smithy/config-resolver" "^4.4.0" - "@smithy/core" "^3.17.1" - "@smithy/fetch-http-handler" "^5.3.4" - "@smithy/hash-node" "^4.2.3" - "@smithy/invalid-dependency" "^4.2.3" - "@smithy/middleware-content-length" "^4.2.3" - "@smithy/middleware-endpoint" "^4.3.5" - "@smithy/middleware-retry" "^4.4.5" - "@smithy/middleware-serde" "^4.2.3" - "@smithy/middleware-stack" "^4.2.3" - "@smithy/node-config-provider" "^4.3.3" - "@smithy/node-http-handler" "^4.4.3" - "@smithy/protocol-http" "^5.3.3" - "@smithy/smithy-client" "^4.9.1" - "@smithy/types" "^4.8.0" - "@smithy/url-parser" "^4.2.3" + "@aws-sdk/core" "3.940.0" + "@aws-sdk/middleware-host-header" "3.936.0" + "@aws-sdk/middleware-logger" "3.936.0" + "@aws-sdk/middleware-recursion-detection" "3.936.0" + "@aws-sdk/middleware-user-agent" "3.940.0" + "@aws-sdk/region-config-resolver" "3.936.0" + "@aws-sdk/types" "3.936.0" + "@aws-sdk/util-endpoints" "3.936.0" + "@aws-sdk/util-user-agent-browser" "3.936.0" + "@aws-sdk/util-user-agent-node" "3.940.0" + "@smithy/config-resolver" "^4.4.3" + "@smithy/core" "^3.18.5" + "@smithy/fetch-http-handler" "^5.3.6" + "@smithy/hash-node" "^4.2.5" + "@smithy/invalid-dependency" "^4.2.5" + "@smithy/middleware-content-length" "^4.2.5" + "@smithy/middleware-endpoint" "^4.3.12" + "@smithy/middleware-retry" "^4.4.12" + "@smithy/middleware-serde" "^4.2.6" + "@smithy/middleware-stack" "^4.2.5" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/node-http-handler" "^4.4.5" + "@smithy/protocol-http" "^5.3.5" + "@smithy/smithy-client" "^4.9.8" + "@smithy/types" "^4.9.0" + "@smithy/url-parser" "^4.2.5" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.4" - "@smithy/util-defaults-mode-node" "^4.2.6" - "@smithy/util-endpoints" "^3.2.3" - "@smithy/util-middleware" "^4.2.3" - "@smithy/util-retry" "^4.2.3" + "@smithy/util-defaults-mode-browser" "^4.3.11" + "@smithy/util-defaults-mode-node" "^4.2.14" + "@smithy/util-endpoints" "^3.2.5" + "@smithy/util-middleware" "^4.2.5" + "@smithy/util-retry" "^4.2.5" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/core@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.916.0.tgz#ea11b485f837f1773e174f8a4ed82ecce9f163f7" - integrity sha512-1JHE5s6MD5PKGovmx/F1e01hUbds/1y3X8rD+Gvi/gWVfdg5noO7ZCerpRsWgfzgvCMZC9VicopBqNHCKLykZA== - dependencies: - "@aws-sdk/types" "3.914.0" - "@aws-sdk/xml-builder" "3.914.0" - "@smithy/core" "^3.17.1" - "@smithy/node-config-provider" "^4.3.3" - "@smithy/property-provider" "^4.2.3" - "@smithy/protocol-http" "^5.3.3" - "@smithy/signature-v4" "^5.3.3" - "@smithy/smithy-client" "^4.9.1" - "@smithy/types" "^4.8.0" +"@aws-sdk/core@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.940.0.tgz#73bd257745df0d069e455f22d4526f4f6d800d76" + integrity sha512-KsGD2FLaX5ngJao1mHxodIVU9VYd1E8810fcYiGwO1PFHDzf5BEkp6D9IdMeQwT8Q6JLYtiiT1Y/o3UCScnGoA== + dependencies: + "@aws-sdk/types" "3.936.0" + "@aws-sdk/xml-builder" "3.930.0" + "@smithy/core" "^3.18.5" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/property-provider" "^4.2.5" + "@smithy/protocol-http" "^5.3.5" + "@smithy/signature-v4" "^5.3.5" + "@smithy/smithy-client" "^4.9.8" + "@smithy/types" "^4.9.0" "@smithy/util-base64" "^4.3.0" - "@smithy/util-middleware" "^4.2.3" + "@smithy/util-middleware" "^4.2.5" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-env@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.916.0.tgz#c76861ec87f9edf227af62474411bf54ca04805d" - integrity sha512-3gDeqOXcBRXGHScc6xb7358Lyf64NRG2P08g6Bu5mv1Vbg9PKDyCAZvhKLkG7hkdfAM8Yc6UJNhbFxr1ud/tCQ== - dependencies: - "@aws-sdk/core" "3.916.0" - "@aws-sdk/types" "3.914.0" - "@smithy/property-provider" "^4.2.3" - "@smithy/types" "^4.8.0" - tslib "^2.6.2" - -"@aws-sdk/credential-provider-http@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.916.0.tgz#b46e51c5cc65364c5fde752b4d016b5b747c6d89" - integrity sha512-NmooA5Z4/kPFJdsyoJgDxuqXC1C6oPMmreJjbOPqcwo6E/h2jxaG8utlQFgXe5F9FeJsMx668dtxVxSYnAAqHQ== - dependencies: - "@aws-sdk/core" "3.916.0" - "@aws-sdk/types" "3.914.0" - "@smithy/fetch-http-handler" "^5.3.4" - "@smithy/node-http-handler" "^4.4.3" - "@smithy/property-provider" "^4.2.3" - "@smithy/protocol-http" "^5.3.3" - "@smithy/smithy-client" "^4.9.1" - "@smithy/types" "^4.8.0" - "@smithy/util-stream" "^4.5.4" - tslib "^2.6.2" - -"@aws-sdk/credential-provider-ini@3.917.0": - version "3.917.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.917.0.tgz#d9255ffeaab2326e94e84a830668aa4182317294" - integrity sha512-rvQ0QamLySRq+Okc0ZqFHZ3Fbvj3tYuWNIlzyEKklNmw5X5PM1idYKlOJflY2dvUGkIqY3lUC9SC2WL+1s7KIw== - dependencies: - "@aws-sdk/core" "3.916.0" - "@aws-sdk/credential-provider-env" "3.916.0" - "@aws-sdk/credential-provider-http" "3.916.0" - "@aws-sdk/credential-provider-process" "3.916.0" - "@aws-sdk/credential-provider-sso" "3.916.0" - "@aws-sdk/credential-provider-web-identity" "3.917.0" - "@aws-sdk/nested-clients" "3.916.0" - "@aws-sdk/types" "3.914.0" - "@smithy/credential-provider-imds" "^4.2.3" - "@smithy/property-provider" "^4.2.3" - "@smithy/shared-ini-file-loader" "^4.3.3" - "@smithy/types" "^4.8.0" - tslib "^2.6.2" - -"@aws-sdk/credential-provider-node@3.917.0": - version "3.917.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.917.0.tgz#a508038c12dc5ba177cc27ff0c26ea48d3702125" - integrity sha512-n7HUJ+TgU9wV/Z46yR1rqD9hUjfG50AKi+b5UXTlaDlVD8bckg40i77ROCllp53h32xQj/7H0yBIYyphwzLtmg== - dependencies: - "@aws-sdk/credential-provider-env" "3.916.0" - "@aws-sdk/credential-provider-http" "3.916.0" - "@aws-sdk/credential-provider-ini" "3.917.0" - "@aws-sdk/credential-provider-process" "3.916.0" - "@aws-sdk/credential-provider-sso" "3.916.0" - "@aws-sdk/credential-provider-web-identity" "3.917.0" - "@aws-sdk/types" "3.914.0" - "@smithy/credential-provider-imds" "^4.2.3" - "@smithy/property-provider" "^4.2.3" - "@smithy/shared-ini-file-loader" "^4.3.3" - "@smithy/types" "^4.8.0" - tslib "^2.6.2" - -"@aws-sdk/credential-provider-process@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.916.0.tgz#7c5aa9642a0e1c2a2791d85fe1bedfecae73672e" - integrity sha512-SXDyDvpJ1+WbotZDLJW1lqP6gYGaXfZJrgFSXIuZjHb75fKeNRgPkQX/wZDdUvCwdrscvxmtyJorp2sVYkMcvA== - dependencies: - "@aws-sdk/core" "3.916.0" - "@aws-sdk/types" "3.914.0" - "@smithy/property-provider" "^4.2.3" - "@smithy/shared-ini-file-loader" "^4.3.3" - "@smithy/types" "^4.8.0" - tslib "^2.6.2" - -"@aws-sdk/credential-provider-sso@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.916.0.tgz#b99ff591e758a56eefe7b05f1e77efe8f28f8c16" - integrity sha512-gu9D+c+U/Dp1AKBcVxYHNNoZF9uD4wjAKYCjgSN37j4tDsazwMEylbbZLuRNuxfbXtizbo4/TiaxBXDbWM7AkQ== - dependencies: - "@aws-sdk/client-sso" "3.916.0" - "@aws-sdk/core" "3.916.0" - "@aws-sdk/token-providers" "3.916.0" - "@aws-sdk/types" "3.914.0" - "@smithy/property-provider" "^4.2.3" - "@smithy/shared-ini-file-loader" "^4.3.3" - "@smithy/types" "^4.8.0" - tslib "^2.6.2" - -"@aws-sdk/credential-provider-web-identity@3.917.0": - version "3.917.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.917.0.tgz#4a9bdc3dae13f5802aaa2d6e51249dfed029d9d6" - integrity sha512-pZncQhFbwW04pB0jcD5OFv3x2gAddDYCVxyJVixgyhSw7bKCYxqu6ramfq1NxyVpmm+qsw+ijwi/3cCmhUHF/A== - dependencies: - "@aws-sdk/core" "3.916.0" - "@aws-sdk/nested-clients" "3.916.0" - "@aws-sdk/types" "3.914.0" - "@smithy/property-provider" "^4.2.3" - "@smithy/shared-ini-file-loader" "^4.3.3" - "@smithy/types" "^4.8.0" - tslib "^2.6.2" - -"@aws-sdk/middleware-bucket-endpoint@3.914.0": - version "3.914.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.914.0.tgz#4500425660d45af30e1bb66d8ce9362e040b9c7d" - integrity sha512-mHLsVnPPp4iq3gL2oEBamfpeETFV0qzxRHmcnCfEP3hualV8YF8jbXGmwPCPopUPQDpbYDBHYtXaoClZikCWPQ== - dependencies: - "@aws-sdk/types" "3.914.0" +"@aws-sdk/credential-provider-env@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.940.0.tgz#e04dc17300de228d572d5783c825a55d18851ecf" + integrity sha512-/G3l5/wbZYP2XEQiOoIkRJmlv15f1P3MSd1a0gz27lHEMrOJOGq66rF1Ca4OJLzapWt3Fy9BPrZAepoAX11kMw== + dependencies: + "@aws-sdk/core" "3.940.0" + "@aws-sdk/types" "3.936.0" + "@smithy/property-provider" "^4.2.5" + "@smithy/types" "^4.9.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-http@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.940.0.tgz#0888b39befaef297d67dcecd35d9237dbb5ab1c0" + integrity sha512-dOrc03DHElNBD6N9Okt4U0zhrG4Wix5QUBSZPr5VN8SvmjD9dkrrxOkkJaMCl/bzrW7kbQEp7LuBdbxArMmOZQ== + dependencies: + "@aws-sdk/core" "3.940.0" + "@aws-sdk/types" "3.936.0" + "@smithy/fetch-http-handler" "^5.3.6" + "@smithy/node-http-handler" "^4.4.5" + "@smithy/property-provider" "^4.2.5" + "@smithy/protocol-http" "^5.3.5" + "@smithy/smithy-client" "^4.9.8" + "@smithy/types" "^4.9.0" + "@smithy/util-stream" "^4.5.6" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-ini@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.940.0.tgz#b7a46fae4902f545e4f2cbcbd4f71dfae783de30" + integrity sha512-gn7PJQEzb/cnInNFTOaDoCN/hOKqMejNmLof1W5VW95Qk0TPO52lH8R4RmJPnRrwFMswOWswTOpR1roKNLIrcw== + dependencies: + "@aws-sdk/core" "3.940.0" + "@aws-sdk/credential-provider-env" "3.940.0" + "@aws-sdk/credential-provider-http" "3.940.0" + "@aws-sdk/credential-provider-login" "3.940.0" + "@aws-sdk/credential-provider-process" "3.940.0" + "@aws-sdk/credential-provider-sso" "3.940.0" + "@aws-sdk/credential-provider-web-identity" "3.940.0" + "@aws-sdk/nested-clients" "3.940.0" + "@aws-sdk/types" "3.936.0" + "@smithy/credential-provider-imds" "^4.2.5" + "@smithy/property-provider" "^4.2.5" + "@smithy/shared-ini-file-loader" "^4.4.0" + "@smithy/types" "^4.9.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-login@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-login/-/credential-provider-login-3.940.0.tgz#d235cad516fd4a58fb261bc1291b7077efcbf58d" + integrity sha512-fOKC3VZkwa9T2l2VFKWRtfHQPQuISqqNl35ZhcXjWKVwRwl/o7THPMkqI4XwgT2noGa7LLYVbWMwnsgSsBqglg== + dependencies: + "@aws-sdk/core" "3.940.0" + "@aws-sdk/nested-clients" "3.940.0" + "@aws-sdk/types" "3.936.0" + "@smithy/property-provider" "^4.2.5" + "@smithy/protocol-http" "^5.3.5" + "@smithy/shared-ini-file-loader" "^4.4.0" + "@smithy/types" "^4.9.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-node@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.940.0.tgz#5c4b3d13532f51528f769f8a87b4c7e7709ca0ad" + integrity sha512-M8NFAvgvO6xZjiti5kztFiAYmSmSlG3eUfr4ZHSfXYZUA/KUdZU/D6xJyaLnU8cYRWBludb6K9XPKKVwKfqm4g== + dependencies: + "@aws-sdk/credential-provider-env" "3.940.0" + "@aws-sdk/credential-provider-http" "3.940.0" + "@aws-sdk/credential-provider-ini" "3.940.0" + "@aws-sdk/credential-provider-process" "3.940.0" + "@aws-sdk/credential-provider-sso" "3.940.0" + "@aws-sdk/credential-provider-web-identity" "3.940.0" + "@aws-sdk/types" "3.936.0" + "@smithy/credential-provider-imds" "^4.2.5" + "@smithy/property-provider" "^4.2.5" + "@smithy/shared-ini-file-loader" "^4.4.0" + "@smithy/types" "^4.9.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-process@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.940.0.tgz#47a11224c1a9d179f67cbd0873c9e99fe0cd0e85" + integrity sha512-pILBzt5/TYCqRsJb7vZlxmRIe0/T+FZPeml417EK75060ajDGnVJjHcuVdLVIeKoTKm9gmJc9l45gon6PbHyUQ== + dependencies: + "@aws-sdk/core" "3.940.0" + "@aws-sdk/types" "3.936.0" + "@smithy/property-provider" "^4.2.5" + "@smithy/shared-ini-file-loader" "^4.4.0" + "@smithy/types" "^4.9.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-sso@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.940.0.tgz#fabadb014fd5c7b043b8b7ccb4e1bda66a2e88cc" + integrity sha512-q6JMHIkBlDCOMnA3RAzf8cGfup+8ukhhb50fNpghMs1SNBGhanmaMbZSgLigBRsPQW7fOk2l8jnzdVLS+BB9Uw== + dependencies: + "@aws-sdk/client-sso" "3.940.0" + "@aws-sdk/core" "3.940.0" + "@aws-sdk/token-providers" "3.940.0" + "@aws-sdk/types" "3.936.0" + "@smithy/property-provider" "^4.2.5" + "@smithy/shared-ini-file-loader" "^4.4.0" + "@smithy/types" "^4.9.0" + tslib "^2.6.2" + +"@aws-sdk/credential-provider-web-identity@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.940.0.tgz#25e83aa96c414608795e5d3c7be0e6d94bab6630" + integrity sha512-9QLTIkDJHHaYL0nyymO41H8g3ui1yz6Y3GmAN1gYQa6plXisuFBnGAbmKVj7zNvjWaOKdF0dV3dd3AFKEDoJ/w== + dependencies: + "@aws-sdk/core" "3.940.0" + "@aws-sdk/nested-clients" "3.940.0" + "@aws-sdk/types" "3.936.0" + "@smithy/property-provider" "^4.2.5" + "@smithy/shared-ini-file-loader" "^4.4.0" + "@smithy/types" "^4.9.0" + tslib "^2.6.2" + +"@aws-sdk/middleware-bucket-endpoint@3.936.0": + version "3.936.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.936.0.tgz#3c2d9935a2a388fb74f8318d620e2da38d360970" + integrity sha512-XLSVVfAorUxZh6dzF+HTOp4R1B5EQcdpGcPliWr0KUj2jukgjZEcqbBmjyMF/p9bmyQsONX80iURF1HLAlW0qg== + dependencies: + "@aws-sdk/types" "3.936.0" "@aws-sdk/util-arn-parser" "3.893.0" - "@smithy/node-config-provider" "^4.3.3" - "@smithy/protocol-http" "^5.3.3" - "@smithy/types" "^4.8.0" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/protocol-http" "^5.3.5" + "@smithy/types" "^4.9.0" "@smithy/util-config-provider" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/middleware-expect-continue@3.917.0": - version "3.917.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.917.0.tgz#f0e0cacad99d048c46cdce8f9dbe47351e59a0f5" - integrity sha512-UPBq1ZP2CaxwbncWSbVqkhYXQrmfNiqAtHyBxi413hjRVZ4JhQ1UyH7pz5yqiG8zx2/+Po8cUD4SDUwJgda4nw== +"@aws-sdk/middleware-expect-continue@3.936.0": + version "3.936.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.936.0.tgz#da1ce8a8b9af61192131a1c0a54bcab2a8a0e02f" + integrity sha512-Eb4ELAC23bEQLJmUMYnPWcjD3FZIsmz2svDiXEcxRkQU9r7NRID7pM7C5NPH94wOfiCk0b2Y8rVyFXW0lGQwbA== dependencies: - "@aws-sdk/types" "3.914.0" - "@smithy/protocol-http" "^5.3.3" - "@smithy/types" "^4.8.0" + "@aws-sdk/types" "3.936.0" + "@smithy/protocol-http" "^5.3.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@aws-sdk/middleware-flexible-checksums@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.916.0.tgz#ecbec3baf54e79dae04f1fd19f21041482928239" - integrity sha512-CBRRg6slHHBYAm26AWY/pECHK0vVO/peDoNhZiAzUNt4jV6VftotjszEJ904pKGOr7/86CfZxtCnP3CCs3lQjA== +"@aws-sdk/middleware-flexible-checksums@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.940.0.tgz#e2e1e1615f7651beb5756272b92fde5ee39524cd" + integrity sha512-WdsxDAVj5qaa5ApAP+JbpCOMHFGSmzjs2Y2OBSbWPeR9Ew7t/Okj+kUub94QJPsgzhvU1/cqNejhsw5VxeFKSQ== dependencies: "@aws-crypto/crc32" "5.2.0" "@aws-crypto/crc32c" "5.2.0" "@aws-crypto/util" "5.2.0" - "@aws-sdk/core" "3.916.0" - "@aws-sdk/types" "3.914.0" + "@aws-sdk/core" "3.940.0" + "@aws-sdk/types" "3.936.0" "@smithy/is-array-buffer" "^4.2.0" - "@smithy/node-config-provider" "^4.3.3" - "@smithy/protocol-http" "^5.3.3" - "@smithy/types" "^4.8.0" - "@smithy/util-middleware" "^4.2.3" - "@smithy/util-stream" "^4.5.4" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/protocol-http" "^5.3.5" + "@smithy/types" "^4.9.0" + "@smithy/util-middleware" "^4.2.5" + "@smithy/util-stream" "^4.5.6" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/middleware-host-header@3.914.0": - version "3.914.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.914.0.tgz#7e962c3d18c1ecc98606eab09a98dcf1b3402835" - integrity sha512-7r9ToySQ15+iIgXMF/h616PcQStByylVkCshmQqcdeynD/lCn2l667ynckxW4+ql0Q+Bo/URljuhJRxVJzydNA== +"@aws-sdk/middleware-host-header@3.936.0": + version "3.936.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.936.0.tgz#ef1144d175f1f499afbbd92ad07e24f8ccc9e9ce" + integrity sha512-tAaObaAnsP1XnLGndfkGWFuzrJYuk9W0b/nLvol66t8FZExIAf/WdkT2NNAWOYxljVs++oHnyHBCxIlaHrzSiw== dependencies: - "@aws-sdk/types" "3.914.0" - "@smithy/protocol-http" "^5.3.3" - "@smithy/types" "^4.8.0" + "@aws-sdk/types" "3.936.0" + "@smithy/protocol-http" "^5.3.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@aws-sdk/middleware-location-constraint@3.914.0": - version "3.914.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.914.0.tgz#ee877bdaa54746f65919fa54685ef392256bfb19" - integrity sha512-Mpd0Sm9+GN7TBqGnZg1+dO5QZ/EOYEcDTo7KfvoyrXScMlxvYm9fdrUVMmLdPn/lntweZGV3uNrs+huasGOOTA== +"@aws-sdk/middleware-location-constraint@3.936.0": + version "3.936.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.936.0.tgz#1f79ba7d2506f12b806689f22d687fb05db3614e" + integrity sha512-SCMPenDtQMd9o5da9JzkHz838w3327iqXk3cbNnXWqnNRx6unyW8FL0DZ84gIY12kAyVHz5WEqlWuekc15ehfw== dependencies: - "@aws-sdk/types" "3.914.0" - "@smithy/types" "^4.8.0" + "@aws-sdk/types" "3.936.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@aws-sdk/middleware-logger@3.914.0": - version "3.914.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.914.0.tgz#222d50ec69447715d6954eb6db0029f11576227b" - integrity sha512-/gaW2VENS5vKvJbcE1umV4Ag3NuiVzpsANxtrqISxT3ovyro29o1RezW/Avz/6oJqjnmgz8soe9J1t65jJdiNg== +"@aws-sdk/middleware-logger@3.936.0": + version "3.936.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.936.0.tgz#691093bebb708b994be10f19358e8699af38a209" + integrity sha512-aPSJ12d3a3Ea5nyEnLbijCaaYJT2QjQ9iW+zGh5QcZYXmOGWbKVyPSxmVOboZQG+c1M8t6d2O7tqrwzIq8L8qw== dependencies: - "@aws-sdk/types" "3.914.0" - "@smithy/types" "^4.8.0" + "@aws-sdk/types" "3.936.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@aws-sdk/middleware-recursion-detection@3.914.0": - version "3.914.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.914.0.tgz#bf65759cf303f271b22770e7f9675034b4ced946" - integrity sha512-yiAjQKs5S2JKYc+GrkvGMwkUvhepXDigEXpSJqUseR/IrqHhvGNuOxDxq+8LbDhM4ajEW81wkiBbU+Jl9G82yQ== +"@aws-sdk/middleware-recursion-detection@3.936.0": + version "3.936.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.936.0.tgz#141b6c92c1aa42bcd71aa854e0783b4f28e87a30" + integrity sha512-l4aGbHpXM45YNgXggIux1HgsCVAvvBoqHPkqLnqMl9QVapfuSTjJHfDYDsx1Xxct6/m7qSMUzanBALhiaGO2fA== dependencies: - "@aws-sdk/types" "3.914.0" - "@aws/lambda-invoke-store" "^0.0.1" - "@smithy/protocol-http" "^5.3.3" - "@smithy/types" "^4.8.0" + "@aws-sdk/types" "3.936.0" + "@aws/lambda-invoke-store" "^0.2.0" + "@smithy/protocol-http" "^5.3.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@aws-sdk/middleware-sdk-s3@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.916.0.tgz#5c1cc4645186b3c0f7ac5f6a897885af0b62198e" - integrity sha512-pjmzzjkEkpJObzmTthqJPq/P13KoNFuEi/x5PISlzJtHofCNcyXeVAQ90yvY2dQ6UXHf511Rh1/ytiKy2A8M0g== +"@aws-sdk/middleware-sdk-s3@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.940.0.tgz#ccf3c1844a3188185248eb126892d6274fec537e" + integrity sha512-JYkLjgS1wLoKHJ40G63+afM1ehmsPsjcmrHirKh8+kSCx4ip7+nL1e/twV4Zicxr8RJi9Y0Ahq5mDvneilDDKQ== dependencies: - "@aws-sdk/core" "3.916.0" - "@aws-sdk/types" "3.914.0" + "@aws-sdk/core" "3.940.0" + "@aws-sdk/types" "3.936.0" "@aws-sdk/util-arn-parser" "3.893.0" - "@smithy/core" "^3.17.1" - "@smithy/node-config-provider" "^4.3.3" - "@smithy/protocol-http" "^5.3.3" - "@smithy/signature-v4" "^5.3.3" - "@smithy/smithy-client" "^4.9.1" - "@smithy/types" "^4.8.0" + "@smithy/core" "^3.18.5" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/protocol-http" "^5.3.5" + "@smithy/signature-v4" "^5.3.5" + "@smithy/smithy-client" "^4.9.8" + "@smithy/types" "^4.9.0" "@smithy/util-config-provider" "^4.2.0" - "@smithy/util-middleware" "^4.2.3" - "@smithy/util-stream" "^4.5.4" + "@smithy/util-middleware" "^4.2.5" + "@smithy/util-stream" "^4.5.6" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/middleware-ssec@3.914.0": - version "3.914.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-ssec/-/middleware-ssec-3.914.0.tgz#4042dfed7a4d4234e37a84bab9d1cd9998a22180" - integrity sha512-V1Oae/oLVbpNb9uWs+v80GKylZCdsbqs2c2Xb1FsAUPtYeSnxFuAWsF3/2AEMSSpFe0dTC5KyWr/eKl2aim9VQ== +"@aws-sdk/middleware-ssec@3.936.0": + version "3.936.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-ssec/-/middleware-ssec-3.936.0.tgz#7a56e6946a86ce4f4489459e5188091116e8ddba" + integrity sha512-/GLC9lZdVp05ozRik5KsuODR/N7j+W+2TbfdFL3iS+7un+gnP6hC8RDOZd6WhpZp7drXQ9guKiTAxkZQwzS8DA== dependencies: - "@aws-sdk/types" "3.914.0" - "@smithy/types" "^4.8.0" + "@aws-sdk/types" "3.936.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.916.0.tgz#a0894ae6d70d7a81b2572ee69ed0d3049d39dfce" - integrity sha512-mzF5AdrpQXc2SOmAoaQeHpDFsK2GE6EGcEACeNuoESluPI2uYMpuuNMYrUufdnIAIyqgKlis0NVxiahA5jG42w== +"@aws-sdk/middleware-user-agent@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.940.0.tgz#e31c59b058b397855cd87fee34d2387d63b35c27" + integrity sha512-nJbLrUj6fY+l2W2rIB9P4Qvpiy0tnTdg/dmixRxrU1z3e8wBdspJlyE+AZN4fuVbeL6rrRrO/zxQC1bB3cw5IA== dependencies: - "@aws-sdk/core" "3.916.0" - "@aws-sdk/types" "3.914.0" - "@aws-sdk/util-endpoints" "3.916.0" - "@smithy/core" "^3.17.1" - "@smithy/protocol-http" "^5.3.3" - "@smithy/types" "^4.8.0" + "@aws-sdk/core" "3.940.0" + "@aws-sdk/types" "3.936.0" + "@aws-sdk/util-endpoints" "3.936.0" + "@smithy/core" "^3.18.5" + "@smithy/protocol-http" "^5.3.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@aws-sdk/nested-clients@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.916.0.tgz#2f79b924dd6c25cc3c40f6a0453097ae7a512702" - integrity sha512-tgg8e8AnVAer0rcgeWucFJ/uNN67TbTiDHfD+zIOPKep0Z61mrHEoeT/X8WxGIOkEn4W6nMpmS4ii8P42rNtnA== +"@aws-sdk/nested-clients@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.940.0.tgz#9b1574a0a56bd3eb5d62bbba85961f9e734c3569" + integrity sha512-x0mdv6DkjXqXEcQj3URbCltEzW6hoy/1uIL+i8gExP6YKrnhiZ7SzuB4gPls2UOpK5UqLiqXjhRLfBb1C9i4Dw== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.916.0" - "@aws-sdk/middleware-host-header" "3.914.0" - "@aws-sdk/middleware-logger" "3.914.0" - "@aws-sdk/middleware-recursion-detection" "3.914.0" - "@aws-sdk/middleware-user-agent" "3.916.0" - "@aws-sdk/region-config-resolver" "3.914.0" - "@aws-sdk/types" "3.914.0" - "@aws-sdk/util-endpoints" "3.916.0" - "@aws-sdk/util-user-agent-browser" "3.914.0" - "@aws-sdk/util-user-agent-node" "3.916.0" - "@smithy/config-resolver" "^4.4.0" - "@smithy/core" "^3.17.1" - "@smithy/fetch-http-handler" "^5.3.4" - "@smithy/hash-node" "^4.2.3" - "@smithy/invalid-dependency" "^4.2.3" - "@smithy/middleware-content-length" "^4.2.3" - "@smithy/middleware-endpoint" "^4.3.5" - "@smithy/middleware-retry" "^4.4.5" - "@smithy/middleware-serde" "^4.2.3" - "@smithy/middleware-stack" "^4.2.3" - "@smithy/node-config-provider" "^4.3.3" - "@smithy/node-http-handler" "^4.4.3" - "@smithy/protocol-http" "^5.3.3" - "@smithy/smithy-client" "^4.9.1" - "@smithy/types" "^4.8.0" - "@smithy/url-parser" "^4.2.3" + "@aws-sdk/core" "3.940.0" + "@aws-sdk/middleware-host-header" "3.936.0" + "@aws-sdk/middleware-logger" "3.936.0" + "@aws-sdk/middleware-recursion-detection" "3.936.0" + "@aws-sdk/middleware-user-agent" "3.940.0" + "@aws-sdk/region-config-resolver" "3.936.0" + "@aws-sdk/types" "3.936.0" + "@aws-sdk/util-endpoints" "3.936.0" + "@aws-sdk/util-user-agent-browser" "3.936.0" + "@aws-sdk/util-user-agent-node" "3.940.0" + "@smithy/config-resolver" "^4.4.3" + "@smithy/core" "^3.18.5" + "@smithy/fetch-http-handler" "^5.3.6" + "@smithy/hash-node" "^4.2.5" + "@smithy/invalid-dependency" "^4.2.5" + "@smithy/middleware-content-length" "^4.2.5" + "@smithy/middleware-endpoint" "^4.3.12" + "@smithy/middleware-retry" "^4.4.12" + "@smithy/middleware-serde" "^4.2.6" + "@smithy/middleware-stack" "^4.2.5" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/node-http-handler" "^4.4.5" + "@smithy/protocol-http" "^5.3.5" + "@smithy/smithy-client" "^4.9.8" + "@smithy/types" "^4.9.0" + "@smithy/url-parser" "^4.2.5" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.4" - "@smithy/util-defaults-mode-node" "^4.2.6" - "@smithy/util-endpoints" "^3.2.3" - "@smithy/util-middleware" "^4.2.3" - "@smithy/util-retry" "^4.2.3" + "@smithy/util-defaults-mode-browser" "^4.3.11" + "@smithy/util-defaults-mode-node" "^4.2.14" + "@smithy/util-endpoints" "^3.2.5" + "@smithy/util-middleware" "^4.2.5" + "@smithy/util-retry" "^4.2.5" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/region-config-resolver@3.914.0": - version "3.914.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.914.0.tgz#b6d2825081195ce1c634b8c92b1e19b08f140008" - integrity sha512-KlmHhRbn1qdwXUdsdrJ7S/MAkkC1jLpQ11n+XvxUUUCGAJd1gjC7AjxPZUM7ieQ2zcb8bfEzIU7al+Q3ZT0u7Q== +"@aws-sdk/region-config-resolver@3.936.0": + version "3.936.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.936.0.tgz#b02f20c4d62973731d42da1f1239a27fbbe53c0a" + integrity sha512-wOKhzzWsshXGduxO4pqSiNyL9oUtk4BEvjWm9aaq6Hmfdoydq6v6t0rAGHWPjFwy9z2haovGRi3C8IxdMB4muw== dependencies: - "@aws-sdk/types" "3.914.0" - "@smithy/config-resolver" "^4.4.0" - "@smithy/types" "^4.8.0" + "@aws-sdk/types" "3.936.0" + "@smithy/config-resolver" "^4.4.3" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@aws-sdk/signature-v4-multi-region@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.916.0.tgz#d70e3dc9ca2cb3f65923283600a0a6e9a6c4ec7f" - integrity sha512-fuzUMo6xU7e0NBzBA6TQ4FUf1gqNbg4woBSvYfxRRsIfKmSMn9/elXXn4sAE5UKvlwVQmYnb6p7dpVRPyFvnQA== +"@aws-sdk/signature-v4-multi-region@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.940.0.tgz#4633dd3db078cce620d36077ce41f7f38b60c6e0" + integrity sha512-ugHZEoktD/bG6mdgmhzLDjMP2VrYRAUPRPF1DpCyiZexkH7DCU7XrSJyXMvkcf0DHV+URk0q2sLf/oqn1D2uYw== dependencies: - "@aws-sdk/middleware-sdk-s3" "3.916.0" - "@aws-sdk/types" "3.914.0" - "@smithy/protocol-http" "^5.3.3" - "@smithy/signature-v4" "^5.3.3" - "@smithy/types" "^4.8.0" + "@aws-sdk/middleware-sdk-s3" "3.940.0" + "@aws-sdk/types" "3.936.0" + "@smithy/protocol-http" "^5.3.5" + "@smithy/signature-v4" "^5.3.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@aws-sdk/token-providers@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.916.0.tgz#e824fd44a553c4047b769caf22a94fd2705c9f1d" - integrity sha512-13GGOEgq5etbXulFCmYqhWtpcEQ6WI6U53dvXbheW0guut8fDFJZmEv7tKMTJgiybxh7JHd0rWcL9JQND8DwoQ== +"@aws-sdk/token-providers@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.940.0.tgz#b89893d7cd0a5ed22ca180e33b6eaf7ca644c7f1" + integrity sha512-k5qbRe/ZFjW9oWEdzLIa2twRVIEx7p/9rutofyrRysrtEnYh3HAWCngAnwbgKMoiwa806UzcTRx0TjyEpnKcCg== dependencies: - "@aws-sdk/core" "3.916.0" - "@aws-sdk/nested-clients" "3.916.0" - "@aws-sdk/types" "3.914.0" - "@smithy/property-provider" "^4.2.3" - "@smithy/shared-ini-file-loader" "^4.3.3" - "@smithy/types" "^4.8.0" + "@aws-sdk/core" "3.940.0" + "@aws-sdk/nested-clients" "3.940.0" + "@aws-sdk/types" "3.936.0" + "@smithy/property-provider" "^4.2.5" + "@smithy/shared-ini-file-loader" "^4.4.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@aws-sdk/types@3.914.0", "@aws-sdk/types@^3.222.0": - version "3.914.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.914.0.tgz#175cf9a4b2267aafbb110fe1316e6827de951fdb" - integrity sha512-kQWPsRDmom4yvAfyG6L1lMmlwnTzm1XwMHOU+G5IFlsP4YEaMtXidDzW/wiivY0QFrhfCz/4TVmu0a2aPU57ug== +"@aws-sdk/types@3.936.0", "@aws-sdk/types@^3.222.0": + version "3.936.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.936.0.tgz#ecd3a4bec1a1bd4df834ab21fe52a76e332dc27a" + integrity sha512-uz0/VlMd2pP5MepdrHizd+T+OKfyK4r3OA9JI+L/lPKg0YFQosdJNCKisr6o70E3dh8iMpFYxF1UN/4uZsyARg== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" "@aws-sdk/util-arn-parser@3.893.0": @@ -521,15 +540,15 @@ dependencies: tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.916.0.tgz#ab54249b8090cd66fe14aa8518097107a2595196" - integrity sha512-bAgUQwvixdsiGNcuZSDAOWbyHlnPtg8G8TyHD6DTfTmKTHUW6tAn+af/ZYJPXEzXhhpwgJqi58vWnsiDhmr7NQ== +"@aws-sdk/util-endpoints@3.936.0": + version "3.936.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.936.0.tgz#81c00be8cfd4f966e05defd739a720ce2c888ddf" + integrity sha512-0Zx3Ntdpu+z9Wlm7JKUBOzS9EunwKAb4KdGUQQxDqh5Lc3ta5uBoub+FgmVuzwnmBu9U1Os8UuwVTH0Lgu+P5w== dependencies: - "@aws-sdk/types" "3.914.0" - "@smithy/types" "^4.8.0" - "@smithy/url-parser" "^4.2.3" - "@smithy/util-endpoints" "^3.2.3" + "@aws-sdk/types" "3.936.0" + "@smithy/types" "^4.9.0" + "@smithy/url-parser" "^4.2.5" + "@smithy/util-endpoints" "^3.2.5" tslib "^2.6.2" "@aws-sdk/util-locate-window@^3.0.0": @@ -539,107 +558,107 @@ dependencies: tslib "^2.6.2" -"@aws-sdk/util-user-agent-browser@3.914.0": - version "3.914.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.914.0.tgz#ed29fd87f6ffba6f53615894a5e969cb9013af59" - integrity sha512-rMQUrM1ECH4kmIwlGl9UB0BtbHy6ZuKdWFrIknu8yGTRI/saAucqNTh5EI1vWBxZ0ElhK5+g7zOnUuhSmVQYUA== +"@aws-sdk/util-user-agent-browser@3.936.0": + version "3.936.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.936.0.tgz#cbfcaeaba6d843b060183638699c0f20dcaed774" + integrity sha512-eZ/XF6NxMtu+iCma58GRNRxSq4lHo6zHQLOZRIeL/ghqYJirqHdenMOwrzPettj60KWlv827RVebP9oNVrwZbw== dependencies: - "@aws-sdk/types" "3.914.0" - "@smithy/types" "^4.8.0" + "@aws-sdk/types" "3.936.0" + "@smithy/types" "^4.9.0" bowser "^2.11.0" tslib "^2.6.2" -"@aws-sdk/util-user-agent-node@3.916.0": - version "3.916.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.916.0.tgz#3ab5fdb9f45345f19f426941ece71988b31bf58d" - integrity sha512-CwfWV2ch6UdjuSV75ZU99N03seEUb31FIUrXBnwa6oONqj/xqXwrxtlUMLx6WH3OJEE4zI3zt5PjlTdGcVwf4g== +"@aws-sdk/util-user-agent-node@3.940.0": + version "3.940.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.940.0.tgz#d9de3178a0567671b8cef3ea520f3416d2cecd1e" + integrity sha512-dlD/F+L/jN26I8Zg5x0oDGJiA+/WEQmnSE27fi5ydvYnpfQLwThtQo9SsNS47XSR/SOULaaoC9qx929rZuo74A== dependencies: - "@aws-sdk/middleware-user-agent" "3.916.0" - "@aws-sdk/types" "3.914.0" - "@smithy/node-config-provider" "^4.3.3" - "@smithy/types" "^4.8.0" + "@aws-sdk/middleware-user-agent" "3.940.0" + "@aws-sdk/types" "3.936.0" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@aws-sdk/xml-builder@3.914.0": - version "3.914.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.914.0.tgz#4e98b479856113db877d055e7b008065c50266d4" - integrity sha512-k75evsBD5TcIjedycYS7QXQ98AmOtbnxRJOPtCo0IwYRmy7UvqgS/gBL5SmrIqeV6FDSYRQMgdBxSMp6MLmdew== +"@aws-sdk/xml-builder@3.930.0": + version "3.930.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.930.0.tgz#949a35219ca52cc769ffbfbf38f3324178ba74f9" + integrity sha512-YIfkD17GocxdmlUVc3ia52QhcWuRIUJonbF8A2CYfcWNV3HzvAqpcPeC0bYUhkK+8e8YO1ARnLKZQE0TlwzorA== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" fast-xml-parser "5.2.5" tslib "^2.6.2" -"@aws/lambda-invoke-store@^0.0.1": - version "0.0.1" - resolved "https://registry.yarnpkg.com/@aws/lambda-invoke-store/-/lambda-invoke-store-0.0.1.tgz#92d792a7dda250dfcb902e13228f37a81be57c8f" - integrity sha512-ORHRQ2tmvnBXc8t/X9Z8IcSbBA4xTLKuN873FopzklHMeqBst7YG0d+AX97inkvDX+NChYtSr+qGfcqGFaI8Zw== +"@aws/lambda-invoke-store@^0.2.0": + version "0.2.2" + resolved "https://registry.yarnpkg.com/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.2.tgz#b00f7d6aedfe832ef6c84488f3a422cce6a47efa" + integrity sha512-C0NBLsIqzDIae8HFw9YIrIBsbc0xTiOtt7fAukGPnqQ/+zZNaq+4jhuccltK0QuWHBnNm/a6kLIRA6GFiM10eg== -"@biomejs/biome@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@biomejs/biome/-/biome-2.2.0.tgz#823ba77363651f310c47909747c879791ebd15c9" - integrity sha512-3On3RSYLsX+n9KnoSgfoYlckYBoU6VRM22cw1gB4Y0OuUVSYd/O/2saOJMrA4HFfA1Ff0eacOvMN1yAAvHtzIw== +"@biomejs/biome@2.3.8": + version "2.3.8" + resolved "https://registry.yarnpkg.com/@biomejs/biome/-/biome-2.3.8.tgz#03f66a19ba7b287bc12ce493f69382f24f3076fa" + integrity sha512-Qjsgoe6FEBxWAUzwFGFrB+1+M8y/y5kwmg5CHac+GSVOdmOIqsAiXM5QMVGZJ1eCUCLlPZtq4aFAQ0eawEUuUA== optionalDependencies: - "@biomejs/cli-darwin-arm64" "2.2.0" - "@biomejs/cli-darwin-x64" "2.2.0" - "@biomejs/cli-linux-arm64" "2.2.0" - "@biomejs/cli-linux-arm64-musl" "2.2.0" - "@biomejs/cli-linux-x64" "2.2.0" - "@biomejs/cli-linux-x64-musl" "2.2.0" - "@biomejs/cli-win32-arm64" "2.2.0" - "@biomejs/cli-win32-x64" "2.2.0" - -"@biomejs/cli-darwin-arm64@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.2.0.tgz#1abf9508e7d0776871710687ddad36e692dce3bc" - integrity sha512-zKbwUUh+9uFmWfS8IFxmVD6XwqFcENjZvEyfOxHs1epjdH3wyyMQG80FGDsmauPwS2r5kXdEM0v/+dTIA9FXAg== - -"@biomejs/cli-darwin-x64@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.2.0.tgz#3a51aa569505fedd3a32bb914d608ec27d87f26d" - integrity sha512-+OmT4dsX2eTfhD5crUOPw3RPhaR+SKVspvGVmSdZ9y9O/AgL8pla6T4hOn1q+VAFBHuHhsdxDRJgFCSC7RaMOw== - -"@biomejs/cli-linux-arm64-musl@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.2.0.tgz#4d720930732a825b7a8c7cfe1741aec9e7d5ae1d" - integrity sha512-egKpOa+4FL9YO+SMUMLUvf543cprjevNc3CAgDNFLcjknuNMcZ0GLJYa3EGTCR2xIkIUJDVneBV3O9OcIlCEZQ== - -"@biomejs/cli-linux-arm64@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.2.0.tgz#d0a5c153ff9243b15600781947d70d6038226feb" - integrity sha512-6eoRdF2yW5FnW9Lpeivh7Mayhq0KDdaDMYOJnH9aT02KuSIX5V1HmWJCQQPwIQbhDh68Zrcpl8inRlTEan0SXw== - -"@biomejs/cli-linux-x64-musl@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.2.0.tgz#946095b0a444f395b2df9244153e1cd6b07404c0" - integrity sha512-I5J85yWwUWpgJyC1CcytNSGusu2p9HjDnOPAFG4Y515hwRD0jpR9sT9/T1cKHtuCvEQ/sBvx+6zhz9l9wEJGAg== - -"@biomejs/cli-linux-x64@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-x64/-/cli-linux-x64-2.2.0.tgz#ae01e0a70c7cd9f842c77dfb4ebd425734667a34" - integrity sha512-5UmQx/OZAfJfi25zAnAGHUMuOd+LOsliIt119x2soA2gLggQYrVPA+2kMUxR6Mw5M1deUF/AWWP2qpxgH7Nyfw== - -"@biomejs/cli-win32-arm64@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.2.0.tgz#09a3988b9d4bab8b8b3a41b4de9560bf70943964" - integrity sha512-n9a1/f2CwIDmNMNkFs+JI0ZjFnMO0jdOyGNtihgUNFnlmd84yIYY2KMTBmMV58ZlVHjgmY5Y6E1hVTnSRieggA== - -"@biomejs/cli-win32-x64@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@biomejs/cli-win32-x64/-/cli-win32-x64-2.2.0.tgz#5d2523b421d847b13fac146cf745436ea8a72b95" - integrity sha512-Nawu5nHjP/zPKTIryh2AavzTc/KEg4um/MxWdXW0A6P/RZOyIpa7+QSjeXwAwX/utJGaCoXRPWtF3m5U/bB3Ww== - -"@emnapi/core@^1.5.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.6.0.tgz#517f65d1c8270d5d5aa1aad660d5acb897430dca" - integrity sha512-zq/ay+9fNIJJtJiZxdTnXS20PllcYMX3OE23ESc4HK/bdYu3cOWYVhsOhVnXALfU/uqJIxn5NBPd9z4v+SfoSg== + "@biomejs/cli-darwin-arm64" "2.3.8" + "@biomejs/cli-darwin-x64" "2.3.8" + "@biomejs/cli-linux-arm64" "2.3.8" + "@biomejs/cli-linux-arm64-musl" "2.3.8" + "@biomejs/cli-linux-x64" "2.3.8" + "@biomejs/cli-linux-x64-musl" "2.3.8" + "@biomejs/cli-win32-arm64" "2.3.8" + "@biomejs/cli-win32-x64" "2.3.8" + +"@biomejs/cli-darwin-arm64@2.3.8": + version "2.3.8" + resolved "https://registry.yarnpkg.com/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.3.8.tgz#58443b6d910a6175be0bd77062774e893de6263c" + integrity sha512-HM4Zg9CGQ3txTPflxD19n8MFPrmUAjaC7PQdLkugeeC0cQ+PiVrd7i09gaBS/11QKsTDBJhVg85CEIK9f50Qww== + +"@biomejs/cli-darwin-x64@2.3.8": + version "2.3.8" + resolved "https://registry.yarnpkg.com/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.3.8.tgz#5765d66ac9e92d80469ab5c24344ab6d3410ff75" + integrity sha512-lUDQ03D7y/qEao7RgdjWVGCu+BLYadhKTm40HkpJIi6kn8LSv5PAwRlew/DmwP4YZ9ke9XXoTIQDO1vAnbRZlA== + +"@biomejs/cli-linux-arm64-musl@2.3.8": + version "2.3.8" + resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.3.8.tgz#63ff811a3acc74c885e989a4e6e8f54399425e3a" + integrity sha512-PShR4mM0sjksUMyxbyPNMxoKFPVF48fU8Qe8Sfx6w6F42verbwRLbz+QiKNiDPRJwUoMG1nPM50OBL3aOnTevA== + +"@biomejs/cli-linux-arm64@2.3.8": + version "2.3.8" + resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.3.8.tgz#c6275cf8bc8592ef4ea840f5b1938606d3f3a721" + integrity sha512-Uo1OJnIkJgSgF+USx970fsM/drtPcQ39I+JO+Fjsaa9ZdCN1oysQmy6oAGbyESlouz+rzEckLTF6DS7cWse95g== + +"@biomejs/cli-linux-x64-musl@2.3.8": + version "2.3.8" + resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.3.8.tgz#95da386940356ef21d71d724587213915a6e7fef" + integrity sha512-YGLkqU91r1276uwSjiUD/xaVikdxgV1QpsicT0bIA1TaieM6E5ibMZeSyjQ/izBn4tKQthUSsVZacmoJfa3pDA== + +"@biomejs/cli-linux-x64@2.3.8": + version "2.3.8" + resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-x64/-/cli-linux-x64-2.3.8.tgz#65fddc3feb27a6817763306b73506308cbdb1dcc" + integrity sha512-QDPMD5bQz6qOVb3kiBui0zKZXASLo0NIQ9JVJio5RveBEFgDgsvJFUvZIbMbUZT3T00M/1wdzwWXk4GIh0KaAw== + +"@biomejs/cli-win32-arm64@2.3.8": + version "2.3.8" + resolved "https://registry.yarnpkg.com/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.3.8.tgz#86385f8ff7abec220af11a7ddf9e57c39e317277" + integrity sha512-H4IoCHvL1fXKDrTALeTKMiE7GGWFAraDwBYFquE/L/5r1927Te0mYIGseXi4F+lrrwhSWbSGt5qPFswNoBaCxg== + +"@biomejs/cli-win32-x64@2.3.8": + version "2.3.8" + resolved "https://registry.yarnpkg.com/@biomejs/cli-win32-x64/-/cli-win32-x64-2.3.8.tgz#dca59fbf4c6f871f22f567ade203e996c7867206" + integrity sha512-RguzimPoZWtBapfKhKjcWXBVI91tiSprqdBYu7tWhgN8pKRZhw24rFeNZTNf6UiBfjCYCi9eFQs/JzJZIhuK4w== + +"@emnapi/core@^1.6.0", "@emnapi/core@^1.7.1": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.7.1.tgz#3a79a02dbc84f45884a1806ebb98e5746bdfaac4" + integrity sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg== dependencies: "@emnapi/wasi-threads" "1.1.0" tslib "^2.4.0" -"@emnapi/runtime@^1.5.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.6.0.tgz#8fe297e0090f6e89a57a1f31f1c440bdbc3c01d8" - integrity sha512-obtUmAHTMjll499P+D9A3axeJFlhdjOWdKUNs/U6QIGT7V5RjcUW1xToAzjvmgTSQhDbYn/NwfTRoJcQ2rNBxA== +"@emnapi/runtime@^1.6.0", "@emnapi/runtime@^1.7.0", "@emnapi/runtime@^1.7.1": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.7.1.tgz#a73784e23f5d57287369c808197288b52276b791" + integrity sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA== dependencies: tslib "^2.4.0" @@ -655,135 +674,147 @@ resolved "https://registry.yarnpkg.com/@img/colour/-/colour-1.0.0.tgz#d2fabb223455a793bf3bf9c70de3d28526aa8311" integrity sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw== -"@img/sharp-darwin-arm64@0.34.4": - version "0.34.4" - resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.4.tgz#8a0dcac9e621ff533fbf2e830f6a977b38d67a0c" - integrity sha512-sitdlPzDVyvmINUdJle3TNHl+AG9QcwiAMsXmccqsCOMZNIdW2/7S26w0LyU8euiLVzFBL3dXPwVCq/ODnf2vA== +"@img/sharp-darwin-arm64@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.5.tgz#6e0732dcade126b6670af7aa17060b926835ea86" + integrity sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w== optionalDependencies: - "@img/sharp-libvips-darwin-arm64" "1.2.3" + "@img/sharp-libvips-darwin-arm64" "1.2.4" -"@img/sharp-darwin-x64@0.34.4": - version "0.34.4" - resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.4.tgz#0ba2bd9dbf07f7300fab73305b787e66156f7752" - integrity sha512-rZheupWIoa3+SOdF/IcUe1ah4ZDpKBGWcsPX6MT0lYniH9micvIU7HQkYTfrx5Xi8u+YqwLtxC/3vl8TQN6rMg== +"@img/sharp-darwin-x64@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.5.tgz#19bc1dd6eba6d5a96283498b9c9f401180ee9c7b" + integrity sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw== optionalDependencies: - "@img/sharp-libvips-darwin-x64" "1.2.3" - -"@img/sharp-libvips-darwin-arm64@1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.3.tgz#f43c9aa3b74fd307e4318da63ebbe0ed4c34e744" - integrity sha512-QzWAKo7kpHxbuHqUC28DZ9pIKpSi2ts2OJnoIGI26+HMgq92ZZ4vk8iJd4XsxN+tYfNJxzH6W62X5eTcsBymHw== - -"@img/sharp-libvips-darwin-x64@1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.3.tgz#c42ff786d4a1f42ef8929dba4a989dd5df6417f0" - integrity sha512-Ju+g2xn1E2AKO6YBhxjj+ACcsPQRHT0bhpglxcEf+3uyPY+/gL8veniKoo96335ZaPo03bdDXMv0t+BBFAbmRA== - -"@img/sharp-libvips-linux-arm64@1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.3.tgz#c9073e5c4b629ee417f777db21c552910d84ed77" - integrity sha512-I4RxkXU90cpufazhGPyVujYwfIm9Nk1QDEmiIsaPwdnm013F7RIceaCc87kAH+oUB1ezqEvC6ga4m7MSlqsJvQ== - -"@img/sharp-libvips-linux-arm@1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.3.tgz#3cbc333fd6b8f224a14d69b03a1dd11df897c799" - integrity sha512-x1uE93lyP6wEwGvgAIV0gP6zmaL/a0tGzJs/BIDDG0zeBhMnuUPm7ptxGhUbcGs4okDJrk4nxgrmxpib9g6HpA== - -"@img/sharp-libvips-linux-ppc64@1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.3.tgz#68e0e0076299f43d838468675674fabcc7161d16" - integrity sha512-Y2T7IsQvJLMCBM+pmPbM3bKT/yYJvVtLJGfCs4Sp95SjvnFIjynbjzsa7dY1fRJX45FTSfDksbTp6AGWudiyCg== - -"@img/sharp-libvips-linux-s390x@1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.3.tgz#7da9ab11a50c0ca905979f0aae14a4ccffab27b2" - integrity sha512-RgWrs/gVU7f+K7P+KeHFaBAJlNkD1nIZuVXdQv6S+fNA6syCcoboNjsV2Pou7zNlVdNQoQUpQTk8SWDHUA3y/w== - -"@img/sharp-libvips-linux-x64@1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.3.tgz#3b162d6b190cf77926819040e09fb15eec42135e" - integrity sha512-3JU7LmR85K6bBiRzSUc/Ff9JBVIFVvq6bomKE0e63UXGeRw2HPVEjoJke1Yx+iU4rL7/7kUjES4dZ/81Qjhyxg== - -"@img/sharp-libvips-linuxmusl-arm64@1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.3.tgz#ac99576630dd8e33cb598d7c4586f6e0655912ea" - integrity sha512-F9q83RZ8yaCwENw1GieztSfj5msz7GGykG/BA+MOUefvER69K/ubgFHNeSyUu64amHIYKGDs4sRCMzXVj8sEyw== - -"@img/sharp-libvips-linuxmusl-x64@1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.3.tgz#93e9495af7bf6c4e0d41dd71d0196c35c3753a1c" - integrity sha512-U5PUY5jbc45ANM6tSJpsgqmBF/VsL6LnxJmIf11kB7J5DctHgqm0SkuXzVWtIY90GnJxKnC/JT251TDnk1fu/g== - -"@img/sharp-linux-arm64@0.34.4": - version "0.34.4" - resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.4.tgz#0570ff1a4fa6e1d6779456fca8b5e8c18a6a9cf2" - integrity sha512-YXU1F/mN/Wu786tl72CyJjP/Ngl8mGHN1hST4BGl+hiW5jhCnV2uRVTNOcaYPs73NeT/H8Upm3y9582JVuZHrQ== + "@img/sharp-libvips-darwin-x64" "1.2.4" + +"@img/sharp-libvips-darwin-arm64@1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.4.tgz#2894c0cb87d42276c3889942e8e2db517a492c43" + integrity sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g== + +"@img/sharp-libvips-darwin-x64@1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.4.tgz#e63681f4539a94af9cd17246ed8881734386f8cc" + integrity sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg== + +"@img/sharp-libvips-linux-arm64@1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.4.tgz#b1b288b36864b3bce545ad91fa6dadcf1a4ad318" + integrity sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw== + +"@img/sharp-libvips-linux-arm@1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.4.tgz#b9260dd1ebe6f9e3bdbcbdcac9d2ac125f35852d" + integrity sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A== + +"@img/sharp-libvips-linux-ppc64@1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.4.tgz#4b83ecf2a829057222b38848c7b022e7b4d07aa7" + integrity sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA== + +"@img/sharp-libvips-linux-riscv64@1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.2.4.tgz#880b4678009e5a2080af192332b00b0aaf8a48de" + integrity sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA== + +"@img/sharp-libvips-linux-s390x@1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.4.tgz#74f343c8e10fad821b38f75ced30488939dc59ec" + integrity sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ== + +"@img/sharp-libvips-linux-x64@1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.4.tgz#df4183e8bd8410f7d61b66859a35edeab0a531ce" + integrity sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw== + +"@img/sharp-libvips-linuxmusl-arm64@1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.4.tgz#c8d6b48211df67137541007ee8d1b7b1f8ca8e06" + integrity sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw== + +"@img/sharp-libvips-linuxmusl-x64@1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.4.tgz#be11c75bee5b080cbee31a153a8779448f919f75" + integrity sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg== + +"@img/sharp-linux-arm64@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.5.tgz#7aa7764ef9c001f15e610546d42fce56911790cc" + integrity sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg== optionalDependencies: - "@img/sharp-libvips-linux-arm64" "1.2.3" + "@img/sharp-libvips-linux-arm64" "1.2.4" -"@img/sharp-linux-arm@0.34.4": - version "0.34.4" - resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.4.tgz#5f020d933f54f3fc49203d32c3b7dd0ec11ffcdb" - integrity sha512-Xyam4mlqM0KkTHYVSuc6wXRmM7LGN0P12li03jAnZ3EJWZqj83+hi8Y9UxZUbxsgsK1qOEwg7O0Bc0LjqQVtxA== +"@img/sharp-linux-arm@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.5.tgz#5fb0c3695dd12522d39c3ff7a6bc816461780a0d" + integrity sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw== optionalDependencies: - "@img/sharp-libvips-linux-arm" "1.2.3" + "@img/sharp-libvips-linux-arm" "1.2.4" -"@img/sharp-linux-ppc64@0.34.4": - version "0.34.4" - resolved "https://registry.yarnpkg.com/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.4.tgz#8d5775f6dc7e30ea3a1efa43798b7690bb5cb344" - integrity sha512-F4PDtF4Cy8L8hXA2p3TO6s4aDt93v+LKmpcYFLAVdkkD3hSxZzee0rh6/+94FpAynsuMpLX5h+LRsSG3rIciUQ== +"@img/sharp-linux-ppc64@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.5.tgz#9c213a81520a20caf66978f3d4c07456ff2e0813" + integrity sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA== optionalDependencies: - "@img/sharp-libvips-linux-ppc64" "1.2.3" + "@img/sharp-libvips-linux-ppc64" "1.2.4" -"@img/sharp-linux-s390x@0.34.4": - version "0.34.4" - resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.4.tgz#740aa5b369188ee2c1913b1015e7f830f4dfdb50" - integrity sha512-qVrZKE9Bsnzy+myf7lFKvng6bQzhNUAYcVORq2P7bDlvmF6u2sCmK2KyEQEBdYk+u3T01pVsPrkj943T1aJAsw== +"@img/sharp-linux-riscv64@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.34.5.tgz#cdd28182774eadbe04f62675a16aabbccb833f60" + integrity sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw== optionalDependencies: - "@img/sharp-libvips-linux-s390x" "1.2.3" + "@img/sharp-libvips-linux-riscv64" "1.2.4" -"@img/sharp-linux-x64@0.34.4": - version "0.34.4" - resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.4.tgz#573ce4196b2d0771bba32acc13a37b7adc9b6212" - integrity sha512-ZfGtcp2xS51iG79c6Vhw9CWqQC8l2Ot8dygxoDoIQPTat/Ov3qAa8qpxSrtAEAJW+UjTXc4yxCjNfxm4h6Xm2A== +"@img/sharp-linux-s390x@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.5.tgz#93eac601b9f329bb27917e0e19098c722d630df7" + integrity sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg== optionalDependencies: - "@img/sharp-libvips-linux-x64" "1.2.3" + "@img/sharp-libvips-linux-s390x" "1.2.4" -"@img/sharp-linuxmusl-arm64@0.34.4": - version "0.34.4" - resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.4.tgz#3c91bc8348cc3b42b43c6fca14f9dbb5cb47bd0d" - integrity sha512-8hDVvW9eu4yHWnjaOOR8kHVrew1iIX+MUgwxSuH2XyYeNRtLUe4VNioSqbNkB7ZYQJj9rUTT4PyRscyk2PXFKA== +"@img/sharp-linux-x64@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.5.tgz#55abc7cd754ffca5002b6c2b719abdfc846819a8" + integrity sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ== optionalDependencies: - "@img/sharp-libvips-linuxmusl-arm64" "1.2.3" + "@img/sharp-libvips-linux-x64" "1.2.4" -"@img/sharp-linuxmusl-x64@0.34.4": - version "0.34.4" - resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.4.tgz#33de7d476ac9e2db7ef654331b54cc679b806bda" - integrity sha512-lU0aA5L8QTlfKjpDCEFOZsTYGn3AEiO6db8W5aQDxj0nQkVrZWmN3ZP9sYKWJdtq3PWPhUNlqehWyXpYDcI9Sg== +"@img/sharp-linuxmusl-arm64@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.5.tgz#d6515ee971bb62f73001a4829b9d865a11b77086" + integrity sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg== optionalDependencies: - "@img/sharp-libvips-linuxmusl-x64" "1.2.3" + "@img/sharp-libvips-linuxmusl-arm64" "1.2.4" -"@img/sharp-wasm32@0.34.4": - version "0.34.4" - resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.34.4.tgz#d617f7b3f851f899802298f360667c20605c0198" - integrity sha512-33QL6ZO/qpRyG7woB/HUALz28WnTMI2W1jgX3Nu2bypqLIKx/QKMILLJzJjI+SIbvXdG9fUnmrxR7vbi1sTBeA== +"@img/sharp-linuxmusl-x64@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.5.tgz#d97978aec7c5212f999714f2f5b736457e12ee9f" + integrity sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q== + optionalDependencies: + "@img/sharp-libvips-linuxmusl-x64" "1.2.4" + +"@img/sharp-wasm32@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.34.5.tgz#2f15803aa626f8c59dd7c9d0bbc766f1ab52cfa0" + integrity sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw== dependencies: - "@emnapi/runtime" "^1.5.0" + "@emnapi/runtime" "^1.7.0" -"@img/sharp-win32-arm64@0.34.4": - version "0.34.4" - resolved "https://registry.yarnpkg.com/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.4.tgz#38e2c8a88826eac647f7c3f99efefb39897a8f5c" - integrity sha512-2Q250do/5WXTwxW3zjsEuMSv5sUU4Tq9VThWKlU2EYLm4MB7ZeMwF+SFJutldYODXF6jzc6YEOC+VfX0SZQPqA== +"@img/sharp-win32-arm64@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.5.tgz#3706e9e3ac35fddfc1c87f94e849f1b75307ce0a" + integrity sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g== -"@img/sharp-win32-ia32@0.34.4": - version "0.34.4" - resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.4.tgz#003a7eb0fdaba600790c3007cfd756e41a9cf749" - integrity sha512-3ZeLue5V82dT92CNL6rsal6I2weKw1cYu+rGKm8fOCCtJTR2gYeUfY3FqUnIJsMUPIH68oS5jmZ0NiJ508YpEw== +"@img/sharp-win32-ia32@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.5.tgz#0b71166599b049e032f085fb9263e02f4e4788de" + integrity sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg== -"@img/sharp-win32-x64@0.34.4": - version "0.34.4" - resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.4.tgz#b19f1f88ace8bfc20784a0ad31767f3438e025d1" - integrity sha512-xIyj4wpYs8J18sVN3mSQjwrw7fKUqRw+Z5rnHNCy5fYTxigBz81u5mOMPmFumwjcn8+ld1ppptMBCLic1nz6ig== +"@img/sharp-win32-x64@0.34.5": + version "0.34.5" + resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.5.tgz#a81ffb00e69267cd0a1d626eaedb8a8430b2b2f8" + integrity sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw== "@jridgewell/gen-mapping@^0.3.5": version "0.3.13" @@ -820,65 +851,111 @@ "@jridgewell/sourcemap-codec" "^1.4.14" "@napi-rs/wasm-runtime@^1.0.7": - version "1.0.7" - resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.0.7.tgz#dcfea99a75f06209a235f3d941e3460a51e9b14c" - integrity sha512-SeDnOO0Tk7Okiq6DbXmmBODgOAb9dp9gjlphokTUxmt8U3liIP1ZsozBahH69j/RJv+Rfs6IwUKHTgQYJ/HBAw== + version "1.1.0" + resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.0.tgz#c0180393d7862cff0d412e3e1a7c3bd5ea6d9b2f" + integrity sha512-Fq6DJW+Bb5jaWE69/qOE0D1TUN9+6uWhCeZpdnSBk14pjLcCWR7Q8n49PTSPHazM37JqrsdpEthXy2xn6jWWiA== dependencies: - "@emnapi/core" "^1.5.0" - "@emnapi/runtime" "^1.5.0" + "@emnapi/core" "^1.7.1" + "@emnapi/runtime" "^1.7.1" "@tybys/wasm-util" "^0.10.1" -"@next/env@15.5.3": - version "15.5.3" - resolved "https://registry.yarnpkg.com/@next/env/-/env-15.5.3.tgz#59ab3143b370774464143731587318b067cc3f87" - integrity sha512-RSEDTRqyihYXygx/OJXwvVupfr9m04+0vH8vyy0HfZ7keRto6VX9BbEk0J2PUk0VGy6YhklJUSrgForov5F9pw== - -"@next/swc-darwin-arm64@15.5.3": - version "15.5.3" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.3.tgz#f1bd728baf9b0ed0b6261a2fbc6436906cf9472e" - integrity sha512-nzbHQo69+au9wJkGKTU9lP7PXv0d1J5ljFpvb+LnEomLtSbJkbZyEs6sbF3plQmiOB2l9OBtN2tNSvCH1nQ9Jg== - -"@next/swc-darwin-x64@15.5.3": - version "15.5.3" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.3.tgz#8aad9294398a693e418611f0d22a8db66e78fb6a" - integrity sha512-w83w4SkOOhekJOcA5HBvHyGzgV1W/XvOfpkrxIse4uPWhYTTRwtGEM4v/jiXwNSJvfRvah0H8/uTLBKRXlef8g== - -"@next/swc-linux-arm64-gnu@15.5.3": - version "15.5.3" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.3.tgz#44949d152340cc455365fa831abd85fbe1e21d4b" - integrity sha512-+m7pfIs0/yvgVu26ieaKrifV8C8yiLe7jVp9SpcIzg7XmyyNE7toC1fy5IOQozmr6kWl/JONC51osih2RyoXRw== - -"@next/swc-linux-arm64-musl@15.5.3": - version "15.5.3" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.3.tgz#5fd36263c09f460e55da566fb785ac4af0a98756" - integrity sha512-u3PEIzuguSenoZviZJahNLgCexGFhso5mxWCrrIMdvpZn6lkME5vc/ADZG8UUk5K1uWRy4hqSFECrON6UKQBbQ== - -"@next/swc-linux-x64-gnu@15.5.3": - version "15.5.3" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.3.tgz#b30ad14372b8266df70c799420133846273c9461" - integrity sha512-lDtOOScYDZxI2BENN9m0pfVPJDSuUkAD1YXSvlJF0DKwZt0WlA7T7o3wrcEr4Q+iHYGzEaVuZcsIbCps4K27sA== - -"@next/swc-linux-x64-musl@15.5.3": - version "15.5.3" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.3.tgz#572e6a9cfaf685148304298222c9bd73dc055a3a" - integrity sha512-9vWVUnsx9PrY2NwdVRJ4dUURAQ8Su0sLRPqcCCxtX5zIQUBES12eRVHq6b70bbfaVaxIDGJN2afHui0eDm+cLg== - -"@next/swc-win32-arm64-msvc@15.5.3": - version "15.5.3" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.3.tgz#d52e475b1c3be6e90be3657f54ed5561528850d7" - integrity sha512-1CU20FZzY9LFQigRi6jM45oJMU3KziA5/sSG+dXeVaTm661snQP6xu3ykGxxwU5sLG3sh14teO/IOEPVsQMRfA== - -"@next/swc-win32-x64-msvc@15.5.3": - version "15.5.3" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.3.tgz#d716c04efa8568680da1c14f5595d932268086f2" - integrity sha512-JMoLAq3n3y5tKXPQwCK5c+6tmwkuFDa2XAxz8Wm4+IVthdBZdZGh+lmiLUHg9f9IDwIQpUjp+ysd6OkYTyZRZw== +"@next/env@15.5.6": + version "15.5.6" + resolved "https://registry.yarnpkg.com/@next/env/-/env-15.5.6.tgz#7009d88d419a36a4ba9e110c151604444744a74d" + integrity sha512-3qBGRW+sCGzgbpc5TS1a0p7eNxnOarGVQhZxfvTdnV0gFI61lX7QNtQ4V1TSREctXzYn5NetbUsLvyqwLFJM6Q== + +"@next/swc-darwin-arm64@15.5.6": + version "15.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.6.tgz#f80d3fe536f29f3217ca07d031f7b43862234059" + integrity sha512-ES3nRz7N+L5Umz4KoGfZ4XX6gwHplwPhioVRc25+QNsDa7RtUF/z8wJcbuQ2Tffm5RZwuN2A063eapoJ1u4nPg== + +"@next/swc-darwin-x64@15.5.6": + version "15.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.6.tgz#289334478617318a0d8d9f1f6661a15952f4e4ab" + integrity sha512-JIGcytAyk9LQp2/nuVZPAtj8uaJ/zZhsKOASTjxDug0SPU9LAM3wy6nPU735M1OqacR4U20LHVF5v5Wnl9ptTA== + +"@next/swc-linux-arm64-gnu@15.5.6": + version "15.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.6.tgz#efdd993cd9ad88b82c948c8e518e045566dd2f98" + integrity sha512-qvz4SVKQ0P3/Im9zcS2RmfFL/UCQnsJKJwQSkissbngnB/12c6bZTCB0gHTexz1s6d/mD0+egPKXAIRFVS7hQg== + +"@next/swc-linux-arm64-musl@15.5.6": + version "15.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.6.tgz#a45185126faf69eb65a017bd2c015ad7e86f5c84" + integrity sha512-FsbGVw3SJz1hZlvnWD+T6GFgV9/NYDeLTNQB2MXoPN5u9VA9OEDy6fJEfePfsUKAhJufFbZLgp0cPxMuV6SV0w== + +"@next/swc-linux-x64-gnu@15.5.6": + version "15.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.6.tgz#8174dc8e03a1f7df292bead360f83c53f8dd8b73" + integrity sha512-3QnHGFWlnvAgyxFxt2Ny8PTpXtQD7kVEeaFat5oPAHHI192WKYB+VIKZijtHLGdBBvc16tiAkPTDmQNOQ0dyrA== + +"@next/swc-linux-x64-musl@15.5.6": + version "15.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.6.tgz#6d0776d81c5bd6a1780e6c39f32d7ef172900635" + integrity sha512-OsGX148sL+TqMK9YFaPFPoIaJKbFJJxFzkXZljIgA9hjMjdruKht6xDCEv1HLtlLNfkx3c5w2GLKhj7veBQizQ== + +"@next/swc-win32-arm64-msvc@15.5.6": + version "15.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.6.tgz#4b63d511b5c41278a48168fccb89cf00912411af" + integrity sha512-ONOMrqWxdzXDJNh2n60H6gGyKed42Ieu6UTVPZteXpuKbLZTH4G4eBMsr5qWgOBA+s7F+uB4OJbZnrkEDnZ5Fg== + +"@next/swc-win32-x64-msvc@15.5.6": + version "15.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.6.tgz#9ed5e84bd85009625dd35c444668d13061452a50" + integrity sha512-pxK4VIjFRx1MY92UycLOOw7dTdvccWsNETQ0kDHkBlcFH1GrTLUjSiHU1ohrznnux6TqRHgv5oflhfIWZwVROQ== + +"@noble/ciphers@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@noble/ciphers/-/ciphers-1.3.0.tgz#f64b8ff886c240e644e5573c097f86e5b43676dc" + integrity sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw== + +"@noble/curves@1.9.1": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.9.1.tgz#9654a0bc6c13420ae252ddcf975eaf0f58f0a35c" + integrity sha512-k11yZxZg+t+gWvBbIswW0yoJlu8cHOC7dhunwOzoWH/mXGBiYyR4YY6hAEK/3EUs4UpB8la1RfdRpeGsFHkWsA== + dependencies: + "@noble/hashes" "1.8.0" + +"@noble/curves@~1.9.0": + version "1.9.7" + resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.9.7.tgz#79d04b4758a43e4bca2cbdc62e7771352fa6b951" + integrity sha512-gbKGcRUYIjA3/zCCNaWDciTMFI0dCkvou3TL8Zmy5Nc7sJ47a0jtOeZoTaMxkuqRo9cRhjOdZJXegxYE5FN/xw== + dependencies: + "@noble/hashes" "1.8.0" + +"@noble/hashes@1.8.0", "@noble/hashes@^1.8.0", "@noble/hashes@~1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.8.0.tgz#cee43d801fcef9644b11b8194857695acd5f815a" + integrity sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A== + +"@scure/base@~1.2.5": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.2.6.tgz#ca917184b8231394dd8847509c67a0be522e59f6" + integrity sha512-g/nm5FgUa//MCj1gV09zTJTaM6KBAHqLN907YVQqf7zC49+DcO4B1so4ZX07Ef10Twr6nuqYEH9GEggFXA4Fmg== + +"@scure/bip32@1.7.0", "@scure/bip32@^1.7.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.7.0.tgz#b8683bab172369f988f1589640e53c4606984219" + integrity sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw== + dependencies: + "@noble/curves" "~1.9.0" + "@noble/hashes" "~1.8.0" + "@scure/base" "~1.2.5" + +"@scure/bip39@1.6.0", "@scure/bip39@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.6.0.tgz#475970ace440d7be87a6086cbee77cb8f1a684f9" + integrity sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A== + dependencies: + "@noble/hashes" "~1.8.0" + "@scure/base" "~1.2.5" -"@smithy/abort-controller@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.2.3.tgz#4615da3012b580ac3d1f0ee7b57ed7d7880bb29b" - integrity sha512-xWL9Mf8b7tIFuAlpjKtRPnHrR8XVrwTj5NPYO/QwZPtc0SDLsPxb56V5tzi5yspSMytISHybifez+4jlrx0vkQ== +"@smithy/abort-controller@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.2.5.tgz#3386e8fff5a8d05930996d891d06803f2b7e5e2c" + integrity sha512-j7HwVkBw68YW8UmFRcjZOmssE77Rvk0GWAIN1oFBhsaovQmZWYCIcGa9/pwRB0ExI8Sk9MWNALTjftjHZea7VA== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" "@smithy/chunked-blob-reader-native@^4.2.1": @@ -896,136 +973,136 @@ dependencies: tslib "^2.6.2" -"@smithy/config-resolver@^4.4.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.4.0.tgz#9a33b7dd9b7e0475802acef53f41555257e104cd" - integrity sha512-Kkmz3Mup2PGp/HNJxhCWkLNdlajJORLSjwkcfrj0E7nu6STAEdcMR1ir5P9/xOmncx8xXfru0fbUYLlZog/cFg== +"@smithy/config-resolver@^4.4.3": + version "4.4.3" + resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.4.3.tgz#37b0e3cba827272e92612e998a2b17e841e20bab" + integrity sha512-ezHLe1tKLUxDJo2LHtDuEDyWXolw8WGOR92qb4bQdWq/zKenO5BvctZGrVJBK08zjezSk7bmbKFOXIVyChvDLw== dependencies: - "@smithy/node-config-provider" "^4.3.3" - "@smithy/types" "^4.8.0" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/types" "^4.9.0" "@smithy/util-config-provider" "^4.2.0" - "@smithy/util-endpoints" "^3.2.3" - "@smithy/util-middleware" "^4.2.3" + "@smithy/util-endpoints" "^3.2.5" + "@smithy/util-middleware" "^4.2.5" tslib "^2.6.2" -"@smithy/core@^3.17.1": - version "3.17.1" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.17.1.tgz#644aa4046b31c82d2c17276bcef2c6b78245dfeb" - integrity sha512-V4Qc2CIb5McABYfaGiIYLTmo/vwNIK7WXI5aGveBd9UcdhbOMwcvIMxIw/DJj1S9QgOMa/7FBkarMdIC0EOTEQ== +"@smithy/core@^3.18.5", "@smithy/core@^3.18.6": + version "3.18.6" + resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.18.6.tgz#bbc0d2dce4b926ce9348bce82b85f5e1294834df" + integrity sha512-8Q/ugWqfDUEU1Exw71+DoOzlONJ2Cn9QA8VeeDzLLjzO/qruh9UKFzbszy4jXcIYgGofxYiT0t1TT6+CT/GupQ== dependencies: - "@smithy/middleware-serde" "^4.2.3" - "@smithy/protocol-http" "^5.3.3" - "@smithy/types" "^4.8.0" + "@smithy/middleware-serde" "^4.2.6" + "@smithy/protocol-http" "^5.3.5" + "@smithy/types" "^4.9.0" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" - "@smithy/util-middleware" "^4.2.3" - "@smithy/util-stream" "^4.5.4" + "@smithy/util-middleware" "^4.2.5" + "@smithy/util-stream" "^4.5.6" "@smithy/util-utf8" "^4.2.0" "@smithy/uuid" "^1.1.0" tslib "^2.6.2" -"@smithy/credential-provider-imds@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.3.tgz#b35d0d1f1b28f415e06282999eba2d53eb10a1c5" - integrity sha512-hA1MQ/WAHly4SYltJKitEsIDVsNmXcQfYBRv2e+q04fnqtAX5qXaybxy/fhUeAMCnQIdAjaGDb04fMHQefWRhw== +"@smithy/credential-provider-imds@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.5.tgz#5acbcd1d02ae31700c2f027090c202d7315d70d3" + integrity sha512-BZwotjoZWn9+36nimwm/OLIcVe+KYRwzMjfhd4QT7QxPm9WY0HiOV8t/Wlh+HVUif0SBVV7ksq8//hPaBC/okQ== dependencies: - "@smithy/node-config-provider" "^4.3.3" - "@smithy/property-provider" "^4.2.3" - "@smithy/types" "^4.8.0" - "@smithy/url-parser" "^4.2.3" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/property-provider" "^4.2.5" + "@smithy/types" "^4.9.0" + "@smithy/url-parser" "^4.2.5" tslib "^2.6.2" -"@smithy/eventstream-codec@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-4.2.3.tgz#dd65d9050c322f0805ba62749a3801985a2f5394" - integrity sha512-rcr0VH0uNoMrtgKuY7sMfyKqbHc4GQaQ6Yp4vwgm+Z6psPuOgL+i/Eo/QWdXRmMinL3EgFM0Z1vkfyPyfzLmjw== +"@smithy/eventstream-codec@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-4.2.5.tgz#331b3f23528137cb5f4ad861de7f34ddff68c62b" + integrity sha512-Ogt4Zi9hEbIP17oQMd68qYOHUzmH47UkK7q7Gl55iIm9oKt27MUGrC5JfpMroeHjdkOliOA4Qt3NQ1xMq/nrlA== dependencies: "@aws-crypto/crc32" "5.2.0" - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" "@smithy/util-hex-encoding" "^4.2.0" tslib "^2.6.2" -"@smithy/eventstream-serde-browser@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.2.3.tgz#57fb9c10daac12647a0b97ef04330d706cbe9494" - integrity sha512-EcS0kydOr2qJ3vV45y7nWnTlrPmVIMbUFOZbMG80+e2+xePQISX9DrcbRpVRFTS5Nqz3FiEbDcTCAV0or7bqdw== +"@smithy/eventstream-serde-browser@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.2.5.tgz#54a680006539601ce71306d8bf2946e3462a47b3" + integrity sha512-HohfmCQZjppVnKX2PnXlf47CW3j92Ki6T/vkAT2DhBR47e89pen3s4fIa7otGTtrVxmj7q+IhH0RnC5kpR8wtw== dependencies: - "@smithy/eventstream-serde-universal" "^4.2.3" - "@smithy/types" "^4.8.0" + "@smithy/eventstream-serde-universal" "^4.2.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/eventstream-serde-config-resolver@^4.3.3": - version "4.3.3" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.3.3.tgz#ca1a7d272ae939aee303da40aa476656d785f75f" - integrity sha512-GewKGZ6lIJ9APjHFqR2cUW+Efp98xLu1KmN0jOWxQ1TN/gx3HTUPVbLciFD8CfScBj2IiKifqh9vYFRRXrYqXA== +"@smithy/eventstream-serde-config-resolver@^4.3.5": + version "4.3.5" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.3.5.tgz#d1490aa127f43ac242495fa6e2e5833e1949a481" + integrity sha512-ibjQjM7wEXtECiT6my1xfiMH9IcEczMOS6xiCQXoUIYSj5b1CpBbJ3VYbdwDy8Vcg5JHN7eFpOCGk8nyZAltNQ== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/eventstream-serde-node@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.2.3.tgz#f1b33bb576bf7222b6bd6bc2ad845068ccf53f16" - integrity sha512-uQobOTQq2FapuSOlmGLUeGTpvcBLE5Fc7XjERUSk4dxEi4AhTwuyHYZNAvL4EMUp7lzxxkKDFaJ1GY0ovrj0Kg== +"@smithy/eventstream-serde-node@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.2.5.tgz#7dd64e0ba64fa930959f3d5b7995c310573ecaf3" + integrity sha512-+elOuaYx6F2H6x1/5BQP5ugv12nfJl66GhxON8+dWVUEDJ9jah/A0tayVdkLRP0AeSac0inYkDz5qBFKfVp2Gg== dependencies: - "@smithy/eventstream-serde-universal" "^4.2.3" - "@smithy/types" "^4.8.0" + "@smithy/eventstream-serde-universal" "^4.2.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/eventstream-serde-universal@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.2.3.tgz#86194daa2cd2496e413723465360d80f32ad7252" - integrity sha512-QIvH/CKOk1BZPz/iwfgbh1SQD5Y0lpaw2kLA8zpLRRtYMPXeYUEWh+moTaJyqDaKlbrB174kB7FSRFiZ735tWw== +"@smithy/eventstream-serde-universal@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.2.5.tgz#34189de45cf5e1d9cb59978e94b76cc210fa984f" + integrity sha512-G9WSqbST45bmIFaeNuP/EnC19Rhp54CcVdX9PDL1zyEB514WsDVXhlyihKlGXnRycmHNmVv88Bvvt4EYxWef/Q== dependencies: - "@smithy/eventstream-codec" "^4.2.3" - "@smithy/types" "^4.8.0" + "@smithy/eventstream-codec" "^4.2.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/fetch-http-handler@^5.3.4": - version "5.3.4" - resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.4.tgz#af6dd2f63550494c84ef029a5ceda81ef46965d3" - integrity sha512-bwigPylvivpRLCm+YK9I5wRIYjFESSVwl8JQ1vVx/XhCw0PtCi558NwTnT2DaVCl5pYlImGuQTSwMsZ+pIavRw== +"@smithy/fetch-http-handler@^5.3.6": + version "5.3.6" + resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.6.tgz#d9dcb8d8ca152918224492f4d1cc1b50df93ae13" + integrity sha512-3+RG3EA6BBJ/ofZUeTFJA7mHfSYrZtQIrDP9dI8Lf7X6Jbos2jptuLrAAteDiFVrmbEmLSuRG/bUKzfAXk7dhg== dependencies: - "@smithy/protocol-http" "^5.3.3" - "@smithy/querystring-builder" "^4.2.3" - "@smithy/types" "^4.8.0" + "@smithy/protocol-http" "^5.3.5" + "@smithy/querystring-builder" "^4.2.5" + "@smithy/types" "^4.9.0" "@smithy/util-base64" "^4.3.0" tslib "^2.6.2" -"@smithy/hash-blob-browser@^4.2.4": - version "4.2.4" - resolved "https://registry.yarnpkg.com/@smithy/hash-blob-browser/-/hash-blob-browser-4.2.4.tgz#c7226d2ba2a394acf6e90510d08f7c3003f516d1" - integrity sha512-W7eIxD+rTNsLB/2ynjmbdeP7TgxRXprfvqQxKFEfy9HW2HeD7t+g+KCIrY0pIn/GFjA6/fIpH+JQnfg5TTk76Q== +"@smithy/hash-blob-browser@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/hash-blob-browser/-/hash-blob-browser-4.2.6.tgz#53d5ae0a069ae4a93abbc7165efe341dca0f9489" + integrity sha512-8P//tA8DVPk+3XURk2rwcKgYwFvwGwmJH/wJqQiSKwXZtf/LiZK+hbUZmPj/9KzM+OVSwe4o85KTp5x9DUZTjw== dependencies: "@smithy/chunked-blob-reader" "^5.2.0" "@smithy/chunked-blob-reader-native" "^4.2.1" - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/hash-node@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.2.3.tgz#c85711fca84e022f05c71b921f98cb6a0f48e5ca" - integrity sha512-6+NOdZDbfuU6s1ISp3UOk5Rg953RJ2aBLNLLBEcamLjHAg1Po9Ha7QIB5ZWhdRUVuOUrT8BVFR+O2KIPmw027g== +"@smithy/hash-node@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.2.5.tgz#fb751ec4a4c6347612458430f201f878adc787f6" + integrity sha512-DpYX914YOfA3UDT9CN1BM787PcHfWRBB43fFGCYrZFUH0Jv+5t8yYl+Pd5PW4+QzoGEDvn5d5QIO4j2HyYZQSA== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" "@smithy/util-buffer-from" "^4.2.0" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@smithy/hash-stream-node@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/hash-stream-node/-/hash-stream-node-4.2.3.tgz#8ddae1f5366513cbbec3acb6f54e3ec1b332db88" - integrity sha512-EXMSa2yiStVII3x/+BIynyOAZlS7dGvI7RFrzXa/XssBgck/7TXJIvnjnCu328GY/VwHDC4VeDyP1S4rqwpYag== +"@smithy/hash-stream-node@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/hash-stream-node/-/hash-stream-node-4.2.5.tgz#f200e6b755cb28f03968c199231774c3ad33db28" + integrity sha512-6+do24VnEyvWcGdHXomlpd0m8bfZePpUKBy7m311n+JuRwug8J4dCanJdTymx//8mi0nlkflZBvJe+dEO/O12Q== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@smithy/invalid-dependency@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.2.3.tgz#4f126ddde90fe3d69d522fc37256ee853246c1ec" - integrity sha512-Cc9W5DwDuebXEDMpOpl4iERo8I0KFjTnomK2RMdhhR87GwrSmUmwMxS4P5JdRf+LsjOdIqumcerwRgYMr/tZ9Q== +"@smithy/invalid-dependency@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.2.5.tgz#58d997e91e7683ffc59882d8fcb180ed9aa9c7dd" + integrity sha512-2L2erASEro1WC5nV+plwIMxrTXpvpfzl4e+Nre6vBVRR2HKeGGcvpJyyL3/PpiSg+cJG2KpTmZmq934Olb6e5A== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" "@smithy/is-array-buffer@^2.2.0": @@ -1042,180 +1119,180 @@ dependencies: tslib "^2.6.2" -"@smithy/md5-js@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/md5-js/-/md5-js-4.2.3.tgz#a89c324ff61c64c25b4895fa16d9358f7e3cc746" - integrity sha512-5+4bUEJQi/NRgzdA5SVXvAwyvEnD0ZAiKzV3yLO6dN5BG8ScKBweZ8mxXXUtdxq+Dx5k6EshKk0XJ7vgvIPSnA== +"@smithy/md5-js@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/md5-js/-/md5-js-4.2.5.tgz#ca16f138dd0c4e91a61d3df57e8d4d15d1ddc97e" + integrity sha512-Bt6jpSTMWfjCtC0s79gZ/WZ1w90grfmopVOWqkI2ovhjpD5Q2XRXuecIPB9689L2+cCySMbaXDhBPU56FKNDNg== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@smithy/middleware-content-length@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.2.3.tgz#b7d1d79ae674dad17e35e3518db4b1f0adc08964" - integrity sha512-/atXLsT88GwKtfp5Jr0Ks1CSa4+lB+IgRnkNrrYP0h1wL4swHNb0YONEvTceNKNdZGJsye+W2HH8W7olbcPUeA== +"@smithy/middleware-content-length@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.2.5.tgz#a6942ce2d7513b46f863348c6c6a8177e9ace752" + integrity sha512-Y/RabVa5vbl5FuHYV2vUCwvh/dqzrEY/K2yWPSqvhFUwIY0atLqO4TienjBXakoy4zrKAMCZwg+YEqmH7jaN7A== dependencies: - "@smithy/protocol-http" "^5.3.3" - "@smithy/types" "^4.8.0" + "@smithy/protocol-http" "^5.3.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/middleware-endpoint@^4.3.5": - version "4.3.5" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.3.5.tgz#c22f82f83f0b5cc6c0866a2a87b65bc2e79af352" - integrity sha512-SIzKVTvEudFWJbxAaq7f2GvP3jh2FHDpIFI6/VAf4FOWGFZy0vnYMPSRj8PGYI8Hjt29mvmwSRgKuO3bK4ixDw== +"@smithy/middleware-endpoint@^4.3.12", "@smithy/middleware-endpoint@^4.3.13": + version "4.3.13" + resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.3.13.tgz#94a0e9fd360355bd224481b5371b39dd3f8e9c99" + integrity sha512-X4za1qCdyx1hEVVXuAWlZuK6wzLDv1uw1OY9VtaYy1lULl661+frY7FeuHdYdl7qAARUxH2yvNExU2/SmRFfcg== dependencies: - "@smithy/core" "^3.17.1" - "@smithy/middleware-serde" "^4.2.3" - "@smithy/node-config-provider" "^4.3.3" - "@smithy/shared-ini-file-loader" "^4.3.3" - "@smithy/types" "^4.8.0" - "@smithy/url-parser" "^4.2.3" - "@smithy/util-middleware" "^4.2.3" + "@smithy/core" "^3.18.6" + "@smithy/middleware-serde" "^4.2.6" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/shared-ini-file-loader" "^4.4.0" + "@smithy/types" "^4.9.0" + "@smithy/url-parser" "^4.2.5" + "@smithy/util-middleware" "^4.2.5" tslib "^2.6.2" -"@smithy/middleware-retry@^4.4.5": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.4.5.tgz#5bdb6ba1be6a97272b79fdac99db40c5e7ab81e0" - integrity sha512-DCaXbQqcZ4tONMvvdz+zccDE21sLcbwWoNqzPLFlZaxt1lDtOE2tlVpRSwcTOJrjJSUThdgEYn7HrX5oLGlK9A== - dependencies: - "@smithy/node-config-provider" "^4.3.3" - "@smithy/protocol-http" "^5.3.3" - "@smithy/service-error-classification" "^4.2.3" - "@smithy/smithy-client" "^4.9.1" - "@smithy/types" "^4.8.0" - "@smithy/util-middleware" "^4.2.3" - "@smithy/util-retry" "^4.2.3" +"@smithy/middleware-retry@^4.4.12": + version "4.4.13" + resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.4.13.tgz#1038ddb69d43301e6424eb1122dd090f3789d8a2" + integrity sha512-RzIDF9OrSviXX7MQeKOm8r/372KTyY8Jmp6HNKOOYlrguHADuM3ED/f4aCyNhZZFLG55lv5beBin7nL0Nzy1Dw== + dependencies: + "@smithy/node-config-provider" "^4.3.5" + "@smithy/protocol-http" "^5.3.5" + "@smithy/service-error-classification" "^4.2.5" + "@smithy/smithy-client" "^4.9.9" + "@smithy/types" "^4.9.0" + "@smithy/util-middleware" "^4.2.5" + "@smithy/util-retry" "^4.2.5" "@smithy/uuid" "^1.1.0" tslib "^2.6.2" -"@smithy/middleware-serde@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.2.3.tgz#a827e9c4ea9e51c79cca4d6741d582026a8b53eb" - integrity sha512-8g4NuUINpYccxiCXM5s1/V+uLtts8NcX4+sPEbvYQDZk4XoJfDpq5y2FQxfmUL89syoldpzNzA0R9nhzdtdKnQ== +"@smithy/middleware-serde@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.2.6.tgz#7e710f43206e13a8c081a372b276e7b2c51bff5b" + integrity sha512-VkLoE/z7e2g8pirwisLz8XJWedUSY8my/qrp81VmAdyrhi94T+riBfwP+AOEEFR9rFTSonC/5D2eWNmFabHyGQ== dependencies: - "@smithy/protocol-http" "^5.3.3" - "@smithy/types" "^4.8.0" + "@smithy/protocol-http" "^5.3.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/middleware-stack@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.2.3.tgz#5a315aa9d0fd4faaa248780297c8cbacc31c2eba" - integrity sha512-iGuOJkH71faPNgOj/gWuEGS6xvQashpLwWB1HjHq1lNNiVfbiJLpZVbhddPuDbx9l4Cgl0vPLq5ltRfSaHfspA== +"@smithy/middleware-stack@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.2.5.tgz#2d13415ed3561c882594c8e6340b801d9a2eb222" + integrity sha512-bYrutc+neOyWxtZdbB2USbQttZN0mXaOyYLIsaTbJhFsfpXyGWUxJpEuO1rJ8IIJm2qH4+xJT0mxUSsEDTYwdQ== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/node-config-provider@^4.3.3": - version "4.3.3" - resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.3.3.tgz#44140a1e6bc666bcf16faf68c35d3dae4ba8cad5" - integrity sha512-NzI1eBpBSViOav8NVy1fqOlSfkLgkUjUTlohUSgAEhHaFWA3XJiLditvavIP7OpvTjDp5u2LhtlBhkBlEisMwA== +"@smithy/node-config-provider@^4.3.5": + version "4.3.5" + resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.3.5.tgz#c09137a79c2930dcc30e6c8bb4f2608d72c1e2c9" + integrity sha512-UTurh1C4qkVCtqggI36DGbLB2Kv8UlcFdMXDcWMbqVY2uRg0XmT9Pb4Vj6oSQ34eizO1fvR0RnFV4Axw4IrrAg== dependencies: - "@smithy/property-provider" "^4.2.3" - "@smithy/shared-ini-file-loader" "^4.3.3" - "@smithy/types" "^4.8.0" + "@smithy/property-provider" "^4.2.5" + "@smithy/shared-ini-file-loader" "^4.4.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/node-http-handler@^4.4.3": - version "4.4.3" - resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.4.3.tgz#fb2d16719cb4e8df0c189e8bde60e837df5c0c5b" - integrity sha512-MAwltrDB0lZB/H6/2M5PIsISSwdI5yIh6DaBB9r0Flo9nx3y0dzl/qTMJPd7tJvPdsx6Ks/cwVzheGNYzXyNbQ== +"@smithy/node-http-handler@^4.4.5": + version "4.4.5" + resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.4.5.tgz#2aea598fdf3dc4e32667d673d48abd4a073665f4" + integrity sha512-CMnzM9R2WqlqXQGtIlsHMEZfXKJVTIrqCNoSd/QpAyp+Dw0a1Vps13l6ma1fH8g7zSPNsA59B/kWgeylFuA/lw== dependencies: - "@smithy/abort-controller" "^4.2.3" - "@smithy/protocol-http" "^5.3.3" - "@smithy/querystring-builder" "^4.2.3" - "@smithy/types" "^4.8.0" + "@smithy/abort-controller" "^4.2.5" + "@smithy/protocol-http" "^5.3.5" + "@smithy/querystring-builder" "^4.2.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/property-provider@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.2.3.tgz#a6c82ca0aa1c57f697464bee496f3fec58660864" - integrity sha512-+1EZ+Y+njiefCohjlhyOcy1UNYjT+1PwGFHCxA/gYctjg3DQWAU19WigOXAco/Ql8hZokNehpzLd0/+3uCreqQ== +"@smithy/property-provider@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.2.5.tgz#f75dc5735d29ca684abbc77504be9246340a43f0" + integrity sha512-8iLN1XSE1rl4MuxvQ+5OSk/Zb5El7NJZ1td6Tn+8dQQHIjp59Lwl6bd0+nzw6SKm2wSSriH2v/I9LPzUic7EOg== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/protocol-http@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.3.3.tgz#55b35c18bdc0f6d86e78f63961e50ba4ff1c5d73" - integrity sha512-Mn7f/1aN2/jecywDcRDvWWWJF4uwg/A0XjFMJtj72DsgHTByfjRltSqcT9NyE9RTdBSN6X1RSXrhn/YWQl8xlw== +"@smithy/protocol-http@^5.3.5": + version "5.3.5" + resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.3.5.tgz#a8f4296dd6d190752589e39ee95298d5c65a60db" + integrity sha512-RlaL+sA0LNMp03bf7XPbFmT5gN+w3besXSWMkA8rcmxLSVfiEXElQi4O2IWwPfxzcHkxqrwBFMbngB8yx/RvaQ== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/querystring-builder@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.2.3.tgz#ca273ae8c21fce01a52632202679c0f9e2acf41a" - integrity sha512-LOVCGCmwMahYUM/P0YnU/AlDQFjcu+gWbFJooC417QRB/lDJlWSn8qmPSDp+s4YVAHOgtgbNG4sR+SxF/VOcJQ== +"@smithy/querystring-builder@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.2.5.tgz#00cafa5a4055600ab8058e26db42f580146b91f3" + integrity sha512-y98otMI1saoajeik2kLfGyRp11e5U/iJYH/wLCh3aTV/XutbGT9nziKGkgCaMD1ghK7p6htHMm6b6scl9JRUWg== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" "@smithy/util-uri-escape" "^4.2.0" tslib "^2.6.2" -"@smithy/querystring-parser@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.2.3.tgz#b6d7d5cd300b4083c62d9bd30915f782d01f503e" - integrity sha512-cYlSNHcTAX/wc1rpblli3aUlLMGgKZ/Oqn8hhjFASXMCXjIqeuQBei0cnq2JR8t4RtU9FpG6uyl6PxyArTiwKA== +"@smithy/querystring-parser@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.2.5.tgz#61d2e77c62f44196590fa0927dbacfbeaffe8c53" + integrity sha512-031WCTdPYgiQRYNPXznHXof2YM0GwL6SeaSyTH/P72M1Vz73TvCNH2Nq8Iu2IEPq9QP2yx0/nrw5YmSeAi/AjQ== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/service-error-classification@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.2.3.tgz#ecb41dd514841eebb93e91012ae5e343040f6828" - integrity sha512-NkxsAxFWwsPsQiwFG2MzJ/T7uIR6AQNh1SzcxSUnmmIqIQMlLRQDKhc17M7IYjiuBXhrQRjQTo3CxX+DobS93g== +"@smithy/service-error-classification@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.2.5.tgz#a64eb78e096e59cc71141e3fea2b4194ce59b4fd" + integrity sha512-8fEvK+WPE3wUAcDvqDQG1Vk3ANLR8Px979te96m84CbKAjBVf25rPYSzb4xU4hlTyho7VhOGnh5i62D/JVF0JQ== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" -"@smithy/shared-ini-file-loader@^4.3.3": - version "4.3.3" - resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.3.3.tgz#1d5162cd3a14f57e4fde56f65aa188e8138c1248" - integrity sha512-9f9Ixej0hFhroOK2TxZfUUDR13WVa8tQzhSzPDgXe5jGL3KmaM9s8XN7RQwqtEypI82q9KHnKS71CJ+q/1xLtQ== +"@smithy/shared-ini-file-loader@^4.4.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.0.tgz#a2f8282f49982f00bafb1fa8cb7fc188a202a594" + integrity sha512-5WmZ5+kJgJDjwXXIzr1vDTG+RhF9wzSODQBfkrQ2VVkYALKGvZX1lgVSxEkgicSAFnFhPj5rudJV0zoinqS0bA== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/signature-v4@^5.3.3": - version "5.3.3" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.3.3.tgz#5ff13cfaa29cb531061c2582cb599b39e040e52e" - integrity sha512-CmSlUy+eEYbIEYN5N3vvQTRfqt0lJlQkaQUIf+oizu7BbDut0pozfDjBGecfcfWf7c62Yis4JIEgqQ/TCfodaA== +"@smithy/signature-v4@^5.3.5": + version "5.3.5" + resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.3.5.tgz#13ab710653f9f16c325ee7e0a102a44f73f2643f" + integrity sha512-xSUfMu1FT7ccfSXkoLl/QRQBi2rOvi3tiBZU2Tdy3I6cgvZ6SEi9QNey+lqps/sJRnogIS+lq+B1gxxbra2a/w== dependencies: "@smithy/is-array-buffer" "^4.2.0" - "@smithy/protocol-http" "^5.3.3" - "@smithy/types" "^4.8.0" + "@smithy/protocol-http" "^5.3.5" + "@smithy/types" "^4.9.0" "@smithy/util-hex-encoding" "^4.2.0" - "@smithy/util-middleware" "^4.2.3" + "@smithy/util-middleware" "^4.2.5" "@smithy/util-uri-escape" "^4.2.0" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@smithy/smithy-client@^4.9.1": - version "4.9.1" - resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.9.1.tgz#a36e456e837121b2ded6f7d5f1f30b205c446e20" - integrity sha512-Ngb95ryR5A9xqvQFT5mAmYkCwbXvoLavLFwmi7zVg/IowFPCfiqRfkOKnbc/ZRL8ZKJ4f+Tp6kSu6wjDQb8L/g== +"@smithy/smithy-client@^4.9.8", "@smithy/smithy-client@^4.9.9": + version "4.9.9" + resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.9.9.tgz#c404029e85a62b5d4130839f7930f7071de00244" + integrity sha512-SUnZJMMo5yCmgjopJbiNeo1vlr8KvdnEfIHV9rlD77QuOGdRotIVBcOrBuMr+sI9zrnhtDtLP054bZVbpZpiQA== dependencies: - "@smithy/core" "^3.17.1" - "@smithy/middleware-endpoint" "^4.3.5" - "@smithy/middleware-stack" "^4.2.3" - "@smithy/protocol-http" "^5.3.3" - "@smithy/types" "^4.8.0" - "@smithy/util-stream" "^4.5.4" + "@smithy/core" "^3.18.6" + "@smithy/middleware-endpoint" "^4.3.13" + "@smithy/middleware-stack" "^4.2.5" + "@smithy/protocol-http" "^5.3.5" + "@smithy/types" "^4.9.0" + "@smithy/util-stream" "^4.5.6" tslib "^2.6.2" -"@smithy/types@^4.8.0": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.8.0.tgz#e6f65e712478910b74747081e6046e68159f767d" - integrity sha512-QpELEHLO8SsQVtqP+MkEgCYTFW0pleGozfs3cZ183ZBj9z3VC1CX1/wtFMK64p+5bhtZo41SeLK1rBRtd25nHQ== +"@smithy/types@^4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.9.0.tgz#c6636ddfa142e1ddcb6e4cf5f3e1a628d420486f" + integrity sha512-MvUbdnXDTwykR8cB1WZvNNwqoWVaTRA0RLlLmf/cIFNMM2cKWz01X4Ly6SMC4Kks30r8tT3Cty0jmeWfiuyHTA== dependencies: tslib "^2.6.2" -"@smithy/url-parser@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.2.3.tgz#82508f273a3f074d47d0919f7ce08028c6575c2f" - integrity sha512-I066AigYvY3d9VlU3zG9XzZg1yT10aNqvCaBTw9EPgu5GrsEl1aUkcMvhkIXascYH1A8W0LQo3B1Kr1cJNcQEw== +"@smithy/url-parser@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.2.5.tgz#2fea006108f17f7761432c7ef98d6aa003421487" + integrity sha512-VaxMGsilqFnK1CeBX+LXnSuaMx4sTL/6znSZh2829txWieazdVxr54HmiyTsIbpOTLcf5nYpq9lpzmwRdxj6rQ== dependencies: - "@smithy/querystring-parser" "^4.2.3" - "@smithy/types" "^4.8.0" + "@smithy/querystring-parser" "^4.2.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" "@smithy/util-base64@^4.3.0": @@ -1264,36 +1341,36 @@ dependencies: tslib "^2.6.2" -"@smithy/util-defaults-mode-browser@^4.3.4": - version "4.3.4" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.4.tgz#ed96651c32ac0de55b066fcb07a296837373212f" - integrity sha512-qI5PJSW52rnutos8Bln8nwQZRpyoSRN6k2ajyoUHNMUzmWqHnOJCnDELJuV6m5PML0VkHI+XcXzdB+6awiqYUw== +"@smithy/util-defaults-mode-browser@^4.3.11": + version "4.3.12" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.12.tgz#dd0c76d0414428011437479faa1d28b68d01271f" + integrity sha512-TKc6FnOxFULKxLgTNHYjcFqdOYzXVPFFVm5JhI30F3RdhT7nYOtOsjgaOwfDRmA/3U66O9KaBQ3UHoXwayRhAg== dependencies: - "@smithy/property-provider" "^4.2.3" - "@smithy/smithy-client" "^4.9.1" - "@smithy/types" "^4.8.0" + "@smithy/property-provider" "^4.2.5" + "@smithy/smithy-client" "^4.9.9" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/util-defaults-mode-node@^4.2.6": - version "4.2.6" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.6.tgz#01b7ff4605f6f981972083fee22d036e5dc4be38" - integrity sha512-c6M/ceBTm31YdcFpgfgQAJaw3KbaLuRKnAz91iMWFLSrgxRpYm03c3bu5cpYojNMfkV9arCUelelKA7XQT36SQ== +"@smithy/util-defaults-mode-node@^4.2.14": + version "4.2.15" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.15.tgz#f04e40ae98b49088f65bc503d3be7eefcff55100" + integrity sha512-94NqfQVo+vGc5gsQ9SROZqOvBkGNMQu6pjXbnn8aQvBUhc31kx49gxlkBEqgmaZQHUUfdRUin5gK/HlHKmbAwg== dependencies: - "@smithy/config-resolver" "^4.4.0" - "@smithy/credential-provider-imds" "^4.2.3" - "@smithy/node-config-provider" "^4.3.3" - "@smithy/property-provider" "^4.2.3" - "@smithy/smithy-client" "^4.9.1" - "@smithy/types" "^4.8.0" + "@smithy/config-resolver" "^4.4.3" + "@smithy/credential-provider-imds" "^4.2.5" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/property-provider" "^4.2.5" + "@smithy/smithy-client" "^4.9.9" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/util-endpoints@^3.2.3": - version "3.2.3" - resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.2.3.tgz#8bbb80f1ad5769d9f73992c5979eea3b74d7baa9" - integrity sha512-aCfxUOVv0CzBIkU10TubdgKSx5uRvzH064kaiPEWfNIvKOtNpu642P4FP1hgOFkjQIkDObrfIDnKMKkeyrejvQ== +"@smithy/util-endpoints@^3.2.5": + version "3.2.5" + resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.2.5.tgz#9e0fc34e38ddfbbc434d23a38367638dc100cb14" + integrity sha512-3O63AAWu2cSNQZp+ayl9I3NapW1p1rR5mlVHcF6hAB1dPZUQFfRPYtplWX/3xrzWthPGj5FqB12taJJCfH6s8A== dependencies: - "@smithy/node-config-provider" "^4.3.3" - "@smithy/types" "^4.8.0" + "@smithy/node-config-provider" "^4.3.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" "@smithy/util-hex-encoding@^4.2.0": @@ -1303,31 +1380,31 @@ dependencies: tslib "^2.6.2" -"@smithy/util-middleware@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.2.3.tgz#7c73416a6e3d3207a2d34a1eadd9f2b6a9811bd6" - integrity sha512-v5ObKlSe8PWUHCqEiX2fy1gNv6goiw6E5I/PN2aXg3Fb/hse0xeaAnSpXDiWl7x6LamVKq7senB+m5LOYHUAHw== +"@smithy/util-middleware@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.2.5.tgz#1ace865afe678fd4b0f9217197e2fe30178d4835" + integrity sha512-6Y3+rvBF7+PZOc40ybeZMcGln6xJGVeY60E7jy9Mv5iKpMJpHgRE6dKy9ScsVxvfAYuEX4Q9a65DQX90KaQ3bA== dependencies: - "@smithy/types" "^4.8.0" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/util-retry@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.2.3.tgz#b1e5c96d96aaf971b68323ff8ba8754f914f22a0" - integrity sha512-lLPWnakjC0q9z+OtiXk+9RPQiYPNAovt2IXD3CP4LkOnd9NpUsxOjMx1SnoUVB7Orb7fZp67cQMtTBKMFDvOGg== +"@smithy/util-retry@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.2.5.tgz#70fe4fbbfb9ad43a9ce2ba4ed111ff7b30d7b333" + integrity sha512-GBj3+EZBbN4NAqJ/7pAhsXdfzdlznOh8PydUijy6FpNIMnHPSMO2/rP4HKu+UFeikJxShERk528oy7GT79YiJg== dependencies: - "@smithy/service-error-classification" "^4.2.3" - "@smithy/types" "^4.8.0" + "@smithy/service-error-classification" "^4.2.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@smithy/util-stream@^4.5.4": - version "4.5.4" - resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.5.4.tgz#bfc60e2714c2065b8e7e91ca921cc31c73efdbd4" - integrity sha512-+qDxSkiErejw1BAIXUFBSfM5xh3arbz1MmxlbMCKanDDZtVEQ7PSKW9FQS0Vud1eI/kYn0oCTVKyNzRlq+9MUw== +"@smithy/util-stream@^4.5.6": + version "4.5.6" + resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.5.6.tgz#ebee9e52adeb6f88337778b2f3356a2cc615298c" + integrity sha512-qWw/UM59TiaFrPevefOZ8CNBKbYEP6wBAIlLqxn3VAIo9rgnTNc4ASbVrqDmhuwI87usnjhdQrxodzAGFFzbRQ== dependencies: - "@smithy/fetch-http-handler" "^5.3.4" - "@smithy/node-http-handler" "^4.4.3" - "@smithy/types" "^4.8.0" + "@smithy/fetch-http-handler" "^5.3.6" + "@smithy/node-http-handler" "^4.4.5" + "@smithy/types" "^4.9.0" "@smithy/util-base64" "^4.3.0" "@smithy/util-buffer-from" "^4.2.0" "@smithy/util-hex-encoding" "^4.2.0" @@ -1357,13 +1434,13 @@ "@smithy/util-buffer-from" "^4.2.0" tslib "^2.6.2" -"@smithy/util-waiter@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-4.2.3.tgz#4c662009db101bc60aed07815d359e90904caef2" - integrity sha512-5+nU///E5sAdD7t3hs4uwvCTWQtTR8JwKwOCSJtBRx0bY1isDo1QwH87vRK86vlFLBTISqoDA2V6xvP6nF1isQ== +"@smithy/util-waiter@^4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-4.2.5.tgz#e527816edae20ec5f68b25685f4b21d93424ea86" + integrity sha512-Dbun99A3InifQdIrsXZ+QLcC0PGBPAdrl4cj1mTgJvyc9N2zf7QSxg8TBkzsCmGJdE3TLbO9ycwpY0EkWahQ/g== dependencies: - "@smithy/abort-controller" "^4.2.3" - "@smithy/types" "^4.8.0" + "@smithy/abort-controller" "^4.2.5" + "@smithy/types" "^4.9.0" tslib "^2.6.2" "@smithy/uuid@^1.1.0": @@ -1380,114 +1457,114 @@ dependencies: tslib "^2.8.0" -"@tailwindcss/node@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/node/-/node-4.1.16.tgz#4d0ca77955a7d03ed6afd68ebd798aed897298e0" - integrity sha512-BX5iaSsloNuvKNHRN3k2RcCuTEgASTo77mofW0vmeHkfrDWaoFAFvNHpEgtu0eqyypcyiBkDWzSMxJhp3AUVcw== +"@tailwindcss/node@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/node/-/node-4.1.17.tgz#ec40a37293246f4eeab2dac00e4425af9272f600" + integrity sha512-csIkHIgLb3JisEFQ0vxr2Y57GUNYh447C8xzwj89U/8fdW8LhProdxvnVH6U8M2Y73QKiTIH+LWbK3V2BBZsAg== dependencies: "@jridgewell/remapping" "^2.3.4" enhanced-resolve "^5.18.3" jiti "^2.6.1" lightningcss "1.30.2" - magic-string "^0.30.19" + magic-string "^0.30.21" source-map-js "^1.2.1" - tailwindcss "4.1.16" - -"@tailwindcss/oxide-android-arm64@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.16.tgz#9bd16c0a08db20d7c93907a9bd1564e0255307eb" - integrity sha512-8+ctzkjHgwDJ5caq9IqRSgsP70xhdhJvm+oueS/yhD5ixLhqTw9fSL1OurzMUhBwE5zK26FXLCz2f/RtkISqHA== - -"@tailwindcss/oxide-darwin-arm64@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.16.tgz#72ac362b2c30a3912f8f0e8acbd4838918a1d11a" - integrity sha512-C3oZy5042v2FOALBZtY0JTDnGNdS6w7DxL/odvSny17ORUnaRKhyTse8xYi3yKGyfnTUOdavRCdmc8QqJYwFKA== - -"@tailwindcss/oxide-darwin-x64@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.16.tgz#6193bafbb1a885795702f12bbef9cc5eb4cc550b" - integrity sha512-vjrl/1Ub9+JwU6BP0emgipGjowzYZMjbWCDqwA2Z4vCa+HBSpP4v6U2ddejcHsolsYxwL5r4bPNoamlV0xDdLg== - -"@tailwindcss/oxide-freebsd-x64@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.16.tgz#0e2b064d71ba87a9001ac963be2752a8ddb64349" - integrity sha512-TSMpPYpQLm+aR1wW5rKuUuEruc/oOX3C7H0BTnPDn7W/eMw8W+MRMpiypKMkXZfwH8wqPIRKppuZoedTtNj2tg== - -"@tailwindcss/oxide-linux-arm-gnueabihf@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.16.tgz#8e80c959eeda81a08ed955e23eb6d228287b9672" - integrity sha512-p0GGfRg/w0sdsFKBjMYvvKIiKy/LNWLWgV/plR4lUgrsxFAoQBFrXkZ4C0w8IOXfslB9vHK/JGASWD2IefIpvw== - -"@tailwindcss/oxide-linux-arm64-gnu@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.16.tgz#d5f54910920fc5808122515f5208c5ecc1a40545" - integrity sha512-DoixyMmTNO19rwRPdqviTrG1rYzpxgyYJl8RgQvdAQUzxC1ToLRqtNJpU/ATURSKgIg6uerPw2feW0aS8SNr/w== - -"@tailwindcss/oxide-linux-arm64-musl@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.16.tgz#67cdb932230ac47bf3bf5415ccc92417b27020ee" - integrity sha512-H81UXMa9hJhWhaAUca6bU2wm5RRFpuHImrwXBUvPbYb+3jo32I9VIwpOX6hms0fPmA6f2pGVlybO6qU8pF4fzQ== - -"@tailwindcss/oxide-linux-x64-gnu@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.16.tgz#80ae0cfd8ebc970f239060ecdfdd07f6f6b14dce" - integrity sha512-ZGHQxDtFC2/ruo7t99Qo2TTIvOERULPl5l0K1g0oK6b5PGqjYMga+FcY1wIUnrUxY56h28FxybtDEla+ICOyew== - -"@tailwindcss/oxide-linux-x64-musl@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.16.tgz#524e5b87e8e79a712de3d9bbb94d2fc2fa44391c" - integrity sha512-Oi1tAaa0rcKf1Og9MzKeINZzMLPbhxvm7rno5/zuP1WYmpiG0bEHq4AcRUiG2165/WUzvxkW4XDYCscZWbTLZw== - -"@tailwindcss/oxide-wasm32-wasi@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.16.tgz#dc31d6bc1f6c1e8119a335ae3f28deb4d7c560f2" - integrity sha512-B01u/b8LteGRwucIBmCQ07FVXLzImWESAIMcUU6nvFt/tYsQ6IHz8DmZ5KtvmwxD+iTYBtM1xwoGXswnlu9v0Q== - dependencies: - "@emnapi/core" "^1.5.0" - "@emnapi/runtime" "^1.5.0" + tailwindcss "4.1.17" + +"@tailwindcss/oxide-android-arm64@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.17.tgz#17f0dc901f88a979c5bff618181bce596dff596d" + integrity sha512-BMqpkJHgOZ5z78qqiGE6ZIRExyaHyuxjgrJ6eBO5+hfrfGkuya0lYfw8fRHG77gdTjWkNWEEm+qeG2cDMxArLQ== + +"@tailwindcss/oxide-darwin-arm64@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.17.tgz#63e12e62b83f6949dbb10b5a7f6e441606835efc" + integrity sha512-EquyumkQweUBNk1zGEU/wfZo2qkp/nQKRZM8bUYO0J+Lums5+wl2CcG1f9BgAjn/u9pJzdYddHWBiFXJTcxmOg== + +"@tailwindcss/oxide-darwin-x64@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.17.tgz#6dad270d2777508f55e2b73eca0eaef625bc45a7" + integrity sha512-gdhEPLzke2Pog8s12oADwYu0IAw04Y2tlmgVzIN0+046ytcgx8uZmCzEg4VcQh+AHKiS7xaL8kGo/QTiNEGRog== + +"@tailwindcss/oxide-freebsd-x64@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.17.tgz#e7628b4602ac7d73c11a9922ecb83c24337eff55" + integrity sha512-hxGS81KskMxML9DXsaXT1H0DyA+ZBIbyG/sSAjWNe2EDl7TkPOBI42GBV3u38itzGUOmFfCzk1iAjDXds8Oh0g== + +"@tailwindcss/oxide-linux-arm-gnueabihf@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.17.tgz#4d96a6fe4c7ed20e7a013101ee46f46caca2233e" + integrity sha512-k7jWk5E3ldAdw0cNglhjSgv501u7yrMf8oeZ0cElhxU6Y2o7f8yqelOp3fhf7evjIS6ujTI3U8pKUXV2I4iXHQ== + +"@tailwindcss/oxide-linux-arm64-gnu@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.17.tgz#adc3c01cd73610870bfc21db5713571e08fb2210" + integrity sha512-HVDOm/mxK6+TbARwdW17WrgDYEGzmoYayrCgmLEw7FxTPLcp/glBisuyWkFz/jb7ZfiAXAXUACfyItn+nTgsdQ== + +"@tailwindcss/oxide-linux-arm64-musl@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.17.tgz#39ceda30407af56a1ee125b2c5ce856c6d29250f" + integrity sha512-HvZLfGr42i5anKtIeQzxdkw/wPqIbpeZqe7vd3V9vI3RQxe3xU1fLjss0TjyhxWcBaipk7NYwSrwTwK1hJARMg== + +"@tailwindcss/oxide-linux-x64-gnu@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.17.tgz#a3d4bd876c04d09856af0c394f5095fbc8a2b14c" + integrity sha512-M3XZuORCGB7VPOEDH+nzpJ21XPvK5PyjlkSFkFziNHGLc5d6g3di2McAAblmaSUNl8IOmzYwLx9NsE7bplNkwQ== + +"@tailwindcss/oxide-linux-x64-musl@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.17.tgz#bdc20aa4fb2d28cc928f2cfffff7a9cd03a51d5b" + integrity sha512-k7f+pf9eXLEey4pBlw+8dgfJHY4PZ5qOUFDyNf7SI6lHjQ9Zt7+NcscjpwdCEbYi6FI5c2KDTDWyf2iHcCSyyQ== + +"@tailwindcss/oxide-wasm32-wasi@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.17.tgz#7c0804748935928751838f86ff4f879c38f8a6d7" + integrity sha512-cEytGqSSoy7zK4JRWiTCx43FsKP/zGr0CsuMawhH67ONlH+T79VteQeJQRO/X7L0juEUA8ZyuYikcRBf0vsxhg== + dependencies: + "@emnapi/core" "^1.6.0" + "@emnapi/runtime" "^1.6.0" "@emnapi/wasi-threads" "^1.1.0" "@napi-rs/wasm-runtime" "^1.0.7" "@tybys/wasm-util" "^0.10.1" tslib "^2.4.0" -"@tailwindcss/oxide-win32-arm64-msvc@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.16.tgz#f1f810cdb49dae8071d5edf0db5cc0da2ec6a7e8" - integrity sha512-zX+Q8sSkGj6HKRTMJXuPvOcP8XfYON24zJBRPlszcH1Np7xuHXhWn8qfFjIujVzvH3BHU+16jBXwgpl20i+v9A== +"@tailwindcss/oxide-win32-arm64-msvc@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.17.tgz#7222fc2ceee9d45ebe5aebf38707ee9833a20475" + integrity sha512-JU5AHr7gKbZlOGvMdb4722/0aYbU+tN6lv1kONx0JK2cGsh7g148zVWLM0IKR3NeKLv+L90chBVYcJ8uJWbC9A== -"@tailwindcss/oxide-win32-x64-msvc@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.16.tgz#76dcda613578f06569c0a6015f39f12746a24dce" - integrity sha512-m5dDFJUEejbFqP+UXVstd4W/wnxA4F61q8SoL+mqTypId2T2ZpuxosNSgowiCnLp2+Z+rivdU0AqpfgiD7yCBg== +"@tailwindcss/oxide-win32-x64-msvc@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.17.tgz#ac79087f451dfcd5c3099589027a5732b045a3bf" + integrity sha512-SKWM4waLuqx0IH+FMDUw6R66Hu4OuTALFgnleKbqhgGU30DY20NORZMZUKgLRjQXNN2TLzKvh48QXTig4h4bGw== -"@tailwindcss/oxide@4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide/-/oxide-4.1.16.tgz#6e94fa039eeddc173a9dc6ba5f8c5f54766b25cf" - integrity sha512-2OSv52FRuhdlgyOQqgtQHuCgXnS8nFSYRp2tJ+4WZXKgTxqPy7SMSls8c3mPT5pkZ17SBToGM5LHEJBO7miEdg== +"@tailwindcss/oxide@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/oxide/-/oxide-4.1.17.tgz#6c063b40a022f4fbdac557c0586cfb9ae08a3dfe" + integrity sha512-F0F7d01fmkQhsTjXezGBLdrl1KresJTcI3DB8EkScCldyKp3Msz4hub4uyYaVnk88BAS1g5DQjjF6F5qczheLA== optionalDependencies: - "@tailwindcss/oxide-android-arm64" "4.1.16" - "@tailwindcss/oxide-darwin-arm64" "4.1.16" - "@tailwindcss/oxide-darwin-x64" "4.1.16" - "@tailwindcss/oxide-freebsd-x64" "4.1.16" - "@tailwindcss/oxide-linux-arm-gnueabihf" "4.1.16" - "@tailwindcss/oxide-linux-arm64-gnu" "4.1.16" - "@tailwindcss/oxide-linux-arm64-musl" "4.1.16" - "@tailwindcss/oxide-linux-x64-gnu" "4.1.16" - "@tailwindcss/oxide-linux-x64-musl" "4.1.16" - "@tailwindcss/oxide-wasm32-wasi" "4.1.16" - "@tailwindcss/oxide-win32-arm64-msvc" "4.1.16" - "@tailwindcss/oxide-win32-x64-msvc" "4.1.16" - -"@tailwindcss/postcss@^4": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@tailwindcss/postcss/-/postcss-4.1.16.tgz#775a0531d377a595a70df4afacc6fc67f391a753" - integrity sha512-Qn3SFGPXYQMKR/UtqS+dqvPrzEeBZHrFA92maT4zijCVggdsXnDBMsPFJo1eArX3J+O+Gi+8pV4PkqjLCNBk3A== + "@tailwindcss/oxide-android-arm64" "4.1.17" + "@tailwindcss/oxide-darwin-arm64" "4.1.17" + "@tailwindcss/oxide-darwin-x64" "4.1.17" + "@tailwindcss/oxide-freebsd-x64" "4.1.17" + "@tailwindcss/oxide-linux-arm-gnueabihf" "4.1.17" + "@tailwindcss/oxide-linux-arm64-gnu" "4.1.17" + "@tailwindcss/oxide-linux-arm64-musl" "4.1.17" + "@tailwindcss/oxide-linux-x64-gnu" "4.1.17" + "@tailwindcss/oxide-linux-x64-musl" "4.1.17" + "@tailwindcss/oxide-wasm32-wasi" "4.1.17" + "@tailwindcss/oxide-win32-arm64-msvc" "4.1.17" + "@tailwindcss/oxide-win32-x64-msvc" "4.1.17" + +"@tailwindcss/postcss@4.1.17": + version "4.1.17" + resolved "https://registry.yarnpkg.com/@tailwindcss/postcss/-/postcss-4.1.17.tgz#983b4233920a9d7083cd0d488d5cdc254f304f6b" + integrity sha512-+nKl9N9mN5uJ+M7dBOOCzINw94MPstNR/GtIhz1fpZysxL/4a+No64jCBD6CPN+bIHWFx3KWuu8XJRrj/572Dw== dependencies: "@alloc/quick-lru" "^5.2.0" - "@tailwindcss/node" "4.1.16" - "@tailwindcss/oxide" "4.1.16" + "@tailwindcss/node" "4.1.17" + "@tailwindcss/oxide" "4.1.17" postcss "^8.4.41" - tailwindcss "4.1.16" + tailwindcss "4.1.17" "@tybys/wasm-util@^0.10.1": version "0.10.1" @@ -1496,29 +1573,39 @@ dependencies: tslib "^2.4.0" -"@types/node@^20": - version "20.19.23" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.23.tgz#7de99389c814071cca78656a3243f224fed7453d" - integrity sha512-yIdlVVVHXpmqRhtyovZAcSy0MiPcYWGkoO4CGe/+jpP0hmNuihm4XhHbADpK++MsiLHP5MVlv+bcgdF99kSiFQ== +"@types/node@20.19.25": + version "20.19.25" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.25.tgz#467da94a2fd966b57cc39c357247d68047611190" + integrity sha512-ZsJzA5thDQMSQO788d7IocwwQbI8B5OPzmqNvpf3NY/+MHDAS759Wo0gd2WQeXYt5AAAQjzcrTVC6SKCuYgoCQ== dependencies: undici-types "~6.21.0" -"@types/react-dom@^19": - version "19.2.2" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.2.2.tgz#a4cc874797b7ddc9cb180ef0d5dc23f596fc2332" - integrity sha512-9KQPoO6mZCi7jcIStSnlOWn2nEF3mNmyr3rIAsGnAbQKYbRLyqmeSc39EVgtxXVia+LMT8j3knZLAZAh+xLmrw== +"@types/react-dom@19.1.2": + version "19.1.2" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.1.2.tgz#bd1fe3b8c28a3a2e942f85314dcfb71f531a242f" + integrity sha512-XGJkWF41Qq305SKWEILa1O8vzhb3aOo3ogBlSmiqNko/WmRb6QIaweuZCXjKygVDXpzXb5wyxKTSOsmkuqj+Qw== -"@types/react@^19": - version "19.2.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-19.2.2.tgz#ba123a75d4c2a51158697160a4ea2ff70aa6bf36" - integrity sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA== +"@types/react@19.1.2": + version "19.1.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-19.1.2.tgz#11df86f66f188f212c90ecb537327ec68bfd593f" + integrity sha512-oxLPMytKchWGbnQM9O7D67uPa9paTNxO7jVoNMXgkkErULBPhPARCfkKL9ytcIJJRGjbsVwW4ugJzyFFvm/Tiw== dependencies: csstype "^3.0.2" +abitype@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/abitype/-/abitype-1.1.0.tgz#510c5b3f92901877977af5e864841f443bf55406" + integrity sha512-6Vh4HcRxNMLA0puzPjM5GBgT4aAcFGKZzSgAXvuZ27shJP6NEpielTuqbBmZILR5/xd0PizkBGy5hReKz9jl5A== + +abitype@^1.0.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/abitype/-/abitype-1.2.0.tgz#aeb24a323c3d28d4e78f2ada9bf2c7610907737a" + integrity sha512-fD3ROjckUrWsybaSor2AdWxzA0e/DSyV2dA4aYd7bd8orHsoJjl09fOgKfUkTDfk0BsDGBf4NBgu/c7JoS2Npw== + bowser@^2.11.0: - version "2.12.1" - resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.12.1.tgz#f9ad78d7aebc472feb63dd9635e3ce2337e0e2c1" - integrity sha512-z4rE2Gxh7tvshQ4hluIT7XcFrgLIQaw9X3A+kTTRdovCz5PMukm/0QC/BKSYPj3omF5Qfypn9O/c5kgpmvYUCw== + version "2.13.1" + resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.13.1.tgz#5a4c652de1d002f847dd011819f5fc729f308a7e" + integrity sha512-OHawaAbjwx6rqICCKgSG0SAnT05bzd7ppyKLVUITZpANBaaMFBAsaNkto3LoQ31tyFP5kNujE8Cdx85G9VzOkw== caniuse-lite@^1.0.30001579: version "1.0.30001751" @@ -1531,11 +1618,11 @@ client-only@0.0.1: integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA== csstype@^3.0.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" - integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== + version "3.2.3" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.2.3.tgz#ec48c0f3e993e50648c86da559e2610995cf989a" + integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ== -detect-libc@^2.0.3, detect-libc@^2.1.0: +detect-libc@^2.0.3, detect-libc@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad" integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ== @@ -1548,6 +1635,11 @@ enhanced-resolve@^5.18.3: graceful-fs "^4.2.4" tapable "^2.2.0" +eventemitter3@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" + integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== + fast-xml-parser@5.2.5: version "5.2.5" resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz#4809fdfb1310494e341098c25cb1341a01a9144a" @@ -1560,6 +1652,11 @@ graceful-fs@^4.2.4: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== +isows@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/isows/-/isows-1.0.7.tgz#1c06400b7eed216fbba3bcbd68f12490fc342915" + integrity sha512-I1fSfDCZL5P0v33sVqeTDSpcstAg/N+wF5HS033mogOVIp4B+oHC7oOCsA3axAbBSGTJ8QubbNmnIRN/h8U7hg== + jiti@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.6.1.tgz#178ef2fc9a1a594248c20627cd820187a4d78d92" @@ -1639,7 +1736,7 @@ lightningcss@1.30.2: lightningcss-win32-arm64-msvc "1.30.2" lightningcss-win32-x64-msvc "1.30.2" -magic-string@^0.30.19: +magic-string@^0.30.21: version "0.30.21" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91" integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ== @@ -1651,27 +1748,41 @@ nanoid@^3.3.11, nanoid@^3.3.6: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b" integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w== -next@15.5.3: - version "15.5.3" - resolved "https://registry.yarnpkg.com/next/-/next-15.5.3.tgz#bfa6836eeed2bad28e2fcbdda8f07c871aea78d1" - integrity sha512-r/liNAx16SQj4D+XH/oI1dlpv9tdKJ6cONYPwwcCC46f2NjpaRWY+EKCzULfgQYV6YKXjHBchff2IZBSlZmJNw== +next@15.5.6: + version "15.5.6" + resolved "https://registry.yarnpkg.com/next/-/next-15.5.6.tgz#16d9d1e9ba2e8caf82ba15e060a12286cd25db30" + integrity sha512-zTxsnI3LQo3c9HSdSf91O1jMNsEzIXDShXd4wVdg9y5shwLqBXi4ZtUUJyB86KGVSJLZx0PFONvO54aheGX8QQ== dependencies: - "@next/env" "15.5.3" + "@next/env" "15.5.6" "@swc/helpers" "0.5.15" caniuse-lite "^1.0.30001579" postcss "8.4.31" styled-jsx "5.1.6" optionalDependencies: - "@next/swc-darwin-arm64" "15.5.3" - "@next/swc-darwin-x64" "15.5.3" - "@next/swc-linux-arm64-gnu" "15.5.3" - "@next/swc-linux-arm64-musl" "15.5.3" - "@next/swc-linux-x64-gnu" "15.5.3" - "@next/swc-linux-x64-musl" "15.5.3" - "@next/swc-win32-arm64-msvc" "15.5.3" - "@next/swc-win32-x64-msvc" "15.5.3" + "@next/swc-darwin-arm64" "15.5.6" + "@next/swc-darwin-x64" "15.5.6" + "@next/swc-linux-arm64-gnu" "15.5.6" + "@next/swc-linux-arm64-musl" "15.5.6" + "@next/swc-linux-x64-gnu" "15.5.6" + "@next/swc-linux-x64-musl" "15.5.6" + "@next/swc-win32-arm64-msvc" "15.5.6" + "@next/swc-win32-x64-msvc" "15.5.6" sharp "^0.34.3" +ox@0.9.6: + version "0.9.6" + resolved "https://registry.yarnpkg.com/ox/-/ox-0.9.6.tgz#5cf02523b6db364c10ee7f293ff1e664e0e1eab7" + integrity sha512-8SuCbHPvv2eZLYXrNmC0EC12rdzXQLdhnOMlHDW2wiCPLxBrOOJwX5L5E61by+UjTPOryqQiRSnjIKCI+GykKg== + dependencies: + "@adraffy/ens-normalize" "^1.11.0" + "@noble/ciphers" "^1.3.0" + "@noble/curves" "1.9.1" + "@noble/hashes" "^1.8.0" + "@scure/bip32" "^1.7.0" + "@scure/bip39" "^1.6.0" + abitype "^1.0.9" + eventemitter3 "5.0.1" + picocolors@^1.0.0, picocolors@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" @@ -1712,42 +1823,44 @@ scheduler@^0.26.0: resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.26.0.tgz#4ce8a8c2a2095f13ea11bf9a445be50c555d6337" integrity sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA== -semver@^7.7.2: +semver@^7.7.3: version "7.7.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946" integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q== sharp@^0.34.3: - version "0.34.4" - resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.34.4.tgz#73c2c5a425e98250b8b927e5537f711da8966e38" - integrity sha512-FUH39xp3SBPnxWvd5iib1X8XY7J0K0X7d93sie9CJg2PO8/7gmg89Nve6OjItK53/MlAushNNxteBYfM6DEuoA== + version "0.34.5" + resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.34.5.tgz#b6f148e4b8c61f1797bde11a9d1cfebbae2c57b0" + integrity sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg== dependencies: "@img/colour" "^1.0.0" - detect-libc "^2.1.0" - semver "^7.7.2" + detect-libc "^2.1.2" + semver "^7.7.3" optionalDependencies: - "@img/sharp-darwin-arm64" "0.34.4" - "@img/sharp-darwin-x64" "0.34.4" - "@img/sharp-libvips-darwin-arm64" "1.2.3" - "@img/sharp-libvips-darwin-x64" "1.2.3" - "@img/sharp-libvips-linux-arm" "1.2.3" - "@img/sharp-libvips-linux-arm64" "1.2.3" - "@img/sharp-libvips-linux-ppc64" "1.2.3" - "@img/sharp-libvips-linux-s390x" "1.2.3" - "@img/sharp-libvips-linux-x64" "1.2.3" - "@img/sharp-libvips-linuxmusl-arm64" "1.2.3" - "@img/sharp-libvips-linuxmusl-x64" "1.2.3" - "@img/sharp-linux-arm" "0.34.4" - "@img/sharp-linux-arm64" "0.34.4" - "@img/sharp-linux-ppc64" "0.34.4" - "@img/sharp-linux-s390x" "0.34.4" - "@img/sharp-linux-x64" "0.34.4" - "@img/sharp-linuxmusl-arm64" "0.34.4" - "@img/sharp-linuxmusl-x64" "0.34.4" - "@img/sharp-wasm32" "0.34.4" - "@img/sharp-win32-arm64" "0.34.4" - "@img/sharp-win32-ia32" "0.34.4" - "@img/sharp-win32-x64" "0.34.4" + "@img/sharp-darwin-arm64" "0.34.5" + "@img/sharp-darwin-x64" "0.34.5" + "@img/sharp-libvips-darwin-arm64" "1.2.4" + "@img/sharp-libvips-darwin-x64" "1.2.4" + "@img/sharp-libvips-linux-arm" "1.2.4" + "@img/sharp-libvips-linux-arm64" "1.2.4" + "@img/sharp-libvips-linux-ppc64" "1.2.4" + "@img/sharp-libvips-linux-riscv64" "1.2.4" + "@img/sharp-libvips-linux-s390x" "1.2.4" + "@img/sharp-libvips-linux-x64" "1.2.4" + "@img/sharp-libvips-linuxmusl-arm64" "1.2.4" + "@img/sharp-libvips-linuxmusl-x64" "1.2.4" + "@img/sharp-linux-arm" "0.34.5" + "@img/sharp-linux-arm64" "0.34.5" + "@img/sharp-linux-ppc64" "0.34.5" + "@img/sharp-linux-riscv64" "0.34.5" + "@img/sharp-linux-s390x" "0.34.5" + "@img/sharp-linux-x64" "0.34.5" + "@img/sharp-linuxmusl-arm64" "0.34.5" + "@img/sharp-linuxmusl-x64" "0.34.5" + "@img/sharp-wasm32" "0.34.5" + "@img/sharp-win32-arm64" "0.34.5" + "@img/sharp-win32-ia32" "0.34.5" + "@img/sharp-win32-x64" "0.34.5" source-map-js@^1.0.2, source-map-js@^1.2.1: version "1.2.1" @@ -1766,10 +1879,10 @@ styled-jsx@5.1.6: dependencies: client-only "0.0.1" -tailwindcss@4.1.16, tailwindcss@^4: - version "4.1.16" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-4.1.16.tgz#c32179f98725eb551e5c1189813a3db437ad5a7f" - integrity sha512-pONL5awpaQX4LN5eiv7moSiSPd/DLDzKVRJz8Q9PgzmAdd1R4307GQS2ZpfiN7ZmekdQrfhZZiSE5jkLR4WNaA== +tailwindcss@4.1.17: + version "4.1.17" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-4.1.17.tgz#e6dcb7a9c60cef7522169b5f207ffec2fd652286" + integrity sha512-j9Ee2YjuQqYT9bbRTfTZht9W/ytp5H+jJpZKiYdP/bpnXARAuELt9ofP0lPnmHjbga7SNQIxdTAXCmtKVYjN+Q== tapable@^2.2.0: version "2.3.0" @@ -1781,7 +1894,7 @@ tslib@^2.4.0, tslib@^2.6.2, tslib@^2.8.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== -typescript@^5: +typescript@5.9.3: version "5.9.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f" integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw== @@ -1790,3 +1903,22 @@ undici-types@~6.21.0: version "6.21.0" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ== + +viem@2.40.3: + version "2.40.3" + resolved "https://registry.yarnpkg.com/viem/-/viem-2.40.3.tgz#237b11c54f808b5747e483fa7dd05a843e3c079f" + integrity sha512-feYfEpbgjRkZYQpwcgxqkWzjxHI5LSDAjcGetHHwDRuX9BRQHUdV8ohrCosCYpdEhus/RknD3/bOd4qLYVPPuA== + dependencies: + "@noble/curves" "1.9.1" + "@noble/hashes" "1.8.0" + "@scure/bip32" "1.7.0" + "@scure/bip39" "1.6.0" + abitype "1.1.0" + isows "1.0.7" + ox "0.9.6" + ws "8.18.3" + +ws@8.18.3: + version "8.18.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472" + integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg== From 9651f7a15edab65422818fb3575d0dc5fad07d6b Mon Sep 17 00:00:00 2001 From: cody-wang-cb Date: Wed, 3 Dec 2025 14:40:07 -0500 Subject: [PATCH 070/117] feat(ingress-rpc): Add raw transaction forwarding to additional endpoint (#88) --- crates/ingress-rpc/src/bin/main.rs | 32 +++++--- crates/ingress-rpc/src/lib.rs | 4 + crates/ingress-rpc/src/metrics.rs | 3 + crates/ingress-rpc/src/service.rs | 123 +++++++++++++++++++++++++---- 4 files changed, 132 insertions(+), 30 deletions(-) diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index d5fd543..0265dde 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -1,4 +1,4 @@ -use alloy_provider::{ProviderBuilder, RootProvider}; +use alloy_provider::ProviderBuilder; use clap::Parser; use jsonrpsee::server::Server; use op_alloy_network::Optimism; @@ -13,7 +13,7 @@ use tips_ingress_rpc::connect_ingress_to_builder; use tips_ingress_rpc::health::bind_health_server; use tips_ingress_rpc::metrics::init_prometheus_exporter; use tips_ingress_rpc::queue::KafkaQueuePublisher; -use tips_ingress_rpc::service::{IngressApiServer, IngressService}; +use tips_ingress_rpc::service::{IngressApiServer, IngressService, Providers}; use tokio::sync::{broadcast, mpsc}; use tracing::info; @@ -39,15 +39,22 @@ async fn main() -> anyhow::Result<()> { health_check_address = %config.health_check_addr, ); - let provider: RootProvider = ProviderBuilder::new() - .disable_recommended_fillers() - .network::() - .connect_http(config.mempool_url); - - let simulation_provider: RootProvider = ProviderBuilder::new() - .disable_recommended_fillers() - .network::() - .connect_http(config.simulation_rpc); + let providers = Providers { + mempool: ProviderBuilder::new() + .disable_recommended_fillers() + .network::() + .connect_http(config.mempool_url), + simulation: ProviderBuilder::new() + .disable_recommended_fillers() + .network::() + .connect_http(config.simulation_rpc), + raw_tx_forward: config.raw_tx_forward_rpc.clone().map(|url| { + ProviderBuilder::new() + .disable_recommended_fillers() + .network::() + .connect_http(url) + }), + }; let ingress_client_config = ClientConfig::from_iter(load_kafka_config_from_file( &config.ingress_kafka_properties, @@ -83,8 +90,7 @@ async fn main() -> anyhow::Result<()> { ); let service = IngressService::new( - provider, - simulation_provider, + providers, queue, audit_tx, builder_tx, diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index 9401400..fe98f2b 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -164,6 +164,10 @@ pub struct Config { /// Enable backrun bundle submission to op-rbuilder #[arg(long, env = "TIPS_INGRESS_BACKRUN_ENABLED", default_value = "false")] pub backrun_enabled: bool, + + /// URL of third-party RPC endpoint to forward raw transactions to (enables forwarding if set) + #[arg(long, env = "TIPS_INGRESS_RAW_TX_FORWARD_RPC")] + pub raw_tx_forward_rpc: Option, } pub fn connect_ingress_to_builder( diff --git a/crates/ingress-rpc/src/metrics.rs b/crates/ingress-rpc/src/metrics.rs index b41eb01..1b7c8a5 100644 --- a/crates/ingress-rpc/src/metrics.rs +++ b/crates/ingress-rpc/src/metrics.rs @@ -35,6 +35,9 @@ pub struct Metrics { #[metric(describe = "Duration to send backrun bundle to op-rbuilder")] pub backrun_bundles_sent_duration: Histogram, + + #[metric(describe = "Total raw transactions forwarded to additional endpoint")] + pub raw_tx_forwards_total: Counter, } /// Initialize Prometheus metrics exporter diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index a883636..7f28e67 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -17,7 +17,7 @@ use tips_core::{ }; use tokio::sync::{broadcast, mpsc}; use tokio::time::{Duration, Instant, timeout}; -use tracing::{info, warn}; +use tracing::{debug, info, warn}; use crate::metrics::{Metrics, record_histogram}; use crate::queue::QueuePublisher; @@ -27,6 +27,13 @@ use account_abstraction_core::types::{SendUserOperationResponse, UserOperationRe use account_abstraction_core::{AccountAbstractionService, AccountAbstractionServiceImpl}; use std::sync::Arc; +/// RPC providers for different endpoints +pub struct Providers { + pub mempool: RootProvider, + pub simulation: RootProvider, + pub raw_tx_forward: Option>, +} + #[rpc(server, namespace = "eth")] pub trait IngressApi { /// `eth_sendBundle` can be used to send your bundles to the builder. @@ -53,8 +60,9 @@ pub trait IngressApi { } pub struct IngressService { - provider: Arc>, + mempool_provider: Arc>, simulation_provider: Arc>, + raw_tx_forward_provider: Option>>, account_abstraction_service: AccountAbstractionServiceImpl, tx_submission_method: TxSubmissionMethod, bundle_queue: Queue, @@ -70,24 +78,26 @@ pub struct IngressService { impl IngressService { pub fn new( - provider: RootProvider, - simulation_provider: RootProvider, + providers: Providers, queue: Queue, audit_channel: mpsc::UnboundedSender, builder_tx: broadcast::Sender, builder_backrun_tx: broadcast::Sender, config: Config, ) -> Self { - let provider = Arc::new(provider); - let simulation_provider = Arc::new(simulation_provider); + let mempool_provider = Arc::new(providers.mempool); + let simulation_provider = Arc::new(providers.simulation); + let raw_tx_forward_provider = providers.raw_tx_forward.map(Arc::new); let account_abstraction_service: AccountAbstractionServiceImpl = AccountAbstractionServiceImpl::new( simulation_provider.clone(), config.validate_user_operation_timeout_ms, ); + Self { - provider, + mempool_provider, simulation_provider, + raw_tx_forward_provider, account_abstraction_service, tx_submission_method: config.tx_submission_method, bundle_queue: queue, @@ -241,7 +251,7 @@ where if send_to_mempool { let response = self - .provider + .mempool_provider .send_raw_transaction(data.iter().as_slice()) .await; match response { @@ -254,6 +264,25 @@ where } } + if let Some(forward_provider) = self.raw_tx_forward_provider.clone() { + self.metrics.raw_tx_forwards_total.increment(1); + let tx_data = data.clone(); + let tx_hash = transaction.tx_hash(); + tokio::spawn(async move { + match forward_provider + .send_raw_transaction(tx_data.iter().as_slice()) + .await + { + Ok(_) => { + debug!(message = "Forwarded raw tx", hash = %tx_hash); + } + Err(e) => { + warn!(message = "Failed to forward raw tx", hash = %tx_hash, error = %e); + } + } + }); + } + self.send_audit_event(&accepted_bundle, transaction.tx_hash()); self.metrics @@ -407,7 +436,7 @@ mod tests { use alloy_provider::RootProvider; use async_trait::async_trait; use std::net::{IpAddr, SocketAddr}; - use std::sync::Arc; + use std::str::FromStr; use tips_core::test_utils::create_test_meter_bundle_response; use tokio::sync::{broadcast, mpsc}; use url::Url; @@ -449,6 +478,7 @@ mod tests { max_buffered_backrun_bundles: 100, health_check_addr: SocketAddr::from(([127, 0, 0, 1], 8081)), backrun_enabled: false, + raw_tx_forward_rpc: None, } } @@ -519,20 +549,19 @@ mod tests { let provider: RootProvider = RootProvider::new_http(mock_server.uri().parse().unwrap()); - let simulation_provider = Arc::new(provider.clone()); + + let providers = Providers { + mempool: provider.clone(), + simulation: provider.clone(), + raw_tx_forward: None, + }; let (audit_tx, _audit_rx) = mpsc::unbounded_channel(); let (builder_tx, _builder_rx) = broadcast::channel(1); let (backrun_tx, _backrun_rx) = broadcast::channel(1); let service = IngressService::new( - provider, - simulation_provider.as_ref().clone(), - MockQueue, - audit_tx, - builder_tx, - backrun_tx, - config, + providers, MockQueue, audit_tx, builder_tx, backrun_tx, config, ); let bundle = Bundle::default(); @@ -545,4 +574,64 @@ mod tests { let response = result.unwrap_or_else(|_| MeterBundleResponse::default()); assert_eq!(response, MeterBundleResponse::default()); } + + #[tokio::test] + async fn test_raw_tx_forward() { + let simulation_server = MockServer::start().await; + let forward_server = MockServer::start().await; + + // Mock error response from base_meterBundle + Mock::given(method("POST")) + .respond_with(ResponseTemplate::new(500).set_body_json(serde_json::json!({ + "jsonrpc": "2.0", + "id": 1, + "error": { + "code": -32000, + "message": "Simulation failed" + } + }))) + .mount(&simulation_server) + .await; + + // Mock forward endpoint - expect exactly 1 call + Mock::given(method("POST")) + .respond_with(ResponseTemplate::new(200).set_body_json(serde_json::json!({ + "jsonrpc": "2.0", + "id": 1, + "result": "0x0000000000000000000000000000000000000000000000000000000000000000" + }))) + .expect(1) + .mount(&forward_server) + .await; + + let mut config = create_test_config(&simulation_server); + config.tx_submission_method = TxSubmissionMethod::Kafka; // Skip mempool send + + let providers = Providers { + mempool: RootProvider::new_http(simulation_server.uri().parse().unwrap()), + simulation: RootProvider::new_http(simulation_server.uri().parse().unwrap()), + raw_tx_forward: Some(RootProvider::new_http( + forward_server.uri().parse().unwrap(), + )), + }; + + let (audit_tx, _audit_rx) = mpsc::unbounded_channel(); + let (builder_tx, _builder_rx) = broadcast::channel(1); + let (backrun_tx, _backrun_rx) = broadcast::channel(1); + + let service = IngressService::new( + providers, MockQueue, audit_tx, builder_tx, backrun_tx, config, + ); + + // Valid signed transaction bytes + let tx_bytes = Bytes::from_str("0x02f86c0d010183072335825208940000000000000000000000000000000000000000872386f26fc1000080c001a0cdb9e4f2f1ba53f9429077e7055e078cf599786e29059cd80c5e0e923bb2c114a01c90e29201e031baf1da66296c3a5c15c200bcb5e6c34da2f05f7d1778f8be07").unwrap(); + + let result = service.send_raw_transaction(tx_bytes).await; + assert!(result.is_ok()); + + // Wait for spawned forward task to complete + tokio::time::sleep(Duration::from_millis(100)).await; + + // wiremock automatically verifies expect(1) when forward_server is dropped + } } From 25904030a31c721e46ea332f8e32ffad8e96fdcd Mon Sep 17 00:00:00 2001 From: William Law Date: Fri, 5 Dec 2025 10:39:32 -0500 Subject: [PATCH 071/117] chore: bump next and react versions (#95) --- ui/package.json | 10 +- ui/yarn.lock | 474 +++++++++++++++++++++++------------------------- 2 files changed, 236 insertions(+), 248 deletions(-) diff --git a/ui/package.json b/ui/package.json index ad050ec..54d105c 100644 --- a/ui/package.json +++ b/ui/package.json @@ -11,17 +11,17 @@ }, "dependencies": { "@aws-sdk/client-s3": "3.940.0", - "next": "15.5.6", - "react": "19.1.0", - "react-dom": "19.1.0", + "next": "16.0.7", + "react": "19.2.1", + "react-dom": "19.2.1", "viem": "2.40.3" }, "devDependencies": { "@biomejs/biome": "2.3.8", "@tailwindcss/postcss": "4.1.17", "@types/node": "20.19.25", - "@types/react": "19.1.2", - "@types/react-dom": "19.1.2", + "@types/react": "19.2.7", + "@types/react-dom": "19.2.3", "tailwindcss": "4.1.17", "typescript": "5.9.3" } diff --git a/ui/yarn.lock b/ui/yarn.lock index abecb19..f687ad4 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -4,17 +4,17 @@ "@adraffy/ens-normalize@^1.11.0": version "1.11.1" - resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.11.1.tgz#6c2d657d4b2dfb37f8ea811dcb3e60843d4ac24a" + resolved "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.11.1.tgz" integrity sha512-nhCBV3quEgesuf7c7KYfperqSS14T8bYuvJ8PcLJp6znkZpFc0AuW4qBtr8eKVyPPe/8RSr7sglCWPU5eaxwKQ== "@alloc/quick-lru@^5.2.0": version "5.2.0" - resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" + resolved "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz" integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw== "@aws-crypto/crc32@5.2.0": version "5.2.0" - resolved "https://registry.yarnpkg.com/@aws-crypto/crc32/-/crc32-5.2.0.tgz#cfcc22570949c98c6689cfcbd2d693d36cdae2e1" + resolved "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz" integrity sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg== dependencies: "@aws-crypto/util" "^5.2.0" @@ -23,7 +23,7 @@ "@aws-crypto/crc32c@5.2.0": version "5.2.0" - resolved "https://registry.yarnpkg.com/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz#4e34aab7f419307821509a98b9b08e84e0c1917e" + resolved "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz" integrity sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag== dependencies: "@aws-crypto/util" "^5.2.0" @@ -32,7 +32,7 @@ "@aws-crypto/sha1-browser@5.2.0": version "5.2.0" - resolved "https://registry.yarnpkg.com/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz#b0ee2d2821d3861f017e965ef3b4cb38e3b6a0f4" + resolved "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz" integrity sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg== dependencies: "@aws-crypto/supports-web-crypto" "^5.2.0" @@ -44,7 +44,7 @@ "@aws-crypto/sha256-browser@5.2.0": version "5.2.0" - resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz#153895ef1dba6f9fce38af550e0ef58988eb649e" + resolved "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz" integrity sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw== dependencies: "@aws-crypto/sha256-js" "^5.2.0" @@ -57,7 +57,7 @@ "@aws-crypto/sha256-js@5.2.0", "@aws-crypto/sha256-js@^5.2.0": version "5.2.0" - resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz#c4fdb773fdbed9a664fc1a95724e206cf3860042" + resolved "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz" integrity sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA== dependencies: "@aws-crypto/util" "^5.2.0" @@ -66,14 +66,14 @@ "@aws-crypto/supports-web-crypto@^5.2.0": version "5.2.0" - resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz#a1e399af29269be08e695109aa15da0a07b5b5fb" + resolved "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz" integrity sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg== dependencies: tslib "^2.6.2" "@aws-crypto/util@5.2.0", "@aws-crypto/util@^5.2.0": version "5.2.0" - resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-5.2.0.tgz#71284c9cffe7927ddadac793c14f14886d3876da" + resolved "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz" integrity sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ== dependencies: "@aws-sdk/types" "^3.222.0" @@ -82,7 +82,7 @@ "@aws-sdk/client-s3@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-3.940.0.tgz#23446a4bb8f9b6efa5d19cf6e051587996a1ac7b" + resolved "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.940.0.tgz" integrity sha512-Wi4qnBT6shRRMXuuTgjMFTU5mu2KFWisgcigEMPptjPGUtJvBVi4PTGgS64qsLoUk/obqDAyOBOfEtRZ2ddC2w== dependencies: "@aws-crypto/sha1-browser" "5.2.0" @@ -143,7 +143,7 @@ "@aws-sdk/client-sso@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.940.0.tgz#23a6b156d9ba0144c01eb1d0c1654600b35fc708" + resolved "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.940.0.tgz" integrity sha512-SdqJGWVhmIURvCSgkDditHRO+ozubwZk9aCX9MK8qxyOndhobCndW1ozl3hX9psvMAo9Q4bppjuqy/GHWpjB+A== dependencies: "@aws-crypto/sha256-browser" "5.2.0" @@ -187,7 +187,7 @@ "@aws-sdk/core@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.940.0.tgz#73bd257745df0d069e455f22d4526f4f6d800d76" + resolved "https://registry.npmjs.org/@aws-sdk/core/-/core-3.940.0.tgz" integrity sha512-KsGD2FLaX5ngJao1mHxodIVU9VYd1E8810fcYiGwO1PFHDzf5BEkp6D9IdMeQwT8Q6JLYtiiT1Y/o3UCScnGoA== dependencies: "@aws-sdk/types" "3.936.0" @@ -206,7 +206,7 @@ "@aws-sdk/credential-provider-env@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.940.0.tgz#e04dc17300de228d572d5783c825a55d18851ecf" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.940.0.tgz" integrity sha512-/G3l5/wbZYP2XEQiOoIkRJmlv15f1P3MSd1a0gz27lHEMrOJOGq66rF1Ca4OJLzapWt3Fy9BPrZAepoAX11kMw== dependencies: "@aws-sdk/core" "3.940.0" @@ -217,7 +217,7 @@ "@aws-sdk/credential-provider-http@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.940.0.tgz#0888b39befaef297d67dcecd35d9237dbb5ab1c0" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.940.0.tgz" integrity sha512-dOrc03DHElNBD6N9Okt4U0zhrG4Wix5QUBSZPr5VN8SvmjD9dkrrxOkkJaMCl/bzrW7kbQEp7LuBdbxArMmOZQ== dependencies: "@aws-sdk/core" "3.940.0" @@ -233,7 +233,7 @@ "@aws-sdk/credential-provider-ini@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.940.0.tgz#b7a46fae4902f545e4f2cbcbd4f71dfae783de30" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.940.0.tgz" integrity sha512-gn7PJQEzb/cnInNFTOaDoCN/hOKqMejNmLof1W5VW95Qk0TPO52lH8R4RmJPnRrwFMswOWswTOpR1roKNLIrcw== dependencies: "@aws-sdk/core" "3.940.0" @@ -253,7 +253,7 @@ "@aws-sdk/credential-provider-login@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-login/-/credential-provider-login-3.940.0.tgz#d235cad516fd4a58fb261bc1291b7077efcbf58d" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.940.0.tgz" integrity sha512-fOKC3VZkwa9T2l2VFKWRtfHQPQuISqqNl35ZhcXjWKVwRwl/o7THPMkqI4XwgT2noGa7LLYVbWMwnsgSsBqglg== dependencies: "@aws-sdk/core" "3.940.0" @@ -267,7 +267,7 @@ "@aws-sdk/credential-provider-node@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.940.0.tgz#5c4b3d13532f51528f769f8a87b4c7e7709ca0ad" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.940.0.tgz" integrity sha512-M8NFAvgvO6xZjiti5kztFiAYmSmSlG3eUfr4ZHSfXYZUA/KUdZU/D6xJyaLnU8cYRWBludb6K9XPKKVwKfqm4g== dependencies: "@aws-sdk/credential-provider-env" "3.940.0" @@ -285,7 +285,7 @@ "@aws-sdk/credential-provider-process@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.940.0.tgz#47a11224c1a9d179f67cbd0873c9e99fe0cd0e85" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.940.0.tgz" integrity sha512-pILBzt5/TYCqRsJb7vZlxmRIe0/T+FZPeml417EK75060ajDGnVJjHcuVdLVIeKoTKm9gmJc9l45gon6PbHyUQ== dependencies: "@aws-sdk/core" "3.940.0" @@ -297,7 +297,7 @@ "@aws-sdk/credential-provider-sso@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.940.0.tgz#fabadb014fd5c7b043b8b7ccb4e1bda66a2e88cc" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.940.0.tgz" integrity sha512-q6JMHIkBlDCOMnA3RAzf8cGfup+8ukhhb50fNpghMs1SNBGhanmaMbZSgLigBRsPQW7fOk2l8jnzdVLS+BB9Uw== dependencies: "@aws-sdk/client-sso" "3.940.0" @@ -311,7 +311,7 @@ "@aws-sdk/credential-provider-web-identity@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.940.0.tgz#25e83aa96c414608795e5d3c7be0e6d94bab6630" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.940.0.tgz" integrity sha512-9QLTIkDJHHaYL0nyymO41H8g3ui1yz6Y3GmAN1gYQa6plXisuFBnGAbmKVj7zNvjWaOKdF0dV3dd3AFKEDoJ/w== dependencies: "@aws-sdk/core" "3.940.0" @@ -324,7 +324,7 @@ "@aws-sdk/middleware-bucket-endpoint@3.936.0": version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.936.0.tgz#3c2d9935a2a388fb74f8318d620e2da38d360970" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.936.0.tgz" integrity sha512-XLSVVfAorUxZh6dzF+HTOp4R1B5EQcdpGcPliWr0KUj2jukgjZEcqbBmjyMF/p9bmyQsONX80iURF1HLAlW0qg== dependencies: "@aws-sdk/types" "3.936.0" @@ -337,7 +337,7 @@ "@aws-sdk/middleware-expect-continue@3.936.0": version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.936.0.tgz#da1ce8a8b9af61192131a1c0a54bcab2a8a0e02f" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.936.0.tgz" integrity sha512-Eb4ELAC23bEQLJmUMYnPWcjD3FZIsmz2svDiXEcxRkQU9r7NRID7pM7C5NPH94wOfiCk0b2Y8rVyFXW0lGQwbA== dependencies: "@aws-sdk/types" "3.936.0" @@ -347,7 +347,7 @@ "@aws-sdk/middleware-flexible-checksums@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.940.0.tgz#e2e1e1615f7651beb5756272b92fde5ee39524cd" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.940.0.tgz" integrity sha512-WdsxDAVj5qaa5ApAP+JbpCOMHFGSmzjs2Y2OBSbWPeR9Ew7t/Okj+kUub94QJPsgzhvU1/cqNejhsw5VxeFKSQ== dependencies: "@aws-crypto/crc32" "5.2.0" @@ -366,7 +366,7 @@ "@aws-sdk/middleware-host-header@3.936.0": version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.936.0.tgz#ef1144d175f1f499afbbd92ad07e24f8ccc9e9ce" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.936.0.tgz" integrity sha512-tAaObaAnsP1XnLGndfkGWFuzrJYuk9W0b/nLvol66t8FZExIAf/WdkT2NNAWOYxljVs++oHnyHBCxIlaHrzSiw== dependencies: "@aws-sdk/types" "3.936.0" @@ -376,7 +376,7 @@ "@aws-sdk/middleware-location-constraint@3.936.0": version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.936.0.tgz#1f79ba7d2506f12b806689f22d687fb05db3614e" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.936.0.tgz" integrity sha512-SCMPenDtQMd9o5da9JzkHz838w3327iqXk3cbNnXWqnNRx6unyW8FL0DZ84gIY12kAyVHz5WEqlWuekc15ehfw== dependencies: "@aws-sdk/types" "3.936.0" @@ -385,7 +385,7 @@ "@aws-sdk/middleware-logger@3.936.0": version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.936.0.tgz#691093bebb708b994be10f19358e8699af38a209" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.936.0.tgz" integrity sha512-aPSJ12d3a3Ea5nyEnLbijCaaYJT2QjQ9iW+zGh5QcZYXmOGWbKVyPSxmVOboZQG+c1M8t6d2O7tqrwzIq8L8qw== dependencies: "@aws-sdk/types" "3.936.0" @@ -394,7 +394,7 @@ "@aws-sdk/middleware-recursion-detection@3.936.0": version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.936.0.tgz#141b6c92c1aa42bcd71aa854e0783b4f28e87a30" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.936.0.tgz" integrity sha512-l4aGbHpXM45YNgXggIux1HgsCVAvvBoqHPkqLnqMl9QVapfuSTjJHfDYDsx1Xxct6/m7qSMUzanBALhiaGO2fA== dependencies: "@aws-sdk/types" "3.936.0" @@ -405,7 +405,7 @@ "@aws-sdk/middleware-sdk-s3@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.940.0.tgz#ccf3c1844a3188185248eb126892d6274fec537e" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.940.0.tgz" integrity sha512-JYkLjgS1wLoKHJ40G63+afM1ehmsPsjcmrHirKh8+kSCx4ip7+nL1e/twV4Zicxr8RJi9Y0Ahq5mDvneilDDKQ== dependencies: "@aws-sdk/core" "3.940.0" @@ -425,7 +425,7 @@ "@aws-sdk/middleware-ssec@3.936.0": version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-ssec/-/middleware-ssec-3.936.0.tgz#7a56e6946a86ce4f4489459e5188091116e8ddba" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.936.0.tgz" integrity sha512-/GLC9lZdVp05ozRik5KsuODR/N7j+W+2TbfdFL3iS+7un+gnP6hC8RDOZd6WhpZp7drXQ9guKiTAxkZQwzS8DA== dependencies: "@aws-sdk/types" "3.936.0" @@ -434,7 +434,7 @@ "@aws-sdk/middleware-user-agent@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.940.0.tgz#e31c59b058b397855cd87fee34d2387d63b35c27" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.940.0.tgz" integrity sha512-nJbLrUj6fY+l2W2rIB9P4Qvpiy0tnTdg/dmixRxrU1z3e8wBdspJlyE+AZN4fuVbeL6rrRrO/zxQC1bB3cw5IA== dependencies: "@aws-sdk/core" "3.940.0" @@ -447,7 +447,7 @@ "@aws-sdk/nested-clients@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.940.0.tgz#9b1574a0a56bd3eb5d62bbba85961f9e734c3569" + resolved "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.940.0.tgz" integrity sha512-x0mdv6DkjXqXEcQj3URbCltEzW6hoy/1uIL+i8gExP6YKrnhiZ7SzuB4gPls2UOpK5UqLiqXjhRLfBb1C9i4Dw== dependencies: "@aws-crypto/sha256-browser" "5.2.0" @@ -491,7 +491,7 @@ "@aws-sdk/region-config-resolver@3.936.0": version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.936.0.tgz#b02f20c4d62973731d42da1f1239a27fbbe53c0a" + resolved "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.936.0.tgz" integrity sha512-wOKhzzWsshXGduxO4pqSiNyL9oUtk4BEvjWm9aaq6Hmfdoydq6v6t0rAGHWPjFwy9z2haovGRi3C8IxdMB4muw== dependencies: "@aws-sdk/types" "3.936.0" @@ -502,7 +502,7 @@ "@aws-sdk/signature-v4-multi-region@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.940.0.tgz#4633dd3db078cce620d36077ce41f7f38b60c6e0" + resolved "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.940.0.tgz" integrity sha512-ugHZEoktD/bG6mdgmhzLDjMP2VrYRAUPRPF1DpCyiZexkH7DCU7XrSJyXMvkcf0DHV+URk0q2sLf/oqn1D2uYw== dependencies: "@aws-sdk/middleware-sdk-s3" "3.940.0" @@ -514,7 +514,7 @@ "@aws-sdk/token-providers@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.940.0.tgz#b89893d7cd0a5ed22ca180e33b6eaf7ca644c7f1" + resolved "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.940.0.tgz" integrity sha512-k5qbRe/ZFjW9oWEdzLIa2twRVIEx7p/9rutofyrRysrtEnYh3HAWCngAnwbgKMoiwa806UzcTRx0TjyEpnKcCg== dependencies: "@aws-sdk/core" "3.940.0" @@ -527,7 +527,7 @@ "@aws-sdk/types@3.936.0", "@aws-sdk/types@^3.222.0": version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.936.0.tgz#ecd3a4bec1a1bd4df834ab21fe52a76e332dc27a" + resolved "https://registry.npmjs.org/@aws-sdk/types/-/types-3.936.0.tgz" integrity sha512-uz0/VlMd2pP5MepdrHizd+T+OKfyK4r3OA9JI+L/lPKg0YFQosdJNCKisr6o70E3dh8iMpFYxF1UN/4uZsyARg== dependencies: "@smithy/types" "^4.9.0" @@ -535,14 +535,14 @@ "@aws-sdk/util-arn-parser@3.893.0": version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-arn-parser/-/util-arn-parser-3.893.0.tgz#fcc9b792744b9da597662891c2422dda83881d8d" + resolved "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.893.0.tgz" integrity sha512-u8H4f2Zsi19DGnwj5FSZzDMhytYF/bCh37vAtBsn3cNDL3YG578X5oc+wSX54pM3tOxS+NY7tvOAo52SW7koUA== dependencies: tslib "^2.6.2" "@aws-sdk/util-endpoints@3.936.0": version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.936.0.tgz#81c00be8cfd4f966e05defd739a720ce2c888ddf" + resolved "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.936.0.tgz" integrity sha512-0Zx3Ntdpu+z9Wlm7JKUBOzS9EunwKAb4KdGUQQxDqh5Lc3ta5uBoub+FgmVuzwnmBu9U1Os8UuwVTH0Lgu+P5w== dependencies: "@aws-sdk/types" "3.936.0" @@ -553,14 +553,14 @@ "@aws-sdk/util-locate-window@^3.0.0": version "3.893.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.893.0.tgz#5df15f24e1edbe12ff1fe8906f823b51cd53bae8" + resolved "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.893.0.tgz" integrity sha512-T89pFfgat6c8nMmpI8eKjBcDcgJq36+m9oiXbcUzeU55MP9ZuGgBomGjGnHaEyF36jenW9gmg3NfZDm0AO2XPg== dependencies: tslib "^2.6.2" "@aws-sdk/util-user-agent-browser@3.936.0": version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.936.0.tgz#cbfcaeaba6d843b060183638699c0f20dcaed774" + resolved "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.936.0.tgz" integrity sha512-eZ/XF6NxMtu+iCma58GRNRxSq4lHo6zHQLOZRIeL/ghqYJirqHdenMOwrzPettj60KWlv827RVebP9oNVrwZbw== dependencies: "@aws-sdk/types" "3.936.0" @@ -570,7 +570,7 @@ "@aws-sdk/util-user-agent-node@3.940.0": version "3.940.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.940.0.tgz#d9de3178a0567671b8cef3ea520f3416d2cecd1e" + resolved "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.940.0.tgz" integrity sha512-dlD/F+L/jN26I8Zg5x0oDGJiA+/WEQmnSE27fi5ydvYnpfQLwThtQo9SsNS47XSR/SOULaaoC9qx929rZuo74A== dependencies: "@aws-sdk/middleware-user-agent" "3.940.0" @@ -581,7 +581,7 @@ "@aws-sdk/xml-builder@3.930.0": version "3.930.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.930.0.tgz#949a35219ca52cc769ffbfbf38f3324178ba74f9" + resolved "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.930.0.tgz" integrity sha512-YIfkD17GocxdmlUVc3ia52QhcWuRIUJonbF8A2CYfcWNV3HzvAqpcPeC0bYUhkK+8e8YO1ARnLKZQE0TlwzorA== dependencies: "@smithy/types" "^4.9.0" @@ -590,12 +590,12 @@ "@aws/lambda-invoke-store@^0.2.0": version "0.2.2" - resolved "https://registry.yarnpkg.com/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.2.tgz#b00f7d6aedfe832ef6c84488f3a422cce6a47efa" + resolved "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.2.tgz" integrity sha512-C0NBLsIqzDIae8HFw9YIrIBsbc0xTiOtt7fAukGPnqQ/+zZNaq+4jhuccltK0QuWHBnNm/a6kLIRA6GFiM10eg== "@biomejs/biome@2.3.8": version "2.3.8" - resolved "https://registry.yarnpkg.com/@biomejs/biome/-/biome-2.3.8.tgz#03f66a19ba7b287bc12ce493f69382f24f3076fa" + resolved "https://registry.npmjs.org/@biomejs/biome/-/biome-2.3.8.tgz" integrity sha512-Qjsgoe6FEBxWAUzwFGFrB+1+M8y/y5kwmg5CHac+GSVOdmOIqsAiXM5QMVGZJ1eCUCLlPZtq4aFAQ0eawEUuUA== optionalDependencies: "@biomejs/cli-darwin-arm64" "2.3.8" @@ -609,7 +609,7 @@ "@biomejs/cli-darwin-arm64@2.3.8": version "2.3.8" - resolved "https://registry.yarnpkg.com/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.3.8.tgz#58443b6d910a6175be0bd77062774e893de6263c" + resolved "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.3.8.tgz" integrity sha512-HM4Zg9CGQ3txTPflxD19n8MFPrmUAjaC7PQdLkugeeC0cQ+PiVrd7i09gaBS/11QKsTDBJhVg85CEIK9f50Qww== "@biomejs/cli-darwin-x64@2.3.8": @@ -671,7 +671,7 @@ "@img/colour@^1.0.0": version "1.0.0" - resolved "https://registry.yarnpkg.com/@img/colour/-/colour-1.0.0.tgz#d2fabb223455a793bf3bf9c70de3d28526aa8311" + resolved "https://registry.npmjs.org/@img/colour/-/colour-1.0.0.tgz" integrity sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw== "@img/sharp-darwin-arm64@0.34.5": @@ -818,7 +818,7 @@ "@jridgewell/gen-mapping@^0.3.5": version "0.3.13" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f" + resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz" integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA== dependencies: "@jridgewell/sourcemap-codec" "^1.5.0" @@ -826,7 +826,7 @@ "@jridgewell/remapping@^2.3.4": version "2.3.5" - resolved "https://registry.yarnpkg.com/@jridgewell/remapping/-/remapping-2.3.5.tgz#375c476d1972947851ba1e15ae8f123047445aa1" + resolved "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz" integrity sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ== dependencies: "@jridgewell/gen-mapping" "^0.3.5" @@ -834,17 +834,17 @@ "@jridgewell/resolve-uri@^3.1.0": version "3.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" + resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz" integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0", "@jridgewell/sourcemap-codec@^1.5.5": version "1.5.5" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba" + resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz" integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og== "@jridgewell/trace-mapping@^0.3.24": version "0.3.31" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0" + resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz" integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw== dependencies: "@jridgewell/resolve-uri" "^3.1.0" @@ -859,83 +859,76 @@ "@emnapi/runtime" "^1.7.1" "@tybys/wasm-util" "^0.10.1" -"@next/env@15.5.6": - version "15.5.6" - resolved "https://registry.yarnpkg.com/@next/env/-/env-15.5.6.tgz#7009d88d419a36a4ba9e110c151604444744a74d" - integrity sha512-3qBGRW+sCGzgbpc5TS1a0p7eNxnOarGVQhZxfvTdnV0gFI61lX7QNtQ4V1TSREctXzYn5NetbUsLvyqwLFJM6Q== - -"@next/swc-darwin-arm64@15.5.6": - version "15.5.6" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.6.tgz#f80d3fe536f29f3217ca07d031f7b43862234059" - integrity sha512-ES3nRz7N+L5Umz4KoGfZ4XX6gwHplwPhioVRc25+QNsDa7RtUF/z8wJcbuQ2Tffm5RZwuN2A063eapoJ1u4nPg== - -"@next/swc-darwin-x64@15.5.6": - version "15.5.6" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.6.tgz#289334478617318a0d8d9f1f6661a15952f4e4ab" - integrity sha512-JIGcytAyk9LQp2/nuVZPAtj8uaJ/zZhsKOASTjxDug0SPU9LAM3wy6nPU735M1OqacR4U20LHVF5v5Wnl9ptTA== - -"@next/swc-linux-arm64-gnu@15.5.6": - version "15.5.6" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.6.tgz#efdd993cd9ad88b82c948c8e518e045566dd2f98" - integrity sha512-qvz4SVKQ0P3/Im9zcS2RmfFL/UCQnsJKJwQSkissbngnB/12c6bZTCB0gHTexz1s6d/mD0+egPKXAIRFVS7hQg== - -"@next/swc-linux-arm64-musl@15.5.6": - version "15.5.6" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.6.tgz#a45185126faf69eb65a017bd2c015ad7e86f5c84" - integrity sha512-FsbGVw3SJz1hZlvnWD+T6GFgV9/NYDeLTNQB2MXoPN5u9VA9OEDy6fJEfePfsUKAhJufFbZLgp0cPxMuV6SV0w== - -"@next/swc-linux-x64-gnu@15.5.6": - version "15.5.6" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.6.tgz#8174dc8e03a1f7df292bead360f83c53f8dd8b73" - integrity sha512-3QnHGFWlnvAgyxFxt2Ny8PTpXtQD7kVEeaFat5oPAHHI192WKYB+VIKZijtHLGdBBvc16tiAkPTDmQNOQ0dyrA== - -"@next/swc-linux-x64-musl@15.5.6": - version "15.5.6" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.6.tgz#6d0776d81c5bd6a1780e6c39f32d7ef172900635" - integrity sha512-OsGX148sL+TqMK9YFaPFPoIaJKbFJJxFzkXZljIgA9hjMjdruKht6xDCEv1HLtlLNfkx3c5w2GLKhj7veBQizQ== - -"@next/swc-win32-arm64-msvc@15.5.6": - version "15.5.6" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.6.tgz#4b63d511b5c41278a48168fccb89cf00912411af" - integrity sha512-ONOMrqWxdzXDJNh2n60H6gGyKed42Ieu6UTVPZteXpuKbLZTH4G4eBMsr5qWgOBA+s7F+uB4OJbZnrkEDnZ5Fg== - -"@next/swc-win32-x64-msvc@15.5.6": - version "15.5.6" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.6.tgz#9ed5e84bd85009625dd35c444668d13061452a50" - integrity sha512-pxK4VIjFRx1MY92UycLOOw7dTdvccWsNETQ0kDHkBlcFH1GrTLUjSiHU1ohrznnux6TqRHgv5oflhfIWZwVROQ== +"@next/env@16.0.7": + version "16.0.7" + resolved "https://registry.npmjs.org/@next/env/-/env-16.0.7.tgz" + integrity sha512-gpaNgUh5nftFKRkRQGnVi5dpcYSKGcZZkQffZ172OrG/XkrnS7UBTQ648YY+8ME92cC4IojpI2LqTC8sTDhAaw== + +"@next/swc-darwin-arm64@16.0.7": + version "16.0.7" + resolved "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.0.7.tgz" + integrity sha512-LlDtCYOEj/rfSnEn/Idi+j1QKHxY9BJFmxx7108A6D8K0SB+bNgfYQATPk/4LqOl4C0Wo3LACg2ie6s7xqMpJg== + +"@next/swc-darwin-x64@16.0.7": + version "16.0.7" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-16.0.7.tgz#ec5fd15ae391e1af9f152881f559bffaa24524e7" + integrity sha512-rtZ7BhnVvO1ICf3QzfW9H3aPz7GhBrnSIMZyr4Qy6boXF0b5E3QLs+cvJmg3PsTCG2M1PBoC+DANUi4wCOKXpA== + +"@next/swc-linux-arm64-gnu@16.0.7": + version "16.0.7" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.0.7.tgz#22be26ee7544f68aa916159b823899b67b09f0a6" + integrity sha512-mloD5WcPIeIeeZqAIP5c2kdaTa6StwP4/2EGy1mUw8HiexSHGK/jcM7lFuS3u3i2zn+xH9+wXJs6njO7VrAqww== + +"@next/swc-linux-arm64-musl@16.0.7": + version "16.0.7" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.0.7.tgz#1b34103951456e5d6766710e4f16dadbd7745bed" + integrity sha512-+ksWNrZrthisXuo9gd1XnjHRowCbMtl/YgMpbRvFeDEqEBd523YHPWpBuDjomod88U8Xliw5DHhekBC3EOOd9g== + +"@next/swc-linux-x64-gnu@16.0.7": + version "16.0.7" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.0.7.tgz#b45e1fa7aaf844269e0932c4cde49bb6b0817ce9" + integrity sha512-4WtJU5cRDxpEE44Ana2Xro1284hnyVpBb62lIpU5k85D8xXxatT+rXxBgPkc7C1XwkZMWpK5rXLXTh9PFipWsA== + +"@next/swc-linux-x64-musl@16.0.7": + version "16.0.7" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.0.7.tgz#c5376fd78ca97a911e2bbfb9b26dc623b54edfab" + integrity sha512-HYlhqIP6kBPXalW2dbMTSuB4+8fe+j9juyxwfMwCe9kQPPeiyFn7NMjNfoFOfJ2eXkeQsoUGXg+O2SE3m4Qg2w== + +"@next/swc-win32-arm64-msvc@16.0.7": + version "16.0.7" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.0.7.tgz#2cf27e275ddd8d04f89391a9cdf6790cccb3bf09" + integrity sha512-EviG+43iOoBRZg9deGauXExjRphhuYmIOJ12b9sAPy0eQ6iwcPxfED2asb/s2/yiLYOdm37kPaiZu8uXSYPs0Q== + +"@next/swc-win32-x64-msvc@16.0.7": + version "16.0.7" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.0.7.tgz#e9e38fcca752902542c25c527e532af71e9ca812" + integrity sha512-gniPjy55zp5Eg0896qSrf3yB1dw4F/3s8VK1ephdsZZ129j2n6e1WqCbE2YgcKhW9hPB9TVZENugquWJD5x0ug== "@noble/ciphers@^1.3.0": version "1.3.0" - resolved "https://registry.yarnpkg.com/@noble/ciphers/-/ciphers-1.3.0.tgz#f64b8ff886c240e644e5573c097f86e5b43676dc" + resolved "https://registry.npmjs.org/@noble/ciphers/-/ciphers-1.3.0.tgz" integrity sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw== -"@noble/curves@1.9.1": +"@noble/curves@1.9.1", "@noble/curves@~1.9.0": version "1.9.1" - resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.9.1.tgz#9654a0bc6c13420ae252ddcf975eaf0f58f0a35c" + resolved "https://registry.npmjs.org/@noble/curves/-/curves-1.9.1.tgz" integrity sha512-k11yZxZg+t+gWvBbIswW0yoJlu8cHOC7dhunwOzoWH/mXGBiYyR4YY6hAEK/3EUs4UpB8la1RfdRpeGsFHkWsA== dependencies: "@noble/hashes" "1.8.0" -"@noble/curves@~1.9.0": - version "1.9.7" - resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.9.7.tgz#79d04b4758a43e4bca2cbdc62e7771352fa6b951" - integrity sha512-gbKGcRUYIjA3/zCCNaWDciTMFI0dCkvou3TL8Zmy5Nc7sJ47a0jtOeZoTaMxkuqRo9cRhjOdZJXegxYE5FN/xw== - dependencies: - "@noble/hashes" "1.8.0" - "@noble/hashes@1.8.0", "@noble/hashes@^1.8.0", "@noble/hashes@~1.8.0": version "1.8.0" - resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.8.0.tgz#cee43d801fcef9644b11b8194857695acd5f815a" + resolved "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz" integrity sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A== "@scure/base@~1.2.5": version "1.2.6" - resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.2.6.tgz#ca917184b8231394dd8847509c67a0be522e59f6" + resolved "https://registry.npmjs.org/@scure/base/-/base-1.2.6.tgz" integrity sha512-g/nm5FgUa//MCj1gV09zTJTaM6KBAHqLN907YVQqf7zC49+DcO4B1so4ZX07Ef10Twr6nuqYEH9GEggFXA4Fmg== "@scure/bip32@1.7.0", "@scure/bip32@^1.7.0": version "1.7.0" - resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.7.0.tgz#b8683bab172369f988f1589640e53c4606984219" + resolved "https://registry.npmjs.org/@scure/bip32/-/bip32-1.7.0.tgz" integrity sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw== dependencies: "@noble/curves" "~1.9.0" @@ -944,7 +937,7 @@ "@scure/bip39@1.6.0", "@scure/bip39@^1.6.0": version "1.6.0" - resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.6.0.tgz#475970ace440d7be87a6086cbee77cb8f1a684f9" + resolved "https://registry.npmjs.org/@scure/bip39/-/bip39-1.6.0.tgz" integrity sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A== dependencies: "@noble/hashes" "~1.8.0" @@ -952,7 +945,7 @@ "@smithy/abort-controller@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.2.5.tgz#3386e8fff5a8d05930996d891d06803f2b7e5e2c" + resolved "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.2.5.tgz" integrity sha512-j7HwVkBw68YW8UmFRcjZOmssE77Rvk0GWAIN1oFBhsaovQmZWYCIcGa9/pwRB0ExI8Sk9MWNALTjftjHZea7VA== dependencies: "@smithy/types" "^4.9.0" @@ -960,7 +953,7 @@ "@smithy/chunked-blob-reader-native@^4.2.1": version "4.2.1" - resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.2.1.tgz#380266951d746b522b4ab2b16bfea6b451147b41" + resolved "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.2.1.tgz" integrity sha512-lX9Ay+6LisTfpLid2zZtIhSEjHMZoAR5hHCR4H7tBz/Zkfr5ea8RcQ7Tk4mi0P76p4cN+Btz16Ffno7YHpKXnQ== dependencies: "@smithy/util-base64" "^4.3.0" @@ -968,14 +961,14 @@ "@smithy/chunked-blob-reader@^5.2.0": version "5.2.0" - resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.2.0.tgz#776fec5eaa5ab5fa70d0d0174b7402420b24559c" + resolved "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.2.0.tgz" integrity sha512-WmU0TnhEAJLWvfSeMxBNe5xtbselEO8+4wG0NtZeL8oR21WgH1xiO37El+/Y+H/Ie4SCwBy3MxYWmOYaGgZueA== dependencies: tslib "^2.6.2" "@smithy/config-resolver@^4.4.3": version "4.4.3" - resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.4.3.tgz#37b0e3cba827272e92612e998a2b17e841e20bab" + resolved "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.4.3.tgz" integrity sha512-ezHLe1tKLUxDJo2LHtDuEDyWXolw8WGOR92qb4bQdWq/zKenO5BvctZGrVJBK08zjezSk7bmbKFOXIVyChvDLw== dependencies: "@smithy/node-config-provider" "^4.3.5" @@ -987,7 +980,7 @@ "@smithy/core@^3.18.5", "@smithy/core@^3.18.6": version "3.18.6" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.18.6.tgz#bbc0d2dce4b926ce9348bce82b85f5e1294834df" + resolved "https://registry.npmjs.org/@smithy/core/-/core-3.18.6.tgz" integrity sha512-8Q/ugWqfDUEU1Exw71+DoOzlONJ2Cn9QA8VeeDzLLjzO/qruh9UKFzbszy4jXcIYgGofxYiT0t1TT6+CT/GupQ== dependencies: "@smithy/middleware-serde" "^4.2.6" @@ -1003,7 +996,7 @@ "@smithy/credential-provider-imds@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.5.tgz#5acbcd1d02ae31700c2f027090c202d7315d70d3" + resolved "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.5.tgz" integrity sha512-BZwotjoZWn9+36nimwm/OLIcVe+KYRwzMjfhd4QT7QxPm9WY0HiOV8t/Wlh+HVUif0SBVV7ksq8//hPaBC/okQ== dependencies: "@smithy/node-config-provider" "^4.3.5" @@ -1014,7 +1007,7 @@ "@smithy/eventstream-codec@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-4.2.5.tgz#331b3f23528137cb5f4ad861de7f34ddff68c62b" + resolved "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-4.2.5.tgz" integrity sha512-Ogt4Zi9hEbIP17oQMd68qYOHUzmH47UkK7q7Gl55iIm9oKt27MUGrC5JfpMroeHjdkOliOA4Qt3NQ1xMq/nrlA== dependencies: "@aws-crypto/crc32" "5.2.0" @@ -1024,7 +1017,7 @@ "@smithy/eventstream-serde-browser@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.2.5.tgz#54a680006539601ce71306d8bf2946e3462a47b3" + resolved "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.2.5.tgz" integrity sha512-HohfmCQZjppVnKX2PnXlf47CW3j92Ki6T/vkAT2DhBR47e89pen3s4fIa7otGTtrVxmj7q+IhH0RnC5kpR8wtw== dependencies: "@smithy/eventstream-serde-universal" "^4.2.5" @@ -1033,7 +1026,7 @@ "@smithy/eventstream-serde-config-resolver@^4.3.5": version "4.3.5" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.3.5.tgz#d1490aa127f43ac242495fa6e2e5833e1949a481" + resolved "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.3.5.tgz" integrity sha512-ibjQjM7wEXtECiT6my1xfiMH9IcEczMOS6xiCQXoUIYSj5b1CpBbJ3VYbdwDy8Vcg5JHN7eFpOCGk8nyZAltNQ== dependencies: "@smithy/types" "^4.9.0" @@ -1041,7 +1034,7 @@ "@smithy/eventstream-serde-node@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.2.5.tgz#7dd64e0ba64fa930959f3d5b7995c310573ecaf3" + resolved "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.2.5.tgz" integrity sha512-+elOuaYx6F2H6x1/5BQP5ugv12nfJl66GhxON8+dWVUEDJ9jah/A0tayVdkLRP0AeSac0inYkDz5qBFKfVp2Gg== dependencies: "@smithy/eventstream-serde-universal" "^4.2.5" @@ -1050,7 +1043,7 @@ "@smithy/eventstream-serde-universal@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.2.5.tgz#34189de45cf5e1d9cb59978e94b76cc210fa984f" + resolved "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.2.5.tgz" integrity sha512-G9WSqbST45bmIFaeNuP/EnC19Rhp54CcVdX9PDL1zyEB514WsDVXhlyihKlGXnRycmHNmVv88Bvvt4EYxWef/Q== dependencies: "@smithy/eventstream-codec" "^4.2.5" @@ -1059,7 +1052,7 @@ "@smithy/fetch-http-handler@^5.3.6": version "5.3.6" - resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.6.tgz#d9dcb8d8ca152918224492f4d1cc1b50df93ae13" + resolved "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.6.tgz" integrity sha512-3+RG3EA6BBJ/ofZUeTFJA7mHfSYrZtQIrDP9dI8Lf7X6Jbos2jptuLrAAteDiFVrmbEmLSuRG/bUKzfAXk7dhg== dependencies: "@smithy/protocol-http" "^5.3.5" @@ -1070,7 +1063,7 @@ "@smithy/hash-blob-browser@^4.2.6": version "4.2.6" - resolved "https://registry.yarnpkg.com/@smithy/hash-blob-browser/-/hash-blob-browser-4.2.6.tgz#53d5ae0a069ae4a93abbc7165efe341dca0f9489" + resolved "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-4.2.6.tgz" integrity sha512-8P//tA8DVPk+3XURk2rwcKgYwFvwGwmJH/wJqQiSKwXZtf/LiZK+hbUZmPj/9KzM+OVSwe4o85KTp5x9DUZTjw== dependencies: "@smithy/chunked-blob-reader" "^5.2.0" @@ -1080,7 +1073,7 @@ "@smithy/hash-node@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.2.5.tgz#fb751ec4a4c6347612458430f201f878adc787f6" + resolved "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.2.5.tgz" integrity sha512-DpYX914YOfA3UDT9CN1BM787PcHfWRBB43fFGCYrZFUH0Jv+5t8yYl+Pd5PW4+QzoGEDvn5d5QIO4j2HyYZQSA== dependencies: "@smithy/types" "^4.9.0" @@ -1090,7 +1083,7 @@ "@smithy/hash-stream-node@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/hash-stream-node/-/hash-stream-node-4.2.5.tgz#f200e6b755cb28f03968c199231774c3ad33db28" + resolved "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-4.2.5.tgz" integrity sha512-6+do24VnEyvWcGdHXomlpd0m8bfZePpUKBy7m311n+JuRwug8J4dCanJdTymx//8mi0nlkflZBvJe+dEO/O12Q== dependencies: "@smithy/types" "^4.9.0" @@ -1099,7 +1092,7 @@ "@smithy/invalid-dependency@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.2.5.tgz#58d997e91e7683ffc59882d8fcb180ed9aa9c7dd" + resolved "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.2.5.tgz" integrity sha512-2L2erASEro1WC5nV+plwIMxrTXpvpfzl4e+Nre6vBVRR2HKeGGcvpJyyL3/PpiSg+cJG2KpTmZmq934Olb6e5A== dependencies: "@smithy/types" "^4.9.0" @@ -1107,21 +1100,21 @@ "@smithy/is-array-buffer@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz#f84f0d9f9a36601a9ca9381688bd1b726fd39111" + resolved "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz" integrity sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA== dependencies: tslib "^2.6.2" "@smithy/is-array-buffer@^4.2.0": version "4.2.0" - resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-4.2.0.tgz#b0f874c43887d3ad44f472a0f3f961bcce0550c2" + resolved "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.2.0.tgz" integrity sha512-DZZZBvC7sjcYh4MazJSGiWMI2L7E0oCiRHREDzIxi/M2LY79/21iXt6aPLHge82wi5LsuRF5A06Ds3+0mlh6CQ== dependencies: tslib "^2.6.2" "@smithy/md5-js@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/md5-js/-/md5-js-4.2.5.tgz#ca16f138dd0c4e91a61d3df57e8d4d15d1ddc97e" + resolved "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-4.2.5.tgz" integrity sha512-Bt6jpSTMWfjCtC0s79gZ/WZ1w90grfmopVOWqkI2ovhjpD5Q2XRXuecIPB9689L2+cCySMbaXDhBPU56FKNDNg== dependencies: "@smithy/types" "^4.9.0" @@ -1130,7 +1123,7 @@ "@smithy/middleware-content-length@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.2.5.tgz#a6942ce2d7513b46f863348c6c6a8177e9ace752" + resolved "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.2.5.tgz" integrity sha512-Y/RabVa5vbl5FuHYV2vUCwvh/dqzrEY/K2yWPSqvhFUwIY0atLqO4TienjBXakoy4zrKAMCZwg+YEqmH7jaN7A== dependencies: "@smithy/protocol-http" "^5.3.5" @@ -1139,7 +1132,7 @@ "@smithy/middleware-endpoint@^4.3.12", "@smithy/middleware-endpoint@^4.3.13": version "4.3.13" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.3.13.tgz#94a0e9fd360355bd224481b5371b39dd3f8e9c99" + resolved "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.3.13.tgz" integrity sha512-X4za1qCdyx1hEVVXuAWlZuK6wzLDv1uw1OY9VtaYy1lULl661+frY7FeuHdYdl7qAARUxH2yvNExU2/SmRFfcg== dependencies: "@smithy/core" "^3.18.6" @@ -1153,7 +1146,7 @@ "@smithy/middleware-retry@^4.4.12": version "4.4.13" - resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.4.13.tgz#1038ddb69d43301e6424eb1122dd090f3789d8a2" + resolved "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.4.13.tgz" integrity sha512-RzIDF9OrSviXX7MQeKOm8r/372KTyY8Jmp6HNKOOYlrguHADuM3ED/f4aCyNhZZFLG55lv5beBin7nL0Nzy1Dw== dependencies: "@smithy/node-config-provider" "^4.3.5" @@ -1168,7 +1161,7 @@ "@smithy/middleware-serde@^4.2.6": version "4.2.6" - resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.2.6.tgz#7e710f43206e13a8c081a372b276e7b2c51bff5b" + resolved "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.2.6.tgz" integrity sha512-VkLoE/z7e2g8pirwisLz8XJWedUSY8my/qrp81VmAdyrhi94T+riBfwP+AOEEFR9rFTSonC/5D2eWNmFabHyGQ== dependencies: "@smithy/protocol-http" "^5.3.5" @@ -1177,7 +1170,7 @@ "@smithy/middleware-stack@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.2.5.tgz#2d13415ed3561c882594c8e6340b801d9a2eb222" + resolved "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.2.5.tgz" integrity sha512-bYrutc+neOyWxtZdbB2USbQttZN0mXaOyYLIsaTbJhFsfpXyGWUxJpEuO1rJ8IIJm2qH4+xJT0mxUSsEDTYwdQ== dependencies: "@smithy/types" "^4.9.0" @@ -1185,7 +1178,7 @@ "@smithy/node-config-provider@^4.3.5": version "4.3.5" - resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.3.5.tgz#c09137a79c2930dcc30e6c8bb4f2608d72c1e2c9" + resolved "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.3.5.tgz" integrity sha512-UTurh1C4qkVCtqggI36DGbLB2Kv8UlcFdMXDcWMbqVY2uRg0XmT9Pb4Vj6oSQ34eizO1fvR0RnFV4Axw4IrrAg== dependencies: "@smithy/property-provider" "^4.2.5" @@ -1195,7 +1188,7 @@ "@smithy/node-http-handler@^4.4.5": version "4.4.5" - resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.4.5.tgz#2aea598fdf3dc4e32667d673d48abd4a073665f4" + resolved "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.4.5.tgz" integrity sha512-CMnzM9R2WqlqXQGtIlsHMEZfXKJVTIrqCNoSd/QpAyp+Dw0a1Vps13l6ma1fH8g7zSPNsA59B/kWgeylFuA/lw== dependencies: "@smithy/abort-controller" "^4.2.5" @@ -1206,7 +1199,7 @@ "@smithy/property-provider@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.2.5.tgz#f75dc5735d29ca684abbc77504be9246340a43f0" + resolved "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.2.5.tgz" integrity sha512-8iLN1XSE1rl4MuxvQ+5OSk/Zb5El7NJZ1td6Tn+8dQQHIjp59Lwl6bd0+nzw6SKm2wSSriH2v/I9LPzUic7EOg== dependencies: "@smithy/types" "^4.9.0" @@ -1214,7 +1207,7 @@ "@smithy/protocol-http@^5.3.5": version "5.3.5" - resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.3.5.tgz#a8f4296dd6d190752589e39ee95298d5c65a60db" + resolved "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.3.5.tgz" integrity sha512-RlaL+sA0LNMp03bf7XPbFmT5gN+w3besXSWMkA8rcmxLSVfiEXElQi4O2IWwPfxzcHkxqrwBFMbngB8yx/RvaQ== dependencies: "@smithy/types" "^4.9.0" @@ -1222,7 +1215,7 @@ "@smithy/querystring-builder@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.2.5.tgz#00cafa5a4055600ab8058e26db42f580146b91f3" + resolved "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.2.5.tgz" integrity sha512-y98otMI1saoajeik2kLfGyRp11e5U/iJYH/wLCh3aTV/XutbGT9nziKGkgCaMD1ghK7p6htHMm6b6scl9JRUWg== dependencies: "@smithy/types" "^4.9.0" @@ -1231,7 +1224,7 @@ "@smithy/querystring-parser@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.2.5.tgz#61d2e77c62f44196590fa0927dbacfbeaffe8c53" + resolved "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.2.5.tgz" integrity sha512-031WCTdPYgiQRYNPXznHXof2YM0GwL6SeaSyTH/P72M1Vz73TvCNH2Nq8Iu2IEPq9QP2yx0/nrw5YmSeAi/AjQ== dependencies: "@smithy/types" "^4.9.0" @@ -1239,14 +1232,14 @@ "@smithy/service-error-classification@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.2.5.tgz#a64eb78e096e59cc71141e3fea2b4194ce59b4fd" + resolved "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.2.5.tgz" integrity sha512-8fEvK+WPE3wUAcDvqDQG1Vk3ANLR8Px979te96m84CbKAjBVf25rPYSzb4xU4hlTyho7VhOGnh5i62D/JVF0JQ== dependencies: "@smithy/types" "^4.9.0" "@smithy/shared-ini-file-loader@^4.4.0": version "4.4.0" - resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.0.tgz#a2f8282f49982f00bafb1fa8cb7fc188a202a594" + resolved "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.0.tgz" integrity sha512-5WmZ5+kJgJDjwXXIzr1vDTG+RhF9wzSODQBfkrQ2VVkYALKGvZX1lgVSxEkgicSAFnFhPj5rudJV0zoinqS0bA== dependencies: "@smithy/types" "^4.9.0" @@ -1254,7 +1247,7 @@ "@smithy/signature-v4@^5.3.5": version "5.3.5" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.3.5.tgz#13ab710653f9f16c325ee7e0a102a44f73f2643f" + resolved "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.3.5.tgz" integrity sha512-xSUfMu1FT7ccfSXkoLl/QRQBi2rOvi3tiBZU2Tdy3I6cgvZ6SEi9QNey+lqps/sJRnogIS+lq+B1gxxbra2a/w== dependencies: "@smithy/is-array-buffer" "^4.2.0" @@ -1268,7 +1261,7 @@ "@smithy/smithy-client@^4.9.8", "@smithy/smithy-client@^4.9.9": version "4.9.9" - resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.9.9.tgz#c404029e85a62b5d4130839f7930f7071de00244" + resolved "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.9.9.tgz" integrity sha512-SUnZJMMo5yCmgjopJbiNeo1vlr8KvdnEfIHV9rlD77QuOGdRotIVBcOrBuMr+sI9zrnhtDtLP054bZVbpZpiQA== dependencies: "@smithy/core" "^3.18.6" @@ -1281,14 +1274,14 @@ "@smithy/types@^4.9.0": version "4.9.0" - resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.9.0.tgz#c6636ddfa142e1ddcb6e4cf5f3e1a628d420486f" + resolved "https://registry.npmjs.org/@smithy/types/-/types-4.9.0.tgz" integrity sha512-MvUbdnXDTwykR8cB1WZvNNwqoWVaTRA0RLlLmf/cIFNMM2cKWz01X4Ly6SMC4Kks30r8tT3Cty0jmeWfiuyHTA== dependencies: tslib "^2.6.2" "@smithy/url-parser@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.2.5.tgz#2fea006108f17f7761432c7ef98d6aa003421487" + resolved "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.2.5.tgz" integrity sha512-VaxMGsilqFnK1CeBX+LXnSuaMx4sTL/6znSZh2829txWieazdVxr54HmiyTsIbpOTLcf5nYpq9lpzmwRdxj6rQ== dependencies: "@smithy/querystring-parser" "^4.2.5" @@ -1297,7 +1290,7 @@ "@smithy/util-base64@^4.3.0": version "4.3.0" - resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-4.3.0.tgz#5e287b528793aa7363877c1a02cd880d2e76241d" + resolved "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.3.0.tgz" integrity sha512-GkXZ59JfyxsIwNTWFnjmFEI8kZpRNIBfxKjv09+nkAWPt/4aGaEWMM04m4sxgNVWkbt2MdSvE3KF/PfX4nFedQ== dependencies: "@smithy/util-buffer-from" "^4.2.0" @@ -1306,21 +1299,21 @@ "@smithy/util-body-length-browser@^4.2.0": version "4.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.0.tgz#04e9fc51ee7a3e7f648a4b4bcdf96c350cfa4d61" + resolved "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.0.tgz" integrity sha512-Fkoh/I76szMKJnBXWPdFkQJl2r9SjPt3cMzLdOB6eJ4Pnpas8hVoWPYemX/peO0yrrvldgCUVJqOAjUrOLjbxg== dependencies: tslib "^2.6.2" "@smithy/util-body-length-node@^4.2.1": version "4.2.1" - resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-4.2.1.tgz#79c8a5d18e010cce6c42d5cbaf6c1958523e6fec" + resolved "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.2.1.tgz" integrity sha512-h53dz/pISVrVrfxV1iqXlx5pRg3V2YWFcSQyPyXZRrZoZj4R4DeWRDo1a7dd3CPTcFi3kE+98tuNyD2axyZReA== dependencies: tslib "^2.6.2" "@smithy/util-buffer-from@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz#6fc88585165ec73f8681d426d96de5d402021e4b" + resolved "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz" integrity sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA== dependencies: "@smithy/is-array-buffer" "^2.2.0" @@ -1328,7 +1321,7 @@ "@smithy/util-buffer-from@^4.2.0": version "4.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-4.2.0.tgz#7abd12c4991b546e7cee24d1e8b4bfaa35c68a9d" + resolved "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.2.0.tgz" integrity sha512-kAY9hTKulTNevM2nlRtxAG2FQ3B2OR6QIrPY3zE5LqJy1oxzmgBGsHLWTcNhWXKchgA0WHW+mZkQrng/pgcCew== dependencies: "@smithy/is-array-buffer" "^4.2.0" @@ -1336,14 +1329,14 @@ "@smithy/util-config-provider@^4.2.0": version "4.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-4.2.0.tgz#2e4722937f8feda4dcb09672c59925a4e6286cfc" + resolved "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.2.0.tgz" integrity sha512-YEjpl6XJ36FTKmD+kRJJWYvrHeUvm5ykaUS5xK+6oXffQPHeEM4/nXlZPe+Wu0lsgRUcNZiliYNh/y7q9c2y6Q== dependencies: tslib "^2.6.2" "@smithy/util-defaults-mode-browser@^4.3.11": version "4.3.12" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.12.tgz#dd0c76d0414428011437479faa1d28b68d01271f" + resolved "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.12.tgz" integrity sha512-TKc6FnOxFULKxLgTNHYjcFqdOYzXVPFFVm5JhI30F3RdhT7nYOtOsjgaOwfDRmA/3U66O9KaBQ3UHoXwayRhAg== dependencies: "@smithy/property-provider" "^4.2.5" @@ -1353,7 +1346,7 @@ "@smithy/util-defaults-mode-node@^4.2.14": version "4.2.15" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.15.tgz#f04e40ae98b49088f65bc503d3be7eefcff55100" + resolved "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.15.tgz" integrity sha512-94NqfQVo+vGc5gsQ9SROZqOvBkGNMQu6pjXbnn8aQvBUhc31kx49gxlkBEqgmaZQHUUfdRUin5gK/HlHKmbAwg== dependencies: "@smithy/config-resolver" "^4.4.3" @@ -1366,7 +1359,7 @@ "@smithy/util-endpoints@^3.2.5": version "3.2.5" - resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.2.5.tgz#9e0fc34e38ddfbbc434d23a38367638dc100cb14" + resolved "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.2.5.tgz" integrity sha512-3O63AAWu2cSNQZp+ayl9I3NapW1p1rR5mlVHcF6hAB1dPZUQFfRPYtplWX/3xrzWthPGj5FqB12taJJCfH6s8A== dependencies: "@smithy/node-config-provider" "^4.3.5" @@ -1375,14 +1368,14 @@ "@smithy/util-hex-encoding@^4.2.0": version "4.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.0.tgz#1c22ea3d1e2c3a81ff81c0a4f9c056a175068a7b" + resolved "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.0.tgz" integrity sha512-CCQBwJIvXMLKxVbO88IukazJD9a4kQ9ZN7/UMGBjBcJYvatpWk+9g870El4cB8/EJxfe+k+y0GmR9CAzkF+Nbw== dependencies: tslib "^2.6.2" "@smithy/util-middleware@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.2.5.tgz#1ace865afe678fd4b0f9217197e2fe30178d4835" + resolved "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.2.5.tgz" integrity sha512-6Y3+rvBF7+PZOc40ybeZMcGln6xJGVeY60E7jy9Mv5iKpMJpHgRE6dKy9ScsVxvfAYuEX4Q9a65DQX90KaQ3bA== dependencies: "@smithy/types" "^4.9.0" @@ -1390,7 +1383,7 @@ "@smithy/util-retry@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.2.5.tgz#70fe4fbbfb9ad43a9ce2ba4ed111ff7b30d7b333" + resolved "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.2.5.tgz" integrity sha512-GBj3+EZBbN4NAqJ/7pAhsXdfzdlznOh8PydUijy6FpNIMnHPSMO2/rP4HKu+UFeikJxShERk528oy7GT79YiJg== dependencies: "@smithy/service-error-classification" "^4.2.5" @@ -1399,7 +1392,7 @@ "@smithy/util-stream@^4.5.6": version "4.5.6" - resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.5.6.tgz#ebee9e52adeb6f88337778b2f3356a2cc615298c" + resolved "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.5.6.tgz" integrity sha512-qWw/UM59TiaFrPevefOZ8CNBKbYEP6wBAIlLqxn3VAIo9rgnTNc4ASbVrqDmhuwI87usnjhdQrxodzAGFFzbRQ== dependencies: "@smithy/fetch-http-handler" "^5.3.6" @@ -1413,14 +1406,14 @@ "@smithy/util-uri-escape@^4.2.0": version "4.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-4.2.0.tgz#096a4cec537d108ac24a68a9c60bee73fc7e3a9e" + resolved "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.2.0.tgz" integrity sha512-igZpCKV9+E/Mzrpq6YacdTQ0qTiLm85gD6N/IrmyDvQFA4UnU3d5g3m8tMT/6zG/vVkWSU+VxeUyGonL62DuxA== dependencies: tslib "^2.6.2" "@smithy/util-utf8@^2.0.0": version "2.3.0" - resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz#dd96d7640363259924a214313c3cf16e7dd329c5" + resolved "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz" integrity sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A== dependencies: "@smithy/util-buffer-from" "^2.2.0" @@ -1428,7 +1421,7 @@ "@smithy/util-utf8@^4.2.0": version "4.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-4.2.0.tgz#8b19d1514f621c44a3a68151f3d43e51087fed9d" + resolved "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.2.0.tgz" integrity sha512-zBPfuzoI8xyBtR2P6WQj63Rz8i3AmfAaJLuNG8dWsfvPe8lO4aCPYLn879mEgHndZH1zQ2oXmG8O1GGzzaoZiw== dependencies: "@smithy/util-buffer-from" "^4.2.0" @@ -1436,7 +1429,7 @@ "@smithy/util-waiter@^4.2.5": version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-4.2.5.tgz#e527816edae20ec5f68b25685f4b21d93424ea86" + resolved "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-4.2.5.tgz" integrity sha512-Dbun99A3InifQdIrsXZ+QLcC0PGBPAdrl4cj1mTgJvyc9N2zf7QSxg8TBkzsCmGJdE3TLbO9ycwpY0EkWahQ/g== dependencies: "@smithy/abort-controller" "^4.2.5" @@ -1445,21 +1438,21 @@ "@smithy/uuid@^1.1.0": version "1.1.0" - resolved "https://registry.yarnpkg.com/@smithy/uuid/-/uuid-1.1.0.tgz#9fd09d3f91375eab94f478858123387df1cda987" + resolved "https://registry.npmjs.org/@smithy/uuid/-/uuid-1.1.0.tgz" integrity sha512-4aUIteuyxtBUhVdiQqcDhKFitwfd9hqoSDYY2KRXiWtgoWJ9Bmise+KfEPDiVHWeJepvF8xJO9/9+WDIciMFFw== dependencies: tslib "^2.6.2" "@swc/helpers@0.5.15": version "0.5.15" - resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.15.tgz#79efab344c5819ecf83a43f3f9f811fc84b516d7" + resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz" integrity sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g== dependencies: tslib "^2.8.0" "@tailwindcss/node@4.1.17": version "4.1.17" - resolved "https://registry.yarnpkg.com/@tailwindcss/node/-/node-4.1.17.tgz#ec40a37293246f4eeab2dac00e4425af9272f600" + resolved "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.17.tgz" integrity sha512-csIkHIgLb3JisEFQ0vxr2Y57GUNYh447C8xzwj89U/8fdW8LhProdxvnVH6U8M2Y73QKiTIH+LWbK3V2BBZsAg== dependencies: "@jridgewell/remapping" "^2.3.4" @@ -1477,7 +1470,7 @@ "@tailwindcss/oxide-darwin-arm64@4.1.17": version "4.1.17" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.17.tgz#63e12e62b83f6949dbb10b5a7f6e441606835efc" + resolved "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.17.tgz" integrity sha512-EquyumkQweUBNk1zGEU/wfZo2qkp/nQKRZM8bUYO0J+Lums5+wl2CcG1f9BgAjn/u9pJzdYddHWBiFXJTcxmOg== "@tailwindcss/oxide-darwin-x64@4.1.17": @@ -1539,7 +1532,7 @@ "@tailwindcss/oxide@4.1.17": version "4.1.17" - resolved "https://registry.yarnpkg.com/@tailwindcss/oxide/-/oxide-4.1.17.tgz#6c063b40a022f4fbdac557c0586cfb9ae08a3dfe" + resolved "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.17.tgz" integrity sha512-F0F7d01fmkQhsTjXezGBLdrl1KresJTcI3DB8EkScCldyKp3Msz4hub4uyYaVnk88BAS1g5DQjjF6F5qczheLA== optionalDependencies: "@tailwindcss/oxide-android-arm64" "4.1.17" @@ -1557,7 +1550,7 @@ "@tailwindcss/postcss@4.1.17": version "4.1.17" - resolved "https://registry.yarnpkg.com/@tailwindcss/postcss/-/postcss-4.1.17.tgz#983b4233920a9d7083cd0d488d5cdc254f304f6b" + resolved "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.1.17.tgz" integrity sha512-+nKl9N9mN5uJ+M7dBOOCzINw94MPstNR/GtIhz1fpZysxL/4a+No64jCBD6CPN+bIHWFx3KWuu8XJRrj/572Dw== dependencies: "@alloc/quick-lru" "^5.2.0" @@ -1575,51 +1568,46 @@ "@types/node@20.19.25": version "20.19.25" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.25.tgz#467da94a2fd966b57cc39c357247d68047611190" + resolved "https://registry.npmjs.org/@types/node/-/node-20.19.25.tgz" integrity sha512-ZsJzA5thDQMSQO788d7IocwwQbI8B5OPzmqNvpf3NY/+MHDAS759Wo0gd2WQeXYt5AAAQjzcrTVC6SKCuYgoCQ== dependencies: undici-types "~6.21.0" -"@types/react-dom@19.1.2": - version "19.1.2" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.1.2.tgz#bd1fe3b8c28a3a2e942f85314dcfb71f531a242f" - integrity sha512-XGJkWF41Qq305SKWEILa1O8vzhb3aOo3ogBlSmiqNko/WmRb6QIaweuZCXjKygVDXpzXb5wyxKTSOsmkuqj+Qw== +"@types/react-dom@19.2.3": + version "19.2.3" + resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz" + integrity sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ== -"@types/react@19.1.2": - version "19.1.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-19.1.2.tgz#11df86f66f188f212c90ecb537327ec68bfd593f" - integrity sha512-oxLPMytKchWGbnQM9O7D67uPa9paTNxO7jVoNMXgkkErULBPhPARCfkKL9ytcIJJRGjbsVwW4ugJzyFFvm/Tiw== +"@types/react@19.2.7": + version "19.2.7" + resolved "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz" + integrity sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg== dependencies: - csstype "^3.0.2" + csstype "^3.2.2" -abitype@1.1.0: +abitype@1.1.0, abitype@^1.0.9: version "1.1.0" - resolved "https://registry.yarnpkg.com/abitype/-/abitype-1.1.0.tgz#510c5b3f92901877977af5e864841f443bf55406" + resolved "https://registry.npmjs.org/abitype/-/abitype-1.1.0.tgz" integrity sha512-6Vh4HcRxNMLA0puzPjM5GBgT4aAcFGKZzSgAXvuZ27shJP6NEpielTuqbBmZILR5/xd0PizkBGy5hReKz9jl5A== -abitype@^1.0.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/abitype/-/abitype-1.2.0.tgz#aeb24a323c3d28d4e78f2ada9bf2c7610907737a" - integrity sha512-fD3ROjckUrWsybaSor2AdWxzA0e/DSyV2dA4aYd7bd8orHsoJjl09fOgKfUkTDfk0BsDGBf4NBgu/c7JoS2Npw== - bowser@^2.11.0: version "2.13.1" - resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.13.1.tgz#5a4c652de1d002f847dd011819f5fc729f308a7e" + resolved "https://registry.npmjs.org/bowser/-/bowser-2.13.1.tgz" integrity sha512-OHawaAbjwx6rqICCKgSG0SAnT05bzd7ppyKLVUITZpANBaaMFBAsaNkto3LoQ31tyFP5kNujE8Cdx85G9VzOkw== caniuse-lite@^1.0.30001579: - version "1.0.30001751" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001751.tgz#dacd5d9f4baeea841641640139d2b2a4df4226ad" - integrity sha512-A0QJhug0Ly64Ii3eIqHu5X51ebln3k4yTUkY1j8drqpWHVreg/VLijN48cZ1bYPiqOQuqpkIKnzr/Ul8V+p6Cw== + version "1.0.30001759" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001759.tgz#d569e7b010372c6b0ca3946e30dada0a2e9d5006" + integrity sha512-Pzfx9fOKoKvevQf8oCXoyNRQ5QyxJj+3O0Rqx2V5oxT61KGx8+n6hV/IUyJeifUci2clnmmKVpvtiqRzgiWjSw== client-only@0.0.1: version "0.0.1" - resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1" + resolved "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz" integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA== -csstype@^3.0.2: +csstype@^3.2.2: version "3.2.3" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.2.3.tgz#ec48c0f3e993e50648c86da559e2610995cf989a" + resolved "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz" integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ== detect-libc@^2.0.3, detect-libc@^2.1.2: @@ -1629,7 +1617,7 @@ detect-libc@^2.0.3, detect-libc@^2.1.2: enhanced-resolve@^5.18.3: version "5.18.3" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44" + resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz" integrity sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww== dependencies: graceful-fs "^4.2.4" @@ -1637,29 +1625,29 @@ enhanced-resolve@^5.18.3: eventemitter3@5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" + resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz" integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== fast-xml-parser@5.2.5: version "5.2.5" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz#4809fdfb1310494e341098c25cb1341a01a9144a" + resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz" integrity sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ== dependencies: strnum "^2.1.0" graceful-fs@^4.2.4: version "4.2.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== isows@1.0.7: version "1.0.7" - resolved "https://registry.yarnpkg.com/isows/-/isows-1.0.7.tgz#1c06400b7eed216fbba3bcbd68f12490fc342915" + resolved "https://registry.npmjs.org/isows/-/isows-1.0.7.tgz" integrity sha512-I1fSfDCZL5P0v33sVqeTDSpcstAg/N+wF5HS033mogOVIp4B+oHC7oOCsA3axAbBSGTJ8QubbNmnIRN/h8U7hg== jiti@^2.6.1: version "2.6.1" - resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.6.1.tgz#178ef2fc9a1a594248c20627cd820187a4d78d92" + resolved "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz" integrity sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ== lightningcss-android-arm64@1.30.2: @@ -1669,7 +1657,7 @@ lightningcss-android-arm64@1.30.2: lightningcss-darwin-arm64@1.30.2: version "1.30.2" - resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz#a5fa946d27c029e48c7ff929e6e724a7de46eb2c" + resolved "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz" integrity sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA== lightningcss-darwin-x64@1.30.2: @@ -1719,7 +1707,7 @@ lightningcss-win32-x64-msvc@1.30.2: lightningcss@1.30.2: version "1.30.2" - resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.30.2.tgz#4ade295f25d140f487d37256f4cd40dc607696d0" + resolved "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.2.tgz" integrity sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ== dependencies: detect-libc "^2.0.3" @@ -1738,40 +1726,40 @@ lightningcss@1.30.2: magic-string@^0.30.21: version "0.30.21" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91" + resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz" integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ== dependencies: "@jridgewell/sourcemap-codec" "^1.5.5" nanoid@^3.3.11, nanoid@^3.3.6: version "3.3.11" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b" + resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz" integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w== -next@15.5.6: - version "15.5.6" - resolved "https://registry.yarnpkg.com/next/-/next-15.5.6.tgz#16d9d1e9ba2e8caf82ba15e060a12286cd25db30" - integrity sha512-zTxsnI3LQo3c9HSdSf91O1jMNsEzIXDShXd4wVdg9y5shwLqBXi4ZtUUJyB86KGVSJLZx0PFONvO54aheGX8QQ== +next@16.0.7: + version "16.0.7" + resolved "https://registry.npmjs.org/next/-/next-16.0.7.tgz" + integrity sha512-3mBRJyPxT4LOxAJI6IsXeFtKfiJUbjCLgvXO02fV8Wy/lIhPvP94Fe7dGhUgHXcQy4sSuYwQNcOLhIfOm0rL0A== dependencies: - "@next/env" "15.5.6" + "@next/env" "16.0.7" "@swc/helpers" "0.5.15" caniuse-lite "^1.0.30001579" postcss "8.4.31" styled-jsx "5.1.6" optionalDependencies: - "@next/swc-darwin-arm64" "15.5.6" - "@next/swc-darwin-x64" "15.5.6" - "@next/swc-linux-arm64-gnu" "15.5.6" - "@next/swc-linux-arm64-musl" "15.5.6" - "@next/swc-linux-x64-gnu" "15.5.6" - "@next/swc-linux-x64-musl" "15.5.6" - "@next/swc-win32-arm64-msvc" "15.5.6" - "@next/swc-win32-x64-msvc" "15.5.6" - sharp "^0.34.3" + "@next/swc-darwin-arm64" "16.0.7" + "@next/swc-darwin-x64" "16.0.7" + "@next/swc-linux-arm64-gnu" "16.0.7" + "@next/swc-linux-arm64-musl" "16.0.7" + "@next/swc-linux-x64-gnu" "16.0.7" + "@next/swc-linux-x64-musl" "16.0.7" + "@next/swc-win32-arm64-msvc" "16.0.7" + "@next/swc-win32-x64-msvc" "16.0.7" + sharp "^0.34.4" ox@0.9.6: version "0.9.6" - resolved "https://registry.yarnpkg.com/ox/-/ox-0.9.6.tgz#5cf02523b6db364c10ee7f293ff1e664e0e1eab7" + resolved "https://registry.npmjs.org/ox/-/ox-0.9.6.tgz" integrity sha512-8SuCbHPvv2eZLYXrNmC0EC12rdzXQLdhnOMlHDW2wiCPLxBrOOJwX5L5E61by+UjTPOryqQiRSnjIKCI+GykKg== dependencies: "@adraffy/ens-normalize" "^1.11.0" @@ -1785,12 +1773,12 @@ ox@0.9.6: picocolors@^1.0.0, picocolors@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz" integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== postcss@8.4.31: version "8.4.31" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz" integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== dependencies: nanoid "^3.3.6" @@ -1799,36 +1787,36 @@ postcss@8.4.31: postcss@^8.4.41: version "8.5.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.6.tgz#2825006615a619b4f62a9e7426cc120b349a8f3c" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz" integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg== dependencies: nanoid "^3.3.11" picocolors "^1.1.1" source-map-js "^1.2.1" -react-dom@19.1.0: - version "19.1.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.1.0.tgz#133558deca37fa1d682708df8904b25186793623" - integrity sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g== +react-dom@19.2.1: + version "19.2.1" + resolved "https://registry.npmjs.org/react-dom/-/react-dom-19.2.1.tgz" + integrity sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg== dependencies: - scheduler "^0.26.0" + scheduler "^0.27.0" -react@19.1.0: - version "19.1.0" - resolved "https://registry.yarnpkg.com/react/-/react-19.1.0.tgz#926864b6c48da7627f004795d6cce50e90793b75" - integrity sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg== +react@19.2.1: + version "19.2.1" + resolved "https://registry.npmjs.org/react/-/react-19.2.1.tgz" + integrity sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw== -scheduler@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.26.0.tgz#4ce8a8c2a2095f13ea11bf9a445be50c555d6337" - integrity sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA== +scheduler@^0.27.0: + version "0.27.0" + resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz" + integrity sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q== semver@^7.7.3: version "7.7.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946" integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q== -sharp@^0.34.3: +sharp@^0.34.4: version "0.34.5" resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.34.5.tgz#b6f148e4b8c61f1797bde11a9d1cfebbae2c57b0" integrity sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg== @@ -1864,49 +1852,49 @@ sharp@^0.34.3: source-map-js@^1.0.2, source-map-js@^1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" + resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz" integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== strnum@^2.1.0: version "2.1.1" - resolved "https://registry.yarnpkg.com/strnum/-/strnum-2.1.1.tgz#cf2a6e0cf903728b8b2c4b971b7e36b4e82d46ab" + resolved "https://registry.npmjs.org/strnum/-/strnum-2.1.1.tgz" integrity sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw== styled-jsx@5.1.6: version "5.1.6" - resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.6.tgz#83b90c077e6c6a80f7f5e8781d0f311b2fe41499" + resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.6.tgz" integrity sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA== dependencies: client-only "0.0.1" tailwindcss@4.1.17: version "4.1.17" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-4.1.17.tgz#e6dcb7a9c60cef7522169b5f207ffec2fd652286" + resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.17.tgz" integrity sha512-j9Ee2YjuQqYT9bbRTfTZht9W/ytp5H+jJpZKiYdP/bpnXARAuELt9ofP0lPnmHjbga7SNQIxdTAXCmtKVYjN+Q== tapable@^2.2.0: version "2.3.0" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.3.0.tgz#7e3ea6d5ca31ba8e078b560f0d83ce9a14aa8be6" + resolved "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz" integrity sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg== tslib@^2.4.0, tslib@^2.6.2, tslib@^2.8.0: version "2.8.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz" integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== typescript@5.9.3: version "5.9.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f" + resolved "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz" integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw== undici-types@~6.21.0: version "6.21.0" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" + resolved "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz" integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ== viem@2.40.3: version "2.40.3" - resolved "https://registry.yarnpkg.com/viem/-/viem-2.40.3.tgz#237b11c54f808b5747e483fa7dd05a843e3c079f" + resolved "https://registry.npmjs.org/viem/-/viem-2.40.3.tgz" integrity sha512-feYfEpbgjRkZYQpwcgxqkWzjxHI5LSDAjcGetHHwDRuX9BRQHUdV8ohrCosCYpdEhus/RknD3/bOd4qLYVPPuA== dependencies: "@noble/curves" "1.9.1" @@ -1920,5 +1908,5 @@ viem@2.40.3: ws@8.18.3: version "8.18.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472" + resolved "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz" integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg== From 037533b3b2508a7626418cdfc8af31ad722b305c Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Fri, 5 Dec 2025 09:39:55 -0600 Subject: [PATCH 072/117] fix: support no builder forwarding and handle metering RPC failures (#94) --- crates/ingress-rpc/src/lib.rs | 8 ++++++-- crates/ingress-rpc/src/service.rs | 19 ++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index fe98f2b..531c740 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -12,7 +12,7 @@ use std::net::{IpAddr, SocketAddr}; use std::str::FromStr; use tips_core::MeterBundleResponse; use tokio::sync::broadcast; -use tracing::error; +use tracing::{error, warn}; use url::Url; #[derive(Debug, Clone, Copy)] @@ -184,7 +184,11 @@ pub fn connect_ingress_to_builder( tokio::spawn(async move { let mut event_rx = metering_rx; while let Ok(event) = event_rx.recv().await { - // we only support one transaction per bundle for now + if event.results.is_empty() { + warn!(message = "received metering information with no transactions", hash=%event.bundle_hash); + continue; + } + let tx_hash = event.results[0].tx_hash; if let Err(e) = metering_builder .client() diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 7f28e67..5815d09 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -224,18 +224,15 @@ where .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; let bundle_hash = &parsed_bundle.bundle_hash(); - let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await - .unwrap_or_else(|_| { - // TODO: in the future, we should return the error - warn!(message = "Bundle simulation failed, using default response", bundle_hash = %bundle_hash); - MeterBundleResponse::default() - }); - let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response.clone()); + let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await.ok(); - self.builder_tx - .send(meter_bundle_response) - .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; + if let Some(meter_info) = meter_bundle_response.as_ref() { + _ = self.builder_tx.send(meter_info.clone()); + } + + let accepted_bundle = + AcceptedBundle::new(parsed_bundle, meter_bundle_response.unwrap_or_default()); if send_to_kafka { if let Err(e) = self @@ -256,7 +253,7 @@ where .await; match response { Ok(_) => { - info!(message = "sent transaction to the mempool", hash=%transaction.tx_hash()); + debug!(message = "sent transaction to the mempool", hash=%transaction.tx_hash()); } Err(e) => { warn!(message = "Failed to send raw transaction to mempool", error = %e); From a7808d5a53539160107757b6294e9f4d5eb16109 Mon Sep 17 00:00:00 2001 From: Andrei De Stefani Date: Mon, 8 Dec 2025 19:05:44 -0300 Subject: [PATCH 073/117] feat: add UserOpEvent types for audit pipeline (#81) --- crates/audit/src/types.rs | 172 +++++++++++++++++++++++++++++++++++++- 1 file changed, 171 insertions(+), 1 deletion(-) diff --git a/crates/audit/src/types.rs b/crates/audit/src/types.rs index 6b0d7d1..f27241a 100644 --- a/crates/audit/src/types.rs +++ b/crates/audit/src/types.rs @@ -1,5 +1,5 @@ use alloy_consensus::transaction::{SignerRecoverable, Transaction as ConsensusTransaction}; -use alloy_primitives::{Address, TxHash, U256}; +use alloy_primitives::{Address, B256, TxHash, U256}; use bytes::Bytes; use serde::{Deserialize, Serialize}; use tips_core::AcceptedBundle; @@ -26,6 +26,15 @@ pub struct Transaction { pub data: Bytes, } +pub type UserOpHash = B256; + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub enum UserOpDropReason { + Invalid(String), + Expired, + ReplacedByHigherFee, +} + #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(tag = "event", content = "data")] pub enum BundleEvent { @@ -104,3 +113,164 @@ impl BundleEvent { } } } + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(tag = "event", content = "data")] +pub enum UserOpEvent { + AddedToMempool { + user_op_hash: UserOpHash, + sender: Address, + entry_point: Address, + nonce: U256, + }, + Dropped { + user_op_hash: UserOpHash, + reason: UserOpDropReason, + }, + Included { + user_op_hash: UserOpHash, + block_number: u64, + tx_hash: TxHash, + }, +} + +impl UserOpEvent { + pub fn user_op_hash(&self) -> UserOpHash { + match self { + UserOpEvent::AddedToMempool { user_op_hash, .. } => *user_op_hash, + UserOpEvent::Dropped { user_op_hash, .. } => *user_op_hash, + UserOpEvent::Included { user_op_hash, .. } => *user_op_hash, + } + } + + pub fn generate_event_key(&self) -> String { + match self { + UserOpEvent::Included { + user_op_hash, + tx_hash, + .. + } => { + format!("{user_op_hash}-{tx_hash}") + } + _ => { + format!("{}-{}", self.user_op_hash(), Uuid::new_v4()) + } + } + } +} + +#[cfg(test)] +mod user_op_event_tests { + use super::*; + use alloy_primitives::{address, b256}; + + fn create_test_user_op_hash() -> UserOpHash { + b256!("1111111111111111111111111111111111111111111111111111111111111111") + } + + #[test] + fn test_user_op_event_added_to_mempool_serialization() { + let event = UserOpEvent::AddedToMempool { + user_op_hash: create_test_user_op_hash(), + sender: address!("2222222222222222222222222222222222222222"), + entry_point: address!("0000000071727De22E5E9d8BAf0edAc6f37da032"), + nonce: U256::from(1), + }; + + let json = serde_json::to_string(&event).unwrap(); + assert!(json.contains("\"event\":\"AddedToMempool\"")); + + let deserialized: UserOpEvent = serde_json::from_str(&json).unwrap(); + assert_eq!(event.user_op_hash(), deserialized.user_op_hash()); + } + + #[test] + fn test_user_op_event_dropped_serialization() { + let event = UserOpEvent::Dropped { + user_op_hash: create_test_user_op_hash(), + reason: UserOpDropReason::Invalid("gas too low".to_string()), + }; + + let json = serde_json::to_string(&event).unwrap(); + assert!(json.contains("\"event\":\"Dropped\"")); + assert!(json.contains("gas too low")); + + let deserialized: UserOpEvent = serde_json::from_str(&json).unwrap(); + assert_eq!(event.user_op_hash(), deserialized.user_op_hash()); + } + + #[test] + fn test_user_op_event_included_serialization() { + let event = UserOpEvent::Included { + user_op_hash: create_test_user_op_hash(), + block_number: 12345, + tx_hash: b256!("3333333333333333333333333333333333333333333333333333333333333333"), + }; + + let json = serde_json::to_string(&event).unwrap(); + assert!(json.contains("\"event\":\"Included\"")); + assert!(json.contains("\"block_number\":12345")); + + let deserialized: UserOpEvent = serde_json::from_str(&json).unwrap(); + assert_eq!(event.user_op_hash(), deserialized.user_op_hash()); + } + + #[test] + fn test_user_op_hash_accessor() { + let hash = create_test_user_op_hash(); + + let added = UserOpEvent::AddedToMempool { + user_op_hash: hash, + sender: address!("2222222222222222222222222222222222222222"), + entry_point: address!("0000000071727De22E5E9d8BAf0edAc6f37da032"), + nonce: U256::from(1), + }; + assert_eq!(added.user_op_hash(), hash); + + let dropped = UserOpEvent::Dropped { + user_op_hash: hash, + reason: UserOpDropReason::Expired, + }; + assert_eq!(dropped.user_op_hash(), hash); + + let included = UserOpEvent::Included { + user_op_hash: hash, + block_number: 100, + tx_hash: b256!("4444444444444444444444444444444444444444444444444444444444444444"), + }; + assert_eq!(included.user_op_hash(), hash); + } + + #[test] + fn test_generate_event_key_included() { + let user_op_hash = + b256!("1111111111111111111111111111111111111111111111111111111111111111"); + let tx_hash = b256!("2222222222222222222222222222222222222222222222222222222222222222"); + + let event = UserOpEvent::Included { + user_op_hash, + block_number: 100, + tx_hash, + }; + + let key = event.generate_event_key(); + assert!(key.contains(&format!("{user_op_hash}"))); + assert!(key.contains(&format!("{tx_hash}"))); + } + + #[test] + fn test_user_op_drop_reason_variants() { + let invalid = UserOpDropReason::Invalid("test reason".to_string()); + let json = serde_json::to_string(&invalid).unwrap(); + assert!(json.contains("Invalid")); + assert!(json.contains("test reason")); + + let expired = UserOpDropReason::Expired; + let json = serde_json::to_string(&expired).unwrap(); + assert!(json.contains("Expired")); + + let replaced = UserOpDropReason::ReplacedByHigherFee; + let json = serde_json::to_string(&replaced).unwrap(); + assert!(json.contains("ReplacedByHigherFee")); + } +} From b1dfde6a5c8f603f19f9309ca6dc015bad260b44 Mon Sep 17 00:00:00 2001 From: Andrei De Stefani Date: Tue, 9 Dec 2025 13:22:30 -0300 Subject: [PATCH 074/117] feat(audit): add UserOpEventPublisher for Kafka (#97) * feat(audit): add UserOpEventPublisher for Kafka --- crates/audit/src/lib.rs | 16 ++++++ crates/audit/src/publisher.rs | 102 +++++++++++++++++++++++++++++++++- 2 files changed, 117 insertions(+), 1 deletion(-) diff --git a/crates/audit/src/lib.rs b/crates/audit/src/lib.rs index 4286e71..a9f0eba 100644 --- a/crates/audit/src/lib.rs +++ b/crates/audit/src/lib.rs @@ -26,3 +26,19 @@ where } }); } + +pub fn connect_userop_audit_to_publisher

( + event_rx: mpsc::UnboundedReceiver, + publisher: P, +) where + P: UserOpEventPublisher + 'static, +{ + tokio::spawn(async move { + let mut event_rx = event_rx; + while let Some(event) = event_rx.recv().await { + if let Err(e) = publisher.publish(event).await { + error!(error = %e, "Failed to publish user op event"); + } + } + }); +} diff --git a/crates/audit/src/publisher.rs b/crates/audit/src/publisher.rs index 0d31391..9dbcffe 100644 --- a/crates/audit/src/publisher.rs +++ b/crates/audit/src/publisher.rs @@ -1,4 +1,4 @@ -use crate::types::BundleEvent; +use crate::types::{BundleEvent, UserOpEvent}; use anyhow::Result; use async_trait::async_trait; use rdkafka::producer::{FutureProducer, FutureRecord}; @@ -104,3 +104,103 @@ impl BundleEventPublisher for LoggingBundleEventPublisher { Ok(()) } } + +#[async_trait] +pub trait UserOpEventPublisher: Send + Sync { + async fn publish(&self, event: UserOpEvent) -> Result<()>; + + async fn publish_all(&self, events: Vec) -> Result<()>; +} + +#[derive(Clone)] +pub struct KafkaUserOpEventPublisher { + producer: FutureProducer, + topic: String, +} + +impl KafkaUserOpEventPublisher { + pub fn new(producer: FutureProducer, topic: String) -> Self { + Self { producer, topic } + } + + async fn send_event(&self, event: &UserOpEvent) -> Result<()> { + let user_op_hash = event.user_op_hash(); + let key = event.generate_event_key(); + let payload = serde_json::to_vec(event)?; + + let record = FutureRecord::to(&self.topic).key(&key).payload(&payload); + + match self + .producer + .send(record, tokio::time::Duration::from_secs(5)) + .await + { + Ok(_) => { + debug!( + user_op_hash = %user_op_hash, + topic = %self.topic, + payload_size = payload.len(), + "Successfully published user op event" + ); + Ok(()) + } + Err((err, _)) => { + error!( + user_op_hash = %user_op_hash, + topic = %self.topic, + error = %err, + "Failed to publish user op event" + ); + Err(anyhow::anyhow!("Failed to publish user op event: {err}")) + } + } + } +} + +#[async_trait] +impl UserOpEventPublisher for KafkaUserOpEventPublisher { + async fn publish(&self, event: UserOpEvent) -> Result<()> { + self.send_event(&event).await + } + + async fn publish_all(&self, events: Vec) -> Result<()> { + for event in events { + self.send_event(&event).await?; + } + Ok(()) + } +} + +#[derive(Clone)] +pub struct LoggingUserOpEventPublisher; + +impl LoggingUserOpEventPublisher { + pub fn new() -> Self { + Self + } +} + +impl Default for LoggingUserOpEventPublisher { + fn default() -> Self { + Self::new() + } +} + +#[async_trait] +impl UserOpEventPublisher for LoggingUserOpEventPublisher { + async fn publish(&self, event: UserOpEvent) -> Result<()> { + info!( + user_op_hash = %event.user_op_hash(), + event = ?event, + "Received user op event" + ); + Ok(()) + } + + async fn publish_all(&self, events: Vec) -> Result<()> { + for event in events { + self.publish(event).await?; + } + Ok(()) + } +} From c6cd712239d24ebe602bc1358263758f1f8464f3 Mon Sep 17 00:00:00 2001 From: William Law Date: Wed, 10 Dec 2025 15:11:45 -0500 Subject: [PATCH 075/117] chore: have shadow mode (#100) --- crates/ingress-rpc/src/lib.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index 531c740..d39837f 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -20,6 +20,7 @@ pub enum TxSubmissionMethod { Mempool, Kafka, MempoolAndKafka, + None, } impl FromStr for TxSubmissionMethod { @@ -30,8 +31,9 @@ impl FromStr for TxSubmissionMethod { "mempool" => Ok(TxSubmissionMethod::Mempool), "kafka" => Ok(TxSubmissionMethod::Kafka), "mempool,kafka" | "kafka,mempool" => Ok(TxSubmissionMethod::MempoolAndKafka), + "none" => Ok(TxSubmissionMethod::None), _ => Err(format!( - "Invalid submission method: '{s}'. Valid options: mempool, kafka, mempool,kafka, kafka,mempool" + "Invalid submission method: '{s}'. Valid options: mempool, kafka, mempool,kafka, kafka,mempool, none" )), } } From c90fe2fcf06e9525a0a26be5b3a3a800370316a7 Mon Sep 17 00:00:00 2001 From: Rayyan Alam <62478924+rayyan224@users.noreply.github.com> Date: Wed, 10 Dec 2025 15:52:54 -0500 Subject: [PATCH 076/117] Implement versioned ERC-4337 user op hashing and user-op Kafka queue (#96) * feat: start scafold user ops queue * chore: refactor out queue dep * chore: fix build * chore: update types of user op * feat: create queue service * chore: docker service for libs * chore: create service for account abstraction * chore: initial logic of user operation * feat: finish lib rs for user op * chore: setup with DRY * feat: create services and clean up * chore: clean up queue rs * feat: clean up system for types rs * chore: clean up and formating * chore: fix build * chore: clean up cargo * chore: add comments for referencing * chore: fmt * chore: fix tests * chore: add back in tests * chore: fmt * chore: handle nit pics --- Cargo.lock | 3 + Cargo.toml | 1 + crates/account-abstraction-core/Cargo.toml | 4 +- .../core/src/account_abstraction_service.rs | 18 +- .../core/src/entrypoints/mod.rs | 3 + .../core/src/entrypoints/v06.rs | 139 ++++++++++++++ .../core/src/entrypoints/v07.rs | 180 ++++++++++++++++++ .../core/src/entrypoints/version.rs | 31 +++ .../account-abstraction-core/core/src/lib.rs | 4 +- .../core/src/types.rs | 61 ++++-- crates/audit/src/reader.rs | 2 +- crates/core/src/user_ops_types.rs | 139 -------------- crates/ingress-rpc/Cargo.toml | 1 + crates/ingress-rpc/src/bin/main.rs | 4 +- crates/ingress-rpc/src/lib.rs | 9 +- crates/ingress-rpc/src/queue.rs | 85 ++++++--- crates/ingress-rpc/src/service.rs | 78 ++++---- docker-compose.yml | 1 + 18 files changed, 531 insertions(+), 232 deletions(-) create mode 100644 crates/account-abstraction-core/core/src/entrypoints/mod.rs create mode 100644 crates/account-abstraction-core/core/src/entrypoints/v06.rs create mode 100644 crates/account-abstraction-core/core/src/entrypoints/v07.rs create mode 100644 crates/account-abstraction-core/core/src/entrypoints/version.rs delete mode 100644 crates/core/src/user_ops_types.rs diff --git a/Cargo.lock b/Cargo.lock index a7938a3..6faa529 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,6 +10,8 @@ dependencies = [ "alloy-provider", "alloy-rpc-types", "alloy-serde", + "alloy-sol-types", + "anyhow", "async-trait", "jsonrpsee", "op-alloy-network", @@ -7099,6 +7101,7 @@ dependencies = [ "reth-optimism-evm", "reth-rpc-eth-types", "revm-context-interface", + "serde", "serde_json", "tips-audit", "tips-core", diff --git a/Cargo.toml b/Cargo.toml index 1195c3c..f05aed7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,6 +29,7 @@ alloy-consensus = { version = "1.0.41" } alloy-provider = { version = "1.0.41" } alloy-serde = "1.0.41" alloy-rpc-types = "1.1.2" +alloy-sol-types = { version = "1.4.1", default-features = false } # op-alloy op-alloy-network = { version = "0.22.0", default-features = false } diff --git a/crates/account-abstraction-core/Cargo.toml b/crates/account-abstraction-core/Cargo.toml index a16a79d..55277ca 100644 --- a/crates/account-abstraction-core/Cargo.toml +++ b/crates/account-abstraction-core/Cargo.toml @@ -9,7 +9,6 @@ edition.workspace = true [lib] path = "core/src/lib.rs" - [dependencies] alloy-serde = { version = "1.0.41", default-features = false } serde.workspace = true @@ -21,9 +20,10 @@ reth-rpc-eth-types.workspace = true tokio.workspace = true jsonrpsee.workspace = true async-trait = { workspace = true } +alloy-sol-types.workspace= true +anyhow.workspace = true [dev-dependencies] alloy-primitives.workspace = true serde_json.workspace = true wiremock.workspace = true - diff --git a/crates/account-abstraction-core/core/src/account_abstraction_service.rs b/crates/account-abstraction-core/core/src/account_abstraction_service.rs index 0cba40d..4a19f1d 100644 --- a/crates/account-abstraction-core/core/src/account_abstraction_service.rs +++ b/crates/account-abstraction-core/core/src/account_abstraction_service.rs @@ -1,4 +1,4 @@ -use crate::types::{UserOperationRequest, UserOperationRequestValidationResult}; +use crate::types::{UserOperationRequestValidationResult, VersionedUserOperation}; use alloy_provider::{Provider, RootProvider}; use async_trait::async_trait; use jsonrpsee::core::RpcResult; @@ -10,7 +10,7 @@ use tokio::time::{Duration, timeout}; pub trait AccountAbstractionService: Send + Sync { async fn validate_user_operation( &self, - user_operation: UserOperationRequest, + user_operation: &VersionedUserOperation, ) -> RpcResult; } @@ -24,7 +24,7 @@ pub struct AccountAbstractionServiceImpl { impl AccountAbstractionService for AccountAbstractionServiceImpl { async fn validate_user_operation( &self, - user_operation: UserOperationRequest, + user_operation: &VersionedUserOperation, ) -> RpcResult { // Steps: Reputation Service Validate // Steps: Base Node Validate User Operation @@ -45,7 +45,7 @@ impl AccountAbstractionServiceImpl { pub async fn base_node_validate_user_operation( &self, - user_operation: UserOperationRequest, + user_operation: &VersionedUserOperation, ) -> RpcResult { let result = timeout( Duration::from_secs(self.validate_user_operation_timeout), @@ -88,8 +88,8 @@ mod tests { MockServer::start().await } - fn new_test_user_operation_v06() -> UserOperationRequest { - UserOperationRequest::EntryPointV06(UserOperation { + fn new_test_user_operation_v06() -> VersionedUserOperation { + VersionedUserOperation::UserOperation(UserOperation { sender: Address::ZERO, nonce: U256::from(0), init_code: Bytes::default(), @@ -126,7 +126,7 @@ mod tests { let user_operation = new_test_user_operation_v06(); let result = service - .base_node_validate_user_operation(user_operation) + .base_node_validate_user_operation(&user_operation) .await; assert!(result.is_err()); @@ -153,7 +153,7 @@ mod tests { let user_operation = new_test_user_operation_v06(); let result = service - .base_node_validate_user_operation(user_operation) + .base_node_validate_user_operation(&user_operation) .await; assert!(result.is_err()); assert!(result.unwrap_err().to_string().contains("Internal error")); @@ -178,7 +178,7 @@ mod tests { let user_operation = new_test_user_operation_v06(); let result = service - .base_node_validate_user_operation(user_operation) + .base_node_validate_user_operation(&user_operation) .await .unwrap(); diff --git a/crates/account-abstraction-core/core/src/entrypoints/mod.rs b/crates/account-abstraction-core/core/src/entrypoints/mod.rs new file mode 100644 index 0000000..4946ba2 --- /dev/null +++ b/crates/account-abstraction-core/core/src/entrypoints/mod.rs @@ -0,0 +1,3 @@ +pub mod v06; +pub mod v07; +pub mod version; diff --git a/crates/account-abstraction-core/core/src/entrypoints/v06.rs b/crates/account-abstraction-core/core/src/entrypoints/v06.rs new file mode 100644 index 0000000..4883305 --- /dev/null +++ b/crates/account-abstraction-core/core/src/entrypoints/v06.rs @@ -0,0 +1,139 @@ +/* + * ERC-4337 v0.6 UserOperation Hash Calculation + * + * 1. Hash variable-length fields: initCode, callData, paymasterAndData + * 2. Pack all fields into struct (using hashes from step 1, gas values as uint256) + * 3. encodedHash = keccak256(abi.encode(packed struct)) + * 4. final hash = keccak256(abi.encode(encodedHash, entryPoint, chainId)) + * + * Reference: rundler/crates/types/src/user_operation/v0_6.rs:927-934 + */ +use alloy_primitives::{ChainId, U256}; +use alloy_rpc_types::erc4337; +use alloy_sol_types::{SolValue, sol}; +sol! { + #[allow(missing_docs)] + #[derive(Default, Debug, PartialEq, Eq)] + struct UserOperationHashEncoded { + bytes32 encodedHash; + address entryPoint; + uint256 chainId; + } + + #[allow(missing_docs)] + #[derive(Default, Debug, PartialEq, Eq)] + struct UserOperationPackedForHash { + address sender; + uint256 nonce; + bytes32 hashInitCode; + bytes32 hashCallData; + uint256 callGasLimit; + uint256 verificationGasLimit; + uint256 preVerificationGas; + uint256 maxFeePerGas; + uint256 maxPriorityFeePerGas; + bytes32 hashPaymasterAndData; + } +} + +impl From for UserOperationPackedForHash { + fn from(op: erc4337::UserOperation) -> UserOperationPackedForHash { + UserOperationPackedForHash { + sender: op.sender, + nonce: op.nonce, + hashInitCode: alloy_primitives::keccak256(op.init_code), + hashCallData: alloy_primitives::keccak256(op.call_data), + callGasLimit: U256::from(op.call_gas_limit), + verificationGasLimit: U256::from(op.verification_gas_limit), + preVerificationGas: U256::from(op.pre_verification_gas), + maxFeePerGas: U256::from(op.max_fee_per_gas), + maxPriorityFeePerGas: U256::from(op.max_priority_fee_per_gas), + hashPaymasterAndData: alloy_primitives::keccak256(op.paymaster_and_data), + } + } +} + +pub fn hash_user_operation( + user_operation: &erc4337::UserOperation, + entry_point: alloy_primitives::Address, + chain_id: ChainId, +) -> alloy_primitives::B256 { + let packed = UserOperationPackedForHash::from(user_operation.clone()); + let encoded = UserOperationHashEncoded { + encodedHash: alloy_primitives::keccak256(packed.abi_encode()), + entryPoint: entry_point, + chainId: U256::from(chain_id), + }; + alloy_primitives::keccak256(encoded.abi_encode()) +} + +#[cfg(test)] +mod tests { + use super::*; + use alloy_primitives::{Bytes, U256, address, b256, bytes}; + use alloy_rpc_types::erc4337; + + #[test] + fn test_hash_zeroed() { + let entry_point_address_v0_6 = address!("66a15edcc3b50a663e72f1457ffd49b9ae284ddc"); + let chain_id = 1337; + let user_op_with_zeroed_init_code = erc4337::UserOperation { + sender: address!("0x0000000000000000000000000000000000000000"), + nonce: U256::ZERO, + init_code: Bytes::default(), + call_data: Bytes::default(), + call_gas_limit: U256::from(0), + verification_gas_limit: U256::from(0), + pre_verification_gas: U256::from(0), + max_fee_per_gas: U256::from(0), + max_priority_fee_per_gas: U256::from(0), + paymaster_and_data: Bytes::default(), + signature: Bytes::default(), + }; + + let hash = hash_user_operation( + &user_op_with_zeroed_init_code, + entry_point_address_v0_6, + chain_id, + ); + assert_eq!( + hash, + b256!("dca97c3b49558ab360659f6ead939773be8bf26631e61bb17045bb70dc983b2d") + ); + } + + #[test] + fn test_hash_non_zeroed() { + let entry_point_address_v0_6 = address!("66a15edcc3b50a663e72f1457ffd49b9ae284ddc"); + let chain_id = 1337; + let user_op_with_non_zeroed_init_code = erc4337::UserOperation { + sender: address!("0x1306b01bc3e4ad202612d3843387e94737673f53"), + nonce: U256::from(8942), + init_code: "0x6942069420694206942069420694206942069420" + .parse() + .unwrap(), + call_data: "0x0000000000000000000000000000000000000000080085" + .parse() + .unwrap(), + call_gas_limit: U256::from(10_000), + verification_gas_limit: U256::from(100_000), + pre_verification_gas: U256::from(100), + max_fee_per_gas: U256::from(99_999), + max_priority_fee_per_gas: U256::from(9_999_999), + paymaster_and_data: bytes!( + "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" + ), + signature: bytes!("da0929f527cded8d0a1eaf2e8861d7f7e2d8160b7b13942f99dd367df4473a"), + }; + + let hash = hash_user_operation( + &user_op_with_non_zeroed_init_code, + entry_point_address_v0_6, + chain_id, + ); + assert_eq!( + hash, + b256!("484add9e4d8c3172d11b5feb6a3cc712280e176d278027cfa02ee396eb28afa1") + ); + } +} diff --git a/crates/account-abstraction-core/core/src/entrypoints/v07.rs b/crates/account-abstraction-core/core/src/entrypoints/v07.rs new file mode 100644 index 0000000..60d8fd4 --- /dev/null +++ b/crates/account-abstraction-core/core/src/entrypoints/v07.rs @@ -0,0 +1,180 @@ +/* + * ERC-4337 v0.7 UserOperation Hash Calculation + * + * 1. Hash variable-length fields: initCode, callData, paymasterAndData + * 2. Pack all fields into struct (using hashes from step 1, gas values as bytes32) + * 3. encodedHash = keccak256(abi.encode(packed struct)) + * 4. final hash = keccak256(abi.encode(encodedHash, entryPoint, chainId)) + * + * Reference: rundler/crates/types/src/user_operation/v0_7.rs:1094-1123 + */ +use alloy_primitives::{Address, ChainId, FixedBytes, U256}; +use alloy_primitives::{Bytes, keccak256}; +use alloy_rpc_types::erc4337; +use alloy_sol_types::{SolValue, sol}; + +sol!( + #[allow(missing_docs)] + #[derive(Default, Debug, PartialEq, Eq)] + struct PackedUserOperation { + address sender; + uint256 nonce; + bytes initCode; + bytes callData; + bytes32 accountGasLimits; + uint256 preVerificationGas; + bytes32 gasFees; + bytes paymasterAndData; + bytes signature; + } + + #[derive(Default, Debug, PartialEq, Eq)] + struct UserOperationHashEncoded { + bytes32 encodedHash; + address entryPoint; + uint256 chainId; + } + + #[derive(Default, Debug, PartialEq, Eq)] + struct UserOperationPackedForHash { + address sender; + uint256 nonce; + bytes32 hashInitCode; + bytes32 hashCallData; + bytes32 accountGasLimits; + uint256 preVerificationGas; + bytes32 gasFees; + bytes32 hashPaymasterAndData; + } +); + +impl From for PackedUserOperation { + fn from(uo: erc4337::PackedUserOperation) -> Self { + let init_code = if let Some(factory) = uo.factory { + let mut init_code = factory.to_vec(); + init_code.extend_from_slice(&uo.factory_data.clone().unwrap_or_default()); + Bytes::from(init_code) + } else { + Bytes::new() + }; + let account_gas_limits = + pack_u256_pair_to_bytes32(uo.verification_gas_limit, uo.call_gas_limit); + let gas_fees = pack_u256_pair_to_bytes32(uo.max_priority_fee_per_gas, uo.max_fee_per_gas); + let pvgl: [u8; 16] = uo + .paymaster_verification_gas_limit + .unwrap_or_default() + .to::() + .to_be_bytes(); + let pogl: [u8; 16] = uo + .paymaster_post_op_gas_limit + .unwrap_or_default() + .to::() + .to_be_bytes(); + let paymaster_and_data = if let Some(paymaster) = uo.paymaster { + let mut paymaster_and_data = paymaster.to_vec(); + paymaster_and_data.extend_from_slice(&pvgl); + paymaster_and_data.extend_from_slice(&pogl); + paymaster_and_data.extend_from_slice(&uo.paymaster_data.unwrap()); + Bytes::from(paymaster_and_data) + } else { + Bytes::new() + }; + PackedUserOperation { + sender: uo.sender, + nonce: uo.nonce, + initCode: init_code, + callData: uo.call_data.clone(), + accountGasLimits: account_gas_limits, + preVerificationGas: U256::from(uo.pre_verification_gas), + gasFees: gas_fees, + paymasterAndData: paymaster_and_data, + signature: uo.signature.clone(), + } + } +} +fn pack_u256_pair_to_bytes32(high: U256, low: U256) -> FixedBytes<32> { + let mask = (U256::from(1u64) << 128) - U256::from(1u64); + let hi = high & mask; + let lo = low & mask; + let combined: U256 = (hi << 128) | lo; + FixedBytes::from(combined.to_be_bytes::<32>()) +} + +fn hash_packed_user_operation( + puo: &PackedUserOperation, + entry_point: Address, + chain_id: u64, +) -> FixedBytes<32> { + let hash_init_code = alloy_primitives::keccak256(&puo.initCode); + let hash_call_data = alloy_primitives::keccak256(&puo.callData); + let hash_paymaster_and_data = alloy_primitives::keccak256(&puo.paymasterAndData); + + let packed_for_hash = UserOperationPackedForHash { + sender: puo.sender, + nonce: puo.nonce, + hashInitCode: hash_init_code, + hashCallData: hash_call_data, + accountGasLimits: puo.accountGasLimits, + preVerificationGas: puo.preVerificationGas, + gasFees: puo.gasFees, + hashPaymasterAndData: hash_paymaster_and_data, + }; + + let hashed = alloy_primitives::keccak256(packed_for_hash.abi_encode()); + + let encoded = UserOperationHashEncoded { + encodedHash: hashed, + entryPoint: entry_point, + chainId: U256::from(chain_id), + }; + + keccak256(encoded.abi_encode()) +} + +pub fn hash_user_operation( + user_operation: &erc4337::PackedUserOperation, + entry_point: Address, + chain_id: ChainId, +) -> FixedBytes<32> { + let packed = PackedUserOperation::from(user_operation.clone()); + hash_packed_user_operation(&packed, entry_point, chain_id) +} + +#[cfg(test)] +mod test { + use super::*; + use alloy_primitives::{Bytes, U256}; + use alloy_primitives::{address, b256, bytes, uint}; + + #[test] + fn test_hash() { + let puo = PackedUserOperation { + sender: address!("b292Cf4a8E1fF21Ac27C4f94071Cd02C022C414b"), + nonce: uint!(0xF83D07238A7C8814A48535035602123AD6DBFA63000000000000000000000001_U256), + initCode: Bytes::default(), // Empty + callData: + bytes!("e9ae5c53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000 + 0000000000000000000000000000000000001d8b292cf4a8e1ff21ac27c4f94071cd02c022c414b00000000000000000000000000000000000000000000000000000000000000009517e29f000000000000000000 + 0000000000000000000000000000000000000000000002000000000000000000000000ad6330089d9a1fe89f4020292e1afe9969a5a2fc00000000000000000000000000000000000000000000000000000000000 + 0006000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000000000000000000000000000000000000000018e2fbe898000000000000000000000000000000000000000000000000000000000000000800000000000000 + 0000000000000000000000000000000000000000000000000800000000000000000000000002372912728f93ab3daaaebea4f87e6e28476d987000000000000000000000000000000000000000000000000002386 + f26fc10000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000"), + accountGasLimits: b256!("000000000000000000000000000114fc0000000000000000000000000012c9b5"), + preVerificationGas: U256::from(48916), + gasFees: b256!("000000000000000000000000524121000000000000000000000000109a4a441a"), + paymasterAndData: Bytes::default(), // Empty + signature: bytes!("3c7bfe22c9c2ef8994a9637bcc4df1741c5dc0c25b209545a7aeb20f7770f351479b683bd17c4d55bc32e2a649c8d2dff49dcfcc1f3fd837bcd88d1e69a434cf1c"), + }; + + let expected_hash = + b256!("e486401370d145766c3cf7ba089553214a1230d38662ae532c9b62eb6dadcf7e"); + let uo = hash_packed_user_operation( + &puo, + address!("0x0000000071727De22E5E9d8BAf0edAc6f37da032"), + 11155111, + ); + + assert_eq!(uo, expected_hash); + } +} diff --git a/crates/account-abstraction-core/core/src/entrypoints/version.rs b/crates/account-abstraction-core/core/src/entrypoints/version.rs new file mode 100644 index 0000000..ae37e5d --- /dev/null +++ b/crates/account-abstraction-core/core/src/entrypoints/version.rs @@ -0,0 +1,31 @@ +use alloy_primitives::{Address, address}; + +#[derive(Debug, Clone)] +pub enum EntryPointVersion { + V06, + V07, +} + +impl EntryPointVersion { + pub const V06_ADDRESS: Address = address!("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"); + pub const V07_ADDRESS: Address = address!("0x0000000071727De22E5E9d8BAf0edAc6f37da032"); +} + +#[derive(Debug)] +pub struct UnknownEntryPointAddress { + pub address: Address, +} + +impl TryFrom

for EntryPointVersion { + type Error = UnknownEntryPointAddress; + + fn try_from(addr: Address) -> Result { + if addr == Self::V06_ADDRESS { + Ok(EntryPointVersion::V06) + } else if addr == Self::V07_ADDRESS { + Ok(EntryPointVersion::V07) + } else { + Err(UnknownEntryPointAddress { address: addr }) + } + } +} diff --git a/crates/account-abstraction-core/core/src/lib.rs b/crates/account-abstraction-core/core/src/lib.rs index bb2abc3..fe08aa7 100644 --- a/crates/account-abstraction-core/core/src/lib.rs +++ b/crates/account-abstraction-core/core/src/lib.rs @@ -1,5 +1,5 @@ pub mod account_abstraction_service; +pub mod entrypoints; pub mod types; - pub use account_abstraction_service::{AccountAbstractionService, AccountAbstractionServiceImpl}; -pub use types::{SendUserOperationResponse, UserOperationRequest}; +pub use types::{SendUserOperationResponse, VersionedUserOperation}; diff --git a/crates/account-abstraction-core/core/src/types.rs b/crates/account-abstraction-core/core/src/types.rs index 27e6303..6cc90f0 100644 --- a/crates/account-abstraction-core/core/src/types.rs +++ b/crates/account-abstraction-core/core/src/types.rs @@ -1,15 +1,40 @@ -use alloy_primitives::U256; +use crate::entrypoints::{v06, v07, version::EntryPointVersion}; +use alloy_primitives::{Address, B256, ChainId, U256}; use alloy_rpc_types::erc4337; -use serde::{Deserialize, Serialize}; - -// Re-export SendUserOperationResponse pub use alloy_rpc_types::erc4337::SendUserOperationResponse; +use anyhow::Result; +use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] #[serde(tag = "type")] -pub enum UserOperationRequest { - EntryPointV06(erc4337::UserOperation), - EntryPointV07(erc4337::PackedUserOperation), +pub enum VersionedUserOperation { + UserOperation(erc4337::UserOperation), + PackedUserOperation(erc4337::PackedUserOperation), +} +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +pub struct UserOperationRequest { + pub user_operation: VersionedUserOperation, + pub entry_point: Address, + pub chain_id: ChainId, +} + +impl UserOperationRequest { + pub fn hash(&self) -> Result { + let entry_point_version = EntryPointVersion::try_from(self.entry_point) + .map_err(|_| anyhow::anyhow!("Unknown entry point version: {:#x}", self.entry_point))?; + + match (&self.user_operation, entry_point_version) { + (VersionedUserOperation::UserOperation(op), EntryPointVersion::V06) => Ok( + v06::hash_user_operation(op, self.entry_point, self.chain_id), + ), + (VersionedUserOperation::PackedUserOperation(op), EntryPointVersion::V07) => Ok( + v07::hash_user_operation(op, self.entry_point, self.chain_id), + ), + _ => Err(anyhow::anyhow!( + "Mismatched operation type and entry point version" + )), + } + } } #[derive(Debug, Clone, Serialize, Deserialize)] @@ -30,14 +55,14 @@ mod tests { fn should_throw_error_when_deserializing_invalid() { const TEST_INVALID_USER_OPERATION: &str = r#" { - "type": "EntryPointV06", + "type": "UserOperation", "sender": "0x1111111111111111111111111111111111111111", "nonce": "0x0", "callGasLimit": "0x5208" } "#; - let user_operation: Result = - serde_json::from_str::(TEST_INVALID_USER_OPERATION); + let user_operation: Result = + serde_json::from_str::(TEST_INVALID_USER_OPERATION); assert!(user_operation.is_err()); } @@ -45,7 +70,7 @@ mod tests { fn should_deserialize_v06() { const TEST_USER_OPERATION: &str = r#" { - "type": "EntryPointV06", + "type": "UserOperation", "sender": "0x1111111111111111111111111111111111111111", "nonce": "0x0", "initCode": "0x", @@ -59,14 +84,14 @@ mod tests { "signature": "0x01" } "#; - let user_operation: Result = - serde_json::from_str::(TEST_USER_OPERATION); + let user_operation: Result = + serde_json::from_str::(TEST_USER_OPERATION); if user_operation.is_err() { panic!("Error: {:?}", user_operation.err()); } let user_operation = user_operation.unwrap(); match user_operation { - UserOperationRequest::EntryPointV06(user_operation) => { + VersionedUserOperation::UserOperation(user_operation) => { assert_eq!( user_operation.sender, Address::from_str("0x1111111111111111111111111111111111111111").unwrap() @@ -98,7 +123,7 @@ mod tests { fn should_deserialize_v07() { const TEST_PACKED_USER_OPERATION: &str = r#" { - "type": "EntryPointV07", + "type": "PackedUserOperation", "sender": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", "nonce": "0x1", "factory": "0x2222222222222222222222222222222222222222", @@ -116,14 +141,14 @@ mod tests { "signature": "0xa3c5f1b90014e68abbbdc42e4b77b9accc0b7e1c5d0b5bcde1a47ba8faba00ff55c9a7de12e98b731766e35f6c51ab25c9b58cc0e7c4a33f25e75c51c6ad3c3a" } "#; - let user_operation: Result = - serde_json::from_str::(TEST_PACKED_USER_OPERATION); + let user_operation: Result = + serde_json::from_str::(TEST_PACKED_USER_OPERATION); if user_operation.is_err() { panic!("Error: {:?}", user_operation.err()); } let user_operation = user_operation.unwrap(); match user_operation { - UserOperationRequest::EntryPointV07(user_operation) => { + VersionedUserOperation::PackedUserOperation(user_operation) => { assert_eq!( user_operation.sender, Address::from_str("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48").unwrap() diff --git a/crates/audit/src/reader.rs b/crates/audit/src/reader.rs index 207b8ac..5ecf512 100644 --- a/crates/audit/src/reader.rs +++ b/crates/audit/src/reader.rs @@ -13,7 +13,7 @@ use tokio::time::sleep; use tracing::{debug, error}; pub fn create_kafka_consumer(kafka_properties_file: &str) -> Result { - let client_config = + let client_config: ClientConfig = ClientConfig::from_iter(load_kafka_config_from_file(kafka_properties_file)?); let consumer: StreamConsumer = client_config.create()?; Ok(consumer) diff --git a/crates/core/src/user_ops_types.rs b/crates/core/src/user_ops_types.rs deleted file mode 100644 index 837e51f..0000000 --- a/crates/core/src/user_ops_types.rs +++ /dev/null @@ -1,139 +0,0 @@ -use alloy_rpc_types::erc4337; -use serde::{Deserialize, Serialize}; - -// Re-export SendUserOperationResponse -pub use alloy_rpc_types::erc4337::SendUserOperationResponse; - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] -#[serde(tag = "type")] -pub enum UserOperationRequest { - EntryPointV06(erc4337::UserOperation), - EntryPointV07(erc4337::PackedUserOperation), -} - -// Tests -#[cfg(test)] -mod tests { - use std::str::FromStr; - - use super::*; - use alloy_primitives::{Address, Bytes, Uint}; - #[test] - fn should_throw_error_when_deserializing_invalid() { - const TEST_INVALID_USER_OPERATION: &str = r#" - { - "type": "EntryPointV06", - "sender": "0x1111111111111111111111111111111111111111", - "nonce": "0x0", - "callGasLimit": "0x5208" - } - "#; - let user_operation: Result = - serde_json::from_str::(TEST_INVALID_USER_OPERATION); - assert!(user_operation.is_err()); - } - - #[test] - fn should_deserialize_v06() { - const TEST_USER_OPERATION: &str = r#" - { - "type": "EntryPointV06", - "sender": "0x1111111111111111111111111111111111111111", - "nonce": "0x0", - "initCode": "0x", - "callData": "0x", - "callGasLimit": "0x5208", - "verificationGasLimit": "0x100000", - "preVerificationGas": "0x10000", - "maxFeePerGas": "0x59682f10", - "maxPriorityFeePerGas": "0x3b9aca00", - "paymasterAndData": "0x", - "signature": "0x01" - } - "#; - let user_operation: Result = - serde_json::from_str::(TEST_USER_OPERATION); - if user_operation.is_err() { - panic!("Error: {:?}", user_operation.err()); - } - let user_operation = user_operation.unwrap(); - match user_operation { - UserOperationRequest::EntryPointV06(user_operation) => { - assert_eq!( - user_operation.sender, - Address::from_str("0x1111111111111111111111111111111111111111").unwrap() - ); - assert_eq!(user_operation.nonce, Uint::from(0)); - assert_eq!(user_operation.init_code, Bytes::from_str("0x").unwrap()); - assert_eq!(user_operation.call_data, Bytes::from_str("0x").unwrap()); - assert_eq!(user_operation.call_gas_limit, Uint::from(0x5208)); - assert_eq!(user_operation.verification_gas_limit, Uint::from(0x100000)); - assert_eq!(user_operation.pre_verification_gas, Uint::from(0x10000)); - assert_eq!(user_operation.max_fee_per_gas, Uint::from(0x59682f10)); - assert_eq!( - user_operation.max_priority_fee_per_gas, - Uint::from(0x3b9aca00) - ); - assert_eq!( - user_operation.paymaster_and_data, - Bytes::from_str("0x").unwrap() - ); - assert_eq!(user_operation.signature, Bytes::from_str("0x01").unwrap()); - } - _ => { - panic!("Expected EntryPointV06, got {:?}", user_operation); - } - } - } - - #[test] - fn should_deserialize_v07() { - const TEST_PACKED_USER_OPERATION: &str = r#" - { - "type": "EntryPointV07", - "sender": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", - "nonce": "0x1", - "factory": "0x2222222222222222222222222222222222222222", - "factoryData": "0xabcdef1234560000000000000000000000000000000000000000000000000000", - "callData": "0xb61d27f600000000000000000000000000000000000000000000000000000000000000c8", - "callGasLimit": "0x2dc6c0", - "verificationGasLimit": "0x1e8480", - "preVerificationGas": "0x186a0", - "maxFeePerGas": "0x77359400", - "maxPriorityFeePerGas": "0x3b9aca00", - "paymaster": "0x3333333333333333333333333333333333333333", - "paymasterVerificationGasLimit": "0x186a0", - "paymasterPostOpGasLimit": "0x27100", - "paymasterData": "0xfafb00000000000000000000000000000000000000000000000000000000000064", - "signature": "0xa3c5f1b90014e68abbbdc42e4b77b9accc0b7e1c5d0b5bcde1a47ba8faba00ff55c9a7de12e98b731766e35f6c51ab25c9b58cc0e7c4a33f25e75c51c6ad3c3a" - } - "#; - let user_operation: Result = - serde_json::from_str::(TEST_PACKED_USER_OPERATION); - if user_operation.is_err() { - panic!("Error: {:?}", user_operation.err()); - } - let user_operation = user_operation.unwrap(); - match user_operation { - UserOperationRequest::EntryPointV07(user_operation) => { - assert_eq!( - user_operation.sender, - Address::from_str("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48").unwrap() - ); - assert_eq!(user_operation.nonce, Uint::from(1)); - assert_eq!( - user_operation.call_data, - alloy_primitives::bytes!( - "0xb61d27f600000000000000000000000000000000000000000000000000000000000000c8" - ) - ); - assert_eq!(user_operation.call_gas_limit, Uint::from(0x2dc6c0)); - assert_eq!(user_operation.verification_gas_limit, Uint::from(0x1e8480)); - assert_eq!(user_operation.pre_verification_gas, Uint::from(0x186a0)); - } - _ => { - panic!("Expected EntryPointV07, got {:?}", user_operation); - } - } - } -} diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index e1e460f..af15a4b 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -40,6 +40,7 @@ metrics.workspace = true metrics-derive.workspace = true metrics-exporter-prometheus.workspace = true axum.workspace = true +serde.workspace = true [dev-dependencies] wiremock.workspace = true diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 0265dde..67da612 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -12,7 +12,7 @@ use tips_ingress_rpc::Config; use tips_ingress_rpc::connect_ingress_to_builder; use tips_ingress_rpc::health::bind_health_server; use tips_ingress_rpc::metrics::init_prometheus_exporter; -use tips_ingress_rpc::queue::KafkaQueuePublisher; +use tips_ingress_rpc::queue::KafkaMessageQueue; use tips_ingress_rpc::service::{IngressApiServer, IngressService, Providers}; use tokio::sync::{broadcast, mpsc}; use tracing::info; @@ -62,7 +62,7 @@ async fn main() -> anyhow::Result<()> { let queue_producer: FutureProducer = ingress_client_config.create()?; - let queue = KafkaQueuePublisher::new(queue_producer, config.ingress_topic); + let queue = KafkaMessageQueue::new(queue_producer); let audit_client_config = ClientConfig::from_iter(load_kafka_config_from_file(&config.audit_kafka_properties)?); diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index d39837f..10d4d4c 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -3,7 +3,6 @@ pub mod metrics; pub mod queue; pub mod service; pub mod validation; - use alloy_primitives::TxHash; use alloy_provider::{Provider, ProviderBuilder, RootProvider}; use clap::Parser; @@ -86,6 +85,14 @@ pub struct Config { )] pub audit_topic: String, + /// User operation topic for pushing valid user operations + #[arg( + long, + env = "TIPS_INGRESS_KAFKA_USER_OPERATION_TOPIC", + default_value = "tips-user-operation" + )] + pub user_operation_topic: String, + #[arg(long, env = "TIPS_INGRESS_LOG_LEVEL", default_value = "info")] pub log_level: String, diff --git a/crates/ingress-rpc/src/queue.rs b/crates/ingress-rpc/src/queue.rs index c3df12a..ee6063c 100644 --- a/crates/ingress-rpc/src/queue.rs +++ b/crates/ingress-rpc/src/queue.rs @@ -1,55 +1,52 @@ +use account_abstraction_core::types::VersionedUserOperation; use alloy_primitives::B256; use anyhow::Result; use async_trait::async_trait; use backon::{ExponentialBuilder, Retryable}; use rdkafka::producer::{FutureProducer, FutureRecord}; +use std::sync::Arc; use tips_core::AcceptedBundle; use tokio::time::Duration; use tracing::{error, info}; -/// A queue to buffer transactions #[async_trait] -pub trait QueuePublisher: Send + Sync { - async fn publish(&self, bundle: &AcceptedBundle, bundle_hash: &B256) -> Result<()>; +pub trait MessageQueue: Send + Sync { + async fn publish(&self, topic: &str, key: &str, payload: &[u8]) -> Result<()>; } -/// A queue to buffer transactions -pub struct KafkaQueuePublisher { + +pub struct KafkaMessageQueue { producer: FutureProducer, - topic: String, } -impl KafkaQueuePublisher { - pub fn new(producer: FutureProducer, topic: String) -> Self { - Self { producer, topic } +impl KafkaMessageQueue { + pub fn new(producer: FutureProducer) -> Self { + Self { producer } } } #[async_trait] -impl QueuePublisher for KafkaQueuePublisher { - async fn publish(&self, bundle: &AcceptedBundle, bundle_hash: &B256) -> Result<()> { - let key = bundle_hash.to_string(); - let payload = serde_json::to_vec(&bundle)?; - +impl MessageQueue for KafkaMessageQueue { + async fn publish(&self, topic: &str, key: &str, payload: &[u8]) -> Result<()> { let enqueue = || async { - let record = FutureRecord::to(&self.topic).key(&key).payload(&payload); + let record = FutureRecord::to(topic).key(key).payload(payload); match self.producer.send(record, Duration::from_secs(5)).await { Ok((partition, offset)) => { info!( - bundle_hash = %bundle_hash, + key = %key, partition = partition, offset = offset, - topic = %self.topic, - "Successfully enqueued bundle" + topic = %topic, + "Successfully enqueued message" ); Ok(()) } Err((err, _)) => { error!( - bundle_hash = %bundle_hash, + key = key, error = %err, - topic = %self.topic, - "Failed to enqueue bundle" + topic = topic, + "Failed to enqueue message" ); Err(anyhow::anyhow!("Failed to enqueue bundle: {err}")) } @@ -64,12 +61,46 @@ impl QueuePublisher for KafkaQueuePublisher { .with_max_times(3), ) .notify(|err: &anyhow::Error, dur: Duration| { - info!("retrying to enqueue bundle {:?} after {:?}", err, dur); + info!("retrying to enqueue message {:?} after {:?}", err, dur); }) .await } } +pub struct UserOpQueuePublisher { + queue: Arc, + topic: String, +} + +impl UserOpQueuePublisher { + pub fn new(queue: Arc, topic: String) -> Self { + Self { queue, topic } + } + + pub async fn publish(&self, user_op: &VersionedUserOperation, hash: &B256) -> Result<()> { + let key = hash.to_string(); + let payload = serde_json::to_vec(&user_op)?; + self.queue.publish(&self.topic, &key, &payload).await + } +} + +pub struct BundleQueuePublisher { + queue: Arc, + topic: String, +} + +impl BundleQueuePublisher { + pub fn new(queue: Arc, topic: String) -> Self { + Self { queue, topic } + } + + pub async fn publish(&self, bundle: &AcceptedBundle, hash: &B256) -> Result<()> { + let key = hash.to_string(); + let payload = serde_json::to_vec(bundle)?; + self.queue.publish(&self.topic, &key, &payload).await + } +} + #[cfg(test)] mod tests { use super::*; @@ -92,7 +123,7 @@ mod tests { .create() .expect("Producer creation failed"); - let publisher = KafkaQueuePublisher::new(producer, "tips-ingress-rpc".to_string()); + let publisher = KafkaMessageQueue::new(producer); let bundle = create_test_bundle(); let accepted_bundle = AcceptedBundle::new( bundle.try_into().unwrap(), @@ -101,7 +132,13 @@ mod tests { let bundle_hash = &accepted_bundle.bundle_hash(); let start = Instant::now(); - let result = publisher.publish(&accepted_bundle, bundle_hash).await; + let result = publisher + .publish( + "tips-ingress-rpc", + bundle_hash.to_string().as_str(), + &serde_json::to_vec(&accepted_bundle).unwrap(), + ) + .await; let elapsed = start.elapsed(); // the backoff tries at minimum 100ms, so verify we tried at least once diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 5815d09..2e245c6 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -20,7 +20,7 @@ use tokio::time::{Duration, Instant, timeout}; use tracing::{debug, info, warn}; use crate::metrics::{Metrics, record_histogram}; -use crate::queue::QueuePublisher; +use crate::queue::{BundleQueuePublisher, MessageQueue, UserOpQueuePublisher}; use crate::validation::validate_bundle; use crate::{Config, TxSubmissionMethod}; use account_abstraction_core::types::{SendUserOperationResponse, UserOperationRequest}; @@ -59,13 +59,14 @@ pub trait IngressApi { ) -> RpcResult; } -pub struct IngressService { +pub struct IngressService { mempool_provider: Arc>, simulation_provider: Arc>, raw_tx_forward_provider: Option>>, account_abstraction_service: AccountAbstractionServiceImpl, tx_submission_method: TxSubmissionMethod, - bundle_queue: Queue, + bundle_queue_publisher: BundleQueuePublisher, + user_op_queue_publisher: UserOpQueuePublisher, audit_channel: mpsc::UnboundedSender, send_transaction_default_lifetime_seconds: u64, metrics: Metrics, @@ -76,10 +77,10 @@ pub struct IngressService { builder_backrun_tx: broadcast::Sender, } -impl IngressService { +impl IngressService { pub fn new( providers: Providers, - queue: Queue, + queue: Q, audit_channel: mpsc::UnboundedSender, builder_tx: broadcast::Sender, builder_backrun_tx: broadcast::Sender, @@ -93,14 +94,21 @@ impl IngressService { simulation_provider.clone(), config.validate_user_operation_timeout_ms, ); - + let queue_connection = Arc::new(queue); Self { mempool_provider, simulation_provider, raw_tx_forward_provider, account_abstraction_service, tx_submission_method: config.tx_submission_method, - bundle_queue: queue, + user_op_queue_publisher: UserOpQueuePublisher::new( + queue_connection.clone(), + config.user_operation_topic, + ), + bundle_queue_publisher: BundleQueuePublisher::new( + queue_connection.clone(), + config.ingress_topic, + ), audit_channel, send_transaction_default_lifetime_seconds: config .send_transaction_default_lifetime_seconds, @@ -115,10 +123,7 @@ impl IngressService { } #[async_trait] -impl IngressApiServer for IngressService -where - Queue: QueuePublisher + Sync + Send + 'static, -{ +impl IngressApiServer for IngressService { async fn send_backrun_bundle(&self, bundle: Bundle) -> RpcResult { if !self.backrun_enabled { info!( @@ -166,7 +171,7 @@ where // publish the bundle to the queue if let Err(e) = self - .bundle_queue + .bundle_queue_publisher .publish(&accepted_bundle, &bundle_hash) .await { @@ -236,7 +241,7 @@ where if send_to_kafka { if let Err(e) = self - .bundle_queue + .bundle_queue_publisher .publish(&accepted_bundle, bundle_hash) .await { @@ -291,28 +296,36 @@ where async fn send_user_operation( &self, - user_operation: UserOperationRequest, + user_operation_request: UserOperationRequest, ) -> RpcResult { - dbg!(&user_operation); + let user_op_hash = user_operation_request + .hash() + .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; - // STEPS: - // 1. Reputation Service Validate - // 2. Base Node Validate User Operation let _ = self .account_abstraction_service - .validate_user_operation(user_operation) + .validate_user_operation(&user_operation_request.user_operation) .await?; - // 3. Send to Kafka - // Send Hash - // todo!("not yet implemented send_user_operation"); + + if let Err(e) = self + .user_op_queue_publisher + .publish(&user_operation_request.user_operation, &user_op_hash) + .await + { + warn!( + message = "Failed to publish user operation to queue", + user_operation_hash = %user_op_hash, + error = %e + ); + return Err( + EthApiError::InvalidParams("Failed to queue user operation".into()).into_rpc_err(), + ); + } todo!("not yet implemented send_user_operation"); } } -impl IngressService -where - Queue: QueuePublisher + Sync + Send + 'static, -{ +impl IngressService { async fn get_tx(&self, data: &Bytes) -> RpcResult> { if data.is_empty() { return Err(EthApiError::EmptyRawTransactionData.into_rpc_err()); @@ -429,8 +442,9 @@ where #[cfg(test)] mod tests { use super::*; - use crate::{Config, TxSubmissionMethod, queue::QueuePublisher}; + use crate::{Config, TxSubmissionMethod, queue::MessageQueue}; use alloy_provider::RootProvider; + use anyhow::Result; use async_trait::async_trait; use std::net::{IpAddr, SocketAddr}; use std::str::FromStr; @@ -438,16 +452,11 @@ mod tests { use tokio::sync::{broadcast, mpsc}; use url::Url; use wiremock::{Mock, MockServer, ResponseTemplate, matchers::method}; - struct MockQueue; #[async_trait] - impl QueuePublisher for MockQueue { - async fn publish( - &self, - _bundle: &tips_core::AcceptedBundle, - _bundle_hash: &B256, - ) -> anyhow::Result<()> { + impl MessageQueue for MockQueue { + async fn publish(&self, _topic: &str, _key: &str, _payload: &[u8]) -> Result<()> { Ok(()) } } @@ -476,6 +485,7 @@ mod tests { health_check_addr: SocketAddr::from(([127, 0, 0, 1], 8081)), backrun_enabled: false, raw_tx_forward_rpc: None, + user_operation_topic: String::new(), } } diff --git a/docker-compose.yml b/docker-compose.yml index 5791426..2cadfbf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,6 +39,7 @@ services: sh -c " kafka-topics --create --if-not-exists --topic tips-audit --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 kafka-topics --create --if-not-exists --topic tips-ingress --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 + kafka-topics --create --if-not-exists --topic tips-user-operation --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 kafka-topics --list --bootstrap-server kafka:29092 " From 427dd53972ea7737e3d573eb551134bfba2e5bb2 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Thu, 11 Dec 2025 09:46:12 -0500 Subject: [PATCH 077/117] chore: add debug logs (#102) --- crates/audit/src/lib.rs | 2 +- crates/audit/src/publisher.rs | 4 ++-- crates/audit/src/reader.rs | 1 - crates/ingress-rpc/src/service.rs | 10 ++++++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/crates/audit/src/lib.rs b/crates/audit/src/lib.rs index a9f0eba..049147e 100644 --- a/crates/audit/src/lib.rs +++ b/crates/audit/src/lib.rs @@ -21,7 +21,7 @@ where let mut event_rx = event_rx; while let Some(event) = event_rx.recv().await { if let Err(e) = publisher.publish(event).await { - error!(error = %e, "Failed to publish bundle event"); + error!(error = %e, "failed to publish bundle event"); } } }); diff --git a/crates/audit/src/publisher.rs b/crates/audit/src/publisher.rs index 9dbcffe..bc3004c 100644 --- a/crates/audit/src/publisher.rs +++ b/crates/audit/src/publisher.rs @@ -40,7 +40,7 @@ impl KafkaBundleEventPublisher { bundle_id = %bundle_id, topic = %self.topic, payload_size = payload.len(), - "Successfully published event" + "successfully published event" ); Ok(()) } @@ -49,7 +49,7 @@ impl KafkaBundleEventPublisher { bundle_id = %bundle_id, topic = %self.topic, error = %err, - "Failed to publish event" + "failed to publish event" ); Err(anyhow::anyhow!("Failed to publish event: {err}")) } diff --git a/crates/audit/src/reader.rs b/crates/audit/src/reader.rs index 5ecf512..f58265d 100644 --- a/crates/audit/src/reader.rs +++ b/crates/audit/src/reader.rs @@ -104,7 +104,6 @@ impl EventReader for KafkaAuditLogReader { Ok(event_result) } Err(e) => { - println!("received error {e:?}"); error!(error = %e, "Error receiving message from Kafka"); sleep(Duration::from_secs(1)).await; Err(e.into()) diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 2e245c6..1a2f9d0 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -285,7 +285,13 @@ impl IngressApiServer for IngressService { }); } - self.send_audit_event(&accepted_bundle, transaction.tx_hash()); + debug!( + message = "processed transaction", + bundle_hash = %bundle_hash, + transaction_hash = %transaction.tx_hash(), + ); + + self.send_audit_event(&accepted_bundle, accepted_bundle.bundle_hash()); self.metrics .send_raw_transaction_duration @@ -431,7 +437,7 @@ impl IngressService { }; if let Err(e) = self.audit_channel.send(audit_event) { warn!( - message = "Failed to send audit event", + message = "failed to send audit event", bundle_hash = %bundle_hash, error = %e ); From 8263c306efb0e73d0b7ca319f119fdbb7e3cd78f Mon Sep 17 00:00:00 2001 From: Rayyan Alam <62478924+rayyan224@users.noreply.github.com> Date: Mon, 15 Dec 2025 11:33:18 -0500 Subject: [PATCH 078/117] Chore Normalize Ingress Specs to Match Eth Send User Operation (#104) * chore: start normalizing * chore: complete pushing to validation service * chore: updat logs and clean up specs * chore: clean up * chore: remove un used --- Cargo.lock | 386 +++++++++++++++--- .../core/src/account_abstraction_service.rs | 35 +- .../core/src/types.rs | 193 +++++---- crates/ingress-rpc/Cargo.toml | 7 +- crates/ingress-rpc/src/lib.rs | 4 + crates/ingress-rpc/src/service.rs | 165 +++++++- 6 files changed, 623 insertions(+), 167 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6faa529..49c509f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -93,7 +93,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -120,7 +120,7 @@ dependencies = [ "alloy-rlp", "crc", "serde", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -146,7 +146,7 @@ dependencies = [ "borsh", "k256", "serde", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -171,7 +171,7 @@ dependencies = [ "serde", "serde_with", "sha2", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -194,7 +194,7 @@ dependencies = [ "op-alloy-rpc-types-engine", "op-revm", "revm", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -247,7 +247,7 @@ dependencies = [ "http 1.3.1", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", "tracing", ] @@ -274,7 +274,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -305,7 +305,7 @@ dependencies = [ "op-alloy-consensus", "op-revm", "revm", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -380,7 +380,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", "tokio", "tracing", "url", @@ -506,7 +506,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -520,7 +520,7 @@ dependencies = [ "alloy-serde", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -546,7 +546,7 @@ dependencies = [ "either", "elliptic-curve 0.13.8", "k256", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -562,7 +562,7 @@ dependencies = [ "async-trait", "k256", "rand 0.8.5", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -650,7 +650,7 @@ dependencies = [ "parking_lot", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", "tokio", "tower", "tracing", @@ -1832,7 +1832,7 @@ dependencies = [ "serde_json", "serde_repr", "serde_urlencoded", - "thiserror", + "thiserror 2.0.17", "tokio", "tokio-util", "tower-service", @@ -1938,6 +1938,12 @@ dependencies = [ "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cexpr" version = "0.6.0" @@ -2037,6 +2043,16 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "const-hex" version = "1.17.0" @@ -2453,6 +2469,12 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + [[package]] name = "dunce" version = "1.0.5" @@ -2777,6 +2799,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fragile" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619" + [[package]] name = "fs_extra" version = "1.3.0" @@ -3249,6 +3277,7 @@ dependencies = [ "http 1.3.1", "hyper 1.8.0", "hyper-util", + "log", "rustls 0.23.35", "rustls-native-certs 0.8.2", "rustls-pki-types", @@ -3561,6 +3590,28 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "jobserver" version = "0.1.34" @@ -3588,6 +3639,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3f48dc3e6b8bd21e15436c1ddd0bc22a6a54e8ec46fedd6adf3425f396ec6a" dependencies = [ "jsonrpsee-core", + "jsonrpsee-http-client", "jsonrpsee-proc-macros", "jsonrpsee-server", "jsonrpsee-types", @@ -3614,12 +3666,35 @@ dependencies = [ "rustc-hash", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", "tokio", "tower", "tracing", ] +[[package]] +name = "jsonrpsee-http-client" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790bedefcec85321e007ff3af84b4e417540d5c87b3c9779b9e247d1bcc3dab8" +dependencies = [ + "base64 0.22.1", + "http-body 1.0.1", + "hyper 1.8.0", + "hyper-rustls 0.27.7", + "hyper-util", + "jsonrpsee-core", + "jsonrpsee-types", + "rustls 0.23.35", + "rustls-platform-verifier", + "serde", + "serde_json", + "thiserror 2.0.17", + "tokio", + "tower", + "url", +] + [[package]] name = "jsonrpsee-proc-macros" version = "0.26.0" @@ -3652,7 +3727,7 @@ dependencies = [ "serde", "serde_json", "soketto", - "thiserror", + "thiserror 2.0.17", "tokio", "tokio-stream", "tokio-util", @@ -3669,7 +3744,7 @@ dependencies = [ "http 1.3.1", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -3902,7 +3977,7 @@ dependencies = [ "metrics", "metrics-util", "quanta", - "thiserror", + "thiserror 2.0.17", "tokio", "tracing", ] @@ -3955,6 +4030,32 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "mockall" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.110", +] + [[package]] name = "modular-bitfield" version = "0.11.2" @@ -4169,7 +4270,7 @@ dependencies = [ "alloy-serde", "derive_more", "serde", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -4210,7 +4311,7 @@ dependencies = [ "op-alloy-consensus", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -4229,7 +4330,7 @@ dependencies = [ "ethereum_ssz_derive", "op-alloy-consensus", "snap", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -4565,6 +4666,32 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "predicates" +version = "3.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573" +dependencies = [ + "anstyle", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa" + +[[package]] +name = "predicates-tree" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c" +dependencies = [ + "predicates-core", + "termtree", +] + [[package]] name = "prettyplease" version = "0.2.37" @@ -4689,7 +4816,7 @@ dependencies = [ "rustc-hash", "rustls 0.23.35", "socket2 0.6.1", - "thiserror", + "thiserror 2.0.17", "tokio", "tracing", "web-time", @@ -4710,7 +4837,7 @@ dependencies = [ "rustls 0.23.35", "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.17", "tinyvec", "tracing", "web-time", @@ -5090,7 +5217,7 @@ dependencies = [ "auto_impl", "reth-execution-types", "reth-primitives-traits", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -5125,7 +5252,7 @@ dependencies = [ "reth-consensus", "reth-execution-errors", "reth-storage-errors", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -5146,7 +5273,7 @@ dependencies = [ "reth-ethereum-primitives", "reth-primitives-traits", "serde", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -5210,7 +5337,7 @@ dependencies = [ "alloy-rlp", "nybbles", "reth-storage-errors", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -5238,7 +5365,7 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea8 dependencies = [ "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -5277,7 +5404,7 @@ dependencies = [ "reth-network-peers", "reth-network-types", "reth-tokio-util", - "thiserror", + "thiserror 2.0.17", "tokio", "tokio-stream", ] @@ -5313,7 +5440,7 @@ dependencies = [ "alloy-rlp", "secp256k1 0.30.0", "serde_with", - "thiserror", + "thiserror 2.0.17", "url", ] @@ -5352,7 +5479,7 @@ dependencies = [ "reth-primitives-traits", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -5376,7 +5503,7 @@ dependencies = [ "reth-storage-errors", "reth-trie-common", "revm", - "thiserror", + "thiserror 2.0.17", "tracing", ] @@ -5404,7 +5531,7 @@ dependencies = [ "reth-primitives-traits", "reth-storage-errors", "revm", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -5460,7 +5587,7 @@ dependencies = [ "secp256k1 0.30.0", "serde", "serde_with", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -5472,7 +5599,7 @@ dependencies = [ "derive_more", "serde", "strum", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -5505,7 +5632,7 @@ dependencies = [ "reth-evm", "reth-primitives-traits", "revm-context", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -5549,7 +5676,7 @@ dependencies = [ "revm-inspectors", "schnellru", "serde", - "thiserror", + "thiserror 2.0.17", "tokio", "tokio-stream", "tracing", @@ -5628,7 +5755,7 @@ dependencies = [ "reth-prune-types", "reth-static-file-types", "revm-database-interface", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -5641,7 +5768,7 @@ dependencies = [ "futures-util", "metrics", "reth-metrics", - "thiserror", + "thiserror 2.0.17", "tokio", "tracing", "tracing-futures", @@ -5690,7 +5817,7 @@ dependencies = [ "serde", "serde_json", "smallvec", - "thiserror", + "thiserror 2.0.17", "tokio", "tokio-stream", "tracing", @@ -5908,7 +6035,7 @@ dependencies = [ "revm", "serde", "serde_json", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -6143,6 +6270,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" dependencies = [ "aws-lc-rs", + "log", "once_cell", "ring", "rustls-pki-types", @@ -6203,6 +6331,33 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.35", + "rustls-native-certs 0.8.2", + "rustls-platform-verifier-android", + "rustls-webpki 0.103.8", + "security-framework 3.5.1", + "security-framework-sys", + "webpki-root-certs 0.26.11", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -6249,6 +6404,15 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "schannel" version = "0.1.28" @@ -6652,7 +6816,7 @@ checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 2.0.17", "time", ] @@ -6886,6 +7050,12 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "termtree" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" + [[package]] name = "testcontainers" version = "0.23.3" @@ -6907,7 +7077,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 2.0.17", "tokio", "tokio-stream", "tokio-tar", @@ -6924,13 +7094,33 @@ dependencies = [ "testcontainers", ] +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + [[package]] name = "thiserror" version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl", + "thiserror-impl 2.0.17", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.110", ] [[package]] @@ -7094,14 +7284,13 @@ dependencies = [ "metrics", "metrics-derive", "metrics-exporter-prometheus", + "mockall", "op-alloy-consensus", "op-alloy-network", "op-revm", "rdkafka", "reth-optimism-evm", "reth-rpc-eth-types", - "revm-context-interface", - "serde", "serde_json", "tips-audit", "tips-core", @@ -7515,6 +7704,16 @@ dependencies = [ "libc", ] +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -7631,6 +7830,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-root-certs" +version = "0.26.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e" +dependencies = [ + "webpki-root-certs 1.0.4", +] + +[[package]] +name = "webpki-root-certs" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee3e3b5f5e80bc89f30ce8d0343bf4e5f12341c51f3e26cbeecbc7c85443e85b" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "winapi" version = "0.3.9" @@ -7647,6 +7864,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -7712,6 +7938,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -7748,6 +7983,21 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -7796,6 +8046,12 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -7814,6 +8070,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -7832,6 +8094,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -7862,6 +8130,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -7880,6 +8154,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -7898,6 +8178,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -7916,6 +8202,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" diff --git a/crates/account-abstraction-core/core/src/account_abstraction_service.rs b/crates/account-abstraction-core/core/src/account_abstraction_service.rs index 4a19f1d..d6c65a0 100644 --- a/crates/account-abstraction-core/core/src/account_abstraction_service.rs +++ b/crates/account-abstraction-core/core/src/account_abstraction_service.rs @@ -1,4 +1,5 @@ -use crate::types::{UserOperationRequestValidationResult, VersionedUserOperation}; +use crate::types::{ValidationResult, VersionedUserOperation}; +use alloy_primitives::Address; use alloy_provider::{Provider, RootProvider}; use async_trait::async_trait; use jsonrpsee::core::RpcResult; @@ -11,7 +12,8 @@ pub trait AccountAbstractionService: Send + Sync { async fn validate_user_operation( &self, user_operation: &VersionedUserOperation, - ) -> RpcResult; + entry_point: &Address, + ) -> RpcResult; } #[derive(Debug, Clone)] @@ -25,10 +27,12 @@ impl AccountAbstractionService for AccountAbstractionServiceImpl { async fn validate_user_operation( &self, user_operation: &VersionedUserOperation, - ) -> RpcResult { + entry_point: &Address, + ) -> RpcResult { // Steps: Reputation Service Validate // Steps: Base Node Validate User Operation - self.base_node_validate_user_operation(user_operation).await + self.base_node_validate_user_operation(user_operation, entry_point) + .await } } @@ -46,16 +50,17 @@ impl AccountAbstractionServiceImpl { pub async fn base_node_validate_user_operation( &self, user_operation: &VersionedUserOperation, - ) -> RpcResult { + entry_point: &Address, + ) -> RpcResult { let result = timeout( Duration::from_secs(self.validate_user_operation_timeout), self.simulation_provider .client() - .request("base_validateUserOperation", (user_operation,)), + .request("base_validateUserOperation", (user_operation, entry_point)), ) .await; - let validation_result: UserOperationRequestValidationResult = match result { + let validation_result: ValidationResult = match result { Err(_) => { return Err( EthApiError::InvalidParams("Timeout on requesting validation".into()) @@ -126,7 +131,7 @@ mod tests { let user_operation = new_test_user_operation_v06(); let result = service - .base_node_validate_user_operation(&user_operation) + .base_node_validate_user_operation(&user_operation, &Address::ZERO) .await; assert!(result.is_err()); @@ -153,7 +158,7 @@ mod tests { let user_operation = new_test_user_operation_v06(); let result = service - .base_node_validate_user_operation(&user_operation) + .base_node_validate_user_operation(&user_operation, &Address::ZERO) .await; assert!(result.is_err()); assert!(result.unwrap_err().to_string().contains("Internal error")); @@ -167,8 +172,11 @@ mod tests { "jsonrpc": "2.0", "id": 1, "result": { - "expirationTimestamp": 1000, - "gasUsed": "10000" + "valid": true, + "reason": null, + "valid_until": null, + "valid_after": null, + "context": null } }))) .mount(&mock_server) @@ -178,11 +186,10 @@ mod tests { let user_operation = new_test_user_operation_v06(); let result = service - .base_node_validate_user_operation(&user_operation) + .base_node_validate_user_operation(&user_operation, &Address::ZERO) .await .unwrap(); - assert_eq!(result.expiration_timestamp, 1000); - assert_eq!(result.gas_used, U256::from(10_000)); + assert_eq!(result.valid, true); } } diff --git a/crates/account-abstraction-core/core/src/types.rs b/crates/account-abstraction-core/core/src/types.rs index 6cc90f0..03e3eb2 100644 --- a/crates/account-abstraction-core/core/src/types.rs +++ b/crates/account-abstraction-core/core/src/types.rs @@ -6,7 +6,7 @@ use anyhow::Result; use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] -#[serde(tag = "type")] +#[serde(untagged)] pub enum VersionedUserOperation { UserOperation(erc4337::UserOperation), PackedUserOperation(erc4337::PackedUserOperation), @@ -44,33 +44,82 @@ pub struct UserOperationRequestValidationResult { pub gas_used: U256, } +/// Validation result for User Operations +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct ValidationResult { + /// Whether the UserOp is valid + pub valid: bool, + /// Error message if not valid + #[serde(skip_serializing_if = "Option::is_none")] + pub reason: Option, + /// Timestamp until the UserOp is valid (0 = no expiry) + #[serde(skip_serializing_if = "Option::is_none")] + pub valid_until: Option, + /// Timestamp after which the UserOp is valid (0 = immediately) + #[serde(skip_serializing_if = "Option::is_none")] + pub valid_after: Option, + /// Entity stake/deposit context + #[serde(skip_serializing_if = "Option::is_none")] + pub context: Option, +} + +/// Entity stake/deposit information context +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct ValidationContext { + /// Sender (account) stake info + pub sender_info: EntityStakeInfo, + /// Factory stake info (if present) + #[serde(skip_serializing_if = "Option::is_none")] + pub factory_info: Option, + /// Paymaster stake info (if present) + #[serde(skip_serializing_if = "Option::is_none")] + pub paymaster_info: Option, + /// Aggregator stake info (if present) + #[serde(skip_serializing_if = "Option::is_none")] + pub aggregator_info: Option, +} + +/// Stake info for an entity (used in RPC response) +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct EntityStakeInfo { + /// Entity address + pub address: Address, + /// Amount staked + pub stake: U256, + /// Unstake delay in seconds + pub unstake_delay_sec: u64, + /// Amount deposited for gas + pub deposit: U256, + /// Whether entity meets staking requirements + pub is_staked: bool, +} + +/// Aggregator stake info (used in RPC response) +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct AggregatorInfo { + /// Aggregator address + pub aggregator: Address, + /// Stake info + pub stake_info: EntityStakeInfo, +} + // Tests #[cfg(test)] mod tests { use std::str::FromStr; use super::*; - use alloy_primitives::{Address, Bytes, Uint}; - #[test] - fn should_throw_error_when_deserializing_invalid() { - const TEST_INVALID_USER_OPERATION: &str = r#" - { - "type": "UserOperation", - "sender": "0x1111111111111111111111111111111111111111", - "nonce": "0x0", - "callGasLimit": "0x5208" - } - "#; - let user_operation: Result = - serde_json::from_str::(TEST_INVALID_USER_OPERATION); - assert!(user_operation.is_err()); - } + use alloy_primitives::{Address, Uint}; #[test] - fn should_deserialize_v06() { - const TEST_USER_OPERATION: &str = r#" + fn deser_untagged_user_operation_without_type_field() { + // v0.6 shape, no "type" key + let json = r#" { - "type": "UserOperation", "sender": "0x1111111111111111111111111111111111111111", "nonce": "0x0", "initCode": "0x", @@ -83,90 +132,56 @@ mod tests { "paymasterAndData": "0x", "signature": "0x01" } - "#; - let user_operation: Result = - serde_json::from_str::(TEST_USER_OPERATION); - if user_operation.is_err() { - panic!("Error: {:?}", user_operation.err()); - } - let user_operation = user_operation.unwrap(); - match user_operation { - VersionedUserOperation::UserOperation(user_operation) => { + "#; + + let parsed: VersionedUserOperation = + serde_json::from_str(json).expect("should deserialize as v0.6"); + match parsed { + VersionedUserOperation::UserOperation(op) => { assert_eq!( - user_operation.sender, + op.sender, Address::from_str("0x1111111111111111111111111111111111111111").unwrap() ); - assert_eq!(user_operation.nonce, Uint::from(0)); - assert_eq!(user_operation.init_code, Bytes::from_str("0x").unwrap()); - assert_eq!(user_operation.call_data, Bytes::from_str("0x").unwrap()); - assert_eq!(user_operation.call_gas_limit, Uint::from(0x5208)); - assert_eq!(user_operation.verification_gas_limit, Uint::from(0x100000)); - assert_eq!(user_operation.pre_verification_gas, Uint::from(0x10000)); - assert_eq!(user_operation.max_fee_per_gas, Uint::from(0x59682f10)); - assert_eq!( - user_operation.max_priority_fee_per_gas, - Uint::from(0x3b9aca00) - ); - assert_eq!( - user_operation.paymaster_and_data, - Bytes::from_str("0x").unwrap() - ); - assert_eq!(user_operation.signature, Bytes::from_str("0x01").unwrap()); - } - _ => { - panic!("Expected EntryPointV06, got {:?}", user_operation); + assert_eq!(op.nonce, Uint::from(0)); } + other => panic!("expected UserOperation, got {:?}", other), } } #[test] - fn should_deserialize_v07() { - const TEST_PACKED_USER_OPERATION: &str = r#" + fn deser_untagged_packed_user_operation_without_type_field() { + // v0.7 shape, no "type" key + let json = r#" { - "type": "PackedUserOperation", - "sender": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", - "nonce": "0x1", - "factory": "0x2222222222222222222222222222222222222222", - "factoryData": "0xabcdef1234560000000000000000000000000000000000000000000000000000", - "callData": "0xb61d27f600000000000000000000000000000000000000000000000000000000000000c8", - "callGasLimit": "0x2dc6c0", - "verificationGasLimit": "0x1e8480", - "preVerificationGas": "0x186a0", - "maxFeePerGas": "0x77359400", - "maxPriorityFeePerGas": "0x3b9aca00", - "paymaster": "0x3333333333333333333333333333333333333333", - "paymasterVerificationGasLimit": "0x186a0", - "paymasterPostOpGasLimit": "0x27100", - "paymasterData": "0xfafb00000000000000000000000000000000000000000000000000000000000064", - "signature": "0xa3c5f1b90014e68abbbdc42e4b77b9accc0b7e1c5d0b5bcde1a47ba8faba00ff55c9a7de12e98b731766e35f6c51ab25c9b58cc0e7c4a33f25e75c51c6ad3c3a" - } - "#; - let user_operation: Result = - serde_json::from_str::(TEST_PACKED_USER_OPERATION); - if user_operation.is_err() { - panic!("Error: {:?}", user_operation.err()); + "sender": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + "nonce": "0x1", + "factory": "0x2222222222222222222222222222222222222222", + "factoryData": "0xabcdef1234560000000000000000000000000000000000000000000000000000", + "callData": "0xb61d27f600000000000000000000000000000000000000000000000000000000000000c8", + "callGasLimit": "0x2dc6c0", + "verificationGasLimit": "0x1e8480", + "preVerificationGas": "0x186a0", + "maxFeePerGas": "0x77359400", + "maxPriorityFeePerGas": "0x3b9aca00", + "paymaster": "0x3333333333333333333333333333333333333333", + "paymasterVerificationGasLimit": "0x186a0", + "paymasterPostOpGasLimit": "0x27100", + "paymasterData": "0xfafb00000000000000000000000000000000000000000000000000000000000064", + "signature": "0xa3c5f1b90014e68abbbdc42e4b77b9accc0b7e1c5d0b5bcde1a47ba8faba00ff55c9a7de12e98b731766e35f6c51ab25c9b58cc0e7c4a33f25e75c51c6ad3c3a" } - let user_operation = user_operation.unwrap(); - match user_operation { - VersionedUserOperation::PackedUserOperation(user_operation) => { + "#; + + let parsed: VersionedUserOperation = + serde_json::from_str(json).expect("should deserialize as v0.7 packed"); + match parsed { + VersionedUserOperation::PackedUserOperation(op) => { assert_eq!( - user_operation.sender, + op.sender, Address::from_str("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48").unwrap() ); - assert_eq!(user_operation.nonce, Uint::from(1)); - assert_eq!( - user_operation.call_data, - alloy_primitives::bytes!( - "0xb61d27f600000000000000000000000000000000000000000000000000000000000000c8" - ) - ); - assert_eq!(user_operation.call_gas_limit, Uint::from(0x2dc6c0)); - assert_eq!(user_operation.verification_gas_limit, Uint::from(0x1e8480)); - assert_eq!(user_operation.pre_verification_gas, Uint::from(0x186a0)); - } - _ => { - panic!("Expected EntryPointV07, got {:?}", user_operation); + assert_eq!(op.nonce, Uint::from(1)); } + other => panic!("expected PackedUserOperation, got {:?}", other), } } } diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index af15a4b..21e7704 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -14,7 +14,7 @@ path = "src/bin/main.rs" [dependencies] tips-core.workspace = true tips-audit.workspace = true -account-abstraction-core.workspace=true +account-abstraction-core.workspace = true jsonrpsee.workspace = true alloy-primitives.workspace = true op-alloy-network.workspace = true @@ -33,15 +33,14 @@ serde_json.workspace = true async-trait.workspace = true backon.workspace = true op-revm.workspace = true -revm-context-interface.workspace = true alloy-signer-local.workspace = true reth-optimism-evm.workspace = true metrics.workspace = true metrics-derive.workspace = true metrics-exporter-prometheus.workspace = true axum.workspace = true -serde.workspace = true [dev-dependencies] wiremock.workspace = true -serde_json.workspace = true +jsonrpsee = { workspace = true, features = ["server", "http-client", "macros"] } +mockall = "0.13" \ No newline at end of file diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index 10d4d4c..649e120 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -170,6 +170,10 @@ pub struct Config { )] pub health_check_addr: SocketAddr, + /// chain id + #[arg(long, env = "TIPS_INGRESS_CHAIN_ID", default_value = "11")] + pub chain_id: u64, + /// Enable backrun bundle submission to op-rbuilder #[arg(long, env = "TIPS_INGRESS_BACKRUN_ENABLED", default_value = "false")] pub backrun_enabled: bool, diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 1a2f9d0..61e438c 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -1,6 +1,6 @@ use alloy_consensus::transaction::Recovered; use alloy_consensus::{Transaction, transaction::SignerRecoverable}; -use alloy_primitives::{B256, Bytes}; +use alloy_primitives::{Address, B256, Bytes, FixedBytes}; use alloy_provider::{Provider, RootProvider, network::eip2718::Decodable2718}; use jsonrpsee::{ core::{RpcResult, async_trait}, @@ -23,7 +23,8 @@ use crate::metrics::{Metrics, record_histogram}; use crate::queue::{BundleQueuePublisher, MessageQueue, UserOpQueuePublisher}; use crate::validation::validate_bundle; use crate::{Config, TxSubmissionMethod}; -use account_abstraction_core::types::{SendUserOperationResponse, UserOperationRequest}; +use account_abstraction_core::entrypoints::version::EntryPointVersion; +use account_abstraction_core::types::{UserOperationRequest, VersionedUserOperation}; use account_abstraction_core::{AccountAbstractionService, AccountAbstractionServiceImpl}; use std::sync::Arc; @@ -55,8 +56,9 @@ pub trait IngressApi { #[method(name = "sendUserOperation")] async fn send_user_operation( &self, - user_operation: UserOperationRequest, - ) -> RpcResult; + user_operation: VersionedUserOperation, + entry_point: Address, + ) -> RpcResult>; } pub struct IngressService { @@ -302,20 +304,51 @@ impl IngressApiServer for IngressService { async fn send_user_operation( &self, - user_operation_request: UserOperationRequest, - ) -> RpcResult { - let user_op_hash = user_operation_request - .hash() - .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; + rpc_user_operation: VersionedUserOperation, + entry_point: Address, + ) -> RpcResult> { + let entry_point_version = EntryPointVersion::try_from(entry_point).map_err(|_| { + EthApiError::InvalidParams("Unknown entry point version".into()).into_rpc_err() + })?; + + let versioned_user_operation = match (rpc_user_operation, entry_point_version) { + (VersionedUserOperation::UserOperation(op), EntryPointVersion::V06) => { + VersionedUserOperation::UserOperation(op) + } + (VersionedUserOperation::PackedUserOperation(op), EntryPointVersion::V07) => { + VersionedUserOperation::PackedUserOperation(op) + } + _ => { + return Err(EthApiError::InvalidParams( + "User operation type does not match entry point version".into(), + ) + .into_rpc_err()); + } + }; + + let request = UserOperationRequest { + user_operation: versioned_user_operation, + entry_point, + chain_id: 1, + }; + + let user_op_hash = request.hash().map_err(|e| { + warn!(message = "Failed to hash user operation", error = %e); + EthApiError::InvalidParams(e.to_string()).into_rpc_err() + })?; let _ = self .account_abstraction_service - .validate_user_operation(&user_operation_request.user_operation) - .await?; + .validate_user_operation(&request.user_operation, &entry_point) + .await + .map_err(|e| { + warn!(message = "Failed to validate user operation", error = %e); + EthApiError::InvalidParams(e.to_string()).into_rpc_err() + })?; if let Err(e) = self .user_op_queue_publisher - .publish(&user_operation_request.user_operation, &user_op_hash) + .publish(&request.user_operation, &user_op_hash) .await { warn!( @@ -327,7 +360,8 @@ impl IngressApiServer for IngressService { EthApiError::InvalidParams("Failed to queue user operation".into()).into_rpc_err(), ); } - todo!("not yet implemented send_user_operation"); + + Ok(user_op_hash) } } @@ -452,6 +486,11 @@ mod tests { use alloy_provider::RootProvider; use anyhow::Result; use async_trait::async_trait; + use jsonrpsee::core::client::ClientT; + use jsonrpsee::http_client::{HttpClient, HttpClientBuilder}; + use jsonrpsee::server::{ServerBuilder, ServerHandle}; + use mockall::mock; + use serde_json::json; use std::net::{IpAddr, SocketAddr}; use std::str::FromStr; use tips_core::test_utils::create_test_meter_bundle_response; @@ -491,10 +530,40 @@ mod tests { health_check_addr: SocketAddr::from(([127, 0, 0, 1], 8081)), backrun_enabled: false, raw_tx_forward_rpc: None, + chain_id: 11, user_operation_topic: String::new(), } } + async fn setup_rpc_server(mock: MockIngressApi) -> (HttpClient, ServerHandle) { + let server = ServerBuilder::default().build("127.0.0.1:0").await.unwrap(); + + let addr = server.local_addr().unwrap(); + let handle = server.start(mock.into_rpc()); + + let client = HttpClientBuilder::default() + .build(format!("http://{}", addr)) + .unwrap(); + + (client, handle) + } + + fn sample_user_operation_v06() -> serde_json::Value { + json!({ + "sender": "0x773d604960feccc5c2ce1e388595268187cf62bf", + "nonce": "0x19b0ffe729f0000000000000000", + "initCode": "0x9406cc6185a346906296840746125a0e449764545fbfb9cf000000000000000000000000f886bc0b4f161090096b82ac0c5eb7349add429d0000000000000000000000000000000000000000000000000000000000000000", + "callData": "0xb61d27f600000000000000000000000066519fcaee1ed65bc9e0acc25ccd900668d3ed490000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000443f84ac0e000000000000000000000000773d604960feccc5c2ce1e388595268187cf62bf000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000", + "callGasLimit": "0x5a3c", + "verificationGasLimit": "0x5b7c7", + "preVerificationGas": "0x1001744e6", + "maxFeePerGas": "0x889fca3c", + "maxPriorityFeePerGas": "0x1e8480", + "paymasterAndData": "0x", + "signature": "0x42eff6474dd0b7efd0ca3070e05ee0f3e3c6c665176b80c7768f59445d3415de30b65c4c6ae35c45822b726e8827a986765027e7e2d7d2a8d72c9cf0d23194b81c" + }) + } + #[tokio::test] async fn test_timeout_logic() { let timeout_duration = Duration::from_millis(100); @@ -647,4 +716,74 @@ mod tests { // wiremock automatically verifies expect(1) when forward_server is dropped } + mock! { + pub IngressApi {} + + #[async_trait] + impl IngressApiServer for IngressApi { + async fn send_bundle(&self, bundle: Bundle) -> RpcResult; + async fn send_backrun_bundle(&self, bundle: Bundle) -> RpcResult; + async fn cancel_bundle(&self, request: CancelBundle) -> RpcResult<()>; + async fn send_raw_transaction(&self, tx: Bytes) -> RpcResult; + async fn send_user_operation( + &self, + user_operation: VersionedUserOperation, + entry_point: Address, + ) -> RpcResult>; + } + } + #[tokio::test] + async fn test_send_user_operation_accepts_valid_payload() { + let mut mock = MockIngressApi::new(); + mock.expect_send_user_operation() + .times(1) + .returning(|_, _| Ok(FixedBytes::ZERO)); + + let (client, _handle) = setup_rpc_server(mock).await; + + let user_op = sample_user_operation_v06(); + let entry_point = + account_abstraction_core::entrypoints::version::EntryPointVersion::V06_ADDRESS; + + let result: Result, _> = client + .request("eth_sendUserOperation", (user_op, entry_point)) + .await; + + assert!(result.is_ok()); + } + + #[tokio::test] + async fn test_send_user_operation_rejects_invalid_payload() { + let mut mock = MockIngressApi::new(); + mock.expect_send_user_operation() + .times(0) + .returning(|_, _| Ok(FixedBytes::ZERO)); + + let (client, _handle) = setup_rpc_server(mock).await; + + let user_op = sample_user_operation_v06(); + + // Missing entry point argument should be rejected by the RPC layer + let result: Result, _> = + client.request("eth_sendUserOperation", (user_op,)).await; + + assert!(result.is_err()); + + let wrong_user_op = json!({ + "nonce": "0x19b0ffe729f0000000000000000", + "callGasLimit": "0x5a3c", + "verificationGasLimit": "0x5b7c7", + "preVerificationGas": "0x1001744e6", + "maxFeePerGas": "0x889fca3c", + "maxPriorityFeePerGas": "0x1e8480", + "paymasterAndData": "0x", + "signature": "0x42eff6474dd0b7efd0ca3070e05ee0f3e3c6c665176b80c7768f59445d3415de30b65c4c6ae35c45822b726e8827a986765027e7e2d7d2a8d72c9cf0d23194b81c" + }); + + let wrong_user_op_result: Result, _> = client + .request("eth_sendUserOperation", (wrong_user_op, Address::ZERO)) + .await; + + assert!(wrong_user_op_result.is_err()); + } } From e6209634bda8c2842c6fe0a75eaef99e17da8131 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Mon, 15 Dec 2025 12:33:32 -0500 Subject: [PATCH 079/117] chore: add ingress rpc metrics (#105) * chore: add ingress rpc metrics * bump logs * remove non error log --- crates/ingress-rpc/src/metrics.rs | 18 ++++++++++++++++++ crates/ingress-rpc/src/service.rs | 12 +++++++++++- ui/src/lib/s3.ts | 1 - 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/crates/ingress-rpc/src/metrics.rs b/crates/ingress-rpc/src/metrics.rs index 1b7c8a5..c899b56 100644 --- a/crates/ingress-rpc/src/metrics.rs +++ b/crates/ingress-rpc/src/metrics.rs @@ -18,6 +18,24 @@ pub fn record_histogram(rpc_latency: Duration, rpc: String) { #[derive(Metrics, Clone)] #[metrics(scope = "tips_ingress_rpc")] pub struct Metrics { + #[metric(describe = "Number of valid transactions received")] + pub transactions_received: Counter, + + #[metric(describe = "Number of valid bundles parsed")] + pub bundles_parsed: Counter, + + #[metric(describe = "Number of bundles simulated")] + pub successful_simulations: Counter, + + #[metric(describe = "Number of bundles simulated")] + pub failed_simulations: Counter, + + #[metric(describe = "Number of bundles sent to kafka")] + pub sent_to_kafka: Counter, + + #[metric(describe = "Number of transactions sent to mempool")] + pub sent_to_mempool: Counter, + #[metric(describe = "Duration of validate_tx")] pub validate_tx_duration: Histogram, diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 61e438c..f0d3341 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -204,6 +204,8 @@ impl IngressApiServer for IngressService { let start = Instant::now(); let transaction = self.get_tx(&data).await?; + self.metrics.transactions_received.increment(1); + let send_to_kafka = matches!( self.tx_submission_method, TxSubmissionMethod::Kafka | TxSubmissionMethod::MempoolAndKafka @@ -225,6 +227,7 @@ impl IngressApiServer for IngressService { reverting_tx_hashes: vec![transaction.tx_hash()], ..Default::default() }; + let parsed_bundle: ParsedBundle = bundle .clone() .try_into() @@ -232,10 +235,15 @@ impl IngressApiServer for IngressService { let bundle_hash = &parsed_bundle.bundle_hash(); + self.metrics.bundles_parsed.increment(1); + let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await.ok(); if let Some(meter_info) = meter_bundle_response.as_ref() { + self.metrics.successful_simulations.increment(1); _ = self.builder_tx.send(meter_info.clone()); + } else { + self.metrics.failed_simulations.increment(1); } let accepted_bundle = @@ -250,6 +258,7 @@ impl IngressApiServer for IngressService { warn!(message = "Failed to publish Queue::enqueue_bundle", bundle_hash = %bundle_hash, error = %e); } + self.metrics.sent_to_kafka.increment(1); info!(message="queued singleton bundle", txn_hash=%transaction.tx_hash()); } @@ -260,6 +269,7 @@ impl IngressApiServer for IngressService { .await; match response { Ok(_) => { + self.metrics.sent_to_mempool.increment(1); debug!(message = "sent transaction to the mempool", hash=%transaction.tx_hash()); } Err(e) => { @@ -287,7 +297,7 @@ impl IngressApiServer for IngressService { }); } - debug!( + info!( message = "processed transaction", bundle_hash = %bundle_hash, transaction_hash = %transaction.tx_hash(), diff --git a/ui/src/lib/s3.ts b/ui/src/lib/s3.ts index 229fdad..4b0263a 100644 --- a/ui/src/lib/s3.ts +++ b/ui/src/lib/s3.ts @@ -60,7 +60,6 @@ async function getObjectContent(key: string): Promise { const body = await response.Body?.transformToString(); return body || null; } catch (error) { - console.error(`Failed to get S3 object ${key}:`, error); return null; } } From 7d8934ef7a8a45be5281a22567c1d206013eb47a Mon Sep 17 00:00:00 2001 From: cody-wang-cb Date: Mon, 15 Dec 2025 16:49:48 -0500 Subject: [PATCH 080/117] chore: add more audit kafka metrics (#107) --- Cargo.lock | 4 ++- crates/audit/Cargo.toml | 2 ++ crates/audit/src/archiver.rs | 46 +++++++++++++++++++++++------- crates/audit/src/bin/main.rs | 8 ++++++ crates/audit/src/lib.rs | 1 + crates/audit/src/metrics.rs | 36 +++++++++++++++++++++++ crates/audit/src/storage.rs | 31 +++++++++++++++++++- crates/core/Cargo.toml | 1 + crates/core/src/lib.rs | 1 + crates/core/src/metrics.rs | 9 ++++++ crates/ingress-rpc/Cargo.toml | 1 - crates/ingress-rpc/src/bin/main.rs | 2 +- crates/ingress-rpc/src/metrics.rs | 16 ----------- 13 files changed, 127 insertions(+), 31 deletions(-) create mode 100644 crates/audit/src/metrics.rs create mode 100644 crates/core/src/metrics.rs diff --git a/Cargo.lock b/Cargo.lock index 49c509f..ce9af07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7232,6 +7232,8 @@ dependencies = [ "bytes", "clap", "dotenvy", + "metrics", + "metrics-derive", "op-alloy-consensus", "rdkafka", "serde", @@ -7255,6 +7257,7 @@ dependencies = [ "alloy-rpc-types", "alloy-serde", "alloy-signer-local", + "metrics-exporter-prometheus", "op-alloy-consensus", "op-alloy-flz", "op-alloy-rpc-types", @@ -7283,7 +7286,6 @@ dependencies = [ "jsonrpsee", "metrics", "metrics-derive", - "metrics-exporter-prometheus", "mockall", "op-alloy-consensus", "op-alloy-network", diff --git a/crates/audit/Cargo.toml b/crates/audit/Cargo.toml index 25cf7e3..09892b8 100644 --- a/crates/audit/Cargo.toml +++ b/crates/audit/Cargo.toml @@ -32,6 +32,8 @@ aws-config = { workspace = true } aws-sdk-s3 = { workspace = true } aws-credential-types = { workspace = true } bytes = { workspace = true } +metrics = { workspace = true } +metrics-derive = { workspace = true } [dev-dependencies] testcontainers = { workspace = true } diff --git a/crates/audit/src/archiver.rs b/crates/audit/src/archiver.rs index b5a645c..f9163c3 100644 --- a/crates/audit/src/archiver.rs +++ b/crates/audit/src/archiver.rs @@ -1,7 +1,8 @@ +use crate::metrics::Metrics; use crate::reader::EventReader; use crate::storage::EventWriter; use anyhow::Result; -use std::time::Duration; +use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; use tokio::time::sleep; use tracing::{error, info}; @@ -12,6 +13,7 @@ where { reader: R, writer: W, + metrics: Metrics, } impl KafkaAuditArchiver @@ -20,25 +22,47 @@ where W: EventWriter, { pub fn new(reader: R, writer: W) -> Self { - Self { reader, writer } + Self { + reader, + writer, + metrics: Metrics::default(), + } } pub async fn run(&mut self) -> Result<()> { info!("Starting Kafka bundle archiver"); loop { + let read_start = Instant::now(); match self.reader.read_event().await { Ok(event) => { + self.metrics + .kafka_read_duration + .record(read_start.elapsed().as_secs_f64()); + + let now_ms = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64; + let event_age_ms = now_ms.saturating_sub(event.timestamp); + self.metrics.event_age.record(event_age_ms as f64); + + let archive_start = Instant::now(); if let Err(e) = self.writer.archive_event(event).await { - error!( - error = %e, - "Failed to write event" - ); - } else if let Err(e) = self.reader.commit().await { - error!( - error = %e, - "Failed to commit message" - ); + error!(error = %e, "Failed to write event"); + } else { + self.metrics + .archive_event_duration + .record(archive_start.elapsed().as_secs_f64()); + self.metrics.events_processed.increment(1); + + let commit_start = Instant::now(); + if let Err(e) = self.reader.commit().await { + error!(error = %e, "Failed to commit message"); + } + self.metrics + .kafka_commit_duration + .record(commit_start.elapsed().as_secs_f64()); } } Err(e) => { diff --git a/crates/audit/src/bin/main.rs b/crates/audit/src/bin/main.rs index 19ac1bf..870efc3 100644 --- a/crates/audit/src/bin/main.rs +++ b/crates/audit/src/bin/main.rs @@ -4,10 +4,12 @@ use aws_credential_types::Credentials; use aws_sdk_s3::{Client as S3Client, config::Builder as S3ConfigBuilder}; use clap::{Parser, ValueEnum}; use rdkafka::consumer::Consumer; +use std::net::SocketAddr; use tips_audit::{ KafkaAuditArchiver, KafkaAuditLogReader, S3EventReaderWriter, create_kafka_consumer, }; use tips_core::logger::init_logger_with_format; +use tips_core::metrics::init_prometheus_exporter; use tracing::info; #[derive(Debug, Clone, ValueEnum)] @@ -48,6 +50,9 @@ struct Args { #[arg(long, env = "TIPS_AUDIT_S3_SECRET_ACCESS_KEY")] s3_secret_access_key: Option, + + #[arg(long, env = "TIPS_AUDIT_METRICS_ADDR", default_value = "0.0.0.0:9002")] + metrics_addr: SocketAddr, } #[tokio::main] @@ -58,10 +63,13 @@ async fn main() -> Result<()> { init_logger_with_format(&args.log_level, args.log_format); + init_prometheus_exporter(args.metrics_addr).expect("Failed to install Prometheus exporter"); + info!( kafka_properties_file = %args.kafka_properties_file, kafka_topic = %args.kafka_topic, s3_bucket = %args.s3_bucket, + metrics_addr = %args.metrics_addr, "Starting audit archiver" ); diff --git a/crates/audit/src/lib.rs b/crates/audit/src/lib.rs index 049147e..13c1bf5 100644 --- a/crates/audit/src/lib.rs +++ b/crates/audit/src/lib.rs @@ -1,4 +1,5 @@ pub mod archiver; +pub mod metrics; pub mod publisher; pub mod reader; pub mod storage; diff --git a/crates/audit/src/metrics.rs b/crates/audit/src/metrics.rs new file mode 100644 index 0000000..b12ac67 --- /dev/null +++ b/crates/audit/src/metrics.rs @@ -0,0 +1,36 @@ +use metrics::{Counter, Histogram}; +use metrics_derive::Metrics; + +#[derive(Metrics, Clone)] +#[metrics(scope = "tips_audit")] +pub struct Metrics { + #[metric(describe = "Duration of archive_event")] + pub archive_event_duration: Histogram, + + #[metric(describe = "Age of event when processed (now - event timestamp)")] + pub event_age: Histogram, + + #[metric(describe = "Duration of Kafka read_event")] + pub kafka_read_duration: Histogram, + + #[metric(describe = "Duration of Kafka commit")] + pub kafka_commit_duration: Histogram, + + #[metric(describe = "Duration of update_bundle_history")] + pub update_bundle_history_duration: Histogram, + + #[metric(describe = "Duration of update all transaction indexes")] + pub update_tx_indexes_duration: Histogram, + + #[metric(describe = "Duration of S3 get_object")] + pub s3_get_duration: Histogram, + + #[metric(describe = "Duration of S3 put_object")] + pub s3_put_duration: Histogram, + + #[metric(describe = "Total events processed")] + pub events_processed: Counter, + + #[metric(describe = "Total S3 writes skipped due to dedup")] + pub s3_writes_skipped: Counter, +} diff --git a/crates/audit/src/storage.rs b/crates/audit/src/storage.rs index c8b619f..a1748d8 100644 --- a/crates/audit/src/storage.rs +++ b/crates/audit/src/storage.rs @@ -1,3 +1,4 @@ +use crate::metrics::Metrics; use crate::reader::Event; use crate::types::{BundleEvent, BundleId, DropReason, TransactionId}; use alloy_primitives::TxHash; @@ -10,6 +11,7 @@ use aws_sdk_s3::primitives::ByteStream; use serde::{Deserialize, Serialize}; use std::fmt; use std::fmt::Debug; +use std::time::Instant; use tips_core::AcceptedBundle; use tracing::info; @@ -182,11 +184,16 @@ pub trait BundleEventS3Reader { pub struct S3EventReaderWriter { s3_client: S3Client, bucket: String, + metrics: Metrics, } impl S3EventReaderWriter { pub fn new(s3_client: S3Client, bucket: String) -> Self { - Self { s3_client, bucket } + Self { + s3_client, + bucket, + metrics: Metrics::default(), + } } async fn update_bundle_history(&self, event: Event) -> Result<()> { @@ -221,7 +228,12 @@ impl S3EventReaderWriter { const BASE_DELAY_MS: u64 = 100; for attempt in 0..MAX_RETRIES { + let get_start = Instant::now(); let (current_value, etag) = self.get_object_with_etag::(key).await?; + self.metrics + .s3_get_duration + .record(get_start.elapsed().as_secs_f64()); + let value = current_value.unwrap_or_default(); match transform_fn(value.clone()) { @@ -241,8 +253,12 @@ impl S3EventReaderWriter { put_request = put_request.if_none_match("*"); } + let put_start = Instant::now(); match put_request.send().await { Ok(_) => { + self.metrics + .s3_put_duration + .record(put_start.elapsed().as_secs_f64()); info!( s3_key = %key, attempt = attempt + 1, @@ -251,6 +267,10 @@ impl S3EventReaderWriter { return Ok(()); } Err(e) => { + self.metrics + .s3_put_duration + .record(put_start.elapsed().as_secs_f64()); + if attempt < MAX_RETRIES - 1 { let delay = BASE_DELAY_MS * 2_u64.pow(attempt as u32); info!( @@ -270,6 +290,7 @@ impl S3EventReaderWriter { } } None => { + self.metrics.s3_writes_skipped.increment(1); info!( s3_key = %key, "Transform function returned None, no write required" @@ -328,12 +349,20 @@ impl EventWriter for S3EventReaderWriter { let bundle_id = event.event.bundle_id(); let transaction_ids = event.event.transaction_ids(); + let start = Instant::now(); self.update_bundle_history(event.clone()).await?; + self.metrics + .update_bundle_history_duration + .record(start.elapsed().as_secs_f64()); + let start = Instant::now(); for tx_id in &transaction_ids { self.update_transaction_by_hash_index(tx_id, bundle_id) .await?; } + self.metrics + .update_tx_indexes_duration + .record(start.elapsed().as_secs_f64()); Ok(()) } diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 4543f47..bd7f06d 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -24,6 +24,7 @@ tracing-subscriber.workspace = true op-alloy-flz.workspace = true serde.workspace = true alloy-rpc-types.workspace = true +metrics-exporter-prometheus.workspace = true [dev-dependencies] diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index dedeb11..2ebfc06 100644 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -1,5 +1,6 @@ pub mod kafka; pub mod logger; +pub mod metrics; #[cfg(any(test, feature = "test-utils"))] pub mod test_utils; pub mod types; diff --git a/crates/core/src/metrics.rs b/crates/core/src/metrics.rs new file mode 100644 index 0000000..de365ce --- /dev/null +++ b/crates/core/src/metrics.rs @@ -0,0 +1,9 @@ +use metrics_exporter_prometheus::PrometheusBuilder; +use std::net::SocketAddr; + +pub fn init_prometheus_exporter(addr: SocketAddr) -> Result<(), Box> { + PrometheusBuilder::new() + .with_http_listener(addr) + .install() + .map_err(|e| Box::new(e) as Box) +} diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index 21e7704..813754b 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -37,7 +37,6 @@ alloy-signer-local.workspace = true reth-optimism-evm.workspace = true metrics.workspace = true metrics-derive.workspace = true -metrics-exporter-prometheus.workspace = true axum.workspace = true [dev-dependencies] diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 67da612..0f63290 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -7,11 +7,11 @@ use rdkafka::producer::FutureProducer; use tips_audit::{BundleEvent, KafkaBundleEventPublisher, connect_audit_to_publisher}; use tips_core::kafka::load_kafka_config_from_file; use tips_core::logger::init_logger_with_format; +use tips_core::metrics::init_prometheus_exporter; use tips_core::{Bundle, MeterBundleResponse}; use tips_ingress_rpc::Config; use tips_ingress_rpc::connect_ingress_to_builder; use tips_ingress_rpc::health::bind_health_server; -use tips_ingress_rpc::metrics::init_prometheus_exporter; use tips_ingress_rpc::queue::KafkaMessageQueue; use tips_ingress_rpc::service::{IngressApiServer, IngressService, Providers}; use tokio::sync::{broadcast, mpsc}; diff --git a/crates/ingress-rpc/src/metrics.rs b/crates/ingress-rpc/src/metrics.rs index c899b56..fb53aa5 100644 --- a/crates/ingress-rpc/src/metrics.rs +++ b/crates/ingress-rpc/src/metrics.rs @@ -1,20 +1,12 @@ use metrics::{Counter, Histogram}; use metrics_derive::Metrics; -use metrics_exporter_prometheus::PrometheusBuilder; -use std::net::SocketAddr; use tokio::time::Duration; -/// `record_histogram` lets us record with tags. pub fn record_histogram(rpc_latency: Duration, rpc: String) { metrics::histogram!("tips_ingress_rpc_rpc_latency", "rpc" => rpc) .record(rpc_latency.as_secs_f64()); } -/// Metrics for the `tips_ingress_rpc` component. -/// Conventions: -/// - Durations are recorded in seconds (histograms). -/// - Counters are monotonic event counts. -/// - Gauges reflect the current value/state. #[derive(Metrics, Clone)] #[metrics(scope = "tips_ingress_rpc")] pub struct Metrics { @@ -57,11 +49,3 @@ pub struct Metrics { #[metric(describe = "Total raw transactions forwarded to additional endpoint")] pub raw_tx_forwards_total: Counter, } - -/// Initialize Prometheus metrics exporter -pub fn init_prometheus_exporter(addr: SocketAddr) -> Result<(), Box> { - PrometheusBuilder::new() - .with_http_listener(addr) - .install() - .map_err(|e| Box::new(e) as Box) -} From 6ba09ff1e5f86680dcc66f365d0b8bf9abe94e75 Mon Sep 17 00:00:00 2001 From: William Law Date: Tue, 16 Dec 2025 15:53:14 -0500 Subject: [PATCH 081/117] chore: improve UI readability (#106) --- ui/src/app/block/[hash]/page.tsx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ui/src/app/block/[hash]/page.tsx b/ui/src/app/block/[hash]/page.tsx index 939d9f7..69f54fc 100644 --- a/ui/src/app/block/[hash]/page.tsx +++ b/ui/src/app/block/[hash]/page.tsx @@ -118,14 +118,14 @@ function TransactionRow({ href={`${BLOCK_EXPLORER_URL}/tx/${tx.hash}`} target="_blank" rel="noopener noreferrer" - className="font-mono text-sm text-blue-600 hover:underline truncate" + className="font-mono text-sm text-blue-600 hover:underline break-all" onClick={(e) => e.stopPropagation()} > - {tx.hash.slice(0, 10)}...{tx.hash.slice(-8)} + {tx.hash} ) : ( - - {tx.hash.slice(0, 10)}...{tx.hash.slice(-8)} + + {tx.hash} )} {hasBundle && ( @@ -214,20 +214,20 @@ function BlockStats({ block }: { block: BlockData }) {
- Gas Used - + Gas Used + {block.gasUsed.toLocaleString()}
- Gas Limit - + Gas Limit + {block.gasLimit.toLocaleString()}
- Timestamp - + Timestamp + {new Date(Number(block.timestamp) * 1000).toLocaleString()}
From c254789cdc8e33c60240969c684ff9de14b73a44 Mon Sep 17 00:00:00 2001 From: William Law Date: Tue, 16 Dec 2025 16:31:11 -0500 Subject: [PATCH 082/117] chore: write archive_event async, off the critical path (#109) * chore: write archive_event async, off the critical path * ignore integration concurrent test issue --- crates/audit/src/archiver.rs | 39 ++++++++++++++----------- crates/audit/tests/integration_tests.rs | 1 + 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/crates/audit/src/archiver.rs b/crates/audit/src/archiver.rs index f9163c3..1bd4f50 100644 --- a/crates/audit/src/archiver.rs +++ b/crates/audit/src/archiver.rs @@ -9,7 +9,7 @@ use tracing::{error, info}; pub struct KafkaAuditArchiver where R: EventReader, - W: EventWriter, + W: EventWriter + Clone + Send + 'static, { reader: R, writer: W, @@ -19,7 +19,7 @@ where impl KafkaAuditArchiver where R: EventReader, - W: EventWriter, + W: EventWriter + Clone + Send + 'static, { pub fn new(reader: R, writer: W) -> Self { Self { @@ -47,23 +47,28 @@ where let event_age_ms = now_ms.saturating_sub(event.timestamp); self.metrics.event_age.record(event_age_ms as f64); - let archive_start = Instant::now(); - if let Err(e) = self.writer.archive_event(event).await { - error!(error = %e, "Failed to write event"); - } else { - self.metrics - .archive_event_duration - .record(archive_start.elapsed().as_secs_f64()); - self.metrics.events_processed.increment(1); - - let commit_start = Instant::now(); - if let Err(e) = self.reader.commit().await { - error!(error = %e, "Failed to commit message"); + // TODO: the integration test breaks because Minio doesn't support etag + let writer = self.writer.clone(); + let metrics = self.metrics.clone(); + tokio::spawn(async move { + let archive_start = Instant::now(); + if let Err(e) = writer.archive_event(event).await { + error!(error = %e, "Failed to write event"); + } else { + metrics + .archive_event_duration + .record(archive_start.elapsed().as_secs_f64()); + metrics.events_processed.increment(1); } - self.metrics - .kafka_commit_duration - .record(commit_start.elapsed().as_secs_f64()); + }); + + let commit_start = Instant::now(); + if let Err(e) = self.reader.commit().await { + error!(error = %e, "Failed to commit message"); } + self.metrics + .kafka_commit_duration + .record(commit_start.elapsed().as_secs_f64()); } Err(e) => { error!(error = %e, "Error reading events"); diff --git a/crates/audit/tests/integration_tests.rs b/crates/audit/tests/integration_tests.rs index bb79d24..11543a4 100644 --- a/crates/audit/tests/integration_tests.rs +++ b/crates/audit/tests/integration_tests.rs @@ -11,6 +11,7 @@ mod common; use common::TestHarness; #[tokio::test] +#[ignore = "TODO doesn't appear to work with minio, should test against a real S3 bucket"] async fn test_kafka_publisher_s3_archiver_integration() -> Result<(), Box> { let harness = TestHarness::new().await?; From 0e40c2cf2273a42bc415aece4eededf27d5fab96 Mon Sep 17 00:00:00 2001 From: cody-wang-cb Date: Wed, 17 Dec 2025 16:56:19 -0500 Subject: [PATCH 083/117] feat(bundle): send accepted bundle for backrun and skip metering for backrun bundles (#112) --- crates/ingress-rpc/src/bin/main.rs | 5 +-- crates/ingress-rpc/src/lib.rs | 10 +++--- crates/ingress-rpc/src/service.rs | 58 +++++++++++++++++------------- 3 files changed, 41 insertions(+), 32 deletions(-) diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 0f63290..3076e18 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -8,7 +8,7 @@ use tips_audit::{BundleEvent, KafkaBundleEventPublisher, connect_audit_to_publis use tips_core::kafka::load_kafka_config_from_file; use tips_core::logger::init_logger_with_format; use tips_core::metrics::init_prometheus_exporter; -use tips_core::{Bundle, MeterBundleResponse}; +use tips_core::{AcceptedBundle, MeterBundleResponse}; use tips_ingress_rpc::Config; use tips_ingress_rpc::connect_ingress_to_builder; use tips_ingress_rpc::health::bind_health_server; @@ -75,7 +75,8 @@ async fn main() -> anyhow::Result<()> { let (builder_tx, _) = broadcast::channel::(config.max_buffered_meter_bundle_responses); - let (builder_backrun_tx, _) = broadcast::channel::(config.max_buffered_backrun_bundles); + let (builder_backrun_tx, _) = + broadcast::channel::(config.max_buffered_backrun_bundles); config.builder_rpcs.iter().for_each(|builder_rpc| { let metering_rx = builder_tx.subscribe(); let backrun_rx = builder_backrun_tx.subscribe(); diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index 649e120..f600765 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -9,7 +9,7 @@ use clap::Parser; use op_alloy_network::Optimism; use std::net::{IpAddr, SocketAddr}; use std::str::FromStr; -use tips_core::MeterBundleResponse; +use tips_core::{AcceptedBundle, MeterBundleResponse}; use tokio::sync::broadcast; use tracing::{error, warn}; use url::Url; @@ -185,7 +185,7 @@ pub struct Config { pub fn connect_ingress_to_builder( metering_rx: broadcast::Receiver, - backrun_rx: broadcast::Receiver, + backrun_rx: broadcast::Receiver, builder_rpc: Url, ) { let builder: RootProvider = ProviderBuilder::new() @@ -218,13 +218,13 @@ pub fn connect_ingress_to_builder( tokio::spawn(async move { let mut event_rx = backrun_rx; - while let Ok(bundle) = event_rx.recv().await { + while let Ok(accepted_bundle) = event_rx.recv().await { if let Err(e) = builder .client() - .request::<(tips_core::Bundle,), ()>("base_sendBackrunBundle", (bundle,)) + .request::<(AcceptedBundle,), ()>("base_sendBackrunBundle", (accepted_bundle,)) .await { - error!(error = %e, "Failed to send backrun bundle to builder"); + error!(error = ?e, "Failed to send backrun bundle to builder"); } } }); diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index f0d3341..80c0d71 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -76,7 +76,7 @@ pub struct IngressService { meter_bundle_timeout_ms: u64, builder_tx: broadcast::Sender, backrun_enabled: bool, - builder_backrun_tx: broadcast::Sender, + builder_backrun_tx: broadcast::Sender, } impl IngressService { @@ -85,7 +85,7 @@ impl IngressService { queue: Q, audit_channel: mpsc::UnboundedSender, builder_tx: broadcast::Sender, - builder_backrun_tx: broadcast::Sender, + builder_backrun_tx: broadcast::Sender, config: Config, ) -> Self { let mempool_provider = Arc::new(providers.mempool); @@ -139,11 +139,12 @@ impl IngressApiServer for IngressService { } let start = Instant::now(); - let (accepted_bundle, bundle_hash) = self.validate_parse_and_meter_bundle(&bundle).await?; + let (accepted_bundle, bundle_hash) = + self.validate_parse_and_meter_bundle(&bundle, false).await?; self.metrics.backrun_bundles_received_total.increment(1); - if let Err(e) = self.builder_backrun_tx.send(bundle) { + if let Err(e) = self.builder_backrun_tx.send(accepted_bundle.clone()) { warn!( message = "Failed to send backrun bundle to builders", bundle_hash = %bundle_hash, @@ -161,7 +162,8 @@ impl IngressApiServer for IngressService { } async fn send_bundle(&self, bundle: Bundle) -> RpcResult { - let (accepted_bundle, bundle_hash) = self.validate_parse_and_meter_bundle(&bundle).await?; + let (accepted_bundle, bundle_hash) = + self.validate_parse_and_meter_bundle(&bundle, true).await?; // Get meter_bundle_response for builder broadcast let meter_bundle_response = accepted_bundle.meter_bundle_response.clone(); @@ -215,6 +217,26 @@ impl IngressApiServer for IngressService { TxSubmissionMethod::Mempool | TxSubmissionMethod::MempoolAndKafka ); + // Forward before metering + if let Some(forward_provider) = self.raw_tx_forward_provider.clone() { + self.metrics.raw_tx_forwards_total.increment(1); + let tx_data = data.clone(); + let tx_hash = transaction.tx_hash(); + tokio::spawn(async move { + match forward_provider + .send_raw_transaction(tx_data.iter().as_slice()) + .await + { + Ok(_) => { + debug!(message = "Forwarded raw tx", hash = %tx_hash); + } + Err(e) => { + warn!(message = "Failed to forward raw tx", hash = %tx_hash, error = %e); + } + } + }); + } + let expiry_timestamp = SystemTime::now() .duration_since(UNIX_EPOCH) .unwrap() @@ -278,25 +300,6 @@ impl IngressApiServer for IngressService { } } - if let Some(forward_provider) = self.raw_tx_forward_provider.clone() { - self.metrics.raw_tx_forwards_total.increment(1); - let tx_data = data.clone(); - let tx_hash = transaction.tx_hash(); - tokio::spawn(async move { - match forward_provider - .send_raw_transaction(tx_data.iter().as_slice()) - .await - { - Ok(_) => { - debug!(message = "Forwarded raw tx", hash = %tx_hash); - } - Err(e) => { - warn!(message = "Failed to forward raw tx", hash = %tx_hash, error = %e); - } - } - }); - } - info!( message = "processed transaction", bundle_hash = %bundle_hash, @@ -461,6 +464,7 @@ impl IngressService { async fn validate_parse_and_meter_bundle( &self, bundle: &Bundle, + to_meter: bool, ) -> RpcResult<(AcceptedBundle, B256)> { self.validate_bundle(bundle).await?; let parsed_bundle: ParsedBundle = bundle @@ -468,7 +472,11 @@ impl IngressService { .try_into() .map_err(|e: String| EthApiError::InvalidParams(e).into_rpc_err())?; let bundle_hash = parsed_bundle.bundle_hash(); - let meter_bundle_response = self.meter_bundle(bundle, &bundle_hash).await?; + let meter_bundle_response = if to_meter { + self.meter_bundle(bundle, &bundle_hash).await? + } else { + MeterBundleResponse::default() + }; let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response.clone()); Ok((accepted_bundle, bundle_hash)) } From 9e096da07bb4d8d72f0cdfd7a34cf45e7464652b Mon Sep 17 00:00:00 2001 From: Andrei De Stefani Date: Thu, 18 Dec 2025 22:03:00 +0100 Subject: [PATCH 084/117] feat(audit): add Kafka reader for UserOp events (#103) * feat(audit): add Kafka reader for UserOp events - Add UserOpEventWrapper struct with key, event, timestamp - Add UserOpEventReader trait with read_event() and commit() - Add KafkaUserOpAuditLogReader implementation - Add integration test verifying real Kafka publish/read flow --- .cursor/rules/bugsnag/fix-bugsnag-issues.mdc | 72 ++++ .cursor/rules/coding-workflow.mdc | 19 + .cursor/rules/github/pr-template-format.mdc | 59 +++ .cursor/rules/golang/coding-rules.mdc | 27 ++ .../rules/golang/english-and-comments-std.mdc | 49 +++ .cursor/rules/golang/golang-naming-std.mdc | 69 +++ .cursor/rules/golang/golang-use-getters.mdc | 53 +++ .cursor/rules/golang/grpcclient.mdc | 17 + .../observability/logging-best-practices.mdc | 255 +++++++++++ .../observability/metrics-best-practices.mdc | 136 ++++++ .cursor/rules/python/api-design.mdc | 28 ++ .../rules/python/dependency-management.mdc | 21 + .../rules/python/distributed-computing.mdc | 25 ++ .cursor/rules/python/fastapi-standards.mdc | 41 ++ .cursor/rules/python/infrastructure.mdc | 25 ++ .../python/microservices-architecture.mdc | 36 ++ .cursor/rules/python/python-coding-rules.mdc | 32 ++ .cursor/rules/python/testing-standards.mdc | 28 ++ .cursor/rules/rego/rego-coding-patterns.mdc | 94 ++++ .../Base Account Pull Request Guidelines.md | 172 ++++++++ context/Mini TDD - TIPS 4337 Bundler .docx | Bin 0 -> 306862 bytes .../account-abstraction-core/core/src/lib.rs | 1 + .../core/src/mempool.rs | 403 ++++++++++++++++++ .../core/src/types.rs | 33 +- crates/audit/src/reader.rs | 97 ++++- crates/audit/tests/integration_tests.rs | 57 ++- 26 files changed, 1844 insertions(+), 5 deletions(-) create mode 100644 .cursor/rules/bugsnag/fix-bugsnag-issues.mdc create mode 100644 .cursor/rules/coding-workflow.mdc create mode 100644 .cursor/rules/github/pr-template-format.mdc create mode 100644 .cursor/rules/golang/coding-rules.mdc create mode 100644 .cursor/rules/golang/english-and-comments-std.mdc create mode 100644 .cursor/rules/golang/golang-naming-std.mdc create mode 100644 .cursor/rules/golang/golang-use-getters.mdc create mode 100644 .cursor/rules/golang/grpcclient.mdc create mode 100644 .cursor/rules/observability/logging-best-practices.mdc create mode 100644 .cursor/rules/observability/metrics-best-practices.mdc create mode 100644 .cursor/rules/python/api-design.mdc create mode 100644 .cursor/rules/python/dependency-management.mdc create mode 100644 .cursor/rules/python/distributed-computing.mdc create mode 100644 .cursor/rules/python/fastapi-standards.mdc create mode 100644 .cursor/rules/python/infrastructure.mdc create mode 100644 .cursor/rules/python/microservices-architecture.mdc create mode 100644 .cursor/rules/python/python-coding-rules.mdc create mode 100644 .cursor/rules/python/testing-standards.mdc create mode 100644 .cursor/rules/rego/rego-coding-patterns.mdc create mode 100644 context/Base Account Pull Request Guidelines.md create mode 100644 context/Mini TDD - TIPS 4337 Bundler .docx create mode 100644 crates/account-abstraction-core/core/src/mempool.rs diff --git a/.cursor/rules/bugsnag/fix-bugsnag-issues.mdc b/.cursor/rules/bugsnag/fix-bugsnag-issues.mdc new file mode 100644 index 0000000..630c982 --- /dev/null +++ b/.cursor/rules/bugsnag/fix-bugsnag-issues.mdc @@ -0,0 +1,72 @@ +--- +description: Describes how to handle a request to fix a bugsnag issue +globs: +alwaysApply: false +--- +# Bugsnag Ticket Workflow + +When a user provides a Bugsnag error URL or asks to fix a Bugsnag issue, follow this systematic approach: + +## 1. **Root Cause Analysis** + +### Error Investigation +- Use `mcp_bugsnag-mcp_list-error-events` to get recent events for the error +- Use `mcp_bugsnag-mcp_get-stacktrace` with `include_code: true` and `show_all_frames: true` to get the complete stacktrace +- Analyze the stacktrace to identify: + - The exact line and file where the error occurs + - The call stack that leads to the error + - The error message and context + +### Codebase Investigation +- Read the relevant files identified in the stacktrace +- Search for related code patterns or similar implementations +- Identify the data flow that leads to the problematic state +- Look for edge cases or missing null/undefined checks + +## 2. **Suggest Fixes (No Code Changes)** + +### Analysis Summary +- Provide a clear explanation of what's causing the error +- Identify the specific conditions that trigger the issue +- Explain the impact and severity of the error +- If you can't figure out what is going on, just say so and ask the user for more context + +### Proposed Solutions +- Present 1-3 potential fix approaches with pros/cons +- Suggest relevant tests to prevent regression +- Try to be tactical with your suggestions, avoid large refactors when possible + +### Implementation Recommendations +- Specify which files need to be modified +- Outline the exact changes needed (but don't make them yet) +- Mention any dependencies or related changes required +- Highlight potential breaking changes or compatibility concerns + +## 3. **User Confirmation & Implementation** + +### Get Approval +- Wait for user confirmation on the proposed approach +- Allow for discussion and refinement of the solution +- Clarify any ambiguous requirements or edge cases + +### Implementation & PR Creation +Once the user confirms the approach: +- Follow the below process: + - Making code changes + - Adding tests if needed + +--- + +**Example Workflow:** + +- User: "Fix this Bugsnag issue: https://app.bugsnag.com/" +- Assistant: + 1. Fetches error events and stacktrace from Bugsnag + 2. Analyzes the code to identify root cause + 3. Proposes specific fix approach with explanation + 4. Waits for user confirmation + 5. Making code changes and tests if needed + +--- + +**Note:** This workflow ensures thorough analysis before making changes, reducing the risk of incomplete fixes or introducing new issues while maintaining the systematic approach for PR creation. \ No newline at end of file diff --git a/.cursor/rules/coding-workflow.mdc b/.cursor/rules/coding-workflow.mdc new file mode 100644 index 0000000..a5b8a37 --- /dev/null +++ b/.cursor/rules/coding-workflow.mdc @@ -0,0 +1,19 @@ +--- +description: Coding workflow cursor must follow +globs: +alwaysApply: false +--- +# Coding workflow preferences +- Focus on the areas of code relevant to the task +- Do not touch code that is unrelated to the task +- Avoid making major changes to the patterns and architecture of how a feature works, after it has shown to work well, unless explicitly instructed +- Always think about what other methods and areas of code might be affected by code changes +- Keep code simple and readable +- Write thorough tests for all functionalities you wrote + +Follow this sequential workflow: +1. Write or update existing code +2. Write the incremental unit-test to cover code logic you wrote +3. Test unit-test pass +4. Verify it passes all the tests by running `make test` command +5. Ensue your unit-test has good code coverage for the code you have written diff --git a/.cursor/rules/github/pr-template-format.mdc b/.cursor/rules/github/pr-template-format.mdc new file mode 100644 index 0000000..bcdac6d --- /dev/null +++ b/.cursor/rules/github/pr-template-format.mdc @@ -0,0 +1,59 @@ +--- +description: +globs: +alwaysApply: false +--- +--- +description: Follow PR template format from .github/pull_request_template.md when creating pull request descriptions +globs: "**/*" +alwaysApply: false +--- + +# GitHub Pull Request Template Format + +When creating pull request descriptions, you **must** follow the format specified in `.github/pull_request_template.md` if it exists in the repository. + +## Rule Requirements + +1. **Check for Template**: Always check if `.github/pull_request_template.md` exists in the repository root before creating PR descriptions. + +2. **Use Template Structure**: If the template exists: + - Follow the exact section structure defined in the template + - Include all required sections from the template + - Maintain the same heading levels and formatting style + - Preserve any placeholder text guidelines or instructions + - Fill in the template sections with relevant information for the specific PR + +3. **Template Sections**: Common sections that should be preserved if present in the template include: + - **Summary/Description**: Brief overview of the changes + - **Changes Made**: Detailed list of modifications + - **Testing**: How the changes were tested + - **Type of Change**: Bug fix, feature, documentation, etc. + - **Checklist**: Action items or verification steps + - **Breaking Changes**: Any backward compatibility concerns + - **Related Issues**: Links to related issues or tickets + +4. **Fallback Behavior**: If no template exists, create a well-structured PR description with: + - Clear summary of changes + - Bullet points for key modifications + - Testing information if applicable + - Any relevant context or notes + +## Implementation Guidelines + +- **Read Template First**: Use tools to read the `.github/pull_request_template.md` file content before generating PR descriptions +- **Preserve Formatting**: Maintain markdown formatting, comments, and structure from the template +- **Fill Appropriately**: Replace template placeholders with actual, relevant information +- **Be Comprehensive**: Ensure all template sections are addressed, even if briefly +- **Stay Consistent**: Use the same tone and style as indicated by the template + +## Example Usage + +When creating a PR: +1. Check for `.github/pull_request_template.md` +2. If found, read the template content +3. Generate PR description following the template structure +4. Fill in each section with relevant information +5. Ensure all required sections are included + +This rule ensures consistency across all pull requests in repositories that have established PR templates, while providing a sensible fallback for repositories without templates. diff --git a/.cursor/rules/golang/coding-rules.mdc b/.cursor/rules/golang/coding-rules.mdc new file mode 100644 index 0000000..125cceb --- /dev/null +++ b/.cursor/rules/golang/coding-rules.mdc @@ -0,0 +1,27 @@ +--- +description: Rules to follow when writing code +globs: *.go +--- +You are Staff Software Engineer expert in Golang, Protobuff, GRPC. You write clean and properly docummented code. You ensure code written works, and you always write corresponding Unit-tests. +You are an expert in writing Unit-test, and specialised in updating existing unit-test to fit missing use-cases. + +# Coding pattern preferences +- Always prefer simple solutions. +- Keep the codebase very clean and organized. +- Avoid duplication of code whenever possible, which means checking for other areas of the codebase that might already have similar code and functionality. +- Write code that takes into account the different environments: development, staging, and production. +- You are careful to only make changes that are requested or you are confident are well understood and related to the change being requested. +- When fixing an issue or bug, do not introduce a new pattern or technology without first exhausting all options for the existing implementation. And if you finally do this, make sure to remove the old ipmlementation afterwards so we don't have duplicate logic. +- Avoid having files over 200-300 lines of code. Refactor at that point. +- Mocking data is only needed for tests, never mock data for dev or prod. +- Avoid writing scripts in files if possible, especially if the script is likely only to be run once. +- Never add stubbing or fake data patterns to code that affects the dev or prod environments. +- Never overwrite config *.yml (Yaml) files without first asking and confirming. +- It is acceptable to say you do not know. +- Do not write your own mocks in testing. Follow this sequence: +1. Update Makefile to generate the mock needed. + Following the example for internal packages + `mockgen -source=internal/client/users_service.go -destination=internal/dao/mocks/mock_users_service.go -package=mockdao` + and for external packages follow this: + ` mockgen -destination=mocks/eth_client_mock.go -mock_names EthClient=MockEthClient -package=mocks github.cbhq.net/intl/rip7755-fulfiller/internal/client EthClientmockgen` +2. Update testing code to use the generated mock diff --git a/.cursor/rules/golang/english-and-comments-std.mdc b/.cursor/rules/golang/english-and-comments-std.mdc new file mode 100644 index 0000000..c35cf56 --- /dev/null +++ b/.cursor/rules/golang/english-and-comments-std.mdc @@ -0,0 +1,49 @@ +--- +description: Make sure to always add clear comments within the codebase +globs: *.go +alwaysApply: true +--- +# Standard: Language, Comments, and Documentation + +This rule defines the standards for language use and commenting within the codebase, prioritizing clarity and developer experience for engineers familiar with the project. + +**1. Language:** + +* **All** code artifacts, including variable names, function names, comments, documentation, commit messages, and generated rules, **must** be written in **simple, clear, friendly and idiomatic English**. + +**2. Comments:** + +* **Target Audience:** Assume the reader is an experienced developer familiar with Go and the general project context. +* **Prioritize Readability:** Code should be self-documenting whenever possible through clear naming and structure. +* **Avoid Redundant Comments:** Do **not** add comments that merely restate what the code clearly does. For example: + ```go + // Bad: Comment explains the obvious + // Increment count + count++ + + // Good: Comment starts with the function name + // GetUserByID finds a user by their ID + func GetUserByID(id string) (*User, error) { ... } + ``` +* **Focus on the "Why", Not Just the "What":** Prioritize comments that explain *why* a particular approach was taken, especially if it's non-obvious, involves trade-offs, or relates to external factors or historical context. + * Explain complex logic or algorithms briefly. + * Clarify the purpose of seemingly arbitrary values or constants. + * Document known limitations, potential issues, or future work (`TODO`, `FIXME`). + * Add comments when fixing subtle bugs to explain the reasoning. + ```go + // Good: Explains the rationale for a non-obvious choice + // Use FNV-1a hash for Redis hash tags to optimize for speed and key length, + // as cryptographic security is not required for slot assignment. + func hashUserIDForTag(userID string) string { ... } + + // Good: Explains a workaround or limitation + // TODO(GH-123): Refactor this when the upstream API supports batch requests. + for _, item := range items { ... } + ``` +* **Placement:** Place comments on the line *before* the code they refer to, or sometimes at the end of a line for very short clarifications. + +**3. Documentation (e.g., READMEs, Design Docs):** + +* Maintain clarity and conciseness. +* Keep documentation up-to-date with significant code changes. +* Use diagrams or examples where appropriate to illustrate complex concepts. diff --git a/.cursor/rules/golang/golang-naming-std.mdc b/.cursor/rules/golang/golang-naming-std.mdc new file mode 100644 index 0000000..25a1e96 --- /dev/null +++ b/.cursor/rules/golang/golang-naming-std.mdc @@ -0,0 +1,69 @@ +--- +description: Avoid package prefix redundancy when naming +globs: *.go +alwaysApply: false +--- +# Go Standard: Naming Conventions - Avoid Package Prefix Redundancy + +This rule outlines the standard Go practice for naming exported identifiers to avoid redundancy with the package name. + +**The Standard:** + +When naming exported identifiers (types, functions, variables, constants), **avoid repeating the package name** if the context provided by the package itself makes the identifier clear. + +**Rationale:** + +* **Readability:** Code that imports the package becomes cleaner and less verbose. For example, `store.New()` is more idiomatic and readable than `store.NewStore()`. +* **Conciseness:** Reduces unnecessary stuttering in code (e.g., `store.StoreType` vs. `store.Type`). +* **Idiomatic Go:** Follows the common practice seen in the Go standard library and many popular Go projects. + +**Examples:** + +```go +// --- Package: store --- + +// BAD: Repeats "store" +package store + +type StoreConfig struct { ... } +func NewStore(cfg StoreConfig) (*Store, error) { ... } +var DefaultStoreOptions StoreOptions + +// GOOD: Avoids repeating "store" +package store + +type Config struct { ... } // Type name is clear within package 'store' +func New(cfg Config) (*Store, error) { ... } // Function name 'New' is clear +var DefaultOptions Options // Variable name is clear + +type Store struct { ... } // OK: Identifier itself IS the package name conceptually +``` + +When importing and using the "good" example: + +```go +import "path/to/store" + +// ... +cfg := store.Config{ ... } +activityStore, err := store.New(cfg) +opts := store.DefaultOptions +var s store.Store +``` + +This reads much better than: + +```go +import "path/to/store" + +// ... +cfg := store.StoreConfig{ ... } +activityStore, err := store.NewStore(cfg) +opts := store.DefaultStoreOptions +var s store.Store +``` + +**Exceptions:** + +* It is acceptable if the identifier itself essentially *is* the package name (e.g., `package http; type Client`, `package store; type Store`). +* Sometimes repeating a part of the package name is necessary for clarity if the package has many distinct concepts. diff --git a/.cursor/rules/golang/golang-use-getters.mdc b/.cursor/rules/golang/golang-use-getters.mdc new file mode 100644 index 0000000..149f380 --- /dev/null +++ b/.cursor/rules/golang/golang-use-getters.mdc @@ -0,0 +1,53 @@ +--- +description: Prefer getter methods over direct field access +globs: *.go +alwaysApply: false +--- +# Go Standard: Prefer Getter Methods (Especially for Protobuf) + +This rule encourages the use of getter methods over direct field access, particularly when working with structs generated from Protobuf definitions. + +**The Standard:** + +**Prefer using generated getter methods (e.g., `myProto.GetMyField()`) over direct field access (e.g., `myProto.MyField`) when such getters are available.** This is especially relevant for structs generated by the Protobuf compiler (`protoc-gen-go`). + +**Rationale:** + +* **Encapsulation and Nil Safety:** Getters often provide a layer of abstraction. For Protobuf messages, getters automatically handle `nil` checks for pointer fields (like optional message fields or fields within a `oneof`), returning a zero value instead of causing a panic. This significantly improves robustness. +* **Consistency:** Using getters consistently makes the code easier to read and maintain, aligning with common Go practices for Protobuf. +* **Future-Proofing:** Relying on the getter method decouples the calling code from the exact internal representation of the field. If the underlying field changes in a backward-compatible way (e.g., how a default value is handled), code using the getter is less likely to break. +* **Helper Logic:** Getters might potentially include minor logic (though less common in basic Protobuf getters beyond nil checks). + +**Example (Protobuf):** + +```protobuf +// -- Example.proto -- +message UserProfile { + optional string name = 1; + optional int32 age = 2; +} +``` + +```go +// -- Go code -- +import "path/to/gen/go/examplepb" + +func processProfile(profile *examplepb.UserProfile) { + // GOOD: Uses getter, safe even if profile or profile.Name is nil. + name := profile.GetName() + age := profile.GetAge() // Also handles potential nil receiver safely. + + // BAD: Direct access risks nil pointer dereference if profile is non-nil + // but profile.Name is nil (for optional fields). + // nameDirect := *profile.Name // PANICS if profile.Name is nil! + // ageDirect := *profile.Age // PANICS if profile.Age is nil! + + fmt.Printf("Name: %s, Age: %d\n", name, age) +} +``` + +**Exceptions:** + +* **No Getter Available:** If a struct field does not have a corresponding getter method, direct access is necessary. +* **Performance Critical Code:** In extremely rare, performance-critical sections where profiling has demonstrably shown the function call overhead of the getter to be a bottleneck, direct access *might* be considered cautiously. This should be well-documented and justified. +* **Setting Values:** This rule applies to *reading* values. Setting struct fields typically involves direct assignment. diff --git a/.cursor/rules/golang/grpcclient.mdc b/.cursor/rules/golang/grpcclient.mdc new file mode 100644 index 0000000..5dac8a6 --- /dev/null +++ b/.cursor/rules/golang/grpcclient.mdc @@ -0,0 +1,17 @@ +--- +description: Creating a new grpc connection should use csf's grpcclient, not golang/grpc +globs: *.go +alwaysApply: false +--- +Pull in the package from github.cbhq.net/engineering/csf/grpcclient + +Here is an example of how you should implement it +``` + manager := csf.New() + ctx := manager.ServiceContext() + conn, err := grpcclient.Dial( + ctx, + endpoint, + grpcclient.WithDialOpt(grpc.WithBlock()), + ) +``` \ No newline at end of file diff --git a/.cursor/rules/observability/logging-best-practices.mdc b/.cursor/rules/observability/logging-best-practices.mdc new file mode 100644 index 0000000..52e94b5 --- /dev/null +++ b/.cursor/rules/observability/logging-best-practices.mdc @@ -0,0 +1,255 @@ +--- +description: Rules to follow when logging +globs: ["*.go", "*.py"] +--- +## Rule +Ensure all logging statements are correct, useful, performant, and secure. Logs must accurately reflect the code's logic, provide sufficient context for debugging, avoid performance degradation, and never expose sensitive information. Use appropriate log levels and avoid logging sensitive data, large objects, or high-frequency debug information. + +Refer to [logging best practices](https://docs.cbhq.net/infra/observability/logging) for more details. + +## Scope +This rule ONLY APPLIES when ALL the following conditions are met: +1. Code contains logging statements (logger.debug, log.info, console.log, etc.) +2. The logging exhibits one or more of these problematic patterns (tagged with Defect Patterns and scenarios): + - **(SS-1) Logging Sensitive Data:** Exposing credentials, tokens, PII, or financial data (passwords, API keys, email addresses). + - **(SS-2) Logging Unsanitized Objects:** Logging entire request/response bodies or complex objects without removing sensitive fields. + - **(PF-1) Logging in High-Frequency Loops:** Placing log statements inside tight loops or on other hot paths like function entry/exit logging for every function, causing excessive volume. + - **(LV-1) Improper Log Level:** Using `DEBUG` or `TRACE` in non-development environments. Using `WARN` or `ERROR` for informational messages. + - **(SM-1) Unit/Metric Mismatch:** The unit in the log message (e.g., "ms") does not match the variable's actual unit (e.g., nanoseconds). + - **(SM-2) Message Contradicts Logic:** The log message misrepresents the code's state (e.g., logging "Success" in an `if err!= nil` block). + - **(IS-1) Insufficient Context:** An error log is not actionable because it omits the `error` variable or critical identifiers (e.g., `transaction_id`). + - **(VR-2) Placeholder-Argument Mismatch:** The number of placeholders in a format string (e.g., `%s`) does not match the number of provided variables. + - **(RD-3) Vague or Ambiguous Message:** The log message is too generic to be useful (e.g., "Done", "Error"). + +| Defect Patterns | Scenario Name | +| --- | --- | +| **RD:** Readability Issues | RD-1: Complicated domain-specific terminology
RD-2: Non-standard language used
RD-3: Poorly formatted or unclear messages | +| **VR:** Variable Issues | VR-1: Incorrect variable value logging
VR-2: Placeholder–value mismatch | +| **LV:** Logging Level Issues | LV-1: Improper verbosity level | +| **SM:** Semantics Inconsistent | SM-1: Wrong unit or metric label
SM-2: Message text does not match the code
SM-3: Misused variables in the message | +| **SS:** Sensitive Information | SS-1: Credentials logged in plain text
SS-2: Dumping whole objects without scrubbing | +| **IS:** Insufficient Information | IS-1: Insufficient information | +| **PF:** Performance Issues | PF-1: Logging on hot path
PF-2: Costly string operations | + +## Out of Scope +This rule does NOT apply to: +- ERROR and WARN level logs for genuine issues +- INFO level logs for significant business events +- Structured logging that includes only relevant, non-sensitive fields. +- Logs that are properly sampled or rate-limited +- Test files or development-only code +- Logs that are conditionally enabled for debugging + +## Good Examples + +1. Appropriate log levels with structured data: +```go +logger.Info("User login successful", + "user_id", userID, + "login_method", "oauth", + "ip_address", clientIP, +) +``` + +2. ERROR logs with context but no sensitive data: +```go +logger.Error("Payment processing failed", + "error_code", "INSUFFICIENT_FUNDS", + "transaction_id", txnID, + "user_id", userID, + "retry_count", retryCount, +) +``` +```go +user, err := db.FindUser(userID) +if err!= nil { + logger.Error("Failed to find user", + "error", err, + "user_id", userID, + "trace_id", traceID, + ) + return +} +``` + + +3. Conditional debug logging: +```go +if config.DebugEnabled { + logger.Debug("Processing order for user", "user_id", userID) +} +``` + +4. Sampling high-frequency events: +```go +// Only log 1% of successful requests +if rand.Float32() < 0.01 { + logger.Info("Request processed successfully", + "endpoint", endpoint, + "duration_ms", duration.Milliseconds(), + ) +} +``` + +5. Structured logging with relevant fields: +```go +logger.Info("Order processed", + "order_id", order.ID, + "user_tier", user.Tier, + "payment_method", "card", + "processing_time_ms", processingTime, +) +``` + +6. Summarizing after a loop instead of logging within it: +```go +processedCount := 0 +for _, item := range items { + if err := process(item); err == nil { + processedCount++ + } +} +logger.Info("Batch processing complete", + "total_items", len(items), + "processed_count", processedCount, +) +``` + +7. Logging specific, safe fields instead of a whole object: +```go +logger.Info("User profile updated", + "user_id", user.ID, + "user_tier", user.Tier, + "updated_fields", updatedFields, +) +``` + +8. Ensuring unit consistency in logs +```go +//... operation... +duration := time.Since(startTime) +logger.Info("Request processed", + "duration_ms", duration.Milliseconds(), +) +``` + +## Bad Examples + +1. (LV-1) DEBUG logging in production code: +```go +// DEBUG logs create excessive volume +logger.Debug("Entering function processPayment") +logger.Debug("Validating payment request") +logger.Debug("Connecting to payment gateway") +logger.Debug("Exiting function processPayment") +``` + +2. (PF-1) Logging inside loops: +```go +// Creates massive log volume +for _, item := range items { + logger.Info("Processing item", "item_id", item.ID) + // ... process item +} +``` + +3. (SS-2) Logging entire objects or request bodies: +```go +// Logs potentially sensitive data and large objects +logger.Info("Received request", "request_body", fmt.Sprintf("%+v", requestBody)) +logger.Info("User object", "user", fmt.Sprintf("%+v", user)) +``` +```go +// BAD: Logs the entire user object, potentially exposing PII. +logger.Info("User object details", "user", fmt.Sprintf("%+v", user)) +``` + +4. (SS-1) Logging sensitive information: +```go +// Exposes sensitive data in logs +logger.Info("Authentication attempt", + "email", user.Email, + "password", password, + "api_key", apiKey, + "token", authToken, + "auth_token", authToken, + "bearer_token", bearerToken, + "credit_card", creditCard, +) +``` + +5. (PF-1) Function entry/exit logging everywhere: +```go +// Excessive noise for every function +func calculateTotal(items []Item) float64 { + logger.Debug("Entering calculateTotal") + total := 0.0 + for _, item := range items { + total += item.Price + } + logger.Debug("Exiting calculateTotal", "total", total) + return total +} +``` + +6. (SS-1) Logging URLs with sensitive information: +```go +// Exposes sensitive token in URL parameter +logger.Info("API request", "url", fmt.Sprintf("/api/users/%s/payments/%s?token=%s", userID, paymentID, token)) +``` + +7. (SM-2) Message contradicts code logic: +```go +// BAD: A success message is logged in the error-handling block. +err := processPayment(paymentDetails) +if err!= nil { + logger.Info("Payment processed successfully", "transaction_id", paymentDetails.ID) + //... handle error... +} +``` + +8. (IS-1) Insufficient context in an error log: +```go +// BAD: The log is not actionable because it omits the actual 'err' variable. +err := db.Save(user) +if err!= nil { + logger.Error("Failed to save user to database", "user_id", user.ID) +} +``` + +9. (SM-1) Unit mismatch in the log message: +```go +// BAD: The log text claims "ms" but the variable is in nanoseconds. +startTime := time.Now() +//... operation... +durationNanos := time.Since(startTime).Nanoseconds() +logger.Info(fmt.Sprintf("Task completed in %d ms", durationNanos)) +``` + +10. (VR-2) Placeholder-argument mismatch: +```go +// BAD: Two placeholders but only one argument provided. +logger.Error(fmt.Sprintf("Login for user %s from %s failed", userID)) +``` + + +## Evaluation Process +1. Identify all logging statements in the code +2. Check log levels - flag DEBUG logs that aren't conditionally enabled +3. Analyze control flow - for each logging statement, analyze its surrounding code to understand the logical context (e.g., is it inside an error-handling block like if err!= nil, a success path, or a loop?). Look for logging patterns inside loops or high-frequency operations +4. Extract semantic intent - use natural language understanding to determine the meaning of the static log message text (e.g., does it imply success, failure, or a status update?). +5. Correlate Logic and Intent - Compare the code's logical context with the message's semantic intent. Flag contradictions (e.g., a "success" message in a failure block - SM-2). +6. Analyze Log Content and Variables: + - Flag the logging of entire un-sanitized objects, request bodies, or other large data structures (SS-2). + - Scan for sensitive data patterns (passwords, keys, PII) in variable names, message text, and URL parameters (SS-1). + - URLs with parameters that might contain sensitive data + - For metric variables (e.g., duration), verify consistency between the variable's actual unit and the unit stated in the log message (SM-1). + - In error-handling blocks, verify that the `error` variable itself is being logged to prevent IS-1. + - Check for function entry/exit logging patterns +7. For each problematic pattern, suggest alternatives: + - Use appropriate log levels (ERROR, WARN, INFO) + - Sample high-frequency logs + - Log only relevant fields instead of entire objects + - Use structured logging with sanitized data + - Move detailed debugging to distributed tracing + - Rate-limit repetitive logs diff --git a/.cursor/rules/observability/metrics-best-practices.mdc b/.cursor/rules/observability/metrics-best-practices.mdc new file mode 100644 index 0000000..d223057 --- /dev/null +++ b/.cursor/rules/observability/metrics-best-practices.mdc @@ -0,0 +1,136 @@ +--- +description: Rules to follow when emitting metrics +globs: ["*.go", "*.py"] +--- +## Rule +Do not use high-cardinality values as tags when emitting metrics. High-cardinality tags can significantly increase observability costs and impact system performance. Every tag that contains an ID must be flagged. + +Refer to [tagging strategy](https://docs.cbhq.net/infra/observability/metrics#tagging-strategy) for more details. + +## Scope +This rule applies to ANY metric emission found ANYWHERE in the code changes, regardless of the primary purpose of the PR. ALL metric emission calls (statsd) must be checked for violations. + +Violation happens when ALL the following conditions are met: +1. Code is emitting metrics to a monitoring system (Datadog, StatsD, etc.) +2. Tags or labels are being added to the metric +3. The tag values contain AT LEAST ONE high-cardinality. + +### High-cardinality Guidelines: +A tag value is considered high-cardinality if it falls into any of these categories: +- **Looks unique** – anything that sounds like it will generate a one-off value (e.g., id, uuid, token, session, generated_x) +- **Continuous values** – non-discrete numbers that can vary infinitely, like current_price, latitude, longitude, sensor readings, etc. +- **High entropy values** – anything random or cryptographic such as random, hash, sha1, md5, encrypted, signature + +### Common High-cardinality Examples: +- **Identifiers**: User IDs, customer IDs, account identifiers (`user_id`, `customer_id`, `account_id`) +- **Request tracking**: Request IDs, trace IDs, transaction IDs (`message_id`, `request_id`, `trace_id`) +- **Pattern-based keys**: Any tag key ending with `_id`, `_uuid`, `_token` +- **Time-based values**: Timestamps or time-based values +- **Network data**: URLs with parameters, dynamic paths, IP addresses, specific hostnames +- **Unique identifiers**: UUIDs, hashes, or other unique identifiers +- **Personal data**: Email addresses or user-specific data + +## Good Examples + +1. Using low-cardinality status codes: +```go +statsdClient.CountWithTags("api.requests_total", 1, map[string]string{ + "method": "GET", + "status": "200", + "endpoint": "/api/users", +}) +``` + +2. Building tags separately with low-cardinality values: +```go +tags := map[string]string{ + "method": "GET", + "status": "200", + "endpoint": "/api/users", +} +statsdClient.CountWithTags("api.requests_total", 1, tags) +``` + +3. Using bounded categorical values: +```go +statsdClient.CountWithTags("payment.processed", 1, map[string]string{ + "payment_method": "card", // Limited values: card, bank, crypto + "region": "us-east-1", // Limited AWS regions + "user_tier": "premium", // Limited tiers: basic, premium, enterprise +}) +``` + +4. Aggregating instead of individual IDs: +```go +// Instead of user_id tag, use aggregated user tier +statsdClient.GaugeWithTags("user.active_sessions", sessionCount, map[string]string{ + "user_tier": getUserTier(userID), // Low cardinality + "region": "us-west-2", +}) +``` + +## Bad Examples + +1. Using user IDs or message IDs as tags: +```go +// VIOLATION: user_id and message_id are high-cardinality IDs +statsd.IncrWithTags(statsdUSTEventProcessingFailure, map[string]string{ + "message_id": messageID, // VIOLATION: message_id is high-cardinality + "error_type": "nil_body", +}) +``` + +2. Building tags separately with ID values: +```go +// VIOLATION: Still problematic when tags are built separately +tags := map[string]string{ + "user_id": userID, // VIOLATION: user_id is high-cardinality + "message_id": messageID, // VIOLATION: message_id is high-cardinality +} +statsd.HistogramWithTags(statsdUSTRepositoryOperationTime, value, tags) +``` + +3. Using request IDs or trace IDs: +```go +// VIOLATION: Request IDs are unique for every request +statsdClient.TimingWithTags("api.response_time", duration, map[string]string{ + "request_id": "req_abc123def456", // VIOLATION: request_id is high-cardinality + "trace_id": "7d5d747be160e280504c099d984bcfe0", // VIOLATION: trace_id is high-cardinality +}) +``` + +4. Using timestamps as tags: +```go +// VIOLATION: Timestamps create unlimited unique values +stats.CountWithTags("queue.length", 1, map[string]string{ + "timestamp": time.Now().Format("2006-01-02T15:04:05"), // VIOLATION: timestamp is high-cardinality + "queue_name": "payments", +}) +``` + +5. Using IP addresses: +```go +// VIOLATION: IP addresses have very high cardinality +statsd.GaugeWithTags("connections.active", 1, map[string]string{ + "client_ip": "192.168.1.100", // VIOLATION: IP address is high-cardinality + "hostname": "server-abc123-def456", // VIOLATION: Dynamic hostnames are high-cardinality +}) +``` + +## Evaluation Process +1. Search the entire code change for ANY calls to `statsd` function that ends with `WithTags` (`statsd.*WithTags`) or tags map building, regardless of the PR's stated purpose +2. For each metric emission found, examine ALL tag keys in the map +3. If ANY tag key contains high-cardinality patterns, flag as violation. Examples for violations: + - `user_id`, `message_id`, `request_id`, `trace_id`, `session_id`, `customer_id` + - Any key ending with `_id`, `_uuid`, `_token` + - Timestamps, IP addresses, URLs with parameters +4. Do not skip metric calls because they seem unrelated to the main PR purpose +5. Check ANY function that contains these strings in its name: `CountWithTags`, `IncrWithTags`, `GaugeWithTags`, `HistogramWithTags`, `TimingWithTags`, `DistributionWithTags`. This includes methods from any package or client (e.g., `statsd.CountWithTags()`, `client.IncrWithTags()`, `metrics.GaugeWithTags()`, etc.) + +**Example**: Even if a PR is titled "Add configuration options", still check ALL metric emissions like: +```go +statsd.IncrWithTags(metric, map[string]string{ + "message_id": messageID, // VIOLATION - Must be flagged + "error_type": "nil_body", +}) +``` diff --git a/.cursor/rules/python/api-design.mdc b/.cursor/rules/python/api-design.mdc new file mode 100644 index 0000000..58f975f --- /dev/null +++ b/.cursor/rules/python/api-design.mdc @@ -0,0 +1,28 @@ +# .cursor/rules/python/api-design.mdc +--- +description: API design principles for Python microservices +globs: ["*.py"] +alwaysApply: true +--- +# API Design Principles + +## REST API Design +- Use proper HTTP methods (GET, POST, PUT, DELETE) +- Implement proper status codes +- Use plural nouns for resource endpoints +- Version APIs in the URL (e.g., /v1/resources) +- Use query parameters for filtering and pagination + +## Request/Response +- Validate all input data +- Use Pydantic models for request/response schemas +- Include proper error responses +- Implement pagination for list endpoints +- Use consistent response formats + +## Security +- Implement proper authentication +- Use JWT for stateless authentication +- Implement rate limiting +- Validate and sanitize all inputs +- Use HTTPS only \ No newline at end of file diff --git a/.cursor/rules/python/dependency-management.mdc b/.cursor/rules/python/dependency-management.mdc new file mode 100644 index 0000000..a02d227 --- /dev/null +++ b/.cursor/rules/python/dependency-management.mdc @@ -0,0 +1,21 @@ +# .cursor/rules/python/dependency-management.mdc +--- +description: Package and dependency management guidelines +globs: ["pyproject.toml", "requirements.txt", "setup.py"] +alwaysApply: true +--- +# Dependency Management + +## Package Management +- Use Poetry for dependency management +- Pin all dependencies with exact versions +- Use separate dependency groups for dev and prod +- Regular security audits with safety +- Keep dependencies up to date + +## Virtual Environments +- Use virtual environments for all projects +- Document Python version requirements +- Use .env files for environment variables +- Keep production dependencies minimal +- Document all third-party integrations \ No newline at end of file diff --git a/.cursor/rules/python/distributed-computing.mdc b/.cursor/rules/python/distributed-computing.mdc new file mode 100644 index 0000000..0b727ed --- /dev/null +++ b/.cursor/rules/python/distributed-computing.mdc @@ -0,0 +1,25 @@ +# .cursor/rules/python/distributed-computing.mdc +--- +description: Guidelines for distributed computing with Ray +globs: ["*.py"] +alwaysApply: true +--- +# Distributed Computing Standards + +## Ray Framework Usage +- Use Ray for distributed task processing +- Implement proper actor patterns +- Use Ray's object store effectively +- Handle distributed errors properly + +## Scaling Patterns +- Implement proper auto-scaling +- Use resource management effectively +- Handle node failures gracefully +- Implement proper checkpointing + +## Performance +- Use Ray's performance monitoring +- Implement proper batching +- Use Ray's memory management +- Profile distributed operations \ No newline at end of file diff --git a/.cursor/rules/python/fastapi-standards.mdc b/.cursor/rules/python/fastapi-standards.mdc new file mode 100644 index 0000000..a83a666 --- /dev/null +++ b/.cursor/rules/python/fastapi-standards.mdc @@ -0,0 +1,41 @@ +# .cursor/rules/python/fastapi-standards.mdc +--- +description: FastAPI-specific development standards and patterns +globs: ["*.py"] +alwaysApply: true +--- +# FastAPI Development Standards + +## Project Structure +- Use the following directory structure: + ``` + app/ + ├── api/ + │ └── v1/ + │ └── endpoints/ + ├── core/ + │ ├── config.py + │ └── security.py + ├── models/ + ├── schemas/ + └── services/ + ``` + +## FastAPI Best Practices +- Use dependency injection for service dependencies +- Implement proper exception handlers +- Use background tasks for async operations +- Implement proper middleware chain +- Use FastAPI's built-in OpenAPI support + +## Performance Optimization +- Use async/await properly +- Implement caching strategies +- Use connection pooling for databases +- Implement proper background tasks + +## Security +- Use FastAPI's security dependencies +- Implement proper CORS policies +- Use rate limiting +- Implement proper authentication middleware \ No newline at end of file diff --git a/.cursor/rules/python/infrastructure.mdc b/.cursor/rules/python/infrastructure.mdc new file mode 100644 index 0000000..d9bd974 --- /dev/null +++ b/.cursor/rules/python/infrastructure.mdc @@ -0,0 +1,25 @@ +# .cursor/rules/python/infrastructure.mdc +--- +description: Infrastructure and deployment standards +globs: ["*.py", "Dockerfile", "*.yaml"] +alwaysApply: true +--- +# Infrastructure Standards + +## Containerization +- Use multi-stage Docker builds +- Implement proper health checks +- Use non-root users +- Follow container security best practices + +## Kubernetes +- Use proper resource requests/limits +- Implement proper probes +- Use proper service mesh integration +- Follow GitOps practices + +## CI/CD +- Implement proper testing stages +- Use proper security scanning +- Implement proper deployment strategies +- Use proper environment separation \ No newline at end of file diff --git a/.cursor/rules/python/microservices-architecture.mdc b/.cursor/rules/python/microservices-architecture.mdc new file mode 100644 index 0000000..e435295 --- /dev/null +++ b/.cursor/rules/python/microservices-architecture.mdc @@ -0,0 +1,36 @@ +# .cursor/rules/python/microservices-architecture.mdc +--- +description: Guidelines for Python microservice architecture +globs: ["*.py"] +alwaysApply: true +--- +# Microservice Architecture Guidelines + +## Service Design +- Keep services small and focused on a single business capability +- Use FastAPI for HTTP APIs +- Use gRPC for internal service communication +- Implement health check endpoints +- Use OpenAPI/Swagger for API documentation +- Use proper service discovery +- Implement proper circuit breaking +- Use proper message queuing +- Implement proper retry policies + +## Configuration +- Use environment variables for service configuration +- Store secrets in a secure vault (e.g., HashiCorp Vault) +- Use configuration management for different environments +- Implement feature flags for gradual rollouts + +## Observability +- Implement structured logging using `structlog` +- Use OpenTelemetry for distributed tracing +- Implement metrics using Prometheus +- Set up proper monitoring dashboards + +## Resilience +- Implement circuit breakers for external calls +- Use retries with exponential backoff +- Implement rate limiting +- Handle partial failures gracefully \ No newline at end of file diff --git a/.cursor/rules/python/python-coding-rules.mdc b/.cursor/rules/python/python-coding-rules.mdc new file mode 100644 index 0000000..34e99a7 --- /dev/null +++ b/.cursor/rules/python/python-coding-rules.mdc @@ -0,0 +1,32 @@ +# .cursor/rules/python/python-coding-rules.mdc +--- +description: Python coding standards and best practices +globs: ["*.py"] +alwaysApply: true +--- +# Python Coding Standards + +## Code Style +- Follow PEP 8 style guide +- Use type hints for all function parameters and return values +- Maximum line length: 88 characters (Black formatter standard) +- Use descriptive variable names that reflect their purpose +- Use docstrings for all public modules, functions, classes, and methods + +## Project Structure +- Use src-layout pattern for all Python packages +- Separate business logic from API handlers +- Keep modules focused and single-responsibility +- Use absolute imports over relative imports + +## Error Handling +- Use custom exceptions for domain-specific errors +- Always include meaningful error messages +- Handle exceptions at appropriate levels +- Log errors with proper context + +## Best Practices +- Use dataclasses or Pydantic models for data structures +- Implement proper logging with structured data +- Use environment variables for configuration +- Follow the principle of least privilege \ No newline at end of file diff --git a/.cursor/rules/python/testing-standards.mdc b/.cursor/rules/python/testing-standards.mdc new file mode 100644 index 0000000..8463816 --- /dev/null +++ b/.cursor/rules/python/testing-standards.mdc @@ -0,0 +1,28 @@ +# .cursor/rules/python/testing-standards.mdc +--- +description: Testing requirements for Python microservices +globs: ["*_test.py", "test_*.py"] +alwaysApply: true +--- +# Testing Standards + +## Unit Tests +- Use pytest as the testing framework +- Maintain minimum 80% code coverage +- Mock external dependencies +- Use fixtures for test data +- Test both success and error cases + +## Integration Tests +- Test service integrations +- Use docker-compose for local testing +- Implement API tests using pytest-asyncio +- Test database interactions +- Verify message queue operations + +## Performance Tests +- Implement load tests using locust +- Test service scalability +- Measure response times +- Test rate limiting +- Verify resource usage \ No newline at end of file diff --git a/.cursor/rules/rego/rego-coding-patterns.mdc b/.cursor/rules/rego/rego-coding-patterns.mdc new file mode 100644 index 0000000..0669550 --- /dev/null +++ b/.cursor/rules/rego/rego-coding-patterns.mdc @@ -0,0 +1,94 @@ +--- +description: +globs: *.rego +alwaysApply: false +--- +# Common Rego Patterns and Idioms + +## Data Access Patterns +```rego +# Safe object access +value := object.get("key", "default") + +# Array iteration +result := [item | item := array[_]] + +# Set operations +combined := set_union(set1, set2) +``` + +## Control Flow +```rego +# Conditional logic +allow { + condition1 + condition2 +} else { + condition3 +} + +# Early returns +deny["reason"] { + not is_valid +} + +# Multiple conditions +allow { + count(violations) == 0 + is_authorized +} +``` + +## Common Functions +```rego +# Existence check +exists { + count(array) > 0 +} + +# Contains check +contains { + array[_] == value +} + +# All elements satisfy condition +all_valid { + count([x | x := array[_]; not is_valid(x)]) == 0 +} +``` + +## Testing Patterns +```rego +# Test case structure +test_allow_when_valid { + allow with input as {"valid": true} +} + +# Test helper functions +test_is_valid { + is_valid with input as {"value": "test"} +} +``` + +## Error Handling +```rego +# Error collection +errors[msg] { + not is_valid + msg := "Invalid input" +} + +# Multiple error messages +errors[msg] { + not is_authorized + msg := "Not authorized" +} +``` + +## Best Practices +1. Use helper functions for complex logic +2. Keep rules focused and single-purpose +3. Use meaningful variable names +4. Document complex logic with comments +5. Use consistent formatting +6. Break down complex conditions into smaller rules diff --git a/context/Base Account Pull Request Guidelines.md b/context/Base Account Pull Request Guidelines.md new file mode 100644 index 0000000..2f9e6e9 --- /dev/null +++ b/context/Base Account Pull Request Guidelines.md @@ -0,0 +1,172 @@ +# Base Account Pull Request Guidelines + +Status **Living** +Updated Jun 16, 2025 +Created Oct 20, 2024 + +[Overview](#overview) + +[Why](#why) + +[SLA](#sla) + +[Success Metrics](#success-metrics) + +[Guidelines](#guidelines) + +[Authoring](#authoring) + +[Reviewing](#reviewing) + +[Owning a Codebase](#owning-a-codebase) + +[Appendix](#appendix) + +[FAQ](#faq) + +[Resources](#resources) + +[Notes](#notes) + +# Overview {#overview} + +*“Honesty in small things is not a small thing.”* + +- *Robert C. Martin, Clean Code: A Handbook of Agile Software Craftsmanship* + +PRs are the lifeline of the team. It’s what allows us to ship value, decides our future in terms of maintenance cost, and has a high impact on our daily QOL. When code is well-maintained and untangled, velocity is sustained. + +This document lays out SLAs, guidelines, and how we think about pull requests as a world-class engineering team. + +## Why {#why} + +Having a quality pull request process allows us to build with sustained velocity and deliver improvements and features to our users. + +Pull requests allow us to: + +* **Hold and improve the bar on quality:** we can catch bugs and architectural code smells early, before these have reached QA or users +* **Build a championship team and mentor top talent**: by knowledge-sharing through clear descriptions and deep, thoughtful reviews, this will help our team become stronger +* **Stay customer focused with repeatable innovation:** by keeping the PRs tight and decoupled, this will allow us to consistently ship (or roll back) incremental improvements to our customers +* **Encourage ownership:** by having clear ownership around domains, this will motivate authors and reviewers to hold the quality high, allowing for the codebase to be malleable to fit the business needs while reducing incidents and bugs + +As engineers, pull requests are a key part of our day-to-day life, whether it’s authoring or reviewing them. By holding a high bar, it will also improve our daily quality of life. + +## SLA {#sla} + +| Name | SLA | Why | +| :---- | :---- | :---- | +| **PR Review** | Reviewed within half a working day | Pull requests are encouraged to be reviewed within half a working day. If they take longer than 1 working day, likely, something needs to be improved. | + +## Success Metrics {#success-metrics} + +| Metric | Why | +| :---- | :---- | +| **Time to PR Review** | Getting a review quickly and swiftly is one of the fastest ways to get unblocked. By having fast reviews, it powers the flywheel of shared context → quality code → maintainable codebase → iteration. | +| **Time from PR Open to Production** | Getting code merged is one thing. Getting it deployed is how it gets in front of customers. | +| **\# of Incidents** | By having a quality author and review process, errors should be caught during the pull request process. | +| **\# of QA regression bugs** | By having a quality author and review process, errors should be caught during the pull request process. | + +# Guidelines {#guidelines} + +## Authoring {#authoring} + +* **PRs should be tight.** This allows for teammates to review deeply and thoroughly. PRs should either make deep changes (creating two new functions) or a shallow change across a breadth of files (renaming a function). + + * PRs should be \<500 LOC. This is a guideline. There may be PRs which may be higher LOC (eg: if it’s auto-generated, boilerplate, or scaffolding). There also may be PRs which are 1-2 lines. + + * PRs should touch \<10 files. This is a guideline. If the PR is focused on renaming across a codebase, it could be 30+ files, but with minimal or no other business logic change. + +* **PRs should be well-described.** This allows for teammates to understand the problem and what the PR sets out to do. Importantly, it also allows for verification of the code and is well-documented for posterity. + +* **PRs should be well-tested.** Any change in code will impact flows. These flows should be well-tested. These can be manually tested and unit tested. Additionally, a QA regression test could be added. + +* **Consider who the reviewers are.** Reviewers are ideally owners of the codebase and/or those with deep knowledge of the domain. By reaching out and finding dedicated reviewers early in the process, it also gives a heads up to the reviewers, allowing them to schedule and prioritize reviews. + +* **Budget time for reviews.** Allow the reviewers time to comment and suggest. Even more importantly, allow there to be time to make improvements. Code is written once, but read much more times. + +* **Consider hosting a synchronous, live review.** Sometimes, it’s easier to communicate live with the reviewers to align (or disagree and commit). Please work the alignment back into the PR for posterity. + +* **Examples:** + + * [https://github.cbhq.net/wallet/wallet-mobile/pull/27738](https://github.cbhq.net/wallet/wallet-mobile/pull/27738) + * [https://github.cbhq.net/wallet/wallet-mobile/pull/26092](https://github.cbhq.net/wallet/wallet-mobile/pull/26092) + +## Reviewing {#reviewing} + +* **PRs should be reviewed within half a day.** This is one of the things worth prioritizing for teammates as it generates a flywheel to improve velocity and knowledge-sharing. At the same time, PRs should be relatively easy to review, given the description, self-review, and code quality. + +* **PRs should be reviewed in detail.** No rubber stamping. + +## Owning a Codebase {#owning-a-codebase} + +**Unit Test** +[Base Wallet Unit Test + Lint SLAs](https://docs.google.com/document/u/0/d/1Ai3UDVDR3Hq1P-smfaeuclxDMQYSJjwlAPFyERraJCI/edit) + +**Unit Test Thresholds** +The owners should decide on unit test thresholds. These thresholds should reflect the appropriate LOE and risk for the business given what code is responsible for. + +**Conventions** +The team should have consensus on conventions, or lack of. Ideally, conventions are automated or linted. Else, they should be documented. + +# Appendix {#appendix} + +## FAQ {#faq} + +**There is a tight timeline and it’s easier to get everything into 1 humongous PR. Can we make an exception?** +Short answer: yes, we can always make an exception. There is no hard and fast rule. If there are humongous PRs, I’d recommend having a retro on it to see what could have been done differently. + +**When should we, as authors, seek out reviewers?** +Short answer: as early as possible. This can differ based on the type of work. + +If there is an artifact (PPS/TDD), the reviewers of the artifact likely should also be pull request reviewers. Transitively, reviewers of the pull requests should be reviewers of the artifact. + +## Resources {#resources} + +* [\[Code Red\] Bar Raiser Code Review Program](https://docs.google.com/document/d/1bzYI2gdnNZI9MqvHyTrD7aZRUfrakVedLRe2gw8b114/edit?tab=t.0#heading=h.ismr2neqrl10) +* [Wallet Pull Request Guild (PRG) Readout](https://docs.google.com/document/u/0/d/1nyE26o9DwQnTstJBrwMYgr6qdQPe71YrluzyiMOU89A/edit) + +## Notes {#notes} + +Oct 24, 2024 + +Questions + +* What are our actual problems with our current code and review process? + * Breaking ERC specs + * Break spec on eth request accounts for Pano + * Documentation may have solved this + * Additional parameter on connection + * Time to review is longer than ideal + * Observation: authors repost requesting reviews in Slack + * Hypotheses + * Lack of context + * Lack of ownership +* Does having people not labeled as “Bar Raiser” set the wrong culture? + * Do we want a culture where some people can absolve themselves of the responsibility to raise the bar? +* Regardless of bar-raisers, we could take it down one level. What do we care about? +* [Wallet Pull Request Guild (PRG) Readout](https://docs.google.com/document/u/0/d/1nyE26o9DwQnTstJBrwMYgr6qdQPe71YrluzyiMOU89A/edit) +* Less in-flight projects +* Implement code owners + +\> Bar Raisers for a given component or system are a subset of the broader owning team, typically consisting of more experienced engineers. For repositories or subdirectories with Bar Raisers, PRs must be either authored by a Bar Raiser or receive approval from one before merging. All existing review and merge rules still apply in addition to the Bar Raiser requirement. + +Domains + +* Transaction / Signing: [Cody Crozier](mailto:cody.crozier@coinbase.com), [Lukas Rosario](mailto:lukas.rosario@coinbase.com), [Arjun Dureja](mailto:arjun.dureja@coinbase.com) +* Sessions: [Spencer Stock](mailto:spencer.stock@coinbase.com), [Jake Feldman](mailto:jake.feldman@coinbase.com), [Felix Zhang](mailto:felix.zhang@coinbase.com) +* SDK: [Felix Zhang](mailto:felix.zhang@coinbase.com), [Jake Feldman](mailto:jake.feldman@coinbase.com), [Spencer Stock](mailto:spencer.stock@coinbase.com), [Conner Swenberg](mailto:conner.swenberg@coinbase.com) +* BE: [Sam Luo](mailto:sam.luo@coinbase.com), [Adam Hodges](mailto:adam.hodges@coinbase.com) +* Smart contracts: [Amie Corso](mailto:amie.corso@coinbase.com), [Conner Swenberg](mailto:conner.swenberg@coinbase.com) +* Infra: ? + +Proposal + +* Opt-in ✅ +* Everyone should maintain code and hold a high bar (be a bar raiser) ✅ +* Further discussion + * What it means to be a PR reviewer + * What improvements we can make + * Faster PR reviews + * Higher quality +* Breaking ERC specs (retro this) +* Other ways we can raise the bar \ No newline at end of file diff --git a/context/Mini TDD - TIPS 4337 Bundler .docx b/context/Mini TDD - TIPS 4337 Bundler .docx new file mode 100644 index 0000000000000000000000000000000000000000..e41bf4d517fc7e5d80e1774183bfad340068e417 GIT binary patch literal 306862 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

P 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⪼gur22o-ayr4tT<7=!_bfa746I!U4TYky@RS_N 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%0D1yL!zE{$mxcnsU<|vh|L)9@ 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 z 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%0DoO7-Y za$Kife5sN!P*d1^J916+izz(f5m8-Qhi=NhiCKibe5#IrSge7zU8I6%mh~RnY5yP2>I#AktZ()OH2j&)A z*ki=mj5xO9S3pGy&+UxMx^T*J(=?K5fq36jP_X`eIUExi-Nv>j38vfJAUnaTx1q9h6b z3T6#3q@7=frpLwPFMJAT5JAOo#Z2U_Ur z0+?Yu{Wgl<`=qMNqQW=79e7-66}63}+uZD*2pzX_aeFsT?eX-W0UwXI3T}oA2hSXB zEt`d64CX7{6YsJN)K{oAkLO3_8_}Fw7L6ut;pagtz-E5d+~rEOgC@Z@;p$x_dc-j# z+o`2P>?}NljLbl*M#u~B&72uZ+1IStcJO0dS_hZ)bC-@iky|`Q9zT3gFJ01krYQ*Y z1+W!6SO*O+n$V;irTJiP7pW+$ElZg2zf1ERf%0pS7hMqWAi}f@iI542<6!1l40F3U z(k?k(r0&$R@=Q8HJpcO}sfS%J#xa!|0q^FA+a$haRZ$4c^bIUCkE);rah$+dFF;s} zI7pO6K2oUpUbGYLBU3T+F3FOKEyxi;8{wBxt@xpSx|Z8A;_3Y$6#;Ej%1+u z(-eumx8`+>Za}tAxkYs-6~%sIaOZ)gAN@1O;FHGzvR$WVz2G3&427=?Na=B5Rhx7l z?3}vlFInze$Ln}-IPvBCn?6O+rPBM^nfs^iPLw@xGP8<~zi1I6rMCFps?3Ka zN*fA!K8-s6v)6m~5u*4;doAVw*b-^2&RrLVZz(g1p$;5{g%Xx#yzNWR!>@x47R7*d zg=0j>ul@-6TSw>Ko7u25zTz*3to0OdxhKJ)1DClN)#fPuR z?5;&qoIshNs^w5-srCtoEhkA79X zjO&!jE3a-lajMvf9We^!9MsaW!p1XY<0S@qNKjO-zvUZbTJ?PfI&X46s?}-_!)g|N z^lmefq?pJ8KfjgZx=J0J%2yxS2sRAaKS~3!zTF%P;|>QP_B=OnOAnCu)&@#vA*&u4 z!0mjABVevAJ4r{}!Ge2n+(_k0?W1*bGGqv1qHGp}{0e#>J*VYQu)QBg%c?G`Yf3TK zxuD%s;udz6@vtuTV|l(74-yODx*KJx)B!cO;uD&Nt)es@qXZBI>6Fy2oqJPVnc`N` zbp{f;fbZkMz?{TOteQH9&=DnX+1%qxjVpTuw)15dpL@Ss_sr+%LE+^Qgf=C7HMT$df4#+Vz{V~CfKHGAz?dJg^- zQ4g9B+XI89o0Ux}+J>9;Q7Myh2NnPnuB7Kx+}@Da?p(54-plUW5T@OCtD5E z4t&5q)~ItZGf}2yx$OgJi6uFAlY)AgU?SO_N-2YCL zD36E0mpK~IJ%9?ysDZOIR^=iT)Y3htLs4J5@!T#19eo7=;dt5hbXIPgUTkN;=+m&9 zk~hp3qCUK@`{Khps!%^^YnK3dP=tuL?31IFR_^!Sy}USz@)TRwT>dB7%86K<+s5V% z{>pa9I1WVi?Pq~QX<@*Kg#qOXk^4XhIK~hCfuKxgsA>%jBVn^LIfaA%SsSp8rC6fb^IlZm1cshb59rf9Rc`dwWI%n@k zhZMJCJ8AmANI&nD|8Ux?8I@^#eiq;d^DNz-RGJ2)8KkEeMpNMnuXjjZVr&}zwHM&m z_zf;V%M*{iE|#Esou%*PMdpAvu^3R~@!%%Cd8Lv)=vo6liS8q^Hx8{GlZKMJD5i&- z#lH4f6$occ%7d~h$r$7Fp(CJkm7#&w&@tpnvIN#7#j?b;;r{EZy%LY=3&PLB4r`+B z-~*J;e^lrBpw&MC+MB5qk~0@9)f_2uQT7xJNhf;ph*qqaU*tBCJ27Z{7eEpgJ$u@- zcAN7pu2=z{W*WQ0vnZnOG1{8?I9Fnb`T!cC{dW3mT@I%b z?1R2Y|8vtqjH%P%S0V-=5&2+UMk~j0nS3>7Z9RTakb@+IA+o=b0(w2`voJg6Tf``} z)UKxU$?_~yR>E5mB5NM-D!p47aJ z6Tpx^^hUmd!6y)9!;8kPAyBvx35Zm_8JXa2pCtge%h|#qp-x0m5t=!mHv`Hfw8=q) zPQU~^GuEZ>&CNu{w}j+`K)m#~PO0|2{EB|$m18=Qzd>FM(2|g9!fSC+T@Q3nUKivlQ2y5&)5oxKh0jIp*a8KfDFyPhe-{p~HQK9cD!>;#ll0xc$6`--&@d zQ&GOAcDs#0sRop94x5vLM7?Eaw8#c!=4yZ2!;{|F!^77BXfe54eTO6AGbLF%0u>Rw zmB}QU8Z|n$uWU5@bDk+!G?DIi7uB5ZDfZVtUFF>>b=!Kvh!sNQjP34>a zO$zGj8iRWDpfm1W{&G8hmf8pE<}DN%Gfkl2ZP?#!eaE#>(81dvks;t37r^dHE-VP7 zT;NB1-LZ%hT5eAp>aE7j#j0aC5N(h6?}^255%cG^ylvS<=bz>zrR{%MCUdnHj)&&V z7?q3wjXchpq@1UwM?c>E%m5$azP4e^K!jZVHWH{Xuz|!?DR|}jj`!P#`|r|8UCHzZ7=$0uG4O*s+#{8$k3DZP-C)4 zy^YbsccNF7F|(-Y6_>juCO>ugj!Y?qppB|n`fh0HH*mSFbvVK&ZNwf-e!BJAVvxH0KALfCNUT)h*yJVJk|IDCJMK`{RQ2hG)PqaR0qb4@ zXIIPXr4jqQzp(``%^(jSvJGq^YucVA^qjBK*s4w?V%0jm)WQIRTHkysI}GySrYz{= zZ)#uu4Itt-^o1h8bBi1tGd;HhlOIkaLfTJ=La+iUDBjUk5Meey^ za|xtL@76C*vU6`hnTxzNG?NsS`fG@YR161wV?ial@!dGRE&^pS0)<1yjUG~P4muT| z*jvPXMPrknX%nPLXX5|1abNOl3=SDB;!KKueUt`Z+kOdxA7xtJM}33E;AIiF@QeqZ57ES|3nkz$-|xhwaYLF zb{R@Py8mi=KFqxES0uLI+Y%xmXLwC<|AmgpmcRK_lz@+uo|yafard;s8V?|4I*)y4ph5|uU|0N7VIIy`x0V*u(f%fF&G{T_ff7(iNurRjzQ z5U&5wpA$GDb)d%XhU9~5!w)km;ip_Uw;jo(he=5O8W5ABOSM~>^M)=w+6CkPD?aq^ z7v2Id%&P3!cwsEUHG9(;ivt>df5rXu#*DG&XKg-X0LQRxsqEs$j2$BS{Ov&We=}A9 zW~`jHxBTaY_#IfOO&9y^Q_y06@R8R2Cp#`)pDjOf^DhEPUfd*H>i@p{??Y|_YjkFr z$hYw_lTc-C>E>E=VY0fta0 zk+VTZcZe(BX!9X}1HFbZCaJp{&qBD~{C^K&<#?w5^jEpX&vEP1EDv|J0<>dA+5GIE z6$qIGx<7zk{?Ee-y8LmUt^LMhqj1uHZXiJ>b78i_ zCM>Yuw1n`~>`%ScH-Pl|UAORupA@M0yNsP%H~mZwP)6{|=i2*?&*XuZ?B8@Fw;g=j zGmSIB8_y!(-2Qs1{woOHr3wYX`tFJ5J2sB9ZT^AI^%tc8DC1erO>#CQ`(+PybGOaA}Kqcvtcj3h+~5{7l}C#$wyUF zqYaU8Y4sz8pXfk&iC0=3|~O$mFk$-=+6rn zNoMoE!pHs=Lm}8QK>NhSZv=ndbUB;*6o24Tgq9ml?f#{^9}G4XgCVdtaf0@He_q&S z1asNk3GD%5XiP6m-v50ThE- zFE@5?h+#MU!+}l3&;-O#B-G7hepVO5NrfVofs^^r6QrB5PRh!_p z`n2@_&#e!@t;118-9IlVM&d00TA%oPrp>@iUnELZEneCXLln;P zuL#e-#o!CX5X^ci^ydY>14OsY6}|$9p^DjU<7XB~44c~>z(w)B|LR8X3;qhX$6x6v zev9EJg^}7@@t;4n=EHNXHk~9!z#n2O)4jnQ!*`5$annG83zTo~A3Myyk%H79OC2_q z^BLeSB37NGe*WaN3)TT;rg5nJR~!b0)$jKF6B1bQHjaP8*5e7_&KN;wg^fFTU>(pu zj@v1_I@4zI=F^^kCb){RxRecPK`}FQ=PeCqwT(L&VI7-0ejY#sR3zoLK~Fa;L*d(W zdE5Y5jOSd|Mo^zwNq73MEFQm=_a~K6OR?n7pW5?qE}L#V?}~*qSjXo62B5byJvVUMAask{L*d(WaomuAgfKPtSo){JV2{zAw%&Be zI51?7huxw-e-bw$W^FEI;62#qpSb;c0phgjrZ0#AFSzi$d)LOC?xDnPDzsYQZIYJX zZ{*lV%wUO|YsDi-E9m+Plzs+W_?O7iTbrugQD6c`(w}YUPWvIE{iajO1a@s~eV?-Y z{0!_Ty3?EIlBHn8zWv=Br0(LT#KldglnJ;Ayl<}2uNNRvH&3fxgBSQuc5h&yi618V zZ~g*M{(Z+cFLEQRn1i=$zVuxIolr%n+XkKOvuz%K#ozv|)&$^&sDiE=JIRmIa9*3n znp{@Uy16@PyRmnKaYLm3wMzc?h^b)2A=`iT(TJld0-Gxl*y~+b{?#)hy93t$*9MJW zO7sY@MeN2(^c?(op-zTUw&@GvK}sPuX5RxYv>&5@lG^iCt0f6uYL>PL*K3<<;2~g& z*~_|q(A;uz0}67xp)}tp03!P_Xu26GLlL;lp1))BF97>q_G69!VpL3&8oE9oDtF=Y z>xJ>>{rZng*+pr7;E9jsRn;kw)sG*$SR_9yLtUP%s=vlAVqWm?8uNcn_kO@85F_ZO zuP^OyJ12fzWx=8DHpVDRGXsB0@9EYBZ`7SgzDS0DAGT)1|-O)5MO)U|@7>N-m5bu(!E;>;!w)mQ>+RJnT*=O>ZABp}C*?$}GjJ0Fu_@N7tk{HxVLA_A8&v@4A8)@;>)7@o(I-tFSnqhBYsJZyruDOh?xqR^IR>4nmJ?Dj80%o_@Tww|C z^XZZH>2`kTH*k6TlParYc?>LkT!3Z$Q@2ZABqVh$z-WJ~RQBxam|IDn4PuF}0LY6> z#mq6i_hp*9YeK{`7gy)|>o3I$0DK+(^W~nWy_)wrU%Ix`Svh(n^E9H=p7|a@eSKwm zs)khy(V$=`mAGVS@((Qn$3q)`?AC!+_?xZ{(5S_yjk_}~9J(^q-jhL*C+kG;upc+t zdlFqS^X}~nuOWaxK6r)ST~~W(o7w3C_H%m&jMzH)R4<&pE!S9>1P!arYt2?Ah+xwn zvh1eM!DB%l+$7Fj{(qo?upc)Y79ynW_~I0G)r1KjV11!kZfC?^t&{t{KvibPf>! z9q;!w+40@XQfCP?2Lgx%V-MHQKD-f>>Zg`GESJyjiG#hdWj&=scTR%nhSQ~A`4ld* zl9nx){LB1d7Ln$5zcd1cci7f$ngX;!@evKat!Aql+NbYg2a1?#Z-Fju-9MEVx+(>D zr%OReGFf9j0)X5u$TZ3e>EC6ed{Ux0aRs&3q(E+JJ5h>iiSz%OERkU8{(=&0-El(K z+x+a!L+>m_w?@doaPy3H50m+)GC+xFi{|nes?^BRA;qnv(>~D(&?rkTm~arY60L8i zlU0XOoi*JVsI3QB=?>tP&zu|$KHi>jmK83T6ZHA@P3>4FQu9P#Sv^?wpb7$joP75O z#g9&J?;d(72p6%S)D?2m?bgPzTY?fG??AT0)!6ok#yw@|7PZN8Z^I#_J)-JUedlfr zT8NF&_B_JaF;dmYPjL(GaSLrcJ>LAkox~q0610LKo9ukP#}tZIkH7+61N3IQl7eq{ z!|RX|scd~OFNTko^z3;;|GvKI#7>iMed!E75-F~QNp?}H$C{JsoaihPvU;|mq2=Vf zRJvvx5{vZ9_*kHBDvcmBCf(fP*`hjxsAz;N!`CN8?Zc`Kh?(wXD2%Qjd7*=en*Saj zd*8FoNSW^WZfy616!+V)3ZQn_+kpPT(Nc{X(DrGye@ad+fEmWqP z6b3=<$l?9ivzO3PX|LjszMl`J<2!^KRILvOjSgE?C^(erwVp7K@Q84kN|m+ws`Xk5 zDJ*PIxW4UWhzWm|oclq%I2T22|4zOkW+U^+0;T5p*~;Y!17zq*%k;AHhb@)6Zqa0D z#Gc?Ce{_VUXrpV>P?tFW%k19;X8%#2o82~0kk7~m2(ayxw5fBDk|6_9y*&M!_&NRd z=O+t&`~SH5@^Gm7|9vxtj3rwcvNMvhM)qY;4B1MGNJE6|CfTp+p+G$IkHgH%0`F zXM29-@tyi{xjokw^3IuBA*F)qG^iGbCY*?^*fQwHU4F}r2 z^1;vZ&#W{rGI*aA6R5j3$KQW^w7*ucslGLM5A-#-;pfw2tk;LZgI1FE8sC~8TQ2j= ziA!(xnVx9%i@P$)7HS!pFbe!=OcN~^o8-CtvGQwou6Fn}vmLkR*np3pp__uJ?&CyV zzGz?zDi8nToEmJ3mb>R4^daQ>K%)|e-s2BZInon%vTx~61>&$=Y*3|J=e+in&SFoN z4_F6$0Vkg`LvDNvuK53BVqSpnckNf*Edfr+bgsMBk1Q9f8g@foTlxrSJ@LFgqcT9# z!k-f0n~2bn)c>K99W%q&+?7CvB~@X%oc%A9Skog47d`dY{QNUYt>?i}%igUm&eJ>h zmB}|HT*3*bG%5Gu)#QDV1mYguxa=Cx1UMxuD`uUR#EcU%U{p!aQkR3ehA3wKZ0KF_ z+DROPPKv!|9lQ(gI~}c=5Q|ZRxK~6C-FE)?W#tlw|1>M6Ih1gywmq60xh5JtS+_mT zUB-x50|#h)*Beimc0aSOVRSGigoVnrQyHu8+DS7nBNM}rkN?<|cy>O0rd_TfYo>@avFD3RKNG& zofKlmXCi33yr}AghAR?foP+|!CY>R3FK*H5u_0BZy&6Ly)X>yx?ghs~+bblBEk$GT zF7%}pW5aCH)gP|R=qI40BYZ^ZHJ8p|^AR3s0k$=Z`P`dJYsb5ziJ2wfV3OsXVoAw& z$yQ+_SfEX8cZR4nKeJ;|Uk;5%>185TJFmY!H4u* zJP!O`e4V6(5%0tUlW+U&|IR|0#6v&n|Ah!3d8QwklD`E&gqxU1uKQ0wH~H-wcYVgZ z@AX?a7^?j;+=2yPb*4#;9xma|nENA`-IGa^dh-q&i}54&behdKlb=Ccadk^J$ETH=?x(E2}CWwrd5 zEN9`2s-nKe2|fT0;m2B1<;TBQ{oTUe_{D7A;mL}42M#4aA~cv`Z;_Bmpz-n#z-ne; z9vLprOv~v}BjpWbzsvRH8)le?9B!Io(pNn+v*k-%QtW#^Sd^8!;@V*xbeN)w;Rhw; zE|r37RG>4r9s00p@_YT$+Xt<5Cp+Z_tgvqmo3K#ms8p3PUfrq9z2eIj{6Ru7ia7)t z(s|V;V?}tSdffmD#m9rA>_1;7(x4YG*7|&oqM^o^>>%RB_n&GWfX3*W#(_E#IfqEa z1Uav7Vg)T@J`=oFeP=Cj0|R$Mf=mX)JD?2y+t{o0{&n90P~dW&&h9$eEypJ$B_`DMSTt6`&^dI>aGU zK`V4R*tJ`1ri0tSm#v1MuDGKY5oEh7{H&_cq4X^So(QbrWzM8JwBq!j0hG1X-(Oj_ zR_IEW($5Z5|@hl>{s&e)S6`J_$!b6tAU z3R!f5B-Qs~Ah1&D#FQ%Tk@OknUgz`3J&#|lYkYb^=6!N^#SDa5OF`jPNkWCG&+zwZ z4p&l;&Y@s#d`tT)zA{i<^Dxf3SKVf!0RZtOUpOpZ6U9lWOW#RyG*2Z7evBc^N!?#c za06G|%T`SRHeX@zcgGq6J63;Wrs7r@oX(>$CMM;Db=9DfjHXDf*KM3S>^&TM=V8wk zG0aGf_wwZQ`LIAq#$JZFnAzQnFm!d5fys;U0Y>35fCCAbUuA==nGR}*H`km~6)kL` zgTUTZGeNX($nvXYyra!s3^FF*XCeOe>;?su8fp!6wey>Tz8(HzNcLh$+z5M(Njz7W zPl_b~`EVF%Vs)AUx35vcOTwjizr&Z-b;XjyT@l+LKBRfc^^ppJbLk{T_|DJx#c)Vm z7swzXsXSQs0l;Ut{g1;!AhfGbgWoM}%VB6R%q``kwWCI(N`7*8LS?x1F5?^H$&h42 zc{r}0kz_nJNV^|yy(z9MSUp`!?z&oe!|~@kvl@{`0J*cmX5m|9S?|>LhT_F_wNB{K zxTFT@8td}`d=Ed|;Yfvi#**Xkm^R6v$`yu}8P)rg^XWrO4Vy=9>IA?r`9JFX3}3Wr z>)`dfQ|A$uX(_V4JDb8%OC&|uu`%w%vQivoAxU=~*`pzW^^OQ(iSC<{XG+EQvxw)G zg8){U>R$RmCyRXi zn;T5gq7fchAGt$MySske7l9R^Cn_CJZAXwY**DTjmrmC&A7qmQbSBd#s?z73mz*-4 z6RLcGViWuJ8^EFYPw)qN?5WKs9)9uTZ;**~(bBs6lRPTJkh06Z#Y#FGJBa#0ohRp+ z-K=zybY(?1$$Xd5gRjL8{Ze6Q>4J0*G*DD=VtS49=;U&5fpNkULoKNZe6)2g12~%l zulk!ZSqPpRo_9-4H429-vyQ%9YvO;!NJ2~ZZfGx=smPp!jV#P*nN%lr%*1Q(!O|XB zRw=eQ)GR5)GPF^GXI=@aWx~-?U|dba*Z<`ewMm_oja6>!5bwA?nQ6@d^O36Gna1F| zo#O;NQl6c>jTKC9+TzTAVMFr6=N583NL>`yol^1^rZWum07wLJNI7O)sbq%o_wO2|a1!I>}J zx$zY@!dRvRW%U2ay;Rr9t%>aSR8+C>rzLly5y&O;jGaT z3=-ug334blYO-_9gjv_D?OTt5EbQoz$FXNUIxKf{@Vha%9jAt=x|k6!2)O z;01%pSN~a8A~ukDT6ZLqPifmI<2_@bS6DG}XP_MbrgN>?WNxS&>pgKyEVi9a6pVX4d`Hxa{CcTM8+n_QykSBMI< z3FdO4nk91{ig9JAD_>mvO7nH;?nOx{V#7PE5`_ocH8V63n@!b_usXeusZb!bPRRju1dg{w>1 zclpIFSnYjfweK(Ez4litNekMjO2-)S{t}Qr)7FqQj&c~lA{*aA0!FwrR{HYj#QXWM8e#d66`JPEI2x& zG~lPL%)h3LA0r)$@fMMbSt>qp2ST#Qt{iBZoCv<^+QT;cp}TqyFuO@!1lie zJy6rVs1TyT=iPTr6DOsob?~vZT5SNU7`I+Gy_WQ}sicJdd1~lCe|22+;Cm3LkH47Q zOO2CUMoAbp1jBL}3uT(w%%9KVeth($oB}0HL)`ZlRtu-E2$WVtOtHeJ-2kefNqCpP z##L9z#VXLyt&e&_ywGTbYYB9#Zfm2l8NZj-FOp&|RMplLK{>$5EzdVyB(GFmxBmmtkI>RBApVqnRHqp>om&V20J4h6zsxPAxS>+{(r_Mlp=LI9nkeRTW&) z69xd`0%ROOz%q?~`6Y3ne3}VjVDjP4=SPe6?_teVRCPb}FVG-TtBbErzGV0{xK=q4 ztSOBrK)y0wB37W!d<)`ytA2p`=T#$*+s%e&n>MQ#9-Z zZbdv9G5igyW7>u%r)wqPCq?Ui?2PuvMv-b;+u)QGpl?hHBmVI_@`;xF0V^8Xw&Ecv zAx8B2azq7$Ii#P-_v}Y89Q#@Nb$Qhq*9~c?7TtCfM$n2Gh`xO6v~rj4rOp%wQ#pim zK-MXR?LRrx*MfK4lmP83O?2xKu*sS54sty-*! z_FDIWDiW_=uM4e(-BU`Pt__{I3LP=vpYW<}U88TXj7@67=KriJHuP7ER4V5`4S5Ete3+63(sOuz&HM|{7e~ML&(}1m1NwBmtS)`cV zx#QoZbh@DkR;TwspgMZuh%$fo*yE_xGi^jIfofx5)>GZ%lcp9j?`#iWFtHfpU(d3S zYv~3v*47;|0?#_0*bigP=6rJj-yk2)6K`>XL_&Id#9i}N>JsDp@`Nnfg;gZZ26bIU zM-uRs!n35c+Em1r!m{x1B-ZF+(x_Aj@VOQ4uHFaAq94C+bmgJ68SE@lbQGr6AfMP1 zGCP$NLuA(#Isxp;9ebq3CZ{)=xvcOo%c=oNZ}1_M{C5so1e|n?4yc0-cha1KW?4zQ zKWUof6Bfh9BRG!zT-<%?Fq54YdAZr5B7Zhx-6L($vRTC;>#0J z78(#IT+`?{2H-vLY<9ahCo~Xi)jQuFIWZ#|;h#!X5xHEy5@RYUwP(=);~Xg1-}&)A zcJ)K;#<#bv{D{=I3=x|wRHB2#E6&h$EI&vc3^Pn~1(7CAYQO%Pp8`NrjdZCy@E6%g)#0YCunR#44@LZ=w zhJL>l&FngN2~oQ!((3gge)cSs#fou02)eoAj9aL^&nJ0N777)H6f^I9m|c@Kw%&01 zAUt7x#8)(=VD2fHsa0g_!l{oZcK9!UO!fa=!iab?w5@7v-=|S6h*)&&Ez}EBz^kci zpUS_+yv0S_H7Iq>Pkc^LT}cM@-*g)uJsF`?`)6+X)7x95s0&+F71X`GiH zb$PfRhGfMZ!MJw?%gg`R}yk$K$a9sR?ZXy$%(Qn@KZ<6fuG>Tw5N*o)!lR}Dk zGu$Ch_)a!CGiL7jyG_#0S0BPFR3Z$m4!-CJ50z(QjAJy|7t}Olb9&F8Hx&P&;6ZL&rb3dhCfixk zIUe%vf#=DtUFQ9qrPA_fB6SFLFW-1xc3;M3LPDd&mv?ThB>Ly?s7RN1?xDx$R9YwM z4h~yEtxEFbF;c*tcdNzL^fzKdnf`Xlr(mZP^7;JiCMs-?V^Yg4xF?N)ANHvF zoW3z#WP?bd0Vai^%!&%B*g@kcsqZC|WIY2*{!~4m-ZvA?kY}~J^9Z+U>5eP+Bc1HIKg91PmZP+wT~-I*OI-}0R0x7oK;Jq)Vtjkp zxriXzQHrtbdl@r@6gJ`Szseje>0){phcLSpp;1(j?Z1@6)ED)dN%FxAdNN~=?fIK+ z^)PD5i&)K|-!V@N9v;@nv~jcQKS2?hc1wz6Q{it0sw?RrCN)4?@Rwr?DcQbJ?{ zu$LPEtvDVC&C+Fo$jxGnA>-czA*#g_es;?HFHj8aCj;+S(RDe(YmL>&M1SjB)ez6c){#97S+$2&_j8W zcYd*D&ITBGB)5pg*#x#Ke)9O8agVAs2&(tS#C!*wp4l<*k|T*3IMnS{_}(!Ugg+*nZKvDaS1b*o z+ag!r9s3v+h4bzufapM6LOj-?jwaGj>U3N$?z(hzb6j{VfSAQx%{!I?kl2d zyzYD$zw4=d4%n^5k6&o4B%xlK>7i^0 z$f9BE0pQpzld~qp5oovxw#P3r z&g#i)UDf6MuD%yBU-~j~f`VmI7^eGDFH=cUO4*?OR)e{BDCW~bqT1CYSKI7bk89~U zQiyAMFie2oRMYBeG`A+Fo+CIWCnLPO6NFv2%$HY8GDZC=IEIa!q(hIGTDTv!4t* z;os`awIjzk_llVOvAz@HGCaNdQlin4n#|wsVrDP{6m56zar5 zlYTptzyT4j&wv%9PYESlrb;B9*LEczPAPUt+}z<&@Xi{mhZ>3y)&%t&19i_G7_A5B zNM{l*HH5(SloWvKULgIHF=FB>j>2e6T;tY@?rc_q$NNpyp6@7~^uetm;Vyy3i+zJKX3V^(}z9i(%@W;n(*jKq%-k6`DM-WCq{Wao^nqmwzSzDS=4HVevVu)&=P}tXWo^0N<~UIh)cTBC{LdAobgE` zYvU$)lBH)k=oOO~+iLwr6x}B`AJfBeeG%T+;OF)h9=}@sxJgNw%cb#Rlvz?B{fVyC z!mIVcaW7yHrTEFrXe{+`FF9|x_R%R5*uNMJ83QS3WVm28R6OA(SryO!{(}t z-@lN9I%Ht6BMFIwS>Zlg)y~!bq+Gt|7!a8?H;qJKtGjRgLkoLVt!OB9UXmVkx@mOw zS7&`Lf+5nh);h=|bm7BT$cst;pWeSS8M-K5uWrecy?&>}6i{9Xuj_|qjhlbKTl>de zCU{XWuL}4O7pu|VR?{$ zJi=Jaie-9QRa4gA*rxf*oh6+$X-V9VG6vHmD)UH;tlC7iqdp4HK&DiQ?0o+sD%p1P zqxL4r>h*mMkK7b_&)npo%b(4&Ss_)ZO#8g>v7f1=ONh7d(lSE;UW)Unl5F|&sAtKn zl&{eho;{gC`j(EuBlAL1+U!`Fte{peN}Q;#krs46!O4uFmkv{`*01d@w*}u%VHoS| zXggJ_E2R}lvcKK35aK7rKNf1oyahReDZu$K-!jXSV<_eEkD=DGSw!AOy2x_?Sl$ZQ zTsrL%qx{>iS;n2Y!(>NX<~kHHO?H)5lUmVLKc=jA6zmqFOyMjExd^dFiMX)9irspa zQNixZYlgV%l<7AP%a51ZBiw@-6uZog7@59JgwBK*YTm$g!m@XRyBVI7PuKIquI#Fb zcDFm@iUURIpzJ1dLD0^F`=xI6;Rm!b?$+ow8|AuIuKFxp9V?-i&qCFgZR|o-3k|xX z*JL1m^&Ln-6aJ;I2Ona*%lM#!ss*zoHdx|YegG~ag*>dAw{~3Z9Kr> z8G-dYs`&0cSJmIXCPq@P@^V8ZWU%`0sELYE4XC~iU7dwfsfzj~k-6De$P>=_$!VHF zzS$$>K&uEOHMDPqzoJ#i5Ga-pbubtu9pg#!w(2t^@$#4&7D9fiiXJ_TO790Im4M8;I?St@e1YdTj#ly)Gv(&%Ld*hwM4t z*~Sb&%=XfrwHagH_w~09mEd$Mx71U212R9G7+Yh`d%G*XhI3twge7j*US|kl z|GmwW_sWxJ3Tt?sIpl(eWD9BRRVehC$mFBHLzmZS45$kG)Z9OxHp$V1RSkZNxGD){ zYsqgt74{IijHK(7A8~mrYO(nYE0Z{72xsiY;;dg=70y8=A=i>1RiTFQ^pYUSD-}~M zdRwdp?b^MfFZszUHzk(~Zs%E&xmmUvxGUa)i%Erj;JWzF(!(WfOY_!-qs^kpSEA$} zXW1Ax{N8KWHU(N4*tMBL`>Z-0Myv`&20IfYBhv2mg;?!~3ZSN;dMB(-TvsDlX*WG14o>L_hS>|Vx9+{)cd;QTtOi`+A)~- zzRIq9s9k3+wI905-bcbV2G5bd*7IK)F+X;&;OI*fXg7C1*u>?~A`UE$iuBaab=yH< zpXmlYtON!0n%E}p)ys}GF*k`*+dn#K5 z6Q5zB!SQrFzelva?CaI}s)LvtJ^Qa*q-s!sg$|u;o-4CXq8e=IB>JQXNVcaSjek4} zPKC2z-M$2Lw)*>h$I>^rs$SRd&m`CS+gKu5el)+>R=hczH)3bOfn@g@Z+6wH@@8v? z#u}ks32e@*e3OZ^7juchW{7uO7s$XUJwkG`8qC*5gkn?dJG1FYSqFUN3}Q8{u%zA4 z#G0(>PZ(8~$k1JYJUTMN!(#VZO2YTZnfDOnQe)2VVH2LUFLkCAvR-Rcd{-W9D1R|a zv-Dkcg_%uR&q!qG`Km|PWj3eauJ#hSkgki!k6zYo&sM zI+(}+FU<@9h1)EdLy5_x%orYY6IkmDn>a?m;4_hYfJ@m0u^_8G|hq z$2SyCR9=}`JIxlgF$15ViGk9~;X*V1&Wb(-9p7zz>X>e!!mgj16cVbNt4`}Q`G+z2 zDv>?1cMhsA*6(M#blF%%(vJP%*~!ib3(3p9pJOI3Aq?Mtiie$m&QjO{mfjZN?9uc& zKHP}xGM5#GQL|LnLXuUd{TPgIBL`CCY>KWBpdv>uKmLMkT2Hhw8yS}ppnEcz(> z9l6r6M+p6Oa#|hEWi~;shSFbVF&AEZ0^?6|t$Ly+CTWp!1%$!Y9k8}DHMNu;!!Udy2kn7ldTGp>Zte(dl32@~~7OZ*I21W^_E#ReJbjospjr z>V+Fi03h(kj8Qp8qbaf=_Vrt*>j6sGAkZ_gjJw^*RL0dbui3}es?!u51&+t|_Y zmDt{ZCOs&|oN@ggG^Ft%`P#=p+7Ui!42ostEc~gwjEhFznc@bE>?8oZxiw++4OeaW zfAhgJYmGk-(UQzEO-qiYZTNKH7>(bmQpk{E4NgM{IZ&BohqSx6p{f4to;rZ2S#;zv z%C7hD8=0;>ZotkYs%wUH%~)u_lll@@uWjt2Y3Is1_I5K94MH!B04z;}F?kmA@}k_i zJJfMvNMgbQN{fBMxt)R>oxpXOV&xB|G0{m<#-rhs5!E`z2>$87uOvnOy~Fe&lxuRhUQ zq|h`gv4_r8=)yu4#*8qjlZp{j#np9;b(Gyb)+Y|HIV<#-o%2gh>PQGJ82+HwyGY3t z4Q<)?6U@CISMCUU9CoR!UFO>n^=;b+HqqJH3jKntN4NFkrqrM} zvXs4TQv?LVT6nCx!!r_t2G6SXFZO(M4WLWH?h8cT7u^-?C>7u|6oNw*#rIXJu25x; z3>RDX>)nB0EE@&qkjvxuq~Fnbcd5~RCGXmCBl%fWN&PgjagVu|zcG-1XQJdFPT9Al z%oAOn$Up-6bvGcw%!xM$>P?|NG=(SN)JUF$OcX)&E`Q#uSt8fh?5X9FoK)pJRhb&d z8ab$=R9x}yt6-$7iM!5qK{!snL`|o|_Q>-^ApgxE{G?iu-gM5do$DdP&0FvfWyUX~ zEX5KyLz#-iczn3bLdl9r(rG%M(bj?q?R16)dD3^Y69`*rIzkN55Y^V-e@3}vkvCZ= z4o|Q;+7|A| zt~C0D-4mE_jY|#O+Ew>bo!rOUTbvnsePhJF4wR;R|0~?02c>;DpL)YTI)pS|h$N)tMv*S0B(SJR6HZKsQSNw_|`diAnsD%aMjwt>G2o25K!LsmovU^l;syVCsp*v_4GvU&R^x4SA$*c! zQ}9XWzJUX$Pl}DDpP+z&M=U{EGh|qoc>@gf7~6V+y5u@lK?hpE7fa%%@j+V_po?5p zkY||(A6C-O2A&NXiP79g>z~9#R2B?P zHQ6Mqw)bEu>t?|V`L9}T{}VHZ`Ey_fgWO2kgqk~_A8BH;v*%$(i-v|d*u%{MW?XJ( zD;E0kMmT}BGFK2~fXX6B6fvu;6k~RF@A!;eS}^>!noy<2rumEdq@sW?o*>m|-=B!ilpi{F_ht*Muv( z@+wv4L=e;x=Ia+f`&iy}__fV9vj1#6teeYz^2IG{xDKm;h3)%~6;BNn#^kC*ScG|t zCFTo)`(hGd#ljY$ITs;L!!fH3$A@b<*+>D8s|?UDF%lK#EDwpL;&e47pVI01kjlk) zv_2sskzr6bMylS|rE=_%rVte*Xp43AV|{k*r`XFV6uzcpjqY}@bJi?G6-`BWav3t* z9z1iC9!45!fHAy`f-!DEMrO+zx9EyVaG^{8L_K18DC+lkSMT;@B0wP*!a9}dj4n!5 zN?`iv=5yDF0Q!ziV(wC2{(!j*O}bEM%J+m66o^&?b}(msrV~=C`z)LCPN4JyDmV}0 zzOfceZC5X}F=Ub^4^v$W_)%niD;RJ9I+kGirZ;BM?Gz|DhVNYP|Akc=o4i6vj{?_7%Q<@@Bkc^mJ?TQe%Gu0d~&;f{}(rs_6C#NMrMw* zriedU7DuIN0WF1@!N-3D1bnKVr+1S=c|?b*Rh|%_GOLrIVw!nHRkkT^0%bZnDX&ao|xLzi?=jM5Fl-`qM&w*zQAwZXLixdf&<} z=aST-=_#e6Vo9%I&;^Ox<(!v%VEd`LyLucLF6i%AD8ZGAE)7_gR(M#`uyZg7;Jn+c1+?~G$Jk&RI^{CJW$caV$Y z(q2sv%_&Yx!mYpRuOaC7^PhJs{wL@Ri$+War@)x#3_N54rU$x_SF8S7Js5>z&O?Hr zORyODhaaBIx=(oJ1kuT`Pv()vD|{0lyH; zc|he$QOP^b^8CtWD&+y4pj7dzc^@1Dv=Mf!hY~;=6Mb~#1=@`F2`=9`q{=3}UTtBiHRi#$}v1H}CpA z^8n}$(t+hUsRDjC@Hb7_GqLiQmP*p}Fd|n_j_XJTs12%`OR<~=2P|}MU?Ba^xawx% zPh~&m11PYVUyqY>AP_dDC;qlx6^>v$G)9%(Z3tex$pD*oPEYk_?<}g1JGg|uJ4__u zNV}98)%zA(@kF;BJk;^*scpV&P)!z0V_5o_`(JAcIU2gNGBD+6D#~Ti1Oq7#pnOt@)WkOy z`|yGD0C-xc1#5rZ6gW1Q69nqaq+Nmy!yIs3NVs(0AAy4^8%2~Am%Yh8{@{?PDMaIZ zxLP@Z%WhOHy3I)w%C{T4XX5RjV(&zWs@on{`3L{_1TGrbZkFB78h71)+Mn4|YNyU@ zmAMYnJc=C8UcQyXL!)@Kp+L-y;yVM*yPf$d+`)K|I#XZX_2L{R80I!i^9J>0y zYjlM8KWBZOBg(C9V??1(w}n*xClxio5mw5G*(pcATlr_UCqj&g?~lmKMGg5ap_LQC zpO@_L0HS?KFFnnbXPNN&xjpSs$3unNtNN#l$Nui%-_WyEHx6`BRR5Fe(sf%t+iy&{ zTGUcg-t$+5i8e@_Kb$Hm+Y-nFmY?6>?qpW*(M zsBvud>3hjI{VAi#GNO9Sr#qj&(jcr@v?Cd#K`kbjVvy$isoFNh;=W!{QT2TKpiLC- z^smorarodprzFOOpoX6}Ex$}f@$-Q~295qJm~6fsN;kgG)$HyrqiiS3g`!%obgSM9 zCk6MU*P+zJzsAPhgHX5soFD1fsSa5Fy}|!85VsdaO@<5>+x(skXZ{L~29xk1!IY(+ z7nsDXCp7Cyn@gJLpFbfyVHKV(?=^~fUsSIQMy=d<{{?YZm4-xAoQYLje4T9D%IjkQ zhX4!u42;wP^G)>hr>6!9k--4c0cEAW$~UJDCxZ7S^3!aePTst7uTCjiDj&EybMK#K z;UfZ`f$!>T7V|SC4X5Q{eS&rC{QrJuM=MC>f2n@4Y#y-CYjj6N|6B1y8kY>v4~I%q z7V6BbMlqo*^az7l#h_Yf=@LlXTZf&Cc>NMS2Hv(eJbf;o@JwNx(`VFE_W@7c#K3Lm zkEdoQ9PmN5z_*P5SUIk&?7eh~l!-O!lxgK@bcCc@`#XVu#i{V1eDd;<>_i~>jmUzH zaj{0-&N4rA%}=NaxE)z+%t!w3t@(ha)DJzu`_SZoq;b64s$B5$e!ARuRw}me<9}}k z66*G!Y!*d;QJwlXK>pM%LW)=pii?h=>fV#%5x370n>!7=^BLhb#{*W_@25~Jqt)1z zT5^}>+O$|f=EVcxmZskXgBgq`%pS-9`?Y1r0iTuh=%$7Ji?-6(_P3qDohbqSLO~1F zSU}+j z4Mz8Ldv!zs%n|DAI7-ky84XSz1sT6TG4~rY3>qNEG7?IGetB1V_{7>Z-y@*@wAiQK zNrA40(=zGj1$$&p9=@B~Uu!Uy(u1YjL~{KgAMm^Bp{7}i5Vsu#`Hrrci;_$DzQt=C zna@bT)7;w<1ba&Ewf>2!>XaqMf+=8V%+B6&QSYkWyP`~GGyJ^s-#uvnsr=6bDi%O~ znDX%Bf1QjBAeL`Hqd-E!7;F?AEd-5yO}p`gV{n4oprG;?#OUB~`G=aNcc9TuB;=o@ zp`e?W!(^b%QOwNHElQQBro)J9B`)E0D|VID za??!jehabgE=PXkY1OU4dzu335|jZAmy7}=?7LjAfhw>I+@sauD_w|5u>Cq(}JqpCl~=o<_Bfc+C9oX1GR> z7XvLRSs3@hiVYCbXJAwp)A4tfW6JBSdvQv($%gXLz_qD?iScPcTSLb(AAEW%31`lk zXg~uII&nNN{VR_ty~g&t=tI3}8_LNW@*^%~0#!uv@6$R5m~%n%7GCWlrcf%)jVS(L z#WCecFl!BH78+m_*+WLm^H4Cy&8=?pCI^=(fQa%anHZJEhjGHNelQ!V@4_*#OAVs6 zf3i~*Vk_Ooa5?IgX9UB-#*bk~`uDKkrp}lBoinIKVWcGI*IfXG$0w+EG-@YdY8Oa09x=_Sp&=y>T3Jl28EHcLVuQeP8OV=t0Llbx~ zi}=`YU&8o$L1h7b4%_8_tjsUOfHLV{HOrp_;5k+d?aBakc>;DUUTZqH0@0b>D2&hc zwZ=W5_gv(#_MLhd!|Vn@C1eUH#{2@SX%qd0*M#E~OE)f{v|w05MRO+dbmRM+v+vP{ zU79cOIplV)O~fq&Nc^@mJ=HQvjg4xf1%~@At{r*|ptczB5J1`ISEde+(^!r7Qc%}L z3W`t8(S&}B?ElZtn^)WEI>gHi&b*xpJHdypWDw|?1Rf`*{*FL12Fcp|IP0XC%TB*}j^6s@?dOb2xgYal^Of%4JrbY~Sf< z-=((&)9s@84+~97T>ui`F8eNTX*aZB_x2$b*s2{dkXuE6E8>9!u;LRO>ZX6adMb2) zt!ofE$x$~>N85R^LtJcO;GNlfFe3I|{qB4W0C+AiZ4s{Acz;jQv2vmTNi0F-UUG-KP7*-Uk-;>zEkSHmD?oQhqWk!kXY8`2A)R z8v|i2RbwZb4`kN>c*l!`%Lugr)dSz(`Y?&Q>QY;2hh#?wr}9HbX)ASMDwDJ}2`ckQ zBqUA{;4{x6IBq|w#MP9Xv@Q-#I)#=Ww2hIN2AUAOqBWp7l8GVdqOTDO4+~X|4jno3 zp>Au~vzbW&6dvP7UUbLcU%vsNgb`4oCm+Fhmd&%1?DMFDD0^!AD`nw{C(uYtA9UW~ z2KACL8_nh)VHonU&}khXP`!jB?(NVEs~0y^t%lnloqGzw|9&Pvd`=!f9#16!h<~0wuen7fwxg1GV!dU?%ExwlYs*l8?`w3ja~HhhXNkDm}IKA z_N#?RYG^HN5PlncZ?YMu0U*8~A1}}?u%khc-@ASo`=}UTO|9S<^ucNw099$~_Q5Ev zhaS_91XKl!jif@LGmNc7IkqQNSLld(NQ^QZLdka+2FH8BoFX00T#xsm-UD}1D_{AM z=kMX%7%Pb-kqZ5HLk^!85*8q%>9e!R#wXdR(Lw^bp)jh*-2$dl6&(|b^>8Avs z#PO8lxBa(&WeqpE8rB~l1>D4o|442)YJ6ge?*zKxTT$s~quMLBr)YuJ;{=K@BhDjz z6V^RPJzFE*Y%o^wp1?zb$rq{*mhT?xN23ELB>q32w!-rmD9VfpuaHgv5JKiJzY$07 zhuZXi4AHx1;-(%g?hdqNbSaSXp!9ONRE_G;2OunWsr~)+-f91(U%*q`Xfg~SEFTth zzQcMee@JHJOjoHm-7nS^OZU3XueU4qY68`OuI$Hxwr`<@rl-uk0>FQr@g#nn64(Im zla1AA90w6Lm>Q+H{Gn_b)Yr2ctIGJs=crA1Cqd{UNl|BUX-8DmkqHT_^2!|x9_ZZvb_Ze6KhX*;_dTDZ$2T#*J-tTu@|68OodW#v^cTk zi6y&7OcK~n7v3EA8f$z3ZZ}>>GAH}sus>HjYN7w5CClvVRm!?30Zhs`0XN`j9y}S* zk`>3R@)ao4-#aEbqj>X}fr@fLvlPaGR6YGR!Jx5T|Jl~R`2LJBLE=9LqI&>pkmiVz z`gghcA^zPmqY~S`ZwjmqKX}{rPuBvQ{2NrlvLY5#MpO*l&lq(3ygCh_ZDaA8g;&4( zE#1F_La0H-W6V{_Y9yckLN4b;J9NU0*^<}Kw+p@B%R!(cSt>p!*&vQ8jqd(?

^ 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 z

lVqchJmm`$=t4tc04jErQ_MFR<$%vhpzOjnnQp!e+it~$qCP%2?vO1S|eSJ`;e zQQu?`sqg*)WVEX#j;4_gyLT^xxJ7*<0ARAs>P4A#==FRHgWj>fZ_^%&nAQ1XG@yMG zwm2EP`9+cgf~uT8ukXwaxP7Kk{|v@=a^4ndf$`$@3eRcKNaFJp_q>{B%~Id{klpvB z#`)|Ht=+4SqPZ2f=RYw^*tPMzn|^nBbDu9lD35s7aon=H`>%RWH8u@u{4AttD^|^Fpn5D{Uih5$-;to~_QU8v1iS-)$$~n?2 z8R%L)-Y*i2ruj++N2iq%XIws;OPo%Z(*T?CUlH^vUs=t+{^?u8#7Y2^0J5$ZU9s@|Zeo*k6T5XA!ZKe49@Xi93KxLlDhBagD;8vg z_NR%@Dl|zlm{zn!sxA#a6^LDVa_uZ?GX|;LJS~XRjf!14gHUdaKfQlQ>RJW0T$Y7c zQ(;kC5^845?Lo4j-oQ+Z8DFtDDmRmV`z@M7VWrb(p~p5oQ+GbOg!c9;(P-QX1XVbY zTd3U*kDbSYd5?g4Wp&{0oHPMLWCejV?W#W1trRKygbDM2GWK;r86 z0D$fgi(km`SE)R5u1#+g#nT75R39KqC59Awby!OW?`=smXab(i-Qis$8Qj_d@oQ$D z_-!aF0M6GdGzJcoGL!^4#n%6fBlGg1Jr9Lg`o!~a#O0mMl~8;TDXGdD7};X>O-HlC zi~Uwi<1;zw*4p_9pDRTw=g$G-g$*HVcGSAtU5p#?$GRrzKz`&NXxeq=tY9gGHP+_Y z2Tv3O3CqaScVYuCW+^}D88|~E+xmg(yN(k6eCpZes)BUf%%oHNvj}=bex;s^4uNCL zdKYy%p{8|e3VQx7_PzDCkr@8zw9a$Xj30X6K5S*|d)HifdHnj`QnD|we~rFrx+x#! z{b|{4b~C8P0reK3Cji8OO5`%* z5*nvyz5D=5ru#!>b{$!|Y!Gi#IRl&BgpzrO9mkAqZ{xB+R^o{xJsd0R9MesOLcH)! zoA;gJJ2=~lsqKy1G0#Bfoij?mkiL|?8^mzMmhl?s^MC>%6jZ-Kp~=s^Z7cm;pNwVO zm~rmaaG!v4`poS^V3r#UxC>V;ei`^n@OIn)C5HDInV zEax8b%r(%zg7CpGkRRf|SXTMga!1O?VBdAtY;Q_(+ zUV#F3iatK~-LoGoPFP90^X%8!Qk=%XM0?~FOCR0|r!@UW4%2H}tFs-{3&^6SNn|?9 z5hB5?1$NbMYm*)P`Ft9U%TvU1*mC53vFm-E39S@M-VCAS>Y;2 zH=pg&!8=DV2z?rdiT8e8OPZ^{J6Bb2W=-BvFx2h-5yk%*OsRvOnbz)CI#gYge2D(~ z(IWDx&)mVS2-QjPZ)96x_C7;$b#4VNgVom6pJp7?L_j_@JVR8f?*o0&Z(GI0rG7qs zb`;ZJU;T=N9*^TpVWaS*x8@m!dg1DXjji`S(BafL*6mo-jBPckru;o4r}$9kMN1hN zToSI?UR?IK1(Q>!u4I`0lKlD4g1?gng$QGv!BVa2}v&X-W8`l(V{Fw7Bzb7S{@N+5aDtn6CjYY>5vQm{v9Eh(;T*i6ib zw@7n?`A>BA?5&(6f;Peid2`7Lx*TSBG9+?o5hDvfhae!Q-;ge&^4nX2j>?_{Q@5N^ zO=>90Zyg%}ds`eL_4J6K4cXoFsx3_Ha}8F}T}D3n^J2EO;?JyFSeksTT4=(uUp>Ef zidigelAg$h-lJt;GKqUE#h@kZF-ucVnY_A47Ge#B?FtO6xTWV6GffhN9z9s*vU@ZU$E|d_S$lXKIvTS%X1mU z-7VzI$N`9t?6URSsL6HxXjkVr4vJoYiSAi%)iPZhMV~GGw%>68S~c1;%%s>xwx

  • Xgrn*5n9 zk1OVg_q#$@1={{W2n=KIU8$~L0&_3(K7>G0Y;{q%;WEWtOCxE<@r-n2y&MF?=#UyS zTm*eX#Gn$y6@B!ydVus7z_p{tWk)~rM6@#pPrs5DM#(NeaT8IDt-b3v=94~3MH|^2 z!D`*SMr19%*6%Ui#}sAoahAecBs2NtQD-UT6KxO?Jf4$Vautwql>nKe=~cjjx1`%D z)Wq&taNX7_W%0B1N;h-z5Jk49(@_rTa}3oFC%91*epjv>%Li*2-e}{Hn5knfclYaF zZSF|Nki$GM{FHKA8jKq*@H^5XAy({ZBKnMH=o1)OGEJq;YX>YwC|DOKo=FdM%12WQ z<)ybeUs12~WoS`XyDK5SBRP9o9Is=aAdkIP%?RamqA9lRDDbVe)}W*evyMN*FLYS1}0hsd!S)o2X;q=*q7SJP=7bML*7+p;ZVEw4yyi#!f52o7ivm#< zcu99n7gI(=8JC~DB&|!^nXnaO7cy!oL7iTwGvTxQDjj8~vPjfL+FD@UUod1Yf0SKb zT7#Cr$mEzKWX@m7=Y19V#V1@G?i?c`$`>8%vBX|)^@LbayfOFDTA% zd!serD5Aq$+&s26S54!n#%n%1y`8#K0^d`D=7d`CXB$mozu?ASGBXXlh`RBao3U2W z&t>uFCoe@g>BSzdo)DgtBa+?dON-~U1W0!@uMQvM<;pZ^zCQ|!5aSAVh;g_-r(9kC z*gCrGlk|d5)=@#Pw$|rI(;18vPEKuQV-Vkg@L(mpTw%XPWJiOLJa;(k)-iCd*S$rz z7$P5dD`uTTuNBm@Hx}igBq&dt-h)lvHzselG*=^U%P8S(5gR;ogvM_JJRH<*eBG^zo&22I`H|@HF!2`V z1^pwFV+vl;v=XNR$t#xA^SB+I0>56X)hyYOZtSR2U%=Wq7&}h zs!thtx0ozQKMRHlSvNjrK#r9QGjr$B*w_}Gmzy1tu`#D>>Kv;~oHwDzR`DdvC*#CX zqVlikTNge?RkuGBwy2o*a&@8)M7IPn-dV`^V{!`5KgUd%B zza-03&9jeajoFoF47QG%_~d}-u05-pPWHIy7CfEH@#F<1`#V|!^L4>Dr%h?NGUMp< z=0o|`Ri7GZT`Xhr&&>6c%z~Kv#awjdy0A6TtjK0V1HWHMPs?~RPEpX$wYebIi|cEU z|AdsLxZj-NLx-e#lz^YGh6xuuW4*~uzBk!Ww~(kyZ1C*z!@k!qFoP|0$Q^WVe)Vd&h7>rJBIv7CPY`v+BZoy?>6XQlWi24Sz(&>bR0>XWSVA3 z9xuS3FEv}-F}9W9vFC_&u53L8XM5;BWk|+on2tLMmt7r-hDirrKqMliP!-~=X}o19 zKbrY0{mysVLy7b)wL8P6A5+I?wA;c6vVj9}hSW{k0vBk^ZIuxANF^UV*Cdwj$ocYI zgcH|9Y27ggq|-)1fL_a0UzBR`Akm-0hN0fdyHv7d}&my;Z=2x7N+IUN9P)|3q0p%Rq1pSRo z5C8cT)8=(|_SKOp;4hrGpfhO4I{rdfrTt?~cls=yAsO|^Q$zB)r}yZVc?hjKcY8m1 z;vMZ;^lL(4f+1W2-;t^XJSL4(B*ml&4U)9;wsPWwnx8q>TW9R^9AZp0CeUH8RijcI zs2yz9i$?b(`yA=Ox&t8ycHzgdzVvlD-I0>?_}=0E;)Kr(w89hoe>8HM`b1- zFfdnm%{B~8UAE(poA)^}-(nlXsi?`*Ul%xyZKdgxk#Z8m_B=tsilh5ZhSuE6&&c%LA}xX=_sUr%}~sc~(Io5Gm^WJ$SkT`@-&$@qx)r-cc@ z@nIS573zD*LxyVH;G3j@S-@ z4_3S@R!q8o3Udu`e2071ZQY0_4PKZgA;gr>1micjv{l(3kcwkmi{PL5I*TB?S0JLI zf^|ktlNlS8x(C?Aw?Y8=A~Hq#%C9Z!yDeeny{gL59tH`V*Jv=KD>Fr{>~AGR$5T8= zf-@vm>ZS5)-KUqMF=yaPY1cfO&&qr$8StGZE*g}(JweSQK|RWi-t9Ef|HaAK_>>NP z^TAoXE7qOaBXSPPe~Dwe&!{onZty#_eBQB_X%kbMH&A7CXxqCt)AMnG1PK&T<+ZrW zS1itgQGZ-GT5<#{^A2TY+`=aUT?-!K%_oNBi0{kcuoID$HKQ@wHbiMx7_r}wDyWwo z98(^;2HEvu-Y@fy#CBZ^P?(Za6yQBdlM+f0%weX!kq)X`eNLs#A!NuTO+q$hWf7hK z2n`W-v&oP@s#UW0QV%0y$nlkH-lwB-LdIrJ?^AAL1p7iqMjAbFlC;RNw7bq}BwhT1 zXxG`%BisQ|@=FW#9FcyEK91}1^Uvp>3FkPpF}8equk#I6kALD2>floTE8e=)mm$yE zi(pJ+p5PZ@dL7f%k3e_mN;Rw4$IweNd4^))tp(ie!91jvMs|1GBjXIC*gks2SWb{` z89a3A968%6NYN$QSFR^mT11NokqCDAb@#>H2pQ{I&kC?$p=cQO*<+?*b2+jkir%O^ zb=-VU-f*3*5JA)`;P;@+*jtaw=dl?}6k9RGlt;g_o1lW9&;ykpdgk#$*1d~{TKMs( zt|$Iu;`LgTDY328b6uHHVV_o-*I>VE6_-=R2xrqn!Cq%D^^_6Gb1FY|j=H+W+Zl{< z0Z-n|x_4VySc65(VYnQP%Cg`zh}$D8~!Q9865 zR+17&coNl=lgE*9WlWMqg+48k2+Rdo%sBE}w`Iad9ha%-OUmekapXszmr}Ji?58oir9PH#KOjTvzud9Q)N9HJju-6^(^TFFSInrZ1-1SSZXTkye%F^^S&!VYPS zk=BbC;%rq5^7`=~@T$9O5e;bGx$vB*^XFpV<6I_|EIhv|hL4TR8s8b>5xIqHWZAf!avkooyRVWPJ1%D^QIP!TZ;o7~Vhbf&O-FyllP`*Hov?}L? zm8#>?y_hrw-cA`5%Vow*GmX@p)#m8#hCY%|q+tl}qUoX&)S55Xer=;P_5J-k%PV20 zoAML0kA3M=q{j@kPcyvj#*h0!yn~#UNLs11 zi?Ge}!Jy_Oa!>R3kmo`b-XliD#0`Tyve{ZvLEn3gEfPt)`pm*l4f+L|F+;M$S4YnZ z2G4&P5B%s6iXgv~jzPh`OO36X>>s-xV#j}VqQXU#4U$=KP0#t!^*eZ!``S#8cq`*i zhj&$2)Az`Ss5U5DBP;}Si@#<6nnCr_paris#!LwD>$g4aDe&J~Z7%v{q=k1}IMHp~ z$n?n^3)ZfjZ?U>SGbT zTz#5-R?_ptTz%2#U3$2*&Ca*6RIgrvLGr*JoJGZLma`)X);k5Al~y5lZ2Y?_A7@;1 z9O+Jpw5G*~AfjrySIQaSDxTQdCQilO^^p<4M{_x)HO|0iZQr`x5CTQJvbpLlcNS?^ zbkuqLDRSh;^7lmA!5%=IH^%Zw-gZptD+%&G>P_KWX%)Q~RgDsY7pb{OC+`={A)jAi zo3GOE$&wk;&b+O($(G9d*g&!zT-{-8Q`Zp>_AF?eW>({@L63D;Y*2Hr%Jct_vBNp2Q@IT4C+m<9SN567my6=GF>{3P9-qJj9&ms9JbDJS%}tiXuKqJ z^9WQfwaEEgQye#c=m+A=b@y#P92mL#sbfiq#0@47?Pv3Chrp>KWX3(HscN^_F3=qmodiq?SDyiqG5qt zzo&I^u^1Zh&q;VKSQvV@?V0M5jx830TrSs_RC)E>2iZX;w3Liv61PHa(r%xS)`^P7 zox+=7doSSPHb+h&&0njwg`p)|QI<3rJkq-8SWd1!feUR3^>V+B-bZgPyJSV8LZM@vyMXOvw zyku6G#}TQt#hWfR8Pv%B^|UW2UjsTL2J#ey~Tu@ zQ8O)iCv5>@@r`mmGJ0`#W?$|#cLW6lDSUmDa&Wlhsmt^@s(BE z%c+GCrysE)bU8b?9Vg)4*T11C7R-!uxd~Qi_kIXlJ?r#)uqGfX1uyM-+BMhJQqhA) zAquCAKy@K=JY6|^HLkIkz-yo#*1>feZXS;IE{kwS#h_&31=fA;?I ztpZxu7NJ>sA+@3WqzU2k5?D7<#;92_B$wEF7DXn&JCJAeY_N8r>_K;k;)4IjJ1o|9 zjkBKyC&8_|TdRm`D6rLBN@SfqNRr{@6J2*m8Zx9D#DSCq% zrbAjd7Sv*K7sXT)lk$;judjV@LW=gNxu(Ewul@cRgpr1yEGf7xQ_n9Q|1E&%;*5C7 zxwceJDV2{WI9r-Vfwn~?y2Wv{VaG_TJ=d(%#I2U$h2okP|AbaXG>#8`16zdjO1jwk z)=B>H5;cx{UI!h;X{#kL$jzSPHQP(99S^!P7m))%jKFg$#q}d z;<(3ryfuxhjU3*TMn}Em|T^X_73*5pm_HRE8tcwr)b~G9u#jEP{x4$Wj!{W47(e>MM(;b^Z)( zvobXeNrHD66Fy*@SwH>;|LdSp;?-Z>VN_exkN7m2r_cT{;Vv5>ix3am(~@jE5-31hdhsmV<^mGOPf5bP+oBFEcDD$h|)xo?%S#sxA7TOo6liXv~# zm4_sc`AHUx$qt=`-_1)MHu0+weUUzTyjrd-t^8=dm3(>2#@jPqGpcvX(IC=Em zmh|4jOOk)(M(#qXeb@ZjjQX>1p5^@Tml0s8o5np{^k;b9aR@#U8a%(25nAq;; z|5ScGBRFTY-a?SIp?uvc3Ghb(z#nG^R`(n285_iofrs&juCTH}Xy!O7=8Qu+T0;C% zQnZ$l)Ov(8 zQ(R@9wx$4apj5ARex&~d#ZK0Iiqi$I?63XkzI?BHkkeQIX`Z z6LghhaO|Ff6nI^1I%po{nRVLwCBjn;b>&X24ao$a!`9E-8Be`4=AU%Ac?ynv9J*?d z@bUe9;=tQe`QbfvZ!h6IurJ@QU5Aq0h@NZeXCg$W)S#aSwX{tz5n|?jq{=zuSHa~c z8Fn|7lL~HTl5aouXVJ!%FF#u?V3wk_TK6NQ89vUl_&@?3d_9OobHc}(#9JvNQVqlT z>!16F-H9&#m}r=ex##8_b0R`^DjNt(+;QnI5%E2?NnW%nWRHuU!vtaTCLF50dhV2( zoW%(+DSv*AmIk)v4_*PNWbp?)n5Z!2^w+V54Voeld zr)7c8pN2Bw>d>(l0X!}Fv@k(|`SRCq&CH$Frks7h3>;>zo%h7D_rdatvn z99hk{GLpXqOw(>#_jvu@)1yv6vj_ibLebOGkFgIm#f+5+eBbdC$mGmOFl^pzzYtH!r39 z>hWP4Joi+SjO#i=-!gKppsXYjp7t%^biJ3*jM1jGh0S%kHvW+N)nbhABk`VL77)p@ z(rkNrgDAqZ)AlkP(Tr>=_bPj!A_nyUh)V_I#kAEq9$moC*<7v}!Q8cSCd<0R zX7yE-!1v{lisj>xakok?MlMAwEAPEF`Y>P4)sERMXn^gE9LuqAIcNDQPR(Ecg2Enj z1x87F;|z6cCb-3SOs`{KlGZ(TJ3;fPz>3vcwXP)bS8XLN5MFT(=Ghc+jr5f9;Ep!T&Q;^LL6wkXA#0SVbwhDdvZ~ zvBz~!gv~NoV~?+@lInN;#M!MiAB&zi`4r{-QOMfMRtD^{4}W#KT68P@*Ejo<+Br*h zELE^Bly-|tKAr?W<42CSiTCE$NHP3LRP{nhwXs*r{XCQr)N_5?3a?77{-E}@y-Z&B zxK%DkN7R_-ey3hUw!C3qiBr%G8rmC==UN-q{P#swB|ubldS>B|VwZaU_2CGXtBFaP zM3&l%i&swjUUQ$i;*k_p%~WaxW_pGJNsUrH+fxmFUnhFh2|kzv%Lo2{RCwrOpp%TR z4gUjMA7e=WCD^)*ih|*UOl(er)piR@txBbDR;7%r`6r5b%n3VSF_0#V?sh(3Z<6Ui z9MA$K&i*|AYDMDjpvEyc9ZW4~nD5VgoI38szqI_DNRz2#(@7wju3YVP$bCnoJ1~rr zyS}wL8)SB*65^;}m{6}9pKLeBn_zyXq~E;}hz__j-A`X1Jbyn;?H?RMLTA^3R$o;9 z`_W$T!GHZ62J$Awtr@&Rqx~iX1U?4cbVSgtvkMAS8;pyt4crx>I$hla5k;`>Wt<1Y zIB3H9XBXO6aJM&LeG2;@70-><{@2|O-=94ILuc(JPJPUZe%|Z0GYGoP-GBS;UNqs3D-X?2vweDKpSsX zOy{u*=@0teZKpr&lIQ`}1%QZH)FSKfiLLF$-@p5vED>gKR@F&;|41fZ#>E~kb%Ibh z^X%YTH$lftVhQHGKNA}`MV+7UZyEGG_}zmILK3CWlW0~zr0tJhWgJ7!yf}R3$>Xl! z*bh!pvoQ1ni>LyR{4)brgHbpvBvTGtr07;XI0hh6+wF?w6Yu}?n@sru|MMG3s~~E2 zHyyxKEl@et%FR{M0W~%#V**_ouoKzeO9o(T9`slDcbBK#{T-sOv?BqGGQcUw+k@zD zy-UrGq{^(T?LXh)>Idj2=K3R@YW5#jC{upm|NI6fN`b)UjdTh&wN zbVYxw53?nqx{^IS6`s@ajU|1~tYA;eOzGe~HyoVw{MdxU zU@gB--7XXtm>{xq=k5C+SHVc0`ob%h!D=_K^%2;c@Q?yUoZD)T?fAzfV6rBAdx9E_ z%YhBi_%{eB2Dtcb{7R_h`n!043aJCjuHY*D^bcA*MfiI7+ZbeQBUbbE5MZ?T=(@OS zjqX!PA2p@MwOBG`!Y-CV_>1;-D-={VyumQ8P#FR1vl;-U0_zBwv31oX=ZZJ-1Lfmyn1?F{e{M!LbZm|^Oyd9fbRQl}Ln=m0ih- zq!L*tGAdh%tb##RCa_Sjxw?}3FTy#k(oVy&-I+%U+>%dR)6);hv&YZ`?>Gy zzQ*_ay^7sJ)z+Bq)YxCNG&k6dY^2PLf$zkFV;7LgZL{FAL#cu)nzTbP|9NcR9R#{Z zFo=PG7#VcjP+xaXhzmI`o%AC3H)A=E+p^1+xQD8l7fX)!gj=jrUEn9vasQPIxGHY> zx%no_C`FUJDSzZ-D1Ck0pLEZJ z0Cd>KLJo>-hJJI}fn?cF7uYSX9WkgOFbc461mSP%4zPb`oEeevBx_#G0hGg_XMrug zOZs_Td)MRyhHfMe&Cl_m1;s)R;JQvYWZ+dIlG~X<=64KPgg(r2TCxu}5+PgbasUOP zd#c?rJlS_iZeIx3s_9PO<$FCeku(m7T_F}M--*)Ywn=o}2d&a(r)b#^C^$QL8Suo} z-U=F@UHEGSfhw6Aa$%TyFmI67{~O^CD|m@hLs(5q*pNWt_cRSh;s+q$$6D}3GHiK% ziKQ-Y$%vLT-Rd@&SxA>omlI0z(GsRx$(z`uy`GJrv6ZMs0y7AO>_mLd^A++vd$9x1 zo36Z6;k!a?vp#ZAZG|@-mq*8~6(sup_tEg9EmFj&p7sAKfPM3A6mZ`;O+c^Ndf9wP zo=7I~bU^zS#lZrpb$ObC^x65%3(>v zK*7sE?#q{XHced|O4JLg*#c&^eb4bd)R}E2I{x>}ZqhO=9g_Wum_v_yhrlklD8?)< zBR=#l#aQ z(yuciabg6o+uri(fPNs#?|SJ)FnZy4u-2m!B@dzAD@QWt@dR;Y5Mco77|JaIuHsV3 z!g!s>HPVXpyGD0_t|KTeqX2V&(*q3a!;`a;Gs$PE8>*QNZswrd770|7@|3h5V@7>fZvMUk!e@isEA=g?J0Y=nMo4OW1QnO8v;aD$+64jdGZZ=})h z7~*Xz$T?gs!9Y!brJTXJX<&c8nQFy}E7z%#HqWJ9KlLE)%qvaHPZ!r@O{`sg%=RYA z(r%RN4?eOkf*;ip-GE_Kxq~~jf6GB zSRjP)-=rXSXBa4i#uz(1ZY2h=jOPM=Lw2%xPxnB2b{L3#fp~+LsPFfq(E$$FG=n=T zljO(7*t+>YuT(o`KiV}W5>tpBK%08qPmOsnA-v0NC@x@Zekkw2inct<{>B^K<@9{@ zbyInaD#&@BOQt9h=-vp|issd`LAMm1a~;ke?3(!cg??!)z`FL!d^iIvYhs_W2yMJ;?r9d`eTew|61f z7|YRKJ^5mG>tG~42f1G=L3079i@E|3Fx&-|4~xC$787sqoCQp38V_ab8)rg=Agl{M<&Okz%JCyhoZin5t|NOLvRs5=0QMm%-;tqzo7X;u3dlAR- z3Mi3+cHhjWKtAs7H@t`7Z>}N!Mk=?iJWA7V&cG#^{O5t>)Jr*tHY%JM%4_Oskm(Eo z{*n+T(evx$mxYdV+ zzW)NofMtdfu(Au}Ax28)#h`;;)yX^R5WF4pgRp@ZVRsAtI_a!ASAP{s=?I`~T1JtK z2zDGuZa^zbRC@%8BGl7#Z*(EfTPR>#vye@k$l(OkYUuX1JX5XQh4?7JpaF%P=v5uZ zQi84zokVk5kVgsTqFYBb)^oH&|H`L+kIYnD89;%e4+(}0ku|kI+|h9G_~s_RL>*-S zpU?8<#nrWW%bE;DLl5h^S}nsHMDRe?N7MCY=f9*PpTTR!$#G3H56x#eWJxt)x9d9` zK;0j`V_5nB_Jh!^Ae;(!C2H~!8z2>9>h?a7H3#wT`%{z)nfN!5IC0RMt!OZ-7@V}a zAY59~`BNrHOotdHkdJk$!yKh&SVk5Z_=8(MrL=9P7CY9AhWu*Dw`udIa)6t(A8|TC zpRJb@2bXXZmSKU_F^7qnA*x9G}l0AmDdz3Q9sUdYEDd%jW`l_w}$ zUh=FPxR(i+^Z=~9VonA%Z$;+9cl?{w`Tgy+@EVM$`p%=b26Y5XhZyNq@wt%_3ycUu z39V? z8iWdfV!9`AMFRo*i4QecOo$PAM*pIZYOrwFgnPeuZ9PV;{~{9G_20Wd0=_t^{Dk?~#vNoL(95g_2eegS5T#1wvLnwDgBVmQX$s9O zrL4s(r2cA~&*H%`LfxIa@zz(6b(Mc-;@SWbG!w%ZP$Yrmw*?Xwhl64X$PB`Mw}8t7 zoF!dkt&7I0)^$U`QXW8Gjd*``^e4h0^~RWg@>*uWOX_&}JXqsfzj}9CoPAq

    @iP zEHt14-ae{X00Q)&s3yBG`rHz+rNPid5t?qgBLQ%Ch-BksfRqC=0trf)x}FSX)rsJt z6%48$4mxzo%L}fc3`6}I_ra0fda?;MxO)27;?!SFC=(|@izd>(tKy)#VUu583uWWT zr?9}}*uSGjU<_ID>Wgd4;@Gi`iqjpCyE5BA`RF+k3PBTMrB`p-7jhYy@BL%K!-Y^- z2l)d0@JXs`x|LY?pN=%#s59Xzh%XF0j!-evCl&9E9oIv0q|{yo8065TfOfSZKm9B) z35!4u8d?THXC*pjF4m)_XOAc#?$p?b@3K7fpe)%<_FXXu!b8nO@Kd-_>CrIf-ahR7 zug+l#`7^%AlngTd5Q}FNbzK43rz+4&3FJL*i?-NAeB~*&Q_>`&nN^S@{sz`WissRNzY z>R_;z{9^T9|5HPdlKB0e1z}-Ai6xuu(u30JQe1!-^M~F*{?<2{w|Q8F{T63{}^&Hp!(LJ=2L1#M#9FBH*%SOr$a3^MRvDY2J=`{jQye;Aw0)*OeEY?QSW&8=VqX^%bu5@N80K=fk43$f1)h3t^D=t55Pi$VhbS_*U| zJ)QMf5Og1)p(yGiA=9XDr`y@5;$cU7430*oZI0c8?*U%U_FpDhcLtI7vg>d_uv#zO zZik}4jOpxp4(HcK$1^?F~C$SAY{R-RbLVa`x>J=kXe$YH+KeNDUFv zZ8jVv4?un+D*rZ^xd$I+ZF+%rg*JmoQ2OjK0 zBD4o_? z0W2sR0W*qAf=EV2hwMcua-Db~ZUVvfIE|evhb;!VG`KM@_n?b?IGLpQlQYislnkYOuTlYiQd zA*vL_*K$Ss&;kc(eogqz>j|8;EVzP$@a2x+5IbpVww_qYc{Bv^8pQzx@%e4~QPhxg zkvkin0Bt~$zXz@iKmPnuWz+$swZI&AYA1m#JDd>^S%juCh&6u-8jQp_5DL>s6&aI zl2C9cp}9R!-(4PloP2$NuLFnp&Ptc(zZQ$bm9hYu8hpzO{mR`h)%ik^Ic@`5K4>f& zi(lGyG^G~Yn}^uKVsvyCe#(ZQHcXYU#QPIbp?P7P9JViU(z;+qf{>2^k};o~Z|>1$ zG(2@b6-~u&3Rl=X_K7jaoMChLdoNLeo z{`@LcThRT}#Wh_I(zC80!MLol8RB8jPGK{+(fj5C$+2`+&}U&xogMcuPMO2j4B5li zTRQX5z%yS7Yy8XGP2~vTPW1TDa%!yEE+7&^Q3~C(Aio9;Vb(bm9j}+`PXrMpw0$UY zpkHWW)|j~;hg_`#a(qBV2MAb~VGlu@PN=pVS=(krdkh4cwpj_-1){GjvMMM3m*(tn zp-Ov!y(`%l)Fwf^RS1J#Y{)@IUJzK&z$pirhc4tS2g#3=NCNp7RQkrd0oVqLWRUm~ z!sqN#IUC&ONqb!vIXZXqruI|oL##O~e_gSX&?4Rn61;N%?)9zE90X1C01X-h%2z0i zlD!5=0G;nc%uJkf)!KjxKR6ab*hJ(9G~1t9`0+YBp4WTwWyx+#Is@o~fxBhP1NNl) zEwx}8eVFX|8$kYyT(aAdeOk$JX#XlO?79q;7%ZyVbpG>A6iDU$?d`-=;|+QG z8k!DnN{4GxC^-LOPd?v5W(ZoTAiIBbCFGCChjEA{LA*zGUyDM-$-P0__U7?j&VQvZ z{&lf(aIHkuqYO-(D`7+Mc=TM&h0gWRu^Y&YP?3-mrXcnr2ywiGAk~IgR22}RL82qX z;%`d&E?)&|l&bnrjrX$21xk&817T=8tWoQXzx z`gAzz+d%3eA%<2SZFY-<%Fv2291ce|o5amw7hl>3 zswp~BXI}l4)8)tU?)~)?xJ^jJWgL?z5_&_sl2(_xZMSWjlH@j|oNme5Ud`iL0lt*Y z68ntM1`6V9pxUR9c8A^oNEpb>r&LnjUXArdy!Z|}$33J=sZtOLT~}`^prZQklZ1X& zY5S3X@vCA7UOxoj)^W!#A>QkFoj6~D-9t?tCo&d_+vfTiGX5U z7h)7b@)~!Ebnc=c+pvj%{ma#XK5KL*B?{M5;tT}L8&lCtR_WY8B99Z|yH+4}j0=1-T?X__LwRa$K~uQ58zp@sC)*vdz2jH#Sqyr7YJ&xM zNW(qb(n?32B0rJ+H&fiquwVN93FyiWo*^If{Dw;g2_K$9BMyIKI-uijN8-xrhz)zX z5U)5K`q>NNAa$Vn7?9o=X!O3qVeKe#e!?X;5U&W|y$s+xkoVe8wr9`~<&w5D1gTSx z1jOR9K+^Bh!G}~3MuRw!>6bB$UP>haxnZGyE1LRsdd^~**B~7X9lSbs5fMweA`%DL zcQnz3n3XF~n*t}PWEUCLnjbfM=Q~O%_qeo-c-u*i+a#WZ=}NslELRRe0du3KOF6Ql zydB&mV|<7MU!idGD~R|`ZnE&CW*F~~LjSY8L)~>T;wlkIZ&7tbur`*%k6OaO3W8h9 zzk!IDXO>7hW*S;75ufmv>nC?;8{OAc9wdh zg<&-kXaPV59(wCSX$1-ypsjPuwAc-eN1=Y0$n1oyW+ig>a<`bc>OibI>xM)A$~!_O zr*gG%k1>tH;^b@9r^shkf}{Jc(Q00MYxCVZiw}*zmy#1n>c9Dx`iv1A&AFDr40u4ZF=5*#GQ2PmoE+`;Cjy5%Uza)TTMh>CFlP`Bs8=iX2pmzQ$2ddiV z+N8J!)Y@R@r=H0>lnI?y-pRWaP-VJ;@Cu>73}P7%2Vz7ps1P~W43bh125RX(rAu>z z)gY@Kr6X05p4tk40b3Ar=4Hf{ffIaS*fL!Mw+E&+# z_@6H{v5>{`Tc+oA=ZBQCJF?#<2C&aBu>|w^F61(99(MU>?fDOT_<+5~@a*?Rs2+{;!AUxVKqlH+qVoJvy*SK`#u9HYie-Z=)%?NbU+2=LOa6 zEJ@qu6f}8&SfUzDEckRY>VAE!$m`0zQB0#|u2<#U{LOkl#o-5x3YL*8;PR?X`_N1f zSbX@x<@(FfkR6h2QebaV^7U}O@K-Ki-fnaOa@s+H*S8pAQ;?X_Lk$y&N6nGr({JNi zSb-IXvmYor0>b3_p-xw-lY0i+p7!e^$dRpR@&yDl02>0m!D}UFjH;FsT^oZS)`31t zvETS)ortK~YTdTN3M39-gB&vGP>mroszf{iR%jLpQ6{8A6EPshefa*p4-N#J{juGf z?7nMSZ#zUb__dd(@`w=sBM)w+?`{;I4<}32>1vjmMT% zAUK zL2P5*)cn-&IzSaAjX|%yYUpI?JvSKy(L0o@L7Mp%;_&3Y*ce;^gjFcif@W~}_%iGx zX?y0!2E%G^aPnW@w&Lh31*u71W~}keUw@FdA`&n6vR9sn(wS1exOO3G{|-&PdwWR9 zk@}3wTbf@%jo{0s6Z6#ANt-^7aEq8GS#lP&)+z%Cd-<_@(QO?*bH z@GqIupWXll@UlD=&OvpS$&0@)OK!P|gkqa{4i}>uq7uh(U;j`uTnh!0?t5)QsAVOr zax(w*{fFjpg#nx!_{i$qDe&8o1C?(j^Xi>&iV7!F>)GG`Z7uw*T=gTh=?9QQdd@7F z|5>_C7BN^B*y60;&lBoNTfUInQ1xNIF?J{MKa2$hVk7l;KIk?L2`A0};maI@FC(At zhGwBsmT+Hxv#sHeJzzp3t!Ek;%Pu(zjo`vglxs zVQ29Xi&6WlCxboxYuiVnW;@t1wMx&XPzBZ$G2FZVL~H#hK~ExAT(r;S;S@ARE~3r& z!w2{$fZv%gQ~LV_Jp$1WC-Xy7YV2D~8u^2@0cZd4^DXV_=m5EdnWR4q09C&u%y~Dc z1LToL{;=iN!vNK??b_%7+X+Rczu!VzA=jiu*XDo@8Dd7x{QW0B91Mh-9j~Siq1NUM z&H=tPw+=Bplus@uDXH^TZKZ=gMw1pz_`)&R}6WO+>xb5euvYf&c z*FXHe7NnWE9pur=a?~7)CNo1tMiCE4`YS=<$=_%9MwPtv|1&!aGc)bBcSL8#h~@je z<-G@Y#{)a^a2ER4p(N!${Ju2&zJ0}THvB#YxB3t70ZFb0>s;i~93Sh=UzPH||MX8W zpZ~}L{c~dhRDzNIgBUnjZ^ekqf0#P77k}XVW;hQ%!3W%w+3z3!03N?J@PjV;cu`{K zA07`b-vieUR3!%SE~kEl6!~lR0DIA*|LA}|ek-x;505v1$Di$i8s!$f8@Q=sf0#Wy z{#4+{F!b?Th{=C=JY;1boEsW`j6?ayR5tx@W)F7$3Vml5`glR2?;jp-4UhMj9EQ@F zo+)nXXI0vtXAh5m5ZKv>K3;%m{)fjqz~em^hM&UY6>(F)tOk9b{Tk%)wc?oKY^uFk z`~#N14cfF%iIA7j>1-g1|6w}kVLD4}tmqGP*!f=p3jX>@5aZ7B@6+&~<~Kzp4nt9+ zTFvuV`9D4RIF7UiJ#;ExXopgMfBG0hIGkunR~eS5ccnFU{#WRizkXtf!;t*d(DyIF zP5rVG_Wh@ah+U5_=cD=woH^#dzXrDGZ9rsZxNt^@V6wB6n~wnp#F3as7$v;QGq*^_xPdkKP=}0WFMA~%}{+a z6C4%l@tXzO3bzoM%Dz&G#}5VnVSvNXKpZi=Y*{d6~~xIX&NkbM-!-Z@}{rDOniG*p~tN&g(gpOTPW`fT1(4QT=}F;p=Gv1^_u4s}nDazIz}uZBxMy ze{=gF7q)$$`H zQ8b?b)C7q#XULpsi$9$V>>(}l+VV z2Ay%f8@BzQZ3y_uArtDn9s+>QYccorhGs<`s~1vK16*>Jp(7fy;7at(@s&CoG3BSG zESK+YNnFlrQVMQ&D9$uXv#gq3rOvY|J-hTgBu&q@#hzeb45G<6ua|a%JB3X|3=}b( zpR>r|2}~?bFIJyr$PzL*3W++)QA+u?2liHuA&WnX2s7r$_g`wM*oICn)0q73pXgH~ z;>_qLw53+g@#hw`!f7D@7M5`c2Cb_)%zM z>t#^5%y4IUzH_;;P>LdrJNrIecBx5uIdR@J)|>mmibdFz0j@G{wi`cl*5FyYU+b`ajw&Q ztX3p@FX-2TUNGpUEGzr-8E4xxt@S5t}r2)P|4yZ!=8%yt0Q$E%& zXZPs;vmk#)wgK0TEA8lvZ-eCU; zfNh6k7i~)Fb&X#?Gt(U|GyCePRpBElPp+4Z=(cd^fZ{cqCr!xVg0MRzH(+5=%jr5} z2RDD}U2P1&I$WI+UDw!CW{ViheXS=CAP4a5iay_OZ;#IA2wF%SNxv7?XyeywA{^3sSzvFRByD)#UOviH_M|6yZbMP5>eCkmXS5is>Z{*`rOwJxvJHpg4mR}_{IT@u+#w@ z#*FfH{J`Rz1XjFPy<8ev~2sp(Qo&_Rf0|}SzoJsSde?X z1I!>uk3hAuXtpn*8#EP`&QW5`ecnf;oeZsh*zjW$TCz%DiOdoXRMc=Nt^i`4E#VkH z2A`V?HA2Z1$i_jD!KhjV;9LN%CXd(}Lz=a{S964@kJ=xnGCwtJ8DnG}l)Lz8#MJtj zOi#VLg9y2^S9H~Kqx?t(G(>^6UvE~7vtJgE3AIVieU#@Oe!hN5C`I|hnb&GsXSEIa zH~145dZG@P^?P4&)%|RlAT3pPNx&)eT<@5BC=&s9t=;&!YgWRo50h6p*H)!{2>Al% zy*Wj-JW~WTUA^L>Fu%TDj^mdp&o=|BHpiN>x&z|eP2IY2k@L7KJ&vUTnR1* z-`P5IiyLR(1%duYlK0emWu9P)vZ{wPn@XRv$;Bh2E4>S8N#_T4(N7rp`y$aSA#&rs zb1QJQ0-^vLRplFS(Z&q{c7!su_uPlGM|}kRuBI$~Zd7I4oqNMuuBmM4TQ;C5$C;;Z znXBCx^RBoYKLOpltGTw=^eLUysJ~}-)Voo0H2IkletA}gyJ^t4XbIF25O!+@BcGB>OLWm%Dvq|4>|TJbS|C2o@bF=#+Xj_dPtijMNF`JA z_&j8`Z+TKm0kjC<7Px-%t3AIy?(fQZzM?LD8mdA`zDu+G<>3?`tuMa*xs`5>n)2>E zM{k;~+S1=i*Zsh}Wcj^KGA)5#U>8TbyFl}S(IrRUd1D7p#6pjEgQU*F`~?-cZ>QGa zI$L?Ab~r8iE>HWSh&AW{Ae7{8VK#;-Y@2U(E4X?Ox*O8YKU`VE*3tL5H`cswco(O` z1i9=67yF#vV|Eb%Cj~}Lx@#jZ>Da`=mF7Mx=w{?kPM0k!@}B>EbNfe&pi-wqV1*^* z2q?F#)?{BW4(pEkT)ve}AzM^n4HPdu-YKrQh0y7RD6aQ_$%lb6F?G}4k`2mS#2}+BS<3LAEw5?{Fd$S>;!8N8T`vyjZ z7(X|3fE-tr9j?4I!^1z)l5L(NUY)|)ym|C|lj3ww4+-#T%ig-pv76h)OGcjo%=rGU z2NJ;v0vPFLH(p_Al`vGcyfoHQwj{+MotL=<@2P1>k;;31avm9b&Cv6Z>Dq3+K;!_# z&rVk)FHH(b_dW|5+cj1Cx%>&KT$iDB#c=pDvo(FxZ+$N>@o(tH>)m#bCr7=|I zBUh2WV*raZ<W~tNQhCp0I=v!Z7|9MIdvU!R;lGu$R6H2JcimLku2|LB700b^V7 z@^fq}7{u5G`a003-qKn8zBh|_?ctaSKf zxX*YZd3&K?(ZYD0Yja$;L&1A%XyV-4Q*m+iu`PyD6vV||G52hMaY!AS*iVG`Ms6!g z#RLTl$g#c<+Th2@9(VJ=huYnpfR+T(S!n}MGb5S;$M&tW=RnSbz16o|rG6fP^%Cu6 zZm*sr_9%g7BE)D_NLfi2+SyE;q-E34iN}PHu%QkPtRP z-2%K=V{{8RVSR)fB6CH1%a-N_`!|~)&eLn?`UeGPMjyEn^`6q`V&86btH?#`RIHe9nA z23KxYabWvtGGm?dGK2 zlvwEo0HNE~m&spw%fMj0hJX=Hr6eYXceB>tH5J&zCUG}{gS>Swe$t3LnST+v;K%FF z;J$KLFS(k9#J_DUvtc+UnYVs~)4=ffVF~5biZ3o3umJ^mhnJ3>&g2w02wkLR-{FN9 z3(c|=!uX)eE3vAUg-NW4a<8rafsGYL+9~N)SqYG;y6>kY)na{OUI?x7yS7$?G3A4y z#N7ZomRsi|cy_BKm7>U)#}|y(Kpf@Af}JvP?pf)-u!(Qn*W?iW`ZIbt*LNc^#kkgr z1k6lOr3+=1Z#;ORlw+jYc1fZj|KgF2pZg(V1O8w{$nM>k zcP8r4MzvJ%e%-c}$Ii<2M3k@vc-!uxH|QsF2JhfpS`MxdtP_+g*AC>Scj&d4)wY%R zL?>|FWiSc8{7zrbVokp)$d`?UDxxK16?O)9Mz98(nMQ++d}eFKBWEveFKh0Pty|cA z-JFqqKhVAd%!~5gi22dhDen#-ND`~INbWNB+%QvBuU(gL(~quFioE}f^(0$GzQVPD z$JbW0j!uiI9`}E}u+ER{(3GS&5rT%s^xx>2xmXwHzST*V1(SFAwM3utZ^r9sKH=AB z%y9Rgtz>re&#V+bLl|<^ZH&@qwEilYmtda6-m{s~@bIhX?F0Ha?71a-6>lUwXsmO! zj+&_JI{y4puQ4s_8A~_iavL`MN%n88Wekk$iJjI7_Wt|}Rjm&#n)D9dR`3Gr+V<^h@d%y$aa!Ec zwmlYj$+=)lHZQ?A-Dk9Zjw>oW?b{1_zufcRoKBZhtD+^UCF$f>aa6_%);UGFK(}rf+|qG;FdbWCYst z0$#(_1=GS^eK$guyy>EfJk~eFkk+3w>B?J{BA+5F+&2x(mPko=)970b3kg^C?S$?} zzvaI&v7^8wt)xk+Tnhtq5hs?M8%t57V>~NqveMp}*v)6l)uaipFZx=fTX$IF{4u-S zN{j8mbjy$FX69o~>@XP26=mfPDZ?%o7$K*?|3ob?u#e`e`3b^)si{$me86DX zU?695kteOai-d9JPdtroPySh#hZ_b#S4<83DE=`u^yL`g4!09yO;_k@m_OTxvy3_IT%0 zr2&c37R>UB?(<#C&u3&-`O+J6*q-u}*74rm^u5pVb0+t_um^gXMwPwmanM>NAk}EP z)iRtCo4fFEDmB)O(R#&>b)n{66Lnj(3z1#G61S?Ytq#Ie(PZ2ACV>r7Ta@VW#2H$t zyer#^_u11}8;?zkEbk&p?+ULsu<6^{q<++JE_wLP21>0fu2SJ)hvGc@9p6tE*Nlrg z8%!RTmXR!BXk>e16(jqNu;juM$pir=e}r$%=2(2)0Q+Gez-fr$qDf|Xls~wYyg*N_eI{mTUPXD(^mS)c+0S?W@Wa`?%`H@v|L6VTp&?7%wa4cJNi=e2wY+kgolNGa?8T~Zd zjBlEiSzCjvl#blMwQ1|9(nYs%ZdaeHO|DBHsxrxRDzhYWFxI*#rRU? ztgKjdR}5o)eOmTV^;U*A8*X0cHdtMi*pkR+lXM8=6TDW;?eAnf8Z#sG5`e=i4ZMk* zbX8$)tE;tyE0O=`tX&S3`n0Sx-Wm5z1`tUB_`V(2kN`+&MmJA1{rQWs_A7&=9<4~x zZ4(#h*saMuE0#VMY-#={8cY@&4rq^jHmuLVM)3(@fcr>pi=%zwvNR)aWK@WOdslV$XZyBSFK8#aoSxU6nCMa~>=AU_`i!aj zr;8r@c(n1738Cgo1@C;?9H=RZ>)NC;OM*Z9LN@clJBKD@E#j7S`$pQ4%R`dBosjWx zQbaqKz11d0xr{j(iFy20#IUBgB7v#x&l8AB>9nke`$m8QC;#N!2yeZE5Jo2@ks_bR zMBtGWNviOR)?ZTd3|ZJiyy3l1Y5h088iJ@|=gmEVB_>L$L(%$xi<@e9EaPXbpJi~* zd({ll`%zAmD;>DrjUnb{>IeLd_xqY}D6Q6{$LDFvQf4v)ouD}`aNR+n>(ym zQ199=_16VibvBH4=GinsGp~t|^Zpt5H}Q`TP~wPUd9?AuO&RB`6DH2>^7Ftw;)x>r zj(mLTI(iMWz0d*py8-cC0&F=v@>q(F%!i%Q9Zt`^68Nq2j}}B(z7jK_OHme1U63w6 z6XPW$TknZ~ju@8f;mbx%McAJ=~&0PiXoq{>M}Lky4A*ZSC@63 zUBOIV-Td{wIfs8&+6}j3dWHl)0j$ZE55?!2Y6vCO_H6g+q}$Z=_aR=68M!rQ2TpR( zXdB6StAo8>qK#d+0GHEOD1R}0jw&H*G2koLuKRkrLGI|Wlc|X(^gKkX0^22X<}e~# za@w%ovO_t~yY58kGDdE`*TnY1&houG+fG{{!dmEh=JeH~q==K&Cq&U8gmbZfVJKLH zKm*Zs#>3jJJiEk;8y+wjMrmA?S?Z^^tdQEnr@5lHfCh1`UJ?2?UL`$1Hp2T06R&L8 zWQvlCIOz&se&V*Sya<9Z+5RdUY33ijvdH^U@*Dto)B1=El-t`JNo$vYL%H!jnoZ(f zM$cl*_eq`(xAFyc9W?)217fsJbr|G(Z$6s!v3(u&DclAmenqSSF8ehSHgc_O>@36k zKIUAh{gVAm>W;b`c8$&C{c>HGH@S?)P~=ArG2CP47rI;*V(&l46Zk}QW!dLj!E`}B zJi!!c-)#07Yrd&o!^C;eY$&9s#64n~A9wVJ+-vy&wsJl{fnP=wlNhyIKHjJ)SCe? z<0IFBjGLWLF6F?ztB(|#B^Bh2tE_76TYSP%b!GDup(;DCahF_fN^7{$WSp}}7Hz?6 zUS2twi#x6R$>5!yRRc;6@eu`{a&3^^<$%W|G{8i?H#X^1y&m{ z@e}+eEO!<(sXCX$%-h!e4KcM5`BtXU8B{Hl@2p8ZeXP&T`j8#gz1xFB&38-$yZY2L z)yq9;7~0Fb?Rx@3!WxS!!>3f6-0oZNUs~VQKl1VVHYw#p58^W$r)pD9Hxx@L6Ludu zWu_*Pkg&EB|193SA#xJPo@NHgYX>r>UZ-lu9xV65y~IZZFP>Ju8|}}@Y#8Qy#-2Z- zejZ;!m?XrY+hiy6LVNi!IPM1{nBfyT2dk$doz`J5-#{fFHL(d zeR!_LQ16ues2yK+VrXq~^r^-K{RYckzsLJ#&b7pK+|zD1WFg(zpOlyBRvz7b*x`UM zt!40Otz}P#fmh4O6BG>sH(vFBOIKt)GtI9_E4-L1HZ17u&$+dzG^?oV3MGb40eG|? zoJ?#AMT_{eayIFr(m(JzDY}Rw^d_iA3tgUVN62oFmwC%i7LS_UtWc)V7ds`YTsI_E zaCFb|@ON3t%!4G7Ox_TofL-=({q|~}a=ZCl+5lrqb7Sp<*}_AsN|p!GvyZ9eY3dTy z{Mv$OZ=Y6JHtU(&c<{otb?!X|>;h-*Ojh6VdpX?ss_?zik4o1QfQ!ipQBjfk`?1C# zw{SRBMN4?b%1LW!W8qeDjQn3L{#ZIKLo5DozXPC#qr!vK87W|m@B9phQN#lZ z9aIJ_UPNqwc6aB8PQJC~9PRn>duIVa)Ogr{%78hED^UM=E^`d9jxX;YN-L>bf3D*y z-{Q-0TD!mDY(4i=ru3e^5JC&Ha*i^0soFyPV7O${5D-N^i~AD8q4EtR4Kdq=(Q z33czNlVg4c(Ma&(0Qg?H#$3UjC;Y>Q)cdpw$v@ueDPT<2#8N?%$F7iu|An&q3H34u zJ49LhG?mHld*D3vH32u5L^MDv(6$6z!Ov>`Kf_)IL=d~;U73L*7n&Dv1wYT|Uw;6g z;ioknRF$;HvsgOi0t}%nXDA@ z3}6J5PJN{sM=xBG(H~x-3OZ+wS-4Um>_86swq|B&egqY~Tn_sekXuEP;C}4KXBlIc zz!DcaI<&F04-P|3I0#rQ*=0+|QgIC*hpinkEo7l&uUA9E_fFG*)DfsZc7eu2HLs^A z2onMMcJPVkkvH9vI+1&ioO!4FPvlwV9_E`+#IXS9IEPP2z4lDlp1eGQt8h1dU*efpnxN)#bg>pAUOHm| z6)xwhwKi`KzB%>N=MNR9to^a>RYy}AX1;#*fko722YIiquf-#%yd6MGK$K&}yKx|s z={gawQ${G|0o_oBgsj@xfhEwj1^#Z*S;egN40~bznH%}%kw;X8$$#ZS+*;j?$9>md zKJ}dD;TU3=vI5pN2bwIjtE1`S0UC(s<;_~O);Z;z4!oOQLdxphj22{8B`qPqq zuAKYmAq2NYVg}08Zj>M4S!b7{3L3H?px6{Yd%yytsx(lAUpoHfOl{8b z=T#m81H;Hdd$^4uhLOF5w_VrR{?U;YFOs00>cjHZ0qGV`Jeh!M367CzR#t!@1Wk1- zavfiwXA^L1JDG-R{2>4B(0o^Vx}59zt&lXunpT`+S@K zWU5Yr^!84#3EFPZx2x0=$>abvh&$0hEM;_9l~cc?t^!D9&jVNT^*?G8y|LCq-@)AJ z#fHF&NNusTN6kE}0tDhYx@&C0Mk24KjVb?R$*fn8PX5>x-Qq+Xd8Ykw8jf*i9;W;W zfOMcA8h^8HL^6N>*7OWEV1l0c+95|zgeU`LAOh+x z_n9aD1wrDWw~2Ol6Vx11YDDeXxUO{PN2~iUbQt*czWSm(e5xhOl;Yj2O0U*g>J35Q zWl-qKwiqoeTigbE4aCHI?U>X`9{=15()(`;F7lYH0N|txITFtTKeRM&u7d1G<9ciF zAvcor)JUhYq0uex`6=hOM~+sWOuMlfnroZ*%=V6j`z~w>e{a4t9t+{1zp)8Oia5VH zs9uSD*Y=H380a}&f}`&6P3_;GJUVfwmt#-!OchnV|m-)={ z_WLf+ce<*$CVBL&9jRi&Z{$Cq5|N@rj~J#{7yfJfJ)m62(dN=(dTz{3tVv;Ff6^-D zFL$D<5KFS2U1#UPk4ks>5Od+{6MTdzE;P|Rq>sLQ3mc<5PeXfX0bv4~_`=Eb3R`O( zx1sZt-&+=l-%;I_FRz8%pN`jx^j`=Di44P+B&FUPf}hnVhWE2ZE;5v2UWjtPAXGL>w5t6UEOg5YS&A|N?CVfBe z7Z~#6BW`>+3b*YFto0YRGgbsA|A%0gBwRg^1#Qp{fJT(tyF(uP=A|DC9ng9QGcg&ic}?uTq&3s*h>x zNWt}=@J(8Ck<8u?+Etc?AKaK?oQ3p^60`5gD20p8E+OA-aRWu0RQ!-7KWK@yqmQS< z!EfzX0aFmi_Yn3d$g6z@vZEl{m2`x6({jg|*E$~Wre376PnoZu7BrkkZU=R%`7bL~ zKknk~TKTqh1i8HG3vECg#%b}OA9)PKwvmC20ex3)cc$vH$_DMPu8M35)|D3!k8Zp5 z^^<~bryoY@*Y=;-|5-T*lRwrGfKjB(?@7zAAAcROaK07KejrsR|FZ z=#l{DF*)=eg&QT>>UU19YW`put~hS_uA2Y z>o27?XCqgu``nkbfMEfikn^rRQCX(NRW}29x#8xL*pxUG(!nEoP&eW#|I6#Av(_Hc zk>W%?zYrHy@3b&h-G3suOKH4v%w1sS zDRL#yO`o!POB2b#5HVqPkfFfE^8#`ciP9T?u^Iaq$9r;}c1w2Q$Md;ur_yP$gBDW$ z7JU8_hQp6q%vAMhx+|Hd0j(5s?9_e8+5}MC-gK`dunAy@)!RjEFp|MZn`c5Uw^JU9*>AKBj z2RZjC-Mq2q5_3)YF{Sp~#Ra3*85$g)BoF5YS>_&NNT$b?hAYk4I)yeOUdg8LA>X$G zvVmG%KO(mvmtZO-xW-F%ZRB+ID`op=E zIKL9X%i5&)_Z@F;xYP=}QesjR{Hj;1-<2cB;8Zr-mr%YHQ~v@WLK7|{^#ylv<%ZV7 z6JDP#uIW3Tagkq)KzDef-u}_J6amSl__Mmo`dX^QnE6Mpbpg;#z>w{R_o+43=kq$v zm*-kKWUSL&o6cG5|Iied(;~hr+A}oft}61bHPmW;rH)E zKRl=<+_cq3?b0nVO&&mxf#{1z{Mj&d@^nUCBcuOIwe~A>`QSjY;95eIRjt}wklV7C zC|~~ZmRPw3V?S}fCL3|JlBMcHnig8@xdB&RHU$kkfT{s1&|{wma#_2MV@3`+j@JmS z#F6o@IN!#0-tq z8;W!y>1$Sd1YY6G|8^@_jIk<&sMx|MBE}kRv(}eQYU_jW^Vjtm2fC}A2{W!qmHX&q z5l4QO;;ItKRG3bb!WhJ*i1Uz?oEC{SHWvr|27?87A~6gP4`n};pu>+4y7KhtYv?k< z$hEAHxf}Hvp3BGw2^#uBZOX*NP+k+7RPJaDC^-5qO(#x&YoV*jKotJjqurj{tuL}> zot(P8gxE385TRrtB}bmXCb6Jx8GYs3Fh!f6A57Zw3J+uV9>i9Z(uR zZcdG+nJj@O1Oa#k{{;b6V%1O!=qw4X(o1vgZ#?+8N4dS~uto$wrFOrIL#2vhRS?-| zSqQ6B{Z}qvX>sD=fPh3ZJ+9WSI{pOx)NQ430Vf{kidAx34yd>x_Pwr9g=miZhy*(+ zr^G^-3|jNH(sXN&CXpn(H(XYyB<1!hMyfH)xtOlvv3W!j^Q}6jpC=k4k-jl!NTJ*g zd2GJ|zTQLW?rvP=w!)4`nklvQbFV?{A90?>-EhMh1u79&@ic5ET;gm@hMzD27UmsA zf>*ks(5Gtdk$i1qYvaT%*60(<(fX8x#|k4*T6&|0eb z5-1bztsgNOc%<0Zzw3{CjF?Z8Vu8Gf`t9Sr_m*X)MWk4V(mE$&pOxnGiLe=sQY2Mf zSTuzuWA~Dx^(9u{Uh$co_7q{%R9BxVJs~3JxzxFd2ATd5ou#iEPF@@l$SONlJogV( zi2+ff+K&i;z-cRalitafc3=}(ye_^*Q{@uI&T_T2=fg=^$@DrC!&6Bl8r9r~tF0Z` z^=uwH&uLM-({8w3QC^;Hx-F*cpDSA37}9WXok&uSiKJxg`@Q7o6c#Kota2+3pJc?F zgvSiz?A#^Ucio~Z>&z9OaeI5_7)RYH7#Kf znZtLyPtvc=>n7+=oZo-Zauuu4i!0TLSz)iY7Tl0>C{5QxX3iXcPhZPJaHnI0iYhsV ze-?r=d^KUOq-S!sejriST7l2_lWW*^x(sWTaqKsvUee~bgx!+uH{MecgU3#+3t}lb zz#lgkq8LPgz7(wWn@P;nYNh@(`!0OBZmBYMq~jnyL?LaBqlD*+FS=Udy-Nc|)8A z>vezHpe=D%"n?v3c0u}gCtIxu>DI6w9TLsfLoiUQ7yM|f<7R2{SEtD<}&YF zB{SlU%5E0yF^7cmv6&>`k@%OM8*1GyG|}w#vD@$w(l>)Fyf7i>9MVpcvlZhjGvTde%6r=UQ0d=^seaoTij4l|z0vN+#1VI|)H{mxHx(Vx zA%~{kBos+mZ@8!398NwI&y;tU5Vu3SAmbus6V}VW6Mrb~V!i0s+SB1AUhN{w@*NGJ z56$|<#@I^ne~n#tAl2XdzphJ2b#aXr*CvD{n=9F}%E~5JWp6Ss4cQct`3Y%AiR@Wc znWZwbvt{q~d!PDzKc(OI`+a}^%kA8ApYwX2^Ne$z^E@d+ZvukZAG6ik(iI~?RP4+=*W_D3zSIW=Jk_Um zkEM3aWnadblAQ*rgw<*u$WoA~>$r8&xI|N!enW35+$PZKyMaY&%}pcokwbWbOL!Dp z&8ux64T1Dz9b`O-#=^b=)V%0egYnLssgp4pGwMBa$l=R%StL>8vP;eoU*HEx&bAib zb-sd57A48*;Iz}^`;AIP1>^WD)>uBfKxSa(fWA(^XCkuqF5zwNCj^KS>K{5LThvTJ zA=@-=APFJS<2ef&q9|jMn1l-GZ?4?EQsuN(hV~iDlcPrPu$xs`XFk?wyL*Euhbo3Y z-mP`5O>fc|3Q((gw`=JPvpd=KH<*|rYIl4{q2CE|ZLFWP0?g^o|Ly#^^uSDecks)66qAJUN=; z2vOa}(3EkF>KG{2fwvQ#10iHl=niRhSh7Fs58(}T#}am6DIwrTNw+8~QkwD-mCSqX z%|>*o5JqnTdHmi3AXTNHnJq^_O-P6x=bWq|f>{6q`qjA+>3kN$hhi{bn^G(|on}RR zG1y+2Ot3Q*2L(;lFpAyLhZEeao3|yt@kw%2R{7Lx9@p!SA*EJH@p|(0@lPj*%D!{z zSJQArNyCHgUoUT|YL@8qf&{lqwNf&=BJ>GVn`U@!WGE@bp=!vri)BR2Ap>i}7O+Qb z6Kwkt(KcoN+?)?ERHTCPpk4&zlE#6E*hOnPb+H=BO&?;CG8IGrbsm6U+`(7pPjK)o zgGP>q7?XnFOrVuGS3q=Er`JKaVo6|Gh?^D+a)>P3E8wL^Ry5xZf+t%y(IeI~)!wR0 zChlWMwQ=FK>hTg@)1>!aeznfMLlD7tWsP`Ixr55#>s(Tf7X zAR9HWkmS!`oQ`!q1gFt5U5Gtrq^e%xgl@&oZpy8MT+Dfv=EfArElZ7aliyUmfDyO~ zmVCVTx6dzt-OF9s$k1&|GNKK}P$i4;jt=XL6VZilCmzl2PZem4FG-^t-@r^PyEAE~ zqFJJLULSuV0dr3Isr+H5DkI6E$#;qTzJ;L(i2EmxgoK8aHxRrhji)+wgOy6+;-0BQ`n$d` zc@AD{+;lO~2Kuf@?js;YRV|Nmr)}7^AZv{EB>#+0@6jliEL{MSLO?ix#jCFB$EW&n z@YX|D{y<8H#At^3ZZ)Ltp`7d8TEu;tna%Y?M(RPIp@&AhCQFP?W~s<9wWfNIHE@o^ zK(gC(YbRQ#g1wN?u0lW;2K$Ct(_2xiD&5S}Jh)vYLz4#UXW6{Rxn!wL&%%PV2P3?&Dg} zdeG8~sDqW((^G_PArVP z8AMTHbFFdVjdMjV*+LeW&btVcG$gRiKFR+ylHWRoyL6{}E{}j&MCX`PjcR(^IPZyM z24i~(r%jHK6YG}a)l$6eyNwcOK=8rfUs<@$3x7gjf?(qBn zG2D}$FWQ7M_8ZOa4r(OK*cVqyD~w%ceRh$;?vB3k)$d>}#fmAXD!gezOT+_ZJ$gz3 zE#+V)sK*nj6^u2?IO`v|?y?uesD)^SK-Z)g(_Vuza$|3hZK7rnC^M08BP5F1`GZ{; z+C76PIgyr_bC|rkgidP-N(f*D% zcHJ1Y<^K2fPGN<*@3#vVR@0~#Gac-3+ZF|r;^{W{UcpNeg!RMXk(Li@d7pupp$<?@cUP_{>?R`OGZyPbu5c(fi_?qJV`2hJw`4CD40%U8tYM zzk8L5M-k)GqZ}tx2BH|wqgUYYl$u4Y>r{5C<6bMCw}m}N8m$OW8MZ#lnYr7GG0sv| zlDF($uos41=-sh^er-V%aEOOLE#)5IE363`yM}4JVbxZZjhg#2m&AV3jmakdo`3Oy zb%ma>a3yLCi5%l5TXOA%c9@+h+_e7u_DQ-1a|NNU;+pjqu=Xc z-X!twk%z}wUN~x-&$bfCNz}?=`Bi?%*BNorQeDqy`InTVoS1E4lIH?1;RzQ{xh5L# zK6?@^+wdc%?M7Wtn#M)=Dx)Z*hgI`1Z*uoM^4j=HP^liR{c7%30mZhgAv33@$OB8WN7sm6D z36Es9`t(aV`11b8U>MvEHc?NLdGkJPX^7`kZ^oBC$HaKdCQ-JzR1CAdKoL^V%z3v1hk9m2GnaPK zu3Fd?qXVLoz_yXKSDKAw#rvMhvUVeM!*zPLYm)zDLbGM^v9s2W{aid!b49aWq@N2# z@+`4m>o2I52e-)AdC}xfEH6kHLKDkU$E$DMyR?1b+;2)xf*25GhkA+dIq=wHwZaBK zXQe{Xm@~ElVa#Cc&M`Yd1uoh)(}=*G-6lv+!`;98VV`D4N1Vdfzq@927@B72@qs z`b`~hE5b~->rBR`Ji==h5L~HrOQ8^8=yQ)2Y(01EL8nv1e&(J#yl=CQKwR*HZhaEA zOf#Ppw-#PFqav4x+d19i>ylUPvOSG5mxtBeylvhg-0l21(v!Mz@IL8&Kl0KE%<=Ti z62RS*v&4ZQQneWI-O%G8tD)Cur!uUB&pE9^5_d)DLOeS*IL5=xv?_l$H_rj1W)if^ z>%z{uueFHK*`qL^nezBYi=hKGZ^@;TD3ewn-Io1r2sI2H3wkEJ${DlU03ava| zHP|$t>OcQKOcn>F;~z^aa{0dsSTZM?u1x|d<}2NOs-c#8=dsozE(witvHLKeZDMd5 zRMgG8=pSyM1F-DwZ6wBprq3YMT3@ zhX`JU;p(ZGjXVF>?m=$rw9^=zclVVgNH(SQSY;liM2L%dkr#vU)ANVj)2?aJFeIG10kAu&jvvotbWTvOBFhrj4tM1Kw-9P~8q(53mP}3t+bDKWr!Vyc44W z?BJu6ml)|7)PSWQ{VZ$$%xF=i_G{P7c9r)}#wFqh+=3zrP!xJPYjv{R^g=tCcuU&` zA+c97GB+3FPi2|T11~i*PZ1FlIJBW4y*Ra@YPr;%4O z6DfGIq&lfU-InSMsZZA&QxIB}wr6(`Jx4!NCsC(+Oz)!dnCMuViD^D!D_I}q-t78^ zd491>nqd<^|5fwA=i>~>PRVukZw$t)z#5GhzLlm@_ojJRqZMiCmolKsjO8~$m1$$J zmc#DYTt-@P(e(BfI_)@CvnuZ{T#{>|keB|$){)L;>zh+mW1iEWDFM07l0F+0PU7?k z$_e$0R%afh!#B2Is?O?*W>0|!sL;%&@{npRbA^))HVWOFqq4#Q8>(VfKQBhEL)zQs zzA`>C2vos9Yrk#$f|69^=eHJ`6{Dou27^Sz91ODC!GxbCb;oUH+ywI~(70S_KQ4Ke z+j_wnj{oyg>^8K_NKWyPra*0UeuZeZrBrPUSw-YON~H0&Rr7%6NrpGpV}3&_c9O0b z?n>*TZQ!)8Yzuc@*o$~4e9Zt zmbe3Q5O`?139g}4KfkrKE?ajz_3_CA`Ld5_GO*+c%7kC7%vu=m5^gT7?m<|vgK9ls2wa~)XnDCc>%bSMp;4ov}=83@Ai)I_&q1vNQ3dQ`@ zYzSSXElGbV9n;7qvp{TSiKHICRV$>JO%LdvE#pOOfUnme6*N8p)q56-eopI z@Z||49j$JzKRmni5*Q7Fqy?Ivybm&5xWLTWk1l_>PTk~Si`Nz0bw5phZ3CD*PZSjq ze|#n7%#PG+{Eq9gg!64#+G>x{eLEvPyb01ua=Y$4JvbCkI=0Q0Q(wJKr;6^J|D%Rc zj>(XYNs@l+#03x!JBgz$WToyM?7M_TxS?Ke3QZjvbcZwikPlt@iCBTyW!^+h(1Usy7&P;;D|11IY$56{yw(r4e7Nwu2y+u*1<;g$=?j~1*xVBrKW0VH=7r6 zV*KGp7V?`>5 z8dJW0-KABNqw}xOm3834_4aY!0P_B({P-*D6g>2*AHSG;(0F(A*D5il0y9-&M8p2Yp}spym3eF4o5+hMds zMG|ajRYS}Cs1>GEvB~{|)rT-M2mN(Ted{ zFko0UL$%^CUhv{s=bP$`L!Nc#egF+^9a3;hQ|=c5&)jlDy4^Hc?ZE7)xBJQkRdo8{ zX?-n^RCbXpQ-k!^1;akZxZ?~{>K3H#^`R{Je!EsNvv8yXzA#|r&;SC2+O_WH-le+( z*@XI)BXK=8I-~uj|Jco;BSt$}*%9Y;ZEZ)XjD7M>qH3$NS{cd6jqB^~t5W3NzCpjp z?$>hHa>8%{Hs;?0{=b#y>&O*D-qIC~x*!qpB@o`T6!d|XTO^|eOrOcSuaTq@>`A;* zCdmA7QA;Bp9}pOVB|$^kGpcf}rX>q(iB1o{c2@0T`X0OP;lqS{6P*$DNH>JMcFzNB zzW3f4likdqJGvWNZg`GaagsmYX4;lo#3Q7q@BC~|3KJUlVKQ`Sop!qS4-ok zMMPS^aCywN#_vycdzj=F+N;|M@i#M=5ZV`;*9U=MXJt6Gm@`=~?@&DJxLZk-m*?2= z8GjRMtpXVTn-66<$_!{hA%UL{lu>YI?r?#p_I8kd~PZ$D0H4BgW0>m%vZcUzU}R z@cSiZFjiI5ZRIYSg?}n#Z%M7gf6aYc4_K4{H55ZFS|1TwC)Y2w8ZTo zWHHBT>);LE^XD$Ok7P4zu__R}Ph1~2M-M+R4q(z+B6+YQT4B6$RHS;+q%Dlz%<)uL zFu1AQbT8|Sa){x^txOSk^$+N={oI=q>f~c4NHuN z++~57_CCc%TP@Pa3fh{*U$&HI3%Jt>$>Xna9XZq(a%<;j3e4|Th8E2@sR)gfi#TT z5@Q|on@;Y(GiK=2A>sX3hhCfBvvAS}a+>8d7XB?<-m+-o+Cb$HfwyAU@tbl$=7KcA zx?ydDr;%V4s7waH)Fsbg4l7dUq^j}rt{mJTT*eudM_xf!+(SsT(1i%M6V&R%LAv0;;W=MBTh1E2NFt{y)_$x<+k%`;XYn)j%E=RvZ~FS zvfschL|b_N0ZHnNd}yd-Mx>iI$^d2G3|sVx`BbHWO)Cry zJNIV>!X1BBWo%jew@*|PY{KEB_fUK)ouGEskTB}08H!aM^C)qIeOS1P`A+M1#aG^t z>!N_Xh5JedNc>_pM>7-HMMSs-j}S1-Lrkw_=PK`Zfmen9%!dlL}N%(`l*eKV@;G1?)Hu=d= z$SU;Jx_vC5$jseJE*>Uz;tXbM9ss=E%@vZ@`{P*QD%NZWcmWS}hh(wK*@fQnQ|v8; z6vEP!-(BJ|i)w$pv(!+1TH{|Z6Aj{f>U;q>v9c`EkhpGf3jN2BhpnBktbhbN768OQ z23mwz2^VPW>C8y$Ry~0gKYY>arcSt?>~*=-STnHf&8?#wv||uGuY)--6&vr zp&PLC?g~uUUsKu~Kpl@@&?_yf!*AC(3;g}YQj{dWAlPEHJpfe8{I})} zQM$1?Nko%kHDeVo4%a(0&N1l&J}t=9X@MLT4sRl)*E5Dxk2HRc^4RdpV>i&&7dwA` z+o9|am93XS)7+~wORDo(0U1WGdfXj%Os#V1zWgB!=h#^*+u1m=ot9UtQCX=)t3fKz zbwtKdRC4$8ZNj4qXUQ)8Gts|}G7)luGQXqb+}=UOaz7Ws@eN)Sc9=39kFz6(Jx zdog>Fk=fC1^2eU>lB=|{3DMnJzH4G2j*mc);xjdNA z?Y@y9%mE;wGB0%!8&$N?4K@8B+`cMnO@+xDl>gjcG!yPTFr-vRh5_9Tms1?yZk4qu zsyRF>^(-r{O?~pO=TzdLiAZaZ+^WyDaPcnh9DVHBXw5?zHs1n=RM0aD_gx=ZvbpcH zZn2}SZer8gfIhcxPJ%mrdKl6G%AltENnuH6++?kp`l?#Z;*!VrpzV5G`2(5X#gz>$ z4VU?ahU_>i0kIbCU(1*RM<2$Pw%G){K+qJNq}c|9_qy)mk-BhP=us%2Q{|{t>w`dL z)q6U%TfEe)4{#=5H`*gmHEPw#)6=v!3IxRGK&PMhhJyTNsA1YNF(HHZXq}punXX+Z z3bG7nY&BpH$ugK5*f>kHP1tst!1HF?rsD|1PIfm{Y9)dL^()SK<|6QBS814p=y8}T zS>AYxraYRQm6_7gb=jTbDwEZP*0mu{-Y8Eh2+M|XSj!dMx@5PF+CwF5D&rU8mhS)# z)!1;ax=Df90m7S-c^X`nx~vxWCY&PAh5YlRB>^A@@qt?XK`LWqCM>L>(Z#?fN=m`l zxg;xIqlK#BTJB3DjriIddwM*W{dad^ySyIK74n*Tims7Hbj3hjB@NMNqsJfz-fV>Ky__I#1Sh>40aS0+}tnhCf*fyav6cG>KAS7 zXkA`OkQ9?U>wJCACg;=CTnjnzY>Lrb?fwXX{1)1|OR|?8Ib%xB>wJ&%$z(d-QLYt( zjq6I-+(OU;*`oAd2r-hprEEzuuP2Yu*#PK&Jl0XE4A&D|r_X-~HZOXVo0P*}MX_iO zxL!*MWR%6R)gyLf8Y6kFYRA*On2GNb4Sl5+bUX%(?3>_0;tyw!2QB1+r|s&nWf3Hf z$$4^FLV*H=tD|9Q>nv6$?Ll?Z$P_fN03HIoy8^gcJ=&(3gOD#r+fPLE10wsEl*@}a ziwY096st%;75pX=ukeNJTN%M&A7{-6it_Kd(3E!`#K4#tR zN*6h;PJ^z5)Q0L9j2N|jRP^pISRD>tEskzsS%j9tL?~2QJ;GWQVQTy z`{|xvF;(~oy_jk+f!3yX8qS!asCslYwLf|vda8Ooyko)vP2o;^c&1a#R_J&LgYksm zMQ7o+P#tTVv(@APsNHcZh!vbd4PoTJ1L!BBm`aB^0?XetNTSX3SwKbl!|ZsJzs-sAS;C`Df$ z)=a55KyMPTs|}d5LGjtXIK4K>z9FBYUrgnn$>6$_U-kTN*D&JR%HSGm`3yk>C@X}4 zdpgL9hLdhB%}_mv+isO0FPlOMN;NPbXmf~wE(Suu*E$?8Z}c9<^3{jBMt{v}dK2ZE zYg_VOIt$F=Lpm08(LdFvk<`zMaX^rT89s}NpkQ*LS{JP0m!n?=dpWfZ%YfF@Se)I0 zH%vO500hn1>*w7{j#o^CL1ib9iVz|GqNfabR^EWo;tv~XdnFNn{1dD}k^-b?@Qwv5 z*g_5!Kr~=uz=~ac?e-;JzxB<$>v(ij^Be%py=P-S);hgkOwbcGOiUM`zbi86y^%E} zixQ04!_2k?YqD7Pr`hTZwj@vkM2s41{I~z=fK&TR7pejPwN4&Lx*Pj>0fT|AoPNLR^l}JYiDjA0-9A$nR`3}1ud7OZj9=PYdN3<>W@7}yj>an2WWP+0Zw)EKJr zzT}+y-##Szv`JPERwoN=*dOZv%RoTXbK7=Y<=2RW$7Oa$Q~!5dd$bT-gf|B2r$^X? zn4xmB6~k<7j&5_3Do3W*l+%$pp!sxwdj?iQ3EOR1CEFcJr|F`MSj`WQuK1l$L;Xbr zr*5nbNxSk7FQEK>Vn~wlLHD-E|#lQxn7OGm`x|iST%Jf5E{I`E|vMWd%P8?WyDAK ze1R=HkKX@g9V%TdOK*bc~jbo^KD($W3Hk9_1`1FDV7e=648*!R*EQqzyM2p}K}PY#%5fd?~8x zA^_-7tKjh-u65K8y3y*+{HTM#_#~N&F*O4Xb#YAKJbR17hS+ot)O92? zJ~M6-nnN>^aQcvJ#RUhrUkBMP{-@^T+V9#%mkr6EFHS1Oxy==@;3!hI!v7a82arjR z$|#*!Ag+1-nA@y=?-uSp{fkpJ7G!tJso^o387iLi6vJlBy)%X_RE*?Hf`KN~hgKM9 zGI@~Vgs^;l??WC%&HiNh(P>rsf5@s&o`jp<|ELAN)r!Pvlq?*bJc6-@fa{in@fS z_u~rT;I2UVm505QFmvT)I!9K4ni?O$q#qKBT;Uk6soS@gtz4!*a7b^@?9%?u{JA1e-fC z;BySoxPpK2K{X@Nf$+@wWUyeMt7ce?rT<4@STvwA9;QTHpRW^Aal<6Mw0riVKV5RKg2;VHfMFG0B?tyXwU}jP}<+POwL8Nb-Yu7iYX$dTW z^VY1Bz^n;+W7n1PK9sLNgjWUo80N%Z_dOMP z=}R{&2amTeOkNSAB{{;mCOg6j%=u$RuS8xFTlKRdC*N^{2~0k)+&9)<6~YzuhVx#2 z4Ok!JSco$F>?~LHSTdl|A4krCtONRtA5atzC2=YJ3jIbyhz3o^UJfDEs>ldMqrgc0 zXtf)|j_HT>U`hgD{5DF>k#h|pr0U>InQ^lbLy;7sO8v-R$=F11V=u$>+RYF3V35LK zVQso-UQq=hq;Ft^Z-?Mj^{|%pV7-uFRp-MGR*Lv*-#$QT zk)*xq>dr3+m0k)DC3~8|R%3X5p&5=Yq7x?o+@AT-Fjw-*eXqV~f|zD%kot?~F_vC0&%!k&}0} zrzHp&^wMKSOr+%hnze`(V+i%xJSc5h0xspcvGM&ktCIMI>~r5Pq@?x8zg!K>jKp162@w?D+gUND}QAB5@u7Yyhfu*Bk!ldkG${FGDt7r-@Ukejl%_u#>;EsocMh}-Mr^feL?+nP#qn-b)$@98q-j!*?;~rAZAFeCZzI;Y)fq* zS34L6uls}#2%BmSScM$fCON!8nlJu?06#CDsalB1ZzI7KJ#(PTpdKhY5AW#@ zv^oPdQ2KRMnLhe4xet^yx5HxCo&F7Er)A4M9ZfnL&=hoU)tx>Ff4W1K9=a|MaJujq z1>0H*=rz~5_yQ8V6xm$OfM_`!DF*~Ffy?SiT-`5DczFDTNE^B*$bW7&>A{tL5A**9nj)pynKP)vJ9V%rcL4HII(BzA_N1>avb zTJ(TA*}=JWiyGfEzz+ezZ_IX5{chm9W9S4*=UvD#%NX7_C=H6AL~P@*)Gh*o71M%h z;@kGRl_JL3TOK2|lo7#s1_wp7^i==ZwQft+)uegrya8m zw$yyi4dZno6XFZ=uB7IY^I^LM8`Q$44!`xrG`vPT-A_^BY%i7~=v(^~)OYvL;=XVEn^jSdAd8g7) z`r?N(4S;ym`=nAxyZbK=g0NciMYr?k_Yt$P7YM?;>W%DXe8hZ=^xQOyH^a~M(2erEz^8h( z>HyAYYntdY&ft3+G+lx~I{U#He`%Zk4S*9@XnpUsp%f3|^%O*!5%4^O`3G)hxQXq4 zM&hrUHtF)OGZAPOjW3*X+m0)b;^-Ik&H@ItwuOJ<%3D(H47yZSN~Gm$Kgl`h5V9it zsOn+%=ba&S#EGR}bCb=rS78}(Kc1-JXOR0JsA)iv;J5RK#~W*>uynWM?}OzsOeY$jS%E*E#ctBu10RRvmiR-eC}LKVWh- zprxchefHGd&3*m?!cje!$?2JA)(?}m8UU<(@2$)9-ei@`?6&_`Rg`}{=Qnl&YIhO= z^;R0ilQ=+wjhffNd^$sk(VFHrM@nH>1vjFFv6TXG)P30JNFo^H*HR^|JoC)|jZz}?BOpvSML>h%Q_1&8x=Ol;`rEoon|91C(a=p;k0Ee9xM5kL6XI zhjt&&3U7%6+k4eajQ1<-N3C1{rqJK&H|HPx!q_8^+`4TWwKtcCohpJdJ_|09EUyG& z++Z+UT&vqV!m@6VBY1pdr=IL;yw_Hox^YSMP4wODnMDpF?`y-isy2eZLhs~LKV#?? zN)Xmx#%i{&m$?7gJ@}t)3HUBnjKIy3vAtCBgF~nI-5{O?SV+@*`JVh9=Y8SeErOI! zyViT`Jo2yAwE_`M=%x&#uX#Z}x$}`|UVLgz`gG6V6`FuWsD9@#x*1b>2cK95mIz!; z`P$wttF=^TO@y15Bk z9pQok3q)(%9t!`Br0+N^Y)&lx}2Ks-oo1LREy|cNAjmiJbjCAfc*4G+RcAIRty@+dWgwA#*>#7%E zE|F{hHfv;XNNmIKEh19aBBB)oAp4*h`#I}F0m*KEQJv;r{JNgs#( zQz^4%iey?5Y7p5ZzJG2ZCEg!W2Ez+{h)9kdHXZ3!XhaO-K3NbpR;~qqg(ig*_t!?F zM~iJ_!kcQV{oeXbx=Mvmkink*X%E^^D^qDS+MM?@rDA#r8M?C_5DmbT64mEhud<+8SRK_q=r*fZbv0NW*Sf$@2MOKnBXYKHPp*({D@vF<7kI+{~;rc$gD49<5 z`wub>zkK%G&Q*Gt1X_FSQ#1qKylTy!NiKt!2#f0KWNlrkK4ATc0spcrTXayPej9y|EDYi;v`-k1FCRJKjEqx&n+IeN z4rEL|JH`;nuu{o-C}4VUC~u!8JmMf^RG{z~ zd4*z(-!5r7Sf#yyrh6AJ=tOg2VC^s#2%C_0juAsji;xfucN=Eca+42ZM*Wm&&=VC> z(Kj`eP#=y_yI0>ID`$*NkL?OjF;{eSBkGDAED02c40c$0j7TQS)G}05c;#wBa9V3! zBdH_`DfA*cf}d)S-8%BxM*16}VD=}B>xH--k}`6hO-+o{y;*31a|n1;YS1SP#ieDV zMnR;3pU-FKBN_haCK$|tkCX3i_U`aWS9R`eFX?PYeGNeqGu!-v(rY+VOBGr4 zR=mb_oqaJ}ovMsnOq&eBm zmA^#aspUkLKE;2;GV1f)QMlJS)w)50&_ysNx!)p$m99INfgCbdG4n99qsYa#sMssXXV)IYG1$3wa$d~bk1q19s%W=h4Uy_x>%z=uNDkrO3Mn5`oM7$;H zBtzK*zKmYU5cBt?E%Wo>JC?pVS=nOYyyK5B?bZ8S;(WNf<@kiPCeNXf=#cFhK|TN{ z3J=bc{qgFdB3M>0PZsRRwNbpwav!6a@pq!M9D6De33GjC!7y*I(V;?^ZE>kF?d&JA zlx1cf?RA@#bXuDukL~Mf0j#sFk79bhWjF+e)4718SXZyFCvP028!1_|62FlSy}%GW-6<*i(eKU$){9Fo%H1<{sN6tyxf_%VOL4x@;q`)xm{n)aA{8FGAlc znZ4A21$y%>Wp`^=9=toea6YP653mUL0+nRFb`G!{txN~XD!)s#B~6suM;>m=8Cx2M zm-_?V?e*IJ)tmd;7EGz7l^eji^?n=$Ul(Kp`@Sc$>3gKKekx*%sOeq&XOiKV@eYdP zUui9_D7P^vgM_iC4193n^*Hgyh&v?!Ns9t8rXIYvT2l&(?QO*rnR3$Ismp&$};Q-l|v6 z&h6~yr%$beQbcBA2nra8f}UDWDL6<1s2|A-IXU=G%3n-hIIu!conBXsQ^5QdQU-ex zNU804!b-Bx-Jw41h*jw58Ot(1Z_UN~TH^u9rAxxZqNFPu^S048``Tl7#J4c@ff0Il zS3gMwcFuvFtEHvyi%qUXj`tJU_9ws+U|L>RM{i2}wS1f21Gwk%fWku)d3r@OaVxww zBV^z#zhpp!bx#m2SZHSD%X6s{5ZqUCx6_`NORfjYt%x`?Wx+IO~;To_SaR@1ta%_Z8N6~ zZG`V?hXkzkc5F#D?AeQ#*QVu(gA=J28}^8VcdX@+4KZE66+)I`6gYIqvR;o{0luy& z;&!EtxUzTX-m782yISelhl)&a#%ZOBcdWf9j!Z^D$jXd78Z)#i6bW{@k+o*|%mcd- z{w@5rn%;EM(x_$>4$#TCHb0h%TZ6+RJ>Ep0OG5@f>IOOb{yB;R`rD=SSr(uwxML+( zg#8Euvk{ivE8lv;n#SdCuyTZqjBLVUyHB6 zo27YR;<*C3Cg79_hk*bL=^y!pHxwQZcNF%r^y(M4>l98R_xOpq_oQn-3OLU_>OqGPKehDSq1$BXVfYZ!!xSflXp z&ih{C!>t&fJ>ot&Qqx1mB0sH4+f#`Qk};dfzI3wglP)9Y!Fr9NKU`)EGGN4EeQdwm zhxE50G+yzdHSNZSphH~qgS*d^^dvhIQ8CH3=%ELYKp#Pbe?>ni2=ONpKX^OV>p?GT zzgQfoW`szo+E?LQP}P$W*ZKRydj5xWV&F0@cAiQvYj5z z%xSy=L%NH#CP9kBG;*eTEk*&i>w22p&M(28vAV;BBfLcX#s}pFWbWfBBabY_iK%_& zQy*-9)|tU3>M`T^P_A@fabAUO595NrJAy|A>u9R3V8tWqFKuv(ll#nVd3es9!$L>~ zzdS%Oi3YS{3Z5#uQFA_R{Y3}u$hSQE{tVIOmU1DRHD7}$>nSUK3+UVt6P1BViwSg^ z{2u^VK&QVyc}^$qt58`MMk#v_3?-qFI3#5zqHWj#gbU^y{y7O?KoRz?gjMb6JN*SSE+8XE9yF> z(UWH)Bh#X}eqa_ak)&*vU?l08yNBFx3S7)_u!}8SS@XJr@p*?>2;d)^n`2=^r2~$$ z(rz;hU7mJXb8{ctN{5VQ($e?CFXvf^#M~Krkc9XtGD7iwWlCK8BVOdE>FH@-=h6>X z=B_3tfwe!}xW7*B|3bJTBS}|$sw}9E`ebJ!r4;$zqDzo0YrxR5pr;P$>>5)d3cqNs z{}7j~-CS>B7n3;|IE3-xM2wX;BTt<3WA)hOG__a>_lj6l;J)m9VOgH_5dSQl`m2Pt zd!NMm;(;i1M9y`(hj7Rb9|ObQk`LamV-pqI_pY^W~@WY@tAojYA5!ao+nB)WN|-al-A&4=08R$#RcernngV0 z>FK#Ei9f-$wY7Q0#hsQ`R+5!(cuzk1M8XUynLC;D>h#`WW1(xix53agiMc}wv=Cw~ zgpX8b3i_Cg>@_=l*H5+c!YJsu0dtqzwoZ`fX^Jv(JQ4Sf0tAEb;SOUDzOed?0(4=t z;IKs=OU(VtBEzbb(r?CR2_b19ECP%DcKKWUiXklH9a0Z3iqrH%>Gz(y!>OSic>|Pj z{h7}p1%-ly4$?7fhNQIA1mGs|dy#(=@ICLUB#rv?mMu~5O=lS&TCY?4V!WC7jRp{- zBD?!(LNW4!i|PM}@wh!2m$-pQbm#OUkZQlB4nNiL{29nB@%vopeo!Nay<=^F_`mb% zJ#35Q?JEDb#UNC3b93<%DCZ1#YilbnBcmQjBsQA)h*OL-tP+A!Icj+GJ_9as4WIy( zfC^a;36Cx@1TVZ4p3mIpde3Lf1(^pj?3n`} z#1;hs= z$9pQc1a_OIpa;z)UpqlaV1McRN8t%<3)rZCKFkH2BUT z38jD>4wi-)l5F344sZsX-E+6+8o}Ro4ZRBXTAN`!`E5l6Oo3wxoG_A^epg^E-QWj@ z)=B^gUHKzzMWfeILPmziJPPkN9Fue!zNBwxXy`Ct?|1w5?GkiK$yl_R?~;R!vX6p- z0;U&WCVpjWlRzMFd-Uj$FCtH5WwOnKidi_vZmEnPVDFPLB#W9BoIh{+W&YwM8O%{_03ZE1+&OHYG$OS zMtyAj?5|ll9@GA7GJEG{;nfKH0wgC|!C=B*MW+rf{!`Tz$dE-uMs`u&hEJK5KNu$+ z*UL35xom18rlO(}r{FgJ?8u20wh6nM|ZVzm1Y=pVEzT^T0n*xRk$b!GVKGz=Eti|^N zeCet!o1*5+#zF-~d{$Z{(K|pfxw-l~TwQoXf1nXpxrPSl{D zSv^w|fCl5L?Kaw0#9FrzqM!TRT;)nD=Iuq7iHIIXb%Bx+d76I1HNlrs*2mTM^&1YY zq6DJ4sWF2hp^unCtjP{=rDh=&Ssi{)w8T#0IQ2#?vsoE%i~(BY25P_~;M3|=nu}lA zT-z@@ettqR|3+1K>8{_-7{`!hw8;bwKp!OCW^^_H=DYRq*K?j7%sbP^m%U>jF1`tE zYHD(M#^(NZ0QgN?>E?w2pyr5IV=n`$nxTymzXi;8PfbOB4W{433svIlrz>KW;8Tho z!D1%aAC3}9I*%f=g2lat0S+)fU>?r8qq0*~99F~q{q(-^P<7@5#BpX)!RAmzy6Ufo zw|6ay-cg@uVH0Cr&GHn9DJ-ti9dJantN~#XRgIpX2iU(yQ?!VOdp5Ry+5If02D|G7 zuVeQrWAhmN&InL#ule#ihr(K>R?@|fMMXQ;{1be)8)&~Nu^V-HhOx_fmr{=oKpxM{ z*>5z9wUu2CAl=$|XKG)7t>+4JmB?`Nuq>NOei29gJ^@%rm)#vmmK9zLRXtV9jRNzX z+UmJQM`8{#cNJ7t2H=>Uk2Oyc=DCM-iPZRvYz)5o^vL~-7cc56j=%38-OA8R+3CUn z4&&aDuI{lhw6d$O5^~HfNsk;KmG+po&u08gip@m<A6V6Aj6~o(-b#NyJv|+vCOOoZpKn-_ z_27I>{Oi|0J4P+X8zX&7JQjxKLcA}owqNCv%r=J0P`aY}-2!}cyY$Q3sYEJA7cQCW zuNbib&f&t7;9ZnZPj{=E-N`%v8)Y>vc=n*!(S&(=#8QCPxW_<*_VLchf92q~&@9Sc zA&g|-U3y86dE<@M4t4aWm7*e1KW6`mx2b8l983nK_I;$asCf|UUA@MF>tuG_Ihhf& z#=2{|!kwAgJaFfqSAh6E15~{}J*5stR{EP9zMDT8gZnSqAKP=R^$|ZmxaZmoC3?)^ zOTV2%QNz)wZ?_|AZ^v36+dD!$WX8;TSABb%qwXkSxa4d%2FKxP>lo^0FkJ4GttmY>PtPd zK~lnT@$o354Z!2jou-tOl!M{wayHo|ihvgl0_M74>b<0}0kF!7(GgQG6k|^J+twJd zy1pmDF0B{SD+fJBd?x41C*LolX7u{uP77^p<=6mPxuC(E0!LzOw<7D#$fL=4f&UvP zowYJY45*#%LMS1NPuzk?iQ(g40aDM%Vf-mI>jV&%Y5dOm0HGYn@#|s483Ij4PF3R- zZnF~r2iG;N12jJ5)?=b?$LMZ}IbU~j41?LIiRKviXr;cVCC%;+Z#5*?I2`Cg9fJKkGZubM2_aRWdL!kqX^n#TOqD z&;XVuh(BrJ{X+z)T4Kwv~#~lJuWyCa6NIijTxV{Rl{Lbiy8!^8eE0+{E z09Bw-9XDlKdNh-q8Cl)oFo0xK)N%L?$}WAS$2DRd7pgYa>n48x-sJkx(XqRZK`$)8 zQRCf4PHrQ<=v=R@@#rCdf-lTzf@?6_*{tX9JVCABCf+R_ae89*Erb<*+2p6m{nxJZ zgMDy|rC+sjA<@x6GG^ZFA`Z!HdqCHYS{w8gKV|!-dDtTa!Ep?Dj}X!Te6O*wamL43 z`((j*lu<=aj-VCsL|1& zPG4FS^~3Buv?g`fk8d^5lu&apG-XrjI1xeG{%~yc65ec&!z70vrksD~A_%@fiQ{g* zew9GM=I*^z%iPWFh;^cb;Pj~h4zUvi^f_7g{g6IGKvsC}tVnSqPO4C|&gC5V0)>6~ zc$DwP@_3U^|DXt9qSWu4J@EFy2@bL62G*mf|9NP=K+q)g&w7H5?7m3`*v1q|tcPL=cP7+a3 zQRBAvvO^Jk+R3IKSNXjG4$b=Dc-=lA1ayoQ3Gx5Nszpo~Itv*S-SLXeLE2}JHt;0i zx)0o7fJvRtgrABW2KXuU#g`Tb9D$Q^5~!gV=rX~CS~Z~5ki?77a8#+QVE(ldyXNP| zPR1=c?<0d!gTHtGyLlTSxtsN9F z&_jEZS_Z8T2YDYT_N*Zm!J_I3UFv+d~Ho1i9f4 z*a=zA`S6^c$8fKCUbWuecUx8sSHdFTgKz zdOF+%LstbeDF}^cic*91&)TC2dOwvoeD)itxM;PpITluzI^WOlGgnym`1GHv9tuvn zT5bSx@LQcgLdfDI8Th7RvhcYc+d&8Tkl-o0py$Y2R`KJrLcF|-HrmyfHU?eXE4J|M z*ifjrQ6t3P+E$C1P|M%x6Y(K1s2ZA?<(-+4Q6CxApH&K2WDycad+aW)b!z+c>xckV z2hB}4MSQTK18X_}MOkv=b<0D7RQ3173sMmbkBp2gPk-;puh^ySkVOR${4R&;tqEL- zsit!NUh~^g?@ME+U+vv#9J|6<5duilRW_6QkTl6P@K*X&W%O$Hrjs8!cK@CW;3`8u z(o~0l7=A~~Z(Icx%Cs`k@^Mamtw`@c@4R45M;_p~M^xMn9rvogH2%0Bz#vqyF#eaGa|%rO6SxIyK|d@AzH- ziwG27)X^EiQgXHh@+*HF1H&??o&fCJc@(o z=-jmU4<*(@@X4?P5a*c+RMRF0{jj^|<*2*Ti;y*#HIb2BR>!hW>4l!RO6_CN6R}P? z+jjU6bp|#Cj|9#wnWjj1ZWbOSJ|DF+fU#CQ<%^%Gga9k6KmujQkUtUeVA=gKASB-n ztn%8Rk#M5K`@%I&(iT8_M>H~z5o+%nxw9ZXkUmHHxkZfw4x1pr&;Ns;3jCe9ARGJQ z#S0vh1+NL_@x_2s=H1kY%Vv644HTgrS0E=_S@x`7Z;05-uX(d zuXoR5&S~%>Q2f*B6d2)M+W=f>D+H{5R<(+7^-eQ?F8u0`AfY`r%-E$cKUXRy!FHTb z7?su4J)A0+o;J0$c_2{TW#`dGj^(v|PZ&!UDQbE4hcaMa>4R>)08}Yv$WPdBc1< z+_fshdM~`A02O{ryGLl+Gdxgy3(5K>tV?=}Q^5w|jv8b(^G?D^N5Hv5O|txZiV|Y- zy;p0z^OfCi3mlJrAB~QTw4^r7i&kR{@r&~3zrDASH7V@)`!^Jz^Iy|!4{gK+y@lV% z9oE(fj)jbt_T7seRk5=yG7Am>&WZbSOk}c#28bcxroXcG3bU@^CjYe({XV%!o(<{R(Y$*{-zobOca@_uQ1$ z6p3eWhf|(C$jAJ29rwhDI6qYCgcACT2?;NL4(a|Gjf_%P{kW{n@gS~HXNUgc`zKDE z@Vx@%WjI}%_}z>cAe-gYmE9ul%>FGB1I;D&eLwu-OMpTdH~NB`wb3(wYWkG#8}I(* z-!W6pQZ|5i+xuj)5k{5@3JpqpH&7F)XokqR%_W_mA>JL?+5?7c6YCML z=g?pZaWxNMOYzn?!VxZ57D@e|S)@1G=6BN^OL`Ecv^RLwiPo z9{t(#7^Q2@2X%ejaCM3OzrQZhuEPdoG41Ov?1Y{s!NB=vc0pMYCa>F(8J^X^vwv3! zyUT1{ggH-?*pPAYC?V5|B&RFI3HB?z9|aA@bC>&m{{fsg8s=PU)8N{zpPT$~ zqyqxQEqKLJh+A3#QjX}4J9K3|0x|f%RcM+&mv*zdX3tjWxP@((IG|&hXWCP7!!6+t zTto@?2NP)#{x95s#Rt?Wz#O_`Kb|5`O@XPu{(n8dJ&$|fcw7hJ1Lj}|p{U8v)Iha2 zUIEe+YTY7S%bAAwKi6NttsfUhPk0mbA3uQQJNA}$YCS>V@mePS7{X%NAG%B>ew7xG z?~$oE0$#*fLNX=$UmLir0vog>wO%CL;FfM+Yx${s2{P)hD(bWF=fhJV3THS(xd z!M`Zfc-t?f-vL8c%3SmaY)XeQafJL#ra$SxLTi2frW^yMY__nRzM)}-a==2Joyn~v z=7?0!mx)HCw$Vq&(!mrZ#E1iY?q$2R>a7Tz zQHDEE4b1oCo2ibEXIIlkZqTZhRQ0d_+h>P{Q;2swe+z2Au^7j+e;QA6SFOHWMx&!N z#LtLE$h@f+FCcrM$$r%BzSU2|m+X+FLl=5|OSdP)7i+F7Dn2#YtuYK(nB>cEUXIvK z%gD%BXp9svW4-v`uB7Ely`9wF8;X?GK$$iBpy2E63zRDeG(caGZb^i11(Q~6{|9qlq(oGiS#e5>)sHKmB zd^My+MMd4yUL7JfHZ~j9uWDY9jtmGq5OnD;wow%VvTkziuX2}3rkn4?r+H8dX$1}7 zTIsxJDE;2VDs7BtF1j`}LCor=N&c?{N3y^xNmb%ger4U*dhn02)+;I!WBaVHLP9K_JJE&_@LLFj8y&@>#>6CF!%Ii{gPH(l)h$` zc)|`yN@BlU4!CC4(K6kwb(jrI>(6mc6IDEh7E#*6hulr(_|e_DM)`(So@>dO+Uar( zt8T4v7ZrZ4U5K)UVkjdW=qUrGpTMJ=-(8rE&dJHKa6n|$x3*&JN0G32u8qvl$l%xr ztFR`mB45qnBMLUr!X|m|B^>$@(rt*@jWT|o(@!>DAH$t1!G-lJRUVkm!2K=y*Uyz+F6*uCb> z%a;9iP``}E4OB($Wh|2lOva+(UQq)mmI|uncOzj%^BKk6fG#fx8 z1e?fxM)Y)IZE}tvdt{!5${$rGBBCx9X=-VScUWrRN!T$iZ|bknAYM=4Gr5b_;RZ}! zOxG6!)CQ`>PD`oR!>i#wm#xt}<9_#SUZsykPnWgv+>D#zh)weuF@m5YqinIp3d7AY zV$8jz1he!(RZy`67?7)WNS!?i;(RAvV)UU5`f3NTJ( z^!P6jOYH!NuU`;QRsuTl21wC_ECmPRs{#Omj@gMggb;)&k>}I@071ur1L0jsTTIZF z{(G|j9}sbSAeI%|j}U@jNYwvN5I=Arnq)4^5Q5P3m-|l;YB&&*P9)R>_pEP$;o(FeCP5|ONiM9NnU-hSO?P?0c=eRf8oHSmw z5PvCe?fnskzs_)ns{JpI7jX_WrPVkffv+OKOTBympfSXiSOP%DZuyt~pCe24n3D7G zf8aCtQ&g4B(bI!|EjuI;-UmMyfHvU+1}uVEN(1aZi$z67@#CMp0^6KB20XjslcY=d zEI$;n_w3B+_UnO|4+hz9)ufJ`B)z`uvzWI1I=xr_wg+fah3_C=H1N@-R{`WTuKK(< zK}p1Up2YgX9{yY~vCf^$Ul$c*YB_PlMfuG_0A@xh^p`6>?OYe4%Z~>tv&w3*V!~yP zl34GJB|uxir%>;63S>au84*SSRIvZYSI(c1U!|XJfPx0#PoENa zJxo96AO8I+5xg{D56FMP>uM9B{MG!|_kwIEcR>hc<)5^?x8r@1UuEOKj$@L~J`nC0 z1ZEX0-LD<$)UKLXd|39x(m~1ZEF}UzqhN0uYr{?T4-qa3CO4 z0ElCwYRS(DKr9JCX9<5F2jW-~07ChR$8!mST>94}@IN4wgK!{D4RfS{D zhxu6u8u@g7V8V#E590nFh)4O>e1stWKREj@h#4G+sg~qSLJ()6cK-pwx1;6QYGgt`-gcm|sMJ37I> zGWIH~jmV#N|GxbpxW1CT{~pfTj_LVRfGE)2-<=8IeqbJb`A-B!g0nleq?u_N7)re}T^tao!)1F(hdJw|9c$X#Y*~iPu8%ZTzuhC=uNP-1sHc8E0$^ z=oQk5U5((SKx;#y)_)i)6> z7HQp*(vp|&=woV3FNQk+(!LIRGA|BDdmELqL?CT79^^kgSI+AYJ)Q4iw2}I$K#Bv1 zhO#|~8+2wJtu#xZly@rrEB|P^h}`%?Xaw(R=B5{e_t=1XMwjywx&`77@gug8Be04N za%ZN041xuw-x=DAn23A45&2Z z|Hg1878(DO#wXh~X0If47N$7z7W4|@blQZ#bc1q1C4U<%^an*V#YWHo_Sq?AIw-RI z?m6J7qLnXJi3pAw1@8RE`5O4n=?+yW?cGPbg=#_QL2rIJq|y`UvyeXVpL@R`E?7%f z6z6(RMQxIbQ$B;44WhKb^Ilid-~d1UEi6Zg!(_?vY`5&XE7^j8*vr5T-yZ;CuR|+~ z5IF6fv(SGoMCqtuH*||$C#T;jxT9WsKbVz~mVa0~qU%((ehjB+cSY@rN?SgI5wPEs z-ZN3Xx_N%)TUfUKb49sX_+CKiieY8uTB59*jbC14O!9&3gMG+&`2-2hQQw%>AZy`-Sp6$7GS_?-q7*RG)Uvs+DYD2Jg>bJ_3M7E zWw17b1o=E}p4NT%k(EayUwRppa2ayQYoTgB0lSm#HJuji?Y*;9CoC!1Q-_=5p?@5 za?x|h==N?YrY6fRc4sl>heB`(Wvp_6My49mxpZ`~qX+9$lK7r`9Vb7d8VN+TD33S3 z1ZB?GEB?}d8-8LkRKTG>a)pf7=lbn{uFJik8tQGc{2k){QU`=;Po4>Uez?jD5f^vT zqx+UsIR!m;Ss)d&o{Ut@gK?FOPh=crWE|e@xXFO|X0bNc^mzAoGK)xJpO-8b8gH2} z$$G9jGsQYpm)muGPz!9|N-4d2@19TqC%UwENuKj${QYg!bnXtrrmkNDmcNMi^Y} zxRm~YyM7>z%83nnFcp}ZLHXU6%`i@zVHIhD%9GBA$o8+G&N)sZ5sg#`W@fD6UuJy4 zh}Ar4O}s$H=K2aTSJX5}OnYfG|EXEEcR9zLX_aS*QH5)!QL**wwwlTJUW4pjb3aRa z?@+Nd9wT?1YX3ydB3{qtIh8a&ou1(Ct`t!Ff*E1vx7)?Y#8k1fP z%$JSfKDrQ(anm16D?sq)Xc#7MUb~-thm6F7iVlF_Mz8!{3((;EjW_QJH2Bv<)n15G zgWa52cU6G>@~SmsBomN+@3Y?5>geSZfS&EnU4ehYZq#5=xWQzPnauR--*AI z_UjzZdpgg&x`qa#(lsY;69T>!lm{yLi{!t$0+zVv8oX@>kH+4bZby|49@(y~&Afr`~tS4ImPVOVjocu$d~YEPks(w;Y2Hbrf1WR{inR;~U} zU9W#4j&fRvW6dwvSi6-Liz{&x-#|qj`u!#vIytrv4bm4wGX8oo8m4o!KmZe+`H{BY zeAzC)Y9fCwLEPreN26A!q6Y5%+Bdx56DLkcY%cH+^^OtGg;L`_PH+KBUbU0BnSzVR zzVymj7l1(4HE`XEAdn^VK-KoPJx^zlEp2pgC;dxxbaHid^=5tzrlKZ(M-DwV)?aKx zZzhy_f%+JE;1x_LHSW^_AC)BROJiz?kZf5w`M8ZLp%1D6Qcymu?nyACM<+xygA;oe zQ@zf50^GYxo9Tu zh8@1)nmz5=hRrL$rbHHqUmLAlX>|c&mB&?@@wbqpxKR^#{b$ZDSeBdD0sm-#0E)ir z#5+W&=ul7z?l_Tf$#Vg# zejBUglo^pm1cs0JA`lbr?2K(PcO}O*qo06PqXh38*%vCbe`Laq)@BO7vfqW91;5Ev zUp@35{5MMHOE|glEy_4B@VZ|d^(P*THuIehe(}QO_U$AAUf%r=qBKSd4CNu_apUl~ z=K0=0M{sbkcW+Nj?tnuqs(X-_jHWX>8KEU2&s!m2&`q_ImAcy^IWk8k(h{=J*13gk zs8*V2j!6+As`375_9zn$1q3qa)?+eh2zNx`M%_2M^v${uG&Di-L}=_{(lho4yW49n zLltf-;Z48tBa6vl_ZXEc!o`R4Ftql5MRyg2m z-9~odB(N!p)v51as+PX7&g0&ma(A1+jpd7qib_bqhTfq+w#m8VS1t#m26RLuD9lrT z=$JjFOxz`5HXao&|9vdCC^Z==FCIU&DV_!elx zL04hF?T!J|VnH@diGW&!FpfTi;6^u)zAC13!&Qiye%#Bd{dX^OdV<|`Klu0vnN)Pj zF4uF-n_;)3IUZ)Cj-XNS1i&>Ha^Ct>qcim+v{RQKB)efm{I*`4y+%oeOFr^Z3J?(i z0~Stm{pSOq!lBDwxI24MzvQtyE`HH(GQdtoS0p=pkH*1OPj3ZCcDk= zzKbVeXO1a<&g&Hky51{PLD;p0ej$;_~h5hw{< z#@>{9C!S1kl7)$vkMI7vTrV37?lnaD6JO>PBVuBvr9I~76ki_y87jMOAnCjF5ce4i z4}io}NRD`S2pN?&*O1{}iDDJE)+m!W2BFIkeD!j`rlFT_`w(a@h!n2pq|E&3656~9 z2;n6*9g4Anf+tHZ#izSPGeLaAhvgKUp5e_-b}{59JzzNYUaHZ=oiR2(&E$KdI(37SbeQ!aG8aKH8rsz44zZ>C^Hwn64;>P}5I0m*+eWEuvMCdGC zP$_a}Yh?(a2dMm1ob$5k?&4nO%Bz^+&*oAUN#E<^!nlu4b!LXkY>o!R?^XhQl4B^C zQ6SDFmwhk_^Ya;pdylb8hzw?PZ1)L>^;PNRnL2i_=6ILZi>>T^?b-SwKtf+HaTw^9 zC#~f^3D|N^(p54zkdZ6CrzpuFmWT2l;HEBju?hOd_X9s}4vb(XI1=uJX*@!e^b7*l z#Q#M0PHlh3+k)%`uGtczhcae#-857PfyX6npZo1@qu@$FHale%&XMEP-4@CwvrXjb z_4TpIC%@mXl`4Q#+l_l+vlY`9&m`E!{>41Z=po?5L!SewOwPfOdGqiFVvixWXdEG7 zy8@U_0OZXICy;0-(JJ`_iI#;Qc^}{wGvE}GMHxiy5{=AU;@%Wy0T2?4 zPlq4K!E%=&fDO&DdoN!0=)L`HtAM7rYtCh&c`1y(Kwu=nbA}I~@f#Nr0l{kTi=+T& z82qlpf%?KOf6l)5oTT9Cxto0Mu{+?)`Z?(xR`SO``CfA3l+my-<`e?=A?-%a4rgBDpns&pe;*NJl@X)=O6d7bLJs+~Sm# z9qM7M6FF725zQaP`_0PIa_!|<=?`&8oT?TvAgO6qRXCxfxRIKGq?W*NLgA(ea!aZ9f{qd1L?^ zakEK}yaiC^h1j)~_N%mR0i@K+yKp7y65FoEzFZ7Sm`M0C)~3L(jC5DEYbTb0Re(m@ zuUd0B+Hm7VH#U=3dv03n;pM~_k~eFsfIoG6MEMf>)81?@X9>wojg5iI?V0TT7e8=J zYi_;Gy~|d-tv%mN9_OFg58j%VaTMcbpENlvdJF~%aIh?C9uwT?jkGa|^Nfc!s$Pp$1HtY5CCZnupmfn`wPK5SFn`i#T3H~qWsqusTh0RBe| zP|nMHO;$P=7;eg;{rcm9-H{6p{ly$EE-vZ7&hxLLqDnokUvGFE7Z>Lpc~R|llTp9$ z$4J0|;Xk&|1P+}*))n0TLId|AUr>*h|~)Y%cx` zaBUuIw6hz4fLSTeIMD!kd7~=LiXbnqF(v}EDYXchIph6ez^P^^@QMU8)Ch>)nn*{i zcguyIvYYYJuO98;@LoXg*>+5=n`D%d&gJTkC#i=@3A|MszFUlMNnWwQR$lKNJ=a zu(L9vy|Olv@8`2Sk$W7N4CmkzH ztX1lZ{>fRT8@O^bgiWTq^@4%OH2&K0-8E(KI2W|Em}(}s|Bao zNDEYdNxZ-$Zf2NtS-@(*eG6JWQ}bDrfo$LmF;y;FiLTdzta$!|dIF}TUkp0y-UB)- zNUlStJVOoG{@Q@*B%$r^%}*=ehCT1zNC}hc-}|By?)@R$7YWa2A|9mmn0T1HVm$H+ zGLU*u*_v<)2xO;|{+#5OW0m*yZs^R^9_biGV^}i$dTugN2Cf$tKe&7MZcbjDzJ`Xz zQ15s}P|>Fp$Q;eh-3T-G+S*!myI2yKA>@shhug@th9Nu8XM~i*lBg6AoG!_gnN2-1 z_J@g0&CQ*AZyw;@ckxNHig$}rx7aNjavvZ`m*O)xwSURRsRy>Pu~F6aFsnt*&CRWl zQL}Uk@$gusl45pIyG@Oa)t%ML3Il#qxJfz79NkTrPo%u{@A}tl#cY?FzOnNpwopgA z&312zW?|L0wzg`1kB%BDtemTx+F7SX5lr!O_#y>>NhJ8?Up6q z&J#qtPBnimAfyz5$&A`!ZOyw|6;j_LUx-vsiMRih81Y`=p4};*d~Y{7lN+6fSNt9B zM54_SiA_hI_QV|&K;evY*3=nu8Ecpr7UiTw*WpFQSwKMiCf>DXHqZkQt8td8HvM=mh7`aS9Nl_T$S_H}&obXr0kKfyGH0J8 zP%zFdoZBU|*cTv6I-JD{+ka0E9IyzJ)zbHWU#DY^+1c82xgf64py@~a`o4f!klZ38 zIe2l4{Hu!jOlPJ?orNijdMg`yQNLRUtX~=uzMk>cl?7|tc22*5#O9J z@oR*E`XktHTq}CHrf!wsJ~UB+Xq^l9S%#Ozq4I!9?|%mjsL7Vso|292dTLk2`C+!y z-1uAnKU)42N?H7d0>rn--Jw8GJHI2reTIrpz#RS*m%3GMfuz}uV7PA9SeSgpN~?@W zDNoji^#B@a-d-1-gLhqU!(b19e;6&F(|w1w;8cfOKGzklzTE?Z~% z=R=^JwIo`}Xuw;Z!((p#eVYa~G<+AbXfN`dIyomNCww{fZbL)ElD?vNLxa?HHWJ>a zAaJIjGeB=YJlL4_dP&lH(Q3C0{f*V>DeV=@#0NJI5NcO<5vl(D+<$1i|dSoO+L zImqX3${X<{i$Fv6Vh`M~ZOyM3_nIL6aT#~}=9xUzTA*xD(6C3~Qzg#$6<|8kE{0jI z5x)Oka^8k9vD~ORCn_k<#r1_2V&h|9!FrJ}Q7}^ZhvQWbKvsOM84* zcY3C{xVR1%B5h?K#C+Hl;k8KnoVOiooB7LKpa#HC)*MC!jZ*}3C}+J zk1db2!|<=(;T(X0K{-ZPjEK{6*j76DUl4jK4h8a}gQ?fU?F*_6(8dUN)Kh~j*cP!+ zmw9!Kmf5Tqzp<(5a7Lzfy6KyQgqlc)?7@yG(xl}L8|>}Cz(AvCD-tZSo~{CH9-0pa zX3CT;F(!tFhH}fP+w=M{D=I1~(tJZLjjeGPSG>ABB9_;Suaie9UDNij0DuINRIH%} zBm)uZJr+XFlkpzg+H+-Np>iPs(JNz#)Z%}xeXO}*ofn1ZL0XelAJYGhXa%O`C8QGw zrElBzlj8OB@<~7{s;SLu*7uD{b_OUK#}jzTbX+%T9b=hm1UJ2VB1xlup3*$~@+C`w zk5+A%1}!S;`DohJ0e8AAubA#hfw&nXOSjn_v1ha#^E}K37$AEm#LM|q)NuJb&}%Xz z@&hKJ3sdV_Dh9%ZG6fa5@aQH`xEeP_37G&jhK0*x&(4a4YP6wEEX0Oye?SvDNHOJf z8@o|(K~P2peeK2QymwU3wb%D1OA1yp)nfZA?)VMlsZSYr*(aJvuAj)(GV zS1N!A&kLnp{aZ>JFQA#!%}RpJ!8mTJc$51?dLIM{yC6{2f}4aZ7y~fes|E z_Rub%u~Gp60U0H?-c*=S@%wDIsN+-`vH;D@K`!J>-T<8=IjslAwJOx+U+Au_Wo-Zz zQLg?Y%KeMH_9I}FYwIJ*^cpxv;Z$#-MR;p6P!F3wjqmx~pH$NXFLbNDP-@as-`H3* zxzLMT&UTaKW*P4scGC;%H!`=maR1r5{F|t#?(}!NE$?%EH#bK5GrtXfuwG4;7NP8c zo9RZ5|NecWq}LIFs?aHs|Go^QYU_pLsJ{n^VBaX8%+XfVw{vX0)}IW6(@%x{tTA{O z8_U`p2aoxg7NxJFQ(Ww^Ff6u4_FKAkHZ3jfi%^YRlDuG>_T76{Rtc%a;#^!~71ciI z;U3_J=}*tOFSKYRa$d?gw$YfbmFM|;&;{J(Gv$%eJg351CLlvyGlA9!lr7X?hu3Dh z1ZLbMQ$IVD_Hj$uhyP*T50AEw)b8d8u_RV~|Iv8fwlkwUaz!zWJ^uF57^eXMHbBY0 zrk|CoixpUew6`RTzfR#x0>$QopB8p%IvxTFin=6gj~=Vd!%f2aRo#+S`bTzs;a!$V zA3YVe02Qu3j__DwEaE3 zMnS6RLK)~iMkc1xqOpjCcGb?2_9xwm|J<0rq6DKEKheZGI-xuV?GOHbR}N78NhmB%PPgbr6_m-6>-Fd$!vEnRU{^>jr5y=uUZn( zjE|0c?o6vbLw5CKiOH6e8}{L4>aY4!>KY4)mjg=M&x=e~WRx( zZe2GK1GrlK3$D{Iy1YylrhT${nnk)kxv__JTX9WhRSHSYj_cQc%SzAxv0S@tarCY= zHmcO&=xdJ@tkM!Tb8c+5{kA^e&*%4fe}2FH;qTe&^?E)ZkLU4t7+t-1@|qeqAHNwhYvO6z zq5a#Uhjf@H>)@CAEn90pTmt~G(_HiyJJd3gbU=OLfuNuuk$_ADIsHl44XCTtd}+tt zCyE|vC*(!1-ihUgN5XvS)a*g9B1f<5vtrl>OLfoB&*iPD6`HYjBuOW^eW!O+>hZ-} zADTD|(=sD^s=C>62o9fLzR32xukr1G3mPJB>a6o;-@SjSR2Exc@>sil)oQYs#7+i%p^PTWiExoFsZ zOGT~VdufnE)X_&+E4_R1MvIUcV$vGBMlD9p6>v3sOu<6l)cRxZLF7brU#EV-U?9@M zWMb~}#~M3=VXo)DYXKWGY}JX|qocFsRs;JB>?7vn%TmreQq!$06hpF+U5hMnqL#>st){C=}hUd2B z-yJw>>RjfTXHAB;jvS;3S0>j0xd@&%`25J_fR2xh-L6F^bWi_YuQ7{Z%S6ouErS!*U?vCI1kml#l4xk3;R&dGaoEvNG zyBlIsj)nTXbhErwO_MDPr*J3rtzjN;>q3GbFfiv4GBw%$NWa3wx zJdQ299t%6C^R=f(5u5l*b(@glvc8<7rqq3cv}K@^R525>v0>I@Uo&ABT9ejA;J)&T z)z>#q-g;j5b=TOTGEci|CzQ$unB|4HwSIoUb)6hJmCzRp^+~{)#g^20&GJfd4X~gIo$*2gF`2rlmw*luB_$<8$N1LdxD2t@uOlJ(rq3=wx6TK_SJ-^FpP!xyR<^Ac z?SYX3+F7>ZkHG~r3Hp(KP%Xqx!_$@|bdF)Y4_4ctY6AqDH=9^zYJ1n)&o4y|2qz6# z99K|QMxX`kXEIlhR?%zPK=uM*pt=ps$JztLrQuEc4*~CneUsB2xKQ8{_^RxGK>;pS zUN>xJx#wPa-9o*0CCb$0Zz+?#R!2b*brN^|iL4f!ffAwpa*HFQRqVj&7Kg2jf61d% zoT$4$bYi^BOddUqzD^E{D>2Rt)UCVsb^kazjJo{bALi1typlBtB%1kll>a%9py2#4jMMoZN2u z;>Q#r3XA&eBZOoP6vH~Y-nsJ?B3(Um{gSAt=p!vLMm&c{za1unrpiW%3i$>phX9M0 zle?ct$j=x?$egcij2?_i$ocV{du{~Tec3|8T1ky+w*!VBUrI3CJMoJj#ORV=9FL8< zV-u*s{BKH@NluZZ7vu|b+cj|6^pT?M!V@*dqN`wIIN2eI4zwxvlXpyX19Fz61Jg-!T3C zazyxxqS&Uy8}5&o+at8D{dp&c3EbA!M4HHOCIJWd zJho@7xN!4RYCBIKRG1^B;`}G@!w(_)a;F5E$Dv8Te`}(ZlEpWL;VzBdFB+d&5~J5% zpf`V}#7y$qkh0M2l_d-_fUI`zj-y@t&z~MLeQnOrl++R3fKb#J>Ol{GXK2Qgk=2_C zKREM5EHp~oG_UY3l!RSqjK2q}0X9)Lmz7CG`#dX-owzx$;tP4Aezx(dEPTg&HwfzJ zhzFLLWFgCe*jRu9)g1%``1EIoB2|w

    )uh33KVSk0QPj073C*#XM|fTr`{8KH)s` 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 z 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%0D9I-yZ&n=CL2#ZjMlo`1|Fz18Q6?t z%J`(0&7?t<&)e%fHjS6IcO?4CtW|*~Dx$Unt-}URGE%39vt6^5mhO=N_F@HDf@urG`Zd-)L5=8Hrfgx5ZA}6s@U8|zFiVD)P3YJ`|r?S{)hxetM8W@B_@)WPl1(v zBK2MAjhg*fyPl-qB#TdCk>4~MRKC`Izw_oJfImN81^_UorTz?Zhs=nxQ_N-%yHFPa zFx0))ZB;)-7GnSHHPLXM7GI*Ae}fEmZ!q@B^|j5$w?18(dXQ!?IN?t4?9GjCD4LoCsr~U_bH>+mEf3WIHn5ZD7H_u#g{sCQ8XN&xO@vOv&ms@AjIU+Uwmtl7 zZ}Q9K9UUD%SDfNLeiVvF0N^pRzL5Zv?}{2vB@O)pDa1$!@S9aGL2Nh!iN(M89WSfH zlw^$RJxhSLF~Goj;0lT|+ZoU>=4sRoy%=7t`(C-IX!3unkNNAkBj)^iK`c|CX&+df z;>}{CP7O$OX|Et|bq!67H_T4O?wCjG}xIb*5kOW+)_=+Q;cD;Hw;tB`E zzN}jexYP>ZvUJ%vd4WN}&HLp*{|!C3_kQy#KAFKyPHyh@WdGBnTh~s3RuXb&CmPw8 zNGenv`uL9sC?z=gvpKZ-jsQppB3FakHE%V!G%R9u;uMPsF`8!>ix;+5u~}S9@h>zI zHb_{S@R;)A&Ua0%z4kc5(3=zOHLPbnnwy=>TrWzUZabLe{^Lr>=Rzi!)o;)RWH~eL zJ~Kqbex$Dfi#G5%*=}!vfu=lXDOUS49!vQ4${f6L$DZu=nwfCeX*Bv_?PuSMQw9?M z;=8a^o$iEcn2|;x+(et?jU}_xPItP5s2T&61Z!Gj`SsFY;Qvcfbj@&*l7EYhTRR6N z{ut0U*-d-V?cThWDMmOs@(sv%p6~+%rKfhM0i=jORb}dUf7PHjS*E~kbvP{wa)v#q zf}_V^P39<{O?Xz%0#NEl<5<}@V_0UTtYQ61Q@!iB@nok97$G-u$-v&M0*s{W8d|NE zOhN?s_uac->k;3#bM&5B^p0ET;|q;P3oL{C=qVp3shKx)&j^V2YM~Xw`dxzcTg^H8 zPY|Of1^S}EG)Dz^nnFlI>;eiW63yF73dljw1-ODq5(*b!0F%wr3Th)GmXq7reey+} zrlehaU=hSTHXr1pkqtY{Bx$R5)Pd-3Igux6xFeN?DJp4WMk91gMjx>_SQt3LD>^1% zZ~nsy1p@6VNOoHm2rn??~PD`YXUXTv?k}EM9OJIM!G$6(bMQV(|C$ ziP*I3hT3wvnVZroZKeYy_xE{2fqA#UbxSSPHdQ$+{RAR5N>z4rsB&qVLC4UnHh8RL zwXiOM*jBU1Sf(aiK{Jy6-+RQ4+avzSOK!rCpuxW_sqS>lNE!T6SJXpLz#8?T(C{;g zm3ZcH?zg|KU>GIm2bTT|Y0hD%xZNR}z{jA}#1 zzV^6K$g8#QM&H!BwBFs705hyuXo+unL@?6tMs z&H-FuwoZsIl2l(}cRrqtlzSG)ZUHmzhesn=cVV?04CtEEFi*U-l z6$D?oSCq0?e_@5~U>h)@*ZUEqmw9h%KF%ZI@6g;3XYq9f1$nJQLEXQd%(AAIBdYAiE5@HwxbNZi zgtl6|u?DiELHpZ!YCSOBN9a(g=0)s(*rpQbFVX=$5N_<1+LRU&^}+q7W#DkEf6W~p zXw25SQm(B>kJ}|5-A8g`NSv;8Gs+AK(!Tn{;~4>sNS#SLZP=TKU0bj~14|q)M|W0o zhB-koH`7(thbRvK2#MIFtA^IoU}LsaYwbmE%^aqUPB15QfHpYS919E@1jcKY=iPHn zF3i@t)PvJ&IXv-p(1+#MLV&@1p)}Xh(?8@58Y^vrv(9jA=ZKv~u9BrA3En6M`P#&v z`k!Hu<*yY^n5uBo;xTAJU%VI^DQ&ZIB$~r*jS|LJ~Fb=j+1qc z;NLDz8qWV#Bzaizj5bvO(D0d;E>EjwN1TO7TPom~NAJnsI2t#fef>APVWH62Kx76m zzc?%6Rd+M;oomd)wE49doeS>LIQyFQ3%>|Y?OuBXTg-KZq}H(`+}1|ZGwX|TPTqri za~c$nk?h!aoR@TEOIU&NfjXz*yfm@%_Zgqt})Lr098P$zg*D2WKu*O z$|0mT^-TCk>)_X0A?@d!u2_7ch79CIo2P!gH^ku^oHcY^IRqxC5N-OtCc=U{#l5na zk>%_Zc36eIHjFyQ6$Lradd|5gW5*d{b;v03p)@0gbT1sQrtO-yL(2sY-w)2jb^rD^ zItXzd>K$%7%TFK&AbrVOC0{6)d@6Rpt~!bfkfezG&{nHjpu5R`g?|<`P^(g*-fK2! z|II0QOX;b;egkmbZOVI9&y@`>WsKAa@sS?thXePshOQJzF5f2r4I8>Bv&i~-*0yw% z>KKPL>hbEaTGgI8ZTjC8ur88ud&c*^N}v-4A!8HbEw2r*8a9FKBeLSxyiNR9ngY^$ zRM~f*nGrCZs0A?Kl{cne=>-Oa12A3v*Jo)V>|{l9JZs+G3;_`cn2zexfKY8^9!C(= zm?16x^rJ&`1c%&|1uKM#NU-PMS${QroMwv#h4IF7$%ApU))DQnPgr1s4%}8$=pDD# zw!!}IRA*#M^?XgTld`5t{jh7N*#X1Wubad}^wwuEV=L+xCHuxG)~pi0oA>!uP99+N z4(3BMHa6@$1RrBxt{=)|oTS1FjE2NAQ`RjIcfP$B`z=%9P{~bhl`o&suMqu31c18# zWO1D~tk@9VqrqJq>&YQ%7frz;#y_NolMMw)oU_1^c!S+*?&Hh)94a`S2>~hb#mgTm z$L2bsl-W9$W7~BS2a@RF>6~^c+LxaoWn(g>P>kD?w2Ku9(5sWAn~i6FJlb^%H@Y8}r#At8;C}WOH5~Ku?>COw!313R zjZ;Hm;r0LI0(34c#Srg2V?^S1wqDZf-w{bG5Ru$wU=V%)wZchQEE&I7@ot0C#<;JU zierTd>_*-m7n!(3p3JKJJej#k8ni?CsIkQoAxERgY( z8~5Kjbw6yvu9JRGbrgGiyE?IZ-__Xf=YeL)$RN*-G)H>deTh9NLiTP-aeC0&3&fpyV ziaenA!IdIPH%k@C={q3(h^mHIqFgC{sXl^iq%pQQ%U1rho6{ zgQ35H;g_t#ScDNAuiEPjd!1=A54Tw4d= zv^X^=By~6)7)9(bR$hX0PU0mq0X#4OC{!-1-*@zaFB&majoI;y;{t=VpTfNtw{b4> zc#MuQljJ%u1X+Etbmh_|Z;Ga3vzC1K^)c;i6}CZM!m0`9x3+4p$6yH3J<20jj+Vt=QYH) zlA#bniJl4J7_*Esvci!gpPIVV&IYDG~7|?2K?u_0|3(b zavr$f47B`W&PjWX^PY#x6`{moHuAw^MM&`<#$6bgih2pk4--$!WRu$ZUVO^tn9WA( zH855l_t%#i#?yNiFaQ5jYQjV|3^*H=BtL~%@VB(~&>N&EuSIe|$z#a;j|dIel{8 zNv}@Hm?BMOUu;p@GF-bIWd~k^=-<&sp>M(Jz6}$l_tYj8=m*}gWY0Z7G!XN(j#r_V zBj32g)*X5vH>4wz!IM)?A&Wz0?w+2So@f7aZsT~4`nem86q~H9((_~J zPsl)*z#fcl(td3?ir>s2e$4$9(d4RSw*>yGVq2T$yQ1Hjou1bDV^p97#t(Cx2PKG_YDVWKV=_`ww4mg~xv zc1U?=q|}DQpedePU*zT6%?aX8$@x+iKR)#37HENR0W(P*F1*P%Z;!}A5D$fY$=7{g zHK;63!PW=dI>SkshkFNC+z2k5b!4_lJy?L5-<@1e*gwTNK0u371(qS2g2gbT%x3+r zeP8OmD=HE*gi@HbG9V}y^V~88`bW-c4K5(qyGI(Avl7>!1e7EMtb5FadabH`@^89? z8Yhm?>tN=0)N)oOYz6t8Wo9kG@naciThkz`zBmi{`)kjyz+#x@ULMYbBubu%lF0L2 zTdE)fZfV)xlF#{kcH8%G>sE1wb#L;FcGdX!K%r&(l zQJ`t3GBF^}_z)-N2kAc4|MJF~!bzgn&OYY z3$_aL;e5T}T#ameH_g)y?i6~S!HA99FQ=R4juIG9=?}>VMTcY&VfSIYOOj+UqK*?1 zUyvD(sn%~Ol$~jDletY7RgT$p%yypOT>mU<4Ow<(o3!0umdx_0F(6HLs)8))qU?HN z>j!S-WYA7}US#Q6e@RCacSsDaD}Q*RQ^Q?p)p8D1n05iPF%eBtktUz`5YDt1zyBj3 z+-v1$WQ^g{g^pi?%3mUzThJQqJQ1R&dynjH9v+-~$Jm$pNo*Vz4_gi7VF~CPZEQ@E zJOuf;^_`+I(?OMA6-5*0PEZ)OlpX)pgQuDWjtMeTzqY0-(Rz^jC{L){+HRb~>Dblr zlbE9`joaA9kzfys%1TDKO?PdQ`M%iHH>vH!W3G|XhpCS;E@?NmP!6x9k~<`kCzs(= zjs=U{)?0_2Il}Rujn)ONeKY;HXE07KXu9EFTYUMaS#_)1w5L9IfBN(FdNK}vNVqGO z=|^B7os)=N+3uvmjNc4ImtV?z@)xnDR-EUO;`yoaF$~g?gVZ@7JjXB)zTV9b#mw57 zkF>>-9$AOTzo@7v%Sh83>QwhJ=nl9r@@ndKUEeh!S2Xw9j5N&oN&2I1v}i&lY0^oO zadO<3n+->+Z=aR5Bc+e^!KLG2Q%~zN5H_W;TzOi(>D<}5e0-@fm+i#BEDdLEb;+h+ zc1Tiz$9hNyDoopbY3~;+*ri898~zlmq*+wcz?H|U&t(>=tDKmFN_;WhFuZPb##U(W zBf;^z`eZ<4BaVMg0g!3x_0!#@3UFqe4*tiyS>X$DSZQ6@bc&;xKxOsjIg-ej5o@(|K%1zD$3tV7)khfX^axTB@t<-ut8J0ts*?2FGv&2W{I3G6u+ z`6(|?#rE3yG`cSI45{;imsh(Sbny7^Y<(%sVQ)n3AY*}*%Viqy z7CGdY5jt3O^2{DKTCO}g@db8u8eeqS#-W?4W@LDM5+&yEkmhjwGx`>16BS|?HD|QX zGV&z==P>>*Jm5tAHU79$BiwCsYLYgrmCQKpL}gaxT*ZM;un7cZsG9w`!!Ygm4-1L$ z<<_jN4VtHN`oC&byyrOSE`NYw_Bl(@0{6APqr{)}XW;yh^8&#vMnQnT=QA;l4$v<6 z#*CoVTF(fWTzfX_|5p{s2)cN#WTHz7|N?7vMt^7eBr|JCFa-c+z#!u z?Ee+5G^GD8a-Fdc3gEFf*+L~;yH+uy-PO17xfpb%cR4Va4r8&s&|@)dOS_^s^ZxJE zl^Q}9&PhW47n}>G-4j{X^%z?BPi}#UY{;kx=HR(#+GS8Wa--4jEp`MV%HnJzz~VOP zS83Ds^-jHT+@sXgre^=PQKz^~RzLq1ACa<~PE#8UJNAL&7rZo@W1toGkpXHwfFR8aF?_UNMM!p6Dn%8(}liX+`DT?k8!c%;GD5wUtAh!%hR` z^J4*f3ZE}ll#lo0ioyQ6d)8f9)97b@R*!+cuUY=Eg&EkiZ|!if-w4IihJCNCY?HM< z+H*TSg(3pRk0oU#a6h{XEJZt*0h@n z{!^?T9O{4`FdScMpcy_M!r&apw%UsUzuB5cvi0Ts+6B}sGmDytsCmrs1S9|cPlju1 z748sNog*XIYtPNh4HWM--SJN@pny7cWE#zp-@(pp(0yrLpjYbTj750l2K;3V)_W#a zY_CthV{{^+AFI(TCbrQKWq+LAJMtx^vG{2A(Mb9-9sgpZ-b@Su!>+}InExM(*WI@T+Fkn& z?;*XF6polFoE`)pE4z7{#a2k8iD858!m#JCjZTqBm*1tbS5Uk&51iEXKZ9SXLV6-?xyX;EHQ1O)uT4gCJw&2F2lH1~J_Wo0^%HP+W zStK4$wTNw2ZLT%;2Rd}D*;;wkFlDKABt*qAep$qx26i)@+HP_9^pc|6*B_65HlQR& zMK*9#tn?k=q+~_xq%{`ZrN_2*(B)Ct$S&EP<-hYr;MAiOVONnRIyS=t_L}If>^Xw8 z#YlB&HWRsJlf5ptWQha0^dB{>O z;p~xmRAZGM0cQN2ka4jshm51Y%!xmG^`XJ|5AxcP$o4|BK&pIwQ>z-ubPe;L0wF%u z`!ixk`vwlj?W)0_&yYe{ec=Q(T2#e0~E;5gViW#pi9dfR7nGQ5Jt*EDAO1YA^z z_SrNFJlj)EDfMsk9<_p;SsnVt{`|sfwTN6TE)$hId||LTruqzJeS*>Qo4w#y;wI=h zmB8U#B05&$^BG}M;SS%Sp8HGt=n2Tro-gJrK=DACX+K0eRiJ!-3!Qu>ZO+t73Im7L zzyd^x_}C*4s*-NwrRCS`FE@?m{@dE z*7qf>dF2%}OwtU$e2dL@PgHKP-zBkG5HI@tqIr;Ud<3I%al1>8CGkEV=*RGcG41`LA%t9#wLt`maJUJt}0srd$)P_(1l{N zpIV`fux~@ka-z^e0k{ zG1f__pSK}G$9`fyM{?t9nKhNC6e;>$?BWJkWslpC6eXb^?*FOo<@3^Z6_7TwxvQ33 zO>Td)(G)@V#Pe~5Hhm6oh*7VyZ@sP8iZsYakXDV3Wy{&)0&SaB<9^g08Gg4I6&qqo zk4-Yq#DtZYJ}0Ag@NJpHpmlce(&3@*+ZWixhEkp}w0FnwikIr0;StP5aJ6L>zPbmt zple>~3A_l699ev4F+QXs<1vKZcRCU~dd8M=nIl=F7q&RO>xAw+$xJ$M;x93s%dMxc z?U7uRp_87^n?DvcXmrE~6rji0o}JF`^i2@{r9FJ{XwP971^{%*vV?O?Da~}=|FZ94 zM6_D4_;kf?NweJJyoyzW3S#B^L%QY;Z-GRYK0VCIqZ;Qftyz@IuKO7r>{OAp5?A?^ zl@nkK>hCDywhlX-J(XggIF=iaQ6FD*DAwAEw-a$>_`UAJ=deO8ARM!ie;7uS`xhog z{yWJ_opWn@PK#UH&3n%ArPR|2{|VPJ06by))H!K@aXS1zJ@FjCf#j+?rwv@1_Wp10 z0G?RZbIu%Kn6~?G@1O_hc;TEoKtHYj-`)W{VQc4HFhDo0_}|{a0MOy=TrxmAEr~Os zD`dXM%h|C{u9LND=@?lm#q!^TmfG}RHK_M|6;K*J_4GO|(OA+G{z?DofD8QM;#KL1 zap=>q)&a4eWErXT?SjfNUTKZ7KtA1(0)wiT-SzeL4E6Zg{}(Kzc?mE1-xVzRR9662 zRGVyA;7V9chBIL4_`e&L)UFl+g_zMORax6!SM&qrMZE=yaQI=?hypN>EhM{Q++y4vvzXvrq$C&6+poGR0-4zoI zLIM>=t!dy2d7c(*%&8G;)z0Bx&*t*;Hc*EjMUOi<0Zk++m_>4a+9-m>jw{C7I`_-9_gUaFpyC($17mL#rLdGOl^XZI;l(M9<4`WHCvhN`z zS;tZs+h9miDpDbYLH1?rvW}=^9|mJzvX6b=#`rytPUoEb-uLr)|ENEt=YF2+zLxK` z6Yg0E;xA^i9dR{BE?}~chd%DK9(|bg*u=0XS%ZIx{RIFcmyvMG)wf|eRp1M_VZ|n=m6&PHkADJxW-dG z#*TI2;_jOH$_-OCk>g+$&fRpywJsBP6CIhz^!H|uz`5GzW9(Vt6sLCD?MVZ6%8$m6RBt`R*Eld9I`K=h}Ox!HQB7kCDI;8Q-xm zWmUradKHn%Pql~s<)?G3!(j&sI`5c)Cf%ul%|P9+;F!XFHue)&A3nED@i`NAxL~)_ zU)Gnj2|2@gNvQSM04`Jj(VQ7%fwTI!{GX(6efg;Q!S%p;eh)P z?4FEn)1IbsVTk-9_i&gdf9vP5q{PuTj~wUF5!i#4!UPa zYbu-qpQ2WZ>nPq?J}?3C_c4y^|e1n0Jvvh7U55!WlazOe?*5WELtc z!uTNaLruTNKS#qfR{Y9N8VWv^&1+Ag-s)DnjvR4g5kNivRWR_v`gH1;Y0JSas z8qOKq^aJ4geLePW`+{b0Er1)r#J#6G&!Se2au*R1-nc-iptaTY<6gp{n zy)Vx)pOU)#sjV*3%=e_F5@$BcBA}51cc;L7$LVr{DKfAyjTun|ck^Z?_UliU#R)<& z>ao!Ei5REe-Hjn$wm{d{;$4T+X|7yI(mV3rj=h40{{n{cs9kED&JO1ky2Xw0GR~K^ z?v#t_4?DJiHy3{@1srzW1c)k8q$YUY=Kj+L?XyM+BY+MRc{EkA(oz7Z$n){H0}ii3 zDJ#_#9YO@)YfmolCUbV9*(kJql8PI}GF1L4zrEIt(fTsL*E?Wim zha~{WL!!B=;@1UgI}!9bQY&nu|FWoQEKYLJ!{S35cD)zgmt|NGyc#8ssw#5mbBlt; z%D6LG5`~zfNX#ap@?38>hEVdKh|e|tVu`pV^g4~on7cRO+A&^GMd#1iVWIOyulB&{ zpwR<7u^D<4VwV%FnxpG?K9Q3PXqdpcOM|{UbGXu+GNWuhPChi;mW?Xe&f-j7VI^SY zbjQz4%MvIcot^f(zPsB|aXO;wdJ&v#!ftQVU z{4Ru5H${ooX69EohtU36L93Ysn62P*iPt>oABlh_L~poVMMNCoocV4WI9CI9@4i{= zF!7Oy=9G-U#@CK7*@d~dS$A&y?0U_$x=4PO7f)?3`o_9U#<~m8QJv(JbUbBB`DpPA zZ682%3!_*C(Osp$?x2Pu&Kkh9I2oNDX%cM}W4wTK-pM%6ksMeg8J&lL1_sh_UaxZ- zKp5cZDU909s3;ScFLY*du)MflXw28?7i4qakA{v_>O@}@6k%uYWLs>DPtord1zJj- zj^b6xuE#KD?cN8kFxSLxoM_N=ujs$Xm>RO_C6}9w@qjsr- zIa~M9)_7!){~;r3g;+A6Ud+;p=gVfEiJ2HD{bdpe=EW&uz|EA{9bJFsc{{KZ12;=_@Wvjo_|UO?p~ z37mFzcD_bi?gn+8LVvd>< z6-L9aB?lKP$NLIdYJlS%ubzf9=)@~EyP<#c^gaOz&#c~FrfV!O- zV%WVf1RzVtIg7>X!f%B{)2-#xpvK=jsh_ z+2tQ+yNVt99@^BC0LUg$I2sMlp|j?3>ozyP*$NIp18&jwb7;hx2KW6(J(iJyEs8}6 z@8n;qx;ik@oG2h?QF*sK;Gzg9d1Q%lHI+QA*w(e%?3&%)3 ze&FvSE~P+q94tbF18DJcy#9sHfJm#gCKFhvo?bt5OkWZ=WLyk56cttX!Ie#nIiHss z1ck}+KCQIeu9|lp4IBufg|_(bJRZaTiYg5RJ(crf$GN*y`!oS_oIM{hL*EEV?Phr@t8q){39168OEd6MhRimzc6FbVc77Z4CR|1!rP@qTX7^dD0 zoU)Gh(I1YU<AdMJI-2=0Df24%xoAeugBOs(+;&g=zUHjnB*rzkXjYGimR9*YLP? zoagx?U21=^r0h*B^c19m_1Z5<*cEZ3Elu|}C$)w4?e8l_VKv7k{=gIWw+@}4$n`eu zxFkcF1NJ@~qHI1-5TMv*$Ol}Oz^Ibw7raa<-u>Py&E{5new0-7r`oQr);?oo5Ikh_ zJ;G}7yI>Yr$_y}kbVOumq_QVMZYCN_T7G%a)N49#+=CkGF$T3x zf9loTehybpWVQDQqu&eeJ6612Q>XFR%(v8WZNt3TtZ0;^4dM-HV{iM|K1qRxZuTtn zbtZ)cL2W|URuPP26`Ma_W~)SAGXIupRAd*Z_{OWKkwK*5{yTn+bvyfukZ>=90GqYR z?Te`&A0TJ*f^3H!2g(p?f+o|gh~2$Yw3}U{s-drC#qcN{4YQT|e;O^o<)x$$RQo}F zN7*m)A3==b&jmcLXE%2NRDZg&u83d?=WI$OJXxLVlgv7b_LpAjyrsJUI+~Rc*E8Ry ziDErhCL|twJNC9{zS-}q&`qoU z3%ldO6XaoYJ?Q~s>rlm`k($!Mt@1^HkgYR=mB=X)z=tE1^DnN~xDENZuUMGh_p=HV zF|FucUS1}3=-D<7T6el9%P)v8DhYam72zY{iZ8zIRasO*_NO@3@gSSz0Gs^{pj6zX z1}Q?BBlNnj{pd6m&so@q>4n38H0o)3f%S(lm7Kz>kdH5a|M(%g8h9UGqvTGC_iX~F zyi8uuP);FEd38S5ug4wP^;z#x*1HCVa@GOd(hK5Ul?b6L2v(b-SK!FpQzAqqD(XU( z=g?;z)0myK+S8n`G&@R9?O#ILWq(`WNfj6o*|D5POz0U%MQ)?(lzA9dC!g!nKDP>l z7x7mz-OQApF4Ev6ApkZ0f#!ql+NT%C`Fm>u8FoAF6k0AOO|=>$X2BBjE{vHxUO<*} z(H-zhf5j|{l9P9e8p8D%@$~w6;U!fo%E+eCtD)*V2w6Lijuk1KMeaecI{{L`<$zHm84XA2w<2Szr$ z*!-ZgdMW4jiu#@6<$Mact~DwRAqXa?%{qc;j@txMW<$_kL>nBRAHW`W%JDFkxNZAiq^Lr0TQ9h*8C=9V-71uQIY}N%GCGOXyG~Ukg!O)ytnO0@$wbU_ zebL6y;;YM{2;x&FU&O3ae*JkjaJMB`(zaj!7JeT94|;g(%{mwl=UVE*BSb5_TDbJKw0~~TncS~j&_0Wbpg}5Bd}<$Ziusj?*m8chEV*^`cId`LbIiuK z)oFZ?YP6W`6L+gg-@V-pH{eeUxvBlW`0iHtt-osGd0$-L)ki$duDj;IW{cMWpIyylQ`{Vk*~(MN8Nw1T54QaV<&0JyJA4*KQdJEpC9077Tq zY61ke@E5UnK~wrYl-J2o+OxON7TX#J+bQ2#nMBRD?83Y}XUE!V&W5qP_Sw4^x*@yD z-Lm@r9Oo(jKirV3%7CJZS~1D05guv#oiOna=D=xVjqD5)LMV%-#@=b@vs_cz5?lfN zD6rdy;p=#$S&q^~ENzNEq&M9_Ly#=6fxU2Bxys4~fR{7o6kpO)d<$LKF&D*bvRx)y*hBTRjd~hxY_E)NX!@qc zy3spm%CNS@m+x($_BeX8+_0b$lm7ndWRkLu&Hcc*HSVFdg80elC7!E2-*isa--+Ec ziZhGdA&!|1h1NT|Ym|HT&o7nMJ!JmV9`nrr_V^9L%7}*}>IgLdYF9fZy~XFwOF5XZ>4QY563=kumF+svVS~ z7T;ez;%yH82tyWsqdm*&d6jnmCiL0-Z;;V0vgbW*>OCt1$Ud#usinfYb3E3bv$Jho zO5B5u$2lM7M#OW3Qh8%PJzl(uXr`Bu^kp6w|6%Ugn^ERf^dwHNac-(-VST4j@jT}Z z{uOW z-TVAT@7cS{4}XP{j1*95yK|B+l;wv+Y%9WyN}lg-!rsRZBYF-5o%F$|ilE>3i^&4j z-~N&NSFBQi50eF;AoKK*8!yG`+q0a8suHq`;Dq91XK#L>f$VRnortpT1@IeOFGFaz z6)rr2>7)b~*#HPh6w$u`NS*}XSU>VL=QWZZuG*O|P-2q)3U=Ay{UCDyChj&WapcxN zcVYHk!!ObJ@rW`y=s;G238J$1EdP|_SK*_#L=^sMzkX8++1=S-Zd^2Texc7Ik*Sv% z(HtdO2Z*T!w~U)uB|C`1=`r*tZR<54u#9&cmP+pM7C*X93IMMnC>H`}tF-9c-m$23skDuBzRP%l#b-*tl@d@9aOy zl;*I_Gjf-)Q>Cg(2OY*ja>(0d`EI4xnkt6!Zti`5wGWrS6x#0r;H;!+mIO){AVP2e z(C32-YJ2toZ;dXK(nbR1s%WwYcmXfm)CjyVFIOpLLcBbx%4fNrzww^D=kN0Md__Nr z15M-aUs6y}Gz3P)u%1_t{)c9C5OKSX-0Nq;iZ4P_Zo%#rSg9GiG>fZYsBXd7hn#R| ze{uWn%bq?af?=COm4%on@{-GYf^=DxJ~K|v|JSEUFyPz{WQmr+Y~PlYOXMo#J@_8s z+Mrbnsk;6XWxKOJ2d;S%>70ZC0JPTU&RXKVBmd1w{r@Soe_B?j4_yEehXBUUYCa=C zF8HEO%Kkju=;`t^8YWm@pFYsV7}IU}&m5A5d@60thrIt)frM6z zk?2a*h=14=2a_4&5HYoP?|-a(&exgeKa%UuO6hhW$K9X?NXz)m=GWTP-C*s6zBpwz z4ceOL%7dqGAA0Z1m2~A>s({UT;!cD8a+|{eV|joK83OvtVX(q;9RSrqq;rw?-pcY= zf~!K|9cf|NfCu3=8S8%Y+kYow{7@9OIRD|P;me$E4FxKm&nE~L9(;F1ClShKZuCL$~((b1$JS$^5Dx?gs-XC8(~mX%}G6rxkL8J{uB8uQehY4dgjENcztHfPUN6rQrZ( zqnGT$v*8A&FM_W@k?XT>mi-k{=v-&J+b#h<^rFDawj|}gi5MqSn^TX!9;=@Kko-nq z7dXHD-CAN3;7Wiqs>KGJLSgH<={l)5gCcH&E6p{Xz=iaoa@#ghqto>2QX@|xb3NdQ zZ@`!q0MeM8X=>ZRE^PD=-2buXE07rk`0A11y7uDxU!LTbQ4{t}^pC&CFZ`E|^B^7F zogMd!3vvbMb#xFw}k>!GA#u08C-9b0$4#YTNbDUIAg&2H+W`<_yID)luAn`+R??TOGIi)Agwm8NgPla3}>a6`7%S#XInI z01Uk^pkiPU+n#a!n}+=ELx86FTuv2j0OxT)*VbBbfMb1Bk8T=(%4&NR1Hk2u#3up% zRx}NR7`#geaOXxhhEU9NCnX*4*#3^EAg4}Q7Z!U{77Q&?caaNMaXV<>EL zzr($<8e9ew1n7dRt)5`xeMtIoo!Czqj}|I7daM1Z9O8Y}^SB&8pLTtdKI+`?{-U`= z5%GdAX{qjVt%BDj2SR1q};EGw89o=tptNuasWS$JQ*o7mBa1GbJ0 ztUIGuFe`GZ$AjV&ZZ_;s%X7H#St?SSTL)}X_x!99d1<{#wDqpKdPw@{(i4VDhhr1# z>Emwy#bQ2zwNe2u#q$e?_8sEJ27mHi_ZT|gYhiT}*+7Y`tfNUr9&)=#n)MvvHsR5+{I)H&+ z4jC;eP%->Obh>ro;Y>frjp!7|1@L(n{o=UotcX|^Y)WnD!hKULLsrIRpB zHz$bEG)*wLWb?>xdFg|wwfc$6=t+FR_t1+NHul6B8_Q>sgC1w4GP9vPp@7G7Y1VG> z=8wf+f!%s)57`4cb${5;jWkTd##qna#vI*#_&RqDs35{xKdDcGjcXmpFymWE4aBdG z9cfzKvEp$351qVj+H!>r)nJH!ZHByZu}OqCHh#}crO}fwnz7!kuQR>fFW-MV+eY(5NJTYN&ET<G#C^M(5f!LJ| zCyuHA#ZufX(f0wGp_iKW8F093M#2q!O*5I(0_5-gkk6^ww%gep4OJ6lvRPxQ>>34^ zz)Z%YhSmZhapqGs2ur!XADWQq6~4~UV3FKJVA z?ybrtI@{GNE)%NwV5*GFjqIhz%XGMo~6V4WK4 zmVe2l>?v-UY~%>`&|huN4~+-+CFLHfqJdmb@MrW&@qmqs-%_w;1>x)uJ2w9}7Xz6G zEQlTH>i|Cn8L+rc;l7A@Jn$6Bo@|!}>&@Om64+?yS;rRA@bdCpEZO=;uU_Qc9yIu* zb}`bNV?UlTN^Qe;z!$jz`XY&A2H$p;n|{NJ^h3eKO+tWO4+${%oguLGyO}2C#lgX^ z#k=m-x|$#!D2I32W-*N;2quyO^wZ#0xOP|WPS7@c=qc=Ouc-;rJPkfa!U-NOl&!kf z*fmplHbm;$?Zbd?@+x8oyD^9q=81khRN=W|X@$-7m1TKxy}L7*_H@BpUf^Jbmo|Lg zz$&5$FYB;|L& z$0jDC_31QAq2G(dD(6ejEY&j0KgD~kP94+s$tsXE9o5GWCg9!K; z=M;5(g<&-oY%N2D?$?Z=^XV7w9kk0}ZZ^2UtaH9;<;-uXKHlxp3adSyUMv0Z0k6@7 z&lE1f4cvl!CeO7P5ndwxI~IVP%@w|zTU}`HovI%D^IJ;DV{R}rkbkdWq3CUOJc=A8 zq%$#JzM%hLsl}5`%m!C2_R=JiB1?4=o0Dv~2=;-lEey%K=4J{72QbS?HJry6w955a zHAjc{hwdAP_l)3t4c>Ne>CdOK(5vZ~LmrzWL3$Ocp9YmMiZ+CtSWrpSmwA1Aa^x*_ z-Yc5hU)>lUiZ_}$w$U>z1$dpi=8f`PCXxsgK{k4U*R-Iu^E8i0=yEi5)k=#DSl;pg3>Je4L2x6C zVJsA(8rurk9b?_j!Y6(aT~2+)*=y7IIxt^ezT6-<2cUBX(Op14auPFi$^rB%;WQ{K z1K`d%aFHH3SxDh&aO2hzfP|ikf-}0beJWPlRn`Hs)(t>#xL4_qkB`5f z%+TiRSSOgF2E^Ws00y)eK)7GPNk=cCWIaPc?$!B$J|2%@${k`RX0~Fbg`pK~vDEEY zKBpSH14xu;^Csa6qA3*Ih~vFnpDW=1N=)Hw*afN02LQy^T6;9NP_=VuOh=yO#Zxe_ zF|yTh6BeU?4X1GUB)If0J@vhf*-)N<>7y^ycMk6p?T%n|z=5fFx}N}#NkAK=S0>r| zyAUc|9ql+!mcq0Ft`e*+0FXhA7~YtB9<6aOHSS?>nH9hl=JiaE^h`fLGI!ns7_C@GUD`5AvvT}(SGI8<@B<#`SNYvl z{G)AfzZkFgqT-3qXuTt4uG1_u0w2AI>0nyu8FVQWKoo*UT)Q9DGJ^G*jIE2n-`_I3 zKR+H-HMNfOOmP6dH9>T*Q3NZbsVu|Ujix+CTn#m?#g#Y>UH&lq^|*#uWun4O;2J7z zC9o|oKnGJI8w#TT=w+9QrWZ_Xw~8RO0DQDr!0uH|_lW%f?y4#mxK!CAUKcb=pUQAn zBxJ-mmZh^m{#RKQ05SBq8N#vU-EUbPXVs*wiUTdCHp{gD$nx^CYV2YH`c0^SUPd=q zz?8xD?bS)qEYFpR#*b~e=1N>LZub6V0N>{80ifH^Aa=41L9g;I9RE-ZZaUeCF+)Wq z5swh^(rQiE*1Ii2A#-hyg?r*}v3^8g$~ccCjCxi2Ya?ds`f{K~jKkPHvWhA2eNn|< zXtG=v!(IX#v+KR}tsAGOJ2MUZ-QZiO%A1N*{MV>|dHn*}6wC*<8ffN$ z@#edGdgJr5{J&XEo3iTl{>GokT#@zsDqiWblwXbl}lP(?}561LHFlXbxYd;G?Q~+Awe^j*0T% zfB7G#qQ0R6F6hTor-Z8|{?-S2Awk-UR3ASO&wXuu1yCGY)Aj3-&PPfyL%Io-E- zZ>Og-PpiXbx~`B{|Y2QaXaQh7Nz;+ZLpVNPJs0%j@=U%Bd2|V0R?7d$^Z4u6_$LGB* zultrUvhCXii}my>MzX2Rmek5K+|f2~hiq8&1ePJywiP&}6PEut6L^MAi#!B<593Ws zsv@&FlpRhsEwPb0JQ?as+UC8mgRu`#zNvTi3-EMzd&B+{{W{rrBX_fk=YkEp(F?aC z0ZI3@IOIALym6Y-<@e_MDEu&!0cR8EYw_YU;p|Cg676qGM~smt&D>CMm4x15Q3)YApGN#@>dI~6G4X+t_54ptA_GiwMhqv0pF6`82=uyfM z)k`Y7<(>Pc8xcX3;0C61rfcRN8}Wd^H(l>DaO+jU*YD#GjZx%g2F`iB*KkHx%4R)K z!fFKcUdn153IUh)4iDRFRzES0+pMVd59|Fl=h$JOTo{KP#yeanPmI-eyUmq?l_kuK zf}p>Alsb$eK_~Q=nM}hohjUm$m`5y1`djC7w1MOaj7TKv$Lrk~$&c=B15qs2PI{Tn zwL@mkwNJl+73MUaqTF03Gru5YXln>Qw}GQZt7gdF)o%Ax(YRkKlo}-?!He}{U8U0Y zbPY0yV)UUe)4xrGZWK~2Ys0}7^_)nr?Mu@54x}w_QK=5(YMRs(Nhc6_5)iSHxM{sP z$)f19qI=f3I&{AY+BT=T<2LPY`*RESW?gQ5>o08zu-5kpf4Zc4Q>i{ZldtJjCg>OK zGl;{!Gk)2!ve0`+2Tf88B}V8=Aqa-tm8M7IWTwD++nMXcE``k*(FTzt&-ckNIq!iJrbEz$t zPkFIOdQ1Q+S<%z<$t-!#@bg0dy>JA5!Oa_^O43L}te>P&k4m#qTlRQcB#OXo9Zb(i zGK-}-T?6M`sEJE5m+TaeDiVjK=ntbh&c2kb79Rt_y^1Q_T$478q(fU>B9>PR5-ZoM zK}$)cKSl09Q*Gjo(z9OW)*yE@;+Dqd+Saephf(f3wMgyW7gZkmFq_;ZPrK>g4NkSw zbI`9*CmhkM788vEEahnQm3rqy-VR!NIW+3c(YwcUR&@G+V^0BwaRIPTjD)7wbR@@D@F4B}{ zj0v3u#0U)!AU`S;g0Z&J=@il$WMHLf)WTIpPy z(X+kp^PpY7g3NT3h8QdOJP**bPon5G*w+f1W)}2t3SzuN+N@cK9%} z&Uot1@F}So$N0x#;~}Myn4$u)xb%qMw{!LFSroxVF~K!JbL0 zRKyfdU#U{AMdqm2*~mQoTk3ly;WfC%+?Tx5+RN_;s@KXEa$7ElzP7&`Y-{A5Cgen^ z>6PcBMqFBu8^%%QoZ!29WQZ?3R1!%vRmsc17Z14y8A7*u4kk)q!W%kD2SOzVOh{yE zKHJ@kigiW6d!+S&-M9sF737C7wIxuq#F_J z{XF@?-=MlTB9h;hV>fSbS)&<}(;yljgAv?vh&|L|>!AeBZHO z0l}AOfj<0_@5>FZQIf(|W?H)Fm~pO;BcQJc%-NBO85(iU{u+03uSzi52>VkMrLV(C zFR<8=*w#{smn;~LszxXxB-HlBb`9lm(Z#K#h(F_lkAYDd#lbm-YZ1RUSS6N-hi>0m zlOUhFGAQ14IEl4wL|u3P+OeXwo#ri99tHO~z*i!tdYEz1yOKBz z&*Qi{;%Q?>@Ca&ieDyN9Z|x*g9=^?)c*z#U8d(dt;9gk{B8;X2GV9c?Mwa(x7sUsJ zz~9a`f5f)Q;pO&2xw=rWx z-TcM)_u%f+dSr%$%FzNZ8%#skxVt_~fi8wSLNXdU&(ItrfEnkYA8Ld@o@@wct)2B2 zE0_Gl$MLDXFWYfT+Udhg-W`$8ZnuLL-6QU@XH+vb+sC{xkrFy@yp4RE#bHvl+GzqD zw7G-Prb@(Pr)1pIKz^`%k`%qi2qqp{On6- z@E_nKjhC?RMU8P#jHd`;{Ke+0)dSSO%x%|l0;F~?Os3+M6ys0oVVnAsT1@?-+|?CJ zJ>l?-L4V_GT7M~e51lWoPxQ@YMBGwxt_QY z>g5fJ9I2O?Yq-nB8Vsu4V~dyucK&LzE#LEwpv=TA%auww?&}ANZ&F)cP%KUu~RLdsRmXS8L9x5kAU=&>;gdt7>=m}*BbE1ajmuWDE zzVV!KLD#}5fLb~mhu1QOMU3ku$1M10&Xr9s%9S!$+rk8=LUD<6E%jlYUS7?kXUoTrsXeyfT_5aqjiI=PdfrYBDc% zA{z{^jOpA}QYY#pasLVp_yw=WD=`|6;#oQ!dCJ-sx!Q`+47TMKhfwFZu@cU+oPVpc z#${6%&NjX}KpFo`-etG2$xqi|tfh`i5+rV6 zR#P8t&MsengjPn)hzDPo(^~X6kD%&U-m1SJ#g8PZ%ji#(mW>I?N2zMEeyvOVtxNqk z5Bg+DO6J#-LIEAzH{v^*Ei7ZOcC}XZ>C~|S8gyWj)HGdb>U!3&Hwd)_prRw)`$vUV zskTd}=d~ZGO!?>GVt?Lm zHsi7_k~h1%{tYeGvIzAQH%f8b?K9Y#Of)hk5ncv#_O(09#~yJw8lCuE1$&lw>4O1! z-XS4~!|lfj@^qu_zB+@QPd`!wvUQ?Fc3tJqW}GTVHzTc*seq7%G0#GaPrDEH&xec7 zsX3AAgAdoui9@%wB`y$6x9f;4kEtn3k`P&ttHL=o!T~IkmFCSNw8Tm5Np1ahUcn;D zq1D7iV%Y5WJQk*iDFIuD1B}4nf{7{)(!~kmN^zWUCEnjebkyQAL(pl07WMDb7C$We zbHlnvN7|15L?g$KQy~i!V^&Y96Zz8QR}QvbR)~FX4KoT_@N{tXNhYEEQFBo_F8?R+ z*v_R8opztx%kf>1wdFSb6;x{i?Wr@-|3O%GFR1Ew6ZuLEN5rWv&ZcY7cK;EB_q%Qm zLbrx6dePoXL?eklt_8rFuRq4qJNbnfRSf=zsLi+~7+uEMwawh*;-_W%{4s;s_jPI* zku!av4Dxf`j(l^ymS_ep>Qa_#{lhe5`cxI!OZbzmat}>;_r^3mZLS%9ei@=$$AUme zEWbe_9Nz0M5^Ln-hzaw=Wn+6)HZu(e)m9Z+SwF|MYF?$EC@@8T;;!wE$F}WNPt{(; zD(nA8kQZK@L1>M9o-^IC}f&9GQa_zA4va8(QV-)kRL@Do-sih+q@=1f)&1Zo z#ERIKC&vTP3CA`;m7>JS7K;nGo7V{u1acQinOGaWq%^=ErOR%29DAGWA4U0dT+O;~ zo5idR7Emw1Pk>4}zW>oUCHo9aLuQlHb@G~WA}qi+;_U4tCqKUcj(v-(6*%ETBP7lw z&n8-DTnnTs zLccz61~QOTl#w(JdLJnM&^q)9_;BCkO?popS8=hSXj3t1xKHoCl8wjr`@^OuuZuIm zt&%zhgAgl zIW01?7PKpVf1M{%jC)W><;|~cBls;RTxa8;1A;F0hN(0fhzatM6fSKFJE_LY1Jl~+ z?SrE>xY%XB?^ZrbW4T6!fs0nbQ~-&g$o46gYXC9C>2u~f(szX?+X57WEfNxPS&)63 z=%0J#8hEMNas*1|hCYckG}e1>H1|!dl7EgM&4^}$Ssib+RNpb5!ze=^pts9*$w?QT zY8FKXsBI-?F;}w7wJ=|6kRUxW%JA3M#thj>OTjw&X7GM3^CKY2$jfJk29uXHo1z7q z9rw8fq7I7eNP5fS9qc{N^*=(Q;V{_LQmysmgCAGiD7Kj4WiMIK^n{$}o-*Ai&QJqn z%YW`E$u)}-Njw`x0q8leSUOmaUfByismK=i%cgNp*2H?`Kl=%yNm7d6TELwZ1DQQ7G)AOV<%Q~*Gc^iY~4n2h27YX zui9$Dzs5_0+$#rYKKkfA!Wpt@kue0M-1*LJ?ouEr^k_uWM9e;Mnk0VCkod(Ks)-oq zoV1_tz62^KF6^8$$_(lFjJQR0)SjS}Hpxeja z?q+<5iB)ZDfu-0YliU!S{n7Gv83ab(rdF%_ar^JD-A2Bb zeYHm*Re--5Y#LUk$A_XtBzSO1<@4=gqDN%BSo`QY8{FVN+M|OLz_dyZD$w54h3pK2UU&US=QNL#BHI% zPk|8=>7>OnmrfyS?A>nt^9*=bRGN6(jT|_AhOrLDl0@~tuUT82wBAk0; zloC@-(HStxamRv+`H03%28Tg-@-dp651E^7@@JO;qeeojNzuA;F$wKmjbCV07vfne zDgU6muBIgZCwhKU0)lPaZL4cBB`a54>v??(zFuM5M%^u(as@cVzRDn$2~C;H?6H?r zNo$C%^Bs$%@H~d*$;FxaMZY|6#GU0#x;p14WuCcRw2^f1RV{lb6W=&#d%UIZmhIUSoRT^J^sLgQCz z=^Q>;ITLpw2g@$*f=v_*eYv@yZv^?&c7tX(wzQl_24zhOL9C72&4m?jPc*F87WSDn zXWy6uHwka9Gz;Bw1LQ%4nXM%j7pQR%qm`kpW;ESAU?iP4?$~$YQ7dYk3w|(uBD^{x z`ZnDiw=I~K7n?4EkPnr)IYV6&q!Kh#4kEEN9guR3d&g%a`4g-V8?df5#e=;lRxM?i zXV#ump6ellYZItN?YmZ_LFC2SG+(X!BrmPp_&_-!8k{Di3jZt><&;FyV2Jm};WX3) z0Rw+72-2%+ zvl=cntzj7nmtpH%N%;29#BpmDt71h8v9VGfhQPe=N^OlEo6D@hdiG-^e-?_+B@9{R z1mbZ)O*Q2vgDvl;h z!%~)1ASZ!0p*>RL#s2|=CwrUp_t4%?{u-5e@&wFu8+^&M70@ADUU(gsP#$*pWXgOn z!S(=R8;b7hNIyz;)uN%Hjhcf#U}=s%(vj4cdgf9>o&gUh0$u_i=QOf+t7C99FukCn z1fHaf-dIU*3JNH z^V%f9S80XyUq*Fe-g{2;8yRn0)nu7{J#ZGvQykqo)~8xwiX3x?VnAY*o<^+-MM91{ z#wL{qm&_QliIB7}HZyyK9&`El>&R;)88MV;c=(sDk0^ zm`hDMm$1o0V&3}tz*qvzI97!kQsol9+Zsg&8~-3y=uNg2$hvA;n?W<9^8kj|X>x+O zIXYvKGAB@C*Ehxonxt>aHOV6IMz2H(64Y3lXW_R6ldHsk$(mb?R3gjk1IM7jEYV_IV z%4W$oDyyKX85KWt0U=!faMPyHHKOw_)qMebeT7&&^qydVywq?w=fedmC$_ zsc-Gfvddj1Sdz-VzB{K2M(6iI$%;zfdbXi!C29e%m&K^ia46N-xH-^N3P}5P@i;1F zn$ut77G*9@-x~{2obUp1zg|WaY~njE3AVUHHe5s!4@#K%V{Q}L34eKdJyuk(3;z5K zgKwOt7w|IwGQ}5^%@QBcPs@5RLaPp2##pzQ!%fC8kS0D3+4@o;6A^)1 z5^TXSPcIv@uYZ^jG-c_q$84d;XNR|82UV{jVA#$k4Zxc*l~s22D>8Nf6ESucyUj3y z%1D+d+-!oXw9nNEAs)6<9i{Ck7?_!*ghEE@1RX3i!xA@+csvO$Xo#j8cdf0W*qETr zv8KgKn#s8I^Xcrg(eY=XkKfVuQQN6Nvv^k)=hDor^W#m1zy@NO_H^rW4R8T%Y5#Cz zWc1~OeO~PB@jxxu;L&vgmYtbwusb?G=&)d5`LHkj)TMD#gbN2zPC8}1TTQ!#6}PyW z_a1p)(^fVc6E0J-%FY+h(_X(vU?sNSNIC!T+_7E8&ppW9fc{=Kh_&F$6#iq|Tao0J zJYa**bl9ei!E;ZmGf<=yY}nhTJ)Gq@esN z7`QZ3+%If?mpa}$PcYP-dG@UVe{wx|R(^^=X1!?kI|=u#vcGc;ZyH#Bs5uF;FKbm{ zzp5)G;N0-gH*Grvw=ej87X#LC#yH-IVigLP;Y^K1Kn=oQk*~IFpFq@Ml#&y_Q@gfB zwGkjm25pDxPS-20>H13#S3U#xK2;?aKP~!rxX-`@ObL4A59-?wwv1m8b}w7(Mg|)W zsXnnH+5+F6jU!U{3?LT&CVrD@qcr4f zVI#-_5^2i6vN$;XrRLF1+P11ho}UA3?gs5+YV%af{A8p?IAeX)%yXis6#x0*jux&$ z8^LyY@Z{dj-Vj>1bn)brVFW(j7O9)l@+-^R(;Dh)65WNdXFrkO)L)Mr3JvV+zx28GQU87YqSu-^VQJe^u>1i^-lVq z-nP!Z+oYc)_4y|LtVaRRk04<2&<9L5#j} zSl`;~N+y1wwsem~8D{hk+eKnRYoBn~Rb<)sq}sX8KjBN%W{q6uu`f;)owpp1u()&U)MY z2(6~~1SDm4i~0Eb!<^>j4T`%i{sc%y-GpQ;x;t_TF7I`^U*<=9KTqT-OkteqdY{qB zf>}gTU;X2ihzUd-4}UioNT=Oc|LPnJl(4X^B^Ceib^y@7AX)T1Ui6bC%JwNj^X@|fQ+x_w-O%!-dEfx5ipVGlV9CqRjPQVPKlqnE!Ye!g3JMB9^`nm-;BOo5OIuG0=-^`R z;9{iV>1gh3z~*6ZR}-)Jv5NycSf!nu8u)1=5mB99)kJ4WI7OT?Hc5)*a$Isb%|7C%VFA7Jo)nOV7At2(#KXG4Jt2G z#<+b-MSzr^l}hKKS4#4xW<@sMvU>J#nDabB`gH&mh&56++dDG4$zoHzla_ZMCtj z!Q|O-$U(b!%+*b=CxRZ{Ay1%Ba6h!T+J(M4JXi_>Wn_5~P~6 z-~a%5M8Jz#;NbB9|7RGmzh)pW0svq}3jn0RVvY5B8R%|DU~! zr=9t~DnBu$WDa@<02B}XH+M(MzrbcdQ`i5H|2N&!iX#l=FC%yHqL}O-x_PAjf*U!R z+c~rUT?pHM&iuCxSgl5>D_$fpy^I9PF_2d;z5fT= CjT;{T literal 0 HcmV?d00001 diff --git a/crates/account-abstraction-core/core/src/lib.rs b/crates/account-abstraction-core/core/src/lib.rs index fe08aa7..b3aa2f7 100644 --- a/crates/account-abstraction-core/core/src/lib.rs +++ b/crates/account-abstraction-core/core/src/lib.rs @@ -3,3 +3,4 @@ pub mod entrypoints; pub mod types; pub use account_abstraction_service::{AccountAbstractionService, AccountAbstractionServiceImpl}; pub use types::{SendUserOperationResponse, VersionedUserOperation}; +pub mod mempool; diff --git a/crates/account-abstraction-core/core/src/mempool.rs b/crates/account-abstraction-core/core/src/mempool.rs new file mode 100644 index 0000000..3cc274f --- /dev/null +++ b/crates/account-abstraction-core/core/src/mempool.rs @@ -0,0 +1,403 @@ +use crate::types::{PoolOperation, UserOpHash}; +use std::collections::{BTreeSet, HashMap}; +use std::sync::Arc; +use std::sync::atomic::AtomicU64; +use std::sync::atomic::Ordering; + +pub struct PoolConfig { + minimum_max_fee_per_gas: u128, +} + +#[derive(Eq, PartialEq, Clone, Debug)] +pub struct OrderedPoolOperation { + pub pool_operation: PoolOperation, + pub submission_id: u64, + pub priority_order: u64, +} + +impl Ord for OrderedPoolOperation { + /// TODO: There can be invalid opperations, where base fee, + expected gas price + /// is greater that the maximum gas, in that case we don't include it in the mempool as such mempool changes. + fn cmp(&self, other: &Self) -> std::cmp::Ordering { + other + .pool_operation + .operation + .max_priority_fee_per_gas() + .cmp(&self.pool_operation.operation.max_priority_fee_per_gas()) + .then_with(|| self.submission_id.cmp(&other.submission_id)) + } +} + +impl PartialOrd for OrderedPoolOperation { + fn partial_cmp(&self, other: &Self) -> Option { + Some(self.cmp(other)) + } +} + +impl OrderedPoolOperation { + pub fn create_from_pool_operation(operation: &PoolOperation, submission_id: u64) -> Self { + Self { + pool_operation: operation.clone(), + priority_order: submission_id, + submission_id, + } + } +} + +pub trait Mempool { + fn add_operation( + &mut self, + operation: &PoolOperation, + ) -> Result, anyhow::Error>; + fn get_top_operations(&self, n: usize) -> impl Iterator>; + fn remove_operation( + &mut self, + operation_hash: &UserOpHash, + ) -> Result, anyhow::Error>; +} + +pub struct MempoolImpl { + config: PoolConfig, + best: BTreeSet, + hash_to_operation: HashMap, + submission_id_counter: AtomicU64, +} + +impl Mempool for MempoolImpl { + fn add_operation( + &mut self, + operation: &PoolOperation, + ) -> Result, anyhow::Error> { + if operation.operation.max_fee_per_gas() < self.config.minimum_max_fee_per_gas { + return Err(anyhow::anyhow!( + "Gas price is below the minimum required PVG gas" + )); + } + let ordered_operation_result = self.handle_add_operation(operation)?; + Ok(ordered_operation_result) + } + + fn get_top_operations(&self, n: usize) -> impl Iterator> { + self.best + .iter() + .take(n) + .map(|o| Arc::new(o.pool_operation.clone())) + } + + fn remove_operation( + &mut self, + operation_hash: &UserOpHash, + ) -> Result, anyhow::Error> { + if let Some(ordered_operation) = self.hash_to_operation.remove(operation_hash) { + self.best.remove(&ordered_operation); + Ok(Some(ordered_operation.pool_operation)) + } else { + Ok(None) + } + } +} + +impl MempoolImpl { + fn handle_add_operation( + &mut self, + operation: &PoolOperation, + ) -> Result, anyhow::Error> { + if let Some(old_ordered_operation) = self.hash_to_operation.get(&operation.hash) { + if operation.should_replace(&old_ordered_operation.pool_operation) { + self.best.remove(old_ordered_operation); + self.hash_to_operation.remove(&operation.hash); + } else { + return Ok(None); + } + } + + let order = self.get_next_order_id(); + let ordered_operation = OrderedPoolOperation::create_from_pool_operation(operation, order); + + self.best.insert(ordered_operation.clone()); + self.hash_to_operation + .insert(operation.hash, ordered_operation.clone()); + Ok(Some(ordered_operation)) + } + + fn get_next_order_id(&self) -> u64 { + self.submission_id_counter.fetch_add(1, Ordering::SeqCst) + } + + pub fn new(config: PoolConfig) -> Self { + Self { + config, + best: BTreeSet::new(), + hash_to_operation: HashMap::new(), + submission_id_counter: AtomicU64::new(0), + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::types::VersionedUserOperation; + use alloy_primitives::{Address, FixedBytes, Uint}; + use alloy_rpc_types::erc4337; + fn create_test_user_operation(max_priority_fee_per_gas: u128) -> VersionedUserOperation { + VersionedUserOperation::UserOperation(erc4337::UserOperation { + sender: Address::ZERO, + nonce: Uint::from(0), + init_code: Default::default(), + call_data: Default::default(), + call_gas_limit: Uint::from(100000), + verification_gas_limit: Uint::from(100000), + pre_verification_gas: Uint::from(21000), + max_fee_per_gas: Uint::from(max_priority_fee_per_gas), + max_priority_fee_per_gas: Uint::from(max_priority_fee_per_gas), + paymaster_and_data: Default::default(), + signature: Default::default(), + }) + } + + fn create_pool_operation(max_priority_fee_per_gas: u128, hash: UserOpHash) -> PoolOperation { + PoolOperation { + operation: create_test_user_operation(max_priority_fee_per_gas), + hash, + } + } + + fn create_test_mempool(minimum_required_pvg_gas: u128) -> MempoolImpl { + MempoolImpl::new(PoolConfig { + minimum_max_fee_per_gas: minimum_required_pvg_gas, + }) + } + + // Tests successfully adding a valid operation to the mempool + #[test] + fn test_add_operation_success() { + let mut mempool = create_test_mempool(1000); + let hash = FixedBytes::from([1u8; 32]); + let operation = create_pool_operation(2000, hash); + + let result = mempool.add_operation(&operation); + + assert!(result.is_ok()); + let ordered_op = result.unwrap(); + assert!(ordered_op.is_some()); + let ordered_op = ordered_op.unwrap(); + assert_eq!(ordered_op.pool_operation.hash, hash); + assert_eq!( + ordered_op.pool_operation.operation.max_fee_per_gas(), + Uint::from(2000) + ); + } + + // Tests adding an operation with a gas price below the minimum required PVG gas + #[test] + fn test_add_operation_below_minimum_gas() { + let mut mempool = create_test_mempool(2000); + let hash = FixedBytes::from([1u8; 32]); + let operation = create_pool_operation(1000, hash); + + let result = mempool.add_operation(&operation); + + assert!(result.is_err()); + assert!( + result + .unwrap_err() + .to_string() + .contains("Gas price is below the minimum required PVG gas") + ); + } + + // Tests adding an operation with the same hash but higher gas price + #[test] + fn test_add_operation_duplicate_hash_higher_gas() { + let mut mempool = create_test_mempool(1000); + let hash = FixedBytes::from([1u8; 32]); + + let operation1 = create_pool_operation(2000, hash); + let result1 = mempool.add_operation(&operation1); + assert!(result1.is_ok()); + assert!(result1.unwrap().is_some()); + + let operation2 = create_pool_operation(3000, hash); + let result2 = mempool.add_operation(&operation2); + assert!(result2.is_ok()); + assert!(result2.unwrap().is_some()); + } + + // Tests adding an operation with the same hash but lower gas price + #[test] + fn test_add_operation_duplicate_hash_lower_gas() { + let mut mempool = create_test_mempool(1000); + let hash = FixedBytes::from([1u8; 32]); + + let operation1 = create_pool_operation(3000, hash); + let result1 = mempool.add_operation(&operation1); + assert!(result1.is_ok()); + assert!(result1.unwrap().is_some()); + + let operation2 = create_pool_operation(2000, hash); + let result2 = mempool.add_operation(&operation2); + assert!(result2.is_ok()); + assert!(result2.unwrap().is_none()); + } + + // Tests adding an operation with the same hash and equal gas price + #[test] + fn test_add_operation_duplicate_hash_equal_gas() { + let mut mempool = create_test_mempool(1000); + let hash = FixedBytes::from([1u8; 32]); + + let operation1 = create_pool_operation(2000, hash); + let result1 = mempool.add_operation(&operation1); + assert!(result1.is_ok()); + assert!(result1.unwrap().is_some()); + + let operation2 = create_pool_operation(2000, hash); + let result2 = mempool.add_operation(&operation2); + assert!(result2.is_ok()); + assert!(result2.unwrap().is_none()); + } + + // Tests adding multiple operations with different hashes + #[test] + fn test_add_multiple_operations_with_different_hashes() { + let mut mempool = create_test_mempool(1000); + + let hash1 = FixedBytes::from([1u8; 32]); + let operation1 = create_pool_operation(2000, hash1); + let result1 = mempool.add_operation(&operation1); + assert!(result1.is_ok()); + assert!(result1.unwrap().is_some()); + + let hash2 = FixedBytes::from([2u8; 32]); + let operation2 = create_pool_operation(3000, hash2); + let result2 = mempool.add_operation(&operation2); + assert!(result2.is_ok()); + assert!(result2.unwrap().is_some()); + + let hash3 = FixedBytes::from([3u8; 32]); + let operation3 = create_pool_operation(1500, hash3); + let result3 = mempool.add_operation(&operation3); + assert!(result3.is_ok()); + assert!(result3.unwrap().is_some()); + + assert_eq!(mempool.hash_to_operation.len(), 3); + assert_eq!(mempool.best.len(), 3); + } + + // Tests removing an operation that is not in the mempool + #[test] + fn test_remove_operation_not_in_mempool() { + let mut mempool = create_test_mempool(1000); + let hash = FixedBytes::from([1u8; 32]); + + let result = mempool.remove_operation(&hash); + assert!(result.is_ok()); + assert!(result.unwrap().is_none()); + } + + // Tests removing an operation that exists in the mempool + #[test] + fn test_remove_operation_exists() { + let mut mempool = create_test_mempool(1000); + let hash = FixedBytes::from([1u8; 32]); + let operation = create_pool_operation(2000, hash); + + mempool.add_operation(&operation).unwrap(); + + let result = mempool.remove_operation(&hash); + assert!(result.is_ok()); + let removed = result.unwrap(); + assert!(removed.is_some()); + let removed_op = removed.unwrap(); + assert_eq!(removed_op.hash, hash); + assert_eq!(removed_op.operation.max_fee_per_gas(), Uint::from(2000)); + } + + // Tests removing an operation and checking the best operations + #[test] + fn test_remove_operation_and_check_best() { + let mut mempool = create_test_mempool(1000); + let hash = FixedBytes::from([1u8; 32]); + let operation = create_pool_operation(2000, hash); + + mempool.add_operation(&operation).unwrap(); + + let best_before: Vec<_> = mempool.get_top_operations(10).collect(); + assert_eq!(best_before.len(), 1); + assert_eq!(best_before[0].hash, hash); + + let result = mempool.remove_operation(&hash); + assert!(result.is_ok()); + assert!(result.unwrap().is_some()); + + let best_after: Vec<_> = mempool.get_top_operations(10).collect(); + assert_eq!(best_after.len(), 0); + } + + // Tests getting the top operations with ordering + #[test] + fn test_get_top_operations_ordering() { + let mut mempool = create_test_mempool(1000); + + let hash1 = FixedBytes::from([1u8; 32]); + let operation1 = create_pool_operation(2000, hash1); + mempool.add_operation(&operation1).unwrap(); + + let hash2 = FixedBytes::from([2u8; 32]); + let operation2 = create_pool_operation(3000, hash2); + mempool.add_operation(&operation2).unwrap(); + + let hash3 = FixedBytes::from([3u8; 32]); + let operation3 = create_pool_operation(1500, hash3); + mempool.add_operation(&operation3).unwrap(); + + let best: Vec<_> = mempool.get_top_operations(10).collect(); + assert_eq!(best.len(), 3); + assert_eq!(best[0].operation.max_fee_per_gas(), Uint::from(3000)); + assert_eq!(best[1].operation.max_fee_per_gas(), Uint::from(2000)); + assert_eq!(best[2].operation.max_fee_per_gas(), Uint::from(1500)); + } + + // Tests getting the top operations with a limit + #[test] + fn test_get_top_operations_limit() { + let mut mempool = create_test_mempool(1000); + + let hash1 = FixedBytes::from([1u8; 32]); + let operation1 = create_pool_operation(2000, hash1); + mempool.add_operation(&operation1).unwrap(); + + let hash2 = FixedBytes::from([2u8; 32]); + let operation2 = create_pool_operation(3000, hash2); + mempool.add_operation(&operation2).unwrap(); + + let hash3 = FixedBytes::from([3u8; 32]); + let operation3 = create_pool_operation(1500, hash3); + mempool.add_operation(&operation3).unwrap(); + + let best: Vec<_> = mempool.get_top_operations(2).collect(); + assert_eq!(best.len(), 2); + assert_eq!(best[0].operation.max_fee_per_gas(), Uint::from(3000)); + assert_eq!(best[1].operation.max_fee_per_gas(), Uint::from(2000)); + } + + // Tests top opperations tie breaker with submission id + #[test] + fn test_get_top_operations_submission_id_tie_breaker() { + let mut mempool = create_test_mempool(1000); + + let hash1 = FixedBytes::from([1u8; 32]); + let operation1 = create_pool_operation(2000, hash1); + mempool.add_operation(&operation1).unwrap().unwrap(); + + let hash2 = FixedBytes::from([2u8; 32]); + let operation2 = create_pool_operation(2000, hash2); + mempool.add_operation(&operation2).unwrap().unwrap(); + + let best: Vec<_> = mempool.get_top_operations(2).collect(); + assert_eq!(best.len(), 2); + assert_eq!(best[0].hash, hash1); + assert_eq!(best[1].hash, hash2); + } +} diff --git a/crates/account-abstraction-core/core/src/types.rs b/crates/account-abstraction-core/core/src/types.rs index 03e3eb2..04e3c9a 100644 --- a/crates/account-abstraction-core/core/src/types.rs +++ b/crates/account-abstraction-core/core/src/types.rs @@ -1,5 +1,5 @@ use crate::entrypoints::{v06, v07, version::EntryPointVersion}; -use alloy_primitives::{Address, B256, ChainId, U256}; +use alloy_primitives::{Address, B256, ChainId, FixedBytes, U256}; use alloy_rpc_types::erc4337; pub use alloy_rpc_types::erc4337::SendUserOperationResponse; use anyhow::Result; @@ -11,6 +11,23 @@ pub enum VersionedUserOperation { UserOperation(erc4337::UserOperation), PackedUserOperation(erc4337::PackedUserOperation), } + +impl VersionedUserOperation { + pub fn max_fee_per_gas(&self) -> U256 { + match self { + VersionedUserOperation::UserOperation(op) => op.max_fee_per_gas, + VersionedUserOperation::PackedUserOperation(op) => op.max_fee_per_gas, + } + } + + pub fn max_priority_fee_per_gas(&self) -> U256 { + match self { + VersionedUserOperation::UserOperation(op) => op.max_priority_fee_per_gas, + VersionedUserOperation::PackedUserOperation(op) => op.max_priority_fee_per_gas, + } + } +} + #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] pub struct UserOperationRequest { pub user_operation: VersionedUserOperation, @@ -107,6 +124,20 @@ pub struct AggregatorInfo { pub stake_info: EntityStakeInfo, } +pub type UserOpHash = FixedBytes<32>; + +#[derive(Eq, PartialEq, Clone, Debug)] +pub struct PoolOperation { + pub operation: VersionedUserOperation, + pub hash: UserOpHash, +} + +impl PoolOperation { + pub fn should_replace(&self, other: &PoolOperation) -> bool { + self.operation.max_fee_per_gas() > other.operation.max_fee_per_gas() + } +} + // Tests #[cfg(test)] mod tests { diff --git a/crates/audit/src/reader.rs b/crates/audit/src/reader.rs index f58265d..7e4de6a 100644 --- a/crates/audit/src/reader.rs +++ b/crates/audit/src/reader.rs @@ -1,4 +1,4 @@ -use crate::types::BundleEvent; +use crate::types::{BundleEvent, UserOpEvent}; use anyhow::Result; use async_trait::async_trait; use rdkafka::{ @@ -129,3 +129,98 @@ impl KafkaAuditLogReader { &self.topic } } + +#[derive(Debug, Clone)] +pub struct UserOpEventWrapper { + pub key: String, + pub event: UserOpEvent, + pub timestamp: i64, +} + +#[async_trait] +pub trait UserOpEventReader { + async fn read_event(&mut self) -> Result; + async fn commit(&mut self) -> Result<()>; +} + +pub struct KafkaUserOpAuditLogReader { + consumer: StreamConsumer, + topic: String, + last_message_offset: Option, + last_message_partition: Option, +} + +impl KafkaUserOpAuditLogReader { + pub fn new(consumer: StreamConsumer, topic: String) -> Result { + consumer.subscribe(&[&topic])?; + Ok(Self { + consumer, + topic, + last_message_offset: None, + last_message_partition: None, + }) + } +} + +#[async_trait] +impl UserOpEventReader for KafkaUserOpAuditLogReader { + async fn read_event(&mut self) -> Result { + match self.consumer.recv().await { + Ok(message) => { + let payload = message + .payload() + .ok_or_else(|| anyhow::anyhow!("Message has no payload"))?; + + let timestamp = match message.timestamp() { + Timestamp::CreateTime(millis) => millis, + Timestamp::LogAppendTime(millis) => millis, + Timestamp::NotAvailable => SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_millis() as i64, + }; + + let event: UserOpEvent = serde_json::from_slice(payload)?; + + debug!( + user_op_hash = %event.user_op_hash(), + timestamp = timestamp, + offset = message.offset(), + partition = message.partition(), + "Received UserOp event" + ); + + self.last_message_offset = Some(message.offset()); + self.last_message_partition = Some(message.partition()); + + let key = message + .key() + .map(|k| String::from_utf8_lossy(k).to_string()) + .ok_or_else(|| anyhow::anyhow!("Message missing required key"))?; + + Ok(UserOpEventWrapper { + key, + event, + timestamp, + }) + } + Err(e) => { + error!(error = %e, "Error receiving UserOp message from Kafka"); + sleep(Duration::from_secs(1)).await; + Err(e.into()) + } + } + } + + async fn commit(&mut self) -> Result<()> { + if let (Some(offset), Some(partition)) = + (self.last_message_offset, self.last_message_partition) + { + let mut tpl = TopicPartitionList::new(); + tpl.add_partition_offset(&self.topic, partition, rdkafka::Offset::Offset(offset + 1))?; + self.consumer + .commit(&tpl, rdkafka::consumer::CommitMode::Async)?; + } + Ok(()) + } +} diff --git a/crates/audit/tests/integration_tests.rs b/crates/audit/tests/integration_tests.rs index 11543a4..cb79836 100644 --- a/crates/audit/tests/integration_tests.rs +++ b/crates/audit/tests/integration_tests.rs @@ -1,9 +1,13 @@ +use alloy_primitives::{Address, B256, U256}; use std::time::Duration; use tips_audit::{ - KafkaAuditArchiver, KafkaAuditLogReader, - publisher::{BundleEventPublisher, KafkaBundleEventPublisher}, + KafkaAuditArchiver, KafkaAuditLogReader, KafkaUserOpAuditLogReader, UserOpEventReader, + publisher::{ + BundleEventPublisher, KafkaBundleEventPublisher, KafkaUserOpEventPublisher, + UserOpEventPublisher, + }, storage::{BundleEventS3Reader, S3EventReaderWriter}, - types::{BundleEvent, DropReason}, + types::{BundleEvent, DropReason, UserOpEvent}, }; use tips_core::test_utils::create_bundle_from_txn_data; use uuid::Uuid; @@ -72,3 +76,50 @@ async fn test_kafka_publisher_s3_archiver_integration() Ok(()) } + +#[tokio::test] +async fn test_userop_kafka_publisher_reader_integration() +-> Result<(), Box> { + let harness = TestHarness::new().await?; + let topic = "test-userop-events"; + + let test_user_op_hash = B256::from_slice(&[1u8; 32]); + let test_sender = Address::from_slice(&[2u8; 20]); + let test_entry_point = Address::from_slice(&[3u8; 20]); + let test_nonce = U256::from(42); + + let test_event = UserOpEvent::AddedToMempool { + user_op_hash: test_user_op_hash, + sender: test_sender, + entry_point: test_entry_point, + nonce: test_nonce, + }; + + let publisher = KafkaUserOpEventPublisher::new(harness.kafka_producer, topic.to_string()); + publisher.publish(test_event.clone()).await?; + + let mut reader = KafkaUserOpAuditLogReader::new(harness.kafka_consumer, topic.to_string())?; + + let received = tokio::time::timeout(Duration::from_secs(10), reader.read_event()).await??; + + assert_eq!(received.event.user_op_hash(), test_user_op_hash); + + match received.event { + UserOpEvent::AddedToMempool { + user_op_hash, + sender, + entry_point, + nonce, + } => { + assert_eq!(user_op_hash, test_user_op_hash); + assert_eq!(sender, test_sender); + assert_eq!(entry_point, test_entry_point); + assert_eq!(nonce, test_nonce); + } + _ => panic!("Expected AddedToMempool event"), + } + + reader.commit().await?; + + Ok(()) +} From 235a94031b334b4a5622d38afef640eecf93b03e Mon Sep 17 00:00:00 2001 From: Rayyan Alam <62478924+rayyan224@users.noreply.github.com> Date: Thu, 18 Dec 2025 17:59:05 -0500 Subject: [PATCH 085/117] feat(core): add in-memory mempool for 4337 user operations (#108) This PR adds an in-memory mempool implementation for ERC-4337 user operations in account-abstraction-core, so we can enqueue, prioritize, and dequeue operations deterministically. --- .../core/src/mempool.rs | 288 +++++++++++------- .../core/src/types.rs | 20 +- 2 files changed, 194 insertions(+), 114 deletions(-) diff --git a/crates/account-abstraction-core/core/src/mempool.rs b/crates/account-abstraction-core/core/src/mempool.rs index 3cc274f..637bf9c 100644 --- a/crates/account-abstraction-core/core/src/mempool.rs +++ b/crates/account-abstraction-core/core/src/mempool.rs @@ -1,8 +1,9 @@ -use crate::types::{PoolOperation, UserOpHash}; +use crate::types::{UserOpHash, WrappedUserOperation}; +use alloy_primitives::Address; +use std::cmp::Ordering; use std::collections::{BTreeSet, HashMap}; use std::sync::Arc; -use std::sync::atomic::AtomicU64; -use std::sync::atomic::Ordering; +use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering}; pub struct PoolConfig { minimum_max_fee_per_gas: u128, @@ -10,63 +11,107 @@ pub struct PoolConfig { #[derive(Eq, PartialEq, Clone, Debug)] pub struct OrderedPoolOperation { - pub pool_operation: PoolOperation, + pub pool_operation: WrappedUserOperation, pub submission_id: u64, - pub priority_order: u64, } -impl Ord for OrderedPoolOperation { - /// TODO: There can be invalid opperations, where base fee, + expected gas price - /// is greater that the maximum gas, in that case we don't include it in the mempool as such mempool changes. - fn cmp(&self, other: &Self) -> std::cmp::Ordering { +impl OrderedPoolOperation { + pub fn from_wrapped(operation: &WrappedUserOperation, submission_id: u64) -> Self { + Self { + pool_operation: operation.clone(), + submission_id, + } + } + + pub fn sender(&self) -> Address { + self.pool_operation.operation.sender() + } +} + +/// Ordering by max priority fee (desc) then submission id, then hash to ensure total order +#[derive(Clone, Debug)] +pub struct ByMaxFeeAndSubmissionId(pub OrderedPoolOperation); + +impl PartialEq for ByMaxFeeAndSubmissionId { + fn eq(&self, other: &Self) -> bool { + self.0.pool_operation.hash == other.0.pool_operation.hash + } +} +impl Eq for ByMaxFeeAndSubmissionId {} + +impl PartialOrd for ByMaxFeeAndSubmissionId { + fn partial_cmp(&self, other: &Self) -> Option { + Some(self.cmp(other)) + } +} + +impl Ord for ByMaxFeeAndSubmissionId { + fn cmp(&self, other: &Self) -> Ordering { other + .0 .pool_operation .operation .max_priority_fee_per_gas() - .cmp(&self.pool_operation.operation.max_priority_fee_per_gas()) - .then_with(|| self.submission_id.cmp(&other.submission_id)) + .cmp(&self.0.pool_operation.operation.max_priority_fee_per_gas()) + .then_with(|| self.0.submission_id.cmp(&other.0.submission_id)) + .then_with(|| self.0.pool_operation.hash.cmp(&other.0.pool_operation.hash)) + } +} + +/// Ordering by nonce (asc), then submission id, then hash to ensure total order +#[derive(Clone, Debug)] +pub struct ByNonce(pub OrderedPoolOperation); + +impl PartialEq for ByNonce { + fn eq(&self, other: &Self) -> bool { + self.0.pool_operation.hash == other.0.pool_operation.hash } } +impl Eq for ByNonce {} -impl PartialOrd for OrderedPoolOperation { - fn partial_cmp(&self, other: &Self) -> Option { +impl PartialOrd for ByNonce { + fn partial_cmp(&self, other: &Self) -> Option { Some(self.cmp(other)) } } -impl OrderedPoolOperation { - pub fn create_from_pool_operation(operation: &PoolOperation, submission_id: u64) -> Self { - Self { - pool_operation: operation.clone(), - priority_order: submission_id, - submission_id, - } +impl Ord for ByNonce { + /// TODO: There can be invalid opperations, where base fee, + expected gas price + /// is greater that the maximum gas, in that case we don't include it in the mempool as such mempool changes. + fn cmp(&self, other: &Self) -> Ordering { + self.0 + .pool_operation + .operation + .nonce() + .cmp(&other.0.pool_operation.operation.nonce()) + .then_with(|| self.0.submission_id.cmp(&other.0.submission_id)) } } pub trait Mempool { fn add_operation( &mut self, - operation: &PoolOperation, + operation: &WrappedUserOperation, ) -> Result, anyhow::Error>; - fn get_top_operations(&self, n: usize) -> impl Iterator>; + fn get_top_operations(&self, n: usize) -> impl Iterator>; fn remove_operation( &mut self, operation_hash: &UserOpHash, - ) -> Result, anyhow::Error>; + ) -> Result, anyhow::Error>; } pub struct MempoolImpl { config: PoolConfig, - best: BTreeSet, + best: BTreeSet, hash_to_operation: HashMap, + operations_by_account: HashMap>, submission_id_counter: AtomicU64, } impl Mempool for MempoolImpl { fn add_operation( &mut self, - operation: &PoolOperation, + operation: &WrappedUserOperation, ) -> Result, anyhow::Error> { if operation.operation.max_fee_per_gas() < self.config.minimum_max_fee_per_gas { return Err(anyhow::anyhow!( @@ -77,19 +122,47 @@ impl Mempool for MempoolImpl { Ok(ordered_operation_result) } - fn get_top_operations(&self, n: usize) -> impl Iterator> { + fn get_top_operations(&self, n: usize) -> impl Iterator> { + // TODO: There is a case where we skip operations that are not the lowest nonce for an account. + // But we still have not given the N number of operations, meaning we don't return those operations. + self.best .iter() + .filter_map(|op_by_fee| { + let lowest = self + .operations_by_account + .get(&op_by_fee.0.sender()) + .and_then(|set| set.first()); + + match lowest { + Some(lowest) + if lowest.0.pool_operation.hash == op_by_fee.0.pool_operation.hash => + { + Some(Arc::new(op_by_fee.0.pool_operation.clone())) + } + Some(_) => None, + None => { + println!( + "No operations found for account: {} but one was found in the best set", + op_by_fee.0.sender() + ); + None + } + } + }) .take(n) - .map(|o| Arc::new(o.pool_operation.clone())) } fn remove_operation( &mut self, operation_hash: &UserOpHash, - ) -> Result, anyhow::Error> { + ) -> Result, anyhow::Error> { if let Some(ordered_operation) = self.hash_to_operation.remove(operation_hash) { - self.best.remove(&ordered_operation); + self.best + .remove(&ByMaxFeeAndSubmissionId(ordered_operation.clone())); + self.operations_by_account + .get_mut(&ordered_operation.sender()) + .map(|set| set.remove(&ByNonce(ordered_operation.clone()))); Ok(Some(ordered_operation.pool_operation)) } else { Ok(None) @@ -97,31 +170,35 @@ impl Mempool for MempoolImpl { } } +// When user opperation is added to the mempool we need to check + impl MempoolImpl { fn handle_add_operation( &mut self, - operation: &PoolOperation, + operation: &WrappedUserOperation, ) -> Result, anyhow::Error> { - if let Some(old_ordered_operation) = self.hash_to_operation.get(&operation.hash) { - if operation.should_replace(&old_ordered_operation.pool_operation) { - self.best.remove(old_ordered_operation); - self.hash_to_operation.remove(&operation.hash); - } else { - return Ok(None); - } + // Account + if self.hash_to_operation.contains_key(&operation.hash) { + return Ok(None); } let order = self.get_next_order_id(); - let ordered_operation = OrderedPoolOperation::create_from_pool_operation(operation, order); + let ordered_operation = OrderedPoolOperation::from_wrapped(operation, order); - self.best.insert(ordered_operation.clone()); + self.best + .insert(ByMaxFeeAndSubmissionId(ordered_operation.clone())); + self.operations_by_account + .entry(ordered_operation.sender()) + .or_default() + .insert(ByNonce(ordered_operation.clone())); self.hash_to_operation .insert(operation.hash, ordered_operation.clone()); Ok(Some(ordered_operation)) } fn get_next_order_id(&self) -> u64 { - self.submission_id_counter.fetch_add(1, Ordering::SeqCst) + self.submission_id_counter + .fetch_add(1, AtomicOrdering::SeqCst) } pub fn new(config: PoolConfig) -> Self { @@ -129,6 +206,7 @@ impl MempoolImpl { config, best: BTreeSet::new(), hash_to_operation: HashMap::new(), + operations_by_account: HashMap::new(), submission_id_counter: AtomicU64::new(0), } } @@ -142,7 +220,7 @@ mod tests { use alloy_rpc_types::erc4337; fn create_test_user_operation(max_priority_fee_per_gas: u128) -> VersionedUserOperation { VersionedUserOperation::UserOperation(erc4337::UserOperation { - sender: Address::ZERO, + sender: Address::random(), nonce: Uint::from(0), init_code: Default::default(), call_data: Default::default(), @@ -156,8 +234,11 @@ mod tests { }) } - fn create_pool_operation(max_priority_fee_per_gas: u128, hash: UserOpHash) -> PoolOperation { - PoolOperation { + fn create_wrapped_operation( + max_priority_fee_per_gas: u128, + hash: UserOpHash, + ) -> WrappedUserOperation { + WrappedUserOperation { operation: create_test_user_operation(max_priority_fee_per_gas), hash, } @@ -174,7 +255,7 @@ mod tests { fn test_add_operation_success() { let mut mempool = create_test_mempool(1000); let hash = FixedBytes::from([1u8; 32]); - let operation = create_pool_operation(2000, hash); + let operation = create_wrapped_operation(2000, hash); let result = mempool.add_operation(&operation); @@ -194,7 +275,7 @@ mod tests { fn test_add_operation_below_minimum_gas() { let mut mempool = create_test_mempool(2000); let hash = FixedBytes::from([1u8; 32]); - let operation = create_pool_operation(1000, hash); + let operation = create_wrapped_operation(1000, hash); let result = mempool.add_operation(&operation); @@ -207,76 +288,25 @@ mod tests { ); } - // Tests adding an operation with the same hash but higher gas price - #[test] - fn test_add_operation_duplicate_hash_higher_gas() { - let mut mempool = create_test_mempool(1000); - let hash = FixedBytes::from([1u8; 32]); - - let operation1 = create_pool_operation(2000, hash); - let result1 = mempool.add_operation(&operation1); - assert!(result1.is_ok()); - assert!(result1.unwrap().is_some()); - - let operation2 = create_pool_operation(3000, hash); - let result2 = mempool.add_operation(&operation2); - assert!(result2.is_ok()); - assert!(result2.unwrap().is_some()); - } - - // Tests adding an operation with the same hash but lower gas price - #[test] - fn test_add_operation_duplicate_hash_lower_gas() { - let mut mempool = create_test_mempool(1000); - let hash = FixedBytes::from([1u8; 32]); - - let operation1 = create_pool_operation(3000, hash); - let result1 = mempool.add_operation(&operation1); - assert!(result1.is_ok()); - assert!(result1.unwrap().is_some()); - - let operation2 = create_pool_operation(2000, hash); - let result2 = mempool.add_operation(&operation2); - assert!(result2.is_ok()); - assert!(result2.unwrap().is_none()); - } - - // Tests adding an operation with the same hash and equal gas price - #[test] - fn test_add_operation_duplicate_hash_equal_gas() { - let mut mempool = create_test_mempool(1000); - let hash = FixedBytes::from([1u8; 32]); - - let operation1 = create_pool_operation(2000, hash); - let result1 = mempool.add_operation(&operation1); - assert!(result1.is_ok()); - assert!(result1.unwrap().is_some()); - - let operation2 = create_pool_operation(2000, hash); - let result2 = mempool.add_operation(&operation2); - assert!(result2.is_ok()); - assert!(result2.unwrap().is_none()); - } - // Tests adding multiple operations with different hashes #[test] - fn test_add_multiple_operations_with_different_hashes() { + fn test_add_multiple_operations() { let mut mempool = create_test_mempool(1000); let hash1 = FixedBytes::from([1u8; 32]); - let operation1 = create_pool_operation(2000, hash1); + let operation1 = create_wrapped_operation(2000, hash1); let result1 = mempool.add_operation(&operation1); assert!(result1.is_ok()); assert!(result1.unwrap().is_some()); let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = create_pool_operation(3000, hash2); + let operation2 = create_wrapped_operation(3000, hash2); let result2 = mempool.add_operation(&operation2); assert!(result2.is_ok()); assert!(result2.unwrap().is_some()); let hash3 = FixedBytes::from([3u8; 32]); - let operation3 = create_pool_operation(1500, hash3); + let operation3 = create_wrapped_operation(1500, hash3); let result3 = mempool.add_operation(&operation3); assert!(result3.is_ok()); assert!(result3.unwrap().is_some()); @@ -301,7 +331,7 @@ mod tests { fn test_remove_operation_exists() { let mut mempool = create_test_mempool(1000); let hash = FixedBytes::from([1u8; 32]); - let operation = create_pool_operation(2000, hash); + let operation = create_wrapped_operation(2000, hash); mempool.add_operation(&operation).unwrap(); @@ -319,7 +349,7 @@ mod tests { fn test_remove_operation_and_check_best() { let mut mempool = create_test_mempool(1000); let hash = FixedBytes::from([1u8; 32]); - let operation = create_pool_operation(2000, hash); + let operation = create_wrapped_operation(2000, hash); mempool.add_operation(&operation).unwrap(); @@ -341,15 +371,15 @@ mod tests { let mut mempool = create_test_mempool(1000); let hash1 = FixedBytes::from([1u8; 32]); - let operation1 = create_pool_operation(2000, hash1); + let operation1 = create_wrapped_operation(2000, hash1); mempool.add_operation(&operation1).unwrap(); let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = create_pool_operation(3000, hash2); + let operation2 = create_wrapped_operation(3000, hash2); mempool.add_operation(&operation2).unwrap(); let hash3 = FixedBytes::from([3u8; 32]); - let operation3 = create_pool_operation(1500, hash3); + let operation3 = create_wrapped_operation(1500, hash3); mempool.add_operation(&operation3).unwrap(); let best: Vec<_> = mempool.get_top_operations(10).collect(); @@ -365,15 +395,15 @@ mod tests { let mut mempool = create_test_mempool(1000); let hash1 = FixedBytes::from([1u8; 32]); - let operation1 = create_pool_operation(2000, hash1); + let operation1 = create_wrapped_operation(2000, hash1); mempool.add_operation(&operation1).unwrap(); let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = create_pool_operation(3000, hash2); + let operation2 = create_wrapped_operation(3000, hash2); mempool.add_operation(&operation2).unwrap(); let hash3 = FixedBytes::from([3u8; 32]); - let operation3 = create_pool_operation(1500, hash3); + let operation3 = create_wrapped_operation(1500, hash3); mempool.add_operation(&operation3).unwrap(); let best: Vec<_> = mempool.get_top_operations(2).collect(); @@ -388,11 +418,11 @@ mod tests { let mut mempool = create_test_mempool(1000); let hash1 = FixedBytes::from([1u8; 32]); - let operation1 = create_pool_operation(2000, hash1); + let operation1 = create_wrapped_operation(2000, hash1); mempool.add_operation(&operation1).unwrap().unwrap(); let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = create_pool_operation(2000, hash2); + let operation2 = create_wrapped_operation(2000, hash2); mempool.add_operation(&operation2).unwrap().unwrap(); let best: Vec<_> = mempool.get_top_operations(2).collect(); @@ -400,4 +430,42 @@ mod tests { assert_eq!(best[0].hash, hash1); assert_eq!(best[1].hash, hash2); } + + #[test] + fn test_get_top_operations_should_return_the_lowest_nonce_operation_for_each_account() { + let mut mempool = create_test_mempool(1000); + let hash1 = FixedBytes::from([1u8; 32]); + let test_user_operation = create_test_user_operation(2000); + + // Destructure to the inner struct, then update nonce + let base_op = match test_user_operation.clone() { + VersionedUserOperation::UserOperation(op) => op, + _ => panic!("expected UserOperation variant"), + }; + + let operation1 = WrappedUserOperation { + operation: VersionedUserOperation::UserOperation(erc4337::UserOperation { + nonce: Uint::from(0), + max_fee_per_gas: Uint::from(2000), + ..base_op.clone() + }), + hash: hash1, + }; + + mempool.add_operation(&operation1).unwrap().unwrap(); + let hash2 = FixedBytes::from([2u8; 32]); + let operation2 = WrappedUserOperation { + operation: VersionedUserOperation::UserOperation(erc4337::UserOperation { + nonce: Uint::from(1), + max_fee_per_gas: Uint::from(10_000), + ..base_op.clone() + }), + hash: hash2, + }; + mempool.add_operation(&operation2).unwrap().unwrap(); + + let best: Vec<_> = mempool.get_top_operations(2).collect(); + assert_eq!(best.len(), 1); + assert_eq!(best[0].operation.nonce(), Uint::from(0)); + } } diff --git a/crates/account-abstraction-core/core/src/types.rs b/crates/account-abstraction-core/core/src/types.rs index 04e3c9a..4600839 100644 --- a/crates/account-abstraction-core/core/src/types.rs +++ b/crates/account-abstraction-core/core/src/types.rs @@ -26,8 +26,20 @@ impl VersionedUserOperation { VersionedUserOperation::PackedUserOperation(op) => op.max_priority_fee_per_gas, } } -} + pub fn nonce(&self) -> U256 { + match self { + VersionedUserOperation::UserOperation(op) => op.nonce, + VersionedUserOperation::PackedUserOperation(op) => op.nonce, + } + } + pub fn sender(&self) -> Address { + match self { + VersionedUserOperation::UserOperation(op) => op.sender, + VersionedUserOperation::PackedUserOperation(op) => op.sender, + } + } +} #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] pub struct UserOperationRequest { pub user_operation: VersionedUserOperation, @@ -127,13 +139,13 @@ pub struct AggregatorInfo { pub type UserOpHash = FixedBytes<32>; #[derive(Eq, PartialEq, Clone, Debug)] -pub struct PoolOperation { +pub struct WrappedUserOperation { pub operation: VersionedUserOperation, pub hash: UserOpHash, } -impl PoolOperation { - pub fn should_replace(&self, other: &PoolOperation) -> bool { +impl WrappedUserOperation { + pub fn has_higher_max_fee(&self, other: &WrappedUserOperation) -> bool { self.operation.max_fee_per_gas() > other.operation.max_fee_per_gas() } } From e50f8035c320e15e08909097428a385e674d1e01 Mon Sep 17 00:00:00 2001 From: Andrei De Stefani Date: Fri, 19 Dec 2025 20:51:56 +0100 Subject: [PATCH 086/117] Feat/userop s3 storage (#99) * feat(audit): add S3 storage schema for UserOp events * docs: add UserOp S3 storage format documentation * test(audit): add S3 integration tests for UserOp events * docs: update AUDIT_S3_FORMAT.md with UserOp storage schema * docs: keep transaction lookups in description * fix: remove duplicate UserOpEventWrapper, import from reader --- crates/audit/src/storage.rs | 398 +++++++++++++++++++++++++++++++++- crates/audit/tests/s3_test.rs | 234 +++++++++++++++++++- docs/AUDIT_S3_FORMAT.md | 56 ++++- 3 files changed, 680 insertions(+), 8 deletions(-) diff --git a/crates/audit/src/storage.rs b/crates/audit/src/storage.rs index a1748d8..58ad115 100644 --- a/crates/audit/src/storage.rs +++ b/crates/audit/src/storage.rs @@ -1,7 +1,9 @@ use crate::metrics::Metrics; use crate::reader::Event; -use crate::types::{BundleEvent, BundleId, DropReason, TransactionId}; -use alloy_primitives::TxHash; +use crate::types::{ + BundleEvent, BundleId, DropReason, TransactionId, UserOpDropReason, UserOpEvent, UserOpHash, +}; +use alloy_primitives::{Address, TxHash, U256}; use anyhow::Result; use async_trait::async_trait; use aws_sdk_s3::Client as S3Client; @@ -19,6 +21,7 @@ use tracing::info; pub enum S3Key { Bundle(BundleId), TransactionByHash(TxHash), + UserOp(UserOpHash), } impl fmt::Display for S3Key { @@ -26,6 +29,7 @@ impl fmt::Display for S3Key { match self { S3Key::Bundle(bundle_id) => write!(f, "bundles/{bundle_id}"), S3Key::TransactionByHash(hash) => write!(f, "transactions/by_hash/{hash}"), + S3Key::UserOp(user_op_hash) => write!(f, "userops/{user_op_hash}"), } } } @@ -84,6 +88,46 @@ pub struct BundleHistory { pub history: Vec, } +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(tag = "event", content = "data")] +pub enum UserOpHistoryEvent { + AddedToMempool { + key: String, + timestamp: i64, + sender: Address, + entry_point: Address, + nonce: U256, + }, + Dropped { + key: String, + timestamp: i64, + reason: UserOpDropReason, + }, + Included { + key: String, + timestamp: i64, + block_number: u64, + tx_hash: TxHash, + }, +} + +impl UserOpHistoryEvent { + pub fn key(&self) -> &str { + match self { + UserOpHistoryEvent::AddedToMempool { key, .. } => key, + UserOpHistoryEvent::Dropped { key, .. } => key, + UserOpHistoryEvent::Included { key, .. } => key, + } + } +} + +#[derive(Debug, Clone, Serialize, Deserialize, Default)] +pub struct UserOpHistory { + pub history: Vec, +} + +pub use crate::reader::UserOpEventWrapper; + fn update_bundle_history_transform( bundle_history: BundleHistory, event: &Event, @@ -166,11 +210,74 @@ fn update_transaction_metadata_transform( Some(TransactionMetadata { bundle_ids }) } +fn update_userop_history_transform( + userop_history: UserOpHistory, + event: &UserOpEventWrapper, +) -> Option { + let mut history = userop_history.history; + let user_op_hash = event.event.user_op_hash(); + + if history.iter().any(|h| h.key() == event.key) { + info!( + user_op_hash = %user_op_hash, + event_key = %event.key, + "UserOp event already exists, skipping due to deduplication" + ); + return None; + } + + let history_event = match &event.event { + UserOpEvent::AddedToMempool { + sender, + entry_point, + nonce, + .. + } => UserOpHistoryEvent::AddedToMempool { + key: event.key.clone(), + timestamp: event.timestamp, + sender: *sender, + entry_point: *entry_point, + nonce: *nonce, + }, + UserOpEvent::Dropped { reason, .. } => UserOpHistoryEvent::Dropped { + key: event.key.clone(), + timestamp: event.timestamp, + reason: reason.clone(), + }, + UserOpEvent::Included { + block_number, + tx_hash, + .. + } => UserOpHistoryEvent::Included { + key: event.key.clone(), + timestamp: event.timestamp, + block_number: *block_number, + tx_hash: *tx_hash, + }, + }; + + history.push(history_event); + let userop_history = UserOpHistory { history }; + + info!( + user_op_hash = %user_op_hash, + event_count = userop_history.history.len(), + "Updated user op history" + ); + + Some(userop_history) +} + #[async_trait] pub trait EventWriter { async fn archive_event(&self, event: Event) -> Result<()>; } +#[async_trait] +pub trait UserOpEventWriter { + async fn archive_userop_event(&self, event: UserOpEventWrapper) -> Result<()>; +} + #[async_trait] pub trait BundleEventS3Reader { async fn get_bundle_history(&self, bundle_id: BundleId) -> Result>; @@ -180,6 +287,11 @@ pub trait BundleEventS3Reader { ) -> Result>; } +#[async_trait] +pub trait UserOpEventS3Reader { + async fn get_userop_history(&self, user_op_hash: UserOpHash) -> Result>; +} + #[derive(Clone)] pub struct S3EventReaderWriter { s3_client: S3Client, @@ -219,6 +331,15 @@ impl S3EventReaderWriter { .await } + async fn update_userop_history(&self, event: UserOpEventWrapper) -> Result<()> { + let s3_key = S3Key::UserOp(event.event.user_op_hash()).to_string(); + + self.idempotent_write::(&s3_key, |current_history| { + update_userop_history_transform(current_history, &event) + }) + .await + } + async fn idempotent_write(&self, key: &str, mut transform_fn: F) -> Result<()> where T: for<'de> Deserialize<'de> + Serialize + Clone + Default + Debug, @@ -388,12 +509,28 @@ impl BundleEventS3Reader for S3EventReaderWriter { } } +#[async_trait] +impl UserOpEventWriter for S3EventReaderWriter { + async fn archive_userop_event(&self, event: UserOpEventWrapper) -> Result<()> { + self.update_userop_history(event).await + } +} + +#[async_trait] +impl UserOpEventS3Reader for S3EventReaderWriter { + async fn get_userop_history(&self, user_op_hash: UserOpHash) -> Result> { + let s3_key = S3Key::UserOp(user_op_hash).to_string(); + let (userop_history, _) = self.get_object_with_etag::(&s3_key).await?; + Ok(userop_history) + } +} + #[cfg(test)] mod tests { use super::*; use crate::reader::Event; - use crate::types::{BundleEvent, DropReason}; - use alloy_primitives::TxHash; + use crate::types::{BundleEvent, DropReason, UserOpDropReason, UserOpEvent}; + use alloy_primitives::{Address, B256, TxHash, U256}; use tips_core::test_utils::create_bundle_from_txn_data; use uuid::Uuid; @@ -548,4 +685,257 @@ mod tests { assert!(metadata.bundle_ids.contains(&existing_bundle_id)); assert!(metadata.bundle_ids.contains(&new_bundle_id)); } + + fn create_test_userop_event( + key: &str, + timestamp: i64, + userop_event: UserOpEvent, + ) -> UserOpEventWrapper { + UserOpEventWrapper { + key: key.to_string(), + timestamp, + event: userop_event, + } + } + + #[test] + fn test_s3_key_userop_display() { + let hash = B256::from([1u8; 32]); + let key = S3Key::UserOp(hash); + let key_str = key.to_string(); + assert!(key_str.starts_with("userops/")); + assert!(key_str.contains(&format!("{hash}"))); + } + + #[test] + fn test_update_userop_history_transform_adds_new_event() { + let userop_history = UserOpHistory { history: vec![] }; + let user_op_hash = B256::from([1u8; 32]); + let sender = Address::from([2u8; 20]); + let entry_point = Address::from([3u8; 20]); + let nonce = U256::from(1); + + let userop_event = UserOpEvent::AddedToMempool { + user_op_hash, + sender, + entry_point, + nonce, + }; + let event = create_test_userop_event("test-key", 1234567890, userop_event); + + let result = update_userop_history_transform(userop_history, &event); + + assert!(result.is_some()); + let history = result.unwrap(); + assert_eq!(history.history.len(), 1); + + match &history.history[0] { + UserOpHistoryEvent::AddedToMempool { + key, + timestamp: ts, + sender: s, + entry_point: ep, + nonce: n, + } => { + assert_eq!(key, "test-key"); + assert_eq!(*ts, 1234567890); + assert_eq!(*s, sender); + assert_eq!(*ep, entry_point); + assert_eq!(*n, nonce); + } + _ => panic!("Expected AddedToMempool event"), + } + } + + #[test] + fn test_update_userop_history_transform_skips_duplicate_key() { + let user_op_hash = B256::from([1u8; 32]); + let sender = Address::from([2u8; 20]); + let entry_point = Address::from([3u8; 20]); + let nonce = U256::from(1); + + let existing_event = UserOpHistoryEvent::AddedToMempool { + key: "duplicate-key".to_string(), + timestamp: 1111111111, + sender, + entry_point, + nonce, + }; + let userop_history = UserOpHistory { + history: vec![existing_event], + }; + + let userop_event = UserOpEvent::AddedToMempool { + user_op_hash, + sender, + entry_point, + nonce, + }; + let event = create_test_userop_event("duplicate-key", 1234567890, userop_event); + + let result = update_userop_history_transform(userop_history, &event); + + assert!(result.is_none()); + } + + #[test] + fn test_update_userop_history_transform_handles_dropped_event() { + let userop_history = UserOpHistory { history: vec![] }; + let user_op_hash = B256::from([1u8; 32]); + let reason = UserOpDropReason::Expired; + + let userop_event = UserOpEvent::Dropped { + user_op_hash, + reason: reason.clone(), + }; + let event = create_test_userop_event("dropped-key", 1234567890, userop_event); + + let result = update_userop_history_transform(userop_history, &event); + + assert!(result.is_some()); + let history = result.unwrap(); + assert_eq!(history.history.len(), 1); + + match &history.history[0] { + UserOpHistoryEvent::Dropped { + key, + timestamp, + reason: r, + } => { + assert_eq!(key, "dropped-key"); + assert_eq!(*timestamp, 1234567890); + match r { + UserOpDropReason::Expired => {} + _ => panic!("Expected Expired reason"), + } + } + _ => panic!("Expected Dropped event"), + } + } + + #[test] + fn test_update_userop_history_transform_handles_included_event() { + let userop_history = UserOpHistory { history: vec![] }; + let user_op_hash = B256::from([1u8; 32]); + let tx_hash = TxHash::from([4u8; 32]); + let block_number = 12345u64; + + let userop_event = UserOpEvent::Included { + user_op_hash, + block_number, + tx_hash, + }; + let event = create_test_userop_event("included-key", 1234567890, userop_event); + + let result = update_userop_history_transform(userop_history, &event); + + assert!(result.is_some()); + let history = result.unwrap(); + assert_eq!(history.history.len(), 1); + + match &history.history[0] { + UserOpHistoryEvent::Included { + key, + timestamp, + block_number: bn, + tx_hash: th, + } => { + assert_eq!(key, "included-key"); + assert_eq!(*timestamp, 1234567890); + assert_eq!(*bn, 12345); + assert_eq!(*th, tx_hash); + } + _ => panic!("Expected Included event"), + } + } + + #[test] + fn test_update_userop_history_transform_handles_all_event_types() { + let userop_history = UserOpHistory { history: vec![] }; + let user_op_hash = B256::from([1u8; 32]); + let sender = Address::from([2u8; 20]); + let entry_point = Address::from([3u8; 20]); + let nonce = U256::from(1); + + let userop_event = UserOpEvent::AddedToMempool { + user_op_hash, + sender, + entry_point, + nonce, + }; + let event = create_test_userop_event("key-1", 1234567890, userop_event); + let result = update_userop_history_transform(userop_history.clone(), &event); + assert!(result.is_some()); + + let userop_event = UserOpEvent::Dropped { + user_op_hash, + reason: UserOpDropReason::Invalid("test error".to_string()), + }; + let event = create_test_userop_event("key-2", 1234567891, userop_event); + let result = update_userop_history_transform(userop_history.clone(), &event); + assert!(result.is_some()); + + let userop_event = UserOpEvent::Included { + user_op_hash, + block_number: 12345, + tx_hash: TxHash::from([4u8; 32]), + }; + let event = create_test_userop_event("key-3", 1234567892, userop_event); + let result = update_userop_history_transform(userop_history, &event); + assert!(result.is_some()); + } + + #[test] + fn test_userop_history_event_key_accessor() { + let sender = Address::from([2u8; 20]); + let entry_point = Address::from([3u8; 20]); + let nonce = U256::from(1); + + let event1 = UserOpHistoryEvent::AddedToMempool { + key: "key-1".to_string(), + timestamp: 1234567890, + sender, + entry_point, + nonce, + }; + assert_eq!(event1.key(), "key-1"); + + let event2 = UserOpHistoryEvent::Dropped { + key: "key-2".to_string(), + timestamp: 1234567890, + reason: UserOpDropReason::Expired, + }; + assert_eq!(event2.key(), "key-2"); + + let event3 = UserOpHistoryEvent::Included { + key: "key-3".to_string(), + timestamp: 1234567890, + block_number: 12345, + tx_hash: TxHash::from([4u8; 32]), + }; + assert_eq!(event3.key(), "key-3"); + } + + #[test] + fn test_userop_history_serialization() { + let sender = Address::from([2u8; 20]); + let entry_point = Address::from([3u8; 20]); + let nonce = U256::from(1); + + let history = UserOpHistory { + history: vec![UserOpHistoryEvent::AddedToMempool { + key: "test-key".to_string(), + timestamp: 1234567890, + sender, + entry_point, + nonce, + }], + }; + + let json = serde_json::to_string(&history).unwrap(); + let deserialized: UserOpHistory = serde_json::from_str(&json).unwrap(); + + assert_eq!(deserialized.history.len(), 1); + assert_eq!(deserialized.history[0].key(), "test-key"); + } } diff --git a/crates/audit/tests/s3_test.rs b/crates/audit/tests/s3_test.rs index 53b1a72..1d70cc1 100644 --- a/crates/audit/tests/s3_test.rs +++ b/crates/audit/tests/s3_test.rs @@ -1,9 +1,12 @@ -use alloy_primitives::TxHash; +use alloy_primitives::{Address, B256, TxHash, U256}; use std::sync::Arc; use tips_audit::{ reader::Event, - storage::{BundleEventS3Reader, EventWriter, S3EventReaderWriter}, - types::BundleEvent, + storage::{ + BundleEventS3Reader, EventWriter, S3EventReaderWriter, UserOpEventS3Reader, + UserOpEventWrapper, UserOpEventWriter, + }, + types::{BundleEvent, UserOpDropReason, UserOpEvent}, }; use tokio::task::JoinSet; use uuid::Uuid; @@ -247,3 +250,228 @@ async fn test_concurrent_writes_for_bundle() -> Result<(), Box UserOpEventWrapper { + UserOpEventWrapper { + key: key.to_string(), + timestamp, + event: userop_event, + } +} + +#[tokio::test] +async fn test_userop_event_write_and_read() -> Result<(), Box> +{ + let harness = TestHarness::new().await?; + let writer = S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + + let user_op_hash = B256::from([1u8; 32]); + let sender = Address::from([2u8; 20]); + let entry_point = Address::from([3u8; 20]); + let nonce = U256::from(1); + + let event = create_test_userop_event( + "test-userop-key-1", + 1234567890, + UserOpEvent::AddedToMempool { + user_op_hash, + sender, + entry_point, + nonce, + }, + ); + + writer.archive_userop_event(event).await?; + + let userop_history = writer.get_userop_history(user_op_hash).await?; + assert!(userop_history.is_some()); + + let history = userop_history.unwrap(); + assert_eq!(history.history.len(), 1); + assert_eq!(history.history[0].key(), "test-userop-key-1"); + + Ok(()) +} + +#[tokio::test] +async fn test_userop_events_appended() -> Result<(), Box> { + let harness = TestHarness::new().await?; + let writer = S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + + let user_op_hash = B256::from([10u8; 32]); + let sender = Address::from([11u8; 20]); + let entry_point = Address::from([12u8; 20]); + let nonce = U256::from(1); + let tx_hash = TxHash::from([13u8; 32]); + + let events = [ + create_test_userop_event( + "userop-key-1", + 1234567890, + UserOpEvent::AddedToMempool { + user_op_hash, + sender, + entry_point, + nonce, + }, + ), + create_test_userop_event( + "userop-key-2", + 1234567891, + UserOpEvent::Included { + user_op_hash, + block_number: 12345, + tx_hash, + }, + ), + ]; + + for (idx, event) in events.iter().enumerate() { + writer.archive_userop_event(event.clone()).await?; + + let userop_history = writer.get_userop_history(user_op_hash).await?; + assert!(userop_history.is_some()); + + let history = userop_history.unwrap(); + assert_eq!(history.history.len(), idx + 1); + + let keys: Vec = history + .history + .iter() + .map(|e| e.key().to_string()) + .collect(); + assert_eq!( + keys, + events + .iter() + .map(|e| e.key.clone()) + .take(idx + 1) + .collect::>() + ); + } + + Ok(()) +} + +#[tokio::test] +async fn test_userop_event_deduplication() -> Result<(), Box> { + let harness = TestHarness::new().await?; + let writer = S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + + let user_op_hash = B256::from([20u8; 32]); + let sender = Address::from([21u8; 20]); + let entry_point = Address::from([22u8; 20]); + let nonce = U256::from(1); + + let event = create_test_userop_event( + "duplicate-userop-key", + 1234567890, + UserOpEvent::AddedToMempool { + user_op_hash, + sender, + entry_point, + nonce, + }, + ); + + writer.archive_userop_event(event.clone()).await?; + writer.archive_userop_event(event).await?; + + let userop_history = writer.get_userop_history(user_op_hash).await?; + assert!(userop_history.is_some()); + + let history = userop_history.unwrap(); + assert_eq!(history.history.len(), 1); + assert_eq!(history.history[0].key(), "duplicate-userop-key"); + + Ok(()) +} + +#[tokio::test] +async fn test_userop_nonexistent_returns_none() +-> Result<(), Box> { + let harness = TestHarness::new().await?; + let writer = S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + + let nonexistent_hash = B256::from([255u8; 32]); + let userop_history = writer.get_userop_history(nonexistent_hash).await?; + assert!(userop_history.is_none()); + + Ok(()) +} + +#[tokio::test] +async fn test_userop_all_event_types() -> Result<(), Box> { + let harness = TestHarness::new().await?; + let writer = S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + + let user_op_hash = B256::from([30u8; 32]); + let sender = Address::from([31u8; 20]); + let entry_point = Address::from([32u8; 20]); + let nonce = U256::from(1); + let tx_hash = TxHash::from([33u8; 32]); + + let event1 = create_test_userop_event( + "event-added", + 1234567890, + UserOpEvent::AddedToMempool { + user_op_hash, + sender, + entry_point, + nonce, + }, + ); + writer.archive_userop_event(event1).await?; + + let event2 = create_test_userop_event( + "event-included", + 1234567891, + UserOpEvent::Included { + user_op_hash, + block_number: 12345, + tx_hash, + }, + ); + writer.archive_userop_event(event2).await?; + + let userop_history = writer.get_userop_history(user_op_hash).await?; + assert!(userop_history.is_some()); + + let history = userop_history.unwrap(); + assert_eq!(history.history.len(), 2); + assert_eq!(history.history[0].key(), "event-added"); + assert_eq!(history.history[1].key(), "event-included"); + + Ok(()) +} + +#[tokio::test] +async fn test_userop_dropped_event() -> Result<(), Box> { + let harness = TestHarness::new().await?; + let writer = S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); + + let user_op_hash = B256::from([40u8; 32]); + + let event = create_test_userop_event( + "event-dropped", + 1234567890, + UserOpEvent::Dropped { + user_op_hash, + reason: UserOpDropReason::Invalid("AA21 didn't pay prefund".to_string()), + }, + ); + writer.archive_userop_event(event).await?; + + let userop_history = writer.get_userop_history(user_op_hash).await?; + assert!(userop_history.is_some()); + + let history = userop_history.unwrap(); + assert_eq!(history.history.len(), 1); + assert_eq!(history.history[0].key(), "event-dropped"); + + Ok(()) +} diff --git a/docs/AUDIT_S3_FORMAT.md b/docs/AUDIT_S3_FORMAT.md index 4ce309c..6732992 100644 --- a/docs/AUDIT_S3_FORMAT.md +++ b/docs/AUDIT_S3_FORMAT.md @@ -1,6 +1,6 @@ # S3 Storage Format -This document describes the S3 storage format used by the audit system for archiving bundle lifecycle events and transaction lookups. +This document describes the S3 storage format used by the audit system for archiving bundle and UserOp lifecycle events and transaction lookups. ## Storage Structure @@ -65,3 +65,57 @@ Transaction hash to bundle mapping for efficient lookups: ] } ``` + +### UserOp History: `/userops/` + +Each UserOperation (ERC-4337) is stored as a JSON object containing its complete lifecycle history. Events are written after validation passes. + +```json +{ + "history": [ + { + "event": "AddedToMempool", + "data": { + "key": "-", + "timestamp": 1234567890, + "sender": "0x1234567890abcdef1234567890abcdef12345678", + "entry_point": "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789", + "nonce": "0x1" + } + }, + { + "event": "Included", + "data": { + "key": "-", + "timestamp": 1234567895, + "block_number": 12345678, + "tx_hash": "0xabcdef..." + } + }, + { + "event": "Dropped", + "data": { + "key": "-", + "timestamp": 1234567896, + "reason": { + "Invalid": "AA21 didn't pay prefund" + } + } + } + ] +} +``` + +#### UserOp Event Types + +| Event | When | Key Fields | +|-------|------|------------| +| `AddedToMempool` | UserOp passes validation and enters the mempool | sender, entry_point, nonce | +| `Dropped` | UserOp removed from mempool | reason (Invalid, Expired, ReplacedByHigherFee) | +| `Included` | UserOp included in a block | block_number, tx_hash | + +#### Drop Reasons + +- `Invalid(String)` - Validation failed with error message (e.g., revert reason) +- `Expired` - TTL exceeded +- `ReplacedByHigherFee` - Replaced by another UserOp with higher fee From eca647c4dd11166ddb8d6d0c45a92a44fd3a3bf5 Mon Sep 17 00:00:00 2001 From: Rayyan Alam <62478924+rayyan224@users.noreply.github.com> Date: Fri, 19 Dec 2025 15:10:44 -0500 Subject: [PATCH 087/117] feat: refactor AA mempool into clean architecture layers (#114) --- .env.example | 1 + Cargo.lock | 28 +- Cargo.toml | 3 +- crates/account-abstraction-core-v2/Cargo.toml | 30 ++ crates/account-abstraction-core-v2/README.md | 310 +++++++++++++ .../src/domain/entrypoints/mod.rs | 3 + .../src/domain/entrypoints/v06.rs | 139 ++++++ .../src/domain/entrypoints/v07.rs | 180 ++++++++ .../src/domain/entrypoints/version.rs | 31 ++ .../src/domain/events.rs | 17 + .../src/domain/mempool.rs | 18 + .../src/domain/mod.rs | 13 + .../src/domain/reputation.rs | 18 + .../src/domain/types.rs | 207 +++++++++ .../src/factories/kafka_engine.rs | 33 ++ .../src/factories/mod.rs | 1 + .../src/infrastructure/base_node/mod.rs | 1 + .../src/infrastructure/base_node/validator.rs | 173 +++++++ .../src/infrastructure/in_memory/mempool.rs | 424 ++++++++++++++++++ .../src/infrastructure/in_memory/mod.rs | 3 + .../src/infrastructure/kafka/consumer.rs | 29 ++ .../src/infrastructure/kafka/mod.rs | 1 + .../src/infrastructure/mod.rs | 3 + crates/account-abstraction-core-v2/src/lib.rs | 23 + .../src/services/interfaces/event_source.rs | 7 + .../src/services/interfaces/mod.rs | 2 + .../services/interfaces/user_op_validator.rs | 12 + .../src/services/mempool_engine.rs | 159 +++++++ .../src/services/mod.rs | 7 + .../src/services/reputations_service.rs | 27 ++ crates/account-abstraction-core/Cargo.toml | 5 +- .../core/src/kafka_mempool_engine.rs | 275 ++++++++++++ .../account-abstraction-core/core/src/lib.rs | 1 + .../core/src/mempool.rs | 1 + .../core/src/types.rs | 2 +- crates/ingress-rpc/Cargo.toml | 2 +- crates/ingress-rpc/src/bin/main.rs | 17 + crates/ingress-rpc/src/lib.rs | 15 + crates/ingress-rpc/src/queue.rs | 23 +- crates/ingress-rpc/src/service.rs | 88 +++- docker-compose.tips.yml | 1 + ...s-user-operation-consumer-kafka-properties | 9 + 42 files changed, 2316 insertions(+), 26 deletions(-) create mode 100644 crates/account-abstraction-core-v2/Cargo.toml create mode 100644 crates/account-abstraction-core-v2/README.md create mode 100644 crates/account-abstraction-core-v2/src/domain/entrypoints/mod.rs create mode 100644 crates/account-abstraction-core-v2/src/domain/entrypoints/v06.rs create mode 100644 crates/account-abstraction-core-v2/src/domain/entrypoints/v07.rs create mode 100644 crates/account-abstraction-core-v2/src/domain/entrypoints/version.rs create mode 100644 crates/account-abstraction-core-v2/src/domain/events.rs create mode 100644 crates/account-abstraction-core-v2/src/domain/mempool.rs create mode 100644 crates/account-abstraction-core-v2/src/domain/mod.rs create mode 100644 crates/account-abstraction-core-v2/src/domain/reputation.rs create mode 100644 crates/account-abstraction-core-v2/src/domain/types.rs create mode 100644 crates/account-abstraction-core-v2/src/factories/kafka_engine.rs create mode 100644 crates/account-abstraction-core-v2/src/factories/mod.rs create mode 100644 crates/account-abstraction-core-v2/src/infrastructure/base_node/mod.rs create mode 100644 crates/account-abstraction-core-v2/src/infrastructure/base_node/validator.rs create mode 100644 crates/account-abstraction-core-v2/src/infrastructure/in_memory/mempool.rs create mode 100644 crates/account-abstraction-core-v2/src/infrastructure/in_memory/mod.rs create mode 100644 crates/account-abstraction-core-v2/src/infrastructure/kafka/consumer.rs create mode 100644 crates/account-abstraction-core-v2/src/infrastructure/kafka/mod.rs create mode 100644 crates/account-abstraction-core-v2/src/infrastructure/mod.rs create mode 100644 crates/account-abstraction-core-v2/src/lib.rs create mode 100644 crates/account-abstraction-core-v2/src/services/interfaces/event_source.rs create mode 100644 crates/account-abstraction-core-v2/src/services/interfaces/mod.rs create mode 100644 crates/account-abstraction-core-v2/src/services/interfaces/user_op_validator.rs create mode 100644 crates/account-abstraction-core-v2/src/services/mempool_engine.rs create mode 100644 crates/account-abstraction-core-v2/src/services/mod.rs create mode 100644 crates/account-abstraction-core-v2/src/services/reputations_service.rs create mode 100644 crates/account-abstraction-core/core/src/kafka_mempool_engine.rs create mode 100644 docker/ingress-user-operation-consumer-kafka-properties diff --git a/.env.example b/.env.example index bb4a66a..4058bd9 100644 --- a/.env.example +++ b/.env.example @@ -7,6 +7,7 @@ TIPS_INGRESS_KAFKA_INGRESS_PROPERTIES_FILE=/app/docker/ingress-bundles-kafka-pro TIPS_INGRESS_KAFKA_INGRESS_TOPIC=tips-ingress TIPS_INGRESS_KAFKA_AUDIT_PROPERTIES_FILE=/app/docker/ingress-audit-kafka-properties TIPS_INGRESS_KAFKA_AUDIT_TOPIC=tips-audit +TIPS_INGRESS_KAFKA_USER_OPERATION_CONSUMER_PROPERTIES_FILE=/app/docker/ingress-user-operation-consumer-kafka-properties TIPS_INGRESS_LOG_LEVEL=info TIPS_INGRESS_LOG_FORMAT=pretty TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS=10800 diff --git a/Cargo.lock b/Cargo.lock index ce9af07..d33b32c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,10 +15,36 @@ dependencies = [ "async-trait", "jsonrpsee", "op-alloy-network", + "rdkafka", "reth-rpc-eth-types", "serde", "serde_json", + "tips-core", "tokio", + "tracing", + "wiremock", +] + +[[package]] +name = "account-abstraction-core-v2" +version = "0.1.0" +dependencies = [ + "alloy-primitives", + "alloy-provider", + "alloy-rpc-types", + "alloy-serde", + "alloy-sol-types", + "anyhow", + "async-trait", + "jsonrpsee", + "op-alloy-network", + "rdkafka", + "reth-rpc-eth-types", + "serde", + "serde_json", + "tips-core", + "tokio", + "tracing", "wiremock", ] @@ -7272,7 +7298,7 @@ dependencies = [ name = "tips-ingress-rpc" version = "0.1.0" dependencies = [ - "account-abstraction-core", + "account-abstraction-core-v2", "alloy-consensus", "alloy-primitives", "alloy-provider", diff --git a/Cargo.toml b/Cargo.toml index f05aed7..80a6631 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,13 +7,14 @@ homepage = "https://github.com/base/tips" repository = "https://github.com/base/tips" [workspace] -members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core"] +members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core", "crates/account-abstraction-core-v2"] resolver = "2" [workspace.dependencies] tips-audit = { path = "crates/audit" } tips-core = { path = "crates/core" } account-abstraction-core = { path = "crates/account-abstraction-core" } +account-abstraction-core-v2 = { path = "crates/account-abstraction-core-v2" } # Reth reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } diff --git a/crates/account-abstraction-core-v2/Cargo.toml b/crates/account-abstraction-core-v2/Cargo.toml new file mode 100644 index 0000000..a0560ce --- /dev/null +++ b/crates/account-abstraction-core-v2/Cargo.toml @@ -0,0 +1,30 @@ +[package] +name = "account-abstraction-core-v2" +version.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +edition.workspace = true + +[dependencies] +alloy-serde = { version = "1.0.41", default-features = false } +serde.workspace = true +alloy-rpc-types.workspace = true +alloy-provider.workspace = true +op-alloy-network.workspace = true +alloy-primitives = { workspace = true } +reth-rpc-eth-types.workspace = true +tokio.workspace = true +jsonrpsee.workspace = true +async-trait = { workspace = true } +alloy-sol-types.workspace = true +anyhow.workspace = true +rdkafka.workspace = true +serde_json.workspace = true +tips-core.workspace = true +tracing.workspace = true + +[dev-dependencies] +alloy-primitives.workspace = true +wiremock.workspace = true diff --git a/crates/account-abstraction-core-v2/README.md b/crates/account-abstraction-core-v2/README.md new file mode 100644 index 0000000..d391854 --- /dev/null +++ b/crates/account-abstraction-core-v2/README.md @@ -0,0 +1,310 @@ +# account-abstraction-core-v2 + +Clean architecture implementation for ERC-4337 account abstraction mempool and validation. + +## Architecture Overview + +This crate follows **Clean Architecture** (also known as Hexagonal Architecture or Ports & Adapters). The goal is to keep business logic independent of external concerns like databases, message queues, or RPC providers. + +**Note**: We use the term "interfaces" for what Hexagonal Architecture traditionally calls "ports" - both refer to the same concept of defining contracts between layers. + +``` +┌─────────────────────────────────────────────────────────────┐ +│ Factories │ +│ (Wiring/Dependency Injection) │ +└───────────────────────┬─────────────────────────────────────┘ + │ +┌───────────────────────▼─────────────────────────────────────┐ +│ Infrastructure │ +│ (Kafka, RPC providers, external systems) │ +│ implements ▼ │ +└───────────────────────┬─────────────────────────────────────┘ + │ +┌───────────────────────▼─────────────────────────────────────┐ +│ Services │ +│ (Orchestration & use cases) │ +│ defines ▼ interfaces │ +└───────────────────────┬─────────────────────────────────────┘ + │ +┌───────────────────────▼─────────────────────────────────────┐ +│ Domain │ +│ (Pure business logic - no dependencies) │ +└─────────────────────────────────────────────────────────────┘ +``` + +### Dependency Direction + +**Critical Rule**: Dependencies always point inward. +- ✅ `infrastructure/` depends on `services/` and `domain/` +- ✅ `services/` depends on `domain/` +- ✅ `domain/` depends on nothing +- ❌ Never reverse these dependencies + +## Layer Descriptions + +### 📦 Domain (`src/domain/`) + +**What it is**: Pure business logic with zero external dependencies. + +**Contains**: +- Core types (`UserOperation`, `ValidationResult`, `WrappedUserOperation`) +- Business events (`MempoolEvent` - what happened in our system) +- Business rules (`Mempool` trait, entrypoint validation logic) +- Domain services (in-memory mempool implementation) + +**Rules**: +- No imports from `infrastructure/`, `services/`, or external crates like `rdkafka` +- Should be reusable in any context (CLI tools, web servers, tests) +- Changes here affect the entire system + +**Example**: +```rust +// domain/events.rs - describes what happens in our system +pub enum MempoolEvent { + UserOpAdded { user_op: WrappedUserOperation }, + UserOpIncluded { user_op: WrappedUserOperation }, + UserOpDropped { user_op: WrappedUserOperation, reason: String }, +} +``` + +### 🎯 Services (`src/services/`) + +**What it is**: High-level orchestration that coordinates domain logic to accomplish specific goals. + +**Contains**: +- Use case implementations (`MempoolEngine` - handles mempool events) +- **Interfaces** (contracts that infrastructure must implement) + +**Purpose**: +- Reusable across different binaries (ingress-rpc, batch-processor, CLI tools) +- Defines "what we need" without specifying "how we get it" +- Orchestrates domain objects to perform complex operations + +**Example**: +```rust +// services/mempool_engine.rs +pub struct MempoolEngine { + mempool: Arc>, + event_source: Arc, // ← uses an interface, not Kafka directly +} + +impl MempoolEngine { + pub async fn run(&self) { + loop { + let event = self.event_source.receive().await?; // ← generic! + self.handle_event(event).await?; + } + } +} +``` + +### 🔌 Interfaces (`src/services/interfaces/`) + +**What they are**: Traits that define what the services layer needs from the outside world. + +**Why they exist**: +- **Dependency Inversion**: Services define what they need; infrastructure provides it +- **Testability**: Easy to mock interfaces with fake implementations +- **Flexibility**: Swap Kafka for Redis without touching service code + +**Interfaces in this crate**: +- `EventSource` - "I need a stream of MempoolEvents" (Kafka? Redis? In-memory? Don't care!) +- `UserOperationValidator` - "I need to validate user operations" (RPC? Mock? Don't care!) + +**Example**: +```rust +// services/interfaces/event_source.rs +#[async_trait] +pub trait EventSource: Send + Sync { + async fn receive(&self) -> anyhow::Result; +} + +// Now we can implement this for ANY event source: +// - KafkaEventSource +// - RedisEventSource +// - MockEventSource (for tests) +// - FileEventSource +``` + +### 🏗️ Infrastructure (`src/infrastructure/`) + +**What it is**: Adapters that connect our system to external services. + +**Contains**: +- Kafka consumer (`KafkaEventSource` implements `EventSource`) +- RPC validators (`BaseNodeValidator` implements `UserOperationValidator`) +- Database clients (when needed) +- External API clients + +**Purpose**: +- Translate between external systems and our domain +- Handle external concerns (serialization, retries, connection pooling) +- Implement the interfaces defined by services + +**Example**: +```rust +// infrastructure/kafka/consumer.rs +pub struct KafkaEventSource { + consumer: Arc, // ← Kafka-specific! +} + +#[async_trait] +impl EventSource for KafkaEventSource { // ← Implements the interface + async fn receive(&self) -> anyhow::Result { + let msg = self.consumer.recv().await?.detach(); + let payload = msg.payload().ok_or(...)?; + let event: MempoolEvent = serde_json::from_slice(payload)?; + Ok(event) + } +} +``` + +### 🏭 Factories (`src/factories/`) + +**What they are**: Convenience functions that wire everything together. + +**Contains**: +- `create_mempool_engine()` - creates a fully-wired MempoolEngine with Kafka consumer + +**Purpose**: +- Reduce boilerplate in main.rs +- Provide sensible defaults +- Make it easy to get started + +**When to use**: +- Quick setup in binaries +- Standard configurations + +**When NOT to use**: +- Custom wiring needed +- Testing (inject mocks directly) +- Non-standard configurations + +**Example**: +```rust +// factories/kafka_engine.rs +pub fn create_mempool_engine( + properties_file: &str, + topic: &str, + consumer_group_id: &str, + pool_config: Option, +) -> anyhow::Result> { + // 1. Create Kafka consumer (infrastructure) + let consumer: StreamConsumer = create_kafka_consumer(...)?; + + // 2. Wrap in interface adapter + let event_source = Arc::new(KafkaEventSource::new(Arc::new(consumer))); + + // 3. Create service with interface + let engine = MempoolEngine::with_event_source(event_source, pool_config); + + Ok(Arc::new(engine)) +} +``` + +## Why This Architecture? + +### ✅ Benefits + +1. **Testability**: Mock interfaces instead of real Kafka/RPC + ```rust + // Test with fake event source + let mock_source = Arc::new(MockEventSource::new(vec![event1, event2])); + let engine = MempoolEngine::with_event_source(mock_source, None); + ``` + +2. **Flexibility**: Swap infrastructure without touching business logic + ```rust + // Production: Kafka + let source = KafkaEventSource::new(kafka_consumer); + + // Development: In-memory + let source = InMemoryEventSource::new(vec![...]); + + // Same engine works with both! + let engine = MempoolEngine::with_event_source(source, config); + ``` + +3. **Reusability**: Services can be used in multiple binaries + ```rust + // ingress-rpc binary + use account_abstraction_core_v2::MempoolEngine; + + // batch-processor binary + use account_abstraction_core_v2::MempoolEngine; + + // Same code, different contexts! + ``` + +4. **Clear boundaries**: Each layer has a single responsibility + - Domain: Business rules + - Services: Orchestration + - Infrastructure: External systems + - Factories: Wiring + +5. **Independent evolution**: Change infrastructure without affecting domain + - Migrate Kafka → Redis: Only touch `infrastructure/` + - Add new validation rule: Only touch `domain/` + - Change orchestration: Only touch `services/` + +## Usage Examples + +### Basic Usage (with Factory) + +```rust +use account_abstraction_core_v2::create_mempool_engine; + +let engine = create_mempool_engine( + "kafka.properties", + "user-operations", + "mempool-consumer", + None, +)?; + +tokio::spawn(async move { + engine.run().await; +}); +``` + +### Custom Setup (without Factory) + +```rust +use account_abstraction_core_v2::{ + MempoolEngine, + infrastructure::kafka::consumer::KafkaEventSource, +}; + +let kafka_consumer = create_kafka_consumer(...)?; +let event_source = Arc::new(KafkaEventSource::new(Arc::new(kafka_consumer))); +let engine = MempoolEngine::with_event_source(event_source, Some(custom_config)); +``` + +### Testing + +```rust +use account_abstraction_core_v2::{ + MempoolEngine, MempoolEvent, + services::interfaces::event_source::EventSource, +}; + +struct MockEventSource { + events: Vec, +} + +#[async_trait] +impl EventSource for MockEventSource { + async fn receive(&self) -> anyhow::Result { + // Return test events + } +} + +let mock = Arc::new(MockEventSource { events: test_events }); +let engine = MempoolEngine::with_event_source(mock, None); +// Test without any real Kafka! +``` + +## Further Reading + +- [Clean Architecture (Robert C. Martin)](https://blog.cleancoder.com/uncle-bob/2012/08/13/the-clean-architecture.html) +- [Hexagonal Architecture](https://alistair.cockburn.us/hexagonal-architecture/) +- [Ports and Adapters Pattern](https://jmgarridopaz.github.io/content/hexagonalarchitecture.html) diff --git a/crates/account-abstraction-core-v2/src/domain/entrypoints/mod.rs b/crates/account-abstraction-core-v2/src/domain/entrypoints/mod.rs new file mode 100644 index 0000000..4946ba2 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/domain/entrypoints/mod.rs @@ -0,0 +1,3 @@ +pub mod v06; +pub mod v07; +pub mod version; diff --git a/crates/account-abstraction-core-v2/src/domain/entrypoints/v06.rs b/crates/account-abstraction-core-v2/src/domain/entrypoints/v06.rs new file mode 100644 index 0000000..4883305 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/domain/entrypoints/v06.rs @@ -0,0 +1,139 @@ +/* + * ERC-4337 v0.6 UserOperation Hash Calculation + * + * 1. Hash variable-length fields: initCode, callData, paymasterAndData + * 2. Pack all fields into struct (using hashes from step 1, gas values as uint256) + * 3. encodedHash = keccak256(abi.encode(packed struct)) + * 4. final hash = keccak256(abi.encode(encodedHash, entryPoint, chainId)) + * + * Reference: rundler/crates/types/src/user_operation/v0_6.rs:927-934 + */ +use alloy_primitives::{ChainId, U256}; +use alloy_rpc_types::erc4337; +use alloy_sol_types::{SolValue, sol}; +sol! { + #[allow(missing_docs)] + #[derive(Default, Debug, PartialEq, Eq)] + struct UserOperationHashEncoded { + bytes32 encodedHash; + address entryPoint; + uint256 chainId; + } + + #[allow(missing_docs)] + #[derive(Default, Debug, PartialEq, Eq)] + struct UserOperationPackedForHash { + address sender; + uint256 nonce; + bytes32 hashInitCode; + bytes32 hashCallData; + uint256 callGasLimit; + uint256 verificationGasLimit; + uint256 preVerificationGas; + uint256 maxFeePerGas; + uint256 maxPriorityFeePerGas; + bytes32 hashPaymasterAndData; + } +} + +impl From for UserOperationPackedForHash { + fn from(op: erc4337::UserOperation) -> UserOperationPackedForHash { + UserOperationPackedForHash { + sender: op.sender, + nonce: op.nonce, + hashInitCode: alloy_primitives::keccak256(op.init_code), + hashCallData: alloy_primitives::keccak256(op.call_data), + callGasLimit: U256::from(op.call_gas_limit), + verificationGasLimit: U256::from(op.verification_gas_limit), + preVerificationGas: U256::from(op.pre_verification_gas), + maxFeePerGas: U256::from(op.max_fee_per_gas), + maxPriorityFeePerGas: U256::from(op.max_priority_fee_per_gas), + hashPaymasterAndData: alloy_primitives::keccak256(op.paymaster_and_data), + } + } +} + +pub fn hash_user_operation( + user_operation: &erc4337::UserOperation, + entry_point: alloy_primitives::Address, + chain_id: ChainId, +) -> alloy_primitives::B256 { + let packed = UserOperationPackedForHash::from(user_operation.clone()); + let encoded = UserOperationHashEncoded { + encodedHash: alloy_primitives::keccak256(packed.abi_encode()), + entryPoint: entry_point, + chainId: U256::from(chain_id), + }; + alloy_primitives::keccak256(encoded.abi_encode()) +} + +#[cfg(test)] +mod tests { + use super::*; + use alloy_primitives::{Bytes, U256, address, b256, bytes}; + use alloy_rpc_types::erc4337; + + #[test] + fn test_hash_zeroed() { + let entry_point_address_v0_6 = address!("66a15edcc3b50a663e72f1457ffd49b9ae284ddc"); + let chain_id = 1337; + let user_op_with_zeroed_init_code = erc4337::UserOperation { + sender: address!("0x0000000000000000000000000000000000000000"), + nonce: U256::ZERO, + init_code: Bytes::default(), + call_data: Bytes::default(), + call_gas_limit: U256::from(0), + verification_gas_limit: U256::from(0), + pre_verification_gas: U256::from(0), + max_fee_per_gas: U256::from(0), + max_priority_fee_per_gas: U256::from(0), + paymaster_and_data: Bytes::default(), + signature: Bytes::default(), + }; + + let hash = hash_user_operation( + &user_op_with_zeroed_init_code, + entry_point_address_v0_6, + chain_id, + ); + assert_eq!( + hash, + b256!("dca97c3b49558ab360659f6ead939773be8bf26631e61bb17045bb70dc983b2d") + ); + } + + #[test] + fn test_hash_non_zeroed() { + let entry_point_address_v0_6 = address!("66a15edcc3b50a663e72f1457ffd49b9ae284ddc"); + let chain_id = 1337; + let user_op_with_non_zeroed_init_code = erc4337::UserOperation { + sender: address!("0x1306b01bc3e4ad202612d3843387e94737673f53"), + nonce: U256::from(8942), + init_code: "0x6942069420694206942069420694206942069420" + .parse() + .unwrap(), + call_data: "0x0000000000000000000000000000000000000000080085" + .parse() + .unwrap(), + call_gas_limit: U256::from(10_000), + verification_gas_limit: U256::from(100_000), + pre_verification_gas: U256::from(100), + max_fee_per_gas: U256::from(99_999), + max_priority_fee_per_gas: U256::from(9_999_999), + paymaster_and_data: bytes!( + "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" + ), + signature: bytes!("da0929f527cded8d0a1eaf2e8861d7f7e2d8160b7b13942f99dd367df4473a"), + }; + + let hash = hash_user_operation( + &user_op_with_non_zeroed_init_code, + entry_point_address_v0_6, + chain_id, + ); + assert_eq!( + hash, + b256!("484add9e4d8c3172d11b5feb6a3cc712280e176d278027cfa02ee396eb28afa1") + ); + } +} diff --git a/crates/account-abstraction-core-v2/src/domain/entrypoints/v07.rs b/crates/account-abstraction-core-v2/src/domain/entrypoints/v07.rs new file mode 100644 index 0000000..60d8fd4 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/domain/entrypoints/v07.rs @@ -0,0 +1,180 @@ +/* + * ERC-4337 v0.7 UserOperation Hash Calculation + * + * 1. Hash variable-length fields: initCode, callData, paymasterAndData + * 2. Pack all fields into struct (using hashes from step 1, gas values as bytes32) + * 3. encodedHash = keccak256(abi.encode(packed struct)) + * 4. final hash = keccak256(abi.encode(encodedHash, entryPoint, chainId)) + * + * Reference: rundler/crates/types/src/user_operation/v0_7.rs:1094-1123 + */ +use alloy_primitives::{Address, ChainId, FixedBytes, U256}; +use alloy_primitives::{Bytes, keccak256}; +use alloy_rpc_types::erc4337; +use alloy_sol_types::{SolValue, sol}; + +sol!( + #[allow(missing_docs)] + #[derive(Default, Debug, PartialEq, Eq)] + struct PackedUserOperation { + address sender; + uint256 nonce; + bytes initCode; + bytes callData; + bytes32 accountGasLimits; + uint256 preVerificationGas; + bytes32 gasFees; + bytes paymasterAndData; + bytes signature; + } + + #[derive(Default, Debug, PartialEq, Eq)] + struct UserOperationHashEncoded { + bytes32 encodedHash; + address entryPoint; + uint256 chainId; + } + + #[derive(Default, Debug, PartialEq, Eq)] + struct UserOperationPackedForHash { + address sender; + uint256 nonce; + bytes32 hashInitCode; + bytes32 hashCallData; + bytes32 accountGasLimits; + uint256 preVerificationGas; + bytes32 gasFees; + bytes32 hashPaymasterAndData; + } +); + +impl From for PackedUserOperation { + fn from(uo: erc4337::PackedUserOperation) -> Self { + let init_code = if let Some(factory) = uo.factory { + let mut init_code = factory.to_vec(); + init_code.extend_from_slice(&uo.factory_data.clone().unwrap_or_default()); + Bytes::from(init_code) + } else { + Bytes::new() + }; + let account_gas_limits = + pack_u256_pair_to_bytes32(uo.verification_gas_limit, uo.call_gas_limit); + let gas_fees = pack_u256_pair_to_bytes32(uo.max_priority_fee_per_gas, uo.max_fee_per_gas); + let pvgl: [u8; 16] = uo + .paymaster_verification_gas_limit + .unwrap_or_default() + .to::() + .to_be_bytes(); + let pogl: [u8; 16] = uo + .paymaster_post_op_gas_limit + .unwrap_or_default() + .to::() + .to_be_bytes(); + let paymaster_and_data = if let Some(paymaster) = uo.paymaster { + let mut paymaster_and_data = paymaster.to_vec(); + paymaster_and_data.extend_from_slice(&pvgl); + paymaster_and_data.extend_from_slice(&pogl); + paymaster_and_data.extend_from_slice(&uo.paymaster_data.unwrap()); + Bytes::from(paymaster_and_data) + } else { + Bytes::new() + }; + PackedUserOperation { + sender: uo.sender, + nonce: uo.nonce, + initCode: init_code, + callData: uo.call_data.clone(), + accountGasLimits: account_gas_limits, + preVerificationGas: U256::from(uo.pre_verification_gas), + gasFees: gas_fees, + paymasterAndData: paymaster_and_data, + signature: uo.signature.clone(), + } + } +} +fn pack_u256_pair_to_bytes32(high: U256, low: U256) -> FixedBytes<32> { + let mask = (U256::from(1u64) << 128) - U256::from(1u64); + let hi = high & mask; + let lo = low & mask; + let combined: U256 = (hi << 128) | lo; + FixedBytes::from(combined.to_be_bytes::<32>()) +} + +fn hash_packed_user_operation( + puo: &PackedUserOperation, + entry_point: Address, + chain_id: u64, +) -> FixedBytes<32> { + let hash_init_code = alloy_primitives::keccak256(&puo.initCode); + let hash_call_data = alloy_primitives::keccak256(&puo.callData); + let hash_paymaster_and_data = alloy_primitives::keccak256(&puo.paymasterAndData); + + let packed_for_hash = UserOperationPackedForHash { + sender: puo.sender, + nonce: puo.nonce, + hashInitCode: hash_init_code, + hashCallData: hash_call_data, + accountGasLimits: puo.accountGasLimits, + preVerificationGas: puo.preVerificationGas, + gasFees: puo.gasFees, + hashPaymasterAndData: hash_paymaster_and_data, + }; + + let hashed = alloy_primitives::keccak256(packed_for_hash.abi_encode()); + + let encoded = UserOperationHashEncoded { + encodedHash: hashed, + entryPoint: entry_point, + chainId: U256::from(chain_id), + }; + + keccak256(encoded.abi_encode()) +} + +pub fn hash_user_operation( + user_operation: &erc4337::PackedUserOperation, + entry_point: Address, + chain_id: ChainId, +) -> FixedBytes<32> { + let packed = PackedUserOperation::from(user_operation.clone()); + hash_packed_user_operation(&packed, entry_point, chain_id) +} + +#[cfg(test)] +mod test { + use super::*; + use alloy_primitives::{Bytes, U256}; + use alloy_primitives::{address, b256, bytes, uint}; + + #[test] + fn test_hash() { + let puo = PackedUserOperation { + sender: address!("b292Cf4a8E1fF21Ac27C4f94071Cd02C022C414b"), + nonce: uint!(0xF83D07238A7C8814A48535035602123AD6DBFA63000000000000000000000001_U256), + initCode: Bytes::default(), // Empty + callData: + bytes!("e9ae5c53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000 + 0000000000000000000000000000000000001d8b292cf4a8e1ff21ac27c4f94071cd02c022c414b00000000000000000000000000000000000000000000000000000000000000009517e29f000000000000000000 + 0000000000000000000000000000000000000000000002000000000000000000000000ad6330089d9a1fe89f4020292e1afe9969a5a2fc00000000000000000000000000000000000000000000000000000000000 + 0006000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000000000000000000000000000000000000000018e2fbe898000000000000000000000000000000000000000000000000000000000000000800000000000000 + 0000000000000000000000000000000000000000000000000800000000000000000000000002372912728f93ab3daaaebea4f87e6e28476d987000000000000000000000000000000000000000000000000002386 + f26fc10000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000"), + accountGasLimits: b256!("000000000000000000000000000114fc0000000000000000000000000012c9b5"), + preVerificationGas: U256::from(48916), + gasFees: b256!("000000000000000000000000524121000000000000000000000000109a4a441a"), + paymasterAndData: Bytes::default(), // Empty + signature: bytes!("3c7bfe22c9c2ef8994a9637bcc4df1741c5dc0c25b209545a7aeb20f7770f351479b683bd17c4d55bc32e2a649c8d2dff49dcfcc1f3fd837bcd88d1e69a434cf1c"), + }; + + let expected_hash = + b256!("e486401370d145766c3cf7ba089553214a1230d38662ae532c9b62eb6dadcf7e"); + let uo = hash_packed_user_operation( + &puo, + address!("0x0000000071727De22E5E9d8BAf0edAc6f37da032"), + 11155111, + ); + + assert_eq!(uo, expected_hash); + } +} diff --git a/crates/account-abstraction-core-v2/src/domain/entrypoints/version.rs b/crates/account-abstraction-core-v2/src/domain/entrypoints/version.rs new file mode 100644 index 0000000..ae37e5d --- /dev/null +++ b/crates/account-abstraction-core-v2/src/domain/entrypoints/version.rs @@ -0,0 +1,31 @@ +use alloy_primitives::{Address, address}; + +#[derive(Debug, Clone)] +pub enum EntryPointVersion { + V06, + V07, +} + +impl EntryPointVersion { + pub const V06_ADDRESS: Address = address!("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"); + pub const V07_ADDRESS: Address = address!("0x0000000071727De22E5E9d8BAf0edAc6f37da032"); +} + +#[derive(Debug)] +pub struct UnknownEntryPointAddress { + pub address: Address, +} + +impl TryFrom

    for EntryPointVersion { + type Error = UnknownEntryPointAddress; + + fn try_from(addr: Address) -> Result { + if addr == Self::V06_ADDRESS { + Ok(EntryPointVersion::V06) + } else if addr == Self::V07_ADDRESS { + Ok(EntryPointVersion::V07) + } else { + Err(UnknownEntryPointAddress { address: addr }) + } + } +} diff --git a/crates/account-abstraction-core-v2/src/domain/events.rs b/crates/account-abstraction-core-v2/src/domain/events.rs new file mode 100644 index 0000000..9b25c0c --- /dev/null +++ b/crates/account-abstraction-core-v2/src/domain/events.rs @@ -0,0 +1,17 @@ +use crate::domain::types::WrappedUserOperation; +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(tag = "event", content = "data")] +pub enum MempoolEvent { + UserOpAdded { + user_op: WrappedUserOperation, + }, + UserOpIncluded { + user_op: WrappedUserOperation, + }, + UserOpDropped { + user_op: WrappedUserOperation, + reason: String, + }, +} diff --git a/crates/account-abstraction-core-v2/src/domain/mempool.rs b/crates/account-abstraction-core-v2/src/domain/mempool.rs new file mode 100644 index 0000000..701a234 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/domain/mempool.rs @@ -0,0 +1,18 @@ +use crate::domain::types::{UserOpHash, WrappedUserOperation}; +use std::sync::Arc; + +#[derive(Default)] +pub struct PoolConfig { + pub minimum_max_fee_per_gas: u128, +} + +pub trait Mempool: Send + Sync { + fn add_operation(&mut self, operation: &WrappedUserOperation) -> Result<(), anyhow::Error>; + + fn get_top_operations(&self, n: usize) -> impl Iterator>; + + fn remove_operation( + &mut self, + operation_hash: &UserOpHash, + ) -> Result, anyhow::Error>; +} diff --git a/crates/account-abstraction-core-v2/src/domain/mod.rs b/crates/account-abstraction-core-v2/src/domain/mod.rs new file mode 100644 index 0000000..751d4e8 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/domain/mod.rs @@ -0,0 +1,13 @@ +pub mod entrypoints; +pub mod events; +pub mod mempool; +pub mod reputation; +pub mod types; + +pub use events::MempoolEvent; +pub use mempool::{Mempool, PoolConfig}; +pub use reputation::{ReputationService, ReputationStatus}; +pub use types::{ + UserOpHash, UserOperationRequest, ValidationResult, VersionedUserOperation, + WrappedUserOperation, +}; diff --git a/crates/account-abstraction-core-v2/src/domain/reputation.rs b/crates/account-abstraction-core-v2/src/domain/reputation.rs new file mode 100644 index 0000000..0f0fed4 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/domain/reputation.rs @@ -0,0 +1,18 @@ +use alloy_primitives::Address; +use async_trait::async_trait; + +/// Reputation status for an entity +#[derive(Debug, Copy, Clone, PartialEq, Eq)] +pub enum ReputationStatus { + /// Entity is not throttled or banned + Ok, + /// Entity is throttled + Throttled, + /// Entity is banned + Banned, +} + +#[async_trait] +pub trait ReputationService: Send + Sync { + async fn get_reputation(&self, entity: &Address) -> ReputationStatus; +} diff --git a/crates/account-abstraction-core-v2/src/domain/types.rs b/crates/account-abstraction-core-v2/src/domain/types.rs new file mode 100644 index 0000000..837cd52 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/domain/types.rs @@ -0,0 +1,207 @@ +use super::entrypoints::{v06, v07, version::EntryPointVersion}; +use alloy_primitives::{Address, B256, ChainId, FixedBytes, U256}; +use alloy_rpc_types::erc4337; +pub use alloy_rpc_types::erc4337::SendUserOperationResponse; +use anyhow::Result; +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +#[serde(untagged)] +pub enum VersionedUserOperation { + UserOperation(erc4337::UserOperation), + PackedUserOperation(erc4337::PackedUserOperation), +} + +impl VersionedUserOperation { + pub fn max_fee_per_gas(&self) -> U256 { + match self { + VersionedUserOperation::UserOperation(op) => op.max_fee_per_gas, + VersionedUserOperation::PackedUserOperation(op) => op.max_fee_per_gas, + } + } + + pub fn max_priority_fee_per_gas(&self) -> U256 { + match self { + VersionedUserOperation::UserOperation(op) => op.max_priority_fee_per_gas, + VersionedUserOperation::PackedUserOperation(op) => op.max_priority_fee_per_gas, + } + } + pub fn nonce(&self) -> U256 { + match self { + VersionedUserOperation::UserOperation(op) => op.nonce, + VersionedUserOperation::PackedUserOperation(op) => op.nonce, + } + } + + pub fn sender(&self) -> Address { + match self { + VersionedUserOperation::UserOperation(op) => op.sender, + VersionedUserOperation::PackedUserOperation(op) => op.sender, + } + } +} +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +pub struct UserOperationRequest { + pub user_operation: VersionedUserOperation, + pub entry_point: Address, + pub chain_id: ChainId, +} + +impl UserOperationRequest { + pub fn hash(&self) -> Result { + let entry_point_version = EntryPointVersion::try_from(self.entry_point) + .map_err(|_| anyhow::anyhow!("Unknown entry point version: {:#x}", self.entry_point))?; + + match (&self.user_operation, entry_point_version) { + (VersionedUserOperation::UserOperation(op), EntryPointVersion::V06) => Ok( + v06::hash_user_operation(op, self.entry_point, self.chain_id), + ), + (VersionedUserOperation::PackedUserOperation(op), EntryPointVersion::V07) => Ok( + v07::hash_user_operation(op, self.entry_point, self.chain_id), + ), + _ => Err(anyhow::anyhow!( + "Mismatched operation type and entry point version" + )), + } + } +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct UserOperationRequestValidationResult { + pub expiration_timestamp: u64, + pub gas_used: U256, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct ValidationResult { + pub valid: bool, + #[serde(skip_serializing_if = "Option::is_none")] + pub reason: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub valid_until: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub valid_after: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub context: Option, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct ValidationContext { + pub sender_info: EntityStakeInfo, + #[serde(skip_serializing_if = "Option::is_none")] + pub factory_info: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub paymaster_info: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub aggregator_info: Option, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct EntityStakeInfo { + pub address: Address, + pub stake: U256, + pub unstake_delay_sec: u64, + pub deposit: U256, + pub is_staked: bool, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct AggregatorInfo { + pub aggregator: Address, + pub stake_info: EntityStakeInfo, +} + +pub type UserOpHash = FixedBytes<32>; + +#[derive(Eq, PartialEq, Clone, Debug, Serialize, Deserialize)] +pub struct WrappedUserOperation { + pub operation: VersionedUserOperation, + pub hash: UserOpHash, +} + +impl WrappedUserOperation { + pub fn has_higher_max_fee(&self, other: &WrappedUserOperation) -> bool { + self.operation.max_fee_per_gas() > other.operation.max_fee_per_gas() + } +} + +#[cfg(test)] +mod tests { + use std::str::FromStr; + + use super::*; + use alloy_primitives::{Address, Uint}; + + #[test] + fn deser_untagged_user_operation_without_type_field() { + let json = r#" + { + "sender": "0x1111111111111111111111111111111111111111", + "nonce": "0x0", + "initCode": "0x", + "callData": "0x", + "callGasLimit": "0x5208", + "verificationGasLimit": "0x100000", + "preVerificationGas": "0x10000", + "maxFeePerGas": "0x59682f10", + "maxPriorityFeePerGas": "0x3b9aca00", + "paymasterAndData": "0x", + "signature": "0x01" + } + "#; + + let parsed: VersionedUserOperation = + serde_json::from_str(json).expect("should deserialize as v0.6"); + match parsed { + VersionedUserOperation::UserOperation(op) => { + assert_eq!( + op.sender, + Address::from_str("0x1111111111111111111111111111111111111111").unwrap() + ); + assert_eq!(op.nonce, Uint::from(0)); + } + other => panic!("expected UserOperation, got {:?}", other), + } + } + + #[test] + fn deser_untagged_packed_user_operation_without_type_field() { + let json = r#" + { + "sender": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + "nonce": "0x1", + "factory": "0x2222222222222222222222222222222222222222", + "factoryData": "0xabcdef1234560000000000000000000000000000000000000000000000000000", + "callData": "0xb61d27f600000000000000000000000000000000000000000000000000000000000000c8", + "callGasLimit": "0x2dc6c0", + "verificationGasLimit": "0x1e8480", + "preVerificationGas": "0x186a0", + "maxFeePerGas": "0x77359400", + "maxPriorityFeePerGas": "0x3b9aca00", + "paymaster": "0x3333333333333333333333333333333333333333", + "paymasterVerificationGasLimit": "0x186a0", + "paymasterPostOpGasLimit": "0x27100", + "paymasterData": "0xfafb00000000000000000000000000000000000000000000000000000000000064", + "signature": "0xa3c5f1b90014e68abbbdc42e4b77b9accc0b7e1c5d0b5bcde1a47ba8faba00ff55c9a7de12e98b731766e35f6c51ab25c9b58cc0e7c4a33f25e75c51c6ad3c3a" + } + "#; + + let parsed: VersionedUserOperation = + serde_json::from_str(json).expect("should deserialize as v0.7 packed"); + match parsed { + VersionedUserOperation::PackedUserOperation(op) => { + assert_eq!( + op.sender, + Address::from_str("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48").unwrap() + ); + assert_eq!(op.nonce, Uint::from(1)); + } + other => panic!("expected PackedUserOperation, got {:?}", other), + } + } +} diff --git a/crates/account-abstraction-core-v2/src/factories/kafka_engine.rs b/crates/account-abstraction-core-v2/src/factories/kafka_engine.rs new file mode 100644 index 0000000..a7d972b --- /dev/null +++ b/crates/account-abstraction-core-v2/src/factories/kafka_engine.rs @@ -0,0 +1,33 @@ +use crate::domain::mempool::PoolConfig; +use crate::infrastructure::in_memory::mempool::InMemoryMempool; +use crate::infrastructure::kafka::consumer::KafkaEventSource; +use crate::services::mempool_engine::MempoolEngine; +use rdkafka::{ + ClientConfig, + consumer::{Consumer, StreamConsumer}, +}; +use std::sync::Arc; +use tips_core::kafka::load_kafka_config_from_file; +use tokio::sync::RwLock; + +pub fn create_mempool_engine( + properties_file: &str, + topic: &str, + consumer_group_id: &str, + pool_config: Option, +) -> anyhow::Result>> { + let mut client_config = ClientConfig::from_iter(load_kafka_config_from_file(properties_file)?); + client_config.set("group.id", consumer_group_id); + client_config.set("enable.auto.commit", "true"); + + let consumer: StreamConsumer = client_config.create()?; + consumer.subscribe(&[topic])?; + + let event_source = Arc::new(KafkaEventSource::new(Arc::new(consumer))); + let mempool = Arc::new(RwLock::new(InMemoryMempool::new( + pool_config.unwrap_or_default(), + ))); + let engine = MempoolEngine::::new(mempool, event_source); + + Ok(Arc::new(engine)) +} diff --git a/crates/account-abstraction-core-v2/src/factories/mod.rs b/crates/account-abstraction-core-v2/src/factories/mod.rs new file mode 100644 index 0000000..16ba50d --- /dev/null +++ b/crates/account-abstraction-core-v2/src/factories/mod.rs @@ -0,0 +1 @@ +pub mod kafka_engine; diff --git a/crates/account-abstraction-core-v2/src/infrastructure/base_node/mod.rs b/crates/account-abstraction-core-v2/src/infrastructure/base_node/mod.rs new file mode 100644 index 0000000..fa199f2 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/infrastructure/base_node/mod.rs @@ -0,0 +1 @@ +pub mod validator; diff --git a/crates/account-abstraction-core-v2/src/infrastructure/base_node/validator.rs b/crates/account-abstraction-core-v2/src/infrastructure/base_node/validator.rs new file mode 100644 index 0000000..e0577f5 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/infrastructure/base_node/validator.rs @@ -0,0 +1,173 @@ +use crate::domain::types::{ValidationResult, VersionedUserOperation}; +use crate::services::interfaces::user_op_validator::UserOperationValidator; +use alloy_primitives::Address; +use alloy_provider::{Provider, RootProvider}; +use async_trait::async_trait; +use op_alloy_network::Optimism; +use std::sync::Arc; +use tokio::time::{Duration, timeout}; + +#[derive(Debug, Clone)] +pub struct BaseNodeValidator { + simulation_provider: Arc>, + validate_user_operation_timeout: u64, +} + +impl BaseNodeValidator { + pub fn new( + simulation_provider: Arc>, + validate_user_operation_timeout: u64, + ) -> Self { + Self { + simulation_provider, + validate_user_operation_timeout, + } + } +} + +#[async_trait] +impl UserOperationValidator for BaseNodeValidator { + async fn validate_user_operation( + &self, + user_operation: &VersionedUserOperation, + entry_point: &Address, + ) -> anyhow::Result { + let result = timeout( + Duration::from_secs(self.validate_user_operation_timeout), + self.simulation_provider + .client() + .request("base_validateUserOperation", (user_operation, entry_point)), + ) + .await; + + let validation_result: ValidationResult = match result { + Err(_) => { + return Err(anyhow::anyhow!("Timeout on requesting validation")); + } + Ok(Err(e)) => { + return Err(anyhow::anyhow!("RPC error: {e}")); + } + Ok(Ok(v)) => v, + }; + + Ok(validation_result) + } +} + +#[cfg(test)] +mod tests { + use super::*; + + use alloy_primitives::{Address, Bytes, U256}; + use alloy_rpc_types::erc4337::UserOperation; + use tokio::time::Duration; + use wiremock::{Mock, MockServer, ResponseTemplate, matchers::method}; + + const VALIDATION_TIMEOUT_SECS: u64 = 1; + const LONG_DELAY_SECS: u64 = 3; + + async fn setup_mock_server() -> MockServer { + MockServer::start().await + } + + fn new_test_user_operation_v06() -> VersionedUserOperation { + VersionedUserOperation::UserOperation(UserOperation { + sender: Address::ZERO, + nonce: U256::from(0), + init_code: Bytes::default(), + call_data: Bytes::default(), + call_gas_limit: U256::from(21_000), + verification_gas_limit: U256::from(100_000), + pre_verification_gas: U256::from(21_000), + max_fee_per_gas: U256::from(1_000_000_000), + max_priority_fee_per_gas: U256::from(1_000_000_000), + paymaster_and_data: Bytes::default(), + signature: Bytes::default(), + }) + } + + fn new_validator(mock_server: &MockServer) -> BaseNodeValidator { + let provider: RootProvider = + RootProvider::new_http(mock_server.uri().parse().unwrap()); + let simulation_provider = Arc::new(provider); + BaseNodeValidator::new(simulation_provider, VALIDATION_TIMEOUT_SECS) + } + + #[tokio::test] + async fn base_node_validate_user_operation_times_out() { + let mock_server = setup_mock_server().await; + + Mock::given(method("POST")) + .respond_with( + ResponseTemplate::new(200).set_delay(Duration::from_secs(LONG_DELAY_SECS)), + ) + .mount(&mock_server) + .await; + + let validator = new_validator(&mock_server); + let user_operation = new_test_user_operation_v06(); + + let result = validator + .validate_user_operation(&user_operation, &Address::ZERO) + .await; + + assert!(result.is_err()); + assert!(result.unwrap_err().to_string().contains("Timeout")); + } + + #[tokio::test] + async fn should_propagate_error_from_base_node() { + let mock_server = setup_mock_server().await; + + Mock::given(method("POST")) + .respond_with(ResponseTemplate::new(500).set_body_json(serde_json::json!({ + "jsonrpc": "2.0", + "id": 1, + "error": { + "code": -32000, + "message": "Internal error" + } + }))) + .mount(&mock_server) + .await; + + let validator = new_validator(&mock_server); + let user_operation = new_test_user_operation_v06(); + + let result = validator + .validate_user_operation(&user_operation, &Address::ZERO) + .await; + assert!(result.is_err()); + assert!(result.unwrap_err().to_string().contains("Internal error")); + } + + #[tokio::test] + async fn base_node_validate_user_operation_succeeds() { + let mock_server = setup_mock_server().await; + + Mock::given(method("POST")) + .respond_with(ResponseTemplate::new(200).set_body_json(serde_json::json!({ + "jsonrpc": "2.0", + "id": 1, + "result": { + "valid": true, + "reason": null, + "valid_until": null, + "valid_after": null, + "context": null + } + }))) + .mount(&mock_server) + .await; + + let validator = new_validator(&mock_server); + let user_operation = new_test_user_operation_v06(); + + let result = validator + .validate_user_operation(&user_operation, &Address::ZERO) + .await + .unwrap(); + + assert_eq!(result.valid, true); + } +} diff --git a/crates/account-abstraction-core-v2/src/infrastructure/in_memory/mempool.rs b/crates/account-abstraction-core-v2/src/infrastructure/in_memory/mempool.rs new file mode 100644 index 0000000..5aa7166 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/infrastructure/in_memory/mempool.rs @@ -0,0 +1,424 @@ +use crate::domain::mempool::{Mempool, PoolConfig}; +use crate::domain::types::{UserOpHash, WrappedUserOperation}; +use alloy_primitives::Address; +use std::cmp::Ordering; +use std::collections::{BTreeSet, HashMap}; +use std::sync::Arc; +use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering}; +use tracing::warn; + +#[derive(Eq, PartialEq, Clone, Debug)] +struct OrderedPoolOperation { + pool_operation: WrappedUserOperation, + submission_id: u64, +} + +impl OrderedPoolOperation { + fn from_wrapped(operation: &WrappedUserOperation, submission_id: u64) -> Self { + Self { + pool_operation: operation.clone(), + submission_id, + } + } + + fn sender(&self) -> Address { + self.pool_operation.operation.sender() + } +} + +#[derive(Clone, Debug)] +struct ByMaxFeeAndSubmissionId(OrderedPoolOperation); + +impl PartialEq for ByMaxFeeAndSubmissionId { + fn eq(&self, other: &Self) -> bool { + self.0.pool_operation.hash == other.0.pool_operation.hash + } +} +impl Eq for ByMaxFeeAndSubmissionId {} + +impl PartialOrd for ByMaxFeeAndSubmissionId { + fn partial_cmp(&self, other: &Self) -> Option { + Some(self.cmp(other)) + } +} + +impl Ord for ByMaxFeeAndSubmissionId { + fn cmp(&self, other: &Self) -> Ordering { + other + .0 + .pool_operation + .operation + .max_priority_fee_per_gas() + .cmp(&self.0.pool_operation.operation.max_priority_fee_per_gas()) + .then_with(|| self.0.submission_id.cmp(&other.0.submission_id)) + } +} + +#[derive(Clone, Debug)] +struct ByNonce(OrderedPoolOperation); + +impl PartialEq for ByNonce { + fn eq(&self, other: &Self) -> bool { + self.0.pool_operation.hash == other.0.pool_operation.hash + } +} +impl Eq for ByNonce {} + +impl PartialOrd for ByNonce { + fn partial_cmp(&self, other: &Self) -> Option { + Some(self.cmp(other)) + } +} + +impl Ord for ByNonce { + fn cmp(&self, other: &Self) -> Ordering { + self.0 + .pool_operation + .operation + .nonce() + .cmp(&other.0.pool_operation.operation.nonce()) + .then_with(|| self.0.submission_id.cmp(&other.0.submission_id)) + .then_with(|| self.0.pool_operation.hash.cmp(&other.0.pool_operation.hash)) + } +} + +pub struct InMemoryMempool { + config: PoolConfig, + best: BTreeSet, + hash_to_operation: HashMap, + operations_by_account: HashMap>, + submission_id_counter: AtomicU64, +} + +impl Mempool for InMemoryMempool { + fn add_operation(&mut self, operation: &WrappedUserOperation) -> Result<(), anyhow::Error> { + if operation.operation.max_fee_per_gas() < self.config.minimum_max_fee_per_gas { + return Err(anyhow::anyhow!( + "Gas price is below the minimum required PVG gas" + )); + } + self.handle_add_operation(operation)?; + Ok(()) + } + + fn get_top_operations(&self, n: usize) -> impl Iterator> { + self.best + .iter() + .filter_map(|op_by_fee| { + let lowest = self + .operations_by_account + .get(&op_by_fee.0.sender()) + .and_then(|set| set.first()); + + match lowest { + Some(lowest) + if lowest.0.pool_operation.hash == op_by_fee.0.pool_operation.hash => + { + Some(Arc::new(op_by_fee.0.pool_operation.clone())) + } + Some(_) => None, + None => { + warn!( + account = %op_by_fee.0.sender(), + "Inconsistent state: operation in best set but not in account index" + ); + None + } + } + }) + .take(n) + } + + fn remove_operation( + &mut self, + operation_hash: &UserOpHash, + ) -> Result, anyhow::Error> { + if let Some(ordered_operation) = self.hash_to_operation.remove(operation_hash) { + self.best + .remove(&ByMaxFeeAndSubmissionId(ordered_operation.clone())); + self.operations_by_account + .get_mut(&ordered_operation.sender()) + .map(|set| set.remove(&ByNonce(ordered_operation.clone()))); + Ok(Some(ordered_operation.pool_operation)) + } else { + Ok(None) + } + } +} + +impl InMemoryMempool { + fn handle_add_operation( + &mut self, + operation: &WrappedUserOperation, + ) -> Result<(), anyhow::Error> { + if self.hash_to_operation.contains_key(&operation.hash) { + return Ok(()); + } + + let order = self.get_next_order_id(); + let ordered_operation = OrderedPoolOperation::from_wrapped(operation, order); + + self.best + .insert(ByMaxFeeAndSubmissionId(ordered_operation.clone())); + self.operations_by_account + .entry(ordered_operation.sender()) + .or_default() + .insert(ByNonce(ordered_operation.clone())); + self.hash_to_operation + .insert(operation.hash, ordered_operation.clone()); + Ok(()) + } + + fn get_next_order_id(&self) -> u64 { + self.submission_id_counter + .fetch_add(1, AtomicOrdering::SeqCst) + } + + pub fn new(config: PoolConfig) -> Self { + Self { + config, + best: BTreeSet::new(), + hash_to_operation: HashMap::new(), + operations_by_account: HashMap::new(), + submission_id_counter: AtomicU64::new(0), + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::domain::types::VersionedUserOperation; + use alloy_primitives::{Address, FixedBytes, Uint}; + use alloy_rpc_types::erc4337; + + fn create_test_user_operation(max_priority_fee_per_gas: u128) -> VersionedUserOperation { + VersionedUserOperation::UserOperation(erc4337::UserOperation { + sender: Address::random(), + nonce: Uint::from(0), + init_code: Default::default(), + call_data: Default::default(), + call_gas_limit: Uint::from(100000), + verification_gas_limit: Uint::from(100000), + pre_verification_gas: Uint::from(21000), + max_fee_per_gas: Uint::from(max_priority_fee_per_gas), + max_priority_fee_per_gas: Uint::from(max_priority_fee_per_gas), + paymaster_and_data: Default::default(), + signature: Default::default(), + }) + } + + fn create_wrapped_operation( + max_priority_fee_per_gas: u128, + hash: UserOpHash, + ) -> WrappedUserOperation { + WrappedUserOperation { + operation: create_test_user_operation(max_priority_fee_per_gas), + hash, + } + } + + fn create_test_mempool(minimum_required_pvg_gas: u128) -> InMemoryMempool { + InMemoryMempool::new(PoolConfig { + minimum_max_fee_per_gas: minimum_required_pvg_gas, + }) + } + + #[test] + fn test_add_operation_success() { + let mut mempool = create_test_mempool(1000); + let hash = FixedBytes::from([1u8; 32]); + let operation = create_wrapped_operation(2000, hash); + + let result = mempool.add_operation(&operation); + + assert!(result.is_ok()); + } + + #[test] + fn test_add_operation_below_minimum_gas() { + let mut mempool = create_test_mempool(2000); + let hash = FixedBytes::from([1u8; 32]); + let operation = create_wrapped_operation(1000, hash); + + let result = mempool.add_operation(&operation); + + assert!(result.is_err()); + assert!( + result + .unwrap_err() + .to_string() + .contains("Gas price is below the minimum required PVG gas") + ); + } + + #[test] + fn test_add_multiple_operations_with_different_hashes() { + let mut mempool = create_test_mempool(1000); + + let hash1 = FixedBytes::from([1u8; 32]); + let operation1 = create_wrapped_operation(2000, hash1); + let result1 = mempool.add_operation(&operation1); + assert!(result1.is_ok()); + + let hash2 = FixedBytes::from([2u8; 32]); + let operation2 = create_wrapped_operation(3000, hash2); + let result2 = mempool.add_operation(&operation2); + assert!(result2.is_ok()); + + let hash3 = FixedBytes::from([3u8; 32]); + let operation3 = create_wrapped_operation(1500, hash3); + let result3 = mempool.add_operation(&operation3); + assert!(result3.is_ok()); + + assert_eq!(mempool.hash_to_operation.len(), 3); + assert_eq!(mempool.best.len(), 3); + } + + #[test] + fn test_remove_operation_not_in_mempool() { + let mut mempool = create_test_mempool(1000); + let hash = FixedBytes::from([1u8; 32]); + + let result = mempool.remove_operation(&hash); + assert!(result.is_ok()); + assert!(result.unwrap().is_none()); + } + + #[test] + fn test_remove_operation_exists() { + let mut mempool = create_test_mempool(1000); + let hash = FixedBytes::from([1u8; 32]); + let operation = create_wrapped_operation(2000, hash); + + mempool.add_operation(&operation).unwrap(); + + let result = mempool.remove_operation(&hash); + assert!(result.is_ok()); + let removed = result.unwrap(); + assert!(removed.is_some()); + let removed_op = removed.unwrap(); + assert_eq!(removed_op.hash, hash); + assert_eq!(removed_op.operation.max_fee_per_gas(), Uint::from(2000)); + } + + #[test] + fn test_remove_operation_and_check_best() { + let mut mempool = create_test_mempool(1000); + let hash = FixedBytes::from([1u8; 32]); + let operation = create_wrapped_operation(2000, hash); + + mempool.add_operation(&operation).unwrap(); + + let best_before: Vec<_> = mempool.get_top_operations(10).collect(); + assert_eq!(best_before.len(), 1); + assert_eq!(best_before[0].hash, hash); + + let result = mempool.remove_operation(&hash); + assert!(result.is_ok()); + assert!(result.unwrap().is_some()); + + let best_after: Vec<_> = mempool.get_top_operations(10).collect(); + assert_eq!(best_after.len(), 0); + } + + #[test] + fn test_get_top_operations_ordering() { + let mut mempool = create_test_mempool(1000); + + let hash1 = FixedBytes::from([1u8; 32]); + let operation1 = create_wrapped_operation(2000, hash1); + mempool.add_operation(&operation1).unwrap(); + + let hash2 = FixedBytes::from([2u8; 32]); + let operation2 = create_wrapped_operation(3000, hash2); + mempool.add_operation(&operation2).unwrap(); + + let hash3 = FixedBytes::from([3u8; 32]); + let operation3 = create_wrapped_operation(1500, hash3); + mempool.add_operation(&operation3).unwrap(); + + let best: Vec<_> = mempool.get_top_operations(10).collect(); + assert_eq!(best.len(), 3); + assert_eq!(best[0].operation.max_fee_per_gas(), Uint::from(3000)); + assert_eq!(best[1].operation.max_fee_per_gas(), Uint::from(2000)); + assert_eq!(best[2].operation.max_fee_per_gas(), Uint::from(1500)); + } + + #[test] + fn test_get_top_operations_limit() { + let mut mempool = create_test_mempool(1000); + + let hash1 = FixedBytes::from([1u8; 32]); + let operation1 = create_wrapped_operation(2000, hash1); + mempool.add_operation(&operation1).unwrap(); + + let hash2 = FixedBytes::from([2u8; 32]); + let operation2 = create_wrapped_operation(3000, hash2); + mempool.add_operation(&operation2).unwrap(); + + let hash3 = FixedBytes::from([3u8; 32]); + let operation3 = create_wrapped_operation(1500, hash3); + mempool.add_operation(&operation3).unwrap(); + + let best: Vec<_> = mempool.get_top_operations(2).collect(); + assert_eq!(best.len(), 2); + assert_eq!(best[0].operation.max_fee_per_gas(), Uint::from(3000)); + assert_eq!(best[1].operation.max_fee_per_gas(), Uint::from(2000)); + } + + #[test] + fn test_get_top_operations_submission_id_tie_breaker() { + let mut mempool = create_test_mempool(1000); + + let hash1 = FixedBytes::from([1u8; 32]); + let operation1 = create_wrapped_operation(2000, hash1); + mempool.add_operation(&operation1).unwrap(); + + let hash2 = FixedBytes::from([2u8; 32]); + let operation2 = create_wrapped_operation(2000, hash2); + mempool.add_operation(&operation2).unwrap(); + + let best: Vec<_> = mempool.get_top_operations(2).collect(); + assert_eq!(best.len(), 2); + assert_eq!(best[0].hash, hash1); + assert_eq!(best[1].hash, hash2); + } + + #[test] + fn test_get_top_operations_should_return_the_lowest_nonce_operation_for_each_account() { + let mut mempool = create_test_mempool(1000); + let hash1 = FixedBytes::from([1u8; 32]); + let test_user_operation = create_test_user_operation(2000); + + let base_op = match test_user_operation.clone() { + VersionedUserOperation::UserOperation(op) => op, + _ => panic!("expected UserOperation variant"), + }; + + let operation1 = WrappedUserOperation { + operation: VersionedUserOperation::UserOperation(erc4337::UserOperation { + nonce: Uint::from(0), + max_fee_per_gas: Uint::from(2000), + ..base_op.clone() + }), + hash: hash1, + }; + + mempool.add_operation(&operation1).unwrap(); + let hash2 = FixedBytes::from([2u8; 32]); + let operation2 = WrappedUserOperation { + operation: VersionedUserOperation::UserOperation(erc4337::UserOperation { + nonce: Uint::from(1), + max_fee_per_gas: Uint::from(10_000), + ..base_op.clone() + }), + hash: hash2, + }; + mempool.add_operation(&operation2).unwrap(); + + let best: Vec<_> = mempool.get_top_operations(2).collect(); + assert_eq!(best.len(), 1); + assert_eq!(best[0].operation.nonce(), Uint::from(0)); + } +} diff --git a/crates/account-abstraction-core-v2/src/infrastructure/in_memory/mod.rs b/crates/account-abstraction-core-v2/src/infrastructure/in_memory/mod.rs new file mode 100644 index 0000000..c6c321b --- /dev/null +++ b/crates/account-abstraction-core-v2/src/infrastructure/in_memory/mod.rs @@ -0,0 +1,3 @@ +pub mod mempool; + +pub use mempool::InMemoryMempool; diff --git a/crates/account-abstraction-core-v2/src/infrastructure/kafka/consumer.rs b/crates/account-abstraction-core-v2/src/infrastructure/kafka/consumer.rs new file mode 100644 index 0000000..708266b --- /dev/null +++ b/crates/account-abstraction-core-v2/src/infrastructure/kafka/consumer.rs @@ -0,0 +1,29 @@ +use crate::domain::events::MempoolEvent; +use crate::services::interfaces::event_source::EventSource; +use async_trait::async_trait; +use rdkafka::{Message, consumer::StreamConsumer}; +use serde_json; +use std::sync::Arc; + +pub struct KafkaEventSource { + consumer: Arc, +} + +impl KafkaEventSource { + pub fn new(consumer: Arc) -> Self { + Self { consumer } + } +} + +#[async_trait] +impl EventSource for KafkaEventSource { + async fn receive(&self) -> anyhow::Result { + let msg = self.consumer.recv().await?.detach(); + let payload = msg + .payload() + .ok_or_else(|| anyhow::anyhow!("Kafka message missing payload"))?; + let event: MempoolEvent = serde_json::from_slice(payload) + .map_err(|e| anyhow::anyhow!("Failed to parse Mempool event: {e}"))?; + Ok(event) + } +} diff --git a/crates/account-abstraction-core-v2/src/infrastructure/kafka/mod.rs b/crates/account-abstraction-core-v2/src/infrastructure/kafka/mod.rs new file mode 100644 index 0000000..dca723b --- /dev/null +++ b/crates/account-abstraction-core-v2/src/infrastructure/kafka/mod.rs @@ -0,0 +1 @@ +pub mod consumer; diff --git a/crates/account-abstraction-core-v2/src/infrastructure/mod.rs b/crates/account-abstraction-core-v2/src/infrastructure/mod.rs new file mode 100644 index 0000000..4b0d4ce --- /dev/null +++ b/crates/account-abstraction-core-v2/src/infrastructure/mod.rs @@ -0,0 +1,3 @@ +pub mod base_node; +pub mod in_memory; +pub mod kafka; diff --git a/crates/account-abstraction-core-v2/src/lib.rs b/crates/account-abstraction-core-v2/src/lib.rs new file mode 100644 index 0000000..0b88b37 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/lib.rs @@ -0,0 +1,23 @@ +//! High-level services that orchestrate domain logic. +//! Designed to be reused by other binaries (ingress-rpc, workers, etc.) + +pub mod domain; +pub mod factories; +pub mod infrastructure; +pub mod services; + +// Convenient re-exports for common imports +pub use domain::{ + events::MempoolEvent, + mempool::{Mempool, PoolConfig}, + types::{ValidationResult, VersionedUserOperation, WrappedUserOperation}, +}; + +pub use infrastructure::in_memory::InMemoryMempool; + +pub use services::{ + interfaces::{event_source::EventSource, user_op_validator::UserOperationValidator}, + mempool_engine::MempoolEngine, +}; + +pub use factories::kafka_engine::create_mempool_engine; diff --git a/crates/account-abstraction-core-v2/src/services/interfaces/event_source.rs b/crates/account-abstraction-core-v2/src/services/interfaces/event_source.rs new file mode 100644 index 0000000..913bda0 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/services/interfaces/event_source.rs @@ -0,0 +1,7 @@ +use crate::domain::events::MempoolEvent; +use async_trait::async_trait; + +#[async_trait] +pub trait EventSource: Send + Sync { + async fn receive(&self) -> anyhow::Result; +} diff --git a/crates/account-abstraction-core-v2/src/services/interfaces/mod.rs b/crates/account-abstraction-core-v2/src/services/interfaces/mod.rs new file mode 100644 index 0000000..7c19294 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/services/interfaces/mod.rs @@ -0,0 +1,2 @@ +pub mod event_source; +pub mod user_op_validator; diff --git a/crates/account-abstraction-core-v2/src/services/interfaces/user_op_validator.rs b/crates/account-abstraction-core-v2/src/services/interfaces/user_op_validator.rs new file mode 100644 index 0000000..45bc6d9 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/services/interfaces/user_op_validator.rs @@ -0,0 +1,12 @@ +use crate::domain::types::{ValidationResult, VersionedUserOperation}; +use alloy_primitives::Address; +use async_trait::async_trait; + +#[async_trait] +pub trait UserOperationValidator: Send + Sync { + async fn validate_user_operation( + &self, + user_operation: &VersionedUserOperation, + entry_point: &Address, + ) -> anyhow::Result; +} diff --git a/crates/account-abstraction-core-v2/src/services/mempool_engine.rs b/crates/account-abstraction-core-v2/src/services/mempool_engine.rs new file mode 100644 index 0000000..a4a8f66 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/services/mempool_engine.rs @@ -0,0 +1,159 @@ +use super::interfaces::event_source::EventSource; +use crate::domain::{events::MempoolEvent, mempool::Mempool}; +use std::sync::Arc; +use tokio::sync::RwLock; +use tracing::{info, warn}; + +pub struct MempoolEngine { + mempool: Arc>, + event_source: Arc, +} + +impl MempoolEngine { + pub fn new(mempool: Arc>, event_source: Arc) -> MempoolEngine { + Self { + mempool, + event_source, + } + } + + pub fn get_mempool(&self) -> Arc> { + Arc::clone(&self.mempool) + } + + pub async fn run(&self) { + loop { + if let Err(err) = self.process_next().await { + warn!(error = %err, "Mempool engine error, continuing"); + } + } + } + + pub async fn process_next(&self) -> anyhow::Result<()> { + let event = self.event_source.receive().await?; + self.handle_event(event).await + } + + async fn handle_event(&self, event: MempoolEvent) -> anyhow::Result<()> { + info!( + event = ?event, + "Mempool engine handling event" + ); + match event { + MempoolEvent::UserOpAdded { user_op } => { + self.mempool.write().await.add_operation(&user_op)?; + } + MempoolEvent::UserOpIncluded { user_op } => { + self.mempool.write().await.remove_operation(&user_op.hash)?; + } + MempoolEvent::UserOpDropped { user_op, reason: _ } => { + self.mempool.write().await.remove_operation(&user_op.hash)?; + } + } + Ok(()) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::domain::{ + mempool::PoolConfig, + types::{VersionedUserOperation, WrappedUserOperation}, + }; + use crate::infrastructure::in_memory::mempool::InMemoryMempool; + use crate::services::interfaces::event_source::EventSource; + use alloy_primitives::{Address, FixedBytes, Uint}; + use alloy_rpc_types::erc4337; + use async_trait::async_trait; + use tokio::sync::Mutex; + + fn make_wrapped_op(max_fee: u128, hash: [u8; 32]) -> WrappedUserOperation { + let op = VersionedUserOperation::UserOperation(erc4337::UserOperation { + sender: Address::ZERO, + nonce: Uint::from(0u64), + init_code: Default::default(), + call_data: Default::default(), + call_gas_limit: Uint::from(100_000u64), + verification_gas_limit: Uint::from(100_000u64), + pre_verification_gas: Uint::from(21_000u64), + max_fee_per_gas: Uint::from(max_fee), + max_priority_fee_per_gas: Uint::from(max_fee), + paymaster_and_data: Default::default(), + signature: Default::default(), + }); + + WrappedUserOperation { + operation: op, + hash: FixedBytes::from(hash), + } + } + + struct MockEventSource { + events: Mutex>, + } + + impl MockEventSource { + fn new(events: Vec) -> Self { + Self { + events: Mutex::new(events), + } + } + } + + #[async_trait] + impl EventSource for MockEventSource { + async fn receive(&self) -> anyhow::Result { + let mut guard = self.events.lock().await; + if guard.is_empty() { + Err(anyhow::anyhow!("no more events")) + } else { + Ok(guard.remove(0)) + } + } + } + + #[tokio::test] + async fn handle_add_operation() { + let mempool = Arc::new(RwLock::new(InMemoryMempool::new(PoolConfig::default()))); + + let op_hash = [1u8; 32]; + let wrapped = make_wrapped_op(1_000, op_hash); + + let add_event = MempoolEvent::UserOpAdded { + user_op: wrapped.clone(), + }; + let mock_source = Arc::new(MockEventSource::new(vec![add_event])); + + let engine = MempoolEngine::new(mempool.clone(), mock_source); + + engine.process_next().await.unwrap(); + let items: Vec<_> = mempool.read().await.get_top_operations(10).collect(); + assert_eq!(items.len(), 1); + assert_eq!(items[0].hash, FixedBytes::from(op_hash)); + } + + #[tokio::test] + async fn remove_operation_should_remove_from_mempool() { + let mempool = Arc::new(RwLock::new(InMemoryMempool::new(PoolConfig::default()))); + let op_hash = [1u8; 32]; + let wrapped = make_wrapped_op(1_000, op_hash); + let add_event = MempoolEvent::UserOpAdded { + user_op: wrapped.clone(), + }; + let remove_event = MempoolEvent::UserOpDropped { + user_op: wrapped.clone(), + reason: "test".to_string(), + }; + let mock_source = Arc::new(MockEventSource::new(vec![add_event, remove_event])); + + let engine = MempoolEngine::new(mempool.clone(), mock_source); + engine.process_next().await.unwrap(); + let items: Vec<_> = mempool.read().await.get_top_operations(10).collect(); + assert_eq!(items.len(), 1); + assert_eq!(items[0].hash, FixedBytes::from(op_hash)); + engine.process_next().await.unwrap(); + let items: Vec<_> = mempool.read().await.get_top_operations(10).collect(); + assert_eq!(items.len(), 0); + } +} diff --git a/crates/account-abstraction-core-v2/src/services/mod.rs b/crates/account-abstraction-core-v2/src/services/mod.rs new file mode 100644 index 0000000..fe032da --- /dev/null +++ b/crates/account-abstraction-core-v2/src/services/mod.rs @@ -0,0 +1,7 @@ +pub mod interfaces; +pub mod mempool_engine; +pub mod reputations_service; + +pub use interfaces::{event_source::EventSource, user_op_validator::UserOperationValidator}; +pub use mempool_engine::MempoolEngine; +pub use reputations_service::ReputationServiceImpl; diff --git a/crates/account-abstraction-core-v2/src/services/reputations_service.rs b/crates/account-abstraction-core-v2/src/services/reputations_service.rs new file mode 100644 index 0000000..df15ff1 --- /dev/null +++ b/crates/account-abstraction-core-v2/src/services/reputations_service.rs @@ -0,0 +1,27 @@ +use crate::{ + Mempool, + domain::{ReputationService, ReputationStatus}, +}; +use alloy_primitives::Address; +use async_trait::async_trait; +use std::sync::Arc; +use tokio::sync::RwLock; + +pub struct ReputationServiceImpl { + mempool: Arc>, +} + +impl ReputationServiceImpl { + pub fn new(mempool: Arc>) -> Self { + Self { mempool } + } +} + +#[async_trait] +impl ReputationService for ReputationServiceImpl { + async fn get_reputation(&self, _entity: &Address) -> ReputationStatus { + // DO something with the mempool for compiling reasons, as this is scafolding + let _ = self.mempool.read().await.get_top_operations(1); + ReputationStatus::Ok + } +} diff --git a/crates/account-abstraction-core/Cargo.toml b/crates/account-abstraction-core/Cargo.toml index 55277ca..39b1591 100644 --- a/crates/account-abstraction-core/Cargo.toml +++ b/crates/account-abstraction-core/Cargo.toml @@ -22,8 +22,11 @@ jsonrpsee.workspace = true async-trait = { workspace = true } alloy-sol-types.workspace= true anyhow.workspace = true +rdkafka.workspace = true +serde_json.workspace = true +tips-core.workspace = true +tracing.workspace=true [dev-dependencies] alloy-primitives.workspace = true -serde_json.workspace = true wiremock.workspace = true diff --git a/crates/account-abstraction-core/core/src/kafka_mempool_engine.rs b/crates/account-abstraction-core/core/src/kafka_mempool_engine.rs new file mode 100644 index 0000000..c843a08 --- /dev/null +++ b/crates/account-abstraction-core/core/src/kafka_mempool_engine.rs @@ -0,0 +1,275 @@ +use crate::mempool::PoolConfig; +use crate::mempool::{self, Mempool}; +use crate::types::WrappedUserOperation; +use async_trait::async_trait; +use rdkafka::{ + ClientConfig, Message, + consumer::{Consumer, StreamConsumer}, + message::OwnedMessage, +}; +use serde::{Deserialize, Serialize}; +use serde_json; +use std::sync::Arc; +use tips_core::kafka::load_kafka_config_from_file; +use tokio::sync::RwLock; +use tracing::{info, warn}; + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(tag = "event", content = "data")] +pub enum KafkaEvent { + UserOpAdded { + user_op: WrappedUserOperation, + }, + UserOpIncluded { + user_op: WrappedUserOperation, + }, + UserOpDropped { + user_op: WrappedUserOperation, + reason: String, + }, +} + +#[async_trait] +pub trait KafkaConsumer: Send + Sync { + async fn recv_msg(&self) -> anyhow::Result; +} + +#[async_trait] +impl KafkaConsumer for StreamConsumer { + async fn recv_msg(&self) -> anyhow::Result { + Ok(self.recv().await?.detach()) + } +} + +pub struct KafkaMempoolEngine { + mempool: Arc>, + kafka_consumer: Arc, +} + +impl KafkaMempoolEngine { + pub fn new( + mempool: Arc>, + kafka_consumer: Arc, + ) -> Self { + Self { + mempool, + kafka_consumer, + } + } + + pub fn with_kafka_consumer( + kafka_consumer: Arc, + pool_config: Option, + ) -> Self { + let pool_config = pool_config.unwrap_or_default(); + let mempool = Arc::new(RwLock::new(mempool::MempoolImpl::new(pool_config))); + Self { + mempool, + kafka_consumer, + } + } + + pub fn get_mempool(&self) -> Arc> { + self.mempool.clone() + } + + pub async fn run(&self) { + loop { + if let Err(err) = self.process_next().await { + warn!(error = %err, "Kafka mempool engine error, continuing"); + } + } + } + + /// Process a single Kafka message (useful for tests and controlled loops) + pub async fn process_next(&self) -> anyhow::Result<()> { + let msg = self.kafka_consumer.recv_msg().await?; + let payload = msg + .payload() + .ok_or_else(|| anyhow::anyhow!("Kafka message missing payload"))?; + let event: KafkaEvent = serde_json::from_slice(payload) + .map_err(|e| anyhow::anyhow!("Failed to parse Kafka event: {e}"))?; + + self.handle_event(event).await + } + + async fn handle_event(&self, event: KafkaEvent) -> anyhow::Result<()> { + info!( + event = ?event, + "Kafka mempool engine handling event" + ); + match event { + KafkaEvent::UserOpAdded { user_op } => { + self.mempool.write().await.add_operation(&user_op)?; + } + KafkaEvent::UserOpIncluded { user_op } => { + self.mempool.write().await.remove_operation(&user_op.hash)?; + } + KafkaEvent::UserOpDropped { user_op, reason: _ } => { + self.mempool.write().await.remove_operation(&user_op.hash)?; + } + } + Ok(()) + } +} + +fn create_user_operation_consumer( + properties_file: &str, + topic: &str, + consumer_group_id: &str, +) -> anyhow::Result { + let mut client_config = ClientConfig::from_iter(load_kafka_config_from_file(properties_file)?); + + client_config.set("group.id", consumer_group_id); + client_config.set("enable.auto.commit", "true"); + + let consumer: StreamConsumer = client_config.create()?; + consumer.subscribe(&[topic])?; + + Ok(consumer) +} + +pub fn create_mempool_engine( + properties_file: &str, + topic: &str, + consumer_group_id: &str, + pool_config: Option, +) -> anyhow::Result> { + let consumer: StreamConsumer = + create_user_operation_consumer(properties_file, topic, consumer_group_id)?; + Ok(Arc::new(KafkaMempoolEngine::with_kafka_consumer( + Arc::new(consumer), + pool_config, + ))) +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::mempool::PoolConfig; + use crate::types::VersionedUserOperation; + use alloy_primitives::{Address, FixedBytes, Uint}; + use alloy_rpc_types::erc4337; + use rdkafka::Timestamp; + use tokio::sync::Mutex; + + fn make_wrapped_op(max_fee: u128, hash: [u8; 32]) -> WrappedUserOperation { + let op = VersionedUserOperation::UserOperation(erc4337::UserOperation { + sender: Address::ZERO, + nonce: Uint::from(0u64), + init_code: Default::default(), + call_data: Default::default(), + call_gas_limit: Uint::from(100_000u64), + verification_gas_limit: Uint::from(100_000u64), + pre_verification_gas: Uint::from(21_000u64), + max_fee_per_gas: Uint::from(max_fee), + max_priority_fee_per_gas: Uint::from(max_fee), + paymaster_and_data: Default::default(), + signature: Default::default(), + }); + + WrappedUserOperation { + operation: op, + hash: FixedBytes::from(hash), + } + } + + #[tokio::test] + async fn handle_add_operation() { + let mempool = Arc::new(RwLock::new( + mempool::MempoolImpl::new(PoolConfig::default()), + )); + + let op_hash = [1u8; 32]; + let wrapped = make_wrapped_op(1_000, op_hash); + + let add_event = KafkaEvent::UserOpAdded { + user_op: wrapped.clone(), + }; + let mock_consumer = Arc::new(MockConsumer::new(vec![OwnedMessage::new( + Some(serde_json::to_vec(&add_event).unwrap()), + None, + "topic".to_string(), + Timestamp::NotAvailable, + 0, + 0, + None, + )])); + + let engine = KafkaMempoolEngine::new(mempool.clone(), mock_consumer); + + // Process add then remove deterministically + engine.process_next().await.unwrap(); + let items: Vec<_> = mempool.read().await.get_top_operations(10).collect(); + assert_eq!(items.len(), 1); + assert_eq!(items[0].hash, FixedBytes::from(op_hash)); + } + + #[tokio::test] + async fn remove_opperation_should_remove_from_mempool() { + let mempool = Arc::new(RwLock::new( + mempool::MempoolImpl::new(PoolConfig::default()), + )); + let op_hash = [1u8; 32]; + let wrapped = make_wrapped_op(1_000, op_hash); + let add_mempool = KafkaEvent::UserOpAdded { + user_op: wrapped.clone(), + }; + let remove_mempool = KafkaEvent::UserOpDropped { + user_op: wrapped.clone(), + reason: "test".to_string(), + }; + let mock_consumer = Arc::new(MockConsumer::new(vec![ + OwnedMessage::new( + Some(serde_json::to_vec(&add_mempool).unwrap()), + None, + "topic".to_string(), + Timestamp::NotAvailable, + 0, + 0, + None, + ), + OwnedMessage::new( + Some(serde_json::to_vec(&remove_mempool).unwrap()), + None, + "topic".to_string(), + Timestamp::NotAvailable, + 0, + 0, + None, + ), + ])); + + let engine = KafkaMempoolEngine::new(mempool.clone(), mock_consumer); + engine.process_next().await.unwrap(); + let items: Vec<_> = mempool.read().await.get_top_operations(10).collect(); + assert_eq!(items.len(), 1); + assert_eq!(items[0].hash, FixedBytes::from(op_hash)); + engine.process_next().await.unwrap(); + let items: Vec<_> = mempool.read().await.get_top_operations(10).collect(); + assert_eq!(items.len(), 0); + } + struct MockConsumer { + msgs: Mutex>, + } + + impl MockConsumer { + fn new(msgs: Vec) -> Self { + Self { + msgs: Mutex::new(msgs), + } + } + } + + #[async_trait] + impl KafkaConsumer for MockConsumer { + async fn recv_msg(&self) -> anyhow::Result { + let mut guard = self.msgs.lock().await; + if guard.is_empty() { + Err(anyhow::anyhow!("no more messages")) + } else { + Ok(guard.remove(0)) + } + } + } +} diff --git a/crates/account-abstraction-core/core/src/lib.rs b/crates/account-abstraction-core/core/src/lib.rs index b3aa2f7..e6f0ffb 100644 --- a/crates/account-abstraction-core/core/src/lib.rs +++ b/crates/account-abstraction-core/core/src/lib.rs @@ -3,4 +3,5 @@ pub mod entrypoints; pub mod types; pub use account_abstraction_service::{AccountAbstractionService, AccountAbstractionServiceImpl}; pub use types::{SendUserOperationResponse, VersionedUserOperation}; +pub mod kafka_mempool_engine; pub mod mempool; diff --git a/crates/account-abstraction-core/core/src/mempool.rs b/crates/account-abstraction-core/core/src/mempool.rs index 637bf9c..d5eccc7 100644 --- a/crates/account-abstraction-core/core/src/mempool.rs +++ b/crates/account-abstraction-core/core/src/mempool.rs @@ -5,6 +5,7 @@ use std::collections::{BTreeSet, HashMap}; use std::sync::Arc; use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering}; +#[derive(Default)] pub struct PoolConfig { minimum_max_fee_per_gas: u128, } diff --git a/crates/account-abstraction-core/core/src/types.rs b/crates/account-abstraction-core/core/src/types.rs index 4600839..3d79564 100644 --- a/crates/account-abstraction-core/core/src/types.rs +++ b/crates/account-abstraction-core/core/src/types.rs @@ -138,7 +138,7 @@ pub struct AggregatorInfo { pub type UserOpHash = FixedBytes<32>; -#[derive(Eq, PartialEq, Clone, Debug)] +#[derive(Eq, PartialEq, Clone, Debug, Serialize, Deserialize)] pub struct WrappedUserOperation { pub operation: VersionedUserOperation, pub hash: UserOpHash, diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index 813754b..d0957e0 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -14,7 +14,7 @@ path = "src/bin/main.rs" [dependencies] tips-core.workspace = true tips-audit.workspace = true -account-abstraction-core.workspace = true +account-abstraction-core-v2.workspace = true jsonrpsee.workspace = true alloy-primitives.workspace = true op-alloy-network.workspace = true diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index 3076e18..c886edb 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -1,3 +1,4 @@ +use account_abstraction_core_v2::create_mempool_engine; use alloy_provider::ProviderBuilder; use clap::Parser; use jsonrpsee::server::Server; @@ -73,6 +74,20 @@ async fn main() -> anyhow::Result<()> { let (audit_tx, audit_rx) = mpsc::unbounded_channel::(); connect_audit_to_publisher(audit_rx, audit_publisher); + let user_op_properties_file = &config.user_operation_consumer_properties; + + let mempool_engine = create_mempool_engine( + user_op_properties_file, + &config.user_operation_topic, + &config.user_operation_consumer_group_id, + None, + )?; + + let mempool_engine_handle = { + let engine = mempool_engine.clone(); + tokio::spawn(async move { engine.run().await }) + }; + let (builder_tx, _) = broadcast::channel::(config.max_buffered_meter_bundle_responses); let (builder_backrun_tx, _) = @@ -96,6 +111,7 @@ async fn main() -> anyhow::Result<()> { audit_tx, builder_tx, builder_backrun_tx, + mempool_engine.clone(), cfg, ); let bind_addr = format!("{}:{}", config.address, config.port); @@ -111,6 +127,7 @@ async fn main() -> anyhow::Result<()> { handle.stopped().await; health_handle.abort(); + mempool_engine_handle.abort(); Ok(()) } diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index f600765..54f57a2 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -85,6 +85,21 @@ pub struct Config { )] pub audit_topic: String, + /// Kafka properties file for the user operation consumer + #[arg( + long, + env = "TIPS_INGRESS_KAFKA_USER_OPERATION_CONSUMER_PROPERTIES_FILE" + )] + pub user_operation_consumer_properties: String, + + /// Consumer group id for user operation topic (set uniquely per deployment) + #[arg( + long, + env = "TIPS_INGRESS_KAFKA_USER_OPERATION_CONSUMER_GROUP_ID", + default_value = "tips-user-operation" + )] + pub user_operation_consumer_group_id: String, + /// User operation topic for pushing valid user operations #[arg( long, diff --git a/crates/ingress-rpc/src/queue.rs b/crates/ingress-rpc/src/queue.rs index ee6063c..d360930 100644 --- a/crates/ingress-rpc/src/queue.rs +++ b/crates/ingress-rpc/src/queue.rs @@ -1,4 +1,7 @@ -use account_abstraction_core::types::VersionedUserOperation; +use account_abstraction_core_v2::{ + MempoolEvent, + domain::types::{VersionedUserOperation, WrappedUserOperation}, +}; use alloy_primitives::B256; use anyhow::Result; use async_trait::async_trait; @@ -79,9 +82,25 @@ impl UserOpQueuePublisher { pub async fn publish(&self, user_op: &VersionedUserOperation, hash: &B256) -> Result<()> { let key = hash.to_string(); - let payload = serde_json::to_vec(&user_op)?; + let event = self.create_user_op_added_event(user_op, hash); + let payload = serde_json::to_vec(&event)?; self.queue.publish(&self.topic, &key, &payload).await } + + fn create_user_op_added_event( + &self, + user_op: &VersionedUserOperation, + hash: &B256, + ) -> MempoolEvent { + let wrapped_user_op = WrappedUserOperation { + operation: user_op.clone(), + hash: *hash, + }; + + MempoolEvent::UserOpAdded { + user_op: wrapped_user_op, + } + } } pub struct BundleQueuePublisher { diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 80c0d71..e03686f 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -1,3 +1,8 @@ +use account_abstraction_core_v2::domain::ReputationService; +use account_abstraction_core_v2::infrastructure::base_node::validator::BaseNodeValidator; +use account_abstraction_core_v2::services::ReputationServiceImpl; +use account_abstraction_core_v2::services::interfaces::user_op_validator::UserOperationValidator; +use account_abstraction_core_v2::{Mempool, MempoolEngine}; use alloy_consensus::transaction::Recovered; use alloy_consensus::{Transaction, transaction::SignerRecoverable}; use alloy_primitives::{Address, B256, Bytes, FixedBytes}; @@ -23,9 +28,8 @@ use crate::metrics::{Metrics, record_histogram}; use crate::queue::{BundleQueuePublisher, MessageQueue, UserOpQueuePublisher}; use crate::validation::validate_bundle; use crate::{Config, TxSubmissionMethod}; -use account_abstraction_core::entrypoints::version::EntryPointVersion; -use account_abstraction_core::types::{UserOperationRequest, VersionedUserOperation}; -use account_abstraction_core::{AccountAbstractionService, AccountAbstractionServiceImpl}; +use account_abstraction_core_v2::domain::entrypoints::version::EntryPointVersion; +use account_abstraction_core_v2::domain::types::{UserOperationRequest, VersionedUserOperation}; use std::sync::Arc; /// RPC providers for different endpoints @@ -61,14 +65,15 @@ pub trait IngressApi { ) -> RpcResult>; } -pub struct IngressService { +pub struct IngressService { mempool_provider: Arc>, simulation_provider: Arc>, raw_tx_forward_provider: Option>>, - account_abstraction_service: AccountAbstractionServiceImpl, + user_op_validator: BaseNodeValidator, tx_submission_method: TxSubmissionMethod, bundle_queue_publisher: BundleQueuePublisher, user_op_queue_publisher: UserOpQueuePublisher, + reputation_service: Arc>, audit_channel: mpsc::UnboundedSender, send_transaction_default_lifetime_seconds: u64, metrics: Metrics, @@ -79,29 +84,30 @@ pub struct IngressService { builder_backrun_tx: broadcast::Sender, } -impl IngressService { +impl IngressService { pub fn new( providers: Providers, queue: Q, audit_channel: mpsc::UnboundedSender, builder_tx: broadcast::Sender, builder_backrun_tx: broadcast::Sender, + mempool_engine: Arc>, config: Config, ) -> Self { let mempool_provider = Arc::new(providers.mempool); let simulation_provider = Arc::new(providers.simulation); let raw_tx_forward_provider = providers.raw_tx_forward.map(Arc::new); - let account_abstraction_service: AccountAbstractionServiceImpl = - AccountAbstractionServiceImpl::new( - simulation_provider.clone(), - config.validate_user_operation_timeout_ms, - ); + let user_op_validator = BaseNodeValidator::new( + simulation_provider.clone(), + config.validate_user_operation_timeout_ms, + ); let queue_connection = Arc::new(queue); + let reputation_service = ReputationServiceImpl::new(mempool_engine.get_mempool()); Self { mempool_provider, simulation_provider, raw_tx_forward_provider, - account_abstraction_service, + user_op_validator, tx_submission_method: config.tx_submission_method, user_op_queue_publisher: UserOpQueuePublisher::new( queue_connection.clone(), @@ -111,6 +117,7 @@ impl IngressService { queue_connection.clone(), config.ingress_topic, ), + reputation_service: Arc::new(reputation_service), audit_channel, send_transaction_default_lifetime_seconds: config .send_transaction_default_lifetime_seconds, @@ -125,7 +132,7 @@ impl IngressService { } #[async_trait] -impl IngressApiServer for IngressService { +impl IngressApiServer for IngressService { async fn send_backrun_bundle(&self, bundle: Bundle) -> RpcResult { if !self.backrun_enabled { info!( @@ -345,13 +352,19 @@ impl IngressApiServer for IngressService { chain_id: 1, }; + // DO Nothing with reputation at the moment as this is scafolding + let _ = self + .reputation_service + .get_reputation(&request.user_operation.sender()) + .await; + let user_op_hash = request.hash().map_err(|e| { warn!(message = "Failed to hash user operation", error = %e); EthApiError::InvalidParams(e.to_string()).into_rpc_err() })?; let _ = self - .account_abstraction_service + .user_op_validator .validate_user_operation(&request.user_operation, &entry_point) .await .map_err(|e| { @@ -378,7 +391,7 @@ impl IngressApiServer for IngressService { } } -impl IngressService { +impl IngressService { async fn get_tx(&self, data: &Bytes) -> RpcResult> { if data.is_empty() { return Err(EthApiError::EmptyRawTransactionData.into_rpc_err()); @@ -501,6 +514,10 @@ impl IngressService { mod tests { use super::*; use crate::{Config, TxSubmissionMethod, queue::MessageQueue}; + use account_abstraction_core_v2::MempoolEvent; + use account_abstraction_core_v2::domain::PoolConfig; + use account_abstraction_core_v2::infrastructure::in_memory::mempool::InMemoryMempool; + use account_abstraction_core_v2::services::interfaces::event_source::EventSource; use alloy_provider::RootProvider; use anyhow::Result; use async_trait::async_trait; @@ -512,7 +529,7 @@ mod tests { use std::net::{IpAddr, SocketAddr}; use std::str::FromStr; use tips_core::test_utils::create_test_meter_bundle_response; - use tokio::sync::{broadcast, mpsc}; + use tokio::sync::{RwLock, broadcast, mpsc}; use url::Url; use wiremock::{Mock, MockServer, ResponseTemplate, matchers::method}; struct MockQueue; @@ -524,6 +541,15 @@ mod tests { } } + struct NoopEventSource; + + #[async_trait] + impl EventSource for NoopEventSource { + async fn receive(&self) -> anyhow::Result { + Err(anyhow::anyhow!("no events")) + } + } + fn create_test_config(mock_server: &MockServer) -> Config { Config { address: IpAddr::from([127, 0, 0, 1]), @@ -534,6 +560,8 @@ mod tests { ingress_topic: String::new(), audit_kafka_properties: String::new(), audit_topic: String::new(), + user_operation_consumer_properties: String::new(), + user_operation_consumer_group_id: "tips-user-operation".to_string(), log_level: String::from("info"), log_format: tips_core::logger::LogFormat::Pretty, send_transaction_default_lifetime_seconds: 300, @@ -660,8 +688,19 @@ mod tests { let (builder_tx, _builder_rx) = broadcast::channel(1); let (backrun_tx, _backrun_rx) = broadcast::channel(1); + let mempool_engine = Arc::new(MempoolEngine::::new( + Arc::new(RwLock::new(InMemoryMempool::new(PoolConfig::default()))), + Arc::new(NoopEventSource), + )); + let service = IngressService::new( - providers, MockQueue, audit_tx, builder_tx, backrun_tx, config, + providers, + MockQueue, + audit_tx, + builder_tx, + backrun_tx, + mempool_engine, + config, ); let bundle = Bundle::default(); @@ -719,8 +758,19 @@ mod tests { let (builder_tx, _builder_rx) = broadcast::channel(1); let (backrun_tx, _backrun_rx) = broadcast::channel(1); + let mempool_engine = Arc::new(MempoolEngine::::new( + Arc::new(RwLock::new(InMemoryMempool::new(PoolConfig::default()))), + Arc::new(NoopEventSource), + )); + let service = IngressService::new( - providers, MockQueue, audit_tx, builder_tx, backrun_tx, config, + providers, + MockQueue, + audit_tx, + builder_tx, + backrun_tx, + mempool_engine, + config, ); // Valid signed transaction bytes @@ -761,7 +811,7 @@ mod tests { let user_op = sample_user_operation_v06(); let entry_point = - account_abstraction_core::entrypoints::version::EntryPointVersion::V06_ADDRESS; + account_abstraction_core_v2::domain::entrypoints::version::EntryPointVersion::V06_ADDRESS; let result: Result, _> = client .request("eth_sendUserOperation", (user_op, entry_point)) diff --git a/docker-compose.tips.yml b/docker-compose.tips.yml index 666802a..4054ccf 100644 --- a/docker-compose.tips.yml +++ b/docker-compose.tips.yml @@ -15,6 +15,7 @@ services: volumes: - ./docker/ingress-bundles-kafka-properties:/app/docker/ingress-bundles-kafka-properties:ro - ./docker/ingress-audit-kafka-properties:/app/docker/ingress-audit-kafka-properties:ro + - ./docker/ingress-user-operation-consumer-kafka-properties:/app/docker/ingress-user-operation-consumer-kafka-properties:ro restart: unless-stopped audit: diff --git a/docker/ingress-user-operation-consumer-kafka-properties b/docker/ingress-user-operation-consumer-kafka-properties new file mode 100644 index 0000000..3bb02bf --- /dev/null +++ b/docker/ingress-user-operation-consumer-kafka-properties @@ -0,0 +1,9 @@ +# Kafka configuration properties for ingress user operation consumer +bootstrap.servers=host.docker.internal:9094 +message.timeout.ms=5000 +enable.partition.eof=false +session.timeout.ms=6000 +fetch.wait.max.ms=100 +fetch.min.bytes=1 +# Note: group.id and enable.auto.commit are set programmatically + From 2f8b0ff4780042b5e84c19de3dae09c0f62418d8 Mon Sep 17 00:00:00 2001 From: kmchicoine Date: Fri, 19 Dec 2025 12:40:56 -0800 Subject: [PATCH 088/117] feat: e2e tests + framework (#44) Adds end to end transactions testing via 'just e2e' which submits a tr=xn to TIPS and checks for inclusion on the sequencer --- .env.example | 2 +- Cargo.lock | 907 ++++++++++-------- Cargo.toml | 7 +- crates/ingress-rpc/src/validation.rs | 18 + crates/system-tests/Cargo.toml | 55 ++ crates/system-tests/README.md | 30 + crates/system-tests/src/client/mod.rs | 3 + crates/system-tests/src/client/tips_rpc.rs | 53 + crates/system-tests/src/fixtures/mod.rs | 3 + .../system-tests/src/fixtures/transactions.rs | 73 ++ crates/system-tests/src/lib.rs | 2 + crates/system-tests/tests/common/kafka.rs | 115 +++ crates/system-tests/tests/common/mod.rs | 1 + .../system-tests/tests/integration_tests.rs | 359 +++++++ docker/host-ingress-audit-kafka-properties | 4 + docker/host-ingress-bundles-kafka-properties | 4 + justfile | 17 + 17 files changed, 1256 insertions(+), 397 deletions(-) create mode 100644 crates/system-tests/Cargo.toml create mode 100644 crates/system-tests/README.md create mode 100644 crates/system-tests/src/client/mod.rs create mode 100644 crates/system-tests/src/client/tips_rpc.rs create mode 100644 crates/system-tests/src/fixtures/mod.rs create mode 100644 crates/system-tests/src/fixtures/transactions.rs create mode 100644 crates/system-tests/src/lib.rs create mode 100644 crates/system-tests/tests/common/kafka.rs create mode 100644 crates/system-tests/tests/common/mod.rs create mode 100644 crates/system-tests/tests/integration_tests.rs create mode 100644 docker/host-ingress-audit-kafka-properties create mode 100644 docker/host-ingress-bundles-kafka-properties diff --git a/.env.example b/.env.example index 4058bd9..316b335 100644 --- a/.env.example +++ b/.env.example @@ -40,4 +40,4 @@ TIPS_UI_S3_BUCKET_NAME=tips TIPS_UI_S3_CONFIG_TYPE=manual TIPS_UI_S3_ENDPOINT=http://localhost:7000 TIPS_UI_S3_ACCESS_KEY_ID=minioadmin -TIPS_UI_S3_SECRET_ACCESS_KEY=minioadmin +TIPS_UI_S3_SECRET_ACCESS_KEY=minioadmin \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index d33b32c..3b241d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -84,9 +84,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy-chains" -version = "0.2.18" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaa9ea039a6f9304b4a593d780b1f23e1ae183acdee938b11b38795acacc9f1" +checksum = "35d744058a9daa51a8cf22a3009607498fcf82d3cf4c5444dd8056cdf651f471" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -97,9 +97,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6440213a22df93a87ed512d2f668e7dc1d62a05642d107f82d61edc9e12370" +checksum = "2e318e25fb719e747a7e8db1654170fc185024f3ed5b10f86c08d448a912f6e2" dependencies = [ "alloy-eips", "alloy-primitives", @@ -124,9 +124,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d0bea09287942405c4f9d2a4f22d1e07611c2dbd9d5bf94b75366340f9e6e0" +checksum = "364380a845193a317bcb7a5398fc86cdb66c47ebe010771dde05f6869bf9e64a" dependencies = [ "alloy-consensus", "alloy-eips", @@ -177,9 +177,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd2c7ae05abcab4483ce821f12f285e01c0b33804e6883dd9ca1569a87ee2be" +checksum = "a4c4d7c5839d9f3a467900c625416b24328450c65702eb3d8caff8813e4d1d33" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -225,23 +225,24 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c25d5acb35706e683df1ea333c862bdb6b7c5548836607cd5bb56e501cca0b4f" +checksum = "1ba4b1be0988c11f0095a2380aa596e35533276b8fa6c9e06961bbfe0aebcac5" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-serde", "alloy-trie", + "borsh", "serde", "serde_with", ] [[package]] name = "alloy-hardforks" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e29d7eacf42f89c21d7f089916d0bdb4f36139a31698790e8837d2dbbd4b2c3" +checksum = "2d9a33550fc21fd77a3f8b63e99969d17660eec8dcc50a95a80f7c9964f7680b" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -252,9 +253,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5513d5e6bd1cba6bdcf5373470f559f320c05c8c59493b6e98912fbe6733943f" +checksum = "9914c147bb9b25f440eca68a31dc29f5c22298bfa7754aa802965695384122b0" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -264,13 +265,13 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b67c5a702121e618217f7a86f314918acb2622276d0273490e2d4534490bc0" +checksum = "f72cf87cda808e593381fb9f005ffa4d2475552b7a6c5ac33d087bf77d82abd0" dependencies = [ "alloy-primitives", "alloy-sol-types", - "http 1.3.1", + "http 1.4.0", "serde", "serde_json", "thiserror 2.0.17", @@ -279,9 +280,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "612296e6b723470bb1101420a73c63dfd535aa9bf738ce09951aedbd4ab7292e" +checksum = "12aeb37b6f2e61b93b1c3d34d01ee720207c76fe447e2a2c217e433ac75b17f5" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -305,9 +306,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7805124ad69e57bbae7731c9c344571700b2a18d351bda9e0eba521c991d1bcb" +checksum = "abd29ace62872083e30929cd9b282d82723196d196db589f3ceda67edcc05552" dependencies = [ "alloy-consensus", "alloy-eips", @@ -336,9 +337,9 @@ dependencies = [ [[package]] name = "alloy-op-hardforks" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ac97adaba4c26e17192d81f49186ac20c1e844e35a00e169c8d3d58bc84e6b" +checksum = "f96fb2fce4024ada5b2c11d4076acf778a0d3e4f011c6dfd2ffce6d0fcf84ee9" dependencies = [ "alloy-chains", "alloy-hardforks", @@ -348,9 +349,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355bf68a433e0fd7f7d33d5a9fc2583fde70bf5c530f63b80845f8da5505cf28" +checksum = "7db950a29746be9e2f2c6288c8bd7a6202a81f999ce109a2933d2379970ec0fa" dependencies = [ "alloy-rlp", "bytes", @@ -359,14 +360,15 @@ dependencies = [ "derive_more", "foldhash 0.2.0", "getrandom 0.3.4", - "hashbrown 0.16.0", - "indexmap 2.12.0", + "hashbrown 0.16.1", + "indexmap 2.12.1", "itoa", "k256", "keccak-asm", "paste", "proptest", "rand 0.9.2", + "rapidhash", "ruint", "rustc-hash", "serde", @@ -376,9 +378,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55c1313a527a2e464d067c031f3c2ec073754ef615cc0eabca702fd0fe35729c" +checksum = "9b710636d7126e08003b8217e24c09f0cca0b46d62f650a841736891b1ed1fc1" dependencies = [ "alloy-chains", "alloy-consensus", @@ -432,14 +434,14 @@ checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] name = "alloy-rpc-client" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f802228273056528dfd6cc8845cc91a7c7e0c6fc1a66d19e8673743dacdc7e" +checksum = "d0882e72d2c1c0c79dcf4ab60a67472d3f009a949f774d4c17d0bdb669cfde05" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -460,9 +462,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e279e6d40ee40fe8f76753b678d8d5d260cb276dc6c8a8026099b16d2b43f4" +checksum = "39cf1398cb33aacb139a960fa3d8cf8b1202079f320e77e952a0b95967bf7a9f" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -473,9 +475,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e11a40c917c704888aa5aa6ffa563395123b732868d2e072ec7dd46c3d4672" +checksum = "65a583d2029b171301f5dcf122aa2ef443a65a373778ec76540d999691ae867d" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -485,9 +487,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdbf6d1766ca41e90ac21c4bc5cbc5e9e965978a25873c3f90b3992d905db4cb" +checksum = "6a63fb40ed24e4c92505f488f9dd256e2afaed17faa1b7a221086ebba74f4122" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -496,9 +498,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4c53a8b0905d931e7921774a1830609713bd3e8222347963172b03a3ecc68" +checksum = "4c60bdce3be295924122732b7ecd0b2495ce4790bedc5370ca7019c08ad3f26e" dependencies = [ "alloy-consensus", "alloy-eips", @@ -516,9 +518,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5fafb741c19b3cca4cdd04fa215c89413491f9695a3e928dee2ae5657f607e" +checksum = "9eae0c7c40da20684548cbc8577b6b7447f7bf4ddbac363df95e3da220e41e72" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -537,9 +539,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0c800e2ce80829fca1491b3f9063c29092850dc6cf19249d5f678f0ce71bb0" +checksum = "ef206a4b8d436fbb7cf2e6a61c692d11df78f9382becc3c9a283bd58e64f0583" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -551,9 +553,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f180c399ca7c1e2fe17ea58343910cad0090878a696ff5a50241aee12fc529" +checksum = "c0df1987ed0ff2d0159d76b52e7ddfc4e4fbddacc54d2fbee765e0d14d7c01b5" dependencies = [ "alloy-primitives", "serde", @@ -562,9 +564,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf0b42ffbf558badfecf1dde0c3c5ed91f29bb7e97876d0bed008c3d5d67171" +checksum = "6ff69deedee7232d7ce5330259025b868c5e6a52fa8dffda2c861fb3a5889b24" dependencies = [ "alloy-primitives", "async-trait", @@ -577,9 +579,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e7d555ee5f27be29af4ae312be014b57c6cff9acb23fe2cf008500be6ca7e33" +checksum = "72cfe0be3ec5a8c1a46b2e5a7047ed41121d360d97f4405bb7c1c784880c86cb" dependencies = [ "alloy-consensus", "alloy-network", @@ -593,41 +595,41 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ce480400051b5217f19d6e9a82d9010cdde20f1ae9c00d53591e4a1afbb312" +checksum = "a3b96d5f5890605ba9907ce1e2158e2701587631dc005bfa582cf92dd6f21147" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] name = "alloy-sol-macro-expander" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d792e205ed3b72f795a8044c52877d2e6b6e9b1d13f431478121d8d4eaa9028" +checksum = "b8247b7cca5cde556e93f8b3882b01dbd272f527836049083d240c57bf7b4c15" dependencies = [ "alloy-sol-macro-input", "const-hex", "heck", - "indexmap 2.12.0", + "indexmap 2.12.1", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "syn-solidity", "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd1247a8f90b465ef3f1207627547ec16940c35597875cdc09c49d58b19693c" +checksum = "3cd54f38512ac7bae10bbc38480eefb1b9b398ca2ce25db9cc0c048c6411c4f1" dependencies = [ "const-hex", "dunce", @@ -635,15 +637,15 @@ dependencies = [ "macro-string", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "954d1b2533b9b2c7959652df3076954ecb1122a28cc740aa84e7b0a49f6ac0a9" +checksum = "444b09815b44899564566d4d56613d14fa9a274b1043a021f00468568752f449" dependencies = [ "serde", "winnow", @@ -651,9 +653,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70319350969a3af119da6fb3e9bddb1bce66c9ea933600cb297c8b1850ad2a3c" +checksum = "dc1038284171df8bfd48befc0c7b78f667a7e2be162f45f07bd1c378078ebe58" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -663,9 +665,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b3deee699d6f271eab587624a9fa84d02d0755db7a95a043d52a6488d16ebe" +checksum = "be98b07210d24acf5b793c99b759e9a696e4a2e67593aec0487ae3b3e1a2478c" dependencies = [ "alloy-json-rpc", "auto_impl", @@ -686,9 +688,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1720bd2ba8fe7e65138aca43bb0f680e4e0bcbd3ca39bf9d3035c9d7d2757f24" +checksum = "4198a1ee82e562cab85e7f3d5921aab725d9bd154b6ad5017f82df1695877c97" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -717,14 +719,14 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae109e33814b49fc0a62f2528993aa8a2dd346c26959b151f05441dc0b9da292" +checksum = "333544408503f42d7d3792bfc0f7218b643d968a03d2c0ed383ae558fb4a76d0" dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -768,22 +770,22 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.10" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -803,7 +805,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -936,7 +938,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -974,7 +976,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1063,7 +1065,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1140,7 +1142,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1151,7 +1153,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1178,7 +1180,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1189,9 +1191,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-config" -version = "1.8.10" +version = "1.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1856b1b48b65f71a4dd940b1c0931f9a7b646d4a924b9828ffefc1454714668a" +checksum = "96571e6996817bf3d58f6b569e4b9fd2e9d2fcf9f7424eed07b2ce9bb87535e5" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1208,7 +1210,7 @@ dependencies = [ "bytes", "fastrand", "hex", - "http 1.3.1", + "http 1.4.0", "ring", "time", "tokio", @@ -1219,9 +1221,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.9" +version = "1.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86590e57ea40121d47d3f2e131bfd873dea15d78dc2f4604f4734537ad9e56c4" +checksum = "3cd362783681b15d136480ad555a099e82ecd8e2d10a841e14dfd0078d67fee3" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -1231,9 +1233,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.15.0" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5932a7d9d28b0d2ea34c6b3779d35e3dd6f6345317c34e73438c4f1f29144151" +checksum = "6a88aab2464f1f25453baa7a07c84c5b7684e274054ba06817f382357f77a288" dependencies = [ "aws-lc-sys", "zeroize", @@ -1241,11 +1243,10 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1826f2e4cfc2cd19ee53c42fbf68e2f81ec21108e0b7ecf6a71cf062137360fc" +checksum = "b45afffdee1e7c9126814751f88dddc747f41d91da16c9551a0f1e8a11e788a1" dependencies = [ - "bindgen", "cc", "cmake", "dunce", @@ -1254,9 +1255,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.5.14" +version = "1.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe0fd441565b0b318c76e7206c8d1d0b0166b3e986cf30e890b61feb6192045" +checksum = "d81b5b2898f6798ad58f484856768bca817e3cd9de0974c24ae0f1113fe88f1b" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -1279,9 +1280,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.112.0" +version = "1.118.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee73a27721035c46da0572b390a69fbdb333d0177c24f3d8f7ff952eeb96690" +checksum = "d3e6b7079f85d9ea9a70643c9f89f50db70f5ada868fa9cfe08c1ffdf51abc13" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1301,7 +1302,7 @@ dependencies = [ "hex", "hmac", "http 0.2.12", - "http 1.3.1", + "http 1.4.0", "http-body 0.4.6", "lru 0.12.5", "percent-encoding", @@ -1313,9 +1314,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.89.0" +version = "1.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c1b1af02288f729e95b72bd17988c009aa72e26dcb59b3200f86d7aea726c9" +checksum = "8ee6402a36f27b52fe67661c6732d684b2635152b676aa2babbfb5204f99115d" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1335,9 +1336,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.91.0" +version = "1.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8122301558dc7c6c68e878af918880b82ff41897a60c8c4e18e4dc4d93e9f1" +checksum = "a45a7f750bbd170ee3677671ad782d90b894548f4e4ae168302c57ec9de5cb3e" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1357,9 +1358,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.92.0" +version = "1.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c7808adcff8333eaa76a849e6de926c6ac1a1268b9fd6afe32de9c29ef29d2" +checksum = "55542378e419558e6b1f398ca70adb0b2088077e79ad9f14eb09441f2f7b2164" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1380,9 +1381,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.3.6" +version = "1.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35452ec3f001e1f2f6db107b6373f1f48f05ec63ba2c5c9fa91f07dad32af11" +checksum = "69e523e1c4e8e7e8ff219d732988e22bfeae8a1cafdbe6d9eca1546fa080be7c" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -1395,7 +1396,7 @@ dependencies = [ "hex", "hmac", "http 0.2.12", - "http 1.3.1", + "http 1.4.0", "p256 0.11.1", "percent-encoding", "ring", @@ -1408,9 +1409,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.2.6" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "127fcfad33b7dfc531141fda7e1c402ac65f88aca5511a4d31e2e3d2cd01ce9c" +checksum = "9ee19095c7c4dda59f1697d028ce704c24b2d33c6718790c7f1d5a3015b4107c" dependencies = [ "futures-util", "pin-project-lite", @@ -1419,9 +1420,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.63.11" +version = "0.63.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95bd108f7b3563598e4dc7b62e1388c9982324a2abd622442167012690184591" +checksum = "87294a084b43d649d967efe58aa1f9e0adc260e13a6938eb904c0ae9b45824ae" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -1439,9 +1440,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.60.13" +version = "0.60.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e29a304f8319781a39808847efb39561351b1bb76e933da7aa90232673638658" +checksum = "dc12f8b310e38cad85cf3bef45ad236f470717393c613266ce0a89512286b650" dependencies = [ "aws-smithy-types", "bytes", @@ -1450,9 +1451,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.62.5" +version = "0.62.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445d5d720c99eed0b4aa674ed00d835d9b1427dd73e04adaf2f94c6b2d6f9fca" +checksum = "826141069295752372f8203c17f28e30c464d22899a43a0c9fd9c458d469c88b" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -1462,7 +1463,7 @@ dependencies = [ "futures-core", "futures-util", "http 0.2.12", - "http 1.3.1", + "http 1.4.0", "http-body 0.4.6", "percent-encoding", "pin-project-lite", @@ -1472,9 +1473,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-client" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "623254723e8dfd535f566ee7b2381645f8981da086b5c4aa26c0c41582bb1d2c" +checksum = "59e62db736db19c488966c8d787f52e6270be565727236fd5579eaa301e7bc4a" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -1482,17 +1483,17 @@ dependencies = [ "h2 0.3.27", "h2 0.4.12", "http 0.2.12", - "http 1.3.1", + "http 1.4.0", "http-body 0.4.6", "hyper 0.14.32", - "hyper 1.8.0", + "hyper 1.8.1", "hyper-rustls 0.24.2", "hyper-rustls 0.27.7", "hyper-util", "pin-project-lite", "rustls 0.21.12", "rustls 0.23.35", - "rustls-native-certs 0.8.2", + "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls 0.26.4", @@ -1502,27 +1503,27 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.61.7" +version = "0.61.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2db31f727935fc63c6eeae8b37b438847639ec330a9161ece694efba257e0c54" +checksum = "49fa1213db31ac95288d981476f78d05d9cbb0353d22cdf3472cc05bb02f6551" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-observability" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1881b1ea6d313f9890710d65c158bdab6fb08c91ea825f74c1c8c357baf4cc" +checksum = "17f616c3f2260612fe44cede278bafa18e73e6479c4e393e2c4518cf2a9a228a" dependencies = [ "aws-smithy-runtime-api", ] [[package]] name = "aws-smithy-query" -version = "0.60.8" +version = "0.60.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d28a63441360c477465f80c7abac3b9c4d075ca638f982e605b7dc2a2c7156c9" +checksum = "ae5d689cf437eae90460e944a58b5668530d433b4ff85789e69d2f2a556e057d" dependencies = [ "aws-smithy-types", "urlencoding", @@ -1530,9 +1531,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.9.4" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bbe9d018d646b96c7be063dd07987849862b0e6d07c778aad7d93d1be6c1ef0" +checksum = "65fda37911905ea4d3141a01364bc5509a0f32ae3f3b22d6e330c0abfb62d247" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -1543,7 +1544,7 @@ dependencies = [ "bytes", "fastrand", "http 0.2.12", - "http 1.3.1", + "http 1.4.0", "http-body 0.4.6", "http-body 1.0.1", "pin-project-lite", @@ -1554,15 +1555,15 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7204f9fd94749a7c53b26da1b961b4ac36bf070ef1e0b94bb09f79d4f6c193" +checksum = "ab0d43d899f9e508300e587bf582ba54c27a452dd0a9ea294690669138ae14a2" dependencies = [ "aws-smithy-async", "aws-smithy-types", "bytes", "http 0.2.12", - "http 1.3.1", + "http 1.4.0", "pin-project-lite", "tokio", "tracing", @@ -1571,16 +1572,16 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.3.4" +version = "1.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f535879a207fce0db74b679cfc3e91a3159c8144d717d55f5832aea9eef46e" +checksum = "905cb13a9895626d49cf2ced759b062d913834c7482c38e49557eac4e6193f01" dependencies = [ "base64-simd", "bytes", "bytes-utils", "futures-core", "http 0.2.12", - "http 1.3.1", + "http 1.4.0", "http-body 0.4.6", "http-body 1.0.1", "http-body-util", @@ -1597,18 +1598,18 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.12" +version = "0.60.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab77cdd036b11056d2a30a7af7b775789fb024bf216acc13884c6c97752ae56" +checksum = "11b2f670422ff42bf7065031e72b45bc52a3508bd089f743ea90731ca2b6ea57" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "1.3.10" +version = "1.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79fb68e3d7fe5d4833ea34dc87d2e97d26d3086cb3da660bb6b1f76d98680b6" +checksum = "1d980627d2dd7bfc32a3c025685a033eeab8d365cc840c631ef59d1b8f428164" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -1628,10 +1629,10 @@ dependencies = [ "bytes", "form_urlencoded", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", - "hyper 1.8.0", + "hyper 1.8.1", "hyper-util", "itoa", "matchit", @@ -1659,7 +1660,7 @@ checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22" dependencies = [ "bytes", "futures-core", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "mime", @@ -1723,9 +1724,9 @@ dependencies = [ [[package]] name = "base64ct" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" +checksum = "0e050f626429857a27ddccb31e0aca21356bfa709c04041aefddac081a8f068a" [[package]] name = "bindgen" @@ -1737,14 +1738,12 @@ dependencies = [ "cexpr", "clang-sys", "itertools 0.13.0", - "log", - "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1764,15 +1763,15 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitcoin-io" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" +checksum = "2dee39a0ee5b4095224a0cfc6bf4cc1baf0f9624b96b367e53b66d974e51d953" [[package]] name = "bitcoin_hashes" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +checksum = "26ec84b80c482df901772e931a9a681e26a1b9ee2302edeff23cb30328745c8b" dependencies = [ "bitcoin-io", "hex-conservative", @@ -1840,9 +1839,9 @@ dependencies = [ "futures-util", "hex", "home", - "http 1.3.1", + "http 1.4.0", "http-body-util", - "hyper 1.8.0", + "hyper 1.8.1", "hyper-named-pipe", "hyper-rustls 0.27.7", "hyper-util", @@ -1850,8 +1849,8 @@ dependencies = [ "log", "pin-project-lite", "rustls 0.23.35", - "rustls-native-certs 0.8.2", - "rustls-pemfile 2.2.0", + "rustls-native-certs", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_derive", @@ -1879,9 +1878,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce" +checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f" dependencies = [ "borsh-derive", "cfg_aliases", @@ -1889,22 +1888,22 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3" +checksum = "0686c856aa6aac0c4498f936d7d6a02df690f614c03e4d906d1018062b5c5e2c" dependencies = [ "once_cell", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "byte-slice-cast" @@ -1920,9 +1919,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" dependencies = [ "serde", ] @@ -1954,9 +1953,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.45" +version = "1.2.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" +checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215" dependencies = [ "find-msvc-tools", "jobserver", @@ -2016,9 +2015,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.51" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" +checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" dependencies = [ "clap_builder", "clap_derive", @@ -2026,9 +2025,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.51" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" +checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" dependencies = [ "anstream", "anstyle", @@ -2045,7 +2044,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2056,9 +2055,9 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "cmake" -version = "0.1.54" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d" dependencies = [ "cc", ] @@ -2119,9 +2118,9 @@ dependencies = [ [[package]] name = "convert_case" -version = "0.7.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" +checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" dependencies = [ "unicode-segmentation", ] @@ -2163,9 +2162,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" dependencies = [ "crc-catalog", ] @@ -2300,7 +2299,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2315,7 +2314,7 @@ dependencies = [ "quote", "serde", "strsim", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2326,7 +2325,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core 0.20.11", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2337,7 +2336,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core 0.21.3", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2421,28 +2420,29 @@ checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] name = "derive_more" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +checksum = "10b768e943bed7bf2cab53df09f4bc34bfd217cdb57d971e769874c9a6710618" dependencies = [ "derive_more-impl", ] [[package]] name = "derive_more-impl" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +checksum = "6d286bfdaf75e988b4a78e013ecd79c581e06399ab53fbacd2d916c2f904f30b" dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.110", + "rustc_version 0.4.1", + "syn 2.0.111", "unicode-xid", ] @@ -2475,7 +2475,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2549,7 +2549,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2601,6 +2601,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + [[package]] name = "enr" version = "0.13.0" @@ -2635,7 +2644,7 @@ checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2702,7 +2711,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2767,9 +2776,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" [[package]] name = "fixed-hash" @@ -2899,7 +2908,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3038,7 +3047,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.12.0", + "indexmap 2.12.1", "slab", "tokio", "tokio-util", @@ -3056,8 +3065,8 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.3.1", - "indexmap 2.12.0", + "http 1.4.0", + "indexmap 2.12.1", "slab", "tokio", "tokio-util", @@ -3095,12 +3104,13 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ "foldhash 0.2.0", "serde", + "serde_core", ] [[package]] @@ -3123,9 +3133,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hex-conservative" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +checksum = "fda06d18ac606267c40c04e41b9947729bf8b9efe74bd4e82b61a5f26a510b9f" dependencies = [ "arrayvec", ] @@ -3161,12 +3171,11 @@ dependencies = [ [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -3188,7 +3197,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.3.1", + "http 1.4.0", ] [[package]] @@ -3199,7 +3208,7 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", "futures-core", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "pin-project-lite", ] @@ -3242,16 +3251,16 @@ dependencies = [ [[package]] name = "hyper" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1744436df46f0bde35af3eda22aeaba453aada65d8f1c171cd8a5f59030bd69f" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ "atomic-waker", "bytes", "futures-channel", "futures-core", "h2 0.4.12", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "httparse", "httpdate", @@ -3270,7 +3279,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" dependencies = [ "hex", - "hyper 1.8.0", + "hyper 1.8.1", "hyper-util", "pin-project-lite", "tokio", @@ -3289,7 +3298,6 @@ dependencies = [ "hyper 0.14.32", "log", "rustls 0.21.12", - "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", ] @@ -3300,12 +3308,12 @@ version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "http 1.3.1", - "hyper 1.8.0", + "http 1.4.0", + "hyper 1.8.1", "hyper-util", "log", "rustls 0.23.35", - "rustls-native-certs 0.8.2", + "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls 0.26.4", @@ -3320,7 +3328,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.8.0", + "hyper 1.8.1", "hyper-util", "native-tls", "tokio", @@ -3330,26 +3338,28 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ "base64 0.22.1", "bytes", "futures-channel", "futures-core", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", - "hyper 1.8.0", + "hyper 1.8.1", "ipnet", "libc", "percent-encoding", "pin-project-lite", "socket2 0.6.1", + "system-configuration", "tokio", "tower-service", "tracing", + "windows-registry", ] [[package]] @@ -3360,7 +3370,7 @@ checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" dependencies = [ "hex", "http-body-util", - "hyper 1.8.0", + "hyper 1.8.1", "hyper-util", "pin-project-lite", "tokio", @@ -3439,9 +3449,9 @@ checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ "icu_collections", "icu_locale_core", @@ -3453,9 +3463,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" @@ -3516,7 +3526,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3551,12 +3561,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" dependencies = [ "equivalent", - "hashbrown 0.16.0", + "hashbrown 0.16.1", "serde", "serde_core", ] @@ -3650,9 +3660,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.82" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" dependencies = [ "once_cell", "wasm-bindgen", @@ -3682,7 +3692,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "jsonrpsee-types", @@ -3706,7 +3716,7 @@ checksum = "790bedefcec85321e007ff3af84b4e417540d5c87b3c9779b9e247d1bcc3dab8" dependencies = [ "base64 0.22.1", "http-body 1.0.1", - "hyper 1.8.0", + "hyper 1.8.1", "hyper-rustls 0.27.7", "hyper-util", "jsonrpsee-core", @@ -3731,7 +3741,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3741,10 +3751,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c51b7c290bb68ce3af2d029648148403863b982f138484a73f02a9dd52dbd7f" dependencies = [ "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", - "hyper 1.8.0", + "hyper 1.8.1", "hyper-util", "jsonrpsee-core", "jsonrpsee-types", @@ -3767,7 +3777,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc88ff4688e43cc3fa9883a8a95c6fa27aa2e76c96e610b737b6554d650d7fd5" dependencies = [ - "http 1.3.1", + "http 1.4.0", "serde", "serde_json", "thiserror 2.0.17", @@ -3829,9 +3839,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.177" +version = "0.2.178" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" +checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" [[package]] name = "libloading" @@ -3851,13 +3861,13 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libredox" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +checksum = "df15f6eac291ed1cf25865b1ee60399f57e7c227e7f51bdbd4c5270396a9ed50" dependencies = [ "bitflags 2.10.0", "libc", - "redox_syscall 0.5.18", + "redox_syscall 0.6.0", ] [[package]] @@ -3895,9 +3905,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lru" @@ -3931,7 +3941,7 @@ checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3967,9 +3977,9 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "metrics" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dea7ac8057892855ec285c440160265225438c3c45072613c25a4b26e98ef5" +checksum = "5d5312e9ba3771cfa961b585728215e3d972c950a3eed9252aa093d6301277e8" dependencies = [ "ahash", "portable-atomic", @@ -3984,7 +3994,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3995,10 +4005,10 @@ checksum = "2b166dea96003ee2531cf14833efedced545751d800f03535801d833313f8c15" dependencies = [ "base64 0.22.1", "http-body-util", - "hyper 1.8.0", + "hyper 1.8.1", "hyper-rustls 0.27.7", "hyper-util", - "indexmap 2.12.0", + "indexmap 2.12.1", "ipnet", "metrics", "metrics-util", @@ -4010,13 +4020,13 @@ dependencies = [ [[package]] name = "metrics-util" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe8db7a05415d0f919ffb905afa37784f71901c9a773188876984b4f769ab986" +checksum = "cdfb1365fea27e6dd9dc1dbc19f570198bc86914533ad639dae939635f096be4" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.15.5", + "hashbrown 0.16.1", "metrics", "quanta", "rand 0.9.2", @@ -4047,9 +4057,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "wasi", @@ -4079,7 +4089,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4248,7 +4258,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4283,9 +4293,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "op-alloy-consensus" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d7ec388eb83a3e6c71774131dbbb2ba9c199b6acac7dce172ed8de2f819e91" +checksum = "726da827358a547be9f1e37c2a756b9e3729cb0350f43408164794b370cad8ae" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4307,9 +4317,9 @@ checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" [[package]] name = "op-alloy-network" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "979fe768bbb571d1d0bd7f84bc35124243b4db17f944b94698872a4701e743a0" +checksum = "f63f27e65be273ec8fcb0b6af0fd850b550979465ab93423705ceb3dfddbd2ab" dependencies = [ "alloy-consensus", "alloy-network", @@ -4323,9 +4333,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc252b5fa74dbd33aa2f9a40e5ff9cfe34ed2af9b9b235781bc7cc8ec7d6aca8" +checksum = "562dd4462562c41f9fdc4d860858c40e14a25df7f983ae82047f15f08fce4d19" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4342,9 +4352,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1abe694cd6718b8932da3f824f46778be0f43289e4103c88abc505c63533a04" +checksum = "d8f24b8cb66e4b33e6c9e508bf46b8ecafc92eadd0b93fedd306c0accb477657" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4393,7 +4403,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4478,7 +4488,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4526,7 +4536,7 @@ dependencies = [ "regex", "regex-syntax", "structmeta", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4553,9 +4563,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.3" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e7521a040efde50c3ab6bbadafbe15ab6dc042686926be59ac35d74607df4" +checksum = "cbcfd20a6d4eeba40179f05735784ad32bdaef05ce8e8af05f180d45bb3e7e22" dependencies = [ "memchr", "ucd-trie", @@ -4592,7 +4602,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4621,7 +4631,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4718,16 +4728,6 @@ dependencies = [ "termtree", ] -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn 2.0.110", -] - [[package]] name = "primeorder" version = "0.13.6" @@ -4776,7 +4776,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4984,6 +4984,16 @@ dependencies = [ "rand_core 0.9.3", ] +[[package]] +name = "rapidhash" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e65c75143ce5d47c55b510297eeb1182f3c739b6043c537670e9fc18612dae" +dependencies = [ + "rand 0.9.2", + "rustversion", +] + [[package]] name = "raw-cpuid" version = "11.6.0" @@ -5063,6 +5073,15 @@ dependencies = [ "bitflags 2.10.0", ] +[[package]] +name = "redox_syscall" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec96166dafa0886eb81fe1c0a388bece180fbef2135f97c1e2cf8302e74b43b5" +dependencies = [ + "bitflags 2.10.0", +] + [[package]] name = "ref-cast" version = "1.0.25" @@ -5080,7 +5099,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5120,28 +5139,31 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" -version = "0.12.24" +version = "0.12.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +checksum = "3b4c14b2d9afca6a60277086b0cc6a6ae0b568f6f7916c943a8cdc79f8be240f" dependencies = [ "base64 0.22.1", "bytes", + "encoding_rs", "futures-core", - "http 1.3.1", + "h2 0.4.12", + "http 1.4.0", "http-body 1.0.1", "http-body-util", - "hyper 1.8.0", + "hyper 1.8.1", "hyper-rustls 0.27.7", "hyper-tls", "hyper-util", "js-sys", "log", + "mime", "native-tls", "percent-encoding", "pin-project-lite", "quinn", "rustls 0.23.35", - "rustls-native-certs 0.8.2", + "rustls-native-certs", "rustls-pki-types", "serde", "serde_json", @@ -5230,7 +5252,7 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v1.9.3#27a8c0f5a6dfb27dea8 dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5984,9 +6006,9 @@ dependencies = [ [[package]] name = "revm-database" -version = "9.0.5" +version = "9.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b6c15bb255481fcf29f5ef7c97f00ed4c28a6ab6c490d77b990d73603031569" +checksum = "980d8d6bba78c5dd35b83abbb6585b0b902eb25ea4448ed7bfba6283b0337191" dependencies = [ "alloy-eips", "revm-bytecode", @@ -6305,18 +6327,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile 1.0.4", - "schannel", - "security-framework 2.11.1", -] - [[package]] name = "rustls-native-certs" version = "0.8.2" @@ -6329,15 +6339,6 @@ dependencies = [ "security-framework 3.5.1", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - [[package]] name = "rustls-pemfile" version = "2.2.0" @@ -6349,9 +6350,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.13.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" +checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282" dependencies = [ "web-time", "zeroize", @@ -6369,13 +6370,13 @@ dependencies = [ "log", "once_cell", "rustls 0.23.35", - "rustls-native-certs 0.8.2", + "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki 0.103.8", "security-framework 3.5.1", "security-framework-sys", "webpki-root-certs 0.26.11", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6439,6 +6440,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "scc" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc" +dependencies = [ + "sdd", +] + [[package]] name = "schannel" version = "0.1.28" @@ -6499,6 +6509,12 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sdd" +version = "3.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" + [[package]] name = "sec1" version = "0.3.0" @@ -6656,7 +6672,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6665,7 +6681,7 @@ version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ - "indexmap 2.12.0", + "indexmap 2.12.1", "itoa", "memchr", "ryu", @@ -6692,7 +6708,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6709,15 +6725,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.15.1" +version = "3.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04" +checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.12.0", + "indexmap 2.12.1", "schemars 0.9.0", "schemars 1.1.0", "serde_core", @@ -6728,14 +6744,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.15.1" +version = "3.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955" +checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6748,6 +6764,31 @@ dependencies = [ "serde", ] +[[package]] +name = "serial_test" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" +dependencies = [ + "futures", + "log", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + [[package]] name = "sha1" version = "0.10.6" @@ -6807,9 +6848,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.6" +version = "1.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" +checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" dependencies = [ "libc", ] @@ -6908,7 +6949,7 @@ dependencies = [ "base64 0.22.1", "bytes", "futures", - "http 1.3.1", + "http 1.4.0", "httparse", "log", "rand 0.8.5", @@ -6962,7 +7003,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6973,7 +7014,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -6994,7 +7035,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -7016,9 +7057,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.110" +version = "2.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" dependencies = [ "proc-macro2", "quote", @@ -7027,14 +7068,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff790eb176cc81bb8936aed0f7b9f14fc4670069a2d371b3e3b0ecce908b2cb3" +checksum = "f6b1d2e2059056b66fec4a6bb2b79511d5e8d76196ef49c38996f4b48db7662f" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -7054,7 +7095,28 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.10.0", + "core-foundation 0.9.4", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", ] [[package]] @@ -7146,7 +7208,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -7157,7 +7219,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -7269,7 +7331,7 @@ dependencies = [ "tips-core", "tokio", "tracing", - "tracing-subscriber 0.3.20", + "tracing-subscriber 0.3.22", "uuid", ] @@ -7290,7 +7352,7 @@ dependencies = [ "serde", "serde_json", "tracing", - "tracing-subscriber 0.3.20", + "tracing-subscriber 0.3.22", "uuid", ] @@ -7328,6 +7390,43 @@ dependencies = [ "wiremock", ] +[[package]] +name = "tips-system-tests" +version = "0.1.0" +dependencies = [ + "alloy-consensus", + "alloy-network", + "alloy-primitives", + "alloy-provider", + "alloy-signer-local", + "anyhow", + "async-trait", + "aws-config", + "aws-credential-types", + "aws-sdk-s3", + "bytes", + "hex", + "jsonrpsee", + "op-alloy-consensus", + "op-alloy-network", + "op-revm", + "rdkafka", + "reqwest", + "serde", + "serde_json", + "serial_test", + "testcontainers", + "testcontainers-modules", + "tips-audit", + "tips-core", + "tips-ingress-rpc", + "tokio", + "tracing", + "tracing-subscriber 0.3.22", + "url", + "uuid", +] + [[package]] name = "tokio" version = "1.48.0" @@ -7353,7 +7452,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -7429,20 +7528,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.3" +version = "0.7.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" dependencies = [ "serde_core", ] [[package]] name = "toml_edit" -version = "0.23.7" +version = "0.23.10+spec-1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" +checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" dependencies = [ - "indexmap 2.12.0", + "indexmap 2.12.1", "toml_datetime", "toml_parser", "winnow", @@ -7450,9 +7549,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.4" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ "winnow", ] @@ -7475,14 +7574,14 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags 2.10.0", "bytes", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "iri-string", "pin-project-lite", @@ -7505,9 +7604,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "log", "pin-project-lite", @@ -7517,20 +7616,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] name = "tracing-core" -version = "0.1.34" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", @@ -7578,9 +7677,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.20" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" +checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" dependencies = [ "matchers", "nu-ansi-term", @@ -7689,13 +7788,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.18.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" +checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" dependencies = [ "getrandom 0.3.4", "js-sys", - "serde", + "serde_core", "wasm-bindgen", ] @@ -7768,9 +7867,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" dependencies = [ "cfg-if", "once_cell", @@ -7781,9 +7880,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.55" +version = "0.4.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" dependencies = [ "cfg-if", "js-sys", @@ -7794,9 +7893,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7804,22 +7903,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" dependencies = [ "unicode-ident", ] @@ -7840,9 +7939,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.82" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" dependencies = [ "js-sys", "wasm-bindgen", @@ -7928,7 +8027,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -7939,7 +8038,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -7948,6 +8047,17 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +dependencies = [ + "windows-link", + "windows-result", + "windows-strings", +] + [[package]] name = "windows-result" version = "0.4.1" @@ -7993,6 +8103,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.60.2" @@ -8256,9 +8375,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" dependencies = [ "memchr", ] @@ -8273,9 +8392,9 @@ dependencies = [ "base64 0.22.1", "deadpool", "futures", - "http 1.3.1", + "http 1.4.0", "http-body-util", - "hyper 1.8.0", + "hyper 1.8.1", "hyper-util", "log", "once_cell", @@ -8342,28 +8461,28 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.27" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.27" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -8383,7 +8502,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "synstructure", ] @@ -8404,7 +8523,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -8437,7 +8556,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 80a6631..88147bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://github.com/base/tips" repository = "https://github.com/base/tips" [workspace] -members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core", "crates/account-abstraction-core-v2"] +members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core", "crates/account-abstraction-core-v2", "crates/system-tests"] resolver = "2" [workspace.dependencies] @@ -15,6 +15,7 @@ tips-audit = { path = "crates/audit" } tips-core = { path = "crates/core" } account-abstraction-core = { path = "crates/account-abstraction-core" } account-abstraction-core-v2 = { path = "crates/account-abstraction-core-v2" } +tips-system-tests = { path = "crates/system-tests" } # Reth reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } @@ -28,9 +29,11 @@ alloy-primitives = { version = "1.4.1", default-features = false, features = [ ] } alloy-consensus = { version = "1.0.41" } alloy-provider = { version = "1.0.41" } -alloy-serde = "1.0.41" alloy-rpc-types = "1.1.2" alloy-sol-types = { version = "1.4.1", default-features = false } +alloy-signer = { version = "1.0.41" } +alloy-network = { version = "1.0.41" } +alloy-serde = "1.0.41" # op-alloy op-alloy-network = { version = "0.22.0", default-features = false } diff --git a/crates/ingress-rpc/src/validation.rs b/crates/ingress-rpc/src/validation.rs index b6bae98..b84dbbd 100644 --- a/crates/ingress-rpc/src/validation.rs +++ b/crates/ingress-rpc/src/validation.rs @@ -353,4 +353,22 @@ mod tests { assert!(error_message.contains("Bundle can only contain 3 transactions")); } } + + #[tokio::test] + async fn test_decode_tx_rejects_empty_bytes() { + // Test that empty bytes fail to decode + use op_alloy_network::eip2718::Decodable2718; + let empty_bytes = Bytes::new(); + let result = OpTxEnvelope::decode_2718(&mut empty_bytes.as_ref()); + assert!(result.is_err(), "Empty bytes should fail decoding"); + } + + #[tokio::test] + async fn test_decode_tx_rejects_invalid_bytes() { + // Test that malformed bytes fail to decode + use op_alloy_network::eip2718::Decodable2718; + let invalid_bytes = Bytes::from(vec![0x01, 0x02, 0x03]); + let result = OpTxEnvelope::decode_2718(&mut invalid_bytes.as_ref()); + assert!(result.is_err(), "Invalid bytes should fail decoding"); + } } diff --git a/crates/system-tests/Cargo.toml b/crates/system-tests/Cargo.toml new file mode 100644 index 0000000..000dd63 --- /dev/null +++ b/crates/system-tests/Cargo.toml @@ -0,0 +1,55 @@ +[package] +name = "tips-system-tests" +version.workspace = true +edition.workspace = true +rust-version.workspace = true +license.workspace = true + +[lib] +path = "src/lib.rs" + +[dependencies] +tips-audit = { workspace = true } +tips-core = { workspace = true } +tips-ingress-rpc = { path = "../ingress-rpc" } + +alloy-primitives = { workspace = true } +alloy-provider = { workspace = true } +alloy-signer-local = { workspace = true } +alloy-consensus = { workspace = true } +alloy-network = { workspace = true } + +op-alloy-network = { workspace = true } +op-alloy-consensus = { workspace = true } + +tokio = { workspace = true } +async-trait = { workspace = true } + +aws-sdk-s3 = { workspace = true } +aws-config = { workspace = true } +aws-credential-types = { workspace = true } + +rdkafka = { workspace = true } + +serde = { workspace = true } +serde_json = { workspace = true } + +anyhow = { workspace = true } + +uuid = { workspace = true } +tracing = { workspace = true } +tracing-subscriber = { workspace = true } +url = { workspace = true } + +reqwest = { version = "0.12.12", features = ["json"] } +bytes = { workspace = true } +hex = "0.4.3" +jsonrpsee = { workspace = true } +op-revm = { workspace = true } + +[dev-dependencies] +tokio = { workspace = true, features = ["test-util"] } +testcontainers = { workspace = true } +testcontainers-modules = { workspace = true } +serial_test = "3" + diff --git a/crates/system-tests/README.md b/crates/system-tests/README.md new file mode 100644 index 0000000..d7f410a --- /dev/null +++ b/crates/system-tests/README.md @@ -0,0 +1,30 @@ +# System Tests (Integration Suite) + +Integration coverage for TIPS ingress RPC. Tests talk to the services started by `just start-all`. + +## What we test +- `test_client_can_connect_to_tips` – RPC connectivity. +- `test_send_raw_transaction_accepted` – `eth_sendRawTransaction` lands on-chain with success receipt. +- `test_send_bundle_accepted` – single‑tx bundle via `eth_sendBackrunBundle` returns the correct bundle hash, audit event, and on-chain inclusion. +- `test_send_bundle_with_two_transactions` – multi-tx bundle (2 txs) flows through audit and lands on-chain. + +Each test confirms: +1. The response hash equals `keccak256` of the tx hashes. +2. The bundle audit event is emitted to Kafka. +3. All transactions are included on-chain with successful receipts. + +## How to run +```bash +# Start infrastructure (see ../../SETUP.md for full instructions) +# - just sync && just start-all +# - builder-playground + op-rbuilder are running + +# Run the tests +INTEGRATION_TESTS=1 cargo test --package tips-system-tests --test integration_tests +``` + +**Note:** Tests that share the funded wallet use `#[serial]` to avoid nonce conflicts. + +Defaults: +- Kafka configs: `docker/host-*.properties` (override with the standard `TIPS_INGRESS_KAFKA_*` env vars if needed). +- URLs: `http://localhost:8080` ingress, `http://localhost:8547` sequencer (override via `INGRESS_URL` / `SEQUENCER_URL`). diff --git a/crates/system-tests/src/client/mod.rs b/crates/system-tests/src/client/mod.rs new file mode 100644 index 0000000..58dabd2 --- /dev/null +++ b/crates/system-tests/src/client/mod.rs @@ -0,0 +1,3 @@ +pub mod tips_rpc; + +pub use tips_rpc::TipsRpcClient; diff --git a/crates/system-tests/src/client/tips_rpc.rs b/crates/system-tests/src/client/tips_rpc.rs new file mode 100644 index 0000000..cbe5a23 --- /dev/null +++ b/crates/system-tests/src/client/tips_rpc.rs @@ -0,0 +1,53 @@ +use alloy_network::Network; +use alloy_primitives::{Bytes, TxHash}; +use alloy_provider::{Provider, RootProvider}; +use anyhow::Result; +use tips_core::{Bundle, BundleHash, CancelBundle}; + +/// Client for TIPS-specific RPC methods (eth_sendBundle, eth_cancelBundle) +/// +/// Wraps a RootProvider to add TIPS functionality while preserving access +/// to standard Ethereum JSON-RPC methods via provider(). +#[derive(Clone)] +pub struct TipsRpcClient { + provider: RootProvider, +} + +impl TipsRpcClient { + pub fn new(provider: RootProvider) -> Self { + Self { provider } + } + + pub async fn send_raw_transaction(&self, signed_tx: Bytes) -> Result { + let tx_hex = format!("0x{}", hex::encode(&signed_tx)); + self.provider + .raw_request("eth_sendRawTransaction".into(), [tx_hex]) + .await + .map_err(Into::into) + } + + pub async fn send_bundle(&self, bundle: Bundle) -> Result { + self.provider + .raw_request("eth_sendBundle".into(), [bundle]) + .await + .map_err(Into::into) + } + + pub async fn send_backrun_bundle(&self, bundle: Bundle) -> Result { + self.provider + .raw_request("eth_sendBackrunBundle".into(), [bundle]) + .await + .map_err(Into::into) + } + + pub async fn cancel_bundle(&self, request: CancelBundle) -> Result { + self.provider + .raw_request("eth_cancelBundle".into(), [request]) + .await + .map_err(Into::into) + } + + pub fn provider(&self) -> &RootProvider { + &self.provider + } +} diff --git a/crates/system-tests/src/fixtures/mod.rs b/crates/system-tests/src/fixtures/mod.rs new file mode 100644 index 0000000..3094ef9 --- /dev/null +++ b/crates/system-tests/src/fixtures/mod.rs @@ -0,0 +1,3 @@ +pub mod transactions; + +pub use transactions::*; diff --git a/crates/system-tests/src/fixtures/transactions.rs b/crates/system-tests/src/fixtures/transactions.rs new file mode 100644 index 0000000..6fed608 --- /dev/null +++ b/crates/system-tests/src/fixtures/transactions.rs @@ -0,0 +1,73 @@ +use alloy_consensus::{SignableTransaction, TxEip1559}; +use alloy_primitives::{Address, Bytes, U256}; +use alloy_provider::{ProviderBuilder, RootProvider}; +use alloy_signer_local::PrivateKeySigner; +use anyhow::Result; +use op_alloy_network::eip2718::Encodable2718; +use op_alloy_network::{Optimism, TxSignerSync}; + +/// Create an Optimism RPC provider from a URL string +/// +/// This is a convenience function to avoid repeating the provider setup +/// pattern across tests and runner code. +pub fn create_optimism_provider(url: &str) -> Result> { + Ok(ProviderBuilder::new() + .disable_recommended_fillers() + .network::() + .connect_http(url.parse()?)) +} + +pub fn create_test_signer() -> PrivateKeySigner { + "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" + .parse() + .expect("Valid test private key") +} + +pub fn create_funded_signer() -> PrivateKeySigner { + // This is the same account used in justfile that has funds in builder-playground + "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d" + .parse() + .expect("Valid funded private key") +} + +pub fn create_signed_transaction( + signer: &PrivateKeySigner, + to: Address, + value: U256, + nonce: u64, + gas_limit: u64, + max_fee_per_gas: u128, +) -> Result { + let mut tx = TxEip1559 { + chain_id: 13, // Local builder-playground chain ID + nonce, + gas_limit, + max_fee_per_gas, + max_priority_fee_per_gas: max_fee_per_gas / 10, // 10% of max fee as priority fee + to: to.into(), + value, + access_list: Default::default(), + input: Default::default(), + }; + + let signature = signer.sign_transaction_sync(&mut tx)?; + + let envelope = op_alloy_consensus::OpTxEnvelope::Eip1559(tx.into_signed(signature)); + + let mut buf = Vec::new(); + envelope.encode_2718(&mut buf); + + Ok(Bytes::from(buf)) +} + +/// Create a simple load test transaction with standard defaults: +/// - value: 1000 wei (small test amount) +/// - gas_limit: 21000 (standard transfer) +/// - max_fee_per_gas: 1 gwei +pub fn create_load_test_transaction( + signer: &PrivateKeySigner, + to: Address, + nonce: u64, +) -> Result { + create_signed_transaction(signer, to, U256::from(1000), nonce, 21000, 1_000_000_000) +} diff --git a/crates/system-tests/src/lib.rs b/crates/system-tests/src/lib.rs new file mode 100644 index 0000000..f8d5845 --- /dev/null +++ b/crates/system-tests/src/lib.rs @@ -0,0 +1,2 @@ +pub mod client; +pub mod fixtures; diff --git a/crates/system-tests/tests/common/kafka.rs b/crates/system-tests/tests/common/kafka.rs new file mode 100644 index 0000000..f01a201 --- /dev/null +++ b/crates/system-tests/tests/common/kafka.rs @@ -0,0 +1,115 @@ +use std::{path::Path, time::Duration}; + +use alloy_primitives::B256; +use anyhow::{Context, Result}; +use rdkafka::{ + Message, + config::ClientConfig, + consumer::{Consumer, StreamConsumer}, + message::BorrowedMessage, +}; +use tips_audit::types::BundleEvent; +use tips_core::{BundleExtensions, kafka::load_kafka_config_from_file}; +use tokio::time::{Instant, timeout}; +use uuid::Uuid; + +const DEFAULT_AUDIT_TOPIC: &str = "tips-audit"; +const DEFAULT_AUDIT_PROPERTIES: &str = "../../docker/host-ingress-audit-kafka-properties"; +const KAFKA_WAIT_TIMEOUT: Duration = Duration::from_secs(60); + +fn resolve_properties_path(env_key: &str, default_path: &str) -> Result { + match std::env::var(env_key) { + Ok(value) => Ok(value), + Err(_) => { + if Path::new(default_path).exists() { + Ok(default_path.to_string()) + } else { + anyhow::bail!( + "Environment variable {env_key} must be set (default path '{default_path}' not found). \ + Run `just sync` or export {env_key} before running tests." + ); + } + } + } +} + +fn build_kafka_consumer(properties_env: &str, default_path: &str) -> Result { + let props_file = resolve_properties_path(properties_env, default_path)?; + + let mut client_config = ClientConfig::from_iter(load_kafka_config_from_file(&props_file)?); + + client_config + .set("group.id", format!("tips-system-tests-{}", Uuid::new_v4())) + .set("enable.auto.commit", "false") + .set("auto.offset.reset", "earliest"); + + client_config + .create() + .context("Failed to create Kafka consumer") +} + +async fn wait_for_kafka_message( + properties_env: &str, + default_properties: &str, + topic_env: &str, + default_topic: &str, + timeout_duration: Duration, + mut matcher: impl FnMut(BorrowedMessage<'_>) -> Option, +) -> Result { + let consumer = build_kafka_consumer(properties_env, default_properties)?; + let topic = std::env::var(topic_env).unwrap_or_else(|_| default_topic.to_string()); + consumer.subscribe(&[&topic])?; + + let deadline = Instant::now() + timeout_duration; + + loop { + let now = Instant::now(); + if now >= deadline { + anyhow::bail!( + "Timed out waiting for Kafka message on topic {topic} after {:?}", + timeout_duration + ); + } + + let remaining = deadline - now; + match timeout(remaining, consumer.recv()).await { + Ok(Ok(message)) => { + if let Some(value) = matcher(message) { + return Ok(value); + } + } + Ok(Err(err)) => { + return Err(err.into()); + } + Err(_) => { + // Timeout for this iteration, continue looping + } + } + } +} + +pub async fn wait_for_audit_event_by_hash( + expected_bundle_hash: &B256, + mut matcher: impl FnMut(&BundleEvent) -> bool, +) -> Result { + let expected_hash = *expected_bundle_hash; + wait_for_kafka_message( + "TIPS_INGRESS_KAFKA_AUDIT_PROPERTIES_FILE", + DEFAULT_AUDIT_PROPERTIES, + "TIPS_INGRESS_KAFKA_AUDIT_TOPIC", + DEFAULT_AUDIT_TOPIC, + KAFKA_WAIT_TIMEOUT, + |message| { + let payload = message.payload()?; + let event: BundleEvent = serde_json::from_slice(payload).ok()?; + // Match by bundle hash from the Received event + if let BundleEvent::Received { bundle, .. } = &event { + if bundle.bundle_hash() == expected_hash && matcher(&event) { + return Some(event); + } + } + None + }, + ) + .await +} diff --git a/crates/system-tests/tests/common/mod.rs b/crates/system-tests/tests/common/mod.rs new file mode 100644 index 0000000..b17877c --- /dev/null +++ b/crates/system-tests/tests/common/mod.rs @@ -0,0 +1 @@ +pub mod kafka; diff --git a/crates/system-tests/tests/integration_tests.rs b/crates/system-tests/tests/integration_tests.rs new file mode 100644 index 0000000..772ea69 --- /dev/null +++ b/crates/system-tests/tests/integration_tests.rs @@ -0,0 +1,359 @@ +#[path = "common/mod.rs"] +mod common; + +use alloy_network::ReceiptResponse; +use alloy_primitives::{Address, TxHash, U256, keccak256}; +use alloy_provider::{Provider, RootProvider}; +use anyhow::{Context, Result, bail}; +use common::kafka::wait_for_audit_event_by_hash; +use op_alloy_network::Optimism; +use serial_test::serial; +use tips_audit::types::BundleEvent; +use tips_core::BundleExtensions; +use tips_system_tests::client::TipsRpcClient; +use tips_system_tests::fixtures::{ + create_funded_signer, create_optimism_provider, create_signed_transaction, +}; +use tokio::time::{Duration, Instant, sleep}; + +/// Get the URL for integration tests against the TIPS ingress service +fn get_integration_test_url() -> String { + std::env::var("INGRESS_URL").unwrap_or_else(|_| "http://localhost:8080".to_string()) +} + +/// Get the URL for the sequencer (for fetching nonces) +fn get_sequencer_url() -> String { + std::env::var("SEQUENCER_URL").unwrap_or_else(|_| "http://localhost:8547".to_string()) +} + +async fn wait_for_transaction_seen( + provider: &RootProvider, + tx_hash: TxHash, + timeout_secs: u64, +) -> Result<()> { + let deadline = Instant::now() + Duration::from_secs(timeout_secs); + loop { + if Instant::now() >= deadline { + bail!( + "Timed out waiting for transaction {} to appear on the sequencer", + tx_hash + ); + } + + if provider + .get_transaction_by_hash(tx_hash.into()) + .await? + .is_some() + { + return Ok(()); + } + + sleep(Duration::from_millis(500)).await; + } +} + +#[tokio::test] +async fn test_client_can_connect_to_tips() -> Result<()> { + if std::env::var("INTEGRATION_TESTS").is_err() { + eprintln!( + "Skipping integration tests (set INTEGRATION_TESTS=1 and ensure TIPS infrastructure is running)" + ); + return Ok(()); + } + + let url = get_integration_test_url(); + let provider = create_optimism_provider(&url)?; + let _client = TipsRpcClient::new(provider); + Ok(()) +} + +#[tokio::test] +#[serial] +async fn test_send_raw_transaction_accepted() -> Result<()> { + if std::env::var("INTEGRATION_TESTS").is_err() { + eprintln!( + "Skipping integration tests (set INTEGRATION_TESTS=1 and ensure TIPS infrastructure is running)" + ); + return Ok(()); + } + + let url = get_integration_test_url(); + let provider = create_optimism_provider(&url)?; + let client = TipsRpcClient::new(provider); + let signer = create_funded_signer(); + + let sequencer_url = get_sequencer_url(); + let sequencer_provider = create_optimism_provider(&sequencer_url)?; + let nonce = sequencer_provider + .get_transaction_count(signer.address()) + .await?; + + let to = Address::from([0x11; 20]); + let value = U256::from(1000); + let gas_limit = 21000; + let gas_price = 1_000_000_000; + + let signed_tx = create_signed_transaction(&signer, to, value, nonce, gas_limit, gas_price)?; + + // Send transaction to TIPS + let tx_hash = client + .send_raw_transaction(signed_tx) + .await + .context("Failed to send transaction to TIPS")?; + + // Verify TIPS accepted the transaction and returned a hash + assert!(!tx_hash.is_zero(), "Transaction hash should not be zero"); + + // Verify transaction lands on-chain + wait_for_transaction_seen(&sequencer_provider, tx_hash, 30) + .await + .context("Transaction never appeared on sequencer")?; + + // Verify transaction receipt shows success + let receipt = sequencer_provider + .get_transaction_receipt(tx_hash) + .await + .context("Failed to fetch transaction receipt")? + .expect("Transaction receipt should exist after being seen on sequencer"); + assert!(receipt.status(), "Transaction should have succeeded"); + + Ok(()) +} + +#[tokio::test] +#[serial] +async fn test_send_bundle_accepted() -> Result<()> { + if std::env::var("INTEGRATION_TESTS").is_err() { + eprintln!( + "Skipping integration tests (set INTEGRATION_TESTS=1 and ensure TIPS infrastructure is running)" + ); + return Ok(()); + } + + use tips_core::Bundle; + + let url = get_integration_test_url(); + let provider = create_optimism_provider(&url)?; + let client = TipsRpcClient::new(provider); + let signer = create_funded_signer(); + + let sequencer_url = get_sequencer_url(); + let sequencer_provider = create_optimism_provider(&sequencer_url)?; + let nonce = sequencer_provider + .get_transaction_count(signer.address()) + .await?; + + let to = Address::from([0x11; 20]); + let value = U256::from(1000); + let gas_limit = 21000; + let gas_price = 1_000_000_000; + + let signed_tx = create_signed_transaction(&signer, to, value, nonce, gas_limit, gas_price)?; + let tx_hash = keccak256(&signed_tx); + + // First send the transaction to mempool + let _mempool_tx_hash = client + .send_raw_transaction(signed_tx.clone()) + .await + .context("Failed to send transaction to mempool")?; + + let bundle = Bundle { + txs: vec![signed_tx], + block_number: 0, + min_timestamp: None, + max_timestamp: None, + reverting_tx_hashes: vec![tx_hash], + replacement_uuid: None, + dropping_tx_hashes: vec![], + flashblock_number_min: None, + flashblock_number_max: None, + }; + + // Send backrun bundle to TIPS + let bundle_hash = client + .send_backrun_bundle(bundle) + .await + .context("Failed to send backrun bundle to TIPS")?; + + // Verify TIPS accepted the bundle and returned a hash + assert!( + !bundle_hash.bundle_hash.is_zero(), + "Bundle hash should not be zero" + ); + + // Verify bundle hash is calculated correctly: keccak256(concat(tx_hashes)) + let mut concatenated = Vec::new(); + concatenated.extend_from_slice(tx_hash.as_slice()); + let expected_bundle_hash = keccak256(&concatenated); + assert_eq!( + bundle_hash.bundle_hash, expected_bundle_hash, + "Bundle hash should match keccak256(tx_hash)" + ); + + // Verify audit channel emitted a Received event for this bundle + let audit_event = wait_for_audit_event_by_hash(&bundle_hash.bundle_hash, |event| { + matches!(event, BundleEvent::Received { .. }) + }) + .await + .context("Failed to read audit event from Kafka")?; + match audit_event { + BundleEvent::Received { bundle, .. } => { + assert_eq!( + bundle.bundle_hash(), + bundle_hash.bundle_hash, + "Audit event bundle hash should match response" + ); + } + other => panic!("Expected Received audit event, got {:?}", other), + } + + // Wait for transaction to appear on sequencer + wait_for_transaction_seen(&sequencer_provider, tx_hash.into(), 60) + .await + .context("Bundle transaction never appeared on sequencer")?; + + // Verify transaction receipt shows success + let receipt = sequencer_provider + .get_transaction_receipt(tx_hash.into()) + .await + .context("Failed to fetch transaction receipt")? + .expect("Transaction receipt should exist after being seen on sequencer"); + assert!(receipt.status(), "Transaction should have succeeded"); + assert!( + receipt.block_number().is_some(), + "Transaction should be included in a block" + ); + + Ok(()) +} + +#[tokio::test] +#[serial] +async fn test_send_bundle_with_two_transactions() -> Result<()> { + if std::env::var("INTEGRATION_TESTS").is_err() { + eprintln!( + "Skipping integration tests (set INTEGRATION_TESTS=1 and ensure TIPS infrastructure is running)" + ); + return Ok(()); + } + + use tips_core::Bundle; + + let url = get_integration_test_url(); + let provider = create_optimism_provider(&url)?; + let client = TipsRpcClient::new(provider); + let signer = create_funded_signer(); + + let sequencer_url = get_sequencer_url(); + let sequencer_provider = create_optimism_provider(&sequencer_url)?; + let nonce = sequencer_provider + .get_transaction_count(signer.address()) + .await?; + + // Create two transactions + let tx1 = create_signed_transaction( + &signer, + Address::from([0x33; 20]), + U256::from(1000), + nonce, + 21000, + 1_000_000_000, + )?; + + let tx2 = create_signed_transaction( + &signer, + Address::from([0x44; 20]), + U256::from(2000), + nonce + 1, + 21000, + 1_000_000_000, + )?; + + let tx1_hash = keccak256(&tx1); + let tx2_hash = keccak256(&tx2); + + // First send both transactions to mempool + client + .send_raw_transaction(tx1.clone()) + .await + .context("Failed to send tx1 to mempool")?; + client + .send_raw_transaction(tx2.clone()) + .await + .context("Failed to send tx2 to mempool")?; + + let bundle = Bundle { + txs: vec![tx1, tx2], + block_number: 0, + min_timestamp: None, + max_timestamp: None, + reverting_tx_hashes: vec![tx1_hash, tx2_hash], + replacement_uuid: None, + dropping_tx_hashes: vec![], + flashblock_number_min: None, + flashblock_number_max: None, + }; + + // Send backrun bundle with 2 transactions to TIPS + let bundle_hash = client + .send_backrun_bundle(bundle) + .await + .context("Failed to send multi-transaction backrun bundle to TIPS")?; + + // Verify TIPS accepted the bundle and returned a hash + assert!( + !bundle_hash.bundle_hash.is_zero(), + "Bundle hash should not be zero" + ); + + // Verify bundle hash is calculated correctly: keccak256(concat(all tx_hashes)) + let mut concatenated = Vec::new(); + concatenated.extend_from_slice(tx1_hash.as_slice()); + concatenated.extend_from_slice(tx2_hash.as_slice()); + let expected_bundle_hash = keccak256(&concatenated); + assert_eq!( + bundle_hash.bundle_hash, expected_bundle_hash, + "Bundle hash should match keccak256(concat(tx1_hash, tx2_hash))" + ); + + // Verify audit channel emitted a Received event + let audit_event = wait_for_audit_event_by_hash(&bundle_hash.bundle_hash, |event| { + matches!(event, BundleEvent::Received { .. }) + }) + .await + .context("Failed to read audit event for 2-tx bundle")?; + match audit_event { + BundleEvent::Received { bundle, .. } => { + assert_eq!( + bundle.bundle_hash(), + bundle_hash.bundle_hash, + "Audit event bundle hash should match response" + ); + } + other => panic!("Expected Received audit event, got {:?}", other), + } + + // Wait for both transactions to appear on sequencer + wait_for_transaction_seen(&sequencer_provider, tx1_hash.into(), 60) + .await + .context("Bundle tx1 never appeared on sequencer")?; + wait_for_transaction_seen(&sequencer_provider, tx2_hash.into(), 60) + .await + .context("Bundle tx2 never appeared on sequencer")?; + + // Verify both transaction receipts show success + for (tx_hash, name) in [(tx1_hash, "tx1"), (tx2_hash, "tx2")] { + let receipt = sequencer_provider + .get_transaction_receipt(tx_hash.into()) + .await + .context(format!("Failed to fetch {name} receipt"))? + .expect(&format!("{name} receipt should exist")); + assert!(receipt.status(), "{name} should have succeeded"); + assert!( + receipt.block_number().is_some(), + "{name} should be included in a block" + ); + } + + Ok(()) +} diff --git a/docker/host-ingress-audit-kafka-properties b/docker/host-ingress-audit-kafka-properties new file mode 100644 index 0000000..7929f9b --- /dev/null +++ b/docker/host-ingress-audit-kafka-properties @@ -0,0 +1,4 @@ +# Kafka audit configuration for host-based integration tests +bootstrap.servers=localhost:9092 +message.timeout.ms=5000 + diff --git a/docker/host-ingress-bundles-kafka-properties b/docker/host-ingress-bundles-kafka-properties new file mode 100644 index 0000000..3462d1f --- /dev/null +++ b/docker/host-ingress-bundles-kafka-properties @@ -0,0 +1,4 @@ +# Kafka configuration properties for host-based integration tests +bootstrap.servers=localhost:9092 +message.timeout.ms=5000 + diff --git a/justfile b/justfile index 4c30a66..fc8e8f3 100644 --- a/justfile +++ b/justfile @@ -175,3 +175,20 @@ send-txn-with-backrun: echo "=== Backrun transaction (from backrunner) ===" cast receipt $backrun_hash_computed -r {{ sequencer_url }} | grep -E "(status|blockNumber|transactionIndex)" || echo "Backrun tx not found yet" + +e2e: + #!/bin/bash + if ! INTEGRATION_TESTS=1 cargo test --package tips-system-tests --test integration_tests; then + echo "" + echo "═══════════════════════════════════════════════════════════════════" + echo " ⚠️ Integration tests failed!" + echo " Make sure the infrastructure is running locally (see SETUP.md for full instructions): " + echo " just start-all" + echo " start builder-playground" + echo " start op-rbuilder" + echo "═══════════════════════════════════════════════════════════════════" + exit 1 + fi + echo "═══════════════════════════════════════════════════════════════════" + echo " ✅ Integration tests passed!" + echo "═══════════════════════════════════════════════════════════════════" \ No newline at end of file From c6ae6f5a307b36c43234535d78c649d60390dd4d Mon Sep 17 00:00:00 2001 From: Rayyan Alam <62478924+rayyan224@users.noreply.github.com> Date: Fri, 19 Dec 2025 15:48:22 -0500 Subject: [PATCH 089/117] Rename Account Abstraction Core (#115) Rename Abstraction Core --- Cargo.lock | 148 +----- Cargo.toml | 8 +- crates/account-abstraction-core-v2/Cargo.toml | 30 -- crates/account-abstraction-core/Cargo.toml | 6 +- .../README.md | 12 +- .../core/src/account_abstraction_service.rs | 195 -------- .../core/src/entrypoints/mod.rs | 3 - .../core/src/entrypoints/v06.rs | 139 ------ .../core/src/entrypoints/v07.rs | 180 ------- .../core/src/entrypoints/version.rs | 31 -- .../core/src/kafka_mempool_engine.rs | 275 ---------- .../account-abstraction-core/core/src/lib.rs | 7 - .../core/src/mempool.rs | 472 ------------------ .../core/src/types.rs | 230 --------- .../src/domain/entrypoints/mod.rs | 0 .../src/domain/entrypoints/v06.rs | 0 .../src/domain/entrypoints/v07.rs | 0 .../src/domain/entrypoints/version.rs | 0 .../src/domain/events.rs | 0 .../src/domain/mempool.rs | 0 .../src/domain/mod.rs | 0 .../src/domain/reputation.rs | 0 .../src/domain/types.rs | 0 .../src/factories/kafka_engine.rs | 0 .../src/factories/mod.rs | 0 .../src/infrastructure/base_node/mod.rs | 0 .../src/infrastructure/base_node/validator.rs | 0 .../src/infrastructure/in_memory/mempool.rs | 0 .../src/infrastructure/in_memory/mod.rs | 0 .../src/infrastructure/kafka/consumer.rs | 0 .../src/infrastructure/kafka/mod.rs | 0 .../src/infrastructure/mod.rs | 0 .../src/lib.rs | 0 .../src/services/interfaces/event_source.rs | 0 .../src/services/interfaces/mod.rs | 0 .../services/interfaces/user_op_validator.rs | 0 .../src/services/mempool_engine.rs | 0 .../src/services/mod.rs | 0 .../src/services/reputations_service.rs | 0 crates/ingress-rpc/Cargo.toml | 2 +- crates/ingress-rpc/src/bin/main.rs | 2 +- crates/ingress-rpc/src/queue.rs | 2 +- crates/ingress-rpc/src/service.rs | 24 +- 43 files changed, 26 insertions(+), 1740 deletions(-) delete mode 100644 crates/account-abstraction-core-v2/Cargo.toml rename crates/{account-abstraction-core-v2 => account-abstraction-core}/README.md (97%) delete mode 100644 crates/account-abstraction-core/core/src/account_abstraction_service.rs delete mode 100644 crates/account-abstraction-core/core/src/entrypoints/mod.rs delete mode 100644 crates/account-abstraction-core/core/src/entrypoints/v06.rs delete mode 100644 crates/account-abstraction-core/core/src/entrypoints/v07.rs delete mode 100644 crates/account-abstraction-core/core/src/entrypoints/version.rs delete mode 100644 crates/account-abstraction-core/core/src/kafka_mempool_engine.rs delete mode 100644 crates/account-abstraction-core/core/src/lib.rs delete mode 100644 crates/account-abstraction-core/core/src/mempool.rs delete mode 100644 crates/account-abstraction-core/core/src/types.rs rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/domain/entrypoints/mod.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/domain/entrypoints/v06.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/domain/entrypoints/v07.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/domain/entrypoints/version.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/domain/events.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/domain/mempool.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/domain/mod.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/domain/reputation.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/domain/types.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/factories/kafka_engine.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/factories/mod.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/infrastructure/base_node/mod.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/infrastructure/base_node/validator.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/infrastructure/in_memory/mempool.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/infrastructure/in_memory/mod.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/infrastructure/kafka/consumer.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/infrastructure/kafka/mod.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/infrastructure/mod.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/lib.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/services/interfaces/event_source.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/services/interfaces/mod.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/services/interfaces/user_op_validator.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/services/mempool_engine.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/services/mod.rs (100%) rename crates/{account-abstraction-core-v2 => account-abstraction-core}/src/services/reputations_service.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 3b241d1..7d6bca7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,29 +25,6 @@ dependencies = [ "wiremock", ] -[[package]] -name = "account-abstraction-core-v2" -version = "0.1.0" -dependencies = [ - "alloy-primitives", - "alloy-provider", - "alloy-rpc-types", - "alloy-serde", - "alloy-sol-types", - "anyhow", - "async-trait", - "jsonrpsee", - "op-alloy-network", - "rdkafka", - "reth-rpc-eth-types", - "serde", - "serde_json", - "tips-core", - "tokio", - "tracing", - "wiremock", -] - [[package]] name = "adler2" version = "2.0.1" @@ -2601,15 +2578,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - [[package]] name = "enr" version = "0.13.0" @@ -3355,11 +3323,9 @@ dependencies = [ "percent-encoding", "pin-project-lite", "socket2 0.6.1", - "system-configuration", "tokio", "tower-service", "tracing", - "windows-registry", ] [[package]] @@ -5145,9 +5111,7 @@ checksum = "3b4c14b2d9afca6a60277086b0cc6a6ae0b568f6f7916c943a8cdc79f8be240f" dependencies = [ "base64 0.22.1", "bytes", - "encoding_rs", "futures-core", - "h2 0.4.12", "http 1.4.0", "http-body 1.0.1", "http-body-util", @@ -5157,7 +5121,6 @@ dependencies = [ "hyper-util", "js-sys", "log", - "mime", "native-tls", "percent-encoding", "pin-project-lite", @@ -6440,15 +6403,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "scc" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc" -dependencies = [ - "sdd", -] - [[package]] name = "schannel" version = "0.1.28" @@ -6509,12 +6463,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "sdd" -version = "3.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" - [[package]] name = "sec1" version = "0.3.0" @@ -6764,31 +6712,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serial_test" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" -dependencies = [ - "futures", - "log", - "once_cell", - "parking_lot", - "scc", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - [[package]] name = "sha1" version = "0.10.6" @@ -7098,27 +7021,6 @@ dependencies = [ "syn 2.0.111", ] -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags 2.10.0", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tap" version = "1.0.1" @@ -7360,7 +7262,7 @@ dependencies = [ name = "tips-ingress-rpc" version = "0.1.0" dependencies = [ - "account-abstraction-core-v2", + "account-abstraction-core", "alloy-consensus", "alloy-primitives", "alloy-provider", @@ -7390,43 +7292,6 @@ dependencies = [ "wiremock", ] -[[package]] -name = "tips-system-tests" -version = "0.1.0" -dependencies = [ - "alloy-consensus", - "alloy-network", - "alloy-primitives", - "alloy-provider", - "alloy-signer-local", - "anyhow", - "async-trait", - "aws-config", - "aws-credential-types", - "aws-sdk-s3", - "bytes", - "hex", - "jsonrpsee", - "op-alloy-consensus", - "op-alloy-network", - "op-revm", - "rdkafka", - "reqwest", - "serde", - "serde_json", - "serial_test", - "testcontainers", - "testcontainers-modules", - "tips-audit", - "tips-core", - "tips-ingress-rpc", - "tokio", - "tracing", - "tracing-subscriber 0.3.22", - "url", - "uuid", -] - [[package]] name = "tokio" version = "1.48.0" @@ -8047,17 +7912,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" -[[package]] -name = "windows-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" -dependencies = [ - "windows-link", - "windows-result", - "windows-strings", -] - [[package]] name = "windows-result" version = "0.4.1" diff --git a/Cargo.toml b/Cargo.toml index 88147bc..f05aed7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,15 +7,13 @@ homepage = "https://github.com/base/tips" repository = "https://github.com/base/tips" [workspace] -members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core", "crates/account-abstraction-core-v2", "crates/system-tests"] +members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core"] resolver = "2" [workspace.dependencies] tips-audit = { path = "crates/audit" } tips-core = { path = "crates/core" } account-abstraction-core = { path = "crates/account-abstraction-core" } -account-abstraction-core-v2 = { path = "crates/account-abstraction-core-v2" } -tips-system-tests = { path = "crates/system-tests" } # Reth reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } @@ -29,11 +27,9 @@ alloy-primitives = { version = "1.4.1", default-features = false, features = [ ] } alloy-consensus = { version = "1.0.41" } alloy-provider = { version = "1.0.41" } +alloy-serde = "1.0.41" alloy-rpc-types = "1.1.2" alloy-sol-types = { version = "1.4.1", default-features = false } -alloy-signer = { version = "1.0.41" } -alloy-network = { version = "1.0.41" } -alloy-serde = "1.0.41" # op-alloy op-alloy-network = { version = "0.22.0", default-features = false } diff --git a/crates/account-abstraction-core-v2/Cargo.toml b/crates/account-abstraction-core-v2/Cargo.toml deleted file mode 100644 index a0560ce..0000000 --- a/crates/account-abstraction-core-v2/Cargo.toml +++ /dev/null @@ -1,30 +0,0 @@ -[package] -name = "account-abstraction-core-v2" -version.workspace = true -rust-version.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true -edition.workspace = true - -[dependencies] -alloy-serde = { version = "1.0.41", default-features = false } -serde.workspace = true -alloy-rpc-types.workspace = true -alloy-provider.workspace = true -op-alloy-network.workspace = true -alloy-primitives = { workspace = true } -reth-rpc-eth-types.workspace = true -tokio.workspace = true -jsonrpsee.workspace = true -async-trait = { workspace = true } -alloy-sol-types.workspace = true -anyhow.workspace = true -rdkafka.workspace = true -serde_json.workspace = true -tips-core.workspace = true -tracing.workspace = true - -[dev-dependencies] -alloy-primitives.workspace = true -wiremock.workspace = true diff --git a/crates/account-abstraction-core/Cargo.toml b/crates/account-abstraction-core/Cargo.toml index 39b1591..132e374 100644 --- a/crates/account-abstraction-core/Cargo.toml +++ b/crates/account-abstraction-core/Cargo.toml @@ -7,8 +7,6 @@ homepage.workspace = true repository.workspace = true edition.workspace = true -[lib] -path = "core/src/lib.rs" [dependencies] alloy-serde = { version = "1.0.41", default-features = false } serde.workspace = true @@ -20,12 +18,12 @@ reth-rpc-eth-types.workspace = true tokio.workspace = true jsonrpsee.workspace = true async-trait = { workspace = true } -alloy-sol-types.workspace= true +alloy-sol-types.workspace = true anyhow.workspace = true rdkafka.workspace = true serde_json.workspace = true tips-core.workspace = true -tracing.workspace=true +tracing.workspace = true [dev-dependencies] alloy-primitives.workspace = true diff --git a/crates/account-abstraction-core-v2/README.md b/crates/account-abstraction-core/README.md similarity index 97% rename from crates/account-abstraction-core-v2/README.md rename to crates/account-abstraction-core/README.md index d391854..0abcaba 100644 --- a/crates/account-abstraction-core-v2/README.md +++ b/crates/account-abstraction-core/README.md @@ -1,4 +1,4 @@ -# account-abstraction-core-v2 +# account-abstraction-core Clean architecture implementation for ERC-4337 account abstraction mempool and validation. @@ -228,10 +228,10 @@ pub fn create_mempool_engine( 3. **Reusability**: Services can be used in multiple binaries ```rust // ingress-rpc binary - use account_abstraction_core_v2::MempoolEngine; + use account_abstraction_core::MempoolEngine; // batch-processor binary - use account_abstraction_core_v2::MempoolEngine; + use account_abstraction_core::MempoolEngine; // Same code, different contexts! ``` @@ -252,7 +252,7 @@ pub fn create_mempool_engine( ### Basic Usage (with Factory) ```rust -use account_abstraction_core_v2::create_mempool_engine; +use account_abstraction_core::create_mempool_engine; let engine = create_mempool_engine( "kafka.properties", @@ -269,7 +269,7 @@ tokio::spawn(async move { ### Custom Setup (without Factory) ```rust -use account_abstraction_core_v2::{ +use account_abstraction_core::{ MempoolEngine, infrastructure::kafka::consumer::KafkaEventSource, }; @@ -282,7 +282,7 @@ let engine = MempoolEngine::with_event_source(event_source, Some(custom_config)) ### Testing ```rust -use account_abstraction_core_v2::{ +use account_abstraction_core::{ MempoolEngine, MempoolEvent, services::interfaces::event_source::EventSource, }; diff --git a/crates/account-abstraction-core/core/src/account_abstraction_service.rs b/crates/account-abstraction-core/core/src/account_abstraction_service.rs deleted file mode 100644 index d6c65a0..0000000 --- a/crates/account-abstraction-core/core/src/account_abstraction_service.rs +++ /dev/null @@ -1,195 +0,0 @@ -use crate::types::{ValidationResult, VersionedUserOperation}; -use alloy_primitives::Address; -use alloy_provider::{Provider, RootProvider}; -use async_trait::async_trait; -use jsonrpsee::core::RpcResult; -use op_alloy_network::Optimism; -use reth_rpc_eth_types::EthApiError; -use std::sync::Arc; -use tokio::time::{Duration, timeout}; -#[async_trait] -pub trait AccountAbstractionService: Send + Sync { - async fn validate_user_operation( - &self, - user_operation: &VersionedUserOperation, - entry_point: &Address, - ) -> RpcResult; -} - -#[derive(Debug, Clone)] -pub struct AccountAbstractionServiceImpl { - simulation_provider: Arc>, - validate_user_operation_timeout: u64, -} - -#[async_trait] -impl AccountAbstractionService for AccountAbstractionServiceImpl { - async fn validate_user_operation( - &self, - user_operation: &VersionedUserOperation, - entry_point: &Address, - ) -> RpcResult { - // Steps: Reputation Service Validate - // Steps: Base Node Validate User Operation - self.base_node_validate_user_operation(user_operation, entry_point) - .await - } -} - -impl AccountAbstractionServiceImpl { - pub fn new( - simulation_provider: Arc>, - validate_user_operation_timeout: u64, - ) -> Self { - Self { - simulation_provider, - validate_user_operation_timeout, - } - } - - pub async fn base_node_validate_user_operation( - &self, - user_operation: &VersionedUserOperation, - entry_point: &Address, - ) -> RpcResult { - let result = timeout( - Duration::from_secs(self.validate_user_operation_timeout), - self.simulation_provider - .client() - .request("base_validateUserOperation", (user_operation, entry_point)), - ) - .await; - - let validation_result: ValidationResult = match result { - Err(_) => { - return Err( - EthApiError::InvalidParams("Timeout on requesting validation".into()) - .into_rpc_err(), - ); - } - Ok(Err(e)) => { - return Err(EthApiError::InvalidParams(e.to_string()).into_rpc_err()); // likewise, map RPC error to your error type - } - Ok(Ok(v)) => v, - }; - - Ok(validation_result) - } -} - -#[cfg(test)] -mod tests { - use super::*; - - use alloy_primitives::{Address, Bytes, U256}; - use alloy_rpc_types::erc4337::UserOperation; - use tokio::time::Duration; - use wiremock::{Mock, MockServer, ResponseTemplate, matchers::method}; - - const VALIDATION_TIMEOUT_SECS: u64 = 1; - const LONG_DELAY_SECS: u64 = 3; - - async fn setup_mock_server() -> MockServer { - MockServer::start().await - } - - fn new_test_user_operation_v06() -> VersionedUserOperation { - VersionedUserOperation::UserOperation(UserOperation { - sender: Address::ZERO, - nonce: U256::from(0), - init_code: Bytes::default(), - call_data: Bytes::default(), - call_gas_limit: U256::from(21_000), - verification_gas_limit: U256::from(100_000), - pre_verification_gas: U256::from(21_000), - max_fee_per_gas: U256::from(1_000_000_000), - max_priority_fee_per_gas: U256::from(1_000_000_000), - paymaster_and_data: Bytes::default(), - signature: Bytes::default(), - }) - } - - fn new_service(mock_server: &MockServer) -> AccountAbstractionServiceImpl { - let provider: RootProvider = - RootProvider::new_http(mock_server.uri().parse().unwrap()); - let simulation_provider = Arc::new(provider); - AccountAbstractionServiceImpl::new(simulation_provider, VALIDATION_TIMEOUT_SECS) - } - - #[tokio::test] - async fn base_node_validate_user_operation_times_out() { - let mock_server = setup_mock_server().await; - - Mock::given(method("POST")) - .respond_with( - ResponseTemplate::new(200).set_delay(Duration::from_secs(LONG_DELAY_SECS)), - ) - .mount(&mock_server) - .await; - - let service = new_service(&mock_server); - let user_operation = new_test_user_operation_v06(); - - let result = service - .base_node_validate_user_operation(&user_operation, &Address::ZERO) - .await; - - assert!(result.is_err()); - assert!(result.unwrap_err().to_string().contains("Timeout")); - } - - #[tokio::test] - async fn should_propagate_error_from_base_node() { - let mock_server = setup_mock_server().await; - - Mock::given(method("POST")) - .respond_with(ResponseTemplate::new(500).set_body_json(serde_json::json!({ - "jsonrpc": "2.0", - "id": 1, - "error": { - "code": -32000, - "message": "Internal error" - } - }))) - .mount(&mock_server) - .await; - - let service = new_service(&mock_server); - let user_operation = new_test_user_operation_v06(); - - let result = service - .base_node_validate_user_operation(&user_operation, &Address::ZERO) - .await; - assert!(result.is_err()); - assert!(result.unwrap_err().to_string().contains("Internal error")); - } - #[tokio::test] - async fn base_node_validate_user_operation_succeeds() { - let mock_server = setup_mock_server().await; - - Mock::given(method("POST")) - .respond_with(ResponseTemplate::new(200).set_body_json(serde_json::json!({ - "jsonrpc": "2.0", - "id": 1, - "result": { - "valid": true, - "reason": null, - "valid_until": null, - "valid_after": null, - "context": null - } - }))) - .mount(&mock_server) - .await; - - let service = new_service(&mock_server); - let user_operation = new_test_user_operation_v06(); - - let result = service - .base_node_validate_user_operation(&user_operation, &Address::ZERO) - .await - .unwrap(); - - assert_eq!(result.valid, true); - } -} diff --git a/crates/account-abstraction-core/core/src/entrypoints/mod.rs b/crates/account-abstraction-core/core/src/entrypoints/mod.rs deleted file mode 100644 index 4946ba2..0000000 --- a/crates/account-abstraction-core/core/src/entrypoints/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod v06; -pub mod v07; -pub mod version; diff --git a/crates/account-abstraction-core/core/src/entrypoints/v06.rs b/crates/account-abstraction-core/core/src/entrypoints/v06.rs deleted file mode 100644 index 4883305..0000000 --- a/crates/account-abstraction-core/core/src/entrypoints/v06.rs +++ /dev/null @@ -1,139 +0,0 @@ -/* - * ERC-4337 v0.6 UserOperation Hash Calculation - * - * 1. Hash variable-length fields: initCode, callData, paymasterAndData - * 2. Pack all fields into struct (using hashes from step 1, gas values as uint256) - * 3. encodedHash = keccak256(abi.encode(packed struct)) - * 4. final hash = keccak256(abi.encode(encodedHash, entryPoint, chainId)) - * - * Reference: rundler/crates/types/src/user_operation/v0_6.rs:927-934 - */ -use alloy_primitives::{ChainId, U256}; -use alloy_rpc_types::erc4337; -use alloy_sol_types::{SolValue, sol}; -sol! { - #[allow(missing_docs)] - #[derive(Default, Debug, PartialEq, Eq)] - struct UserOperationHashEncoded { - bytes32 encodedHash; - address entryPoint; - uint256 chainId; - } - - #[allow(missing_docs)] - #[derive(Default, Debug, PartialEq, Eq)] - struct UserOperationPackedForHash { - address sender; - uint256 nonce; - bytes32 hashInitCode; - bytes32 hashCallData; - uint256 callGasLimit; - uint256 verificationGasLimit; - uint256 preVerificationGas; - uint256 maxFeePerGas; - uint256 maxPriorityFeePerGas; - bytes32 hashPaymasterAndData; - } -} - -impl From for UserOperationPackedForHash { - fn from(op: erc4337::UserOperation) -> UserOperationPackedForHash { - UserOperationPackedForHash { - sender: op.sender, - nonce: op.nonce, - hashInitCode: alloy_primitives::keccak256(op.init_code), - hashCallData: alloy_primitives::keccak256(op.call_data), - callGasLimit: U256::from(op.call_gas_limit), - verificationGasLimit: U256::from(op.verification_gas_limit), - preVerificationGas: U256::from(op.pre_verification_gas), - maxFeePerGas: U256::from(op.max_fee_per_gas), - maxPriorityFeePerGas: U256::from(op.max_priority_fee_per_gas), - hashPaymasterAndData: alloy_primitives::keccak256(op.paymaster_and_data), - } - } -} - -pub fn hash_user_operation( - user_operation: &erc4337::UserOperation, - entry_point: alloy_primitives::Address, - chain_id: ChainId, -) -> alloy_primitives::B256 { - let packed = UserOperationPackedForHash::from(user_operation.clone()); - let encoded = UserOperationHashEncoded { - encodedHash: alloy_primitives::keccak256(packed.abi_encode()), - entryPoint: entry_point, - chainId: U256::from(chain_id), - }; - alloy_primitives::keccak256(encoded.abi_encode()) -} - -#[cfg(test)] -mod tests { - use super::*; - use alloy_primitives::{Bytes, U256, address, b256, bytes}; - use alloy_rpc_types::erc4337; - - #[test] - fn test_hash_zeroed() { - let entry_point_address_v0_6 = address!("66a15edcc3b50a663e72f1457ffd49b9ae284ddc"); - let chain_id = 1337; - let user_op_with_zeroed_init_code = erc4337::UserOperation { - sender: address!("0x0000000000000000000000000000000000000000"), - nonce: U256::ZERO, - init_code: Bytes::default(), - call_data: Bytes::default(), - call_gas_limit: U256::from(0), - verification_gas_limit: U256::from(0), - pre_verification_gas: U256::from(0), - max_fee_per_gas: U256::from(0), - max_priority_fee_per_gas: U256::from(0), - paymaster_and_data: Bytes::default(), - signature: Bytes::default(), - }; - - let hash = hash_user_operation( - &user_op_with_zeroed_init_code, - entry_point_address_v0_6, - chain_id, - ); - assert_eq!( - hash, - b256!("dca97c3b49558ab360659f6ead939773be8bf26631e61bb17045bb70dc983b2d") - ); - } - - #[test] - fn test_hash_non_zeroed() { - let entry_point_address_v0_6 = address!("66a15edcc3b50a663e72f1457ffd49b9ae284ddc"); - let chain_id = 1337; - let user_op_with_non_zeroed_init_code = erc4337::UserOperation { - sender: address!("0x1306b01bc3e4ad202612d3843387e94737673f53"), - nonce: U256::from(8942), - init_code: "0x6942069420694206942069420694206942069420" - .parse() - .unwrap(), - call_data: "0x0000000000000000000000000000000000000000080085" - .parse() - .unwrap(), - call_gas_limit: U256::from(10_000), - verification_gas_limit: U256::from(100_000), - pre_verification_gas: U256::from(100), - max_fee_per_gas: U256::from(99_999), - max_priority_fee_per_gas: U256::from(9_999_999), - paymaster_and_data: bytes!( - "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" - ), - signature: bytes!("da0929f527cded8d0a1eaf2e8861d7f7e2d8160b7b13942f99dd367df4473a"), - }; - - let hash = hash_user_operation( - &user_op_with_non_zeroed_init_code, - entry_point_address_v0_6, - chain_id, - ); - assert_eq!( - hash, - b256!("484add9e4d8c3172d11b5feb6a3cc712280e176d278027cfa02ee396eb28afa1") - ); - } -} diff --git a/crates/account-abstraction-core/core/src/entrypoints/v07.rs b/crates/account-abstraction-core/core/src/entrypoints/v07.rs deleted file mode 100644 index 60d8fd4..0000000 --- a/crates/account-abstraction-core/core/src/entrypoints/v07.rs +++ /dev/null @@ -1,180 +0,0 @@ -/* - * ERC-4337 v0.7 UserOperation Hash Calculation - * - * 1. Hash variable-length fields: initCode, callData, paymasterAndData - * 2. Pack all fields into struct (using hashes from step 1, gas values as bytes32) - * 3. encodedHash = keccak256(abi.encode(packed struct)) - * 4. final hash = keccak256(abi.encode(encodedHash, entryPoint, chainId)) - * - * Reference: rundler/crates/types/src/user_operation/v0_7.rs:1094-1123 - */ -use alloy_primitives::{Address, ChainId, FixedBytes, U256}; -use alloy_primitives::{Bytes, keccak256}; -use alloy_rpc_types::erc4337; -use alloy_sol_types::{SolValue, sol}; - -sol!( - #[allow(missing_docs)] - #[derive(Default, Debug, PartialEq, Eq)] - struct PackedUserOperation { - address sender; - uint256 nonce; - bytes initCode; - bytes callData; - bytes32 accountGasLimits; - uint256 preVerificationGas; - bytes32 gasFees; - bytes paymasterAndData; - bytes signature; - } - - #[derive(Default, Debug, PartialEq, Eq)] - struct UserOperationHashEncoded { - bytes32 encodedHash; - address entryPoint; - uint256 chainId; - } - - #[derive(Default, Debug, PartialEq, Eq)] - struct UserOperationPackedForHash { - address sender; - uint256 nonce; - bytes32 hashInitCode; - bytes32 hashCallData; - bytes32 accountGasLimits; - uint256 preVerificationGas; - bytes32 gasFees; - bytes32 hashPaymasterAndData; - } -); - -impl From for PackedUserOperation { - fn from(uo: erc4337::PackedUserOperation) -> Self { - let init_code = if let Some(factory) = uo.factory { - let mut init_code = factory.to_vec(); - init_code.extend_from_slice(&uo.factory_data.clone().unwrap_or_default()); - Bytes::from(init_code) - } else { - Bytes::new() - }; - let account_gas_limits = - pack_u256_pair_to_bytes32(uo.verification_gas_limit, uo.call_gas_limit); - let gas_fees = pack_u256_pair_to_bytes32(uo.max_priority_fee_per_gas, uo.max_fee_per_gas); - let pvgl: [u8; 16] = uo - .paymaster_verification_gas_limit - .unwrap_or_default() - .to::() - .to_be_bytes(); - let pogl: [u8; 16] = uo - .paymaster_post_op_gas_limit - .unwrap_or_default() - .to::() - .to_be_bytes(); - let paymaster_and_data = if let Some(paymaster) = uo.paymaster { - let mut paymaster_and_data = paymaster.to_vec(); - paymaster_and_data.extend_from_slice(&pvgl); - paymaster_and_data.extend_from_slice(&pogl); - paymaster_and_data.extend_from_slice(&uo.paymaster_data.unwrap()); - Bytes::from(paymaster_and_data) - } else { - Bytes::new() - }; - PackedUserOperation { - sender: uo.sender, - nonce: uo.nonce, - initCode: init_code, - callData: uo.call_data.clone(), - accountGasLimits: account_gas_limits, - preVerificationGas: U256::from(uo.pre_verification_gas), - gasFees: gas_fees, - paymasterAndData: paymaster_and_data, - signature: uo.signature.clone(), - } - } -} -fn pack_u256_pair_to_bytes32(high: U256, low: U256) -> FixedBytes<32> { - let mask = (U256::from(1u64) << 128) - U256::from(1u64); - let hi = high & mask; - let lo = low & mask; - let combined: U256 = (hi << 128) | lo; - FixedBytes::from(combined.to_be_bytes::<32>()) -} - -fn hash_packed_user_operation( - puo: &PackedUserOperation, - entry_point: Address, - chain_id: u64, -) -> FixedBytes<32> { - let hash_init_code = alloy_primitives::keccak256(&puo.initCode); - let hash_call_data = alloy_primitives::keccak256(&puo.callData); - let hash_paymaster_and_data = alloy_primitives::keccak256(&puo.paymasterAndData); - - let packed_for_hash = UserOperationPackedForHash { - sender: puo.sender, - nonce: puo.nonce, - hashInitCode: hash_init_code, - hashCallData: hash_call_data, - accountGasLimits: puo.accountGasLimits, - preVerificationGas: puo.preVerificationGas, - gasFees: puo.gasFees, - hashPaymasterAndData: hash_paymaster_and_data, - }; - - let hashed = alloy_primitives::keccak256(packed_for_hash.abi_encode()); - - let encoded = UserOperationHashEncoded { - encodedHash: hashed, - entryPoint: entry_point, - chainId: U256::from(chain_id), - }; - - keccak256(encoded.abi_encode()) -} - -pub fn hash_user_operation( - user_operation: &erc4337::PackedUserOperation, - entry_point: Address, - chain_id: ChainId, -) -> FixedBytes<32> { - let packed = PackedUserOperation::from(user_operation.clone()); - hash_packed_user_operation(&packed, entry_point, chain_id) -} - -#[cfg(test)] -mod test { - use super::*; - use alloy_primitives::{Bytes, U256}; - use alloy_primitives::{address, b256, bytes, uint}; - - #[test] - fn test_hash() { - let puo = PackedUserOperation { - sender: address!("b292Cf4a8E1fF21Ac27C4f94071Cd02C022C414b"), - nonce: uint!(0xF83D07238A7C8814A48535035602123AD6DBFA63000000000000000000000001_U256), - initCode: Bytes::default(), // Empty - callData: - bytes!("e9ae5c53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000 - 0000000000000000000000000000000000001d8b292cf4a8e1ff21ac27c4f94071cd02c022c414b00000000000000000000000000000000000000000000000000000000000000009517e29f000000000000000000 - 0000000000000000000000000000000000000000000002000000000000000000000000ad6330089d9a1fe89f4020292e1afe9969a5a2fc00000000000000000000000000000000000000000000000000000000000 - 0006000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000000000000000000000000000000000000000018e2fbe898000000000000000000000000000000000000000000000000000000000000000800000000000000 - 0000000000000000000000000000000000000000000000000800000000000000000000000002372912728f93ab3daaaebea4f87e6e28476d987000000000000000000000000000000000000000000000000002386 - f26fc10000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000"), - accountGasLimits: b256!("000000000000000000000000000114fc0000000000000000000000000012c9b5"), - preVerificationGas: U256::from(48916), - gasFees: b256!("000000000000000000000000524121000000000000000000000000109a4a441a"), - paymasterAndData: Bytes::default(), // Empty - signature: bytes!("3c7bfe22c9c2ef8994a9637bcc4df1741c5dc0c25b209545a7aeb20f7770f351479b683bd17c4d55bc32e2a649c8d2dff49dcfcc1f3fd837bcd88d1e69a434cf1c"), - }; - - let expected_hash = - b256!("e486401370d145766c3cf7ba089553214a1230d38662ae532c9b62eb6dadcf7e"); - let uo = hash_packed_user_operation( - &puo, - address!("0x0000000071727De22E5E9d8BAf0edAc6f37da032"), - 11155111, - ); - - assert_eq!(uo, expected_hash); - } -} diff --git a/crates/account-abstraction-core/core/src/entrypoints/version.rs b/crates/account-abstraction-core/core/src/entrypoints/version.rs deleted file mode 100644 index ae37e5d..0000000 --- a/crates/account-abstraction-core/core/src/entrypoints/version.rs +++ /dev/null @@ -1,31 +0,0 @@ -use alloy_primitives::{Address, address}; - -#[derive(Debug, Clone)] -pub enum EntryPointVersion { - V06, - V07, -} - -impl EntryPointVersion { - pub const V06_ADDRESS: Address = address!("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"); - pub const V07_ADDRESS: Address = address!("0x0000000071727De22E5E9d8BAf0edAc6f37da032"); -} - -#[derive(Debug)] -pub struct UnknownEntryPointAddress { - pub address: Address, -} - -impl TryFrom
    for EntryPointVersion { - type Error = UnknownEntryPointAddress; - - fn try_from(addr: Address) -> Result { - if addr == Self::V06_ADDRESS { - Ok(EntryPointVersion::V06) - } else if addr == Self::V07_ADDRESS { - Ok(EntryPointVersion::V07) - } else { - Err(UnknownEntryPointAddress { address: addr }) - } - } -} diff --git a/crates/account-abstraction-core/core/src/kafka_mempool_engine.rs b/crates/account-abstraction-core/core/src/kafka_mempool_engine.rs deleted file mode 100644 index c843a08..0000000 --- a/crates/account-abstraction-core/core/src/kafka_mempool_engine.rs +++ /dev/null @@ -1,275 +0,0 @@ -use crate::mempool::PoolConfig; -use crate::mempool::{self, Mempool}; -use crate::types::WrappedUserOperation; -use async_trait::async_trait; -use rdkafka::{ - ClientConfig, Message, - consumer::{Consumer, StreamConsumer}, - message::OwnedMessage, -}; -use serde::{Deserialize, Serialize}; -use serde_json; -use std::sync::Arc; -use tips_core::kafka::load_kafka_config_from_file; -use tokio::sync::RwLock; -use tracing::{info, warn}; - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(tag = "event", content = "data")] -pub enum KafkaEvent { - UserOpAdded { - user_op: WrappedUserOperation, - }, - UserOpIncluded { - user_op: WrappedUserOperation, - }, - UserOpDropped { - user_op: WrappedUserOperation, - reason: String, - }, -} - -#[async_trait] -pub trait KafkaConsumer: Send + Sync { - async fn recv_msg(&self) -> anyhow::Result; -} - -#[async_trait] -impl KafkaConsumer for StreamConsumer { - async fn recv_msg(&self) -> anyhow::Result { - Ok(self.recv().await?.detach()) - } -} - -pub struct KafkaMempoolEngine { - mempool: Arc>, - kafka_consumer: Arc, -} - -impl KafkaMempoolEngine { - pub fn new( - mempool: Arc>, - kafka_consumer: Arc, - ) -> Self { - Self { - mempool, - kafka_consumer, - } - } - - pub fn with_kafka_consumer( - kafka_consumer: Arc, - pool_config: Option, - ) -> Self { - let pool_config = pool_config.unwrap_or_default(); - let mempool = Arc::new(RwLock::new(mempool::MempoolImpl::new(pool_config))); - Self { - mempool, - kafka_consumer, - } - } - - pub fn get_mempool(&self) -> Arc> { - self.mempool.clone() - } - - pub async fn run(&self) { - loop { - if let Err(err) = self.process_next().await { - warn!(error = %err, "Kafka mempool engine error, continuing"); - } - } - } - - /// Process a single Kafka message (useful for tests and controlled loops) - pub async fn process_next(&self) -> anyhow::Result<()> { - let msg = self.kafka_consumer.recv_msg().await?; - let payload = msg - .payload() - .ok_or_else(|| anyhow::anyhow!("Kafka message missing payload"))?; - let event: KafkaEvent = serde_json::from_slice(payload) - .map_err(|e| anyhow::anyhow!("Failed to parse Kafka event: {e}"))?; - - self.handle_event(event).await - } - - async fn handle_event(&self, event: KafkaEvent) -> anyhow::Result<()> { - info!( - event = ?event, - "Kafka mempool engine handling event" - ); - match event { - KafkaEvent::UserOpAdded { user_op } => { - self.mempool.write().await.add_operation(&user_op)?; - } - KafkaEvent::UserOpIncluded { user_op } => { - self.mempool.write().await.remove_operation(&user_op.hash)?; - } - KafkaEvent::UserOpDropped { user_op, reason: _ } => { - self.mempool.write().await.remove_operation(&user_op.hash)?; - } - } - Ok(()) - } -} - -fn create_user_operation_consumer( - properties_file: &str, - topic: &str, - consumer_group_id: &str, -) -> anyhow::Result { - let mut client_config = ClientConfig::from_iter(load_kafka_config_from_file(properties_file)?); - - client_config.set("group.id", consumer_group_id); - client_config.set("enable.auto.commit", "true"); - - let consumer: StreamConsumer = client_config.create()?; - consumer.subscribe(&[topic])?; - - Ok(consumer) -} - -pub fn create_mempool_engine( - properties_file: &str, - topic: &str, - consumer_group_id: &str, - pool_config: Option, -) -> anyhow::Result> { - let consumer: StreamConsumer = - create_user_operation_consumer(properties_file, topic, consumer_group_id)?; - Ok(Arc::new(KafkaMempoolEngine::with_kafka_consumer( - Arc::new(consumer), - pool_config, - ))) -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::mempool::PoolConfig; - use crate::types::VersionedUserOperation; - use alloy_primitives::{Address, FixedBytes, Uint}; - use alloy_rpc_types::erc4337; - use rdkafka::Timestamp; - use tokio::sync::Mutex; - - fn make_wrapped_op(max_fee: u128, hash: [u8; 32]) -> WrappedUserOperation { - let op = VersionedUserOperation::UserOperation(erc4337::UserOperation { - sender: Address::ZERO, - nonce: Uint::from(0u64), - init_code: Default::default(), - call_data: Default::default(), - call_gas_limit: Uint::from(100_000u64), - verification_gas_limit: Uint::from(100_000u64), - pre_verification_gas: Uint::from(21_000u64), - max_fee_per_gas: Uint::from(max_fee), - max_priority_fee_per_gas: Uint::from(max_fee), - paymaster_and_data: Default::default(), - signature: Default::default(), - }); - - WrappedUserOperation { - operation: op, - hash: FixedBytes::from(hash), - } - } - - #[tokio::test] - async fn handle_add_operation() { - let mempool = Arc::new(RwLock::new( - mempool::MempoolImpl::new(PoolConfig::default()), - )); - - let op_hash = [1u8; 32]; - let wrapped = make_wrapped_op(1_000, op_hash); - - let add_event = KafkaEvent::UserOpAdded { - user_op: wrapped.clone(), - }; - let mock_consumer = Arc::new(MockConsumer::new(vec![OwnedMessage::new( - Some(serde_json::to_vec(&add_event).unwrap()), - None, - "topic".to_string(), - Timestamp::NotAvailable, - 0, - 0, - None, - )])); - - let engine = KafkaMempoolEngine::new(mempool.clone(), mock_consumer); - - // Process add then remove deterministically - engine.process_next().await.unwrap(); - let items: Vec<_> = mempool.read().await.get_top_operations(10).collect(); - assert_eq!(items.len(), 1); - assert_eq!(items[0].hash, FixedBytes::from(op_hash)); - } - - #[tokio::test] - async fn remove_opperation_should_remove_from_mempool() { - let mempool = Arc::new(RwLock::new( - mempool::MempoolImpl::new(PoolConfig::default()), - )); - let op_hash = [1u8; 32]; - let wrapped = make_wrapped_op(1_000, op_hash); - let add_mempool = KafkaEvent::UserOpAdded { - user_op: wrapped.clone(), - }; - let remove_mempool = KafkaEvent::UserOpDropped { - user_op: wrapped.clone(), - reason: "test".to_string(), - }; - let mock_consumer = Arc::new(MockConsumer::new(vec![ - OwnedMessage::new( - Some(serde_json::to_vec(&add_mempool).unwrap()), - None, - "topic".to_string(), - Timestamp::NotAvailable, - 0, - 0, - None, - ), - OwnedMessage::new( - Some(serde_json::to_vec(&remove_mempool).unwrap()), - None, - "topic".to_string(), - Timestamp::NotAvailable, - 0, - 0, - None, - ), - ])); - - let engine = KafkaMempoolEngine::new(mempool.clone(), mock_consumer); - engine.process_next().await.unwrap(); - let items: Vec<_> = mempool.read().await.get_top_operations(10).collect(); - assert_eq!(items.len(), 1); - assert_eq!(items[0].hash, FixedBytes::from(op_hash)); - engine.process_next().await.unwrap(); - let items: Vec<_> = mempool.read().await.get_top_operations(10).collect(); - assert_eq!(items.len(), 0); - } - struct MockConsumer { - msgs: Mutex>, - } - - impl MockConsumer { - fn new(msgs: Vec) -> Self { - Self { - msgs: Mutex::new(msgs), - } - } - } - - #[async_trait] - impl KafkaConsumer for MockConsumer { - async fn recv_msg(&self) -> anyhow::Result { - let mut guard = self.msgs.lock().await; - if guard.is_empty() { - Err(anyhow::anyhow!("no more messages")) - } else { - Ok(guard.remove(0)) - } - } - } -} diff --git a/crates/account-abstraction-core/core/src/lib.rs b/crates/account-abstraction-core/core/src/lib.rs deleted file mode 100644 index e6f0ffb..0000000 --- a/crates/account-abstraction-core/core/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -pub mod account_abstraction_service; -pub mod entrypoints; -pub mod types; -pub use account_abstraction_service::{AccountAbstractionService, AccountAbstractionServiceImpl}; -pub use types::{SendUserOperationResponse, VersionedUserOperation}; -pub mod kafka_mempool_engine; -pub mod mempool; diff --git a/crates/account-abstraction-core/core/src/mempool.rs b/crates/account-abstraction-core/core/src/mempool.rs deleted file mode 100644 index d5eccc7..0000000 --- a/crates/account-abstraction-core/core/src/mempool.rs +++ /dev/null @@ -1,472 +0,0 @@ -use crate::types::{UserOpHash, WrappedUserOperation}; -use alloy_primitives::Address; -use std::cmp::Ordering; -use std::collections::{BTreeSet, HashMap}; -use std::sync::Arc; -use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering}; - -#[derive(Default)] -pub struct PoolConfig { - minimum_max_fee_per_gas: u128, -} - -#[derive(Eq, PartialEq, Clone, Debug)] -pub struct OrderedPoolOperation { - pub pool_operation: WrappedUserOperation, - pub submission_id: u64, -} - -impl OrderedPoolOperation { - pub fn from_wrapped(operation: &WrappedUserOperation, submission_id: u64) -> Self { - Self { - pool_operation: operation.clone(), - submission_id, - } - } - - pub fn sender(&self) -> Address { - self.pool_operation.operation.sender() - } -} - -/// Ordering by max priority fee (desc) then submission id, then hash to ensure total order -#[derive(Clone, Debug)] -pub struct ByMaxFeeAndSubmissionId(pub OrderedPoolOperation); - -impl PartialEq for ByMaxFeeAndSubmissionId { - fn eq(&self, other: &Self) -> bool { - self.0.pool_operation.hash == other.0.pool_operation.hash - } -} -impl Eq for ByMaxFeeAndSubmissionId {} - -impl PartialOrd for ByMaxFeeAndSubmissionId { - fn partial_cmp(&self, other: &Self) -> Option { - Some(self.cmp(other)) - } -} - -impl Ord for ByMaxFeeAndSubmissionId { - fn cmp(&self, other: &Self) -> Ordering { - other - .0 - .pool_operation - .operation - .max_priority_fee_per_gas() - .cmp(&self.0.pool_operation.operation.max_priority_fee_per_gas()) - .then_with(|| self.0.submission_id.cmp(&other.0.submission_id)) - .then_with(|| self.0.pool_operation.hash.cmp(&other.0.pool_operation.hash)) - } -} - -/// Ordering by nonce (asc), then submission id, then hash to ensure total order -#[derive(Clone, Debug)] -pub struct ByNonce(pub OrderedPoolOperation); - -impl PartialEq for ByNonce { - fn eq(&self, other: &Self) -> bool { - self.0.pool_operation.hash == other.0.pool_operation.hash - } -} -impl Eq for ByNonce {} - -impl PartialOrd for ByNonce { - fn partial_cmp(&self, other: &Self) -> Option { - Some(self.cmp(other)) - } -} - -impl Ord for ByNonce { - /// TODO: There can be invalid opperations, where base fee, + expected gas price - /// is greater that the maximum gas, in that case we don't include it in the mempool as such mempool changes. - fn cmp(&self, other: &Self) -> Ordering { - self.0 - .pool_operation - .operation - .nonce() - .cmp(&other.0.pool_operation.operation.nonce()) - .then_with(|| self.0.submission_id.cmp(&other.0.submission_id)) - } -} - -pub trait Mempool { - fn add_operation( - &mut self, - operation: &WrappedUserOperation, - ) -> Result, anyhow::Error>; - fn get_top_operations(&self, n: usize) -> impl Iterator>; - fn remove_operation( - &mut self, - operation_hash: &UserOpHash, - ) -> Result, anyhow::Error>; -} - -pub struct MempoolImpl { - config: PoolConfig, - best: BTreeSet, - hash_to_operation: HashMap, - operations_by_account: HashMap>, - submission_id_counter: AtomicU64, -} - -impl Mempool for MempoolImpl { - fn add_operation( - &mut self, - operation: &WrappedUserOperation, - ) -> Result, anyhow::Error> { - if operation.operation.max_fee_per_gas() < self.config.minimum_max_fee_per_gas { - return Err(anyhow::anyhow!( - "Gas price is below the minimum required PVG gas" - )); - } - let ordered_operation_result = self.handle_add_operation(operation)?; - Ok(ordered_operation_result) - } - - fn get_top_operations(&self, n: usize) -> impl Iterator> { - // TODO: There is a case where we skip operations that are not the lowest nonce for an account. - // But we still have not given the N number of operations, meaning we don't return those operations. - - self.best - .iter() - .filter_map(|op_by_fee| { - let lowest = self - .operations_by_account - .get(&op_by_fee.0.sender()) - .and_then(|set| set.first()); - - match lowest { - Some(lowest) - if lowest.0.pool_operation.hash == op_by_fee.0.pool_operation.hash => - { - Some(Arc::new(op_by_fee.0.pool_operation.clone())) - } - Some(_) => None, - None => { - println!( - "No operations found for account: {} but one was found in the best set", - op_by_fee.0.sender() - ); - None - } - } - }) - .take(n) - } - - fn remove_operation( - &mut self, - operation_hash: &UserOpHash, - ) -> Result, anyhow::Error> { - if let Some(ordered_operation) = self.hash_to_operation.remove(operation_hash) { - self.best - .remove(&ByMaxFeeAndSubmissionId(ordered_operation.clone())); - self.operations_by_account - .get_mut(&ordered_operation.sender()) - .map(|set| set.remove(&ByNonce(ordered_operation.clone()))); - Ok(Some(ordered_operation.pool_operation)) - } else { - Ok(None) - } - } -} - -// When user opperation is added to the mempool we need to check - -impl MempoolImpl { - fn handle_add_operation( - &mut self, - operation: &WrappedUserOperation, - ) -> Result, anyhow::Error> { - // Account - if self.hash_to_operation.contains_key(&operation.hash) { - return Ok(None); - } - - let order = self.get_next_order_id(); - let ordered_operation = OrderedPoolOperation::from_wrapped(operation, order); - - self.best - .insert(ByMaxFeeAndSubmissionId(ordered_operation.clone())); - self.operations_by_account - .entry(ordered_operation.sender()) - .or_default() - .insert(ByNonce(ordered_operation.clone())); - self.hash_to_operation - .insert(operation.hash, ordered_operation.clone()); - Ok(Some(ordered_operation)) - } - - fn get_next_order_id(&self) -> u64 { - self.submission_id_counter - .fetch_add(1, AtomicOrdering::SeqCst) - } - - pub fn new(config: PoolConfig) -> Self { - Self { - config, - best: BTreeSet::new(), - hash_to_operation: HashMap::new(), - operations_by_account: HashMap::new(), - submission_id_counter: AtomicU64::new(0), - } - } -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::types::VersionedUserOperation; - use alloy_primitives::{Address, FixedBytes, Uint}; - use alloy_rpc_types::erc4337; - fn create_test_user_operation(max_priority_fee_per_gas: u128) -> VersionedUserOperation { - VersionedUserOperation::UserOperation(erc4337::UserOperation { - sender: Address::random(), - nonce: Uint::from(0), - init_code: Default::default(), - call_data: Default::default(), - call_gas_limit: Uint::from(100000), - verification_gas_limit: Uint::from(100000), - pre_verification_gas: Uint::from(21000), - max_fee_per_gas: Uint::from(max_priority_fee_per_gas), - max_priority_fee_per_gas: Uint::from(max_priority_fee_per_gas), - paymaster_and_data: Default::default(), - signature: Default::default(), - }) - } - - fn create_wrapped_operation( - max_priority_fee_per_gas: u128, - hash: UserOpHash, - ) -> WrappedUserOperation { - WrappedUserOperation { - operation: create_test_user_operation(max_priority_fee_per_gas), - hash, - } - } - - fn create_test_mempool(minimum_required_pvg_gas: u128) -> MempoolImpl { - MempoolImpl::new(PoolConfig { - minimum_max_fee_per_gas: minimum_required_pvg_gas, - }) - } - - // Tests successfully adding a valid operation to the mempool - #[test] - fn test_add_operation_success() { - let mut mempool = create_test_mempool(1000); - let hash = FixedBytes::from([1u8; 32]); - let operation = create_wrapped_operation(2000, hash); - - let result = mempool.add_operation(&operation); - - assert!(result.is_ok()); - let ordered_op = result.unwrap(); - assert!(ordered_op.is_some()); - let ordered_op = ordered_op.unwrap(); - assert_eq!(ordered_op.pool_operation.hash, hash); - assert_eq!( - ordered_op.pool_operation.operation.max_fee_per_gas(), - Uint::from(2000) - ); - } - - // Tests adding an operation with a gas price below the minimum required PVG gas - #[test] - fn test_add_operation_below_minimum_gas() { - let mut mempool = create_test_mempool(2000); - let hash = FixedBytes::from([1u8; 32]); - let operation = create_wrapped_operation(1000, hash); - - let result = mempool.add_operation(&operation); - - assert!(result.is_err()); - assert!( - result - .unwrap_err() - .to_string() - .contains("Gas price is below the minimum required PVG gas") - ); - } - - // Tests adding multiple operations with different hashes - #[test] - fn test_add_multiple_operations() { - let mut mempool = create_test_mempool(1000); - - let hash1 = FixedBytes::from([1u8; 32]); - let operation1 = create_wrapped_operation(2000, hash1); - let result1 = mempool.add_operation(&operation1); - assert!(result1.is_ok()); - assert!(result1.unwrap().is_some()); - - let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = create_wrapped_operation(3000, hash2); - let result2 = mempool.add_operation(&operation2); - assert!(result2.is_ok()); - assert!(result2.unwrap().is_some()); - - let hash3 = FixedBytes::from([3u8; 32]); - let operation3 = create_wrapped_operation(1500, hash3); - let result3 = mempool.add_operation(&operation3); - assert!(result3.is_ok()); - assert!(result3.unwrap().is_some()); - - assert_eq!(mempool.hash_to_operation.len(), 3); - assert_eq!(mempool.best.len(), 3); - } - - // Tests removing an operation that is not in the mempool - #[test] - fn test_remove_operation_not_in_mempool() { - let mut mempool = create_test_mempool(1000); - let hash = FixedBytes::from([1u8; 32]); - - let result = mempool.remove_operation(&hash); - assert!(result.is_ok()); - assert!(result.unwrap().is_none()); - } - - // Tests removing an operation that exists in the mempool - #[test] - fn test_remove_operation_exists() { - let mut mempool = create_test_mempool(1000); - let hash = FixedBytes::from([1u8; 32]); - let operation = create_wrapped_operation(2000, hash); - - mempool.add_operation(&operation).unwrap(); - - let result = mempool.remove_operation(&hash); - assert!(result.is_ok()); - let removed = result.unwrap(); - assert!(removed.is_some()); - let removed_op = removed.unwrap(); - assert_eq!(removed_op.hash, hash); - assert_eq!(removed_op.operation.max_fee_per_gas(), Uint::from(2000)); - } - - // Tests removing an operation and checking the best operations - #[test] - fn test_remove_operation_and_check_best() { - let mut mempool = create_test_mempool(1000); - let hash = FixedBytes::from([1u8; 32]); - let operation = create_wrapped_operation(2000, hash); - - mempool.add_operation(&operation).unwrap(); - - let best_before: Vec<_> = mempool.get_top_operations(10).collect(); - assert_eq!(best_before.len(), 1); - assert_eq!(best_before[0].hash, hash); - - let result = mempool.remove_operation(&hash); - assert!(result.is_ok()); - assert!(result.unwrap().is_some()); - - let best_after: Vec<_> = mempool.get_top_operations(10).collect(); - assert_eq!(best_after.len(), 0); - } - - // Tests getting the top operations with ordering - #[test] - fn test_get_top_operations_ordering() { - let mut mempool = create_test_mempool(1000); - - let hash1 = FixedBytes::from([1u8; 32]); - let operation1 = create_wrapped_operation(2000, hash1); - mempool.add_operation(&operation1).unwrap(); - - let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = create_wrapped_operation(3000, hash2); - mempool.add_operation(&operation2).unwrap(); - - let hash3 = FixedBytes::from([3u8; 32]); - let operation3 = create_wrapped_operation(1500, hash3); - mempool.add_operation(&operation3).unwrap(); - - let best: Vec<_> = mempool.get_top_operations(10).collect(); - assert_eq!(best.len(), 3); - assert_eq!(best[0].operation.max_fee_per_gas(), Uint::from(3000)); - assert_eq!(best[1].operation.max_fee_per_gas(), Uint::from(2000)); - assert_eq!(best[2].operation.max_fee_per_gas(), Uint::from(1500)); - } - - // Tests getting the top operations with a limit - #[test] - fn test_get_top_operations_limit() { - let mut mempool = create_test_mempool(1000); - - let hash1 = FixedBytes::from([1u8; 32]); - let operation1 = create_wrapped_operation(2000, hash1); - mempool.add_operation(&operation1).unwrap(); - - let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = create_wrapped_operation(3000, hash2); - mempool.add_operation(&operation2).unwrap(); - - let hash3 = FixedBytes::from([3u8; 32]); - let operation3 = create_wrapped_operation(1500, hash3); - mempool.add_operation(&operation3).unwrap(); - - let best: Vec<_> = mempool.get_top_operations(2).collect(); - assert_eq!(best.len(), 2); - assert_eq!(best[0].operation.max_fee_per_gas(), Uint::from(3000)); - assert_eq!(best[1].operation.max_fee_per_gas(), Uint::from(2000)); - } - - // Tests top opperations tie breaker with submission id - #[test] - fn test_get_top_operations_submission_id_tie_breaker() { - let mut mempool = create_test_mempool(1000); - - let hash1 = FixedBytes::from([1u8; 32]); - let operation1 = create_wrapped_operation(2000, hash1); - mempool.add_operation(&operation1).unwrap().unwrap(); - - let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = create_wrapped_operation(2000, hash2); - mempool.add_operation(&operation2).unwrap().unwrap(); - - let best: Vec<_> = mempool.get_top_operations(2).collect(); - assert_eq!(best.len(), 2); - assert_eq!(best[0].hash, hash1); - assert_eq!(best[1].hash, hash2); - } - - #[test] - fn test_get_top_operations_should_return_the_lowest_nonce_operation_for_each_account() { - let mut mempool = create_test_mempool(1000); - let hash1 = FixedBytes::from([1u8; 32]); - let test_user_operation = create_test_user_operation(2000); - - // Destructure to the inner struct, then update nonce - let base_op = match test_user_operation.clone() { - VersionedUserOperation::UserOperation(op) => op, - _ => panic!("expected UserOperation variant"), - }; - - let operation1 = WrappedUserOperation { - operation: VersionedUserOperation::UserOperation(erc4337::UserOperation { - nonce: Uint::from(0), - max_fee_per_gas: Uint::from(2000), - ..base_op.clone() - }), - hash: hash1, - }; - - mempool.add_operation(&operation1).unwrap().unwrap(); - let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = WrappedUserOperation { - operation: VersionedUserOperation::UserOperation(erc4337::UserOperation { - nonce: Uint::from(1), - max_fee_per_gas: Uint::from(10_000), - ..base_op.clone() - }), - hash: hash2, - }; - mempool.add_operation(&operation2).unwrap().unwrap(); - - let best: Vec<_> = mempool.get_top_operations(2).collect(); - assert_eq!(best.len(), 1); - assert_eq!(best[0].operation.nonce(), Uint::from(0)); - } -} diff --git a/crates/account-abstraction-core/core/src/types.rs b/crates/account-abstraction-core/core/src/types.rs deleted file mode 100644 index 3d79564..0000000 --- a/crates/account-abstraction-core/core/src/types.rs +++ /dev/null @@ -1,230 +0,0 @@ -use crate::entrypoints::{v06, v07, version::EntryPointVersion}; -use alloy_primitives::{Address, B256, ChainId, FixedBytes, U256}; -use alloy_rpc_types::erc4337; -pub use alloy_rpc_types::erc4337::SendUserOperationResponse; -use anyhow::Result; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] -#[serde(untagged)] -pub enum VersionedUserOperation { - UserOperation(erc4337::UserOperation), - PackedUserOperation(erc4337::PackedUserOperation), -} - -impl VersionedUserOperation { - pub fn max_fee_per_gas(&self) -> U256 { - match self { - VersionedUserOperation::UserOperation(op) => op.max_fee_per_gas, - VersionedUserOperation::PackedUserOperation(op) => op.max_fee_per_gas, - } - } - - pub fn max_priority_fee_per_gas(&self) -> U256 { - match self { - VersionedUserOperation::UserOperation(op) => op.max_priority_fee_per_gas, - VersionedUserOperation::PackedUserOperation(op) => op.max_priority_fee_per_gas, - } - } - pub fn nonce(&self) -> U256 { - match self { - VersionedUserOperation::UserOperation(op) => op.nonce, - VersionedUserOperation::PackedUserOperation(op) => op.nonce, - } - } - - pub fn sender(&self) -> Address { - match self { - VersionedUserOperation::UserOperation(op) => op.sender, - VersionedUserOperation::PackedUserOperation(op) => op.sender, - } - } -} -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] -pub struct UserOperationRequest { - pub user_operation: VersionedUserOperation, - pub entry_point: Address, - pub chain_id: ChainId, -} - -impl UserOperationRequest { - pub fn hash(&self) -> Result { - let entry_point_version = EntryPointVersion::try_from(self.entry_point) - .map_err(|_| anyhow::anyhow!("Unknown entry point version: {:#x}", self.entry_point))?; - - match (&self.user_operation, entry_point_version) { - (VersionedUserOperation::UserOperation(op), EntryPointVersion::V06) => Ok( - v06::hash_user_operation(op, self.entry_point, self.chain_id), - ), - (VersionedUserOperation::PackedUserOperation(op), EntryPointVersion::V07) => Ok( - v07::hash_user_operation(op, self.entry_point, self.chain_id), - ), - _ => Err(anyhow::anyhow!( - "Mismatched operation type and entry point version" - )), - } - } -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct UserOperationRequestValidationResult { - pub expiration_timestamp: u64, - pub gas_used: U256, -} - -/// Validation result for User Operations -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct ValidationResult { - /// Whether the UserOp is valid - pub valid: bool, - /// Error message if not valid - #[serde(skip_serializing_if = "Option::is_none")] - pub reason: Option, - /// Timestamp until the UserOp is valid (0 = no expiry) - #[serde(skip_serializing_if = "Option::is_none")] - pub valid_until: Option, - /// Timestamp after which the UserOp is valid (0 = immediately) - #[serde(skip_serializing_if = "Option::is_none")] - pub valid_after: Option, - /// Entity stake/deposit context - #[serde(skip_serializing_if = "Option::is_none")] - pub context: Option, -} - -/// Entity stake/deposit information context -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct ValidationContext { - /// Sender (account) stake info - pub sender_info: EntityStakeInfo, - /// Factory stake info (if present) - #[serde(skip_serializing_if = "Option::is_none")] - pub factory_info: Option, - /// Paymaster stake info (if present) - #[serde(skip_serializing_if = "Option::is_none")] - pub paymaster_info: Option, - /// Aggregator stake info (if present) - #[serde(skip_serializing_if = "Option::is_none")] - pub aggregator_info: Option, -} - -/// Stake info for an entity (used in RPC response) -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct EntityStakeInfo { - /// Entity address - pub address: Address, - /// Amount staked - pub stake: U256, - /// Unstake delay in seconds - pub unstake_delay_sec: u64, - /// Amount deposited for gas - pub deposit: U256, - /// Whether entity meets staking requirements - pub is_staked: bool, -} - -/// Aggregator stake info (used in RPC response) -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct AggregatorInfo { - /// Aggregator address - pub aggregator: Address, - /// Stake info - pub stake_info: EntityStakeInfo, -} - -pub type UserOpHash = FixedBytes<32>; - -#[derive(Eq, PartialEq, Clone, Debug, Serialize, Deserialize)] -pub struct WrappedUserOperation { - pub operation: VersionedUserOperation, - pub hash: UserOpHash, -} - -impl WrappedUserOperation { - pub fn has_higher_max_fee(&self, other: &WrappedUserOperation) -> bool { - self.operation.max_fee_per_gas() > other.operation.max_fee_per_gas() - } -} - -// Tests -#[cfg(test)] -mod tests { - use std::str::FromStr; - - use super::*; - use alloy_primitives::{Address, Uint}; - - #[test] - fn deser_untagged_user_operation_without_type_field() { - // v0.6 shape, no "type" key - let json = r#" - { - "sender": "0x1111111111111111111111111111111111111111", - "nonce": "0x0", - "initCode": "0x", - "callData": "0x", - "callGasLimit": "0x5208", - "verificationGasLimit": "0x100000", - "preVerificationGas": "0x10000", - "maxFeePerGas": "0x59682f10", - "maxPriorityFeePerGas": "0x3b9aca00", - "paymasterAndData": "0x", - "signature": "0x01" - } - "#; - - let parsed: VersionedUserOperation = - serde_json::from_str(json).expect("should deserialize as v0.6"); - match parsed { - VersionedUserOperation::UserOperation(op) => { - assert_eq!( - op.sender, - Address::from_str("0x1111111111111111111111111111111111111111").unwrap() - ); - assert_eq!(op.nonce, Uint::from(0)); - } - other => panic!("expected UserOperation, got {:?}", other), - } - } - - #[test] - fn deser_untagged_packed_user_operation_without_type_field() { - // v0.7 shape, no "type" key - let json = r#" - { - "sender": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", - "nonce": "0x1", - "factory": "0x2222222222222222222222222222222222222222", - "factoryData": "0xabcdef1234560000000000000000000000000000000000000000000000000000", - "callData": "0xb61d27f600000000000000000000000000000000000000000000000000000000000000c8", - "callGasLimit": "0x2dc6c0", - "verificationGasLimit": "0x1e8480", - "preVerificationGas": "0x186a0", - "maxFeePerGas": "0x77359400", - "maxPriorityFeePerGas": "0x3b9aca00", - "paymaster": "0x3333333333333333333333333333333333333333", - "paymasterVerificationGasLimit": "0x186a0", - "paymasterPostOpGasLimit": "0x27100", - "paymasterData": "0xfafb00000000000000000000000000000000000000000000000000000000000064", - "signature": "0xa3c5f1b90014e68abbbdc42e4b77b9accc0b7e1c5d0b5bcde1a47ba8faba00ff55c9a7de12e98b731766e35f6c51ab25c9b58cc0e7c4a33f25e75c51c6ad3c3a" - } - "#; - - let parsed: VersionedUserOperation = - serde_json::from_str(json).expect("should deserialize as v0.7 packed"); - match parsed { - VersionedUserOperation::PackedUserOperation(op) => { - assert_eq!( - op.sender, - Address::from_str("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48").unwrap() - ); - assert_eq!(op.nonce, Uint::from(1)); - } - other => panic!("expected PackedUserOperation, got {:?}", other), - } - } -} diff --git a/crates/account-abstraction-core-v2/src/domain/entrypoints/mod.rs b/crates/account-abstraction-core/src/domain/entrypoints/mod.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/domain/entrypoints/mod.rs rename to crates/account-abstraction-core/src/domain/entrypoints/mod.rs diff --git a/crates/account-abstraction-core-v2/src/domain/entrypoints/v06.rs b/crates/account-abstraction-core/src/domain/entrypoints/v06.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/domain/entrypoints/v06.rs rename to crates/account-abstraction-core/src/domain/entrypoints/v06.rs diff --git a/crates/account-abstraction-core-v2/src/domain/entrypoints/v07.rs b/crates/account-abstraction-core/src/domain/entrypoints/v07.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/domain/entrypoints/v07.rs rename to crates/account-abstraction-core/src/domain/entrypoints/v07.rs diff --git a/crates/account-abstraction-core-v2/src/domain/entrypoints/version.rs b/crates/account-abstraction-core/src/domain/entrypoints/version.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/domain/entrypoints/version.rs rename to crates/account-abstraction-core/src/domain/entrypoints/version.rs diff --git a/crates/account-abstraction-core-v2/src/domain/events.rs b/crates/account-abstraction-core/src/domain/events.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/domain/events.rs rename to crates/account-abstraction-core/src/domain/events.rs diff --git a/crates/account-abstraction-core-v2/src/domain/mempool.rs b/crates/account-abstraction-core/src/domain/mempool.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/domain/mempool.rs rename to crates/account-abstraction-core/src/domain/mempool.rs diff --git a/crates/account-abstraction-core-v2/src/domain/mod.rs b/crates/account-abstraction-core/src/domain/mod.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/domain/mod.rs rename to crates/account-abstraction-core/src/domain/mod.rs diff --git a/crates/account-abstraction-core-v2/src/domain/reputation.rs b/crates/account-abstraction-core/src/domain/reputation.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/domain/reputation.rs rename to crates/account-abstraction-core/src/domain/reputation.rs diff --git a/crates/account-abstraction-core-v2/src/domain/types.rs b/crates/account-abstraction-core/src/domain/types.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/domain/types.rs rename to crates/account-abstraction-core/src/domain/types.rs diff --git a/crates/account-abstraction-core-v2/src/factories/kafka_engine.rs b/crates/account-abstraction-core/src/factories/kafka_engine.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/factories/kafka_engine.rs rename to crates/account-abstraction-core/src/factories/kafka_engine.rs diff --git a/crates/account-abstraction-core-v2/src/factories/mod.rs b/crates/account-abstraction-core/src/factories/mod.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/factories/mod.rs rename to crates/account-abstraction-core/src/factories/mod.rs diff --git a/crates/account-abstraction-core-v2/src/infrastructure/base_node/mod.rs b/crates/account-abstraction-core/src/infrastructure/base_node/mod.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/infrastructure/base_node/mod.rs rename to crates/account-abstraction-core/src/infrastructure/base_node/mod.rs diff --git a/crates/account-abstraction-core-v2/src/infrastructure/base_node/validator.rs b/crates/account-abstraction-core/src/infrastructure/base_node/validator.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/infrastructure/base_node/validator.rs rename to crates/account-abstraction-core/src/infrastructure/base_node/validator.rs diff --git a/crates/account-abstraction-core-v2/src/infrastructure/in_memory/mempool.rs b/crates/account-abstraction-core/src/infrastructure/in_memory/mempool.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/infrastructure/in_memory/mempool.rs rename to crates/account-abstraction-core/src/infrastructure/in_memory/mempool.rs diff --git a/crates/account-abstraction-core-v2/src/infrastructure/in_memory/mod.rs b/crates/account-abstraction-core/src/infrastructure/in_memory/mod.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/infrastructure/in_memory/mod.rs rename to crates/account-abstraction-core/src/infrastructure/in_memory/mod.rs diff --git a/crates/account-abstraction-core-v2/src/infrastructure/kafka/consumer.rs b/crates/account-abstraction-core/src/infrastructure/kafka/consumer.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/infrastructure/kafka/consumer.rs rename to crates/account-abstraction-core/src/infrastructure/kafka/consumer.rs diff --git a/crates/account-abstraction-core-v2/src/infrastructure/kafka/mod.rs b/crates/account-abstraction-core/src/infrastructure/kafka/mod.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/infrastructure/kafka/mod.rs rename to crates/account-abstraction-core/src/infrastructure/kafka/mod.rs diff --git a/crates/account-abstraction-core-v2/src/infrastructure/mod.rs b/crates/account-abstraction-core/src/infrastructure/mod.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/infrastructure/mod.rs rename to crates/account-abstraction-core/src/infrastructure/mod.rs diff --git a/crates/account-abstraction-core-v2/src/lib.rs b/crates/account-abstraction-core/src/lib.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/lib.rs rename to crates/account-abstraction-core/src/lib.rs diff --git a/crates/account-abstraction-core-v2/src/services/interfaces/event_source.rs b/crates/account-abstraction-core/src/services/interfaces/event_source.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/services/interfaces/event_source.rs rename to crates/account-abstraction-core/src/services/interfaces/event_source.rs diff --git a/crates/account-abstraction-core-v2/src/services/interfaces/mod.rs b/crates/account-abstraction-core/src/services/interfaces/mod.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/services/interfaces/mod.rs rename to crates/account-abstraction-core/src/services/interfaces/mod.rs diff --git a/crates/account-abstraction-core-v2/src/services/interfaces/user_op_validator.rs b/crates/account-abstraction-core/src/services/interfaces/user_op_validator.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/services/interfaces/user_op_validator.rs rename to crates/account-abstraction-core/src/services/interfaces/user_op_validator.rs diff --git a/crates/account-abstraction-core-v2/src/services/mempool_engine.rs b/crates/account-abstraction-core/src/services/mempool_engine.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/services/mempool_engine.rs rename to crates/account-abstraction-core/src/services/mempool_engine.rs diff --git a/crates/account-abstraction-core-v2/src/services/mod.rs b/crates/account-abstraction-core/src/services/mod.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/services/mod.rs rename to crates/account-abstraction-core/src/services/mod.rs diff --git a/crates/account-abstraction-core-v2/src/services/reputations_service.rs b/crates/account-abstraction-core/src/services/reputations_service.rs similarity index 100% rename from crates/account-abstraction-core-v2/src/services/reputations_service.rs rename to crates/account-abstraction-core/src/services/reputations_service.rs diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index d0957e0..813754b 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -14,7 +14,7 @@ path = "src/bin/main.rs" [dependencies] tips-core.workspace = true tips-audit.workspace = true -account-abstraction-core-v2.workspace = true +account-abstraction-core.workspace = true jsonrpsee.workspace = true alloy-primitives.workspace = true op-alloy-network.workspace = true diff --git a/crates/ingress-rpc/src/bin/main.rs b/crates/ingress-rpc/src/bin/main.rs index c886edb..28bcfe3 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/crates/ingress-rpc/src/bin/main.rs @@ -1,4 +1,4 @@ -use account_abstraction_core_v2::create_mempool_engine; +use account_abstraction_core::create_mempool_engine; use alloy_provider::ProviderBuilder; use clap::Parser; use jsonrpsee::server::Server; diff --git a/crates/ingress-rpc/src/queue.rs b/crates/ingress-rpc/src/queue.rs index d360930..cd227a0 100644 --- a/crates/ingress-rpc/src/queue.rs +++ b/crates/ingress-rpc/src/queue.rs @@ -1,4 +1,4 @@ -use account_abstraction_core_v2::{ +use account_abstraction_core::{ MempoolEvent, domain::types::{VersionedUserOperation, WrappedUserOperation}, }; diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index e03686f..7b2ad79 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -1,8 +1,8 @@ -use account_abstraction_core_v2::domain::ReputationService; -use account_abstraction_core_v2::infrastructure::base_node::validator::BaseNodeValidator; -use account_abstraction_core_v2::services::ReputationServiceImpl; -use account_abstraction_core_v2::services::interfaces::user_op_validator::UserOperationValidator; -use account_abstraction_core_v2::{Mempool, MempoolEngine}; +use account_abstraction_core::domain::ReputationService; +use account_abstraction_core::infrastructure::base_node::validator::BaseNodeValidator; +use account_abstraction_core::services::ReputationServiceImpl; +use account_abstraction_core::services::interfaces::user_op_validator::UserOperationValidator; +use account_abstraction_core::{Mempool, MempoolEngine}; use alloy_consensus::transaction::Recovered; use alloy_consensus::{Transaction, transaction::SignerRecoverable}; use alloy_primitives::{Address, B256, Bytes, FixedBytes}; @@ -28,8 +28,8 @@ use crate::metrics::{Metrics, record_histogram}; use crate::queue::{BundleQueuePublisher, MessageQueue, UserOpQueuePublisher}; use crate::validation::validate_bundle; use crate::{Config, TxSubmissionMethod}; -use account_abstraction_core_v2::domain::entrypoints::version::EntryPointVersion; -use account_abstraction_core_v2::domain::types::{UserOperationRequest, VersionedUserOperation}; +use account_abstraction_core::domain::entrypoints::version::EntryPointVersion; +use account_abstraction_core::domain::types::{UserOperationRequest, VersionedUserOperation}; use std::sync::Arc; /// RPC providers for different endpoints @@ -514,10 +514,10 @@ impl IngressService { mod tests { use super::*; use crate::{Config, TxSubmissionMethod, queue::MessageQueue}; - use account_abstraction_core_v2::MempoolEvent; - use account_abstraction_core_v2::domain::PoolConfig; - use account_abstraction_core_v2::infrastructure::in_memory::mempool::InMemoryMempool; - use account_abstraction_core_v2::services::interfaces::event_source::EventSource; + use account_abstraction_core::MempoolEvent; + use account_abstraction_core::domain::PoolConfig; + use account_abstraction_core::infrastructure::in_memory::mempool::InMemoryMempool; + use account_abstraction_core::services::interfaces::event_source::EventSource; use alloy_provider::RootProvider; use anyhow::Result; use async_trait::async_trait; @@ -811,7 +811,7 @@ mod tests { let user_op = sample_user_operation_v06(); let entry_point = - account_abstraction_core_v2::domain::entrypoints::version::EntryPointVersion::V06_ADDRESS; + account_abstraction_core::domain::entrypoints::version::EntryPointVersion::V06_ADDRESS; let result: Result, _> = client .request("eth_sendUserOperation", (user_op, entry_point)) From 8bb2117a918299de684cef27075bbcd1b8f1ac1c Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Mon, 22 Dec 2025 11:40:36 -0600 Subject: [PATCH 090/117] fix(ui): handle undefined values in BigInt formatting functions (#118) Add null checks to formatHexValue() and formatGasPrice() to prevent "Cannot convert undefined to a BigInt" error when viewing bundles with missing meter fields. --- ui/src/app/bundles/[uuid]/page.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/src/app/bundles/[uuid]/page.tsx b/ui/src/app/bundles/[uuid]/page.tsx index 95187f3..07c6973 100644 --- a/ui/src/app/bundles/[uuid]/page.tsx +++ b/ui/src/app/bundles/[uuid]/page.tsx @@ -19,7 +19,8 @@ function formatBigInt(value: bigint, decimals: number, scale: bigint): string { return `${whole}.${frac.toString().padStart(decimals, "0")}`; } -function formatHexValue(hex: string): string { +function formatHexValue(hex: string | undefined): string { + if (!hex) return "—"; const value = BigInt(hex); if (value >= WEI_PER_ETH / 10000n) { return `${formatBigInt(value, 6, WEI_PER_ETH)} ETH`; @@ -30,7 +31,8 @@ function formatHexValue(hex: string): string { return `${value.toString()} Wei`; } -function formatGasPrice(hex: string): string { +function formatGasPrice(hex: string | undefined): string { + if (!hex) return "—"; const value = BigInt(hex); return `${formatBigInt(value, 2, WEI_PER_GWEI)} Gwei`; } From 0ef607c7704dff3ff63d8b093a50332dd5ef6ab7 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Mon, 22 Dec 2025 13:07:43 -0600 Subject: [PATCH 091/117] fix(ui): remove bundle and reverting tags from UI (#120) Remove the "Bundle" tag from block transaction rows and the "Reverting" badge from bundle transaction details as these labels are no longer needed. --- ui/src/app/block/[hash]/page.tsx | 5 ----- ui/src/app/bundles/[uuid]/page.tsx | 11 +---------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/ui/src/app/block/[hash]/page.tsx b/ui/src/app/block/[hash]/page.tsx index 69f54fc..71133e0 100644 --- a/ui/src/app/block/[hash]/page.tsx +++ b/ui/src/app/block/[hash]/page.tsx @@ -128,11 +128,6 @@ function TransactionRow({ {tx.hash} )} - {hasBundle && ( - - Bundle - - )}
    • {tx.from.slice(0, 6)}...{tx.from.slice(-4)} diff --git a/ui/src/app/bundles/[uuid]/page.tsx b/ui/src/app/bundles/[uuid]/page.tsx index 07c6973..135270f 100644 --- a/ui/src/app/bundles/[uuid]/page.tsx +++ b/ui/src/app/bundles/[uuid]/page.tsx @@ -158,11 +158,9 @@ function Card({ function TransactionDetails({ tx, index, - isReverting, }: { tx: BundleTransaction; index: number; - isReverting: boolean; }) { const [expanded, setExpanded] = useState(index === 0); @@ -182,7 +180,6 @@ function TransactionDetails({ {tx.hash.slice(0, 10)}...{tx.hash.slice(-8)} - {isReverting && Reverting}
    {tx.signer.slice(0, 6)}...{tx.signer.slice(-4)} →{" "} @@ -482,7 +479,6 @@ export default function BundlePage({ params }: PageProps) { .filter((e) => e.data?.bundle) .map((e) => e.data.bundle) .pop(); - const revertingHashes = new Set(latestBundle?.reverting_tx_hashes || []); return (
    @@ -560,12 +556,7 @@ export default function BundlePage({ params }: PageProps) { Transactions
    {latestBundle.txs.map((tx, index) => ( - + ))}
    From 230544c4da1dca03720ba9f2e62e6c74dde7bd38 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Mon, 22 Dec 2025 13:07:59 -0600 Subject: [PATCH 092/117] fix(ui): refetch missing transactions in cached blocks (#119) --- ui/src/app/api/block/[hash]/route.ts | 59 +++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/ui/src/app/api/block/[hash]/route.ts b/ui/src/app/api/block/[hash]/route.ts index 919591b..aafe3c5 100644 --- a/ui/src/app/api/block/[hash]/route.ts +++ b/ui/src/app/api/block/[hash]/route.ts @@ -47,6 +47,13 @@ async function fetchBlockFromRpc( } } +// On OP Stack, the first transaction (index 0) is the L1 attributes deposit transaction. +// This is not a perfect check (ideally we'd check tx.type === 'deposit' or type 0x7e), +// but sufficient for filtering out system transactions that don't need simulation data. +function isSystemTransaction(tx: BlockTransaction): boolean { + return tx.index === 0; +} + async function enrichTransactionWithBundleData( txHash: string, ): Promise<{ bundleId: string | null; executionTimeUs: number | null }> { @@ -78,6 +85,49 @@ async function enrichTransactionWithBundleData( }; } +async function refetchMissingTransactionSimulations( + block: BlockData, +): Promise<{ updatedBlock: BlockData; hasUpdates: boolean }> { + const transactionsToRefetch = block.transactions.filter( + (tx) => tx.bundleId === null && !isSystemTransaction(tx), + ); + + if (transactionsToRefetch.length === 0) { + return { updatedBlock: block, hasUpdates: false }; + } + + const refetchResults = await Promise.all( + transactionsToRefetch.map(async (tx) => { + const { bundleId, executionTimeUs } = + await enrichTransactionWithBundleData(tx.hash); + return { hash: tx.hash, bundleId, executionTimeUs }; + }), + ); + + let hasUpdates = false; + const updatedTransactions = block.transactions.map((tx) => { + const refetchResult = refetchResults.find((r) => r.hash === tx.hash); + if (refetchResult && refetchResult.bundleId !== null) { + hasUpdates = true; + return { + ...tx, + bundleId: refetchResult.bundleId, + executionTimeUs: refetchResult.executionTimeUs, + }; + } + return tx; + }); + + return { + updatedBlock: { + ...block, + transactions: updatedTransactions, + cachedAt: hasUpdates ? Date.now() : block.cachedAt, + }, + hasUpdates, + }; +} + export async function GET( _request: NextRequest, { params }: { params: Promise<{ hash: string }> }, @@ -87,7 +137,14 @@ export async function GET( const cachedBlock = await getBlockFromCache(hash); if (cachedBlock) { - return NextResponse.json(serializeBlockData(cachedBlock)); + const { updatedBlock, hasUpdates } = + await refetchMissingTransactionSimulations(cachedBlock); + + if (hasUpdates) { + await cacheBlockData(updatedBlock); + } + + return NextResponse.json(serializeBlockData(updatedBlock)); } const rpcBlock = await fetchBlockFromRpc(hash); From ffb966fc807603351d9b0d1ab8a6eb515bc552dd Mon Sep 17 00:00:00 2001 From: cody-wang-cb Date: Tue, 23 Dec 2025 11:35:19 -0500 Subject: [PATCH 093/117] feat(backrun): set max backrun bundle tx limit and gas limit (#122) --- crates/ingress-rpc/src/lib.rs | 8 ++++ crates/ingress-rpc/src/service.rs | 78 ++++++++++++++++++++++++++----- 2 files changed, 75 insertions(+), 11 deletions(-) diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index 54f57a2..87c2dc5 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -193,6 +193,14 @@ pub struct Config { #[arg(long, env = "TIPS_INGRESS_BACKRUN_ENABLED", default_value = "false")] pub backrun_enabled: bool, + /// Maximum number of transactions allowed in a backrun bundle (including target tx) + #[arg(long, env = "MAX_BACKRUN_TXS", default_value = "5")] + pub max_backrun_txs: usize, + + /// Maximum total gas limit for all transactions in a backrun bundle + #[arg(long, env = "MAX_BACKRUN_GAS_LIMIT", default_value = "5000000")] + pub max_backrun_gas_limit: u64, + /// URL of third-party RPC endpoint to forward raw transactions to (enables forwarding if set) #[arg(long, env = "TIPS_INGRESS_RAW_TX_FORWARD_RPC")] pub raw_tx_forward_rpc: Option, diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 7b2ad79..56cd41a 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -82,6 +82,8 @@ pub struct IngressService { builder_tx: broadcast::Sender, backrun_enabled: bool, builder_backrun_tx: broadcast::Sender, + max_backrun_txs: usize, + max_backrun_gas_limit: u64, } impl IngressService { @@ -127,18 +129,40 @@ impl IngressService { builder_tx, backrun_enabled: config.backrun_enabled, builder_backrun_tx, + max_backrun_txs: config.max_backrun_txs, + max_backrun_gas_limit: config.max_backrun_gas_limit, } } } +fn validate_backrun_bundle_limits( + txs_count: usize, + total_gas_limit: u64, + max_backrun_txs: usize, + max_backrun_gas_limit: u64, +) -> Result<(), String> { + if txs_count < 2 { + return Err( + "Backrun bundle must have at least 2 transactions (target + backrun)".to_string(), + ); + } + if txs_count > max_backrun_txs { + return Err(format!( + "Backrun bundle exceeds max transaction count: {txs_count} > {max_backrun_txs}", + )); + } + if total_gas_limit > max_backrun_gas_limit { + return Err(format!( + "Backrun bundle exceeds max gas limit: {total_gas_limit} > {max_backrun_gas_limit}", + )); + } + Ok(()) +} + #[async_trait] impl IngressApiServer for IngressService { async fn send_backrun_bundle(&self, bundle: Bundle) -> RpcResult { if !self.backrun_enabled { - info!( - message = "Backrun bundle submission is disabled", - backrun_enabled = self.backrun_enabled - ); return Err( EthApiError::InvalidParams("Backrun bundle submission is disabled".into()) .into_rpc_err(), @@ -149,15 +173,23 @@ impl IngressApiServer for Ingre let (accepted_bundle, bundle_hash) = self.validate_parse_and_meter_bundle(&bundle, false).await?; + let total_gas_limit: u64 = accepted_bundle.txs.iter().map(|tx| tx.gas_limit()).sum(); + validate_backrun_bundle_limits( + accepted_bundle.txs.len(), + total_gas_limit, + self.max_backrun_txs, + self.max_backrun_gas_limit, + ) + .map_err(|e| EthApiError::InvalidParams(e).into_rpc_err())?; + self.metrics.backrun_bundles_received_total.increment(1); - if let Err(e) = self.builder_backrun_tx.send(accepted_bundle.clone()) { - warn!( - message = "Failed to send backrun bundle to builders", - bundle_hash = %bundle_hash, - error = %e - ); - } + self.builder_backrun_tx + .send(accepted_bundle.clone()) + .map_err(|e| { + EthApiError::InvalidParams(format!("Failed to send backrun bundle: {e}")) + .into_rpc_err() + })?; self.send_audit_event(&accepted_bundle, bundle_hash); @@ -578,6 +610,8 @@ mod tests { raw_tx_forward_rpc: None, chain_id: 11, user_operation_topic: String::new(), + max_backrun_txs: 5, + max_backrun_gas_limit: 5000000, } } @@ -854,4 +888,26 @@ mod tests { assert!(wrong_user_op_result.is_err()); } + + #[test] + fn test_validate_backrun_bundle_rejects_invalid() { + // Too few transactions (need at least 2: target + backrun) + let result = validate_backrun_bundle_limits(1, 21000, 5, 5000000); + assert!(result.is_err()); + assert!(result.unwrap_err().contains("at least 2 transactions")); + + // Exceeds max tx count + let result = validate_backrun_bundle_limits(6, 21000, 5, 5000000); + assert!(result.is_err()); + assert!( + result + .unwrap_err() + .contains("exceeds max transaction count") + ); + + // Exceeds max gas limit + let result = validate_backrun_bundle_limits(2, 6000000, 5, 5000000); + assert!(result.is_err()); + assert!(result.unwrap_err().contains("exceeds max gas limit")); + } } From 9908c08d44819edea98b65d3e61aba9e0eb134f4 Mon Sep 17 00:00:00 2001 From: kmchicoine Date: Tue, 23 Dec 2025 08:53:47 -0800 Subject: [PATCH 094/117] Metrics and load testing (#121) * skeleton test setup * add basic tests and rpc client * add client * full e2e tests, with local node * Ignore test that requires node running * Mark full node tests with env flag * Finish merge * readme + fmt * yarn update * Update tests for clean fail * fmt * Add mock provider to avoid need to run node for e2e tests * Cargo * lint + clippy * Update env var flag and readme * run tests with full services * update integration tests filename * create runnable bin for load testing * Restructure for runnable binary * Separate load testing from integration testing * refine load testing * Fix toml * Cargo.toml update * Load test cleanup * fix readme * METRICS.md fix + fmt --- Cargo.lock | 244 +- Cargo.toml | 7 +- crates/system-tests/Cargo.toml | 7 + crates/system-tests/METRICS.md | 133 + crates/system-tests/src/bin/load-test.rs | 13 + crates/system-tests/src/lib.rs | 1 + crates/system-tests/src/load_test/config.rs | 76 + crates/system-tests/src/load_test/load.rs | 133 + crates/system-tests/src/load_test/metrics.rs | 78 + crates/system-tests/src/load_test/mod.rs | 9 + crates/system-tests/src/load_test/output.rs | 67 + crates/system-tests/src/load_test/poller.rs | 77 + crates/system-tests/src/load_test/sender.rs | 113 + crates/system-tests/src/load_test/setup.rs | 90 + crates/system-tests/src/load_test/tracker.rs | 115 + crates/system-tests/src/load_test/wallet.rs | 86 + ui/package-lock.json | 4752 ++++++++++++++++++ ui/src/lib/s3.ts | 2 +- ui/tsconfig.json | 10 +- 19 files changed, 5972 insertions(+), 41 deletions(-) create mode 100644 crates/system-tests/METRICS.md create mode 100644 crates/system-tests/src/bin/load-test.rs create mode 100644 crates/system-tests/src/load_test/config.rs create mode 100644 crates/system-tests/src/load_test/load.rs create mode 100644 crates/system-tests/src/load_test/metrics.rs create mode 100644 crates/system-tests/src/load_test/mod.rs create mode 100644 crates/system-tests/src/load_test/output.rs create mode 100644 crates/system-tests/src/load_test/poller.rs create mode 100644 crates/system-tests/src/load_test/sender.rs create mode 100644 crates/system-tests/src/load_test/setup.rs create mode 100644 crates/system-tests/src/load_test/tracker.rs create mode 100644 crates/system-tests/src/load_test/wallet.rs create mode 100644 ui/package-lock.json diff --git a/Cargo.lock b/Cargo.lock index 7d6bca7..948676b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -230,9 +230,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9914c147bb9b25f440eca68a31dc29f5c22298bfa7754aa802965695384122b0" +checksum = "84e3cf01219c966f95a460c95f1d4c30e12f6c18150c21a30b768af2a2a29142" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -326,9 +326,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7db950a29746be9e2f2c6288c8bd7a6202a81f999ce109a2933d2379970ec0fa" +checksum = "f6a0fb18dd5fb43ec5f0f6a20be1ce0287c79825827de5744afaa6c957737c33" dependencies = [ "alloy-rlp", "bytes", @@ -572,9 +572,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b96d5f5890605ba9907ce1e2158e2701587631dc005bfa582cf92dd6f21147" +checksum = "09eb18ce0df92b4277291bbaa0ed70545d78b02948df756bbd3d6214bf39a218" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -586,9 +586,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8247b7cca5cde556e93f8b3882b01dbd272f527836049083d240c57bf7b4c15" +checksum = "95d9fa2daf21f59aa546d549943f10b5cce1ae59986774019fbedae834ffe01b" dependencies = [ "alloy-sol-macro-input", "const-hex", @@ -604,9 +604,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd54f38512ac7bae10bbc38480eefb1b9b398ca2ce25db9cc0c048c6411c4f1" +checksum = "9396007fe69c26ee118a19f4dee1f5d1d6be186ea75b3881adf16d87f8444686" dependencies = [ "const-hex", "dunce", @@ -620,9 +620,9 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b09815b44899564566d4d56613d14fa9a274b1043a021f00468568752f449" +checksum = "af67a0b0dcebe14244fc92002cd8d96ecbf65db4639d479f5fcd5805755a4c27" dependencies = [ "serde", "winnow", @@ -630,9 +630,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1038284171df8bfd48befc0c7b78f667a7e2be162f45f07bd1c378078ebe58" +checksum = "09aeea64f09a7483bdcd4193634c7e5cf9fd7775ee767585270cd8ce2d69dc95" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -680,9 +680,9 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3412d52bb97c6c6cc27ccc28d4e6e8cf605469101193b50b0bd5813b1f990b5" +checksum = "2b77b56af09ead281337d06b1d036c88e2dc8a2e45da512a532476dbee94912b" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -1598,9 +1598,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425" +checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8" dependencies = [ "axum-core", "bytes", @@ -1930,9 +1930,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.49" +version = "1.2.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215" +checksum = "9f50d563227a1c37cc0a263f64eca3334388c01c5e4c4861a9def205c614383c" dependencies = [ "find-msvc-tools", "jobserver", @@ -2055,6 +2055,19 @@ dependencies = [ "memchr", ] +[[package]] +name = "console" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" +dependencies = [ + "encode_unicode", + "libc", + "once_cell", + "unicode-width", + "windows-sys 0.59.0", +] + [[package]] name = "const-hex" version = "1.17.0" @@ -2402,18 +2415,18 @@ dependencies = [ [[package]] name = "derive_more" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10b768e943bed7bf2cab53df09f4bc34bfd217cdb57d971e769874c9a6710618" +checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" dependencies = [ "derive_more-impl", ] [[package]] name = "derive_more-impl" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d286bfdaf75e988b4a78e013ecd79c581e06399ab53fbacd2d916c2f904f30b" +checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" dependencies = [ "convert_case", "proc-macro2", @@ -2578,6 +2591,21 @@ dependencies = [ "zeroize", ] +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + [[package]] name = "enr" version = "0.13.0" @@ -3323,9 +3351,11 @@ dependencies = [ "percent-encoding", "pin-project-lite", "socket2 0.6.1", + "system-configuration", "tokio", "tower-service", "tracing", + "windows-registry", ] [[package]] @@ -3537,6 +3567,19 @@ dependencies = [ "serde_core", ] +[[package]] +name = "indicatif" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" +dependencies = [ + "console", + "number_prefix", + "portable-atomic", + "unicode-width", + "web-time", +] + [[package]] name = "ipnet" version = "2.11.0" @@ -3588,9 +3631,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "7ee5b5339afb4c41626dde77b7a611bd4f2c202b897852b4bcf5d03eddc61010" [[package]] name = "jni" @@ -4227,6 +4270,12 @@ dependencies = [ "syn 2.0.111", ] +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + [[package]] name = "nybbles" version = "0.4.6" @@ -4640,9 +4689,9 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "portable-atomic" -version = "1.11.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" +checksum = "f59e70c4aef1e55797c2e8fd94a4f2a973fc972cfde0e0b05f683667b0cd39dd" [[package]] name = "potential_utf" @@ -4952,9 +5001,9 @@ dependencies = [ [[package]] name = "rapidhash" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e65c75143ce5d47c55b510297eeb1182f3c739b6043c537670e9fc18612dae" +checksum = "2988730ee014541157f48ce4dcc603940e00915edc3c7f9a8d78092256bb2493" dependencies = [ "rand 0.9.2", "rustversion", @@ -5111,7 +5160,9 @@ checksum = "3b4c14b2d9afca6a60277086b0cc6a6ae0b568f6f7916c943a8cdc79f8be240f" dependencies = [ "base64 0.22.1", "bytes", + "encoding_rs", "futures-core", + "h2 0.4.12", "http 1.4.0", "http-body 1.0.1", "http-body-util", @@ -5121,6 +5172,7 @@ dependencies = [ "hyper-util", "js-sys", "log", + "mime", "native-tls", "percent-encoding", "pin-project-lite", @@ -6390,9 +6442,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "62049b2877bf12821e8f9ad256ee38fdc31db7387ec2d3b3f403024de2034aea" [[package]] name = "same-file" @@ -6403,6 +6455,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "scc" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc" +dependencies = [ + "sdd", +] + [[package]] name = "schannel" version = "0.1.28" @@ -6463,6 +6524,12 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sdd" +version = "3.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" + [[package]] name = "sec1" version = "0.3.0" @@ -6625,9 +6692,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.146" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "217ca874ae0207aac254aa02c957ded05585a90892cc8d87f9e5fa49669dadd8" dependencies = [ "indexmap 2.12.1", "itoa", @@ -6712,6 +6779,31 @@ dependencies = [ "serde", ] +[[package]] +name = "serial_test" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" +dependencies = [ + "futures", + "log", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + [[package]] name = "sha1" version = "0.10.6" @@ -6991,9 +7083,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b1d2e2059056b66fec4a6bb2b79511d5e8d76196ef49c38996f4b48db7662f" +checksum = "5f92d01b5de07eaf324f7fca61cc6bd3d82bbc1de5b6c963e6fe79e86f36580d" dependencies = [ "paste", "proc-macro2", @@ -7021,6 +7113,27 @@ dependencies = [ "syn 2.0.111", ] +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.10.0", + "core-foundation 0.9.4", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -7292,6 +7405,48 @@ dependencies = [ "wiremock", ] +[[package]] +name = "tips-system-tests" +version = "0.1.0" +dependencies = [ + "alloy-consensus", + "alloy-network", + "alloy-primitives", + "alloy-provider", + "alloy-signer-local", + "anyhow", + "async-trait", + "aws-config", + "aws-credential-types", + "aws-sdk-s3", + "bytes", + "clap", + "dashmap", + "hex", + "indicatif", + "jsonrpsee", + "op-alloy-consensus", + "op-alloy-network", + "op-revm", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rdkafka", + "reqwest", + "serde", + "serde_json", + "serial_test", + "testcontainers", + "testcontainers-modules", + "tips-audit", + "tips-core", + "tips-ingress-rpc", + "tokio", + "tracing", + "tracing-subscriber 0.3.22", + "url", + "uuid", +] + [[package]] name = "tokio" version = "1.48.0" @@ -7609,6 +7764,12 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" +[[package]] +name = "unicode-width" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" + [[package]] name = "unicode-xid" version = "0.2.6" @@ -7912,6 +8073,17 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +dependencies = [ + "windows-link", + "windows-result", + "windows-strings", +] + [[package]] name = "windows-result" version = "0.4.1" diff --git a/Cargo.toml b/Cargo.toml index f05aed7..90a7d44 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,12 +7,13 @@ homepage = "https://github.com/base/tips" repository = "https://github.com/base/tips" [workspace] -members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core"] +members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core", "crates/system-tests"] resolver = "2" [workspace.dependencies] tips-audit = { path = "crates/audit" } tips-core = { path = "crates/core" } +tips-system-tests = { path = "crates/system-tests" } account-abstraction-core = { path = "crates/account-abstraction-core" } # Reth @@ -27,8 +28,10 @@ alloy-primitives = { version = "1.4.1", default-features = false, features = [ ] } alloy-consensus = { version = "1.0.41" } alloy-provider = { version = "1.0.41" } -alloy-serde = "1.0.41" alloy-rpc-types = "1.1.2" +alloy-signer = { version = "1.0.41" } +alloy-network = { version = "1.0.41" } +alloy-serde = "1.0.41" alloy-sol-types = { version = "1.4.1", default-features = false } # op-alloy diff --git a/crates/system-tests/Cargo.toml b/crates/system-tests/Cargo.toml index 000dd63..95d99dd 100644 --- a/crates/system-tests/Cargo.toml +++ b/crates/system-tests/Cargo.toml @@ -47,6 +47,13 @@ hex = "0.4.3" jsonrpsee = { workspace = true } op-revm = { workspace = true } +# Load test dependencies +clap = { version = "4.5", features = ["derive", "env"] } +indicatif = "0.17" +rand = "0.8" +rand_chacha = "0.3" +dashmap = "6.0" + [dev-dependencies] tokio = { workspace = true, features = ["test-util"] } testcontainers = { workspace = true } diff --git a/crates/system-tests/METRICS.md b/crates/system-tests/METRICS.md new file mode 100644 index 0000000..49f9a0a --- /dev/null +++ b/crates/system-tests/METRICS.md @@ -0,0 +1,133 @@ +# TIPS Load Testing + +Multi-wallet concurrent load testing tool for measuring TIPS performance. + +## Quick Start + +```bash +# 1. Build +cargo build --release --bin load-test + +# 2. Setup wallets +./target/release/load-test setup \ + --master-key 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d \ + --output wallets.json + +# 3. Run load test +./target/release/load-test load --wallets wallets.json +``` + +--- + +## Configuration Options + +### Setup Command + +Create and fund test wallets from a master wallet. Test wallets are saved to allow test reproducibility and avoid the need to create new wallets for every test run. + +**Usage:** +```bash +./target/release/load-test setup --master-key --output [OPTIONS] +``` + +**Options:** + +| Flag | Description | Default | Example | +|------|-------------|---------|---------| +| `--master-key` | Private key of funded wallet (required) | - | `0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d` | +| `--output` | Save wallets to JSON file (required) | - | `wallets.json` | +| `--sequencer` | L2 sequencer RPC URL | `http://localhost:8547` | `http://localhost:8547` | +| `--num-wallets` | Number of wallets to create | `10` | `100` | +| `--fund-amount` | ETH to fund each wallet | `0.1` | `0.5` | + +**Environment Variables:** +- `MASTER_KEY` - Alternative to `--master-key` flag +- `SEQUENCER_URL` - Alternative to `--sequencer` flag + +### Load Command + +Run load test with funded wallets. Use the `--seed` flag to set the RNG seed for test reproducibility. + +**Usage:** +```bash +./target/release/load-test load --wallets [OPTIONS] +``` + +**Options:** + +| Flag | Description | Default | Example | +|------|-------------|---------|---------| +| `--wallets` | Path to wallets JSON file (required) | - | `wallets.json` | +| `--target` | TIPS ingress RPC URL | `http://localhost:8080` | `http://localhost:8080` | +| `--sequencer` | L2 sequencer RPC URL | `http://localhost:8547` | `http://localhost:8547` | +| `--rate` | Target transaction rate (tx/s) | `100` | `500` | +| `--duration` | Test duration in seconds | `60` | `100` | +| `--tx-timeout` | Timeout for tx inclusion (seconds) | `60` | `120` | +| `--seed` | Random seed for reproducibility | (none) | `42` | +| `--output` | Save metrics to JSON file | (none) | `metrics.json` | + +**Environment Variables:** +- `INGRESS_URL` - Alternative to `--target` flag +- `SEQUENCER_URL` - Alternative to `--sequencer` flag + +--- +--- + +## Metrics Explained + +### Output Example + +``` +Load Test Results +━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +Configuration: + Target: http://localhost:8080 + Sequencer: http://localhost:8547 + Wallets: 100 + Target Rate: 100 tx/s + Duration: 60s + TX Timeout: 60s + +Throughput: + Sent: 100.0 tx/s (6000 total) + Included: 98.5 tx/s (5910 total) + Success Rate: 98.5% + +Transaction Results: + Included: 5910 (98.5%) + Reverted: 10 (0.2%) + Timed Out: 70 (1.2%) + Send Errors: 10 (0.1%) +``` + +### Metrics Definitions + +**Throughput:** +- `Sent Rate` - Transactions sent to TIPS per second +- `Included Rate` - Transactions included in blocks per second +- `Success Rate` - Percentage of sent transactions that were included + +**Transaction Results:** +- `Included` - Successfully included in a block with status == true +- `Reverted` - Included in a block but transaction reverted (status == false) +- `Timed Out` - Not included within timeout period +- `Send Errors` - Failed to send to TIPS RPC + +--- + +## Architecture + +``` +Sender Tasks (1 per wallet) Receipt Poller + │ │ + ▼ ▼ + Send to TIPS ──► Tracker ◄── Poll sequencer every 2s + (retry 3x) (pending) │ + │ │ ├─ status=true → included + │ │ ├─ status=false → reverted + │ │ └─ timeout → timed_out + ▼ ▼ + rate/N tx/s Calculate Results → Print Summary +``` + +--- diff --git a/crates/system-tests/src/bin/load-test.rs b/crates/system-tests/src/bin/load-test.rs new file mode 100644 index 0000000..50a36d2 --- /dev/null +++ b/crates/system-tests/src/bin/load-test.rs @@ -0,0 +1,13 @@ +use anyhow::Result; +use clap::Parser; +use tips_system_tests::load_test::{config, load, setup}; + +#[tokio::main] +async fn main() -> Result<()> { + let cli = config::Cli::parse(); + + match cli.command { + config::Commands::Setup(args) => setup::run(args).await, + config::Commands::Load(args) => load::run(args).await, + } +} diff --git a/crates/system-tests/src/lib.rs b/crates/system-tests/src/lib.rs index f8d5845..c05f0a3 100644 --- a/crates/system-tests/src/lib.rs +++ b/crates/system-tests/src/lib.rs @@ -1,2 +1,3 @@ pub mod client; pub mod fixtures; +pub mod load_test; diff --git a/crates/system-tests/src/load_test/config.rs b/crates/system-tests/src/load_test/config.rs new file mode 100644 index 0000000..02543e3 --- /dev/null +++ b/crates/system-tests/src/load_test/config.rs @@ -0,0 +1,76 @@ +use clap::{Parser, Subcommand}; +use std::path::PathBuf; + +#[derive(Parser)] +#[command(name = "load-test")] +#[command(about = "Load testing tool for TIPS ingress service", long_about = None)] +pub struct Cli { + #[command(subcommand)] + pub command: Commands, +} + +#[derive(Subcommand)] +pub enum Commands { + /// Setup: Fund N wallets from a master wallet + Setup(SetupArgs), + /// Load: Run load test with funded wallets + Load(LoadArgs), +} + +#[derive(Parser)] +pub struct SetupArgs { + /// Master wallet private key (must have funds) + #[arg(long, env = "MASTER_KEY")] + pub master_key: String, + + /// Sequencer RPC URL + #[arg(long, env = "SEQUENCER_URL", default_value = "http://localhost:8547")] + pub sequencer: String, + + /// Number of wallets to create and fund + #[arg(long, default_value = "10")] + pub num_wallets: usize, + + /// Amount of ETH to fund each wallet + #[arg(long, default_value = "0.1")] + pub fund_amount: f64, + + /// Output file for wallet data (required) + #[arg(long)] + pub output: PathBuf, +} + +#[derive(Parser)] +pub struct LoadArgs { + /// TIPS ingress RPC URL + #[arg(long, env = "INGRESS_URL", default_value = "http://localhost:8080")] + pub target: String, + + /// Sequencer RPC URL (for nonce fetching and receipt polling) + #[arg(long, env = "SEQUENCER_URL", default_value = "http://localhost:8547")] + pub sequencer: String, + + /// Path to wallets JSON file (required) + #[arg(long)] + pub wallets: PathBuf, + + /// Target transaction rate (transactions per second) + #[arg(long, default_value = "100")] + pub rate: u64, + + /// Test duration in seconds + #[arg(long, default_value = "60")] + pub duration: u64, + + /// Timeout for transaction inclusion (seconds) + #[arg(long, default_value = "60")] + pub tx_timeout: u64, + + /// Random seed for reproducibility + #[arg(long)] + pub seed: Option, + + /// Output file for metrics (JSON) + #[arg(long)] + pub output: Option, +} diff --git a/crates/system-tests/src/load_test/load.rs b/crates/system-tests/src/load_test/load.rs new file mode 100644 index 0000000..ca5045f --- /dev/null +++ b/crates/system-tests/src/load_test/load.rs @@ -0,0 +1,133 @@ +use super::config::LoadArgs; +use super::metrics::{TestConfig, calculate_results}; +use super::output::{print_results, save_results}; +use super::poller::ReceiptPoller; +use super::sender::SenderTask; +use super::tracker::TransactionTracker; +use super::wallet::load_wallets; +use crate::client::TipsRpcClient; +use crate::fixtures::create_optimism_provider; +use anyhow::{Context, Result}; +use indicatif::{ProgressBar, ProgressStyle}; +use rand::SeedableRng; +use rand_chacha::ChaCha8Rng; +use std::sync::Arc; +use std::time::Duration; + +pub async fn run(args: LoadArgs) -> Result<()> { + let wallets = load_wallets(&args.wallets).context("Failed to load wallets")?; + + if wallets.is_empty() { + anyhow::bail!("No wallets found in file. Run 'setup' command first."); + } + + let num_wallets = wallets.len(); + + let sequencer = create_optimism_provider(&args.sequencer)?; + + let tips_provider = create_optimism_provider(&args.target)?; + let tips_client = TipsRpcClient::new(tips_provider); + + let tracker = TransactionTracker::new(Duration::from_secs(args.duration)); + + let rate_per_wallet = args.rate as f64 / num_wallets as f64; + + let pb = ProgressBar::new(args.duration); + pb.set_style( + ProgressStyle::default_bar() + .template("[{elapsed_precise}] {bar:40.cyan/blue} {pos}/{len}s | Sent: {msg}") + .unwrap() + .progress_chars("##-"), + ); + + let poller = ReceiptPoller::new( + sequencer.clone(), + Arc::clone(&tracker), + Duration::from_secs(args.tx_timeout), + ); + let poller_handle = tokio::spawn(async move { poller.run().await }); + + let mut sender_handles = Vec::new(); + + for (i, wallet) in wallets.into_iter().enumerate() { + let rng = match args.seed { + Some(seed) => ChaCha8Rng::seed_from_u64(seed + i as u64), + None => ChaCha8Rng::from_entropy(), + }; + + let sender = SenderTask::new( + wallet, + tips_client.clone(), + sequencer.clone(), + rate_per_wallet, + Duration::from_secs(args.duration), + Arc::clone(&tracker), + rng, + ); + + let handle = tokio::spawn(async move { sender.run().await }); + + sender_handles.push(handle); + } + + let pb_tracker = Arc::clone(&tracker); + let pb_handle = tokio::spawn(async move { + let mut interval = tokio::time::interval(Duration::from_secs(1)); + loop { + interval.tick().await; + let elapsed = pb_tracker.elapsed().as_secs(); + let sent = pb_tracker.total_sent(); + pb.set_position(elapsed); + pb.set_message(format!("{sent}")); + + if pb_tracker.is_test_completed() { + break; + } + } + pb.finish_with_message("Complete"); + }); + + for handle in sender_handles { + handle.await??; + } + + tracker.mark_test_completed(); + + pb_handle.await?; + + let grace_period = Duration::from_secs(args.tx_timeout + 10); + match tokio::time::timeout(grace_period, poller_handle).await { + Ok(Ok(Ok(()))) => { + println!("✅ All transactions resolved"); + } + Ok(Ok(Err(e))) => { + println!("⚠️ Poller error: {e}"); + } + Ok(Err(e)) => { + println!("⚠️ Poller panicked: {e}"); + } + Err(_) => { + println!("⏱️ Grace period expired, some transactions may still be pending"); + } + } + + let config = TestConfig { + target: args.target.clone(), + sequencer: args.sequencer.clone(), + wallets: num_wallets, + target_rate: args.rate, + duration_secs: args.duration, + tx_timeout_secs: args.tx_timeout, + seed: args.seed, + }; + + let results = calculate_results(&tracker, config); + print_results(&results); + + // Save results if output file specified + if let Some(output_path) = args.output.as_ref() { + save_results(&results, output_path)?; + } + + Ok(()) +} diff --git a/crates/system-tests/src/load_test/metrics.rs b/crates/system-tests/src/load_test/metrics.rs new file mode 100644 index 0000000..53415c9 --- /dev/null +++ b/crates/system-tests/src/load_test/metrics.rs @@ -0,0 +1,78 @@ +use super::tracker::TransactionTracker; +use serde::{Deserialize, Serialize}; +use std::sync::Arc; + +#[derive(Debug, Serialize, Deserialize)] +pub struct TestResults { + pub config: TestConfig, + pub results: ThroughputResults, + pub errors: ErrorResults, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct TestConfig { + pub target: String, + pub sequencer: String, + pub wallets: usize, + pub target_rate: u64, + pub duration_secs: u64, + pub tx_timeout_secs: u64, + pub seed: Option, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct ThroughputResults { + pub sent_rate: f64, + pub included_rate: f64, + pub total_sent: u64, + pub total_included: u64, + pub total_reverted: u64, + pub total_pending: u64, + pub total_timed_out: u64, + pub success_rate: f64, + pub actual_duration_secs: f64, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct ErrorResults { + pub send_errors: u64, + pub reverted: u64, + pub timed_out: u64, +} + +pub fn calculate_results(tracker: &Arc, config: TestConfig) -> TestResults { + let actual_duration = tracker.elapsed(); + let total_sent = tracker.total_sent(); + let total_included = tracker.total_included(); + let total_reverted = tracker.total_reverted(); + let total_timed_out = tracker.total_timed_out(); + let send_errors = tracker.total_send_errors(); + + let sent_rate = total_sent as f64 / actual_duration.as_secs_f64(); + let included_rate = total_included as f64 / actual_duration.as_secs_f64(); + let success_rate = if total_sent > 0 { + total_included as f64 / total_sent as f64 + } else { + 0.0 + }; + + TestResults { + config, + results: ThroughputResults { + sent_rate, + included_rate, + total_sent, + total_included, + total_reverted, + total_pending: tracker.total_pending(), + total_timed_out, + success_rate, + actual_duration_secs: actual_duration.as_secs_f64(), + }, + errors: ErrorResults { + send_errors, + reverted: total_reverted, + timed_out: total_timed_out, + }, + } +} diff --git a/crates/system-tests/src/load_test/mod.rs b/crates/system-tests/src/load_test/mod.rs new file mode 100644 index 0000000..896b415 --- /dev/null +++ b/crates/system-tests/src/load_test/mod.rs @@ -0,0 +1,9 @@ +pub mod config; +pub mod load; +pub mod metrics; +pub mod output; +pub mod poller; +pub mod sender; +pub mod setup; +pub mod tracker; +pub mod wallet; diff --git a/crates/system-tests/src/load_test/output.rs b/crates/system-tests/src/load_test/output.rs new file mode 100644 index 0000000..60e7564 --- /dev/null +++ b/crates/system-tests/src/load_test/output.rs @@ -0,0 +1,67 @@ +use super::metrics::TestResults; +use anyhow::{Context, Result}; +use std::fs; +use std::path::Path; + +pub fn print_results(results: &TestResults) { + println!("\n"); + println!("Load Test Results"); + println!("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"); + + println!("Configuration:"); + println!(" Target: {}", results.config.target); + println!(" Sequencer: {}", results.config.sequencer); + println!(" Wallets: {}", results.config.wallets); + println!(" Target Rate: {} tx/s", results.config.target_rate); + println!(" Duration: {}s", results.config.duration_secs); + println!(" TX Timeout: {}s", results.config.tx_timeout_secs); + if let Some(seed) = results.config.seed { + println!(" Seed: {seed}"); + } + + println!("\nThroughput:"); + println!( + " Sent: {:.1} tx/s ({} total)", + results.results.sent_rate, results.results.total_sent + ); + println!( + " Included: {:.1} tx/s ({} total)", + results.results.included_rate, results.results.total_included + ); + println!( + " Success Rate: {:.1}%", + results.results.success_rate * 100.0 + ); + + println!("\nTransaction Results:"); + println!( + " Included: {} ({:.1}%)", + results.results.total_included, + (results.results.total_included as f64 / results.results.total_sent as f64) * 100.0 + ); + if results.results.total_reverted > 0 { + println!( + " Reverted: {} ({:.1}%)", + results.results.total_reverted, + (results.results.total_reverted as f64 / results.results.total_sent as f64) * 100.0 + ); + } + println!( + " Timed Out: {} ({:.1}%)", + results.results.total_timed_out, + (results.results.total_timed_out as f64 / results.results.total_sent as f64) * 100.0 + ); + println!(" Send Errors: {}", results.errors.send_errors); + if results.results.total_pending > 0 { + println!(" Still Pending: {}", results.results.total_pending); + } + + println!("\n"); +} + +pub fn save_results(results: &TestResults, path: &Path) -> Result<()> { + let json = serde_json::to_string_pretty(results).context("Failed to serialize results")?; + fs::write(path, json).context("Failed to write results file")?; + println!("💾 Metrics saved to: {}", path.display()); + Ok(()) +} diff --git a/crates/system-tests/src/load_test/poller.rs b/crates/system-tests/src/load_test/poller.rs new file mode 100644 index 0000000..43014a9 --- /dev/null +++ b/crates/system-tests/src/load_test/poller.rs @@ -0,0 +1,77 @@ +use super::tracker::TransactionTracker; +use alloy_network::ReceiptResponse; +use alloy_provider::{Provider, RootProvider}; +use anyhow::Result; +use op_alloy_network::Optimism; +use std::sync::Arc; +use std::time::Duration; +use tracing::debug; + +pub struct ReceiptPoller { + sequencer: RootProvider, + tracker: Arc, + timeout: Duration, +} + +impl ReceiptPoller { + pub fn new( + sequencer: RootProvider, + tracker: Arc, + timeout: Duration, + ) -> Self { + Self { + sequencer, + tracker, + timeout, + } + } + + pub async fn run(self) -> Result<()> { + let mut interval = tokio::time::interval(Duration::from_secs(2)); // Block time + + loop { + interval.tick().await; + + let pending_txs = self.tracker.get_pending(); + + for (tx_hash, send_time) in pending_txs { + let elapsed = send_time.elapsed(); + + if elapsed > self.timeout { + self.tracker.record_timeout(tx_hash); + debug!("Transaction timed out: {:?}", tx_hash); + continue; + } + + match self.sequencer.get_transaction_receipt(tx_hash).await { + Ok(Some(receipt)) => { + // Verify transaction succeeded (status == true) and is in a block + if receipt.status() && receipt.block_number().is_some() { + self.tracker.record_included(tx_hash); + debug!("Transaction included and succeeded: {:?}", tx_hash); + } else if receipt.block_number().is_some() { + // Transaction was included but reverted + self.tracker.record_reverted(tx_hash); + debug!("Transaction included but reverted: {:?}", tx_hash); + } + // If no block_number yet, keep polling + } + Ok(None) => { + // Transaction not yet included, continue polling + } + Err(e) => { + debug!("Error fetching receipt for {:?}: {}", tx_hash, e); + // Don't mark as timeout, might be temporary RPC error + } + } + } + + // Exit when all transactions resolved and test completed + if self.tracker.all_resolved() && self.tracker.is_test_completed() { + break; + } + } + + Ok(()) + } +} diff --git a/crates/system-tests/src/load_test/sender.rs b/crates/system-tests/src/load_test/sender.rs new file mode 100644 index 0000000..050363a --- /dev/null +++ b/crates/system-tests/src/load_test/sender.rs @@ -0,0 +1,113 @@ +use super::tracker::TransactionTracker; +use super::wallet::Wallet; +use crate::client::TipsRpcClient; +use crate::fixtures::create_load_test_transaction; +use alloy_network::Network; +use alloy_primitives::{Address, Bytes, keccak256}; +use alloy_provider::{Provider, RootProvider}; +use anyhow::{Context, Result}; +use op_alloy_network::Optimism; +use rand::Rng; +use rand_chacha::ChaCha8Rng; +use std::sync::Arc; +use std::time::{Duration, Instant}; +use tokio::time::sleep; + +const MAX_RETRIES: u32 = 3; +const INITIAL_BACKOFF_MS: u64 = 100; + +pub struct SenderTask { + wallet: Wallet, + client: TipsRpcClient, + sequencer: RootProvider, + rate_per_wallet: f64, + duration: Duration, + tracker: Arc, + rng: ChaCha8Rng, +} + +impl SenderTask { + pub fn new( + wallet: Wallet, + client: TipsRpcClient, + sequencer: RootProvider, + rate_per_wallet: f64, + duration: Duration, + tracker: Arc, + rng: ChaCha8Rng, + ) -> Self { + Self { + wallet, + client, + sequencer, + rate_per_wallet, + duration, + tracker, + rng, + } + } + + pub async fn run(mut self) -> Result<()> { + let mut nonce = self + .sequencer + .get_transaction_count(self.wallet.address) + .await + .context("Failed to get initial nonce")?; + + let interval_duration = Duration::from_secs_f64(1.0 / self.rate_per_wallet); + let mut ticker = tokio::time::interval(interval_duration); + ticker.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Delay); + + let deadline = Instant::now() + self.duration; + + while Instant::now() < deadline { + ticker.tick().await; + + let recipient = self.random_address(); + let tx_bytes = self.create_transaction(recipient, nonce)?; + let tx_hash = keccak256(&tx_bytes); + + // Retry loop with exponential backoff + let mut retries = 0; + let mut backoff_ms = INITIAL_BACKOFF_MS; + + loop { + let send_time = Instant::now(); + + match self.client.send_raw_transaction(tx_bytes.clone()).await { + Ok(_) => { + self.tracker.record_sent(tx_hash, send_time); + nonce += 1; + break; + } + Err(e) => { + retries += 1; + if retries > MAX_RETRIES { + println!( + "Error sending raw transaction after {MAX_RETRIES} retries: {e}" + ); + self.tracker.record_send_error(); + nonce += 1; // Move on to next nonce after max retries + break; + } + // Exponential backoff before retry + sleep(Duration::from_millis(backoff_ms)).await; + backoff_ms *= 2; // Double backoff each retry + } + } + } + } + + Ok(()) + } + + fn create_transaction(&self, to: Address, nonce: u64) -> Result { + create_load_test_transaction(&self.wallet.signer, to, nonce) + } + + fn random_address(&mut self) -> Address { + let mut bytes = [0u8; 20]; + self.rng.fill(&mut bytes); + Address::from(bytes) + } +} diff --git a/crates/system-tests/src/load_test/setup.rs b/crates/system-tests/src/load_test/setup.rs new file mode 100644 index 0000000..1603df6 --- /dev/null +++ b/crates/system-tests/src/load_test/setup.rs @@ -0,0 +1,90 @@ +use super::config::SetupArgs; +use super::wallet::{Wallet, generate_wallets, save_wallets}; +use crate::fixtures::create_optimism_provider; +use alloy_consensus::{SignableTransaction, TxEip1559}; +use alloy_primitives::U256; +use alloy_provider::Provider; +use anyhow::{Context, Result}; +use indicatif::{ProgressBar, ProgressStyle}; +use op_alloy_network::TxSignerSync; +use op_alloy_network::eip2718::Encodable2718; + +const CHAIN_ID: u64 = 13; // builder-playground local chain ID + +pub async fn run(args: SetupArgs) -> Result<()> { + let master_wallet = Wallet::from_private_key(&args.master_key) + .context("Failed to parse master wallet private key")?; + + let provider = create_optimism_provider(&args.sequencer)?; + + let master_balance = provider + .get_balance(master_wallet.address) + .await + .context("Failed to get master wallet balance")?; + + let required_balance = + U256::from((args.fund_amount * 1e18) as u64) * U256::from(args.num_wallets); + + if master_balance < required_balance { + anyhow::bail!( + "Insufficient master wallet balance. Need {} ETH, have {} ETH", + required_balance.to::() as f64 / 1e18, + master_balance.to::() as f64 / 1e18 + ); + } + + let wallets = generate_wallets(args.num_wallets, None); + + let pb = ProgressBar::new(args.num_wallets as u64); + pb.set_style( + ProgressStyle::default_bar() + .template("[{elapsed_precise}] {bar:40.cyan/blue} {pos}/{len} {msg}") + .unwrap() + .progress_chars("##-"), + ); + + let mut nonce = provider + .get_transaction_count(master_wallet.address) + .await + .context("Failed to get master wallet nonce")?; + + let fund_amount_wei = U256::from((args.fund_amount * 1e18) as u64); + + // Send all funding transactions + let mut pending_txs = Vec::new(); + for (i, wallet) in wallets.iter().enumerate() { + let mut tx = TxEip1559 { + chain_id: CHAIN_ID, + nonce, + gas_limit: 21000, + max_fee_per_gas: 1_000_000_000, // 1 gwei + max_priority_fee_per_gas: 100_000_000, // 0.1 gwei + to: wallet.address.into(), + value: fund_amount_wei, + access_list: Default::default(), + input: Default::default(), + }; + + let signature = master_wallet.signer.sign_transaction_sync(&mut tx)?; + let envelope = op_alloy_consensus::OpTxEnvelope::Eip1559(tx.into_signed(signature)); + + let mut buf = Vec::new(); + envelope.encode_2718(&mut buf); + let pending = provider + .send_raw_transaction(buf.as_ref()) + .await + .with_context(|| format!("Failed to send funding tx for wallet {i}"))?; + + pending_txs.push(pending); + nonce += 1; + pb.set_message(format!("Sent funding tx {}", i + 1)); + pb.inc(1); + } + + pb.finish_with_message("All funding transactions sent!"); + + // Save wallets to file + save_wallets(&wallets, args.fund_amount, &args.output)?; + + Ok(()) +} diff --git a/crates/system-tests/src/load_test/tracker.rs b/crates/system-tests/src/load_test/tracker.rs new file mode 100644 index 0000000..18a8458 --- /dev/null +++ b/crates/system-tests/src/load_test/tracker.rs @@ -0,0 +1,115 @@ +use alloy_primitives::B256; +use dashmap::DashMap; +use std::sync::Arc; +use std::sync::atomic::{AtomicBool, AtomicU64, Ordering}; +use std::time::{Duration, Instant}; + +pub struct TransactionTracker { + // Pending transactions (tx_hash -> send_time) + pending: DashMap, + + // Included transactions (succeeded) + included: DashMap, + + // Reverted transactions (included but status == false) + reverted: DashMap, + + // Timed out transactions + timed_out: DashMap, + + // Send errors (not transaction-specific) + send_errors: AtomicU64, + + // Test metadata + test_start: Instant, + test_completed: AtomicBool, +} + +impl TransactionTracker { + pub fn new(_test_duration: Duration) -> Arc { + Arc::new(Self { + pending: DashMap::new(), + included: DashMap::new(), + reverted: DashMap::new(), + timed_out: DashMap::new(), + send_errors: AtomicU64::new(0), + test_start: Instant::now(), + test_completed: AtomicBool::new(false), + }) + } + + pub fn record_sent(&self, tx_hash: B256, send_time: Instant) { + self.pending.insert(tx_hash, send_time); + } + + pub fn record_send_error(&self) { + self.send_errors.fetch_add(1, Ordering::Relaxed); + } + + /// Record a transaction that was included and succeeded (status == true) + pub fn record_included(&self, tx_hash: B256) { + self.pending.remove(&tx_hash); + self.included.insert(tx_hash, ()); + } + + /// Record a transaction that was included but reverted (status == false) + pub fn record_reverted(&self, tx_hash: B256) { + self.pending.remove(&tx_hash); + self.reverted.insert(tx_hash, ()); + } + + pub fn record_timeout(&self, tx_hash: B256) { + if self.pending.remove(&tx_hash).is_some() { + self.timed_out.insert(tx_hash, ()); + } + } + + pub fn get_pending(&self) -> Vec<(B256, Instant)> { + self.pending + .iter() + .map(|entry| (*entry.key(), *entry.value())) + .collect() + } + + pub fn mark_test_completed(&self) { + self.test_completed.store(true, Ordering::Relaxed); + } + + pub fn is_test_completed(&self) -> bool { + self.test_completed.load(Ordering::Relaxed) + } + + pub fn all_resolved(&self) -> bool { + self.pending.is_empty() + } + + pub fn elapsed(&self) -> Duration { + self.test_start.elapsed() + } + + // Metrics getters + pub fn total_sent(&self) -> u64 { + (self.pending.len() + self.included.len() + self.reverted.len() + self.timed_out.len()) + as u64 + } + + pub fn total_included(&self) -> u64 { + self.included.len() as u64 + } + + pub fn total_reverted(&self) -> u64 { + self.reverted.len() as u64 + } + + pub fn total_pending(&self) -> u64 { + self.pending.len() as u64 + } + + pub fn total_timed_out(&self) -> u64 { + self.timed_out.len() as u64 + } + + pub fn total_send_errors(&self) -> u64 { + self.send_errors.load(Ordering::Relaxed) + } +} diff --git a/crates/system-tests/src/load_test/wallet.rs b/crates/system-tests/src/load_test/wallet.rs new file mode 100644 index 0000000..e5d7a73 --- /dev/null +++ b/crates/system-tests/src/load_test/wallet.rs @@ -0,0 +1,86 @@ +use alloy_primitives::Address; +use alloy_signer_local::PrivateKeySigner; +use anyhow::{Context, Result}; +use rand::SeedableRng; +use rand_chacha::ChaCha8Rng; +use serde::{Deserialize, Serialize}; +use std::fs; +use std::path::Path; + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct WalletData { + pub address: String, + pub private_key: String, + pub initial_balance: String, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct WalletsFile { + pub wallets: Vec, +} + +pub struct Wallet { + pub signer: PrivateKeySigner, + pub address: Address, +} + +impl Wallet { + pub fn from_private_key(private_key: &str) -> Result { + let signer: PrivateKeySigner = + private_key.parse().context("Failed to parse private key")?; + let address = signer.address(); + Ok(Self { signer, address }) + } + + pub fn new_random(rng: &mut ChaCha8Rng) -> Self { + let signer = PrivateKeySigner::random_with(rng); + let address = signer.address(); + Self { signer, address } + } +} + +pub fn generate_wallets(num_wallets: usize, seed: Option) -> Vec { + let mut rng = match seed { + Some(s) => ChaCha8Rng::seed_from_u64(s), + None => ChaCha8Rng::from_entropy(), + }; + + (0..num_wallets) + .map(|_| Wallet::new_random(&mut rng)) + .collect() +} + +pub fn save_wallets(wallets: &[Wallet], fund_amount: f64, path: &Path) -> Result<()> { + let wallet_data: Vec = wallets + .iter() + .map(|w| WalletData { + address: format!("{:?}", w.address), + private_key: format!("0x{}", hex::encode(w.signer.to_bytes())), + initial_balance: fund_amount.to_string(), + }) + .collect(); + + let wallets_file = WalletsFile { + wallets: wallet_data, + }; + + let json = + serde_json::to_string_pretty(&wallets_file).context("Failed to serialize wallets")?; + fs::write(path, json).context("Failed to write wallets file")?; + + Ok(()) +} + +pub fn load_wallets(path: &Path) -> Result> { + let json = fs::read_to_string(path).context("Failed to read wallets file")?; + let wallets_file: WalletsFile = + serde_json::from_str(&json).context("Failed to parse wallets file")?; + + let wallets: Result> = wallets_file + .wallets + .iter() + .map(|wd| Wallet::from_private_key(&wd.private_key)) + .collect(); + + wallets +} diff --git a/ui/package-lock.json b/ui/package-lock.json new file mode 100644 index 0000000..1ffa8b2 --- /dev/null +++ b/ui/package-lock.json @@ -0,0 +1,4752 @@ +{ + "name": "ui", + "version": "0.1.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "ui", + "version": "0.1.0", + "dependencies": { + "@aws-sdk/client-s3": "^3.888.0", + "drizzle-kit": "^0.31.4", + "drizzle-orm": "^0.44.5", + "next": "15.5.3", + "pg": "^8.16.3", + "react": "19.1.0", + "react-dom": "19.1.0" + }, + "devDependencies": { + "@biomejs/biome": "2.2.0", + "@tailwindcss/postcss": "^4", + "@types/node": "^20", + "@types/pg": "^8.15.5", + "@types/react": "^19", + "@types/react-dom": "^19", + "tailwindcss": "^4", + "typescript": "^5" + } + }, + "node_modules/@alloc/quick-lru": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", + "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@aws-crypto/crc32": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz", + "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-crypto/crc32c": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz", + "integrity": "sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@aws-crypto/sha1-browser": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz", + "integrity": "sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/supports-web-crypto": "^5.2.0", + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "@aws-sdk/util-locate-window": "^3.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@aws-crypto/sha1-browser/node_modules/@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-crypto/sha1-browser/node_modules/@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-crypto/sha1-browser/node_modules/@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-crypto/sha256-browser": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz", + "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/sha256-js": "^5.2.0", + "@aws-crypto/supports-web-crypto": "^5.2.0", + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "@aws-sdk/util-locate-window": "^3.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-crypto/sha256-js": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz", + "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-crypto/supports-web-crypto": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz", + "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + } + }, + "node_modules/@aws-crypto/util": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz", + "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "^3.222.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/client-s3": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.893.0.tgz", + "integrity": "sha512-/P74KDJhOijnIAQR93sq1DQn8vbU3WaPZDyy1XUMRJJIY6iEJnDo1toD9XY6AFDz5TRto8/8NbcXT30AMOUtJQ==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/sha1-browser": "5.2.0", + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.893.0", + "@aws-sdk/credential-provider-node": "3.893.0", + "@aws-sdk/middleware-bucket-endpoint": "3.893.0", + "@aws-sdk/middleware-expect-continue": "3.893.0", + "@aws-sdk/middleware-flexible-checksums": "3.893.0", + "@aws-sdk/middleware-host-header": "3.893.0", + "@aws-sdk/middleware-location-constraint": "3.893.0", + "@aws-sdk/middleware-logger": "3.893.0", + "@aws-sdk/middleware-recursion-detection": "3.893.0", + "@aws-sdk/middleware-sdk-s3": "3.893.0", + "@aws-sdk/middleware-ssec": "3.893.0", + "@aws-sdk/middleware-user-agent": "3.893.0", + "@aws-sdk/region-config-resolver": "3.893.0", + "@aws-sdk/signature-v4-multi-region": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@aws-sdk/util-endpoints": "3.893.0", + "@aws-sdk/util-user-agent-browser": "3.893.0", + "@aws-sdk/util-user-agent-node": "3.893.0", + "@aws-sdk/xml-builder": "3.893.0", + "@smithy/config-resolver": "^4.2.2", + "@smithy/core": "^3.11.1", + "@smithy/eventstream-serde-browser": "^4.1.1", + "@smithy/eventstream-serde-config-resolver": "^4.2.1", + "@smithy/eventstream-serde-node": "^4.1.1", + "@smithy/fetch-http-handler": "^5.2.1", + "@smithy/hash-blob-browser": "^4.1.1", + "@smithy/hash-node": "^4.1.1", + "@smithy/hash-stream-node": "^4.1.1", + "@smithy/invalid-dependency": "^4.1.1", + "@smithy/md5-js": "^4.1.1", + "@smithy/middleware-content-length": "^4.1.1", + "@smithy/middleware-endpoint": "^4.2.3", + "@smithy/middleware-retry": "^4.2.4", + "@smithy/middleware-serde": "^4.1.1", + "@smithy/middleware-stack": "^4.1.1", + "@smithy/node-config-provider": "^4.2.2", + "@smithy/node-http-handler": "^4.2.1", + "@smithy/protocol-http": "^5.2.1", + "@smithy/smithy-client": "^4.6.3", + "@smithy/types": "^4.5.0", + "@smithy/url-parser": "^4.1.1", + "@smithy/util-base64": "^4.1.0", + "@smithy/util-body-length-browser": "^4.1.0", + "@smithy/util-body-length-node": "^4.1.0", + "@smithy/util-defaults-mode-browser": "^4.1.3", + "@smithy/util-defaults-mode-node": "^4.1.3", + "@smithy/util-endpoints": "^3.1.2", + "@smithy/util-middleware": "^4.1.1", + "@smithy/util-retry": "^4.1.2", + "@smithy/util-stream": "^4.3.2", + "@smithy/util-utf8": "^4.1.0", + "@smithy/util-waiter": "^4.1.1", + "@types/uuid": "^9.0.1", + "tslib": "^2.6.2", + "uuid": "^9.0.1" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/client-sso": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.893.0.tgz", + "integrity": "sha512-0+qRGq7H8UNfxI0F02ObyOgOiYxkN4DSlFfwQUQMPfqENDNYOrL++2H9X3EInyc1lUM/+aK8TZqSbh473gdxcg==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.893.0", + "@aws-sdk/middleware-host-header": "3.893.0", + "@aws-sdk/middleware-logger": "3.893.0", + "@aws-sdk/middleware-recursion-detection": "3.893.0", + "@aws-sdk/middleware-user-agent": "3.893.0", + "@aws-sdk/region-config-resolver": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@aws-sdk/util-endpoints": "3.893.0", + "@aws-sdk/util-user-agent-browser": "3.893.0", + "@aws-sdk/util-user-agent-node": "3.893.0", + "@smithy/config-resolver": "^4.2.2", + "@smithy/core": "^3.11.1", + "@smithy/fetch-http-handler": "^5.2.1", + "@smithy/hash-node": "^4.1.1", + "@smithy/invalid-dependency": "^4.1.1", + "@smithy/middleware-content-length": "^4.1.1", + "@smithy/middleware-endpoint": "^4.2.3", + "@smithy/middleware-retry": "^4.2.4", + "@smithy/middleware-serde": "^4.1.1", + "@smithy/middleware-stack": "^4.1.1", + "@smithy/node-config-provider": "^4.2.2", + "@smithy/node-http-handler": "^4.2.1", + "@smithy/protocol-http": "^5.2.1", + "@smithy/smithy-client": "^4.6.3", + "@smithy/types": "^4.5.0", + "@smithy/url-parser": "^4.1.1", + "@smithy/util-base64": "^4.1.0", + "@smithy/util-body-length-browser": "^4.1.0", + "@smithy/util-body-length-node": "^4.1.0", + "@smithy/util-defaults-mode-browser": "^4.1.3", + "@smithy/util-defaults-mode-node": "^4.1.3", + "@smithy/util-endpoints": "^3.1.2", + "@smithy/util-middleware": "^4.1.1", + "@smithy/util-retry": "^4.1.2", + "@smithy/util-utf8": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/core": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.893.0.tgz", + "integrity": "sha512-E1NAWHOprBXIJ9CVb6oTsRD/tNOozrKBD/Sb4t7WZd3dpby6KpYfM6FaEGfRGcJBIcB4245hww8Rmg16qDMJWg==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.893.0", + "@aws-sdk/xml-builder": "3.893.0", + "@smithy/core": "^3.11.1", + "@smithy/node-config-provider": "^4.2.2", + "@smithy/property-provider": "^4.1.1", + "@smithy/protocol-http": "^5.2.1", + "@smithy/signature-v4": "^5.2.1", + "@smithy/smithy-client": "^4.6.3", + "@smithy/types": "^4.5.0", + "@smithy/util-base64": "^4.1.0", + "@smithy/util-body-length-browser": "^4.1.0", + "@smithy/util-middleware": "^4.1.1", + "@smithy/util-utf8": "^4.1.0", + "fast-xml-parser": "5.2.5", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-env": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.893.0.tgz", + "integrity": "sha512-h4sYNk1iDrSZQLqFfbuD1GWY6KoVCvourfqPl6JZCYj8Vmnox5y9+7taPxwlU2VVII0hiV8UUbO79P35oPBSyA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/core": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@smithy/property-provider": "^4.1.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-http": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.893.0.tgz", + "integrity": "sha512-xYoC7DRr++zWZ9jG7/hvd6YjCbGDQzsAu2fBHHf91RVmSETXUgdEaP9rOdfCM02iIK/MYlwiWEIVBcBxWY/GQw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/core": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@smithy/fetch-http-handler": "^5.2.1", + "@smithy/node-http-handler": "^4.2.1", + "@smithy/property-provider": "^4.1.1", + "@smithy/protocol-http": "^5.2.1", + "@smithy/smithy-client": "^4.6.3", + "@smithy/types": "^4.5.0", + "@smithy/util-stream": "^4.3.2", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-ini": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.893.0.tgz", + "integrity": "sha512-ZQWOl4jdLhJHHrHsOfNRjgpP98A5kw4YzkMOUoK+TgSQVLi7wjb957V0htvwpi6KmGr3f2F8J06D6u2OtIc62w==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/core": "3.893.0", + "@aws-sdk/credential-provider-env": "3.893.0", + "@aws-sdk/credential-provider-http": "3.893.0", + "@aws-sdk/credential-provider-process": "3.893.0", + "@aws-sdk/credential-provider-sso": "3.893.0", + "@aws-sdk/credential-provider-web-identity": "3.893.0", + "@aws-sdk/nested-clients": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@smithy/credential-provider-imds": "^4.1.2", + "@smithy/property-provider": "^4.1.1", + "@smithy/shared-ini-file-loader": "^4.2.0", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-node": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.893.0.tgz", + "integrity": "sha512-NjvDUXciC2+EaQnbL/u/ZuCXj9PZQ/9ciPhI62LGCoJ3ft91lI1Z58Dgut0OFPpV6i16GhpFxzmbuf40wTgDbA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.893.0", + "@aws-sdk/credential-provider-http": "3.893.0", + "@aws-sdk/credential-provider-ini": "3.893.0", + "@aws-sdk/credential-provider-process": "3.893.0", + "@aws-sdk/credential-provider-sso": "3.893.0", + "@aws-sdk/credential-provider-web-identity": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@smithy/credential-provider-imds": "^4.1.2", + "@smithy/property-provider": "^4.1.1", + "@smithy/shared-ini-file-loader": "^4.2.0", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-process": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.893.0.tgz", + "integrity": "sha512-5XitkZdiQhjWJV71qWqrH7hMXwuK/TvIRwiwKs7Pj0sapGSk3YgD3Ykdlolz7sQOleoKWYYqgoq73fIPpTTmFA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/core": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@smithy/property-provider": "^4.1.1", + "@smithy/shared-ini-file-loader": "^4.2.0", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-sso": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.893.0.tgz", + "integrity": "sha512-ms8v13G1r0aHZh5PLcJu6AnQZPs23sRm3Ph0A7+GdqbPvWewP8M7jgZTKyTXi+oYXswdYECU1zPVur8zamhtLg==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/client-sso": "3.893.0", + "@aws-sdk/core": "3.893.0", + "@aws-sdk/token-providers": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@smithy/property-provider": "^4.1.1", + "@smithy/shared-ini-file-loader": "^4.2.0", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-web-identity": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.893.0.tgz", + "integrity": "sha512-wWD8r2ot4jf/CoogdPTl13HbwNLW4UheGUCu6gW7n9GoHh1JImYyooPHK8K7kD42hihydIA7OW7iFAf7//JYTw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/core": "3.893.0", + "@aws-sdk/nested-clients": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@smithy/property-provider": "^4.1.1", + "@smithy/shared-ini-file-loader": "^4.2.0", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/middleware-bucket-endpoint": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.893.0.tgz", + "integrity": "sha512-H+wMAoFC73T7M54OFIezdHXR9/lH8TZ3Cx1C3MEBb2ctlzQrVCd8LX8zmOtcGYC8plrRwV+8rNPe0FMqecLRew==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.893.0", + "@aws-sdk/util-arn-parser": "3.893.0", + "@smithy/node-config-provider": "^4.2.2", + "@smithy/protocol-http": "^5.2.1", + "@smithy/types": "^4.5.0", + "@smithy/util-config-provider": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/middleware-expect-continue": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.893.0.tgz", + "integrity": "sha512-PEZkvD6k0X9sacHkvkVF4t2QyQEAzd35OJ2bIrjWCfc862TwukMMJ1KErRmQ1WqKXHKF4L0ed5vtWaO/8jVLNA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.893.0", + "@smithy/protocol-http": "^5.2.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/middleware-flexible-checksums": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.893.0.tgz", + "integrity": "sha512-2swRPpyGK6xpZwIFmmFSFKp10iuyBLZEouhrt1ycBVA8iHGmPkuJSCim6Vb+JoRKqINp5tizWeQwdg9boIxJPw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/crc32": "5.2.0", + "@aws-crypto/crc32c": "5.2.0", + "@aws-crypto/util": "5.2.0", + "@aws-sdk/core": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@smithy/is-array-buffer": "^4.1.0", + "@smithy/node-config-provider": "^4.2.2", + "@smithy/protocol-http": "^5.2.1", + "@smithy/types": "^4.5.0", + "@smithy/util-middleware": "^4.1.1", + "@smithy/util-stream": "^4.3.2", + "@smithy/util-utf8": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/middleware-host-header": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.893.0.tgz", + "integrity": "sha512-qL5xYRt80ahDfj9nDYLhpCNkDinEXvjLe/Qen/Y/u12+djrR2MB4DRa6mzBCkLkdXDtf0WAoW2EZsNCfGrmOEQ==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.893.0", + "@smithy/protocol-http": "^5.2.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/middleware-location-constraint": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.893.0.tgz", + "integrity": "sha512-MlbBc7Ttb1ekbeeeFBU4DeEZOLb5s0Vl4IokvO17g6yJdLk4dnvZro9zdXl3e7NXK+kFxHRBFZe55p/42mVgDA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.893.0", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/middleware-logger": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.893.0.tgz", + "integrity": "sha512-ZqzMecjju5zkBquSIfVfCORI/3Mge21nUY4nWaGQy+NUXehqCGG4W7AiVpiHGOcY2cGJa7xeEkYcr2E2U9U0AA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.893.0", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/middleware-recursion-detection": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.893.0.tgz", + "integrity": "sha512-H7Zotd9zUHQAr/wr3bcWHULYhEeoQrF54artgsoUGIf/9emv6LzY89QUccKIxYd6oHKNTrTyXm9F0ZZrzXNxlg==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.893.0", + "@aws/lambda-invoke-store": "^0.0.1", + "@smithy/protocol-http": "^5.2.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/middleware-sdk-s3": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.893.0.tgz", + "integrity": "sha512-J2v7jOoSlE4o416yQiuka6+cVJzyrU7mbJEQA9VFCb+TYT2cG3xQB0bDzE24QoHeonpeBDghbg/zamYMnt+GsQ==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/core": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@aws-sdk/util-arn-parser": "3.893.0", + "@smithy/core": "^3.11.1", + "@smithy/node-config-provider": "^4.2.2", + "@smithy/protocol-http": "^5.2.1", + "@smithy/signature-v4": "^5.2.1", + "@smithy/smithy-client": "^4.6.3", + "@smithy/types": "^4.5.0", + "@smithy/util-config-provider": "^4.1.0", + "@smithy/util-middleware": "^4.1.1", + "@smithy/util-stream": "^4.3.2", + "@smithy/util-utf8": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/middleware-ssec": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.893.0.tgz", + "integrity": "sha512-e4ccCiAnczv9mMPheKjgKxZQN473mcup+3DPLVNnIw5GRbQoDqPSB70nUzfORKZvM7ar7xLMPxNR8qQgo1C8Rg==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.893.0", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/middleware-user-agent": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.893.0.tgz", + "integrity": "sha512-n1vHj7bdC4ycIAKkny0rmgvgvGOIgYnGBAqfPAFPR26WuGWmCxH2cT9nQTNA+li8ofxX9F9FIFBTKkW92Pc8iQ==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/core": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@aws-sdk/util-endpoints": "3.893.0", + "@smithy/core": "^3.11.1", + "@smithy/protocol-http": "^5.2.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/nested-clients": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.893.0.tgz", + "integrity": "sha512-HIUCyNtWkxvc0BmaJPUj/A0/29OapT/dzBNxr2sjgKNZgO81JuDFp+aXCmnf7vQoA2D1RzCsAIgEtfTExNFZqA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.893.0", + "@aws-sdk/middleware-host-header": "3.893.0", + "@aws-sdk/middleware-logger": "3.893.0", + "@aws-sdk/middleware-recursion-detection": "3.893.0", + "@aws-sdk/middleware-user-agent": "3.893.0", + "@aws-sdk/region-config-resolver": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@aws-sdk/util-endpoints": "3.893.0", + "@aws-sdk/util-user-agent-browser": "3.893.0", + "@aws-sdk/util-user-agent-node": "3.893.0", + "@smithy/config-resolver": "^4.2.2", + "@smithy/core": "^3.11.1", + "@smithy/fetch-http-handler": "^5.2.1", + "@smithy/hash-node": "^4.1.1", + "@smithy/invalid-dependency": "^4.1.1", + "@smithy/middleware-content-length": "^4.1.1", + "@smithy/middleware-endpoint": "^4.2.3", + "@smithy/middleware-retry": "^4.2.4", + "@smithy/middleware-serde": "^4.1.1", + "@smithy/middleware-stack": "^4.1.1", + "@smithy/node-config-provider": "^4.2.2", + "@smithy/node-http-handler": "^4.2.1", + "@smithy/protocol-http": "^5.2.1", + "@smithy/smithy-client": "^4.6.3", + "@smithy/types": "^4.5.0", + "@smithy/url-parser": "^4.1.1", + "@smithy/util-base64": "^4.1.0", + "@smithy/util-body-length-browser": "^4.1.0", + "@smithy/util-body-length-node": "^4.1.0", + "@smithy/util-defaults-mode-browser": "^4.1.3", + "@smithy/util-defaults-mode-node": "^4.1.3", + "@smithy/util-endpoints": "^3.1.2", + "@smithy/util-middleware": "^4.1.1", + "@smithy/util-retry": "^4.1.2", + "@smithy/util-utf8": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/region-config-resolver": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.893.0.tgz", + "integrity": "sha512-/cJvh3Zsa+Of0Zbg7vl9wp/kZtdb40yk/2+XcroAMVPO9hPvmS9r/UOm6tO7FeX4TtkRFwWaQJiTZTgSdsPY+Q==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.893.0", + "@smithy/node-config-provider": "^4.2.2", + "@smithy/types": "^4.5.0", + "@smithy/util-config-provider": "^4.1.0", + "@smithy/util-middleware": "^4.1.1", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/signature-v4-multi-region": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.893.0.tgz", + "integrity": "sha512-pp4Bn8dL4i68P/mHgZ7sgkm8OSIpwjtGxP73oGseu9Cli0JRyJ1asTSsT60hUz3sbo+3oKk3hEobD6UxLUeGRA==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/middleware-sdk-s3": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@smithy/protocol-http": "^5.2.1", + "@smithy/signature-v4": "^5.2.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/token-providers": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.893.0.tgz", + "integrity": "sha512-nkzuE910TxW4pnIwJ+9xDMx5m+A8iXGM16Oa838YKsds07cgkRp7sPnpH9B8NbGK2szskAAkXfj7t1f59EKd1Q==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/core": "3.893.0", + "@aws-sdk/nested-clients": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@smithy/property-provider": "^4.1.1", + "@smithy/shared-ini-file-loader": "^4.2.0", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/types": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.893.0.tgz", + "integrity": "sha512-Aht1nn5SnA0N+Tjv0dzhAY7CQbxVtmq1bBR6xI0MhG7p2XYVh1wXuKTzrldEvQWwA3odOYunAfT9aBiKZx9qIg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/util-arn-parser": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.893.0.tgz", + "integrity": "sha512-u8H4f2Zsi19DGnwj5FSZzDMhytYF/bCh37vAtBsn3cNDL3YG578X5oc+wSX54pM3tOxS+NY7tvOAo52SW7koUA==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/util-endpoints": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.893.0.tgz", + "integrity": "sha512-xeMcL31jXHKyxRwB3oeNjs8YEpyvMnSYWr2OwLydgzgTr0G349AHlJHwYGCF9xiJ2C27kDxVvXV/Hpdp0p7TWw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.893.0", + "@smithy/types": "^4.5.0", + "@smithy/url-parser": "^4.1.1", + "@smithy/util-endpoints": "^3.1.2", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/util-locate-window": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.893.0.tgz", + "integrity": "sha512-T89pFfgat6c8nMmpI8eKjBcDcgJq36+m9oiXbcUzeU55MP9ZuGgBomGjGnHaEyF36jenW9gmg3NfZDm0AO2XPg==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws-sdk/util-user-agent-browser": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.893.0.tgz", + "integrity": "sha512-PE9NtbDBW6Kgl1bG6A5fF3EPo168tnkj8TgMcT0sg4xYBWsBpq0bpJZRh+Jm5Bkwiw9IgTCLjEU7mR6xWaMB9w==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.893.0", + "@smithy/types": "^4.5.0", + "bowser": "^2.11.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@aws-sdk/util-user-agent-node": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.893.0.tgz", + "integrity": "sha512-tTRkJo/fth9NPJ2AO/XLuJWVsOhbhejQRLyP0WXG3z0Waa5IWK5YBxBC1tWWATUCwsN748JQXU03C1aF9cRD9w==", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/middleware-user-agent": "3.893.0", + "@aws-sdk/types": "3.893.0", + "@smithy/node-config-provider": "^4.2.2", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "aws-crt": ">=1.0.0" + }, + "peerDependenciesMeta": { + "aws-crt": { + "optional": true + } + } + }, + "node_modules/@aws-sdk/xml-builder": { + "version": "3.893.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.893.0.tgz", + "integrity": "sha512-qKkJ2E0hU60iq0o2+hBSIWS8sf34xhqiRRGw5nbRhwEnE2MsWsWBpRoysmr32uq9dHMWUzII0c/fS29+wOSdMA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@aws/lambda-invoke-store": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.0.1.tgz", + "integrity": "sha512-ORHRQ2tmvnBXc8t/X9Z8IcSbBA4xTLKuN873FopzklHMeqBst7YG0d+AX97inkvDX+NChYtSr+qGfcqGFaI8Zw==", + "license": "Apache-2.0", + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@biomejs/biome": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.2.0.tgz", + "integrity": "sha512-3On3RSYLsX+n9KnoSgfoYlckYBoU6VRM22cw1gB4Y0OuUVSYd/O/2saOJMrA4HFfA1Ff0eacOvMN1yAAvHtzIw==", + "dev": true, + "license": "MIT OR Apache-2.0", + "bin": { + "biome": "bin/biome" + }, + "engines": { + "node": ">=14.21.3" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/biome" + }, + "optionalDependencies": { + "@biomejs/cli-darwin-arm64": "2.2.0", + "@biomejs/cli-darwin-x64": "2.2.0", + "@biomejs/cli-linux-arm64": "2.2.0", + "@biomejs/cli-linux-arm64-musl": "2.2.0", + "@biomejs/cli-linux-x64": "2.2.0", + "@biomejs/cli-linux-x64-musl": "2.2.0", + "@biomejs/cli-win32-arm64": "2.2.0", + "@biomejs/cli-win32-x64": "2.2.0" + } + }, + "node_modules/@biomejs/cli-darwin-arm64": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.2.0.tgz", + "integrity": "sha512-zKbwUUh+9uFmWfS8IFxmVD6XwqFcENjZvEyfOxHs1epjdH3wyyMQG80FGDsmauPwS2r5kXdEM0v/+dTIA9FXAg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-darwin-x64": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.2.0.tgz", + "integrity": "sha512-+OmT4dsX2eTfhD5crUOPw3RPhaR+SKVspvGVmSdZ9y9O/AgL8pla6T4hOn1q+VAFBHuHhsdxDRJgFCSC7RaMOw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-linux-arm64": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.2.0.tgz", + "integrity": "sha512-6eoRdF2yW5FnW9Lpeivh7Mayhq0KDdaDMYOJnH9aT02KuSIX5V1HmWJCQQPwIQbhDh68Zrcpl8inRlTEan0SXw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-linux-arm64-musl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.2.0.tgz", + "integrity": "sha512-egKpOa+4FL9YO+SMUMLUvf543cprjevNc3CAgDNFLcjknuNMcZ0GLJYa3EGTCR2xIkIUJDVneBV3O9OcIlCEZQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-linux-x64": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.2.0.tgz", + "integrity": "sha512-5UmQx/OZAfJfi25zAnAGHUMuOd+LOsliIt119x2soA2gLggQYrVPA+2kMUxR6Mw5M1deUF/AWWP2qpxgH7Nyfw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-linux-x64-musl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.2.0.tgz", + "integrity": "sha512-I5J85yWwUWpgJyC1CcytNSGusu2p9HjDnOPAFG4Y515hwRD0jpR9sT9/T1cKHtuCvEQ/sBvx+6zhz9l9wEJGAg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-win32-arm64": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.2.0.tgz", + "integrity": "sha512-n9a1/f2CwIDmNMNkFs+JI0ZjFnMO0jdOyGNtihgUNFnlmd84yIYY2KMTBmMV58ZlVHjgmY5Y6E1hVTnSRieggA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@biomejs/cli-win32-x64": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.2.0.tgz", + "integrity": "sha512-Nawu5nHjP/zPKTIryh2AavzTc/KEg4um/MxWdXW0A6P/RZOyIpa7+QSjeXwAwX/utJGaCoXRPWtF3m5U/bB3Ww==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT OR Apache-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=14.21.3" + } + }, + "node_modules/@drizzle-team/brocli": { + "version": "0.10.2", + "resolved": "https://registry.npmjs.org/@drizzle-team/brocli/-/brocli-0.10.2.tgz", + "integrity": "sha512-z33Il7l5dKjUgGULTqBsQBQwckHh5AbIuxhdsIxDDiZAzBOrZO6q9ogcWC65kU382AfynTfgNumVcNIjuIua6w==", + "license": "Apache-2.0" + }, + "node_modules/@emnapi/runtime": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.5.0.tgz", + "integrity": "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@esbuild-kit/core-utils": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.3.2.tgz", + "integrity": "sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==", + "deprecated": "Merged into tsx: https://tsx.is", + "license": "MIT", + "dependencies": { + "esbuild": "~0.18.20", + "source-map-support": "^0.5.21" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/android-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/android-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/android-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/darwin-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/darwin-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/freebsd-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/freebsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "cpu": [ + "ia32" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-loong64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "cpu": [ + "loong64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-mips64el": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "cpu": [ + "mips64el" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-ppc64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "cpu": [ + "ppc64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-riscv64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "cpu": [ + "riscv64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-s390x": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "cpu": [ + "s390x" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/netbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/openbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/sunos-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/win32-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/win32-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "cpu": [ + "ia32" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/win32-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/esbuild": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" + } + }, + "node_modules/@esbuild-kit/esm-loader": { + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/@esbuild-kit/esm-loader/-/esm-loader-2.6.5.tgz", + "integrity": "sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==", + "deprecated": "Merged into tsx: https://tsx.is", + "license": "MIT", + "dependencies": { + "@esbuild-kit/core-utils": "^3.3.2", + "get-tsconfig": "^4.7.0" + } + }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz", + "integrity": "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==", + "cpu": [ + "ppc64" + ], + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.10.tgz", + "integrity": "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.10.tgz", + "integrity": "sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.10.tgz", + "integrity": "sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.10.tgz", + "integrity": "sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.10.tgz", + "integrity": "sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.10.tgz", + "integrity": "sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.10.tgz", + "integrity": "sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.10.tgz", + "integrity": "sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.10.tgz", + "integrity": "sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.10.tgz", + "integrity": "sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==", + "cpu": [ + "ia32" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.10.tgz", + "integrity": "sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==", + "cpu": [ + "loong64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.10.tgz", + "integrity": "sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==", + "cpu": [ + "mips64el" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.10.tgz", + "integrity": "sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==", + "cpu": [ + "ppc64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.10.tgz", + "integrity": "sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==", + "cpu": [ + "riscv64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.10.tgz", + "integrity": "sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==", + "cpu": [ + "s390x" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz", + "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.10.tgz", + "integrity": "sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.10.tgz", + "integrity": "sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.10.tgz", + "integrity": "sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.10.tgz", + "integrity": "sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openharmony-arm64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.10.tgz", + "integrity": "sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.10.tgz", + "integrity": "sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.10.tgz", + "integrity": "sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.10.tgz", + "integrity": "sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==", + "cpu": [ + "ia32" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.10.tgz", + "integrity": "sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@img/colour": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.0.0.tgz", + "integrity": "sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=18" + } + }, + "node_modules/@img/sharp-darwin-arm64": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.4.tgz", + "integrity": "sha512-sitdlPzDVyvmINUdJle3TNHl+AG9QcwiAMsXmccqsCOMZNIdW2/7S26w0LyU8euiLVzFBL3dXPwVCq/ODnf2vA==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-darwin-arm64": "1.2.3" + } + }, + "node_modules/@img/sharp-darwin-x64": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.4.tgz", + "integrity": "sha512-rZheupWIoa3+SOdF/IcUe1ah4ZDpKBGWcsPX6MT0lYniH9micvIU7HQkYTfrx5Xi8u+YqwLtxC/3vl8TQN6rMg==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-darwin-x64": "1.2.3" + } + }, + "node_modules/@img/sharp-libvips-darwin-arm64": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.3.tgz", + "integrity": "sha512-QzWAKo7kpHxbuHqUC28DZ9pIKpSi2ts2OJnoIGI26+HMgq92ZZ4vk8iJd4XsxN+tYfNJxzH6W62X5eTcsBymHw==", + "cpu": [ + "arm64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "darwin" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-darwin-x64": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.3.tgz", + "integrity": "sha512-Ju+g2xn1E2AKO6YBhxjj+ACcsPQRHT0bhpglxcEf+3uyPY+/gL8veniKoo96335ZaPo03bdDXMv0t+BBFAbmRA==", + "cpu": [ + "x64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "darwin" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-arm": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.3.tgz", + "integrity": "sha512-x1uE93lyP6wEwGvgAIV0gP6zmaL/a0tGzJs/BIDDG0zeBhMnuUPm7ptxGhUbcGs4okDJrk4nxgrmxpib9g6HpA==", + "cpu": [ + "arm" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-arm64": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.3.tgz", + "integrity": "sha512-I4RxkXU90cpufazhGPyVujYwfIm9Nk1QDEmiIsaPwdnm013F7RIceaCc87kAH+oUB1ezqEvC6ga4m7MSlqsJvQ==", + "cpu": [ + "arm64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-ppc64": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.3.tgz", + "integrity": "sha512-Y2T7IsQvJLMCBM+pmPbM3bKT/yYJvVtLJGfCs4Sp95SjvnFIjynbjzsa7dY1fRJX45FTSfDksbTp6AGWudiyCg==", + "cpu": [ + "ppc64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-s390x": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.3.tgz", + "integrity": "sha512-RgWrs/gVU7f+K7P+KeHFaBAJlNkD1nIZuVXdQv6S+fNA6syCcoboNjsV2Pou7zNlVdNQoQUpQTk8SWDHUA3y/w==", + "cpu": [ + "s390x" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-x64": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.3.tgz", + "integrity": "sha512-3JU7LmR85K6bBiRzSUc/Ff9JBVIFVvq6bomKE0e63UXGeRw2HPVEjoJke1Yx+iU4rL7/7kUjES4dZ/81Qjhyxg==", + "cpu": [ + "x64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linuxmusl-arm64": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.3.tgz", + "integrity": "sha512-F9q83RZ8yaCwENw1GieztSfj5msz7GGykG/BA+MOUefvER69K/ubgFHNeSyUu64amHIYKGDs4sRCMzXVj8sEyw==", + "cpu": [ + "arm64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linuxmusl-x64": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.3.tgz", + "integrity": "sha512-U5PUY5jbc45ANM6tSJpsgqmBF/VsL6LnxJmIf11kB7J5DctHgqm0SkuXzVWtIY90GnJxKnC/JT251TDnk1fu/g==", + "cpu": [ + "x64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-linux-arm": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.4.tgz", + "integrity": "sha512-Xyam4mlqM0KkTHYVSuc6wXRmM7LGN0P12li03jAnZ3EJWZqj83+hi8Y9UxZUbxsgsK1qOEwg7O0Bc0LjqQVtxA==", + "cpu": [ + "arm" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-arm": "1.2.3" + } + }, + "node_modules/@img/sharp-linux-arm64": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.4.tgz", + "integrity": "sha512-YXU1F/mN/Wu786tl72CyJjP/Ngl8mGHN1hST4BGl+hiW5jhCnV2uRVTNOcaYPs73NeT/H8Upm3y9582JVuZHrQ==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-arm64": "1.2.3" + } + }, + "node_modules/@img/sharp-linux-ppc64": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.4.tgz", + "integrity": "sha512-F4PDtF4Cy8L8hXA2p3TO6s4aDt93v+LKmpcYFLAVdkkD3hSxZzee0rh6/+94FpAynsuMpLX5h+LRsSG3rIciUQ==", + "cpu": [ + "ppc64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-ppc64": "1.2.3" + } + }, + "node_modules/@img/sharp-linux-s390x": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.4.tgz", + "integrity": "sha512-qVrZKE9Bsnzy+myf7lFKvng6bQzhNUAYcVORq2P7bDlvmF6u2sCmK2KyEQEBdYk+u3T01pVsPrkj943T1aJAsw==", + "cpu": [ + "s390x" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-s390x": "1.2.3" + } + }, + "node_modules/@img/sharp-linux-x64": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.4.tgz", + "integrity": "sha512-ZfGtcp2xS51iG79c6Vhw9CWqQC8l2Ot8dygxoDoIQPTat/Ov3qAa8qpxSrtAEAJW+UjTXc4yxCjNfxm4h6Xm2A==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-x64": "1.2.3" + } + }, + "node_modules/@img/sharp-linuxmusl-arm64": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.4.tgz", + "integrity": "sha512-8hDVvW9eu4yHWnjaOOR8kHVrew1iIX+MUgwxSuH2XyYeNRtLUe4VNioSqbNkB7ZYQJj9rUTT4PyRscyk2PXFKA==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linuxmusl-arm64": "1.2.3" + } + }, + "node_modules/@img/sharp-linuxmusl-x64": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.4.tgz", + "integrity": "sha512-lU0aA5L8QTlfKjpDCEFOZsTYGn3AEiO6db8W5aQDxj0nQkVrZWmN3ZP9sYKWJdtq3PWPhUNlqehWyXpYDcI9Sg==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linuxmusl-x64": "1.2.3" + } + }, + "node_modules/@img/sharp-wasm32": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.4.tgz", + "integrity": "sha512-33QL6ZO/qpRyG7woB/HUALz28WnTMI2W1jgX3Nu2bypqLIKx/QKMILLJzJjI+SIbvXdG9fUnmrxR7vbi1sTBeA==", + "cpu": [ + "wasm32" + ], + "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", + "optional": true, + "dependencies": { + "@emnapi/runtime": "^1.5.0" + }, + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-win32-arm64": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.4.tgz", + "integrity": "sha512-2Q250do/5WXTwxW3zjsEuMSv5sUU4Tq9VThWKlU2EYLm4MB7ZeMwF+SFJutldYODXF6jzc6YEOC+VfX0SZQPqA==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-win32-ia32": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.4.tgz", + "integrity": "sha512-3ZeLue5V82dT92CNL6rsal6I2weKw1cYu+rGKm8fOCCtJTR2gYeUfY3FqUnIJsMUPIH68oS5jmZ0NiJ508YpEw==", + "cpu": [ + "ia32" + ], + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-win32-x64": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.4.tgz", + "integrity": "sha512-xIyj4wpYs8J18sVN3mSQjwrw7fKUqRw+Z5rnHNCy5fYTxigBz81u5mOMPmFumwjcn8+ld1ppptMBCLic1nz6ig==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@isaacs/fs-minipass": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", + "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.4" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", + "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/remapping": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", + "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", + "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@next/env": { + "version": "15.5.3", + "resolved": "https://registry.npmjs.org/@next/env/-/env-15.5.3.tgz", + "integrity": "sha512-RSEDTRqyihYXygx/OJXwvVupfr9m04+0vH8vyy0HfZ7keRto6VX9BbEk0J2PUk0VGy6YhklJUSrgForov5F9pw==", + "license": "MIT" + }, + "node_modules/@next/swc-darwin-arm64": { + "version": "15.5.3", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.3.tgz", + "integrity": "sha512-nzbHQo69+au9wJkGKTU9lP7PXv0d1J5ljFpvb+LnEomLtSbJkbZyEs6sbF3plQmiOB2l9OBtN2tNSvCH1nQ9Jg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-darwin-x64": { + "version": "15.5.3", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.3.tgz", + "integrity": "sha512-w83w4SkOOhekJOcA5HBvHyGzgV1W/XvOfpkrxIse4uPWhYTTRwtGEM4v/jiXwNSJvfRvah0H8/uTLBKRXlef8g==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-gnu": { + "version": "15.5.3", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.3.tgz", + "integrity": "sha512-+m7pfIs0/yvgVu26ieaKrifV8C8yiLe7jVp9SpcIzg7XmyyNE7toC1fy5IOQozmr6kWl/JONC51osih2RyoXRw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-musl": { + "version": "15.5.3", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.3.tgz", + "integrity": "sha512-u3PEIzuguSenoZviZJahNLgCexGFhso5mxWCrrIMdvpZn6lkME5vc/ADZG8UUk5K1uWRy4hqSFECrON6UKQBbQ==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-x64-gnu": { + "version": "15.5.3", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.3.tgz", + "integrity": "sha512-lDtOOScYDZxI2BENN9m0pfVPJDSuUkAD1YXSvlJF0DKwZt0WlA7T7o3wrcEr4Q+iHYGzEaVuZcsIbCps4K27sA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-x64-musl": { + "version": "15.5.3", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.3.tgz", + "integrity": "sha512-9vWVUnsx9PrY2NwdVRJ4dUURAQ8Su0sLRPqcCCxtX5zIQUBES12eRVHq6b70bbfaVaxIDGJN2afHui0eDm+cLg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-arm64-msvc": { + "version": "15.5.3", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.3.tgz", + "integrity": "sha512-1CU20FZzY9LFQigRi6jM45oJMU3KziA5/sSG+dXeVaTm661snQP6xu3ykGxxwU5sLG3sh14teO/IOEPVsQMRfA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-x64-msvc": { + "version": "15.5.3", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.3.tgz", + "integrity": "sha512-JMoLAq3n3y5tKXPQwCK5c+6tmwkuFDa2XAxz8Wm4+IVthdBZdZGh+lmiLUHg9f9IDwIQpUjp+ysd6OkYTyZRZw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@smithy/abort-controller": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.1.1.tgz", + "integrity": "sha512-vkzula+IwRvPR6oKQhMYioM3A/oX/lFCZiwuxkQbRhqJS2S4YRY2k7k/SyR2jMf3607HLtbEwlRxi0ndXHMjRg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/chunked-blob-reader": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.1.0.tgz", + "integrity": "sha512-a36AtR7Q7XOhRPt6F/7HENmTWcB8kN7mDJcOFM/+FuKO6x88w8MQJfYCufMWh4fGyVkPjUh3Rrz/dnqFQdo6OQ==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/chunked-blob-reader-native": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.1.0.tgz", + "integrity": "sha512-Bnv0B3nSlfB2mPO0WgM49I/prl7+kamF042rrf3ezJ3Z4C7csPYvyYgZfXTGXwXfj1mAwDWjE/ybIf49PzFzvA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/util-base64": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/config-resolver": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.2.2.tgz", + "integrity": "sha512-IT6MatgBWagLybZl1xQcURXRICvqz1z3APSCAI9IqdvfCkrA7RaQIEfgC6G/KvfxnDfQUDqFV+ZlixcuFznGBQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/node-config-provider": "^4.2.2", + "@smithy/types": "^4.5.0", + "@smithy/util-config-provider": "^4.1.0", + "@smithy/util-middleware": "^4.1.1", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/core": { + "version": "3.11.1", + "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.11.1.tgz", + "integrity": "sha512-REH7crwORgdjSpYs15JBiIWOYjj0hJNC3aCecpJvAlMMaaqL5i2CLb1i6Hc4yevToTKSqslLMI9FKjhugEwALA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/middleware-serde": "^4.1.1", + "@smithy/protocol-http": "^5.2.1", + "@smithy/types": "^4.5.0", + "@smithy/util-base64": "^4.1.0", + "@smithy/util-body-length-browser": "^4.1.0", + "@smithy/util-middleware": "^4.1.1", + "@smithy/util-stream": "^4.3.2", + "@smithy/util-utf8": "^4.1.0", + "@types/uuid": "^9.0.1", + "tslib": "^2.6.2", + "uuid": "^9.0.1" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/credential-provider-imds": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.1.2.tgz", + "integrity": "sha512-JlYNq8TShnqCLg0h+afqe2wLAwZpuoSgOyzhYvTgbiKBWRov+uUve+vrZEQO6lkdLOWPh7gK5dtb9dS+KGendg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/node-config-provider": "^4.2.2", + "@smithy/property-provider": "^4.1.1", + "@smithy/types": "^4.5.0", + "@smithy/url-parser": "^4.1.1", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/eventstream-codec": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-4.1.1.tgz", + "integrity": "sha512-PwkQw1hZwHTQB6X5hSUWz2OSeuj5Z6enWuAqke7DgWoP3t6vg3ktPpqPz3Erkn6w+tmsl8Oss6nrgyezoea2Iw==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/crc32": "5.2.0", + "@smithy/types": "^4.5.0", + "@smithy/util-hex-encoding": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-browser": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.1.1.tgz", + "integrity": "sha512-Q9QWdAzRaIuVkefupRPRFAasaG/droBqn1feiMnmLa+LLEUG45pqX1+FurHFmlqiCfobB3nUlgoJfeXZsr7MPA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/eventstream-serde-universal": "^4.1.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-config-resolver": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.2.1.tgz", + "integrity": "sha512-oSUkF9zDN9zcOUBMtxp8RewJlh71E9NoHWU8jE3hU9JMYCsmW4assVTpgic/iS3/dM317j6hO5x18cc3XrfvEw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-node": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.1.1.tgz", + "integrity": "sha512-tn6vulwf/ScY0vjhzptSJuDJJqlhNtUjkxJ4wiv9E3SPoEqTEKbaq6bfqRO7nvhTG29ALICRcvfFheOUPl8KNA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/eventstream-serde-universal": "^4.1.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-universal": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.1.1.tgz", + "integrity": "sha512-uLOAiM/Dmgh2CbEXQx+6/ssK7fbzFhd+LjdyFxXid5ZBCbLHTFHLdD/QbXw5aEDsLxQhgzDxLLsZhsftAYwHJA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/eventstream-codec": "^4.1.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/fetch-http-handler": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.2.1.tgz", + "integrity": "sha512-5/3wxKNtV3wO/hk1is+CZUhL8a1yy/U+9u9LKQ9kZTkMsHaQjJhc3stFfiujtMnkITjzWfndGA2f7g9Uh9vKng==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/protocol-http": "^5.2.1", + "@smithy/querystring-builder": "^4.1.1", + "@smithy/types": "^4.5.0", + "@smithy/util-base64": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/hash-blob-browser": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-4.1.1.tgz", + "integrity": "sha512-avAtk++s1e/1VODf+rg7c9R2pB5G9y8yaJaGY4lPZI2+UIqVyuSDMikWjeWfBVmFZ3O7NpDxBbUCyGhThVUKWQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/chunked-blob-reader": "^5.1.0", + "@smithy/chunked-blob-reader-native": "^4.1.0", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/hash-node": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.1.1.tgz", + "integrity": "sha512-H9DIU9WBLhYrvPs9v4sYvnZ1PiAI0oc8CgNQUJ1rpN3pP7QADbTOUjchI2FB764Ub0DstH5xbTqcMJu1pnVqxA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "@smithy/util-buffer-from": "^4.1.0", + "@smithy/util-utf8": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/hash-stream-node": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-4.1.1.tgz", + "integrity": "sha512-3ztT4pV0Moazs3JAYFdfKk11kYFDo4b/3R3+xVjIm6wY9YpJf+xfz+ocEnNKcWAdcmSMqi168i2EMaKmJHbJMA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "@smithy/util-utf8": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/invalid-dependency": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.1.1.tgz", + "integrity": "sha512-1AqLyFlfrrDkyES8uhINRlJXmHA2FkG+3DY8X+rmLSqmFwk3DJnvhyGzyByPyewh2jbmV+TYQBEfngQax8IFGg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/is-array-buffer": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.1.0.tgz", + "integrity": "sha512-ePTYUOV54wMogio+he4pBybe8fwg4sDvEVDBU8ZlHOZXbXK3/C0XfJgUCu6qAZcawv05ZhZzODGUerFBPsPUDQ==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/md5-js": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-4.1.1.tgz", + "integrity": "sha512-MvWXKK743BuHjr/hnWuT6uStdKEaoqxHAQUvbKJPPZM5ZojTNFI5D+47BoQfBE5RgGlRRty05EbWA+NXDv+hIA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "@smithy/util-utf8": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/middleware-content-length": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.1.1.tgz", + "integrity": "sha512-9wlfBBgTsRvC2JxLJxv4xDGNBrZuio3AgSl0lSFX7fneW2cGskXTYpFxCdRYD2+5yzmsiTuaAJD1Wp7gWt9y9w==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/protocol-http": "^5.2.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/middleware-endpoint": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.2.3.tgz", + "integrity": "sha512-+1H5A28DeffRVrqmVmtqtRraEjoaC6JVap3xEQdVoBh2EagCVY7noPmcBcG4y7mnr9AJitR1ZAse2l+tEtK5vg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/core": "^3.11.1", + "@smithy/middleware-serde": "^4.1.1", + "@smithy/node-config-provider": "^4.2.2", + "@smithy/shared-ini-file-loader": "^4.2.0", + "@smithy/types": "^4.5.0", + "@smithy/url-parser": "^4.1.1", + "@smithy/util-middleware": "^4.1.1", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/middleware-retry": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.2.4.tgz", + "integrity": "sha512-amyqYQFewnAviX3yy/rI/n1HqAgfvUdkEhc04kDjxsngAUREKuOI24iwqQUirrj6GtodWmR4iO5Zeyl3/3BwWg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/node-config-provider": "^4.2.2", + "@smithy/protocol-http": "^5.2.1", + "@smithy/service-error-classification": "^4.1.2", + "@smithy/smithy-client": "^4.6.3", + "@smithy/types": "^4.5.0", + "@smithy/util-middleware": "^4.1.1", + "@smithy/util-retry": "^4.1.2", + "@types/uuid": "^9.0.1", + "tslib": "^2.6.2", + "uuid": "^9.0.1" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/middleware-serde": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.1.1.tgz", + "integrity": "sha512-lh48uQdbCoj619kRouev5XbWhCwRKLmphAif16c4J6JgJ4uXjub1PI6RL38d3BLliUvSso6klyB/LTNpWSNIyg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/protocol-http": "^5.2.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/middleware-stack": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.1.1.tgz", + "integrity": "sha512-ygRnniqNcDhHzs6QAPIdia26M7e7z9gpkIMUe/pK0RsrQ7i5MblwxY8078/QCnGq6AmlUUWgljK2HlelsKIb/A==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/node-config-provider": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.2.2.tgz", + "integrity": "sha512-SYGTKyPvyCfEzIN5rD8q/bYaOPZprYUPD2f5g9M7OjaYupWOoQFYJ5ho+0wvxIRf471i2SR4GoiZ2r94Jq9h6A==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/property-provider": "^4.1.1", + "@smithy/shared-ini-file-loader": "^4.2.0", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/node-http-handler": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.2.1.tgz", + "integrity": "sha512-REyybygHlxo3TJICPF89N2pMQSf+p+tBJqpVe1+77Cfi9HBPReNjTgtZ1Vg73exq24vkqJskKDpfF74reXjxfw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/abort-controller": "^4.1.1", + "@smithy/protocol-http": "^5.2.1", + "@smithy/querystring-builder": "^4.1.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/property-provider": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.1.1.tgz", + "integrity": "sha512-gm3ZS7DHxUbzC2wr8MUCsAabyiXY0gaj3ROWnhSx/9sPMc6eYLMM4rX81w1zsMaObj2Lq3PZtNCC1J6lpEY7zg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/protocol-http": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.2.1.tgz", + "integrity": "sha512-T8SlkLYCwfT/6m33SIU/JOVGNwoelkrvGjFKDSDtVvAXj/9gOT78JVJEas5a+ETjOu4SVvpCstKgd0PxSu/aHw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/querystring-builder": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.1.1.tgz", + "integrity": "sha512-J9b55bfimP4z/Jg1gNo+AT84hr90p716/nvxDkPGCD4W70MPms0h8KF50RDRgBGZeL83/u59DWNqJv6tEP/DHA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "@smithy/util-uri-escape": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/querystring-parser": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.1.1.tgz", + "integrity": "sha512-63TEp92YFz0oQ7Pj9IuI3IgnprP92LrZtRAkE3c6wLWJxfy/yOPRt39IOKerVr0JS770olzl0kGafXlAXZ1vng==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/service-error-classification": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.1.2.tgz", + "integrity": "sha512-Kqd8wyfmBWHZNppZSMfrQFpc3M9Y/kjyN8n8P4DqJJtuwgK1H914R471HTw7+RL+T7+kI1f1gOnL7Vb5z9+NgQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/shared-ini-file-loader": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.2.0.tgz", + "integrity": "sha512-OQTfmIEp2LLuWdxa8nEEPhZmiOREO6bcB6pjs0AySf4yiZhl6kMOfqmcwcY8BaBPX+0Tb+tG7/Ia/6mwpoZ7Pw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/signature-v4": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.2.1.tgz", + "integrity": "sha512-M9rZhWQLjlQVCCR37cSjHfhriGRN+FQ8UfgrYNufv66TJgk+acaggShl3KS5U/ssxivvZLlnj7QH2CUOKlxPyA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/is-array-buffer": "^4.1.0", + "@smithy/protocol-http": "^5.2.1", + "@smithy/types": "^4.5.0", + "@smithy/util-hex-encoding": "^4.1.0", + "@smithy/util-middleware": "^4.1.1", + "@smithy/util-uri-escape": "^4.1.0", + "@smithy/util-utf8": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/smithy-client": { + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.6.3.tgz", + "integrity": "sha512-K27LqywsaqKz4jusdUQYJh/YP2VbnbdskZ42zG8xfV+eovbTtMc2/ZatLWCfSkW0PDsTUXlpvlaMyu8925HsOw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/core": "^3.11.1", + "@smithy/middleware-endpoint": "^4.2.3", + "@smithy/middleware-stack": "^4.1.1", + "@smithy/protocol-http": "^5.2.1", + "@smithy/types": "^4.5.0", + "@smithy/util-stream": "^4.3.2", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/types": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.5.0.tgz", + "integrity": "sha512-RkUpIOsVlAwUIZXO1dsz8Zm+N72LClFfsNqf173catVlvRZiwPy0x2u0JLEA4byreOPKDZPGjmPDylMoP8ZJRg==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/url-parser": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.1.1.tgz", + "integrity": "sha512-bx32FUpkhcaKlEoOMbScvc93isaSiRM75pQ5IgIBaMkT7qMlIibpPRONyx/0CvrXHzJLpOn/u6YiDX2hcvs7Dg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/querystring-parser": "^4.1.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-base64": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.1.0.tgz", + "integrity": "sha512-RUGd4wNb8GeW7xk+AY5ghGnIwM96V0l2uzvs/uVHf+tIuVX2WSvynk5CxNoBCsM2rQRSZElAo9rt3G5mJ/gktQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/util-buffer-from": "^4.1.0", + "@smithy/util-utf8": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-body-length-browser": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.1.0.tgz", + "integrity": "sha512-V2E2Iez+bo6bUMOTENPr6eEmepdY8Hbs+Uc1vkDKgKNA/brTJqOW/ai3JO1BGj9GbCeLqw90pbbH7HFQyFotGQ==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-body-length-node": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.1.0.tgz", + "integrity": "sha512-BOI5dYjheZdgR9XiEM3HJcEMCXSoqbzu7CzIgYrx0UtmvtC3tC2iDGpJLsSRFffUpy8ymsg2ARMP5fR8mtuUQQ==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-buffer-from": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.1.0.tgz", + "integrity": "sha512-N6yXcjfe/E+xKEccWEKzK6M+crMrlwaCepKja0pNnlSkm6SjAeLKKA++er5Ba0I17gvKfN/ThV+ZOx/CntKTVw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/is-array-buffer": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-config-provider": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.1.0.tgz", + "integrity": "sha512-swXz2vMjrP1ZusZWVTB/ai5gK+J8U0BWvP10v9fpcFvg+Xi/87LHvHfst2IgCs1i0v4qFZfGwCmeD/KNCdJZbQ==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-defaults-mode-browser": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.1.3.tgz", + "integrity": "sha512-5fm3i2laE95uhY6n6O6uGFxI5SVbqo3/RWEuS3YsT0LVmSZk+0eUqPhKd4qk0KxBRPaT5VNT/WEBUqdMyYoRgg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/property-provider": "^4.1.1", + "@smithy/smithy-client": "^4.6.3", + "@smithy/types": "^4.5.0", + "bowser": "^2.11.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-defaults-mode-node": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.1.3.tgz", + "integrity": "sha512-lwnMzlMslZ9GJNt+/wVjz6+fe9Wp5tqR1xAyQn+iywmP+Ymj0F6NhU/KfHM5jhGPQchRSCcau5weKhFdLIM4cA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/config-resolver": "^4.2.2", + "@smithy/credential-provider-imds": "^4.1.2", + "@smithy/node-config-provider": "^4.2.2", + "@smithy/property-provider": "^4.1.1", + "@smithy/smithy-client": "^4.6.3", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-endpoints": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.1.2.tgz", + "integrity": "sha512-+AJsaaEGb5ySvf1SKMRrPZdYHRYSzMkCoK16jWnIMpREAnflVspMIDeCVSZJuj+5muZfgGpNpijE3mUNtjv01Q==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/node-config-provider": "^4.2.2", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-hex-encoding": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.1.0.tgz", + "integrity": "sha512-1LcueNN5GYC4tr8mo14yVYbh/Ur8jHhWOxniZXii+1+ePiIbsLZ5fEI0QQGtbRRP5mOhmooos+rLmVASGGoq5w==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-middleware": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.1.1.tgz", + "integrity": "sha512-CGmZ72mL29VMfESz7S6dekqzCh8ZISj3B+w0g1hZFXaOjGTVaSqfAEFAq8EGp8fUL+Q2l8aqNmt8U1tglTikeg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-retry": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.1.2.tgz", + "integrity": "sha512-NCgr1d0/EdeP6U5PSZ9Uv5SMR5XRRYoVr1kRVtKZxWL3tixEL3UatrPIMFZSKwHlCcp2zPLDvMubVDULRqeunA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/service-error-classification": "^4.1.2", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-stream": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.3.2.tgz", + "integrity": "sha512-Ka+FA2UCC/Q1dEqUanCdpqwxOFdf5Dg2VXtPtB1qxLcSGh5C1HdzklIt18xL504Wiy9nNUKwDMRTVCbKGoK69g==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/fetch-http-handler": "^5.2.1", + "@smithy/node-http-handler": "^4.2.1", + "@smithy/types": "^4.5.0", + "@smithy/util-base64": "^4.1.0", + "@smithy/util-buffer-from": "^4.1.0", + "@smithy/util-hex-encoding": "^4.1.0", + "@smithy/util-utf8": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-uri-escape": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.1.0.tgz", + "integrity": "sha512-b0EFQkq35K5NHUYxU72JuoheM6+pytEVUGlTwiFxWFpmddA+Bpz3LgsPRIpBk8lnPE47yT7AF2Egc3jVnKLuPg==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-utf8": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.1.0.tgz", + "integrity": "sha512-mEu1/UIXAdNYuBcyEPbjScKi/+MQVXNIuY/7Cm5XLIWe319kDrT5SizBE95jqtmEXoDbGoZxKLCMttdZdqTZKQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/util-buffer-from": "^4.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@smithy/util-waiter": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-4.1.1.tgz", + "integrity": "sha512-PJBmyayrlfxM7nbqjomF4YcT1sApQwZio0NHSsT0EzhJqljRmvhzqZua43TyEs80nJk2Cn2FGPg/N8phH6KeCQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/abort-controller": "^4.1.1", + "@smithy/types": "^4.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@swc/helpers": { + "version": "0.5.15", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz", + "integrity": "sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.8.0" + } + }, + "node_modules/@tailwindcss/node": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.13.tgz", + "integrity": "sha512-eq3ouolC1oEFOAvOMOBAmfCIqZBJuvWvvYWh5h5iOYfe1HFC6+GZ6EIL0JdM3/niGRJmnrOc+8gl9/HGUaaptw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/remapping": "^2.3.4", + "enhanced-resolve": "^5.18.3", + "jiti": "^2.5.1", + "lightningcss": "1.30.1", + "magic-string": "^0.30.18", + "source-map-js": "^1.2.1", + "tailwindcss": "4.1.13" + } + }, + "node_modules/@tailwindcss/oxide": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.13.tgz", + "integrity": "sha512-CPgsM1IpGRa880sMbYmG1s4xhAy3xEt1QULgTJGQmZUeNgXFR7s1YxYygmJyBGtou4SyEosGAGEeYqY7R53bIA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "detect-libc": "^2.0.4", + "tar": "^7.4.3" + }, + "engines": { + "node": ">= 10" + }, + "optionalDependencies": { + "@tailwindcss/oxide-android-arm64": "4.1.13", + "@tailwindcss/oxide-darwin-arm64": "4.1.13", + "@tailwindcss/oxide-darwin-x64": "4.1.13", + "@tailwindcss/oxide-freebsd-x64": "4.1.13", + "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.13", + "@tailwindcss/oxide-linux-arm64-gnu": "4.1.13", + "@tailwindcss/oxide-linux-arm64-musl": "4.1.13", + "@tailwindcss/oxide-linux-x64-gnu": "4.1.13", + "@tailwindcss/oxide-linux-x64-musl": "4.1.13", + "@tailwindcss/oxide-wasm32-wasi": "4.1.13", + "@tailwindcss/oxide-win32-arm64-msvc": "4.1.13", + "@tailwindcss/oxide-win32-x64-msvc": "4.1.13" + } + }, + "node_modules/@tailwindcss/oxide-android-arm64": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.13.tgz", + "integrity": "sha512-BrpTrVYyejbgGo57yc8ieE+D6VT9GOgnNdmh5Sac6+t0m+v+sKQevpFVpwX3pBrM2qKrQwJ0c5eDbtjouY/+ew==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-darwin-arm64": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.13.tgz", + "integrity": "sha512-YP+Jksc4U0KHcu76UhRDHq9bx4qtBftp9ShK/7UGfq0wpaP96YVnnjFnj3ZFrUAjc5iECzODl/Ts0AN7ZPOANQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-darwin-x64": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.13.tgz", + "integrity": "sha512-aAJ3bbwrn/PQHDxCto9sxwQfT30PzyYJFG0u/BWZGeVXi5Hx6uuUOQEI2Fa43qvmUjTRQNZnGqe9t0Zntexeuw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-freebsd-x64": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.13.tgz", + "integrity": "sha512-Wt8KvASHwSXhKE/dJLCCWcTSVmBj3xhVhp/aF3RpAhGeZ3sVo7+NTfgiN8Vey/Fi8prRClDs6/f0KXPDTZE6nQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.13.tgz", + "integrity": "sha512-mbVbcAsW3Gkm2MGwA93eLtWrwajz91aXZCNSkGTx/R5eb6KpKD5q8Ueckkh9YNboU8RH7jiv+ol/I7ZyQ9H7Bw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-linux-arm64-gnu": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.13.tgz", + "integrity": "sha512-wdtfkmpXiwej/yoAkrCP2DNzRXCALq9NVLgLELgLim1QpSfhQM5+ZxQQF8fkOiEpuNoKLp4nKZ6RC4kmeFH0HQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-linux-arm64-musl": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.13.tgz", + "integrity": "sha512-hZQrmtLdhyqzXHB7mkXfq0IYbxegaqTmfa1p9MBj72WPoDD3oNOh1Lnxf6xZLY9C3OV6qiCYkO1i/LrzEdW2mg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-linux-x64-gnu": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.13.tgz", + "integrity": "sha512-uaZTYWxSXyMWDJZNY1Ul7XkJTCBRFZ5Fo6wtjrgBKzZLoJNrG+WderJwAjPzuNZOnmdrVg260DKwXCFtJ/hWRQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-linux-x64-musl": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.13.tgz", + "integrity": "sha512-oXiPj5mi4Hdn50v5RdnuuIms0PVPI/EG4fxAfFiIKQh5TgQgX7oSuDWntHW7WNIi/yVLAiS+CRGW4RkoGSSgVQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-wasm32-wasi": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.13.tgz", + "integrity": "sha512-+LC2nNtPovtrDwBc/nqnIKYh/W2+R69FA0hgoeOn64BdCX522u19ryLh3Vf3F8W49XBcMIxSe665kwy21FkhvA==", + "bundleDependencies": [ + "@napi-rs/wasm-runtime", + "@emnapi/core", + "@emnapi/runtime", + "@tybys/wasm-util", + "@emnapi/wasi-threads", + "tslib" + ], + "cpu": [ + "wasm32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/core": "^1.4.5", + "@emnapi/runtime": "^1.4.5", + "@emnapi/wasi-threads": "^1.0.4", + "@napi-rs/wasm-runtime": "^0.2.12", + "@tybys/wasm-util": "^0.10.0", + "tslib": "^2.8.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@tailwindcss/oxide-win32-arm64-msvc": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.13.tgz", + "integrity": "sha512-dziTNeQXtoQ2KBXmrjCxsuPk3F3CQ/yb7ZNZNA+UkNTeiTGgfeh+gH5Pi7mRncVgcPD2xgHvkFCh/MhZWSgyQg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/oxide-win32-x64-msvc": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.13.tgz", + "integrity": "sha512-3+LKesjXydTkHk5zXX01b5KMzLV1xl2mcktBJkje7rhFUpUlYJy7IMOLqjIRQncLTa1WZZiFY/foAeB5nmaiTw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tailwindcss/postcss": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.1.13.tgz", + "integrity": "sha512-HLgx6YSFKJT7rJqh9oJs/TkBFhxuMOfUKSBEPYwV+t78POOBsdQ7crhZLzwcH3T0UyUuOzU/GK5pk5eKr3wCiQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@alloc/quick-lru": "^5.2.0", + "@tailwindcss/node": "4.1.13", + "@tailwindcss/oxide": "4.1.13", + "postcss": "^8.4.41", + "tailwindcss": "4.1.13" + } + }, + "node_modules/@types/node": { + "version": "20.19.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.17.tgz", + "integrity": "sha512-gfehUI8N1z92kygssiuWvLiwcbOB3IRktR6hTDgJlXMYh5OvkPSRmgfoBUmfZt+vhwJtX7v1Yw4KvvAf7c5QKQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.21.0" + } + }, + "node_modules/@types/pg": { + "version": "8.15.5", + "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.15.5.tgz", + "integrity": "sha512-LF7lF6zWEKxuT3/OR8wAZGzkg4ENGXFNyiV/JeOt9z5B+0ZVwbql9McqX5c/WStFq1GaGso7H1AzP/qSzmlCKQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "pg-protocol": "*", + "pg-types": "^2.2.0" + } + }, + "node_modules/@types/react": { + "version": "19.1.13", + "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.13.tgz", + "integrity": "sha512-hHkbU/eoO3EG5/MZkuFSKmYqPbSVk5byPFa3e7y/8TybHiLMACgI8seVYlicwk7H5K/rI2px9xrQp/C+AUDTiQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "csstype": "^3.0.2" + } + }, + "node_modules/@types/react-dom": { + "version": "19.1.9", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.1.9.tgz", + "integrity": "sha512-qXRuZaOsAdXKFyOhRBg6Lqqc0yay13vN7KrIg4L7N4aaHN68ma9OK3NE1BoDFgFOTfM7zg+3/8+2n8rLUH3OKQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "@types/react": "^19.0.0" + } + }, + "node_modules/@types/uuid": { + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz", + "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==", + "license": "MIT" + }, + "node_modules/bowser": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.12.1.tgz", + "integrity": "sha512-z4rE2Gxh7tvshQ4hluIT7XcFrgLIQaw9X3A+kTTRdovCz5PMukm/0QC/BKSYPj3omF5Qfypn9O/c5kgpmvYUCw==", + "license": "MIT" + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "license": "MIT" + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001743", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001743.tgz", + "integrity": "sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/chownr": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", + "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } + }, + "node_modules/client-only": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", + "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==", + "license": "MIT" + }, + "node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "dev": true, + "license": "MIT" + }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/detect-libc": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz", + "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==", + "devOptional": true, + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, + "node_modules/drizzle-kit": { + "version": "0.31.4", + "resolved": "https://registry.npmjs.org/drizzle-kit/-/drizzle-kit-0.31.4.tgz", + "integrity": "sha512-tCPWVZWZqWVx2XUsVpJRnH9Mx0ClVOf5YUHerZ5so1OKSlqww4zy1R5ksEdGRcO3tM3zj0PYN6V48TbQCL1RfA==", + "license": "MIT", + "dependencies": { + "@drizzle-team/brocli": "^0.10.2", + "@esbuild-kit/esm-loader": "^2.5.5", + "esbuild": "^0.25.4", + "esbuild-register": "^3.5.0" + }, + "bin": { + "drizzle-kit": "bin.cjs" + } + }, + "node_modules/drizzle-orm": { + "version": "0.44.5", + "resolved": "https://registry.npmjs.org/drizzle-orm/-/drizzle-orm-0.44.5.tgz", + "integrity": "sha512-jBe37K7d8ZSKptdKfakQFdeljtu3P2Cbo7tJoJSVZADzIKOBo9IAJPOmMsH2bZl90bZgh8FQlD8BjxXA/zuBkQ==", + "license": "Apache-2.0", + "peerDependencies": { + "@aws-sdk/client-rds-data": ">=3", + "@cloudflare/workers-types": ">=4", + "@electric-sql/pglite": ">=0.2.0", + "@libsql/client": ">=0.10.0", + "@libsql/client-wasm": ">=0.10.0", + "@neondatabase/serverless": ">=0.10.0", + "@op-engineering/op-sqlite": ">=2", + "@opentelemetry/api": "^1.4.1", + "@planetscale/database": ">=1.13", + "@prisma/client": "*", + "@tidbcloud/serverless": "*", + "@types/better-sqlite3": "*", + "@types/pg": "*", + "@types/sql.js": "*", + "@upstash/redis": ">=1.34.7", + "@vercel/postgres": ">=0.8.0", + "@xata.io/client": "*", + "better-sqlite3": ">=7", + "bun-types": "*", + "expo-sqlite": ">=14.0.0", + "gel": ">=2", + "knex": "*", + "kysely": "*", + "mysql2": ">=2", + "pg": ">=8", + "postgres": ">=3", + "sql.js": ">=1", + "sqlite3": ">=5" + }, + "peerDependenciesMeta": { + "@aws-sdk/client-rds-data": { + "optional": true + }, + "@cloudflare/workers-types": { + "optional": true + }, + "@electric-sql/pglite": { + "optional": true + }, + "@libsql/client": { + "optional": true + }, + "@libsql/client-wasm": { + "optional": true + }, + "@neondatabase/serverless": { + "optional": true + }, + "@op-engineering/op-sqlite": { + "optional": true + }, + "@opentelemetry/api": { + "optional": true + }, + "@planetscale/database": { + "optional": true + }, + "@prisma/client": { + "optional": true + }, + "@tidbcloud/serverless": { + "optional": true + }, + "@types/better-sqlite3": { + "optional": true + }, + "@types/pg": { + "optional": true + }, + "@types/sql.js": { + "optional": true + }, + "@upstash/redis": { + "optional": true + }, + "@vercel/postgres": { + "optional": true + }, + "@xata.io/client": { + "optional": true + }, + "better-sqlite3": { + "optional": true + }, + "bun-types": { + "optional": true + }, + "expo-sqlite": { + "optional": true + }, + "gel": { + "optional": true + }, + "knex": { + "optional": true + }, + "kysely": { + "optional": true + }, + "mysql2": { + "optional": true + }, + "pg": { + "optional": true + }, + "postgres": { + "optional": true + }, + "prisma": { + "optional": true + }, + "sql.js": { + "optional": true + }, + "sqlite3": { + "optional": true + } + } + }, + "node_modules/enhanced-resolve": { + "version": "5.18.3", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz", + "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/esbuild": { + "version": "0.25.10", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz", + "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==", + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.25.10", + "@esbuild/android-arm": "0.25.10", + "@esbuild/android-arm64": "0.25.10", + "@esbuild/android-x64": "0.25.10", + "@esbuild/darwin-arm64": "0.25.10", + "@esbuild/darwin-x64": "0.25.10", + "@esbuild/freebsd-arm64": "0.25.10", + "@esbuild/freebsd-x64": "0.25.10", + "@esbuild/linux-arm": "0.25.10", + "@esbuild/linux-arm64": "0.25.10", + "@esbuild/linux-ia32": "0.25.10", + "@esbuild/linux-loong64": "0.25.10", + "@esbuild/linux-mips64el": "0.25.10", + "@esbuild/linux-ppc64": "0.25.10", + "@esbuild/linux-riscv64": "0.25.10", + "@esbuild/linux-s390x": "0.25.10", + "@esbuild/linux-x64": "0.25.10", + "@esbuild/netbsd-arm64": "0.25.10", + "@esbuild/netbsd-x64": "0.25.10", + "@esbuild/openbsd-arm64": "0.25.10", + "@esbuild/openbsd-x64": "0.25.10", + "@esbuild/openharmony-arm64": "0.25.10", + "@esbuild/sunos-x64": "0.25.10", + "@esbuild/win32-arm64": "0.25.10", + "@esbuild/win32-ia32": "0.25.10", + "@esbuild/win32-x64": "0.25.10" + } + }, + "node_modules/esbuild-register": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.6.0.tgz", + "integrity": "sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg==", + "license": "MIT", + "dependencies": { + "debug": "^4.3.4" + }, + "peerDependencies": { + "esbuild": ">=0.12 <1" + } + }, + "node_modules/fast-xml-parser": { + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz", + "integrity": "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT", + "dependencies": { + "strnum": "^2.1.0" + }, + "bin": { + "fxparser": "src/cli/cli.js" + } + }, + "node_modules/get-tsconfig": { + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz", + "integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==", + "license": "MIT", + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/jiti": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.5.1.tgz", + "integrity": "sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==", + "dev": true, + "license": "MIT", + "bin": { + "jiti": "lib/jiti-cli.mjs" + } + }, + "node_modules/lightningcss": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.1.tgz", + "integrity": "sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==", + "dev": true, + "license": "MPL-2.0", + "dependencies": { + "detect-libc": "^2.0.3" + }, + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "lightningcss-darwin-arm64": "1.30.1", + "lightningcss-darwin-x64": "1.30.1", + "lightningcss-freebsd-x64": "1.30.1", + "lightningcss-linux-arm-gnueabihf": "1.30.1", + "lightningcss-linux-arm64-gnu": "1.30.1", + "lightningcss-linux-arm64-musl": "1.30.1", + "lightningcss-linux-x64-gnu": "1.30.1", + "lightningcss-linux-x64-musl": "1.30.1", + "lightningcss-win32-arm64-msvc": "1.30.1", + "lightningcss-win32-x64-msvc": "1.30.1" + } + }, + "node_modules/lightningcss-darwin-arm64": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.1.tgz", + "integrity": "sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-darwin-x64": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.1.tgz", + "integrity": "sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-freebsd-x64": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.1.tgz", + "integrity": "sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm-gnueabihf": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.1.tgz", + "integrity": "sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm64-gnu": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.1.tgz", + "integrity": "sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm64-musl": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.1.tgz", + "integrity": "sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-x64-gnu": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.1.tgz", + "integrity": "sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-x64-musl": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.1.tgz", + "integrity": "sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-win32-arm64-msvc": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.1.tgz", + "integrity": "sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-win32-x64-msvc": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.1.tgz", + "integrity": "sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/magic-string": { + "version": "0.30.19", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.19.tgz", + "integrity": "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.5" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minizlib": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz", + "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^7.1.2" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/mkdirp": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", + "dev": true, + "license": "MIT", + "bin": { + "mkdirp": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/nanoid": { + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/next": { + "version": "15.5.3", + "resolved": "https://registry.npmjs.org/next/-/next-15.5.3.tgz", + "integrity": "sha512-r/liNAx16SQj4D+XH/oI1dlpv9tdKJ6cONYPwwcCC46f2NjpaRWY+EKCzULfgQYV6YKXjHBchff2IZBSlZmJNw==", + "license": "MIT", + "dependencies": { + "@next/env": "15.5.3", + "@swc/helpers": "0.5.15", + "caniuse-lite": "^1.0.30001579", + "postcss": "8.4.31", + "styled-jsx": "5.1.6" + }, + "bin": { + "next": "dist/bin/next" + }, + "engines": { + "node": "^18.18.0 || ^19.8.0 || >= 20.0.0" + }, + "optionalDependencies": { + "@next/swc-darwin-arm64": "15.5.3", + "@next/swc-darwin-x64": "15.5.3", + "@next/swc-linux-arm64-gnu": "15.5.3", + "@next/swc-linux-arm64-musl": "15.5.3", + "@next/swc-linux-x64-gnu": "15.5.3", + "@next/swc-linux-x64-musl": "15.5.3", + "@next/swc-win32-arm64-msvc": "15.5.3", + "@next/swc-win32-x64-msvc": "15.5.3", + "sharp": "^0.34.3" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.1.0", + "@playwright/test": "^1.51.1", + "babel-plugin-react-compiler": "*", + "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", + "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", + "sass": "^1.3.0" + }, + "peerDependenciesMeta": { + "@opentelemetry/api": { + "optional": true + }, + "@playwright/test": { + "optional": true + }, + "babel-plugin-react-compiler": { + "optional": true + }, + "sass": { + "optional": true + } + } + }, + "node_modules/next/node_modules/postcss": { + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.6", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.2" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/pg": { + "version": "8.16.3", + "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz", + "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==", + "license": "MIT", + "dependencies": { + "pg-connection-string": "^2.9.1", + "pg-pool": "^3.10.1", + "pg-protocol": "^1.10.3", + "pg-types": "2.2.0", + "pgpass": "1.0.5" + }, + "engines": { + "node": ">= 16.0.0" + }, + "optionalDependencies": { + "pg-cloudflare": "^1.2.7" + }, + "peerDependencies": { + "pg-native": ">=3.0.1" + }, + "peerDependenciesMeta": { + "pg-native": { + "optional": true + } + } + }, + "node_modules/pg-cloudflare": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz", + "integrity": "sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==", + "license": "MIT", + "optional": true + }, + "node_modules/pg-connection-string": { + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz", + "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==", + "license": "MIT" + }, + "node_modules/pg-int8": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", + "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==", + "license": "ISC", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/pg-pool": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz", + "integrity": "sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==", + "license": "MIT", + "peerDependencies": { + "pg": ">=8.0" + } + }, + "node_modules/pg-protocol": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz", + "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==", + "license": "MIT" + }, + "node_modules/pg-types": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz", + "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==", + "license": "MIT", + "dependencies": { + "pg-int8": "1.0.1", + "postgres-array": "~2.0.0", + "postgres-bytea": "~1.0.0", + "postgres-date": "~1.0.4", + "postgres-interval": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/pgpass": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz", + "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==", + "license": "MIT", + "dependencies": { + "split2": "^4.1.0" + } + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" + }, + "node_modules/postcss": { + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", + "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.11", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/postgres-array": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", + "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/postgres-bytea": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz", + "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/postgres-date": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz", + "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/postgres-interval": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz", + "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==", + "license": "MIT", + "dependencies": { + "xtend": "^4.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react": { + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz", + "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-dom": { + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.0.tgz", + "integrity": "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==", + "license": "MIT", + "dependencies": { + "scheduler": "^0.26.0" + }, + "peerDependencies": { + "react": "^19.1.0" + } + }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "license": "MIT", + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, + "node_modules/scheduler": { + "version": "0.26.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz", + "integrity": "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==", + "license": "MIT" + }, + "node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "license": "ISC", + "optional": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/sharp": { + "version": "0.34.4", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.4.tgz", + "integrity": "sha512-FUH39xp3SBPnxWvd5iib1X8XY7J0K0X7d93sie9CJg2PO8/7gmg89Nve6OjItK53/MlAushNNxteBYfM6DEuoA==", + "hasInstallScript": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "@img/colour": "^1.0.0", + "detect-libc": "^2.1.0", + "semver": "^7.7.2" + }, + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-darwin-arm64": "0.34.4", + "@img/sharp-darwin-x64": "0.34.4", + "@img/sharp-libvips-darwin-arm64": "1.2.3", + "@img/sharp-libvips-darwin-x64": "1.2.3", + "@img/sharp-libvips-linux-arm": "1.2.3", + "@img/sharp-libvips-linux-arm64": "1.2.3", + "@img/sharp-libvips-linux-ppc64": "1.2.3", + "@img/sharp-libvips-linux-s390x": "1.2.3", + "@img/sharp-libvips-linux-x64": "1.2.3", + "@img/sharp-libvips-linuxmusl-arm64": "1.2.3", + "@img/sharp-libvips-linuxmusl-x64": "1.2.3", + "@img/sharp-linux-arm": "0.34.4", + "@img/sharp-linux-arm64": "0.34.4", + "@img/sharp-linux-ppc64": "0.34.4", + "@img/sharp-linux-s390x": "0.34.4", + "@img/sharp-linux-x64": "0.34.4", + "@img/sharp-linuxmusl-arm64": "0.34.4", + "@img/sharp-linuxmusl-x64": "0.34.4", + "@img/sharp-wasm32": "0.34.4", + "@img/sharp-win32-arm64": "0.34.4", + "@img/sharp-win32-ia32": "0.34.4", + "@img/sharp-win32-x64": "0.34.4" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/split2": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", + "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", + "license": "ISC", + "engines": { + "node": ">= 10.x" + } + }, + "node_modules/strnum": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.1.tgz", + "integrity": "sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT" + }, + "node_modules/styled-jsx": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.6.tgz", + "integrity": "sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==", + "license": "MIT", + "dependencies": { + "client-only": "0.0.1" + }, + "engines": { + "node": ">= 12.0.0" + }, + "peerDependencies": { + "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "babel-plugin-macros": { + "optional": true + } + } + }, + "node_modules/tailwindcss": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.13.tgz", + "integrity": "sha512-i+zidfmTqtwquj4hMEwdjshYYgMbOrPzb9a0M3ZgNa0JMoZeFC6bxZvO8yr8ozS6ix2SDz0+mvryPeBs2TFE+w==", + "dev": true, + "license": "MIT" + }, + "node_modules/tapable": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.3.tgz", + "integrity": "sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/tar": { + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", + "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@isaacs/fs-minipass": "^4.0.0", + "chownr": "^3.0.0", + "minipass": "^7.1.2", + "minizlib": "^3.0.1", + "mkdirp": "^3.0.1", + "yallist": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" + }, + "node_modules/typescript": { + "version": "5.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", + "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/undici-types": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "license": "MIT", + "engines": { + "node": ">=0.4" + } + }, + "node_modules/yallist": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } + } + } +} diff --git a/ui/src/lib/s3.ts b/ui/src/lib/s3.ts index 4b0263a..0d0cde7 100644 --- a/ui/src/lib/s3.ts +++ b/ui/src/lib/s3.ts @@ -59,7 +59,7 @@ async function getObjectContent(key: string): Promise { const response = await s3Client.send(command); const body = await response.Body?.transformToString(); return body || null; - } catch (error) { + } catch (_error) { return null; } } diff --git a/ui/tsconfig.json b/ui/tsconfig.json index d7e05e5..0f96f2a 100644 --- a/ui/tsconfig.json +++ b/ui/tsconfig.json @@ -11,7 +11,7 @@ "moduleResolution": "bundler", "resolveJsonModule": true, "isolatedModules": true, - "jsx": "preserve", + "jsx": "react-jsx", "incremental": true, "plugins": [ { @@ -22,6 +22,12 @@ "@/*": ["./src/*"] } }, - "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], + "include": [ + "next-env.d.ts", + "**/*.ts", + "**/*.tsx", + ".next/types/**/*.ts", + ".next/dev/types/**/*.ts" + ], "exclude": ["node_modules"] } From 603f6b202a29c62fcc6df534f3968459b074f844 Mon Sep 17 00:00:00 2001 From: William Law Date: Mon, 5 Jan 2026 14:51:11 -0500 Subject: [PATCH 095/117] chore: add metric for num in progress archive tasks (#127) --- .gitignore | 3 +++ crates/audit/src/archiver.rs | 2 ++ crates/audit/src/metrics.rs | 5 ++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f380f46..cd0eced 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ Thumbs.db # Claude /.claude /ui/.claude + +# e2e / load tests +wallets.json \ No newline at end of file diff --git a/crates/audit/src/archiver.rs b/crates/audit/src/archiver.rs index 1bd4f50..0626f60 100644 --- a/crates/audit/src/archiver.rs +++ b/crates/audit/src/archiver.rs @@ -50,6 +50,7 @@ where // TODO: the integration test breaks because Minio doesn't support etag let writer = self.writer.clone(); let metrics = self.metrics.clone(); + self.metrics.in_flight_archive_tasks.increment(1.0); tokio::spawn(async move { let archive_start = Instant::now(); if let Err(e) = writer.archive_event(event).await { @@ -60,6 +61,7 @@ where .record(archive_start.elapsed().as_secs_f64()); metrics.events_processed.increment(1); } + metrics.in_flight_archive_tasks.decrement(1.0); }); let commit_start = Instant::now(); diff --git a/crates/audit/src/metrics.rs b/crates/audit/src/metrics.rs index b12ac67..d178911 100644 --- a/crates/audit/src/metrics.rs +++ b/crates/audit/src/metrics.rs @@ -1,4 +1,4 @@ -use metrics::{Counter, Histogram}; +use metrics::{Counter, Gauge, Histogram}; use metrics_derive::Metrics; #[derive(Metrics, Clone)] @@ -33,4 +33,7 @@ pub struct Metrics { #[metric(describe = "Total S3 writes skipped due to dedup")] pub s3_writes_skipped: Counter, + + #[metric(describe = "Number of in-flight archive tasks")] + pub in_flight_archive_tasks: Gauge, } From 14b735715ffca4d34a24cf2d02208a7f6770c75c Mon Sep 17 00:00:00 2001 From: refcell Date: Mon, 5 Jan 2026 18:06:52 -0500 Subject: [PATCH 096/117] chore(workspace): Touchup Justfile (#124) * rm: justfile * add: Justfile * chore(workspace): touchup justfile Add aliases, comments, and proper recipe descriptions. Use npx to auto-install biome when needed instead of npm install. --- justfile => Justfile | 65 ++++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 26 deletions(-) rename justfile => Justfile (86%) diff --git a/justfile b/Justfile similarity index 86% rename from justfile rename to Justfile index fc8e8f3..c6a014a 100644 --- a/justfile +++ b/Justfile @@ -1,49 +1,52 @@ -### DEVELOPMENT COMMANDS ### +set positional-arguments + +alias f := fix +alias c := ci + +# Default to display help menu +default: + @just --list + +# Runs all ci checks ci: - # Rust cargo fmt --all -- --check cargo clippy -- -D warnings cargo build cargo test - # UI - cd ui && npm run lint + cd ui && npx --yes @biomejs/biome check . cd ui && npm run build +# Fixes formatting and clippy issues fix: - # Rust cargo fmt --all cargo clippy --fix --allow-dirty --allow-staged - # UI - cd ui && npx biome check --write --unsafe + cd ui && npx --yes @biomejs/biome check --write --unsafe . -sync: deps-reset - ### ENV ### - just sync-env - ### REFORMAT ### - just fix +# Resets dependencies and reformats code +sync: deps-reset sync-env fix +# Copies environment templates and adapts for docker sync-env: cp .env.example .env cp .env.example ./ui/.env cp .env.example .env.docker - # Change kafka ports sed -i '' 's/localhost:9092/host.docker.internal:9094/g' ./.env.docker - # Change other dependencies sed -i '' 's/localhost/host.docker.internal/g' ./.env.docker +# Stops and removes all docker containers and data stop-all: export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && docker compose down && docker compose rm && rm -rf data/ -# Start every service running in docker, useful for demos +# Starts all services in docker, useful for demos start-all: stop-all export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && mkdir -p data/kafka data/minio && docker compose build && docker compose up -d -# Start every service in docker, except the one you're currently working on. e.g. just start-except ui ingress-rpc +# Starts docker services except specified ones, e.g. just start-except ui ingress-rpc start-except programs: stop-all #!/bin/bash all_services=(kafka kafka-setup minio minio-setup ingress-rpc audit ui) exclude_services=({{ programs }}) - + # Create result array with services not in exclude list result_services=() for service in "${all_services[@]}"; do @@ -58,28 +61,34 @@ start-except programs: stop-all result_services+=("$service") fi done - + export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && mkdir -p data/kafka data/minio && docker compose build && docker compose up -d ${result_services[@]} -### RUN SERVICES ### +# Resets docker dependencies with clean data deps-reset: COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml docker compose down && docker compose rm && rm -rf data/ && mkdir -p data/kafka data/minio && docker compose up -d +# Restarts docker dependencies without data reset deps: COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml docker compose down && docker compose rm && docker compose up -d +# Runs the tips-audit service audit: cargo run --bin tips-audit +# Runs the tips-ingress-rpc service ingress-rpc: cargo run --bin tips-ingress-rpc +# Runs the tips-maintenance service maintenance: cargo run --bin tips-maintenance +# Runs the tips-ingress-writer service ingress-writer: cargo run --bin tips-ingress-writer +# Starts the UI development server ui: cd ui && yarn dev @@ -88,6 +97,13 @@ validator_url := "http://localhost:8549" builder_url := "http://localhost:2222" ingress_url := "http://localhost:8080" +sender := "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" +sender_key := "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d" + +backrunner := "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC" +backrunner_key := "0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a" + +# Queries block numbers from sequencer, validator, and builder get-blocks: echo "Sequencer" cast bn -r {{ sequencer_url }} @@ -96,12 +112,7 @@ get-blocks: echo "Builder" cast bn -r {{ builder_url }} -sender := "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" -sender_key := "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d" - -backrunner := "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC" -backrunner_key := "0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a" - +# Sends a test transaction through the ingress endpoint send-txn: #!/usr/bin/env bash set -euxo pipefail @@ -112,6 +123,7 @@ send-txn: cast receipt $hash -r {{ sequencer_url }} | grep status cast receipt $hash -r {{ builder_url }} | grep status +# Sends a transaction with a backrun bundle send-txn-with-backrun: #!/usr/bin/env bash set -euxo pipefail @@ -176,6 +188,7 @@ send-txn-with-backrun: echo "=== Backrun transaction (from backrunner) ===" cast receipt $backrun_hash_computed -r {{ sequencer_url }} | grep -E "(status|blockNumber|transactionIndex)" || echo "Backrun tx not found yet" +# Runs integration tests with infrastructure checks e2e: #!/bin/bash if ! INTEGRATION_TESTS=1 cargo test --package tips-system-tests --test integration_tests; then @@ -191,4 +204,4 @@ e2e: fi echo "═══════════════════════════════════════════════════════════════════" echo " ✅ Integration tests passed!" - echo "═══════════════════════════════════════════════════════════════════" \ No newline at end of file + echo "═══════════════════════════════════════════════════════════════════" From 23c1010ab99aaee4a67c4a2e5260a81ca5fa598b Mon Sep 17 00:00:00 2001 From: refcell Date: Mon, 5 Jan 2026 20:32:02 -0500 Subject: [PATCH 097/117] chore(workspace): manifest updates (#128) --- Cargo.lock | 405 ++------------------- Cargo.toml | 115 +++--- crates/account-abstraction-core/Cargo.toml | 30 +- crates/audit/Cargo.toml | 46 +-- crates/core/Cargo.toml | 31 +- crates/ingress-rpc/Cargo.toml | 40 +- crates/system-tests/Cargo.toml | 75 ++-- 7 files changed, 200 insertions(+), 542 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 948676b..841f683 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -444,7 +444,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cf1398cb33aacb139a960fa3d8cf8b1202079f320e77e952a0b95967bf7a9f" dependencies = [ "alloy-primitives", - "alloy-rpc-types-engine", "alloy-rpc-types-eth", "alloy-serde", "serde", @@ -487,8 +486,6 @@ dependencies = [ "derive_more", "ethereum_ssz", "ethereum_ssz_derive", - "jsonwebtoken", - "rand 0.8.5", "serde", "strum", ] @@ -549,7 +546,7 @@ dependencies = [ "async-trait", "auto_impl", "either", - "elliptic-curve 0.13.8", + "elliptic-curve", "k256", "thiserror 2.0.17", ] @@ -1174,8 +1171,6 @@ checksum = "96571e6996817bf3d58f6b569e4b9fd2e9d2fcf9f7424eed07b2ce9bb87535e5" dependencies = [ "aws-credential-types", "aws-runtime", - "aws-sdk-sso", - "aws-sdk-ssooidc", "aws-sdk-sts", "aws-smithy-async", "aws-smithy-http", @@ -1186,14 +1181,11 @@ dependencies = [ "aws-types", "bytes", "fastrand", - "hex", "http 1.4.0", - "ring", "time", "tokio", "tracing", "url", - "zeroize", ] [[package]] @@ -1289,50 +1281,6 @@ dependencies = [ "url", ] -[[package]] -name = "aws-sdk-sso" -version = "1.91.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee6402a36f27b52fe67661c6732d684b2635152b676aa2babbfb5204f99115d" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand", - "http 0.2.12", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sdk-ssooidc" -version = "1.93.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45a7f750bbd170ee3677671ad782d90b894548f4e4ae168302c57ec9de5cb3e" -dependencies = [ - "aws-credential-types", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand", - "http 0.2.12", - "regex-lite", - "tracing", -] - [[package]] name = "aws-sdk-sts" version = "1.95.0" @@ -1368,20 +1316,15 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "bytes", - "crypto-bigint 0.5.5", "form_urlencoded", "hex", "hmac", "http 0.2.12", "http 1.4.0", - "p256 0.11.1", "percent-encoding", - "ring", "sha2", - "subtle", "time", "tracing", - "zeroize", ] [[package]] @@ -1604,7 +1547,6 @@ checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8" dependencies = [ "axum-core", "bytes", - "form_urlencoded", "futures-util", "http 1.4.0", "http-body 1.0.1", @@ -1620,13 +1562,11 @@ dependencies = [ "serde_core", "serde_json", "serde_path_to_error", - "serde_urlencoded", "sync_wrapper", "tokio", "tower", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -1645,7 +1585,6 @@ dependencies = [ "sync_wrapper", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -1661,16 +1600,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cffb0e931875b666fc4fcb20fee52e9bbd1ef836fd9e9e04ec21555f9f85f7ef" dependencies = [ "fastrand", - "gloo-timers", "tokio", ] -[[package]] -name = "base16ct" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" - [[package]] name = "base16ct" version = "0.2.0" @@ -1705,24 +1637,6 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e050f626429857a27ddccb31e0aca21356bfa709c04041aefddac081a8f068a" -[[package]] -name = "bindgen" -version = "0.72.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" -dependencies = [ - "bitflags 2.10.0", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.111", -] - [[package]] name = "bit-set" version = "0.8.0" @@ -1946,15 +1860,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.4" @@ -1979,17 +1884,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" version = "4.5.53" @@ -2224,18 +2118,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" -[[package]] -name = "crypto-bigint" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" -dependencies = [ - "generic-array", - "rand_core 0.6.4", - "subtle", - "zeroize", -] - [[package]] name = "crypto-bigint" version = "0.5.5" @@ -2361,16 +2243,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" -[[package]] -name = "der" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid", - "zeroize", -] - [[package]] name = "der" version = "0.7.10" @@ -2503,31 +2375,19 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" -[[package]] -name = "ecdsa" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" -dependencies = [ - "der 0.6.1", - "elliptic-curve 0.12.3", - "rfc6979 0.3.1", - "signature 1.6.4", -] - [[package]] name = "ecdsa" version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der 0.7.10", + "der", "digest 0.10.7", - "elliptic-curve 0.13.8", - "rfc6979 0.4.0", + "elliptic-curve", + "rfc6979", "serdect", - "signature 2.2.0", - "spki 0.7.3", + "signature", + "spki", ] [[package]] @@ -2551,41 +2411,21 @@ dependencies = [ "serde", ] -[[package]] -name = "elliptic-curve" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" -dependencies = [ - "base16ct 0.1.1", - "crypto-bigint 0.4.9", - "der 0.6.1", - "digest 0.10.7", - "ff 0.12.1", - "generic-array", - "group 0.12.1", - "pkcs8 0.9.0", - "rand_core 0.6.4", - "sec1 0.3.0", - "subtle", - "zeroize", -] - [[package]] name = "elliptic-curve" version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ - "base16ct 0.2.0", - "crypto-bigint 0.5.5", + "base16ct", + "crypto-bigint", "digest 0.10.7", - "ff 0.13.1", + "ff", "generic-array", - "group 0.13.0", - "pkcs8 0.10.2", + "group", + "pkcs8", "rand_core 0.6.4", - "sec1 0.7.3", + "sec1", "serdect", "subtle", "zeroize", @@ -2738,16 +2578,6 @@ dependencies = [ "bytes", ] -[[package]] -name = "ff" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" -dependencies = [ - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "ff" version = "0.13.1" @@ -2987,18 +2817,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" -[[package]] -name = "gloo-timers" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "gmp-mpfr-sys" version = "1.6.8" @@ -3009,24 +2827,13 @@ dependencies = [ "windows-sys 0.60.2", ] -[[package]] -name = "group" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" -dependencies = [ - "ff 0.12.1", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "group" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff 0.13.1", + "ff", "rand_core 0.6.4", "subtle", ] @@ -3792,21 +3599,6 @@ dependencies = [ "thiserror 2.0.17", ] -[[package]] -name = "jsonwebtoken" -version = "9.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde" -dependencies = [ - "base64 0.22.1", - "js-sys", - "pem", - "ring", - "serde", - "serde_json", - "simple_asn1", -] - [[package]] name = "k256" version = "0.13.4" @@ -3814,8 +3606,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ "cfg-if", - "ecdsa 0.16.9", - "elliptic-curve 0.13.8", + "ecdsa", + "elliptic-curve", "once_cell", "serdect", "sha2", @@ -3852,16 +3644,6 @@ version = "0.2.178" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" -[[package]] -name = "libloading" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" -dependencies = [ - "cfg-if", - "windows-link", -] - [[package]] name = "libm" version = "0.2.15" @@ -4015,7 +3797,6 @@ dependencies = [ "base64 0.22.1", "http-body-util", "hyper 1.8.1", - "hyper-rustls 0.27.7", "hyper-util", "indexmap 2.12.1", "ipnet", @@ -4049,12 +3830,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.8.9" @@ -4139,23 +3914,13 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "nu-ansi-term" version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -4427,15 +4192,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" -[[package]] -name = "openssl-src" -version = "300.5.4+3.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507b3792995dae9b0df8a1c1e3771e8418b7c2d9f0baeba32e6fe8b06c7cb72" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.111" @@ -4444,7 +4200,6 @@ checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] @@ -4455,25 +4210,14 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e" -[[package]] -name = "p256" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" -dependencies = [ - "ecdsa 0.14.8", - "elliptic-curve 0.12.3", - "sha2", -] - [[package]] name = "p256" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "ecdsa 0.16.9", - "elliptic-curve 0.13.8", + "ecdsa", + "elliptic-curve", "primeorder", "sha2", ] @@ -4560,16 +4304,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pem" -version = "3.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" -dependencies = [ - "base64 0.22.1", - "serde_core", -] - [[package]] name = "percent-encoding" version = "2.3.2" @@ -4661,24 +4395,14 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs8" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" -dependencies = [ - "der 0.6.1", - "spki 0.6.0", -] - [[package]] name = "pkcs8" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.10", - "spki 0.7.3", + "der", + "spki", ] [[package]] @@ -4749,7 +4473,7 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ - "elliptic-curve 0.13.8", + "elliptic-curve", ] [[package]] @@ -5065,9 +4789,7 @@ dependencies = [ "libc", "libz-sys", "num_enum", - "openssl-sys", "pkg-config", - "zstd-sys", ] [[package]] @@ -6130,7 +5852,7 @@ dependencies = [ "c-kzg", "cfg-if", "k256", - "p256 0.13.2", + "p256", "revm-primitives", "ripemd", "rug", @@ -6162,17 +5884,6 @@ dependencies = [ "serde", ] -[[package]] -name = "rfc6979" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" -dependencies = [ - "crypto-bigint 0.4.9", - "hmac", - "zeroize", -] - [[package]] name = "rfc6979" version = "0.4.0" @@ -6530,30 +6241,16 @@ version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" -[[package]] -name = "sec1" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" -dependencies = [ - "base16ct 0.1.1", - "der 0.6.1", - "generic-array", - "pkcs8 0.9.0", - "subtle", - "zeroize", -] - [[package]] name = "sec1" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ - "base16ct 0.2.0", - "der 0.7.10", + "base16ct", + "der", "generic-array", - "pkcs8 0.10.2", + "pkcs8", "serdect", "subtle", "zeroize", @@ -6775,7 +6472,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177" dependencies = [ - "base16ct 0.2.0", + "base16ct", "serde", ] @@ -6870,16 +6567,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -dependencies = [ - "digest 0.10.7", - "rand_core 0.6.4", -] - [[package]] name = "signature" version = "2.2.0" @@ -6890,18 +6577,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "simple_asn1" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror 2.0.17", - "time", -] - [[package]] name = "siphasher" version = "1.0.1" @@ -6971,16 +6646,6 @@ dependencies = [ "sha1", ] -[[package]] -name = "spki" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" -dependencies = [ - "base64ct", - "der 0.6.1", -] - [[package]] name = "spki" version = "0.7.3" @@ -6988,7 +6653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der 0.7.10", + "der", ] [[package]] @@ -7589,7 +7254,6 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -7628,7 +7292,6 @@ version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -7665,17 +7328,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-serde" version = "0.2.0" @@ -7708,11 +7360,9 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec", "thread_local", "tracing", "tracing-core", - "tracing-log", "tracing-serde", ] @@ -8609,7 +8259,6 @@ version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ - "bindgen", "cc", "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index 90a7d44..09da831 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,68 +10,89 @@ repository = "https://github.com/base/tips" members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core", "crates/system-tests"] resolver = "2" +[workspace.lints.rust] +missing-debug-implementations = "warn" +missing-docs = "warn" +unreachable-pub = "warn" +unused-must-use = "deny" +rust-2018-idioms = "deny" +unnameable-types = "warn" + +[workspace.lints.rustdoc] +all = "warn" + +[workspace.lints.clippy] +all = { level = "warn", priority = -1 } +missing-const-for-fn = "warn" +use-self = "warn" +option-if-let-else = "warn" +redundant-clone = "warn" + [workspace.dependencies] -tips-audit = { path = "crates/audit" } +# local tips-core = { path = "crates/core" } +tips-audit = { path = "crates/audit" } tips-system-tests = { path = "crates/system-tests" } account-abstraction-core = { path = "crates/account-abstraction-core" } -# Reth +# reth reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } + +# revm +op-revm = { version = "12.0.0", default-features = false } +revm-context-interface = { version = "12.0.0", default-features = false } # alloy -alloy-primitives = { version = "1.4.1", default-features = false, features = [ - "map-foldhash", - "serde", -] } -alloy-consensus = { version = "1.0.41" } -alloy-provider = { version = "1.0.41" } -alloy-rpc-types = "1.1.2" -alloy-signer = { version = "1.0.41" } -alloy-network = { version = "1.0.41" } -alloy-serde = "1.0.41" +alloy-serde = { version = "1.0.41", default-features = false } +alloy-signer = { version = "1.0.41", default-features = false } +alloy-network = { version = "1.0.41", default-features = false } +alloy-provider = { version = "1.0.41", default-features = false } +alloy-consensus = { version = "1.0.41", default-features = false } alloy-sol-types = { version = "1.4.1", default-features = false } +alloy-rpc-types = { version = "1.1.2", default-features = false } +alloy-primitives = { version = "1.4.1", default-features = false } +alloy-signer-local = { version = "1.0.41", default-features = false } # op-alloy +op-alloy-flz = { version = "0.13.1", default-features = false } op-alloy-network = { version = "0.22.0", default-features = false } -op-alloy-consensus = { version = "0.22.0", features = ["k256", "serde"] } -op-alloy-rpc-types = { version = "0.22.0", default-features = true} -op-alloy-flz = { version = "0.13.1" } +op-alloy-rpc-types = { version = "0.22.0", default-features = false } +op-alloy-consensus = { version = "0.22.0", default-features = false } -tokio = { version = "1.47.1", features = ["full"] } -tracing = "0.1.41" -tracing-subscriber = { version = "0.3.20", features = ["env-filter", "json"] } -anyhow = "1.0.99" -clap = { version = "4.5.47", features = ["derive", "env"] } -url = "2.5.7" -uuid = { version = "1.18.1", features = ["v4", "serde"] } -serde = { version = "1.0.219", features = ["derive"] } +# tokio +tokio = { version = "1.47.1", default-features = false } + +# async async-trait = "0.1.89" -serde_json = "1.0.143" -dotenvy = "0.15.7" -testcontainers = { version = "0.23.1", features = ["blocking"] } -testcontainers-modules = { version = "0.11.2", features = ["postgres", "kafka", "minio"] } -jsonrpsee = { version = "0.26.0", features = ["server", "macros"] } -chrono = { version = "0.4.42", features = ["serde"] } -wiremock = "0.6.2" -axum = "0.8.3" -# Kafka and S3 dependencies -rdkafka = { version = "0.37.0", features = ["zstd", "ssl-vendored"] } -aws-config = "1.1.7" -aws-sdk-s3 = "1.106.0" -aws-credential-types = "1.1.7" -bytes = { version = "1.8.0", features = ["serde"] } +# rpc +jsonrpsee = { version = "0.26.0", default-features = false } -# tips-ingress -backon = "1.5.2" -op-revm = { version = "12.0.0", default-features = false } -revm-context-interface = "12.0.0" -alloy-signer-local = "1.0.41" +# kafka and s3 +bytes = { version = "1.8.0", default-features = false } +rdkafka = { version = "0.37.0", default-features = false } +aws-config = { version = "1.1.7", default-features = false } +aws-sdk-s3 = { version = "1.106.0", default-features = false } +aws-credential-types = { version = "1.1.7", default-features = false } -# Misc -metrics = "0.24.1" -metrics-derive = "0.1" -metrics-exporter-prometheus = { version = "0.17.0", features = ["http-listener"]} +# misc +url = { version = "2.5.7", default-features = false } +axum = { version = "0.8.3", default-features = false } +serde = { version = "1.0.219", default-features = false } +uuid = { version = "1.18.1", default-features = false } +clap = { version = "4.5.47", default-features = false } +backon = { version = "1.5.2", default-features = false } +chrono = { version = "0.4.42", default-features = false } +anyhow = { version = "1.0.99", default-features = false } +tracing = { version = "0.1.41", default-features = false } +wiremock = { version = "0.6.2", default-features = false } +dotenvy = { version = "0.15.7", default-features = false } +metrics = { version = "0.24.1", default-features = false } +metrics-derive = { version = "0.1", default-features = false } +serde_json = { version = "1.0.143", default-features = false } +testcontainers = { version = "0.23.1", default-features = false } +tracing-subscriber = { version = "0.3.20", default-features = false } +testcontainers-modules = { version = "0.11.2", default-features = false } +metrics-exporter-prometheus = { version = "0.17.0", default-features = false } diff --git a/crates/account-abstraction-core/Cargo.toml b/crates/account-abstraction-core/Cargo.toml index 132e374..41bbd9e 100644 --- a/crates/account-abstraction-core/Cargo.toml +++ b/crates/account-abstraction-core/Cargo.toml @@ -8,23 +8,23 @@ repository.workspace = true edition.workspace = true [dependencies] -alloy-serde = { version = "1.0.41", default-features = false } -serde.workspace = true -alloy-rpc-types.workspace = true -alloy-provider.workspace = true +tips-core.workspace = true +serde = { workspace = true, features = ["std", "derive"] } +tokio = { workspace = true, features = ["full"] } +tracing = { workspace = true, features = ["std"] } +anyhow = { workspace = true, features = ["std"] } +rdkafka = { workspace = true, features = ["tokio", "libz"] } +jsonrpsee = { workspace = true, features = ["server", "macros"] } +serde_json = { workspace = true, features = ["std"] } +async-trait.workspace = true +alloy-serde.workspace = true +alloy-sol-types.workspace = true +alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } +alloy-rpc-types = { workspace = true, features = ["eth"] } +alloy-provider = { workspace = true, features = ["reqwest"] } op-alloy-network.workspace = true -alloy-primitives = { workspace = true } reth-rpc-eth-types.workspace = true -tokio.workspace = true -jsonrpsee.workspace = true -async-trait = { workspace = true } -alloy-sol-types.workspace = true -anyhow.workspace = true -rdkafka.workspace = true -serde_json.workspace = true -tips-core.workspace = true -tracing.workspace = true [dev-dependencies] -alloy-primitives.workspace = true wiremock.workspace = true +alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } diff --git a/crates/audit/Cargo.toml b/crates/audit/Cargo.toml index 09892b8..7fe6873 100644 --- a/crates/audit/Cargo.toml +++ b/crates/audit/Cargo.toml @@ -13,28 +13,28 @@ path = "src/bin/main.rs" [dependencies] tips-core = { workspace = true, features = ["test-utils"] } -tokio = { workspace = true } -tracing = { workspace = true } -tracing-subscriber = { workspace = true } -anyhow = { workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } -uuid = { workspace = true } -async-trait = { workspace = true } -alloy-primitives = { workspace = true } -alloy-consensus = { workspace = true } -alloy-provider = { workspace = true } -op-alloy-consensus = { workspace = true } -clap = { workspace = true } -dotenvy = { workspace = true } -rdkafka = { workspace = true } -aws-config = { workspace = true } -aws-sdk-s3 = { workspace = true } -aws-credential-types = { workspace = true } -bytes = { workspace = true } -metrics = { workspace = true } -metrics-derive = { workspace = true } +bytes.workspace = true +metrics.workspace = true +dotenvy.workspace = true +async-trait.workspace = true +metrics-derive.workspace = true +alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } +tokio = { workspace = true, features = ["full"] } +serde = { workspace = true, features = ["std", "derive"] } +uuid = { workspace = true, features = ["v4", "serde"] } +tracing = { workspace = true, features = ["std"] } +anyhow = { workspace = true, features = ["std"] } +serde_json = { workspace = true, features = ["std"] } +rdkafka = { workspace = true, features = ["tokio", "libz"] } +alloy-consensus = { workspace = true, features = ["std"] } +alloy-provider = { workspace = true, features = ["reqwest"] } +op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } +clap = { version = "4.5.47", features = ["std", "derive", "env"] } +tracing-subscriber = { workspace = true, features = ["std", "fmt", "env-filter", "json"] } +aws-config = { workspace = true, features = ["default-https-client", "rt-tokio"] } +aws-sdk-s3 = { workspace = true, features = ["rustls", "default-https-client", "rt-tokio"] } +aws-credential-types.workspace = true [dev-dependencies] -testcontainers = { workspace = true } -testcontainers-modules = { workspace = true } \ No newline at end of file +testcontainers = { workspace = true, features = ["blocking"] } +testcontainers-modules = { workspace = true, features = ["postgres", "kafka", "minio"] } \ No newline at end of file diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index bd7f06d..6657e7b 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -11,23 +11,22 @@ edition.workspace = true test-utils = ["dep:alloy-signer-local", "dep:op-alloy-rpc-types"] [dependencies] -uuid.workspace = true -alloy-primitives.workspace = true -alloy-consensus.workspace = true -alloy-provider.workspace = true -op-alloy-consensus.workspace = true -alloy-serde = { version = "1.0.41", default-features = false } -alloy-signer-local = { workspace = true, optional = true } -op-alloy-rpc-types = { workspace = true, optional = true } -tracing.workspace = true -tracing-subscriber.workspace = true +serde = { workspace = true, features = ["std", "derive"] } +uuid = { workspace = true, features = ["v4", "serde"] } +tracing = { workspace = true, features = ["std"] } op-alloy-flz.workspace = true -serde.workspace = true -alloy-rpc-types.workspace = true -metrics-exporter-prometheus.workspace = true - +alloy-serde.workspace = true +alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } +alloy-consensus = { workspace = true, features = ["std"] } +alloy-rpc-types = { workspace = true, features = ["eth"] } +alloy-provider = { workspace = true, features = ["reqwest"] } +op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } +alloy-signer-local = { workspace = true, optional = true } +op-alloy-rpc-types = { workspace = true, features = ["std"], optional = true } +tracing-subscriber = { workspace = true, features = ["std", "fmt", "ansi", "env-filter", "json"] } +metrics-exporter-prometheus = { workspace = true, features = ["http-listener"] } [dev-dependencies] alloy-signer-local.workspace = true -op-alloy-rpc-types.workspace = true -serde_json.workspace = true +serde_json = { workspace = true, features = ["std"] } +op-alloy-rpc-types = { workspace = true, features = ["std"] } diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index 813754b..4ce5ee8 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -15,31 +15,31 @@ path = "src/bin/main.rs" tips-core.workspace = true tips-audit.workspace = true account-abstraction-core.workspace = true -jsonrpsee.workspace = true -alloy-primitives.workspace = true -op-alloy-network.workspace = true -alloy-provider.workspace = true -tokio.workspace = true -tracing.workspace = true -anyhow.workspace = true -clap.workspace = true url.workspace = true -alloy-consensus.workspace = true -op-alloy-consensus.workspace = true +metrics.workspace = true dotenvy.workspace = true -rdkafka.workspace = true -reth-rpc-eth-types.workspace = true -serde_json.workspace = true -async-trait.workspace = true -backon.workspace = true op-revm.workspace = true +async-trait.workspace = true +metrics-derive.workspace = true +alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } alloy-signer-local.workspace = true +op-alloy-network.workspace = true reth-optimism-evm.workspace = true -metrics.workspace = true -metrics-derive.workspace = true -axum.workspace = true +reth-rpc-eth-types.workspace = true +tokio = { workspace = true, features = ["full"] } +tracing = { workspace = true, features = ["std"] } +anyhow = { workspace = true, features = ["std"] } +serde_json = { workspace = true, features = ["std"] } +axum = { workspace = true, features = ["tokio", "http1", "json"] } +rdkafka = { workspace = true, features = ["tokio", "libz"] } +backon = { workspace = true, features = ["std", "tokio-sleep"] } +jsonrpsee = { workspace = true, features = ["server", "macros"] } +alloy-consensus = { workspace = true, features = ["std"] } +alloy-provider = { workspace = true, features = ["reqwest"] } +op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } +clap = { version = "4.5.47", features = ["std", "derive", "env"] } [dev-dependencies] wiremock.workspace = true -jsonrpsee = { workspace = true, features = ["server", "http-client", "macros"] } -mockall = "0.13" \ No newline at end of file +mockall = "0.13" +jsonrpsee = { workspace = true, features = ["server", "http-client", "macros"] } \ No newline at end of file diff --git a/crates/system-tests/Cargo.toml b/crates/system-tests/Cargo.toml index 95d99dd..072a3b5 100644 --- a/crates/system-tests/Cargo.toml +++ b/crates/system-tests/Cargo.toml @@ -9,54 +9,43 @@ license.workspace = true path = "src/lib.rs" [dependencies] -tips-audit = { workspace = true } -tips-core = { workspace = true } +tips-core.workspace = true +tips-audit.workspace = true tips-ingress-rpc = { path = "../ingress-rpc" } - -alloy-primitives = { workspace = true } -alloy-provider = { workspace = true } -alloy-signer-local = { workspace = true } -alloy-consensus = { workspace = true } -alloy-network = { workspace = true } - -op-alloy-network = { workspace = true } -op-alloy-consensus = { workspace = true } - -tokio = { workspace = true } -async-trait = { workspace = true } - -aws-sdk-s3 = { workspace = true } -aws-config = { workspace = true } -aws-credential-types = { workspace = true } - -rdkafka = { workspace = true } - -serde = { workspace = true } -serde_json = { workspace = true } - -anyhow = { workspace = true } - -uuid = { workspace = true } -tracing = { workspace = true } -tracing-subscriber = { workspace = true } -url = { workspace = true } - -reqwest = { version = "0.12.12", features = ["json"] } -bytes = { workspace = true } +url.workspace = true +bytes.workspace = true +op-revm.workspace = true +async-trait.workspace = true +alloy-network.workspace = true +alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } +alloy-signer-local.workspace = true +op-alloy-network.workspace = true +aws-credential-types.workspace = true hex = "0.4.3" -jsonrpsee = { workspace = true } -op-revm = { workspace = true } - -# Load test dependencies -clap = { version = "4.5", features = ["derive", "env"] } -indicatif = "0.17" rand = "0.8" -rand_chacha = "0.3" dashmap = "6.0" +indicatif = "0.17" +rand_chacha = "0.3" +tokio = { workspace = true, features = ["full"] } +serde = { workspace = true, features = ["std", "derive"] } +uuid = { workspace = true, features = ["v4", "serde"] } +tracing = { workspace = true, features = ["std"] } +anyhow = { workspace = true, features = ["std"] } +serde_json = { workspace = true, features = ["std"] } +rdkafka = { workspace = true, features = ["tokio", "libz"] } +jsonrpsee = { workspace = true, features = ["server", "macros"] } +alloy-consensus = { workspace = true, features = ["std"] } +alloy-provider = { workspace = true, features = ["reqwest"] } +op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } +reqwest = { version = "0.12.12", features = ["json"] } +clap = { version = "4.5", features = ["std", "derive", "env"] } +tracing-subscriber = { workspace = true, features = ["std", "fmt", "env-filter", "json"] } +aws-config = { workspace = true, features = ["default-https-client", "rt-tokio"] } +aws-sdk-s3 = { workspace = true, features = ["rustls", "default-https-client", "rt-tokio"] } [dev-dependencies] -tokio = { workspace = true, features = ["test-util"] } -testcontainers = { workspace = true } -testcontainers-modules = { workspace = true } serial_test = "3" +tokio = { workspace = true, features = ["full", "test-util"] } +testcontainers = { workspace = true, features = ["blocking"] } +testcontainers-modules = { workspace = true, features = ["postgres", "kafka", "minio"] } From 40db340e5af6d16ad94e7a46cf035d13564b1de9 Mon Sep 17 00:00:00 2001 From: refcell Date: Mon, 5 Jan 2026 20:37:58 -0500 Subject: [PATCH 098/117] chore(workspace): cleanup docs :memo: (#126) --- README.md | 4 +- SETUP.md | 137 ------------ .../Base Account Pull Request Guidelines.md | 172 --------------- context/Mini TDD - TIPS 4337 Bundler .docx | Bin 306862 -> 0 bytes docs/API.md | 113 +++++----- docs/AUDIT_S3_FORMAT.md | 197 ++++++++++-------- docs/BUNDLE_STATES.md | 88 ++++---- docs/ERC4337_BUNDLER.md | 104 +++++++++ docs/PULL_REQUEST_GUIDELINES.md | 93 +++++++++ docs/SETUP.md | 117 +++++++++++ 10 files changed, 524 insertions(+), 501 deletions(-) delete mode 100644 SETUP.md delete mode 100644 context/Base Account Pull Request Guidelines.md delete mode 100644 context/Mini TDD - TIPS 4337 Bundler .docx create mode 100644 docs/ERC4337_BUNDLER.md create mode 100644 docs/PULL_REQUEST_GUIDELINES.md create mode 100644 docs/SETUP.md diff --git a/README.md b/README.md index 2dae6fe..7733a53 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,6 @@ The main entry point that provides a JSON-RPC API for receiving transactions and ### 🖥️ UI (`ui`) A debug UI for viewing the state of the bundle store and S3. -## Running TIPS locally +## Local Development -See the [setup instructions](./SETUP.md) for how to run the TIPS system locally. +See the [setup instructions](./docs/SETUP.md) for how to run TIPS locally. diff --git a/SETUP.md b/SETUP.md deleted file mode 100644 index 8af0129..0000000 --- a/SETUP.md +++ /dev/null @@ -1,137 +0,0 @@ -# TIPS Local Development Setup - -This guide walks you through setting up and running TIPS locally with all required dependencies. - -## Prerequisites - -- Docker and Docker Compose -- Rust (latest stable) -- Go (1.21+) -- Just command runner (`cargo install just`) -- Git - -## Step 1: Clone Required Repositories - -Clone the three repositories you'll need: - -```bash -# Clone TIPS (this repository) -git clone https://github.com/base/tips.git - -# Clone builder-playground in a separate directory -git clone https://github.com/flashbots/builder-playground.git -cd builder-playground -git remote add danyal git@github.com:danyalprout/builder-playground.git # TODO: change this once it's upstreamed -git checkout danyal/base-overlay - -# Clone op-rbuilder in a separate directory -git clone https://github.com/base/op-rbuilder.git -cd op-rbuilder -``` - -## Step 2: Start TIPS Infrastructure - -```bash -cd tips - -# Sync (and load env vars) and start all TIPS services -just sync -just start-all -``` - -This will: -- Reset and start Docker containers (Kafka, MinIO, node-reth services) -- Start the TIPS ingress RPC service -- Start the audit service -- Start the bundle pool service -- Start the UI - -## Step 3: Start builder-playground - -The builder-playground provides the L1/L2 blockchain infrastructure. - -```bash -cd builder-playground - -# Start the playground -go run main.go cook opstack --external-builder http://host.docker.internal:4444/ --enable-latest-fork 0 --flashblocks --base-overlay --flashblocks-builder ws://host.docker.internal:1111/ws -``` - -Keep this terminal running. The playground will: -- Start L1 and L2 nodes -- Provide blockchain infrastructure for TIPS -- Expose services on various ports - -## Step 4: Start op-rbuilder - -The op-rbuilder handles block building for the L2. - -```bash -cd op-rbuilder - -# Start the builder (ensure you're on tips-prototype branch) -just run-playground -``` - -Keep this terminal running. The builder will: -- Connect to the builder-playground infrastructure -- Handle block building requests -- Expose builder API on port 4444 - -## Step 5: Access the UI and send a test transaction - -Once everything is running, you can test the system: - -```bash -cd tips - -# Send a test transaction -just send-txn -``` - -This will: -- Submit a transaction bundle to TIPS -- Process it through the ingress → audit → bundle pool pipeline -- Send it to the builder for inclusion in blocks - -## Ports Reference - -| Service | Port | Description | -|---------|------|-------------| -| TIPS Ingress RPC | 8080 | Main RPC endpoint for bundle submission | -| TIPS UI | 3000 | Web interface | -| MinIO Console | 7001 | Object storage UI | -| MinIO API | 7000 | Object storage API | -| Kafka | 9092 | Message broker | -| op-rbuilder | 4444 | Block builder API | -| builder-playground | Various | L1/L2 blockchain infrastructure | - -If you want to get information regarding the sequencer, validator, and builder, you can run: - -```bash -just get-blocks -``` - -## Development Workflow - -For active development: - -1. Keep builder-playground and op-rbuilder running -2. Use `just start-all` to restart TIPS services after code changes -3. Use `just send-txn` to test transaction flow -4. Monitor logs with `docker logs -f ` -5. Access TIPS UI at http://localhost:3000 for debugging - -## Stopping Services - -To stop everything: - -```bash -# Stop TIPS services -cd tips -just stop-all - -# Stop op-rbuilder (Ctrl+C in terminal) - -# Stop builder-playground (Ctrl+C in terminal) -``` diff --git a/context/Base Account Pull Request Guidelines.md b/context/Base Account Pull Request Guidelines.md deleted file mode 100644 index 2f9e6e9..0000000 --- a/context/Base Account Pull Request Guidelines.md +++ /dev/null @@ -1,172 +0,0 @@ -# Base Account Pull Request Guidelines - -Status **Living** -Updated Jun 16, 2025 -Created Oct 20, 2024 - -[Overview](#overview) - -[Why](#why) - -[SLA](#sla) - -[Success Metrics](#success-metrics) - -[Guidelines](#guidelines) - -[Authoring](#authoring) - -[Reviewing](#reviewing) - -[Owning a Codebase](#owning-a-codebase) - -[Appendix](#appendix) - -[FAQ](#faq) - -[Resources](#resources) - -[Notes](#notes) - -# Overview {#overview} - -*“Honesty in small things is not a small thing.”* - -- *Robert C. Martin, Clean Code: A Handbook of Agile Software Craftsmanship* - -PRs are the lifeline of the team. It’s what allows us to ship value, decides our future in terms of maintenance cost, and has a high impact on our daily QOL. When code is well-maintained and untangled, velocity is sustained. - -This document lays out SLAs, guidelines, and how we think about pull requests as a world-class engineering team. - -## Why {#why} - -Having a quality pull request process allows us to build with sustained velocity and deliver improvements and features to our users. - -Pull requests allow us to: - -* **Hold and improve the bar on quality:** we can catch bugs and architectural code smells early, before these have reached QA or users -* **Build a championship team and mentor top talent**: by knowledge-sharing through clear descriptions and deep, thoughtful reviews, this will help our team become stronger -* **Stay customer focused with repeatable innovation:** by keeping the PRs tight and decoupled, this will allow us to consistently ship (or roll back) incremental improvements to our customers -* **Encourage ownership:** by having clear ownership around domains, this will motivate authors and reviewers to hold the quality high, allowing for the codebase to be malleable to fit the business needs while reducing incidents and bugs - -As engineers, pull requests are a key part of our day-to-day life, whether it’s authoring or reviewing them. By holding a high bar, it will also improve our daily quality of life. - -## SLA {#sla} - -| Name | SLA | Why | -| :---- | :---- | :---- | -| **PR Review** | Reviewed within half a working day | Pull requests are encouraged to be reviewed within half a working day. If they take longer than 1 working day, likely, something needs to be improved. | - -## Success Metrics {#success-metrics} - -| Metric | Why | -| :---- | :---- | -| **Time to PR Review** | Getting a review quickly and swiftly is one of the fastest ways to get unblocked. By having fast reviews, it powers the flywheel of shared context → quality code → maintainable codebase → iteration. | -| **Time from PR Open to Production** | Getting code merged is one thing. Getting it deployed is how it gets in front of customers. | -| **\# of Incidents** | By having a quality author and review process, errors should be caught during the pull request process. | -| **\# of QA regression bugs** | By having a quality author and review process, errors should be caught during the pull request process. | - -# Guidelines {#guidelines} - -## Authoring {#authoring} - -* **PRs should be tight.** This allows for teammates to review deeply and thoroughly. PRs should either make deep changes (creating two new functions) or a shallow change across a breadth of files (renaming a function). - - * PRs should be \<500 LOC. This is a guideline. There may be PRs which may be higher LOC (eg: if it’s auto-generated, boilerplate, or scaffolding). There also may be PRs which are 1-2 lines. - - * PRs should touch \<10 files. This is a guideline. If the PR is focused on renaming across a codebase, it could be 30+ files, but with minimal or no other business logic change. - -* **PRs should be well-described.** This allows for teammates to understand the problem and what the PR sets out to do. Importantly, it also allows for verification of the code and is well-documented for posterity. - -* **PRs should be well-tested.** Any change in code will impact flows. These flows should be well-tested. These can be manually tested and unit tested. Additionally, a QA regression test could be added. - -* **Consider who the reviewers are.** Reviewers are ideally owners of the codebase and/or those with deep knowledge of the domain. By reaching out and finding dedicated reviewers early in the process, it also gives a heads up to the reviewers, allowing them to schedule and prioritize reviews. - -* **Budget time for reviews.** Allow the reviewers time to comment and suggest. Even more importantly, allow there to be time to make improvements. Code is written once, but read much more times. - -* **Consider hosting a synchronous, live review.** Sometimes, it’s easier to communicate live with the reviewers to align (or disagree and commit). Please work the alignment back into the PR for posterity. - -* **Examples:** - - * [https://github.cbhq.net/wallet/wallet-mobile/pull/27738](https://github.cbhq.net/wallet/wallet-mobile/pull/27738) - * [https://github.cbhq.net/wallet/wallet-mobile/pull/26092](https://github.cbhq.net/wallet/wallet-mobile/pull/26092) - -## Reviewing {#reviewing} - -* **PRs should be reviewed within half a day.** This is one of the things worth prioritizing for teammates as it generates a flywheel to improve velocity and knowledge-sharing. At the same time, PRs should be relatively easy to review, given the description, self-review, and code quality. - -* **PRs should be reviewed in detail.** No rubber stamping. - -## Owning a Codebase {#owning-a-codebase} - -**Unit Test** -[Base Wallet Unit Test + Lint SLAs](https://docs.google.com/document/u/0/d/1Ai3UDVDR3Hq1P-smfaeuclxDMQYSJjwlAPFyERraJCI/edit) - -**Unit Test Thresholds** -The owners should decide on unit test thresholds. These thresholds should reflect the appropriate LOE and risk for the business given what code is responsible for. - -**Conventions** -The team should have consensus on conventions, or lack of. Ideally, conventions are automated or linted. Else, they should be documented. - -# Appendix {#appendix} - -## FAQ {#faq} - -**There is a tight timeline and it’s easier to get everything into 1 humongous PR. Can we make an exception?** -Short answer: yes, we can always make an exception. There is no hard and fast rule. If there are humongous PRs, I’d recommend having a retro on it to see what could have been done differently. - -**When should we, as authors, seek out reviewers?** -Short answer: as early as possible. This can differ based on the type of work. - -If there is an artifact (PPS/TDD), the reviewers of the artifact likely should also be pull request reviewers. Transitively, reviewers of the pull requests should be reviewers of the artifact. - -## Resources {#resources} - -* [\[Code Red\] Bar Raiser Code Review Program](https://docs.google.com/document/d/1bzYI2gdnNZI9MqvHyTrD7aZRUfrakVedLRe2gw8b114/edit?tab=t.0#heading=h.ismr2neqrl10) -* [Wallet Pull Request Guild (PRG) Readout](https://docs.google.com/document/u/0/d/1nyE26o9DwQnTstJBrwMYgr6qdQPe71YrluzyiMOU89A/edit) - -## Notes {#notes} - -Oct 24, 2024 - -Questions - -* What are our actual problems with our current code and review process? - * Breaking ERC specs - * Break spec on eth request accounts for Pano - * Documentation may have solved this - * Additional parameter on connection - * Time to review is longer than ideal - * Observation: authors repost requesting reviews in Slack - * Hypotheses - * Lack of context - * Lack of ownership -* Does having people not labeled as “Bar Raiser” set the wrong culture? - * Do we want a culture where some people can absolve themselves of the responsibility to raise the bar? -* Regardless of bar-raisers, we could take it down one level. What do we care about? -* [Wallet Pull Request Guild (PRG) Readout](https://docs.google.com/document/u/0/d/1nyE26o9DwQnTstJBrwMYgr6qdQPe71YrluzyiMOU89A/edit) -* Less in-flight projects -* Implement code owners - -\> Bar Raisers for a given component or system are a subset of the broader owning team, typically consisting of more experienced engineers. For repositories or subdirectories with Bar Raisers, PRs must be either authored by a Bar Raiser or receive approval from one before merging. All existing review and merge rules still apply in addition to the Bar Raiser requirement. - -Domains - -* Transaction / Signing: [Cody Crozier](mailto:cody.crozier@coinbase.com), [Lukas Rosario](mailto:lukas.rosario@coinbase.com), [Arjun Dureja](mailto:arjun.dureja@coinbase.com) -* Sessions: [Spencer Stock](mailto:spencer.stock@coinbase.com), [Jake Feldman](mailto:jake.feldman@coinbase.com), [Felix Zhang](mailto:felix.zhang@coinbase.com) -* SDK: [Felix Zhang](mailto:felix.zhang@coinbase.com), [Jake Feldman](mailto:jake.feldman@coinbase.com), [Spencer Stock](mailto:spencer.stock@coinbase.com), [Conner Swenberg](mailto:conner.swenberg@coinbase.com) -* BE: [Sam Luo](mailto:sam.luo@coinbase.com), [Adam Hodges](mailto:adam.hodges@coinbase.com) -* Smart contracts: [Amie Corso](mailto:amie.corso@coinbase.com), [Conner Swenberg](mailto:conner.swenberg@coinbase.com) -* Infra: ? - -Proposal - -* Opt-in ✅ -* Everyone should maintain code and hold a high bar (be a bar raiser) ✅ -* Further discussion - * What it means to be a PR reviewer - * What improvements we can make - * Faster PR reviews - * Higher quality -* Breaking ERC specs (retro this) -* Other ways we can raise the bar \ No newline at end of file diff --git a/context/Mini TDD - TIPS 4337 Bundler .docx b/context/Mini TDD - TIPS 4337 Bundler .docx deleted file mode 100644 index e41bf4d517fc7e5d80e1774183bfad340068e417..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306862 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

    P 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⪼gur22o-ayr4tT<7=!_bfa746I!U4TYky@RS_N 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%0D1yL!zE{$mxcnsU<|vh|L)9@ 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 z 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%0DoO7-Y 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

    ^ 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 z

    lVqchJmm`$=t4tc04jErQ_MFR<$%vhpzOjnnQp!e+it~$qCP%2?vO1S|eSJ`;e zQQu?`sqg*)WVEX#j;4_gyLT^xxJ7*<0ARAs>P4A#==FRHgWj>fZ_^%&nAQ1XG@yMG zwm2EP`9+cgf~uT8ukXwaxP7Kk{|v@=a^4ndf$`$@3eRcKNaFJp_q>{B%~Id{klpvB z#`)|Ht=+4SqPZ2f=RYw^*tPMzn|^nBbDu9lD35s7aon=H`>%RWH8u@u{4AttD^|^Fpn5D{Uih5$-;to~_QU8v1iS-)$$~n?2 z8R%L)-Y*i2ruj++N2iq%XIws;OPo%Z(*T?CUlH^vUs=t+{^?u8#7Y2^0J5$ZU9s@|Zeo*k6T5XA!ZKe49@Xi93KxLlDhBagD;8vg z_NR%@Dl|zlm{zn!sxA#a6^LDVa_uZ?GX|;LJS~XRjf!14gHUdaKfQlQ>RJW0T$Y7c zQ(;kC5^845?Lo4j-oQ+Z8DFtDDmRmV`z@M7VWrb(p~p5oQ+GbOg!c9;(P-QX1XVbY zTd3U*kDbSYd5?g4Wp&{0oHPMLWCejV?W#W1trRKygbDM2GWK;r86 z0D$fgi(km`SE)R5u1#+g#nT75R39KqC59Awby!OW?`=smXab(i-Qis$8Qj_d@oQ$D z_-!aF0M6GdGzJcoGL!^4#n%6fBlGg1Jr9Lg`o!~a#O0mMl~8;TDXGdD7};X>O-HlC zi~Uwi<1;zw*4p_9pDRTw=g$G-g$*HVcGSAtU5p#?$GRrzKz`&NXxeq=tY9gGHP+_Y z2Tv3O3CqaScVYuCW+^}D88|~E+xmg(yN(k6eCpZes)BUf%%oHNvj}=bex;s^4uNCL zdKYy%p{8|e3VQx7_PzDCkr@8zw9a$Xj30X6K5S*|d)HifdHnj`QnD|we~rFrx+x#! z{b|{4b~C8P0reK3Cji8OO5`%* z5*nvyz5D=5ru#!>b{$!|Y!Gi#IRl&BgpzrO9mkAqZ{xB+R^o{xJsd0R9MesOLcH)! zoA;gJJ2=~lsqKy1G0#Bfoij?mkiL|?8^mzMmhl?s^MC>%6jZ-Kp~=s^Z7cm;pNwVO zm~rmaaG!v4`poS^V3r#UxC>V;ei`^n@OIn)C5HDInV zEax8b%r(%zg7CpGkRRf|SXTMga!1O?VBdAtY;Q_(+ zUV#F3iatK~-LoGoPFP90^X%8!Qk=%XM0?~FOCR0|r!@UW4%2H}tFs-{3&^6SNn|?9 z5hB5?1$NbMYm*)P`Ft9U%TvU1*mC53vFm-E39S@M-VCAS>Y;2 zH=pg&!8=DV2z?rdiT8e8OPZ^{J6Bb2W=-BvFx2h-5yk%*OsRvOnbz)CI#gYge2D(~ z(IWDx&)mVS2-QjPZ)96x_C7;$b#4VNgVom6pJp7?L_j_@JVR8f?*o0&Z(GI0rG7qs zb`;ZJU;T=N9*^TpVWaS*x8@m!dg1DXjji`S(BafL*6mo-jBPckru;o4r}$9kMN1hN zToSI?UR?IK1(Q>!u4I`0lKlD4g1?gng$QGv!BVa2}v&X-W8`l(V{Fw7Bzb7S{@N+5aDtn6CjYY>5vQm{v9Eh(;T*i6ib zw@7n?`A>BA?5&(6f;Peid2`7Lx*TSBG9+?o5hDvfhae!Q-;ge&^4nX2j>?_{Q@5N^ zO=>90Zyg%}ds`eL_4J6K4cXoFsx3_Ha}8F}T}D3n^J2EO;?JyFSeksTT4=(uUp>Ef zidigelAg$h-lJt;GKqUE#h@kZF-ucVnY_A47Ge#B?FtO6xTWV6GffhN9z9s*vU@ZU$E|d_S$lXKIvTS%X1mU z-7VzI$N`9t?6URSsL6HxXjkVr4vJoYiSAi%)iPZhMV~GGw%>68S~c1;%%s>xwx

  • Xgrn*5n9 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

    @iP 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

    )uh33KVSk0QPj073C*#XM|fTr`{8KH)s` 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 z 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%0D9I-yZ&n=CL2#ZjMlo`1|Fz18Q6?t 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 CjT;{T diff --git a/docs/API.md b/docs/API.md index bb6df4c..fc83613 100644 --- a/docs/API.md +++ b/docs/API.md @@ -1,80 +1,75 @@ -# API +# API Reference -## Overview +TIPS processes all transactions as bundles. Transactions submitted via `eth_sendRawTransaction` are wrapped into a single-transaction bundle with sensible defaults. -TIPS only processes bundles. Transactions sent via `eth_sendRawTransaction` are wrapped into a bundle (see: [EthSendBundle](https://github.com/alloy-rs/alloy/blob/25019adf54272a3372d75c6c44a6185e4be9dfa2/crates/rpc-types-mev/src/eth_calls.rs#L252)) -with a single transaction and sensible defaults. +## Bundle Identifiers -Bundles can be identified in two ways: -- Bundle UUID: Generated server-side on submission of a new bundle, globally unique -- Bundle Hash: `keccak(..bundle.txns)`, unique per set of transactions +Bundles have two identifiers: +- **UUID**: Server-generated unique identifier assigned on submission +- **Bundle Hash**: `keccak(..bundle.txns)`, derived from the transaction set + +## Bundle Lifecycle + +### Creation + +Bundles are deduplicated by bundle hash. When multiple bundles share the same hash, the latest submission defines the bundle fields: -### Bundle Creates -Any bundle that's created as part of TIPS, will be deduplicated by bundle hash in the TIPS bundle store with the latest bundle -defining the fields. For example: ``` -Multiple Bundles inserted in the order of A, B, C, D +bundleA = (txA) → store: {bundleA} +bundleB = (txA, txB) → store: {bundleA, bundleB} +bundleC = (txA, txB) → store: {bundleA, bundleC} # replaces bundleB +bundleD = (txC, txA) → store: {bundleA, bundleC, bundleD} +``` + +### Updates -# Single bundle transction -bundleA = (txA) -bundleStore = {bundleA} +Bundles can be updated via: +- `eth_sendRawTransaction`: matches by (address, nonce) +- `eth_sendBundle`: matches by UUID -# Bundle with overlapping transactions -bundleB = (txA, txB) -bundleStore = {bundleA, bundleB} +Updates are best-effort. If a bundle is already included in a flashblock before the update processes, the original bundle will be used. -# Bundle with identical bundle hash -bundleC = (txA, txB) -bundleStore = {bundleA, bundleC} +### Cancellation -# Bundle with overlapping transactions -bundleD = (txC, txA) -bundleStore = {bundleA, bundleC, bundleD} +Cancel bundles with `eth_cancelBundle`. Cancellations are best-effort and may not take effect if the bundle is already included. + +## RPC Methods + +### eth_sendRawTransaction + +``` +eth_sendRawTransaction(bytes) → hash ``` -### Bundle Updates -There are two ways bundles can be updated, either via `eth_sendRawTransaction` (address, nonce) or `eth_sendBundle` (UUID), see below for more details. +Validates and wraps the transaction in a bundle. Replacement transactions (same address and nonce) replace the existing bundle. + +**Limits:** +- 25 million gas per transaction + +### eth_sendBundle -Bundle updates are **best effort**. For example: ``` -bundleA = createBundle(txA) -# In parrallel -includedByBuilder(bundleA) # bundleA is included in the current Flashblock -updateBundle(bundleA, [txB, txC]) # bundleA is updated to bundleA` -# Bundle A will have been removed from the bundle store +eth_sendBundle(EthSendBundle) → uuid ``` -### Bundle Cancellation: -Bundles can be cancelled via `eth_cancelBundle`. Similar to bundle updates, cancellations are processed as **best effort**. +Submits a bundle directly. Without a replacement UUID, inserts a new bundle (merging with existing bundles sharing the same hash). With a UUID, updates the existing bundle if it still exists. -## RPC Methods +**Limits:** +- 25 million gas per bundle +- Maximum 3 transactions per bundle +- All transaction hashes must be in `reverting_tx_hashes` (revert protection not supported) +- `dropping_tx_hashes` must be empty +- Refunds not supported (`refund_percent`, `refund_recipient`, `refund_tx_hashes` must be unset/empty) +- `extra_fields` must be empty -### eth_sendRawTransaction(Bytes) -> Hash -Transactions provided to this endpoint, are validated and then wrapped in a bundle (with defaults) and added to the bundle store. -Previously submitted transactions can be replaced by submitting a new transaction from the same address and nonce. These will -replace bundles with the same bundle hash submitted via this endpoint or `eth_sendBundle`. +**Reference:** [EthSendBundle](https://github.com/alloy-rs/alloy/blob/25019adf54272a3372d75c6c44a6185e4be9dfa2/crates/rpc-types-mev/src/eth_calls.rs#L252) -**Limitations:** -- 25 million gas per transaction +### eth_cancelBundle -### eth_sendBundle([EthSendBundle](https://github.com/alloy-rs/alloy/blob/25019adf54272a3372d75c6c44a6185e4be9dfa2/crates/rpc-types-mev/src/eth_calls.rs#L252)) -> UUID -If a replacement UUID is not provided, this will attempt to insert the bundle. If a bundle with the same bundle hash already exists -the bundle will be combined with the existing one. +``` +eth_cancelBundle(EthCancelBundle) +``` -If a UUID is provided, this endpoint will only attempt to update a bundle, if that bundle is no longer in the bundle store, the -update will be dropped. +Cancels a bundle by UUID. Best-effort; may not succeed if already included by the builder. -**Limitations** -- 25 million gas per bundle -- Can only provide three transactions at once -- Revert protection is not supported, all transaction hashes must be in `reverting_tx_hashes` -- Partial transaction dropping is not supported, `dropping_tx_hashes` must be empty -- Refunds are not initially supported - - `refund_percent` must not be set - - `refund_receipient` must not be set - - `refund_tx_hashes` must be empty -- extra_fields must be empty - -### eth_cancelBundle([EthCancelBundle](https://github.com/alloy-rs/alloy/blob/25019adf54272a3372d75c6c44a6185e4be9dfa2/crates/rpc-types-mev/src/eth_calls.rs#L216)) -- Will cancel the bundle matching the UUID -- Cancellation is the best effort, if the builder has already included it is will go through \ No newline at end of file +**Reference:** [EthCancelBundle](https://github.com/alloy-rs/alloy/blob/25019adf54272a3372d75c6c44a6185e4be9dfa2/crates/rpc-types-mev/src/eth_calls.rs#L216) diff --git a/docs/AUDIT_S3_FORMAT.md b/docs/AUDIT_S3_FORMAT.md index 6732992..acb00d4 100644 --- a/docs/AUDIT_S3_FORMAT.md +++ b/docs/AUDIT_S3_FORMAT.md @@ -1,121 +1,134 @@ -# S3 Storage Format +# Audit S3 Storage Format -This document describes the S3 storage format used by the audit system for archiving bundle and UserOp lifecycle events and transaction lookups. +The audit system archives bundle and UserOp lifecycle events to S3 for long-term storage and lookup. -## Storage Structure +## Storage Paths -### Bundle History: `/bundles/` +| Path | Description | +|------|-------------| +| `/bundles/` | Bundle lifecycle history | +| `/transactions/by_hash/` | Transaction hash to bundle mapping | +| `/userops/` | UserOperation lifecycle history | -Each bundle is stored as a JSON object containing its complete lifecycle history. The history events in this object are -dervied from the events defined in the [bundle states](./BUNDLE_STATES.md). +## Bundle History + +**Path:** `/bundles/` + +Stores the complete lifecycle of a bundle as a series of events. ```json { - "history": [ - { - "event": "Created", // Event type - "timestamp": 1234567890, // timestamp event was written to kafka - "key": "-", // used to dedup events - "data": { - "bundle": { - // EthSendBundle object - } - } - }, - { - "event": "BuilderIncluded", - "timestamp": 1234567893, - "key": "-", - "data": { - "blockNumber": 12345, - "flashblockIndex": 1, - "builderId": "builder-id" - } - }, - { - "event": "BlockIncluded", - "timestamp": 1234567895, - "key": "-", - "data": { - "blockNumber": 12345, - "blockHash": "0x..." - } - }, - { - "event": "Dropped", - "timestamp": 1234567896, - "key": "-", - "data": { - "reason": "TIMEOUT" - } - } - ] + "history": [ + { + "event": "Created", + "timestamp": 1234567890, + "key": "-", + "data": { + "bundle": { /* EthSendBundle object */ } + } + }, + { + "event": "BuilderIncluded", + "timestamp": 1234567893, + "key": "-", + "data": { + "blockNumber": 12345, + "flashblockIndex": 1, + "builderId": "builder-id" + } + }, + { + "event": "BlockIncluded", + "timestamp": 1234567895, + "key": "-", + "data": { + "blockNumber": 12345, + "blockHash": "0x..." + } + }, + { + "event": "Dropped", + "timestamp": 1234567896, + "key": "-", + "data": { + "reason": "TIMEOUT" + } + } + ] } ``` -### Transaction Lookup: `/transactions/by_hash/` +See [Bundle States](./BUNDLE_STATES.md) for event type definitions. -Transaction hash to bundle mapping for efficient lookups: +## Transaction Lookup + +**Path:** `/transactions/by_hash/` + +Maps transaction hashes to bundle UUIDs for efficient lookups. ```json { - "bundle_ids": [ - "550e8400-e29b-41d4-a716-446655440000", - "6ba7b810-9dad-11d1-80b4-00c04fd430c8" - ] + "bundle_ids": [ + "550e8400-e29b-41d4-a716-446655440000", + "6ba7b810-9dad-11d1-80b4-00c04fd430c8" + ] } ``` -### UserOp History: `/userops/` +## UserOperation History + +**Path:** `/userops/` -Each UserOperation (ERC-4337) is stored as a JSON object containing its complete lifecycle history. Events are written after validation passes. +Stores ERC-4337 UserOperation lifecycle events. Events are written after validation passes. ```json { - "history": [ - { - "event": "AddedToMempool", - "data": { - "key": "-", - "timestamp": 1234567890, - "sender": "0x1234567890abcdef1234567890abcdef12345678", - "entry_point": "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789", - "nonce": "0x1" - } - }, - { - "event": "Included", - "data": { - "key": "-", - "timestamp": 1234567895, - "block_number": 12345678, - "tx_hash": "0xabcdef..." - } - }, - { - "event": "Dropped", - "data": { - "key": "-", - "timestamp": 1234567896, - "reason": { - "Invalid": "AA21 didn't pay prefund" - } - } + "history": [ + { + "event": "AddedToMempool", + "data": { + "key": "-", + "timestamp": 1234567890, + "sender": "0x1234567890abcdef1234567890abcdef12345678", + "entry_point": "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789", + "nonce": "0x1" + } + }, + { + "event": "Included", + "data": { + "key": "-", + "timestamp": 1234567895, + "block_number": 12345678, + "tx_hash": "0xabcdef..." + } + }, + { + "event": "Dropped", + "data": { + "key": "-", + "timestamp": 1234567896, + "reason": { + "Invalid": "AA21 didn't pay prefund" } - ] + } + } + ] } ``` -#### UserOp Event Types +### UserOp Events -| Event | When | Key Fields | -|-------|------|------------| -| `AddedToMempool` | UserOp passes validation and enters the mempool | sender, entry_point, nonce | -| `Dropped` | UserOp removed from mempool | reason (Invalid, Expired, ReplacedByHigherFee) | +| Event | Description | Key Fields | +|-------|-------------|------------| +| `AddedToMempool` | UserOp passed validation and entered mempool | sender, entry_point, nonce | | `Included` | UserOp included in a block | block_number, tx_hash | +| `Dropped` | UserOp removed from mempool | reason | -#### Drop Reasons +### Drop Reasons -- `Invalid(String)` - Validation failed with error message (e.g., revert reason) -- `Expired` - TTL exceeded -- `ReplacedByHigherFee` - Replaced by another UserOp with higher fee +| Reason | Description | +|--------|-------------| +| `Invalid(String)` | Validation failed with error message | +| `Expired` | TTL exceeded | +| `ReplacedByHigherFee` | Replaced by another UserOp with higher fee | diff --git a/docs/BUNDLE_STATES.md b/docs/BUNDLE_STATES.md index 7b68f28..d51e691 100644 --- a/docs/BUNDLE_STATES.md +++ b/docs/BUNDLE_STATES.md @@ -1,41 +1,51 @@ # Bundle States -- **Created**: - - Initial bundle creation with transaction list - - Arguments: (bundle) -- **Updated**: - - Bundle modification (transaction additions/removals) - - Arguments: (bundle) -- **Cancelled**: - - Bundle explicitly cancelled - - Arguments: (nonce | uuid) -- **IncludedByBuilder**: - - Bundle included by builder in flashblock - - Arguments: (flashblockNum, blockNum, builderId) -- **IncludedInBlock**: - - Final confirmation in blockchain - - Arguments: (blockNum, blockHash) -- **Dropped**: - - Bundle dropped from processing - - Arguments: Why(enum Reason) - - "TIMEOUT": Bundle expired without inclusion - - "INCLUDED_BY_OTHER": Another bundle caused the transactions in this bundle to not be includable - - "REVERTED": A transaction reverted which was not allowed to - -### Dropping Transactions -Transactions can be dropped because of multiple reasons, all of which are indicated on -the audit log for a transaction. The initial prototype has the following limits: - -- Included by other - - There are two bundles that overlap (e.g. bundleA=(txA, txB) and bundleB=(txA), if bundleB is included and txA in - bundleA is not allowed to be dropped, then bundleA will be marked as "Included By Other" and dropped. -- Bundle Limits - - Timeouts (block or flashblock) - - Block number -- Account Limits - - An account can only have a fixed number (TBD) of transactions in the mempool, - transactions will be dropped by descending nonce -- Global Limits - - When the mempool reaches a certain size (TBD), it will be pruned based on a combination of: - - Bundle age - - Low base fee \ No newline at end of file +Bundles transition through the following states during their lifecycle. + +## State Definitions + +| State | Description | Arguments | +|-------|-------------|-----------| +| **Created** | Bundle created with initial transaction list | bundle | +| **Updated** | Bundle modified (transactions added/removed) | bundle | +| **Cancelled** | Bundle explicitly cancelled | nonce \| uuid | +| **IncludedByBuilder** | Bundle included in flashblock by builder | flashblockNum, blockNum, builderId | +| **IncludedInBlock** | Bundle confirmed in blockchain | blockNum, blockHash | +| **Dropped** | Bundle dropped from processing | reason | + +## Drop Reasons + +| Reason | Description | +|--------|-------------| +| `TIMEOUT` | Bundle expired without inclusion | +| `INCLUDED_BY_OTHER` | Overlapping bundle caused this bundle's transactions to become non-includable | +| `REVERTED` | A non-revertible transaction reverted | + +## Mempool Limits + +Bundles may be dropped when limits are exceeded: + +### Bundle Limits +- Timeout (block or flashblock deadline) +- Target block number passed + +### Account Limits +- Fixed number of transactions per account in mempool +- Excess transactions dropped by descending nonce + +### Global Limits +- Mempool pruned at capacity based on: + - Bundle age + - Low base fee + +### Overlapping Bundles + +When bundles share transactions, inclusion of one may invalidate another: + +``` +bundleA = (txA, txB) +bundleB = (txA) + +If bundleB is included and txA in bundleA cannot be dropped, +bundleA is marked INCLUDED_BY_OTHER and removed. +``` diff --git a/docs/ERC4337_BUNDLER.md b/docs/ERC4337_BUNDLER.md new file mode 100644 index 0000000..5843191 --- /dev/null +++ b/docs/ERC4337_BUNDLER.md @@ -0,0 +1,104 @@ +# TIPS ERC-4337 Bundler + +## Overview + +ERC-4337 bundlers include user operations (smart account transactions) onchain. TIPS includes a native bundler that provides optimal speed and cost for user operations with full audit tracing via the TIPS UI. + +## Architecture + +### Ingress + +TIPS exposes `eth_sendUserOperation` and performs standard ERC-7562 validation checks while managing the user operation mempool. Supported entry points: v0.6 through v0.9. + +Base node reth includes `base_validateUserOperation` for validating user ops before adding them to the queue. + +### ERC-7562 Validation + +[ERC-7562](https://eips.ethereum.org/EIPS/eip-7562) protects bundlers from DoS attacks through unpaid computation and reverting transactions. The rules restrict: + +- Opcodes +- Reputation +- Storage access +- Bundle rules +- Staking for globally used contracts (paymasters, factories) + +These restrictions minimize cross-transactional dependencies that could allow one transaction to invalidate another. + +TIPS streams events from the block builder to the audit stream, updating ingress rules and reputation/mempool limits. A Redis cluster maintains reputation scores for user operation entities (sender, paymaster, factory) tracking `opsSeen` and `opsIncluded` over configured intervals. + +User operations from `BANNED` entities are filtered out before validation. + +### Block Building + +Native bundler integration enables: + +- **Larger bundles**: Reduces signatures from worst case 2N to best case N+1 (N = number of user ops), improving data availability on Base Chain +- **Priority fee ordering**: User operations ordered by priority fee within bundles + +Initial approach: One large bundle at the middle of each flashblock with priority fee ordering within that bundle. + +#### Bundle Construction + +1. Incrementally stack user op validation phases +2. Attempt to include the transaction +3. Prune and resubmit any reverting ops +4. Execute once the bundle is built (no revert risk in execution phase) + +#### Key Management + +The block builder requires a hot bundler key that accrues ETH. Balance is swept periodically (every N blocks) to the sequencer address. + +Future AA V2 phases will add a new transaction type to remove this hot key requirement. + +## RPC Methods + +### Base Node Methods + +| Method | Description | +|--------|-------------| +| `base_validateUserOperation` | Validates user operation conforms to ERC-7562 with successful validation phase | +| `eth_supportedEntrypoints` | Returns supported entry points | +| `eth_estimateUserOperationGas` | Returns PVG and gas limit estimates | +| `eth_sendUserOperation` | Sends user operation to TIPS pipeline after validation | +| `eth_getUserOperationByHash` | Gets user operation by hash (flashblock enabled) | +| `eth_getUserOperationReceipt` | Gets user operation receipt (flashblock enabled) | + +### Gas Estimation + +`eth_estimateUserOperationGas` returns: +- Verification gas limit +- Execution gas limit +- PreVerificationGas (PVG) + +PVG covers bundler tip, entrypoint overhead, and L1 data fee. + +### PreVerificationGas (PVG) + +Current issues: +1. Primary source of overcharging +2. User ops stuck in mempool if PVG too low + +Solutions: +- Future AA V2 will decouple L1 data fee from bundler tip + overhead via `l1GasFeeLimit` +- TIPS native bundler amortizes costs across user ops in bundles, enabling lower PVG values +- Clear error messages for PVG too low conditions + +## Call Flow + +``` +Wallet (EIP-5792) + ↓ +eth_sendUserOperation + ↓ +base_validateUserOperation (ERC-7562) + ↓ +User Operation Queue (Kafka) + ↓ +User Operation Mempool + ↓ +rBuilder (bundle construction) + ↓ +Block Inclusion + ↓ +Audit Pipeline +``` diff --git a/docs/PULL_REQUEST_GUIDELINES.md b/docs/PULL_REQUEST_GUIDELINES.md new file mode 100644 index 0000000..8fb4180 --- /dev/null +++ b/docs/PULL_REQUEST_GUIDELINES.md @@ -0,0 +1,93 @@ +# Pull Request Guidelines + +## Overview + +PRs are the lifeline of the team. They allow us to ship value, determine maintenance cost, and impact daily quality of life. Well-maintained code sustains velocity. + +## Why + +A quality pull request process enables sustained velocity and consistent delivery. + +Pull requests allow us to: + +- **Hold and improve quality**: Catch bugs and architectural issues early +- **Build team expertise**: Share knowledge through clear descriptions and thoughtful reviews +- **Stay customer focused**: Keep PRs tight and decoupled for incremental, reversible changes +- **Encourage ownership**: Clear domain ownership motivates high quality and reduces incidents + +## SLA + +| Metric | Target | Rationale | +|--------|--------|-----------| +| PR Review | Within half a working day | If reviews take longer than 1 working day, something needs improvement | + +## Success Metrics + +| Metric | Why | +|--------|-----| +| Time to PR Review | Fast reviews power the flywheel: shared context → quality code → maintainable codebase → iteration | +| Time from PR Open to Production | Deployed code reaches customers | +| Incidents | Quality authoring and review catches errors early | +| QA Regression Bugs | Quality authoring and review catches errors early | + +## Authoring Guidelines + +### Keep PRs Tight + +PRs should make either deep changes (few files, significant logic) or shallow changes (many files, simple refactors). + +- **< 500 LOC** (guideline; auto-generated or boilerplate may exceed this) +- **< 10 files** (guideline; renames may touch more files) + +### Write Clear Descriptions + +Enable reviewers to understand the problem and verify the solution. Good descriptions also serve as documentation. + +### Test Thoroughly + +Any code change impacts flows. Include: +- Manual testing +- Unit tests +- QA regression tests where appropriate + +### Choose Reviewers Carefully + +Select codebase owners and domain experts. Reach out early to allow reviewers to schedule time. + +### Budget Time for Reviews + +Allow time for comments, suggestions, and improvements. Code is written once but read many times. + +### Consider Live Reviews + +Synchronous reviews can resolve alignment faster. Document decisions in the PR for posterity. + +## Reviewing Guidelines + +### Review Within Half a Day + +Fast reviews generate a flywheel of velocity and knowledge-sharing. + +### Review in Detail + +No rubber stamping. Given good descriptions and self-review, PRs should be relatively easy to review thoroughly. + +## Codebase Ownership + +### Unit Tests + +Owners decide on unit test thresholds reflecting appropriate effort and business risk. + +### Conventions + +Team should have consensus on conventions. Ideally automated or linted; otherwise documented. + +## FAQ + +**Can we make an exception for tight timelines?** + +Yes, exceptions are always possible. For large PRs, hold a retro to identify what could be done differently. + +**When should authors seek reviewers?** + +As early as possible. Reviewers of design artifacts (PPS/TDD) should likely also review the PR. diff --git a/docs/SETUP.md b/docs/SETUP.md new file mode 100644 index 0000000..6489255 --- /dev/null +++ b/docs/SETUP.md @@ -0,0 +1,117 @@ +# Local Development Setup + +This guide covers setting up and running TIPS locally with all required dependencies. + +## Prerequisites + +- Docker and Docker Compose +- Rust (latest stable) +- Go (1.21+) +- Just command runner (`cargo install just`) +- Git + +## Clone Repositories + +Clone the three required repositories: + +```bash +# TIPS (this repository) +git clone https://github.com/base/tips.git + +# builder-playground (separate directory) +git clone https://github.com/flashbots/builder-playground.git +cd builder-playground +git remote add danyal git@github.com:danyalprout/builder-playground.git +git checkout danyal/base-overlay + +# op-rbuilder (separate directory) +git clone https://github.com/base/op-rbuilder.git +``` + +## Start Services + +### 1. TIPS Infrastructure + +```bash +cd tips +just sync # Sync and load environment variables +just start-all # Start all TIPS services +``` + +This starts: +- Docker containers (Kafka, MinIO, node-reth) +- Ingress RPC service +- Audit service +- Bundle pool service +- UI + +### 2. builder-playground + +Provides L1/L2 blockchain infrastructure: + +```bash +cd builder-playground +go run main.go cook opstack \ + --external-builder http://host.docker.internal:4444/ \ + --enable-latest-fork 0 \ + --flashblocks \ + --base-overlay \ + --flashblocks-builder ws://host.docker.internal:1111/ws +``` + +Keep this terminal running. + +### 3. op-rbuilder + +Handles L2 block building: + +```bash +cd op-rbuilder +just run-playground +``` + +Keep this terminal running. + +## Test the System + +```bash +cd tips +just send-txn +``` + +This submits a test transaction through the ingress → audit → bundle pool → builder pipeline. + +## Port Reference + +| Service | Port | Description | +|---------|------|-------------| +| TIPS Ingress RPC | 8080 | Bundle submission endpoint | +| TIPS UI | 3000 | Debug interface | +| MinIO Console | 7001 | Object storage UI | +| MinIO API | 7000 | Object storage API | +| Kafka | 9092 | Message broker | +| op-rbuilder | 4444 | Block builder API | + +## Development Workflow + +1. Keep builder-playground and op-rbuilder running +2. Run `just start-all` after code changes +3. Test with `just send-txn` +4. View logs with `docker logs -f ` +5. Access UI at http://localhost:3000 + +Query block information: + +```bash +just get-blocks +``` + +## Stop Services + +```bash +cd tips +just stop-all + +# Ctrl+C in op-rbuilder terminal +# Ctrl+C in builder-playground terminal +``` From 909e322a3598f48d759735cc85bd1a48cd8b5cce Mon Sep 17 00:00:00 2001 From: refcell Date: Tue, 6 Jan 2026 09:50:09 -0500 Subject: [PATCH 099/117] chore(bin): Lifts the Ingress Binary to bin Directory (#125) * chore(bin): lift binary to bin directory * chore(bin): lift binary to bin directory * fixes --- Cargo.lock | 43 +++++++++++++++++-- Cargo.toml | 7 ++- Dockerfile | 2 +- README.md | 4 +- bin/tips-audit/Cargo.toml | 21 +++++++++ .../src/bin => bin/tips-audit/src}/main.rs | 2 +- bin/tips-ingress-rpc/Cargo.toml | 23 ++++++++++ .../bin => bin/tips-ingress-rpc/src}/main.rs | 13 +++--- crates/account-abstraction-core/Cargo.toml | 16 +++---- crates/audit/Cargo.toml | 18 +++----- crates/audit/tests/integration_tests.rs | 2 +- crates/audit/tests/s3_test.rs | 2 +- crates/core/Cargo.toml | 10 ++--- crates/ingress-rpc/Cargo.toml | 30 ++++++------- crates/ingress-rpc/src/service.rs | 2 +- crates/system-tests/Cargo.toml | 36 ++++++++-------- crates/system-tests/tests/common/kafka.rs | 2 +- .../system-tests/tests/integration_tests.rs | 2 +- 18 files changed, 153 insertions(+), 82 deletions(-) create mode 100644 bin/tips-audit/Cargo.toml rename {crates/audit/src/bin => bin/tips-audit/src}/main.rs (99%) create mode 100644 bin/tips-ingress-rpc/Cargo.toml rename {crates/ingress-rpc/src/bin => bin/tips-ingress-rpc/src}/main.rs (90%) diff --git a/Cargo.lock b/Cargo.lock index 841f683..2b5fa99 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6988,6 +6988,23 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tips-audit" version = "0.1.0" +dependencies = [ + "anyhow", + "aws-config", + "aws-credential-types", + "aws-sdk-s3", + "clap", + "dotenvy", + "rdkafka", + "tips-audit-lib", + "tips-core", + "tokio", + "tracing", +] + +[[package]] +name = "tips-audit-lib" +version = "0.1.0" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7039,6 +7056,25 @@ dependencies = [ [[package]] name = "tips-ingress-rpc" version = "0.1.0" +dependencies = [ + "account-abstraction-core", + "alloy-provider", + "anyhow", + "clap", + "dotenvy", + "jsonrpsee", + "op-alloy-network", + "rdkafka", + "tips-audit-lib", + "tips-core", + "tips-ingress-rpc-lib", + "tokio", + "tracing", +] + +[[package]] +name = "tips-ingress-rpc-lib" +version = "0.1.0" dependencies = [ "account-abstraction-core", "alloy-consensus", @@ -7062,7 +7098,7 @@ dependencies = [ "reth-optimism-evm", "reth-rpc-eth-types", "serde_json", - "tips-audit", + "tips-audit-lib", "tips-core", "tokio", "tracing", @@ -7092,7 +7128,6 @@ dependencies = [ "jsonrpsee", "op-alloy-consensus", "op-alloy-network", - "op-revm", "rand 0.8.5", "rand_chacha 0.3.1", "rdkafka", @@ -7102,9 +7137,9 @@ dependencies = [ "serial_test", "testcontainers", "testcontainers-modules", - "tips-audit", + "tips-audit-lib", "tips-core", - "tips-ingress-rpc", + "tips-ingress-rpc-lib", "tokio", "tracing", "tracing-subscriber 0.3.22", diff --git a/Cargo.toml b/Cargo.toml index 09da831..02e2475 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,8 +7,9 @@ homepage = "https://github.com/base/tips" repository = "https://github.com/base/tips" [workspace] -members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core", "crates/system-tests"] resolver = "2" +members = ["crates/*", "bin/*"] +default-members = ["bin/tips-ingress-rpc"] [workspace.lints.rust] missing-debug-implementations = "warn" @@ -31,7 +32,9 @@ redundant-clone = "warn" [workspace.dependencies] # local tips-core = { path = "crates/core" } -tips-audit = { path = "crates/audit" } +tips-audit = { path = "bin/tips-audit" } +tips-audit-lib = { path = "crates/audit" } +tips-ingress-rpc-lib = { path = "crates/ingress-rpc" } tips-system-tests = { path = "crates/system-tests" } account-abstraction-core = { path = "crates/account-abstraction-core" } diff --git a/Dockerfile b/Dockerfile index 366b286..9442acb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ COPY . . RUN --mount=type=cache,target=/usr/local/cargo/registry \ --mount=type=cache,target=/usr/local/cargo/git \ --mount=type=cache,target=/app/target \ - cargo build && \ + cargo build -p tips-ingress-rpc -p tips-audit && \ cp target/debug/tips-ingress-rpc /tmp/tips-ingress-rpc && \ cp target/debug/tips-audit /tmp/tips-audit diff --git a/README.md b/README.md index 7733a53..6fbb622 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,13 @@ The project consists of several components: ### 🗄️ Datastore (`crates/datastore`) Postgres storage layer that provides API's to persist and retrieve bundles. -### 📊 Audit (`crates/audit`) +### 📊 Audit (`bin/tips-audit`) Event streaming and archival system that: - Provides an API to publish bundle events to Kafka - Archives bundle history to S3 for long-term storage - See [S3 Storage Format](docs/AUDIT_S3_FORMAT.md) for data structure details -### 🔌 Ingress RPC (`crates/ingress-rpc`) +### 🔌 Ingress RPC (`bin/tips-ingress-rpc`) The main entry point that provides a JSON-RPC API for receiving transactions and bundles. ### 🖥️ UI (`ui`) diff --git a/bin/tips-audit/Cargo.toml b/bin/tips-audit/Cargo.toml new file mode 100644 index 0000000..7d43244 --- /dev/null +++ b/bin/tips-audit/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "tips-audit" +version.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +edition.workspace = true + +[dependencies] +tips-core.workspace = true +tips-audit-lib.workspace = true +clap.workspace = true +tokio.workspace = true +anyhow.workspace = true +tracing.workspace = true +dotenvy.workspace = true +rdkafka.workspace = true +aws-config.workspace = true +aws-sdk-s3.workspace = true +aws-credential-types.workspace = true diff --git a/crates/audit/src/bin/main.rs b/bin/tips-audit/src/main.rs similarity index 99% rename from crates/audit/src/bin/main.rs rename to bin/tips-audit/src/main.rs index 870efc3..db958eb 100644 --- a/crates/audit/src/bin/main.rs +++ b/bin/tips-audit/src/main.rs @@ -5,7 +5,7 @@ use aws_sdk_s3::{Client as S3Client, config::Builder as S3ConfigBuilder}; use clap::{Parser, ValueEnum}; use rdkafka::consumer::Consumer; use std::net::SocketAddr; -use tips_audit::{ +use tips_audit_lib::{ KafkaAuditArchiver, KafkaAuditLogReader, S3EventReaderWriter, create_kafka_consumer, }; use tips_core::logger::init_logger_with_format; diff --git a/bin/tips-ingress-rpc/Cargo.toml b/bin/tips-ingress-rpc/Cargo.toml new file mode 100644 index 0000000..f3b2697 --- /dev/null +++ b/bin/tips-ingress-rpc/Cargo.toml @@ -0,0 +1,23 @@ +[package] +name = "tips-ingress-rpc" +version.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +edition.workspace = true + +[dependencies] +tips-core.workspace = true +tips-audit-lib.workspace = true +tips-ingress-rpc-lib.workspace = true +account-abstraction-core.workspace = true +clap.workspace = true +tokio.workspace = true +anyhow.workspace = true +tracing.workspace = true +dotenvy.workspace = true +rdkafka.workspace = true +jsonrpsee.workspace = true +op-alloy-network.workspace = true +alloy-provider.workspace = true diff --git a/crates/ingress-rpc/src/bin/main.rs b/bin/tips-ingress-rpc/src/main.rs similarity index 90% rename from crates/ingress-rpc/src/bin/main.rs rename to bin/tips-ingress-rpc/src/main.rs index 28bcfe3..fb47d72 100644 --- a/crates/ingress-rpc/src/bin/main.rs +++ b/bin/tips-ingress-rpc/src/main.rs @@ -5,16 +5,16 @@ use jsonrpsee::server::Server; use op_alloy_network::Optimism; use rdkafka::ClientConfig; use rdkafka::producer::FutureProducer; -use tips_audit::{BundleEvent, KafkaBundleEventPublisher, connect_audit_to_publisher}; +use tips_audit_lib::{BundleEvent, KafkaBundleEventPublisher, connect_audit_to_publisher}; use tips_core::kafka::load_kafka_config_from_file; use tips_core::logger::init_logger_with_format; use tips_core::metrics::init_prometheus_exporter; use tips_core::{AcceptedBundle, MeterBundleResponse}; -use tips_ingress_rpc::Config; -use tips_ingress_rpc::connect_ingress_to_builder; -use tips_ingress_rpc::health::bind_health_server; -use tips_ingress_rpc::queue::KafkaMessageQueue; -use tips_ingress_rpc::service::{IngressApiServer, IngressService, Providers}; +use tips_ingress_rpc_lib::Config; +use tips_ingress_rpc_lib::connect_ingress_to_builder; +use tips_ingress_rpc_lib::health::bind_health_server; +use tips_ingress_rpc_lib::queue::KafkaMessageQueue; +use tips_ingress_rpc_lib::service::{IngressApiServer, IngressService, Providers}; use tokio::sync::{broadcast, mpsc}; use tracing::info; @@ -23,7 +23,6 @@ async fn main() -> anyhow::Result<()> { dotenvy::dotenv().ok(); let config = Config::parse(); - // clone once instead of cloning each field before passing to `IngressService::new` let cfg = config.clone(); init_logger_with_format(&config.log_level, config.log_format); diff --git a/crates/account-abstraction-core/Cargo.toml b/crates/account-abstraction-core/Cargo.toml index 41bbd9e..6a61a62 100644 --- a/crates/account-abstraction-core/Cargo.toml +++ b/crates/account-abstraction-core/Cargo.toml @@ -9,21 +9,21 @@ edition.workspace = true [dependencies] tips-core.workspace = true +alloy-serde.workspace = true +async-trait.workspace = true +alloy-sol-types.workspace = true +op-alloy-network.workspace = true +reth-rpc-eth-types.workspace = true serde = { workspace = true, features = ["std", "derive"] } tokio = { workspace = true, features = ["full"] } tracing = { workspace = true, features = ["std"] } anyhow = { workspace = true, features = ["std"] } -rdkafka = { workspace = true, features = ["tokio", "libz"] } -jsonrpsee = { workspace = true, features = ["server", "macros"] } serde_json = { workspace = true, features = ["std"] } -async-trait.workspace = true -alloy-serde.workspace = true -alloy-sol-types.workspace = true -alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } +rdkafka = { workspace = true, features = ["tokio", "libz"] } alloy-rpc-types = { workspace = true, features = ["eth"] } +jsonrpsee = { workspace = true, features = ["server", "macros"] } alloy-provider = { workspace = true, features = ["reqwest"] } -op-alloy-network.workspace = true -reth-rpc-eth-types.workspace = true +alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } [dev-dependencies] wiremock.workspace = true diff --git a/crates/audit/Cargo.toml b/crates/audit/Cargo.toml index 7fe6873..84df131 100644 --- a/crates/audit/Cargo.toml +++ b/crates/audit/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "tips-audit" +name = "tips-audit-lib" version.workspace = true rust-version.workspace = true license.workspace = true @@ -7,20 +7,16 @@ homepage.workspace = true repository.workspace = true edition.workspace = true -[[bin]] -name = "tips-audit" -path = "src/bin/main.rs" - [dependencies] -tips-core = { workspace = true, features = ["test-utils"] } bytes.workspace = true metrics.workspace = true dotenvy.workspace = true async-trait.workspace = true metrics-derive.workspace = true -alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } -tokio = { workspace = true, features = ["full"] } +aws-credential-types.workspace = true +tips-core = { workspace = true, features = ["test-utils"] } serde = { workspace = true, features = ["std", "derive"] } +tokio = { workspace = true, features = ["full"] } uuid = { workspace = true, features = ["v4", "serde"] } tracing = { workspace = true, features = ["std"] } anyhow = { workspace = true, features = ["std"] } @@ -28,13 +24,13 @@ serde_json = { workspace = true, features = ["std"] } rdkafka = { workspace = true, features = ["tokio", "libz"] } alloy-consensus = { workspace = true, features = ["std"] } alloy-provider = { workspace = true, features = ["reqwest"] } -op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } clap = { version = "4.5.47", features = ["std", "derive", "env"] } +op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } +alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } tracing-subscriber = { workspace = true, features = ["std", "fmt", "env-filter", "json"] } aws-config = { workspace = true, features = ["default-https-client", "rt-tokio"] } aws-sdk-s3 = { workspace = true, features = ["rustls", "default-https-client", "rt-tokio"] } -aws-credential-types.workspace = true [dev-dependencies] testcontainers = { workspace = true, features = ["blocking"] } -testcontainers-modules = { workspace = true, features = ["postgres", "kafka", "minio"] } \ No newline at end of file +testcontainers-modules = { workspace = true, features = ["postgres", "kafka", "minio"] } diff --git a/crates/audit/tests/integration_tests.rs b/crates/audit/tests/integration_tests.rs index cb79836..f2bb9d3 100644 --- a/crates/audit/tests/integration_tests.rs +++ b/crates/audit/tests/integration_tests.rs @@ -1,6 +1,6 @@ use alloy_primitives::{Address, B256, U256}; use std::time::Duration; -use tips_audit::{ +use tips_audit_lib::{ KafkaAuditArchiver, KafkaAuditLogReader, KafkaUserOpAuditLogReader, UserOpEventReader, publisher::{ BundleEventPublisher, KafkaBundleEventPublisher, KafkaUserOpEventPublisher, diff --git a/crates/audit/tests/s3_test.rs b/crates/audit/tests/s3_test.rs index 1d70cc1..d6bfba6 100644 --- a/crates/audit/tests/s3_test.rs +++ b/crates/audit/tests/s3_test.rs @@ -1,6 +1,6 @@ use alloy_primitives::{Address, B256, TxHash, U256}; use std::sync::Arc; -use tips_audit::{ +use tips_audit_lib::{ reader::Event, storage::{ BundleEventS3Reader, EventWriter, S3EventReaderWriter, UserOpEventS3Reader, diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 6657e7b..d843721 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -11,20 +11,20 @@ edition.workspace = true test-utils = ["dep:alloy-signer-local", "dep:op-alloy-rpc-types"] [dependencies] +op-alloy-flz.workspace = true +alloy-serde.workspace = true serde = { workspace = true, features = ["std", "derive"] } uuid = { workspace = true, features = ["v4", "serde"] } tracing = { workspace = true, features = ["std"] } -op-alloy-flz.workspace = true -alloy-serde.workspace = true -alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } alloy-consensus = { workspace = true, features = ["std"] } alloy-rpc-types = { workspace = true, features = ["eth"] } alloy-provider = { workspace = true, features = ["reqwest"] } -op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } alloy-signer-local = { workspace = true, optional = true } +op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } +alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } op-alloy-rpc-types = { workspace = true, features = ["std"], optional = true } -tracing-subscriber = { workspace = true, features = ["std", "fmt", "ansi", "env-filter", "json"] } metrics-exporter-prometheus = { workspace = true, features = ["http-listener"] } +tracing-subscriber = { workspace = true, features = ["std", "fmt", "ansi", "env-filter", "json"] } [dev-dependencies] alloy-signer-local.workspace = true diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index 4ce5ee8..d2d090f 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "tips-ingress-rpc" +name = "tips-ingress-rpc-lib" version.workspace = true rust-version.workspace = true license.workspace = true @@ -7,39 +7,35 @@ homepage.workspace = true repository.workspace = true edition.workspace = true -[[bin]] -name = "tips-ingress-rpc" -path = "src/bin/main.rs" - [dependencies] -tips-core.workspace = true -tips-audit.workspace = true -account-abstraction-core.workspace = true url.workspace = true +tips-core.workspace = true +op-revm.workspace = true metrics.workspace = true dotenvy.workspace = true -op-revm.workspace = true +tips-audit-lib.workspace = true async-trait.workspace = true metrics-derive.workspace = true -alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } -alloy-signer-local.workspace = true op-alloy-network.workspace = true +alloy-signer-local.workspace = true reth-optimism-evm.workspace = true reth-rpc-eth-types.workspace = true +account-abstraction-core.workspace = true tokio = { workspace = true, features = ["full"] } tracing = { workspace = true, features = ["std"] } anyhow = { workspace = true, features = ["std"] } serde_json = { workspace = true, features = ["std"] } -axum = { workspace = true, features = ["tokio", "http1", "json"] } rdkafka = { workspace = true, features = ["tokio", "libz"] } -backon = { workspace = true, features = ["std", "tokio-sleep"] } -jsonrpsee = { workspace = true, features = ["server", "macros"] } alloy-consensus = { workspace = true, features = ["std"] } alloy-provider = { workspace = true, features = ["reqwest"] } -op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } +jsonrpsee = { workspace = true, features = ["server", "macros"] } +backon = { workspace = true, features = ["std", "tokio-sleep"] } +axum = { workspace = true, features = ["tokio", "http1", "json"] } clap = { version = "4.5.47", features = ["std", "derive", "env"] } +op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } +alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } [dev-dependencies] -wiremock.workspace = true mockall = "0.13" -jsonrpsee = { workspace = true, features = ["server", "http-client", "macros"] } \ No newline at end of file +wiremock.workspace = true +jsonrpsee = { workspace = true, features = ["server", "http-client", "macros"] } diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 56cd41a..4ac51fb 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -15,7 +15,7 @@ use op_alloy_consensus::OpTxEnvelope; use op_alloy_network::Optimism; use reth_rpc_eth_types::EthApiError; use std::time::{SystemTime, UNIX_EPOCH}; -use tips_audit::BundleEvent; +use tips_audit_lib::BundleEvent; use tips_core::types::ParsedBundle; use tips_core::{ AcceptedBundle, Bundle, BundleExtensions, BundleHash, CancelBundle, MeterBundleResponse, diff --git a/crates/system-tests/Cargo.toml b/crates/system-tests/Cargo.toml index 072a3b5..d460ede 100644 --- a/crates/system-tests/Cargo.toml +++ b/crates/system-tests/Cargo.toml @@ -9,38 +9,37 @@ license.workspace = true path = "src/lib.rs" [dependencies] -tips-core.workspace = true -tips-audit.workspace = true -tips-ingress-rpc = { path = "../ingress-rpc" } -url.workspace = true -bytes.workspace = true -op-revm.workspace = true -async-trait.workspace = true -alloy-network.workspace = true -alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } -alloy-signer-local.workspace = true -op-alloy-network.workspace = true -aws-credential-types.workspace = true hex = "0.4.3" rand = "0.8" dashmap = "6.0" indicatif = "0.17" rand_chacha = "0.3" -tokio = { workspace = true, features = ["full"] } +url = { workspace = true } +tips-core = { workspace = true } +bytes = { workspace = true } +async-trait = { workspace = true } +tips-audit-lib = { workspace = true } +alloy-network = { workspace = true } +tips-ingress-rpc-lib.workspace = true +op-alloy-network = { workspace = true } +alloy-signer-local = { workspace = true } +aws-credential-types = { workspace = true } serde = { workspace = true, features = ["std", "derive"] } -uuid = { workspace = true, features = ["v4", "serde"] } +tokio = { workspace = true, features = ["full"] } tracing = { workspace = true, features = ["std"] } anyhow = { workspace = true, features = ["std"] } +uuid = { workspace = true, features = ["v4", "serde"] } serde_json = { workspace = true, features = ["std"] } +reqwest = { version = "0.12.12", features = ["json"] } rdkafka = { workspace = true, features = ["tokio", "libz"] } -jsonrpsee = { workspace = true, features = ["server", "macros"] } alloy-consensus = { workspace = true, features = ["std"] } alloy-provider = { workspace = true, features = ["reqwest"] } -op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } -reqwest = { version = "0.12.12", features = ["json"] } +jsonrpsee = { workspace = true, features = ["server", "macros"] } clap = { version = "4.5", features = ["std", "derive", "env"] } -tracing-subscriber = { workspace = true, features = ["std", "fmt", "env-filter", "json"] } +op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } +alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } aws-config = { workspace = true, features = ["default-https-client", "rt-tokio"] } +tracing-subscriber = { workspace = true, features = ["std", "fmt", "env-filter", "json"] } aws-sdk-s3 = { workspace = true, features = ["rustls", "default-https-client", "rt-tokio"] } [dev-dependencies] @@ -48,4 +47,3 @@ serial_test = "3" tokio = { workspace = true, features = ["full", "test-util"] } testcontainers = { workspace = true, features = ["blocking"] } testcontainers-modules = { workspace = true, features = ["postgres", "kafka", "minio"] } - diff --git a/crates/system-tests/tests/common/kafka.rs b/crates/system-tests/tests/common/kafka.rs index f01a201..a61e54c 100644 --- a/crates/system-tests/tests/common/kafka.rs +++ b/crates/system-tests/tests/common/kafka.rs @@ -8,7 +8,7 @@ use rdkafka::{ consumer::{Consumer, StreamConsumer}, message::BorrowedMessage, }; -use tips_audit::types::BundleEvent; +use tips_audit_lib::types::BundleEvent; use tips_core::{BundleExtensions, kafka::load_kafka_config_from_file}; use tokio::time::{Instant, timeout}; use uuid::Uuid; diff --git a/crates/system-tests/tests/integration_tests.rs b/crates/system-tests/tests/integration_tests.rs index 772ea69..901bb41 100644 --- a/crates/system-tests/tests/integration_tests.rs +++ b/crates/system-tests/tests/integration_tests.rs @@ -8,7 +8,7 @@ use anyhow::{Context, Result, bail}; use common::kafka::wait_for_audit_event_by_hash; use op_alloy_network::Optimism; use serial_test::serial; -use tips_audit::types::BundleEvent; +use tips_audit_lib::types::BundleEvent; use tips_core::BundleExtensions; use tips_system_tests::client::TipsRpcClient; use tips_system_tests::fixtures::{ From e0a10f7ecf0a937c54d1d840af491ad4a04a40a7 Mon Sep 17 00:00:00 2001 From: refcell Date: Tue, 6 Jan 2026 10:19:35 -0500 Subject: [PATCH 100/117] chore(core): Lints and Formatting (#129) * chore(workspace): manifest updates * chore(core): lints --- crates/core/Cargo.toml | 6 +++++- crates/core/README.md | 3 +++ crates/core/src/lib.rs | 8 ++++++++ crates/core/src/logger.rs | 8 ++++---- crates/core/src/test_utils.rs | 4 ++-- crates/core/src/types.rs | 6 +++--- crates/ingress-rpc/Cargo.toml | 2 +- 7 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 crates/core/README.md diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index d843721..76d7d63 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -1,11 +1,15 @@ [package] name = "tips-core" +description = "Core primitives and utilities for TIPS" version.workspace = true +edition.workspace = true rust-version.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true -edition.workspace = true + +[lints] +workspace = true [features] test-utils = ["dep:alloy-signer-local", "dep:op-alloy-rpc-types"] diff --git a/crates/core/README.md b/crates/core/README.md new file mode 100644 index 0000000..6dd1d3d --- /dev/null +++ b/crates/core/README.md @@ -0,0 +1,3 @@ +# `tips-core` + +Core primitives and utilities for TIPS. diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index 2ebfc06..c2a045c 100644 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -1,3 +1,11 @@ +#![doc = include_str!("../README.md")] +#![doc(issue_tracker_base_url = "https://github.com/base/tips/issues/")] +#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] +#![cfg_attr(not(test), warn(unused_crate_dependencies))] +#![allow(missing_docs)] + +use alloy_rpc_types as _; + pub mod kafka; pub mod logger; pub mod metrics; diff --git a/crates/core/src/logger.rs b/crates/core/src/logger.rs index c90c731..ca4ef1b 100644 --- a/crates/core/src/logger.rs +++ b/crates/core/src/logger.rs @@ -14,12 +14,12 @@ impl FromStr for LogFormat { fn from_str(s: &str) -> Result { match s.to_lowercase().as_str() { - "json" => Ok(LogFormat::Json), - "compact" => Ok(LogFormat::Compact), - "pretty" => Ok(LogFormat::Pretty), + "json" => Ok(Self::Json), + "compact" => Ok(Self::Compact), + "pretty" => Ok(Self::Pretty), _ => { warn!("Invalid log format '{}', defaulting to 'pretty'", s); - Ok(LogFormat::Pretty) + Ok(Self::Pretty) } } } diff --git a/crates/core/src/test_utils.rs b/crates/core/src/test_utils.rs index 34a95db..3216298 100644 --- a/crates/core/src/test_utils.rs +++ b/crates/core/src/test_utils.rs @@ -18,7 +18,7 @@ pub const TXN_HASH: TxHash = pub fn create_bundle_from_txn_data() -> AcceptedBundle { AcceptedBundle::new( Bundle { - txs: vec![TXN_DATA.clone()], + txs: vec![TXN_DATA], ..Default::default() } .try_into() @@ -40,7 +40,7 @@ pub fn create_transaction(from: PrivateKeySigner, nonce: u64, to: Address) -> Op .unwrap(); let sig = from.sign_transaction_sync(&mut txn).unwrap(); - OpTxEnvelope::Eip1559(txn.eip1559().cloned().unwrap().into_signed(sig).clone()) + OpTxEnvelope::Eip1559(txn.eip1559().cloned().unwrap().into_signed(sig)) } pub fn create_test_bundle( diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index ae00f36..5badc34 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -92,7 +92,7 @@ impl TryFrom for ParsedBundle { .transpose() .map_err(|e| format!("Invalid UUID: {e:?}"))?; - Ok(ParsedBundle { + Ok(Self { txs, block_number: bundle.block_number, flashblock_number_min: bundle.flashblock_number_min, @@ -243,7 +243,7 @@ impl BundleTxs for AcceptedBundle { impl AcceptedBundle { pub fn new(bundle: ParsedBundle, meter_bundle_response: MeterBundleResponse) -> Self { - AcceptedBundle { + Self { uuid: bundle.replacement_uuid.unwrap_or_else(Uuid::new_v4), txs: bundle.txs, block_number: bundle.block_number, @@ -258,7 +258,7 @@ impl AcceptedBundle { } } - pub fn uuid(&self) -> &Uuid { + pub const fn uuid(&self) -> &Uuid { &self.uuid } } diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index d2d090f..d2b2865 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -21,6 +21,7 @@ alloy-signer-local.workspace = true reth-optimism-evm.workspace = true reth-rpc-eth-types.workspace = true account-abstraction-core.workspace = true +alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } tokio = { workspace = true, features = ["full"] } tracing = { workspace = true, features = ["std"] } anyhow = { workspace = true, features = ["std"] } @@ -33,7 +34,6 @@ backon = { workspace = true, features = ["std", "tokio-sleep"] } axum = { workspace = true, features = ["tokio", "http1", "json"] } clap = { version = "4.5.47", features = ["std", "derive", "env"] } op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } -alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } [dev-dependencies] mockall = "0.13" From 2d70ac00ddc206866adb1423bba4767c226754c0 Mon Sep 17 00:00:00 2001 From: refcell Date: Tue, 6 Jan 2026 10:36:33 -0500 Subject: [PATCH 101/117] chore(audit): apply workspace lints (#130) --- Cargo.lock | 7 --- crates/audit/Cargo.toml | 10 +--- crates/audit/src/archiver.rs | 14 +++++ crates/audit/src/lib.rs | 53 +++++++++++++---- crates/audit/src/metrics.rs | 12 ++++ crates/audit/src/publisher.rs | 43 +++++++++++--- crates/audit/src/reader.rs | 41 +++++++++++++ crates/audit/src/storage.rs | 88 +++++++++++++++++++++++---- crates/audit/src/types.rs | 109 ++++++++++++++++++++++++---------- 9 files changed, 300 insertions(+), 77 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2b5fa99..7c3206c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7008,18 +7008,12 @@ version = "0.1.0" dependencies = [ "alloy-consensus", "alloy-primitives", - "alloy-provider", "anyhow", "async-trait", - "aws-config", - "aws-credential-types", "aws-sdk-s3", "bytes", - "clap", - "dotenvy", "metrics", "metrics-derive", - "op-alloy-consensus", "rdkafka", "serde", "serde_json", @@ -7028,7 +7022,6 @@ dependencies = [ "tips-core", "tokio", "tracing", - "tracing-subscriber 0.3.22", "uuid", ] diff --git a/crates/audit/Cargo.toml b/crates/audit/Cargo.toml index 84df131..d8957d9 100644 --- a/crates/audit/Cargo.toml +++ b/crates/audit/Cargo.toml @@ -7,13 +7,14 @@ homepage.workspace = true repository.workspace = true edition.workspace = true +[lints] +workspace = true + [dependencies] bytes.workspace = true metrics.workspace = true -dotenvy.workspace = true async-trait.workspace = true metrics-derive.workspace = true -aws-credential-types.workspace = true tips-core = { workspace = true, features = ["test-utils"] } serde = { workspace = true, features = ["std", "derive"] } tokio = { workspace = true, features = ["full"] } @@ -23,12 +24,7 @@ anyhow = { workspace = true, features = ["std"] } serde_json = { workspace = true, features = ["std"] } rdkafka = { workspace = true, features = ["tokio", "libz"] } alloy-consensus = { workspace = true, features = ["std"] } -alloy-provider = { workspace = true, features = ["reqwest"] } -clap = { version = "4.5.47", features = ["std", "derive", "env"] } -op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } -tracing-subscriber = { workspace = true, features = ["std", "fmt", "env-filter", "json"] } -aws-config = { workspace = true, features = ["default-https-client", "rt-tokio"] } aws-sdk-s3 = { workspace = true, features = ["rustls", "default-https-client", "rt-tokio"] } [dev-dependencies] diff --git a/crates/audit/src/archiver.rs b/crates/audit/src/archiver.rs index 0626f60..832e7ff 100644 --- a/crates/audit/src/archiver.rs +++ b/crates/audit/src/archiver.rs @@ -2,10 +2,12 @@ use crate::metrics::Metrics; use crate::reader::EventReader; use crate::storage::EventWriter; use anyhow::Result; +use std::fmt; use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; use tokio::time::sleep; use tracing::{error, info}; +/// Archives audit events from Kafka to S3 storage. pub struct KafkaAuditArchiver where R: EventReader, @@ -16,11 +18,22 @@ where metrics: Metrics, } +impl fmt::Debug for KafkaAuditArchiver +where + R: EventReader, + W: EventWriter + Clone + Send + 'static, +{ + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("KafkaAuditArchiver").finish_non_exhaustive() + } +} + impl KafkaAuditArchiver where R: EventReader, W: EventWriter + Clone + Send + 'static, { + /// Creates a new archiver with the given reader and writer. pub fn new(reader: R, writer: W) -> Self { Self { reader, @@ -29,6 +42,7 @@ where } } + /// Runs the archiver loop, reading events and writing them to storage. pub async fn run(&mut self) -> Result<()> { info!("Starting Kafka bundle archiver"); diff --git a/crates/audit/src/lib.rs b/crates/audit/src/lib.rs index 13c1bf5..8291936 100644 --- a/crates/audit/src/lib.rs +++ b/crates/audit/src/lib.rs @@ -1,19 +1,47 @@ -pub mod archiver; -pub mod metrics; -pub mod publisher; -pub mod reader; -pub mod storage; -pub mod types; +//! Audit library for tracking and archiving bundle and user operation events. +//! +//! This crate provides functionality for publishing events to Kafka, +//! archiving them to S3, and reading event history. + +#![doc(issue_tracker_base_url = "https://github.com/base/tips/issues/")] +#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] +#![cfg_attr(not(test), warn(unused_crate_dependencies))] + +mod archiver; +pub use archiver::KafkaAuditArchiver; + +mod metrics; +pub use metrics::Metrics; + +mod publisher; +pub use publisher::{ + BundleEventPublisher, KafkaBundleEventPublisher, KafkaUserOpEventPublisher, + LoggingBundleEventPublisher, LoggingUserOpEventPublisher, UserOpEventPublisher, +}; + +mod reader; +pub use reader::{ + Event, EventReader, KafkaAuditLogReader, KafkaUserOpAuditLogReader, UserOpEventReader, + UserOpEventWrapper, assign_topic_partition, create_kafka_consumer, +}; + +mod storage; +pub use storage::{ + BundleEventS3Reader, BundleHistory, BundleHistoryEvent, EventWriter, S3EventReaderWriter, + S3Key, TransactionMetadata, UserOpEventS3Reader, UserOpEventWriter, UserOpHistory, + UserOpHistoryEvent, +}; + +mod types; +pub use types::{ + BundleEvent, BundleId, DropReason, Transaction, TransactionId, UserOpDropReason, UserOpEvent, + UserOpHash, +}; use tokio::sync::mpsc; use tracing::error; -pub use archiver::*; -pub use publisher::*; -pub use reader::*; -pub use storage::*; -pub use types::*; - +/// Connects a bundle event receiver to a publisher, spawning a task to forward events. pub fn connect_audit_to_publisher

    (event_rx: mpsc::UnboundedReceiver, publisher: P) where P: BundleEventPublisher + 'static, @@ -28,6 +56,7 @@ where }); } +/// Connects a user operation event receiver to a publisher, spawning a task to forward events. pub fn connect_userop_audit_to_publisher

    ( event_rx: mpsc::UnboundedReceiver, publisher: P, diff --git a/crates/audit/src/metrics.rs b/crates/audit/src/metrics.rs index d178911..fd09eaa 100644 --- a/crates/audit/src/metrics.rs +++ b/crates/audit/src/metrics.rs @@ -1,39 +1,51 @@ use metrics::{Counter, Gauge, Histogram}; use metrics_derive::Metrics; +/// Metrics for audit operations including Kafka reads, S3 writes, and event processing. #[derive(Metrics, Clone)] #[metrics(scope = "tips_audit")] pub struct Metrics { + /// Duration of archive_event operations. #[metric(describe = "Duration of archive_event")] pub archive_event_duration: Histogram, + /// Age of event when processed (now - event timestamp). #[metric(describe = "Age of event when processed (now - event timestamp)")] pub event_age: Histogram, + /// Duration of Kafka read_event operations. #[metric(describe = "Duration of Kafka read_event")] pub kafka_read_duration: Histogram, + /// Duration of Kafka commit operations. #[metric(describe = "Duration of Kafka commit")] pub kafka_commit_duration: Histogram, + /// Duration of update_bundle_history operations. #[metric(describe = "Duration of update_bundle_history")] pub update_bundle_history_duration: Histogram, + /// Duration of updating all transaction indexes. #[metric(describe = "Duration of update all transaction indexes")] pub update_tx_indexes_duration: Histogram, + /// Duration of S3 get_object operations. #[metric(describe = "Duration of S3 get_object")] pub s3_get_duration: Histogram, + /// Duration of S3 put_object operations. #[metric(describe = "Duration of S3 put_object")] pub s3_put_duration: Histogram, + /// Total events processed. #[metric(describe = "Total events processed")] pub events_processed: Counter, + /// Total S3 writes skipped due to deduplication. #[metric(describe = "Total S3 writes skipped due to dedup")] pub s3_writes_skipped: Counter, + /// Number of in-flight archive tasks. #[metric(describe = "Number of in-flight archive tasks")] pub in_flight_archive_tasks: Gauge, } diff --git a/crates/audit/src/publisher.rs b/crates/audit/src/publisher.rs index bc3004c..3058543 100644 --- a/crates/audit/src/publisher.rs +++ b/crates/audit/src/publisher.rs @@ -2,24 +2,36 @@ use crate::types::{BundleEvent, UserOpEvent}; use anyhow::Result; use async_trait::async_trait; use rdkafka::producer::{FutureProducer, FutureRecord}; -use serde_json; use tracing::{debug, error, info}; +/// Trait for publishing bundle events. #[async_trait] pub trait BundleEventPublisher: Send + Sync { + /// Publishes a single bundle event. async fn publish(&self, event: BundleEvent) -> Result<()>; + /// Publishes multiple bundle events. async fn publish_all(&self, events: Vec) -> Result<()>; } +/// Publishes bundle events to Kafka. #[derive(Clone)] pub struct KafkaBundleEventPublisher { producer: FutureProducer, topic: String, } +impl std::fmt::Debug for KafkaBundleEventPublisher { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("KafkaBundleEventPublisher") + .field("topic", &self.topic) + .finish_non_exhaustive() + } +} + impl KafkaBundleEventPublisher { - pub fn new(producer: FutureProducer, topic: String) -> Self { + /// Creates a new Kafka bundle event publisher. + pub const fn new(producer: FutureProducer, topic: String) -> Self { Self { producer, topic } } @@ -71,11 +83,13 @@ impl BundleEventPublisher for KafkaBundleEventPublisher { } } -#[derive(Clone)] +/// Publishes bundle events to logs (for testing/debugging). +#[derive(Clone, Debug)] pub struct LoggingBundleEventPublisher; impl LoggingBundleEventPublisher { - pub fn new() -> Self { + /// Creates a new logging bundle event publisher. + pub const fn new() -> Self { Self } } @@ -105,21 +119,34 @@ impl BundleEventPublisher for LoggingBundleEventPublisher { } } +/// Trait for publishing user operation events. #[async_trait] pub trait UserOpEventPublisher: Send + Sync { + /// Publishes a single user operation event. async fn publish(&self, event: UserOpEvent) -> Result<()>; + /// Publishes multiple user operation events. async fn publish_all(&self, events: Vec) -> Result<()>; } +/// Publishes user operation events to Kafka. #[derive(Clone)] pub struct KafkaUserOpEventPublisher { producer: FutureProducer, topic: String, } +impl std::fmt::Debug for KafkaUserOpEventPublisher { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("KafkaUserOpEventPublisher") + .field("topic", &self.topic) + .finish_non_exhaustive() + } +} + impl KafkaUserOpEventPublisher { - pub fn new(producer: FutureProducer, topic: String) -> Self { + /// Creates a new Kafka user operation event publisher. + pub const fn new(producer: FutureProducer, topic: String) -> Self { Self { producer, topic } } @@ -171,11 +198,13 @@ impl UserOpEventPublisher for KafkaUserOpEventPublisher { } } -#[derive(Clone)] +/// Publishes user operation events to logs (for testing/debugging). +#[derive(Clone, Debug)] pub struct LoggingUserOpEventPublisher; impl LoggingUserOpEventPublisher { - pub fn new() -> Self { + /// Creates a new logging user operation event publisher. + pub const fn new() -> Self { Self } } diff --git a/crates/audit/src/reader.rs b/crates/audit/src/reader.rs index 7e4de6a..50697a2 100644 --- a/crates/audit/src/reader.rs +++ b/crates/audit/src/reader.rs @@ -12,6 +12,7 @@ use tips_core::kafka::load_kafka_config_from_file; use tokio::time::sleep; use tracing::{debug, error}; +/// Creates a Kafka consumer from a properties file. pub fn create_kafka_consumer(kafka_properties_file: &str) -> Result { let client_config: ClientConfig = ClientConfig::from_iter(load_kafka_config_from_file(kafka_properties_file)?); @@ -19,6 +20,7 @@ pub fn create_kafka_consumer(kafka_properties_file: &str) -> Result Result<()> { let mut tpl = TopicPartitionList::new(); tpl.add_partition(topic, 0); @@ -26,19 +28,27 @@ pub fn assign_topic_partition(consumer: &StreamConsumer, topic: &str) -> Result< Ok(()) } +/// A bundle event with metadata from Kafka. #[derive(Debug, Clone)] pub struct Event { + /// The event key. pub key: String, + /// The bundle event. pub event: BundleEvent, + /// The event timestamp in milliseconds. pub timestamp: i64, } +/// Trait for reading bundle events. #[async_trait] pub trait EventReader { + /// Reads the next event. async fn read_event(&mut self) -> Result; + /// Commits the last read message. async fn commit(&mut self) -> Result<()>; } +/// Reads bundle audit events from Kafka. pub struct KafkaAuditLogReader { consumer: StreamConsumer, topic: String, @@ -46,7 +56,18 @@ pub struct KafkaAuditLogReader { last_message_partition: Option, } +impl std::fmt::Debug for KafkaAuditLogReader { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("KafkaAuditLogReader") + .field("topic", &self.topic) + .field("last_message_offset", &self.last_message_offset) + .field("last_message_partition", &self.last_message_partition) + .finish_non_exhaustive() + } +} + impl KafkaAuditLogReader { + /// Creates a new Kafka audit log reader. pub fn new(consumer: StreamConsumer, topic: String) -> Result { consumer.subscribe(&[&topic])?; Ok(Self { @@ -125,24 +146,33 @@ impl EventReader for KafkaAuditLogReader { } impl KafkaAuditLogReader { + /// Returns the topic this reader is subscribed to. pub fn topic(&self) -> &str { &self.topic } } +/// A user operation event with metadata from Kafka. #[derive(Debug, Clone)] pub struct UserOpEventWrapper { + /// The event key. pub key: String, + /// The user operation event. pub event: UserOpEvent, + /// The event timestamp in milliseconds. pub timestamp: i64, } +/// Trait for reading user operation events. #[async_trait] pub trait UserOpEventReader { + /// Reads the next user operation event. async fn read_event(&mut self) -> Result; + /// Commits the last read message. async fn commit(&mut self) -> Result<()>; } +/// Reads user operation audit events from Kafka. pub struct KafkaUserOpAuditLogReader { consumer: StreamConsumer, topic: String, @@ -150,7 +180,18 @@ pub struct KafkaUserOpAuditLogReader { last_message_partition: Option, } +impl std::fmt::Debug for KafkaUserOpAuditLogReader { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("KafkaUserOpAuditLogReader") + .field("topic", &self.topic) + .field("last_message_offset", &self.last_message_offset) + .field("last_message_partition", &self.last_message_partition) + .finish_non_exhaustive() + } +} + impl KafkaUserOpAuditLogReader { + /// Creates a new Kafka user operation audit log reader. pub fn new(consumer: StreamConsumer, topic: String) -> Result { consumer.subscribe(&[&topic])?; Ok(Self { diff --git a/crates/audit/src/storage.rs b/crates/audit/src/storage.rs index 58ad115..a0ba49f 100644 --- a/crates/audit/src/storage.rs +++ b/crates/audit/src/storage.rs @@ -17,116 +17,167 @@ use std::time::Instant; use tips_core::AcceptedBundle; use tracing::info; +/// S3 key types for storing different event types. #[derive(Debug)] pub enum S3Key { + /// Key for bundle events. Bundle(BundleId), + /// Key for transaction lookups by hash. TransactionByHash(TxHash), + /// Key for user operation events. UserOp(UserOpHash), } impl fmt::Display for S3Key { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - S3Key::Bundle(bundle_id) => write!(f, "bundles/{bundle_id}"), - S3Key::TransactionByHash(hash) => write!(f, "transactions/by_hash/{hash}"), - S3Key::UserOp(user_op_hash) => write!(f, "userops/{user_op_hash}"), + Self::Bundle(bundle_id) => write!(f, "bundles/{bundle_id}"), + Self::TransactionByHash(hash) => write!(f, "transactions/by_hash/{hash}"), + Self::UserOp(user_op_hash) => write!(f, "userops/{user_op_hash}"), } } } +/// Metadata for a transaction, tracking which bundles it belongs to. #[derive(Debug, Clone, Serialize, Deserialize, Default)] pub struct TransactionMetadata { + /// Bundle IDs that contain this transaction. pub bundle_ids: Vec, } +/// History event for a bundle. #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(tag = "event", content = "data")] pub enum BundleHistoryEvent { + /// Bundle was received. Received { + /// Event key. key: String, + /// Event timestamp. timestamp: i64, + /// The accepted bundle. bundle: Box, }, + /// Bundle was cancelled. Cancelled { + /// Event key. key: String, + /// Event timestamp. timestamp: i64, }, + /// Bundle was included by a builder. BuilderIncluded { + /// Event key. key: String, + /// Event timestamp. timestamp: i64, + /// Builder identifier. builder: String, + /// Block number. block_number: u64, + /// Flashblock index. flashblock_index: u64, }, + /// Bundle was included in a block. BlockIncluded { + /// Event key. key: String, + /// Event timestamp. timestamp: i64, + /// Block number. block_number: u64, + /// Block hash. block_hash: TxHash, }, + /// Bundle was dropped. Dropped { + /// Event key. key: String, + /// Event timestamp. timestamp: i64, + /// Drop reason. reason: DropReason, }, } impl BundleHistoryEvent { + /// Returns the event key. pub fn key(&self) -> &str { match self { - BundleHistoryEvent::Received { key, .. } => key, - BundleHistoryEvent::Cancelled { key, .. } => key, - BundleHistoryEvent::BuilderIncluded { key, .. } => key, - BundleHistoryEvent::BlockIncluded { key, .. } => key, - BundleHistoryEvent::Dropped { key, .. } => key, + Self::Received { key, .. } => key, + Self::Cancelled { key, .. } => key, + Self::BuilderIncluded { key, .. } => key, + Self::BlockIncluded { key, .. } => key, + Self::Dropped { key, .. } => key, } } } +/// History of events for a bundle. #[derive(Debug, Clone, Serialize, Deserialize, Default)] pub struct BundleHistory { + /// List of history events. pub history: Vec, } +/// History event for a user operation. #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(tag = "event", content = "data")] pub enum UserOpHistoryEvent { + /// User operation was added to the mempool. AddedToMempool { + /// Event key. key: String, + /// Event timestamp. timestamp: i64, + /// Sender address. sender: Address, + /// Entry point address. entry_point: Address, + /// Nonce. nonce: U256, }, + /// User operation was dropped. Dropped { + /// Event key. key: String, + /// Event timestamp. timestamp: i64, + /// Drop reason. reason: UserOpDropReason, }, + /// User operation was included in a block. Included { + /// Event key. key: String, + /// Event timestamp. timestamp: i64, + /// Block number. block_number: u64, + /// Transaction hash. tx_hash: TxHash, }, } impl UserOpHistoryEvent { + /// Returns the event key. pub fn key(&self) -> &str { match self { - UserOpHistoryEvent::AddedToMempool { key, .. } => key, - UserOpHistoryEvent::Dropped { key, .. } => key, - UserOpHistoryEvent::Included { key, .. } => key, + Self::AddedToMempool { key, .. } => key, + Self::Dropped { key, .. } => key, + Self::Included { key, .. } => key, } } } +/// History of events for a user operation. #[derive(Debug, Clone, Serialize, Deserialize, Default)] pub struct UserOpHistory { + /// List of history events. pub history: Vec, } -pub use crate::reader::UserOpEventWrapper; +pub(crate) use crate::reader::UserOpEventWrapper; fn update_bundle_history_transform( bundle_history: BundleHistory, @@ -268,31 +319,41 @@ fn update_userop_history_transform( Some(userop_history) } +/// Trait for writing bundle events to storage. #[async_trait] pub trait EventWriter { + /// Archives a bundle event. async fn archive_event(&self, event: Event) -> Result<()>; } +/// Trait for writing user operation events to storage. #[async_trait] pub trait UserOpEventWriter { + /// Archives a user operation event. async fn archive_userop_event(&self, event: UserOpEventWrapper) -> Result<()>; } +/// Trait for reading bundle events from S3. #[async_trait] pub trait BundleEventS3Reader { + /// Gets the bundle history for a given bundle ID. async fn get_bundle_history(&self, bundle_id: BundleId) -> Result>; + /// Gets transaction metadata for a given transaction hash. async fn get_transaction_metadata( &self, tx_hash: TxHash, ) -> Result>; } +/// Trait for reading user operation events from S3. #[async_trait] pub trait UserOpEventS3Reader { + /// Gets the user operation history for a given hash. async fn get_userop_history(&self, user_op_hash: UserOpHash) -> Result>; } -#[derive(Clone)] +/// S3-backed event reader and writer. +#[derive(Clone, Debug)] pub struct S3EventReaderWriter { s3_client: S3Client, bucket: String, @@ -300,6 +361,7 @@ pub struct S3EventReaderWriter { } impl S3EventReaderWriter { + /// Creates a new S3 event reader/writer. pub fn new(s3_client: S3Client, bucket: String) -> Self { Self { s3_client, diff --git a/crates/audit/src/types.rs b/crates/audit/src/types.rs index f27241a..6200572 100644 --- a/crates/audit/src/types.rs +++ b/crates/audit/src/types.rs @@ -5,102 +5,134 @@ use serde::{Deserialize, Serialize}; use tips_core::AcceptedBundle; use uuid::Uuid; +/// Unique identifier for a transaction. #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] pub struct TransactionId { + /// The sender address. pub sender: Address, + /// The transaction nonce. pub nonce: U256, + /// The transaction hash. pub hash: TxHash, } +/// Unique identifier for a bundle. pub type BundleId = Uuid; +/// Reason a bundle was dropped. #[derive(Debug, Clone, Serialize, Deserialize)] pub enum DropReason { + /// Bundle timed out. TimedOut, + /// Bundle transaction reverted. Reverted, } +/// A transaction with its data. #[derive(Debug, Clone, Serialize, Deserialize)] pub struct Transaction { + /// Transaction identifier. pub id: TransactionId, + /// Raw transaction data. pub data: Bytes, } +/// Hash of a user operation. pub type UserOpHash = B256; +/// Reason a user operation was dropped. #[derive(Debug, Clone, Serialize, Deserialize)] pub enum UserOpDropReason { + /// User operation was invalid. Invalid(String), + /// User operation expired. Expired, + /// Replaced by a higher fee user operation. ReplacedByHigherFee, } +/// Bundle lifecycle event. #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(tag = "event", content = "data")] pub enum BundleEvent { + /// Bundle was received. Received { + /// Bundle identifier. bundle_id: BundleId, + /// The accepted bundle. bundle: Box, }, + /// Bundle was cancelled. Cancelled { + /// Bundle identifier. bundle_id: BundleId, }, + /// Bundle was included by a builder. BuilderIncluded { + /// Bundle identifier. bundle_id: BundleId, + /// Builder identifier. builder: String, + /// Block number. block_number: u64, + /// Flashblock index. flashblock_index: u64, }, + /// Bundle was included in a block. BlockIncluded { + /// Bundle identifier. bundle_id: BundleId, + /// Block number. block_number: u64, + /// Block hash. block_hash: TxHash, }, + /// Bundle was dropped. Dropped { + /// Bundle identifier. bundle_id: BundleId, + /// Drop reason. reason: DropReason, }, } impl BundleEvent { - pub fn bundle_id(&self) -> BundleId { + /// Returns the bundle ID for this event. + pub const fn bundle_id(&self) -> BundleId { match self { - BundleEvent::Received { bundle_id, .. } => *bundle_id, - BundleEvent::Cancelled { bundle_id, .. } => *bundle_id, - BundleEvent::BuilderIncluded { bundle_id, .. } => *bundle_id, - BundleEvent::BlockIncluded { bundle_id, .. } => *bundle_id, - BundleEvent::Dropped { bundle_id, .. } => *bundle_id, + Self::Received { bundle_id, .. } => *bundle_id, + Self::Cancelled { bundle_id, .. } => *bundle_id, + Self::BuilderIncluded { bundle_id, .. } => *bundle_id, + Self::BlockIncluded { bundle_id, .. } => *bundle_id, + Self::Dropped { bundle_id, .. } => *bundle_id, } } + /// Returns transaction IDs from this event (only for Received events). pub fn transaction_ids(&self) -> Vec { match self { - BundleEvent::Received { bundle, .. } => { - bundle - .txs - .iter() - .filter_map(|envelope| { - match envelope.recover_signer() { - Ok(sender) => Some(TransactionId { - sender, - nonce: U256::from(envelope.nonce()), - hash: *envelope.hash(), - }), - Err(_) => None, // Skip invalid transactions - } + Self::Received { bundle, .. } => bundle + .txs + .iter() + .filter_map(|envelope| { + envelope.recover_signer().ok().map(|sender| TransactionId { + sender, + nonce: U256::from(envelope.nonce()), + hash: *envelope.hash(), }) - .collect() - } - BundleEvent::Cancelled { .. } => vec![], - BundleEvent::BuilderIncluded { .. } => vec![], - BundleEvent::BlockIncluded { .. } => vec![], - BundleEvent::Dropped { .. } => vec![], + }) + .collect(), + Self::Cancelled { .. } => vec![], + Self::BuilderIncluded { .. } => vec![], + Self::BlockIncluded { .. } => vec![], + Self::Dropped { .. } => vec![], } } + /// Generates a unique event key for this event. pub fn generate_event_key(&self) -> String { match self { - BundleEvent::BlockIncluded { + Self::BlockIncluded { bundle_id, block_hash, .. @@ -114,38 +146,53 @@ impl BundleEvent { } } +/// User operation lifecycle event. #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(tag = "event", content = "data")] pub enum UserOpEvent { + /// User operation was added to the mempool. AddedToMempool { + /// Hash of the user operation. user_op_hash: UserOpHash, + /// Sender address. sender: Address, + /// Entry point address. entry_point: Address, + /// Nonce. nonce: U256, }, + /// User operation was dropped. Dropped { + /// Hash of the user operation. user_op_hash: UserOpHash, + /// Reason for dropping. reason: UserOpDropReason, }, + /// User operation was included in a block. Included { + /// Hash of the user operation. user_op_hash: UserOpHash, + /// Block number. block_number: u64, + /// Transaction hash. tx_hash: TxHash, }, } impl UserOpEvent { - pub fn user_op_hash(&self) -> UserOpHash { + /// Returns the user operation hash for this event. + pub const fn user_op_hash(&self) -> UserOpHash { match self { - UserOpEvent::AddedToMempool { user_op_hash, .. } => *user_op_hash, - UserOpEvent::Dropped { user_op_hash, .. } => *user_op_hash, - UserOpEvent::Included { user_op_hash, .. } => *user_op_hash, + Self::AddedToMempool { user_op_hash, .. } => *user_op_hash, + Self::Dropped { user_op_hash, .. } => *user_op_hash, + Self::Included { user_op_hash, .. } => *user_op_hash, } } + /// Generates a unique event key for this event. pub fn generate_event_key(&self) -> String { match self { - UserOpEvent::Included { + Self::Included { user_op_hash, tx_hash, .. From 4a45faf72a100083e739767872e0e361243cced1 Mon Sep 17 00:00:00 2001 From: refcell Date: Tue, 6 Jan 2026 12:19:24 -0500 Subject: [PATCH 102/117] chore(workspace): remove reth dependency and use base-reth-rpc-types in place (#131) --- Cargo.lock | 13 ++++++++++--- Cargo.toml | 6 ++---- crates/account-abstraction-core/Cargo.toml | 1 - crates/ingress-rpc/Cargo.toml | 3 +-- crates/ingress-rpc/src/service.rs | 2 +- crates/ingress-rpc/src/validation.rs | 3 +-- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7c3206c..6d7af52 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,7 +16,6 @@ dependencies = [ "jsonrpsee", "op-alloy-network", "rdkafka", - "reth-rpc-eth-types", "serde", "serde_json", "tips-core", @@ -1603,6 +1602,15 @@ dependencies = [ "tokio", ] +[[package]] +name = "base-reth-rpc-types" +version = "0.2.1" +source = "git+https://github.com/base/node-reth?branch=main#6eb0b53eb7ed6aa087058f898e8f965f423b9521" +dependencies = [ + "reth-optimism-evm", + "reth-rpc-eth-types", +] + [[package]] name = "base16ct" version = "0.2.0" @@ -7078,6 +7086,7 @@ dependencies = [ "async-trait", "axum", "backon", + "base-reth-rpc-types", "clap", "dotenvy", "jsonrpsee", @@ -7088,8 +7097,6 @@ dependencies = [ "op-alloy-network", "op-revm", "rdkafka", - "reth-optimism-evm", - "reth-rpc-eth-types", "serde_json", "tips-audit-lib", "tips-core", diff --git a/Cargo.toml b/Cargo.toml index 02e2475..bf8b84a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,10 +38,8 @@ tips-ingress-rpc-lib = { path = "crates/ingress-rpc" } tips-system-tests = { path = "crates/system-tests" } account-abstraction-core = { path = "crates/account-abstraction-core" } -# reth -reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" } +# base-reth +base-reth-rpc-types = { git = "https://github.com/base/node-reth", branch = "main" } # revm op-revm = { version = "12.0.0", default-features = false } diff --git a/crates/account-abstraction-core/Cargo.toml b/crates/account-abstraction-core/Cargo.toml index 6a61a62..9381826 100644 --- a/crates/account-abstraction-core/Cargo.toml +++ b/crates/account-abstraction-core/Cargo.toml @@ -13,7 +13,6 @@ alloy-serde.workspace = true async-trait.workspace = true alloy-sol-types.workspace = true op-alloy-network.workspace = true -reth-rpc-eth-types.workspace = true serde = { workspace = true, features = ["std", "derive"] } tokio = { workspace = true, features = ["full"] } tracing = { workspace = true, features = ["std"] } diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index d2b2865..9708088 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -18,8 +18,7 @@ async-trait.workspace = true metrics-derive.workspace = true op-alloy-network.workspace = true alloy-signer-local.workspace = true -reth-optimism-evm.workspace = true -reth-rpc-eth-types.workspace = true +base-reth-rpc-types.workspace = true account-abstraction-core.workspace = true alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } tokio = { workspace = true, features = ["full"] } diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 4ac51fb..0dd3f34 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -7,13 +7,13 @@ use alloy_consensus::transaction::Recovered; use alloy_consensus::{Transaction, transaction::SignerRecoverable}; use alloy_primitives::{Address, B256, Bytes, FixedBytes}; use alloy_provider::{Provider, RootProvider, network::eip2718::Decodable2718}; +use base_reth_rpc_types::EthApiError; use jsonrpsee::{ core::{RpcResult, async_trait}, proc_macros::rpc, }; use op_alloy_consensus::OpTxEnvelope; use op_alloy_network::Optimism; -use reth_rpc_eth_types::EthApiError; use std::time::{SystemTime, UNIX_EPOCH}; use tips_audit_lib::BundleEvent; use tips_core::types::ParsedBundle; diff --git a/crates/ingress-rpc/src/validation.rs b/crates/ingress-rpc/src/validation.rs index b84dbbd..5ce1044 100644 --- a/crates/ingress-rpc/src/validation.rs +++ b/crates/ingress-rpc/src/validation.rs @@ -2,11 +2,10 @@ use alloy_consensus::private::alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_primitives::{Address, B256, U256}; use alloy_provider::{Provider, RootProvider}; use async_trait::async_trait; +use base_reth_rpc_types::{EthApiError, SignError, extract_l1_info_from_tx}; use jsonrpsee::core::RpcResult; use op_alloy_network::Optimism; use op_revm::l1block::L1BlockInfo; -use reth_optimism_evm::extract_l1_info_from_tx; -use reth_rpc_eth_types::{EthApiError, SignError}; use std::collections::HashSet; use std::time::{Duration, SystemTime, UNIX_EPOCH}; use tips_core::Bundle; From 9e422cc5741bd31fb391c645e1880fc2094572ba Mon Sep 17 00:00:00 2001 From: William Law Date: Tue, 6 Jan 2026 13:15:53 -0500 Subject: [PATCH 103/117] chore: feature flag `user_op_properties_file` (#132) * spike feat flag * add zstd * wait for kafka topics to be made * revert docker --- Cargo.lock | 77 ++++++++++++++++++++++ bin/tips-ingress-rpc/src/main.rs | 37 +++++++---- crates/account-abstraction-core/Cargo.toml | 2 +- crates/audit/Cargo.toml | 2 +- crates/ingress-rpc/Cargo.toml | 2 +- crates/ingress-rpc/src/lib.rs | 2 +- crates/ingress-rpc/src/service.rs | 23 ++++--- crates/system-tests/Cargo.toml | 2 +- 8 files changed, 119 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d7af52..c0f4707 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1645,6 +1645,24 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e050f626429857a27ddccb31e0aca21356bfa709c04041aefddac081a8f068a" +[[package]] +name = "bindgen" +version = "0.72.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" +dependencies = [ + "bitflags 2.10.0", + "cexpr", + "clang-sys", + "itertools 0.10.5", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.111", +] + [[package]] name = "bit-set" version = "0.8.0" @@ -1868,6 +1886,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + [[package]] name = "cfg-if" version = "1.0.4" @@ -1892,6 +1919,17 @@ dependencies = [ "windows-link", ] +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + [[package]] name = "clap" version = "4.5.53" @@ -3652,6 +3690,16 @@ version = "0.2.178" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" +[[package]] +name = "libloading" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" +dependencies = [ + "cfg-if", + "windows-link", +] + [[package]] name = "libm" version = "0.2.15" @@ -3838,6 +3886,12 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.8.9" @@ -3922,6 +3976,16 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "nu-ansi-term" version = "0.50.3" @@ -4200,6 +4264,15 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" +[[package]] +name = "openssl-src" +version = "300.5.4+3.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507b3792995dae9b0df8a1c1e3771e8418b7c2d9f0baeba32e6fe8b06c7cb72" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.111" @@ -4208,6 +4281,7 @@ checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -4797,7 +4871,9 @@ dependencies = [ "libc", "libz-sys", "num_enum", + "openssl-sys", "pkg-config", + "zstd-sys", ] [[package]] @@ -8294,6 +8370,7 @@ version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ + "bindgen", "cc", "pkg-config", ] diff --git a/bin/tips-ingress-rpc/src/main.rs b/bin/tips-ingress-rpc/src/main.rs index fb47d72..dcb22c2 100644 --- a/bin/tips-ingress-rpc/src/main.rs +++ b/bin/tips-ingress-rpc/src/main.rs @@ -73,18 +73,27 @@ async fn main() -> anyhow::Result<()> { let (audit_tx, audit_rx) = mpsc::unbounded_channel::(); connect_audit_to_publisher(audit_rx, audit_publisher); - let user_op_properties_file = &config.user_operation_consumer_properties; - - let mempool_engine = create_mempool_engine( - user_op_properties_file, - &config.user_operation_topic, - &config.user_operation_consumer_group_id, - None, - )?; - - let mempool_engine_handle = { - let engine = mempool_engine.clone(); - tokio::spawn(async move { engine.run().await }) + let (mempool_engine, mempool_engine_handle) = if let Some(user_op_properties_file) = + &config.user_operation_consumer_properties + { + let engine = create_mempool_engine( + user_op_properties_file, + &config.user_operation_topic, + &config.user_operation_consumer_group_id, + None, + )?; + + let handle = { + let engine_clone = engine.clone(); + tokio::spawn(async move { engine_clone.run().await }) + }; + + (Some(engine), Some(handle)) + } else { + info!( + "User operation consumer properties not provided, skipping mempool engine initialization" + ); + (None, None) }; let (builder_tx, _) = @@ -126,7 +135,9 @@ async fn main() -> anyhow::Result<()> { handle.stopped().await; health_handle.abort(); - mempool_engine_handle.abort(); + if let Some(engine_handle) = mempool_engine_handle { + engine_handle.abort(); + } Ok(()) } diff --git a/crates/account-abstraction-core/Cargo.toml b/crates/account-abstraction-core/Cargo.toml index 9381826..53b843d 100644 --- a/crates/account-abstraction-core/Cargo.toml +++ b/crates/account-abstraction-core/Cargo.toml @@ -18,7 +18,7 @@ tokio = { workspace = true, features = ["full"] } tracing = { workspace = true, features = ["std"] } anyhow = { workspace = true, features = ["std"] } serde_json = { workspace = true, features = ["std"] } -rdkafka = { workspace = true, features = ["tokio", "libz"] } +rdkafka = { workspace = true, features = ["tokio", "libz", "zstd", "ssl-vendored"] } alloy-rpc-types = { workspace = true, features = ["eth"] } jsonrpsee = { workspace = true, features = ["server", "macros"] } alloy-provider = { workspace = true, features = ["reqwest"] } diff --git a/crates/audit/Cargo.toml b/crates/audit/Cargo.toml index d8957d9..76c5ad6 100644 --- a/crates/audit/Cargo.toml +++ b/crates/audit/Cargo.toml @@ -22,7 +22,7 @@ uuid = { workspace = true, features = ["v4", "serde"] } tracing = { workspace = true, features = ["std"] } anyhow = { workspace = true, features = ["std"] } serde_json = { workspace = true, features = ["std"] } -rdkafka = { workspace = true, features = ["tokio", "libz"] } +rdkafka = { workspace = true, features = ["tokio", "libz", "zstd", "ssl-vendored"] } alloy-consensus = { workspace = true, features = ["std"] } alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } aws-sdk-s3 = { workspace = true, features = ["rustls", "default-https-client", "rt-tokio"] } diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index 9708088..9291d8f 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -25,7 +25,7 @@ tokio = { workspace = true, features = ["full"] } tracing = { workspace = true, features = ["std"] } anyhow = { workspace = true, features = ["std"] } serde_json = { workspace = true, features = ["std"] } -rdkafka = { workspace = true, features = ["tokio", "libz"] } +rdkafka = { workspace = true, features = ["tokio", "libz", "zstd", "ssl-vendored"] } alloy-consensus = { workspace = true, features = ["std"] } alloy-provider = { workspace = true, features = ["reqwest"] } jsonrpsee = { workspace = true, features = ["server", "macros"] } diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index 87c2dc5..1f43896 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -90,7 +90,7 @@ pub struct Config { long, env = "TIPS_INGRESS_KAFKA_USER_OPERATION_CONSUMER_PROPERTIES_FILE" )] - pub user_operation_consumer_properties: String, + pub user_operation_consumer_properties: Option, /// Consumer group id for user operation topic (set uniquely per deployment) #[arg( diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 0dd3f34..8560e48 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -73,7 +73,7 @@ pub struct IngressService { tx_submission_method: TxSubmissionMethod, bundle_queue_publisher: BundleQueuePublisher, user_op_queue_publisher: UserOpQueuePublisher, - reputation_service: Arc>, + reputation_service: Option>>, audit_channel: mpsc::UnboundedSender, send_transaction_default_lifetime_seconds: u64, metrics: Metrics, @@ -93,9 +93,10 @@ impl IngressService { audit_channel: mpsc::UnboundedSender, builder_tx: broadcast::Sender, builder_backrun_tx: broadcast::Sender, - mempool_engine: Arc>, + mempool_engine: impl Into>>>, config: Config, ) -> Self { + let mempool_engine = mempool_engine.into(); let mempool_provider = Arc::new(providers.mempool); let simulation_provider = Arc::new(providers.simulation); let raw_tx_forward_provider = providers.raw_tx_forward.map(Arc::new); @@ -104,7 +105,9 @@ impl IngressService { config.validate_user_operation_timeout_ms, ); let queue_connection = Arc::new(queue); - let reputation_service = ReputationServiceImpl::new(mempool_engine.get_mempool()); + let reputation_service = mempool_engine + .as_ref() + .map(|engine| Arc::new(ReputationServiceImpl::new(engine.get_mempool()))); Self { mempool_provider, simulation_provider, @@ -119,7 +122,7 @@ impl IngressService { queue_connection.clone(), config.ingress_topic, ), - reputation_service: Arc::new(reputation_service), + reputation_service, audit_channel, send_transaction_default_lifetime_seconds: config .send_transaction_default_lifetime_seconds, @@ -384,11 +387,11 @@ impl IngressApiServer for Ingre chain_id: 1, }; - // DO Nothing with reputation at the moment as this is scafolding - let _ = self - .reputation_service - .get_reputation(&request.user_operation.sender()) - .await; + if let Some(reputation_service) = &self.reputation_service { + let _ = reputation_service + .get_reputation(&request.user_operation.sender()) + .await; + } let user_op_hash = request.hash().map_err(|e| { warn!(message = "Failed to hash user operation", error = %e); @@ -592,7 +595,7 @@ mod tests { ingress_topic: String::new(), audit_kafka_properties: String::new(), audit_topic: String::new(), - user_operation_consumer_properties: String::new(), + user_operation_consumer_properties: Some(String::new()), user_operation_consumer_group_id: "tips-user-operation".to_string(), log_level: String::from("info"), log_format: tips_core::logger::LogFormat::Pretty, diff --git a/crates/system-tests/Cargo.toml b/crates/system-tests/Cargo.toml index d460ede..3ce797b 100644 --- a/crates/system-tests/Cargo.toml +++ b/crates/system-tests/Cargo.toml @@ -31,7 +31,7 @@ anyhow = { workspace = true, features = ["std"] } uuid = { workspace = true, features = ["v4", "serde"] } serde_json = { workspace = true, features = ["std"] } reqwest = { version = "0.12.12", features = ["json"] } -rdkafka = { workspace = true, features = ["tokio", "libz"] } +rdkafka = { workspace = true, features = ["tokio", "libz", "zstd", "ssl-vendored"] } alloy-consensus = { workspace = true, features = ["std"] } alloy-provider = { workspace = true, features = ["reqwest"] } jsonrpsee = { workspace = true, features = ["server", "macros"] } From 3e73a99d7d0c215b8cec5f061b58934d96968ac6 Mon Sep 17 00:00:00 2001 From: William Law Date: Tue, 6 Jan 2026 16:20:11 -0500 Subject: [PATCH 104/117] chore: add failed archive task counter (#134) --- crates/audit/src/archiver.rs | 1 + crates/audit/src/metrics.rs | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/crates/audit/src/archiver.rs b/crates/audit/src/archiver.rs index 832e7ff..80f038a 100644 --- a/crates/audit/src/archiver.rs +++ b/crates/audit/src/archiver.rs @@ -69,6 +69,7 @@ where let archive_start = Instant::now(); if let Err(e) = writer.archive_event(event).await { error!(error = %e, "Failed to write event"); + metrics.failed_archive_tasks.increment(1); } else { metrics .archive_event_duration diff --git a/crates/audit/src/metrics.rs b/crates/audit/src/metrics.rs index fd09eaa..906de8e 100644 --- a/crates/audit/src/metrics.rs +++ b/crates/audit/src/metrics.rs @@ -48,4 +48,8 @@ pub struct Metrics { /// Number of in-flight archive tasks. #[metric(describe = "Number of in-flight archive tasks")] pub in_flight_archive_tasks: Gauge, + + /// Number of failed archive tasks. + #[metric(describe = "Number of failed archive tasks")] + pub failed_archive_tasks: Counter, } From 0846204dc7b8a3387929816aa71c4b9ea2a19131 Mon Sep 17 00:00:00 2001 From: William Law Date: Mon, 12 Jan 2026 10:35:12 -0500 Subject: [PATCH 105/117] perf: improve audit (#123) * perf: improve audit * fix metric * wip * add error logs * worker pool * make params configurable * simplify try_join * try_join_all * chore: add more audit logs * perf: deduplicate bundles with the same contents (#137) * chore: use uuid v5 for determinism * feat: add ttl * diffs * fix: in-flight archive task * Revert "fix: in-flight archive task" This reverts commit a759f2b84f51001645fdcc124f8b88614483496a. * tmp: clear backlog by nooping * chore: log out meterbundleres * make ttl configurable --- .gitignore | 2 +- Cargo.lock | 96 ++++++++++++++++++- Cargo.toml | 2 + bin/tips-audit/src/main.rs | 17 +++- crates/audit/Cargo.toml | 3 +- crates/audit/src/archiver.rs | 112 +++++++++++++++++----- crates/audit/src/reader.rs | 5 +- crates/audit/src/storage.rs | 52 ++++++---- crates/audit/src/types.rs | 12 ++- crates/audit/tests/common/mod.rs | 5 +- crates/audit/tests/integration_tests.rs | 9 +- crates/audit/tests/s3_test.rs | 22 +++-- crates/core/Cargo.toml | 2 +- crates/core/src/types.rs | 45 ++++++++- crates/ingress-rpc/Cargo.toml | 2 + crates/ingress-rpc/src/lib.rs | 4 + crates/ingress-rpc/src/service.rs | 97 +++++++++++++------ crates/system-tests/Cargo.toml | 2 +- crates/system-tests/tests/common/kafka.rs | 8 +- 19 files changed, 398 insertions(+), 99 deletions(-) diff --git a/.gitignore b/.gitignore index cd0eced..509ea6b 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,4 @@ Thumbs.db /ui/.claude # e2e / load tests -wallets.json \ No newline at end of file +wallets.json diff --git a/Cargo.lock b/Cargo.lock index c0f4707..e08f1be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1096,6 +1096,17 @@ dependencies = [ "serde_json", ] +[[package]] +name = "async-lock" +version = "3.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" +dependencies = [ + "event-listener", + "event-listener-strategy", + "pin-project-lite", +] + [[package]] name = "async-stream" version = "0.3.6" @@ -1654,7 +1665,7 @@ dependencies = [ "bitflags 2.10.0", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.13.0", "proc-macro2", "quote", "regex", @@ -1995,6 +2006,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console" version = "0.15.11" @@ -2133,6 +2153,15 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -2596,6 +2625,27 @@ dependencies = [ "syn 2.0.111", ] +[[package]] +name = "event-listener" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "fastrand" version = "2.3.0" @@ -3959,6 +4009,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "moka" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3dec6bd31b08944e08b58fd99373893a6c17054d6f3ea5006cc894f4f4eee2a" +dependencies = [ + "async-lock", + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "equivalent", + "event-listener", + "futures-util", + "parking_lot", + "portable-atomic", + "smallvec", + "tagptr", + "uuid", +] + [[package]] name = "native-tls" version = "0.2.14" @@ -3992,7 +4062,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4332,6 +4402,12 @@ dependencies = [ "syn 2.0.111", ] +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + [[package]] name = "parking_lot" version = "0.12.5" @@ -6596,6 +6672,12 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha1_smol" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" + [[package]] name = "sha2" version = "0.10.9" @@ -6883,6 +6965,12 @@ dependencies = [ "libc", ] +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + [[package]] name = "tap" version = "1.0.1" @@ -7096,6 +7184,7 @@ dependencies = [ "async-trait", "aws-sdk-s3", "bytes", + "futures", "metrics", "metrics-derive", "rdkafka", @@ -7169,6 +7258,7 @@ dependencies = [ "metrics", "metrics-derive", "mockall", + "moka", "op-alloy-consensus", "op-alloy-network", "op-revm", @@ -7179,6 +7269,7 @@ dependencies = [ "tokio", "tracing", "url", + "uuid", "wiremock", ] @@ -7582,6 +7673,7 @@ dependencies = [ "getrandom 0.3.4", "js-sys", "serde_core", + "sha1_smol", "wasm-bindgen", ] diff --git a/Cargo.toml b/Cargo.toml index bf8b84a..623dedc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -97,3 +97,5 @@ testcontainers = { version = "0.23.1", default-features = false } tracing-subscriber = { version = "0.3.20", default-features = false } testcontainers-modules = { version = "0.11.2", default-features = false } metrics-exporter-prometheus = { version = "0.17.0", default-features = false } +futures = { version = "0.3.31", default-features = false } +moka = { version = "0.12.12", default-features = false } diff --git a/bin/tips-audit/src/main.rs b/bin/tips-audit/src/main.rs index db958eb..f29f6d1 100644 --- a/bin/tips-audit/src/main.rs +++ b/bin/tips-audit/src/main.rs @@ -53,6 +53,15 @@ struct Args { #[arg(long, env = "TIPS_AUDIT_METRICS_ADDR", default_value = "0.0.0.0:9002")] metrics_addr: SocketAddr, + + #[arg(long, env = "TIPS_AUDIT_WORKER_POOL_SIZE", default_value = "80")] + worker_pool_size: usize, + + #[arg(long, env = "TIPS_AUDIT_CHANNEL_BUFFER_SIZE", default_value = "500")] + channel_buffer_size: usize, + + #[arg(long, env = "TIPS_AUDIT_NOOP_ARCHIVE", default_value = "false")] + noop_archive: bool, } #[tokio::main] @@ -82,7 +91,13 @@ async fn main() -> Result<()> { let s3_bucket = args.s3_bucket.clone(); let writer = S3EventReaderWriter::new(s3_client, s3_bucket); - let mut archiver = KafkaAuditArchiver::new(reader, writer); + let mut archiver = KafkaAuditArchiver::new( + reader, + writer, + args.worker_pool_size, + args.channel_buffer_size, + args.noop_archive, + ); info!("Audit archiver initialized, starting main loop"); diff --git a/crates/audit/Cargo.toml b/crates/audit/Cargo.toml index 76c5ad6..159f2aa 100644 --- a/crates/audit/Cargo.toml +++ b/crates/audit/Cargo.toml @@ -18,7 +18,7 @@ metrics-derive.workspace = true tips-core = { workspace = true, features = ["test-utils"] } serde = { workspace = true, features = ["std", "derive"] } tokio = { workspace = true, features = ["full"] } -uuid = { workspace = true, features = ["v4", "serde"] } +uuid = { workspace = true, features = ["v5", "serde"] } tracing = { workspace = true, features = ["std"] } anyhow = { workspace = true, features = ["std"] } serde_json = { workspace = true, features = ["std"] } @@ -26,6 +26,7 @@ rdkafka = { workspace = true, features = ["tokio", "libz", "zstd", "ssl-vendored alloy-consensus = { workspace = true, features = ["std"] } alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } aws-sdk-s3 = { workspace = true, features = ["rustls", "default-https-client", "rt-tokio"] } +futures = { workspace = true } [dev-dependencies] testcontainers = { workspace = true, features = ["blocking"] } diff --git a/crates/audit/src/archiver.rs b/crates/audit/src/archiver.rs index 80f038a..415782e 100644 --- a/crates/audit/src/archiver.rs +++ b/crates/audit/src/archiver.rs @@ -1,9 +1,12 @@ use crate::metrics::Metrics; -use crate::reader::EventReader; +use crate::reader::{Event, EventReader}; use crate::storage::EventWriter; use anyhow::Result; use std::fmt; +use std::marker::PhantomData; +use std::sync::Arc; use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; +use tokio::sync::{Mutex, mpsc}; use tokio::time::sleep; use tracing::{error, info}; @@ -14,8 +17,9 @@ where W: EventWriter + Clone + Send + 'static, { reader: R, - writer: W, + event_tx: mpsc::Sender, metrics: Metrics, + _phantom: PhantomData, } impl fmt::Debug for KafkaAuditArchiver @@ -34,18 +38,92 @@ where W: EventWriter + Clone + Send + 'static, { /// Creates a new archiver with the given reader and writer. - pub fn new(reader: R, writer: W) -> Self { + pub fn new( + reader: R, + writer: W, + worker_pool_size: usize, + channel_buffer_size: usize, + noop_archive: bool, + ) -> Self { + let (event_tx, event_rx) = mpsc::channel(channel_buffer_size); + let metrics = Metrics::default(); + + Self::spawn_workers( + writer, + event_rx, + metrics.clone(), + worker_pool_size, + noop_archive, + ); + Self { reader, - writer, - metrics: Metrics::default(), + event_tx, + metrics, + _phantom: PhantomData, + } + } + + fn spawn_workers( + writer: W, + event_rx: mpsc::Receiver, + metrics: Metrics, + worker_pool_size: usize, + noop_archive: bool, + ) { + let event_rx = Arc::new(Mutex::new(event_rx)); + + for worker_id in 0..worker_pool_size { + let writer = writer.clone(); + let metrics = metrics.clone(); + let event_rx = event_rx.clone(); + + tokio::spawn(async move { + loop { + let event = { + let mut rx = event_rx.lock().await; + rx.recv().await + }; + + match event { + Some(event) => { + let archive_start = Instant::now(); + // tmp: only use this to clear kafka consumer offset + // TODO: use debug! later + if noop_archive { + info!( + worker_id, + bundle_id = %event.event.bundle_id(), + tx_ids = ?event.event.transaction_ids(), + timestamp = event.timestamp, + "Noop archive - skipping event" + ); + metrics.events_processed.increment(1); + metrics.in_flight_archive_tasks.decrement(1.0); + continue; + } + if let Err(e) = writer.archive_event(event).await { + error!(worker_id, error = %e, "Failed to write event"); + } else { + metrics + .archive_event_duration + .record(archive_start.elapsed().as_secs_f64()); + metrics.events_processed.increment(1); + } + metrics.in_flight_archive_tasks.decrement(1.0); + } + None => { + info!(worker_id, "Worker stopped - channel closed"); + break; + } + } + } + }); } } /// Runs the archiver loop, reading events and writing them to storage. pub async fn run(&mut self) -> Result<()> { - info!("Starting Kafka bundle archiver"); - loop { let read_start = Instant::now(); match self.reader.read_event().await { @@ -61,23 +139,11 @@ where let event_age_ms = now_ms.saturating_sub(event.timestamp); self.metrics.event_age.record(event_age_ms as f64); - // TODO: the integration test breaks because Minio doesn't support etag - let writer = self.writer.clone(); - let metrics = self.metrics.clone(); self.metrics.in_flight_archive_tasks.increment(1.0); - tokio::spawn(async move { - let archive_start = Instant::now(); - if let Err(e) = writer.archive_event(event).await { - error!(error = %e, "Failed to write event"); - metrics.failed_archive_tasks.increment(1); - } else { - metrics - .archive_event_duration - .record(archive_start.elapsed().as_secs_f64()); - metrics.events_processed.increment(1); - } - metrics.in_flight_archive_tasks.decrement(1.0); - }); + if let Err(e) = self.event_tx.send(event).await { + error!(error = %e, "Failed to send event to worker pool"); + self.metrics.in_flight_archive_tasks.decrement(1.0); + } let commit_start = Instant::now(); if let Err(e) = self.reader.commit().await { diff --git a/crates/audit/src/reader.rs b/crates/audit/src/reader.rs index 50697a2..be1c3c5 100644 --- a/crates/audit/src/reader.rs +++ b/crates/audit/src/reader.rs @@ -10,7 +10,7 @@ use rdkafka::{ use std::time::{Duration, SystemTime, UNIX_EPOCH}; use tips_core::kafka::load_kafka_config_from_file; use tokio::time::sleep; -use tracing::{debug, error}; +use tracing::{debug, error, info}; /// Creates a Kafka consumer from a properties file. pub fn create_kafka_consumer(kafka_properties_file: &str) -> Result { @@ -100,8 +100,9 @@ impl EventReader for KafkaAuditLogReader { let event: BundleEvent = serde_json::from_slice(payload)?; - debug!( + info!( bundle_id = %event.bundle_id(), + tx_ids = ?event.transaction_ids(), timestamp = timestamp, offset = message.offset(), partition = message.partition(), diff --git a/crates/audit/src/storage.rs b/crates/audit/src/storage.rs index a0ba49f..ba9d114 100644 --- a/crates/audit/src/storage.rs +++ b/crates/audit/src/storage.rs @@ -10,6 +10,7 @@ use aws_sdk_s3::Client as S3Client; use aws_sdk_s3::error::SdkError; use aws_sdk_s3::operation::get_object::GetObjectError; use aws_sdk_s3::primitives::ByteStream; +use futures::future; use serde::{Deserialize, Serialize}; use std::fmt; use std::fmt::Debug; @@ -532,20 +533,27 @@ impl EventWriter for S3EventReaderWriter { let bundle_id = event.event.bundle_id(); let transaction_ids = event.event.transaction_ids(); - let start = Instant::now(); - self.update_bundle_history(event.clone()).await?; + let bundle_start = Instant::now(); + let bundle_future = self.update_bundle_history(event); + + let tx_start = Instant::now(); + let tx_futures: Vec<_> = transaction_ids + .into_iter() + .map(|tx_id| async move { + self.update_transaction_by_hash_index(&tx_id, bundle_id) + .await + }) + .collect(); + + // Run the bundle and transaction futures concurrently and wait for them to complete + tokio::try_join!(bundle_future, future::try_join_all(tx_futures))?; + self.metrics .update_bundle_history_duration - .record(start.elapsed().as_secs_f64()); - - let start = Instant::now(); - for tx_id in &transaction_ids { - self.update_transaction_by_hash_index(tx_id, bundle_id) - .await?; - } + .record(bundle_start.elapsed().as_secs_f64()); self.metrics .update_tx_indexes_duration - .record(start.elapsed().as_secs_f64()); + .record(tx_start.elapsed().as_secs_f64()); Ok(()) } @@ -593,7 +601,7 @@ mod tests { use crate::reader::Event; use crate::types::{BundleEvent, DropReason, UserOpDropReason, UserOpEvent}; use alloy_primitives::{Address, B256, TxHash, U256}; - use tips_core::test_utils::create_bundle_from_txn_data; + use tips_core::{BundleExtensions, test_utils::create_bundle_from_txn_data}; use uuid::Uuid; fn create_test_event(key: &str, timestamp: i64, bundle_event: BundleEvent) -> Event { @@ -608,7 +616,7 @@ mod tests { fn test_update_bundle_history_transform_adds_new_event() { let bundle_history = BundleHistory { history: vec![] }; let bundle = create_bundle_from_txn_data(); - let bundle_id = Uuid::new_v4(); + let bundle_id = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); let bundle_event = BundleEvent::Received { bundle_id, bundle: Box::new(bundle.clone()), @@ -647,7 +655,7 @@ mod tests { }; let bundle = create_bundle_from_txn_data(); - let bundle_id = Uuid::new_v4(); + let bundle_id = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); let bundle_event = BundleEvent::Received { bundle_id, bundle: Box::new(bundle), @@ -662,9 +670,9 @@ mod tests { #[test] fn test_update_bundle_history_transform_handles_all_event_types() { let bundle_history = BundleHistory { history: vec![] }; - let bundle_id = Uuid::new_v4(); - let bundle = create_bundle_from_txn_data(); + let bundle_id = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); + let bundle_event = BundleEvent::Received { bundle_id, bundle: Box::new(bundle), @@ -709,7 +717,8 @@ mod tests { #[test] fn test_update_transaction_metadata_transform_adds_new_bundle() { let metadata = TransactionMetadata { bundle_ids: vec![] }; - let bundle_id = Uuid::new_v4(); + let bundle = create_bundle_from_txn_data(); + let bundle_id = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); let result = update_transaction_metadata_transform(metadata, bundle_id); @@ -721,7 +730,8 @@ mod tests { #[test] fn test_update_transaction_metadata_transform_skips_existing_bundle() { - let bundle_id = Uuid::new_v4(); + let bundle = create_bundle_from_txn_data(); + let bundle_id = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); let metadata = TransactionMetadata { bundle_ids: vec![bundle_id], }; @@ -733,8 +743,12 @@ mod tests { #[test] fn test_update_transaction_metadata_transform_adds_to_existing_bundles() { - let existing_bundle_id = Uuid::new_v4(); - let new_bundle_id = Uuid::new_v4(); + // Some different, dummy bundle IDs since create_bundle_from_txn_data() returns the same bundle ID + // Even if the same txn is contained across multiple bundles, the bundle ID will be different since the + // UUID is based on the bundle hash. + let existing_bundle_id = Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000").unwrap(); + let new_bundle_id = Uuid::parse_str("6ba7b810-9dad-11d1-80b4-00c04fd430c8").unwrap(); + let metadata = TransactionMetadata { bundle_ids: vec![existing_bundle_id], }; diff --git a/crates/audit/src/types.rs b/crates/audit/src/types.rs index 6200572..2dd0291 100644 --- a/crates/audit/src/types.rs +++ b/crates/audit/src/types.rs @@ -140,7 +140,11 @@ impl BundleEvent { format!("{bundle_id}-{block_hash}") } _ => { - format!("{}-{}", self.bundle_id(), Uuid::new_v4()) + format!( + "{}-{}", + self.bundle_id(), + Uuid::new_v5(&Uuid::NAMESPACE_OID, self.bundle_id().as_bytes()) + ) } } } @@ -200,7 +204,11 @@ impl UserOpEvent { format!("{user_op_hash}-{tx_hash}") } _ => { - format!("{}-{}", self.user_op_hash(), Uuid::new_v4()) + format!( + "{}-{}", + self.user_op_hash(), + Uuid::new_v5(&Uuid::NAMESPACE_OID, self.user_op_hash().as_slice()) + ) } } } diff --git a/crates/audit/tests/common/mod.rs b/crates/audit/tests/common/mod.rs index 4c5a67a..6db10f2 100644 --- a/crates/audit/tests/common/mod.rs +++ b/crates/audit/tests/common/mod.rs @@ -35,7 +35,10 @@ impl TestHarness { .await; let s3_client = aws_sdk_s3::Client::new(&config); - let bucket_name = format!("test-bucket-{}", Uuid::new_v4()); + let bucket_name = format!( + "test-bucket-{}", + Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()) + ); s3_client .create_bucket() diff --git a/crates/audit/tests/integration_tests.rs b/crates/audit/tests/integration_tests.rs index f2bb9d3..5b23fd0 100644 --- a/crates/audit/tests/integration_tests.rs +++ b/crates/audit/tests/integration_tests.rs @@ -9,7 +9,7 @@ use tips_audit_lib::{ storage::{BundleEventS3Reader, S3EventReaderWriter}, types::{BundleEvent, DropReason, UserOpEvent}, }; -use tips_core::test_utils::create_bundle_from_txn_data; +use tips_core::{BundleExtensions, test_utils::create_bundle_from_txn_data}; use uuid::Uuid; mod common; use common::TestHarness; @@ -24,11 +24,12 @@ async fn test_kafka_publisher_s3_archiver_integration() let s3_writer = S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone()); - let test_bundle_id = Uuid::new_v4(); + let bundle = create_bundle_from_txn_data(); + let test_bundle_id = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); let test_events = [ BundleEvent::Received { bundle_id: test_bundle_id, - bundle: Box::new(create_bundle_from_txn_data()), + bundle: Box::new(bundle.clone()), }, BundleEvent::Dropped { bundle_id: test_bundle_id, @@ -45,6 +46,8 @@ async fn test_kafka_publisher_s3_archiver_integration() let mut consumer = KafkaAuditArchiver::new( KafkaAuditLogReader::new(harness.kafka_consumer, topic.to_string())?, s3_writer.clone(), + 1, + 100, ); tokio::spawn(async move { diff --git a/crates/audit/tests/s3_test.rs b/crates/audit/tests/s3_test.rs index d6bfba6..d555bc0 100644 --- a/crates/audit/tests/s3_test.rs +++ b/crates/audit/tests/s3_test.rs @@ -13,7 +13,10 @@ use uuid::Uuid; mod common; use common::TestHarness; -use tips_core::test_utils::{TXN_HASH, create_bundle_from_txn_data}; +use tips_core::{ + BundleExtensions, + test_utils::{TXN_HASH, create_bundle_from_txn_data}, +}; fn create_test_event(key: &str, timestamp: i64, bundle_event: BundleEvent) -> Event { Event { @@ -28,8 +31,8 @@ async fn test_event_write_and_read() -> Result<(), Box Result<(), Box Result<(), Box Result<(), Box Result<(), Box Result<(), Box Result<(), Box>> = + JoinSet::new(); for i in 0..4 { let writer_clone = writer.clone(); diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 76d7d63..0eef255 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -18,7 +18,7 @@ test-utils = ["dep:alloy-signer-local", "dep:op-alloy-rpc-types"] op-alloy-flz.workspace = true alloy-serde.workspace = true serde = { workspace = true, features = ["std", "derive"] } -uuid = { workspace = true, features = ["v4", "serde"] } +uuid = { workspace = true, features = ["v5", "serde"] } tracing = { workspace = true, features = ["std"] } alloy-consensus = { workspace = true, features = ["std"] } alloy-rpc-types = { workspace = true, features = ["eth"] } diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index 5badc34..6c38978 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -244,7 +244,9 @@ impl BundleTxs for AcceptedBundle { impl AcceptedBundle { pub fn new(bundle: ParsedBundle, meter_bundle_response: MeterBundleResponse) -> Self { Self { - uuid: bundle.replacement_uuid.unwrap_or_else(Uuid::new_v4), + uuid: bundle.replacement_uuid.unwrap_or_else(|| { + Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()) + }), txs: bundle.txs, block_number: bundle.block_number, flashblock_number_min: bundle.flashblock_number_min, @@ -345,7 +347,7 @@ mod tests { assert_eq!(bundle.bundle_hash(), expected_bundle_hash_single); - let uuid = Uuid::new_v4(); + let uuid = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); let bundle = AcceptedBundle::new( Bundle { txs: vec![tx1_bytes.clone().into(), tx2_bytes.clone().into()], @@ -448,4 +450,43 @@ mod tests { assert_eq!(deserialized.state_block_number, 12345); assert_eq!(deserialized.total_gas_used, 21000); } + + #[test] + fn test_same_uuid_for_same_bundle_hash() { + let alice = PrivateKeySigner::random(); + let bob = PrivateKeySigner::random(); + + // suppose this is a spam tx + let tx1 = create_transaction(alice.clone(), 1, bob.address()); + let tx1_bytes = tx1.encoded_2718(); + + // we receive it the first time + let bundle1 = AcceptedBundle::new( + Bundle { + txs: vec![tx1_bytes.clone().into()], + block_number: 1, + replacement_uuid: None, + ..Default::default() + } + .try_into() + .unwrap(), + create_test_meter_bundle_response(), + ); + + // but we may receive it more than once + let bundle2 = AcceptedBundle::new( + Bundle { + txs: vec![tx1_bytes.clone().into()], + block_number: 1, + replacement_uuid: None, + ..Default::default() + } + .try_into() + .unwrap(), + create_test_meter_bundle_response(), + ); + + // however, the UUID should be the same + assert_eq!(bundle1.uuid(), bundle2.uuid()); + } } diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index 9291d8f..75e30e0 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -33,6 +33,8 @@ backon = { workspace = true, features = ["std", "tokio-sleep"] } axum = { workspace = true, features = ["tokio", "http1", "json"] } clap = { version = "4.5.47", features = ["std", "derive", "env"] } op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } +moka = { workspace = true, features = ["future"] } +uuid = { workspace = true, features = ["v5"] } [dev-dependencies] mockall = "0.13" diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index 1f43896..6fd1ad1 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -204,6 +204,10 @@ pub struct Config { /// URL of third-party RPC endpoint to forward raw transactions to (enables forwarding if set) #[arg(long, env = "TIPS_INGRESS_RAW_TX_FORWARD_RPC")] pub raw_tx_forward_rpc: Option, + + /// TTL for bundle cache in seconds + #[arg(long, env = "TIPS_INGRESS_BUNDLE_CACHE_TTL", default_value = "20")] + pub bundle_cache_ttl: u64, } pub fn connect_ingress_to_builder( diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 8560e48..3605dd8 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -12,6 +12,7 @@ use jsonrpsee::{ core::{RpcResult, async_trait}, proc_macros::rpc, }; +use moka::future::Cache; use op_alloy_consensus::OpTxEnvelope; use op_alloy_network::Optimism; use std::time::{SystemTime, UNIX_EPOCH}; @@ -23,6 +24,7 @@ use tips_core::{ use tokio::sync::{broadcast, mpsc}; use tokio::time::{Duration, Instant, timeout}; use tracing::{debug, info, warn}; +use uuid::Uuid; use crate::metrics::{Metrics, record_histogram}; use crate::queue::{BundleQueuePublisher, MessageQueue, UserOpQueuePublisher}; @@ -84,6 +86,7 @@ pub struct IngressService { builder_backrun_tx: broadcast::Sender, max_backrun_txs: usize, max_backrun_gas_limit: u64, + bundle_cache: Cache, } impl IngressService { @@ -108,6 +111,11 @@ impl IngressService { let reputation_service = mempool_engine .as_ref() .map(|engine| Arc::new(ReputationServiceImpl::new(engine.get_mempool()))); + + // A TTL cache to deduplicate bundles with the same Bundle ID + let bundle_cache = Cache::builder() + .time_to_live(Duration::from_secs(config.bundle_cache_ttl)) + .build(); Self { mempool_provider, simulation_provider, @@ -134,6 +142,7 @@ impl IngressService { builder_backrun_tx, max_backrun_txs: config.max_backrun_txs, max_backrun_gas_limit: config.max_backrun_gas_limit, + bundle_cache, } } } @@ -301,7 +310,20 @@ impl IngressApiServer for Ingre self.metrics.bundles_parsed.increment(1); - let meter_bundle_response = self.meter_bundle(&bundle, bundle_hash).await.ok(); + let meter_bundle_response = match self.meter_bundle(&bundle, bundle_hash).await { + Ok(response) => { + info!(message = "Metering succeeded for raw transaction", bundle_hash = %bundle_hash, response = ?response); + Some(response) + } + Err(e) => { + warn!( + bundle_hash = %bundle_hash, + error = %e, + "Metering failed for raw transaction" + ); + None + } + }; if let Some(meter_info) = meter_bundle_response.as_ref() { self.metrics.successful_simulations.increment(1); @@ -313,42 +335,54 @@ impl IngressApiServer for Ingre let accepted_bundle = AcceptedBundle::new(parsed_bundle, meter_bundle_response.unwrap_or_default()); - if send_to_kafka { - if let Err(e) = self - .bundle_queue_publisher - .publish(&accepted_bundle, bundle_hash) - .await - { - warn!(message = "Failed to publish Queue::enqueue_bundle", bundle_hash = %bundle_hash, error = %e); - } - - self.metrics.sent_to_kafka.increment(1); - info!(message="queued singleton bundle", txn_hash=%transaction.tx_hash()); - } + let bundle_id = *accepted_bundle.uuid(); + if self.bundle_cache.get(&bundle_id).await.is_some() { + debug!( + message = "Duplicate bundle detected, skipping Kafka publish", + bundle_id = %bundle_id, + bundle_hash = %bundle_hash, + transaction_hash = %transaction.tx_hash(), + ); + } else { + self.bundle_cache.insert(bundle_id, ()).await; - if send_to_mempool { - let response = self - .mempool_provider - .send_raw_transaction(data.iter().as_slice()) - .await; - match response { - Ok(_) => { - self.metrics.sent_to_mempool.increment(1); - debug!(message = "sent transaction to the mempool", hash=%transaction.tx_hash()); + if send_to_kafka { + if let Err(e) = self + .bundle_queue_publisher + .publish(&accepted_bundle, bundle_hash) + .await + { + warn!(message = "Failed to publish Queue::enqueue_bundle", bundle_hash = %bundle_hash, error = %e); } - Err(e) => { - warn!(message = "Failed to send raw transaction to mempool", error = %e); + + self.metrics.sent_to_kafka.increment(1); + info!(message="queued singleton bundle", txn_hash=%transaction.tx_hash()); + } + + if send_to_mempool { + let response = self + .mempool_provider + .send_raw_transaction(data.iter().as_slice()) + .await; + match response { + Ok(_) => { + self.metrics.sent_to_mempool.increment(1); + debug!(message = "sent transaction to the mempool", hash=%transaction.tx_hash()); + } + Err(e) => { + warn!(message = "Failed to send raw transaction to mempool", error = %e); + } } } - } - info!( - message = "processed transaction", - bundle_hash = %bundle_hash, - transaction_hash = %transaction.tx_hash(), - ); + info!( + message = "processed transaction", + bundle_hash = %bundle_hash, + transaction_hash = %transaction.tx_hash(), + ); - self.send_audit_event(&accepted_bundle, accepted_bundle.bundle_hash()); + self.send_audit_event(&accepted_bundle, accepted_bundle.bundle_hash()); + } self.metrics .send_raw_transaction_duration @@ -615,6 +649,7 @@ mod tests { user_operation_topic: String::new(), max_backrun_txs: 5, max_backrun_gas_limit: 5000000, + bundle_cache_ttl: 20, } } diff --git a/crates/system-tests/Cargo.toml b/crates/system-tests/Cargo.toml index 3ce797b..6163b29 100644 --- a/crates/system-tests/Cargo.toml +++ b/crates/system-tests/Cargo.toml @@ -28,7 +28,7 @@ serde = { workspace = true, features = ["std", "derive"] } tokio = { workspace = true, features = ["full"] } tracing = { workspace = true, features = ["std"] } anyhow = { workspace = true, features = ["std"] } -uuid = { workspace = true, features = ["v4", "serde"] } +uuid = { workspace = true, features = ["v5", "serde"] } serde_json = { workspace = true, features = ["std"] } reqwest = { version = "0.12.12", features = ["json"] } rdkafka = { workspace = true, features = ["tokio", "libz", "zstd", "ssl-vendored"] } diff --git a/crates/system-tests/tests/common/kafka.rs b/crates/system-tests/tests/common/kafka.rs index a61e54c..5acda1b 100644 --- a/crates/system-tests/tests/common/kafka.rs +++ b/crates/system-tests/tests/common/kafka.rs @@ -39,7 +39,13 @@ fn build_kafka_consumer(properties_env: &str, default_path: &str) -> Result Date: Mon, 12 Jan 2026 18:58:09 -0500 Subject: [PATCH 106/117] chore: push to docker public registry (#140) --- .github/workflows/docker.yml | 48 ++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index bd11ca8..849a3fd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,15 +1,21 @@ -name: Docker Build +name: Docker Build and Publish permissions: contents: read + packages: write on: push: - branches: [ master ] + branches: [master] + tags: ['v*'] pull_request: +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + jobs: docker-build: - name: Docker Build + name: Build and Publish Docker image runs-on: ubuntu-latest steps: - name: Harden the runner (Audit all outbound calls) @@ -18,5 +24,37 @@ jobs: egress-policy: audit - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - - run: cp .env.example .env.docker - - run: docker compose -f docker-compose.tips.yml build \ No newline at end of file + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0 + + - name: Log in to GitHub Container Registry + if: github.event_name != 'pull_request' + uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) + id: meta + uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + type=ref,event=branch + type=ref,event=pr + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=sha + + - name: Build and push Docker image + uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0 + with: + context: . + platforms: linux/amd64 + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max From d2f3610af0e3a418450322442be3721b33ebe858 Mon Sep 17 00:00:00 2001 From: William Law Date: Wed, 14 Jan 2026 14:38:53 -0500 Subject: [PATCH 107/117] perf: dedup earlier (#142) --- crates/ingress-rpc/src/service.rs | 62 +++++++++++++++---------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 3605dd8..4f965e9 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -24,7 +24,6 @@ use tips_core::{ use tokio::sync::{broadcast, mpsc}; use tokio::time::{Duration, Instant, timeout}; use tracing::{debug, info, warn}; -use uuid::Uuid; use crate::metrics::{Metrics, record_histogram}; use crate::queue::{BundleQueuePublisher, MessageQueue, UserOpQueuePublisher}; @@ -86,7 +85,7 @@ pub struct IngressService { builder_backrun_tx: broadcast::Sender, max_backrun_txs: usize, max_backrun_gas_limit: u64, - bundle_cache: Cache, + bundle_cache: Cache, } impl IngressService { @@ -308,43 +307,40 @@ impl IngressApiServer for Ingre let bundle_hash = &parsed_bundle.bundle_hash(); - self.metrics.bundles_parsed.increment(1); - - let meter_bundle_response = match self.meter_bundle(&bundle, bundle_hash).await { - Ok(response) => { - info!(message = "Metering succeeded for raw transaction", bundle_hash = %bundle_hash, response = ?response); - Some(response) - } - Err(e) => { - warn!( - bundle_hash = %bundle_hash, - error = %e, - "Metering failed for raw transaction" - ); - None - } - }; - - if let Some(meter_info) = meter_bundle_response.as_ref() { - self.metrics.successful_simulations.increment(1); - _ = self.builder_tx.send(meter_info.clone()); - } else { - self.metrics.failed_simulations.increment(1); - } - - let accepted_bundle = - AcceptedBundle::new(parsed_bundle, meter_bundle_response.unwrap_or_default()); - - let bundle_id = *accepted_bundle.uuid(); - if self.bundle_cache.get(&bundle_id).await.is_some() { + if self.bundle_cache.get(bundle_hash).await.is_some() { debug!( message = "Duplicate bundle detected, skipping Kafka publish", - bundle_id = %bundle_id, bundle_hash = %bundle_hash, transaction_hash = %transaction.tx_hash(), ); } else { - self.bundle_cache.insert(bundle_id, ()).await; + self.bundle_cache.insert(*bundle_hash, ()).await; + self.metrics.bundles_parsed.increment(1); + + let meter_bundle_response = match self.meter_bundle(&bundle, bundle_hash).await { + Ok(response) => { + info!(message = "Metering succeeded for raw transaction", bundle_hash = %bundle_hash, response = ?response); + Some(response) + } + Err(e) => { + warn!( + bundle_hash = %bundle_hash, + error = %e, + "Metering failed for raw transaction" + ); + None + } + }; + + if let Some(meter_info) = meter_bundle_response.as_ref() { + self.metrics.successful_simulations.increment(1); + _ = self.builder_tx.send(meter_info.clone()); + } else { + self.metrics.failed_simulations.increment(1); + } + + let accepted_bundle = + AcceptedBundle::new(parsed_bundle, meter_bundle_response.unwrap_or_default()); if send_to_kafka { if let Err(e) = self From ba25fd0f40f651f97a0e42cbe6d49a74d8eface1 Mon Sep 17 00:00:00 2001 From: William Law Date: Thu, 15 Jan 2026 14:05:23 -0500 Subject: [PATCH 108/117] metrics: bundle meter exceeded count (#143) * add bundle exceeded metric * ui make text dark * flag send to builder --- crates/ingress-rpc/src/lib.rs | 4 ++++ crates/ingress-rpc/src/metrics.rs | 3 +++ crates/ingress-rpc/src/service.rs | 8 +++++++- ui/src/app/bundles/[uuid]/page.tsx | 22 +++++++++++++--------- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index 6fd1ad1..ea304c6 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -208,6 +208,10 @@ pub struct Config { /// TTL for bundle cache in seconds #[arg(long, env = "TIPS_INGRESS_BUNDLE_CACHE_TTL", default_value = "20")] pub bundle_cache_ttl: u64, + + /// Enable sending to builder + #[arg(long, env = "TIPS_INGRESS_SEND_TO_BUILDER", default_value = "false")] + pub send_to_builder: bool, } pub fn connect_ingress_to_builder( diff --git a/crates/ingress-rpc/src/metrics.rs b/crates/ingress-rpc/src/metrics.rs index fb53aa5..a62b3b8 100644 --- a/crates/ingress-rpc/src/metrics.rs +++ b/crates/ingress-rpc/src/metrics.rs @@ -48,4 +48,7 @@ pub struct Metrics { #[metric(describe = "Total raw transactions forwarded to additional endpoint")] pub raw_tx_forwards_total: Counter, + + #[metric(describe = "Number of bundles that exceeded the metering time")] + pub bundles_exceeded_metering_time: Counter, } diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 4f965e9..1e276a4 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -86,6 +86,7 @@ pub struct IngressService { max_backrun_txs: usize, max_backrun_gas_limit: u64, bundle_cache: Cache, + send_to_builder: bool, } impl IngressService { @@ -142,6 +143,7 @@ impl IngressService { max_backrun_txs: config.max_backrun_txs, max_backrun_gas_limit: config.max_backrun_gas_limit, bundle_cache, + send_to_builder: config.send_to_builder, } } } @@ -334,7 +336,9 @@ impl IngressApiServer for Ingre if let Some(meter_info) = meter_bundle_response.as_ref() { self.metrics.successful_simulations.increment(1); - _ = self.builder_tx.send(meter_info.clone()); + if self.send_to_builder { + _ = self.builder_tx.send(meter_info.clone()); + } } else { self.metrics.failed_simulations.increment(1); } @@ -531,6 +535,7 @@ impl IngressService { // that we know will take longer than the block time to execute let total_execution_time = (res.total_execution_time_us / 1_000) as u64; if total_execution_time > self.block_time_milliseconds { + self.metrics.bundles_exceeded_metering_time.increment(1); return Err( EthApiError::InvalidParams("Bundle simulation took too long".into()).into_rpc_err(), ); @@ -646,6 +651,7 @@ mod tests { max_backrun_txs: 5, max_backrun_gas_limit: 5000000, bundle_cache_ttl: 20, + send_to_builder: false, } } diff --git a/ui/src/app/bundles/[uuid]/page.tsx b/ui/src/app/bundles/[uuid]/page.tsx index 135270f..0212106 100644 --- a/ui/src/app/bundles/[uuid]/page.tsx +++ b/ui/src/app/bundles/[uuid]/page.tsx @@ -240,7 +240,7 @@ function TransactionDetails({ {tx.signer} @@ -255,7 +255,7 @@ function TransactionDetails({ {tx.to} @@ -269,23 +269,25 @@ function TransactionDetails({

    Nonce - {parseInt(tx.nonce, 16)} + + {parseInt(tx.nonce, 16)} +
    Max Fee - + {formatGasPrice(tx.maxFeePerGas)}
    Priority Fee - + {formatGasPrice(tx.maxPriorityFeePerGas)}
    Type - + {tx.type === "0x2" ? "EIP-1559" : tx.type}
    @@ -330,17 +332,19 @@ function SimulationCard({ meter }: { meter: MeterBundleResponse }) {
    State Block - #{meter.stateBlockNumber} + + #{meter.stateBlockNumber} +
    Gas Fees - + {formatHexValue(meter.gasFees)}
    ETH to Coinbase - + {formatHexValue(meter.ethSentToCoinbase)}
    From 619662c62ada8e80984e16340f21cc7f846f139b Mon Sep 17 00:00:00 2001 From: Niran Babalola Date: Thu, 29 Jan 2026 16:36:29 -0600 Subject: [PATCH 109/117] Add state_root_time_us field to MeterBundleResponse (#148) The builder returns state_root_time_us in its response but tips was silently dropping this field during deserialization. Add the field with serde(default) for backwards compatibility. --- crates/core/src/test_utils.rs | 1 + crates/core/src/types.rs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/crates/core/src/test_utils.rs b/crates/core/src/test_utils.rs index 3216298..b4c89b3 100644 --- a/crates/core/src/test_utils.rs +++ b/crates/core/src/test_utils.rs @@ -75,5 +75,6 @@ pub fn create_test_meter_bundle_response() -> MeterBundleResponse { state_flashblock_index: None, total_gas_used: 0, total_execution_time_us: 0, + state_root_time_us: 0, } } diff --git a/crates/core/src/types.rs b/crates/core/src/types.rs index 6c38978..5f1c88f 100644 --- a/crates/core/src/types.rs +++ b/crates/core/src/types.rs @@ -298,6 +298,8 @@ pub struct MeterBundleResponse { pub state_flashblock_index: Option, pub total_gas_used: u64, pub total_execution_time_us: u128, + #[serde(default)] + pub state_root_time_us: u128, } #[cfg(test)] From b575c4c2b4cdb0c724757a4b7ba5b99af44c17f1 Mon Sep 17 00:00:00 2001 From: Mihir Wadekar Date: Wed, 11 Feb 2026 23:58:29 -0800 Subject: [PATCH 110/117] chore: remove crates that we will no longer use --- crates/account-abstraction-core/Cargo.toml | 29 -- crates/account-abstraction-core/README.md | 310 ------------- .../src/domain/entrypoints/mod.rs | 3 - .../src/domain/entrypoints/v06.rs | 139 ------ .../src/domain/entrypoints/v07.rs | 180 -------- .../src/domain/entrypoints/version.rs | 31 -- .../src/domain/events.rs | 17 - .../src/domain/mempool.rs | 18 - .../src/domain/mod.rs | 13 - .../src/domain/reputation.rs | 18 - .../src/domain/types.rs | 207 --------- .../src/factories/kafka_engine.rs | 33 -- .../src/factories/mod.rs | 1 - .../src/infrastructure/base_node/mod.rs | 1 - .../src/infrastructure/base_node/validator.rs | 173 ------- .../src/infrastructure/in_memory/mempool.rs | 424 ------------------ .../src/infrastructure/in_memory/mod.rs | 3 - .../src/infrastructure/kafka/consumer.rs | 29 -- .../src/infrastructure/kafka/mod.rs | 1 - .../src/infrastructure/mod.rs | 3 - crates/account-abstraction-core/src/lib.rs | 23 - .../src/services/interfaces/event_source.rs | 7 - .../src/services/interfaces/mod.rs | 2 - .../services/interfaces/user_op_validator.rs | 12 - .../src/services/mempool_engine.rs | 159 ------- .../src/services/mod.rs | 7 - .../src/services/reputations_service.rs | 27 -- crates/system-tests/Cargo.toml | 49 -- crates/system-tests/METRICS.md | 133 ------ crates/system-tests/README.md | 30 -- crates/system-tests/src/bin/load-test.rs | 13 - crates/system-tests/src/client/mod.rs | 3 - crates/system-tests/src/client/tips_rpc.rs | 53 --- crates/system-tests/src/fixtures/mod.rs | 3 - .../system-tests/src/fixtures/transactions.rs | 73 --- crates/system-tests/src/lib.rs | 3 - crates/system-tests/src/load_test/config.rs | 76 ---- crates/system-tests/src/load_test/load.rs | 133 ------ crates/system-tests/src/load_test/metrics.rs | 78 ---- crates/system-tests/src/load_test/mod.rs | 9 - crates/system-tests/src/load_test/output.rs | 67 --- crates/system-tests/src/load_test/poller.rs | 77 ---- crates/system-tests/src/load_test/sender.rs | 113 ----- crates/system-tests/src/load_test/setup.rs | 90 ---- crates/system-tests/src/load_test/tracker.rs | 115 ----- crates/system-tests/src/load_test/wallet.rs | 86 ---- crates/system-tests/tests/common/kafka.rs | 121 ----- crates/system-tests/tests/common/mod.rs | 1 - .../system-tests/tests/integration_tests.rs | 359 --------------- 49 files changed, 3555 deletions(-) delete mode 100644 crates/account-abstraction-core/Cargo.toml delete mode 100644 crates/account-abstraction-core/README.md delete mode 100644 crates/account-abstraction-core/src/domain/entrypoints/mod.rs delete mode 100644 crates/account-abstraction-core/src/domain/entrypoints/v06.rs delete mode 100644 crates/account-abstraction-core/src/domain/entrypoints/v07.rs delete mode 100644 crates/account-abstraction-core/src/domain/entrypoints/version.rs delete mode 100644 crates/account-abstraction-core/src/domain/events.rs delete mode 100644 crates/account-abstraction-core/src/domain/mempool.rs delete mode 100644 crates/account-abstraction-core/src/domain/mod.rs delete mode 100644 crates/account-abstraction-core/src/domain/reputation.rs delete mode 100644 crates/account-abstraction-core/src/domain/types.rs delete mode 100644 crates/account-abstraction-core/src/factories/kafka_engine.rs delete mode 100644 crates/account-abstraction-core/src/factories/mod.rs delete mode 100644 crates/account-abstraction-core/src/infrastructure/base_node/mod.rs delete mode 100644 crates/account-abstraction-core/src/infrastructure/base_node/validator.rs delete mode 100644 crates/account-abstraction-core/src/infrastructure/in_memory/mempool.rs delete mode 100644 crates/account-abstraction-core/src/infrastructure/in_memory/mod.rs delete mode 100644 crates/account-abstraction-core/src/infrastructure/kafka/consumer.rs delete mode 100644 crates/account-abstraction-core/src/infrastructure/kafka/mod.rs delete mode 100644 crates/account-abstraction-core/src/infrastructure/mod.rs delete mode 100644 crates/account-abstraction-core/src/lib.rs delete mode 100644 crates/account-abstraction-core/src/services/interfaces/event_source.rs delete mode 100644 crates/account-abstraction-core/src/services/interfaces/mod.rs delete mode 100644 crates/account-abstraction-core/src/services/interfaces/user_op_validator.rs delete mode 100644 crates/account-abstraction-core/src/services/mempool_engine.rs delete mode 100644 crates/account-abstraction-core/src/services/mod.rs delete mode 100644 crates/account-abstraction-core/src/services/reputations_service.rs delete mode 100644 crates/system-tests/Cargo.toml delete mode 100644 crates/system-tests/METRICS.md delete mode 100644 crates/system-tests/README.md delete mode 100644 crates/system-tests/src/bin/load-test.rs delete mode 100644 crates/system-tests/src/client/mod.rs delete mode 100644 crates/system-tests/src/client/tips_rpc.rs delete mode 100644 crates/system-tests/src/fixtures/mod.rs delete mode 100644 crates/system-tests/src/fixtures/transactions.rs delete mode 100644 crates/system-tests/src/lib.rs delete mode 100644 crates/system-tests/src/load_test/config.rs delete mode 100644 crates/system-tests/src/load_test/load.rs delete mode 100644 crates/system-tests/src/load_test/metrics.rs delete mode 100644 crates/system-tests/src/load_test/mod.rs delete mode 100644 crates/system-tests/src/load_test/output.rs delete mode 100644 crates/system-tests/src/load_test/poller.rs delete mode 100644 crates/system-tests/src/load_test/sender.rs delete mode 100644 crates/system-tests/src/load_test/setup.rs delete mode 100644 crates/system-tests/src/load_test/tracker.rs delete mode 100644 crates/system-tests/src/load_test/wallet.rs delete mode 100644 crates/system-tests/tests/common/kafka.rs delete mode 100644 crates/system-tests/tests/common/mod.rs delete mode 100644 crates/system-tests/tests/integration_tests.rs diff --git a/crates/account-abstraction-core/Cargo.toml b/crates/account-abstraction-core/Cargo.toml deleted file mode 100644 index 53b843d..0000000 --- a/crates/account-abstraction-core/Cargo.toml +++ /dev/null @@ -1,29 +0,0 @@ -[package] -name = "account-abstraction-core" -version.workspace = true -rust-version.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true -edition.workspace = true - -[dependencies] -tips-core.workspace = true -alloy-serde.workspace = true -async-trait.workspace = true -alloy-sol-types.workspace = true -op-alloy-network.workspace = true -serde = { workspace = true, features = ["std", "derive"] } -tokio = { workspace = true, features = ["full"] } -tracing = { workspace = true, features = ["std"] } -anyhow = { workspace = true, features = ["std"] } -serde_json = { workspace = true, features = ["std"] } -rdkafka = { workspace = true, features = ["tokio", "libz", "zstd", "ssl-vendored"] } -alloy-rpc-types = { workspace = true, features = ["eth"] } -jsonrpsee = { workspace = true, features = ["server", "macros"] } -alloy-provider = { workspace = true, features = ["reqwest"] } -alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } - -[dev-dependencies] -wiremock.workspace = true -alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } diff --git a/crates/account-abstraction-core/README.md b/crates/account-abstraction-core/README.md deleted file mode 100644 index 0abcaba..0000000 --- a/crates/account-abstraction-core/README.md +++ /dev/null @@ -1,310 +0,0 @@ -# account-abstraction-core - -Clean architecture implementation for ERC-4337 account abstraction mempool and validation. - -## Architecture Overview - -This crate follows **Clean Architecture** (also known as Hexagonal Architecture or Ports & Adapters). The goal is to keep business logic independent of external concerns like databases, message queues, or RPC providers. - -**Note**: We use the term "interfaces" for what Hexagonal Architecture traditionally calls "ports" - both refer to the same concept of defining contracts between layers. - -``` -┌─────────────────────────────────────────────────────────────┐ -│ Factories │ -│ (Wiring/Dependency Injection) │ -└───────────────────────┬─────────────────────────────────────┘ - │ -┌───────────────────────▼─────────────────────────────────────┐ -│ Infrastructure │ -│ (Kafka, RPC providers, external systems) │ -│ implements ▼ │ -└───────────────────────┬─────────────────────────────────────┘ - │ -┌───────────────────────▼─────────────────────────────────────┐ -│ Services │ -│ (Orchestration & use cases) │ -│ defines ▼ interfaces │ -└───────────────────────┬─────────────────────────────────────┘ - │ -┌───────────────────────▼─────────────────────────────────────┐ -│ Domain │ -│ (Pure business logic - no dependencies) │ -└─────────────────────────────────────────────────────────────┘ -``` - -### Dependency Direction - -**Critical Rule**: Dependencies always point inward. -- ✅ `infrastructure/` depends on `services/` and `domain/` -- ✅ `services/` depends on `domain/` -- ✅ `domain/` depends on nothing -- ❌ Never reverse these dependencies - -## Layer Descriptions - -### 📦 Domain (`src/domain/`) - -**What it is**: Pure business logic with zero external dependencies. - -**Contains**: -- Core types (`UserOperation`, `ValidationResult`, `WrappedUserOperation`) -- Business events (`MempoolEvent` - what happened in our system) -- Business rules (`Mempool` trait, entrypoint validation logic) -- Domain services (in-memory mempool implementation) - -**Rules**: -- No imports from `infrastructure/`, `services/`, or external crates like `rdkafka` -- Should be reusable in any context (CLI tools, web servers, tests) -- Changes here affect the entire system - -**Example**: -```rust -// domain/events.rs - describes what happens in our system -pub enum MempoolEvent { - UserOpAdded { user_op: WrappedUserOperation }, - UserOpIncluded { user_op: WrappedUserOperation }, - UserOpDropped { user_op: WrappedUserOperation, reason: String }, -} -``` - -### 🎯 Services (`src/services/`) - -**What it is**: High-level orchestration that coordinates domain logic to accomplish specific goals. - -**Contains**: -- Use case implementations (`MempoolEngine` - handles mempool events) -- **Interfaces** (contracts that infrastructure must implement) - -**Purpose**: -- Reusable across different binaries (ingress-rpc, batch-processor, CLI tools) -- Defines "what we need" without specifying "how we get it" -- Orchestrates domain objects to perform complex operations - -**Example**: -```rust -// services/mempool_engine.rs -pub struct MempoolEngine { - mempool: Arc>, - event_source: Arc, // ← uses an interface, not Kafka directly -} - -impl MempoolEngine { - pub async fn run(&self) { - loop { - let event = self.event_source.receive().await?; // ← generic! - self.handle_event(event).await?; - } - } -} -``` - -### 🔌 Interfaces (`src/services/interfaces/`) - -**What they are**: Traits that define what the services layer needs from the outside world. - -**Why they exist**: -- **Dependency Inversion**: Services define what they need; infrastructure provides it -- **Testability**: Easy to mock interfaces with fake implementations -- **Flexibility**: Swap Kafka for Redis without touching service code - -**Interfaces in this crate**: -- `EventSource` - "I need a stream of MempoolEvents" (Kafka? Redis? In-memory? Don't care!) -- `UserOperationValidator` - "I need to validate user operations" (RPC? Mock? Don't care!) - -**Example**: -```rust -// services/interfaces/event_source.rs -#[async_trait] -pub trait EventSource: Send + Sync { - async fn receive(&self) -> anyhow::Result; -} - -// Now we can implement this for ANY event source: -// - KafkaEventSource -// - RedisEventSource -// - MockEventSource (for tests) -// - FileEventSource -``` - -### 🏗️ Infrastructure (`src/infrastructure/`) - -**What it is**: Adapters that connect our system to external services. - -**Contains**: -- Kafka consumer (`KafkaEventSource` implements `EventSource`) -- RPC validators (`BaseNodeValidator` implements `UserOperationValidator`) -- Database clients (when needed) -- External API clients - -**Purpose**: -- Translate between external systems and our domain -- Handle external concerns (serialization, retries, connection pooling) -- Implement the interfaces defined by services - -**Example**: -```rust -// infrastructure/kafka/consumer.rs -pub struct KafkaEventSource { - consumer: Arc, // ← Kafka-specific! -} - -#[async_trait] -impl EventSource for KafkaEventSource { // ← Implements the interface - async fn receive(&self) -> anyhow::Result { - let msg = self.consumer.recv().await?.detach(); - let payload = msg.payload().ok_or(...)?; - let event: MempoolEvent = serde_json::from_slice(payload)?; - Ok(event) - } -} -``` - -### 🏭 Factories (`src/factories/`) - -**What they are**: Convenience functions that wire everything together. - -**Contains**: -- `create_mempool_engine()` - creates a fully-wired MempoolEngine with Kafka consumer - -**Purpose**: -- Reduce boilerplate in main.rs -- Provide sensible defaults -- Make it easy to get started - -**When to use**: -- Quick setup in binaries -- Standard configurations - -**When NOT to use**: -- Custom wiring needed -- Testing (inject mocks directly) -- Non-standard configurations - -**Example**: -```rust -// factories/kafka_engine.rs -pub fn create_mempool_engine( - properties_file: &str, - topic: &str, - consumer_group_id: &str, - pool_config: Option, -) -> anyhow::Result> { - // 1. Create Kafka consumer (infrastructure) - let consumer: StreamConsumer = create_kafka_consumer(...)?; - - // 2. Wrap in interface adapter - let event_source = Arc::new(KafkaEventSource::new(Arc::new(consumer))); - - // 3. Create service with interface - let engine = MempoolEngine::with_event_source(event_source, pool_config); - - Ok(Arc::new(engine)) -} -``` - -## Why This Architecture? - -### ✅ Benefits - -1. **Testability**: Mock interfaces instead of real Kafka/RPC - ```rust - // Test with fake event source - let mock_source = Arc::new(MockEventSource::new(vec![event1, event2])); - let engine = MempoolEngine::with_event_source(mock_source, None); - ``` - -2. **Flexibility**: Swap infrastructure without touching business logic - ```rust - // Production: Kafka - let source = KafkaEventSource::new(kafka_consumer); - - // Development: In-memory - let source = InMemoryEventSource::new(vec![...]); - - // Same engine works with both! - let engine = MempoolEngine::with_event_source(source, config); - ``` - -3. **Reusability**: Services can be used in multiple binaries - ```rust - // ingress-rpc binary - use account_abstraction_core::MempoolEngine; - - // batch-processor binary - use account_abstraction_core::MempoolEngine; - - // Same code, different contexts! - ``` - -4. **Clear boundaries**: Each layer has a single responsibility - - Domain: Business rules - - Services: Orchestration - - Infrastructure: External systems - - Factories: Wiring - -5. **Independent evolution**: Change infrastructure without affecting domain - - Migrate Kafka → Redis: Only touch `infrastructure/` - - Add new validation rule: Only touch `domain/` - - Change orchestration: Only touch `services/` - -## Usage Examples - -### Basic Usage (with Factory) - -```rust -use account_abstraction_core::create_mempool_engine; - -let engine = create_mempool_engine( - "kafka.properties", - "user-operations", - "mempool-consumer", - None, -)?; - -tokio::spawn(async move { - engine.run().await; -}); -``` - -### Custom Setup (without Factory) - -```rust -use account_abstraction_core::{ - MempoolEngine, - infrastructure::kafka::consumer::KafkaEventSource, -}; - -let kafka_consumer = create_kafka_consumer(...)?; -let event_source = Arc::new(KafkaEventSource::new(Arc::new(kafka_consumer))); -let engine = MempoolEngine::with_event_source(event_source, Some(custom_config)); -``` - -### Testing - -```rust -use account_abstraction_core::{ - MempoolEngine, MempoolEvent, - services::interfaces::event_source::EventSource, -}; - -struct MockEventSource { - events: Vec, -} - -#[async_trait] -impl EventSource for MockEventSource { - async fn receive(&self) -> anyhow::Result { - // Return test events - } -} - -let mock = Arc::new(MockEventSource { events: test_events }); -let engine = MempoolEngine::with_event_source(mock, None); -// Test without any real Kafka! -``` - -## Further Reading - -- [Clean Architecture (Robert C. Martin)](https://blog.cleancoder.com/uncle-bob/2012/08/13/the-clean-architecture.html) -- [Hexagonal Architecture](https://alistair.cockburn.us/hexagonal-architecture/) -- [Ports and Adapters Pattern](https://jmgarridopaz.github.io/content/hexagonalarchitecture.html) diff --git a/crates/account-abstraction-core/src/domain/entrypoints/mod.rs b/crates/account-abstraction-core/src/domain/entrypoints/mod.rs deleted file mode 100644 index 4946ba2..0000000 --- a/crates/account-abstraction-core/src/domain/entrypoints/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod v06; -pub mod v07; -pub mod version; diff --git a/crates/account-abstraction-core/src/domain/entrypoints/v06.rs b/crates/account-abstraction-core/src/domain/entrypoints/v06.rs deleted file mode 100644 index 4883305..0000000 --- a/crates/account-abstraction-core/src/domain/entrypoints/v06.rs +++ /dev/null @@ -1,139 +0,0 @@ -/* - * ERC-4337 v0.6 UserOperation Hash Calculation - * - * 1. Hash variable-length fields: initCode, callData, paymasterAndData - * 2. Pack all fields into struct (using hashes from step 1, gas values as uint256) - * 3. encodedHash = keccak256(abi.encode(packed struct)) - * 4. final hash = keccak256(abi.encode(encodedHash, entryPoint, chainId)) - * - * Reference: rundler/crates/types/src/user_operation/v0_6.rs:927-934 - */ -use alloy_primitives::{ChainId, U256}; -use alloy_rpc_types::erc4337; -use alloy_sol_types::{SolValue, sol}; -sol! { - #[allow(missing_docs)] - #[derive(Default, Debug, PartialEq, Eq)] - struct UserOperationHashEncoded { - bytes32 encodedHash; - address entryPoint; - uint256 chainId; - } - - #[allow(missing_docs)] - #[derive(Default, Debug, PartialEq, Eq)] - struct UserOperationPackedForHash { - address sender; - uint256 nonce; - bytes32 hashInitCode; - bytes32 hashCallData; - uint256 callGasLimit; - uint256 verificationGasLimit; - uint256 preVerificationGas; - uint256 maxFeePerGas; - uint256 maxPriorityFeePerGas; - bytes32 hashPaymasterAndData; - } -} - -impl From for UserOperationPackedForHash { - fn from(op: erc4337::UserOperation) -> UserOperationPackedForHash { - UserOperationPackedForHash { - sender: op.sender, - nonce: op.nonce, - hashInitCode: alloy_primitives::keccak256(op.init_code), - hashCallData: alloy_primitives::keccak256(op.call_data), - callGasLimit: U256::from(op.call_gas_limit), - verificationGasLimit: U256::from(op.verification_gas_limit), - preVerificationGas: U256::from(op.pre_verification_gas), - maxFeePerGas: U256::from(op.max_fee_per_gas), - maxPriorityFeePerGas: U256::from(op.max_priority_fee_per_gas), - hashPaymasterAndData: alloy_primitives::keccak256(op.paymaster_and_data), - } - } -} - -pub fn hash_user_operation( - user_operation: &erc4337::UserOperation, - entry_point: alloy_primitives::Address, - chain_id: ChainId, -) -> alloy_primitives::B256 { - let packed = UserOperationPackedForHash::from(user_operation.clone()); - let encoded = UserOperationHashEncoded { - encodedHash: alloy_primitives::keccak256(packed.abi_encode()), - entryPoint: entry_point, - chainId: U256::from(chain_id), - }; - alloy_primitives::keccak256(encoded.abi_encode()) -} - -#[cfg(test)] -mod tests { - use super::*; - use alloy_primitives::{Bytes, U256, address, b256, bytes}; - use alloy_rpc_types::erc4337; - - #[test] - fn test_hash_zeroed() { - let entry_point_address_v0_6 = address!("66a15edcc3b50a663e72f1457ffd49b9ae284ddc"); - let chain_id = 1337; - let user_op_with_zeroed_init_code = erc4337::UserOperation { - sender: address!("0x0000000000000000000000000000000000000000"), - nonce: U256::ZERO, - init_code: Bytes::default(), - call_data: Bytes::default(), - call_gas_limit: U256::from(0), - verification_gas_limit: U256::from(0), - pre_verification_gas: U256::from(0), - max_fee_per_gas: U256::from(0), - max_priority_fee_per_gas: U256::from(0), - paymaster_and_data: Bytes::default(), - signature: Bytes::default(), - }; - - let hash = hash_user_operation( - &user_op_with_zeroed_init_code, - entry_point_address_v0_6, - chain_id, - ); - assert_eq!( - hash, - b256!("dca97c3b49558ab360659f6ead939773be8bf26631e61bb17045bb70dc983b2d") - ); - } - - #[test] - fn test_hash_non_zeroed() { - let entry_point_address_v0_6 = address!("66a15edcc3b50a663e72f1457ffd49b9ae284ddc"); - let chain_id = 1337; - let user_op_with_non_zeroed_init_code = erc4337::UserOperation { - sender: address!("0x1306b01bc3e4ad202612d3843387e94737673f53"), - nonce: U256::from(8942), - init_code: "0x6942069420694206942069420694206942069420" - .parse() - .unwrap(), - call_data: "0x0000000000000000000000000000000000000000080085" - .parse() - .unwrap(), - call_gas_limit: U256::from(10_000), - verification_gas_limit: U256::from(100_000), - pre_verification_gas: U256::from(100), - max_fee_per_gas: U256::from(99_999), - max_priority_fee_per_gas: U256::from(9_999_999), - paymaster_and_data: bytes!( - "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" - ), - signature: bytes!("da0929f527cded8d0a1eaf2e8861d7f7e2d8160b7b13942f99dd367df4473a"), - }; - - let hash = hash_user_operation( - &user_op_with_non_zeroed_init_code, - entry_point_address_v0_6, - chain_id, - ); - assert_eq!( - hash, - b256!("484add9e4d8c3172d11b5feb6a3cc712280e176d278027cfa02ee396eb28afa1") - ); - } -} diff --git a/crates/account-abstraction-core/src/domain/entrypoints/v07.rs b/crates/account-abstraction-core/src/domain/entrypoints/v07.rs deleted file mode 100644 index 60d8fd4..0000000 --- a/crates/account-abstraction-core/src/domain/entrypoints/v07.rs +++ /dev/null @@ -1,180 +0,0 @@ -/* - * ERC-4337 v0.7 UserOperation Hash Calculation - * - * 1. Hash variable-length fields: initCode, callData, paymasterAndData - * 2. Pack all fields into struct (using hashes from step 1, gas values as bytes32) - * 3. encodedHash = keccak256(abi.encode(packed struct)) - * 4. final hash = keccak256(abi.encode(encodedHash, entryPoint, chainId)) - * - * Reference: rundler/crates/types/src/user_operation/v0_7.rs:1094-1123 - */ -use alloy_primitives::{Address, ChainId, FixedBytes, U256}; -use alloy_primitives::{Bytes, keccak256}; -use alloy_rpc_types::erc4337; -use alloy_sol_types::{SolValue, sol}; - -sol!( - #[allow(missing_docs)] - #[derive(Default, Debug, PartialEq, Eq)] - struct PackedUserOperation { - address sender; - uint256 nonce; - bytes initCode; - bytes callData; - bytes32 accountGasLimits; - uint256 preVerificationGas; - bytes32 gasFees; - bytes paymasterAndData; - bytes signature; - } - - #[derive(Default, Debug, PartialEq, Eq)] - struct UserOperationHashEncoded { - bytes32 encodedHash; - address entryPoint; - uint256 chainId; - } - - #[derive(Default, Debug, PartialEq, Eq)] - struct UserOperationPackedForHash { - address sender; - uint256 nonce; - bytes32 hashInitCode; - bytes32 hashCallData; - bytes32 accountGasLimits; - uint256 preVerificationGas; - bytes32 gasFees; - bytes32 hashPaymasterAndData; - } -); - -impl From for PackedUserOperation { - fn from(uo: erc4337::PackedUserOperation) -> Self { - let init_code = if let Some(factory) = uo.factory { - let mut init_code = factory.to_vec(); - init_code.extend_from_slice(&uo.factory_data.clone().unwrap_or_default()); - Bytes::from(init_code) - } else { - Bytes::new() - }; - let account_gas_limits = - pack_u256_pair_to_bytes32(uo.verification_gas_limit, uo.call_gas_limit); - let gas_fees = pack_u256_pair_to_bytes32(uo.max_priority_fee_per_gas, uo.max_fee_per_gas); - let pvgl: [u8; 16] = uo - .paymaster_verification_gas_limit - .unwrap_or_default() - .to::() - .to_be_bytes(); - let pogl: [u8; 16] = uo - .paymaster_post_op_gas_limit - .unwrap_or_default() - .to::() - .to_be_bytes(); - let paymaster_and_data = if let Some(paymaster) = uo.paymaster { - let mut paymaster_and_data = paymaster.to_vec(); - paymaster_and_data.extend_from_slice(&pvgl); - paymaster_and_data.extend_from_slice(&pogl); - paymaster_and_data.extend_from_slice(&uo.paymaster_data.unwrap()); - Bytes::from(paymaster_and_data) - } else { - Bytes::new() - }; - PackedUserOperation { - sender: uo.sender, - nonce: uo.nonce, - initCode: init_code, - callData: uo.call_data.clone(), - accountGasLimits: account_gas_limits, - preVerificationGas: U256::from(uo.pre_verification_gas), - gasFees: gas_fees, - paymasterAndData: paymaster_and_data, - signature: uo.signature.clone(), - } - } -} -fn pack_u256_pair_to_bytes32(high: U256, low: U256) -> FixedBytes<32> { - let mask = (U256::from(1u64) << 128) - U256::from(1u64); - let hi = high & mask; - let lo = low & mask; - let combined: U256 = (hi << 128) | lo; - FixedBytes::from(combined.to_be_bytes::<32>()) -} - -fn hash_packed_user_operation( - puo: &PackedUserOperation, - entry_point: Address, - chain_id: u64, -) -> FixedBytes<32> { - let hash_init_code = alloy_primitives::keccak256(&puo.initCode); - let hash_call_data = alloy_primitives::keccak256(&puo.callData); - let hash_paymaster_and_data = alloy_primitives::keccak256(&puo.paymasterAndData); - - let packed_for_hash = UserOperationPackedForHash { - sender: puo.sender, - nonce: puo.nonce, - hashInitCode: hash_init_code, - hashCallData: hash_call_data, - accountGasLimits: puo.accountGasLimits, - preVerificationGas: puo.preVerificationGas, - gasFees: puo.gasFees, - hashPaymasterAndData: hash_paymaster_and_data, - }; - - let hashed = alloy_primitives::keccak256(packed_for_hash.abi_encode()); - - let encoded = UserOperationHashEncoded { - encodedHash: hashed, - entryPoint: entry_point, - chainId: U256::from(chain_id), - }; - - keccak256(encoded.abi_encode()) -} - -pub fn hash_user_operation( - user_operation: &erc4337::PackedUserOperation, - entry_point: Address, - chain_id: ChainId, -) -> FixedBytes<32> { - let packed = PackedUserOperation::from(user_operation.clone()); - hash_packed_user_operation(&packed, entry_point, chain_id) -} - -#[cfg(test)] -mod test { - use super::*; - use alloy_primitives::{Bytes, U256}; - use alloy_primitives::{address, b256, bytes, uint}; - - #[test] - fn test_hash() { - let puo = PackedUserOperation { - sender: address!("b292Cf4a8E1fF21Ac27C4f94071Cd02C022C414b"), - nonce: uint!(0xF83D07238A7C8814A48535035602123AD6DBFA63000000000000000000000001_U256), - initCode: Bytes::default(), // Empty - callData: - bytes!("e9ae5c53000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000 - 0000000000000000000000000000000000001d8b292cf4a8e1ff21ac27c4f94071cd02c022c414b00000000000000000000000000000000000000000000000000000000000000009517e29f000000000000000000 - 0000000000000000000000000000000000000000000002000000000000000000000000ad6330089d9a1fe89f4020292e1afe9969a5a2fc00000000000000000000000000000000000000000000000000000000000 - 0006000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000015180000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000000000000000000000000000000000000000018e2fbe898000000000000000000000000000000000000000000000000000000000000000800000000000000 - 0000000000000000000000000000000000000000000000000800000000000000000000000002372912728f93ab3daaaebea4f87e6e28476d987000000000000000000000000000000000000000000000000002386 - f26fc10000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000"), - accountGasLimits: b256!("000000000000000000000000000114fc0000000000000000000000000012c9b5"), - preVerificationGas: U256::from(48916), - gasFees: b256!("000000000000000000000000524121000000000000000000000000109a4a441a"), - paymasterAndData: Bytes::default(), // Empty - signature: bytes!("3c7bfe22c9c2ef8994a9637bcc4df1741c5dc0c25b209545a7aeb20f7770f351479b683bd17c4d55bc32e2a649c8d2dff49dcfcc1f3fd837bcd88d1e69a434cf1c"), - }; - - let expected_hash = - b256!("e486401370d145766c3cf7ba089553214a1230d38662ae532c9b62eb6dadcf7e"); - let uo = hash_packed_user_operation( - &puo, - address!("0x0000000071727De22E5E9d8BAf0edAc6f37da032"), - 11155111, - ); - - assert_eq!(uo, expected_hash); - } -} diff --git a/crates/account-abstraction-core/src/domain/entrypoints/version.rs b/crates/account-abstraction-core/src/domain/entrypoints/version.rs deleted file mode 100644 index ae37e5d..0000000 --- a/crates/account-abstraction-core/src/domain/entrypoints/version.rs +++ /dev/null @@ -1,31 +0,0 @@ -use alloy_primitives::{Address, address}; - -#[derive(Debug, Clone)] -pub enum EntryPointVersion { - V06, - V07, -} - -impl EntryPointVersion { - pub const V06_ADDRESS: Address = address!("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"); - pub const V07_ADDRESS: Address = address!("0x0000000071727De22E5E9d8BAf0edAc6f37da032"); -} - -#[derive(Debug)] -pub struct UnknownEntryPointAddress { - pub address: Address, -} - -impl TryFrom
    for EntryPointVersion { - type Error = UnknownEntryPointAddress; - - fn try_from(addr: Address) -> Result { - if addr == Self::V06_ADDRESS { - Ok(EntryPointVersion::V06) - } else if addr == Self::V07_ADDRESS { - Ok(EntryPointVersion::V07) - } else { - Err(UnknownEntryPointAddress { address: addr }) - } - } -} diff --git a/crates/account-abstraction-core/src/domain/events.rs b/crates/account-abstraction-core/src/domain/events.rs deleted file mode 100644 index 9b25c0c..0000000 --- a/crates/account-abstraction-core/src/domain/events.rs +++ /dev/null @@ -1,17 +0,0 @@ -use crate::domain::types::WrappedUserOperation; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(tag = "event", content = "data")] -pub enum MempoolEvent { - UserOpAdded { - user_op: WrappedUserOperation, - }, - UserOpIncluded { - user_op: WrappedUserOperation, - }, - UserOpDropped { - user_op: WrappedUserOperation, - reason: String, - }, -} diff --git a/crates/account-abstraction-core/src/domain/mempool.rs b/crates/account-abstraction-core/src/domain/mempool.rs deleted file mode 100644 index 701a234..0000000 --- a/crates/account-abstraction-core/src/domain/mempool.rs +++ /dev/null @@ -1,18 +0,0 @@ -use crate::domain::types::{UserOpHash, WrappedUserOperation}; -use std::sync::Arc; - -#[derive(Default)] -pub struct PoolConfig { - pub minimum_max_fee_per_gas: u128, -} - -pub trait Mempool: Send + Sync { - fn add_operation(&mut self, operation: &WrappedUserOperation) -> Result<(), anyhow::Error>; - - fn get_top_operations(&self, n: usize) -> impl Iterator>; - - fn remove_operation( - &mut self, - operation_hash: &UserOpHash, - ) -> Result, anyhow::Error>; -} diff --git a/crates/account-abstraction-core/src/domain/mod.rs b/crates/account-abstraction-core/src/domain/mod.rs deleted file mode 100644 index 751d4e8..0000000 --- a/crates/account-abstraction-core/src/domain/mod.rs +++ /dev/null @@ -1,13 +0,0 @@ -pub mod entrypoints; -pub mod events; -pub mod mempool; -pub mod reputation; -pub mod types; - -pub use events::MempoolEvent; -pub use mempool::{Mempool, PoolConfig}; -pub use reputation::{ReputationService, ReputationStatus}; -pub use types::{ - UserOpHash, UserOperationRequest, ValidationResult, VersionedUserOperation, - WrappedUserOperation, -}; diff --git a/crates/account-abstraction-core/src/domain/reputation.rs b/crates/account-abstraction-core/src/domain/reputation.rs deleted file mode 100644 index 0f0fed4..0000000 --- a/crates/account-abstraction-core/src/domain/reputation.rs +++ /dev/null @@ -1,18 +0,0 @@ -use alloy_primitives::Address; -use async_trait::async_trait; - -/// Reputation status for an entity -#[derive(Debug, Copy, Clone, PartialEq, Eq)] -pub enum ReputationStatus { - /// Entity is not throttled or banned - Ok, - /// Entity is throttled - Throttled, - /// Entity is banned - Banned, -} - -#[async_trait] -pub trait ReputationService: Send + Sync { - async fn get_reputation(&self, entity: &Address) -> ReputationStatus; -} diff --git a/crates/account-abstraction-core/src/domain/types.rs b/crates/account-abstraction-core/src/domain/types.rs deleted file mode 100644 index 837cd52..0000000 --- a/crates/account-abstraction-core/src/domain/types.rs +++ /dev/null @@ -1,207 +0,0 @@ -use super::entrypoints::{v06, v07, version::EntryPointVersion}; -use alloy_primitives::{Address, B256, ChainId, FixedBytes, U256}; -use alloy_rpc_types::erc4337; -pub use alloy_rpc_types::erc4337::SendUserOperationResponse; -use anyhow::Result; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] -#[serde(untagged)] -pub enum VersionedUserOperation { - UserOperation(erc4337::UserOperation), - PackedUserOperation(erc4337::PackedUserOperation), -} - -impl VersionedUserOperation { - pub fn max_fee_per_gas(&self) -> U256 { - match self { - VersionedUserOperation::UserOperation(op) => op.max_fee_per_gas, - VersionedUserOperation::PackedUserOperation(op) => op.max_fee_per_gas, - } - } - - pub fn max_priority_fee_per_gas(&self) -> U256 { - match self { - VersionedUserOperation::UserOperation(op) => op.max_priority_fee_per_gas, - VersionedUserOperation::PackedUserOperation(op) => op.max_priority_fee_per_gas, - } - } - pub fn nonce(&self) -> U256 { - match self { - VersionedUserOperation::UserOperation(op) => op.nonce, - VersionedUserOperation::PackedUserOperation(op) => op.nonce, - } - } - - pub fn sender(&self) -> Address { - match self { - VersionedUserOperation::UserOperation(op) => op.sender, - VersionedUserOperation::PackedUserOperation(op) => op.sender, - } - } -} -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] -pub struct UserOperationRequest { - pub user_operation: VersionedUserOperation, - pub entry_point: Address, - pub chain_id: ChainId, -} - -impl UserOperationRequest { - pub fn hash(&self) -> Result { - let entry_point_version = EntryPointVersion::try_from(self.entry_point) - .map_err(|_| anyhow::anyhow!("Unknown entry point version: {:#x}", self.entry_point))?; - - match (&self.user_operation, entry_point_version) { - (VersionedUserOperation::UserOperation(op), EntryPointVersion::V06) => Ok( - v06::hash_user_operation(op, self.entry_point, self.chain_id), - ), - (VersionedUserOperation::PackedUserOperation(op), EntryPointVersion::V07) => Ok( - v07::hash_user_operation(op, self.entry_point, self.chain_id), - ), - _ => Err(anyhow::anyhow!( - "Mismatched operation type and entry point version" - )), - } - } -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct UserOperationRequestValidationResult { - pub expiration_timestamp: u64, - pub gas_used: U256, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct ValidationResult { - pub valid: bool, - #[serde(skip_serializing_if = "Option::is_none")] - pub reason: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub valid_until: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub valid_after: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub context: Option, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct ValidationContext { - pub sender_info: EntityStakeInfo, - #[serde(skip_serializing_if = "Option::is_none")] - pub factory_info: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub paymaster_info: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub aggregator_info: Option, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct EntityStakeInfo { - pub address: Address, - pub stake: U256, - pub unstake_delay_sec: u64, - pub deposit: U256, - pub is_staked: bool, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct AggregatorInfo { - pub aggregator: Address, - pub stake_info: EntityStakeInfo, -} - -pub type UserOpHash = FixedBytes<32>; - -#[derive(Eq, PartialEq, Clone, Debug, Serialize, Deserialize)] -pub struct WrappedUserOperation { - pub operation: VersionedUserOperation, - pub hash: UserOpHash, -} - -impl WrappedUserOperation { - pub fn has_higher_max_fee(&self, other: &WrappedUserOperation) -> bool { - self.operation.max_fee_per_gas() > other.operation.max_fee_per_gas() - } -} - -#[cfg(test)] -mod tests { - use std::str::FromStr; - - use super::*; - use alloy_primitives::{Address, Uint}; - - #[test] - fn deser_untagged_user_operation_without_type_field() { - let json = r#" - { - "sender": "0x1111111111111111111111111111111111111111", - "nonce": "0x0", - "initCode": "0x", - "callData": "0x", - "callGasLimit": "0x5208", - "verificationGasLimit": "0x100000", - "preVerificationGas": "0x10000", - "maxFeePerGas": "0x59682f10", - "maxPriorityFeePerGas": "0x3b9aca00", - "paymasterAndData": "0x", - "signature": "0x01" - } - "#; - - let parsed: VersionedUserOperation = - serde_json::from_str(json).expect("should deserialize as v0.6"); - match parsed { - VersionedUserOperation::UserOperation(op) => { - assert_eq!( - op.sender, - Address::from_str("0x1111111111111111111111111111111111111111").unwrap() - ); - assert_eq!(op.nonce, Uint::from(0)); - } - other => panic!("expected UserOperation, got {:?}", other), - } - } - - #[test] - fn deser_untagged_packed_user_operation_without_type_field() { - let json = r#" - { - "sender": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", - "nonce": "0x1", - "factory": "0x2222222222222222222222222222222222222222", - "factoryData": "0xabcdef1234560000000000000000000000000000000000000000000000000000", - "callData": "0xb61d27f600000000000000000000000000000000000000000000000000000000000000c8", - "callGasLimit": "0x2dc6c0", - "verificationGasLimit": "0x1e8480", - "preVerificationGas": "0x186a0", - "maxFeePerGas": "0x77359400", - "maxPriorityFeePerGas": "0x3b9aca00", - "paymaster": "0x3333333333333333333333333333333333333333", - "paymasterVerificationGasLimit": "0x186a0", - "paymasterPostOpGasLimit": "0x27100", - "paymasterData": "0xfafb00000000000000000000000000000000000000000000000000000000000064", - "signature": "0xa3c5f1b90014e68abbbdc42e4b77b9accc0b7e1c5d0b5bcde1a47ba8faba00ff55c9a7de12e98b731766e35f6c51ab25c9b58cc0e7c4a33f25e75c51c6ad3c3a" - } - "#; - - let parsed: VersionedUserOperation = - serde_json::from_str(json).expect("should deserialize as v0.7 packed"); - match parsed { - VersionedUserOperation::PackedUserOperation(op) => { - assert_eq!( - op.sender, - Address::from_str("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48").unwrap() - ); - assert_eq!(op.nonce, Uint::from(1)); - } - other => panic!("expected PackedUserOperation, got {:?}", other), - } - } -} diff --git a/crates/account-abstraction-core/src/factories/kafka_engine.rs b/crates/account-abstraction-core/src/factories/kafka_engine.rs deleted file mode 100644 index a7d972b..0000000 --- a/crates/account-abstraction-core/src/factories/kafka_engine.rs +++ /dev/null @@ -1,33 +0,0 @@ -use crate::domain::mempool::PoolConfig; -use crate::infrastructure::in_memory::mempool::InMemoryMempool; -use crate::infrastructure::kafka::consumer::KafkaEventSource; -use crate::services::mempool_engine::MempoolEngine; -use rdkafka::{ - ClientConfig, - consumer::{Consumer, StreamConsumer}, -}; -use std::sync::Arc; -use tips_core::kafka::load_kafka_config_from_file; -use tokio::sync::RwLock; - -pub fn create_mempool_engine( - properties_file: &str, - topic: &str, - consumer_group_id: &str, - pool_config: Option, -) -> anyhow::Result>> { - let mut client_config = ClientConfig::from_iter(load_kafka_config_from_file(properties_file)?); - client_config.set("group.id", consumer_group_id); - client_config.set("enable.auto.commit", "true"); - - let consumer: StreamConsumer = client_config.create()?; - consumer.subscribe(&[topic])?; - - let event_source = Arc::new(KafkaEventSource::new(Arc::new(consumer))); - let mempool = Arc::new(RwLock::new(InMemoryMempool::new( - pool_config.unwrap_or_default(), - ))); - let engine = MempoolEngine::::new(mempool, event_source); - - Ok(Arc::new(engine)) -} diff --git a/crates/account-abstraction-core/src/factories/mod.rs b/crates/account-abstraction-core/src/factories/mod.rs deleted file mode 100644 index 16ba50d..0000000 --- a/crates/account-abstraction-core/src/factories/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod kafka_engine; diff --git a/crates/account-abstraction-core/src/infrastructure/base_node/mod.rs b/crates/account-abstraction-core/src/infrastructure/base_node/mod.rs deleted file mode 100644 index fa199f2..0000000 --- a/crates/account-abstraction-core/src/infrastructure/base_node/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod validator; diff --git a/crates/account-abstraction-core/src/infrastructure/base_node/validator.rs b/crates/account-abstraction-core/src/infrastructure/base_node/validator.rs deleted file mode 100644 index e0577f5..0000000 --- a/crates/account-abstraction-core/src/infrastructure/base_node/validator.rs +++ /dev/null @@ -1,173 +0,0 @@ -use crate::domain::types::{ValidationResult, VersionedUserOperation}; -use crate::services::interfaces::user_op_validator::UserOperationValidator; -use alloy_primitives::Address; -use alloy_provider::{Provider, RootProvider}; -use async_trait::async_trait; -use op_alloy_network::Optimism; -use std::sync::Arc; -use tokio::time::{Duration, timeout}; - -#[derive(Debug, Clone)] -pub struct BaseNodeValidator { - simulation_provider: Arc>, - validate_user_operation_timeout: u64, -} - -impl BaseNodeValidator { - pub fn new( - simulation_provider: Arc>, - validate_user_operation_timeout: u64, - ) -> Self { - Self { - simulation_provider, - validate_user_operation_timeout, - } - } -} - -#[async_trait] -impl UserOperationValidator for BaseNodeValidator { - async fn validate_user_operation( - &self, - user_operation: &VersionedUserOperation, - entry_point: &Address, - ) -> anyhow::Result { - let result = timeout( - Duration::from_secs(self.validate_user_operation_timeout), - self.simulation_provider - .client() - .request("base_validateUserOperation", (user_operation, entry_point)), - ) - .await; - - let validation_result: ValidationResult = match result { - Err(_) => { - return Err(anyhow::anyhow!("Timeout on requesting validation")); - } - Ok(Err(e)) => { - return Err(anyhow::anyhow!("RPC error: {e}")); - } - Ok(Ok(v)) => v, - }; - - Ok(validation_result) - } -} - -#[cfg(test)] -mod tests { - use super::*; - - use alloy_primitives::{Address, Bytes, U256}; - use alloy_rpc_types::erc4337::UserOperation; - use tokio::time::Duration; - use wiremock::{Mock, MockServer, ResponseTemplate, matchers::method}; - - const VALIDATION_TIMEOUT_SECS: u64 = 1; - const LONG_DELAY_SECS: u64 = 3; - - async fn setup_mock_server() -> MockServer { - MockServer::start().await - } - - fn new_test_user_operation_v06() -> VersionedUserOperation { - VersionedUserOperation::UserOperation(UserOperation { - sender: Address::ZERO, - nonce: U256::from(0), - init_code: Bytes::default(), - call_data: Bytes::default(), - call_gas_limit: U256::from(21_000), - verification_gas_limit: U256::from(100_000), - pre_verification_gas: U256::from(21_000), - max_fee_per_gas: U256::from(1_000_000_000), - max_priority_fee_per_gas: U256::from(1_000_000_000), - paymaster_and_data: Bytes::default(), - signature: Bytes::default(), - }) - } - - fn new_validator(mock_server: &MockServer) -> BaseNodeValidator { - let provider: RootProvider = - RootProvider::new_http(mock_server.uri().parse().unwrap()); - let simulation_provider = Arc::new(provider); - BaseNodeValidator::new(simulation_provider, VALIDATION_TIMEOUT_SECS) - } - - #[tokio::test] - async fn base_node_validate_user_operation_times_out() { - let mock_server = setup_mock_server().await; - - Mock::given(method("POST")) - .respond_with( - ResponseTemplate::new(200).set_delay(Duration::from_secs(LONG_DELAY_SECS)), - ) - .mount(&mock_server) - .await; - - let validator = new_validator(&mock_server); - let user_operation = new_test_user_operation_v06(); - - let result = validator - .validate_user_operation(&user_operation, &Address::ZERO) - .await; - - assert!(result.is_err()); - assert!(result.unwrap_err().to_string().contains("Timeout")); - } - - #[tokio::test] - async fn should_propagate_error_from_base_node() { - let mock_server = setup_mock_server().await; - - Mock::given(method("POST")) - .respond_with(ResponseTemplate::new(500).set_body_json(serde_json::json!({ - "jsonrpc": "2.0", - "id": 1, - "error": { - "code": -32000, - "message": "Internal error" - } - }))) - .mount(&mock_server) - .await; - - let validator = new_validator(&mock_server); - let user_operation = new_test_user_operation_v06(); - - let result = validator - .validate_user_operation(&user_operation, &Address::ZERO) - .await; - assert!(result.is_err()); - assert!(result.unwrap_err().to_string().contains("Internal error")); - } - - #[tokio::test] - async fn base_node_validate_user_operation_succeeds() { - let mock_server = setup_mock_server().await; - - Mock::given(method("POST")) - .respond_with(ResponseTemplate::new(200).set_body_json(serde_json::json!({ - "jsonrpc": "2.0", - "id": 1, - "result": { - "valid": true, - "reason": null, - "valid_until": null, - "valid_after": null, - "context": null - } - }))) - .mount(&mock_server) - .await; - - let validator = new_validator(&mock_server); - let user_operation = new_test_user_operation_v06(); - - let result = validator - .validate_user_operation(&user_operation, &Address::ZERO) - .await - .unwrap(); - - assert_eq!(result.valid, true); - } -} diff --git a/crates/account-abstraction-core/src/infrastructure/in_memory/mempool.rs b/crates/account-abstraction-core/src/infrastructure/in_memory/mempool.rs deleted file mode 100644 index 5aa7166..0000000 --- a/crates/account-abstraction-core/src/infrastructure/in_memory/mempool.rs +++ /dev/null @@ -1,424 +0,0 @@ -use crate::domain::mempool::{Mempool, PoolConfig}; -use crate::domain::types::{UserOpHash, WrappedUserOperation}; -use alloy_primitives::Address; -use std::cmp::Ordering; -use std::collections::{BTreeSet, HashMap}; -use std::sync::Arc; -use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering}; -use tracing::warn; - -#[derive(Eq, PartialEq, Clone, Debug)] -struct OrderedPoolOperation { - pool_operation: WrappedUserOperation, - submission_id: u64, -} - -impl OrderedPoolOperation { - fn from_wrapped(operation: &WrappedUserOperation, submission_id: u64) -> Self { - Self { - pool_operation: operation.clone(), - submission_id, - } - } - - fn sender(&self) -> Address { - self.pool_operation.operation.sender() - } -} - -#[derive(Clone, Debug)] -struct ByMaxFeeAndSubmissionId(OrderedPoolOperation); - -impl PartialEq for ByMaxFeeAndSubmissionId { - fn eq(&self, other: &Self) -> bool { - self.0.pool_operation.hash == other.0.pool_operation.hash - } -} -impl Eq for ByMaxFeeAndSubmissionId {} - -impl PartialOrd for ByMaxFeeAndSubmissionId { - fn partial_cmp(&self, other: &Self) -> Option { - Some(self.cmp(other)) - } -} - -impl Ord for ByMaxFeeAndSubmissionId { - fn cmp(&self, other: &Self) -> Ordering { - other - .0 - .pool_operation - .operation - .max_priority_fee_per_gas() - .cmp(&self.0.pool_operation.operation.max_priority_fee_per_gas()) - .then_with(|| self.0.submission_id.cmp(&other.0.submission_id)) - } -} - -#[derive(Clone, Debug)] -struct ByNonce(OrderedPoolOperation); - -impl PartialEq for ByNonce { - fn eq(&self, other: &Self) -> bool { - self.0.pool_operation.hash == other.0.pool_operation.hash - } -} -impl Eq for ByNonce {} - -impl PartialOrd for ByNonce { - fn partial_cmp(&self, other: &Self) -> Option { - Some(self.cmp(other)) - } -} - -impl Ord for ByNonce { - fn cmp(&self, other: &Self) -> Ordering { - self.0 - .pool_operation - .operation - .nonce() - .cmp(&other.0.pool_operation.operation.nonce()) - .then_with(|| self.0.submission_id.cmp(&other.0.submission_id)) - .then_with(|| self.0.pool_operation.hash.cmp(&other.0.pool_operation.hash)) - } -} - -pub struct InMemoryMempool { - config: PoolConfig, - best: BTreeSet, - hash_to_operation: HashMap, - operations_by_account: HashMap>, - submission_id_counter: AtomicU64, -} - -impl Mempool for InMemoryMempool { - fn add_operation(&mut self, operation: &WrappedUserOperation) -> Result<(), anyhow::Error> { - if operation.operation.max_fee_per_gas() < self.config.minimum_max_fee_per_gas { - return Err(anyhow::anyhow!( - "Gas price is below the minimum required PVG gas" - )); - } - self.handle_add_operation(operation)?; - Ok(()) - } - - fn get_top_operations(&self, n: usize) -> impl Iterator> { - self.best - .iter() - .filter_map(|op_by_fee| { - let lowest = self - .operations_by_account - .get(&op_by_fee.0.sender()) - .and_then(|set| set.first()); - - match lowest { - Some(lowest) - if lowest.0.pool_operation.hash == op_by_fee.0.pool_operation.hash => - { - Some(Arc::new(op_by_fee.0.pool_operation.clone())) - } - Some(_) => None, - None => { - warn!( - account = %op_by_fee.0.sender(), - "Inconsistent state: operation in best set but not in account index" - ); - None - } - } - }) - .take(n) - } - - fn remove_operation( - &mut self, - operation_hash: &UserOpHash, - ) -> Result, anyhow::Error> { - if let Some(ordered_operation) = self.hash_to_operation.remove(operation_hash) { - self.best - .remove(&ByMaxFeeAndSubmissionId(ordered_operation.clone())); - self.operations_by_account - .get_mut(&ordered_operation.sender()) - .map(|set| set.remove(&ByNonce(ordered_operation.clone()))); - Ok(Some(ordered_operation.pool_operation)) - } else { - Ok(None) - } - } -} - -impl InMemoryMempool { - fn handle_add_operation( - &mut self, - operation: &WrappedUserOperation, - ) -> Result<(), anyhow::Error> { - if self.hash_to_operation.contains_key(&operation.hash) { - return Ok(()); - } - - let order = self.get_next_order_id(); - let ordered_operation = OrderedPoolOperation::from_wrapped(operation, order); - - self.best - .insert(ByMaxFeeAndSubmissionId(ordered_operation.clone())); - self.operations_by_account - .entry(ordered_operation.sender()) - .or_default() - .insert(ByNonce(ordered_operation.clone())); - self.hash_to_operation - .insert(operation.hash, ordered_operation.clone()); - Ok(()) - } - - fn get_next_order_id(&self) -> u64 { - self.submission_id_counter - .fetch_add(1, AtomicOrdering::SeqCst) - } - - pub fn new(config: PoolConfig) -> Self { - Self { - config, - best: BTreeSet::new(), - hash_to_operation: HashMap::new(), - operations_by_account: HashMap::new(), - submission_id_counter: AtomicU64::new(0), - } - } -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::domain::types::VersionedUserOperation; - use alloy_primitives::{Address, FixedBytes, Uint}; - use alloy_rpc_types::erc4337; - - fn create_test_user_operation(max_priority_fee_per_gas: u128) -> VersionedUserOperation { - VersionedUserOperation::UserOperation(erc4337::UserOperation { - sender: Address::random(), - nonce: Uint::from(0), - init_code: Default::default(), - call_data: Default::default(), - call_gas_limit: Uint::from(100000), - verification_gas_limit: Uint::from(100000), - pre_verification_gas: Uint::from(21000), - max_fee_per_gas: Uint::from(max_priority_fee_per_gas), - max_priority_fee_per_gas: Uint::from(max_priority_fee_per_gas), - paymaster_and_data: Default::default(), - signature: Default::default(), - }) - } - - fn create_wrapped_operation( - max_priority_fee_per_gas: u128, - hash: UserOpHash, - ) -> WrappedUserOperation { - WrappedUserOperation { - operation: create_test_user_operation(max_priority_fee_per_gas), - hash, - } - } - - fn create_test_mempool(minimum_required_pvg_gas: u128) -> InMemoryMempool { - InMemoryMempool::new(PoolConfig { - minimum_max_fee_per_gas: minimum_required_pvg_gas, - }) - } - - #[test] - fn test_add_operation_success() { - let mut mempool = create_test_mempool(1000); - let hash = FixedBytes::from([1u8; 32]); - let operation = create_wrapped_operation(2000, hash); - - let result = mempool.add_operation(&operation); - - assert!(result.is_ok()); - } - - #[test] - fn test_add_operation_below_minimum_gas() { - let mut mempool = create_test_mempool(2000); - let hash = FixedBytes::from([1u8; 32]); - let operation = create_wrapped_operation(1000, hash); - - let result = mempool.add_operation(&operation); - - assert!(result.is_err()); - assert!( - result - .unwrap_err() - .to_string() - .contains("Gas price is below the minimum required PVG gas") - ); - } - - #[test] - fn test_add_multiple_operations_with_different_hashes() { - let mut mempool = create_test_mempool(1000); - - let hash1 = FixedBytes::from([1u8; 32]); - let operation1 = create_wrapped_operation(2000, hash1); - let result1 = mempool.add_operation(&operation1); - assert!(result1.is_ok()); - - let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = create_wrapped_operation(3000, hash2); - let result2 = mempool.add_operation(&operation2); - assert!(result2.is_ok()); - - let hash3 = FixedBytes::from([3u8; 32]); - let operation3 = create_wrapped_operation(1500, hash3); - let result3 = mempool.add_operation(&operation3); - assert!(result3.is_ok()); - - assert_eq!(mempool.hash_to_operation.len(), 3); - assert_eq!(mempool.best.len(), 3); - } - - #[test] - fn test_remove_operation_not_in_mempool() { - let mut mempool = create_test_mempool(1000); - let hash = FixedBytes::from([1u8; 32]); - - let result = mempool.remove_operation(&hash); - assert!(result.is_ok()); - assert!(result.unwrap().is_none()); - } - - #[test] - fn test_remove_operation_exists() { - let mut mempool = create_test_mempool(1000); - let hash = FixedBytes::from([1u8; 32]); - let operation = create_wrapped_operation(2000, hash); - - mempool.add_operation(&operation).unwrap(); - - let result = mempool.remove_operation(&hash); - assert!(result.is_ok()); - let removed = result.unwrap(); - assert!(removed.is_some()); - let removed_op = removed.unwrap(); - assert_eq!(removed_op.hash, hash); - assert_eq!(removed_op.operation.max_fee_per_gas(), Uint::from(2000)); - } - - #[test] - fn test_remove_operation_and_check_best() { - let mut mempool = create_test_mempool(1000); - let hash = FixedBytes::from([1u8; 32]); - let operation = create_wrapped_operation(2000, hash); - - mempool.add_operation(&operation).unwrap(); - - let best_before: Vec<_> = mempool.get_top_operations(10).collect(); - assert_eq!(best_before.len(), 1); - assert_eq!(best_before[0].hash, hash); - - let result = mempool.remove_operation(&hash); - assert!(result.is_ok()); - assert!(result.unwrap().is_some()); - - let best_after: Vec<_> = mempool.get_top_operations(10).collect(); - assert_eq!(best_after.len(), 0); - } - - #[test] - fn test_get_top_operations_ordering() { - let mut mempool = create_test_mempool(1000); - - let hash1 = FixedBytes::from([1u8; 32]); - let operation1 = create_wrapped_operation(2000, hash1); - mempool.add_operation(&operation1).unwrap(); - - let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = create_wrapped_operation(3000, hash2); - mempool.add_operation(&operation2).unwrap(); - - let hash3 = FixedBytes::from([3u8; 32]); - let operation3 = create_wrapped_operation(1500, hash3); - mempool.add_operation(&operation3).unwrap(); - - let best: Vec<_> = mempool.get_top_operations(10).collect(); - assert_eq!(best.len(), 3); - assert_eq!(best[0].operation.max_fee_per_gas(), Uint::from(3000)); - assert_eq!(best[1].operation.max_fee_per_gas(), Uint::from(2000)); - assert_eq!(best[2].operation.max_fee_per_gas(), Uint::from(1500)); - } - - #[test] - fn test_get_top_operations_limit() { - let mut mempool = create_test_mempool(1000); - - let hash1 = FixedBytes::from([1u8; 32]); - let operation1 = create_wrapped_operation(2000, hash1); - mempool.add_operation(&operation1).unwrap(); - - let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = create_wrapped_operation(3000, hash2); - mempool.add_operation(&operation2).unwrap(); - - let hash3 = FixedBytes::from([3u8; 32]); - let operation3 = create_wrapped_operation(1500, hash3); - mempool.add_operation(&operation3).unwrap(); - - let best: Vec<_> = mempool.get_top_operations(2).collect(); - assert_eq!(best.len(), 2); - assert_eq!(best[0].operation.max_fee_per_gas(), Uint::from(3000)); - assert_eq!(best[1].operation.max_fee_per_gas(), Uint::from(2000)); - } - - #[test] - fn test_get_top_operations_submission_id_tie_breaker() { - let mut mempool = create_test_mempool(1000); - - let hash1 = FixedBytes::from([1u8; 32]); - let operation1 = create_wrapped_operation(2000, hash1); - mempool.add_operation(&operation1).unwrap(); - - let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = create_wrapped_operation(2000, hash2); - mempool.add_operation(&operation2).unwrap(); - - let best: Vec<_> = mempool.get_top_operations(2).collect(); - assert_eq!(best.len(), 2); - assert_eq!(best[0].hash, hash1); - assert_eq!(best[1].hash, hash2); - } - - #[test] - fn test_get_top_operations_should_return_the_lowest_nonce_operation_for_each_account() { - let mut mempool = create_test_mempool(1000); - let hash1 = FixedBytes::from([1u8; 32]); - let test_user_operation = create_test_user_operation(2000); - - let base_op = match test_user_operation.clone() { - VersionedUserOperation::UserOperation(op) => op, - _ => panic!("expected UserOperation variant"), - }; - - let operation1 = WrappedUserOperation { - operation: VersionedUserOperation::UserOperation(erc4337::UserOperation { - nonce: Uint::from(0), - max_fee_per_gas: Uint::from(2000), - ..base_op.clone() - }), - hash: hash1, - }; - - mempool.add_operation(&operation1).unwrap(); - let hash2 = FixedBytes::from([2u8; 32]); - let operation2 = WrappedUserOperation { - operation: VersionedUserOperation::UserOperation(erc4337::UserOperation { - nonce: Uint::from(1), - max_fee_per_gas: Uint::from(10_000), - ..base_op.clone() - }), - hash: hash2, - }; - mempool.add_operation(&operation2).unwrap(); - - let best: Vec<_> = mempool.get_top_operations(2).collect(); - assert_eq!(best.len(), 1); - assert_eq!(best[0].operation.nonce(), Uint::from(0)); - } -} diff --git a/crates/account-abstraction-core/src/infrastructure/in_memory/mod.rs b/crates/account-abstraction-core/src/infrastructure/in_memory/mod.rs deleted file mode 100644 index c6c321b..0000000 --- a/crates/account-abstraction-core/src/infrastructure/in_memory/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod mempool; - -pub use mempool::InMemoryMempool; diff --git a/crates/account-abstraction-core/src/infrastructure/kafka/consumer.rs b/crates/account-abstraction-core/src/infrastructure/kafka/consumer.rs deleted file mode 100644 index 708266b..0000000 --- a/crates/account-abstraction-core/src/infrastructure/kafka/consumer.rs +++ /dev/null @@ -1,29 +0,0 @@ -use crate::domain::events::MempoolEvent; -use crate::services::interfaces::event_source::EventSource; -use async_trait::async_trait; -use rdkafka::{Message, consumer::StreamConsumer}; -use serde_json; -use std::sync::Arc; - -pub struct KafkaEventSource { - consumer: Arc, -} - -impl KafkaEventSource { - pub fn new(consumer: Arc) -> Self { - Self { consumer } - } -} - -#[async_trait] -impl EventSource for KafkaEventSource { - async fn receive(&self) -> anyhow::Result { - let msg = self.consumer.recv().await?.detach(); - let payload = msg - .payload() - .ok_or_else(|| anyhow::anyhow!("Kafka message missing payload"))?; - let event: MempoolEvent = serde_json::from_slice(payload) - .map_err(|e| anyhow::anyhow!("Failed to parse Mempool event: {e}"))?; - Ok(event) - } -} diff --git a/crates/account-abstraction-core/src/infrastructure/kafka/mod.rs b/crates/account-abstraction-core/src/infrastructure/kafka/mod.rs deleted file mode 100644 index dca723b..0000000 --- a/crates/account-abstraction-core/src/infrastructure/kafka/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod consumer; diff --git a/crates/account-abstraction-core/src/infrastructure/mod.rs b/crates/account-abstraction-core/src/infrastructure/mod.rs deleted file mode 100644 index 4b0d4ce..0000000 --- a/crates/account-abstraction-core/src/infrastructure/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod base_node; -pub mod in_memory; -pub mod kafka; diff --git a/crates/account-abstraction-core/src/lib.rs b/crates/account-abstraction-core/src/lib.rs deleted file mode 100644 index 0b88b37..0000000 --- a/crates/account-abstraction-core/src/lib.rs +++ /dev/null @@ -1,23 +0,0 @@ -//! High-level services that orchestrate domain logic. -//! Designed to be reused by other binaries (ingress-rpc, workers, etc.) - -pub mod domain; -pub mod factories; -pub mod infrastructure; -pub mod services; - -// Convenient re-exports for common imports -pub use domain::{ - events::MempoolEvent, - mempool::{Mempool, PoolConfig}, - types::{ValidationResult, VersionedUserOperation, WrappedUserOperation}, -}; - -pub use infrastructure::in_memory::InMemoryMempool; - -pub use services::{ - interfaces::{event_source::EventSource, user_op_validator::UserOperationValidator}, - mempool_engine::MempoolEngine, -}; - -pub use factories::kafka_engine::create_mempool_engine; diff --git a/crates/account-abstraction-core/src/services/interfaces/event_source.rs b/crates/account-abstraction-core/src/services/interfaces/event_source.rs deleted file mode 100644 index 913bda0..0000000 --- a/crates/account-abstraction-core/src/services/interfaces/event_source.rs +++ /dev/null @@ -1,7 +0,0 @@ -use crate::domain::events::MempoolEvent; -use async_trait::async_trait; - -#[async_trait] -pub trait EventSource: Send + Sync { - async fn receive(&self) -> anyhow::Result; -} diff --git a/crates/account-abstraction-core/src/services/interfaces/mod.rs b/crates/account-abstraction-core/src/services/interfaces/mod.rs deleted file mode 100644 index 7c19294..0000000 --- a/crates/account-abstraction-core/src/services/interfaces/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub mod event_source; -pub mod user_op_validator; diff --git a/crates/account-abstraction-core/src/services/interfaces/user_op_validator.rs b/crates/account-abstraction-core/src/services/interfaces/user_op_validator.rs deleted file mode 100644 index 45bc6d9..0000000 --- a/crates/account-abstraction-core/src/services/interfaces/user_op_validator.rs +++ /dev/null @@ -1,12 +0,0 @@ -use crate::domain::types::{ValidationResult, VersionedUserOperation}; -use alloy_primitives::Address; -use async_trait::async_trait; - -#[async_trait] -pub trait UserOperationValidator: Send + Sync { - async fn validate_user_operation( - &self, - user_operation: &VersionedUserOperation, - entry_point: &Address, - ) -> anyhow::Result; -} diff --git a/crates/account-abstraction-core/src/services/mempool_engine.rs b/crates/account-abstraction-core/src/services/mempool_engine.rs deleted file mode 100644 index a4a8f66..0000000 --- a/crates/account-abstraction-core/src/services/mempool_engine.rs +++ /dev/null @@ -1,159 +0,0 @@ -use super::interfaces::event_source::EventSource; -use crate::domain::{events::MempoolEvent, mempool::Mempool}; -use std::sync::Arc; -use tokio::sync::RwLock; -use tracing::{info, warn}; - -pub struct MempoolEngine { - mempool: Arc>, - event_source: Arc, -} - -impl MempoolEngine { - pub fn new(mempool: Arc>, event_source: Arc) -> MempoolEngine { - Self { - mempool, - event_source, - } - } - - pub fn get_mempool(&self) -> Arc> { - Arc::clone(&self.mempool) - } - - pub async fn run(&self) { - loop { - if let Err(err) = self.process_next().await { - warn!(error = %err, "Mempool engine error, continuing"); - } - } - } - - pub async fn process_next(&self) -> anyhow::Result<()> { - let event = self.event_source.receive().await?; - self.handle_event(event).await - } - - async fn handle_event(&self, event: MempoolEvent) -> anyhow::Result<()> { - info!( - event = ?event, - "Mempool engine handling event" - ); - match event { - MempoolEvent::UserOpAdded { user_op } => { - self.mempool.write().await.add_operation(&user_op)?; - } - MempoolEvent::UserOpIncluded { user_op } => { - self.mempool.write().await.remove_operation(&user_op.hash)?; - } - MempoolEvent::UserOpDropped { user_op, reason: _ } => { - self.mempool.write().await.remove_operation(&user_op.hash)?; - } - } - Ok(()) - } -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::domain::{ - mempool::PoolConfig, - types::{VersionedUserOperation, WrappedUserOperation}, - }; - use crate::infrastructure::in_memory::mempool::InMemoryMempool; - use crate::services::interfaces::event_source::EventSource; - use alloy_primitives::{Address, FixedBytes, Uint}; - use alloy_rpc_types::erc4337; - use async_trait::async_trait; - use tokio::sync::Mutex; - - fn make_wrapped_op(max_fee: u128, hash: [u8; 32]) -> WrappedUserOperation { - let op = VersionedUserOperation::UserOperation(erc4337::UserOperation { - sender: Address::ZERO, - nonce: Uint::from(0u64), - init_code: Default::default(), - call_data: Default::default(), - call_gas_limit: Uint::from(100_000u64), - verification_gas_limit: Uint::from(100_000u64), - pre_verification_gas: Uint::from(21_000u64), - max_fee_per_gas: Uint::from(max_fee), - max_priority_fee_per_gas: Uint::from(max_fee), - paymaster_and_data: Default::default(), - signature: Default::default(), - }); - - WrappedUserOperation { - operation: op, - hash: FixedBytes::from(hash), - } - } - - struct MockEventSource { - events: Mutex>, - } - - impl MockEventSource { - fn new(events: Vec) -> Self { - Self { - events: Mutex::new(events), - } - } - } - - #[async_trait] - impl EventSource for MockEventSource { - async fn receive(&self) -> anyhow::Result { - let mut guard = self.events.lock().await; - if guard.is_empty() { - Err(anyhow::anyhow!("no more events")) - } else { - Ok(guard.remove(0)) - } - } - } - - #[tokio::test] - async fn handle_add_operation() { - let mempool = Arc::new(RwLock::new(InMemoryMempool::new(PoolConfig::default()))); - - let op_hash = [1u8; 32]; - let wrapped = make_wrapped_op(1_000, op_hash); - - let add_event = MempoolEvent::UserOpAdded { - user_op: wrapped.clone(), - }; - let mock_source = Arc::new(MockEventSource::new(vec![add_event])); - - let engine = MempoolEngine::new(mempool.clone(), mock_source); - - engine.process_next().await.unwrap(); - let items: Vec<_> = mempool.read().await.get_top_operations(10).collect(); - assert_eq!(items.len(), 1); - assert_eq!(items[0].hash, FixedBytes::from(op_hash)); - } - - #[tokio::test] - async fn remove_operation_should_remove_from_mempool() { - let mempool = Arc::new(RwLock::new(InMemoryMempool::new(PoolConfig::default()))); - let op_hash = [1u8; 32]; - let wrapped = make_wrapped_op(1_000, op_hash); - let add_event = MempoolEvent::UserOpAdded { - user_op: wrapped.clone(), - }; - let remove_event = MempoolEvent::UserOpDropped { - user_op: wrapped.clone(), - reason: "test".to_string(), - }; - let mock_source = Arc::new(MockEventSource::new(vec![add_event, remove_event])); - - let engine = MempoolEngine::new(mempool.clone(), mock_source); - engine.process_next().await.unwrap(); - let items: Vec<_> = mempool.read().await.get_top_operations(10).collect(); - assert_eq!(items.len(), 1); - assert_eq!(items[0].hash, FixedBytes::from(op_hash)); - engine.process_next().await.unwrap(); - let items: Vec<_> = mempool.read().await.get_top_operations(10).collect(); - assert_eq!(items.len(), 0); - } -} diff --git a/crates/account-abstraction-core/src/services/mod.rs b/crates/account-abstraction-core/src/services/mod.rs deleted file mode 100644 index fe032da..0000000 --- a/crates/account-abstraction-core/src/services/mod.rs +++ /dev/null @@ -1,7 +0,0 @@ -pub mod interfaces; -pub mod mempool_engine; -pub mod reputations_service; - -pub use interfaces::{event_source::EventSource, user_op_validator::UserOperationValidator}; -pub use mempool_engine::MempoolEngine; -pub use reputations_service::ReputationServiceImpl; diff --git a/crates/account-abstraction-core/src/services/reputations_service.rs b/crates/account-abstraction-core/src/services/reputations_service.rs deleted file mode 100644 index df15ff1..0000000 --- a/crates/account-abstraction-core/src/services/reputations_service.rs +++ /dev/null @@ -1,27 +0,0 @@ -use crate::{ - Mempool, - domain::{ReputationService, ReputationStatus}, -}; -use alloy_primitives::Address; -use async_trait::async_trait; -use std::sync::Arc; -use tokio::sync::RwLock; - -pub struct ReputationServiceImpl { - mempool: Arc>, -} - -impl ReputationServiceImpl { - pub fn new(mempool: Arc>) -> Self { - Self { mempool } - } -} - -#[async_trait] -impl ReputationService for ReputationServiceImpl { - async fn get_reputation(&self, _entity: &Address) -> ReputationStatus { - // DO something with the mempool for compiling reasons, as this is scafolding - let _ = self.mempool.read().await.get_top_operations(1); - ReputationStatus::Ok - } -} diff --git a/crates/system-tests/Cargo.toml b/crates/system-tests/Cargo.toml deleted file mode 100644 index 6163b29..0000000 --- a/crates/system-tests/Cargo.toml +++ /dev/null @@ -1,49 +0,0 @@ -[package] -name = "tips-system-tests" -version.workspace = true -edition.workspace = true -rust-version.workspace = true -license.workspace = true - -[lib] -path = "src/lib.rs" - -[dependencies] -hex = "0.4.3" -rand = "0.8" -dashmap = "6.0" -indicatif = "0.17" -rand_chacha = "0.3" -url = { workspace = true } -tips-core = { workspace = true } -bytes = { workspace = true } -async-trait = { workspace = true } -tips-audit-lib = { workspace = true } -alloy-network = { workspace = true } -tips-ingress-rpc-lib.workspace = true -op-alloy-network = { workspace = true } -alloy-signer-local = { workspace = true } -aws-credential-types = { workspace = true } -serde = { workspace = true, features = ["std", "derive"] } -tokio = { workspace = true, features = ["full"] } -tracing = { workspace = true, features = ["std"] } -anyhow = { workspace = true, features = ["std"] } -uuid = { workspace = true, features = ["v5", "serde"] } -serde_json = { workspace = true, features = ["std"] } -reqwest = { version = "0.12.12", features = ["json"] } -rdkafka = { workspace = true, features = ["tokio", "libz", "zstd", "ssl-vendored"] } -alloy-consensus = { workspace = true, features = ["std"] } -alloy-provider = { workspace = true, features = ["reqwest"] } -jsonrpsee = { workspace = true, features = ["server", "macros"] } -clap = { version = "4.5", features = ["std", "derive", "env"] } -op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } -alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } -aws-config = { workspace = true, features = ["default-https-client", "rt-tokio"] } -tracing-subscriber = { workspace = true, features = ["std", "fmt", "env-filter", "json"] } -aws-sdk-s3 = { workspace = true, features = ["rustls", "default-https-client", "rt-tokio"] } - -[dev-dependencies] -serial_test = "3" -tokio = { workspace = true, features = ["full", "test-util"] } -testcontainers = { workspace = true, features = ["blocking"] } -testcontainers-modules = { workspace = true, features = ["postgres", "kafka", "minio"] } diff --git a/crates/system-tests/METRICS.md b/crates/system-tests/METRICS.md deleted file mode 100644 index 49f9a0a..0000000 --- a/crates/system-tests/METRICS.md +++ /dev/null @@ -1,133 +0,0 @@ -# TIPS Load Testing - -Multi-wallet concurrent load testing tool for measuring TIPS performance. - -## Quick Start - -```bash -# 1. Build -cargo build --release --bin load-test - -# 2. Setup wallets -./target/release/load-test setup \ - --master-key 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d \ - --output wallets.json - -# 3. Run load test -./target/release/load-test load --wallets wallets.json -``` - ---- - -## Configuration Options - -### Setup Command - -Create and fund test wallets from a master wallet. Test wallets are saved to allow test reproducibility and avoid the need to create new wallets for every test run. - -**Usage:** -```bash -./target/release/load-test setup --master-key --output [OPTIONS] -``` - -**Options:** - -| Flag | Description | Default | Example | -|------|-------------|---------|---------| -| `--master-key` | Private key of funded wallet (required) | - | `0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d` | -| `--output` | Save wallets to JSON file (required) | - | `wallets.json` | -| `--sequencer` | L2 sequencer RPC URL | `http://localhost:8547` | `http://localhost:8547` | -| `--num-wallets` | Number of wallets to create | `10` | `100` | -| `--fund-amount` | ETH to fund each wallet | `0.1` | `0.5` | - -**Environment Variables:** -- `MASTER_KEY` - Alternative to `--master-key` flag -- `SEQUENCER_URL` - Alternative to `--sequencer` flag - -### Load Command - -Run load test with funded wallets. Use the `--seed` flag to set the RNG seed for test reproducibility. - -**Usage:** -```bash -./target/release/load-test load --wallets [OPTIONS] -``` - -**Options:** - -| Flag | Description | Default | Example | -|------|-------------|---------|---------| -| `--wallets` | Path to wallets JSON file (required) | - | `wallets.json` | -| `--target` | TIPS ingress RPC URL | `http://localhost:8080` | `http://localhost:8080` | -| `--sequencer` | L2 sequencer RPC URL | `http://localhost:8547` | `http://localhost:8547` | -| `--rate` | Target transaction rate (tx/s) | `100` | `500` | -| `--duration` | Test duration in seconds | `60` | `100` | -| `--tx-timeout` | Timeout for tx inclusion (seconds) | `60` | `120` | -| `--seed` | Random seed for reproducibility | (none) | `42` | -| `--output` | Save metrics to JSON file | (none) | `metrics.json` | - -**Environment Variables:** -- `INGRESS_URL` - Alternative to `--target` flag -- `SEQUENCER_URL` - Alternative to `--sequencer` flag - ---- ---- - -## Metrics Explained - -### Output Example - -``` -Load Test Results -━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -Configuration: - Target: http://localhost:8080 - Sequencer: http://localhost:8547 - Wallets: 100 - Target Rate: 100 tx/s - Duration: 60s - TX Timeout: 60s - -Throughput: - Sent: 100.0 tx/s (6000 total) - Included: 98.5 tx/s (5910 total) - Success Rate: 98.5% - -Transaction Results: - Included: 5910 (98.5%) - Reverted: 10 (0.2%) - Timed Out: 70 (1.2%) - Send Errors: 10 (0.1%) -``` - -### Metrics Definitions - -**Throughput:** -- `Sent Rate` - Transactions sent to TIPS per second -- `Included Rate` - Transactions included in blocks per second -- `Success Rate` - Percentage of sent transactions that were included - -**Transaction Results:** -- `Included` - Successfully included in a block with status == true -- `Reverted` - Included in a block but transaction reverted (status == false) -- `Timed Out` - Not included within timeout period -- `Send Errors` - Failed to send to TIPS RPC - ---- - -## Architecture - -``` -Sender Tasks (1 per wallet) Receipt Poller - │ │ - ▼ ▼ - Send to TIPS ──► Tracker ◄── Poll sequencer every 2s - (retry 3x) (pending) │ - │ │ ├─ status=true → included - │ │ ├─ status=false → reverted - │ │ └─ timeout → timed_out - ▼ ▼ - rate/N tx/s Calculate Results → Print Summary -``` - ---- diff --git a/crates/system-tests/README.md b/crates/system-tests/README.md deleted file mode 100644 index d7f410a..0000000 --- a/crates/system-tests/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# System Tests (Integration Suite) - -Integration coverage for TIPS ingress RPC. Tests talk to the services started by `just start-all`. - -## What we test -- `test_client_can_connect_to_tips` – RPC connectivity. -- `test_send_raw_transaction_accepted` – `eth_sendRawTransaction` lands on-chain with success receipt. -- `test_send_bundle_accepted` – single‑tx bundle via `eth_sendBackrunBundle` returns the correct bundle hash, audit event, and on-chain inclusion. -- `test_send_bundle_with_two_transactions` – multi-tx bundle (2 txs) flows through audit and lands on-chain. - -Each test confirms: -1. The response hash equals `keccak256` of the tx hashes. -2. The bundle audit event is emitted to Kafka. -3. All transactions are included on-chain with successful receipts. - -## How to run -```bash -# Start infrastructure (see ../../SETUP.md for full instructions) -# - just sync && just start-all -# - builder-playground + op-rbuilder are running - -# Run the tests -INTEGRATION_TESTS=1 cargo test --package tips-system-tests --test integration_tests -``` - -**Note:** Tests that share the funded wallet use `#[serial]` to avoid nonce conflicts. - -Defaults: -- Kafka configs: `docker/host-*.properties` (override with the standard `TIPS_INGRESS_KAFKA_*` env vars if needed). -- URLs: `http://localhost:8080` ingress, `http://localhost:8547` sequencer (override via `INGRESS_URL` / `SEQUENCER_URL`). diff --git a/crates/system-tests/src/bin/load-test.rs b/crates/system-tests/src/bin/load-test.rs deleted file mode 100644 index 50a36d2..0000000 --- a/crates/system-tests/src/bin/load-test.rs +++ /dev/null @@ -1,13 +0,0 @@ -use anyhow::Result; -use clap::Parser; -use tips_system_tests::load_test::{config, load, setup}; - -#[tokio::main] -async fn main() -> Result<()> { - let cli = config::Cli::parse(); - - match cli.command { - config::Commands::Setup(args) => setup::run(args).await, - config::Commands::Load(args) => load::run(args).await, - } -} diff --git a/crates/system-tests/src/client/mod.rs b/crates/system-tests/src/client/mod.rs deleted file mode 100644 index 58dabd2..0000000 --- a/crates/system-tests/src/client/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod tips_rpc; - -pub use tips_rpc::TipsRpcClient; diff --git a/crates/system-tests/src/client/tips_rpc.rs b/crates/system-tests/src/client/tips_rpc.rs deleted file mode 100644 index cbe5a23..0000000 --- a/crates/system-tests/src/client/tips_rpc.rs +++ /dev/null @@ -1,53 +0,0 @@ -use alloy_network::Network; -use alloy_primitives::{Bytes, TxHash}; -use alloy_provider::{Provider, RootProvider}; -use anyhow::Result; -use tips_core::{Bundle, BundleHash, CancelBundle}; - -/// Client for TIPS-specific RPC methods (eth_sendBundle, eth_cancelBundle) -/// -/// Wraps a RootProvider to add TIPS functionality while preserving access -/// to standard Ethereum JSON-RPC methods via provider(). -#[derive(Clone)] -pub struct TipsRpcClient { - provider: RootProvider, -} - -impl TipsRpcClient { - pub fn new(provider: RootProvider) -> Self { - Self { provider } - } - - pub async fn send_raw_transaction(&self, signed_tx: Bytes) -> Result { - let tx_hex = format!("0x{}", hex::encode(&signed_tx)); - self.provider - .raw_request("eth_sendRawTransaction".into(), [tx_hex]) - .await - .map_err(Into::into) - } - - pub async fn send_bundle(&self, bundle: Bundle) -> Result { - self.provider - .raw_request("eth_sendBundle".into(), [bundle]) - .await - .map_err(Into::into) - } - - pub async fn send_backrun_bundle(&self, bundle: Bundle) -> Result { - self.provider - .raw_request("eth_sendBackrunBundle".into(), [bundle]) - .await - .map_err(Into::into) - } - - pub async fn cancel_bundle(&self, request: CancelBundle) -> Result { - self.provider - .raw_request("eth_cancelBundle".into(), [request]) - .await - .map_err(Into::into) - } - - pub fn provider(&self) -> &RootProvider { - &self.provider - } -} diff --git a/crates/system-tests/src/fixtures/mod.rs b/crates/system-tests/src/fixtures/mod.rs deleted file mode 100644 index 3094ef9..0000000 --- a/crates/system-tests/src/fixtures/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod transactions; - -pub use transactions::*; diff --git a/crates/system-tests/src/fixtures/transactions.rs b/crates/system-tests/src/fixtures/transactions.rs deleted file mode 100644 index 6fed608..0000000 --- a/crates/system-tests/src/fixtures/transactions.rs +++ /dev/null @@ -1,73 +0,0 @@ -use alloy_consensus::{SignableTransaction, TxEip1559}; -use alloy_primitives::{Address, Bytes, U256}; -use alloy_provider::{ProviderBuilder, RootProvider}; -use alloy_signer_local::PrivateKeySigner; -use anyhow::Result; -use op_alloy_network::eip2718::Encodable2718; -use op_alloy_network::{Optimism, TxSignerSync}; - -/// Create an Optimism RPC provider from a URL string -/// -/// This is a convenience function to avoid repeating the provider setup -/// pattern across tests and runner code. -pub fn create_optimism_provider(url: &str) -> Result> { - Ok(ProviderBuilder::new() - .disable_recommended_fillers() - .network::() - .connect_http(url.parse()?)) -} - -pub fn create_test_signer() -> PrivateKeySigner { - "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" - .parse() - .expect("Valid test private key") -} - -pub fn create_funded_signer() -> PrivateKeySigner { - // This is the same account used in justfile that has funds in builder-playground - "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d" - .parse() - .expect("Valid funded private key") -} - -pub fn create_signed_transaction( - signer: &PrivateKeySigner, - to: Address, - value: U256, - nonce: u64, - gas_limit: u64, - max_fee_per_gas: u128, -) -> Result { - let mut tx = TxEip1559 { - chain_id: 13, // Local builder-playground chain ID - nonce, - gas_limit, - max_fee_per_gas, - max_priority_fee_per_gas: max_fee_per_gas / 10, // 10% of max fee as priority fee - to: to.into(), - value, - access_list: Default::default(), - input: Default::default(), - }; - - let signature = signer.sign_transaction_sync(&mut tx)?; - - let envelope = op_alloy_consensus::OpTxEnvelope::Eip1559(tx.into_signed(signature)); - - let mut buf = Vec::new(); - envelope.encode_2718(&mut buf); - - Ok(Bytes::from(buf)) -} - -/// Create a simple load test transaction with standard defaults: -/// - value: 1000 wei (small test amount) -/// - gas_limit: 21000 (standard transfer) -/// - max_fee_per_gas: 1 gwei -pub fn create_load_test_transaction( - signer: &PrivateKeySigner, - to: Address, - nonce: u64, -) -> Result { - create_signed_transaction(signer, to, U256::from(1000), nonce, 21000, 1_000_000_000) -} diff --git a/crates/system-tests/src/lib.rs b/crates/system-tests/src/lib.rs deleted file mode 100644 index c05f0a3..0000000 --- a/crates/system-tests/src/lib.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod client; -pub mod fixtures; -pub mod load_test; diff --git a/crates/system-tests/src/load_test/config.rs b/crates/system-tests/src/load_test/config.rs deleted file mode 100644 index 02543e3..0000000 --- a/crates/system-tests/src/load_test/config.rs +++ /dev/null @@ -1,76 +0,0 @@ -use clap::{Parser, Subcommand}; -use std::path::PathBuf; - -#[derive(Parser)] -#[command(name = "load-test")] -#[command(about = "Load testing tool for TIPS ingress service", long_about = None)] -pub struct Cli { - #[command(subcommand)] - pub command: Commands, -} - -#[derive(Subcommand)] -pub enum Commands { - /// Setup: Fund N wallets from a master wallet - Setup(SetupArgs), - /// Load: Run load test with funded wallets - Load(LoadArgs), -} - -#[derive(Parser)] -pub struct SetupArgs { - /// Master wallet private key (must have funds) - #[arg(long, env = "MASTER_KEY")] - pub master_key: String, - - /// Sequencer RPC URL - #[arg(long, env = "SEQUENCER_URL", default_value = "http://localhost:8547")] - pub sequencer: String, - - /// Number of wallets to create and fund - #[arg(long, default_value = "10")] - pub num_wallets: usize, - - /// Amount of ETH to fund each wallet - #[arg(long, default_value = "0.1")] - pub fund_amount: f64, - - /// Output file for wallet data (required) - #[arg(long)] - pub output: PathBuf, -} - -#[derive(Parser)] -pub struct LoadArgs { - /// TIPS ingress RPC URL - #[arg(long, env = "INGRESS_URL", default_value = "http://localhost:8080")] - pub target: String, - - /// Sequencer RPC URL (for nonce fetching and receipt polling) - #[arg(long, env = "SEQUENCER_URL", default_value = "http://localhost:8547")] - pub sequencer: String, - - /// Path to wallets JSON file (required) - #[arg(long)] - pub wallets: PathBuf, - - /// Target transaction rate (transactions per second) - #[arg(long, default_value = "100")] - pub rate: u64, - - /// Test duration in seconds - #[arg(long, default_value = "60")] - pub duration: u64, - - /// Timeout for transaction inclusion (seconds) - #[arg(long, default_value = "60")] - pub tx_timeout: u64, - - /// Random seed for reproducibility - #[arg(long)] - pub seed: Option, - - /// Output file for metrics (JSON) - #[arg(long)] - pub output: Option, -} diff --git a/crates/system-tests/src/load_test/load.rs b/crates/system-tests/src/load_test/load.rs deleted file mode 100644 index ca5045f..0000000 --- a/crates/system-tests/src/load_test/load.rs +++ /dev/null @@ -1,133 +0,0 @@ -use super::config::LoadArgs; -use super::metrics::{TestConfig, calculate_results}; -use super::output::{print_results, save_results}; -use super::poller::ReceiptPoller; -use super::sender::SenderTask; -use super::tracker::TransactionTracker; -use super::wallet::load_wallets; -use crate::client::TipsRpcClient; -use crate::fixtures::create_optimism_provider; -use anyhow::{Context, Result}; -use indicatif::{ProgressBar, ProgressStyle}; -use rand::SeedableRng; -use rand_chacha::ChaCha8Rng; -use std::sync::Arc; -use std::time::Duration; - -pub async fn run(args: LoadArgs) -> Result<()> { - let wallets = load_wallets(&args.wallets).context("Failed to load wallets")?; - - if wallets.is_empty() { - anyhow::bail!("No wallets found in file. Run 'setup' command first."); - } - - let num_wallets = wallets.len(); - - let sequencer = create_optimism_provider(&args.sequencer)?; - - let tips_provider = create_optimism_provider(&args.target)?; - let tips_client = TipsRpcClient::new(tips_provider); - - let tracker = TransactionTracker::new(Duration::from_secs(args.duration)); - - let rate_per_wallet = args.rate as f64 / num_wallets as f64; - - let pb = ProgressBar::new(args.duration); - pb.set_style( - ProgressStyle::default_bar() - .template("[{elapsed_precise}] {bar:40.cyan/blue} {pos}/{len}s | Sent: {msg}") - .unwrap() - .progress_chars("##-"), - ); - - let poller = ReceiptPoller::new( - sequencer.clone(), - Arc::clone(&tracker), - Duration::from_secs(args.tx_timeout), - ); - let poller_handle = tokio::spawn(async move { poller.run().await }); - - let mut sender_handles = Vec::new(); - - for (i, wallet) in wallets.into_iter().enumerate() { - let rng = match args.seed { - Some(seed) => ChaCha8Rng::seed_from_u64(seed + i as u64), - None => ChaCha8Rng::from_entropy(), - }; - - let sender = SenderTask::new( - wallet, - tips_client.clone(), - sequencer.clone(), - rate_per_wallet, - Duration::from_secs(args.duration), - Arc::clone(&tracker), - rng, - ); - - let handle = tokio::spawn(async move { sender.run().await }); - - sender_handles.push(handle); - } - - let pb_tracker = Arc::clone(&tracker); - let pb_handle = tokio::spawn(async move { - let mut interval = tokio::time::interval(Duration::from_secs(1)); - loop { - interval.tick().await; - let elapsed = pb_tracker.elapsed().as_secs(); - let sent = pb_tracker.total_sent(); - pb.set_position(elapsed); - pb.set_message(format!("{sent}")); - - if pb_tracker.is_test_completed() { - break; - } - } - pb.finish_with_message("Complete"); - }); - - for handle in sender_handles { - handle.await??; - } - - tracker.mark_test_completed(); - - pb_handle.await?; - - let grace_period = Duration::from_secs(args.tx_timeout + 10); - match tokio::time::timeout(grace_period, poller_handle).await { - Ok(Ok(Ok(()))) => { - println!("✅ All transactions resolved"); - } - Ok(Ok(Err(e))) => { - println!("⚠️ Poller error: {e}"); - } - Ok(Err(e)) => { - println!("⚠️ Poller panicked: {e}"); - } - Err(_) => { - println!("⏱️ Grace period expired, some transactions may still be pending"); - } - } - - let config = TestConfig { - target: args.target.clone(), - sequencer: args.sequencer.clone(), - wallets: num_wallets, - target_rate: args.rate, - duration_secs: args.duration, - tx_timeout_secs: args.tx_timeout, - seed: args.seed, - }; - - let results = calculate_results(&tracker, config); - print_results(&results); - - // Save results if output file specified - if let Some(output_path) = args.output.as_ref() { - save_results(&results, output_path)?; - } - - Ok(()) -} diff --git a/crates/system-tests/src/load_test/metrics.rs b/crates/system-tests/src/load_test/metrics.rs deleted file mode 100644 index 53415c9..0000000 --- a/crates/system-tests/src/load_test/metrics.rs +++ /dev/null @@ -1,78 +0,0 @@ -use super::tracker::TransactionTracker; -use serde::{Deserialize, Serialize}; -use std::sync::Arc; - -#[derive(Debug, Serialize, Deserialize)] -pub struct TestResults { - pub config: TestConfig, - pub results: ThroughputResults, - pub errors: ErrorResults, -} - -#[derive(Debug, Serialize, Deserialize)] -pub struct TestConfig { - pub target: String, - pub sequencer: String, - pub wallets: usize, - pub target_rate: u64, - pub duration_secs: u64, - pub tx_timeout_secs: u64, - pub seed: Option, -} - -#[derive(Debug, Serialize, Deserialize)] -pub struct ThroughputResults { - pub sent_rate: f64, - pub included_rate: f64, - pub total_sent: u64, - pub total_included: u64, - pub total_reverted: u64, - pub total_pending: u64, - pub total_timed_out: u64, - pub success_rate: f64, - pub actual_duration_secs: f64, -} - -#[derive(Debug, Serialize, Deserialize)] -pub struct ErrorResults { - pub send_errors: u64, - pub reverted: u64, - pub timed_out: u64, -} - -pub fn calculate_results(tracker: &Arc, config: TestConfig) -> TestResults { - let actual_duration = tracker.elapsed(); - let total_sent = tracker.total_sent(); - let total_included = tracker.total_included(); - let total_reverted = tracker.total_reverted(); - let total_timed_out = tracker.total_timed_out(); - let send_errors = tracker.total_send_errors(); - - let sent_rate = total_sent as f64 / actual_duration.as_secs_f64(); - let included_rate = total_included as f64 / actual_duration.as_secs_f64(); - let success_rate = if total_sent > 0 { - total_included as f64 / total_sent as f64 - } else { - 0.0 - }; - - TestResults { - config, - results: ThroughputResults { - sent_rate, - included_rate, - total_sent, - total_included, - total_reverted, - total_pending: tracker.total_pending(), - total_timed_out, - success_rate, - actual_duration_secs: actual_duration.as_secs_f64(), - }, - errors: ErrorResults { - send_errors, - reverted: total_reverted, - timed_out: total_timed_out, - }, - } -} diff --git a/crates/system-tests/src/load_test/mod.rs b/crates/system-tests/src/load_test/mod.rs deleted file mode 100644 index 896b415..0000000 --- a/crates/system-tests/src/load_test/mod.rs +++ /dev/null @@ -1,9 +0,0 @@ -pub mod config; -pub mod load; -pub mod metrics; -pub mod output; -pub mod poller; -pub mod sender; -pub mod setup; -pub mod tracker; -pub mod wallet; diff --git a/crates/system-tests/src/load_test/output.rs b/crates/system-tests/src/load_test/output.rs deleted file mode 100644 index 60e7564..0000000 --- a/crates/system-tests/src/load_test/output.rs +++ /dev/null @@ -1,67 +0,0 @@ -use super::metrics::TestResults; -use anyhow::{Context, Result}; -use std::fs; -use std::path::Path; - -pub fn print_results(results: &TestResults) { - println!("\n"); - println!("Load Test Results"); - println!("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"); - - println!("Configuration:"); - println!(" Target: {}", results.config.target); - println!(" Sequencer: {}", results.config.sequencer); - println!(" Wallets: {}", results.config.wallets); - println!(" Target Rate: {} tx/s", results.config.target_rate); - println!(" Duration: {}s", results.config.duration_secs); - println!(" TX Timeout: {}s", results.config.tx_timeout_secs); - if let Some(seed) = results.config.seed { - println!(" Seed: {seed}"); - } - - println!("\nThroughput:"); - println!( - " Sent: {:.1} tx/s ({} total)", - results.results.sent_rate, results.results.total_sent - ); - println!( - " Included: {:.1} tx/s ({} total)", - results.results.included_rate, results.results.total_included - ); - println!( - " Success Rate: {:.1}%", - results.results.success_rate * 100.0 - ); - - println!("\nTransaction Results:"); - println!( - " Included: {} ({:.1}%)", - results.results.total_included, - (results.results.total_included as f64 / results.results.total_sent as f64) * 100.0 - ); - if results.results.total_reverted > 0 { - println!( - " Reverted: {} ({:.1}%)", - results.results.total_reverted, - (results.results.total_reverted as f64 / results.results.total_sent as f64) * 100.0 - ); - } - println!( - " Timed Out: {} ({:.1}%)", - results.results.total_timed_out, - (results.results.total_timed_out as f64 / results.results.total_sent as f64) * 100.0 - ); - println!(" Send Errors: {}", results.errors.send_errors); - if results.results.total_pending > 0 { - println!(" Still Pending: {}", results.results.total_pending); - } - - println!("\n"); -} - -pub fn save_results(results: &TestResults, path: &Path) -> Result<()> { - let json = serde_json::to_string_pretty(results).context("Failed to serialize results")?; - fs::write(path, json).context("Failed to write results file")?; - println!("💾 Metrics saved to: {}", path.display()); - Ok(()) -} diff --git a/crates/system-tests/src/load_test/poller.rs b/crates/system-tests/src/load_test/poller.rs deleted file mode 100644 index 43014a9..0000000 --- a/crates/system-tests/src/load_test/poller.rs +++ /dev/null @@ -1,77 +0,0 @@ -use super::tracker::TransactionTracker; -use alloy_network::ReceiptResponse; -use alloy_provider::{Provider, RootProvider}; -use anyhow::Result; -use op_alloy_network::Optimism; -use std::sync::Arc; -use std::time::Duration; -use tracing::debug; - -pub struct ReceiptPoller { - sequencer: RootProvider, - tracker: Arc, - timeout: Duration, -} - -impl ReceiptPoller { - pub fn new( - sequencer: RootProvider, - tracker: Arc, - timeout: Duration, - ) -> Self { - Self { - sequencer, - tracker, - timeout, - } - } - - pub async fn run(self) -> Result<()> { - let mut interval = tokio::time::interval(Duration::from_secs(2)); // Block time - - loop { - interval.tick().await; - - let pending_txs = self.tracker.get_pending(); - - for (tx_hash, send_time) in pending_txs { - let elapsed = send_time.elapsed(); - - if elapsed > self.timeout { - self.tracker.record_timeout(tx_hash); - debug!("Transaction timed out: {:?}", tx_hash); - continue; - } - - match self.sequencer.get_transaction_receipt(tx_hash).await { - Ok(Some(receipt)) => { - // Verify transaction succeeded (status == true) and is in a block - if receipt.status() && receipt.block_number().is_some() { - self.tracker.record_included(tx_hash); - debug!("Transaction included and succeeded: {:?}", tx_hash); - } else if receipt.block_number().is_some() { - // Transaction was included but reverted - self.tracker.record_reverted(tx_hash); - debug!("Transaction included but reverted: {:?}", tx_hash); - } - // If no block_number yet, keep polling - } - Ok(None) => { - // Transaction not yet included, continue polling - } - Err(e) => { - debug!("Error fetching receipt for {:?}: {}", tx_hash, e); - // Don't mark as timeout, might be temporary RPC error - } - } - } - - // Exit when all transactions resolved and test completed - if self.tracker.all_resolved() && self.tracker.is_test_completed() { - break; - } - } - - Ok(()) - } -} diff --git a/crates/system-tests/src/load_test/sender.rs b/crates/system-tests/src/load_test/sender.rs deleted file mode 100644 index 050363a..0000000 --- a/crates/system-tests/src/load_test/sender.rs +++ /dev/null @@ -1,113 +0,0 @@ -use super::tracker::TransactionTracker; -use super::wallet::Wallet; -use crate::client::TipsRpcClient; -use crate::fixtures::create_load_test_transaction; -use alloy_network::Network; -use alloy_primitives::{Address, Bytes, keccak256}; -use alloy_provider::{Provider, RootProvider}; -use anyhow::{Context, Result}; -use op_alloy_network::Optimism; -use rand::Rng; -use rand_chacha::ChaCha8Rng; -use std::sync::Arc; -use std::time::{Duration, Instant}; -use tokio::time::sleep; - -const MAX_RETRIES: u32 = 3; -const INITIAL_BACKOFF_MS: u64 = 100; - -pub struct SenderTask { - wallet: Wallet, - client: TipsRpcClient, - sequencer: RootProvider, - rate_per_wallet: f64, - duration: Duration, - tracker: Arc, - rng: ChaCha8Rng, -} - -impl SenderTask { - pub fn new( - wallet: Wallet, - client: TipsRpcClient, - sequencer: RootProvider, - rate_per_wallet: f64, - duration: Duration, - tracker: Arc, - rng: ChaCha8Rng, - ) -> Self { - Self { - wallet, - client, - sequencer, - rate_per_wallet, - duration, - tracker, - rng, - } - } - - pub async fn run(mut self) -> Result<()> { - let mut nonce = self - .sequencer - .get_transaction_count(self.wallet.address) - .await - .context("Failed to get initial nonce")?; - - let interval_duration = Duration::from_secs_f64(1.0 / self.rate_per_wallet); - let mut ticker = tokio::time::interval(interval_duration); - ticker.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Delay); - - let deadline = Instant::now() + self.duration; - - while Instant::now() < deadline { - ticker.tick().await; - - let recipient = self.random_address(); - let tx_bytes = self.create_transaction(recipient, nonce)?; - let tx_hash = keccak256(&tx_bytes); - - // Retry loop with exponential backoff - let mut retries = 0; - let mut backoff_ms = INITIAL_BACKOFF_MS; - - loop { - let send_time = Instant::now(); - - match self.client.send_raw_transaction(tx_bytes.clone()).await { - Ok(_) => { - self.tracker.record_sent(tx_hash, send_time); - nonce += 1; - break; - } - Err(e) => { - retries += 1; - if retries > MAX_RETRIES { - println!( - "Error sending raw transaction after {MAX_RETRIES} retries: {e}" - ); - self.tracker.record_send_error(); - nonce += 1; // Move on to next nonce after max retries - break; - } - // Exponential backoff before retry - sleep(Duration::from_millis(backoff_ms)).await; - backoff_ms *= 2; // Double backoff each retry - } - } - } - } - - Ok(()) - } - - fn create_transaction(&self, to: Address, nonce: u64) -> Result { - create_load_test_transaction(&self.wallet.signer, to, nonce) - } - - fn random_address(&mut self) -> Address { - let mut bytes = [0u8; 20]; - self.rng.fill(&mut bytes); - Address::from(bytes) - } -} diff --git a/crates/system-tests/src/load_test/setup.rs b/crates/system-tests/src/load_test/setup.rs deleted file mode 100644 index 1603df6..0000000 --- a/crates/system-tests/src/load_test/setup.rs +++ /dev/null @@ -1,90 +0,0 @@ -use super::config::SetupArgs; -use super::wallet::{Wallet, generate_wallets, save_wallets}; -use crate::fixtures::create_optimism_provider; -use alloy_consensus::{SignableTransaction, TxEip1559}; -use alloy_primitives::U256; -use alloy_provider::Provider; -use anyhow::{Context, Result}; -use indicatif::{ProgressBar, ProgressStyle}; -use op_alloy_network::TxSignerSync; -use op_alloy_network::eip2718::Encodable2718; - -const CHAIN_ID: u64 = 13; // builder-playground local chain ID - -pub async fn run(args: SetupArgs) -> Result<()> { - let master_wallet = Wallet::from_private_key(&args.master_key) - .context("Failed to parse master wallet private key")?; - - let provider = create_optimism_provider(&args.sequencer)?; - - let master_balance = provider - .get_balance(master_wallet.address) - .await - .context("Failed to get master wallet balance")?; - - let required_balance = - U256::from((args.fund_amount * 1e18) as u64) * U256::from(args.num_wallets); - - if master_balance < required_balance { - anyhow::bail!( - "Insufficient master wallet balance. Need {} ETH, have {} ETH", - required_balance.to::() as f64 / 1e18, - master_balance.to::() as f64 / 1e18 - ); - } - - let wallets = generate_wallets(args.num_wallets, None); - - let pb = ProgressBar::new(args.num_wallets as u64); - pb.set_style( - ProgressStyle::default_bar() - .template("[{elapsed_precise}] {bar:40.cyan/blue} {pos}/{len} {msg}") - .unwrap() - .progress_chars("##-"), - ); - - let mut nonce = provider - .get_transaction_count(master_wallet.address) - .await - .context("Failed to get master wallet nonce")?; - - let fund_amount_wei = U256::from((args.fund_amount * 1e18) as u64); - - // Send all funding transactions - let mut pending_txs = Vec::new(); - for (i, wallet) in wallets.iter().enumerate() { - let mut tx = TxEip1559 { - chain_id: CHAIN_ID, - nonce, - gas_limit: 21000, - max_fee_per_gas: 1_000_000_000, // 1 gwei - max_priority_fee_per_gas: 100_000_000, // 0.1 gwei - to: wallet.address.into(), - value: fund_amount_wei, - access_list: Default::default(), - input: Default::default(), - }; - - let signature = master_wallet.signer.sign_transaction_sync(&mut tx)?; - let envelope = op_alloy_consensus::OpTxEnvelope::Eip1559(tx.into_signed(signature)); - - let mut buf = Vec::new(); - envelope.encode_2718(&mut buf); - let pending = provider - .send_raw_transaction(buf.as_ref()) - .await - .with_context(|| format!("Failed to send funding tx for wallet {i}"))?; - - pending_txs.push(pending); - nonce += 1; - pb.set_message(format!("Sent funding tx {}", i + 1)); - pb.inc(1); - } - - pb.finish_with_message("All funding transactions sent!"); - - // Save wallets to file - save_wallets(&wallets, args.fund_amount, &args.output)?; - - Ok(()) -} diff --git a/crates/system-tests/src/load_test/tracker.rs b/crates/system-tests/src/load_test/tracker.rs deleted file mode 100644 index 18a8458..0000000 --- a/crates/system-tests/src/load_test/tracker.rs +++ /dev/null @@ -1,115 +0,0 @@ -use alloy_primitives::B256; -use dashmap::DashMap; -use std::sync::Arc; -use std::sync::atomic::{AtomicBool, AtomicU64, Ordering}; -use std::time::{Duration, Instant}; - -pub struct TransactionTracker { - // Pending transactions (tx_hash -> send_time) - pending: DashMap, - - // Included transactions (succeeded) - included: DashMap, - - // Reverted transactions (included but status == false) - reverted: DashMap, - - // Timed out transactions - timed_out: DashMap, - - // Send errors (not transaction-specific) - send_errors: AtomicU64, - - // Test metadata - test_start: Instant, - test_completed: AtomicBool, -} - -impl TransactionTracker { - pub fn new(_test_duration: Duration) -> Arc { - Arc::new(Self { - pending: DashMap::new(), - included: DashMap::new(), - reverted: DashMap::new(), - timed_out: DashMap::new(), - send_errors: AtomicU64::new(0), - test_start: Instant::now(), - test_completed: AtomicBool::new(false), - }) - } - - pub fn record_sent(&self, tx_hash: B256, send_time: Instant) { - self.pending.insert(tx_hash, send_time); - } - - pub fn record_send_error(&self) { - self.send_errors.fetch_add(1, Ordering::Relaxed); - } - - /// Record a transaction that was included and succeeded (status == true) - pub fn record_included(&self, tx_hash: B256) { - self.pending.remove(&tx_hash); - self.included.insert(tx_hash, ()); - } - - /// Record a transaction that was included but reverted (status == false) - pub fn record_reverted(&self, tx_hash: B256) { - self.pending.remove(&tx_hash); - self.reverted.insert(tx_hash, ()); - } - - pub fn record_timeout(&self, tx_hash: B256) { - if self.pending.remove(&tx_hash).is_some() { - self.timed_out.insert(tx_hash, ()); - } - } - - pub fn get_pending(&self) -> Vec<(B256, Instant)> { - self.pending - .iter() - .map(|entry| (*entry.key(), *entry.value())) - .collect() - } - - pub fn mark_test_completed(&self) { - self.test_completed.store(true, Ordering::Relaxed); - } - - pub fn is_test_completed(&self) -> bool { - self.test_completed.load(Ordering::Relaxed) - } - - pub fn all_resolved(&self) -> bool { - self.pending.is_empty() - } - - pub fn elapsed(&self) -> Duration { - self.test_start.elapsed() - } - - // Metrics getters - pub fn total_sent(&self) -> u64 { - (self.pending.len() + self.included.len() + self.reverted.len() + self.timed_out.len()) - as u64 - } - - pub fn total_included(&self) -> u64 { - self.included.len() as u64 - } - - pub fn total_reverted(&self) -> u64 { - self.reverted.len() as u64 - } - - pub fn total_pending(&self) -> u64 { - self.pending.len() as u64 - } - - pub fn total_timed_out(&self) -> u64 { - self.timed_out.len() as u64 - } - - pub fn total_send_errors(&self) -> u64 { - self.send_errors.load(Ordering::Relaxed) - } -} diff --git a/crates/system-tests/src/load_test/wallet.rs b/crates/system-tests/src/load_test/wallet.rs deleted file mode 100644 index e5d7a73..0000000 --- a/crates/system-tests/src/load_test/wallet.rs +++ /dev/null @@ -1,86 +0,0 @@ -use alloy_primitives::Address; -use alloy_signer_local::PrivateKeySigner; -use anyhow::{Context, Result}; -use rand::SeedableRng; -use rand_chacha::ChaCha8Rng; -use serde::{Deserialize, Serialize}; -use std::fs; -use std::path::Path; - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct WalletData { - pub address: String, - pub private_key: String, - pub initial_balance: String, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct WalletsFile { - pub wallets: Vec, -} - -pub struct Wallet { - pub signer: PrivateKeySigner, - pub address: Address, -} - -impl Wallet { - pub fn from_private_key(private_key: &str) -> Result { - let signer: PrivateKeySigner = - private_key.parse().context("Failed to parse private key")?; - let address = signer.address(); - Ok(Self { signer, address }) - } - - pub fn new_random(rng: &mut ChaCha8Rng) -> Self { - let signer = PrivateKeySigner::random_with(rng); - let address = signer.address(); - Self { signer, address } - } -} - -pub fn generate_wallets(num_wallets: usize, seed: Option) -> Vec { - let mut rng = match seed { - Some(s) => ChaCha8Rng::seed_from_u64(s), - None => ChaCha8Rng::from_entropy(), - }; - - (0..num_wallets) - .map(|_| Wallet::new_random(&mut rng)) - .collect() -} - -pub fn save_wallets(wallets: &[Wallet], fund_amount: f64, path: &Path) -> Result<()> { - let wallet_data: Vec = wallets - .iter() - .map(|w| WalletData { - address: format!("{:?}", w.address), - private_key: format!("0x{}", hex::encode(w.signer.to_bytes())), - initial_balance: fund_amount.to_string(), - }) - .collect(); - - let wallets_file = WalletsFile { - wallets: wallet_data, - }; - - let json = - serde_json::to_string_pretty(&wallets_file).context("Failed to serialize wallets")?; - fs::write(path, json).context("Failed to write wallets file")?; - - Ok(()) -} - -pub fn load_wallets(path: &Path) -> Result> { - let json = fs::read_to_string(path).context("Failed to read wallets file")?; - let wallets_file: WalletsFile = - serde_json::from_str(&json).context("Failed to parse wallets file")?; - - let wallets: Result> = wallets_file - .wallets - .iter() - .map(|wd| Wallet::from_private_key(&wd.private_key)) - .collect(); - - wallets -} diff --git a/crates/system-tests/tests/common/kafka.rs b/crates/system-tests/tests/common/kafka.rs deleted file mode 100644 index 5acda1b..0000000 --- a/crates/system-tests/tests/common/kafka.rs +++ /dev/null @@ -1,121 +0,0 @@ -use std::{path::Path, time::Duration}; - -use alloy_primitives::B256; -use anyhow::{Context, Result}; -use rdkafka::{ - Message, - config::ClientConfig, - consumer::{Consumer, StreamConsumer}, - message::BorrowedMessage, -}; -use tips_audit_lib::types::BundleEvent; -use tips_core::{BundleExtensions, kafka::load_kafka_config_from_file}; -use tokio::time::{Instant, timeout}; -use uuid::Uuid; - -const DEFAULT_AUDIT_TOPIC: &str = "tips-audit"; -const DEFAULT_AUDIT_PROPERTIES: &str = "../../docker/host-ingress-audit-kafka-properties"; -const KAFKA_WAIT_TIMEOUT: Duration = Duration::from_secs(60); - -fn resolve_properties_path(env_key: &str, default_path: &str) -> Result { - match std::env::var(env_key) { - Ok(value) => Ok(value), - Err(_) => { - if Path::new(default_path).exists() { - Ok(default_path.to_string()) - } else { - anyhow::bail!( - "Environment variable {env_key} must be set (default path '{default_path}' not found). \ - Run `just sync` or export {env_key} before running tests." - ); - } - } - } -} - -fn build_kafka_consumer(properties_env: &str, default_path: &str) -> Result { - let props_file = resolve_properties_path(properties_env, default_path)?; - - let mut client_config = ClientConfig::from_iter(load_kafka_config_from_file(&props_file)?); - - client_config - .set( - "group.id", - format!( - "tips-system-tests-{}", - Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()) - ), - ) - .set("enable.auto.commit", "false") - .set("auto.offset.reset", "earliest"); - - client_config - .create() - .context("Failed to create Kafka consumer") -} - -async fn wait_for_kafka_message( - properties_env: &str, - default_properties: &str, - topic_env: &str, - default_topic: &str, - timeout_duration: Duration, - mut matcher: impl FnMut(BorrowedMessage<'_>) -> Option, -) -> Result { - let consumer = build_kafka_consumer(properties_env, default_properties)?; - let topic = std::env::var(topic_env).unwrap_or_else(|_| default_topic.to_string()); - consumer.subscribe(&[&topic])?; - - let deadline = Instant::now() + timeout_duration; - - loop { - let now = Instant::now(); - if now >= deadline { - anyhow::bail!( - "Timed out waiting for Kafka message on topic {topic} after {:?}", - timeout_duration - ); - } - - let remaining = deadline - now; - match timeout(remaining, consumer.recv()).await { - Ok(Ok(message)) => { - if let Some(value) = matcher(message) { - return Ok(value); - } - } - Ok(Err(err)) => { - return Err(err.into()); - } - Err(_) => { - // Timeout for this iteration, continue looping - } - } - } -} - -pub async fn wait_for_audit_event_by_hash( - expected_bundle_hash: &B256, - mut matcher: impl FnMut(&BundleEvent) -> bool, -) -> Result { - let expected_hash = *expected_bundle_hash; - wait_for_kafka_message( - "TIPS_INGRESS_KAFKA_AUDIT_PROPERTIES_FILE", - DEFAULT_AUDIT_PROPERTIES, - "TIPS_INGRESS_KAFKA_AUDIT_TOPIC", - DEFAULT_AUDIT_TOPIC, - KAFKA_WAIT_TIMEOUT, - |message| { - let payload = message.payload()?; - let event: BundleEvent = serde_json::from_slice(payload).ok()?; - // Match by bundle hash from the Received event - if let BundleEvent::Received { bundle, .. } = &event { - if bundle.bundle_hash() == expected_hash && matcher(&event) { - return Some(event); - } - } - None - }, - ) - .await -} diff --git a/crates/system-tests/tests/common/mod.rs b/crates/system-tests/tests/common/mod.rs deleted file mode 100644 index b17877c..0000000 --- a/crates/system-tests/tests/common/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod kafka; diff --git a/crates/system-tests/tests/integration_tests.rs b/crates/system-tests/tests/integration_tests.rs deleted file mode 100644 index 901bb41..0000000 --- a/crates/system-tests/tests/integration_tests.rs +++ /dev/null @@ -1,359 +0,0 @@ -#[path = "common/mod.rs"] -mod common; - -use alloy_network::ReceiptResponse; -use alloy_primitives::{Address, TxHash, U256, keccak256}; -use alloy_provider::{Provider, RootProvider}; -use anyhow::{Context, Result, bail}; -use common::kafka::wait_for_audit_event_by_hash; -use op_alloy_network::Optimism; -use serial_test::serial; -use tips_audit_lib::types::BundleEvent; -use tips_core::BundleExtensions; -use tips_system_tests::client::TipsRpcClient; -use tips_system_tests::fixtures::{ - create_funded_signer, create_optimism_provider, create_signed_transaction, -}; -use tokio::time::{Duration, Instant, sleep}; - -/// Get the URL for integration tests against the TIPS ingress service -fn get_integration_test_url() -> String { - std::env::var("INGRESS_URL").unwrap_or_else(|_| "http://localhost:8080".to_string()) -} - -/// Get the URL for the sequencer (for fetching nonces) -fn get_sequencer_url() -> String { - std::env::var("SEQUENCER_URL").unwrap_or_else(|_| "http://localhost:8547".to_string()) -} - -async fn wait_for_transaction_seen( - provider: &RootProvider, - tx_hash: TxHash, - timeout_secs: u64, -) -> Result<()> { - let deadline = Instant::now() + Duration::from_secs(timeout_secs); - loop { - if Instant::now() >= deadline { - bail!( - "Timed out waiting for transaction {} to appear on the sequencer", - tx_hash - ); - } - - if provider - .get_transaction_by_hash(tx_hash.into()) - .await? - .is_some() - { - return Ok(()); - } - - sleep(Duration::from_millis(500)).await; - } -} - -#[tokio::test] -async fn test_client_can_connect_to_tips() -> Result<()> { - if std::env::var("INTEGRATION_TESTS").is_err() { - eprintln!( - "Skipping integration tests (set INTEGRATION_TESTS=1 and ensure TIPS infrastructure is running)" - ); - return Ok(()); - } - - let url = get_integration_test_url(); - let provider = create_optimism_provider(&url)?; - let _client = TipsRpcClient::new(provider); - Ok(()) -} - -#[tokio::test] -#[serial] -async fn test_send_raw_transaction_accepted() -> Result<()> { - if std::env::var("INTEGRATION_TESTS").is_err() { - eprintln!( - "Skipping integration tests (set INTEGRATION_TESTS=1 and ensure TIPS infrastructure is running)" - ); - return Ok(()); - } - - let url = get_integration_test_url(); - let provider = create_optimism_provider(&url)?; - let client = TipsRpcClient::new(provider); - let signer = create_funded_signer(); - - let sequencer_url = get_sequencer_url(); - let sequencer_provider = create_optimism_provider(&sequencer_url)?; - let nonce = sequencer_provider - .get_transaction_count(signer.address()) - .await?; - - let to = Address::from([0x11; 20]); - let value = U256::from(1000); - let gas_limit = 21000; - let gas_price = 1_000_000_000; - - let signed_tx = create_signed_transaction(&signer, to, value, nonce, gas_limit, gas_price)?; - - // Send transaction to TIPS - let tx_hash = client - .send_raw_transaction(signed_tx) - .await - .context("Failed to send transaction to TIPS")?; - - // Verify TIPS accepted the transaction and returned a hash - assert!(!tx_hash.is_zero(), "Transaction hash should not be zero"); - - // Verify transaction lands on-chain - wait_for_transaction_seen(&sequencer_provider, tx_hash, 30) - .await - .context("Transaction never appeared on sequencer")?; - - // Verify transaction receipt shows success - let receipt = sequencer_provider - .get_transaction_receipt(tx_hash) - .await - .context("Failed to fetch transaction receipt")? - .expect("Transaction receipt should exist after being seen on sequencer"); - assert!(receipt.status(), "Transaction should have succeeded"); - - Ok(()) -} - -#[tokio::test] -#[serial] -async fn test_send_bundle_accepted() -> Result<()> { - if std::env::var("INTEGRATION_TESTS").is_err() { - eprintln!( - "Skipping integration tests (set INTEGRATION_TESTS=1 and ensure TIPS infrastructure is running)" - ); - return Ok(()); - } - - use tips_core::Bundle; - - let url = get_integration_test_url(); - let provider = create_optimism_provider(&url)?; - let client = TipsRpcClient::new(provider); - let signer = create_funded_signer(); - - let sequencer_url = get_sequencer_url(); - let sequencer_provider = create_optimism_provider(&sequencer_url)?; - let nonce = sequencer_provider - .get_transaction_count(signer.address()) - .await?; - - let to = Address::from([0x11; 20]); - let value = U256::from(1000); - let gas_limit = 21000; - let gas_price = 1_000_000_000; - - let signed_tx = create_signed_transaction(&signer, to, value, nonce, gas_limit, gas_price)?; - let tx_hash = keccak256(&signed_tx); - - // First send the transaction to mempool - let _mempool_tx_hash = client - .send_raw_transaction(signed_tx.clone()) - .await - .context("Failed to send transaction to mempool")?; - - let bundle = Bundle { - txs: vec![signed_tx], - block_number: 0, - min_timestamp: None, - max_timestamp: None, - reverting_tx_hashes: vec![tx_hash], - replacement_uuid: None, - dropping_tx_hashes: vec![], - flashblock_number_min: None, - flashblock_number_max: None, - }; - - // Send backrun bundle to TIPS - let bundle_hash = client - .send_backrun_bundle(bundle) - .await - .context("Failed to send backrun bundle to TIPS")?; - - // Verify TIPS accepted the bundle and returned a hash - assert!( - !bundle_hash.bundle_hash.is_zero(), - "Bundle hash should not be zero" - ); - - // Verify bundle hash is calculated correctly: keccak256(concat(tx_hashes)) - let mut concatenated = Vec::new(); - concatenated.extend_from_slice(tx_hash.as_slice()); - let expected_bundle_hash = keccak256(&concatenated); - assert_eq!( - bundle_hash.bundle_hash, expected_bundle_hash, - "Bundle hash should match keccak256(tx_hash)" - ); - - // Verify audit channel emitted a Received event for this bundle - let audit_event = wait_for_audit_event_by_hash(&bundle_hash.bundle_hash, |event| { - matches!(event, BundleEvent::Received { .. }) - }) - .await - .context("Failed to read audit event from Kafka")?; - match audit_event { - BundleEvent::Received { bundle, .. } => { - assert_eq!( - bundle.bundle_hash(), - bundle_hash.bundle_hash, - "Audit event bundle hash should match response" - ); - } - other => panic!("Expected Received audit event, got {:?}", other), - } - - // Wait for transaction to appear on sequencer - wait_for_transaction_seen(&sequencer_provider, tx_hash.into(), 60) - .await - .context("Bundle transaction never appeared on sequencer")?; - - // Verify transaction receipt shows success - let receipt = sequencer_provider - .get_transaction_receipt(tx_hash.into()) - .await - .context("Failed to fetch transaction receipt")? - .expect("Transaction receipt should exist after being seen on sequencer"); - assert!(receipt.status(), "Transaction should have succeeded"); - assert!( - receipt.block_number().is_some(), - "Transaction should be included in a block" - ); - - Ok(()) -} - -#[tokio::test] -#[serial] -async fn test_send_bundle_with_two_transactions() -> Result<()> { - if std::env::var("INTEGRATION_TESTS").is_err() { - eprintln!( - "Skipping integration tests (set INTEGRATION_TESTS=1 and ensure TIPS infrastructure is running)" - ); - return Ok(()); - } - - use tips_core::Bundle; - - let url = get_integration_test_url(); - let provider = create_optimism_provider(&url)?; - let client = TipsRpcClient::new(provider); - let signer = create_funded_signer(); - - let sequencer_url = get_sequencer_url(); - let sequencer_provider = create_optimism_provider(&sequencer_url)?; - let nonce = sequencer_provider - .get_transaction_count(signer.address()) - .await?; - - // Create two transactions - let tx1 = create_signed_transaction( - &signer, - Address::from([0x33; 20]), - U256::from(1000), - nonce, - 21000, - 1_000_000_000, - )?; - - let tx2 = create_signed_transaction( - &signer, - Address::from([0x44; 20]), - U256::from(2000), - nonce + 1, - 21000, - 1_000_000_000, - )?; - - let tx1_hash = keccak256(&tx1); - let tx2_hash = keccak256(&tx2); - - // First send both transactions to mempool - client - .send_raw_transaction(tx1.clone()) - .await - .context("Failed to send tx1 to mempool")?; - client - .send_raw_transaction(tx2.clone()) - .await - .context("Failed to send tx2 to mempool")?; - - let bundle = Bundle { - txs: vec![tx1, tx2], - block_number: 0, - min_timestamp: None, - max_timestamp: None, - reverting_tx_hashes: vec![tx1_hash, tx2_hash], - replacement_uuid: None, - dropping_tx_hashes: vec![], - flashblock_number_min: None, - flashblock_number_max: None, - }; - - // Send backrun bundle with 2 transactions to TIPS - let bundle_hash = client - .send_backrun_bundle(bundle) - .await - .context("Failed to send multi-transaction backrun bundle to TIPS")?; - - // Verify TIPS accepted the bundle and returned a hash - assert!( - !bundle_hash.bundle_hash.is_zero(), - "Bundle hash should not be zero" - ); - - // Verify bundle hash is calculated correctly: keccak256(concat(all tx_hashes)) - let mut concatenated = Vec::new(); - concatenated.extend_from_slice(tx1_hash.as_slice()); - concatenated.extend_from_slice(tx2_hash.as_slice()); - let expected_bundle_hash = keccak256(&concatenated); - assert_eq!( - bundle_hash.bundle_hash, expected_bundle_hash, - "Bundle hash should match keccak256(concat(tx1_hash, tx2_hash))" - ); - - // Verify audit channel emitted a Received event - let audit_event = wait_for_audit_event_by_hash(&bundle_hash.bundle_hash, |event| { - matches!(event, BundleEvent::Received { .. }) - }) - .await - .context("Failed to read audit event for 2-tx bundle")?; - match audit_event { - BundleEvent::Received { bundle, .. } => { - assert_eq!( - bundle.bundle_hash(), - bundle_hash.bundle_hash, - "Audit event bundle hash should match response" - ); - } - other => panic!("Expected Received audit event, got {:?}", other), - } - - // Wait for both transactions to appear on sequencer - wait_for_transaction_seen(&sequencer_provider, tx1_hash.into(), 60) - .await - .context("Bundle tx1 never appeared on sequencer")?; - wait_for_transaction_seen(&sequencer_provider, tx2_hash.into(), 60) - .await - .context("Bundle tx2 never appeared on sequencer")?; - - // Verify both transaction receipts show success - for (tx_hash, name) in [(tx1_hash, "tx1"), (tx2_hash, "tx2")] { - let receipt = sequencer_provider - .get_transaction_receipt(tx_hash.into()) - .await - .context(format!("Failed to fetch {name} receipt"))? - .expect(&format!("{name} receipt should exist")); - assert!(receipt.status(), "{name} should have succeeded"); - assert!( - receipt.block_number().is_some(), - "{name} should be included in a block" - ); - } - - Ok(()) -} From 255010939b3a944c9f8530bbb2a6321f64141466 Mon Sep 17 00:00:00 2001 From: Mihir Wadekar Date: Mon, 2 Feb 2026 23:38:24 -0800 Subject: [PATCH 111/117] chore: moves tips audit service to base/infra We move the tips audit service and associated crates from base/tips to base/infra. --- .config/nextest.toml | 8 + .github/workflows/ci.yml | 2 +- Cargo.lock | 2011 +++++++++++++++++++--- Cargo.toml | 127 +- Justfile | 207 --- bin/{tips-audit => audit}/Cargo.toml | 13 +- bin/{tips-audit => audit}/src/main.rs | 12 +- crates/audit/Cargo.toml | 11 +- crates/audit/src/archiver.rs | 51 +- crates/audit/src/lib.rs | 8 +- crates/audit/src/metrics.rs | 10 +- crates/audit/src/publisher.rs | 15 +- crates/audit/src/reader.rs | 72 +- crates/audit/src/storage.rs | 282 +-- crates/{core => audit}/src/test_utils.rs | 18 +- crates/audit/src/types.rs | 53 +- crates/audit/tests/common/mod.rs | 26 +- crates/audit/tests/integration_tests.rs | 53 +- crates/audit/tests/s3_test.rs | 166 +- crates/basectl/Cargo.toml | 2 +- crates/basectl/src/app/resources.rs | 2 +- crates/basectl/src/app/runner.rs | 2 +- crates/basectl/src/rpc.rs | 2 +- crates/core/Cargo.toml | 36 - crates/core/README.md | 3 - crates/core/src/lib.rs | 19 - crates/core/src/types.rs | 494 ------ crates/mempool-rebroadcaster/Cargo.toml | 6 +- crates/sidecrush/Cargo.toml | 12 +- crates/utils/Cargo.toml | 21 + crates/utils/README.md | 3 + crates/{core => utils}/src/kafka.rs | 3 +- crates/utils/src/lib.rs | 11 + crates/{core => utils}/src/logger.rs | 18 +- crates/{core => utils}/src/metrics.rs | 3 +- deny.toml | 27 + justfile | 294 ++-- 37 files changed, 2342 insertions(+), 1761 deletions(-) create mode 100644 .config/nextest.toml delete mode 100644 Justfile rename bin/{tips-audit => audit}/Cargo.toml (75%) rename bin/{tips-audit => audit}/src/main.rs (94%) rename crates/{core => audit}/src/test_utils.rs (85%) delete mode 100644 crates/core/Cargo.toml delete mode 100644 crates/core/README.md delete mode 100644 crates/core/src/lib.rs delete mode 100644 crates/core/src/types.rs create mode 100644 crates/utils/Cargo.toml create mode 100644 crates/utils/README.md rename crates/{core => utils}/src/kafka.rs (92%) create mode 100644 crates/utils/src/lib.rs rename crates/{core => utils}/src/logger.rs (76%) rename crates/{core => utils}/src/metrics.rs (99%) diff --git a/.config/nextest.toml b/.config/nextest.toml new file mode 100644 index 0000000..7053c63 --- /dev/null +++ b/.config/nextest.toml @@ -0,0 +1,8 @@ +[test-groups] +# Limit concurrency for tests that spin up Docker containers (Kafka + MinIO) +# to avoid resource contention causing container startup failures. +container-tests = { max-threads = 4 } + +[[profile.default.overrides]] +filter = 'binary_id(audit::s3_test) | binary_id(audit::integration_tests)' +test-group = 'container-tests' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c1cf89..0a31cd1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -188,4 +188,4 @@ jobs: key: nightly-${{ hashFiles('Cargo.lock') }} - name: Install just uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3 - - run: just check-format + - run: just check-deny diff --git a/Cargo.lock b/Cargo.lock index ccf4f1d..8cc4f56 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,6 +8,18 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" +[[package]] +name = "ahash" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "1.1.4" @@ -51,9 +63,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86debde32d8dbb0ab29e7cc75ae1a98688ac7a4c9da54b3a9b14593b9b3c46d3" +checksum = "4e4ff99651d46cef43767b5e8262ea228cd05287409ccb0c947cc25e70a952f9" dependencies = [ "alloy-eips", "alloy-primitives", @@ -78,9 +90,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6cb2e7efd385b333f5a77b71baaa2605f7e22f1d583f2879543b54cbce777c" +checksum = "1a0701b0eda8051a2398591113e7862f807ccdd3315d0b441f06c2a0865a379b" dependencies = [ "alloy-consensus", "alloy-eips", @@ -92,9 +104,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668859fcdb42eee289de22a9d01758c910955bb6ecda675b97276f99ce2e16b0" +checksum = "f3c83c7a3c4e1151e8cac383d0a67ddf358f37e5ea51c95a1283d897c9de0a5a" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -114,9 +126,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "1.5.4" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14ff5ee5f27aa305bda825c735f686ad71bb65508158f059f513895abe69b8c3" +checksum = "e6ab1b2f1b48a7e6b3597cb2afae04f93879fb69d71e39736b5663d7366b23f2" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -162,6 +174,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "borsh", + "k256", "serde", "thiserror", ] @@ -180,9 +193,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be47bf1b91674a5f394b9ed3c691d764fb58ba43937f1371550ff4bc8e59c295" +checksum = "def1626eea28d48c6cc0a6f16f34d4af0001906e4f889df6c660b39c86fd044d" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -204,9 +217,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "1.5.4" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8708475665cc00e081c085886e68eada2f64cfa08fc668213a9231655093d4de" +checksum = "1e414aa37b335ad2acb78a95814c59d137d53139b412f87aed1e10e2d862cd49" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -216,13 +229,13 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a24c81a56d684f525cd1c012619815ad3a1dd13b0238f069356795d84647d3c" +checksum = "e57586581f2008933241d16c3e3f633168b3a5d2738c5c42ea5246ec5e0ef17a" dependencies = [ "alloy-primitives", "alloy-sol-types", - "http", + "http 1.4.0", "serde", "serde_json", "thiserror", @@ -231,9 +244,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786c5b3ad530eaf43cda450f973fe7fb1c127b4c8990adf66709dafca25e3f6f" +checksum = "3b36c2a0ed74e48851f78415ca5b465211bd678891ba11e88fee09eac534bab1" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -257,9 +270,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ed40adf21ae4be786ef5eb62db9c692f6a30f86d34452ca3f849d6390ce319" +checksum = "636c8051da58802e757b76c3b65af610b95799f72423dc955737dec73de234fd" dependencies = [ "alloy-consensus", "alloy-eips", @@ -270,9 +283,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.5.4" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b88cf92ed20685979ed1d8472422f0c6c2d010cec77caf63aaa7669cc1a7bc2" +checksum = "66b1483f8c2562bf35f0270b697d5b5fe8170464e935bd855a4c5eaf6f89b354" dependencies = [ "alloy-rlp", "bytes", @@ -297,9 +310,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ca4c15818be7ac86208aff3a91b951d14c24e1426e66624e75f2215ba5e2cc" +checksum = "b3dd56e2eafe8b1803e325867ac2c8a4c73c9fb5f341ffd8347f9344458c5922" dependencies = [ "alloy-chains", "alloy-consensus", @@ -339,9 +352,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9eb9c9371738ac47f589e40aae6e418cb5f7436ad25b87575a7f94a60ccf43b" +checksum = "6eebf54983d4fccea08053c218ee5c288adf2e660095a243d0532a8070b43955" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -383,9 +396,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe0addad5b8197e851062b49dc47157444bced173b601d91e3f9b561a060a50" +checksum = "91577235d341a1bdbee30a463655d08504408a4d51e9f72edbfc5a622829f402" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -408,11 +421,12 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d17d4645a717f0527e491f44f6f7a75c221b9c00ccf79ddba2d26c8e0df4c3" +checksum = "79cff039bf01a17d76c0aace3a3a773d5f895eb4c68baaae729ec9da9e86c99c" dependencies = [ "alloy-primitives", + "alloy-rpc-types-eth", "alloy-rpc-types-txpool", "alloy-serde", "serde", @@ -420,9 +434,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e98aabb013a71a4b67b52825f7b503e5bb6057fb3b7b2290d514b0b0574b57" +checksum = "73234a141ecce14e2989748c04fcac23deee67a445e2c4c167cfb42d4dacd1b6" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -431,9 +445,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc871ae69688e358cf242a6a7ee6b6e0476a03fd0256434c68daedaec086ec4" +checksum = "10620d600cc46538f613c561ac9a923843c6c74c61f054828dcdb8dd18c72ec4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -449,9 +463,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5899af8417dcf89f40f88fa3bdb2f3f172605d8e167234311ee34811bbfdb0bf" +checksum = "010e101dbebe0c678248907a2545b574a87d078d82c2f6f5d0e8e7c9a6149a10" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -470,9 +484,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8074654c0292783d504bfa1f2691a69f420154ee9a7883f9212eaf611e60cd" +checksum = "14ab75189fbc29c5dd6f0bc1529bccef7b00773b458763f4d9d81a77ae4a1a2d" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -482,9 +496,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb73325ee881e42972a5a7bc85250f6af89f92c6ad1222285f74384a203abeb" +checksum = "9e6d631f8b975229361d8af7b2c749af31c73b3cf1352f90e144ddb06227105e" dependencies = [ "alloy-primitives", "serde", @@ -493,9 +507,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bea4c8f30eddb11d7ab56e83e49c814655daa78ca708df26c300c10d0189cbc" +checksum = "97f40010b5e8f79b70bf163b38cd15f529b18ca88c4427c0e43441ee54e4ed82" dependencies = [ "alloy-primitives", "async-trait", @@ -506,11 +520,27 @@ dependencies = [ "thiserror", ] +[[package]] +name = "alloy-signer-local" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c4ec1cc27473819399a3f0da83bc1cef0ceaac8c1c93997696e46dc74377a58" +dependencies = [ + "alloy-consensus", + "alloy-network", + "alloy-primitives", + "alloy-signer", + "async-trait", + "k256", + "rand 0.8.5", + "thiserror", +] + [[package]] name = "alloy-sol-macro" -version = "1.5.4" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fa1ca7e617c634d2bd9fa71f9ec8e47c07106e248b9fcbd3eaddc13cabd625" +checksum = "2c4b64c8146291f750c3f391dff2dd40cf896f7e2b253417a31e342aa7265baa" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -522,9 +552,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "1.5.4" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27c00c0c3a75150a9dc7c8c679ca21853a137888b4e1c5569f92d7e2b15b5102" +checksum = "d9df903674682f9bae8d43fdea535ab48df2d6a8cb5104ca29c58ada22ef67b3" dependencies = [ "alloy-sol-macro-input", "const-hex", @@ -540,9 +570,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "1.5.4" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297db260eb4d67c105f68d6ba11b8874eec681caec5505eab8fbebee97f790bc" +checksum = "737b8a959f527a86e07c44656db237024a32ae9b97d449f788262a547e8aa136" dependencies = [ "const-hex", "dunce", @@ -556,9 +586,9 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "1.5.4" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b91b13181d3bcd23680fd29d7bc861d1f33fbe90fdd0af67162434aeba902d" +checksum = "b28e6e86c6d2db52654b65a5a76b4f57eae5a32a7f0aa2222d1dbdb74e2cb8e0" dependencies = [ "serde", "winnow", @@ -566,9 +596,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "1.5.4" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc442cc2a75207b708d481314098a0f8b6f7b58e3148dd8d8cc7407b0d6f9385" +checksum = "fdf7effe4ab0a4f52c865959f790036e61a7983f68b13b75d7fbcedf20b753ce" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -578,13 +608,13 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b321f506bd67a434aae8e8a7dfe5373bf66137c149a5f09c9e7dfb0ca43d7c91" +checksum = "a03bb3f02b9a7ab23dacd1822fa7f69aa5c8eefcdcf57fad085e0b8d76fb4334" dependencies = [ "alloy-json-rpc", "auto_impl", - "base64", + "base64 0.22.1", "derive_more", "futures", "futures-utils-wasm", @@ -601,12 +631,13 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bf12879a20e1261cd39c3b101856f52d18886907a826e102538897f0d2b66e" +checksum = "5ce599598ef8ebe067f3627509358d9faaa1ef94f77f834a7783cd44209ef55c" dependencies = [ "alloy-json-rpc", "alloy-transport", + "itertools 0.14.0", "opentelemetry", "opentelemetry-http", "reqwest", @@ -619,14 +650,14 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527a0d9c8bbc5c3215b03ad465d4ae8775384ff5faec7c41f033f087c851a9f9" +checksum = "5ed38ea573c6658e0c2745af9d1f1773b1ed83aa59fbd9c286358ad469c3233a" dependencies = [ "alloy-pubsub", "alloy-transport", "futures", - "http", + "http 1.4.0", "serde_json", "tokio", "tokio-tungstenite", @@ -653,9 +684,9 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a91d6b4c2f6574fdbcb1611e460455c326667cf5b805c6bd1640dad8e8ee4d2" +checksum = "397406cf04b11ca2a48e6f81804c70af3f40a36abf648e11dc7416043eb0834d" dependencies = [ "darling 0.21.3", "proc-macro2", @@ -672,56 +703,12 @@ dependencies = [ "libc", ] -[[package]] -name = "anstream" -version = "0.6.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - [[package]] name = "anstyle" version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" -[[package]] -name = "anstyle-parse" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" -dependencies = [ - "anstyle", - "once_cell_polyfill", - "windows-sys 0.61.2", -] - [[package]] name = "anyhow" version = "1.0.101" @@ -996,6 +983,54 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +[[package]] +name = "audit" +version = "0.0.0" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-provider", + "alloy-signer-local", + "anyhow", + "async-trait", + "audit", + "aws-config", + "aws-sdk-s3", + "base-bundles", + "bytes", + "futures", + "metrics", + "metrics-derive", + "op-alloy-consensus 0.22.4", + "op-alloy-rpc-types", + "rdkafka", + "serde", + "serde_json", + "testcontainers", + "testcontainers-modules", + "tokio", + "tracing", + "utils", + "uuid", +] + +[[package]] +name = "audit-bin" +version = "0.0.0" +dependencies = [ + "anyhow", + "audit", + "aws-config", + "aws-credential-types", + "aws-sdk-s3", + "clap", + "dotenvy", + "rdkafka", + "tokio", + "tracing", + "utils", +] + [[package]] name = "auto_impl" version = "1.3.0" @@ -1014,9 +1049,436 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] -name = "base-flashtypes" +name = "aws-config" +version = "1.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a8fc176d53d6fe85017f230405e3255cedb4a02221cb55ed6d76dccbbb099b2" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-sdk-sts", + "aws-smithy-async", + "aws-smithy-http 0.63.4", + "aws-smithy-json 0.62.4", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand", + "http 1.4.0", + "time", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "aws-credential-types" +version = "1.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e26bbf46abc608f2dc61fd6cb3b7b0665497cc259a21520151ed98f8b37d2c79" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "zeroize", +] + +[[package]] +name = "aws-lc-rs" +version = "1.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b7b6141e96a8c160799cc2d5adecd5cbbe5054cb8c7c4af53da0f83bb7ad256" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.37.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b092fe214090261288111db7a2b2c2118e5a7f30dc2569f1732c4069a6840549" +dependencies = [ + "cc", + "cmake", + "dunce", + "fs_extra", +] + +[[package]] +name = "aws-runtime" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0f92058d22a46adf53ec57a6a96f34447daf02bff52e8fb956c66bcd5c6ac12" +dependencies = [ + "aws-credential-types", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-eventstream", + "aws-smithy-http 0.63.4", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "bytes-utils", + "fastrand", + "http 0.2.12", + "http 1.4.0", + "http-body 0.4.6", + "http-body 1.0.1", + "percent-encoding", + "pin-project-lite", + "tracing", + "uuid", +] + +[[package]] +name = "aws-sdk-s3" +version = "1.119.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d65fddc3844f902dfe1864acb8494db5f9342015ee3ab7890270d36fbd2e01c" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-checksums", + "aws-smithy-eventstream", + "aws-smithy-http 0.62.6", + "aws-smithy-json 0.61.9", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "bytes", + "fastrand", + "hex", + "hmac", + "http 0.2.12", + "http 1.4.0", + "http-body 0.4.6", + "lru 0.12.5", + "percent-encoding", + "regex-lite", + "sha2", + "tracing", + "url", +] + +[[package]] +name = "aws-sdk-sts" +version = "1.98.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89c4f19655ab0856375e169865c91264de965bd74c407c7f1e403184b1049409" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http 0.63.4", + "aws-smithy-json 0.62.4", + "aws-smithy-observability", + "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "fastrand", + "http 0.2.12", + "http 1.4.0", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f6ae9b71597dc5fd115d52849d7a5556ad9265885ad3492ea8d73b93bbc46e" +dependencies = [ + "aws-credential-types", + "aws-smithy-eventstream", + "aws-smithy-http 0.63.4", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "form_urlencoded", + "hex", + "hmac", + "http 0.2.12", + "http 1.4.0", + "percent-encoding", + "sha2", + "time", + "tracing", +] + +[[package]] +name = "aws-smithy-async" +version = "1.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cba48474f1d6807384d06fec085b909f5807e16653c5af5c45dfe89539f0b70" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "aws-smithy-checksums" +version = "0.63.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87294a084b43d649d967efe58aa1f9e0adc260e13a6938eb904c0ae9b45824ae" +dependencies = [ + "aws-smithy-http 0.62.6", + "aws-smithy-types", + "bytes", + "crc-fast", + "hex", + "http 0.2.12", + "http-body 0.4.6", + "md-5", + "pin-project-lite", + "sha1", + "sha2", + "tracing", +] + +[[package]] +name = "aws-smithy-eventstream" +version = "0.60.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c0b3e587fbaa5d7f7e870544508af8ce82ea47cd30376e69e1e37c4ac746f79" +dependencies = [ + "aws-smithy-types", + "bytes", + "crc32fast", +] + +[[package]] +name = "aws-smithy-http" +version = "0.62.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826141069295752372f8203c17f28e30c464d22899a43a0c9fd9c458d469c88b" +dependencies = [ + "aws-smithy-eventstream", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "futures-util", + "http 0.2.12", + "http 1.4.0", + "http-body 0.4.6", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-http" +version = "0.63.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af4a8a5fe3e4ac7ee871237c340bbce13e982d37543b65700f4419e039f5d78e" +dependencies = [ + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "futures-util", + "http 1.4.0", + "http-body 1.0.1", + "http-body-util", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-http-client" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0709f0083aa19b704132684bc26d3c868e06bd428ccc4373b0b55c3e8748a58b" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "h2 0.3.27", + "h2 0.4.13", + "http 0.2.12", + "http 1.4.0", + "http-body 0.4.6", + "hyper 0.14.32", + "hyper 1.8.1", + "hyper-rustls 0.24.2", + "hyper-rustls 0.27.7", + "hyper-util", + "pin-project-lite", + "rustls 0.21.12", + "rustls 0.23.36", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.4", + "tower", + "tracing", +] + +[[package]] +name = "aws-smithy-json" +version = "0.61.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49fa1213db31ac95288d981476f78d05d9cbb0353d22cdf3472cc05bb02f6551" +dependencies = [ + "aws-smithy-types", +] + +[[package]] +name = "aws-smithy-json" +version = "0.62.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b3a779093e18cad88bbae08dc4261e1d95018c4c5b9356a52bcae7c0b6e9bb" +dependencies = [ + "aws-smithy-types", +] + +[[package]] +name = "aws-smithy-observability" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d3f39d5bb871aaf461d59144557f16d5927a5248a983a40654d9cf3b9ba183b" +dependencies = [ + "aws-smithy-runtime-api", +] + +[[package]] +name = "aws-smithy-query" +version = "0.60.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f76a580e3d8f8961e5d48763214025a2af65c2fa4cd1fb7f270a0e107a71b0" +dependencies = [ + "aws-smithy-types", + "urlencoding", +] + +[[package]] +name = "aws-smithy-runtime" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fd3dfc18c1ce097cf81fced7192731e63809829c6cbf933c1ec47452d08e1aa" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http 0.63.4", + "aws-smithy-http-client", + "aws-smithy-observability", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand", + "http 0.2.12", + "http 1.4.0", + "http-body 0.4.6", + "http-body 1.0.1", + "http-body-util", + "pin-project-lite", + "pin-utils", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "1.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c55e0837e9b8526f49e0b9bfa9ee18ddee70e853f5bc09c5d11ebceddcb0fec" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "bytes", + "http 0.2.12", + "http 1.4.0", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-types" +version = "1.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "576b0d6991c9c32bc14fc340582ef148311f924d41815f641a308b5d11e8e7cd" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http 1.4.0", + "http-body 0.4.6", + "http-body 1.0.1", + "http-body-util", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", + "tokio", + "tokio-util", +] + +[[package]] +name = "aws-smithy-xml" +version = "0.60.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b53543b4b86ed43f051644f704a98c7291b3618b67adf057ee77a366fa52fcaa" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "aws-types" +version = "1.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c50f3cdf47caa8d01f2be4a6663ea02418e892f9bbfd82c7b9a3a37eaccdd3a" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "rustc_version 0.4.1", + "tracing", +] + +[[package]] +name = "base-bundles" +version = "0.0.0" +source = "git+https://github.com/base/base?branch=main#d8adce06b1b8d86f2ccdee5688004569f42789a2" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-provider", + "alloy-serde", + "op-alloy-consensus 0.23.1", + "op-alloy-flz", + "serde", + "uuid", +] + +[[package]] +name = "base-primitives" version = "0.0.0" -source = "git+https://github.com/base/base.git#720f6e1a73faabc938402b0cb617d3960db742d4" +source = "git+https://github.com/base/base.git#d8adce06b1b8d86f2ccdee5688004569f42789a2" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -1035,12 +1497,28 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" +dependencies = [ + "outref", + "vsimd", +] + [[package]] name = "base64ct" version = "1.8.3" @@ -1069,12 +1547,12 @@ dependencies = [ "alloy-sol-types", "anyhow", "arboard", - "base-flashtypes", + "base-primitives", "chrono", "crossterm", "dirs", "futures-util", - "op-alloy-consensus", + "op-alloy-consensus 0.22.4", "op-alloy-network", "ratatui", "serde", @@ -1092,6 +1570,24 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" +[[package]] +name = "bindgen" +version = "0.72.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" +dependencies = [ + "bitflags 2.10.0", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.114", +] + [[package]] name = "bit-set" version = "0.8.0" @@ -1123,6 +1619,12 @@ dependencies = [ "hex-conservative", ] +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + [[package]] name = "bitflags" version = "2.10.0" @@ -1147,19 +1649,69 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array", + "generic-array", +] + +[[package]] +name = "blst" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcdb4c7013139a150f9fc55d123186dbfaba0d912817466282c73ac49e71fb45" +dependencies = [ + "cc", + "glob", + "threadpool", + "zeroize", +] + +[[package]] +name = "bollard" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97ccca1260af6a459d75994ad5acc1651bcabcbdbc41467cc9786519ab854c30" +dependencies = [ + "base64 0.22.1", + "bollard-stubs", + "bytes", + "futures-core", + "futures-util", + "hex", + "home", + "http 1.4.0", + "http-body-util", + "hyper 1.8.1", + "hyper-named-pipe", + "hyper-rustls 0.27.7", + "hyper-util", + "hyperlocal", + "log", + "pin-project-lite", + "rustls 0.23.36", + "rustls-native-certs", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_derive", + "serde_json", + "serde_repr", + "serde_urlencoded", + "thiserror", + "tokio", + "tokio-util", + "tower-service", + "url", + "winapi", ] [[package]] -name = "blst" -version = "0.3.16" +name = "bollard-stubs" +version = "1.47.1-rc.27.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdb4c7013139a150f9fc55d123186dbfaba0d912817466282c73ac49e71fb45" +checksum = "3f179cfbddb6e77a5472703d4b30436bff32929c0aa8a9008ecf23d1d3cdd0da" dependencies = [ - "cc", - "glob", - "threadpool", - "zeroize", + "serde", + "serde_repr", + "serde_with", ] [[package]] @@ -1245,6 +1797,16 @@ dependencies = [ "serde", ] +[[package]] +name = "bytes-utils" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" +dependencies = [ + "bytes", + "either", +] + [[package]] name = "c-kzg" version = "2.1.5" @@ -1262,9 +1824,9 @@ dependencies = [ [[package]] name = "cadence" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3075f133bee430b7644c54fb629b9b4420346ffa275a45c81a6babe8b09b4f51" +checksum = "d7aff0c323415907f37007d645d7499c378df47efb3e33ffc1f397fa4e549b2e" dependencies = [ "crossbeam-channel", ] @@ -1291,9 +1853,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29" dependencies = [ "find-msvc-tools", + "jobserver", + "libc", "shlex", ] +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + [[package]] name = "cfg-if" version = "1.0.4" @@ -1320,11 +1893,22 @@ dependencies = [ "windows-link", ] +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + [[package]] name = "clap" -version = "4.5.57" +version = "4.5.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6899ea499e3fb9305a65d5ebf6e3d2248c5fab291f300ad0a704fbe142eae31a" +checksum = "63be97961acde393029492ce0be7a1af7e323e6bae9511ebfac33751be5e6806" dependencies = [ "clap_builder", "clap_derive", @@ -1332,14 +1916,12 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.57" +version = "4.5.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b12c8b680195a62a8364d16b8447b01b6c2c8f9aaf68bee653be34d4245e238" +checksum = "7f13174bda5dfd69d7e947827e5af4b0f2f94a4a3ee92912fba07a66150f21e2" dependencies = [ - "anstream", "anstyle", "clap_lex", - "strsim", ] [[package]] @@ -1356,9 +1938,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" +checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831" [[package]] name = "clipboard-win" @@ -1370,10 +1952,13 @@ dependencies = [ ] [[package]] -name = "colorchoice" -version = "1.0.4" +name = "cmake" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" +checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d" +dependencies = [ + "cc", +] [[package]] name = "compact_str" @@ -1446,6 +2031,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -1476,6 +2071,19 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" +[[package]] +name = "crc-fast" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ddc2d09feefeee8bd78101665bd8645637828fa9317f9f292496dbbd8c65ff3" +dependencies = [ + "crc", + "digest 0.10.7", + "rand 0.9.2", + "regex", + "rustversion", +] + [[package]] name = "crc32fast" version = "1.5.0" @@ -1494,6 +2102,15 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.21" @@ -1506,7 +2123,7 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ - "bitflags", + "bitflags 2.10.0", "crossterm_winapi", "mio", "parking_lot", @@ -1655,9 +2272,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" +checksum = "cc3dc5ad92c2e2d1c193bbbbdf2ea477cb81331de4f3103f267ca18368b988c4" dependencies = [ "powerfmt", "serde_core", @@ -1745,7 +2362,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" dependencies = [ - "bitflags", + "bitflags 2.10.0", "objc2", ] @@ -1760,6 +2377,17 @@ dependencies = [ "syn 2.0.114", ] +[[package]] +name = "docker_credential" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d89dfcba45b4afad7450a99b39e751590463e45c04728cf555d36bb66940de8" +dependencies = [ + "base64 0.21.7", + "serde", + "serde_json", +] + [[package]] name = "dotenvy" version = "0.15.7" @@ -1876,6 +2504,17 @@ version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59" +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + [[package]] name = "fastrand" version = "2.3.0" @@ -1943,6 +2582,17 @@ dependencies = [ "subtle", ] +[[package]] +name = "filetime" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db" +dependencies = [ + "cfg-if", + "libc", + "libredox", +] + [[package]] name = "find-msvc-tools" version = "0.1.9" @@ -2013,6 +2663,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "funty" version = "2.0.0" @@ -2160,6 +2816,19 @@ dependencies = [ "wasip2", ] +[[package]] +name = "getrandom" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasip2", + "wasip3", +] + [[package]] name = "glob" version = "0.3.3" @@ -2177,6 +2846,44 @@ dependencies = [ "subtle", ] +[[package]] +name = "h2" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.13.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.4.0", + "indexmap 2.13.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "2.7.1" @@ -2260,6 +2967,26 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "home" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http" version = "1.4.0" @@ -2270,6 +2997,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + [[package]] name = "http-body" version = "1.0.1" @@ -2277,7 +3015,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http", + "http 1.4.0", ] [[package]] @@ -2288,8 +3026,8 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", "futures-core", - "http", - "http-body", + "http 1.4.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -2299,6 +3037,36 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.27", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.5.10", + "tokio", + "tower-service", + "tracing", + "want", +] + [[package]] name = "hyper" version = "1.8.1" @@ -2309,9 +3077,11 @@ dependencies = [ "bytes", "futures-channel", "futures-core", - "http", - "http-body", + "h2 0.4.13", + "http 1.4.0", + "http-body 1.0.1", "httparse", + "httpdate", "itoa", "pin-project-lite", "pin-utils", @@ -2320,6 +3090,53 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-named-pipe" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" +dependencies = [ + "hex", + "hyper 1.8.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", + "winapi", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.12", + "hyper 0.14.32", + "log", + "rustls 0.21.12", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +dependencies = [ + "http 1.4.0", + "hyper 1.8.1", + "hyper-util", + "rustls 0.23.36", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.4", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.6.0" @@ -2328,7 +3145,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper", + "hyper 1.8.1", "hyper-util", "native-tls", "tokio", @@ -2342,23 +3159,38 @@ version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" dependencies = [ - "base64", + "base64 0.22.1", "bytes", "futures-channel", "futures-util", - "http", - "http-body", - "hyper", + "http 1.4.0", + "http-body 1.0.1", + "hyper 1.8.1", "ipnet", "libc", "percent-encoding", "pin-project-lite", - "socket2", + "socket2 0.6.2", "tokio", "tower-service", "tracing", ] +[[package]] +name = "hyperlocal" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" +dependencies = [ + "hex", + "http-body-util", + "hyper 1.8.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "iana-time-zone" version = "0.1.65" @@ -2464,6 +3296,12 @@ dependencies = [ "zerovec", ] +[[package]] +name = "id-arena" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + [[package]] name = "ident_case" version = "1.0.1" @@ -2586,12 +3424,6 @@ dependencies = [ "serde", ] -[[package]] -name = "is_terminal_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" - [[package]] name = "itertools" version = "0.10.5" @@ -2625,6 +3457,16 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" +[[package]] +name = "jobserver" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +dependencies = [ + "getrandom 0.3.4", + "libc", +] + [[package]] name = "js-sys" version = "0.3.85" @@ -2641,7 +3483,7 @@ version = "9.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde" dependencies = [ - "base64", + "base64 0.22.1", "js-sys", "pem", "ring", @@ -2687,13 +3529,29 @@ dependencies = [ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] name = "libc" -version = "0.2.180" +version = "0.2.181" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "459427e2af2b9c839b132acb702a1c654d95e10f8c326bfc2ad11310e458b1c5" + +[[package]] +name = "libloading" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" +dependencies = [ + "cfg-if", + "windows-link", +] [[package]] name = "libm" @@ -2707,8 +3565,21 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" dependencies = [ - "bitflags", + "bitflags 2.10.0", + "libc", + "redox_syscall 0.7.1", +] + +[[package]] +name = "libz-sys" +version = "1.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15d118bbf3771060e7311cc7bb0545b01d08a8b4a7de949198dec1fa0ca1c0f7" +dependencies = [ + "cc", "libc", + "pkg-config", + "vcpkg", ] [[package]] @@ -2782,6 +3653,16 @@ dependencies = [ "regex-automata", ] +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest 0.10.7", +] + [[package]] name = "memchr" version = "2.8.0" @@ -2803,6 +3684,7 @@ dependencies = [ "serde_json", "tokio", "tracing", + "tracing-subscriber", ] [[package]] @@ -2817,6 +3699,69 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "metrics" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5312e9ba3771cfa961b585728215e3d972c950a3eed9252aa093d6301277e8" +dependencies = [ + "ahash", + "portable-atomic", +] + +[[package]] +name = "metrics-derive" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "161ab904c2c62e7bda0f7562bf22f96440ca35ff79e66c800cbac298f2f4f5ec" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "metrics-exporter-prometheus" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b166dea96003ee2531cf14833efedced545751d800f03535801d833313f8c15" +dependencies = [ + "base64 0.22.1", + "http-body-util", + "hyper 1.8.1", + "hyper-util", + "indexmap 2.13.0", + "ipnet", + "metrics", + "metrics-util", + "quanta", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "metrics-util" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdfb1365fea27e6dd9dc1dbc19f570198bc86914533ad639dae939635f096be4" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", + "hashbrown 0.16.1", + "metrics", + "quanta", + "rand 0.9.2", + "rand_xoshiro", + "sketches-ddsketch", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.8.9" @@ -2858,14 +3803,24 @@ dependencies = [ "libc", "log", "openssl", - "openssl-probe", + "openssl-probe 0.1.6", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "nu-ansi-term" version = "0.50.3" @@ -2936,6 +3891,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" dependencies = [ + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.114", @@ -2970,7 +3926,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ - "bitflags", + "bitflags 2.10.0", "objc2", "objc2-core-graphics", "objc2-foundation", @@ -2982,7 +3938,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags", + "bitflags 2.10.0", "dispatch2", "objc2", ] @@ -2993,7 +3949,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" dependencies = [ - "bitflags", + "bitflags 2.10.0", "dispatch2", "objc2", "objc2-core-foundation", @@ -3012,7 +3968,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ - "bitflags", + "bitflags 2.10.0", "objc2", "objc2-core-foundation", ] @@ -3023,7 +3979,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" dependencies = [ - "bitflags", + "bitflags 2.10.0", "objc2", "objc2-core-foundation", ] @@ -3034,12 +3990,6 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" -[[package]] -name = "once_cell_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" - [[package]] name = "op-alloy-consensus" version = "0.22.4" @@ -3058,6 +4008,28 @@ dependencies = [ "thiserror", ] +[[package]] +name = "op-alloy-consensus" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736381a95471d23e267263cfcee9e1d96d30b9754a94a2819148f83379de8a86" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "derive_more", + "serde", + "thiserror", +] + +[[package]] +name = "op-alloy-flz" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" + [[package]] name = "op-alloy-network" version = "0.22.4" @@ -3070,7 +4042,7 @@ dependencies = [ "alloy-provider", "alloy-rpc-types-eth", "alloy-signer", - "op-alloy-consensus", + "op-alloy-consensus 0.22.4", "op-alloy-rpc-types", ] @@ -3087,7 +4059,7 @@ dependencies = [ "alloy-rpc-types-eth", "alloy-serde", "derive_more", - "op-alloy-consensus", + "op-alloy-consensus 0.22.4", "serde", "serde_json", "thiserror", @@ -3099,7 +4071,7 @@ version = "0.10.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" dependencies = [ - "bitflags", + "bitflags 2.10.0", "cfg-if", "foreign-types", "libc", @@ -3125,6 +4097,21 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" +[[package]] +name = "openssl-probe" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" + +[[package]] +name = "openssl-src" +version = "300.5.5+3.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f1787d533e03597a7934fd0a765f0d28e94ecc5fb7789f8053b1e699a56f709" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.111" @@ -3133,6 +4120,7 @@ checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -3159,7 +4147,7 @@ checksum = "d7a6d09a73194e6b66df7c8f1b680f156d916a1a942abf2de06823dd02b7855d" dependencies = [ "async-trait", "bytes", - "http", + "http 1.4.0", "opentelemetry", ] @@ -3169,6 +4157,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +[[package]] +name = "outref" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e" + [[package]] name = "parity-scale-codec" version = "3.7.5" @@ -3215,11 +4209,36 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.18", "smallvec", "windows-link", ] +[[package]] +name = "parse-display" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914a1c2265c98e2446911282c6ac86d8524f495792c38c5bd884f80499c7538a" +dependencies = [ + "parse-display-derive", + "regex", + "regex-syntax", +] + +[[package]] +name = "parse-display-derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae7800a4c974efd12df917266338e79a7a74415173caf7e70aa0a0707345281" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "regex-syntax", + "structmeta", + "syn 2.0.114", +] + [[package]] name = "paste" version = "1.0.15" @@ -3232,7 +4251,7 @@ version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" dependencies = [ - "base64", + "base64 0.22.1", "serde_core", ] @@ -3316,13 +4335,19 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0" dependencies = [ - "bitflags", + "bitflags 2.10.0", "crc32fast", "fdeflate", "flate2", "miniz_oxide", ] +[[package]] +name = "portable-atomic" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" + [[package]] name = "potential_utf" version = "0.1.4" @@ -3347,6 +4372,16 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn 2.0.114", +] + [[package]] name = "primitive-types" version = "0.12.2" @@ -3406,7 +4441,7 @@ checksum = "37566cb3fdacef14c0737f9546df7cfeadbfbc9fef10991038bf5015d0c80532" dependencies = [ "bit-set", "bit-vec", - "bitflags", + "bitflags 2.10.0", "num-traits", "rand 0.9.2", "rand_chacha 0.9.0", @@ -3426,6 +4461,21 @@ dependencies = [ "num-traits", ] +[[package]] +name = "quanta" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -3530,11 +4580,20 @@ dependencies = [ "rand_core 0.9.5", ] +[[package]] +name = "rand_xoshiro" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41" +dependencies = [ + "rand_core 0.9.5", +] + [[package]] name = "rapidhash" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ec30b38a417407efe7676bad0ca6b78f995f810185ece9af3bd5dc561185a9" +checksum = "84816e4c99c467e92cf984ee6328caa976dfecd33a673544489d79ca2caaefe5" dependencies = [ "rustversion", ] @@ -3545,7 +4604,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" dependencies = [ - "bitflags", + "bitflags 2.10.0", "cassowary", "compact_str", "crossterm", @@ -3560,13 +4619,72 @@ dependencies = [ "unicode-width 0.2.0", ] +[[package]] +name = "raw-cpuid" +version = "11.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" +dependencies = [ + "bitflags 2.10.0", +] + +[[package]] +name = "rdkafka" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b52c81ac3cac39c9639b95c20452076e74b8d9a71bc6fc4d83407af2ea6fff" +dependencies = [ + "futures-channel", + "futures-util", + "libc", + "log", + "rdkafka-sys", + "serde", + "serde_derive", + "serde_json", + "slab", + "tokio", +] + +[[package]] +name = "rdkafka-sys" +version = "4.10.0+2.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e234cf318915c1059d4921ef7f75616b5219b10b46e9f3a511a15eb4b56a3f77" +dependencies = [ + "libc", + "libz-sys", + "num_enum", + "openssl-sys", + "pkg-config", + "zstd-sys", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_syscall" version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags", + "bitflags 2.10.0", +] + +[[package]] +name = "redox_syscall" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35985aa610addc02e24fc232012c86fd11f14111180f902b67e2d5331f8ebf2b" +dependencies = [ + "bitflags 2.10.0", ] [[package]] @@ -3600,6 +4718,18 @@ dependencies = [ "syn 2.0.114", ] +[[package]] +name = "regex" +version = "1.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + [[package]] name = "regex-automata" version = "0.4.14" @@ -3611,6 +4741,12 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "regex-lite" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973" + [[package]] name = "regex-syntax" version = "0.8.9" @@ -3623,13 +4759,13 @@ version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ - "base64", + "base64 0.22.1", "bytes", "futures-core", - "http", - "http-body", + "http 1.4.0", + "http-body 1.0.1", "http-body-util", - "hyper", + "hyper 1.8.1", "hyper-tls", "hyper-util", "js-sys", @@ -3757,7 +4893,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags", + "bitflags 2.10.0", "errno", "libc", "linux-raw-sys 0.4.15", @@ -3770,26 +4906,61 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" dependencies = [ - "bitflags", + "bitflags 2.10.0", "errno", "libc", "linux-raw-sys 0.11.0", "windows-sys 0.61.2", ] +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + [[package]] name = "rustls" version = "0.23.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" dependencies = [ + "aws-lc-rs", "once_cell", + "ring", "rustls-pki-types", - "rustls-webpki", + "rustls-webpki 0.103.9", "subtle", "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" +dependencies = [ + "openssl-probe 0.2.1", + "rustls-pki-types", + "schannel", + "security-framework 3.5.1", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "rustls-pki-types" version = "1.14.0" @@ -3799,12 +4970,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustls-webpki" version = "0.103.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -3830,9 +5012,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "schannel" @@ -3873,6 +5055,16 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "sec1" version = "0.7.3" @@ -3906,17 +5098,30 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" dependencies = [ - "cc", + "cc", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.10.0", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", ] [[package]] name = "security-framework" -version = "2.11.1" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" dependencies = [ - "bitflags", - "core-foundation", + "bitflags 2.10.0", + "core-foundation 0.10.1", "core-foundation-sys", "libc", "security-framework-sys", @@ -4005,6 +5210,17 @@ dependencies = [ "zmij", ] +[[package]] +name = "serde_repr" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -4023,7 +5239,7 @@ version = "3.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" dependencies = [ - "base64", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", @@ -4082,6 +5298,12 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha1_smol" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" + [[package]] name = "sha2" version = "0.10.9" @@ -4142,6 +5364,7 @@ dependencies = [ "cadence", "tokio", "tracing", + "tracing-subscriber", ] [[package]] @@ -4215,6 +5438,12 @@ dependencies = [ "time", ] +[[package]] +name = "sketches-ddsketch" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a" + [[package]] name = "slab" version = "0.4.12" @@ -4230,6 +5459,16 @@ dependencies = [ "serde", ] +[[package]] +name = "socket2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "socket2" version = "0.6.2" @@ -4268,6 +5507,29 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "structmeta" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" +dependencies = [ + "proc-macro2", + "quote", + "structmeta-derive", + "syn 2.0.114", +] + +[[package]] +name = "structmeta-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + [[package]] name = "strum" version = "0.26.3" @@ -4341,9 +5603,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.5.4" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2379beea9476b89d0237078be761cf8e012d92d5ae4ae0c9a329f974838870fc" +checksum = "f8658017776544996edc21c8c7cc8bb4f13db60955382f4bac25dc6303b38438" dependencies = [ "paste", "proc-macro2", @@ -4379,17 +5641,55 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.24.0" +version = "3.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" +checksum = "0136791f7c95b1f6dd99f9cc786b91bb81c3800b639b3478e561ddb7be95e5f1" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.1", "once_cell", "rustix 1.1.3", "windows-sys 0.61.2", ] +[[package]] +name = "testcontainers" +version = "0.23.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a4f01f39bb10fc2a5ab23eb0d888b1e2bb168c157f61a1b98e6c501c639c74" +dependencies = [ + "async-trait", + "bollard", + "bollard-stubs", + "bytes", + "docker_credential", + "either", + "etcetera", + "futures", + "log", + "memchr", + "parse-display", + "pin-project-lite", + "serde", + "serde_json", + "serde_with", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tar", + "tokio-util", + "url", +] + +[[package]] +name = "testcontainers-modules" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d43ed4e8f58424c3a2c6c56dbea6643c3c23e8666a34df13c54f0a184e6c707" +dependencies = [ + "testcontainers", +] + [[package]] name = "thiserror" version = "2.0.18" @@ -4495,7 +5795,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.6.2", "tokio-macros", "windows-sys 0.61.2", ] @@ -4521,13 +5821,23 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + [[package]] name = "tokio-rustls" version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ - "rustls", + "rustls 0.23.36", "tokio", ] @@ -4543,6 +5853,21 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "tokio-tar" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" +dependencies = [ + "filetime", + "futures-core", + "libc", + "redox_syscall 0.3.5", + "tokio", + "tokio-stream", + "xattr", +] + [[package]] name = "tokio-tungstenite" version = "0.26.2" @@ -4552,11 +5877,11 @@ dependencies = [ "futures-util", "log", "native-tls", - "rustls", + "rustls 0.23.36", "rustls-pki-types", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.26.4", "tungstenite", "webpki-roots 0.26.11", ] @@ -4597,9 +5922,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.6+spec-1.1.0" +version = "1.0.7+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" +checksum = "247eaa3197818b831697600aadf81514e577e0cba5eab10f7e064e78ae154df1" dependencies = [ "winnow", ] @@ -4625,11 +5950,11 @@ version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ - "bitflags", + "bitflags 2.10.0", "bytes", "futures-util", - "http", - "http-body", + "http 1.4.0", + "http-body 1.0.1", "iri-string", "pin-project-lite", "tower", @@ -4751,12 +6076,12 @@ checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" dependencies = [ "bytes", "data-encoding", - "http", + "http 1.4.0", "httparse", "log", "native-tls", "rand 0.9.2", - "rustls", + "rustls 0.23.36", "rustls-pki-types", "sha1", "thiserror", @@ -4795,9 +6120,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" +checksum = "537dd038a89878be9b64dd4bd1b260315c1bb94f4d784956b81e27a088d9a09e" [[package]] name = "unicode-segmentation" @@ -4859,6 +6184,12 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "utf-8" version = "0.7.6" @@ -4872,10 +6203,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] -name = "utf8parse" -version = "0.2.2" +name = "utils" +version = "0.0.0" +dependencies = [ + "alloy-rpc-types", + "metrics-exporter-prometheus", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "uuid" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f" +dependencies = [ + "getrandom 0.3.4", + "js-sys", + "serde_core", + "sha1_smol", + "wasm-bindgen", +] [[package]] name = "valuable" @@ -4895,6 +6244,12 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + [[package]] name = "wait-timeout" version = "0.2.1" @@ -4928,6 +6283,15 @@ dependencies = [ "wit-bindgen", ] +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" +dependencies = [ + "wit-bindgen", +] + [[package]] name = "wasm-bindgen" version = "0.2.108" @@ -4987,6 +6351,40 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "wasm-encoder" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +dependencies = [ + "leb128fmt", + "wasmparser", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap 2.13.0", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags 2.10.0", + "hashbrown 0.15.5", + "indexmap 2.13.0", + "semver 1.0.27", +] + [[package]] name = "wasmtimer" version = "0.4.3" @@ -5126,6 +6524,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -5162,6 +6569,21 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -5195,6 +6617,12 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -5207,6 +6635,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -5219,6 +6653,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -5243,6 +6683,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -5255,6 +6701,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -5267,6 +6719,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -5279,6 +6737,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -5305,6 +6769,88 @@ name = "wit-bindgen" version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +dependencies = [ + "wit-bindgen-rust-macro", +] + +[[package]] +name = "wit-bindgen-core" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck", + "indexmap 2.13.0", + "prettyplease", + "syn 2.0.114", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn 2.0.114", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags 2.10.0", + "indexmap 2.13.0", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.13.0", + "log", + "semver 1.0.27", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] [[package]] name = "writeable" @@ -5357,6 +6903,22 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" +[[package]] +name = "xattr" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" +dependencies = [ + "libc", + "rustix 1.1.3", +] + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + [[package]] name = "yoke" version = "0.8.1" @@ -5476,9 +7038,20 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.19" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4de98dfa5d5b7fef4ee834d0073d560c9ca7b6c46a71d058c48db7960f8cfaf7" + +[[package]] +name = "zstd-sys" +version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" +dependencies = [ + "bindgen", + "cc", + "pkg-config", +] [[package]] name = "zune-core" diff --git a/Cargo.toml b/Cargo.toml index c102d3e..2684429 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,19 @@ -[workspace] -resolver = "2" -members = ["crates/*", "bin/*"] -default-members = ["bin/*"] -exclude = [".github/"] + [workspace.package] version = "0.0.0" edition = "2024" +rust-version = "1.88" license = "MIT" +homepage = "https://github.com/base/infra" +repository = "https://github.com/base/infra" +exclude = [".github/"] + +[workspace] +resolver = "2" +members = ["crates/*", "bin/*"] +default-members = ["bin/*"] +exclude = [".github/"] [workspace.lints.rust] missing-debug-implementations = "warn" @@ -44,42 +50,36 @@ needless-pass-by-ref-mut = "warn" string-lit-as-bytes = "warn" [workspace.dependencies] -cadence = "1.4" -clap = { version = "4.0", features = ["derive", "env"] } -tokio-tungstenite = { version = "0.26", features = ["native-tls"] } -futures-util = "0.3" -url = "2.5" -ratatui = "0.29" -crossterm = "0.28" -chrono = "0.4" -anyhow = "1.0" -serde_yaml = "0.9" -dirs = "6.0" -arboard = "3.4" -dotenvy = "0.15.7" -async-trait = "0.1" -mempool-rebroadcaster = { path = "./crates/mempool-rebroadcaster" } -sidecrush = { path = "./crates/sidecrush" } -metrics = "0.24.1" -metrics-derive = "0.1" -tracing = "0.1" -tracing-subscriber = { version = "0.3", default-features = false, features = ["env-filter", "fmt", "ansi", "json"] } -tokio = { version = "1.0", features = ["full"] } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" +# Internal crates +audit = { path = "crates/audit" } +basectl-cli = { path = "crates/basectl" } +mempool-rebroadcaster = { path = "crates/mempool-rebroadcaster" } +sidecrush = { path = "crates/sidecrush" } +utils = { path = "crates/utils" } + +# base-reth +base-bundles = { git = "https://github.com/base/base", branch = "main" } +base-primitives = { git = "https://github.com/base/base.git", features = ["flashblocks"] } +base-reth-rpc-types = { git = "https://github.com/base/base", branch = "main" } + +# revm +op-revm = { version = "15.0.0", default-features = false } +revm-context-interface = { version = "15.0.0", default-features = false } # alloy -alloy-primitives = { version = "1.5.2", default-features = false, features = [ - "map-foldhash", -] } -alloy-genesis = { version = "1.5.2", default-features = false } -alloy-eips = { version = "1.5.2", default-features = false } -alloy-rpc-types = { version = "1.5.2", default-features = false } -alloy-rpc-types-engine = { version = "1.5.2", default-features = false } -alloy-rpc-types-eth = { version = "1.5.2" } -alloy-consensus = { version = "1.5.2" } -alloy-trie = { version = "0.9.1", default-features = false } +alloy-serde = { version = "1.0.41", default-features = false } +alloy-signer = { version = "1.0.41", default-features = false } +alloy-network = { version = "1.0.41", default-features = false } alloy-provider = { version = "1.5.2", features = ["ws", "pubsub"] } +alloy-consensus = { version = "1.0.41", default-features = false } +alloy-rpc-types = { version = "1.1.2", default-features = false } +alloy-primitives = { version = "1.4.1", default-features = false } +alloy-signer-local = { version = "1.0.41", default-features = false } +alloy-genesis = { version = "1.0.41", default-features = false } +alloy-eips = { version = "1.0.41", default-features = false } +alloy-rpc-types-engine = { version = "1.0.41", default-features = false } +alloy-rpc-types-eth = { version = "1.0.41" } +alloy-trie = { version = "0.9.1", default-features = false } alloy-hardforks = { version = "0.5" } alloy-rpc-client = { version = "1.5.2" } alloy-transport-http = { version = "1.5.2" } @@ -87,11 +87,54 @@ alloy-sol-types = { version = "1.5.2" } alloy-contract = { version = "1.5.2" } # op-alloy +op-alloy-flz = { version = "0.13.1", default-features = false } op-alloy-network = { version = "0.22.0", default-features = false } op-alloy-rpc-types = { version = "0.22.0", default-features = false } -op-alloy-rpc-types-engine = { version = "0.22.0", default-features = false } op-alloy-consensus = { version = "0.22.0", default-features = false } +op-alloy-rpc-types-engine = { version = "0.22.0", default-features = false } -# base -base-flashtypes = { git = "https://github.com/base/base.git" } -basectl-cli = { path = "crates/basectl" } +# tokio +tokio = { version = "1.47.1", features = ["full"] } + +# async +async-trait = "0.1.89" +futures = { version = "0.3.31", default-features = false } +futures-util = "0.3" + +# rpc +jsonrpsee = { version = "0.26.0", default-features = false } + +# kafka and s3 +bytes = { version = "1.8.0", default-features = false } +rdkafka = { version = "0.37.0", default-features = false } +aws-config = { version = "1.1.7", default-features = false } +aws-sdk-s3 = { version = "1.106.0", default-features = false } +aws-credential-types = { version = "1.1.7", default-features = false } + +# misc +tokio-tungstenite = { version = "0.26", features = ["native-tls"] } +url = { version = "2.5.7", default-features = false } +axum = { version = "0.8.3", default-features = false } +ratatui = "0.29" +crossterm = "0.28" +clap = { version = "4.5.47", default-features = false, features = ["std", "derive", "env"] } +chrono = "0.4" +anyhow = { version = "1.0.99", default-features = false } +serde = { version = "1.0.219", default-features = false, features = ["derive"] } +serde_json = { version = "1.0.143", default-features = false } +serde_yaml = "0.9" +uuid = { version = "1.18.1", default-features = false } +backon = { version = "1.5.2", default-features = false } +dirs = "6.0" +arboard = "3.4" +dotenvy = { version = "0.15.7", default-features = false } +tracing = { version = "0.1.41", default-features = false } +tracing-subscriber = { version = "0.3.20", default-features = false, features = ["env-filter", "fmt", "ansi", "json"] } +wiremock = { version = "0.6.2", default-features = false } +metrics = { version = "0.24.1", default-features = false } +metrics-derive = { version = "0.1", default-features = false } +metrics-exporter-prometheus = { version = "0.17.0", default-features = false } +testcontainers = { version = "0.23.1", default-features = false } +testcontainers-modules = { version = "0.11.2", default-features = false } +moka = { version = "0.12.12", default-features = false } +cadence = "1.4" diff --git a/Justfile b/Justfile deleted file mode 100644 index c6a014a..0000000 --- a/Justfile +++ /dev/null @@ -1,207 +0,0 @@ -set positional-arguments - -alias f := fix -alias c := ci - -# Default to display help menu -default: - @just --list - -# Runs all ci checks -ci: - cargo fmt --all -- --check - cargo clippy -- -D warnings - cargo build - cargo test - cd ui && npx --yes @biomejs/biome check . - cd ui && npm run build - -# Fixes formatting and clippy issues -fix: - cargo fmt --all - cargo clippy --fix --allow-dirty --allow-staged - cd ui && npx --yes @biomejs/biome check --write --unsafe . - -# Resets dependencies and reformats code -sync: deps-reset sync-env fix - -# Copies environment templates and adapts for docker -sync-env: - cp .env.example .env - cp .env.example ./ui/.env - cp .env.example .env.docker - sed -i '' 's/localhost:9092/host.docker.internal:9094/g' ./.env.docker - sed -i '' 's/localhost/host.docker.internal/g' ./.env.docker - -# Stops and removes all docker containers and data -stop-all: - export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && docker compose down && docker compose rm && rm -rf data/ - -# Starts all services in docker, useful for demos -start-all: stop-all - export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && mkdir -p data/kafka data/minio && docker compose build && docker compose up -d - -# Starts docker services except specified ones, e.g. just start-except ui ingress-rpc -start-except programs: stop-all - #!/bin/bash - all_services=(kafka kafka-setup minio minio-setup ingress-rpc audit ui) - exclude_services=({{ programs }}) - - # Create result array with services not in exclude list - result_services=() - for service in "${all_services[@]}"; do - skip=false - for exclude in "${exclude_services[@]}"; do - if [[ "$service" == "$exclude" ]]; then - skip=true - break - fi - done - if [[ "$skip" == false ]]; then - result_services+=("$service") - fi - done - - export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && mkdir -p data/kafka data/minio && docker compose build && docker compose up -d ${result_services[@]} - -# Resets docker dependencies with clean data -deps-reset: - COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml docker compose down && docker compose rm && rm -rf data/ && mkdir -p data/kafka data/minio && docker compose up -d - -# Restarts docker dependencies without data reset -deps: - COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml docker compose down && docker compose rm && docker compose up -d - -# Runs the tips-audit service -audit: - cargo run --bin tips-audit - -# Runs the tips-ingress-rpc service -ingress-rpc: - cargo run --bin tips-ingress-rpc - -# Runs the tips-maintenance service -maintenance: - cargo run --bin tips-maintenance - -# Runs the tips-ingress-writer service -ingress-writer: - cargo run --bin tips-ingress-writer - -# Starts the UI development server -ui: - cd ui && yarn dev - -sequencer_url := "http://localhost:8547" -validator_url := "http://localhost:8549" -builder_url := "http://localhost:2222" -ingress_url := "http://localhost:8080" - -sender := "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" -sender_key := "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d" - -backrunner := "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC" -backrunner_key := "0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a" - -# Queries block numbers from sequencer, validator, and builder -get-blocks: - echo "Sequencer" - cast bn -r {{ sequencer_url }} - echo "Validator" - cast bn -r {{ validator_url }} - echo "Builder" - cast bn -r {{ builder_url }} - -# Sends a test transaction through the ingress endpoint -send-txn: - #!/usr/bin/env bash - set -euxo pipefail - echo "sending txn" - nonce=$(cast nonce {{ sender }} -r {{ builder_url }}) - txn=$(cast mktx --private-key {{ sender_key }} 0x0000000000000000000000000000000000000000 --value 0.01ether --nonce $nonce --chain-id 13 -r {{ builder_url }}) - hash=$(curl -s {{ ingress_url }} -X POST -H "Content-Type: application/json" --data "{\"method\":\"eth_sendRawTransaction\",\"params\":[\"$txn\"],\"id\":1,\"jsonrpc\":\"2.0\"}" | jq -r ".result") - cast receipt $hash -r {{ sequencer_url }} | grep status - cast receipt $hash -r {{ builder_url }} | grep status - -# Sends a transaction with a backrun bundle -send-txn-with-backrun: - #!/usr/bin/env bash - set -euxo pipefail - - # 1. Get nonce and send target transaction from sender account - nonce=$(cast nonce {{ sender }} -r {{ builder_url }}) - echo "Sending target transaction from sender (nonce=$nonce)..." - target_txn=$(cast mktx --private-key {{ sender_key }} \ - 0x0000000000000000000000000000000000000000 \ - --value 0.01ether \ - --nonce $nonce \ - --chain-id 13 \ - -r {{ builder_url }}) - - target_hash=$(curl -s {{ ingress_url }} -X POST \ - -H "Content-Type: application/json" \ - --data "{\"method\":\"eth_sendRawTransaction\",\"params\":[\"$target_txn\"],\"id\":1,\"jsonrpc\":\"2.0\"}" \ - | jq -r ".result") - echo "Target tx sent: $target_hash" - - # 2. Build backrun transaction from backrunner account (different account!) - backrun_nonce=$(cast nonce {{ backrunner }} -r {{ builder_url }}) - echo "Building backrun transaction from backrunner (nonce=$backrun_nonce)..." - backrun_txn=$(cast mktx --private-key {{ backrunner_key }} \ - 0x0000000000000000000000000000000000000001 \ - --value 0.001ether \ - --nonce $backrun_nonce \ - --chain-id 13 \ - -r {{ builder_url }}) - - # 3. Compute tx hashes for reverting_tx_hashes - backrun_hash_computed=$(cast keccak $backrun_txn) - echo "Target tx hash: $target_hash" - echo "Backrun tx hash: $backrun_hash_computed" - - # 4. Construct and send bundle with reverting_tx_hashes - echo "Sending backrun bundle..." - bundle_json=$(jq -n \ - --arg target "$target_txn" \ - --arg backrun "$backrun_txn" \ - --arg target_hash "$target_hash" \ - --arg backrun_hash "$backrun_hash_computed" \ - '{ - txs: [$target, $backrun], - blockNumber: 0, - revertingTxHashes: [$target_hash, $backrun_hash] - }') - - bundle_hash=$(curl -s {{ ingress_url }} -X POST \ - -H "Content-Type: application/json" \ - --data "{\"method\":\"eth_sendBackrunBundle\",\"params\":[$bundle_json],\"id\":1,\"jsonrpc\":\"2.0\"}" \ - | jq -r ".result") - echo "Bundle sent: $bundle_hash" - - # 5. Wait and verify both transactions - echo "Waiting for transactions to land..." - sleep 5 - - echo "=== Target transaction (from sender) ===" - cast receipt $target_hash -r {{ sequencer_url }} | grep -E "(status|blockNumber|transactionIndex)" - - echo "=== Backrun transaction (from backrunner) ===" - cast receipt $backrun_hash_computed -r {{ sequencer_url }} | grep -E "(status|blockNumber|transactionIndex)" || echo "Backrun tx not found yet" - -# Runs integration tests with infrastructure checks -e2e: - #!/bin/bash - if ! INTEGRATION_TESTS=1 cargo test --package tips-system-tests --test integration_tests; then - echo "" - echo "═══════════════════════════════════════════════════════════════════" - echo " ⚠️ Integration tests failed!" - echo " Make sure the infrastructure is running locally (see SETUP.md for full instructions): " - echo " just start-all" - echo " start builder-playground" - echo " start op-rbuilder" - echo "═══════════════════════════════════════════════════════════════════" - exit 1 - fi - echo "═══════════════════════════════════════════════════════════════════" - echo " ✅ Integration tests passed!" - echo "═══════════════════════════════════════════════════════════════════" diff --git a/bin/tips-audit/Cargo.toml b/bin/audit/Cargo.toml similarity index 75% rename from bin/tips-audit/Cargo.toml rename to bin/audit/Cargo.toml index 7d43244..cf87213 100644 --- a/bin/tips-audit/Cargo.toml +++ b/bin/audit/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "tips-audit" +name = "audit-bin" version.workspace = true rust-version.workspace = true license.workspace = true @@ -7,9 +7,16 @@ homepage.workspace = true repository.workspace = true edition.workspace = true +[lints] +workspace = true + +[[bin]] +name = "audit" +path = "src/main.rs" + [dependencies] -tips-core.workspace = true -tips-audit-lib.workspace = true +utils.workspace = true +audit.workspace = true clap.workspace = true tokio.workspace = true anyhow.workspace = true diff --git a/bin/tips-audit/src/main.rs b/bin/audit/src/main.rs similarity index 94% rename from bin/tips-audit/src/main.rs rename to bin/audit/src/main.rs index f29f6d1..0e6dac4 100644 --- a/bin/tips-audit/src/main.rs +++ b/bin/audit/src/main.rs @@ -1,16 +1,14 @@ +use std::net::SocketAddr; + use anyhow::Result; +use audit::{KafkaAuditArchiver, KafkaAuditLogReader, S3EventReaderWriter, create_kafka_consumer}; use aws_config::{BehaviorVersion, Region}; use aws_credential_types::Credentials; use aws_sdk_s3::{Client as S3Client, config::Builder as S3ConfigBuilder}; use clap::{Parser, ValueEnum}; use rdkafka::consumer::Consumer; -use std::net::SocketAddr; -use tips_audit_lib::{ - KafkaAuditArchiver, KafkaAuditLogReader, S3EventReaderWriter, create_kafka_consumer, -}; -use tips_core::logger::init_logger_with_format; -use tips_core::metrics::init_prometheus_exporter; use tracing::info; +use utils::{logger::init_logger_with_format, metrics::init_prometheus_exporter}; #[derive(Debug, Clone, ValueEnum)] enum S3ConfigType { @@ -34,7 +32,7 @@ struct Args { log_level: String, #[arg(long, env = "TIPS_AUDIT_LOG_FORMAT", default_value = "pretty")] - log_format: tips_core::logger::LogFormat, + log_format: utils::logger::LogFormat, #[arg(long, env = "TIPS_AUDIT_S3_CONFIG_TYPE", default_value = "aws")] s3_config_type: S3ConfigType, diff --git a/crates/audit/Cargo.toml b/crates/audit/Cargo.toml index 159f2aa..08c96d3 100644 --- a/crates/audit/Cargo.toml +++ b/crates/audit/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "tips-audit-lib" +name = "audit" version.workspace = true rust-version.workspace = true license.workspace = true @@ -15,7 +15,8 @@ bytes.workspace = true metrics.workspace = true async-trait.workspace = true metrics-derive.workspace = true -tips-core = { workspace = true, features = ["test-utils"] } +base-bundles.workspace = true +utils = { workspace = true } serde = { workspace = true, features = ["std", "derive"] } tokio = { workspace = true, features = ["full"] } uuid = { workspace = true, features = ["v5", "serde"] } @@ -24,10 +25,16 @@ anyhow = { workspace = true, features = ["std"] } serde_json = { workspace = true, features = ["std"] } rdkafka = { workspace = true, features = ["tokio", "libz", "zstd", "ssl-vendored"] } alloy-consensus = { workspace = true, features = ["std"] } +alloy-provider = { workspace = true } alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } aws-sdk-s3 = { workspace = true, features = ["rustls", "default-https-client", "rt-tokio"] } futures = { workspace = true } +alloy-signer-local = { workspace = true } +op-alloy-consensus = { workspace = true } +op-alloy-rpc-types = { workspace = true } [dev-dependencies] +audit = { workspace = true } testcontainers = { workspace = true, features = ["blocking"] } testcontainers-modules = { workspace = true, features = ["postgres", "kafka", "minio"] } +aws-config = { workspace = true, features = ["default-https-client", "rt-tokio"] } diff --git a/crates/audit/src/archiver.rs b/crates/audit/src/archiver.rs index 415782e..d622094 100644 --- a/crates/audit/src/archiver.rs +++ b/crates/audit/src/archiver.rs @@ -1,15 +1,23 @@ -use crate::metrics::Metrics; -use crate::reader::{Event, EventReader}; -use crate::storage::EventWriter; +use std::{ + fmt, + marker::PhantomData, + sync::Arc, + time::{Duration, Instant, SystemTime, UNIX_EPOCH}, +}; + use anyhow::Result; -use std::fmt; -use std::marker::PhantomData; -use std::sync::Arc; -use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; -use tokio::sync::{Mutex, mpsc}; -use tokio::time::sleep; +use tokio::{ + sync::{Mutex, mpsc}, + time::sleep, +}; use tracing::{error, info}; +use crate::{ + metrics::Metrics, + reader::{Event, EventReader}, + storage::EventWriter, +}; + /// Archives audit events from Kafka to S3 storage. pub struct KafkaAuditArchiver where @@ -48,20 +56,9 @@ where let (event_tx, event_rx) = mpsc::channel(channel_buffer_size); let metrics = Metrics::default(); - Self::spawn_workers( - writer, - event_rx, - metrics.clone(), - worker_pool_size, - noop_archive, - ); + Self::spawn_workers(writer, event_rx, metrics.clone(), worker_pool_size, noop_archive); - Self { - reader, - event_tx, - metrics, - _phantom: PhantomData, - } + Self { reader, event_tx, metrics, _phantom: PhantomData } } fn spawn_workers( @@ -76,7 +73,7 @@ where for worker_id in 0..worker_pool_size { let writer = writer.clone(); let metrics = metrics.clone(); - let event_rx = event_rx.clone(); + let event_rx = Arc::clone(&event_rx); tokio::spawn(async move { loop { @@ -128,9 +125,7 @@ where let read_start = Instant::now(); match self.reader.read_event().await { Ok(event) => { - self.metrics - .kafka_read_duration - .record(read_start.elapsed().as_secs_f64()); + self.metrics.kafka_read_duration.record(read_start.elapsed().as_secs_f64()); let now_ms = SystemTime::now() .duration_since(UNIX_EPOCH) @@ -149,9 +144,7 @@ where if let Err(e) = self.reader.commit().await { error!(error = %e, "Failed to commit message"); } - self.metrics - .kafka_commit_duration - .record(commit_start.elapsed().as_secs_f64()); + self.metrics.kafka_commit_duration.record(commit_start.elapsed().as_secs_f64()); } Err(e) => { error!(error = %e, "Error reading events"); diff --git a/crates/audit/src/lib.rs b/crates/audit/src/lib.rs index 8291936..060ded8 100644 --- a/crates/audit/src/lib.rs +++ b/crates/audit/src/lib.rs @@ -32,15 +32,17 @@ pub use storage::{ UserOpHistoryEvent, }; +pub mod test_utils; + +use tokio::sync::mpsc; +use tracing::error; + mod types; pub use types::{ BundleEvent, BundleId, DropReason, Transaction, TransactionId, UserOpDropReason, UserOpEvent, UserOpHash, }; -use tokio::sync::mpsc; -use tracing::error; - /// Connects a bundle event receiver to a publisher, spawning a task to forward events. pub fn connect_audit_to_publisher

    (event_rx: mpsc::UnboundedReceiver, publisher: P) where diff --git a/crates/audit/src/metrics.rs b/crates/audit/src/metrics.rs index 906de8e..257b879 100644 --- a/crates/audit/src/metrics.rs +++ b/crates/audit/src/metrics.rs @@ -5,7 +5,7 @@ use metrics_derive::Metrics; #[derive(Metrics, Clone)] #[metrics(scope = "tips_audit")] pub struct Metrics { - /// Duration of archive_event operations. + /// Duration of `archive_event` operations. #[metric(describe = "Duration of archive_event")] pub archive_event_duration: Histogram, @@ -13,7 +13,7 @@ pub struct Metrics { #[metric(describe = "Age of event when processed (now - event timestamp)")] pub event_age: Histogram, - /// Duration of Kafka read_event operations. + /// Duration of Kafka `read_event` operations. #[metric(describe = "Duration of Kafka read_event")] pub kafka_read_duration: Histogram, @@ -21,7 +21,7 @@ pub struct Metrics { #[metric(describe = "Duration of Kafka commit")] pub kafka_commit_duration: Histogram, - /// Duration of update_bundle_history operations. + /// Duration of `update_bundle_history` operations. #[metric(describe = "Duration of update_bundle_history")] pub update_bundle_history_duration: Histogram, @@ -29,11 +29,11 @@ pub struct Metrics { #[metric(describe = "Duration of update all transaction indexes")] pub update_tx_indexes_duration: Histogram, - /// Duration of S3 get_object operations. + /// Duration of S3 `get_object` operations. #[metric(describe = "Duration of S3 get_object")] pub s3_get_duration: Histogram, - /// Duration of S3 put_object operations. + /// Duration of S3 `put_object` operations. #[metric(describe = "Duration of S3 put_object")] pub s3_put_duration: Histogram, diff --git a/crates/audit/src/publisher.rs b/crates/audit/src/publisher.rs index 3058543..b845f14 100644 --- a/crates/audit/src/publisher.rs +++ b/crates/audit/src/publisher.rs @@ -1,9 +1,10 @@ -use crate::types::{BundleEvent, UserOpEvent}; use anyhow::Result; use async_trait::async_trait; use rdkafka::producer::{FutureProducer, FutureRecord}; use tracing::{debug, error, info}; +use crate::types::{BundleEvent, UserOpEvent}; + /// Trait for publishing bundle events. #[async_trait] pub trait BundleEventPublisher: Send + Sync { @@ -42,11 +43,7 @@ impl KafkaBundleEventPublisher { let record = FutureRecord::to(&self.topic).key(&key).payload(&payload); - match self - .producer - .send(record, tokio::time::Duration::from_secs(5)) - .await - { + match self.producer.send(record, tokio::time::Duration::from_secs(5)).await { Ok(_) => { debug!( bundle_id = %bundle_id, @@ -157,11 +154,7 @@ impl KafkaUserOpEventPublisher { let record = FutureRecord::to(&self.topic).key(&key).payload(&payload); - match self - .producer - .send(record, tokio::time::Duration::from_secs(5)) - .await - { + match self.producer.send(record, tokio::time::Duration::from_secs(5)).await { Ok(_) => { debug!( user_op_hash = %user_op_hash, diff --git a/crates/audit/src/reader.rs b/crates/audit/src/reader.rs index be1c3c5..f447a96 100644 --- a/crates/audit/src/reader.rs +++ b/crates/audit/src/reader.rs @@ -1,4 +1,5 @@ -use crate::types::{BundleEvent, UserOpEvent}; +use std::time::{Duration, SystemTime, UNIX_EPOCH}; + use anyhow::Result; use async_trait::async_trait; use rdkafka::{ @@ -7,10 +8,11 @@ use rdkafka::{ consumer::{Consumer, StreamConsumer}, message::Message, }; -use std::time::{Duration, SystemTime, UNIX_EPOCH}; -use tips_core::kafka::load_kafka_config_from_file; use tokio::time::sleep; use tracing::{debug, error, info}; +use utils::kafka::load_kafka_config_from_file; + +use crate::types::{BundleEvent, UserOpEvent}; /// Creates a Kafka consumer from a properties file. pub fn create_kafka_consumer(kafka_properties_file: &str) -> Result { @@ -70,12 +72,7 @@ impl KafkaAuditLogReader { /// Creates a new Kafka audit log reader. pub fn new(consumer: StreamConsumer, topic: String) -> Result { consumer.subscribe(&[&topic])?; - Ok(Self { - consumer, - topic, - last_message_offset: None, - last_message_partition: None, - }) + Ok(Self { consumer, topic, last_message_offset: None, last_message_partition: None }) } } @@ -84,18 +81,16 @@ impl EventReader for KafkaAuditLogReader { async fn read_event(&mut self) -> Result { match self.consumer.recv().await { Ok(message) => { - let payload = message - .payload() - .ok_or_else(|| anyhow::anyhow!("Message has no payload"))?; + let payload = + message.payload().ok_or_else(|| anyhow::anyhow!("Message has no payload"))?; // Extract Kafka timestamp, use current time as fallback let timestamp = match message.timestamp() { - Timestamp::CreateTime(millis) => millis, - Timestamp::LogAppendTime(millis) => millis, - Timestamp::NotAvailable => SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap_or_default() - .as_millis() as i64, + Timestamp::CreateTime(millis) | Timestamp::LogAppendTime(millis) => millis, + Timestamp::NotAvailable => { + SystemTime::now().duration_since(UNIX_EPOCH).unwrap_or_default().as_millis() + as i64 + } }; let event: BundleEvent = serde_json::from_slice(payload)?; @@ -117,11 +112,7 @@ impl EventReader for KafkaAuditLogReader { .map(|k| String::from_utf8_lossy(k).to_string()) .ok_or_else(|| anyhow::anyhow!("Message missing required key"))?; - let event_result = Event { - key, - event, - timestamp, - }; + let event_result = Event { key, event, timestamp }; Ok(event_result) } @@ -139,8 +130,7 @@ impl EventReader for KafkaAuditLogReader { { let mut tpl = TopicPartitionList::new(); tpl.add_partition_offset(&self.topic, partition, rdkafka::Offset::Offset(offset + 1))?; - self.consumer - .commit(&tpl, rdkafka::consumer::CommitMode::Async)?; + self.consumer.commit(&tpl, rdkafka::consumer::CommitMode::Async)?; } Ok(()) } @@ -195,12 +185,7 @@ impl KafkaUserOpAuditLogReader { /// Creates a new Kafka user operation audit log reader. pub fn new(consumer: StreamConsumer, topic: String) -> Result { consumer.subscribe(&[&topic])?; - Ok(Self { - consumer, - topic, - last_message_offset: None, - last_message_partition: None, - }) + Ok(Self { consumer, topic, last_message_offset: None, last_message_partition: None }) } } @@ -209,17 +194,15 @@ impl UserOpEventReader for KafkaUserOpAuditLogReader { async fn read_event(&mut self) -> Result { match self.consumer.recv().await { Ok(message) => { - let payload = message - .payload() - .ok_or_else(|| anyhow::anyhow!("Message has no payload"))?; + let payload = + message.payload().ok_or_else(|| anyhow::anyhow!("Message has no payload"))?; let timestamp = match message.timestamp() { - Timestamp::CreateTime(millis) => millis, - Timestamp::LogAppendTime(millis) => millis, - Timestamp::NotAvailable => SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap_or_default() - .as_millis() as i64, + Timestamp::CreateTime(millis) | Timestamp::LogAppendTime(millis) => millis, + Timestamp::NotAvailable => { + SystemTime::now().duration_since(UNIX_EPOCH).unwrap_or_default().as_millis() + as i64 + } }; let event: UserOpEvent = serde_json::from_slice(payload)?; @@ -240,11 +223,7 @@ impl UserOpEventReader for KafkaUserOpAuditLogReader { .map(|k| String::from_utf8_lossy(k).to_string()) .ok_or_else(|| anyhow::anyhow!("Message missing required key"))?; - Ok(UserOpEventWrapper { - key, - event, - timestamp, - }) + Ok(UserOpEventWrapper { key, event, timestamp }) } Err(e) => { error!(error = %e, "Error receiving UserOp message from Kafka"); @@ -260,8 +239,7 @@ impl UserOpEventReader for KafkaUserOpAuditLogReader { { let mut tpl = TopicPartitionList::new(); tpl.add_partition_offset(&self.topic, partition, rdkafka::Offset::Offset(offset + 1))?; - self.consumer - .commit(&tpl, rdkafka::consumer::CommitMode::Async)?; + self.consumer.commit(&tpl, rdkafka::consumer::CommitMode::Async)?; } Ok(()) } diff --git a/crates/audit/src/storage.rs b/crates/audit/src/storage.rs index ba9d114..3c15ce1 100644 --- a/crates/audit/src/storage.rs +++ b/crates/audit/src/storage.rs @@ -1,23 +1,25 @@ -use crate::metrics::Metrics; -use crate::reader::Event; -use crate::types::{ - BundleEvent, BundleId, DropReason, TransactionId, UserOpDropReason, UserOpEvent, UserOpHash, -}; +use std::{fmt, fmt::Debug, time::Instant}; + use alloy_primitives::{Address, TxHash, U256}; use anyhow::Result; use async_trait::async_trait; -use aws_sdk_s3::Client as S3Client; -use aws_sdk_s3::error::SdkError; -use aws_sdk_s3::operation::get_object::GetObjectError; -use aws_sdk_s3::primitives::ByteStream; +use aws_sdk_s3::{ + Client as S3Client, error::SdkError, operation::get_object::GetObjectError, + primitives::ByteStream, +}; +use base_bundles::AcceptedBundle; use futures::future; use serde::{Deserialize, Serialize}; -use std::fmt; -use std::fmt::Debug; -use std::time::Instant; -use tips_core::AcceptedBundle; use tracing::info; +use crate::{ + metrics::Metrics, + reader::Event, + types::{ + BundleEvent, BundleId, DropReason, TransactionId, UserOpDropReason, UserOpEvent, UserOpHash, + }, +}; + /// S3 key types for storing different event types. #[derive(Debug)] pub enum S3Key { @@ -105,11 +107,11 @@ impl BundleHistoryEvent { /// Returns the event key. pub fn key(&self) -> &str { match self { - Self::Received { key, .. } => key, - Self::Cancelled { key, .. } => key, - Self::BuilderIncluded { key, .. } => key, - Self::BlockIncluded { key, .. } => key, - Self::Dropped { key, .. } => key, + Self::Received { key, .. } + | Self::Cancelled { key, .. } + | Self::BuilderIncluded { key, .. } + | Self::BlockIncluded { key, .. } + | Self::Dropped { key, .. } => key, } } } @@ -164,9 +166,9 @@ impl UserOpHistoryEvent { /// Returns the event key. pub fn key(&self) -> &str { match self { - Self::AddedToMempool { key, .. } => key, - Self::Dropped { key, .. } => key, - Self::Included { key, .. } => key, + Self::AddedToMempool { key, .. } + | Self::Dropped { key, .. } + | Self::Included { key, .. } => key, } } } @@ -203,32 +205,26 @@ fn update_bundle_history_transform( timestamp: event.timestamp, bundle: bundle.clone(), }, - BundleEvent::Cancelled { .. } => BundleHistoryEvent::Cancelled { - key: event.key.clone(), - timestamp: event.timestamp, - }, - BundleEvent::BuilderIncluded { - builder, - block_number, - flashblock_index, - .. - } => BundleHistoryEvent::BuilderIncluded { - key: event.key.clone(), - timestamp: event.timestamp, - builder: builder.clone(), - block_number: *block_number, - flashblock_index: *flashblock_index, - }, - BundleEvent::BlockIncluded { - block_number, - block_hash, - .. - } => BundleHistoryEvent::BlockIncluded { - key: event.key.clone(), - timestamp: event.timestamp, - block_number: *block_number, - block_hash: *block_hash, - }, + BundleEvent::Cancelled { .. } => { + BundleHistoryEvent::Cancelled { key: event.key.clone(), timestamp: event.timestamp } + } + BundleEvent::BuilderIncluded { builder, block_number, flashblock_index, .. } => { + BundleHistoryEvent::BuilderIncluded { + key: event.key.clone(), + timestamp: event.timestamp, + builder: builder.clone(), + block_number: *block_number, + flashblock_index: *flashblock_index, + } + } + BundleEvent::BlockIncluded { block_number, block_hash, .. } => { + BundleHistoryEvent::BlockIncluded { + key: event.key.clone(), + timestamp: event.timestamp, + block_number: *block_number, + block_hash: *block_hash, + } + } BundleEvent::Dropped { reason, .. } => BundleHistoryEvent::Dropped { key: event.key.clone(), timestamp: event.timestamp, @@ -279,28 +275,21 @@ fn update_userop_history_transform( } let history_event = match &event.event { - UserOpEvent::AddedToMempool { - sender, - entry_point, - nonce, - .. - } => UserOpHistoryEvent::AddedToMempool { - key: event.key.clone(), - timestamp: event.timestamp, - sender: *sender, - entry_point: *entry_point, - nonce: *nonce, - }, + UserOpEvent::AddedToMempool { sender, entry_point, nonce, .. } => { + UserOpHistoryEvent::AddedToMempool { + key: event.key.clone(), + timestamp: event.timestamp, + sender: *sender, + entry_point: *entry_point, + nonce: *nonce, + } + } UserOpEvent::Dropped { reason, .. } => UserOpHistoryEvent::Dropped { key: event.key.clone(), timestamp: event.timestamp, reason: reason.clone(), }, - UserOpEvent::Included { - block_number, - tx_hash, - .. - } => UserOpHistoryEvent::Included { + UserOpEvent::Included { block_number, tx_hash, .. } => UserOpHistoryEvent::Included { key: event.key.clone(), timestamp: event.timestamp, block_number: *block_number, @@ -364,11 +353,7 @@ pub struct S3EventReaderWriter { impl S3EventReaderWriter { /// Creates a new S3 event reader/writer. pub fn new(s3_client: S3Client, bucket: String) -> Self { - Self { - s3_client, - bucket, - metrics: Metrics::default(), - } + Self { s3_client, bucket, metrics: Metrics::default() } } async fn update_bundle_history(&self, event: Event) -> Result<()> { @@ -414,9 +399,7 @@ impl S3EventReaderWriter { for attempt in 0..MAX_RETRIES { let get_start = Instant::now(); let (current_value, etag) = self.get_object_with_etag::(key).await?; - self.metrics - .s3_get_duration - .record(get_start.elapsed().as_secs_f64()); + self.metrics.s3_get_duration.record(get_start.elapsed().as_secs_f64()); let value = current_value.unwrap_or_default(); @@ -440,9 +423,7 @@ impl S3EventReaderWriter { let put_start = Instant::now(); match put_request.send().await { Ok(_) => { - self.metrics - .s3_put_duration - .record(put_start.elapsed().as_secs_f64()); + self.metrics.s3_put_duration.record(put_start.elapsed().as_secs_f64()); info!( s3_key = %key, attempt = attempt + 1, @@ -451,9 +432,7 @@ impl S3EventReaderWriter { return Ok(()); } Err(e) => { - self.metrics - .s3_put_duration - .record(put_start.elapsed().as_secs_f64()); + self.metrics.s3_put_duration.record(put_start.elapsed().as_secs_f64()); if attempt < MAX_RETRIES - 1 { let delay = BASE_DELAY_MS * 2_u64.pow(attempt as u32); @@ -491,14 +470,7 @@ impl S3EventReaderWriter { where T: for<'de> Deserialize<'de>, { - match self - .s3_client - .get_object() - .bucket(&self.bucket) - .key(key) - .send() - .await - { + match self.s3_client.get_object().bucket(&self.bucket).key(key).send().await { Ok(response) => { let etag = response.e_tag().map(|s| s.to_string()); let body = response.body.collect().await?; @@ -537,23 +509,19 @@ impl EventWriter for S3EventReaderWriter { let bundle_future = self.update_bundle_history(event); let tx_start = Instant::now(); - let tx_futures: Vec<_> = transaction_ids - .into_iter() - .map(|tx_id| async move { - self.update_transaction_by_hash_index(&tx_id, bundle_id) - .await - }) - .collect(); + let tx_futures: Vec<_> = + transaction_ids + .into_iter() + .map(|tx_id| async move { + self.update_transaction_by_hash_index(&tx_id, bundle_id).await + }) + .collect(); // Run the bundle and transaction futures concurrently and wait for them to complete tokio::try_join!(bundle_future, future::try_join_all(tx_futures))?; - self.metrics - .update_bundle_history_duration - .record(bundle_start.elapsed().as_secs_f64()); - self.metrics - .update_tx_indexes_duration - .record(tx_start.elapsed().as_secs_f64()); + self.metrics.update_bundle_history_duration.record(bundle_start.elapsed().as_secs_f64()); + self.metrics.update_tx_indexes_duration.record(tx_start.elapsed().as_secs_f64()); Ok(()) } @@ -572,9 +540,8 @@ impl BundleEventS3Reader for S3EventReaderWriter { tx_hash: TxHash, ) -> Result> { let s3_key = S3Key::TransactionByHash(tx_hash).to_string(); - let (transaction_metadata, _) = self - .get_object_with_etag::(&s3_key) - .await?; + let (transaction_metadata, _) = + self.get_object_with_etag::(&s3_key).await?; Ok(transaction_metadata) } } @@ -597,19 +564,19 @@ impl UserOpEventS3Reader for S3EventReaderWriter { #[cfg(test)] mod tests { - use super::*; - use crate::reader::Event; - use crate::types::{BundleEvent, DropReason, UserOpDropReason, UserOpEvent}; use alloy_primitives::{Address, B256, TxHash, U256}; - use tips_core::{BundleExtensions, test_utils::create_bundle_from_txn_data}; + use base_bundles::BundleExtensions; use uuid::Uuid; + use super::*; + use crate::{ + reader::Event, + test_utils::create_bundle_from_txn_data, + types::{BundleEvent, DropReason, UserOpDropReason, UserOpEvent}, + }; + fn create_test_event(key: &str, timestamp: i64, bundle_event: BundleEvent) -> Event { - Event { - key: key.to_string(), - timestamp, - event: bundle_event, - } + Event { key: key.to_string(), timestamp, event: bundle_event } } #[test] @@ -617,10 +584,7 @@ mod tests { let bundle_history = BundleHistory { history: vec![] }; let bundle = create_bundle_from_txn_data(); let bundle_id = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); - let bundle_event = BundleEvent::Received { - bundle_id, - bundle: Box::new(bundle.clone()), - }; + let bundle_event = BundleEvent::Received { bundle_id, bundle: Box::new(bundle.clone()) }; let event = create_test_event("test-key", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history, &event); @@ -630,11 +594,7 @@ mod tests { assert_eq!(bundle_history.history.len(), 1); match &bundle_history.history[0] { - BundleHistoryEvent::Received { - key, - timestamp: ts, - bundle: b, - } => { + BundleHistoryEvent::Received { key, timestamp: ts, bundle: b } => { assert_eq!(key, "test-key"); assert_eq!(*ts, 1234567890); assert_eq!(b.block_number, bundle.block_number); @@ -650,16 +610,11 @@ mod tests { timestamp: 1111111111, bundle: Box::new(create_bundle_from_txn_data()), }; - let bundle_history = BundleHistory { - history: vec![existing_event], - }; + let bundle_history = BundleHistory { history: vec![existing_event] }; let bundle = create_bundle_from_txn_data(); let bundle_id = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); - let bundle_event = BundleEvent::Received { - bundle_id, - bundle: Box::new(bundle), - }; + let bundle_event = BundleEvent::Received { bundle_id, bundle: Box::new(bundle) }; let event = create_test_event("duplicate-key", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history, &event); @@ -673,10 +628,7 @@ mod tests { let bundle = create_bundle_from_txn_data(); let bundle_id = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); - let bundle_event = BundleEvent::Received { - bundle_id, - bundle: Box::new(bundle), - }; + let bundle_event = BundleEvent::Received { bundle_id, bundle: Box::new(bundle) }; let event = create_test_event("test-key", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); @@ -705,10 +657,7 @@ mod tests { let result = update_bundle_history_transform(bundle_history.clone(), &event); assert!(result.is_some()); - let bundle_event = BundleEvent::Dropped { - bundle_id, - reason: DropReason::TimedOut, - }; + let bundle_event = BundleEvent::Dropped { bundle_id, reason: DropReason::TimedOut }; let event = create_test_event("test-key-5", 1234567890, bundle_event); let result = update_bundle_history_transform(bundle_history, &event); assert!(result.is_some()); @@ -732,9 +681,7 @@ mod tests { fn test_update_transaction_metadata_transform_skips_existing_bundle() { let bundle = create_bundle_from_txn_data(); let bundle_id = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); - let metadata = TransactionMetadata { - bundle_ids: vec![bundle_id], - }; + let metadata = TransactionMetadata { bundle_ids: vec![bundle_id] }; let result = update_transaction_metadata_transform(metadata, bundle_id); @@ -749,9 +696,7 @@ mod tests { let existing_bundle_id = Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000").unwrap(); let new_bundle_id = Uuid::parse_str("6ba7b810-9dad-11d1-80b4-00c04fd430c8").unwrap(); - let metadata = TransactionMetadata { - bundle_ids: vec![existing_bundle_id], - }; + let metadata = TransactionMetadata { bundle_ids: vec![existing_bundle_id] }; let result = update_transaction_metadata_transform(metadata, new_bundle_id); @@ -767,11 +712,7 @@ mod tests { timestamp: i64, userop_event: UserOpEvent, ) -> UserOpEventWrapper { - UserOpEventWrapper { - key: key.to_string(), - timestamp, - event: userop_event, - } + UserOpEventWrapper { key: key.to_string(), timestamp, event: userop_event } } #[test] @@ -791,12 +732,7 @@ mod tests { let entry_point = Address::from([3u8; 20]); let nonce = U256::from(1); - let userop_event = UserOpEvent::AddedToMempool { - user_op_hash, - sender, - entry_point, - nonce, - }; + let userop_event = UserOpEvent::AddedToMempool { user_op_hash, sender, entry_point, nonce }; let event = create_test_userop_event("test-key", 1234567890, userop_event); let result = update_userop_history_transform(userop_history, &event); @@ -837,16 +773,9 @@ mod tests { entry_point, nonce, }; - let userop_history = UserOpHistory { - history: vec![existing_event], - }; + let userop_history = UserOpHistory { history: vec![existing_event] }; - let userop_event = UserOpEvent::AddedToMempool { - user_op_hash, - sender, - entry_point, - nonce, - }; + let userop_event = UserOpEvent::AddedToMempool { user_op_hash, sender, entry_point, nonce }; let event = create_test_userop_event("duplicate-key", 1234567890, userop_event); let result = update_userop_history_transform(userop_history, &event); @@ -860,10 +789,7 @@ mod tests { let user_op_hash = B256::from([1u8; 32]); let reason = UserOpDropReason::Expired; - let userop_event = UserOpEvent::Dropped { - user_op_hash, - reason: reason.clone(), - }; + let userop_event = UserOpEvent::Dropped { user_op_hash, reason }; let event = create_test_userop_event("dropped-key", 1234567890, userop_event); let result = update_userop_history_transform(userop_history, &event); @@ -873,11 +799,7 @@ mod tests { assert_eq!(history.history.len(), 1); match &history.history[0] { - UserOpHistoryEvent::Dropped { - key, - timestamp, - reason: r, - } => { + UserOpHistoryEvent::Dropped { key, timestamp, reason: r } => { assert_eq!(key, "dropped-key"); assert_eq!(*timestamp, 1234567890); match r { @@ -896,11 +818,7 @@ mod tests { let tx_hash = TxHash::from([4u8; 32]); let block_number = 12345u64; - let userop_event = UserOpEvent::Included { - user_op_hash, - block_number, - tx_hash, - }; + let userop_event = UserOpEvent::Included { user_op_hash, block_number, tx_hash }; let event = create_test_userop_event("included-key", 1234567890, userop_event); let result = update_userop_history_transform(userop_history, &event); @@ -910,12 +828,7 @@ mod tests { assert_eq!(history.history.len(), 1); match &history.history[0] { - UserOpHistoryEvent::Included { - key, - timestamp, - block_number: bn, - tx_hash: th, - } => { + UserOpHistoryEvent::Included { key, timestamp, block_number: bn, tx_hash: th } => { assert_eq!(key, "included-key"); assert_eq!(*timestamp, 1234567890); assert_eq!(*bn, 12345); @@ -933,12 +846,7 @@ mod tests { let entry_point = Address::from([3u8; 20]); let nonce = U256::from(1); - let userop_event = UserOpEvent::AddedToMempool { - user_op_hash, - sender, - entry_point, - nonce, - }; + let userop_event = UserOpEvent::AddedToMempool { user_op_hash, sender, entry_point, nonce }; let event = create_test_userop_event("key-1", 1234567890, userop_event); let result = update_userop_history_transform(userop_history.clone(), &event); assert!(result.is_some()); diff --git a/crates/core/src/test_utils.rs b/crates/audit/src/test_utils.rs similarity index 85% rename from crates/core/src/test_utils.rs rename to crates/audit/src/test_utils.rs index b4c89b3..5a34e48 100644 --- a/crates/core/src/test_utils.rs +++ b/crates/audit/src/test_utils.rs @@ -1,9 +1,10 @@ -use crate::{AcceptedBundle, Bundle, MeterBundleResponse}; +//! Test utilities for creating bundles and transactions. + use alloy_consensus::SignableTransaction; -use alloy_primitives::{Address, B256, Bytes, TxHash, U256, b256, bytes}; -use alloy_provider::network::TxSignerSync; -use alloy_provider::network::eip2718::Encodable2718; +use alloy_primitives::{Address, Bytes, TxHash, U256, b256, bytes}; +use alloy_provider::network::{TxSignerSync, eip2718::Encodable2718}; use alloy_signer_local::PrivateKeySigner; +use base_bundles::{AcceptedBundle, Bundle, MeterBundleResponse}; use op_alloy_consensus::OpTxEnvelope; use op_alloy_rpc_types::OpTransactionRequest; @@ -17,12 +18,7 @@ pub const TXN_HASH: TxHash = pub fn create_bundle_from_txn_data() -> AcceptedBundle { AcceptedBundle::new( - Bundle { - txs: vec![TXN_DATA], - ..Default::default() - } - .try_into() - .unwrap(), + Bundle { txs: vec![TXN_DATA], ..Default::default() }.try_into().unwrap(), create_test_meter_bundle_response(), ) } @@ -66,7 +62,7 @@ pub fn create_test_bundle( pub fn create_test_meter_bundle_response() -> MeterBundleResponse { MeterBundleResponse { bundle_gas_price: U256::from(0), - bundle_hash: B256::default(), + bundle_hash: alloy_primitives::B256::default(), coinbase_diff: U256::from(0), eth_sent_to_coinbase: U256::from(0), gas_fees: U256::from(0), diff --git a/crates/audit/src/types.rs b/crates/audit/src/types.rs index 2dd0291..96adb18 100644 --- a/crates/audit/src/types.rs +++ b/crates/audit/src/types.rs @@ -1,8 +1,8 @@ use alloy_consensus::transaction::{SignerRecoverable, Transaction as ConsensusTransaction}; use alloy_primitives::{Address, B256, TxHash, U256}; +use base_bundles::AcceptedBundle; use bytes::Bytes; use serde::{Deserialize, Serialize}; -use tips_core::AcceptedBundle; use uuid::Uuid; /// Unique identifier for a transaction. @@ -100,11 +100,11 @@ impl BundleEvent { /// Returns the bundle ID for this event. pub const fn bundle_id(&self) -> BundleId { match self { - Self::Received { bundle_id, .. } => *bundle_id, - Self::Cancelled { bundle_id, .. } => *bundle_id, - Self::BuilderIncluded { bundle_id, .. } => *bundle_id, - Self::BlockIncluded { bundle_id, .. } => *bundle_id, - Self::Dropped { bundle_id, .. } => *bundle_id, + Self::Received { bundle_id, .. } + | Self::Cancelled { bundle_id, .. } + | Self::BuilderIncluded { bundle_id, .. } + | Self::BlockIncluded { bundle_id, .. } + | Self::Dropped { bundle_id, .. } => *bundle_id, } } @@ -122,21 +122,17 @@ impl BundleEvent { }) }) .collect(), - Self::Cancelled { .. } => vec![], - Self::BuilderIncluded { .. } => vec![], - Self::BlockIncluded { .. } => vec![], - Self::Dropped { .. } => vec![], + Self::Cancelled { .. } + | Self::BuilderIncluded { .. } + | Self::BlockIncluded { .. } + | Self::Dropped { .. } => vec![], } } /// Generates a unique event key for this event. pub fn generate_event_key(&self) -> String { match self { - Self::BlockIncluded { - bundle_id, - block_hash, - .. - } => { + Self::BlockIncluded { bundle_id, block_hash, .. } => { format!("{bundle_id}-{block_hash}") } _ => { @@ -187,20 +183,16 @@ impl UserOpEvent { /// Returns the user operation hash for this event. pub const fn user_op_hash(&self) -> UserOpHash { match self { - Self::AddedToMempool { user_op_hash, .. } => *user_op_hash, - Self::Dropped { user_op_hash, .. } => *user_op_hash, - Self::Included { user_op_hash, .. } => *user_op_hash, + Self::AddedToMempool { user_op_hash, .. } + | Self::Dropped { user_op_hash, .. } + | Self::Included { user_op_hash, .. } => *user_op_hash, } } /// Generates a unique event key for this event. pub fn generate_event_key(&self) -> String { match self { - Self::Included { - user_op_hash, - tx_hash, - .. - } => { + Self::Included { user_op_hash, tx_hash, .. } => { format!("{user_op_hash}-{tx_hash}") } _ => { @@ -216,9 +208,10 @@ impl UserOpEvent { #[cfg(test)] mod user_op_event_tests { - use super::*; use alloy_primitives::{address, b256}; + use super::*; + fn create_test_user_op_hash() -> UserOpHash { b256!("1111111111111111111111111111111111111111111111111111111111111111") } @@ -282,10 +275,8 @@ mod user_op_event_tests { }; assert_eq!(added.user_op_hash(), hash); - let dropped = UserOpEvent::Dropped { - user_op_hash: hash, - reason: UserOpDropReason::Expired, - }; + let dropped = + UserOpEvent::Dropped { user_op_hash: hash, reason: UserOpDropReason::Expired }; assert_eq!(dropped.user_op_hash(), hash); let included = UserOpEvent::Included { @@ -302,11 +293,7 @@ mod user_op_event_tests { b256!("1111111111111111111111111111111111111111111111111111111111111111"); let tx_hash = b256!("2222222222222222222222222222222222222222222222222222222222222222"); - let event = UserOpEvent::Included { - user_op_hash, - block_number: 100, - tx_hash, - }; + let event = UserOpEvent::Included { user_op_hash, block_number: 100, tx_hash }; let key = event.generate_event_key(); assert!(key.contains(&format!("{user_op_hash}"))); diff --git a/crates/audit/tests/common/mod.rs b/crates/audit/tests/common/mod.rs index 6db10f2..095689c 100644 --- a/crates/audit/tests/common/mod.rs +++ b/crates/audit/tests/common/mod.rs @@ -1,10 +1,11 @@ -use rdkafka::producer::FutureProducer; -use rdkafka::{ClientConfig, consumer::StreamConsumer}; +use audit::test_utils::create_bundle_from_txn_data; +use base_bundles::BundleExtensions; +use rdkafka::{ClientConfig, consumer::StreamConsumer, producer::FutureProducer}; use testcontainers::runners::AsyncRunner; use testcontainers_modules::{kafka, kafka::Kafka, minio::MinIO}; use uuid::Uuid; -pub struct TestHarness { +pub(crate) struct TestHarness { pub s3_client: aws_sdk_s3::Client, pub bucket_name: String, #[allow(dead_code)] // TODO is read @@ -16,7 +17,7 @@ pub struct TestHarness { } impl TestHarness { - pub async fn new() -> Result> { + pub(crate) async fn new() -> Result> { let minio_container = MinIO::default().start().await?; let s3_port = minio_container.get_host_port_ipv4(9000).await?; let s3_endpoint = format!("http://127.0.0.1:{s3_port}"); @@ -35,24 +36,17 @@ impl TestHarness { .await; let s3_client = aws_sdk_s3::Client::new(&config); + let bundle = create_bundle_from_txn_data(); let bucket_name = format!( "test-bucket-{}", Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()) ); - s3_client - .create_bucket() - .bucket(&bucket_name) - .send() - .await?; + s3_client.create_bucket().bucket(&bucket_name).send().await?; let kafka_container = Kafka::default().start().await?; - let bootstrap_servers = format!( - "127.0.0.1:{}", - kafka_container - .get_host_port_ipv4(kafka::KAFKA_PORT) - .await? - ); + let bootstrap_servers = + format!("127.0.0.1:{}", kafka_container.get_host_port_ipv4(kafka::KAFKA_PORT).await?); let kafka_producer = ClientConfig::new() .set("bootstrap.servers", &bootstrap_servers) @@ -69,7 +63,7 @@ impl TestHarness { .create::() .expect("Failed to create Kafka StreamConsumer"); - Ok(TestHarness { + Ok(Self { s3_client, bucket_name, kafka_producer, diff --git a/crates/audit/tests/integration_tests.rs b/crates/audit/tests/integration_tests.rs index 5b23fd0..90a1c4b 100644 --- a/crates/audit/tests/integration_tests.rs +++ b/crates/audit/tests/integration_tests.rs @@ -1,17 +1,19 @@ -use alloy_primitives::{Address, B256, U256}; +#![allow(missing_docs)] + use std::time::Duration; -use tips_audit_lib::{ - KafkaAuditArchiver, KafkaAuditLogReader, KafkaUserOpAuditLogReader, UserOpEventReader, - publisher::{ - BundleEventPublisher, KafkaBundleEventPublisher, KafkaUserOpEventPublisher, - UserOpEventPublisher, - }, - storage::{BundleEventS3Reader, S3EventReaderWriter}, - types::{BundleEvent, DropReason, UserOpEvent}, + +use alloy_primitives::{Address, B256, U256}; +use audit::{ + BundleEvent, BundleEventPublisher, BundleEventS3Reader, DropReason, KafkaAuditArchiver, + KafkaAuditLogReader, KafkaBundleEventPublisher, KafkaUserOpAuditLogReader, + KafkaUserOpEventPublisher, S3EventReaderWriter, UserOpEvent, UserOpEventPublisher, + UserOpEventReader, test_utils::create_bundle_from_txn_data, }; -use tips_core::{BundleExtensions, test_utils::create_bundle_from_txn_data}; +use base_bundles::BundleExtensions; use uuid::Uuid; + mod common; + use common::TestHarness; #[tokio::test] @@ -27,19 +29,13 @@ async fn test_kafka_publisher_s3_archiver_integration() let bundle = create_bundle_from_txn_data(); let test_bundle_id = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); let test_events = [ - BundleEvent::Received { - bundle_id: test_bundle_id, - bundle: Box::new(bundle.clone()), - }, - BundleEvent::Dropped { - bundle_id: test_bundle_id, - reason: DropReason::TimedOut, - }, + BundleEvent::Received { bundle_id: test_bundle_id, bundle: Box::new(bundle.clone()) }, + BundleEvent::Dropped { bundle_id: test_bundle_id, reason: DropReason::TimedOut }, ]; let publisher = KafkaBundleEventPublisher::new(harness.kafka_producer, topic.to_string()); - for event in test_events.iter() { + for event in &test_events { publisher.publish(event.clone()).await?; } @@ -48,6 +44,7 @@ async fn test_kafka_publisher_s3_archiver_integration() s3_writer.clone(), 1, 100, + false, ); tokio::spawn(async move { @@ -59,22 +56,19 @@ async fn test_kafka_publisher_s3_archiver_integration() loop { counter += 1; if counter > 10 { - assert!(false, "unable to complete archiving within the deadline"); + panic!("unable to complete archiving within the deadline"); } tokio::time::sleep(Duration::from_secs(1)).await; let bundle_history = s3_writer.get_bundle_history(test_bundle_id).await?; - if bundle_history.is_some() { - let history = bundle_history.unwrap(); + if let Some(history) = bundle_history { if history.history.len() != test_events.len() { continue; - } else { - break; } - } else { - continue; + break; } + continue; } Ok(()) @@ -108,12 +102,7 @@ async fn test_userop_kafka_publisher_reader_integration() assert_eq!(received.event.user_op_hash(), test_user_op_hash); match received.event { - UserOpEvent::AddedToMempool { - user_op_hash, - sender, - entry_point, - nonce, - } => { + UserOpEvent::AddedToMempool { user_op_hash, sender, entry_point, nonce } => { assert_eq!(user_op_hash, test_user_op_hash); assert_eq!(sender, test_sender); assert_eq!(entry_point, test_entry_point); diff --git a/crates/audit/tests/s3_test.rs b/crates/audit/tests/s3_test.rs index d555bc0..6ffc979 100644 --- a/crates/audit/tests/s3_test.rs +++ b/crates/audit/tests/s3_test.rs @@ -1,29 +1,22 @@ -use alloy_primitives::{Address, B256, TxHash, U256}; +#![allow(missing_docs)] + use std::sync::Arc; -use tips_audit_lib::{ - reader::Event, - storage::{ - BundleEventS3Reader, EventWriter, S3EventReaderWriter, UserOpEventS3Reader, - UserOpEventWrapper, UserOpEventWriter, - }, - types::{BundleEvent, UserOpDropReason, UserOpEvent}, + +use alloy_primitives::{Address, B256, TxHash, U256}; +use audit::{ + BundleEvent, BundleEventS3Reader, Event, EventWriter, S3EventReaderWriter, UserOpDropReason, + UserOpEvent, UserOpEventS3Reader, UserOpEventWrapper, UserOpEventWriter, + test_utils::{TXN_HASH, create_bundle_from_txn_data}, }; +use base_bundles::BundleExtensions; use tokio::task::JoinSet; use uuid::Uuid; mod common; use common::TestHarness; -use tips_core::{ - BundleExtensions, - test_utils::{TXN_HASH, create_bundle_from_txn_data}, -}; fn create_test_event(key: &str, timestamp: i64, bundle_event: BundleEvent) -> Event { - Event { - key: key.to_string(), - timestamp, - event: bundle_event, - } + Event { key: key.to_string(), timestamp, event: bundle_event } } #[tokio::test] @@ -36,10 +29,7 @@ async fn test_event_write_and_read() -> Result<(), Box Result<(), Box Result<(), Box Result<(), Box = history - .history - .iter() - .map(|e| e.key().to_string()) - .collect(); + let keys: Vec = history.history.iter().map(|e| e.key().to_string()).collect(); assert_eq!( keys, - events - .iter() - .map(|e| e.key.clone()) - .take(idx + 1) - .collect::>() + events.iter().map(|e| e.key.clone()).take(idx + 1).collect::>() ); } @@ -144,10 +116,7 @@ async fn test_event_deduplication() -> Result<(), Box Result<(), Box Result<(), Box> { let harness = TestHarness::new().await?; - let writer = Arc::new(S3EventReaderWriter::new( - harness.s3_client.clone(), - harness.bucket_name.clone(), - )); + let writer = + Arc::new(S3EventReaderWriter::new(harness.s3_client.clone(), harness.bucket_name.clone())); let bundle = create_bundle_from_txn_data(); let bundle_id = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); @@ -196,10 +163,7 @@ async fn test_concurrent_writes_for_bundle() -> Result<(), Box Result<(), Box Result<(), Box UserOpEventWrapper { - UserOpEventWrapper { - key: key.to_string(), - timestamp, - event: userop_event, - } + UserOpEventWrapper { key: key.to_string(), timestamp, event: userop_event } } #[tokio::test] @@ -283,12 +231,7 @@ async fn test_userop_event_write_and_read() -> Result<(), Box Result<(), Box Result<(), Box = history - .history - .iter() - .map(|e| e.key().to_string()) - .collect(); + let keys: Vec = history.history.iter().map(|e| e.key().to_string()).collect(); assert_eq!( keys, - events - .iter() - .map(|e| e.key.clone()) - .take(idx + 1) - .collect::>() + events.iter().map(|e| e.key.clone()).take(idx + 1).collect::>() ); } @@ -376,12 +302,7 @@ async fn test_userop_event_deduplication() -> Result<(), Box Result<(), Box, - - #[serde(with = "alloy_serde::quantity")] - pub block_number: u64, - - #[serde( - default, - deserialize_with = "alloy_serde::quantity::opt::deserialize", - skip_serializing_if = "Option::is_none" - )] - pub flashblock_number_min: Option, - - #[serde( - default, - deserialize_with = "alloy_serde::quantity::opt::deserialize", - skip_serializing_if = "Option::is_none" - )] - pub flashblock_number_max: Option, - - #[serde( - default, - deserialize_with = "alloy_serde::quantity::opt::deserialize", - skip_serializing_if = "Option::is_none" - )] - pub min_timestamp: Option, - - #[serde( - default, - deserialize_with = "alloy_serde::quantity::opt::deserialize", - skip_serializing_if = "Option::is_none" - )] - pub max_timestamp: Option, - - #[serde(default, skip_serializing_if = "Vec::is_empty")] - pub reverting_tx_hashes: Vec, - - #[serde(default, skip_serializing_if = "Option::is_none")] - pub replacement_uuid: Option, - - #[serde(default, skip_serializing_if = "Vec::is_empty")] - pub dropping_tx_hashes: Vec, -} - -/// `ParsedBundle` is the type that contains utility methods for the `Bundle` type. -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] -pub struct ParsedBundle { - pub txs: Vec>, - pub block_number: u64, - pub flashblock_number_min: Option, - pub flashblock_number_max: Option, - pub min_timestamp: Option, - pub max_timestamp: Option, - pub reverting_tx_hashes: Vec, - pub replacement_uuid: Option, - pub dropping_tx_hashes: Vec, -} - -impl TryFrom for ParsedBundle { - type Error = String; - fn try_from(bundle: Bundle) -> Result { - let txs: Vec> = bundle - .txs - .into_iter() - .map(|tx| { - OpTxEnvelope::decode_2718_exact(tx.iter().as_slice()) - .map_err(|e| format!("Failed to decode transaction: {e:?}")) - .and_then(|tx| { - tx.try_into_recovered().map_err(|e| { - format!("Failed to convert transaction to recovered: {e:?}") - }) - }) - }) - .collect::>, String>>()?; - - let uuid = bundle - .replacement_uuid - .map(|x| Uuid::parse_str(x.as_ref())) - .transpose() - .map_err(|e| format!("Invalid UUID: {e:?}"))?; - - Ok(Self { - txs, - block_number: bundle.block_number, - flashblock_number_min: bundle.flashblock_number_min, - flashblock_number_max: bundle.flashblock_number_max, - min_timestamp: bundle.min_timestamp, - max_timestamp: bundle.max_timestamp, - reverting_tx_hashes: bundle.reverting_tx_hashes, - replacement_uuid: uuid, - dropping_tx_hashes: bundle.dropping_tx_hashes, - }) - } -} - -impl From for ParsedBundle { - fn from(accepted_bundle: AcceptedBundle) -> Self { - Self { - txs: accepted_bundle.txs, - block_number: accepted_bundle.block_number, - flashblock_number_min: accepted_bundle.flashblock_number_min, - flashblock_number_max: accepted_bundle.flashblock_number_max, - min_timestamp: accepted_bundle.min_timestamp, - max_timestamp: accepted_bundle.max_timestamp, - reverting_tx_hashes: accepted_bundle.reverting_tx_hashes, - replacement_uuid: accepted_bundle.replacement_uuid, - dropping_tx_hashes: accepted_bundle.dropping_tx_hashes, - } - } -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct BundleHash { - pub bundle_hash: B256, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct CancelBundle { - pub replacement_uuid: String, -} - -/// `AcceptedBundle` is the type that is sent over the wire. -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct AcceptedBundle { - pub uuid: Uuid, - - pub txs: Vec>, - - #[serde(with = "alloy_serde::quantity")] - pub block_number: u64, - - #[serde( - default, - deserialize_with = "alloy_serde::quantity::opt::deserialize", - skip_serializing_if = "Option::is_none" - )] - pub flashblock_number_min: Option, - - #[serde( - default, - deserialize_with = "alloy_serde::quantity::opt::deserialize", - skip_serializing_if = "Option::is_none" - )] - pub flashblock_number_max: Option, - - #[serde( - default, - deserialize_with = "alloy_serde::quantity::opt::deserialize", - skip_serializing_if = "Option::is_none" - )] - pub min_timestamp: Option, - - #[serde( - default, - deserialize_with = "alloy_serde::quantity::opt::deserialize", - skip_serializing_if = "Option::is_none" - )] - pub max_timestamp: Option, - - #[serde(default, skip_serializing_if = "Vec::is_empty")] - pub reverting_tx_hashes: Vec, - - #[serde(default, skip_serializing_if = "Option::is_none")] - pub replacement_uuid: Option, - - #[serde(default, skip_serializing_if = "Vec::is_empty")] - pub dropping_tx_hashes: Vec, - - pub meter_bundle_response: MeterBundleResponse, -} - -pub trait BundleTxs { - fn transactions(&self) -> &Vec>; -} - -pub trait BundleExtensions { - fn bundle_hash(&self) -> B256; - fn txn_hashes(&self) -> Vec; - fn senders(&self) -> Vec

    ; - fn gas_limit(&self) -> u64; - fn da_size(&self) -> u64; -} - -impl BundleExtensions for T { - fn bundle_hash(&self) -> B256 { - let parsed = self.transactions(); - let mut concatenated = Vec::new(); - for tx in parsed { - concatenated.extend_from_slice(tx.tx_hash().as_slice()); - } - keccak256(&concatenated) - } - - fn txn_hashes(&self) -> Vec { - self.transactions().iter().map(|t| t.tx_hash()).collect() - } - - fn senders(&self) -> Vec
    { - self.transactions() - .iter() - .map(|t| t.recover_signer().unwrap()) - .collect() - } - - fn gas_limit(&self) -> u64 { - self.transactions().iter().map(|t| t.gas_limit()).sum() - } - - fn da_size(&self) -> u64 { - self.transactions() - .iter() - .map(|t| tx_estimated_size_fjord_bytes(&t.encoded_2718())) - .sum() - } -} - -impl BundleTxs for ParsedBundle { - fn transactions(&self) -> &Vec> { - &self.txs - } -} - -impl BundleTxs for AcceptedBundle { - fn transactions(&self) -> &Vec> { - &self.txs - } -} - -impl AcceptedBundle { - pub fn new(bundle: ParsedBundle, meter_bundle_response: MeterBundleResponse) -> Self { - Self { - uuid: bundle.replacement_uuid.unwrap_or_else(|| { - Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()) - }), - txs: bundle.txs, - block_number: bundle.block_number, - flashblock_number_min: bundle.flashblock_number_min, - flashblock_number_max: bundle.flashblock_number_max, - min_timestamp: bundle.min_timestamp, - max_timestamp: bundle.max_timestamp, - reverting_tx_hashes: bundle.reverting_tx_hashes, - replacement_uuid: bundle.replacement_uuid, - dropping_tx_hashes: bundle.dropping_tx_hashes, - meter_bundle_response, - } - } - - pub const fn uuid(&self) -> &Uuid { - &self.uuid - } -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] -#[serde(rename_all = "camelCase")] -pub struct TransactionResult { - pub coinbase_diff: U256, - pub eth_sent_to_coinbase: U256, - pub from_address: Address, - pub gas_fees: U256, - pub gas_price: U256, - pub gas_used: u64, - pub to_address: Option
    , - pub tx_hash: TxHash, - pub value: U256, - pub execution_time_us: u128, -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)] -#[serde(rename_all = "camelCase")] -pub struct MeterBundleResponse { - pub bundle_gas_price: U256, - pub bundle_hash: B256, - pub coinbase_diff: U256, - pub eth_sent_to_coinbase: U256, - pub gas_fees: U256, - pub results: Vec, - pub state_block_number: u64, - #[serde( - default, - deserialize_with = "alloy_serde::quantity::opt::deserialize", - skip_serializing_if = "Option::is_none" - )] - pub state_flashblock_index: Option, - pub total_gas_used: u64, - pub total_execution_time_us: u128, - #[serde(default)] - pub state_root_time_us: u128, -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::test_utils::{create_test_meter_bundle_response, create_transaction}; - use alloy_primitives::Keccak256; - use alloy_provider::network::eip2718::Encodable2718; - use alloy_signer_local::PrivateKeySigner; - - #[test] - fn test_bundle_types() { - let alice = PrivateKeySigner::random(); - let bob = PrivateKeySigner::random(); - - let tx1 = create_transaction(alice.clone(), 1, bob.address()); - let tx2 = create_transaction(alice.clone(), 2, bob.address()); - - let tx1_bytes = tx1.encoded_2718(); - let tx2_bytes = tx2.encoded_2718(); - - let bundle = AcceptedBundle::new( - Bundle { - txs: vec![tx1_bytes.clone().into()], - block_number: 1, - replacement_uuid: None, - ..Default::default() - } - .try_into() - .unwrap(), - create_test_meter_bundle_response(), - ); - - assert!(!bundle.uuid().is_nil()); - assert_eq!(bundle.replacement_uuid, None); // we're fine with bundles that don't have a replacement UUID - assert_eq!(bundle.txn_hashes().len(), 1); - assert_eq!(bundle.txn_hashes()[0], tx1.tx_hash()); - assert_eq!(bundle.senders().len(), 1); - assert_eq!(bundle.senders()[0], alice.address()); - - // Bundle hashes are keccack256(...txnHashes) - let expected_bundle_hash_single = { - let mut hasher = Keccak256::default(); - hasher.update(keccak256(&tx1_bytes)); - hasher.finalize() - }; - - assert_eq!(bundle.bundle_hash(), expected_bundle_hash_single); - - let uuid = Uuid::new_v5(&Uuid::NAMESPACE_OID, bundle.bundle_hash().as_slice()); - let bundle = AcceptedBundle::new( - Bundle { - txs: vec![tx1_bytes.clone().into(), tx2_bytes.clone().into()], - block_number: 1, - replacement_uuid: Some(uuid.to_string()), - ..Default::default() - } - .try_into() - .unwrap(), - create_test_meter_bundle_response(), - ); - - assert_eq!(*bundle.uuid(), uuid); - assert_eq!(bundle.replacement_uuid, Some(uuid)); - assert_eq!(bundle.txn_hashes().len(), 2); - assert_eq!(bundle.txn_hashes()[0], tx1.tx_hash()); - assert_eq!(bundle.txn_hashes()[1], tx2.tx_hash()); - assert_eq!(bundle.senders().len(), 2); - assert_eq!(bundle.senders()[0], alice.address()); - assert_eq!(bundle.senders()[1], alice.address()); - - let expected_bundle_hash_double = { - let mut hasher = Keccak256::default(); - hasher.update(keccak256(&tx1_bytes)); - hasher.update(keccak256(&tx2_bytes)); - hasher.finalize() - }; - - assert_eq!(bundle.bundle_hash(), expected_bundle_hash_double); - } - - #[test] - fn test_meter_bundle_response_serialization() { - let response = MeterBundleResponse { - bundle_gas_price: U256::from(1000000000), - bundle_hash: B256::default(), - coinbase_diff: U256::from(100), - eth_sent_to_coinbase: U256::from(0), - gas_fees: U256::from(100), - results: vec![], - state_block_number: 12345, - state_flashblock_index: Some(42), - total_gas_used: 21000, - total_execution_time_us: 1000, - }; - - let json = serde_json::to_string(&response).unwrap(); - assert!(json.contains("\"stateFlashblockIndex\":42")); - assert!(json.contains("\"stateBlockNumber\":12345")); - - let deserialized: MeterBundleResponse = serde_json::from_str(&json).unwrap(); - assert_eq!(deserialized.state_flashblock_index, Some(42)); - assert_eq!(deserialized.state_block_number, 12345); - } - - #[test] - fn test_meter_bundle_response_without_flashblock_index() { - let response = MeterBundleResponse { - bundle_gas_price: U256::from(1000000000), - bundle_hash: B256::default(), - coinbase_diff: U256::from(100), - eth_sent_to_coinbase: U256::from(0), - gas_fees: U256::from(100), - results: vec![], - state_block_number: 12345, - state_flashblock_index: None, - total_gas_used: 21000, - total_execution_time_us: 1000, - }; - - let json = serde_json::to_string(&response).unwrap(); - assert!(!json.contains("stateFlashblockIndex")); - assert!(json.contains("\"stateBlockNumber\":12345")); - - let deserialized: MeterBundleResponse = serde_json::from_str(&json).unwrap(); - assert_eq!(deserialized.state_flashblock_index, None); - assert_eq!(deserialized.state_block_number, 12345); - } - - #[test] - fn test_meter_bundle_response_deserialization_without_flashblock() { - let json = r#"{ - "bundleGasPrice": "1000000000", - "bundleHash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "coinbaseDiff": "100", - "ethSentToCoinbase": "0", - "gasFees": "100", - "results": [], - "stateBlockNumber": 12345, - "totalGasUsed": 21000, - "totalExecutionTimeUs": 1000, - "stateRootTimeUs": 500 - }"#; - - let deserialized: MeterBundleResponse = serde_json::from_str(json).unwrap(); - assert_eq!(deserialized.bundle_gas_price, U256::from(1000000000)); - assert_eq!(deserialized.coinbase_diff, U256::from(100)); - assert_eq!(deserialized.eth_sent_to_coinbase, U256::from(0)); - assert_eq!(deserialized.state_flashblock_index, None); - assert_eq!(deserialized.state_block_number, 12345); - assert_eq!(deserialized.total_gas_used, 21000); - } - - #[test] - fn test_same_uuid_for_same_bundle_hash() { - let alice = PrivateKeySigner::random(); - let bob = PrivateKeySigner::random(); - - // suppose this is a spam tx - let tx1 = create_transaction(alice.clone(), 1, bob.address()); - let tx1_bytes = tx1.encoded_2718(); - - // we receive it the first time - let bundle1 = AcceptedBundle::new( - Bundle { - txs: vec![tx1_bytes.clone().into()], - block_number: 1, - replacement_uuid: None, - ..Default::default() - } - .try_into() - .unwrap(), - create_test_meter_bundle_response(), - ); - - // but we may receive it more than once - let bundle2 = AcceptedBundle::new( - Bundle { - txs: vec![tx1_bytes.clone().into()], - block_number: 1, - replacement_uuid: None, - ..Default::default() - } - .try_into() - .unwrap(), - create_test_meter_bundle_response(), - ); - - // however, the UUID should be the same - assert_eq!(bundle1.uuid(), bundle2.uuid()); - } -} diff --git a/crates/mempool-rebroadcaster/Cargo.toml b/crates/mempool-rebroadcaster/Cargo.toml index c562f63..e2d232a 100644 --- a/crates/mempool-rebroadcaster/Cargo.toml +++ b/crates/mempool-rebroadcaster/Cargo.toml @@ -14,7 +14,8 @@ path = "src/lib.rs" serde = { workspace = true } serde_json = { workspace = true } tracing = { workspace = true } -tokio = { workspace = true } +tracing-subscriber = { workspace = true, features = ["fmt", "std", "json", "env-filter"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } # alloy alloy-primitives.workspace = true @@ -23,4 +24,5 @@ alloy-rpc-types = { workspace = true, features = ["txpool"] } alloy-rpc-types-eth.workspace = true alloy-consensus.workspace = true alloy-trie.workspace = true -alloy-provider = { workspace = true, features = ["txpool-api"] } +alloy-provider = { workspace = true, features = ["txpool-api", "reqwest"] } + diff --git a/crates/sidecrush/Cargo.toml b/crates/sidecrush/Cargo.toml index 10d8d15..89f6564 100644 --- a/crates/sidecrush/Cargo.toml +++ b/crates/sidecrush/Cargo.toml @@ -14,16 +14,14 @@ path = "src/lib.rs" anyhow = { workspace = true } async-trait = { workspace = true } cadence = { workspace = true } +tokio = { workspace = true, features = ["rt-multi-thread", "macros", "signal"] } tracing = { workspace = true } -tokio = { workspace = true } +tracing-subscriber = { workspace = true, features = ["fmt", "std", "json"] } # Ethereum client deps (will be used for header fetching) -alloy-provider = { workspace = true } -alloy-transport-http = { workspace = true } -alloy-rpc-types-eth = { workspace = true } alloy-consensus = { workspace = true } alloy-primitives = { workspace = true } +alloy-provider = { workspace = true, features = ["reqwest"] } +alloy-rpc-types-eth = { workspace = true } +alloy-transport-http = { workspace = true } -[dev-dependencies] -tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } -tracing = { workspace = true } diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml new file mode 100644 index 0000000..e875ce3 --- /dev/null +++ b/crates/utils/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "utils" +description = "Shared utility functions for logging, metrics, and config parsing" +version.workspace = true +edition.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true + +[lints] +workspace = true + +[dependencies] +tracing = { workspace = true, features = ["std"] } +alloy-rpc-types = { workspace = true, features = ["eth"] } +metrics-exporter-prometheus = { workspace = true, features = ["http-listener"] } +tracing-subscriber = { workspace = true, features = ["std", "fmt", "ansi", "env-filter", "json"] } + +[dev-dependencies] +serde_json = { workspace = true, features = ["std"] } diff --git a/crates/utils/README.md b/crates/utils/README.md new file mode 100644 index 0000000..546ed46 --- /dev/null +++ b/crates/utils/README.md @@ -0,0 +1,3 @@ +# `utils` + +Shared utility functions for `base/infra` services — logging, metrics, and config parsing. diff --git a/crates/core/src/kafka.rs b/crates/utils/src/kafka.rs similarity index 92% rename from crates/core/src/kafka.rs rename to crates/utils/src/kafka.rs index a5230ee..ac07051 100644 --- a/crates/core/src/kafka.rs +++ b/crates/utils/src/kafka.rs @@ -1,5 +1,4 @@ -use std::collections::HashMap; -use std::fs; +use std::{collections::HashMap, fs}; pub fn load_kafka_config_from_file( properties_file_path: &str, diff --git a/crates/utils/src/lib.rs b/crates/utils/src/lib.rs new file mode 100644 index 0000000..a6eacd8 --- /dev/null +++ b/crates/utils/src/lib.rs @@ -0,0 +1,11 @@ +#![doc = include_str!("../README.md")] +#![doc(issue_tracker_base_url = "https://github.com/base/infra/issues/")] +#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] +#![cfg_attr(not(test), warn(unused_crate_dependencies))] +#![allow(missing_docs)] + +use alloy_rpc_types as _; + +pub mod kafka; +pub mod logger; +pub mod metrics; diff --git a/crates/core/src/logger.rs b/crates/utils/src/logger.rs similarity index 76% rename from crates/core/src/logger.rs rename to crates/utils/src/logger.rs index ca4ef1b..ccdb8d2 100644 --- a/crates/core/src/logger.rs +++ b/crates/utils/src/logger.rs @@ -1,4 +1,5 @@ use std::str::FromStr; + use tracing::warn; use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt}; @@ -49,25 +50,14 @@ pub fn init_logger_with_format(log_level: &str, format: LogFormat) { LogFormat::Json => { tracing_subscriber::registry() .with(env_filter) - .with( - fmt::layer() - .json() - .flatten_event(true) - .with_current_span(true), - ) + .with(fmt::layer().json().flatten_event(true).with_current_span(true)) .init(); } LogFormat::Compact => { - tracing_subscriber::registry() - .with(env_filter) - .with(fmt::layer().compact()) - .init(); + tracing_subscriber::registry().with(env_filter).with(fmt::layer().compact()).init(); } LogFormat::Pretty => { - tracing_subscriber::registry() - .with(env_filter) - .with(fmt::layer().pretty()) - .init(); + tracing_subscriber::registry().with(env_filter).with(fmt::layer().pretty()).init(); } } } diff --git a/crates/core/src/metrics.rs b/crates/utils/src/metrics.rs similarity index 99% rename from crates/core/src/metrics.rs rename to crates/utils/src/metrics.rs index de365ce..bb5f67f 100644 --- a/crates/core/src/metrics.rs +++ b/crates/utils/src/metrics.rs @@ -1,6 +1,7 @@ -use metrics_exporter_prometheus::PrometheusBuilder; use std::net::SocketAddr; +use metrics_exporter_prometheus::PrometheusBuilder; + pub fn init_prometheus_exporter(addr: SocketAddr) -> Result<(), Box> { PrometheusBuilder::new() .with_http_listener(addr) diff --git a/deny.toml b/deny.toml index 5c4adf5..3b760be 100644 --- a/deny.toml +++ b/deny.toml @@ -48,11 +48,38 @@ skip = [ "foldhash", "lru", + # AWS SDK transitive dependencies + "aws-smithy-http", + "aws-smithy-json", + + # HTTP ecosystem (hyper 0.14 vs 1.x transition) + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + + # TLS/crypto ecosystem + "rustls", + "rustls-webpki", + "tokio-rustls", + + # macOS security framework + "core-foundation", + "security-framework", + "openssl-probe", + # Random number generation "rand", "rand_chacha", "rand_core", + # Networking + "socket2", + + # OP Stack crates (reth uses older versions) + "op-alloy-consensus", + # Proc-macro / derive ecosystem (alloy-tx-macros vs ratatui/instability) "darling", "darling_core", diff --git a/justfile b/justfile index c6a014a..d9c7a1b 100644 --- a/justfile +++ b/justfile @@ -1,207 +1,107 @@ -set positional-arguments +set positional-arguments := true +set dotenv-load := true +alias t := test alias f := fix -alias c := ci +alias b := build +alias c := clean +alias u := check-udeps +alias wt := watch-test +alias wc := watch-check + +# Default service name for docker builds +SERVICE := env_var_or_default("SERVICE", "mempool-rebroadcaster") # Default to display help menu default: @just --list # Runs all ci checks -ci: - cargo fmt --all -- --check - cargo clippy -- -D warnings - cargo build - cargo test - cd ui && npx --yes @biomejs/biome check . - cd ui && npm run build +ci: fix check lychee zepter + +# Performs lychee checks, installing the lychee command if necessary +lychee: + @command -v lychee >/dev/null 2>&1 || cargo install lychee + lychee --config ./lychee.toml . + +# Checks formatting, udeps, clippy, and tests +check: check-format check-udeps check-clippy test check-deny + +# Runs cargo deny to check dependencies +check-deny: + @command -v cargo-deny >/dev/null 2>&1 || cargo install cargo-deny + cargo deny check bans --hide-inclusion-graph # Fixes formatting and clippy issues -fix: - cargo fmt --all - cargo clippy --fix --allow-dirty --allow-staged - cd ui && npx --yes @biomejs/biome check --write --unsafe . - -# Resets dependencies and reformats code -sync: deps-reset sync-env fix - -# Copies environment templates and adapts for docker -sync-env: - cp .env.example .env - cp .env.example ./ui/.env - cp .env.example .env.docker - sed -i '' 's/localhost:9092/host.docker.internal:9094/g' ./.env.docker - sed -i '' 's/localhost/host.docker.internal/g' ./.env.docker - -# Stops and removes all docker containers and data -stop-all: - export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && docker compose down && docker compose rm && rm -rf data/ - -# Starts all services in docker, useful for demos -start-all: stop-all - export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && mkdir -p data/kafka data/minio && docker compose build && docker compose up -d - -# Starts docker services except specified ones, e.g. just start-except ui ingress-rpc -start-except programs: stop-all - #!/bin/bash - all_services=(kafka kafka-setup minio minio-setup ingress-rpc audit ui) - exclude_services=({{ programs }}) - - # Create result array with services not in exclude list - result_services=() - for service in "${all_services[@]}"; do - skip=false - for exclude in "${exclude_services[@]}"; do - if [[ "$service" == "$exclude" ]]; then - skip=true - break - fi - done - if [[ "$skip" == false ]]; then - result_services+=("$service") - fi - done - - export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && mkdir -p data/kafka data/minio && docker compose build && docker compose up -d ${result_services[@]} - -# Resets docker dependencies with clean data -deps-reset: - COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml docker compose down && docker compose rm && rm -rf data/ && mkdir -p data/kafka data/minio && docker compose up -d - -# Restarts docker dependencies without data reset -deps: - COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml docker compose down && docker compose rm && docker compose up -d - -# Runs the tips-audit service -audit: - cargo run --bin tips-audit - -# Runs the tips-ingress-rpc service -ingress-rpc: - cargo run --bin tips-ingress-rpc - -# Runs the tips-maintenance service -maintenance: - cargo run --bin tips-maintenance - -# Runs the tips-ingress-writer service -ingress-writer: - cargo run --bin tips-ingress-writer - -# Starts the UI development server -ui: - cd ui && yarn dev - -sequencer_url := "http://localhost:8547" -validator_url := "http://localhost:8549" -builder_url := "http://localhost:2222" -ingress_url := "http://localhost:8080" - -sender := "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" -sender_key := "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d" - -backrunner := "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC" -backrunner_key := "0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a" - -# Queries block numbers from sequencer, validator, and builder -get-blocks: - echo "Sequencer" - cast bn -r {{ sequencer_url }} - echo "Validator" - cast bn -r {{ validator_url }} - echo "Builder" - cast bn -r {{ builder_url }} - -# Sends a test transaction through the ingress endpoint -send-txn: - #!/usr/bin/env bash - set -euxo pipefail - echo "sending txn" - nonce=$(cast nonce {{ sender }} -r {{ builder_url }}) - txn=$(cast mktx --private-key {{ sender_key }} 0x0000000000000000000000000000000000000000 --value 0.01ether --nonce $nonce --chain-id 13 -r {{ builder_url }}) - hash=$(curl -s {{ ingress_url }} -X POST -H "Content-Type: application/json" --data "{\"method\":\"eth_sendRawTransaction\",\"params\":[\"$txn\"],\"id\":1,\"jsonrpc\":\"2.0\"}" | jq -r ".result") - cast receipt $hash -r {{ sequencer_url }} | grep status - cast receipt $hash -r {{ builder_url }} | grep status - -# Sends a transaction with a backrun bundle -send-txn-with-backrun: - #!/usr/bin/env bash - set -euxo pipefail - - # 1. Get nonce and send target transaction from sender account - nonce=$(cast nonce {{ sender }} -r {{ builder_url }}) - echo "Sending target transaction from sender (nonce=$nonce)..." - target_txn=$(cast mktx --private-key {{ sender_key }} \ - 0x0000000000000000000000000000000000000000 \ - --value 0.01ether \ - --nonce $nonce \ - --chain-id 13 \ - -r {{ builder_url }}) - - target_hash=$(curl -s {{ ingress_url }} -X POST \ - -H "Content-Type: application/json" \ - --data "{\"method\":\"eth_sendRawTransaction\",\"params\":[\"$target_txn\"],\"id\":1,\"jsonrpc\":\"2.0\"}" \ - | jq -r ".result") - echo "Target tx sent: $target_hash" - - # 2. Build backrun transaction from backrunner account (different account!) - backrun_nonce=$(cast nonce {{ backrunner }} -r {{ builder_url }}) - echo "Building backrun transaction from backrunner (nonce=$backrun_nonce)..." - backrun_txn=$(cast mktx --private-key {{ backrunner_key }} \ - 0x0000000000000000000000000000000000000001 \ - --value 0.001ether \ - --nonce $backrun_nonce \ - --chain-id 13 \ - -r {{ builder_url }}) - - # 3. Compute tx hashes for reverting_tx_hashes - backrun_hash_computed=$(cast keccak $backrun_txn) - echo "Target tx hash: $target_hash" - echo "Backrun tx hash: $backrun_hash_computed" - - # 4. Construct and send bundle with reverting_tx_hashes - echo "Sending backrun bundle..." - bundle_json=$(jq -n \ - --arg target "$target_txn" \ - --arg backrun "$backrun_txn" \ - --arg target_hash "$target_hash" \ - --arg backrun_hash "$backrun_hash_computed" \ - '{ - txs: [$target, $backrun], - blockNumber: 0, - revertingTxHashes: [$target_hash, $backrun_hash] - }') - - bundle_hash=$(curl -s {{ ingress_url }} -X POST \ - -H "Content-Type: application/json" \ - --data "{\"method\":\"eth_sendBackrunBundle\",\"params\":[$bundle_json],\"id\":1,\"jsonrpc\":\"2.0\"}" \ - | jq -r ".result") - echo "Bundle sent: $bundle_hash" - - # 5. Wait and verify both transactions - echo "Waiting for transactions to land..." - sleep 5 - - echo "=== Target transaction (from sender) ===" - cast receipt $target_hash -r {{ sequencer_url }} | grep -E "(status|blockNumber|transactionIndex)" - - echo "=== Backrun transaction (from backrunner) ===" - cast receipt $backrun_hash_computed -r {{ sequencer_url }} | grep -E "(status|blockNumber|transactionIndex)" || echo "Backrun tx not found yet" - -# Runs integration tests with infrastructure checks -e2e: - #!/bin/bash - if ! INTEGRATION_TESTS=1 cargo test --package tips-system-tests --test integration_tests; then - echo "" - echo "═══════════════════════════════════════════════════════════════════" - echo " ⚠️ Integration tests failed!" - echo " Make sure the infrastructure is running locally (see SETUP.md for full instructions): " - echo " just start-all" - echo " start builder-playground" - echo " start op-rbuilder" - echo "═══════════════════════════════════════════════════════════════════" - exit 1 - fi - echo "═══════════════════════════════════════════════════════════════════" - echo " ✅ Integration tests passed!" - echo "═══════════════════════════════════════════════════════════════════" +fix: format-fix clippy-fix zepter-fix + +# Runs zepter feature checks, installing zepter if necessary +zepter: + @command -v zepter >/dev/null 2>&1 || cargo install zepter + zepter --version + zepter format features + zepter + +# Fixes zepter feature formatting +zepter-fix: + @command -v zepter >/dev/null 2>&1 || cargo install zepter + zepter format features --fix + +# Runs tests across workspace with all features enabled +test: + @command -v cargo-nextest >/dev/null 2>&1 || cargo install cargo-nextest + RUSTFLAGS="-D warnings" cargo nextest run --workspace --all-features + +# Checks formatting +check-format: + cargo +nightly fmt --all -- --check + +# Fixes any formatting issues +format-fix: + cargo fix --allow-dirty --allow-staged --workspace + cargo +nightly fmt --all + +# Checks clippy +check-clippy: + cargo clippy --workspace --all-targets -- -D warnings + +# Fixes any clippy issues +clippy-fix: + cargo clippy --workspace --all-targets --fix --allow-dirty --allow-staged + +# Builds the workspace with release +build: + cargo build --workspace --release + +# Builds all targets in debug mode +build-all-targets: + cargo build --workspace --all-targets + +# Cleans the workspace +clean: + cargo clean + +# Checks if there are any unused dependencies +check-udeps: + @command -v cargo-udeps >/dev/null 2>&1 || cargo install cargo-udeps + cargo +nightly udeps --workspace --all-features --all-targets + +# Watches tests +watch-test: + cargo watch -x test + +# Watches checks +watch-check: + cargo watch -x "fmt --all -- --check" -x "clippy --all-targets -- -D warnings" -x test + +# Build Docker image for a service +docker-image: + docker build --platform linux/amd64 --build-arg SERVICE_NAME={{SERVICE}} -t {{SERVICE}} . + +# Run mempool rebroadcaster service +run-mempool-rebroadcaster: + cargo run --bin mempool-rebroadcaster -- --geth-mempool-endpoint {{env_var("GETH_MEMPOOL_ENDPOINT")}} --reth-mempool-endpoint {{env_var("RETH_MEMPOOL_ENDPOINT")}} + +# Run basectl with specified config (mainnet, sepolia, devnet, or path) +basectl config="mainnet": + cargo run -p basectl --release -- -c {{config}} \ No newline at end of file From 6376ec78cd3ebe688917f1857d7bdfab776fe97a Mon Sep 17 00:00:00 2001 From: Mihir Wadekar Date: Mon, 2 Feb 2026 23:38:24 -0800 Subject: [PATCH 112/117] chore: adds tips-ingress-rpc service --- .github/workflows/ci.yml | 6 +- Cargo.lock | 2862 ++++++++++++++++- Cargo.toml | 1 + .../Cargo.toml | 18 +- .../src/main.rs | 68 +- crates/ingress-rpc/Cargo.toml | 9 +- crates/ingress-rpc/src/health.rs | 3 +- crates/ingress-rpc/src/lib.rs | 95 +- crates/ingress-rpc/src/queue.rs | 56 +- crates/ingress-rpc/src/service.rs | 392 +-- crates/ingress-rpc/src/validation.rs | 60 +- deny.toml | 5 + justfile | 10 +- 13 files changed, 2885 insertions(+), 700 deletions(-) rename bin/{tips-ingress-rpc => ingress-rpc}/Cargo.toml (66%) rename bin/{tips-ingress-rpc => ingress-rpc}/src/main.rs (63%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a31cd1..d4c83ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -178,14 +178,12 @@ jobs: egress-policy: audit - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: dtolnay/rust-toolchain@0c3131df9e5407c0c36352032d04af846dbe0fb7 # nightly - with: - components: rustfmt + - uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2 with: cache-on-failure: true add-rust-environment-hash-key: "false" - key: nightly-${{ hashFiles('Cargo.lock') }} + key: stable-${{ hashFiles('Cargo.lock') }} - name: Install just uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3 - run: just check-deny diff --git a/Cargo.lock b/Cargo.lock index 8cc4f56..accacad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,6 +15,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", + "getrandom 0.3.4", "once_cell", "version_check", "zerocopy", @@ -57,7 +58,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90f374d3c6d729268bbe2d0e0ff992bb97898b2df756691a62ee1d5f0506bc39" dependencies = [ "alloy-primitives", + "alloy-rlp", "num_enum", + "serde", "strum 0.27.2", ] @@ -81,11 +84,11 @@ dependencies = [ "k256", "once_cell", "rand 0.8.5", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -121,7 +124,7 @@ dependencies = [ "futures", "futures-util", "serde_json", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -150,7 +153,7 @@ dependencies = [ "alloy-rlp", "crc", "serde", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -176,7 +179,7 @@ dependencies = [ "borsh", "k256", "serde", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -209,10 +212,62 @@ dependencies = [ "c-kzg", "derive_more", "either", + "ethereum_ssz", + "ethereum_ssz_derive", "serde", "serde_with", "sha2", - "thiserror", + "thiserror 2.0.18", +] + +[[package]] +name = "alloy-evm" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b99ba7b74a87176f31ee1cd26768f7155b0eeff61ed925f59b13085ffe5f891" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-hardforks", + "alloy-op-hardforks", + "alloy-primitives", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "alloy-sol-types", + "auto_impl", + "derive_more", + "op-alloy", + "op-revm", + "revm", + "thiserror 2.0.18", +] + +[[package]] +name = "alloy-genesis" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55d9d1aba3f914f0e8db9e4616ae37f3d811426d95bdccf44e47d0605ab202f6" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-serde", + "alloy-trie", + "borsh", + "serde", + "serde_with", +] + +[[package]] +name = "alloy-hardforks" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83ba208044232d14d4adbfa77e57d6329f51bc1acc21f5667bb7db72d88a0831" +dependencies = [ + "alloy-chains", + "alloy-eip2124", + "alloy-primitives", + "auto_impl", + "dyn-clone", ] [[package]] @@ -238,7 +293,7 @@ dependencies = [ "http 1.4.0", "serde", "serde_json", - "thiserror", + "thiserror 2.0.18", "tracing", ] @@ -265,7 +320,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -281,6 +336,36 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-op-evm" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "646a01ebc9778ee08bcc33cfa6714efc548f94e53de1aff6b34d9da55a2e5d41" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-op-hardforks", + "alloy-primitives", + "auto_impl", + "op-alloy", + "op-revm", + "revm", + "thiserror 2.0.18", +] + +[[package]] +name = "alloy-op-hardforks" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6472c610150c4c4c15be9e1b964c9b78068f933bda25fb9cdf09b9ac2bb66f36" +dependencies = [ + "alloy-chains", + "alloy-hardforks", + "alloy-primitives", + "auto_impl", +] + [[package]] name = "alloy-primitives" version = "1.5.6" @@ -293,6 +378,7 @@ dependencies = [ "const-hex", "derive_more", "foldhash 0.2.0", + "getrandom 0.4.1", "hashbrown 0.16.1", "indexmap 2.13.0", "itoa", @@ -343,7 +429,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror", + "thiserror 2.0.18", "tokio", "tracing", "url", @@ -391,7 +477,7 @@ checksum = "ce8849c74c9ca0f5a03da1c865e3eb6f768df816e67dd3721a398a8a7e398011" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -432,6 +518,18 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-rpc-types-admin" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "564afceae126df73b95f78c81eb46e2ef689a45ace0fcdaf5c9a178693a5ccca" +dependencies = [ + "alloy-genesis", + "alloy-primitives", + "serde", + "serde_json", +] + [[package]] name = "alloy-rpc-types-any" version = "1.6.3" @@ -455,6 +553,8 @@ dependencies = [ "alloy-rlp", "alloy-serde", "derive_more", + "ethereum_ssz", + "ethereum_ssz_derive", "jsonwebtoken", "rand 0.8.5", "serde", @@ -479,7 +579,21 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 2.0.18", +] + +[[package]] +name = "alloy-rpc-types-trace" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be096f74d85e1f927580b398bf7bc5b4aa62326f149680ec0867e3c040c9aced" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "serde", + "serde_json", + "thiserror 2.0.18", ] [[package]] @@ -517,7 +631,7 @@ dependencies = [ "either", "elliptic-curve", "k256", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -533,7 +647,7 @@ dependencies = [ "async-trait", "k256", "rand 0.8.5", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -547,7 +661,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -564,7 +678,7 @@ dependencies = [ "proc-macro2", "quote", "sha3", - "syn 2.0.114", + "syn 2.0.115", "syn-solidity", ] @@ -580,7 +694,7 @@ dependencies = [ "macro-string", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "syn-solidity", ] @@ -621,7 +735,7 @@ dependencies = [ "parking_lot", "serde", "serde_json", - "thiserror", + "thiserror 2.0.18", "tokio", "tower", "tracing", @@ -678,7 +792,7 @@ dependencies = [ "nybbles", "serde", "smallvec", - "thiserror", + "thiserror 2.0.18", "tracing", ] @@ -691,7 +805,7 @@ dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -703,18 +817,76 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.6.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + [[package]] name = "anstyle" version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" +[[package]] +name = "anstyle-parse" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.61.2", +] + [[package]] name = "anyhow" version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea" +[[package]] +name = "aquamarine" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f50776554130342de4836ba542aa85a4ddb361690d7e8df13774d7284c3d5c2" +dependencies = [ + "include_dir", + "itertools 0.10.5", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.115", +] + [[package]] name = "arboard" version = "3.6.1" @@ -735,6 +907,51 @@ dependencies = [ "x11rb", ] +[[package]] +name = "ark-bls12-381" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3df4dcc01ff89867cd86b0da835f23c3f02738353aaee7dde7495af71363b8d5" +dependencies = [ + "ark-ec", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", +] + +[[package]] +name = "ark-bn254" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc" +dependencies = [ + "ark-ec", + "ark-ff 0.5.0", + "ark-r1cs-std", + "ark-std 0.5.0", +] + +[[package]] +name = "ark-ec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce" +dependencies = [ + "ahash", + "ark-ff 0.5.0", + "ark-poly", + "ark-serialize 0.5.0", + "ark-std 0.5.0", + "educe", + "fnv", + "hashbrown 0.15.5", + "itertools 0.13.0", + "num-bigint", + "num-integer", + "num-traits", + "zeroize", +] + [[package]] name = "ark-ff" version = "0.3.0" @@ -820,7 +1037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -858,7 +1075,51 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", +] + +[[package]] +name = "ark-poly" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27" +dependencies = [ + "ahash", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", + "educe", + "fnv", + "hashbrown 0.15.5", +] + +[[package]] +name = "ark-r1cs-std" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941551ef1df4c7a401de7068758db6503598e6f01850bdb2cfdb614a1f9dbea1" +dependencies = [ + "ark-ec", + "ark-ff 0.5.0", + "ark-relations", + "ark-std 0.5.0", + "educe", + "num-bigint", + "num-integer", + "num-traits", + "tracing", +] + +[[package]] +name = "ark-relations" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec46ddc93e7af44bcab5230937635b06fb5744464dd6a7e7b083e80ebd274384" +dependencies = [ + "ark-ff 0.5.0", + "ark-std 0.5.0", + "tracing", + "tracing-subscriber 0.2.25", ] [[package]] @@ -888,12 +1149,24 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7" dependencies = [ + "ark-serialize-derive", "ark-std 0.5.0", "arrayvec", "digest 0.10.7", "num-bigint", ] +[[package]] +name = "ark-serialize-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.115", +] + [[package]] name = "ark-std" version = "0.3.0" @@ -924,6 +1197,12 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + [[package]] name = "arrayvec" version = "0.7.6" @@ -933,6 +1212,27 @@ dependencies = [ "serde", ] +[[package]] +name = "assert-json-diff" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "async-lock" +version = "3.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" +dependencies = [ + "event-listener", + "event-listener-strategy", + "pin-project-lite", +] + [[package]] name = "async-stream" version = "0.3.6" @@ -952,7 +1252,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -963,7 +1263,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1002,7 +1302,7 @@ dependencies = [ "metrics", "metrics-derive", "op-alloy-consensus 0.22.4", - "op-alloy-rpc-types", + "op-alloy-rpc-types 0.22.4", "rdkafka", "serde", "serde_json", @@ -1031,6 +1331,16 @@ dependencies = [ "utils", ] +[[package]] +name = "aurora-engine-modexp" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "518bc5745a6264b5fd7b09dffb9667e400ee9e2bbe18555fac75e1fe9afa0df9" +dependencies = [ + "hex", + "num", +] + [[package]] name = "auto_impl" version = "1.3.0" @@ -1039,7 +1349,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1461,34 +1771,101 @@ dependencies = [ ] [[package]] -name = "base-bundles" -version = "0.0.0" -source = "git+https://github.com/base/base?branch=main#d8adce06b1b8d86f2ccdee5688004569f42789a2" -dependencies = [ - "alloy-consensus", - "alloy-primitives", - "alloy-provider", - "alloy-serde", - "op-alloy-consensus 0.23.1", - "op-alloy-flz", - "serde", - "uuid", -] - -[[package]] -name = "base-primitives" -version = "0.0.0" -source = "git+https://github.com/base/base.git#d8adce06b1b8d86f2ccdee5688004569f42789a2" +name = "axum" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8" dependencies = [ - "alloy-primitives", - "alloy-rpc-types-engine", - "alloy-rpc-types-eth", - "alloy-serde", - "brotli", + "axum-core", "bytes", - "serde", + "futures-util", + "http 1.4.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.8.1", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde_core", "serde_json", - "thiserror", + "serde_path_to_error", + "sync_wrapper", + "tokio", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1" +dependencies = [ + "bytes", + "futures-core", + "http 1.4.0", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "sync_wrapper", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backon" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cffb0e931875b666fc4fcb20fee52e9bbd1ef836fd9e9e04ec21555f9f85f7ef" +dependencies = [ + "fastrand", + "tokio", +] + +[[package]] +name = "base-bundles" +version = "0.0.0" +source = "git+https://github.com/base/base?branch=main#d8adce06b1b8d86f2ccdee5688004569f42789a2" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-provider", + "alloy-serde", + "op-alloy-consensus 0.23.1", + "op-alloy-flz", + "serde", + "uuid", +] + +[[package]] +name = "base-primitives" +version = "0.0.0" +source = "git+https://github.com/base/base.git#d8adce06b1b8d86f2ccdee5688004569f42789a2" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "alloy-serde", + "brotli", + "bytes", + "serde", + "serde_json", + "thiserror 2.0.18", +] + +[[package]] +name = "base-reth-rpc-types" +version = "0.0.0" +source = "git+https://github.com/base/base?branch=main#d8adce06b1b8d86f2ccdee5688004569f42789a2" +dependencies = [ + "reth-optimism-evm", + "reth-rpc-eth-types", ] [[package]] @@ -1553,7 +1930,7 @@ dependencies = [ "dirs", "futures-util", "op-alloy-consensus 0.22.4", - "op-alloy-network", + "op-alloy-network 0.22.4", "ratatui", "serde", "serde_json", @@ -1585,7 +1962,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1630,6 +2007,9 @@ name = "bitflags" version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +dependencies = [ + "serde_core", +] [[package]] name = "bitvec" @@ -1639,6 +2019,7 @@ checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", + "serde", "tap", "wyz", ] @@ -1695,7 +2076,7 @@ dependencies = [ "serde_json", "serde_repr", "serde_urlencoded", - "thiserror", + "thiserror 2.0.18", "tokio", "tokio-util", "tower-service", @@ -1734,7 +2115,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1858,6 +2239,12 @@ dependencies = [ "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cexpr" version = "0.6.0" @@ -1920,8 +2307,10 @@ version = "4.5.58" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f13174bda5dfd69d7e947827e5af4b0f2f94a4a3ee92912fba07a66150f21e2" dependencies = [ + "anstream", "anstyle", "clap_lex", + "strsim", ] [[package]] @@ -1933,7 +2322,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1960,6 +2349,22 @@ dependencies = [ "cc", ] +[[package]] +name = "colorchoice" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "compact_str" version = "0.8.1" @@ -1974,6 +2379,15 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "const-hex" version = "1.17.0" @@ -2093,6 +2507,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "critical-section" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" + [[package]] name = "crossbeam-channel" version = "0.5.15" @@ -2102,6 +2522,16 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + [[package]] name = "crossbeam-epoch" version = "0.9.18" @@ -2170,6 +2600,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "darling" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" +dependencies = [ + "darling_core 0.20.11", + "darling_macro 0.20.11", +] + [[package]] name = "darling" version = "0.21.3" @@ -2190,6 +2630,20 @@ dependencies = [ "darling_macro 0.23.0", ] +[[package]] +name = "darling_core" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.115", +] + [[package]] name = "darling_core" version = "0.21.3" @@ -2202,7 +2656,7 @@ dependencies = [ "quote", "serde", "strsim", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2215,7 +2669,18 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.114", + "syn 2.0.115", +] + +[[package]] +name = "darling_macro" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" +dependencies = [ + "darling_core 0.20.11", + "quote", + "syn 2.0.115", ] [[package]] @@ -2226,7 +2691,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core 0.21.3", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2237,7 +2702,7 @@ checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" dependencies = [ "darling_core 0.23.0", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2260,6 +2725,24 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" +[[package]] +name = "deadpool" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0be2b1d1d6ec8d846f05e137292d0b89133caf95ef33695424c09568bdd39b1b" +dependencies = [ + "deadpool-runtime", + "lazy_static", + "num_cpus", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" + [[package]] name = "der" version = "0.7.10" @@ -2291,6 +2774,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive-where" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.115", +] + [[package]] name = "derive_more" version = "2.1.1" @@ -2310,7 +2804,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.114", + "syn 2.0.115", "unicode-xid", ] @@ -2374,7 +2868,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2394,6 +2888,12 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + [[package]] name = "dunce" version = "1.0.5" @@ -2430,7 +2930,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2462,6 +2962,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "enr" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "851bd664a3d3a3c175cff92b2f0df02df3c541b4895d0ae307611827aae46152" +dependencies = [ + "alloy-rlp", + "base64 0.22.1", + "bytes", + "hex", + "log", + "rand 0.8.5", + "secp256k1 0.30.0", + "sha3", + "zeroize", +] + [[package]] name = "enum-ordinalize" version = "4.3.2" @@ -2479,7 +2996,7 @@ checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2515,6 +3032,67 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "ethereum_serde_utils" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dc1355dbb41fbbd34ec28d4fb2a57d9a70c67ac3c19f6a5ca4d4a176b9e997a" +dependencies = [ + "alloy-primitives", + "hex", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "ethereum_ssz" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dcddb2554d19cde19b099fadddde576929d7a4d0c1cd3512d1fd95cf174375c" +dependencies = [ + "alloy-primitives", + "ethereum_serde_utils", + "itertools 0.13.0", + "serde", + "serde_derive", + "smallvec", + "typenum", +] + +[[package]] +name = "ethereum_ssz_derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a657b6b3b7e153637dc6bdc6566ad9279d9ee11a15b12cfb24a2e04360637e9f" +dependencies = [ + "darling 0.20.11", + "proc-macro2", + "quote", + "syn 2.0.115", +] + +[[package]] +name = "event-listener" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "fastrand" version = "2.3.0" @@ -2560,7 +3138,7 @@ checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2611,6 +3189,27 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "fixed-map" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ed19add84e8cb9e8cc5f7074de0324247149ffef0b851e215fb0edc50c229b" +dependencies = [ + "fixed-map-derive", + "serde", +] + +[[package]] +name = "fixed-map-derive" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dc7a9cb3326bafb80642c5ce99b39a2c0702d4bfa8ee8a3e773791a6cbe2407" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.115", +] + [[package]] name = "flate2" version = "1.1.9" @@ -2663,6 +3262,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fragile" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619" + [[package]] name = "fs_extra" version = "1.3.0" @@ -2731,7 +3336,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2811,9 +3416,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi", "wasip2", + "wasm-bindgen", ] [[package]] @@ -2901,6 +3508,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + [[package]] name = "hashbrown" version = "0.14.5" @@ -3129,6 +3742,7 @@ dependencies = [ "http 1.4.0", "hyper 1.8.1", "hyper-util", + "log", "rustls 0.23.36", "rustls-native-certs", "rustls-pki-types", @@ -3360,7 +3974,26 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", +] + +[[package]] +name = "include_dir" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" +dependencies = [ + "proc-macro2", + "quote", ] [[package]] @@ -3396,21 +4029,74 @@ dependencies = [ ] [[package]] -name = "instability" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357b7205c6cd18dd2c86ed312d1e70add149aea98e7ef72b9fdf0270e555c11d" +name = "ingress-rpc" +version = "0.0.0" dependencies = [ - "darling 0.23.0", - "indoc", - "proc-macro2", - "quote", - "syn 2.0.114", -] - -[[package]] -name = "ipnet" -version = "2.11.0" + "alloy-consensus", + "alloy-primitives", + "alloy-provider", + "alloy-signer-local", + "anyhow", + "async-trait", + "audit", + "axum", + "backon", + "base-bundles", + "base-reth-rpc-types", + "clap", + "jsonrpsee", + "metrics", + "metrics-derive", + "mockall", + "moka", + "op-alloy-consensus 0.22.4", + "op-alloy-network 0.22.4", + "op-revm", + "rdkafka", + "serde_json", + "tokio", + "tracing", + "url", + "utils", + "uuid", + "wiremock", +] + +[[package]] +name = "ingress-rpc-bin" +version = "0.0.0" +dependencies = [ + "alloy-provider", + "anyhow", + "audit", + "base-bundles", + "clap", + "dotenvy", + "ingress-rpc", + "jsonrpsee", + "op-alloy-network 0.22.4", + "rdkafka", + "tokio", + "tracing", + "utils", +] + +[[package]] +name = "instability" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357b7205c6cd18dd2c86ed312d1e70add149aea98e7ef72b9fdf0270e555c11d" +dependencies = [ + "darling 0.23.0", + "indoc", + "proc-macro2", + "quote", + "syn 2.0.115", +] + +[[package]] +name = "ipnet" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" @@ -3424,6 +4110,12 @@ dependencies = [ "serde", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" + [[package]] name = "itertools" version = "0.10.5" @@ -3457,6 +4149,28 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "jobserver" version = "0.1.34" @@ -3477,6 +4191,121 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "jsonrpsee" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3f48dc3e6b8bd21e15436c1ddd0bc22a6a54e8ec46fedd6adf3425f396ec6a" +dependencies = [ + "jsonrpsee-core", + "jsonrpsee-http-client", + "jsonrpsee-proc-macros", + "jsonrpsee-server", + "jsonrpsee-types", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "316c96719901f05d1137f19ba598b5fe9c9bc39f4335f67f6be8613921946480" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.4.0", + "http-body 1.0.1", + "http-body-util", + "jsonrpsee-types", + "parking_lot", + "pin-project", + "rand 0.9.2", + "rustc-hash", + "serde", + "serde_json", + "thiserror 2.0.18", + "tokio", + "tower", + "tracing", +] + +[[package]] +name = "jsonrpsee-http-client" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790bedefcec85321e007ff3af84b4e417540d5c87b3c9779b9e247d1bcc3dab8" +dependencies = [ + "base64 0.22.1", + "http-body 1.0.1", + "hyper 1.8.1", + "hyper-rustls 0.27.7", + "hyper-util", + "jsonrpsee-core", + "jsonrpsee-types", + "rustls 0.23.36", + "rustls-platform-verifier", + "serde", + "serde_json", + "thiserror 2.0.18", + "tokio", + "tower", + "url", +] + +[[package]] +name = "jsonrpsee-proc-macros" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da3f8ab5ce1bb124b6d082e62dffe997578ceaf0aeb9f3174a214589dc00f07" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.115", +] + +[[package]] +name = "jsonrpsee-server" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c51b7c290bb68ce3af2d029648148403863b982f138484a73f02a9dd52dbd7f" +dependencies = [ + "futures-util", + "http 1.4.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.8.1", + "hyper-util", + "jsonrpsee-core", + "jsonrpsee-types", + "pin-project", + "route-recognizer", + "serde", + "serde_json", + "soketto", + "thiserror 2.0.18", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tracing", +] + +[[package]] +name = "jsonrpsee-types" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc88ff4688e43cc3fa9883a8a95c6fa27aa2e76c96e610b737b6554d650d7fd5" +dependencies = [ + "http 1.4.0", + "serde", + "serde_json", + "thiserror 2.0.18", +] + [[package]] name = "jsonwebtoken" version = "9.3.1" @@ -3633,6 +4462,12 @@ dependencies = [ "hashbrown 0.16.1", ] +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + [[package]] name = "macro-string" version = "0.1.4" @@ -3641,7 +4476,7 @@ checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -3653,6 +4488,12 @@ dependencies = [ "regex-automata", ] +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "md-5" version = "0.10.6" @@ -3684,7 +4525,7 @@ dependencies = [ "serde_json", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.3.22", ] [[package]] @@ -3696,7 +4537,7 @@ dependencies = [ "mempool-rebroadcaster", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.3.22", ] [[package]] @@ -3717,7 +4558,7 @@ checksum = "161ab904c2c62e7bda0f7562bf22f96440ca35ff79e66c800cbac298f2f4f5ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -3735,7 +4576,7 @@ dependencies = [ "metrics", "metrics-util", "quanta", - "thiserror", + "thiserror 2.0.18", "tokio", "tracing", ] @@ -3756,6 +4597,12 @@ dependencies = [ "sketches-ddsketch", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -3784,6 +4631,73 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "mockall" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.115", +] + +[[package]] +name = "modular-bitfield" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74" +dependencies = [ + "modular-bitfield-impl", + "static_assertions", +] + +[[package]] +name = "modular-bitfield-impl" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "moka" +version = "0.12.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ac832c50ced444ef6be0767a008b02c106a909ba79d1d830501e94b96f6b7e" +dependencies = [ + "async-lock", + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "equivalent", + "event-listener", + "futures-util", + "parking_lot", + "portable-atomic", + "smallvec", + "tagptr", + "uuid", +] + [[package]] name = "moxcms" version = "0.7.11" @@ -3830,6 +4744,20 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + [[package]] name = "num-bigint" version = "0.4.6" @@ -3840,6 +4768,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + [[package]] name = "num-conv" version = "0.2.0" @@ -3855,6 +4792,28 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -3894,7 +4853,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -3989,6 +4948,29 @@ name = "once_cell" version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +dependencies = [ + "critical-section", + "portable-atomic", +] + +[[package]] +name = "once_cell_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" + +[[package]] +name = "op-alloy" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9b8fee21003dd4f076563de9b9d26f8c97840157ef78593cd7f262c5ca99848" +dependencies = [ + "op-alloy-consensus 0.23.1", + "op-alloy-network 0.23.1", + "op-alloy-provider", + "op-alloy-rpc-types 0.23.1", + "op-alloy-rpc-types-engine", +] [[package]] name = "op-alloy-consensus" @@ -4005,7 +4987,7 @@ dependencies = [ "alloy-serde", "derive_more", "serde", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -4016,12 +4998,14 @@ checksum = "736381a95471d23e267263cfcee9e1d96d30b9754a94a2819148f83379de8a86" dependencies = [ "alloy-consensus", "alloy-eips", + "alloy-network", "alloy-primitives", "alloy-rlp", + "alloy-rpc-types-eth", "alloy-serde", "derive_more", "serde", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -4043,18 +5027,49 @@ dependencies = [ "alloy-rpc-types-eth", "alloy-signer", "op-alloy-consensus 0.22.4", - "op-alloy-rpc-types", + "op-alloy-rpc-types 0.22.4", ] [[package]] -name = "op-alloy-rpc-types" -version = "0.22.4" +name = "op-alloy-network" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562dd4462562c41f9fdc4d860858c40e14a25df7f983ae82047f15f08fce4d19" +checksum = "4034183dca6bff6632e7c24c92e75ff5f0eabb58144edb4d8241814851334d47" dependencies = [ "alloy-consensus", - "alloy-eips", - "alloy-network-primitives", + "alloy-network", + "alloy-primitives", + "alloy-provider", + "alloy-rpc-types-eth", + "alloy-signer", + "op-alloy-consensus 0.23.1", + "op-alloy-rpc-types 0.23.1", +] + +[[package]] +name = "op-alloy-provider" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6753d90efbaa8ea8bcb89c1737408ca85fa60d7adb875049d3f382c063666f86" +dependencies = [ + "alloy-network", + "alloy-primitives", + "alloy-provider", + "alloy-rpc-types-engine", + "alloy-transport", + "async-trait", + "op-alloy-rpc-types-engine", +] + +[[package]] +name = "op-alloy-rpc-types" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "562dd4462562c41f9fdc4d860858c40e14a25df7f983ae82047f15f08fce4d19" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-network-primitives", "alloy-primitives", "alloy-rpc-types-eth", "alloy-serde", @@ -4062,7 +5077,59 @@ dependencies = [ "op-alloy-consensus 0.22.4", "serde", "serde_json", - "thiserror", + "thiserror 2.0.18", +] + +[[package]] +name = "op-alloy-rpc-types" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd87c6b9e5b6eee8d6b76f41b04368dca0e9f38d83338e5b00e730c282098a4" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "derive_more", + "op-alloy-consensus 0.23.1", + "serde", + "serde_json", + "thiserror 2.0.18", +] + +[[package]] +name = "op-alloy-rpc-types-engine" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77727699310a18cdeed32da3928c709e2704043b6584ed416397d5da65694efc" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-engine", + "alloy-serde", + "derive_more", + "ethereum_ssz", + "ethereum_ssz_derive", + "op-alloy-consensus 0.23.1", + "serde", + "sha2", + "snap", + "thiserror 2.0.18", +] + +[[package]] +name = "op-revm" +version = "15.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79c92b75162c2ed1661849fa51683b11254a5b661798360a2c24be918edafd40" +dependencies = [ + "auto_impl", + "revm", + "serde", ] [[package]] @@ -4088,7 +5155,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -4135,7 +5202,7 @@ dependencies = [ "futures-sink", "js-sys", "pin-project-lite", - "thiserror", + "thiserror 2.0.18", "tracing", ] @@ -4163,6 +5230,18 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e" +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + [[package]] name = "parity-scale-codec" version = "3.7.5" @@ -4188,9 +5267,15 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + [[package]] name = "parking_lot" version = "0.12.5" @@ -4236,7 +5321,7 @@ dependencies = [ "regex", "regex-syntax", "structmeta", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -4281,6 +5366,49 @@ dependencies = [ "rustc_version 0.4.1", ] +[[package]] +name = "phf" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" +dependencies = [ + "phf_macros", + "phf_shared", + "serde", +] + +[[package]] +name = "phf_generator" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" +dependencies = [ + "fastrand", + "phf_shared", +] + +[[package]] +name = "phf_macros" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.115", +] + +[[package]] +name = "phf_shared" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" version = "1.1.10" @@ -4298,7 +5426,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -4372,6 +5500,32 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "predicates" +version = "3.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ada8f2932f28a27ee7b70dd6c1c39ea0675c55a36879ab92f3a715eaa1e63cfe" +dependencies = [ + "anstyle", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cad38746f3166b4031b1a0d39ad9f954dd291e7854fcc0eed52ee41a0b50d144" + +[[package]] +name = "predicates-tree" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0de1b847b39c8131db0467e9df1ff60e6d0562ab8e9a16e568ad0fdb372e2f2" +dependencies = [ + "predicates-core", + "termtree", +] + [[package]] name = "prettyplease" version = "0.2.37" @@ -4379,7 +5533,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.114", + "syn 2.0.115", +] + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", ] [[package]] @@ -4421,7 +5584,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -4488,6 +5651,61 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" +[[package]] +name = "quinn" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +dependencies = [ + "bytes", + "cfg_aliases", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls 0.23.36", + "socket2 0.6.2", + "thiserror 2.0.18", + "tokio", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-proto" +version = "0.11.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +dependencies = [ + "bytes", + "getrandom 0.3.4", + "lru-slab", + "rand 0.9.2", + "ring", + "rustc-hash", + "rustls 0.23.36", + "rustls-pki-types", + "slab", + "thiserror 2.0.18", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2 0.6.2", + "tracing", + "windows-sys 0.60.2", +] + [[package]] name = "quote" version = "1.0.44" @@ -4595,6 +5813,7 @@ version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84816e4c99c467e92cf984ee6328caa976dfecd33a673544489d79ca2caaefe5" dependencies = [ + "rand 0.9.2", "rustversion", ] @@ -4628,6 +5847,26 @@ dependencies = [ "bitflags 2.10.0", ] +[[package]] +name = "rayon" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "rdkafka" version = "0.37.0" @@ -4695,7 +5934,7 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ "getrandom 0.2.17", "libredox", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -4715,7 +5954,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -4766,6 +6005,7 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.8.1", + "hyper-rustls 0.27.7", "hyper-tls", "hyper-util", "js-sys", @@ -4773,20 +6013,994 @@ dependencies = [ "native-tls", "percent-encoding", "pin-project-lite", + "quinn", + "rustls 0.23.36", + "rustls-native-certs", "rustls-pki-types", "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-native-tls", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-native-tls", + "tokio-rustls 0.26.4", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "reth-chain-state" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "derive_more", + "metrics", + "parking_lot", + "pin-project", + "reth-chainspec", + "reth-errors", + "reth-ethereum-primitives", + "reth-execution-types", + "reth-metrics", + "reth-primitives-traits", + "reth-storage-api", + "reth-trie", + "revm-database", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "reth-chainspec" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-genesis", + "alloy-primitives", + "alloy-trie", + "auto_impl", + "derive_more", + "reth-ethereum-forks", + "reth-network-peers", + "reth-primitives-traits", + "serde_json", +] + +[[package]] +name = "reth-codecs" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-primitives", + "alloy-trie", + "bytes", + "modular-bitfield", + "op-alloy-consensus 0.23.1", + "reth-codecs-derive", + "reth-zstd-compressors", + "serde", +] + +[[package]] +name = "reth-codecs-derive" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.115", +] + +[[package]] +name = "reth-consensus" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "auto_impl", + "reth-execution-types", + "reth-primitives-traits", + "thiserror 2.0.18", +] + +[[package]] +name = "reth-consensus-common" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "reth-chainspec", + "reth-consensus", + "reth-primitives-traits", +] + +[[package]] +name = "reth-db-models" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "bytes", + "reth-primitives-traits", + "serde", +] + +[[package]] +name = "reth-errors" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "reth-consensus", + "reth-execution-errors", + "reth-storage-errors", + "thiserror 2.0.18", +] + +[[package]] +name = "reth-eth-wire-types" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-hardforks", + "alloy-primitives", + "alloy-rlp", + "bytes", + "derive_more", + "reth-chainspec", + "reth-codecs-derive", + "reth-ethereum-primitives", + "reth-primitives-traits", + "serde", + "thiserror 2.0.18", +] + +[[package]] +name = "reth-ethereum-forks" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-eip2124", + "alloy-hardforks", + "alloy-primitives", + "auto_impl", + "once_cell", + "rustc-hash", +] + +[[package]] +name = "reth-ethereum-primitives" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-eth", + "alloy-serde", + "reth-primitives-traits", + "reth-zstd-compressors", + "serde", + "serde_with", +] + +[[package]] +name = "reth-evm" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-primitives", + "auto_impl", + "derive_more", + "futures-util", + "rayon", + "reth-execution-errors", + "reth-execution-types", + "reth-primitives-traits", + "reth-storage-api", + "reth-storage-errors", + "reth-trie-common", + "revm", +] + +[[package]] +name = "reth-execution-errors" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-evm", + "alloy-primitives", + "alloy-rlp", + "nybbles", + "reth-storage-errors", + "thiserror 2.0.18", +] + +[[package]] +name = "reth-execution-types" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-primitives", + "derive_more", + "reth-ethereum-primitives", + "reth-primitives-traits", + "reth-trie-common", + "revm", + "serde", + "serde_with", +] + +[[package]] +name = "reth-fs-util" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "serde", + "serde_json", + "thiserror 2.0.18", +] + +[[package]] +name = "reth-metrics" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "metrics", + "metrics-derive", +] + +[[package]] +name = "reth-net-banlist" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-primitives", + "ipnet", +] + +[[package]] +name = "reth-network-api" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-rpc-types-admin", + "alloy-rpc-types-eth", + "auto_impl", + "derive_more", + "enr", + "futures", + "reth-eth-wire-types", + "reth-ethereum-forks", + "reth-network-p2p", + "reth-network-peers", + "reth-network-types", + "reth-tokio-util", + "thiserror 2.0.18", + "tokio", + "tokio-stream", +] + +[[package]] +name = "reth-network-p2p" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "auto_impl", + "derive_more", + "futures", + "reth-consensus", + "reth-eth-wire-types", + "reth-ethereum-primitives", + "reth-network-peers", + "reth-network-types", + "reth-primitives-traits", + "reth-storage-errors", + "tokio", + "tracing", +] + +[[package]] +name = "reth-network-peers" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "secp256k1 0.30.0", + "serde_with", + "thiserror 2.0.18", + "url", +] + +[[package]] +name = "reth-network-types" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-eip2124", + "reth-net-banlist", + "reth-network-peers", + "serde_json", + "tracing", +] + +[[package]] +name = "reth-optimism-chainspec" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-hardforks", + "alloy-primitives", + "derive_more", + "miniz_oxide", + "op-alloy-consensus 0.23.1", + "op-alloy-rpc-types 0.23.1", + "reth-chainspec", + "reth-ethereum-forks", + "reth-network-peers", + "reth-optimism-forks", + "reth-optimism-primitives", + "reth-primitives-traits", + "serde", + "serde_json", + "thiserror 2.0.18", +] + +[[package]] +name = "reth-optimism-consensus" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-trie", + "reth-chainspec", + "reth-consensus", + "reth-consensus-common", + "reth-execution-types", + "reth-optimism-chainspec", + "reth-optimism-forks", + "reth-optimism-primitives", + "reth-primitives-traits", + "reth-storage-api", + "reth-storage-errors", + "reth-trie-common", + "revm", + "thiserror 2.0.18", + "tracing", +] + +[[package]] +name = "reth-optimism-evm" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-op-evm", + "alloy-primitives", + "op-alloy-consensus 0.23.1", + "op-alloy-rpc-types-engine", + "op-revm", + "reth-chainspec", + "reth-evm", + "reth-execution-errors", + "reth-execution-types", + "reth-optimism-chainspec", + "reth-optimism-consensus", + "reth-optimism-forks", + "reth-optimism-primitives", + "reth-primitives-traits", + "reth-storage-errors", + "revm", + "thiserror 2.0.18", +] + +[[package]] +name = "reth-optimism-forks" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-op-hardforks", + "alloy-primitives", + "once_cell", + "reth-ethereum-forks", +] + +[[package]] +name = "reth-optimism-primitives" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "op-alloy-consensus 0.23.1", + "reth-primitives-traits", + "serde", + "serde_with", +] + +[[package]] +name = "reth-primitives-traits" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-eth", + "alloy-trie", + "auto_impl", + "bytes", + "derive_more", + "once_cell", + "op-alloy-consensus 0.23.1", + "reth-codecs", + "revm-bytecode", + "revm-primitives", + "revm-state", + "secp256k1 0.30.0", + "serde", + "serde_with", + "thiserror 2.0.18", +] + +[[package]] +name = "reth-prune-types" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-primitives", + "derive_more", + "serde", + "strum 0.27.2", + "thiserror 2.0.18", +] + +[[package]] +name = "reth-revm" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-primitives", + "reth-primitives-traits", + "reth-storage-api", + "reth-storage-errors", + "revm", +] + +[[package]] +name = "reth-rpc-convert" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-evm", + "alloy-json-rpc", + "alloy-network", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-signer", + "auto_impl", + "dyn-clone", + "jsonrpsee-types", + "reth-ethereum-primitives", + "reth-evm", + "reth-primitives-traits", + "thiserror 2.0.18", +] + +[[package]] +name = "reth-rpc-eth-types" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-evm", + "alloy-network", + "alloy-primitives", + "alloy-rpc-client", + "alloy-rpc-types-eth", + "alloy-sol-types", + "alloy-transport", + "derive_more", + "futures", + "itertools 0.14.0", + "jsonrpsee-core", + "jsonrpsee-types", + "metrics", + "rand 0.9.2", + "reqwest", + "reth-chain-state", + "reth-chainspec", + "reth-errors", + "reth-ethereum-primitives", + "reth-evm", + "reth-execution-types", + "reth-metrics", + "reth-primitives-traits", + "reth-revm", + "reth-rpc-convert", + "reth-rpc-server-types", + "reth-storage-api", + "reth-tasks", + "reth-transaction-pool", + "reth-trie", + "revm", + "revm-inspectors", + "schnellru", + "serde", + "thiserror 2.0.18", + "tokio", + "tokio-stream", + "tracing", + "url", +] + +[[package]] +name = "reth-rpc-server-types" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "jsonrpsee-core", + "jsonrpsee-types", + "reth-errors", + "reth-network-api", + "serde", + "strum 0.27.2", +] + +[[package]] +name = "reth-stages-types" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-primitives", + "bytes", + "reth-trie-common", + "serde", +] + +[[package]] +name = "reth-static-file-types" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-primitives", + "derive_more", + "fixed-map", + "serde", + "strum 0.27.2", +] + +[[package]] +name = "reth-storage-api" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rpc-types-engine", + "auto_impl", + "reth-chainspec", + "reth-db-models", + "reth-ethereum-primitives", + "reth-execution-types", + "reth-primitives-traits", + "reth-prune-types", + "reth-stages-types", + "reth-storage-errors", + "reth-trie-common", + "revm-database", + "serde_json", +] + +[[package]] +name = "reth-storage-errors" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "derive_more", + "reth-primitives-traits", + "reth-prune-types", + "reth-static-file-types", + "revm-database-interface", + "revm-state", + "thiserror 2.0.18", +] + +[[package]] +name = "reth-tasks" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "auto_impl", + "dyn-clone", + "futures-util", + "metrics", + "reth-metrics", + "thiserror 2.0.18", + "tokio", + "tracing", + "tracing-futures", +] + +[[package]] +name = "reth-tokio-util" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "reth-transaction-pool" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "aquamarine", + "auto_impl", + "bitflags 2.10.0", + "futures-util", + "metrics", + "parking_lot", + "pin-project", + "reth-chain-state", + "reth-chainspec", + "reth-eth-wire-types", + "reth-ethereum-primitives", + "reth-execution-types", + "reth-fs-util", + "reth-metrics", + "reth-primitives-traits", + "reth-storage-api", + "reth-tasks", + "revm-interpreter", + "revm-primitives", + "rustc-hash", + "schnellru", + "serde", + "serde_json", + "smallvec", + "thiserror 2.0.18", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "reth-trie" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-trie", + "auto_impl", + "itertools 0.14.0", + "reth-execution-errors", + "reth-primitives-traits", + "reth-stages-types", + "reth-storage-errors", + "reth-trie-common", + "reth-trie-sparse", + "revm-database", + "tracing", +] + +[[package]] +name = "reth-trie-common" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-trie", + "arrayvec", + "bytes", + "derive_more", + "itertools 0.14.0", + "nybbles", + "rayon", + "reth-primitives-traits", + "revm-database", + "serde", + "serde_with", +] + +[[package]] +name = "reth-trie-sparse" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "alloy-trie", + "auto_impl", + "reth-execution-errors", + "reth-primitives-traits", + "reth-trie-common", + "smallvec", + "tracing", +] + +[[package]] +name = "reth-zstd-compressors" +version = "1.10.2" +source = "git+https://github.com/paradigmxyz/reth?tag=v1.10.2#8e3b5e6a99439561b73c5dd31bd3eced2e994d60" +dependencies = [ + "zstd", +] + +[[package]] +name = "revm" +version = "34.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2aabdebaa535b3575231a88d72b642897ae8106cf6b0d12eafc6bfdf50abfc7" +dependencies = [ + "revm-bytecode", + "revm-context", + "revm-context-interface", + "revm-database", + "revm-database-interface", + "revm-handler", + "revm-inspector", + "revm-interpreter", + "revm-precompile", + "revm-primitives", + "revm-state", +] + +[[package]] +name = "revm-bytecode" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d1e5c1eaa44d39d537f668bc5c3409dc01e5c8be954da6c83370bbdf006457" +dependencies = [ + "bitvec", + "phf", + "revm-primitives", + "serde", +] + +[[package]] +name = "revm-context" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "892ff3e6a566cf8d72ffb627fdced3becebbd9ba64089c25975b9b028af326a5" +dependencies = [ + "bitvec", + "cfg-if", + "derive-where", + "revm-bytecode", + "revm-context-interface", + "revm-database-interface", + "revm-primitives", + "revm-state", + "serde", +] + +[[package]] +name = "revm-context-interface" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57f61cc6d23678c4840af895b19f8acfbbd546142ec8028b6526c53cc1c16c98" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702", + "auto_impl", + "either", + "revm-database-interface", + "revm-primitives", + "revm-state", + "serde", +] + +[[package]] +name = "revm-database" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "529528d0b05fe646be86223032c3e77aa8b05caa2a35447d538c55965956a511" +dependencies = [ + "alloy-eips", + "revm-bytecode", + "revm-database-interface", + "revm-primitives", + "revm-state", + "serde", +] + +[[package]] +name = "revm-database-interface" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7bf93ac5b91347c057610c0d96e923db8c62807e03f036762d03e981feddc1d" +dependencies = [ + "auto_impl", + "either", + "revm-primitives", + "revm-state", + "serde", + "thiserror 2.0.18", +] + +[[package]] +name = "revm-handler" +version = "15.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cd0e43e815a85eded249df886c4badec869195e70cdd808a13cfca2794622d2" +dependencies = [ + "auto_impl", + "derive-where", + "revm-bytecode", + "revm-context", + "revm-context-interface", + "revm-database-interface", + "revm-interpreter", + "revm-precompile", + "revm-primitives", + "revm-state", + "serde", +] + +[[package]] +name = "revm-inspector" +version = "15.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3ccad59db91ef93696536a0dbaf2f6f17cfe20d4d8843ae118edb7e97947ef" +dependencies = [ + "auto_impl", + "either", + "revm-context", + "revm-database-interface", + "revm-handler", + "revm-interpreter", + "revm-primitives", + "revm-state", + "serde", + "serde_json", +] + +[[package]] +name = "revm-inspectors" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e435414e9de50a1b930da602067c76365fea2fea11e80ceb50783c94ddd127f" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-rpc-types-trace", + "alloy-sol-types", + "anstyle", + "colorchoice", + "revm", + "serde", + "serde_json", + "thiserror 2.0.18", +] + +[[package]] +name = "revm-interpreter" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11406408597bc249392d39295831c4b641b3a6f5c471a7c41104a7a1e3564c07" +dependencies = [ + "revm-bytecode", + "revm-context-interface", + "revm-primitives", + "revm-state", + "serde", +] + +[[package]] +name = "revm-precompile" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c1285c848d240678bf69cb0f6179ff5a4aee6fc8e921d89708087197a0aff3" +dependencies = [ + "ark-bls12-381", + "ark-bn254", + "ark-ec", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", + "arrayref", + "aurora-engine-modexp", + "c-kzg", + "cfg-if", + "k256", + "p256", + "revm-primitives", + "ripemd", + "secp256k1 0.31.1", + "sha2", +] + +[[package]] +name = "revm-primitives" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba580c56a8ec824a64f8a1683577876c2e1dbe5247044199e9b881421ad5dcf9" +dependencies = [ + "alloy-primitives", + "num_enum", + "once_cell", + "serde", +] + +[[package]] +name = "revm-state" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "311720d4f0f239b041375e7ddafdbd20032a33b7bae718562ea188e188ed9fd3" +dependencies = [ + "alloy-eip7928", + "bitflags 2.10.0", + "revm-bytecode", + "revm-primitives", + "serde", ] [[package]] @@ -4813,6 +7027,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "ripemd" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "rlp" version = "0.5.2" @@ -4823,6 +7046,12 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "route-recognizer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" + [[package]] name = "ruint" version = "1.17.2" @@ -4862,6 +7091,9 @@ name = "rustc-hash" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" +dependencies = [ + "rand 0.8.5", +] [[package]] name = "rustc-hex" @@ -4932,6 +7164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" dependencies = [ "aws-lc-rs", + "log", "once_cell", "ring", "rustls-pki-types", @@ -4967,9 +7200,37 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" dependencies = [ + "web-time", "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.36", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki 0.103.9", + "security-framework 3.5.1", + "security-framework-sys", + "webpki-root-certs 0.26.11", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -5016,6 +7277,15 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "schannel" version = "0.1.28" @@ -5049,6 +7319,17 @@ dependencies = [ "serde_json", ] +[[package]] +name = "schnellru" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "356285bbf17bea63d9e52e96bd18f039672ac92b55b8cb997d6162a2a37d1649" +dependencies = [ + "ahash", + "cfg-if", + "hashbrown 0.13.2", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -5088,10 +7369,21 @@ checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ "bitcoin_hashes", "rand 0.8.5", - "secp256k1-sys", + "secp256k1-sys 0.10.1", "serde", ] +[[package]] +name = "secp256k1" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2" +dependencies = [ + "bitcoin_hashes", + "rand 0.9.2", + "secp256k1-sys 0.11.0", +] + [[package]] name = "secp256k1-sys" version = "0.10.1" @@ -5101,6 +7393,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -5194,7 +7495,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -5203,6 +7504,7 @@ version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ + "indexmap 2.13.0", "itoa", "memchr", "serde", @@ -5210,6 +7512,17 @@ dependencies = [ "zmij", ] +[[package]] +name = "serde_path_to_error" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" +dependencies = [ + "itoa", + "serde", + "serde_core", +] + [[package]] name = "serde_repr" version = "0.1.20" @@ -5218,7 +7531,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -5261,7 +7574,7 @@ dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -5364,7 +7677,7 @@ dependencies = [ "cadence", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.3.22", ] [[package]] @@ -5376,7 +7689,7 @@ dependencies = [ "sidecrush", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.3.22", ] [[package]] @@ -5434,10 +7747,16 @@ checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 2.0.18", "time", ] +[[package]] +name = "siphasher" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" + [[package]] name = "sketches-ddsketch" version = "0.3.0" @@ -5459,6 +7778,12 @@ dependencies = [ "serde", ] +[[package]] +name = "snap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" + [[package]] name = "socket2" version = "0.5.10" @@ -5479,6 +7804,22 @@ dependencies = [ "windows-sys 0.60.2", ] +[[package]] +name = "soketto" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e859df029d160cb88608f5d7df7fb4753fd20fdfb4de5644f3d8b8440841721" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures", + "http 1.4.0", + "httparse", + "log", + "rand 0.8.5", + "sha1", +] + [[package]] name = "spki" version = "0.7.3" @@ -5516,7 +7857,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -5527,7 +7868,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -5558,7 +7899,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -5570,7 +7911,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -5592,9 +7933,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.114" +version = "2.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" +checksum = "6e614ed320ac28113fa64972c4262d5dbc89deacdfd00c34a3e4cea073243c12" dependencies = [ "proc-macro2", "quote", @@ -5610,7 +7951,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -5630,9 +7971,15 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + [[package]] name = "tap" version = "1.0.1" @@ -5652,6 +7999,12 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "termtree" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" + [[package]] name = "testcontainers" version = "0.23.3" @@ -5673,7 +8026,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 2.0.18", "tokio", "tokio-stream", "tokio-tar", @@ -5690,13 +8043,33 @@ dependencies = [ "testcontainers", ] +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + [[package]] name = "thiserror" version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl", + "thiserror-impl 2.0.18", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.115", ] [[package]] @@ -5707,7 +8080,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -5783,6 +8156,21 @@ dependencies = [ "zerovec", ] +[[package]] +name = "tinyvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "tokio" version = "1.49.0" @@ -5808,7 +8196,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -5894,6 +8282,7 @@ checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" dependencies = [ "bytes", "futures-core", + "futures-io", "futures-sink", "pin-project-lite", "tokio", @@ -5993,7 +8382,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6006,6 +8395,16 @@ dependencies = [ "valuable", ] +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + [[package]] name = "tracing-log" version = "0.2.0" @@ -6029,7 +8428,7 @@ dependencies = [ "tracing", "tracing-core", "tracing-log", - "tracing-subscriber", + "tracing-subscriber 0.3.22", "web-time", ] @@ -6043,6 +8442,15 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-subscriber" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" +dependencies = [ + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.3.22" @@ -6084,7 +8492,7 @@ dependencies = [ "rustls 0.23.36", "rustls-pki-types", "sha1", - "thiserror", + "thiserror 2.0.18", "utf-8", ] @@ -6202,6 +8610,12 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "utils" version = "0.0.0" @@ -6210,7 +8624,7 @@ dependencies = [ "metrics-exporter-prometheus", "serde_json", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.3.22", ] [[package]] @@ -6259,6 +8673,16 @@ dependencies = [ "libc", ] +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -6338,7 +8762,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "wasm-bindgen-shared", ] @@ -6419,6 +8843,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-root-certs" +version = "0.26.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e" +dependencies = [ + "webpki-root-certs 1.0.6", +] + +[[package]] +name = "webpki-root-certs" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804f18a4ac2676ffb4e8b5b5fa9ae38af06df08162314f96a68d2a363e21a8ca" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webpki-roots" version = "0.26.11" @@ -6459,6 +8901,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -6486,7 +8937,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6497,7 +8948,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6524,6 +8975,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -6569,6 +9029,21 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -6617,6 +9092,12 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -6635,6 +9116,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -6653,6 +9140,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -6683,6 +9176,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -6701,6 +9200,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -6719,6 +9224,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -6737,6 +9248,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -6764,6 +9281,29 @@ dependencies = [ "memchr", ] +[[package]] +name = "wiremock" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08db1edfb05d9b3c1542e521aea074442088292f00b5f28e435c714a98f85031" +dependencies = [ + "assert-json-diff", + "base64 0.22.1", + "deadpool", + "futures", + "http 1.4.0", + "http-body-util", + "hyper 1.8.1", + "hyper-util", + "log", + "once_cell", + "regex", + "serde", + "serde_json", + "tokio", + "url", +] + [[package]] name = "wit-bindgen" version = "0.51.0" @@ -6794,7 +9334,7 @@ dependencies = [ "heck", "indexmap 2.13.0", "prettyplease", - "syn 2.0.114", + "syn 2.0.115", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -6810,7 +9350,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -6871,7 +9411,7 @@ dependencies = [ "pharos", "rustc_version 0.4.1", "send_wrapper", - "thiserror", + "thiserror 2.0.18", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -6938,7 +9478,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] @@ -6959,7 +9499,7 @@ checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6979,7 +9519,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] @@ -7000,7 +9540,7 @@ checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -7033,14 +9573,32 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] name = "zmij" -version = "1.0.20" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" + +[[package]] +name = "zstd" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de98dfa5d5b7fef4ee834d0073d560c9ca7b6c46a71d058c48db7960f8cfaf7" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" +dependencies = [ + "zstd-sys", +] [[package]] name = "zstd-sys" diff --git a/Cargo.toml b/Cargo.toml index 2684429..42c5ccd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,6 +56,7 @@ basectl-cli = { path = "crates/basectl" } mempool-rebroadcaster = { path = "crates/mempool-rebroadcaster" } sidecrush = { path = "crates/sidecrush" } utils = { path = "crates/utils" } +ingress-rpc = { path = "crates/ingress-rpc" } # base-reth base-bundles = { git = "https://github.com/base/base", branch = "main" } diff --git a/bin/tips-ingress-rpc/Cargo.toml b/bin/ingress-rpc/Cargo.toml similarity index 66% rename from bin/tips-ingress-rpc/Cargo.toml rename to bin/ingress-rpc/Cargo.toml index f3b2697..e7155c3 100644 --- a/bin/tips-ingress-rpc/Cargo.toml +++ b/bin/ingress-rpc/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "tips-ingress-rpc" +name = "ingress-rpc-bin" version.workspace = true rust-version.workspace = true license.workspace = true @@ -7,11 +7,19 @@ homepage.workspace = true repository.workspace = true edition.workspace = true +[lints] +workspace = true + +[[bin]] +name = "ingress-rpc" +path = "src/main.rs" + + [dependencies] -tips-core.workspace = true -tips-audit-lib.workspace = true -tips-ingress-rpc-lib.workspace = true -account-abstraction-core.workspace = true +utils.workspace = true +base-bundles.workspace = true +audit.workspace = true +ingress-rpc.workspace = true clap.workspace = true tokio.workspace = true anyhow.workspace = true diff --git a/bin/tips-ingress-rpc/src/main.rs b/bin/ingress-rpc/src/main.rs similarity index 63% rename from bin/tips-ingress-rpc/src/main.rs rename to bin/ingress-rpc/src/main.rs index dcb22c2..85a52fe 100644 --- a/bin/tips-ingress-rpc/src/main.rs +++ b/bin/ingress-rpc/src/main.rs @@ -1,22 +1,22 @@ -use account_abstraction_core::create_mempool_engine; use alloy_provider::ProviderBuilder; +use audit::{BundleEvent, KafkaBundleEventPublisher, connect_audit_to_publisher}; +use base_bundles::{AcceptedBundle, MeterBundleResponse}; use clap::Parser; +use ingress_rpc::{ + Config, connect_ingress_to_builder, + health::bind_health_server, + queue::KafkaMessageQueue, + service::{IngressApiServer, IngressService, Providers}, +}; use jsonrpsee::server::Server; use op_alloy_network::Optimism; -use rdkafka::ClientConfig; -use rdkafka::producer::FutureProducer; -use tips_audit_lib::{BundleEvent, KafkaBundleEventPublisher, connect_audit_to_publisher}; -use tips_core::kafka::load_kafka_config_from_file; -use tips_core::logger::init_logger_with_format; -use tips_core::metrics::init_prometheus_exporter; -use tips_core::{AcceptedBundle, MeterBundleResponse}; -use tips_ingress_rpc_lib::Config; -use tips_ingress_rpc_lib::connect_ingress_to_builder; -use tips_ingress_rpc_lib::health::bind_health_server; -use tips_ingress_rpc_lib::queue::KafkaMessageQueue; -use tips_ingress_rpc_lib::service::{IngressApiServer, IngressService, Providers}; +use rdkafka::{ClientConfig, producer::FutureProducer}; use tokio::sync::{broadcast, mpsc}; use tracing::info; +use utils::{ + kafka::load_kafka_config_from_file, logger::init_logger_with_format, + metrics::init_prometheus_exporter, +}; #[tokio::main] async fn main() -> anyhow::Result<()> { @@ -56,9 +56,8 @@ async fn main() -> anyhow::Result<()> { }), }; - let ingress_client_config = ClientConfig::from_iter(load_kafka_config_from_file( - &config.ingress_kafka_properties, - )?); + let ingress_client_config = + ClientConfig::from_iter(load_kafka_config_from_file(&config.ingress_kafka_properties)?); let queue_producer: FutureProducer = ingress_client_config.create()?; @@ -73,29 +72,6 @@ async fn main() -> anyhow::Result<()> { let (audit_tx, audit_rx) = mpsc::unbounded_channel::(); connect_audit_to_publisher(audit_rx, audit_publisher); - let (mempool_engine, mempool_engine_handle) = if let Some(user_op_properties_file) = - &config.user_operation_consumer_properties - { - let engine = create_mempool_engine( - user_op_properties_file, - &config.user_operation_topic, - &config.user_operation_consumer_group_id, - None, - )?; - - let handle = { - let engine_clone = engine.clone(); - tokio::spawn(async move { engine_clone.run().await }) - }; - - (Some(engine), Some(handle)) - } else { - info!( - "User operation consumer properties not provided, skipping mempool engine initialization" - ); - (None, None) - }; - let (builder_tx, _) = broadcast::channel::(config.max_buffered_meter_bundle_responses); let (builder_backrun_tx, _) = @@ -113,15 +89,8 @@ async fn main() -> anyhow::Result<()> { address = %bound_health_addr ); - let service = IngressService::new( - providers, - queue, - audit_tx, - builder_tx, - builder_backrun_tx, - mempool_engine.clone(), - cfg, - ); + let service = + IngressService::new(providers, queue, audit_tx, builder_tx, builder_backrun_tx, cfg); let bind_addr = format!("{}:{}", config.address, config.port); let server = Server::builder().build(&bind_addr).await?; @@ -135,9 +104,6 @@ async fn main() -> anyhow::Result<()> { handle.stopped().await; health_handle.abort(); - if let Some(engine_handle) = mempool_engine_handle { - engine_handle.abort(); - } Ok(()) } diff --git a/crates/ingress-rpc/Cargo.toml b/crates/ingress-rpc/Cargo.toml index 75e30e0..5d4a62a 100644 --- a/crates/ingress-rpc/Cargo.toml +++ b/crates/ingress-rpc/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "tips-ingress-rpc-lib" +name = "ingress-rpc" version.workspace = true rust-version.workspace = true license.workspace = true @@ -9,17 +9,15 @@ edition.workspace = true [dependencies] url.workspace = true -tips-core.workspace = true +utils.workspace = true op-revm.workspace = true metrics.workspace = true -dotenvy.workspace = true -tips-audit-lib.workspace = true +audit.workspace = true async-trait.workspace = true metrics-derive.workspace = true op-alloy-network.workspace = true alloy-signer-local.workspace = true base-reth-rpc-types.workspace = true -account-abstraction-core.workspace = true alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] } tokio = { workspace = true, features = ["full"] } tracing = { workspace = true, features = ["std"] } @@ -35,6 +33,7 @@ clap = { version = "4.5.47", features = ["std", "derive", "env"] } op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] } moka = { workspace = true, features = ["future"] } uuid = { workspace = true, features = ["v5"] } +base-bundles = { workspace = true } [dev-dependencies] mockall = "0.13" diff --git a/crates/ingress-rpc/src/health.rs b/crates/ingress-rpc/src/health.rs index 314fc49..718104e 100644 --- a/crates/ingress-rpc/src/health.rs +++ b/crates/ingress-rpc/src/health.rs @@ -1,5 +1,6 @@ -use axum::{Router, http::StatusCode, response::IntoResponse, routing::get}; use std::net::SocketAddr; + +use axum::{Router, http::StatusCode, response::IntoResponse, routing::get}; use tracing::info; /// Health check handler that always returns 200 OK diff --git a/crates/ingress-rpc/src/lib.rs b/crates/ingress-rpc/src/lib.rs index ea304c6..13a1fb7 100644 --- a/crates/ingress-rpc/src/lib.rs +++ b/crates/ingress-rpc/src/lib.rs @@ -3,13 +3,16 @@ pub mod metrics; pub mod queue; pub mod service; pub mod validation; +use std::{ + net::{IpAddr, SocketAddr}, + str::FromStr, +}; + use alloy_primitives::TxHash; use alloy_provider::{Provider, ProviderBuilder, RootProvider}; +use base_bundles::{AcceptedBundle, MeterBundleResponse}; use clap::Parser; use op_alloy_network::Optimism; -use std::net::{IpAddr, SocketAddr}; -use std::str::FromStr; -use tips_core::{AcceptedBundle, MeterBundleResponse}; use tokio::sync::broadcast; use tracing::{error, warn}; use url::Url; @@ -54,11 +57,7 @@ pub struct Config { pub mempool_url: Url, /// Method to submit transactions to the mempool - #[arg( - long, - env = "TIPS_INGRESS_TX_SUBMISSION_METHOD", - default_value = "mempool" - )] + #[arg(long, env = "TIPS_INGRESS_TX_SUBMISSION_METHOD", default_value = "mempool")] pub tx_submission_method: TxSubmissionMethod, /// Kafka brokers for publishing mempool events @@ -66,11 +65,7 @@ pub struct Config { pub ingress_kafka_properties: String, /// Kafka topic for queuing transactions before the DB Writer - #[arg( - long, - env = "TIPS_INGRESS_KAFKA_INGRESS_TOPIC", - default_value = "tips-ingress" - )] + #[arg(long, env = "TIPS_INGRESS_KAFKA_INGRESS_TOPIC", default_value = "tips-ingress")] pub ingress_topic: String, /// Kafka properties file for audit events @@ -78,41 +73,14 @@ pub struct Config { pub audit_kafka_properties: String, /// Kafka topic for audit events - #[arg( - long, - env = "TIPS_INGRESS_KAFKA_AUDIT_TOPIC", - default_value = "tips-audit" - )] + #[arg(long, env = "TIPS_INGRESS_KAFKA_AUDIT_TOPIC", default_value = "tips-audit")] pub audit_topic: String, - /// Kafka properties file for the user operation consumer - #[arg( - long, - env = "TIPS_INGRESS_KAFKA_USER_OPERATION_CONSUMER_PROPERTIES_FILE" - )] - pub user_operation_consumer_properties: Option, - - /// Consumer group id for user operation topic (set uniquely per deployment) - #[arg( - long, - env = "TIPS_INGRESS_KAFKA_USER_OPERATION_CONSUMER_GROUP_ID", - default_value = "tips-user-operation" - )] - pub user_operation_consumer_group_id: String, - - /// User operation topic for pushing valid user operations - #[arg( - long, - env = "TIPS_INGRESS_KAFKA_USER_OPERATION_TOPIC", - default_value = "tips-user-operation" - )] - pub user_operation_topic: String, - #[arg(long, env = "TIPS_INGRESS_LOG_LEVEL", default_value = "info")] pub log_level: String, #[arg(long, env = "TIPS_INGRESS_LOG_FORMAT", default_value = "pretty")] - pub log_format: tips_core::logger::LogFormat, + pub log_format: utils::logger::LogFormat, /// Default lifetime for sent transactions in seconds (default: 3 hours) #[arg( @@ -127,62 +95,31 @@ pub struct Config { pub simulation_rpc: Url, /// Port to bind the Prometheus metrics server to - #[arg( - long, - env = "TIPS_INGRESS_METRICS_ADDR", - default_value = "0.0.0.0:9002" - )] + #[arg(long, env = "TIPS_INGRESS_METRICS_ADDR", default_value = "0.0.0.0:9002")] pub metrics_addr: SocketAddr, /// Configurable block time in milliseconds (default: 2000 milliseconds) - #[arg( - long, - env = "TIPS_INGRESS_BLOCK_TIME_MILLISECONDS", - default_value = "2000" - )] + #[arg(long, env = "TIPS_INGRESS_BLOCK_TIME_MILLISECONDS", default_value = "2000")] pub block_time_milliseconds: u64, /// Timeout for bundle metering in milliseconds (default: 2000 milliseconds) - #[arg( - long, - env = "TIPS_INGRESS_METER_BUNDLE_TIMEOUT_MS", - default_value = "2000" - )] + #[arg(long, env = "TIPS_INGRESS_METER_BUNDLE_TIMEOUT_MS", default_value = "2000")] pub meter_bundle_timeout_ms: u64, - #[arg( - long, - env = "TIPS_INGRESS_VALIDATE_USER_OPERATION_TIMEOUT_MS", - default_value = "2000" - )] - pub validate_user_operation_timeout_ms: u64, - /// URLs of the builder RPC service for setting metering information #[arg(long, env = "TIPS_INGRESS_BUILDER_RPCS", value_delimiter = ',')] pub builder_rpcs: Vec, /// Maximum number of `MeterBundleResponse`s to buffer in memory - #[arg( - long, - env = "TIPS_INGRESS_MAX_BUFFERED_METER_BUNDLE_RESPONSES", - default_value = "100" - )] + #[arg(long, env = "TIPS_INGRESS_MAX_BUFFERED_METER_BUNDLE_RESPONSES", default_value = "100")] pub max_buffered_meter_bundle_responses: usize, /// Maximum number of backrun bundles to buffer in memory - #[arg( - long, - env = "TIPS_INGRESS_MAX_BUFFERED_BACKRUN_BUNDLES", - default_value = "100" - )] + #[arg(long, env = "TIPS_INGRESS_MAX_BUFFERED_BACKRUN_BUNDLES", default_value = "100")] pub max_buffered_backrun_bundles: usize, /// Address to bind the health check server to - #[arg( - long, - env = "TIPS_INGRESS_HEALTH_CHECK_ADDR", - default_value = "0.0.0.0:8081" - )] + #[arg(long, env = "TIPS_INGRESS_HEALTH_CHECK_ADDR", default_value = "0.0.0.0:8081")] pub health_check_addr: SocketAddr, /// chain id diff --git a/crates/ingress-rpc/src/queue.rs b/crates/ingress-rpc/src/queue.rs index cd227a0..a695eaa 100644 --- a/crates/ingress-rpc/src/queue.rs +++ b/crates/ingress-rpc/src/queue.rs @@ -1,14 +1,11 @@ -use account_abstraction_core::{ - MempoolEvent, - domain::types::{VersionedUserOperation, WrappedUserOperation}, -}; +use std::sync::Arc; + use alloy_primitives::B256; use anyhow::Result; use async_trait::async_trait; use backon::{ExponentialBuilder, Retryable}; +use base_bundles::AcceptedBundle; use rdkafka::producer::{FutureProducer, FutureRecord}; -use std::sync::Arc; -use tips_core::AcceptedBundle; use tokio::time::Duration; use tracing::{error, info}; @@ -70,39 +67,6 @@ impl MessageQueue for KafkaMessageQueue { } } -pub struct UserOpQueuePublisher { - queue: Arc, - topic: String, -} - -impl UserOpQueuePublisher { - pub fn new(queue: Arc, topic: String) -> Self { - Self { queue, topic } - } - - pub async fn publish(&self, user_op: &VersionedUserOperation, hash: &B256) -> Result<()> { - let key = hash.to_string(); - let event = self.create_user_op_added_event(user_op, hash); - let payload = serde_json::to_vec(&event)?; - self.queue.publish(&self.topic, &key, &payload).await - } - - fn create_user_op_added_event( - &self, - user_op: &VersionedUserOperation, - hash: &B256, - ) -> MempoolEvent { - let wrapped_user_op = WrappedUserOperation { - operation: user_op.clone(), - hash: *hash, - }; - - MempoolEvent::UserOpAdded { - user_op: wrapped_user_op, - } - } -} - pub struct BundleQueuePublisher { queue: Arc, topic: String, @@ -122,13 +86,13 @@ impl BundleQueuePublisher { #[cfg(test)] mod tests { - use super::*; + use audit::test_utils::create_test_meter_bundle_response; + use base_bundles::{AcceptedBundle, Bundle, BundleExtensions}; use rdkafka::config::ClientConfig; - use tips_core::{ - AcceptedBundle, Bundle, BundleExtensions, test_utils::create_test_meter_bundle_response, - }; use tokio::time::{Duration, Instant}; + use super::*; + fn create_test_bundle() -> Bundle { Bundle::default() } @@ -144,10 +108,8 @@ mod tests { let publisher = KafkaMessageQueue::new(producer); let bundle = create_test_bundle(); - let accepted_bundle = AcceptedBundle::new( - bundle.try_into().unwrap(), - create_test_meter_bundle_response(), - ); + let accepted_bundle = + AcceptedBundle::new(bundle.try_into().unwrap(), create_test_meter_bundle_response()); let bundle_hash = &accepted_bundle.bundle_hash(); let start = Instant::now(); diff --git a/crates/ingress-rpc/src/service.rs b/crates/ingress-rpc/src/service.rs index 1e276a4..0809cbd 100644 --- a/crates/ingress-rpc/src/service.rs +++ b/crates/ingress-rpc/src/service.rs @@ -1,12 +1,19 @@ -use account_abstraction_core::domain::ReputationService; -use account_abstraction_core::infrastructure::base_node::validator::BaseNodeValidator; -use account_abstraction_core::services::ReputationServiceImpl; -use account_abstraction_core::services::interfaces::user_op_validator::UserOperationValidator; -use account_abstraction_core::{Mempool, MempoolEngine}; -use alloy_consensus::transaction::Recovered; -use alloy_consensus::{Transaction, transaction::SignerRecoverable}; -use alloy_primitives::{Address, B256, Bytes, FixedBytes}; +use std::{ + sync::Arc, + time::{SystemTime, UNIX_EPOCH}, +}; + +use alloy_consensus::{ + Transaction, + transaction::{Recovered, SignerRecoverable}, +}; +use alloy_primitives::{B256, Bytes}; use alloy_provider::{Provider, RootProvider, network::eip2718::Decodable2718}; +use audit::BundleEvent; +use base_bundles::{ + AcceptedBundle, Bundle, BundleExtensions, BundleHash, CancelBundle, MeterBundleResponse, + ParsedBundle, +}; use base_reth_rpc_types::EthApiError; use jsonrpsee::{ core::{RpcResult, async_trait}, @@ -15,23 +22,18 @@ use jsonrpsee::{ use moka::future::Cache; use op_alloy_consensus::OpTxEnvelope; use op_alloy_network::Optimism; -use std::time::{SystemTime, UNIX_EPOCH}; -use tips_audit_lib::BundleEvent; -use tips_core::types::ParsedBundle; -use tips_core::{ - AcceptedBundle, Bundle, BundleExtensions, BundleHash, CancelBundle, MeterBundleResponse, +use tokio::{ + sync::{broadcast, mpsc}, + time::{Duration, Instant, timeout}, }; -use tokio::sync::{broadcast, mpsc}; -use tokio::time::{Duration, Instant, timeout}; use tracing::{debug, info, warn}; -use crate::metrics::{Metrics, record_histogram}; -use crate::queue::{BundleQueuePublisher, MessageQueue, UserOpQueuePublisher}; -use crate::validation::validate_bundle; -use crate::{Config, TxSubmissionMethod}; -use account_abstraction_core::domain::entrypoints::version::EntryPointVersion; -use account_abstraction_core::domain::types::{UserOperationRequest, VersionedUserOperation}; -use std::sync::Arc; +use crate::{ + Config, TxSubmissionMethod, + metrics::{Metrics, record_histogram}, + queue::{BundleQueuePublisher, MessageQueue}, + validation::validate_bundle, +}; /// RPC providers for different endpoints pub struct Providers { @@ -56,25 +58,14 @@ pub trait IngressApi { /// Handler for: `eth_sendRawTransaction` #[method(name = "sendRawTransaction")] async fn send_raw_transaction(&self, tx: Bytes) -> RpcResult; - - /// Handler for: `eth_sendUserOperation` - #[method(name = "sendUserOperation")] - async fn send_user_operation( - &self, - user_operation: VersionedUserOperation, - entry_point: Address, - ) -> RpcResult>; } -pub struct IngressService { +pub struct IngressService { mempool_provider: Arc>, simulation_provider: Arc>, raw_tx_forward_provider: Option>>, - user_op_validator: BaseNodeValidator, tx_submission_method: TxSubmissionMethod, bundle_queue_publisher: BundleQueuePublisher, - user_op_queue_publisher: UserOpQueuePublisher, - reputation_service: Option>>, audit_channel: mpsc::UnboundedSender, send_transaction_default_lifetime_seconds: u64, metrics: Metrics, @@ -89,48 +80,32 @@ pub struct IngressService { send_to_builder: bool, } -impl IngressService { +impl IngressService { pub fn new( providers: Providers, queue: Q, audit_channel: mpsc::UnboundedSender, builder_tx: broadcast::Sender, builder_backrun_tx: broadcast::Sender, - mempool_engine: impl Into>>>, config: Config, ) -> Self { - let mempool_engine = mempool_engine.into(); let mempool_provider = Arc::new(providers.mempool); let simulation_provider = Arc::new(providers.simulation); let raw_tx_forward_provider = providers.raw_tx_forward.map(Arc::new); - let user_op_validator = BaseNodeValidator::new( - simulation_provider.clone(), - config.validate_user_operation_timeout_ms, - ); let queue_connection = Arc::new(queue); - let reputation_service = mempool_engine - .as_ref() - .map(|engine| Arc::new(ReputationServiceImpl::new(engine.get_mempool()))); // A TTL cache to deduplicate bundles with the same Bundle ID - let bundle_cache = Cache::builder() - .time_to_live(Duration::from_secs(config.bundle_cache_ttl)) - .build(); + let bundle_cache = + Cache::builder().time_to_live(Duration::from_secs(config.bundle_cache_ttl)).build(); Self { mempool_provider, simulation_provider, raw_tx_forward_provider, - user_op_validator, tx_submission_method: config.tx_submission_method, - user_op_queue_publisher: UserOpQueuePublisher::new( - queue_connection.clone(), - config.user_operation_topic, - ), bundle_queue_publisher: BundleQueuePublisher::new( queue_connection.clone(), config.ingress_topic, ), - reputation_service, audit_channel, send_transaction_default_lifetime_seconds: config .send_transaction_default_lifetime_seconds, @@ -156,7 +131,7 @@ fn validate_backrun_bundle_limits( ) -> Result<(), String> { if txs_count < 2 { return Err( - "Backrun bundle must have at least 2 transactions (target + backrun)".to_string(), + "Backrun bundle must have at least 2 transactions (target + backrun)".to_string() ); } if txs_count > max_backrun_txs { @@ -173,13 +148,11 @@ fn validate_backrun_bundle_limits( } #[async_trait] -impl IngressApiServer for IngressService { +impl IngressApiServer for IngressService { async fn send_backrun_bundle(&self, bundle: Bundle) -> RpcResult { if !self.backrun_enabled { - return Err( - EthApiError::InvalidParams("Backrun bundle submission is disabled".into()) - .into_rpc_err(), - ); + return Err(EthApiError::InvalidParams("Backrun bundle submission is disabled".into()) + .into_rpc_err()); } let start = Instant::now(); @@ -197,18 +170,13 @@ impl IngressApiServer for Ingre self.metrics.backrun_bundles_received_total.increment(1); - self.builder_backrun_tx - .send(accepted_bundle.clone()) - .map_err(|e| { - EthApiError::InvalidParams(format!("Failed to send backrun bundle: {e}")) - .into_rpc_err() - })?; + self.builder_backrun_tx.send(accepted_bundle.clone()).map_err(|e| { + EthApiError::InvalidParams(format!("Failed to send backrun bundle: {e}")).into_rpc_err() + })?; self.send_audit_event(&accepted_bundle, bundle_hash); - self.metrics - .backrun_bundles_sent_duration - .record(start.elapsed().as_secs_f64()); + self.metrics.backrun_bundles_sent_duration.record(start.elapsed().as_secs_f64()); Ok(BundleHash { bundle_hash }) } @@ -226,11 +194,7 @@ impl IngressApiServer for Ingre .map_err(|e| EthApiError::InvalidParams(e.to_string()).into_rpc_err())?; // publish the bundle to the queue - if let Err(e) = self - .bundle_queue_publisher - .publish(&accepted_bundle, &bundle_hash) - .await - { + if let Err(e) = self.bundle_queue_publisher.publish(&accepted_bundle, &bundle_hash).await { warn!(message = "Failed to publish bundle to queue", bundle_hash = %bundle_hash, error = %e); return Err(EthApiError::InvalidParams("Failed to queue bundle".into()).into_rpc_err()); } @@ -247,10 +211,7 @@ impl IngressApiServer for Ingre } async fn cancel_bundle(&self, _request: CancelBundle) -> RpcResult<()> { - warn!( - message = "TODO: implement cancel_bundle", - method = "cancel_bundle" - ); + warn!(message = "TODO: implement cancel_bundle", method = "cancel_bundle"); todo!("implement cancel_bundle") } @@ -275,10 +236,7 @@ impl IngressApiServer for Ingre let tx_data = data.clone(); let tx_hash = transaction.tx_hash(); tokio::spawn(async move { - match forward_provider - .send_raw_transaction(tx_data.iter().as_slice()) - .await - { + match forward_provider.send_raw_transaction(tx_data.iter().as_slice()).await { Ok(_) => { debug!(message = "Forwarded raw tx", hash = %tx_hash); } @@ -289,10 +247,7 @@ impl IngressApiServer for Ingre }); } - let expiry_timestamp = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_secs() + let expiry_timestamp = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs() + self.send_transaction_default_lifetime_seconds; let bundle = Bundle { @@ -347,10 +302,8 @@ impl IngressApiServer for Ingre AcceptedBundle::new(parsed_bundle, meter_bundle_response.unwrap_or_default()); if send_to_kafka { - if let Err(e) = self - .bundle_queue_publisher - .publish(&accepted_bundle, bundle_hash) - .await + if let Err(e) = + self.bundle_queue_publisher.publish(&accepted_bundle, bundle_hash).await { warn!(message = "Failed to publish Queue::enqueue_bundle", bundle_hash = %bundle_hash, error = %e); } @@ -360,10 +313,8 @@ impl IngressApiServer for Ingre } if send_to_mempool { - let response = self - .mempool_provider - .send_raw_transaction(data.iter().as_slice()) - .await; + let response = + self.mempool_provider.send_raw_transaction(data.iter().as_slice()).await; match response { Ok(_) => { self.metrics.sent_to_mempool.increment(1); @@ -384,83 +335,13 @@ impl IngressApiServer for Ingre self.send_audit_event(&accepted_bundle, accepted_bundle.bundle_hash()); } - self.metrics - .send_raw_transaction_duration - .record(start.elapsed().as_secs_f64()); + self.metrics.send_raw_transaction_duration.record(start.elapsed().as_secs_f64()); Ok(transaction.tx_hash()) } - - async fn send_user_operation( - &self, - rpc_user_operation: VersionedUserOperation, - entry_point: Address, - ) -> RpcResult> { - let entry_point_version = EntryPointVersion::try_from(entry_point).map_err(|_| { - EthApiError::InvalidParams("Unknown entry point version".into()).into_rpc_err() - })?; - - let versioned_user_operation = match (rpc_user_operation, entry_point_version) { - (VersionedUserOperation::UserOperation(op), EntryPointVersion::V06) => { - VersionedUserOperation::UserOperation(op) - } - (VersionedUserOperation::PackedUserOperation(op), EntryPointVersion::V07) => { - VersionedUserOperation::PackedUserOperation(op) - } - _ => { - return Err(EthApiError::InvalidParams( - "User operation type does not match entry point version".into(), - ) - .into_rpc_err()); - } - }; - - let request = UserOperationRequest { - user_operation: versioned_user_operation, - entry_point, - chain_id: 1, - }; - - if let Some(reputation_service) = &self.reputation_service { - let _ = reputation_service - .get_reputation(&request.user_operation.sender()) - .await; - } - - let user_op_hash = request.hash().map_err(|e| { - warn!(message = "Failed to hash user operation", error = %e); - EthApiError::InvalidParams(e.to_string()).into_rpc_err() - })?; - - let _ = self - .user_op_validator - .validate_user_operation(&request.user_operation, &entry_point) - .await - .map_err(|e| { - warn!(message = "Failed to validate user operation", error = %e); - EthApiError::InvalidParams(e.to_string()).into_rpc_err() - })?; - - if let Err(e) = self - .user_op_queue_publisher - .publish(&request.user_operation, &user_op_hash) - .await - { - warn!( - message = "Failed to publish user operation to queue", - user_operation_hash = %user_op_hash, - error = %e - ); - return Err( - EthApiError::InvalidParams("Failed to queue user operation".into()).into_rpc_err(), - ); - } - - Ok(user_op_hash) - } } -impl IngressService { +impl IngressService { async fn get_tx(&self, data: &Bytes) -> RpcResult> { if data.is_empty() { return Err(EthApiError::EmptyRawTransactionData.into_rpc_err()); @@ -479,10 +360,8 @@ impl IngressService { async fn validate_bundle(&self, bundle: &Bundle) -> RpcResult<()> { let start = Instant::now(); if bundle.txs.is_empty() { - return Err( - EthApiError::InvalidParams("Bundle cannot have empty transactions".into()) - .into_rpc_err(), - ); + return Err(EthApiError::InvalidParams("Bundle cannot have empty transactions".into()) + .into_rpc_err()); } let mut total_gas = 0u64; @@ -494,9 +373,7 @@ impl IngressService { } validate_bundle(bundle, total_gas, tx_hashes)?; - self.metrics - .validate_bundle_duration - .record(start.elapsed().as_secs_f64()); + self.metrics.validate_bundle_duration.record(start.elapsed().as_secs_f64()); Ok(()) } @@ -518,9 +395,7 @@ impl IngressService { // > let res: MeterBundleResponse = timeout( timeout_duration, - self.simulation_provider - .client() - .request("base_meterBundle", (bundle,)), + self.simulation_provider.client().request("base_meterBundle", (bundle,)), ) .await .map_err(|_| { @@ -537,7 +412,7 @@ impl IngressService { if total_execution_time > self.block_time_milliseconds { self.metrics.bundles_exceeded_metering_time.increment(1); return Err( - EthApiError::InvalidParams("Bundle simulation took too long".into()).into_rpc_err(), + EthApiError::InvalidParams("Bundle simulation took too long".into()).into_rpc_err() ); } Ok(res) @@ -582,26 +457,26 @@ impl IngressService { #[cfg(test)] mod tests { - use super::*; - use crate::{Config, TxSubmissionMethod, queue::MessageQueue}; - use account_abstraction_core::MempoolEvent; - use account_abstraction_core::domain::PoolConfig; - use account_abstraction_core::infrastructure::in_memory::mempool::InMemoryMempool; - use account_abstraction_core::services::interfaces::event_source::EventSource; + use std::{ + net::{IpAddr, SocketAddr}, + str::FromStr, + }; + use alloy_provider::RootProvider; use anyhow::Result; use async_trait::async_trait; - use jsonrpsee::core::client::ClientT; - use jsonrpsee::http_client::{HttpClient, HttpClientBuilder}; - use jsonrpsee::server::{ServerBuilder, ServerHandle}; + use audit::test_utils::create_test_meter_bundle_response; + use jsonrpsee::{ + http_client::{HttpClient, HttpClientBuilder}, + server::{ServerBuilder, ServerHandle}, + }; use mockall::mock; - use serde_json::json; - use std::net::{IpAddr, SocketAddr}; - use std::str::FromStr; - use tips_core::test_utils::create_test_meter_bundle_response; - use tokio::sync::{RwLock, broadcast, mpsc}; + use tokio::sync::{broadcast, mpsc}; use url::Url; use wiremock::{Mock, MockServer, ResponseTemplate, matchers::method}; + + use super::*; + use crate::{Config, TxSubmissionMethod, queue::MessageQueue}; struct MockQueue; #[async_trait] @@ -611,15 +486,6 @@ mod tests { } } - struct NoopEventSource; - - #[async_trait] - impl EventSource for NoopEventSource { - async fn receive(&self) -> anyhow::Result { - Err(anyhow::anyhow!("no events")) - } - } - fn create_test_config(mock_server: &MockServer) -> Config { Config { address: IpAddr::from([127, 0, 0, 1]), @@ -630,16 +496,13 @@ mod tests { ingress_topic: String::new(), audit_kafka_properties: String::new(), audit_topic: String::new(), - user_operation_consumer_properties: Some(String::new()), - user_operation_consumer_group_id: "tips-user-operation".to_string(), log_level: String::from("info"), - log_format: tips_core::logger::LogFormat::Pretty, + log_format: utils::logger::LogFormat::Pretty, send_transaction_default_lifetime_seconds: 300, simulation_rpc: mock_server.uri().parse().unwrap(), metrics_addr: SocketAddr::from(([127, 0, 0, 1], 9002)), block_time_milliseconds: 1000, meter_bundle_timeout_ms: 5000, - validate_user_operation_timeout_ms: 2000, builder_rpcs: vec![], max_buffered_meter_bundle_responses: 100, max_buffered_backrun_bundles: 100, @@ -647,7 +510,6 @@ mod tests { backrun_enabled: false, raw_tx_forward_rpc: None, chain_id: 11, - user_operation_topic: String::new(), max_backrun_txs: 5, max_backrun_gas_limit: 5000000, bundle_cache_ttl: 20, @@ -655,35 +517,18 @@ mod tests { } } + #[allow(dead_code)] async fn setup_rpc_server(mock: MockIngressApi) -> (HttpClient, ServerHandle) { let server = ServerBuilder::default().build("127.0.0.1:0").await.unwrap(); let addr = server.local_addr().unwrap(); let handle = server.start(mock.into_rpc()); - let client = HttpClientBuilder::default() - .build(format!("http://{}", addr)) - .unwrap(); + let client = HttpClientBuilder::default().build(format!("http://{}", addr)).unwrap(); (client, handle) } - fn sample_user_operation_v06() -> serde_json::Value { - json!({ - "sender": "0x773d604960feccc5c2ce1e388595268187cf62bf", - "nonce": "0x19b0ffe729f0000000000000000", - "initCode": "0x9406cc6185a346906296840746125a0e449764545fbfb9cf000000000000000000000000f886bc0b4f161090096b82ac0c5eb7349add429d0000000000000000000000000000000000000000000000000000000000000000", - "callData": "0xb61d27f600000000000000000000000066519fcaee1ed65bc9e0acc25ccd900668d3ed490000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000443f84ac0e000000000000000000000000773d604960feccc5c2ce1e388595268187cf62bf000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000", - "callGasLimit": "0x5a3c", - "verificationGasLimit": "0x5b7c7", - "preVerificationGas": "0x1001744e6", - "maxFeePerGas": "0x889fca3c", - "maxPriorityFeePerGas": "0x1e8480", - "paymasterAndData": "0x", - "signature": "0x42eff6474dd0b7efd0ca3070e05ee0f3e3c6c665176b80c7768f59445d3415de30b65c4c6ae35c45822b726e8827a986765027e7e2d7d2a8d72c9cf0d23194b81c" - }) - } - #[tokio::test] async fn test_timeout_logic() { let timeout_duration = Duration::from_millis(100); @@ -762,20 +607,8 @@ mod tests { let (builder_tx, _builder_rx) = broadcast::channel(1); let (backrun_tx, _backrun_rx) = broadcast::channel(1); - let mempool_engine = Arc::new(MempoolEngine::::new( - Arc::new(RwLock::new(InMemoryMempool::new(PoolConfig::default()))), - Arc::new(NoopEventSource), - )); - - let service = IngressService::new( - providers, - MockQueue, - audit_tx, - builder_tx, - backrun_tx, - mempool_engine, - config, - ); + let service = + IngressService::new(providers, MockQueue, audit_tx, builder_tx, backrun_tx, config); let bundle = Bundle::default(); let bundle_hash = B256::default(); @@ -823,29 +656,15 @@ mod tests { let providers = Providers { mempool: RootProvider::new_http(simulation_server.uri().parse().unwrap()), simulation: RootProvider::new_http(simulation_server.uri().parse().unwrap()), - raw_tx_forward: Some(RootProvider::new_http( - forward_server.uri().parse().unwrap(), - )), + raw_tx_forward: Some(RootProvider::new_http(forward_server.uri().parse().unwrap())), }; let (audit_tx, _audit_rx) = mpsc::unbounded_channel(); let (builder_tx, _builder_rx) = broadcast::channel(1); let (backrun_tx, _backrun_rx) = broadcast::channel(1); - let mempool_engine = Arc::new(MempoolEngine::::new( - Arc::new(RwLock::new(InMemoryMempool::new(PoolConfig::default()))), - Arc::new(NoopEventSource), - )); - - let service = IngressService::new( - providers, - MockQueue, - audit_tx, - builder_tx, - backrun_tx, - mempool_engine, - config, - ); + let service = + IngressService::new(providers, MockQueue, audit_tx, builder_tx, backrun_tx, config); // Valid signed transaction bytes let tx_bytes = Bytes::from_str("0x02f86c0d010183072335825208940000000000000000000000000000000000000000872386f26fc1000080c001a0cdb9e4f2f1ba53f9429077e7055e078cf599786e29059cd80c5e0e923bb2c114a01c90e29201e031baf1da66296c3a5c15c200bcb5e6c34da2f05f7d1778f8be07").unwrap(); @@ -867,67 +686,8 @@ mod tests { async fn send_backrun_bundle(&self, bundle: Bundle) -> RpcResult; async fn cancel_bundle(&self, request: CancelBundle) -> RpcResult<()>; async fn send_raw_transaction(&self, tx: Bytes) -> RpcResult; - async fn send_user_operation( - &self, - user_operation: VersionedUserOperation, - entry_point: Address, - ) -> RpcResult>; } } - #[tokio::test] - async fn test_send_user_operation_accepts_valid_payload() { - let mut mock = MockIngressApi::new(); - mock.expect_send_user_operation() - .times(1) - .returning(|_, _| Ok(FixedBytes::ZERO)); - - let (client, _handle) = setup_rpc_server(mock).await; - - let user_op = sample_user_operation_v06(); - let entry_point = - account_abstraction_core::domain::entrypoints::version::EntryPointVersion::V06_ADDRESS; - - let result: Result, _> = client - .request("eth_sendUserOperation", (user_op, entry_point)) - .await; - - assert!(result.is_ok()); - } - - #[tokio::test] - async fn test_send_user_operation_rejects_invalid_payload() { - let mut mock = MockIngressApi::new(); - mock.expect_send_user_operation() - .times(0) - .returning(|_, _| Ok(FixedBytes::ZERO)); - - let (client, _handle) = setup_rpc_server(mock).await; - - let user_op = sample_user_operation_v06(); - - // Missing entry point argument should be rejected by the RPC layer - let result: Result, _> = - client.request("eth_sendUserOperation", (user_op,)).await; - - assert!(result.is_err()); - - let wrong_user_op = json!({ - "nonce": "0x19b0ffe729f0000000000000000", - "callGasLimit": "0x5a3c", - "verificationGasLimit": "0x5b7c7", - "preVerificationGas": "0x1001744e6", - "maxFeePerGas": "0x889fca3c", - "maxPriorityFeePerGas": "0x1e8480", - "paymasterAndData": "0x", - "signature": "0x42eff6474dd0b7efd0ca3070e05ee0f3e3c6c665176b80c7768f59445d3415de30b65c4c6ae35c45822b726e8827a986765027e7e2d7d2a8d72c9cf0d23194b81c" - }); - - let wrong_user_op_result: Result, _> = client - .request("eth_sendUserOperation", (wrong_user_op, Address::ZERO)) - .await; - - assert!(wrong_user_op_result.is_err()); - } #[test] fn test_validate_backrun_bundle_rejects_invalid() { @@ -939,11 +699,7 @@ mod tests { // Exceeds max tx count let result = validate_backrun_bundle_limits(6, 21000, 5, 5000000); assert!(result.is_err()); - assert!( - result - .unwrap_err() - .contains("exceeds max transaction count") - ); + assert!(result.unwrap_err().contains("exceeds max transaction count")); // Exceeds max gas limit let result = validate_backrun_bundle_limits(2, 6000000, 5, 5000000); diff --git a/crates/ingress-rpc/src/validation.rs b/crates/ingress-rpc/src/validation.rs index 5ce1044..df39af7 100644 --- a/crates/ingress-rpc/src/validation.rs +++ b/crates/ingress-rpc/src/validation.rs @@ -1,14 +1,17 @@ +use std::{ + collections::HashSet, + time::{Duration, SystemTime, UNIX_EPOCH}, +}; + use alloy_consensus::private::alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_primitives::{Address, B256, U256}; use alloy_provider::{Provider, RootProvider}; use async_trait::async_trait; +use base_bundles::Bundle; use base_reth_rpc_types::{EthApiError, SignError, extract_l1_info_from_tx}; use jsonrpsee::core::RpcResult; use op_alloy_network::Optimism; use op_revm::l1block::L1BlockInfo; -use std::collections::HashSet; -use std::time::{Duration, SystemTime, UNIX_EPOCH}; -use tips_core::Bundle; use tokio::time::Instant; use tracing::warn; @@ -95,10 +98,7 @@ impl L1BlockInfoLookup for RootProvider { pub fn validate_bundle(bundle: &Bundle, bundle_gas: u64, tx_hashes: Vec) -> RpcResult<()> { // Don't allow bundles to be submitted over 1 hour into the future // TODO: make the window configurable - let valid_timestamp_window = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_secs() + let valid_timestamp_window = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs() + Duration::from_secs(3600).as_secs(); if let Some(max_timestamp) = bundle.max_timestamp && max_timestamp > valid_timestamp_window @@ -111,18 +111,14 @@ pub fn validate_bundle(bundle: &Bundle, bundle_gas: u64, tx_hashes: Vec) - // Check max gas limit for the entire bundle if bundle_gas > MAX_BUNDLE_GAS { - return Err( - EthApiError::InvalidParams("Bundle gas limit exceeds maximum allowed".into()) - .into_rpc_err(), - ); + return Err(EthApiError::InvalidParams("Bundle gas limit exceeds maximum allowed".into()) + .into_rpc_err()); } // Can only provide 3 transactions at once if bundle.txs.len() > 3 { - return Err( - EthApiError::InvalidParams("Bundle can only contain 3 transactions".into()) - .into_rpc_err(), - ); + return Err(EthApiError::InvalidParams("Bundle can only contain 3 transactions".into()) + .into_rpc_err()); } // Partial transaction dropping is not supported, `dropping_tx_hashes` must be empty @@ -149,24 +145,19 @@ pub fn validate_bundle(bundle: &Bundle, bundle_gas: u64, tx_hashes: Vec) - #[cfg(test)] mod tests { - use super::*; - use alloy_consensus::SignableTransaction; - use alloy_consensus::TxEip1559; - use alloy_consensus::transaction::SignerRecoverable; - use alloy_primitives::Bytes; - use alloy_primitives::bytes; + use std::time::{SystemTime, UNIX_EPOCH}; + + use alloy_consensus::{SignableTransaction, TxEip1559, transaction::SignerRecoverable}; + use alloy_primitives::{Bytes, bytes}; use alloy_signer_local::PrivateKeySigner; use op_alloy_consensus::OpTxEnvelope; - use op_alloy_network::TxSignerSync; - use op_alloy_network::eip2718::Encodable2718; - use std::time::{SystemTime, UNIX_EPOCH}; + use op_alloy_network::{TxSignerSync, eip2718::Encodable2718}; + + use super::*; #[tokio::test] async fn test_err_bundle_max_timestamp_too_far_in_the_future() { - let current_time = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_secs(); + let current_time = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs(); let too_far_in_the_future = current_time + 3601; let bundle = Bundle { txs: vec![], @@ -288,17 +279,12 @@ mod tests { #[tokio::test] async fn test_err_bundle_partial_transaction_dropping_not_supported() { - let bundle = Bundle { - txs: vec![], - dropping_tx_hashes: vec![B256::random()], - ..Default::default() - }; + let bundle = + Bundle { txs: vec![], dropping_tx_hashes: vec![B256::random()], ..Default::default() }; assert_eq!( validate_bundle(&bundle, 0, vec![]), - Err( - EthApiError::InvalidParams("Partial transaction dropping is not supported".into()) - .into_rpc_err() - ) + Err(EthApiError::InvalidParams("Partial transaction dropping is not supported".into()) + .into_rpc_err()) ); } diff --git a/deny.toml b/deny.toml index 3b760be..3951543 100644 --- a/deny.toml +++ b/deny.toml @@ -79,6 +79,11 @@ skip = [ # OP Stack crates (reth uses older versions) "op-alloy-consensus", + "op-alloy-rpc-types", + + # thiserror 1.x vs 2.x transition + "thiserror", + "thiserror-impl", # Proc-macro / derive ecosystem (alloy-tx-macros vs ratatui/instability) "darling", diff --git a/justfile b/justfile index d9c7a1b..0e2476a 100644 --- a/justfile +++ b/justfile @@ -104,4 +104,12 @@ run-mempool-rebroadcaster: # Run basectl with specified config (mainnet, sepolia, devnet, or path) basectl config="mainnet": - cargo run -p basectl --release -- -c {{config}} \ No newline at end of file + cargo run -p basectl --release -- -c {{config}} + +# Run tips audit service +run-audit: + cargo run --bin audit + +# Run tips ingress RPC service +run-ingress-rpc: + cargo run --bin ingress-rpc From 9f1ff2a2d8bc54f9564718d1b3c5239b6d853e03 Mon Sep 17 00:00:00 2001 From: Mihir Wadekar Date: Thu, 12 Feb 2026 00:29:42 -0800 Subject: [PATCH 113/117] chore: moves ui to ui/tips Moving ui to ui/tips allows us to have an overarching ui folder for multiple potential web UIs --- ui/package-lock.json | 4752 ----------------- ui/{ => tips}/.gitignore | 0 ui/{ => tips}/Dockerfile | 0 ui/{ => tips}/biome.json | 0 ui/{ => tips}/next.config.ts | 0 ui/{ => tips}/package.json | 0 ui/{ => tips}/postcss.config.mjs | 0 ui/{ => tips}/public/logo.svg | 0 .../src/app/api/block/[hash]/route.ts | 0 ui/{ => tips}/src/app/api/blocks/route.ts | 0 .../src/app/api/bundle/[uuid]/route.ts | 0 ui/{ => tips}/src/app/api/health/route.ts | 0 ui/{ => tips}/src/app/api/txn/[hash]/route.ts | 0 ui/{ => tips}/src/app/block/[hash]/page.tsx | 0 ui/{ => tips}/src/app/bundles/[uuid]/page.tsx | 0 ui/{ => tips}/src/app/globals.css | 0 ui/{ => tips}/src/app/layout.tsx | 0 ui/{ => tips}/src/app/page.tsx | 0 ui/{ => tips}/src/app/txn/[hash]/page.tsx | 0 ui/{ => tips}/src/lib/s3.ts | 0 ui/{ => tips}/tsconfig.json | 0 ui/{ => tips}/yarn.lock | 0 22 files changed, 4752 deletions(-) delete mode 100644 ui/package-lock.json rename ui/{ => tips}/.gitignore (100%) rename ui/{ => tips}/Dockerfile (100%) rename ui/{ => tips}/biome.json (100%) rename ui/{ => tips}/next.config.ts (100%) rename ui/{ => tips}/package.json (100%) rename ui/{ => tips}/postcss.config.mjs (100%) rename ui/{ => tips}/public/logo.svg (100%) rename ui/{ => tips}/src/app/api/block/[hash]/route.ts (100%) rename ui/{ => tips}/src/app/api/blocks/route.ts (100%) rename ui/{ => tips}/src/app/api/bundle/[uuid]/route.ts (100%) rename ui/{ => tips}/src/app/api/health/route.ts (100%) rename ui/{ => tips}/src/app/api/txn/[hash]/route.ts (100%) rename ui/{ => tips}/src/app/block/[hash]/page.tsx (100%) rename ui/{ => tips}/src/app/bundles/[uuid]/page.tsx (100%) rename ui/{ => tips}/src/app/globals.css (100%) rename ui/{ => tips}/src/app/layout.tsx (100%) rename ui/{ => tips}/src/app/page.tsx (100%) rename ui/{ => tips}/src/app/txn/[hash]/page.tsx (100%) rename ui/{ => tips}/src/lib/s3.ts (100%) rename ui/{ => tips}/tsconfig.json (100%) rename ui/{ => tips}/yarn.lock (100%) diff --git a/ui/package-lock.json b/ui/package-lock.json deleted file mode 100644 index 1ffa8b2..0000000 --- a/ui/package-lock.json +++ /dev/null @@ -1,4752 +0,0 @@ -{ - "name": "ui", - "version": "0.1.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "ui", - "version": "0.1.0", - "dependencies": { - "@aws-sdk/client-s3": "^3.888.0", - "drizzle-kit": "^0.31.4", - "drizzle-orm": "^0.44.5", - "next": "15.5.3", - "pg": "^8.16.3", - "react": "19.1.0", - "react-dom": "19.1.0" - }, - "devDependencies": { - "@biomejs/biome": "2.2.0", - "@tailwindcss/postcss": "^4", - "@types/node": "^20", - "@types/pg": "^8.15.5", - "@types/react": "^19", - "@types/react-dom": "^19", - "tailwindcss": "^4", - "typescript": "^5" - } - }, - "node_modules/@alloc/quick-lru": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", - "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@aws-crypto/crc32": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz", - "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-crypto/crc32c": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz", - "integrity": "sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-crypto/sha1-browser": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz", - "integrity": "sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/supports-web-crypto": "^5.2.0", - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@smithy/util-utf8": "^2.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-crypto/sha1-browser/node_modules/@smithy/is-array-buffer": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", - "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/sha1-browser/node_modules/@smithy/util-buffer-from": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", - "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/sha1-browser/node_modules/@smithy/util-utf8": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", - "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/sha256-browser": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz", - "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-js": "^5.2.0", - "@aws-crypto/supports-web-crypto": "^5.2.0", - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@smithy/util-utf8": "^2.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", - "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", - "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", - "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/sha256-js": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz", - "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-crypto/supports-web-crypto": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz", - "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-crypto/util": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz", - "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "^3.222.0", - "@smithy/util-utf8": "^2.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", - "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", - "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", - "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/client-s3": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.893.0.tgz", - "integrity": "sha512-/P74KDJhOijnIAQR93sq1DQn8vbU3WaPZDyy1XUMRJJIY6iEJnDo1toD9XY6AFDz5TRto8/8NbcXT30AMOUtJQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha1-browser": "5.2.0", - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.893.0", - "@aws-sdk/credential-provider-node": "3.893.0", - "@aws-sdk/middleware-bucket-endpoint": "3.893.0", - "@aws-sdk/middleware-expect-continue": "3.893.0", - "@aws-sdk/middleware-flexible-checksums": "3.893.0", - "@aws-sdk/middleware-host-header": "3.893.0", - "@aws-sdk/middleware-location-constraint": "3.893.0", - "@aws-sdk/middleware-logger": "3.893.0", - "@aws-sdk/middleware-recursion-detection": "3.893.0", - "@aws-sdk/middleware-sdk-s3": "3.893.0", - "@aws-sdk/middleware-ssec": "3.893.0", - "@aws-sdk/middleware-user-agent": "3.893.0", - "@aws-sdk/region-config-resolver": "3.893.0", - "@aws-sdk/signature-v4-multi-region": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@aws-sdk/util-endpoints": "3.893.0", - "@aws-sdk/util-user-agent-browser": "3.893.0", - "@aws-sdk/util-user-agent-node": "3.893.0", - "@aws-sdk/xml-builder": "3.893.0", - "@smithy/config-resolver": "^4.2.2", - "@smithy/core": "^3.11.1", - "@smithy/eventstream-serde-browser": "^4.1.1", - "@smithy/eventstream-serde-config-resolver": "^4.2.1", - "@smithy/eventstream-serde-node": "^4.1.1", - "@smithy/fetch-http-handler": "^5.2.1", - "@smithy/hash-blob-browser": "^4.1.1", - "@smithy/hash-node": "^4.1.1", - "@smithy/hash-stream-node": "^4.1.1", - "@smithy/invalid-dependency": "^4.1.1", - "@smithy/md5-js": "^4.1.1", - "@smithy/middleware-content-length": "^4.1.1", - "@smithy/middleware-endpoint": "^4.2.3", - "@smithy/middleware-retry": "^4.2.4", - "@smithy/middleware-serde": "^4.1.1", - "@smithy/middleware-stack": "^4.1.1", - "@smithy/node-config-provider": "^4.2.2", - "@smithy/node-http-handler": "^4.2.1", - "@smithy/protocol-http": "^5.2.1", - "@smithy/smithy-client": "^4.6.3", - "@smithy/types": "^4.5.0", - "@smithy/url-parser": "^4.1.1", - "@smithy/util-base64": "^4.1.0", - "@smithy/util-body-length-browser": "^4.1.0", - "@smithy/util-body-length-node": "^4.1.0", - "@smithy/util-defaults-mode-browser": "^4.1.3", - "@smithy/util-defaults-mode-node": "^4.1.3", - "@smithy/util-endpoints": "^3.1.2", - "@smithy/util-middleware": "^4.1.1", - "@smithy/util-retry": "^4.1.2", - "@smithy/util-stream": "^4.3.2", - "@smithy/util-utf8": "^4.1.0", - "@smithy/util-waiter": "^4.1.1", - "@types/uuid": "^9.0.1", - "tslib": "^2.6.2", - "uuid": "^9.0.1" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/client-sso": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.893.0.tgz", - "integrity": "sha512-0+qRGq7H8UNfxI0F02ObyOgOiYxkN4DSlFfwQUQMPfqENDNYOrL++2H9X3EInyc1lUM/+aK8TZqSbh473gdxcg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.893.0", - "@aws-sdk/middleware-host-header": "3.893.0", - "@aws-sdk/middleware-logger": "3.893.0", - "@aws-sdk/middleware-recursion-detection": "3.893.0", - "@aws-sdk/middleware-user-agent": "3.893.0", - "@aws-sdk/region-config-resolver": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@aws-sdk/util-endpoints": "3.893.0", - "@aws-sdk/util-user-agent-browser": "3.893.0", - "@aws-sdk/util-user-agent-node": "3.893.0", - "@smithy/config-resolver": "^4.2.2", - "@smithy/core": "^3.11.1", - "@smithy/fetch-http-handler": "^5.2.1", - "@smithy/hash-node": "^4.1.1", - "@smithy/invalid-dependency": "^4.1.1", - "@smithy/middleware-content-length": "^4.1.1", - "@smithy/middleware-endpoint": "^4.2.3", - "@smithy/middleware-retry": "^4.2.4", - "@smithy/middleware-serde": "^4.1.1", - "@smithy/middleware-stack": "^4.1.1", - "@smithy/node-config-provider": "^4.2.2", - "@smithy/node-http-handler": "^4.2.1", - "@smithy/protocol-http": "^5.2.1", - "@smithy/smithy-client": "^4.6.3", - "@smithy/types": "^4.5.0", - "@smithy/url-parser": "^4.1.1", - "@smithy/util-base64": "^4.1.0", - "@smithy/util-body-length-browser": "^4.1.0", - "@smithy/util-body-length-node": "^4.1.0", - "@smithy/util-defaults-mode-browser": "^4.1.3", - "@smithy/util-defaults-mode-node": "^4.1.3", - "@smithy/util-endpoints": "^3.1.2", - "@smithy/util-middleware": "^4.1.1", - "@smithy/util-retry": "^4.1.2", - "@smithy/util-utf8": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/core": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.893.0.tgz", - "integrity": "sha512-E1NAWHOprBXIJ9CVb6oTsRD/tNOozrKBD/Sb4t7WZd3dpby6KpYfM6FaEGfRGcJBIcB4245hww8Rmg16qDMJWg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.893.0", - "@aws-sdk/xml-builder": "3.893.0", - "@smithy/core": "^3.11.1", - "@smithy/node-config-provider": "^4.2.2", - "@smithy/property-provider": "^4.1.1", - "@smithy/protocol-http": "^5.2.1", - "@smithy/signature-v4": "^5.2.1", - "@smithy/smithy-client": "^4.6.3", - "@smithy/types": "^4.5.0", - "@smithy/util-base64": "^4.1.0", - "@smithy/util-body-length-browser": "^4.1.0", - "@smithy/util-middleware": "^4.1.1", - "@smithy/util-utf8": "^4.1.0", - "fast-xml-parser": "5.2.5", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.893.0.tgz", - "integrity": "sha512-h4sYNk1iDrSZQLqFfbuD1GWY6KoVCvourfqPl6JZCYj8Vmnox5y9+7taPxwlU2VVII0hiV8UUbO79P35oPBSyA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@smithy/property-provider": "^4.1.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.893.0.tgz", - "integrity": "sha512-xYoC7DRr++zWZ9jG7/hvd6YjCbGDQzsAu2fBHHf91RVmSETXUgdEaP9rOdfCM02iIK/MYlwiWEIVBcBxWY/GQw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@smithy/fetch-http-handler": "^5.2.1", - "@smithy/node-http-handler": "^4.2.1", - "@smithy/property-provider": "^4.1.1", - "@smithy/protocol-http": "^5.2.1", - "@smithy/smithy-client": "^4.6.3", - "@smithy/types": "^4.5.0", - "@smithy/util-stream": "^4.3.2", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.893.0.tgz", - "integrity": "sha512-ZQWOl4jdLhJHHrHsOfNRjgpP98A5kw4YzkMOUoK+TgSQVLi7wjb957V0htvwpi6KmGr3f2F8J06D6u2OtIc62w==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.893.0", - "@aws-sdk/credential-provider-env": "3.893.0", - "@aws-sdk/credential-provider-http": "3.893.0", - "@aws-sdk/credential-provider-process": "3.893.0", - "@aws-sdk/credential-provider-sso": "3.893.0", - "@aws-sdk/credential-provider-web-identity": "3.893.0", - "@aws-sdk/nested-clients": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@smithy/credential-provider-imds": "^4.1.2", - "@smithy/property-provider": "^4.1.1", - "@smithy/shared-ini-file-loader": "^4.2.0", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.893.0.tgz", - "integrity": "sha512-NjvDUXciC2+EaQnbL/u/ZuCXj9PZQ/9ciPhI62LGCoJ3ft91lI1Z58Dgut0OFPpV6i16GhpFxzmbuf40wTgDbA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.893.0", - "@aws-sdk/credential-provider-http": "3.893.0", - "@aws-sdk/credential-provider-ini": "3.893.0", - "@aws-sdk/credential-provider-process": "3.893.0", - "@aws-sdk/credential-provider-sso": "3.893.0", - "@aws-sdk/credential-provider-web-identity": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@smithy/credential-provider-imds": "^4.1.2", - "@smithy/property-provider": "^4.1.1", - "@smithy/shared-ini-file-loader": "^4.2.0", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.893.0.tgz", - "integrity": "sha512-5XitkZdiQhjWJV71qWqrH7hMXwuK/TvIRwiwKs7Pj0sapGSk3YgD3Ykdlolz7sQOleoKWYYqgoq73fIPpTTmFA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@smithy/property-provider": "^4.1.1", - "@smithy/shared-ini-file-loader": "^4.2.0", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.893.0.tgz", - "integrity": "sha512-ms8v13G1r0aHZh5PLcJu6AnQZPs23sRm3Ph0A7+GdqbPvWewP8M7jgZTKyTXi+oYXswdYECU1zPVur8zamhtLg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/client-sso": "3.893.0", - "@aws-sdk/core": "3.893.0", - "@aws-sdk/token-providers": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@smithy/property-provider": "^4.1.1", - "@smithy/shared-ini-file-loader": "^4.2.0", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.893.0.tgz", - "integrity": "sha512-wWD8r2ot4jf/CoogdPTl13HbwNLW4UheGUCu6gW7n9GoHh1JImYyooPHK8K7kD42hihydIA7OW7iFAf7//JYTw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.893.0", - "@aws-sdk/nested-clients": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@smithy/property-provider": "^4.1.1", - "@smithy/shared-ini-file-loader": "^4.2.0", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-bucket-endpoint": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.893.0.tgz", - "integrity": "sha512-H+wMAoFC73T7M54OFIezdHXR9/lH8TZ3Cx1C3MEBb2ctlzQrVCd8LX8zmOtcGYC8plrRwV+8rNPe0FMqecLRew==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.893.0", - "@aws-sdk/util-arn-parser": "3.893.0", - "@smithy/node-config-provider": "^4.2.2", - "@smithy/protocol-http": "^5.2.1", - "@smithy/types": "^4.5.0", - "@smithy/util-config-provider": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-expect-continue": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.893.0.tgz", - "integrity": "sha512-PEZkvD6k0X9sacHkvkVF4t2QyQEAzd35OJ2bIrjWCfc862TwukMMJ1KErRmQ1WqKXHKF4L0ed5vtWaO/8jVLNA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.893.0", - "@smithy/protocol-http": "^5.2.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-flexible-checksums": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.893.0.tgz", - "integrity": "sha512-2swRPpyGK6xpZwIFmmFSFKp10iuyBLZEouhrt1ycBVA8iHGmPkuJSCim6Vb+JoRKqINp5tizWeQwdg9boIxJPw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/crc32": "5.2.0", - "@aws-crypto/crc32c": "5.2.0", - "@aws-crypto/util": "5.2.0", - "@aws-sdk/core": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@smithy/is-array-buffer": "^4.1.0", - "@smithy/node-config-provider": "^4.2.2", - "@smithy/protocol-http": "^5.2.1", - "@smithy/types": "^4.5.0", - "@smithy/util-middleware": "^4.1.1", - "@smithy/util-stream": "^4.3.2", - "@smithy/util-utf8": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.893.0.tgz", - "integrity": "sha512-qL5xYRt80ahDfj9nDYLhpCNkDinEXvjLe/Qen/Y/u12+djrR2MB4DRa6mzBCkLkdXDtf0WAoW2EZsNCfGrmOEQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.893.0", - "@smithy/protocol-http": "^5.2.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-location-constraint": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.893.0.tgz", - "integrity": "sha512-MlbBc7Ttb1ekbeeeFBU4DeEZOLb5s0Vl4IokvO17g6yJdLk4dnvZro9zdXl3e7NXK+kFxHRBFZe55p/42mVgDA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.893.0", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-logger": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.893.0.tgz", - "integrity": "sha512-ZqzMecjju5zkBquSIfVfCORI/3Mge21nUY4nWaGQy+NUXehqCGG4W7AiVpiHGOcY2cGJa7xeEkYcr2E2U9U0AA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.893.0", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.893.0.tgz", - "integrity": "sha512-H7Zotd9zUHQAr/wr3bcWHULYhEeoQrF54artgsoUGIf/9emv6LzY89QUccKIxYd6oHKNTrTyXm9F0ZZrzXNxlg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.893.0", - "@aws/lambda-invoke-store": "^0.0.1", - "@smithy/protocol-http": "^5.2.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-sdk-s3": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.893.0.tgz", - "integrity": "sha512-J2v7jOoSlE4o416yQiuka6+cVJzyrU7mbJEQA9VFCb+TYT2cG3xQB0bDzE24QoHeonpeBDghbg/zamYMnt+GsQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@aws-sdk/util-arn-parser": "3.893.0", - "@smithy/core": "^3.11.1", - "@smithy/node-config-provider": "^4.2.2", - "@smithy/protocol-http": "^5.2.1", - "@smithy/signature-v4": "^5.2.1", - "@smithy/smithy-client": "^4.6.3", - "@smithy/types": "^4.5.0", - "@smithy/util-config-provider": "^4.1.0", - "@smithy/util-middleware": "^4.1.1", - "@smithy/util-stream": "^4.3.2", - "@smithy/util-utf8": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-ssec": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.893.0.tgz", - "integrity": "sha512-e4ccCiAnczv9mMPheKjgKxZQN473mcup+3DPLVNnIw5GRbQoDqPSB70nUzfORKZvM7ar7xLMPxNR8qQgo1C8Rg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.893.0", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.893.0.tgz", - "integrity": "sha512-n1vHj7bdC4ycIAKkny0rmgvgvGOIgYnGBAqfPAFPR26WuGWmCxH2cT9nQTNA+li8ofxX9F9FIFBTKkW92Pc8iQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@aws-sdk/util-endpoints": "3.893.0", - "@smithy/core": "^3.11.1", - "@smithy/protocol-http": "^5.2.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/nested-clients": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.893.0.tgz", - "integrity": "sha512-HIUCyNtWkxvc0BmaJPUj/A0/29OapT/dzBNxr2sjgKNZgO81JuDFp+aXCmnf7vQoA2D1RzCsAIgEtfTExNFZqA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.893.0", - "@aws-sdk/middleware-host-header": "3.893.0", - "@aws-sdk/middleware-logger": "3.893.0", - "@aws-sdk/middleware-recursion-detection": "3.893.0", - "@aws-sdk/middleware-user-agent": "3.893.0", - "@aws-sdk/region-config-resolver": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@aws-sdk/util-endpoints": "3.893.0", - "@aws-sdk/util-user-agent-browser": "3.893.0", - "@aws-sdk/util-user-agent-node": "3.893.0", - "@smithy/config-resolver": "^4.2.2", - "@smithy/core": "^3.11.1", - "@smithy/fetch-http-handler": "^5.2.1", - "@smithy/hash-node": "^4.1.1", - "@smithy/invalid-dependency": "^4.1.1", - "@smithy/middleware-content-length": "^4.1.1", - "@smithy/middleware-endpoint": "^4.2.3", - "@smithy/middleware-retry": "^4.2.4", - "@smithy/middleware-serde": "^4.1.1", - "@smithy/middleware-stack": "^4.1.1", - "@smithy/node-config-provider": "^4.2.2", - "@smithy/node-http-handler": "^4.2.1", - "@smithy/protocol-http": "^5.2.1", - "@smithy/smithy-client": "^4.6.3", - "@smithy/types": "^4.5.0", - "@smithy/url-parser": "^4.1.1", - "@smithy/util-base64": "^4.1.0", - "@smithy/util-body-length-browser": "^4.1.0", - "@smithy/util-body-length-node": "^4.1.0", - "@smithy/util-defaults-mode-browser": "^4.1.3", - "@smithy/util-defaults-mode-node": "^4.1.3", - "@smithy/util-endpoints": "^3.1.2", - "@smithy/util-middleware": "^4.1.1", - "@smithy/util-retry": "^4.1.2", - "@smithy/util-utf8": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.893.0.tgz", - "integrity": "sha512-/cJvh3Zsa+Of0Zbg7vl9wp/kZtdb40yk/2+XcroAMVPO9hPvmS9r/UOm6tO7FeX4TtkRFwWaQJiTZTgSdsPY+Q==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.893.0", - "@smithy/node-config-provider": "^4.2.2", - "@smithy/types": "^4.5.0", - "@smithy/util-config-provider": "^4.1.0", - "@smithy/util-middleware": "^4.1.1", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/signature-v4-multi-region": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.893.0.tgz", - "integrity": "sha512-pp4Bn8dL4i68P/mHgZ7sgkm8OSIpwjtGxP73oGseu9Cli0JRyJ1asTSsT60hUz3sbo+3oKk3hEobD6UxLUeGRA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/middleware-sdk-s3": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@smithy/protocol-http": "^5.2.1", - "@smithy/signature-v4": "^5.2.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/token-providers": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.893.0.tgz", - "integrity": "sha512-nkzuE910TxW4pnIwJ+9xDMx5m+A8iXGM16Oa838YKsds07cgkRp7sPnpH9B8NbGK2szskAAkXfj7t1f59EKd1Q==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/core": "3.893.0", - "@aws-sdk/nested-clients": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@smithy/property-provider": "^4.1.1", - "@smithy/shared-ini-file-loader": "^4.2.0", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/types": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.893.0.tgz", - "integrity": "sha512-Aht1nn5SnA0N+Tjv0dzhAY7CQbxVtmq1bBR6xI0MhG7p2XYVh1wXuKTzrldEvQWwA3odOYunAfT9aBiKZx9qIg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/util-arn-parser": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.893.0.tgz", - "integrity": "sha512-u8H4f2Zsi19DGnwj5FSZzDMhytYF/bCh37vAtBsn3cNDL3YG578X5oc+wSX54pM3tOxS+NY7tvOAo52SW7koUA==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/util-endpoints": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.893.0.tgz", - "integrity": "sha512-xeMcL31jXHKyxRwB3oeNjs8YEpyvMnSYWr2OwLydgzgTr0G349AHlJHwYGCF9xiJ2C27kDxVvXV/Hpdp0p7TWw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.893.0", - "@smithy/types": "^4.5.0", - "@smithy/url-parser": "^4.1.1", - "@smithy/util-endpoints": "^3.1.2", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/util-locate-window": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.893.0.tgz", - "integrity": "sha512-T89pFfgat6c8nMmpI8eKjBcDcgJq36+m9oiXbcUzeU55MP9ZuGgBomGjGnHaEyF36jenW9gmg3NfZDm0AO2XPg==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.893.0.tgz", - "integrity": "sha512-PE9NtbDBW6Kgl1bG6A5fF3EPo168tnkj8TgMcT0sg4xYBWsBpq0bpJZRh+Jm5Bkwiw9IgTCLjEU7mR6xWaMB9w==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.893.0", - "@smithy/types": "^4.5.0", - "bowser": "^2.11.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.893.0.tgz", - "integrity": "sha512-tTRkJo/fth9NPJ2AO/XLuJWVsOhbhejQRLyP0WXG3z0Waa5IWK5YBxBC1tWWATUCwsN748JQXU03C1aF9cRD9w==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/middleware-user-agent": "3.893.0", - "@aws-sdk/types": "3.893.0", - "@smithy/node-config-provider": "^4.2.2", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - }, - "peerDependencies": { - "aws-crt": ">=1.0.0" - }, - "peerDependenciesMeta": { - "aws-crt": { - "optional": true - } - } - }, - "node_modules/@aws-sdk/xml-builder": { - "version": "3.893.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.893.0.tgz", - "integrity": "sha512-qKkJ2E0hU60iq0o2+hBSIWS8sf34xhqiRRGw5nbRhwEnE2MsWsWBpRoysmr32uq9dHMWUzII0c/fS29+wOSdMA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@aws/lambda-invoke-store": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.0.1.tgz", - "integrity": "sha512-ORHRQ2tmvnBXc8t/X9Z8IcSbBA4xTLKuN873FopzklHMeqBst7YG0d+AX97inkvDX+NChYtSr+qGfcqGFaI8Zw==", - "license": "Apache-2.0", - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@biomejs/biome": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.2.0.tgz", - "integrity": "sha512-3On3RSYLsX+n9KnoSgfoYlckYBoU6VRM22cw1gB4Y0OuUVSYd/O/2saOJMrA4HFfA1Ff0eacOvMN1yAAvHtzIw==", - "dev": true, - "license": "MIT OR Apache-2.0", - "bin": { - "biome": "bin/biome" - }, - "engines": { - "node": ">=14.21.3" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/biome" - }, - "optionalDependencies": { - "@biomejs/cli-darwin-arm64": "2.2.0", - "@biomejs/cli-darwin-x64": "2.2.0", - "@biomejs/cli-linux-arm64": "2.2.0", - "@biomejs/cli-linux-arm64-musl": "2.2.0", - "@biomejs/cli-linux-x64": "2.2.0", - "@biomejs/cli-linux-x64-musl": "2.2.0", - "@biomejs/cli-win32-arm64": "2.2.0", - "@biomejs/cli-win32-x64": "2.2.0" - } - }, - "node_modules/@biomejs/cli-darwin-arm64": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.2.0.tgz", - "integrity": "sha512-zKbwUUh+9uFmWfS8IFxmVD6XwqFcENjZvEyfOxHs1epjdH3wyyMQG80FGDsmauPwS2r5kXdEM0v/+dTIA9FXAg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-darwin-x64": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.2.0.tgz", - "integrity": "sha512-+OmT4dsX2eTfhD5crUOPw3RPhaR+SKVspvGVmSdZ9y9O/AgL8pla6T4hOn1q+VAFBHuHhsdxDRJgFCSC7RaMOw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-linux-arm64": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.2.0.tgz", - "integrity": "sha512-6eoRdF2yW5FnW9Lpeivh7Mayhq0KDdaDMYOJnH9aT02KuSIX5V1HmWJCQQPwIQbhDh68Zrcpl8inRlTEan0SXw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-linux-arm64-musl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.2.0.tgz", - "integrity": "sha512-egKpOa+4FL9YO+SMUMLUvf543cprjevNc3CAgDNFLcjknuNMcZ0GLJYa3EGTCR2xIkIUJDVneBV3O9OcIlCEZQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-linux-x64": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.2.0.tgz", - "integrity": "sha512-5UmQx/OZAfJfi25zAnAGHUMuOd+LOsliIt119x2soA2gLggQYrVPA+2kMUxR6Mw5M1deUF/AWWP2qpxgH7Nyfw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-linux-x64-musl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.2.0.tgz", - "integrity": "sha512-I5J85yWwUWpgJyC1CcytNSGusu2p9HjDnOPAFG4Y515hwRD0jpR9sT9/T1cKHtuCvEQ/sBvx+6zhz9l9wEJGAg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-win32-arm64": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.2.0.tgz", - "integrity": "sha512-n9a1/f2CwIDmNMNkFs+JI0ZjFnMO0jdOyGNtihgUNFnlmd84yIYY2KMTBmMV58ZlVHjgmY5Y6E1hVTnSRieggA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-win32-x64": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.2.0.tgz", - "integrity": "sha512-Nawu5nHjP/zPKTIryh2AavzTc/KEg4um/MxWdXW0A6P/RZOyIpa7+QSjeXwAwX/utJGaCoXRPWtF3m5U/bB3Ww==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@drizzle-team/brocli": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/@drizzle-team/brocli/-/brocli-0.10.2.tgz", - "integrity": "sha512-z33Il7l5dKjUgGULTqBsQBQwckHh5AbIuxhdsIxDDiZAzBOrZO6q9ogcWC65kU382AfynTfgNumVcNIjuIua6w==", - "license": "Apache-2.0" - }, - "node_modules/@emnapi/runtime": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.5.0.tgz", - "integrity": "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==", - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, - "node_modules/@esbuild-kit/core-utils": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.3.2.tgz", - "integrity": "sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==", - "deprecated": "Merged into tsx: https://tsx.is", - "license": "MIT", - "dependencies": { - "esbuild": "~0.18.20", - "source-map-support": "^0.5.21" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/android-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", - "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/android-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", - "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/android-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", - "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/darwin-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", - "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/darwin-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", - "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", - "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/freebsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", - "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", - "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", - "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", - "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-loong64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", - "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", - "cpu": [ - "loong64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-mips64el": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", - "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", - "cpu": [ - "mips64el" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-ppc64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", - "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", - "cpu": [ - "ppc64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-riscv64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", - "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", - "cpu": [ - "riscv64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-s390x": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", - "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", - "cpu": [ - "s390x" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", - "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/netbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", - "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/openbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", - "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/sunos-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", - "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/win32-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", - "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/win32-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", - "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/win32-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", - "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild-kit/core-utils/node_modules/esbuild": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", - "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", - "hasInstallScript": true, - "license": "MIT", - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/android-arm": "0.18.20", - "@esbuild/android-arm64": "0.18.20", - "@esbuild/android-x64": "0.18.20", - "@esbuild/darwin-arm64": "0.18.20", - "@esbuild/darwin-x64": "0.18.20", - "@esbuild/freebsd-arm64": "0.18.20", - "@esbuild/freebsd-x64": "0.18.20", - "@esbuild/linux-arm": "0.18.20", - "@esbuild/linux-arm64": "0.18.20", - "@esbuild/linux-ia32": "0.18.20", - "@esbuild/linux-loong64": "0.18.20", - "@esbuild/linux-mips64el": "0.18.20", - "@esbuild/linux-ppc64": "0.18.20", - "@esbuild/linux-riscv64": "0.18.20", - "@esbuild/linux-s390x": "0.18.20", - "@esbuild/linux-x64": "0.18.20", - "@esbuild/netbsd-x64": "0.18.20", - "@esbuild/openbsd-x64": "0.18.20", - "@esbuild/sunos-x64": "0.18.20", - "@esbuild/win32-arm64": "0.18.20", - "@esbuild/win32-ia32": "0.18.20", - "@esbuild/win32-x64": "0.18.20" - } - }, - "node_modules/@esbuild-kit/esm-loader": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/@esbuild-kit/esm-loader/-/esm-loader-2.6.5.tgz", - "integrity": "sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==", - "deprecated": "Merged into tsx: https://tsx.is", - "license": "MIT", - "dependencies": { - "@esbuild-kit/core-utils": "^3.3.2", - "get-tsconfig": "^4.7.0" - } - }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz", - "integrity": "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==", - "cpu": [ - "ppc64" - ], - "license": "MIT", - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.10.tgz", - "integrity": "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.10.tgz", - "integrity": "sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.10.tgz", - "integrity": "sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.10.tgz", - "integrity": "sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.10.tgz", - "integrity": "sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.10.tgz", - "integrity": "sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.10.tgz", - "integrity": "sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.10.tgz", - "integrity": "sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.10.tgz", - "integrity": "sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.10.tgz", - "integrity": "sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.10.tgz", - "integrity": "sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==", - "cpu": [ - "loong64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.10.tgz", - "integrity": "sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==", - "cpu": [ - "mips64el" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.10.tgz", - "integrity": "sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==", - "cpu": [ - "ppc64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.10.tgz", - "integrity": "sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==", - "cpu": [ - "riscv64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.10.tgz", - "integrity": "sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==", - "cpu": [ - "s390x" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz", - "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.10.tgz", - "integrity": "sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.10.tgz", - "integrity": "sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.10.tgz", - "integrity": "sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.10.tgz", - "integrity": "sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openharmony-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.10.tgz", - "integrity": "sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.10.tgz", - "integrity": "sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.10.tgz", - "integrity": "sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.10.tgz", - "integrity": "sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.10.tgz", - "integrity": "sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@img/colour": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.0.0.tgz", - "integrity": "sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==", - "license": "MIT", - "optional": true, - "engines": { - "node": ">=18" - } - }, - "node_modules/@img/sharp-darwin-arm64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.4.tgz", - "integrity": "sha512-sitdlPzDVyvmINUdJle3TNHl+AG9QcwiAMsXmccqsCOMZNIdW2/7S26w0LyU8euiLVzFBL3dXPwVCq/ODnf2vA==", - "cpu": [ - "arm64" - ], - "license": "Apache-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - }, - "optionalDependencies": { - "@img/sharp-libvips-darwin-arm64": "1.2.3" - } - }, - "node_modules/@img/sharp-darwin-x64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.4.tgz", - "integrity": "sha512-rZheupWIoa3+SOdF/IcUe1ah4ZDpKBGWcsPX6MT0lYniH9micvIU7HQkYTfrx5Xi8u+YqwLtxC/3vl8TQN6rMg==", - "cpu": [ - "x64" - ], - "license": "Apache-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - }, - "optionalDependencies": { - "@img/sharp-libvips-darwin-x64": "1.2.3" - } - }, - "node_modules/@img/sharp-libvips-darwin-arm64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.3.tgz", - "integrity": "sha512-QzWAKo7kpHxbuHqUC28DZ9pIKpSi2ts2OJnoIGI26+HMgq92ZZ4vk8iJd4XsxN+tYfNJxzH6W62X5eTcsBymHw==", - "cpu": [ - "arm64" - ], - "license": "LGPL-3.0-or-later", - "optional": true, - "os": [ - "darwin" - ], - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@img/sharp-libvips-darwin-x64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.3.tgz", - "integrity": "sha512-Ju+g2xn1E2AKO6YBhxjj+ACcsPQRHT0bhpglxcEf+3uyPY+/gL8veniKoo96335ZaPo03bdDXMv0t+BBFAbmRA==", - "cpu": [ - "x64" - ], - "license": "LGPL-3.0-or-later", - "optional": true, - "os": [ - "darwin" - ], - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@img/sharp-libvips-linux-arm": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.3.tgz", - "integrity": "sha512-x1uE93lyP6wEwGvgAIV0gP6zmaL/a0tGzJs/BIDDG0zeBhMnuUPm7ptxGhUbcGs4okDJrk4nxgrmxpib9g6HpA==", - "cpu": [ - "arm" - ], - "license": "LGPL-3.0-or-later", - "optional": true, - "os": [ - "linux" - ], - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@img/sharp-libvips-linux-arm64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.3.tgz", - "integrity": "sha512-I4RxkXU90cpufazhGPyVujYwfIm9Nk1QDEmiIsaPwdnm013F7RIceaCc87kAH+oUB1ezqEvC6ga4m7MSlqsJvQ==", - "cpu": [ - "arm64" - ], - "license": "LGPL-3.0-or-later", - "optional": true, - "os": [ - "linux" - ], - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@img/sharp-libvips-linux-ppc64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.3.tgz", - "integrity": "sha512-Y2T7IsQvJLMCBM+pmPbM3bKT/yYJvVtLJGfCs4Sp95SjvnFIjynbjzsa7dY1fRJX45FTSfDksbTp6AGWudiyCg==", - "cpu": [ - "ppc64" - ], - "license": "LGPL-3.0-or-later", - "optional": true, - "os": [ - "linux" - ], - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@img/sharp-libvips-linux-s390x": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.3.tgz", - "integrity": "sha512-RgWrs/gVU7f+K7P+KeHFaBAJlNkD1nIZuVXdQv6S+fNA6syCcoboNjsV2Pou7zNlVdNQoQUpQTk8SWDHUA3y/w==", - "cpu": [ - "s390x" - ], - "license": "LGPL-3.0-or-later", - "optional": true, - "os": [ - "linux" - ], - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@img/sharp-libvips-linux-x64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.3.tgz", - "integrity": "sha512-3JU7LmR85K6bBiRzSUc/Ff9JBVIFVvq6bomKE0e63UXGeRw2HPVEjoJke1Yx+iU4rL7/7kUjES4dZ/81Qjhyxg==", - "cpu": [ - "x64" - ], - "license": "LGPL-3.0-or-later", - "optional": true, - "os": [ - "linux" - ], - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@img/sharp-libvips-linuxmusl-arm64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.3.tgz", - "integrity": "sha512-F9q83RZ8yaCwENw1GieztSfj5msz7GGykG/BA+MOUefvER69K/ubgFHNeSyUu64amHIYKGDs4sRCMzXVj8sEyw==", - "cpu": [ - "arm64" - ], - "license": "LGPL-3.0-or-later", - "optional": true, - "os": [ - "linux" - ], - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@img/sharp-libvips-linuxmusl-x64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.3.tgz", - "integrity": "sha512-U5PUY5jbc45ANM6tSJpsgqmBF/VsL6LnxJmIf11kB7J5DctHgqm0SkuXzVWtIY90GnJxKnC/JT251TDnk1fu/g==", - "cpu": [ - "x64" - ], - "license": "LGPL-3.0-or-later", - "optional": true, - "os": [ - "linux" - ], - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@img/sharp-linux-arm": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.4.tgz", - "integrity": "sha512-Xyam4mlqM0KkTHYVSuc6wXRmM7LGN0P12li03jAnZ3EJWZqj83+hi8Y9UxZUbxsgsK1qOEwg7O0Bc0LjqQVtxA==", - "cpu": [ - "arm" - ], - "license": "Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - }, - "optionalDependencies": { - "@img/sharp-libvips-linux-arm": "1.2.3" - } - }, - "node_modules/@img/sharp-linux-arm64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.4.tgz", - "integrity": "sha512-YXU1F/mN/Wu786tl72CyJjP/Ngl8mGHN1hST4BGl+hiW5jhCnV2uRVTNOcaYPs73NeT/H8Upm3y9582JVuZHrQ==", - "cpu": [ - "arm64" - ], - "license": "Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - }, - "optionalDependencies": { - "@img/sharp-libvips-linux-arm64": "1.2.3" - } - }, - "node_modules/@img/sharp-linux-ppc64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.4.tgz", - "integrity": "sha512-F4PDtF4Cy8L8hXA2p3TO6s4aDt93v+LKmpcYFLAVdkkD3hSxZzee0rh6/+94FpAynsuMpLX5h+LRsSG3rIciUQ==", - "cpu": [ - "ppc64" - ], - "license": "Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - }, - "optionalDependencies": { - "@img/sharp-libvips-linux-ppc64": "1.2.3" - } - }, - "node_modules/@img/sharp-linux-s390x": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.4.tgz", - "integrity": "sha512-qVrZKE9Bsnzy+myf7lFKvng6bQzhNUAYcVORq2P7bDlvmF6u2sCmK2KyEQEBdYk+u3T01pVsPrkj943T1aJAsw==", - "cpu": [ - "s390x" - ], - "license": "Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - }, - "optionalDependencies": { - "@img/sharp-libvips-linux-s390x": "1.2.3" - } - }, - "node_modules/@img/sharp-linux-x64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.4.tgz", - "integrity": "sha512-ZfGtcp2xS51iG79c6Vhw9CWqQC8l2Ot8dygxoDoIQPTat/Ov3qAa8qpxSrtAEAJW+UjTXc4yxCjNfxm4h6Xm2A==", - "cpu": [ - "x64" - ], - "license": "Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - }, - "optionalDependencies": { - "@img/sharp-libvips-linux-x64": "1.2.3" - } - }, - "node_modules/@img/sharp-linuxmusl-arm64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.4.tgz", - "integrity": "sha512-8hDVvW9eu4yHWnjaOOR8kHVrew1iIX+MUgwxSuH2XyYeNRtLUe4VNioSqbNkB7ZYQJj9rUTT4PyRscyk2PXFKA==", - "cpu": [ - "arm64" - ], - "license": "Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - }, - "optionalDependencies": { - "@img/sharp-libvips-linuxmusl-arm64": "1.2.3" - } - }, - "node_modules/@img/sharp-linuxmusl-x64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.4.tgz", - "integrity": "sha512-lU0aA5L8QTlfKjpDCEFOZsTYGn3AEiO6db8W5aQDxj0nQkVrZWmN3ZP9sYKWJdtq3PWPhUNlqehWyXpYDcI9Sg==", - "cpu": [ - "x64" - ], - "license": "Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - }, - "optionalDependencies": { - "@img/sharp-libvips-linuxmusl-x64": "1.2.3" - } - }, - "node_modules/@img/sharp-wasm32": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.4.tgz", - "integrity": "sha512-33QL6ZO/qpRyG7woB/HUALz28WnTMI2W1jgX3Nu2bypqLIKx/QKMILLJzJjI+SIbvXdG9fUnmrxR7vbi1sTBeA==", - "cpu": [ - "wasm32" - ], - "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", - "optional": true, - "dependencies": { - "@emnapi/runtime": "^1.5.0" - }, - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@img/sharp-win32-arm64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.4.tgz", - "integrity": "sha512-2Q250do/5WXTwxW3zjsEuMSv5sUU4Tq9VThWKlU2EYLm4MB7ZeMwF+SFJutldYODXF6jzc6YEOC+VfX0SZQPqA==", - "cpu": [ - "arm64" - ], - "license": "Apache-2.0 AND LGPL-3.0-or-later", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@img/sharp-win32-ia32": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.4.tgz", - "integrity": "sha512-3ZeLue5V82dT92CNL6rsal6I2weKw1cYu+rGKm8fOCCtJTR2gYeUfY3FqUnIJsMUPIH68oS5jmZ0NiJ508YpEw==", - "cpu": [ - "ia32" - ], - "license": "Apache-2.0 AND LGPL-3.0-or-later", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@img/sharp-win32-x64": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.4.tgz", - "integrity": "sha512-xIyj4wpYs8J18sVN3mSQjwrw7fKUqRw+Z5rnHNCy5fYTxigBz81u5mOMPmFumwjcn8+ld1ppptMBCLic1nz6ig==", - "cpu": [ - "x64" - ], - "license": "Apache-2.0 AND LGPL-3.0-or-later", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - } - }, - "node_modules/@isaacs/fs-minipass": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", - "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.4" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", - "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.0", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "node_modules/@jridgewell/remapping": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", - "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", - "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", - "dev": true, - "license": "MIT" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.31", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", - "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@next/env": { - "version": "15.5.3", - "resolved": "https://registry.npmjs.org/@next/env/-/env-15.5.3.tgz", - "integrity": "sha512-RSEDTRqyihYXygx/OJXwvVupfr9m04+0vH8vyy0HfZ7keRto6VX9BbEk0J2PUk0VGy6YhklJUSrgForov5F9pw==", - "license": "MIT" - }, - "node_modules/@next/swc-darwin-arm64": { - "version": "15.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.3.tgz", - "integrity": "sha512-nzbHQo69+au9wJkGKTU9lP7PXv0d1J5ljFpvb+LnEomLtSbJkbZyEs6sbF3plQmiOB2l9OBtN2tNSvCH1nQ9Jg==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-darwin-x64": { - "version": "15.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.3.tgz", - "integrity": "sha512-w83w4SkOOhekJOcA5HBvHyGzgV1W/XvOfpkrxIse4uPWhYTTRwtGEM4v/jiXwNSJvfRvah0H8/uTLBKRXlef8g==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-linux-arm64-gnu": { - "version": "15.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.3.tgz", - "integrity": "sha512-+m7pfIs0/yvgVu26ieaKrifV8C8yiLe7jVp9SpcIzg7XmyyNE7toC1fy5IOQozmr6kWl/JONC51osih2RyoXRw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-linux-arm64-musl": { - "version": "15.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.3.tgz", - "integrity": "sha512-u3PEIzuguSenoZviZJahNLgCexGFhso5mxWCrrIMdvpZn6lkME5vc/ADZG8UUk5K1uWRy4hqSFECrON6UKQBbQ==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-linux-x64-gnu": { - "version": "15.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.3.tgz", - "integrity": "sha512-lDtOOScYDZxI2BENN9m0pfVPJDSuUkAD1YXSvlJF0DKwZt0WlA7T7o3wrcEr4Q+iHYGzEaVuZcsIbCps4K27sA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-linux-x64-musl": { - "version": "15.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.3.tgz", - "integrity": "sha512-9vWVUnsx9PrY2NwdVRJ4dUURAQ8Su0sLRPqcCCxtX5zIQUBES12eRVHq6b70bbfaVaxIDGJN2afHui0eDm+cLg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-win32-arm64-msvc": { - "version": "15.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.3.tgz", - "integrity": "sha512-1CU20FZzY9LFQigRi6jM45oJMU3KziA5/sSG+dXeVaTm661snQP6xu3ykGxxwU5sLG3sh14teO/IOEPVsQMRfA==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-win32-x64-msvc": { - "version": "15.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.3.tgz", - "integrity": "sha512-JMoLAq3n3y5tKXPQwCK5c+6tmwkuFDa2XAxz8Wm4+IVthdBZdZGh+lmiLUHg9f9IDwIQpUjp+ysd6OkYTyZRZw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@smithy/abort-controller": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.1.1.tgz", - "integrity": "sha512-vkzula+IwRvPR6oKQhMYioM3A/oX/lFCZiwuxkQbRhqJS2S4YRY2k7k/SyR2jMf3607HLtbEwlRxi0ndXHMjRg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/chunked-blob-reader": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.1.0.tgz", - "integrity": "sha512-a36AtR7Q7XOhRPt6F/7HENmTWcB8kN7mDJcOFM/+FuKO6x88w8MQJfYCufMWh4fGyVkPjUh3Rrz/dnqFQdo6OQ==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/chunked-blob-reader-native": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.1.0.tgz", - "integrity": "sha512-Bnv0B3nSlfB2mPO0WgM49I/prl7+kamF042rrf3ezJ3Z4C7csPYvyYgZfXTGXwXfj1mAwDWjE/ybIf49PzFzvA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-base64": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/config-resolver": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.2.2.tgz", - "integrity": "sha512-IT6MatgBWagLybZl1xQcURXRICvqz1z3APSCAI9IqdvfCkrA7RaQIEfgC6G/KvfxnDfQUDqFV+ZlixcuFznGBQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/node-config-provider": "^4.2.2", - "@smithy/types": "^4.5.0", - "@smithy/util-config-provider": "^4.1.0", - "@smithy/util-middleware": "^4.1.1", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/core": { - "version": "3.11.1", - "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.11.1.tgz", - "integrity": "sha512-REH7crwORgdjSpYs15JBiIWOYjj0hJNC3aCecpJvAlMMaaqL5i2CLb1i6Hc4yevToTKSqslLMI9FKjhugEwALA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/middleware-serde": "^4.1.1", - "@smithy/protocol-http": "^5.2.1", - "@smithy/types": "^4.5.0", - "@smithy/util-base64": "^4.1.0", - "@smithy/util-body-length-browser": "^4.1.0", - "@smithy/util-middleware": "^4.1.1", - "@smithy/util-stream": "^4.3.2", - "@smithy/util-utf8": "^4.1.0", - "@types/uuid": "^9.0.1", - "tslib": "^2.6.2", - "uuid": "^9.0.1" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/credential-provider-imds": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.1.2.tgz", - "integrity": "sha512-JlYNq8TShnqCLg0h+afqe2wLAwZpuoSgOyzhYvTgbiKBWRov+uUve+vrZEQO6lkdLOWPh7gK5dtb9dS+KGendg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/node-config-provider": "^4.2.2", - "@smithy/property-provider": "^4.1.1", - "@smithy/types": "^4.5.0", - "@smithy/url-parser": "^4.1.1", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/eventstream-codec": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-4.1.1.tgz", - "integrity": "sha512-PwkQw1hZwHTQB6X5hSUWz2OSeuj5Z6enWuAqke7DgWoP3t6vg3ktPpqPz3Erkn6w+tmsl8Oss6nrgyezoea2Iw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/crc32": "5.2.0", - "@smithy/types": "^4.5.0", - "@smithy/util-hex-encoding": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/eventstream-serde-browser": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.1.1.tgz", - "integrity": "sha512-Q9QWdAzRaIuVkefupRPRFAasaG/droBqn1feiMnmLa+LLEUG45pqX1+FurHFmlqiCfobB3nUlgoJfeXZsr7MPA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/eventstream-serde-universal": "^4.1.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/eventstream-serde-config-resolver": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.2.1.tgz", - "integrity": "sha512-oSUkF9zDN9zcOUBMtxp8RewJlh71E9NoHWU8jE3hU9JMYCsmW4assVTpgic/iS3/dM317j6hO5x18cc3XrfvEw==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/eventstream-serde-node": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.1.1.tgz", - "integrity": "sha512-tn6vulwf/ScY0vjhzptSJuDJJqlhNtUjkxJ4wiv9E3SPoEqTEKbaq6bfqRO7nvhTG29ALICRcvfFheOUPl8KNA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/eventstream-serde-universal": "^4.1.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/eventstream-serde-universal": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.1.1.tgz", - "integrity": "sha512-uLOAiM/Dmgh2CbEXQx+6/ssK7fbzFhd+LjdyFxXid5ZBCbLHTFHLdD/QbXw5aEDsLxQhgzDxLLsZhsftAYwHJA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/eventstream-codec": "^4.1.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/fetch-http-handler": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.2.1.tgz", - "integrity": "sha512-5/3wxKNtV3wO/hk1is+CZUhL8a1yy/U+9u9LKQ9kZTkMsHaQjJhc3stFfiujtMnkITjzWfndGA2f7g9Uh9vKng==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/protocol-http": "^5.2.1", - "@smithy/querystring-builder": "^4.1.1", - "@smithy/types": "^4.5.0", - "@smithy/util-base64": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/hash-blob-browser": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-4.1.1.tgz", - "integrity": "sha512-avAtk++s1e/1VODf+rg7c9R2pB5G9y8yaJaGY4lPZI2+UIqVyuSDMikWjeWfBVmFZ3O7NpDxBbUCyGhThVUKWQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/chunked-blob-reader": "^5.1.0", - "@smithy/chunked-blob-reader-native": "^4.1.0", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/hash-node": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.1.1.tgz", - "integrity": "sha512-H9DIU9WBLhYrvPs9v4sYvnZ1PiAI0oc8CgNQUJ1rpN3pP7QADbTOUjchI2FB764Ub0DstH5xbTqcMJu1pnVqxA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "@smithy/util-buffer-from": "^4.1.0", - "@smithy/util-utf8": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/hash-stream-node": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-4.1.1.tgz", - "integrity": "sha512-3ztT4pV0Moazs3JAYFdfKk11kYFDo4b/3R3+xVjIm6wY9YpJf+xfz+ocEnNKcWAdcmSMqi168i2EMaKmJHbJMA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "@smithy/util-utf8": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/invalid-dependency": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.1.1.tgz", - "integrity": "sha512-1AqLyFlfrrDkyES8uhINRlJXmHA2FkG+3DY8X+rmLSqmFwk3DJnvhyGzyByPyewh2jbmV+TYQBEfngQax8IFGg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/is-array-buffer": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.1.0.tgz", - "integrity": "sha512-ePTYUOV54wMogio+he4pBybe8fwg4sDvEVDBU8ZlHOZXbXK3/C0XfJgUCu6qAZcawv05ZhZzODGUerFBPsPUDQ==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/md5-js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-4.1.1.tgz", - "integrity": "sha512-MvWXKK743BuHjr/hnWuT6uStdKEaoqxHAQUvbKJPPZM5ZojTNFI5D+47BoQfBE5RgGlRRty05EbWA+NXDv+hIA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "@smithy/util-utf8": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/middleware-content-length": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.1.1.tgz", - "integrity": "sha512-9wlfBBgTsRvC2JxLJxv4xDGNBrZuio3AgSl0lSFX7fneW2cGskXTYpFxCdRYD2+5yzmsiTuaAJD1Wp7gWt9y9w==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/protocol-http": "^5.2.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/middleware-endpoint": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.2.3.tgz", - "integrity": "sha512-+1H5A28DeffRVrqmVmtqtRraEjoaC6JVap3xEQdVoBh2EagCVY7noPmcBcG4y7mnr9AJitR1ZAse2l+tEtK5vg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/core": "^3.11.1", - "@smithy/middleware-serde": "^4.1.1", - "@smithy/node-config-provider": "^4.2.2", - "@smithy/shared-ini-file-loader": "^4.2.0", - "@smithy/types": "^4.5.0", - "@smithy/url-parser": "^4.1.1", - "@smithy/util-middleware": "^4.1.1", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/middleware-retry": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.2.4.tgz", - "integrity": "sha512-amyqYQFewnAviX3yy/rI/n1HqAgfvUdkEhc04kDjxsngAUREKuOI24iwqQUirrj6GtodWmR4iO5Zeyl3/3BwWg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/node-config-provider": "^4.2.2", - "@smithy/protocol-http": "^5.2.1", - "@smithy/service-error-classification": "^4.1.2", - "@smithy/smithy-client": "^4.6.3", - "@smithy/types": "^4.5.0", - "@smithy/util-middleware": "^4.1.1", - "@smithy/util-retry": "^4.1.2", - "@types/uuid": "^9.0.1", - "tslib": "^2.6.2", - "uuid": "^9.0.1" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/middleware-serde": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.1.1.tgz", - "integrity": "sha512-lh48uQdbCoj619kRouev5XbWhCwRKLmphAif16c4J6JgJ4uXjub1PI6RL38d3BLliUvSso6klyB/LTNpWSNIyg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/protocol-http": "^5.2.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/middleware-stack": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.1.1.tgz", - "integrity": "sha512-ygRnniqNcDhHzs6QAPIdia26M7e7z9gpkIMUe/pK0RsrQ7i5MblwxY8078/QCnGq6AmlUUWgljK2HlelsKIb/A==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/node-config-provider": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.2.2.tgz", - "integrity": "sha512-SYGTKyPvyCfEzIN5rD8q/bYaOPZprYUPD2f5g9M7OjaYupWOoQFYJ5ho+0wvxIRf471i2SR4GoiZ2r94Jq9h6A==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/property-provider": "^4.1.1", - "@smithy/shared-ini-file-loader": "^4.2.0", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/node-http-handler": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.2.1.tgz", - "integrity": "sha512-REyybygHlxo3TJICPF89N2pMQSf+p+tBJqpVe1+77Cfi9HBPReNjTgtZ1Vg73exq24vkqJskKDpfF74reXjxfw==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/abort-controller": "^4.1.1", - "@smithy/protocol-http": "^5.2.1", - "@smithy/querystring-builder": "^4.1.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/property-provider": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.1.1.tgz", - "integrity": "sha512-gm3ZS7DHxUbzC2wr8MUCsAabyiXY0gaj3ROWnhSx/9sPMc6eYLMM4rX81w1zsMaObj2Lq3PZtNCC1J6lpEY7zg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/protocol-http": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.2.1.tgz", - "integrity": "sha512-T8SlkLYCwfT/6m33SIU/JOVGNwoelkrvGjFKDSDtVvAXj/9gOT78JVJEas5a+ETjOu4SVvpCstKgd0PxSu/aHw==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/querystring-builder": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.1.1.tgz", - "integrity": "sha512-J9b55bfimP4z/Jg1gNo+AT84hr90p716/nvxDkPGCD4W70MPms0h8KF50RDRgBGZeL83/u59DWNqJv6tEP/DHA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "@smithy/util-uri-escape": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/querystring-parser": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.1.1.tgz", - "integrity": "sha512-63TEp92YFz0oQ7Pj9IuI3IgnprP92LrZtRAkE3c6wLWJxfy/yOPRt39IOKerVr0JS770olzl0kGafXlAXZ1vng==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/service-error-classification": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.1.2.tgz", - "integrity": "sha512-Kqd8wyfmBWHZNppZSMfrQFpc3M9Y/kjyN8n8P4DqJJtuwgK1H914R471HTw7+RL+T7+kI1f1gOnL7Vb5z9+NgQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/shared-ini-file-loader": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.2.0.tgz", - "integrity": "sha512-OQTfmIEp2LLuWdxa8nEEPhZmiOREO6bcB6pjs0AySf4yiZhl6kMOfqmcwcY8BaBPX+0Tb+tG7/Ia/6mwpoZ7Pw==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/signature-v4": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.2.1.tgz", - "integrity": "sha512-M9rZhWQLjlQVCCR37cSjHfhriGRN+FQ8UfgrYNufv66TJgk+acaggShl3KS5U/ssxivvZLlnj7QH2CUOKlxPyA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^4.1.0", - "@smithy/protocol-http": "^5.2.1", - "@smithy/types": "^4.5.0", - "@smithy/util-hex-encoding": "^4.1.0", - "@smithy/util-middleware": "^4.1.1", - "@smithy/util-uri-escape": "^4.1.0", - "@smithy/util-utf8": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/smithy-client": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.6.3.tgz", - "integrity": "sha512-K27LqywsaqKz4jusdUQYJh/YP2VbnbdskZ42zG8xfV+eovbTtMc2/ZatLWCfSkW0PDsTUXlpvlaMyu8925HsOw==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/core": "^3.11.1", - "@smithy/middleware-endpoint": "^4.2.3", - "@smithy/middleware-stack": "^4.1.1", - "@smithy/protocol-http": "^5.2.1", - "@smithy/types": "^4.5.0", - "@smithy/util-stream": "^4.3.2", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/types": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.5.0.tgz", - "integrity": "sha512-RkUpIOsVlAwUIZXO1dsz8Zm+N72LClFfsNqf173catVlvRZiwPy0x2u0JLEA4byreOPKDZPGjmPDylMoP8ZJRg==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/url-parser": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.1.1.tgz", - "integrity": "sha512-bx32FUpkhcaKlEoOMbScvc93isaSiRM75pQ5IgIBaMkT7qMlIibpPRONyx/0CvrXHzJLpOn/u6YiDX2hcvs7Dg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/querystring-parser": "^4.1.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-base64": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.1.0.tgz", - "integrity": "sha512-RUGd4wNb8GeW7xk+AY5ghGnIwM96V0l2uzvs/uVHf+tIuVX2WSvynk5CxNoBCsM2rQRSZElAo9rt3G5mJ/gktQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^4.1.0", - "@smithy/util-utf8": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-body-length-browser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.1.0.tgz", - "integrity": "sha512-V2E2Iez+bo6bUMOTENPr6eEmepdY8Hbs+Uc1vkDKgKNA/brTJqOW/ai3JO1BGj9GbCeLqw90pbbH7HFQyFotGQ==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-body-length-node": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.1.0.tgz", - "integrity": "sha512-BOI5dYjheZdgR9XiEM3HJcEMCXSoqbzu7CzIgYrx0UtmvtC3tC2iDGpJLsSRFffUpy8ymsg2ARMP5fR8mtuUQQ==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-buffer-from": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.1.0.tgz", - "integrity": "sha512-N6yXcjfe/E+xKEccWEKzK6M+crMrlwaCepKja0pNnlSkm6SjAeLKKA++er5Ba0I17gvKfN/ThV+ZOx/CntKTVw==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-config-provider": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.1.0.tgz", - "integrity": "sha512-swXz2vMjrP1ZusZWVTB/ai5gK+J8U0BWvP10v9fpcFvg+Xi/87LHvHfst2IgCs1i0v4qFZfGwCmeD/KNCdJZbQ==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-defaults-mode-browser": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.1.3.tgz", - "integrity": "sha512-5fm3i2laE95uhY6n6O6uGFxI5SVbqo3/RWEuS3YsT0LVmSZk+0eUqPhKd4qk0KxBRPaT5VNT/WEBUqdMyYoRgg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/property-provider": "^4.1.1", - "@smithy/smithy-client": "^4.6.3", - "@smithy/types": "^4.5.0", - "bowser": "^2.11.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-defaults-mode-node": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.1.3.tgz", - "integrity": "sha512-lwnMzlMslZ9GJNt+/wVjz6+fe9Wp5tqR1xAyQn+iywmP+Ymj0F6NhU/KfHM5jhGPQchRSCcau5weKhFdLIM4cA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/config-resolver": "^4.2.2", - "@smithy/credential-provider-imds": "^4.1.2", - "@smithy/node-config-provider": "^4.2.2", - "@smithy/property-provider": "^4.1.1", - "@smithy/smithy-client": "^4.6.3", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-endpoints": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.1.2.tgz", - "integrity": "sha512-+AJsaaEGb5ySvf1SKMRrPZdYHRYSzMkCoK16jWnIMpREAnflVspMIDeCVSZJuj+5muZfgGpNpijE3mUNtjv01Q==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/node-config-provider": "^4.2.2", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-hex-encoding": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.1.0.tgz", - "integrity": "sha512-1LcueNN5GYC4tr8mo14yVYbh/Ur8jHhWOxniZXii+1+ePiIbsLZ5fEI0QQGtbRRP5mOhmooos+rLmVASGGoq5w==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-middleware": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.1.1.tgz", - "integrity": "sha512-CGmZ72mL29VMfESz7S6dekqzCh8ZISj3B+w0g1hZFXaOjGTVaSqfAEFAq8EGp8fUL+Q2l8aqNmt8U1tglTikeg==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-retry": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.1.2.tgz", - "integrity": "sha512-NCgr1d0/EdeP6U5PSZ9Uv5SMR5XRRYoVr1kRVtKZxWL3tixEL3UatrPIMFZSKwHlCcp2zPLDvMubVDULRqeunA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/service-error-classification": "^4.1.2", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-stream": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.3.2.tgz", - "integrity": "sha512-Ka+FA2UCC/Q1dEqUanCdpqwxOFdf5Dg2VXtPtB1qxLcSGh5C1HdzklIt18xL504Wiy9nNUKwDMRTVCbKGoK69g==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/fetch-http-handler": "^5.2.1", - "@smithy/node-http-handler": "^4.2.1", - "@smithy/types": "^4.5.0", - "@smithy/util-base64": "^4.1.0", - "@smithy/util-buffer-from": "^4.1.0", - "@smithy/util-hex-encoding": "^4.1.0", - "@smithy/util-utf8": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-uri-escape": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.1.0.tgz", - "integrity": "sha512-b0EFQkq35K5NHUYxU72JuoheM6+pytEVUGlTwiFxWFpmddA+Bpz3LgsPRIpBk8lnPE47yT7AF2Egc3jVnKLuPg==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-utf8": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.1.0.tgz", - "integrity": "sha512-mEu1/UIXAdNYuBcyEPbjScKi/+MQVXNIuY/7Cm5XLIWe319kDrT5SizBE95jqtmEXoDbGoZxKLCMttdZdqTZKQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^4.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@smithy/util-waiter": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-4.1.1.tgz", - "integrity": "sha512-PJBmyayrlfxM7nbqjomF4YcT1sApQwZio0NHSsT0EzhJqljRmvhzqZua43TyEs80nJk2Cn2FGPg/N8phH6KeCQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/abort-controller": "^4.1.1", - "@smithy/types": "^4.5.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/@swc/helpers": { - "version": "0.5.15", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz", - "integrity": "sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.8.0" - } - }, - "node_modules/@tailwindcss/node": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.13.tgz", - "integrity": "sha512-eq3ouolC1oEFOAvOMOBAmfCIqZBJuvWvvYWh5h5iOYfe1HFC6+GZ6EIL0JdM3/niGRJmnrOc+8gl9/HGUaaptw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/remapping": "^2.3.4", - "enhanced-resolve": "^5.18.3", - "jiti": "^2.5.1", - "lightningcss": "1.30.1", - "magic-string": "^0.30.18", - "source-map-js": "^1.2.1", - "tailwindcss": "4.1.13" - } - }, - "node_modules/@tailwindcss/oxide": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.13.tgz", - "integrity": "sha512-CPgsM1IpGRa880sMbYmG1s4xhAy3xEt1QULgTJGQmZUeNgXFR7s1YxYygmJyBGtou4SyEosGAGEeYqY7R53bIA==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "detect-libc": "^2.0.4", - "tar": "^7.4.3" - }, - "engines": { - "node": ">= 10" - }, - "optionalDependencies": { - "@tailwindcss/oxide-android-arm64": "4.1.13", - "@tailwindcss/oxide-darwin-arm64": "4.1.13", - "@tailwindcss/oxide-darwin-x64": "4.1.13", - "@tailwindcss/oxide-freebsd-x64": "4.1.13", - "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.13", - "@tailwindcss/oxide-linux-arm64-gnu": "4.1.13", - "@tailwindcss/oxide-linux-arm64-musl": "4.1.13", - "@tailwindcss/oxide-linux-x64-gnu": "4.1.13", - "@tailwindcss/oxide-linux-x64-musl": "4.1.13", - "@tailwindcss/oxide-wasm32-wasi": "4.1.13", - "@tailwindcss/oxide-win32-arm64-msvc": "4.1.13", - "@tailwindcss/oxide-win32-x64-msvc": "4.1.13" - } - }, - "node_modules/@tailwindcss/oxide-android-arm64": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.13.tgz", - "integrity": "sha512-BrpTrVYyejbgGo57yc8ieE+D6VT9GOgnNdmh5Sac6+t0m+v+sKQevpFVpwX3pBrM2qKrQwJ0c5eDbtjouY/+ew==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-darwin-arm64": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.13.tgz", - "integrity": "sha512-YP+Jksc4U0KHcu76UhRDHq9bx4qtBftp9ShK/7UGfq0wpaP96YVnnjFnj3ZFrUAjc5iECzODl/Ts0AN7ZPOANQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-darwin-x64": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.13.tgz", - "integrity": "sha512-aAJ3bbwrn/PQHDxCto9sxwQfT30PzyYJFG0u/BWZGeVXi5Hx6uuUOQEI2Fa43qvmUjTRQNZnGqe9t0Zntexeuw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-freebsd-x64": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.13.tgz", - "integrity": "sha512-Wt8KvASHwSXhKE/dJLCCWcTSVmBj3xhVhp/aF3RpAhGeZ3sVo7+NTfgiN8Vey/Fi8prRClDs6/f0KXPDTZE6nQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.13.tgz", - "integrity": "sha512-mbVbcAsW3Gkm2MGwA93eLtWrwajz91aXZCNSkGTx/R5eb6KpKD5q8Ueckkh9YNboU8RH7jiv+ol/I7ZyQ9H7Bw==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-linux-arm64-gnu": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.13.tgz", - "integrity": "sha512-wdtfkmpXiwej/yoAkrCP2DNzRXCALq9NVLgLELgLim1QpSfhQM5+ZxQQF8fkOiEpuNoKLp4nKZ6RC4kmeFH0HQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-linux-arm64-musl": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.13.tgz", - "integrity": "sha512-hZQrmtLdhyqzXHB7mkXfq0IYbxegaqTmfa1p9MBj72WPoDD3oNOh1Lnxf6xZLY9C3OV6qiCYkO1i/LrzEdW2mg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-linux-x64-gnu": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.13.tgz", - "integrity": "sha512-uaZTYWxSXyMWDJZNY1Ul7XkJTCBRFZ5Fo6wtjrgBKzZLoJNrG+WderJwAjPzuNZOnmdrVg260DKwXCFtJ/hWRQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-linux-x64-musl": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.13.tgz", - "integrity": "sha512-oXiPj5mi4Hdn50v5RdnuuIms0PVPI/EG4fxAfFiIKQh5TgQgX7oSuDWntHW7WNIi/yVLAiS+CRGW4RkoGSSgVQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.13.tgz", - "integrity": "sha512-+LC2nNtPovtrDwBc/nqnIKYh/W2+R69FA0hgoeOn64BdCX522u19ryLh3Vf3F8W49XBcMIxSe665kwy21FkhvA==", - "bundleDependencies": [ - "@napi-rs/wasm-runtime", - "@emnapi/core", - "@emnapi/runtime", - "@tybys/wasm-util", - "@emnapi/wasi-threads", - "tslib" - ], - "cpu": [ - "wasm32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/core": "^1.4.5", - "@emnapi/runtime": "^1.4.5", - "@emnapi/wasi-threads": "^1.0.4", - "@napi-rs/wasm-runtime": "^0.2.12", - "@tybys/wasm-util": "^0.10.0", - "tslib": "^2.8.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@tailwindcss/oxide-win32-arm64-msvc": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.13.tgz", - "integrity": "sha512-dziTNeQXtoQ2KBXmrjCxsuPk3F3CQ/yb7ZNZNA+UkNTeiTGgfeh+gH5Pi7mRncVgcPD2xgHvkFCh/MhZWSgyQg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-win32-x64-msvc": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.13.tgz", - "integrity": "sha512-3+LKesjXydTkHk5zXX01b5KMzLV1xl2mcktBJkje7rhFUpUlYJy7IMOLqjIRQncLTa1WZZiFY/foAeB5nmaiTw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/postcss": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.1.13.tgz", - "integrity": "sha512-HLgx6YSFKJT7rJqh9oJs/TkBFhxuMOfUKSBEPYwV+t78POOBsdQ7crhZLzwcH3T0UyUuOzU/GK5pk5eKr3wCiQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@alloc/quick-lru": "^5.2.0", - "@tailwindcss/node": "4.1.13", - "@tailwindcss/oxide": "4.1.13", - "postcss": "^8.4.41", - "tailwindcss": "4.1.13" - } - }, - "node_modules/@types/node": { - "version": "20.19.17", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.17.tgz", - "integrity": "sha512-gfehUI8N1z92kygssiuWvLiwcbOB3IRktR6hTDgJlXMYh5OvkPSRmgfoBUmfZt+vhwJtX7v1Yw4KvvAf7c5QKQ==", - "devOptional": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.21.0" - } - }, - "node_modules/@types/pg": { - "version": "8.15.5", - "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.15.5.tgz", - "integrity": "sha512-LF7lF6zWEKxuT3/OR8wAZGzkg4ENGXFNyiV/JeOt9z5B+0ZVwbql9McqX5c/WStFq1GaGso7H1AzP/qSzmlCKQ==", - "devOptional": true, - "license": "MIT", - "dependencies": { - "@types/node": "*", - "pg-protocol": "*", - "pg-types": "^2.2.0" - } - }, - "node_modules/@types/react": { - "version": "19.1.13", - "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.13.tgz", - "integrity": "sha512-hHkbU/eoO3EG5/MZkuFSKmYqPbSVk5byPFa3e7y/8TybHiLMACgI8seVYlicwk7H5K/rI2px9xrQp/C+AUDTiQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "csstype": "^3.0.2" - } - }, - "node_modules/@types/react-dom": { - "version": "19.1.9", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.1.9.tgz", - "integrity": "sha512-qXRuZaOsAdXKFyOhRBg6Lqqc0yay13vN7KrIg4L7N4aaHN68ma9OK3NE1BoDFgFOTfM7zg+3/8+2n8rLUH3OKQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "@types/react": "^19.0.0" - } - }, - "node_modules/@types/uuid": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz", - "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==", - "license": "MIT" - }, - "node_modules/bowser": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.12.1.tgz", - "integrity": "sha512-z4rE2Gxh7tvshQ4hluIT7XcFrgLIQaw9X3A+kTTRdovCz5PMukm/0QC/BKSYPj3omF5Qfypn9O/c5kgpmvYUCw==", - "license": "MIT" - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "license": "MIT" - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001743", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001743.tgz", - "integrity": "sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "CC-BY-4.0" - }, - "node_modules/chownr": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", - "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", - "dev": true, - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=18" - } - }, - "node_modules/client-only": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", - "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==", - "license": "MIT" - }, - "node_modules/csstype": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", - "dev": true, - "license": "MIT" - }, - "node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/detect-libc": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz", - "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==", - "devOptional": true, - "license": "Apache-2.0", - "engines": { - "node": ">=8" - } - }, - "node_modules/drizzle-kit": { - "version": "0.31.4", - "resolved": "https://registry.npmjs.org/drizzle-kit/-/drizzle-kit-0.31.4.tgz", - "integrity": "sha512-tCPWVZWZqWVx2XUsVpJRnH9Mx0ClVOf5YUHerZ5so1OKSlqww4zy1R5ksEdGRcO3tM3zj0PYN6V48TbQCL1RfA==", - "license": "MIT", - "dependencies": { - "@drizzle-team/brocli": "^0.10.2", - "@esbuild-kit/esm-loader": "^2.5.5", - "esbuild": "^0.25.4", - "esbuild-register": "^3.5.0" - }, - "bin": { - "drizzle-kit": "bin.cjs" - } - }, - "node_modules/drizzle-orm": { - "version": "0.44.5", - "resolved": "https://registry.npmjs.org/drizzle-orm/-/drizzle-orm-0.44.5.tgz", - "integrity": "sha512-jBe37K7d8ZSKptdKfakQFdeljtu3P2Cbo7tJoJSVZADzIKOBo9IAJPOmMsH2bZl90bZgh8FQlD8BjxXA/zuBkQ==", - "license": "Apache-2.0", - "peerDependencies": { - "@aws-sdk/client-rds-data": ">=3", - "@cloudflare/workers-types": ">=4", - "@electric-sql/pglite": ">=0.2.0", - "@libsql/client": ">=0.10.0", - "@libsql/client-wasm": ">=0.10.0", - "@neondatabase/serverless": ">=0.10.0", - "@op-engineering/op-sqlite": ">=2", - "@opentelemetry/api": "^1.4.1", - "@planetscale/database": ">=1.13", - "@prisma/client": "*", - "@tidbcloud/serverless": "*", - "@types/better-sqlite3": "*", - "@types/pg": "*", - "@types/sql.js": "*", - "@upstash/redis": ">=1.34.7", - "@vercel/postgres": ">=0.8.0", - "@xata.io/client": "*", - "better-sqlite3": ">=7", - "bun-types": "*", - "expo-sqlite": ">=14.0.0", - "gel": ">=2", - "knex": "*", - "kysely": "*", - "mysql2": ">=2", - "pg": ">=8", - "postgres": ">=3", - "sql.js": ">=1", - "sqlite3": ">=5" - }, - "peerDependenciesMeta": { - "@aws-sdk/client-rds-data": { - "optional": true - }, - "@cloudflare/workers-types": { - "optional": true - }, - "@electric-sql/pglite": { - "optional": true - }, - "@libsql/client": { - "optional": true - }, - "@libsql/client-wasm": { - "optional": true - }, - "@neondatabase/serverless": { - "optional": true - }, - "@op-engineering/op-sqlite": { - "optional": true - }, - "@opentelemetry/api": { - "optional": true - }, - "@planetscale/database": { - "optional": true - }, - "@prisma/client": { - "optional": true - }, - "@tidbcloud/serverless": { - "optional": true - }, - "@types/better-sqlite3": { - "optional": true - }, - "@types/pg": { - "optional": true - }, - "@types/sql.js": { - "optional": true - }, - "@upstash/redis": { - "optional": true - }, - "@vercel/postgres": { - "optional": true - }, - "@xata.io/client": { - "optional": true - }, - "better-sqlite3": { - "optional": true - }, - "bun-types": { - "optional": true - }, - "expo-sqlite": { - "optional": true - }, - "gel": { - "optional": true - }, - "knex": { - "optional": true - }, - "kysely": { - "optional": true - }, - "mysql2": { - "optional": true - }, - "pg": { - "optional": true - }, - "postgres": { - "optional": true - }, - "prisma": { - "optional": true - }, - "sql.js": { - "optional": true - }, - "sqlite3": { - "optional": true - } - } - }, - "node_modules/enhanced-resolve": { - "version": "5.18.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz", - "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/esbuild": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz", - "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==", - "hasInstallScript": true, - "license": "MIT", - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=18" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.25.10", - "@esbuild/android-arm": "0.25.10", - "@esbuild/android-arm64": "0.25.10", - "@esbuild/android-x64": "0.25.10", - "@esbuild/darwin-arm64": "0.25.10", - "@esbuild/darwin-x64": "0.25.10", - "@esbuild/freebsd-arm64": "0.25.10", - "@esbuild/freebsd-x64": "0.25.10", - "@esbuild/linux-arm": "0.25.10", - "@esbuild/linux-arm64": "0.25.10", - "@esbuild/linux-ia32": "0.25.10", - "@esbuild/linux-loong64": "0.25.10", - "@esbuild/linux-mips64el": "0.25.10", - "@esbuild/linux-ppc64": "0.25.10", - "@esbuild/linux-riscv64": "0.25.10", - "@esbuild/linux-s390x": "0.25.10", - "@esbuild/linux-x64": "0.25.10", - "@esbuild/netbsd-arm64": "0.25.10", - "@esbuild/netbsd-x64": "0.25.10", - "@esbuild/openbsd-arm64": "0.25.10", - "@esbuild/openbsd-x64": "0.25.10", - "@esbuild/openharmony-arm64": "0.25.10", - "@esbuild/sunos-x64": "0.25.10", - "@esbuild/win32-arm64": "0.25.10", - "@esbuild/win32-ia32": "0.25.10", - "@esbuild/win32-x64": "0.25.10" - } - }, - "node_modules/esbuild-register": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.6.0.tgz", - "integrity": "sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg==", - "license": "MIT", - "dependencies": { - "debug": "^4.3.4" - }, - "peerDependencies": { - "esbuild": ">=0.12 <1" - } - }, - "node_modules/fast-xml-parser": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz", - "integrity": "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/NaturalIntelligence" - } - ], - "license": "MIT", - "dependencies": { - "strnum": "^2.1.0" - }, - "bin": { - "fxparser": "src/cli/cli.js" - } - }, - "node_modules/get-tsconfig": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz", - "integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==", - "license": "MIT", - "dependencies": { - "resolve-pkg-maps": "^1.0.0" - }, - "funding": { - "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/jiti": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.5.1.tgz", - "integrity": "sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==", - "dev": true, - "license": "MIT", - "bin": { - "jiti": "lib/jiti-cli.mjs" - } - }, - "node_modules/lightningcss": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.1.tgz", - "integrity": "sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==", - "dev": true, - "license": "MPL-2.0", - "dependencies": { - "detect-libc": "^2.0.3" - }, - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - }, - "optionalDependencies": { - "lightningcss-darwin-arm64": "1.30.1", - "lightningcss-darwin-x64": "1.30.1", - "lightningcss-freebsd-x64": "1.30.1", - "lightningcss-linux-arm-gnueabihf": "1.30.1", - "lightningcss-linux-arm64-gnu": "1.30.1", - "lightningcss-linux-arm64-musl": "1.30.1", - "lightningcss-linux-x64-gnu": "1.30.1", - "lightningcss-linux-x64-musl": "1.30.1", - "lightningcss-win32-arm64-msvc": "1.30.1", - "lightningcss-win32-x64-msvc": "1.30.1" - } - }, - "node_modules/lightningcss-darwin-arm64": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.1.tgz", - "integrity": "sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-darwin-x64": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.1.tgz", - "integrity": "sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-freebsd-x64": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.1.tgz", - "integrity": "sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-arm-gnueabihf": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.1.tgz", - "integrity": "sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-arm64-gnu": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.1.tgz", - "integrity": "sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-arm64-musl": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.1.tgz", - "integrity": "sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-x64-gnu": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.1.tgz", - "integrity": "sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-x64-musl": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.1.tgz", - "integrity": "sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-win32-arm64-msvc": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.1.tgz", - "integrity": "sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-win32-x64-msvc": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.1.tgz", - "integrity": "sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/magic-string": { - "version": "0.30.19", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.19.tgz", - "integrity": "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.5" - } - }, - "node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/minizlib": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz", - "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^7.1.2" - }, - "engines": { - "node": ">= 18" - } - }, - "node_modules/mkdirp": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", - "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", - "dev": true, - "license": "MIT", - "bin": { - "mkdirp": "dist/cjs/src/bin.js" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" - }, - "node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/next": { - "version": "15.5.3", - "resolved": "https://registry.npmjs.org/next/-/next-15.5.3.tgz", - "integrity": "sha512-r/liNAx16SQj4D+XH/oI1dlpv9tdKJ6cONYPwwcCC46f2NjpaRWY+EKCzULfgQYV6YKXjHBchff2IZBSlZmJNw==", - "license": "MIT", - "dependencies": { - "@next/env": "15.5.3", - "@swc/helpers": "0.5.15", - "caniuse-lite": "^1.0.30001579", - "postcss": "8.4.31", - "styled-jsx": "5.1.6" - }, - "bin": { - "next": "dist/bin/next" - }, - "engines": { - "node": "^18.18.0 || ^19.8.0 || >= 20.0.0" - }, - "optionalDependencies": { - "@next/swc-darwin-arm64": "15.5.3", - "@next/swc-darwin-x64": "15.5.3", - "@next/swc-linux-arm64-gnu": "15.5.3", - "@next/swc-linux-arm64-musl": "15.5.3", - "@next/swc-linux-x64-gnu": "15.5.3", - "@next/swc-linux-x64-musl": "15.5.3", - "@next/swc-win32-arm64-msvc": "15.5.3", - "@next/swc-win32-x64-msvc": "15.5.3", - "sharp": "^0.34.3" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.1.0", - "@playwright/test": "^1.51.1", - "babel-plugin-react-compiler": "*", - "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", - "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", - "sass": "^1.3.0" - }, - "peerDependenciesMeta": { - "@opentelemetry/api": { - "optional": true - }, - "@playwright/test": { - "optional": true - }, - "babel-plugin-react-compiler": { - "optional": true - }, - "sass": { - "optional": true - } - } - }, - "node_modules/next/node_modules/postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "nanoid": "^3.3.6", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/pg": { - "version": "8.16.3", - "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz", - "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==", - "license": "MIT", - "dependencies": { - "pg-connection-string": "^2.9.1", - "pg-pool": "^3.10.1", - "pg-protocol": "^1.10.3", - "pg-types": "2.2.0", - "pgpass": "1.0.5" - }, - "engines": { - "node": ">= 16.0.0" - }, - "optionalDependencies": { - "pg-cloudflare": "^1.2.7" - }, - "peerDependencies": { - "pg-native": ">=3.0.1" - }, - "peerDependenciesMeta": { - "pg-native": { - "optional": true - } - } - }, - "node_modules/pg-cloudflare": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz", - "integrity": "sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==", - "license": "MIT", - "optional": true - }, - "node_modules/pg-connection-string": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz", - "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==", - "license": "MIT" - }, - "node_modules/pg-int8": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", - "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==", - "license": "ISC", - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/pg-pool": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz", - "integrity": "sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==", - "license": "MIT", - "peerDependencies": { - "pg": ">=8.0" - } - }, - "node_modules/pg-protocol": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz", - "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==", - "license": "MIT" - }, - "node_modules/pg-types": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz", - "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==", - "license": "MIT", - "dependencies": { - "pg-int8": "1.0.1", - "postgres-array": "~2.0.0", - "postgres-bytea": "~1.0.0", - "postgres-date": "~1.0.4", - "postgres-interval": "^1.1.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/pgpass": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz", - "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==", - "license": "MIT", - "dependencies": { - "split2": "^4.1.0" - } - }, - "node_modules/picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "license": "ISC" - }, - "node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "nanoid": "^3.3.11", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/postgres-array": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", - "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==", - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/postgres-bytea": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz", - "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/postgres-date": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz", - "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/postgres-interval": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz", - "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==", - "license": "MIT", - "dependencies": { - "xtend": "^4.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/react": { - "version": "19.1.0", - "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz", - "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/react-dom": { - "version": "19.1.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.0.tgz", - "integrity": "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==", - "license": "MIT", - "dependencies": { - "scheduler": "^0.26.0" - }, - "peerDependencies": { - "react": "^19.1.0" - } - }, - "node_modules/resolve-pkg-maps": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", - "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", - "license": "MIT", - "funding": { - "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" - } - }, - "node_modules/scheduler": { - "version": "0.26.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz", - "integrity": "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==", - "license": "MIT" - }, - "node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "license": "ISC", - "optional": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/sharp": { - "version": "0.34.4", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.4.tgz", - "integrity": "sha512-FUH39xp3SBPnxWvd5iib1X8XY7J0K0X7d93sie9CJg2PO8/7gmg89Nve6OjItK53/MlAushNNxteBYfM6DEuoA==", - "hasInstallScript": true, - "license": "Apache-2.0", - "optional": true, - "dependencies": { - "@img/colour": "^1.0.0", - "detect-libc": "^2.1.0", - "semver": "^7.7.2" - }, - "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" - }, - "funding": { - "url": "https://opencollective.com/libvips" - }, - "optionalDependencies": { - "@img/sharp-darwin-arm64": "0.34.4", - "@img/sharp-darwin-x64": "0.34.4", - "@img/sharp-libvips-darwin-arm64": "1.2.3", - "@img/sharp-libvips-darwin-x64": "1.2.3", - "@img/sharp-libvips-linux-arm": "1.2.3", - "@img/sharp-libvips-linux-arm64": "1.2.3", - "@img/sharp-libvips-linux-ppc64": "1.2.3", - "@img/sharp-libvips-linux-s390x": "1.2.3", - "@img/sharp-libvips-linux-x64": "1.2.3", - "@img/sharp-libvips-linuxmusl-arm64": "1.2.3", - "@img/sharp-libvips-linuxmusl-x64": "1.2.3", - "@img/sharp-linux-arm": "0.34.4", - "@img/sharp-linux-arm64": "0.34.4", - "@img/sharp-linux-ppc64": "0.34.4", - "@img/sharp-linux-s390x": "0.34.4", - "@img/sharp-linux-x64": "0.34.4", - "@img/sharp-linuxmusl-arm64": "0.34.4", - "@img/sharp-linuxmusl-x64": "0.34.4", - "@img/sharp-wasm32": "0.34.4", - "@img/sharp-win32-arm64": "0.34.4", - "@img/sharp-win32-ia32": "0.34.4", - "@img/sharp-win32-x64": "0.34.4" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "license": "MIT", - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/split2": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", - "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", - "license": "ISC", - "engines": { - "node": ">= 10.x" - } - }, - "node_modules/strnum": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.1.tgz", - "integrity": "sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/NaturalIntelligence" - } - ], - "license": "MIT" - }, - "node_modules/styled-jsx": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.6.tgz", - "integrity": "sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==", - "license": "MIT", - "dependencies": { - "client-only": "0.0.1" - }, - "engines": { - "node": ">= 12.0.0" - }, - "peerDependencies": { - "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0" - }, - "peerDependenciesMeta": { - "@babel/core": { - "optional": true - }, - "babel-plugin-macros": { - "optional": true - } - } - }, - "node_modules/tailwindcss": { - "version": "4.1.13", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.13.tgz", - "integrity": "sha512-i+zidfmTqtwquj4hMEwdjshYYgMbOrPzb9a0M3ZgNa0JMoZeFC6bxZvO8yr8ozS6ix2SDz0+mvryPeBs2TFE+w==", - "dev": true, - "license": "MIT" - }, - "node_modules/tapable": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.3.tgz", - "integrity": "sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/tar": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", - "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", - "dev": true, - "license": "ISC", - "dependencies": { - "@isaacs/fs-minipass": "^4.0.0", - "chownr": "^3.0.0", - "minipass": "^7.1.2", - "minizlib": "^3.0.1", - "mkdirp": "^3.0.1", - "yallist": "^5.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/tslib": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD" - }, - "node_modules/typescript": { - "version": "5.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", - "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/undici-types": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", - "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", - "devOptional": true, - "license": "MIT" - }, - "node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "license": "MIT", - "engines": { - "node": ">=0.4" - } - }, - "node_modules/yallist": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", - "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", - "dev": true, - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=18" - } - } - } -} diff --git a/ui/.gitignore b/ui/tips/.gitignore similarity index 100% rename from ui/.gitignore rename to ui/tips/.gitignore diff --git a/ui/Dockerfile b/ui/tips/Dockerfile similarity index 100% rename from ui/Dockerfile rename to ui/tips/Dockerfile diff --git a/ui/biome.json b/ui/tips/biome.json similarity index 100% rename from ui/biome.json rename to ui/tips/biome.json diff --git a/ui/next.config.ts b/ui/tips/next.config.ts similarity index 100% rename from ui/next.config.ts rename to ui/tips/next.config.ts diff --git a/ui/package.json b/ui/tips/package.json similarity index 100% rename from ui/package.json rename to ui/tips/package.json diff --git a/ui/postcss.config.mjs b/ui/tips/postcss.config.mjs similarity index 100% rename from ui/postcss.config.mjs rename to ui/tips/postcss.config.mjs diff --git a/ui/public/logo.svg b/ui/tips/public/logo.svg similarity index 100% rename from ui/public/logo.svg rename to ui/tips/public/logo.svg diff --git a/ui/src/app/api/block/[hash]/route.ts b/ui/tips/src/app/api/block/[hash]/route.ts similarity index 100% rename from ui/src/app/api/block/[hash]/route.ts rename to ui/tips/src/app/api/block/[hash]/route.ts diff --git a/ui/src/app/api/blocks/route.ts b/ui/tips/src/app/api/blocks/route.ts similarity index 100% rename from ui/src/app/api/blocks/route.ts rename to ui/tips/src/app/api/blocks/route.ts diff --git a/ui/src/app/api/bundle/[uuid]/route.ts b/ui/tips/src/app/api/bundle/[uuid]/route.ts similarity index 100% rename from ui/src/app/api/bundle/[uuid]/route.ts rename to ui/tips/src/app/api/bundle/[uuid]/route.ts diff --git a/ui/src/app/api/health/route.ts b/ui/tips/src/app/api/health/route.ts similarity index 100% rename from ui/src/app/api/health/route.ts rename to ui/tips/src/app/api/health/route.ts diff --git a/ui/src/app/api/txn/[hash]/route.ts b/ui/tips/src/app/api/txn/[hash]/route.ts similarity index 100% rename from ui/src/app/api/txn/[hash]/route.ts rename to ui/tips/src/app/api/txn/[hash]/route.ts diff --git a/ui/src/app/block/[hash]/page.tsx b/ui/tips/src/app/block/[hash]/page.tsx similarity index 100% rename from ui/src/app/block/[hash]/page.tsx rename to ui/tips/src/app/block/[hash]/page.tsx diff --git a/ui/src/app/bundles/[uuid]/page.tsx b/ui/tips/src/app/bundles/[uuid]/page.tsx similarity index 100% rename from ui/src/app/bundles/[uuid]/page.tsx rename to ui/tips/src/app/bundles/[uuid]/page.tsx diff --git a/ui/src/app/globals.css b/ui/tips/src/app/globals.css similarity index 100% rename from ui/src/app/globals.css rename to ui/tips/src/app/globals.css diff --git a/ui/src/app/layout.tsx b/ui/tips/src/app/layout.tsx similarity index 100% rename from ui/src/app/layout.tsx rename to ui/tips/src/app/layout.tsx diff --git a/ui/src/app/page.tsx b/ui/tips/src/app/page.tsx similarity index 100% rename from ui/src/app/page.tsx rename to ui/tips/src/app/page.tsx diff --git a/ui/src/app/txn/[hash]/page.tsx b/ui/tips/src/app/txn/[hash]/page.tsx similarity index 100% rename from ui/src/app/txn/[hash]/page.tsx rename to ui/tips/src/app/txn/[hash]/page.tsx diff --git a/ui/src/lib/s3.ts b/ui/tips/src/lib/s3.ts similarity index 100% rename from ui/src/lib/s3.ts rename to ui/tips/src/lib/s3.ts diff --git a/ui/tsconfig.json b/ui/tips/tsconfig.json similarity index 100% rename from ui/tsconfig.json rename to ui/tips/tsconfig.json diff --git a/ui/yarn.lock b/ui/tips/yarn.lock similarity index 100% rename from ui/yarn.lock rename to ui/tips/yarn.lock From 59c1055246896e02e232e3fe5076c6c97c8dc079 Mon Sep 17 00:00:00 2001 From: Mihir Wadekar Date: Thu, 12 Feb 2026 00:31:03 -0800 Subject: [PATCH 114/117] chore: removes docs + claude + cursorrules We remove docs, claude.md and .cursor/rules since they are all relevant to just the base/tips repo. --- .cursor/rules/bugsnag/fix-bugsnag-issues.mdc | 72 ----- .cursor/rules/coding-workflow.mdc | 19 -- .cursor/rules/github/pr-template-format.mdc | 59 ---- .cursor/rules/golang/coding-rules.mdc | 27 -- .../rules/golang/english-and-comments-std.mdc | 49 ---- .cursor/rules/golang/golang-naming-std.mdc | 69 ----- .cursor/rules/golang/golang-use-getters.mdc | 53 ---- .cursor/rules/golang/grpcclient.mdc | 17 -- .../observability/logging-best-practices.mdc | 255 ------------------ .../observability/metrics-best-practices.mdc | 136 ---------- .cursor/rules/python/api-design.mdc | 28 -- .../rules/python/dependency-management.mdc | 21 -- .../rules/python/distributed-computing.mdc | 25 -- .cursor/rules/python/fastapi-standards.mdc | 41 --- .cursor/rules/python/infrastructure.mdc | 25 -- .../python/microservices-architecture.mdc | 36 --- .cursor/rules/python/python-coding-rules.mdc | 32 --- .cursor/rules/python/testing-standards.mdc | 28 -- .cursor/rules/rego/rego-coding-patterns.mdc | 94 ------- CLAUDE.md | 18 -- docs/API.md | 75 ------ docs/AUDIT_S3_FORMAT.md | 134 --------- docs/BUNDLE_STATES.md | 51 ---- docs/ERC4337_BUNDLER.md | 104 ------- docs/PULL_REQUEST_GUIDELINES.md | 93 ------- docs/SETUP.md | 117 -------- docs/logo.png | Bin 127664 -> 0 bytes 27 files changed, 1678 deletions(-) delete mode 100644 .cursor/rules/bugsnag/fix-bugsnag-issues.mdc delete mode 100644 .cursor/rules/coding-workflow.mdc delete mode 100644 .cursor/rules/github/pr-template-format.mdc delete mode 100644 .cursor/rules/golang/coding-rules.mdc delete mode 100644 .cursor/rules/golang/english-and-comments-std.mdc delete mode 100644 .cursor/rules/golang/golang-naming-std.mdc delete mode 100644 .cursor/rules/golang/golang-use-getters.mdc delete mode 100644 .cursor/rules/golang/grpcclient.mdc delete mode 100644 .cursor/rules/observability/logging-best-practices.mdc delete mode 100644 .cursor/rules/observability/metrics-best-practices.mdc delete mode 100644 .cursor/rules/python/api-design.mdc delete mode 100644 .cursor/rules/python/dependency-management.mdc delete mode 100644 .cursor/rules/python/distributed-computing.mdc delete mode 100644 .cursor/rules/python/fastapi-standards.mdc delete mode 100644 .cursor/rules/python/infrastructure.mdc delete mode 100644 .cursor/rules/python/microservices-architecture.mdc delete mode 100644 .cursor/rules/python/python-coding-rules.mdc delete mode 100644 .cursor/rules/python/testing-standards.mdc delete mode 100644 .cursor/rules/rego/rego-coding-patterns.mdc delete mode 100644 CLAUDE.md delete mode 100644 docs/API.md delete mode 100644 docs/AUDIT_S3_FORMAT.md delete mode 100644 docs/BUNDLE_STATES.md delete mode 100644 docs/ERC4337_BUNDLER.md delete mode 100644 docs/PULL_REQUEST_GUIDELINES.md delete mode 100644 docs/SETUP.md delete mode 100644 docs/logo.png diff --git a/.cursor/rules/bugsnag/fix-bugsnag-issues.mdc b/.cursor/rules/bugsnag/fix-bugsnag-issues.mdc deleted file mode 100644 index 630c982..0000000 --- a/.cursor/rules/bugsnag/fix-bugsnag-issues.mdc +++ /dev/null @@ -1,72 +0,0 @@ ---- -description: Describes how to handle a request to fix a bugsnag issue -globs: -alwaysApply: false ---- -# Bugsnag Ticket Workflow - -When a user provides a Bugsnag error URL or asks to fix a Bugsnag issue, follow this systematic approach: - -## 1. **Root Cause Analysis** - -### Error Investigation -- Use `mcp_bugsnag-mcp_list-error-events` to get recent events for the error -- Use `mcp_bugsnag-mcp_get-stacktrace` with `include_code: true` and `show_all_frames: true` to get the complete stacktrace -- Analyze the stacktrace to identify: - - The exact line and file where the error occurs - - The call stack that leads to the error - - The error message and context - -### Codebase Investigation -- Read the relevant files identified in the stacktrace -- Search for related code patterns or similar implementations -- Identify the data flow that leads to the problematic state -- Look for edge cases or missing null/undefined checks - -## 2. **Suggest Fixes (No Code Changes)** - -### Analysis Summary -- Provide a clear explanation of what's causing the error -- Identify the specific conditions that trigger the issue -- Explain the impact and severity of the error -- If you can't figure out what is going on, just say so and ask the user for more context - -### Proposed Solutions -- Present 1-3 potential fix approaches with pros/cons -- Suggest relevant tests to prevent regression -- Try to be tactical with your suggestions, avoid large refactors when possible - -### Implementation Recommendations -- Specify which files need to be modified -- Outline the exact changes needed (but don't make them yet) -- Mention any dependencies or related changes required -- Highlight potential breaking changes or compatibility concerns - -## 3. **User Confirmation & Implementation** - -### Get Approval -- Wait for user confirmation on the proposed approach -- Allow for discussion and refinement of the solution -- Clarify any ambiguous requirements or edge cases - -### Implementation & PR Creation -Once the user confirms the approach: -- Follow the below process: - - Making code changes - - Adding tests if needed - ---- - -**Example Workflow:** - -- User: "Fix this Bugsnag issue: https://app.bugsnag.com/" -- Assistant: - 1. Fetches error events and stacktrace from Bugsnag - 2. Analyzes the code to identify root cause - 3. Proposes specific fix approach with explanation - 4. Waits for user confirmation - 5. Making code changes and tests if needed - ---- - -**Note:** This workflow ensures thorough analysis before making changes, reducing the risk of incomplete fixes or introducing new issues while maintaining the systematic approach for PR creation. \ No newline at end of file diff --git a/.cursor/rules/coding-workflow.mdc b/.cursor/rules/coding-workflow.mdc deleted file mode 100644 index a5b8a37..0000000 --- a/.cursor/rules/coding-workflow.mdc +++ /dev/null @@ -1,19 +0,0 @@ ---- -description: Coding workflow cursor must follow -globs: -alwaysApply: false ---- -# Coding workflow preferences -- Focus on the areas of code relevant to the task -- Do not touch code that is unrelated to the task -- Avoid making major changes to the patterns and architecture of how a feature works, after it has shown to work well, unless explicitly instructed -- Always think about what other methods and areas of code might be affected by code changes -- Keep code simple and readable -- Write thorough tests for all functionalities you wrote - -Follow this sequential workflow: -1. Write or update existing code -2. Write the incremental unit-test to cover code logic you wrote -3. Test unit-test pass -4. Verify it passes all the tests by running `make test` command -5. Ensue your unit-test has good code coverage for the code you have written diff --git a/.cursor/rules/github/pr-template-format.mdc b/.cursor/rules/github/pr-template-format.mdc deleted file mode 100644 index bcdac6d..0000000 --- a/.cursor/rules/github/pr-template-format.mdc +++ /dev/null @@ -1,59 +0,0 @@ ---- -description: -globs: -alwaysApply: false ---- ---- -description: Follow PR template format from .github/pull_request_template.md when creating pull request descriptions -globs: "**/*" -alwaysApply: false ---- - -# GitHub Pull Request Template Format - -When creating pull request descriptions, you **must** follow the format specified in `.github/pull_request_template.md` if it exists in the repository. - -## Rule Requirements - -1. **Check for Template**: Always check if `.github/pull_request_template.md` exists in the repository root before creating PR descriptions. - -2. **Use Template Structure**: If the template exists: - - Follow the exact section structure defined in the template - - Include all required sections from the template - - Maintain the same heading levels and formatting style - - Preserve any placeholder text guidelines or instructions - - Fill in the template sections with relevant information for the specific PR - -3. **Template Sections**: Common sections that should be preserved if present in the template include: - - **Summary/Description**: Brief overview of the changes - - **Changes Made**: Detailed list of modifications - - **Testing**: How the changes were tested - - **Type of Change**: Bug fix, feature, documentation, etc. - - **Checklist**: Action items or verification steps - - **Breaking Changes**: Any backward compatibility concerns - - **Related Issues**: Links to related issues or tickets - -4. **Fallback Behavior**: If no template exists, create a well-structured PR description with: - - Clear summary of changes - - Bullet points for key modifications - - Testing information if applicable - - Any relevant context or notes - -## Implementation Guidelines - -- **Read Template First**: Use tools to read the `.github/pull_request_template.md` file content before generating PR descriptions -- **Preserve Formatting**: Maintain markdown formatting, comments, and structure from the template -- **Fill Appropriately**: Replace template placeholders with actual, relevant information -- **Be Comprehensive**: Ensure all template sections are addressed, even if briefly -- **Stay Consistent**: Use the same tone and style as indicated by the template - -## Example Usage - -When creating a PR: -1. Check for `.github/pull_request_template.md` -2. If found, read the template content -3. Generate PR description following the template structure -4. Fill in each section with relevant information -5. Ensure all required sections are included - -This rule ensures consistency across all pull requests in repositories that have established PR templates, while providing a sensible fallback for repositories without templates. diff --git a/.cursor/rules/golang/coding-rules.mdc b/.cursor/rules/golang/coding-rules.mdc deleted file mode 100644 index 125cceb..0000000 --- a/.cursor/rules/golang/coding-rules.mdc +++ /dev/null @@ -1,27 +0,0 @@ ---- -description: Rules to follow when writing code -globs: *.go ---- -You are Staff Software Engineer expert in Golang, Protobuff, GRPC. You write clean and properly docummented code. You ensure code written works, and you always write corresponding Unit-tests. -You are an expert in writing Unit-test, and specialised in updating existing unit-test to fit missing use-cases. - -# Coding pattern preferences -- Always prefer simple solutions. -- Keep the codebase very clean and organized. -- Avoid duplication of code whenever possible, which means checking for other areas of the codebase that might already have similar code and functionality. -- Write code that takes into account the different environments: development, staging, and production. -- You are careful to only make changes that are requested or you are confident are well understood and related to the change being requested. -- When fixing an issue or bug, do not introduce a new pattern or technology without first exhausting all options for the existing implementation. And if you finally do this, make sure to remove the old ipmlementation afterwards so we don't have duplicate logic. -- Avoid having files over 200-300 lines of code. Refactor at that point. -- Mocking data is only needed for tests, never mock data for dev or prod. -- Avoid writing scripts in files if possible, especially if the script is likely only to be run once. -- Never add stubbing or fake data patterns to code that affects the dev or prod environments. -- Never overwrite config *.yml (Yaml) files without first asking and confirming. -- It is acceptable to say you do not know. -- Do not write your own mocks in testing. Follow this sequence: -1. Update Makefile to generate the mock needed. - Following the example for internal packages - `mockgen -source=internal/client/users_service.go -destination=internal/dao/mocks/mock_users_service.go -package=mockdao` - and for external packages follow this: - ` mockgen -destination=mocks/eth_client_mock.go -mock_names EthClient=MockEthClient -package=mocks github.cbhq.net/intl/rip7755-fulfiller/internal/client EthClientmockgen` -2. Update testing code to use the generated mock diff --git a/.cursor/rules/golang/english-and-comments-std.mdc b/.cursor/rules/golang/english-and-comments-std.mdc deleted file mode 100644 index c35cf56..0000000 --- a/.cursor/rules/golang/english-and-comments-std.mdc +++ /dev/null @@ -1,49 +0,0 @@ ---- -description: Make sure to always add clear comments within the codebase -globs: *.go -alwaysApply: true ---- -# Standard: Language, Comments, and Documentation - -This rule defines the standards for language use and commenting within the codebase, prioritizing clarity and developer experience for engineers familiar with the project. - -**1. Language:** - -* **All** code artifacts, including variable names, function names, comments, documentation, commit messages, and generated rules, **must** be written in **simple, clear, friendly and idiomatic English**. - -**2. Comments:** - -* **Target Audience:** Assume the reader is an experienced developer familiar with Go and the general project context. -* **Prioritize Readability:** Code should be self-documenting whenever possible through clear naming and structure. -* **Avoid Redundant Comments:** Do **not** add comments that merely restate what the code clearly does. For example: - ```go - // Bad: Comment explains the obvious - // Increment count - count++ - - // Good: Comment starts with the function name - // GetUserByID finds a user by their ID - func GetUserByID(id string) (*User, error) { ... } - ``` -* **Focus on the "Why", Not Just the "What":** Prioritize comments that explain *why* a particular approach was taken, especially if it's non-obvious, involves trade-offs, or relates to external factors or historical context. - * Explain complex logic or algorithms briefly. - * Clarify the purpose of seemingly arbitrary values or constants. - * Document known limitations, potential issues, or future work (`TODO`, `FIXME`). - * Add comments when fixing subtle bugs to explain the reasoning. - ```go - // Good: Explains the rationale for a non-obvious choice - // Use FNV-1a hash for Redis hash tags to optimize for speed and key length, - // as cryptographic security is not required for slot assignment. - func hashUserIDForTag(userID string) string { ... } - - // Good: Explains a workaround or limitation - // TODO(GH-123): Refactor this when the upstream API supports batch requests. - for _, item := range items { ... } - ``` -* **Placement:** Place comments on the line *before* the code they refer to, or sometimes at the end of a line for very short clarifications. - -**3. Documentation (e.g., READMEs, Design Docs):** - -* Maintain clarity and conciseness. -* Keep documentation up-to-date with significant code changes. -* Use diagrams or examples where appropriate to illustrate complex concepts. diff --git a/.cursor/rules/golang/golang-naming-std.mdc b/.cursor/rules/golang/golang-naming-std.mdc deleted file mode 100644 index 25a1e96..0000000 --- a/.cursor/rules/golang/golang-naming-std.mdc +++ /dev/null @@ -1,69 +0,0 @@ ---- -description: Avoid package prefix redundancy when naming -globs: *.go -alwaysApply: false ---- -# Go Standard: Naming Conventions - Avoid Package Prefix Redundancy - -This rule outlines the standard Go practice for naming exported identifiers to avoid redundancy with the package name. - -**The Standard:** - -When naming exported identifiers (types, functions, variables, constants), **avoid repeating the package name** if the context provided by the package itself makes the identifier clear. - -**Rationale:** - -* **Readability:** Code that imports the package becomes cleaner and less verbose. For example, `store.New()` is more idiomatic and readable than `store.NewStore()`. -* **Conciseness:** Reduces unnecessary stuttering in code (e.g., `store.StoreType` vs. `store.Type`). -* **Idiomatic Go:** Follows the common practice seen in the Go standard library and many popular Go projects. - -**Examples:** - -```go -// --- Package: store --- - -// BAD: Repeats "store" -package store - -type StoreConfig struct { ... } -func NewStore(cfg StoreConfig) (*Store, error) { ... } -var DefaultStoreOptions StoreOptions - -// GOOD: Avoids repeating "store" -package store - -type Config struct { ... } // Type name is clear within package 'store' -func New(cfg Config) (*Store, error) { ... } // Function name 'New' is clear -var DefaultOptions Options // Variable name is clear - -type Store struct { ... } // OK: Identifier itself IS the package name conceptually -``` - -When importing and using the "good" example: - -```go -import "path/to/store" - -// ... -cfg := store.Config{ ... } -activityStore, err := store.New(cfg) -opts := store.DefaultOptions -var s store.Store -``` - -This reads much better than: - -```go -import "path/to/store" - -// ... -cfg := store.StoreConfig{ ... } -activityStore, err := store.NewStore(cfg) -opts := store.DefaultStoreOptions -var s store.Store -``` - -**Exceptions:** - -* It is acceptable if the identifier itself essentially *is* the package name (e.g., `package http; type Client`, `package store; type Store`). -* Sometimes repeating a part of the package name is necessary for clarity if the package has many distinct concepts. diff --git a/.cursor/rules/golang/golang-use-getters.mdc b/.cursor/rules/golang/golang-use-getters.mdc deleted file mode 100644 index 149f380..0000000 --- a/.cursor/rules/golang/golang-use-getters.mdc +++ /dev/null @@ -1,53 +0,0 @@ ---- -description: Prefer getter methods over direct field access -globs: *.go -alwaysApply: false ---- -# Go Standard: Prefer Getter Methods (Especially for Protobuf) - -This rule encourages the use of getter methods over direct field access, particularly when working with structs generated from Protobuf definitions. - -**The Standard:** - -**Prefer using generated getter methods (e.g., `myProto.GetMyField()`) over direct field access (e.g., `myProto.MyField`) when such getters are available.** This is especially relevant for structs generated by the Protobuf compiler (`protoc-gen-go`). - -**Rationale:** - -* **Encapsulation and Nil Safety:** Getters often provide a layer of abstraction. For Protobuf messages, getters automatically handle `nil` checks for pointer fields (like optional message fields or fields within a `oneof`), returning a zero value instead of causing a panic. This significantly improves robustness. -* **Consistency:** Using getters consistently makes the code easier to read and maintain, aligning with common Go practices for Protobuf. -* **Future-Proofing:** Relying on the getter method decouples the calling code from the exact internal representation of the field. If the underlying field changes in a backward-compatible way (e.g., how a default value is handled), code using the getter is less likely to break. -* **Helper Logic:** Getters might potentially include minor logic (though less common in basic Protobuf getters beyond nil checks). - -**Example (Protobuf):** - -```protobuf -// -- Example.proto -- -message UserProfile { - optional string name = 1; - optional int32 age = 2; -} -``` - -```go -// -- Go code -- -import "path/to/gen/go/examplepb" - -func processProfile(profile *examplepb.UserProfile) { - // GOOD: Uses getter, safe even if profile or profile.Name is nil. - name := profile.GetName() - age := profile.GetAge() // Also handles potential nil receiver safely. - - // BAD: Direct access risks nil pointer dereference if profile is non-nil - // but profile.Name is nil (for optional fields). - // nameDirect := *profile.Name // PANICS if profile.Name is nil! - // ageDirect := *profile.Age // PANICS if profile.Age is nil! - - fmt.Printf("Name: %s, Age: %d\n", name, age) -} -``` - -**Exceptions:** - -* **No Getter Available:** If a struct field does not have a corresponding getter method, direct access is necessary. -* **Performance Critical Code:** In extremely rare, performance-critical sections where profiling has demonstrably shown the function call overhead of the getter to be a bottleneck, direct access *might* be considered cautiously. This should be well-documented and justified. -* **Setting Values:** This rule applies to *reading* values. Setting struct fields typically involves direct assignment. diff --git a/.cursor/rules/golang/grpcclient.mdc b/.cursor/rules/golang/grpcclient.mdc deleted file mode 100644 index 5dac8a6..0000000 --- a/.cursor/rules/golang/grpcclient.mdc +++ /dev/null @@ -1,17 +0,0 @@ ---- -description: Creating a new grpc connection should use csf's grpcclient, not golang/grpc -globs: *.go -alwaysApply: false ---- -Pull in the package from github.cbhq.net/engineering/csf/grpcclient - -Here is an example of how you should implement it -``` - manager := csf.New() - ctx := manager.ServiceContext() - conn, err := grpcclient.Dial( - ctx, - endpoint, - grpcclient.WithDialOpt(grpc.WithBlock()), - ) -``` \ No newline at end of file diff --git a/.cursor/rules/observability/logging-best-practices.mdc b/.cursor/rules/observability/logging-best-practices.mdc deleted file mode 100644 index 52e94b5..0000000 --- a/.cursor/rules/observability/logging-best-practices.mdc +++ /dev/null @@ -1,255 +0,0 @@ ---- -description: Rules to follow when logging -globs: ["*.go", "*.py"] ---- -## Rule -Ensure all logging statements are correct, useful, performant, and secure. Logs must accurately reflect the code's logic, provide sufficient context for debugging, avoid performance degradation, and never expose sensitive information. Use appropriate log levels and avoid logging sensitive data, large objects, or high-frequency debug information. - -Refer to [logging best practices](https://docs.cbhq.net/infra/observability/logging) for more details. - -## Scope -This rule ONLY APPLIES when ALL the following conditions are met: -1. Code contains logging statements (logger.debug, log.info, console.log, etc.) -2. The logging exhibits one or more of these problematic patterns (tagged with Defect Patterns and scenarios): - - **(SS-1) Logging Sensitive Data:** Exposing credentials, tokens, PII, or financial data (passwords, API keys, email addresses). - - **(SS-2) Logging Unsanitized Objects:** Logging entire request/response bodies or complex objects without removing sensitive fields. - - **(PF-1) Logging in High-Frequency Loops:** Placing log statements inside tight loops or on other hot paths like function entry/exit logging for every function, causing excessive volume. - - **(LV-1) Improper Log Level:** Using `DEBUG` or `TRACE` in non-development environments. Using `WARN` or `ERROR` for informational messages. - - **(SM-1) Unit/Metric Mismatch:** The unit in the log message (e.g., "ms") does not match the variable's actual unit (e.g., nanoseconds). - - **(SM-2) Message Contradicts Logic:** The log message misrepresents the code's state (e.g., logging "Success" in an `if err!= nil` block). - - **(IS-1) Insufficient Context:** An error log is not actionable because it omits the `error` variable or critical identifiers (e.g., `transaction_id`). - - **(VR-2) Placeholder-Argument Mismatch:** The number of placeholders in a format string (e.g., `%s`) does not match the number of provided variables. - - **(RD-3) Vague or Ambiguous Message:** The log message is too generic to be useful (e.g., "Done", "Error"). - -| Defect Patterns | Scenario Name | -| --- | --- | -| **RD:** Readability Issues | RD-1: Complicated domain-specific terminology
    RD-2: Non-standard language used
    RD-3: Poorly formatted or unclear messages | -| **VR:** Variable Issues | VR-1: Incorrect variable value logging
    VR-2: Placeholder–value mismatch | -| **LV:** Logging Level Issues | LV-1: Improper verbosity level | -| **SM:** Semantics Inconsistent | SM-1: Wrong unit or metric label
    SM-2: Message text does not match the code
    SM-3: Misused variables in the message | -| **SS:** Sensitive Information | SS-1: Credentials logged in plain text
    SS-2: Dumping whole objects without scrubbing | -| **IS:** Insufficient Information | IS-1: Insufficient information | -| **PF:** Performance Issues | PF-1: Logging on hot path
    PF-2: Costly string operations | - -## Out of Scope -This rule does NOT apply to: -- ERROR and WARN level logs for genuine issues -- INFO level logs for significant business events -- Structured logging that includes only relevant, non-sensitive fields. -- Logs that are properly sampled or rate-limited -- Test files or development-only code -- Logs that are conditionally enabled for debugging - -## Good Examples - -1. Appropriate log levels with structured data: -```go -logger.Info("User login successful", - "user_id", userID, - "login_method", "oauth", - "ip_address", clientIP, -) -``` - -2. ERROR logs with context but no sensitive data: -```go -logger.Error("Payment processing failed", - "error_code", "INSUFFICIENT_FUNDS", - "transaction_id", txnID, - "user_id", userID, - "retry_count", retryCount, -) -``` -```go -user, err := db.FindUser(userID) -if err!= nil { - logger.Error("Failed to find user", - "error", err, - "user_id", userID, - "trace_id", traceID, - ) - return -} -``` - - -3. Conditional debug logging: -```go -if config.DebugEnabled { - logger.Debug("Processing order for user", "user_id", userID) -} -``` - -4. Sampling high-frequency events: -```go -// Only log 1% of successful requests -if rand.Float32() < 0.01 { - logger.Info("Request processed successfully", - "endpoint", endpoint, - "duration_ms", duration.Milliseconds(), - ) -} -``` - -5. Structured logging with relevant fields: -```go -logger.Info("Order processed", - "order_id", order.ID, - "user_tier", user.Tier, - "payment_method", "card", - "processing_time_ms", processingTime, -) -``` - -6. Summarizing after a loop instead of logging within it: -```go -processedCount := 0 -for _, item := range items { - if err := process(item); err == nil { - processedCount++ - } -} -logger.Info("Batch processing complete", - "total_items", len(items), - "processed_count", processedCount, -) -``` - -7. Logging specific, safe fields instead of a whole object: -```go -logger.Info("User profile updated", - "user_id", user.ID, - "user_tier", user.Tier, - "updated_fields", updatedFields, -) -``` - -8. Ensuring unit consistency in logs -```go -//... operation... -duration := time.Since(startTime) -logger.Info("Request processed", - "duration_ms", duration.Milliseconds(), -) -``` - -## Bad Examples - -1. (LV-1) DEBUG logging in production code: -```go -// DEBUG logs create excessive volume -logger.Debug("Entering function processPayment") -logger.Debug("Validating payment request") -logger.Debug("Connecting to payment gateway") -logger.Debug("Exiting function processPayment") -``` - -2. (PF-1) Logging inside loops: -```go -// Creates massive log volume -for _, item := range items { - logger.Info("Processing item", "item_id", item.ID) - // ... process item -} -``` - -3. (SS-2) Logging entire objects or request bodies: -```go -// Logs potentially sensitive data and large objects -logger.Info("Received request", "request_body", fmt.Sprintf("%+v", requestBody)) -logger.Info("User object", "user", fmt.Sprintf("%+v", user)) -``` -```go -// BAD: Logs the entire user object, potentially exposing PII. -logger.Info("User object details", "user", fmt.Sprintf("%+v", user)) -``` - -4. (SS-1) Logging sensitive information: -```go -// Exposes sensitive data in logs -logger.Info("Authentication attempt", - "email", user.Email, - "password", password, - "api_key", apiKey, - "token", authToken, - "auth_token", authToken, - "bearer_token", bearerToken, - "credit_card", creditCard, -) -``` - -5. (PF-1) Function entry/exit logging everywhere: -```go -// Excessive noise for every function -func calculateTotal(items []Item) float64 { - logger.Debug("Entering calculateTotal") - total := 0.0 - for _, item := range items { - total += item.Price - } - logger.Debug("Exiting calculateTotal", "total", total) - return total -} -``` - -6. (SS-1) Logging URLs with sensitive information: -```go -// Exposes sensitive token in URL parameter -logger.Info("API request", "url", fmt.Sprintf("/api/users/%s/payments/%s?token=%s", userID, paymentID, token)) -``` - -7. (SM-2) Message contradicts code logic: -```go -// BAD: A success message is logged in the error-handling block. -err := processPayment(paymentDetails) -if err!= nil { - logger.Info("Payment processed successfully", "transaction_id", paymentDetails.ID) - //... handle error... -} -``` - -8. (IS-1) Insufficient context in an error log: -```go -// BAD: The log is not actionable because it omits the actual 'err' variable. -err := db.Save(user) -if err!= nil { - logger.Error("Failed to save user to database", "user_id", user.ID) -} -``` - -9. (SM-1) Unit mismatch in the log message: -```go -// BAD: The log text claims "ms" but the variable is in nanoseconds. -startTime := time.Now() -//... operation... -durationNanos := time.Since(startTime).Nanoseconds() -logger.Info(fmt.Sprintf("Task completed in %d ms", durationNanos)) -``` - -10. (VR-2) Placeholder-argument mismatch: -```go -// BAD: Two placeholders but only one argument provided. -logger.Error(fmt.Sprintf("Login for user %s from %s failed", userID)) -``` - - -## Evaluation Process -1. Identify all logging statements in the code -2. Check log levels - flag DEBUG logs that aren't conditionally enabled -3. Analyze control flow - for each logging statement, analyze its surrounding code to understand the logical context (e.g., is it inside an error-handling block like if err!= nil, a success path, or a loop?). Look for logging patterns inside loops or high-frequency operations -4. Extract semantic intent - use natural language understanding to determine the meaning of the static log message text (e.g., does it imply success, failure, or a status update?). -5. Correlate Logic and Intent - Compare the code's logical context with the message's semantic intent. Flag contradictions (e.g., a "success" message in a failure block - SM-2). -6. Analyze Log Content and Variables: - - Flag the logging of entire un-sanitized objects, request bodies, or other large data structures (SS-2). - - Scan for sensitive data patterns (passwords, keys, PII) in variable names, message text, and URL parameters (SS-1). - - URLs with parameters that might contain sensitive data - - For metric variables (e.g., duration), verify consistency between the variable's actual unit and the unit stated in the log message (SM-1). - - In error-handling blocks, verify that the `error` variable itself is being logged to prevent IS-1. - - Check for function entry/exit logging patterns -7. For each problematic pattern, suggest alternatives: - - Use appropriate log levels (ERROR, WARN, INFO) - - Sample high-frequency logs - - Log only relevant fields instead of entire objects - - Use structured logging with sanitized data - - Move detailed debugging to distributed tracing - - Rate-limit repetitive logs diff --git a/.cursor/rules/observability/metrics-best-practices.mdc b/.cursor/rules/observability/metrics-best-practices.mdc deleted file mode 100644 index d223057..0000000 --- a/.cursor/rules/observability/metrics-best-practices.mdc +++ /dev/null @@ -1,136 +0,0 @@ ---- -description: Rules to follow when emitting metrics -globs: ["*.go", "*.py"] ---- -## Rule -Do not use high-cardinality values as tags when emitting metrics. High-cardinality tags can significantly increase observability costs and impact system performance. Every tag that contains an ID must be flagged. - -Refer to [tagging strategy](https://docs.cbhq.net/infra/observability/metrics#tagging-strategy) for more details. - -## Scope -This rule applies to ANY metric emission found ANYWHERE in the code changes, regardless of the primary purpose of the PR. ALL metric emission calls (statsd) must be checked for violations. - -Violation happens when ALL the following conditions are met: -1. Code is emitting metrics to a monitoring system (Datadog, StatsD, etc.) -2. Tags or labels are being added to the metric -3. The tag values contain AT LEAST ONE high-cardinality. - -### High-cardinality Guidelines: -A tag value is considered high-cardinality if it falls into any of these categories: -- **Looks unique** – anything that sounds like it will generate a one-off value (e.g., id, uuid, token, session, generated_x) -- **Continuous values** – non-discrete numbers that can vary infinitely, like current_price, latitude, longitude, sensor readings, etc. -- **High entropy values** – anything random or cryptographic such as random, hash, sha1, md5, encrypted, signature - -### Common High-cardinality Examples: -- **Identifiers**: User IDs, customer IDs, account identifiers (`user_id`, `customer_id`, `account_id`) -- **Request tracking**: Request IDs, trace IDs, transaction IDs (`message_id`, `request_id`, `trace_id`) -- **Pattern-based keys**: Any tag key ending with `_id`, `_uuid`, `_token` -- **Time-based values**: Timestamps or time-based values -- **Network data**: URLs with parameters, dynamic paths, IP addresses, specific hostnames -- **Unique identifiers**: UUIDs, hashes, or other unique identifiers -- **Personal data**: Email addresses or user-specific data - -## Good Examples - -1. Using low-cardinality status codes: -```go -statsdClient.CountWithTags("api.requests_total", 1, map[string]string{ - "method": "GET", - "status": "200", - "endpoint": "/api/users", -}) -``` - -2. Building tags separately with low-cardinality values: -```go -tags := map[string]string{ - "method": "GET", - "status": "200", - "endpoint": "/api/users", -} -statsdClient.CountWithTags("api.requests_total", 1, tags) -``` - -3. Using bounded categorical values: -```go -statsdClient.CountWithTags("payment.processed", 1, map[string]string{ - "payment_method": "card", // Limited values: card, bank, crypto - "region": "us-east-1", // Limited AWS regions - "user_tier": "premium", // Limited tiers: basic, premium, enterprise -}) -``` - -4. Aggregating instead of individual IDs: -```go -// Instead of user_id tag, use aggregated user tier -statsdClient.GaugeWithTags("user.active_sessions", sessionCount, map[string]string{ - "user_tier": getUserTier(userID), // Low cardinality - "region": "us-west-2", -}) -``` - -## Bad Examples - -1. Using user IDs or message IDs as tags: -```go -// VIOLATION: user_id and message_id are high-cardinality IDs -statsd.IncrWithTags(statsdUSTEventProcessingFailure, map[string]string{ - "message_id": messageID, // VIOLATION: message_id is high-cardinality - "error_type": "nil_body", -}) -``` - -2. Building tags separately with ID values: -```go -// VIOLATION: Still problematic when tags are built separately -tags := map[string]string{ - "user_id": userID, // VIOLATION: user_id is high-cardinality - "message_id": messageID, // VIOLATION: message_id is high-cardinality -} -statsd.HistogramWithTags(statsdUSTRepositoryOperationTime, value, tags) -``` - -3. Using request IDs or trace IDs: -```go -// VIOLATION: Request IDs are unique for every request -statsdClient.TimingWithTags("api.response_time", duration, map[string]string{ - "request_id": "req_abc123def456", // VIOLATION: request_id is high-cardinality - "trace_id": "7d5d747be160e280504c099d984bcfe0", // VIOLATION: trace_id is high-cardinality -}) -``` - -4. Using timestamps as tags: -```go -// VIOLATION: Timestamps create unlimited unique values -stats.CountWithTags("queue.length", 1, map[string]string{ - "timestamp": time.Now().Format("2006-01-02T15:04:05"), // VIOLATION: timestamp is high-cardinality - "queue_name": "payments", -}) -``` - -5. Using IP addresses: -```go -// VIOLATION: IP addresses have very high cardinality -statsd.GaugeWithTags("connections.active", 1, map[string]string{ - "client_ip": "192.168.1.100", // VIOLATION: IP address is high-cardinality - "hostname": "server-abc123-def456", // VIOLATION: Dynamic hostnames are high-cardinality -}) -``` - -## Evaluation Process -1. Search the entire code change for ANY calls to `statsd` function that ends with `WithTags` (`statsd.*WithTags`) or tags map building, regardless of the PR's stated purpose -2. For each metric emission found, examine ALL tag keys in the map -3. If ANY tag key contains high-cardinality patterns, flag as violation. Examples for violations: - - `user_id`, `message_id`, `request_id`, `trace_id`, `session_id`, `customer_id` - - Any key ending with `_id`, `_uuid`, `_token` - - Timestamps, IP addresses, URLs with parameters -4. Do not skip metric calls because they seem unrelated to the main PR purpose -5. Check ANY function that contains these strings in its name: `CountWithTags`, `IncrWithTags`, `GaugeWithTags`, `HistogramWithTags`, `TimingWithTags`, `DistributionWithTags`. This includes methods from any package or client (e.g., `statsd.CountWithTags()`, `client.IncrWithTags()`, `metrics.GaugeWithTags()`, etc.) - -**Example**: Even if a PR is titled "Add configuration options", still check ALL metric emissions like: -```go -statsd.IncrWithTags(metric, map[string]string{ - "message_id": messageID, // VIOLATION - Must be flagged - "error_type": "nil_body", -}) -``` diff --git a/.cursor/rules/python/api-design.mdc b/.cursor/rules/python/api-design.mdc deleted file mode 100644 index 58f975f..0000000 --- a/.cursor/rules/python/api-design.mdc +++ /dev/null @@ -1,28 +0,0 @@ -# .cursor/rules/python/api-design.mdc ---- -description: API design principles for Python microservices -globs: ["*.py"] -alwaysApply: true ---- -# API Design Principles - -## REST API Design -- Use proper HTTP methods (GET, POST, PUT, DELETE) -- Implement proper status codes -- Use plural nouns for resource endpoints -- Version APIs in the URL (e.g., /v1/resources) -- Use query parameters for filtering and pagination - -## Request/Response -- Validate all input data -- Use Pydantic models for request/response schemas -- Include proper error responses -- Implement pagination for list endpoints -- Use consistent response formats - -## Security -- Implement proper authentication -- Use JWT for stateless authentication -- Implement rate limiting -- Validate and sanitize all inputs -- Use HTTPS only \ No newline at end of file diff --git a/.cursor/rules/python/dependency-management.mdc b/.cursor/rules/python/dependency-management.mdc deleted file mode 100644 index a02d227..0000000 --- a/.cursor/rules/python/dependency-management.mdc +++ /dev/null @@ -1,21 +0,0 @@ -# .cursor/rules/python/dependency-management.mdc ---- -description: Package and dependency management guidelines -globs: ["pyproject.toml", "requirements.txt", "setup.py"] -alwaysApply: true ---- -# Dependency Management - -## Package Management -- Use Poetry for dependency management -- Pin all dependencies with exact versions -- Use separate dependency groups for dev and prod -- Regular security audits with safety -- Keep dependencies up to date - -## Virtual Environments -- Use virtual environments for all projects -- Document Python version requirements -- Use .env files for environment variables -- Keep production dependencies minimal -- Document all third-party integrations \ No newline at end of file diff --git a/.cursor/rules/python/distributed-computing.mdc b/.cursor/rules/python/distributed-computing.mdc deleted file mode 100644 index 0b727ed..0000000 --- a/.cursor/rules/python/distributed-computing.mdc +++ /dev/null @@ -1,25 +0,0 @@ -# .cursor/rules/python/distributed-computing.mdc ---- -description: Guidelines for distributed computing with Ray -globs: ["*.py"] -alwaysApply: true ---- -# Distributed Computing Standards - -## Ray Framework Usage -- Use Ray for distributed task processing -- Implement proper actor patterns -- Use Ray's object store effectively -- Handle distributed errors properly - -## Scaling Patterns -- Implement proper auto-scaling -- Use resource management effectively -- Handle node failures gracefully -- Implement proper checkpointing - -## Performance -- Use Ray's performance monitoring -- Implement proper batching -- Use Ray's memory management -- Profile distributed operations \ No newline at end of file diff --git a/.cursor/rules/python/fastapi-standards.mdc b/.cursor/rules/python/fastapi-standards.mdc deleted file mode 100644 index a83a666..0000000 --- a/.cursor/rules/python/fastapi-standards.mdc +++ /dev/null @@ -1,41 +0,0 @@ -# .cursor/rules/python/fastapi-standards.mdc ---- -description: FastAPI-specific development standards and patterns -globs: ["*.py"] -alwaysApply: true ---- -# FastAPI Development Standards - -## Project Structure -- Use the following directory structure: - ``` - app/ - ├── api/ - │ └── v1/ - │ └── endpoints/ - ├── core/ - │ ├── config.py - │ └── security.py - ├── models/ - ├── schemas/ - └── services/ - ``` - -## FastAPI Best Practices -- Use dependency injection for service dependencies -- Implement proper exception handlers -- Use background tasks for async operations -- Implement proper middleware chain -- Use FastAPI's built-in OpenAPI support - -## Performance Optimization -- Use async/await properly -- Implement caching strategies -- Use connection pooling for databases -- Implement proper background tasks - -## Security -- Use FastAPI's security dependencies -- Implement proper CORS policies -- Use rate limiting -- Implement proper authentication middleware \ No newline at end of file diff --git a/.cursor/rules/python/infrastructure.mdc b/.cursor/rules/python/infrastructure.mdc deleted file mode 100644 index d9bd974..0000000 --- a/.cursor/rules/python/infrastructure.mdc +++ /dev/null @@ -1,25 +0,0 @@ -# .cursor/rules/python/infrastructure.mdc ---- -description: Infrastructure and deployment standards -globs: ["*.py", "Dockerfile", "*.yaml"] -alwaysApply: true ---- -# Infrastructure Standards - -## Containerization -- Use multi-stage Docker builds -- Implement proper health checks -- Use non-root users -- Follow container security best practices - -## Kubernetes -- Use proper resource requests/limits -- Implement proper probes -- Use proper service mesh integration -- Follow GitOps practices - -## CI/CD -- Implement proper testing stages -- Use proper security scanning -- Implement proper deployment strategies -- Use proper environment separation \ No newline at end of file diff --git a/.cursor/rules/python/microservices-architecture.mdc b/.cursor/rules/python/microservices-architecture.mdc deleted file mode 100644 index e435295..0000000 --- a/.cursor/rules/python/microservices-architecture.mdc +++ /dev/null @@ -1,36 +0,0 @@ -# .cursor/rules/python/microservices-architecture.mdc ---- -description: Guidelines for Python microservice architecture -globs: ["*.py"] -alwaysApply: true ---- -# Microservice Architecture Guidelines - -## Service Design -- Keep services small and focused on a single business capability -- Use FastAPI for HTTP APIs -- Use gRPC for internal service communication -- Implement health check endpoints -- Use OpenAPI/Swagger for API documentation -- Use proper service discovery -- Implement proper circuit breaking -- Use proper message queuing -- Implement proper retry policies - -## Configuration -- Use environment variables for service configuration -- Store secrets in a secure vault (e.g., HashiCorp Vault) -- Use configuration management for different environments -- Implement feature flags for gradual rollouts - -## Observability -- Implement structured logging using `structlog` -- Use OpenTelemetry for distributed tracing -- Implement metrics using Prometheus -- Set up proper monitoring dashboards - -## Resilience -- Implement circuit breakers for external calls -- Use retries with exponential backoff -- Implement rate limiting -- Handle partial failures gracefully \ No newline at end of file diff --git a/.cursor/rules/python/python-coding-rules.mdc b/.cursor/rules/python/python-coding-rules.mdc deleted file mode 100644 index 34e99a7..0000000 --- a/.cursor/rules/python/python-coding-rules.mdc +++ /dev/null @@ -1,32 +0,0 @@ -# .cursor/rules/python/python-coding-rules.mdc ---- -description: Python coding standards and best practices -globs: ["*.py"] -alwaysApply: true ---- -# Python Coding Standards - -## Code Style -- Follow PEP 8 style guide -- Use type hints for all function parameters and return values -- Maximum line length: 88 characters (Black formatter standard) -- Use descriptive variable names that reflect their purpose -- Use docstrings for all public modules, functions, classes, and methods - -## Project Structure -- Use src-layout pattern for all Python packages -- Separate business logic from API handlers -- Keep modules focused and single-responsibility -- Use absolute imports over relative imports - -## Error Handling -- Use custom exceptions for domain-specific errors -- Always include meaningful error messages -- Handle exceptions at appropriate levels -- Log errors with proper context - -## Best Practices -- Use dataclasses or Pydantic models for data structures -- Implement proper logging with structured data -- Use environment variables for configuration -- Follow the principle of least privilege \ No newline at end of file diff --git a/.cursor/rules/python/testing-standards.mdc b/.cursor/rules/python/testing-standards.mdc deleted file mode 100644 index 8463816..0000000 --- a/.cursor/rules/python/testing-standards.mdc +++ /dev/null @@ -1,28 +0,0 @@ -# .cursor/rules/python/testing-standards.mdc ---- -description: Testing requirements for Python microservices -globs: ["*_test.py", "test_*.py"] -alwaysApply: true ---- -# Testing Standards - -## Unit Tests -- Use pytest as the testing framework -- Maintain minimum 80% code coverage -- Mock external dependencies -- Use fixtures for test data -- Test both success and error cases - -## Integration Tests -- Test service integrations -- Use docker-compose for local testing -- Implement API tests using pytest-asyncio -- Test database interactions -- Verify message queue operations - -## Performance Tests -- Implement load tests using locust -- Test service scalability -- Measure response times -- Test rate limiting -- Verify resource usage \ No newline at end of file diff --git a/.cursor/rules/rego/rego-coding-patterns.mdc b/.cursor/rules/rego/rego-coding-patterns.mdc deleted file mode 100644 index 0669550..0000000 --- a/.cursor/rules/rego/rego-coding-patterns.mdc +++ /dev/null @@ -1,94 +0,0 @@ ---- -description: -globs: *.rego -alwaysApply: false ---- -# Common Rego Patterns and Idioms - -## Data Access Patterns -```rego -# Safe object access -value := object.get("key", "default") - -# Array iteration -result := [item | item := array[_]] - -# Set operations -combined := set_union(set1, set2) -``` - -## Control Flow -```rego -# Conditional logic -allow { - condition1 - condition2 -} else { - condition3 -} - -# Early returns -deny["reason"] { - not is_valid -} - -# Multiple conditions -allow { - count(violations) == 0 - is_authorized -} -``` - -## Common Functions -```rego -# Existence check -exists { - count(array) > 0 -} - -# Contains check -contains { - array[_] == value -} - -# All elements satisfy condition -all_valid { - count([x | x := array[_]; not is_valid(x)]) == 0 -} -``` - -## Testing Patterns -```rego -# Test case structure -test_allow_when_valid { - allow with input as {"valid": true} -} - -# Test helper functions -test_is_valid { - is_valid with input as {"value": "test"} -} -``` - -## Error Handling -```rego -# Error collection -errors[msg] { - not is_valid - msg := "Invalid input" -} - -# Multiple error messages -errors[msg] { - not is_authorized - msg := "Not authorized" -} -``` - -## Best Practices -1. Use helper functions for complex logic -2. Keep rules focused and single-purpose -3. Use meaningful variable names -4. Document complex logic with comments -5. Use consistent formatting -6. Break down complex conditions into smaller rules diff --git a/CLAUDE.md b/CLAUDE.md deleted file mode 100644 index 998ae7a..0000000 --- a/CLAUDE.md +++ /dev/null @@ -1,18 +0,0 @@ -# TIPS - Transaction Inclusion Prioritization Stack - -## Overview -TIPS is an experimental project to replace the p2p mempool with a collection of stateless servies to enable: - -- Higher throughput -- Simulation of all transaction -- Cost savings on hardware -- Bundle support - -## Code Style & Standards -- Do not add comments unless instructed -- Put imports at the top of the file, never in functions -- Use `just fix` to fix formatting and warnings -- Run `just ci` to verify your changes -- Add dependencies to the Cargo.toml in the root and reference them in the crate cargo files -- Always use the latest dependency versions. Use https://crates.io/ to find dependency versions when adding new deps -- For logging use the tracing crate with appropriate levels and structured logging \ No newline at end of file diff --git a/docs/API.md b/docs/API.md deleted file mode 100644 index fc83613..0000000 --- a/docs/API.md +++ /dev/null @@ -1,75 +0,0 @@ -# API Reference - -TIPS processes all transactions as bundles. Transactions submitted via `eth_sendRawTransaction` are wrapped into a single-transaction bundle with sensible defaults. - -## Bundle Identifiers - -Bundles have two identifiers: -- **UUID**: Server-generated unique identifier assigned on submission -- **Bundle Hash**: `keccak(..bundle.txns)`, derived from the transaction set - -## Bundle Lifecycle - -### Creation - -Bundles are deduplicated by bundle hash. When multiple bundles share the same hash, the latest submission defines the bundle fields: - -``` -bundleA = (txA) → store: {bundleA} -bundleB = (txA, txB) → store: {bundleA, bundleB} -bundleC = (txA, txB) → store: {bundleA, bundleC} # replaces bundleB -bundleD = (txC, txA) → store: {bundleA, bundleC, bundleD} -``` - -### Updates - -Bundles can be updated via: -- `eth_sendRawTransaction`: matches by (address, nonce) -- `eth_sendBundle`: matches by UUID - -Updates are best-effort. If a bundle is already included in a flashblock before the update processes, the original bundle will be used. - -### Cancellation - -Cancel bundles with `eth_cancelBundle`. Cancellations are best-effort and may not take effect if the bundle is already included. - -## RPC Methods - -### eth_sendRawTransaction - -``` -eth_sendRawTransaction(bytes) → hash -``` - -Validates and wraps the transaction in a bundle. Replacement transactions (same address and nonce) replace the existing bundle. - -**Limits:** -- 25 million gas per transaction - -### eth_sendBundle - -``` -eth_sendBundle(EthSendBundle) → uuid -``` - -Submits a bundle directly. Without a replacement UUID, inserts a new bundle (merging with existing bundles sharing the same hash). With a UUID, updates the existing bundle if it still exists. - -**Limits:** -- 25 million gas per bundle -- Maximum 3 transactions per bundle -- All transaction hashes must be in `reverting_tx_hashes` (revert protection not supported) -- `dropping_tx_hashes` must be empty -- Refunds not supported (`refund_percent`, `refund_recipient`, `refund_tx_hashes` must be unset/empty) -- `extra_fields` must be empty - -**Reference:** [EthSendBundle](https://github.com/alloy-rs/alloy/blob/25019adf54272a3372d75c6c44a6185e4be9dfa2/crates/rpc-types-mev/src/eth_calls.rs#L252) - -### eth_cancelBundle - -``` -eth_cancelBundle(EthCancelBundle) -``` - -Cancels a bundle by UUID. Best-effort; may not succeed if already included by the builder. - -**Reference:** [EthCancelBundle](https://github.com/alloy-rs/alloy/blob/25019adf54272a3372d75c6c44a6185e4be9dfa2/crates/rpc-types-mev/src/eth_calls.rs#L216) diff --git a/docs/AUDIT_S3_FORMAT.md b/docs/AUDIT_S3_FORMAT.md deleted file mode 100644 index acb00d4..0000000 --- a/docs/AUDIT_S3_FORMAT.md +++ /dev/null @@ -1,134 +0,0 @@ -# Audit S3 Storage Format - -The audit system archives bundle and UserOp lifecycle events to S3 for long-term storage and lookup. - -## Storage Paths - -| Path | Description | -|------|-------------| -| `/bundles/` | Bundle lifecycle history | -| `/transactions/by_hash/` | Transaction hash to bundle mapping | -| `/userops/` | UserOperation lifecycle history | - -## Bundle History - -**Path:** `/bundles/` - -Stores the complete lifecycle of a bundle as a series of events. - -```json -{ - "history": [ - { - "event": "Created", - "timestamp": 1234567890, - "key": "-", - "data": { - "bundle": { /* EthSendBundle object */ } - } - }, - { - "event": "BuilderIncluded", - "timestamp": 1234567893, - "key": "-", - "data": { - "blockNumber": 12345, - "flashblockIndex": 1, - "builderId": "builder-id" - } - }, - { - "event": "BlockIncluded", - "timestamp": 1234567895, - "key": "-", - "data": { - "blockNumber": 12345, - "blockHash": "0x..." - } - }, - { - "event": "Dropped", - "timestamp": 1234567896, - "key": "-", - "data": { - "reason": "TIMEOUT" - } - } - ] -} -``` - -See [Bundle States](./BUNDLE_STATES.md) for event type definitions. - -## Transaction Lookup - -**Path:** `/transactions/by_hash/` - -Maps transaction hashes to bundle UUIDs for efficient lookups. - -```json -{ - "bundle_ids": [ - "550e8400-e29b-41d4-a716-446655440000", - "6ba7b810-9dad-11d1-80b4-00c04fd430c8" - ] -} -``` - -## UserOperation History - -**Path:** `/userops/` - -Stores ERC-4337 UserOperation lifecycle events. Events are written after validation passes. - -```json -{ - "history": [ - { - "event": "AddedToMempool", - "data": { - "key": "-", - "timestamp": 1234567890, - "sender": "0x1234567890abcdef1234567890abcdef12345678", - "entry_point": "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789", - "nonce": "0x1" - } - }, - { - "event": "Included", - "data": { - "key": "-", - "timestamp": 1234567895, - "block_number": 12345678, - "tx_hash": "0xabcdef..." - } - }, - { - "event": "Dropped", - "data": { - "key": "-", - "timestamp": 1234567896, - "reason": { - "Invalid": "AA21 didn't pay prefund" - } - } - } - ] -} -``` - -### UserOp Events - -| Event | Description | Key Fields | -|-------|-------------|------------| -| `AddedToMempool` | UserOp passed validation and entered mempool | sender, entry_point, nonce | -| `Included` | UserOp included in a block | block_number, tx_hash | -| `Dropped` | UserOp removed from mempool | reason | - -### Drop Reasons - -| Reason | Description | -|--------|-------------| -| `Invalid(String)` | Validation failed with error message | -| `Expired` | TTL exceeded | -| `ReplacedByHigherFee` | Replaced by another UserOp with higher fee | diff --git a/docs/BUNDLE_STATES.md b/docs/BUNDLE_STATES.md deleted file mode 100644 index d51e691..0000000 --- a/docs/BUNDLE_STATES.md +++ /dev/null @@ -1,51 +0,0 @@ -# Bundle States - -Bundles transition through the following states during their lifecycle. - -## State Definitions - -| State | Description | Arguments | -|-------|-------------|-----------| -| **Created** | Bundle created with initial transaction list | bundle | -| **Updated** | Bundle modified (transactions added/removed) | bundle | -| **Cancelled** | Bundle explicitly cancelled | nonce \| uuid | -| **IncludedByBuilder** | Bundle included in flashblock by builder | flashblockNum, blockNum, builderId | -| **IncludedInBlock** | Bundle confirmed in blockchain | blockNum, blockHash | -| **Dropped** | Bundle dropped from processing | reason | - -## Drop Reasons - -| Reason | Description | -|--------|-------------| -| `TIMEOUT` | Bundle expired without inclusion | -| `INCLUDED_BY_OTHER` | Overlapping bundle caused this bundle's transactions to become non-includable | -| `REVERTED` | A non-revertible transaction reverted | - -## Mempool Limits - -Bundles may be dropped when limits are exceeded: - -### Bundle Limits -- Timeout (block or flashblock deadline) -- Target block number passed - -### Account Limits -- Fixed number of transactions per account in mempool -- Excess transactions dropped by descending nonce - -### Global Limits -- Mempool pruned at capacity based on: - - Bundle age - - Low base fee - -### Overlapping Bundles - -When bundles share transactions, inclusion of one may invalidate another: - -``` -bundleA = (txA, txB) -bundleB = (txA) - -If bundleB is included and txA in bundleA cannot be dropped, -bundleA is marked INCLUDED_BY_OTHER and removed. -``` diff --git a/docs/ERC4337_BUNDLER.md b/docs/ERC4337_BUNDLER.md deleted file mode 100644 index 5843191..0000000 --- a/docs/ERC4337_BUNDLER.md +++ /dev/null @@ -1,104 +0,0 @@ -# TIPS ERC-4337 Bundler - -## Overview - -ERC-4337 bundlers include user operations (smart account transactions) onchain. TIPS includes a native bundler that provides optimal speed and cost for user operations with full audit tracing via the TIPS UI. - -## Architecture - -### Ingress - -TIPS exposes `eth_sendUserOperation` and performs standard ERC-7562 validation checks while managing the user operation mempool. Supported entry points: v0.6 through v0.9. - -Base node reth includes `base_validateUserOperation` for validating user ops before adding them to the queue. - -### ERC-7562 Validation - -[ERC-7562](https://eips.ethereum.org/EIPS/eip-7562) protects bundlers from DoS attacks through unpaid computation and reverting transactions. The rules restrict: - -- Opcodes -- Reputation -- Storage access -- Bundle rules -- Staking for globally used contracts (paymasters, factories) - -These restrictions minimize cross-transactional dependencies that could allow one transaction to invalidate another. - -TIPS streams events from the block builder to the audit stream, updating ingress rules and reputation/mempool limits. A Redis cluster maintains reputation scores for user operation entities (sender, paymaster, factory) tracking `opsSeen` and `opsIncluded` over configured intervals. - -User operations from `BANNED` entities are filtered out before validation. - -### Block Building - -Native bundler integration enables: - -- **Larger bundles**: Reduces signatures from worst case 2N to best case N+1 (N = number of user ops), improving data availability on Base Chain -- **Priority fee ordering**: User operations ordered by priority fee within bundles - -Initial approach: One large bundle at the middle of each flashblock with priority fee ordering within that bundle. - -#### Bundle Construction - -1. Incrementally stack user op validation phases -2. Attempt to include the transaction -3. Prune and resubmit any reverting ops -4. Execute once the bundle is built (no revert risk in execution phase) - -#### Key Management - -The block builder requires a hot bundler key that accrues ETH. Balance is swept periodically (every N blocks) to the sequencer address. - -Future AA V2 phases will add a new transaction type to remove this hot key requirement. - -## RPC Methods - -### Base Node Methods - -| Method | Description | -|--------|-------------| -| `base_validateUserOperation` | Validates user operation conforms to ERC-7562 with successful validation phase | -| `eth_supportedEntrypoints` | Returns supported entry points | -| `eth_estimateUserOperationGas` | Returns PVG and gas limit estimates | -| `eth_sendUserOperation` | Sends user operation to TIPS pipeline after validation | -| `eth_getUserOperationByHash` | Gets user operation by hash (flashblock enabled) | -| `eth_getUserOperationReceipt` | Gets user operation receipt (flashblock enabled) | - -### Gas Estimation - -`eth_estimateUserOperationGas` returns: -- Verification gas limit -- Execution gas limit -- PreVerificationGas (PVG) - -PVG covers bundler tip, entrypoint overhead, and L1 data fee. - -### PreVerificationGas (PVG) - -Current issues: -1. Primary source of overcharging -2. User ops stuck in mempool if PVG too low - -Solutions: -- Future AA V2 will decouple L1 data fee from bundler tip + overhead via `l1GasFeeLimit` -- TIPS native bundler amortizes costs across user ops in bundles, enabling lower PVG values -- Clear error messages for PVG too low conditions - -## Call Flow - -``` -Wallet (EIP-5792) - ↓ -eth_sendUserOperation - ↓ -base_validateUserOperation (ERC-7562) - ↓ -User Operation Queue (Kafka) - ↓ -User Operation Mempool - ↓ -rBuilder (bundle construction) - ↓ -Block Inclusion - ↓ -Audit Pipeline -``` diff --git a/docs/PULL_REQUEST_GUIDELINES.md b/docs/PULL_REQUEST_GUIDELINES.md deleted file mode 100644 index 8fb4180..0000000 --- a/docs/PULL_REQUEST_GUIDELINES.md +++ /dev/null @@ -1,93 +0,0 @@ -# Pull Request Guidelines - -## Overview - -PRs are the lifeline of the team. They allow us to ship value, determine maintenance cost, and impact daily quality of life. Well-maintained code sustains velocity. - -## Why - -A quality pull request process enables sustained velocity and consistent delivery. - -Pull requests allow us to: - -- **Hold and improve quality**: Catch bugs and architectural issues early -- **Build team expertise**: Share knowledge through clear descriptions and thoughtful reviews -- **Stay customer focused**: Keep PRs tight and decoupled for incremental, reversible changes -- **Encourage ownership**: Clear domain ownership motivates high quality and reduces incidents - -## SLA - -| Metric | Target | Rationale | -|--------|--------|-----------| -| PR Review | Within half a working day | If reviews take longer than 1 working day, something needs improvement | - -## Success Metrics - -| Metric | Why | -|--------|-----| -| Time to PR Review | Fast reviews power the flywheel: shared context → quality code → maintainable codebase → iteration | -| Time from PR Open to Production | Deployed code reaches customers | -| Incidents | Quality authoring and review catches errors early | -| QA Regression Bugs | Quality authoring and review catches errors early | - -## Authoring Guidelines - -### Keep PRs Tight - -PRs should make either deep changes (few files, significant logic) or shallow changes (many files, simple refactors). - -- **< 500 LOC** (guideline; auto-generated or boilerplate may exceed this) -- **< 10 files** (guideline; renames may touch more files) - -### Write Clear Descriptions - -Enable reviewers to understand the problem and verify the solution. Good descriptions also serve as documentation. - -### Test Thoroughly - -Any code change impacts flows. Include: -- Manual testing -- Unit tests -- QA regression tests where appropriate - -### Choose Reviewers Carefully - -Select codebase owners and domain experts. Reach out early to allow reviewers to schedule time. - -### Budget Time for Reviews - -Allow time for comments, suggestions, and improvements. Code is written once but read many times. - -### Consider Live Reviews - -Synchronous reviews can resolve alignment faster. Document decisions in the PR for posterity. - -## Reviewing Guidelines - -### Review Within Half a Day - -Fast reviews generate a flywheel of velocity and knowledge-sharing. - -### Review in Detail - -No rubber stamping. Given good descriptions and self-review, PRs should be relatively easy to review thoroughly. - -## Codebase Ownership - -### Unit Tests - -Owners decide on unit test thresholds reflecting appropriate effort and business risk. - -### Conventions - -Team should have consensus on conventions. Ideally automated or linted; otherwise documented. - -## FAQ - -**Can we make an exception for tight timelines?** - -Yes, exceptions are always possible. For large PRs, hold a retro to identify what could be done differently. - -**When should authors seek reviewers?** - -As early as possible. Reviewers of design artifacts (PPS/TDD) should likely also review the PR. diff --git a/docs/SETUP.md b/docs/SETUP.md deleted file mode 100644 index 6489255..0000000 --- a/docs/SETUP.md +++ /dev/null @@ -1,117 +0,0 @@ -# Local Development Setup - -This guide covers setting up and running TIPS locally with all required dependencies. - -## Prerequisites - -- Docker and Docker Compose -- Rust (latest stable) -- Go (1.21+) -- Just command runner (`cargo install just`) -- Git - -## Clone Repositories - -Clone the three required repositories: - -```bash -# TIPS (this repository) -git clone https://github.com/base/tips.git - -# builder-playground (separate directory) -git clone https://github.com/flashbots/builder-playground.git -cd builder-playground -git remote add danyal git@github.com:danyalprout/builder-playground.git -git checkout danyal/base-overlay - -# op-rbuilder (separate directory) -git clone https://github.com/base/op-rbuilder.git -``` - -## Start Services - -### 1. TIPS Infrastructure - -```bash -cd tips -just sync # Sync and load environment variables -just start-all # Start all TIPS services -``` - -This starts: -- Docker containers (Kafka, MinIO, node-reth) -- Ingress RPC service -- Audit service -- Bundle pool service -- UI - -### 2. builder-playground - -Provides L1/L2 blockchain infrastructure: - -```bash -cd builder-playground -go run main.go cook opstack \ - --external-builder http://host.docker.internal:4444/ \ - --enable-latest-fork 0 \ - --flashblocks \ - --base-overlay \ - --flashblocks-builder ws://host.docker.internal:1111/ws -``` - -Keep this terminal running. - -### 3. op-rbuilder - -Handles L2 block building: - -```bash -cd op-rbuilder -just run-playground -``` - -Keep this terminal running. - -## Test the System - -```bash -cd tips -just send-txn -``` - -This submits a test transaction through the ingress → audit → bundle pool → builder pipeline. - -## Port Reference - -| Service | Port | Description | -|---------|------|-------------| -| TIPS Ingress RPC | 8080 | Bundle submission endpoint | -| TIPS UI | 3000 | Debug interface | -| MinIO Console | 7001 | Object storage UI | -| MinIO API | 7000 | Object storage API | -| Kafka | 9092 | Message broker | -| op-rbuilder | 4444 | Block builder API | - -## Development Workflow - -1. Keep builder-playground and op-rbuilder running -2. Run `just start-all` after code changes -3. Test with `just send-txn` -4. View logs with `docker logs -f ` -5. Access UI at http://localhost:3000 - -Query block information: - -```bash -just get-blocks -``` - -## Stop Services - -```bash -cd tips -just stop-all - -# Ctrl+C in op-rbuilder terminal -# Ctrl+C in builder-playground terminal -``` diff --git a/docs/logo.png b/docs/logo.png deleted file mode 100644 index 5dc999b136f37eb93277a7ae8e6c6f89f5f3e082..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127664 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%0DZ1e%+iKGJNQ;S10@f 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 bT=$Q+4wsaj2{+p3;eIyP9V~FyZYTT~ME0hr From b2d36d1a151aa6281b9511fc32140a9fc818a5b1 Mon Sep 17 00:00:00 2001 From: Mihir Wadekar Date: Thu, 12 Feb 2026 00:40:45 -0800 Subject: [PATCH 115/117] chore: renaming dockerfiles and compose --- docker-compose.tips.yml | 43 ------------------- docker/Dockerfile.audit | 35 +++++++++++++++ docker/Dockerfile.ingress-rpc | 35 +++++++++++++++ .../docker-compose.tips-infra.yml | 2 +- docker/docker-compose.tips-services.yml | 39 +++++++++++++++++ .../audit-kafka-properties | 0 .../host-ingress-audit-kafka-properties | 0 .../host-ingress-bundles-kafka-properties | 0 .../ingress-audit-kafka-properties | 0 .../ingress-bundles-kafka-properties | 0 ...s-user-operation-consumer-kafka-properties | 0 11 files changed, 110 insertions(+), 44 deletions(-) delete mode 100644 docker-compose.tips.yml create mode 100644 docker/Dockerfile.audit create mode 100644 docker/Dockerfile.ingress-rpc rename docker-compose.yml => docker/docker-compose.tips-infra.yml (99%) create mode 100644 docker/docker-compose.tips-services.yml rename docker/{ => kafka-properties}/audit-kafka-properties (100%) rename docker/{ => kafka-properties}/host-ingress-audit-kafka-properties (100%) rename docker/{ => kafka-properties}/host-ingress-bundles-kafka-properties (100%) rename docker/{ => kafka-properties}/ingress-audit-kafka-properties (100%) rename docker/{ => kafka-properties}/ingress-bundles-kafka-properties (100%) rename docker/{ => kafka-properties}/ingress-user-operation-consumer-kafka-properties (100%) diff --git a/docker-compose.tips.yml b/docker-compose.tips.yml deleted file mode 100644 index 4054ccf..0000000 --- a/docker-compose.tips.yml +++ /dev/null @@ -1,43 +0,0 @@ -services: - ingress-rpc: - build: - context: . - dockerfile: Dockerfile - command: - - "/app/tips-ingress-rpc" - container_name: tips-ingress-rpc - ports: - - "8080:8080" - - "8081:8081" - - "9002:9002" - env_file: - - .env.docker - volumes: - - ./docker/ingress-bundles-kafka-properties:/app/docker/ingress-bundles-kafka-properties:ro - - ./docker/ingress-audit-kafka-properties:/app/docker/ingress-audit-kafka-properties:ro - - ./docker/ingress-user-operation-consumer-kafka-properties:/app/docker/ingress-user-operation-consumer-kafka-properties:ro - restart: unless-stopped - - audit: - build: - context: . - dockerfile: Dockerfile - command: - - "/app/tips-audit" - container_name: tips-audit - env_file: - - .env.docker - volumes: - - ./docker/audit-kafka-properties:/app/docker/audit-kafka-properties:ro - restart: unless-stopped - - ui: - build: - context: . - dockerfile: ui/Dockerfile - ports: - - "3000:3000" - container_name: tips-ui - env_file: - - .env.docker - restart: unless-stopped \ No newline at end of file diff --git a/docker/Dockerfile.audit b/docker/Dockerfile.audit new file mode 100644 index 0000000..1fefc39 --- /dev/null +++ b/docker/Dockerfile.audit @@ -0,0 +1,35 @@ +FROM rust:1-bookworm AS base + +RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config libsasl2-dev libssl-dev + +RUN cargo install cargo-chef --locked +WORKDIR /app + +FROM base AS planner +COPY . . +RUN cargo chef prepare --recipe-path recipe.json + +FROM base AS builder +COPY --from=planner /app/recipe.json recipe.json + +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=/usr/local/cargo/git \ + --mount=type=cache,target=/app/target \ + cargo chef cook --recipe-path recipe.json + +COPY . . +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=/usr/local/cargo/git \ + --mount=type=cache,target=/app/target \ + cargo build -p audit-bin && \ + cp target/debug/audit /tmp/audit + +FROM debian:bookworm + +RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/lib/apt/lists/* + +WORKDIR /app + +COPY --from=builder /tmp/audit /app/audit + +ENTRYPOINT ["/app/audit"] diff --git a/docker/Dockerfile.ingress-rpc b/docker/Dockerfile.ingress-rpc new file mode 100644 index 0000000..025f4b1 --- /dev/null +++ b/docker/Dockerfile.ingress-rpc @@ -0,0 +1,35 @@ +FROM rust:1-bookworm AS base + +RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config libsasl2-dev libssl-dev + +RUN cargo install cargo-chef --locked +WORKDIR /app + +FROM base AS planner +COPY . . +RUN cargo chef prepare --recipe-path recipe.json + +FROM base AS builder +COPY --from=planner /app/recipe.json recipe.json + +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=/usr/local/cargo/git \ + --mount=type=cache,target=/app/target \ + cargo chef cook --recipe-path recipe.json + +COPY . . +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=/usr/local/cargo/git \ + --mount=type=cache,target=/app/target \ + cargo build -p ingress-rpc-bin && \ + cp target/debug/ingress-rpc /tmp/ingress-rpc + +FROM debian:bookworm + +RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/lib/apt/lists/* + +WORKDIR /app + +COPY --from=builder /tmp/ingress-rpc /app/ingress-rpc + +ENTRYPOINT ["/app/ingress-rpc"] diff --git a/docker-compose.yml b/docker/docker-compose.tips-infra.yml similarity index 99% rename from docker-compose.yml rename to docker/docker-compose.tips-infra.yml index 2cadfbf..0bebd3d 100644 --- a/docker-compose.yml +++ b/docker/docker-compose.tips-infra.yml @@ -72,4 +72,4 @@ services: /usr/bin/mc mb minio/tips; /usr/bin/mc anonymous set public minio/tips; exit 0; - " \ No newline at end of file + " diff --git a/docker/docker-compose.tips-services.yml b/docker/docker-compose.tips-services.yml new file mode 100644 index 0000000..1e6c31c --- /dev/null +++ b/docker/docker-compose.tips-services.yml @@ -0,0 +1,39 @@ +services: + ingress-rpc: + build: + context: .. + dockerfile: docker/Dockerfile.ingress-rpc + container_name: tips-ingress-rpc + ports: + - "8080:8080" + - "8081:8081" + - "9002:9002" + env_file: + - ../.env.docker + volumes: + - ./kafka-properties/ingress-bundles-kafka-properties:/etc/kafka/ingress-bundles-kafka-properties:ro + - ./kafka-properties/ingress-audit-kafka-properties:/etc/kafka/ingress-audit-kafka-properties:ro + - ./kafka-properties/ingress-user-operation-consumer-kafka-properties:/etc/kafka/ingress-user-operation-consumer-kafka-properties:ro + restart: unless-stopped + + audit: + build: + context: .. + dockerfile: docker/Dockerfile.audit + container_name: tips-audit + env_file: + - ../.env.docker + volumes: + - ./kafka-properties/audit-kafka-properties:/etc/kafka/audit-kafka-properties:ro + restart: unless-stopped + + ui: + build: + context: .. + dockerfile: ui/tips/Dockerfile + ports: + - "3000:3000" + container_name: tips-ui + env_file: + - ../.env.docker + restart: unless-stopped diff --git a/docker/audit-kafka-properties b/docker/kafka-properties/audit-kafka-properties similarity index 100% rename from docker/audit-kafka-properties rename to docker/kafka-properties/audit-kafka-properties diff --git a/docker/host-ingress-audit-kafka-properties b/docker/kafka-properties/host-ingress-audit-kafka-properties similarity index 100% rename from docker/host-ingress-audit-kafka-properties rename to docker/kafka-properties/host-ingress-audit-kafka-properties diff --git a/docker/host-ingress-bundles-kafka-properties b/docker/kafka-properties/host-ingress-bundles-kafka-properties similarity index 100% rename from docker/host-ingress-bundles-kafka-properties rename to docker/kafka-properties/host-ingress-bundles-kafka-properties diff --git a/docker/ingress-audit-kafka-properties b/docker/kafka-properties/ingress-audit-kafka-properties similarity index 100% rename from docker/ingress-audit-kafka-properties rename to docker/kafka-properties/ingress-audit-kafka-properties diff --git a/docker/ingress-bundles-kafka-properties b/docker/kafka-properties/ingress-bundles-kafka-properties similarity index 100% rename from docker/ingress-bundles-kafka-properties rename to docker/kafka-properties/ingress-bundles-kafka-properties diff --git a/docker/ingress-user-operation-consumer-kafka-properties b/docker/kafka-properties/ingress-user-operation-consumer-kafka-properties similarity index 100% rename from docker/ingress-user-operation-consumer-kafka-properties rename to docker/kafka-properties/ingress-user-operation-consumer-kafka-properties From 5ca7848a8aa3f511bef756919c0f304b92716dcd Mon Sep 17 00:00:00 2001 From: Mihir Wadekar Date: Thu, 12 Feb 2026 00:43:23 -0800 Subject: [PATCH 116/117] chore: removes unused workflows --- .github/workflows/docker.yml | 60 -------------------------- .github/workflows/rust.yml | 81 ------------------------------------ .github/workflows/ui.yml | 71 ++++++++++++++++++++++++------- 3 files changed, 56 insertions(+), 156 deletions(-) delete mode 100644 .github/workflows/docker.yml delete mode 100644 .github/workflows/rust.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index 849a3fd..0000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: Docker Build and Publish -permissions: - contents: read - packages: write - -on: - push: - branches: [master] - tags: ['v*'] - pull_request: - -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -jobs: - docker-build: - name: Build and Publish Docker image - runs-on: ubuntu-latest - steps: - - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 - with: - egress-policy: audit - - - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0 - - - name: Log in to GitHub Container Registry - if: github.event_name != 'pull_request' - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) - id: meta - uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - tags: | - type=ref,event=branch - type=ref,event=pr - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=sha - - - name: Build and push Docker image - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0 - with: - context: . - platforms: linux/amd64 - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml deleted file mode 100644 index 051baf6..0000000 --- a/.github/workflows/rust.yml +++ /dev/null @@ -1,81 +0,0 @@ -name: Rust -permissions: - contents: read - -on: - push: - branches: [ master ] - pull_request: - -env: - CARGO_TERM_COLOR: always - -jobs: - check: - name: Check - runs-on: ubuntu-latest - steps: - - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 - with: - egress-policy: audit - - - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - - uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable - - run: cargo check - - test: - name: Test - runs-on: ubuntu-latest - steps: - - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 - with: - egress-policy: audit - - - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - - uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable - - run: cargo test - - fmt: - name: Rustfmt - runs-on: ubuntu-latest - steps: - - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 - with: - egress-policy: audit - - - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - - uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable - with: - components: rustfmt - - run: cargo fmt --all -- --check - - clippy: - name: Clippy - runs-on: ubuntu-latest - steps: - - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 - with: - egress-policy: audit - - - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - - uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable - with: - components: clippy - - run: cargo clippy -- -D warnings -W clippy::uninlined_format_args - - build: - name: Build - runs-on: ubuntu-latest - steps: - - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 - with: - egress-policy: audit - - - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - - uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable - - run: cargo build --release \ No newline at end of file diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml index f4559b9..6587ce8 100644 --- a/.github/workflows/ui.yml +++ b/.github/workflows/ui.yml @@ -10,9 +10,40 @@ on: paths: ['ui/**'] jobs: + changes: + name: Detect Changes + runs-on: ubuntu-latest + outputs: + projects: ${{ steps.filter.outputs.projects }} + steps: + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 + with: + egress-policy: audit + + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 + id: paths + with: + filters: | + tips: + - 'ui/tips/**' + - id: filter + run: | + projects='[]' + if [ "${{ steps.paths.outputs.tips }}" == "true" ]; then + projects=$(echo "$projects" | jq -c '. + ["tips"]') + fi + echo "projects=$projects" >> $GITHUB_OUTPUT + lint: - name: Lint + name: Lint (${{ matrix.project }}) + needs: changes + if: ${{ needs.changes.outputs.projects != '[]' }} runs-on: ubuntu-latest + strategy: + matrix: + project: ${{ fromJson(needs.changes.outputs.projects) }} steps: - name: Harden the runner (Audit all outbound calls) uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 @@ -24,14 +55,19 @@ jobs: with: node-version: '20' cache: 'yarn' - cache-dependency-path: ui/yarn.lock - - run: cp .env.example ui/.env - - run: cd ui && yarn install - - run: cd ui && yarn lint + cache-dependency-path: ui/${{ matrix.project }}/yarn.lock + - run: cp .env.example ui/${{ matrix.project }}/.env + - run: cd ui/${{ matrix.project }} && yarn install + - run: cd ui/${{ matrix.project }} && yarn lint type-check: - name: Type Check + name: Type Check (${{ matrix.project }}) + needs: changes + if: ${{ needs.changes.outputs.projects != '[]' }} runs-on: ubuntu-latest + strategy: + matrix: + project: ${{ fromJson(needs.changes.outputs.projects) }} steps: - name: Harden the runner (Audit all outbound calls) uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 @@ -43,14 +79,19 @@ jobs: with: node-version: '20' cache: 'yarn' - cache-dependency-path: ui/yarn.lock - - run: cp .env.example ui/.env - - run: cd ui && yarn install - - run: cd ui && npx tsc --noEmit + cache-dependency-path: ui/${{ matrix.project }}/yarn.lock + - run: cp .env.example ui/${{ matrix.project }}/.env + - run: cd ui/${{ matrix.project }} && yarn install + - run: cd ui/${{ matrix.project }} && npx tsc --noEmit build: - name: Build + name: Build (${{ matrix.project }}) + needs: changes + if: ${{ needs.changes.outputs.projects != '[]' }} runs-on: ubuntu-latest + strategy: + matrix: + project: ${{ fromJson(needs.changes.outputs.projects) }} steps: - name: Harden the runner (Audit all outbound calls) uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1 @@ -62,7 +103,7 @@ jobs: with: node-version: '20' cache: 'yarn' - cache-dependency-path: ui/yarn.lock - - run: cp .env.example ui/.env - - run: cd ui && yarn install - - run: cd ui && yarn build \ No newline at end of file + cache-dependency-path: ui/${{ matrix.project }}/yarn.lock + - run: cp .env.example ui/${{ matrix.project }}/.env + - run: cd ui/${{ matrix.project }} && yarn install + - run: cd ui/${{ matrix.project }} && yarn build \ No newline at end of file From 0e9bb8dfa9a9625ce18900a8d74523603b565408 Mon Sep 17 00:00:00 2001 From: Mihir Wadekar Date: Thu, 12 Feb 2026 01:05:19 -0800 Subject: [PATCH 117/117] chore: removes docker spcific setup --- .env.example | 46 +++++++++++- docker/Dockerfile.audit | 35 --------- docker/Dockerfile.ingress-rpc | 35 --------- docker/docker-compose.tips-infra.yml | 75 ------------------- docker/docker-compose.tips-services.yml | 39 ---------- .../kafka-properties/audit-kafka-properties | 10 --- .../host-ingress-audit-kafka-properties | 4 - .../host-ingress-bundles-kafka-properties | 4 - .../ingress-audit-kafka-properties | 4 - .../ingress-bundles-kafka-properties | 3 - ...s-user-operation-consumer-kafka-properties | 9 --- ui/tips/Dockerfile | 4 +- 12 files changed, 47 insertions(+), 221 deletions(-) delete mode 100644 docker/Dockerfile.audit delete mode 100644 docker/Dockerfile.ingress-rpc delete mode 100644 docker/docker-compose.tips-infra.yml delete mode 100644 docker/docker-compose.tips-services.yml delete mode 100644 docker/kafka-properties/audit-kafka-properties delete mode 100644 docker/kafka-properties/host-ingress-audit-kafka-properties delete mode 100644 docker/kafka-properties/host-ingress-bundles-kafka-properties delete mode 100644 docker/kafka-properties/ingress-audit-kafka-properties delete mode 100644 docker/kafka-properties/ingress-bundles-kafka-properties delete mode 100644 docker/kafka-properties/ingress-user-operation-consumer-kafka-properties diff --git a/.env.example b/.env.example index 20fe76e..a53a4c6 100644 --- a/.env.example +++ b/.env.example @@ -3,4 +3,48 @@ GETH_MEMPOOL_ENDPOINT=http://localhost:8546 RETH_MEMPOOL_ENDPOINT=http://localhost:8547 # Service selection for generic Docker commands -SERVICE=mempool-rebroadcaster \ No newline at end of file +SERVICE=mempool-rebroadcaster + +# Ingress +TIPS_INGRESS_ADDRESS=0.0.0.0 +TIPS_INGRESS_PORT=8080 +TIPS_INGRESS_RPC_MEMPOOL=http://localhost:2222 +TIPS_INGRESS_TX_SUBMISSION_METHOD=mempool +TIPS_INGRESS_KAFKA_INGRESS_PROPERTIES_FILE=/app/docker/ingress-bundles-kafka-properties +TIPS_INGRESS_KAFKA_INGRESS_TOPIC=tips-ingress +TIPS_INGRESS_KAFKA_AUDIT_PROPERTIES_FILE=/app/docker/ingress-audit-kafka-properties +TIPS_INGRESS_KAFKA_AUDIT_TOPIC=tips-audit +TIPS_INGRESS_KAFKA_USER_OPERATION_CONSUMER_PROPERTIES_FILE=/app/docker/ingress-user-operation-consumer-kafka-properties +TIPS_INGRESS_LOG_LEVEL=info +TIPS_INGRESS_LOG_FORMAT=pretty +TIPS_INGRESS_SEND_TRANSACTION_DEFAULT_LIFETIME_SECONDS=10800 +TIPS_INGRESS_RPC_SIMULATION=http://localhost:8549 +TIPS_INGRESS_METRICS_ADDR=0.0.0.0:9002 +TIPS_INGRESS_HEALTH_CHECK_ADDR=0.0.0.0:8081 +TIPS_INGRESS_BLOCK_TIME_MILLISECONDS=2000 +TIPS_INGRESS_METER_BUNDLE_TIMEOUT_MS=2000 +TIPS_INGRESS_MAX_BUFFERED_METER_BUNDLE_RESPONSES=100 +TIPS_INGRESS_BUILDER_RPCS=http://localhost:2222,http://localhost:2222,http://localhost:2222 +TIPS_INGRESS_BACKRUN_ENABLED=true + +# Audit service configuration +TIPS_AUDIT_KAFKA_PROPERTIES_FILE=/app/docker/audit-kafka-properties +TIPS_AUDIT_KAFKA_TOPIC=tips-audit +TIPS_AUDIT_LOG_LEVEL=info +TIPS_AUDIT_LOG_FORMAT=pretty +TIPS_AUDIT_S3_BUCKET=tips +TIPS_AUDIT_S3_CONFIG_TYPE=manual +TIPS_AUDIT_S3_ENDPOINT=http://localhost:7000 +TIPS_AUDIT_S3_REGION=us-east-1 +TIPS_AUDIT_S3_ACCESS_KEY_ID=minioadmin +TIPS_AUDIT_S3_SECRET_ACCESS_KEY=minioadmin + +# TIPS UI +NEXT_PUBLIC_BLOCK_EXPLORER_URL=https://base.blockscout.com +TIPS_UI_RPC_URL=http://localhost:8549 +TIPS_UI_AWS_REGION=us-east-1 +TIPS_UI_S3_BUCKET_NAME=tips +TIPS_UI_S3_CONFIG_TYPE=manual +TIPS_UI_S3_ENDPOINT=http://localhost:7000 +TIPS_UI_S3_ACCESS_KEY_ID=minioadmin +TIPS_UI_S3_SECRET_ACCESS_KEY=minioadmin \ No newline at end of file diff --git a/docker/Dockerfile.audit b/docker/Dockerfile.audit deleted file mode 100644 index 1fefc39..0000000 --- a/docker/Dockerfile.audit +++ /dev/null @@ -1,35 +0,0 @@ -FROM rust:1-bookworm AS base - -RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config libsasl2-dev libssl-dev - -RUN cargo install cargo-chef --locked -WORKDIR /app - -FROM base AS planner -COPY . . -RUN cargo chef prepare --recipe-path recipe.json - -FROM base AS builder -COPY --from=planner /app/recipe.json recipe.json - -RUN --mount=type=cache,target=/usr/local/cargo/registry \ - --mount=type=cache,target=/usr/local/cargo/git \ - --mount=type=cache,target=/app/target \ - cargo chef cook --recipe-path recipe.json - -COPY . . -RUN --mount=type=cache,target=/usr/local/cargo/registry \ - --mount=type=cache,target=/usr/local/cargo/git \ - --mount=type=cache,target=/app/target \ - cargo build -p audit-bin && \ - cp target/debug/audit /tmp/audit - -FROM debian:bookworm - -RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/lib/apt/lists/* - -WORKDIR /app - -COPY --from=builder /tmp/audit /app/audit - -ENTRYPOINT ["/app/audit"] diff --git a/docker/Dockerfile.ingress-rpc b/docker/Dockerfile.ingress-rpc deleted file mode 100644 index 025f4b1..0000000 --- a/docker/Dockerfile.ingress-rpc +++ /dev/null @@ -1,35 +0,0 @@ -FROM rust:1-bookworm AS base - -RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config libsasl2-dev libssl-dev - -RUN cargo install cargo-chef --locked -WORKDIR /app - -FROM base AS planner -COPY . . -RUN cargo chef prepare --recipe-path recipe.json - -FROM base AS builder -COPY --from=planner /app/recipe.json recipe.json - -RUN --mount=type=cache,target=/usr/local/cargo/registry \ - --mount=type=cache,target=/usr/local/cargo/git \ - --mount=type=cache,target=/app/target \ - cargo chef cook --recipe-path recipe.json - -COPY . . -RUN --mount=type=cache,target=/usr/local/cargo/registry \ - --mount=type=cache,target=/usr/local/cargo/git \ - --mount=type=cache,target=/app/target \ - cargo build -p ingress-rpc-bin && \ - cp target/debug/ingress-rpc /tmp/ingress-rpc - -FROM debian:bookworm - -RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/lib/apt/lists/* - -WORKDIR /app - -COPY --from=builder /tmp/ingress-rpc /app/ingress-rpc - -ENTRYPOINT ["/app/ingress-rpc"] diff --git a/docker/docker-compose.tips-infra.yml b/docker/docker-compose.tips-infra.yml deleted file mode 100644 index 0bebd3d..0000000 --- a/docker/docker-compose.tips-infra.yml +++ /dev/null @@ -1,75 +0,0 @@ -services: - kafka: - image: confluentinc/cp-kafka:7.5.0 - container_name: tips-kafka - ports: - - "9092:9092" - - "9094:9094" - environment: - KAFKA_BROKER_ID: 1 - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,PLAINTEXT_DOCKER:PLAINTEXT,CONTROLLER:PLAINTEXT - KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092,PLAINTEXT_DOCKER://host.docker.internal:9094 - KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:29092,CONTROLLER://0.0.0.0:9093,PLAINTEXT_HOST://0.0.0.0:9092,PLAINTEXT_DOCKER://0.0.0.0:9094 - KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT - KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER - KAFKA_ZOOKEEPER_CONNECT: ' ' - KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 - KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1 - KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1 - KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0 - KAFKA_PROCESS_ROLES: broker,controller - KAFKA_NODE_ID: 1 - KAFKA_CONTROLLER_QUORUM_VOTERS: 1@kafka:9093 - KAFKA_LOG_DIRS: /var/lib/kafka/data - CLUSTER_ID: 4L6g3nShT-eMCtK--X86sw - volumes: - - ./data/kafka:/var/lib/kafka/data - healthcheck: - test: ["CMD", "kafka-broker-api-versions", "--bootstrap-server", "localhost:9092"] - interval: 10s - timeout: 10s - retries: 5 - kafka-setup: - image: confluentinc/cp-kafka:7.5.0 - container_name: tips-kafka-setup - depends_on: - kafka: - condition: service_healthy - command: | - sh -c " - kafka-topics --create --if-not-exists --topic tips-audit --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 - kafka-topics --create --if-not-exists --topic tips-ingress --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 - kafka-topics --create --if-not-exists --topic tips-user-operation --bootstrap-server kafka:29092 --partitions 3 --replication-factor 1 - kafka-topics --list --bootstrap-server kafka:29092 - " - - minio: - image: minio/minio:latest - container_name: tips-minio - environment: - MINIO_ROOT_USER: minioadmin - MINIO_ROOT_PASSWORD: minioadmin - ports: - - "7000:9000" - - "7001:9001" - command: server /data --console-address ":9001" - volumes: - - ./data/minio:/data - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] - interval: 30s - timeout: 20s - retries: 3 - minio-setup: - image: minio/mc - container_name: tips-minio-setup - depends_on: - minio: - condition: service_healthy - entrypoint: > - /bin/sh -c " - /usr/bin/mc alias set minio http://minio:9000 minioadmin minioadmin; - /usr/bin/mc mb minio/tips; - /usr/bin/mc anonymous set public minio/tips; - exit 0; - " diff --git a/docker/docker-compose.tips-services.yml b/docker/docker-compose.tips-services.yml deleted file mode 100644 index 1e6c31c..0000000 --- a/docker/docker-compose.tips-services.yml +++ /dev/null @@ -1,39 +0,0 @@ -services: - ingress-rpc: - build: - context: .. - dockerfile: docker/Dockerfile.ingress-rpc - container_name: tips-ingress-rpc - ports: - - "8080:8080" - - "8081:8081" - - "9002:9002" - env_file: - - ../.env.docker - volumes: - - ./kafka-properties/ingress-bundles-kafka-properties:/etc/kafka/ingress-bundles-kafka-properties:ro - - ./kafka-properties/ingress-audit-kafka-properties:/etc/kafka/ingress-audit-kafka-properties:ro - - ./kafka-properties/ingress-user-operation-consumer-kafka-properties:/etc/kafka/ingress-user-operation-consumer-kafka-properties:ro - restart: unless-stopped - - audit: - build: - context: .. - dockerfile: docker/Dockerfile.audit - container_name: tips-audit - env_file: - - ../.env.docker - volumes: - - ./kafka-properties/audit-kafka-properties:/etc/kafka/audit-kafka-properties:ro - restart: unless-stopped - - ui: - build: - context: .. - dockerfile: ui/tips/Dockerfile - ports: - - "3000:3000" - container_name: tips-ui - env_file: - - ../.env.docker - restart: unless-stopped diff --git a/docker/kafka-properties/audit-kafka-properties b/docker/kafka-properties/audit-kafka-properties deleted file mode 100644 index d0ede9b..0000000 --- a/docker/kafka-properties/audit-kafka-properties +++ /dev/null @@ -1,10 +0,0 @@ -# Kafka configuration properties for audit service -bootstrap.servers=host.docker.internal:9094 -message.timeout.ms=5000 -group.id=local-audit -enable.partition.eof=false -session.timeout.ms=6000 -enable.auto.commit=false -auto.offset.reset=earliest -fetch.wait.max.ms=100 -fetch.min.bytes=1 \ No newline at end of file diff --git a/docker/kafka-properties/host-ingress-audit-kafka-properties b/docker/kafka-properties/host-ingress-audit-kafka-properties deleted file mode 100644 index 7929f9b..0000000 --- a/docker/kafka-properties/host-ingress-audit-kafka-properties +++ /dev/null @@ -1,4 +0,0 @@ -# Kafka audit configuration for host-based integration tests -bootstrap.servers=localhost:9092 -message.timeout.ms=5000 - diff --git a/docker/kafka-properties/host-ingress-bundles-kafka-properties b/docker/kafka-properties/host-ingress-bundles-kafka-properties deleted file mode 100644 index 3462d1f..0000000 --- a/docker/kafka-properties/host-ingress-bundles-kafka-properties +++ /dev/null @@ -1,4 +0,0 @@ -# Kafka configuration properties for host-based integration tests -bootstrap.servers=localhost:9092 -message.timeout.ms=5000 - diff --git a/docker/kafka-properties/ingress-audit-kafka-properties b/docker/kafka-properties/ingress-audit-kafka-properties deleted file mode 100644 index 2f58fc9..0000000 --- a/docker/kafka-properties/ingress-audit-kafka-properties +++ /dev/null @@ -1,4 +0,0 @@ -# Kafka configuration properties for ingress audit events -bootstrap.servers=host.docker.internal:9094 -message.timeout.ms=5000 -compression.type=zstd \ No newline at end of file diff --git a/docker/kafka-properties/ingress-bundles-kafka-properties b/docker/kafka-properties/ingress-bundles-kafka-properties deleted file mode 100644 index 6b7899a..0000000 --- a/docker/kafka-properties/ingress-bundles-kafka-properties +++ /dev/null @@ -1,3 +0,0 @@ -# Kafka configuration properties for ingress service -bootstrap.servers=host.docker.internal:9094 -message.timeout.ms=5000 \ No newline at end of file diff --git a/docker/kafka-properties/ingress-user-operation-consumer-kafka-properties b/docker/kafka-properties/ingress-user-operation-consumer-kafka-properties deleted file mode 100644 index 3bb02bf..0000000 --- a/docker/kafka-properties/ingress-user-operation-consumer-kafka-properties +++ /dev/null @@ -1,9 +0,0 @@ -# Kafka configuration properties for ingress user operation consumer -bootstrap.servers=host.docker.internal:9094 -message.timeout.ms=5000 -enable.partition.eof=false -session.timeout.ms=6000 -fetch.wait.max.ms=100 -fetch.min.bytes=1 -# Note: group.id and enable.auto.commit are set programmatically - diff --git a/ui/tips/Dockerfile b/ui/tips/Dockerfile index 8615be8..b24abfd 100644 --- a/ui/tips/Dockerfile +++ b/ui/tips/Dockerfile @@ -1,13 +1,13 @@ FROM node:20-alpine AS deps WORKDIR /app -COPY ui/package.json ui/yarn.lock ./ +COPY ui/tips/package.json ui/tips/yarn.lock ./ RUN --mount=type=cache,target=/root/.yarn \ yarn install --frozen-lockfile FROM node:20-alpine AS builder WORKDIR /app COPY --from=deps /app/node_modules ./node_modules -COPY ./ui . +COPY ./ui/tips . ENV NEXT_TELEMETRY_DISABLED=1