From dcfc1a626b3151446925873f847a955405a6585c Mon Sep 17 00:00:00 2001 From: Lorenzo Delgado Date: Fri, 8 Nov 2024 18:55:51 +0100 Subject: [PATCH] chore(deps): update rust crate thegraph-core to v0.x.x Signed-off-by: Lorenzo Delgado --- Cargo.lock | 1154 +++++++++++++++-- Cargo.toml | 3 +- src/auth.rs | 2 +- src/block_constraints.rs | 4 +- src/blocks.rs | 2 +- src/chain.rs | 6 +- src/client_query.rs | 2 +- src/client_query/context.rs | 2 +- src/config.rs | 6 +- src/errors.rs | 2 +- src/indexer_client.rs | 6 +- src/indexers/indexing_progress.rs | 2 +- src/indexers/public_poi.rs | 4 +- src/indexing_performance.rs | 2 +- src/main.rs | 9 +- src/network/indexer_indexing_poi_blocklist.rs | 2 +- src/network/indexer_indexing_poi_resolver.rs | 2 +- .../indexer_indexing_progress_resolver.rs | 2 +- src/network/internal/indexer_processing.rs | 2 +- src/network/internal/snapshot.rs | 4 +- src/network/internal/state.rs | 2 +- src/network/internal/subgraph_processing.rs | 4 +- src/network/service.rs | 5 +- src/network/subgraph_client.rs | 6 +- src/receipts.rs | 14 +- src/reports.rs | 2 +- src/vouchers.rs | 3 +- 27 files changed, 1104 insertions(+), 150 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 75abf00b0..801ee7aaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,9 +62,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "611cc2ae7d2e242c457e4be7f97036b8ad9ca152b499f53faf99b1ed8fc2553f" [[package]] name = "alloy" @@ -72,25 +72,45 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea8ebf106e84a1c37f86244df7da0c7587e697b71a0d565cce079449b85ac6f8" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.5.4", "alloy-contract", "alloy-core", - "alloy-eips", - "alloy-genesis", - "alloy-network", - "alloy-provider", + "alloy-eips 0.5.4", + "alloy-genesis 0.5.4", + "alloy-network 0.5.4", + "alloy-provider 0.5.4", "alloy-pubsub", - "alloy-rpc-client", + "alloy-rpc-client 0.5.4", "alloy-rpc-types", - "alloy-serde", + "alloy-serde 0.5.4", "alloy-signer 0.5.4", "alloy-signer-local", - "alloy-transport", - "alloy-transport-http", + "alloy-transport 0.5.4", + "alloy-transport-http 0.5.4", "alloy-transport-ipc", "alloy-transport-ws", ] +[[package]] +name = "alloy" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5758d94b67741865938b2f36bb0e4f52b08dbf38c100b78f16648e41d06050e9" +dependencies = [ + "alloy-consensus 0.6.2", + "alloy-core", + "alloy-eips 0.6.2", + "alloy-genesis 0.6.2", + "alloy-provider 0.6.2", + "alloy-rpc-client 0.6.2", + "alloy-serde 0.6.2", + "alloy-signer 0.6.2", + "alloy-signer-aws", + "alloy-signer-gcp", + "alloy-signer-ledger", + "alloy-transport-http 0.6.2", +] + [[package]] name = "alloy-chains" version = "0.1.47" @@ -108,10 +128,26 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41ed961a48297c732a5d97ee321aa8bb5009ecadbcb077d8bec90cb54e651629" dependencies = [ - "alloy-eips", + "alloy-eips 0.5.4", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.5.4", + "auto_impl", + "c-kzg", + "derive_more", + "serde", +] + +[[package]] +name = "alloy-consensus" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b19fd285b55dd39ae0dbc37481ad9f5f48898726f76335a2d6167a85a5fa41da" +dependencies = [ + "alloy-eips 0.6.2", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.6.2", "auto_impl", "c-kzg", "derive_more", @@ -126,14 +162,14 @@ checksum = "460ab80ce4bda1c80bcf96fe7460520476f2c7b734581c6567fac2708e2a60ef" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", - "alloy-network", - "alloy-network-primitives", + "alloy-network 0.5.4", + "alloy-network-primitives 0.5.4", "alloy-primitives", - "alloy-provider", + "alloy-provider 0.5.4", "alloy-pubsub", - "alloy-rpc-types-eth", + "alloy-rpc-types-eth 0.5.4", "alloy-sol-types", - "alloy-transport", + "alloy-transport 0.5.4", "futures", "futures-util", "thiserror", @@ -194,6 +230,18 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-eip7702" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69fb9fd842fdf10a524bbf2c4de6942ad869c1c8c3d128a1b09e67ed5f7cedbd" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "derive_more", + "serde", +] + [[package]] name = "alloy-eips" version = "0.5.4" @@ -201,10 +249,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b69e06cf9c37be824b9d26d6d101114fdde6af0c87de2828b414c05c4b3daa71" dependencies = [ "alloy-eip2930", - "alloy-eip7702", + "alloy-eip7702 0.3.2", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.5.4", + "c-kzg", + "derive_more", + "once_cell", + "serde", + "sha2", +] + +[[package]] +name = "alloy-eips" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21aff0f2c921246398cad88e32a1d8ec14359b183afbc3dcb816873714cafc1a" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702 0.4.0", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.6.2", "c-kzg", "derive_more", "once_cell", @@ -219,7 +285,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dde15e14944a88bd6a57d325e9a49b75558746fe16aaccc79713ae50a6a9574c" dependencies = [ "alloy-primitives", - "alloy-serde", + "alloy-serde 0.5.4", + "serde", +] + +[[package]] +name = "alloy-genesis" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76d899cfbfa13c5ed044383b7ae0e6a4d6ffcad3fd25e4acf71ff1c255ddae0" +dependencies = [ + "alloy-primitives", + "alloy-serde 0.6.2", "serde", ] @@ -249,19 +326,33 @@ dependencies = [ "tracing", ] +[[package]] +name = "alloy-json-rpc" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e244937365749c09c403d3054de39cc7dd46e3c3a12e5b164106af4903011ab1" +dependencies = [ + "alloy-primitives", + "alloy-sol-types", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "alloy-network" version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "204237129086ce5dc17a58025e93739b01b45313841f98fa339eb1d780511e57" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-network-primitives", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-json-rpc 0.5.4", + "alloy-network-primitives 0.5.4", "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-eth 0.5.4", + "alloy-serde 0.5.4", "alloy-signer 0.5.4", "alloy-sol-types", "async-trait", @@ -270,16 +361,52 @@ dependencies = [ "thiserror", ] +[[package]] +name = "alloy-network" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a28811461dc37e28db92b6d3a8c03a5883f2100b270a6294af00710bf4a0be4" +dependencies = [ + "alloy-consensus 0.6.2", + "alloy-eips 0.6.2", + "alloy-json-rpc 0.6.2", + "alloy-network-primitives 0.6.2", + "alloy-primitives", + "alloy-rpc-types-eth 0.6.2", + "alloy-serde 0.6.2", + "alloy-signer 0.6.2", + "alloy-sol-types", + "async-trait", + "auto_impl", + "futures-utils-wasm", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "alloy-network-primitives" version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "514f70ee2a953db21631cd817b13a1571474ec77ddc03d47616d5e8203489fde" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-primitives", + "alloy-serde 0.5.4", + "serde", +] + +[[package]] +name = "alloy-network-primitives" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e517c44a97e753f10dc0736215ba4677da5e2fbc1451e3e76902e02cd6cff12" +dependencies = [ + "alloy-consensus 0.6.2", + "alloy-eips 0.6.2", "alloy-primitives", - "alloy-serde", + "alloy-serde 0.6.2", "serde", ] @@ -318,17 +445,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4814d141ede360bb6cd1b4b064f1aab9de391e7c4d0d4d50ac89ea4bc1e25fbd" dependencies = [ "alloy-chains", - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-network", - "alloy-network-primitives", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-json-rpc 0.5.4", + "alloy-network 0.5.4", + "alloy-network-primitives 0.5.4", "alloy-primitives", "alloy-pubsub", - "alloy-rpc-client", - "alloy-rpc-types-eth", - "alloy-transport", - "alloy-transport-http", + "alloy-rpc-client 0.5.4", + "alloy-rpc-types-eth 0.5.4", + "alloy-transport 0.5.4", + "alloy-transport-http 0.5.4", "alloy-transport-ipc", "alloy-transport-ws", "async-stream", @@ -339,7 +466,7 @@ dependencies = [ "futures-utils-wasm", "lru", "parking_lot", - "pin-project", + "pin-project 1.1.7", "reqwest 0.12.9", "schnellru", "serde", @@ -348,7 +475,44 @@ dependencies = [ "tokio", "tracing", "url", - "wasmtimer", + "wasmtimer 0.2.1", +] + +[[package]] +name = "alloy-provider" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56befb85784c7eb4f163b9aed7cdcaba09d5b07f8e59d6c12ad0ce1acf67c0fd" +dependencies = [ + "alloy-chains", + "alloy-consensus 0.6.2", + "alloy-eips 0.6.2", + "alloy-json-rpc 0.6.2", + "alloy-network 0.6.2", + "alloy-network-primitives 0.6.2", + "alloy-primitives", + "alloy-rpc-client 0.6.2", + "alloy-rpc-types-eth 0.6.2", + "alloy-transport 0.6.2", + "alloy-transport-http 0.6.2", + "async-stream", + "async-trait", + "auto_impl", + "dashmap", + "futures", + "futures-utils-wasm", + "lru", + "parking_lot", + "pin-project 1.1.7", + "reqwest 0.12.9", + "schnellru", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "url", + "wasmtimer 0.4.0", ] [[package]] @@ -357,16 +521,16 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96ba46eb69ddf7a9925b81f15229cb74658e6eebe5dd30a5b74e2cd040380573" dependencies = [ - "alloy-json-rpc", + "alloy-json-rpc 0.5.4", "alloy-primitives", - "alloy-transport", + "alloy-transport 0.5.4", "bimap", "futures", "serde", "serde_json", "tokio", "tokio-stream", - "tower", + "tower 0.5.1", "tracing", ] @@ -398,24 +562,47 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc2bd1e7403463a5f2c61e955bcc9d3072b63aa177442b0f9aa6a6d22a941e3" dependencies = [ - "alloy-json-rpc", + "alloy-json-rpc 0.5.4", "alloy-primitives", "alloy-pubsub", - "alloy-transport", - "alloy-transport-http", + "alloy-transport 0.5.4", + "alloy-transport-http 0.5.4", "alloy-transport-ipc", "alloy-transport-ws", "futures", - "pin-project", + "pin-project 1.1.7", + "reqwest 0.12.9", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tower 0.5.1", + "tracing", + "url", + "wasmtimer 0.2.1", +] + +[[package]] +name = "alloy-rpc-client" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb49d38b3279a07e864d973323534a2c4a845e16f2c0153a509a3abcc01da7b1" +dependencies = [ + "alloy-json-rpc 0.6.2", + "alloy-primitives", + "alloy-transport 0.6.2", + "alloy-transport-http 0.6.2", + "futures", + "pin-project 1.1.7", "reqwest 0.12.9", "serde", "serde_json", "tokio", "tokio-stream", - "tower", + "tower 0.5.1", "tracing", "url", - "wasmtimer", + "wasmtimer 0.4.0", ] [[package]] @@ -426,8 +613,8 @@ checksum = "eea9bf1abdd506f985a53533f5ac01296bcd6102c5e139bbc5d40bc468d2c916" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-eth 0.5.4", + "alloy-serde 0.5.4", "serde", ] @@ -437,11 +624,11 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "886d22d41992287a235af2f3af4299b5ced2bcafb81eb835572ad35747476946" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.5.4", "derive_more", "serde", "strum", @@ -453,12 +640,31 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b034779a4850b4b03f5be5ea674a1cf7d746b2da762b34d1860ab45e48ca27" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network-primitives", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-network-primitives 0.5.4", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.5.4", + "alloy-sol-types", + "derive_more", + "itertools 0.13.0", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-rpc-types-eth" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be10f130b8be7c2351a3ea64b4bf07020fde5be8d1ac18db9a9a3496aa22bb19" +dependencies = [ + "alloy-consensus 0.6.2", + "alloy-eips 0.6.2", + "alloy-network-primitives 0.6.2", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.6.2", "alloy-sol-types", "derive_more", "itertools 0.13.0", @@ -477,15 +683,24 @@ dependencies = [ "serde_json", ] +[[package]] +name = "alloy-serde" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1493df14770a23b1e32d22c66fa22508d09e0a99d6923a45f179ff7887ca0cef" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", +] + [[package]] name = "alloy-signer" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd4e0ad79c81a27ca659be5d176ca12399141659fef2bcbfdc848da478f4504" +checksum = "592c185d7100258c041afac51877660c7bf6213447999787197db4842f0e938e" dependencies = [ - "alloy-dyn-abi", "alloy-primitives", - "alloy-sol-types", "async-trait", "auto_impl", "elliptic-curve", @@ -495,11 +710,13 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.5.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592c185d7100258c041afac51877660c7bf6213447999787197db4842f0e938e" +checksum = "ebff64a3b4062eba217404700d1517b9bf3ff9a7a5b2dd03f1cf8aeec3e9a6b8" dependencies = [ + "alloy-dyn-abi", "alloy-primitives", + "alloy-sol-types", "async-trait", "auto_impl", "elliptic-curve", @@ -507,14 +724,70 @@ dependencies = [ "thiserror", ] +[[package]] +name = "alloy-signer-aws" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d2b4605fa9567b001e60a74c89bc5b41f7de335be5fb70ed53db0135b8243e8" +dependencies = [ + "alloy-consensus 0.6.2", + "alloy-network 0.6.2", + "alloy-primitives", + "alloy-signer 0.6.2", + "async-trait", + "aws-sdk-kms", + "k256", + "spki", + "thiserror", + "tracing", +] + +[[package]] +name = "alloy-signer-gcp" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30f210ec8b6607d14a72a1748ffaf54383d412105833c98911be83e2110d50a" +dependencies = [ + "alloy-consensus 0.6.2", + "alloy-network 0.6.2", + "alloy-primitives", + "alloy-signer 0.6.2", + "async-trait", + "gcloud-sdk", + "k256", + "spki", + "thiserror", + "tracing", +] + +[[package]] +name = "alloy-signer-ledger" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee5b165638abcb4fd5509f63e8e2c074697bd0cc6fb715b7b59c84cf063a286f" +dependencies = [ + "alloy-consensus 0.6.2", + "alloy-dyn-abi", + "alloy-network 0.6.2", + "alloy-primitives", + "alloy-signer 0.6.2", + "alloy-sol-types", + "async-trait", + "coins-ledger", + "futures-util", + "semver 1.0.23", + "thiserror", + "tracing", +] + [[package]] name = "alloy-signer-local" version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6614f02fc1d5b079b2a4a5320018317b506fd0a6d67c1fd5542a71201724986c" dependencies = [ - "alloy-consensus", - "alloy-network", + "alloy-consensus 0.5.4", + "alloy-network 0.5.4", "alloy-primitives", "alloy-signer 0.5.4", "async-trait", @@ -602,7 +875,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be77579633ebbc1266ae6fd7694f75c408beb1aeb6865d0b18f22893c265a061" dependencies = [ - "alloy-json-rpc", + "alloy-json-rpc 0.5.4", "base64 0.22.1", "futures-util", "futures-utils-wasm", @@ -610,10 +883,30 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tower", + "tower 0.5.1", "tracing", "url", - "wasmtimer", + "wasmtimer 0.2.1", +] + +[[package]] +name = "alloy-transport" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64534da7f71ecca86b3449adec19b7942fb0905b9f392f60054a02a5f686f71f" +dependencies = [ + "alloy-json-rpc 0.6.2", + "base64 0.22.1", + "futures-util", + "futures-utils-wasm", + "serde", + "serde_json", + "thiserror", + "tokio", + "tower 0.5.1", + "tracing", + "url", + "wasmtimer 0.4.0", ] [[package]] @@ -622,11 +915,26 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91fd1a5d0827939847983b46f2f79510361f901dc82f8e3c38ac7397af142c6e" dependencies = [ - "alloy-json-rpc", - "alloy-transport", + "alloy-json-rpc 0.5.4", + "alloy-transport 0.5.4", + "reqwest 0.12.9", + "serde_json", + "tower 0.5.1", + "tracing", + "url", +] + +[[package]] +name = "alloy-transport-http" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617b5ab96f4fb64ef697a84c68ec8534c062baafbdb0529c34aaee43324f0d5a" +dependencies = [ + "alloy-json-rpc 0.6.2", + "alloy-transport 0.6.2", "reqwest 0.12.9", "serde_json", - "tower", + "tower 0.5.1", "tracing", "url", ] @@ -637,13 +945,13 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8073d1186bfeeb8fbdd1292b6f1a0731f3aed8e21e1463905abfae0b96a887a6" dependencies = [ - "alloy-json-rpc", + "alloy-json-rpc 0.5.4", "alloy-pubsub", - "alloy-transport", + "alloy-transport 0.5.4", "bytes", "futures", "interprocess", - "pin-project", + "pin-project 1.1.7", "serde_json", "tokio", "tokio-util", @@ -657,7 +965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61f27837bb4a1d6c83a28231c94493e814882f0e9058648a97e908a5f3fc9fcf" dependencies = [ "alloy-pubsub", - "alloy-transport", + "alloy-transport 0.5.4", "futures", "http 1.1.0", "rustls 0.23.16", @@ -926,6 +1234,205 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +[[package]] +name = "aws-credential-types" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "zeroize", +] + +[[package]] +name = "aws-runtime" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468" +dependencies = [ + "aws-credential-types", + "aws-sigv4", + "aws-smithy-async", + "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", + "once_cell", + "percent-encoding", + "pin-project-lite", + "tracing", + "uuid 1.11.0", +] + +[[package]] +name = "aws-sdk-kms" +version = "1.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfd059dacda4dfd5b57f2bd453fc6555f9acb496cb77508d517da24cf5d73167" +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", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "1.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1" +dependencies = [ + "aws-credential-types", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "form_urlencoded", + "hex", + "hmac", + "http 0.2.12", + "http 1.1.0", + "once_cell", + "percent-encoding", + "sha2", + "time", + "tracing", +] + +[[package]] +name = "aws-smithy-async" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "aws-smithy-http" +version = "0.60.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6" +dependencies = [ + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http-body 0.4.6", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-json" +version = "0.60.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" +dependencies = [ + "aws-smithy-types", +] + +[[package]] +name = "aws-smithy-runtime" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand", + "http 0.2.12", + "http-body 0.4.6", + "http-body 1.0.1", + "httparse", + "once_cell", + "pin-project-lite", + "pin-utils", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "bytes", + "http 0.2.12", + "http 1.1.0", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-types" +version = "1.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fbd94a32b3a7d55d3806fe27d98d3ad393050439dd05eb53ece36ec5e3d3510" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "http 0.2.12", + "http 1.1.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", +] + +[[package]] +name = "aws-types" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "rustc_version 0.4.1", + "tracing", +] + [[package]] name = "axum" version = "0.7.7" @@ -953,7 +1460,7 @@ dependencies = [ "serde_path_to_error", "sync_wrapper 1.0.1", "tokio", - "tower", + "tower 0.5.1", "tower-layer", "tower-service", ] @@ -1017,6 +1524,16 @@ 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.6.0" @@ -1138,6 +1655,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 = "bzip2" version = "0.4.4" @@ -1217,9 +1744,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.36" +version = "1.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baee610e9452a8f6f0a1b6194ec09ff9e2d85dea54432acdae41aa0761c95d70" +checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf" dependencies = [ "jobserver", "libc", @@ -1232,6 +1759,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[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.38" @@ -1316,6 +1849,29 @@ dependencies = [ "thiserror", ] +[[package]] +name = "coins-ledger" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9bc0994d0aa0f4ade5f3a9baf4a8d936f250278c85a1124b401860454246ab" +dependencies = [ + "async-trait", + "byteorder", + "cfg-if", + "const-hex", + "getrandom", + "hidapi-rusb", + "js-sys", + "log", + "nix", + "once_cell", + "thiserror", + "tokio", + "tracing", + "wasm-bindgen", + "wasm-bindgen-futures", +] + [[package]] name = "combine" version = "3.8.1" @@ -1551,6 +2107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", + "pem-rfc7468", "zeroize", ] @@ -1726,6 +2283,7 @@ dependencies = [ "ff", "generic-array", "group", + "pem-rfc7468", "pkcs8", "rand_core", "sec1", @@ -1816,7 +2374,7 @@ dependencies = [ "sha2", "sha3", "thiserror", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -1908,7 +2466,7 @@ dependencies = [ "ethers-providers", "futures-util", "once_cell", - "pin-project", + "pin-project 1.1.7", "serde", "serde_json", "thiserror", @@ -2046,9 +2604,9 @@ dependencies = [ "hashers", "http 0.2.12", "instant", - "jsonwebtoken", + "jsonwebtoken 8.3.0", "once_cell", - "pin-project", + "pin-project 1.1.7", "reqwest 0.11.27", "serde", "serde_json", @@ -2137,9 +2695,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "fastrlp" @@ -2382,6 +2940,34 @@ dependencies = [ "byteorder", ] +[[package]] +name = "gcloud-sdk" +version = "0.25.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0775bfa745cdf7287ae9765a685a813b91049b6b6d5ca3de20a3d5d16a80d8b2" +dependencies = [ + "async-trait", + "bytes", + "chrono", + "futures", + "hyper 1.5.0", + "jsonwebtoken 9.3.0", + "once_cell", + "prost", + "prost-types", + "reqwest 0.12.9", + "secret-vault-value", + "serde", + "serde_json", + "tokio", + "tonic", + "tower 0.5.1", + "tower-layer", + "tower-util", + "tracing", + "url", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -2400,8 +2986,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -2432,7 +3020,6 @@ dependencies = [ name = "graph-gateway" version = "24.0.0" dependencies = [ - "alloy-primitives", "alloy-signer-local", "alloy-sol-types", "anyhow", @@ -2458,7 +3045,7 @@ dependencies = [ "num-traits", "ordered-float", "parking_lot", - "pin-project", + "pin-project 1.1.7", "primitive-types", "prometheus", "prost", @@ -2481,7 +3068,7 @@ dependencies = [ "tokio", "tokio-test", "toolshed", - "tower", + "tower 0.5.1", "tower-http", "tower-test", "tracing", @@ -2722,6 +3309,18 @@ dependencies = [ "tracing", ] +[[package]] +name = "hidapi-rusb" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efdc2ec354929a6e8f3c6b6923a4d97427ec2f764cfee8cd4bfe890946cdf08b" +dependencies = [ + "cc", + "libc", + "pkg-config", + "rusb", +] + [[package]] name = "hmac" version = "0.12.1" @@ -2888,10 +3487,24 @@ dependencies = [ "http 1.1.0", "hyper 1.5.0", "hyper-util", - "rustls 0.23.16", - "rustls-pki-types", + "rustls 0.23.16", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + +[[package]] +name = "hyper-timeout" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" +dependencies = [ + "hyper 1.5.0", + "hyper-util", + "pin-project-lite", "tokio", - "tokio-rustls 0.26.0", "tower-service", ] @@ -3307,13 +3920,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ "base64 0.21.7", - "pem", + "pem 1.1.1", "ring 0.16.20", "serde", "serde_json", "simple_asn1", ] +[[package]] +name = "jsonwebtoken" +version = "9.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" +dependencies = [ + "base64 0.21.7", + "js-sys", + "pem 3.0.4", + "ring 0.17.8", + "serde", + "serde_json", + "simple_asn1", +] + [[package]] name = "k256" version = "0.13.4" @@ -3385,9 +4013,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.161" +version = "0.2.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" [[package]] name = "libm" @@ -3405,6 +4033,18 @@ dependencies = [ "libc", ] +[[package]] +name = "libusb1-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "libz-sys" version = "1.1.20" @@ -3506,12 +4146,31 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[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 = "minimal-lexical" version = "0.2.1" @@ -3562,6 +4221,19 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset", + "pin-utils", +] + [[package]] name = "nom" version = "7.1.3" @@ -3823,6 +4495,12 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" + [[package]] name = "overload" version = "0.1.1" @@ -3932,6 +4610,25 @@ dependencies = [ "base64 0.13.1", ] +[[package]] +name = "pem" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +dependencies = [ + "base64 0.22.1", + "serde", +] + +[[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.1" @@ -4026,13 +4723,33 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pin-project" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" +dependencies = [ + "pin-project-internal 0.4.30", +] + [[package]] name = "pin-project" version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ - "pin-project-internal", + "pin-project-internal 1.1.7", +] + +[[package]] +name = "pin-project-internal" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -4226,12 +4943,70 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "prost-types" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" +dependencies = [ + "prost", +] + [[package]] name = "quick-error" version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quinn" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls 0.23.16", + "socket2", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes", + "rand", + "ring 0.17.8", + "rustc-hash", + "rustls 0.23.16", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.59.0", +] + [[package]] name = "quote" version = "1.0.37" @@ -4411,6 +5186,12 @@ dependencies = [ "regex-syntax 0.8.5", ] +[[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + [[package]] name = "regex-syntax" version = "0.6.29" @@ -4488,11 +5269,16 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "native-tls", "once_cell", "percent-encoding", "pin-project-lite", + "quinn", + "rustls 0.23.16", + "rustls-native-certs", "rustls-pemfile 2.2.0", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", @@ -4500,11 +5286,13 @@ dependencies = [ "system-configuration 0.6.1", "tokio", "tokio-native-tls", + "tokio-rustls 0.26.0", "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "windows-registry", ] @@ -4620,6 +5408,16 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" +[[package]] +name = "rusb" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4" +dependencies = [ + "libc", + "libusb1-sys", +] + [[package]] name = "rustc-demangle" version = "0.1.24" @@ -4687,6 +5485,7 @@ version = "0.23.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" dependencies = [ + "log", "once_cell", "ring 0.17.8", "rustls-pki-types", @@ -4695,6 +5494,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -4898,6 +5710,19 @@ dependencies = [ "cc", ] +[[package]] +name = "secret-vault-value" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc32a777b53b3433b974c9c26b6d502a50037f8da94e46cb8ce2ced2cfdfaea0" +dependencies = [ + "prost", + "prost-types", + "serde", + "serde_json", + "zeroize", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -4913,9 +5738,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -5437,7 +6262,7 @@ name = "tap_core" version = "2.0.0" source = "git+https://github.com/semiotic-ai/timeline-aggregation-protocol?rev=61b47b3#61b47b3b96aaa1437fc390eb581636d51134b006" dependencies = [ - "alloy", + "alloy 0.5.4", "anyhow", "anymap3", "async-trait", @@ -5449,9 +6274,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", @@ -5486,16 +6311,13 @@ dependencies = [ [[package]] name = "thegraph-core" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab9be84cae9a83751afdfca73490b1debdb4405684e3ffc5b9b1c7bc7ced731" +checksum = "89c0e3f94b7b9e746820ca37ff50d39d3cbf971ced9cea5a56f5a43ef41f8e59" dependencies = [ - "alloy-primitives", - "alloy-signer 0.4.2", + "alloy 0.6.2", "alloy-sol-types", "bs58", - "serde", - "serde_with", "thiserror", "url", ] @@ -5619,9 +6441,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -5791,6 +6613,39 @@ dependencies = [ "winnow 0.6.20", ] +[[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.6", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.5.0", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project 1.1.7", + "prost", + "rustls-native-certs", + "rustls-pemfile 2.2.0", + "socket2", + "tokio", + "tokio-rustls 0.26.0", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "toolshed" version = "0.6.0" @@ -5799,6 +6654,26 @@ dependencies = [ "tokio", ] +[[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 1.1.7", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower" version = "0.5.1" @@ -5847,13 +6722,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4546773ffeab9e4ea02b8872faa49bb616a80a7da66afc2f32688943f97efa7" dependencies = [ "futures-util", - "pin-project", + "pin-project 1.1.7", "tokio", "tokio-test", "tower-layer", "tower-service", ] +[[package]] +name = "tower-util" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1093c19826d33807c72511e68f73b4a0469a3f22c2bd5f7d5212178b4b89674" +dependencies = [ + "futures-core", + "futures-util", + "pin-project 0.4.30", + "tower-service", +] + [[package]] name = "tracing" version = "0.1.40" @@ -5892,7 +6779,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project", + "pin-project 1.1.7", "tracing", ] @@ -6015,6 +6902,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" +[[package]] +name = "unicase" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" + [[package]] name = "unicode-bidi" version = "0.3.17" @@ -6102,6 +6995,12 @@ dependencies = [ "serde", ] +[[package]] +name = "uuid" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" + [[package]] name = "valuable" version = "0.1.0" @@ -6126,6 +7025,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[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.0" @@ -6227,6 +7132,19 @@ version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +[[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.2.1" @@ -6241,6 +7159,20 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "wasmtimer" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb4f099acbc1043cc752b91615b24b02d7f6fcd975bd781fed9f50b3c3e15bf7" +dependencies = [ + "futures", + "js-sys", + "parking_lot", + "pin-utils", + "slab", + "wasm-bindgen", +] + [[package]] name = "web-sys" version = "0.3.72" diff --git a/Cargo.toml b/Cargo.toml index b40bd7a35..ed239aff1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,6 @@ inherits = "release" debug = true [dependencies] -alloy-primitives = { version = "0.8.11", features = ["serde"] } alloy-signer-local = "0.5.4" alloy-sol-types = "0.8.11" anyhow = "1.0" @@ -59,7 +58,7 @@ serde_with = "3.8.1" simple-rate-limiter = "1.0" snmalloc-rs = "0.3" tap_core = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "61b47b3" } -thegraph-core = { version = "0.7.0", features = ["serde"] } +thegraph-core = "0.8.1" thegraph-graphql-http = { version = "0.2.1", features = [ "http-client-reqwest", ] } diff --git a/src/auth.rs b/src/auth.rs index 04e459007..785a7b969 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -146,7 +146,7 @@ pub fn is_domain_authorized>(authorized: &[S], origin: &str) -> bo #[cfg(test)] mod tests { - use alloy_primitives::hex; + use thegraph_core::alloy::primitives::hex; use super::{is_domain_authorized, parse_api_key}; diff --git a/src/block_constraints.rs b/src/block_constraints.rs index 5c9394501..27cb26866 100644 --- a/src/block_constraints.rs +++ b/src/block_constraints.rs @@ -11,7 +11,7 @@ use graphql::{ }; use itertools::Itertools as _; use serde_json::{self, json}; -use thegraph_core::{BlockHash, BlockNumber}; +use thegraph_core::alloy::primitives::{BlockHash, BlockNumber}; use crate::{ blocks::{BlockConstraint, UnresolvedBlock}, @@ -304,7 +304,7 @@ fn parse_number<'c, T: Text<'c>>( mod tests { use std::iter::FromIterator as _; - use alloy_primitives::hex; + use thegraph_core::alloy::primitives::hex; use super::*; diff --git a/src/blocks.rs b/src/blocks.rs index f80ca70ff..34d6cf65e 100644 --- a/src/blocks.rs +++ b/src/blocks.rs @@ -1,7 +1,7 @@ use std::fmt; use serde::Deserialize; -use thegraph_core::{BlockHash, BlockNumber, BlockTimestamp}; +use thegraph_core::alloy::primitives::{BlockHash, BlockNumber, BlockTimestamp}; #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Deserialize)] pub struct Block { diff --git a/src/chain.rs b/src/chain.rs index 462a93dce..a155167a5 100644 --- a/src/chain.rs +++ b/src/chain.rs @@ -107,12 +107,14 @@ impl Chain { #[cfg(test)] mod tests { - use alloy_primitives::U256; use itertools::Itertools; use rand::{ rngs::SmallRng, seq::SliceRandom as _, thread_rng, Rng as _, RngCore as _, SeedableRng, }; - use thegraph_core::{Address, BlockHash, IndexerId}; + use thegraph_core::{ + alloy::primitives::{Address, BlockHash, U256}, + IndexerId, + }; use toolshed::concat_bytes; use super::{Block, Chain, MAX_LEN}; diff --git a/src/client_query.rs b/src/client_query.rs index a7c7bc154..5f65f0a3a 100644 --- a/src/client_query.rs +++ b/src/client_query.rs @@ -21,7 +21,7 @@ use prost::bytes::Buf; use rand::{thread_rng, Rng as _}; use serde::Deserialize; use serde_json::value::RawValue; -use thegraph_core::{AllocationId, BlockNumber, DeploymentId, IndexerId}; +use thegraph_core::{alloy::primitives::BlockNumber, AllocationId, DeploymentId, IndexerId}; use tokio::sync::mpsc; use tracing::{info_span, Instrument as _}; use url::Url; diff --git a/src/client_query/context.rs b/src/client_query/context.rs index 0f43da6b4..047423b7b 100644 --- a/src/client_query/context.rs +++ b/src/client_query/context.rs @@ -1,5 +1,5 @@ -use alloy_sol_types::Eip712Domain; use ordered_float::NotNan; +use thegraph_core::alloy::sol_types::Eip712Domain; use tokio::sync::{mpsc, watch}; use crate::{ diff --git a/src/config.rs b/src/config.rs index fe05bc2ff..126001c71 100644 --- a/src/config.rs +++ b/src/config.rs @@ -7,7 +7,6 @@ use std::{ str::FromStr, }; -use alloy_primitives::{B256, U256}; use anyhow::Context; use custom_debug::CustomDebug; use ipnetwork::IpNetwork; @@ -16,7 +15,10 @@ use secp256k1::SecretKey; use semver::Version; use serde::Deserialize; use serde_with::{serde_as, DeserializeAs, DisplayFromStr}; -use thegraph_core::{Address, DeploymentId}; +use thegraph_core::{ + alloy::primitives::{Address, B256, U256}, + DeploymentId, +}; use url::Url; use crate::{ diff --git a/src/errors.rs b/src/errors.rs index 58877c02b..3671a2c6d 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -5,7 +5,7 @@ use std::{ use axum::response::{IntoResponse, Response}; use itertools::Itertools as _; -use thegraph_core::{BlockNumber, IndexerId}; +use thegraph_core::{alloy::primitives::BlockNumber, IndexerId}; use crate::{blocks::UnresolvedBlock, graphql}; diff --git a/src/indexer_client.rs b/src/indexer_client.rs index 5bf44807d..dbcbfca9d 100644 --- a/src/indexer_client.rs +++ b/src/indexer_client.rs @@ -1,9 +1,11 @@ -use alloy_sol_types::Eip712Domain; use reqwest::header::AUTHORIZATION; use serde::{Deserialize, Serialize}; use thegraph_core::{ + alloy::{ + primitives::{BlockHash, BlockNumber}, + sol_types::Eip712Domain, + }, attestation::{self, Attestation}, - BlockHash, BlockNumber, }; use thegraph_graphql_http::http::response::Error as GQLError; use url::Url; diff --git a/src/indexers/indexing_progress.rs b/src/indexers/indexing_progress.rs index fe6b1f1e7..5bbe0cd42 100644 --- a/src/indexers/indexing_progress.rs +++ b/src/indexers/indexing_progress.rs @@ -1,6 +1,6 @@ use serde::Deserialize; use serde_with::serde_as; -use thegraph_core::{BlockNumber, DeploymentId}; +use thegraph_core::{alloy::primitives::BlockNumber, DeploymentId}; use thegraph_graphql_http::{ graphql::{Document, IntoDocument, IntoDocumentWithVariables}, http_client::{RequestError, ReqwestExt as _, ResponseError}, diff --git a/src/indexers/public_poi.rs b/src/indexers/public_poi.rs index 24a88e84a..a04635f8e 100644 --- a/src/indexers/public_poi.rs +++ b/src/indexers/public_poi.rs @@ -1,6 +1,6 @@ use serde::{Deserialize, Serialize}; use serde_with::{serde_as, DisplayFromStr}; -use thegraph_core::{BlockNumber, DeploymentId, ProofOfIndexing}; +use thegraph_core::{alloy::primitives::BlockNumber, DeploymentId, ProofOfIndexing}; use thegraph_graphql_http::{ graphql::{Document, IntoDocument, IntoDocumentWithVariables}, http_client::{RequestError, ReqwestExt, ResponseError}, @@ -166,7 +166,7 @@ pub struct PartialBlockPtr { #[cfg(test)] mod tests { - use thegraph_core::{deployment_id, poi}; + use thegraph_core::{deployment_id, proof_of_indexing as poi}; use super::Response; diff --git a/src/indexing_performance.rs b/src/indexing_performance.rs index 1b9edee74..f05f04726 100644 --- a/src/indexing_performance.rs +++ b/src/indexing_performance.rs @@ -1,7 +1,7 @@ use std::{collections::HashMap, ops::Deref, time::Duration}; use parking_lot::RwLock; -use thegraph_core::{BlockNumber, DeploymentId, IndexerId}; +use thegraph_core::{alloy::primitives::BlockNumber, DeploymentId, IndexerId}; use tokio::{self, sync::mpsc, time::MissedTickBehavior}; use crate::network::NetworkService; diff --git a/src/main.rs b/src/main.rs index 4c97944bd..b39dacab8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,7 +8,6 @@ use std::{ time::Duration, }; -use alloy_sol_types::Eip712Domain; use axum::{ body::Body, extract::{ConnectInfo, DefaultBodyLimit, State}, @@ -40,7 +39,13 @@ use prometheus::{self, Encoder as _}; use secp256k1::SecretKey; use serde_json::json; use simple_rate_limiter::RateLimiter; -use thegraph_core::{attestation, Address, ChainId}; +use thegraph_core::{ + alloy::{ + primitives::{Address, ChainId}, + sol_types::Eip712Domain, + }, + attestation, +}; use tokio::{ net::TcpListener, signal::unix::SignalKind, diff --git a/src/network/indexer_indexing_poi_blocklist.rs b/src/network/indexer_indexing_poi_blocklist.rs index b57805f5a..c39301a4e 100644 --- a/src/network/indexer_indexing_poi_blocklist.rs +++ b/src/network/indexer_indexing_poi_blocklist.rs @@ -9,7 +9,7 @@ use std::collections::{HashMap, HashSet}; -use thegraph_core::{BlockNumber, DeploymentId, ProofOfIndexing}; +use thegraph_core::{alloy::primitives::BlockNumber, DeploymentId, ProofOfIndexing}; use crate::indexers::public_poi::ProofOfIndexingInfo; diff --git a/src/network/indexer_indexing_poi_resolver.rs b/src/network/indexer_indexing_poi_resolver.rs index 3c21abb0f..666f844f7 100644 --- a/src/network/indexer_indexing_poi_resolver.rs +++ b/src/network/indexer_indexing_poi_resolver.rs @@ -9,7 +9,7 @@ use std::{collections::HashMap, time::Duration}; use parking_lot::RwLock; -use thegraph_core::{BlockNumber, DeploymentId, ProofOfIndexing}; +use thegraph_core::{alloy::primitives::BlockNumber, DeploymentId, ProofOfIndexing}; use url::Url; use crate::{ diff --git a/src/network/indexer_indexing_progress_resolver.rs b/src/network/indexer_indexing_progress_resolver.rs index 6391f6f53..432a44da2 100644 --- a/src/network/indexer_indexing_progress_resolver.rs +++ b/src/network/indexer_indexing_progress_resolver.rs @@ -3,7 +3,7 @@ use std::{collections::HashMap, time::Duration}; use parking_lot::{Mutex, RwLock}; -use thegraph_core::{BlockNumber, DeploymentId}; +use thegraph_core::{alloy::primitives::BlockNumber, DeploymentId}; use url::Url; use crate::{ diff --git a/src/network/internal/indexer_processing.rs b/src/network/internal/indexer_processing.rs index e309c198f..6cee85dd5 100644 --- a/src/network/internal/indexer_processing.rs +++ b/src/network/internal/indexer_processing.rs @@ -4,7 +4,7 @@ use cost_model::CostModel; use custom_debug::CustomDebug; use ipnetwork::IpNetwork; use semver::Version; -use thegraph_core::{AllocationId, BlockNumber, DeploymentId, IndexerId}; +use thegraph_core::{alloy::primitives::BlockNumber, AllocationId, DeploymentId, IndexerId}; use tracing::Instrument; use url::Url; diff --git a/src/network/internal/snapshot.rs b/src/network/internal/snapshot.rs index ffc20306d..0365b7fbc 100644 --- a/src/network/internal/snapshot.rs +++ b/src/network/internal/snapshot.rs @@ -9,7 +9,9 @@ use std::{ use cost_model::CostModel; use custom_debug::CustomDebug; use semver::Version; -use thegraph_core::{AllocationId, BlockNumber, DeploymentId, IndexerId, SubgraphId}; +use thegraph_core::{ + alloy::primitives::BlockNumber, AllocationId, DeploymentId, IndexerId, SubgraphId, +}; use url::Url; use super::{DeploymentInfo, SubgraphInfo}; diff --git a/src/network/internal/state.rs b/src/network/internal/state.rs index 78ec4e9a3..4fcd65997 100644 --- a/src/network/internal/state.rs +++ b/src/network/internal/state.rs @@ -1,7 +1,7 @@ use std::collections::{BTreeMap, HashSet}; use ipnetwork::IpNetwork; -use thegraph_core::Address; +use thegraph_core::alloy::primitives::Address; use crate::{ config::BlockedIndexer, diff --git a/src/network/internal/subgraph_processing.rs b/src/network/internal/subgraph_processing.rs index a7032e8b8..70c4db247 100644 --- a/src/network/internal/subgraph_processing.rs +++ b/src/network/internal/subgraph_processing.rs @@ -1,6 +1,8 @@ use std::collections::{HashMap, HashSet}; -use thegraph_core::{AllocationId, BlockNumber, DeploymentId, IndexerId, SubgraphId}; +use thegraph_core::{ + alloy::primitives::BlockNumber, AllocationId, DeploymentId, IndexerId, SubgraphId, +}; use crate::network::errors::{DeploymentError, SubgraphError}; diff --git a/src/network/service.rs b/src/network/service.rs index d0faa9b08..eceb2f16d 100644 --- a/src/network/service.rs +++ b/src/network/service.rs @@ -9,7 +9,10 @@ use std::{ use ipnetwork::IpNetwork; use semver::Version; -use thegraph_core::{Address, BlockNumber, DeploymentId, SubgraphId}; +use thegraph_core::{ + alloy::primitives::{Address, BlockNumber}, + DeploymentId, SubgraphId, +}; use tokio::{sync::watch, time::MissedTickBehavior}; use super::{ diff --git a/src/network/subgraph_client.rs b/src/network/subgraph_client.rs index 98b52093a..dff24f9d3 100644 --- a/src/network/subgraph_client.rs +++ b/src/network/subgraph_client.rs @@ -9,7 +9,7 @@ use custom_debug::CustomDebug; use serde::{ser::SerializeMap, Deserialize, Serialize, Serializer}; use serde_json::json; use serde_with::serde_as; -use thegraph_core::{BlockHash, BlockNumber, BlockTimestamp}; +use thegraph_core::alloy::primitives::{BlockHash, BlockNumber, BlockTimestamp}; use thegraph_graphql_http::http::response::Error as GqlError; use types::Subgraph; use url::Url; @@ -34,7 +34,9 @@ use crate::{ pub mod types { use serde::Deserialize; use serde_with::serde_as; - use thegraph_core::{AllocationId, BlockNumber, DeploymentId, IndexerId, SubgraphId}; + use thegraph_core::{ + alloy::primitives::BlockNumber, AllocationId, DeploymentId, IndexerId, SubgraphId, + }; #[derive(Debug, Clone, Deserialize)] #[serde(rename_all = "camelCase")] diff --git a/src/receipts.rs b/src/receipts.rs index 18b65c6c7..84385acda 100644 --- a/src/receipts.rs +++ b/src/receipts.rs @@ -1,15 +1,19 @@ use std::{collections::HashMap, sync::Arc, time::SystemTime}; -use alloy_primitives::U256; use alloy_signer_local::PrivateKeySigner; -use alloy_sol_types::Eip712Domain; use parking_lot::{Mutex, RwLock}; use rand::RngCore; pub use receipts::QueryStatus as ReceiptStatus; use receipts::ReceiptPool; use secp256k1::SecretKey; use tap_core::{receipt::Receipt as TapReceipt, signed_message::EIP712SignedMessage}; -use thegraph_core::{Address, AllocationId}; +use thegraph_core::{ + alloy::{ + primitives::{Address, U256}, + sol_types::Eip712Domain, + }, + AllocationId, +}; /// A receipt for an indexer request. #[derive(Debug, Clone)] @@ -216,7 +220,7 @@ impl ReceiptSigner { #[cfg(test)] mod tests { - use thegraph_core::{address, allocation_id}; + use thegraph_core::{allocation_id, alloy::primitives::address}; use super::*; @@ -276,7 +280,7 @@ mod tests { } mod tap { - use thegraph_core::{address, allocation_id}; + use thegraph_core::{allocation_id, alloy::primitives::address}; use super::*; diff --git a/src/reports.rs b/src/reports.rs index a51e406f0..56b46166d 100644 --- a/src/reports.rs +++ b/src/reports.rs @@ -1,7 +1,7 @@ use anyhow::{anyhow, Context}; use ordered_float::NotNan; use prost::Message; -use thegraph_core::{Address, AllocationId, DeploymentId, IndexerId}; +use thegraph_core::{alloy::primitives::Address, AllocationId, DeploymentId, IndexerId}; use tokio::sync::mpsc; use toolshed::concat_bytes; diff --git a/src/vouchers.rs b/src/vouchers.rs index 413afaac2..ab32bfff2 100644 --- a/src/vouchers.rs +++ b/src/vouchers.rs @@ -1,11 +1,10 @@ -use alloy_primitives::{FixedBytes, U256}; use axum::{body::Bytes, extract::State, http::StatusCode}; use lazy_static::lazy_static; use receipts::{self, combine_partial_vouchers, receipts_to_partial_voucher, receipts_to_voucher}; use secp256k1::{PublicKey, Secp256k1, SecretKey}; use serde::Deserialize; use serde_json::json; -use thegraph_core::Address; +use thegraph_core::alloy::primitives::{Address, FixedBytes, U256}; use crate::{ json::{json_response, JsonResponse},