diff --git a/Cargo.lock b/Cargo.lock index 2cd4811d..6b8ee04c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -66,55 +66,30 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" -[[package]] -name = "alloy" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea8ebf106e84a1c37f86244df7da0c7587e697b71a0d565cce079449b85ac6f8" -dependencies = [ - "alloy-consensus 0.5.4", - "alloy-contract 0.5.4", - "alloy-core", - "alloy-eips 0.5.4", - "alloy-genesis 0.5.4", - "alloy-network 0.5.4", - "alloy-provider 0.5.4", - "alloy-pubsub 0.5.4", - "alloy-rpc-client 0.5.4", - "alloy-rpc-types 0.5.4", - "alloy-serde 0.5.4", - "alloy-signer 0.5.4", - "alloy-signer-local 0.5.4", - "alloy-transport 0.5.4", - "alloy-transport-http 0.5.4", - "alloy-transport-ipc 0.5.4", - "alloy-transport-ws 0.5.4", -] - [[package]] name = "alloy" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbcc41e8a11a4975b18ec6afba2cc48d591fa63336a4c526dacb50479a8d6b35" dependencies = [ - "alloy-consensus 0.9.2", - "alloy-contract 0.9.2", + "alloy-consensus", + "alloy-contract", "alloy-core", - "alloy-eips 0.9.2", - "alloy-genesis 0.9.2", - "alloy-network 0.9.2", - "alloy-provider 0.9.2", - "alloy-pubsub 0.9.2", - "alloy-rpc-client 0.9.2", - "alloy-rpc-types 0.9.2", - "alloy-serde 0.9.2", - "alloy-signer 0.9.2", + "alloy-eips", + "alloy-genesis", + "alloy-network", + "alloy-provider", + "alloy-pubsub", + "alloy-rpc-client", + "alloy-rpc-types", + "alloy-serde", + "alloy-signer", "alloy-signer-aws", - "alloy-signer-local 0.9.2", - "alloy-transport 0.9.2", - "alloy-transport-http 0.9.2", - "alloy-transport-ipc 0.9.2", - "alloy-transport-ws 0.9.2", + "alloy-signer-local", + "alloy-transport", + "alloy-transport-http", + "alloy-transport-ipc", + "alloy-transport-ws", ] [[package]] @@ -128,32 +103,16 @@ dependencies = [ "strum", ] -[[package]] -name = "alloy-consensus" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed961a48297c732a5d97ee321aa8bb5009ecadbcb077d8bec90cb54e651629" -dependencies = [ - "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.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4138dc275554afa6f18c4217262ac9388790b2fc393c2dfe03c51d357abf013" dependencies = [ - "alloy-eips 0.9.2", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.9.2", + "alloy-serde", "alloy-trie", "auto_impl", "c-kzg", @@ -168,35 +127,14 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fa04e1882c31288ce1028fdf31b6ea94cfa9eafa2e497f903ded631c8c6a42c" dependencies = [ - "alloy-consensus 0.9.2", - "alloy-eips 0.9.2", + "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.9.2", + "alloy-serde", "serde", ] -[[package]] -name = "alloy-contract" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460ab80ce4bda1c80bcf96fe7460520476f2c7b734581c6567fac2708e2a60ef" -dependencies = [ - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-network 0.5.4", - "alloy-network-primitives 0.5.4", - "alloy-primitives", - "alloy-provider 0.5.4", - "alloy-pubsub 0.5.4", - "alloy-rpc-types-eth 0.5.4", - "alloy-sol-types", - "alloy-transport 0.5.4", - "futures", - "futures-util", - "thiserror 1.0.69", -] - [[package]] name = "alloy-contract" version = "0.9.2" @@ -205,14 +143,14 @@ checksum = "5f21886c1fea0626f755a49b2ac653b396fb345233f6170db2da3d0ada31560c" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", - "alloy-network 0.9.2", - "alloy-network-primitives 0.9.2", + "alloy-network", + "alloy-network-primitives", "alloy-primitives", - "alloy-provider 0.9.2", - "alloy-pubsub 0.9.2", - "alloy-rpc-types-eth 0.9.2", + "alloy-provider", + "alloy-pubsub", + "alloy-rpc-types-eth", "alloy-sol-types", - "alloy-transport 0.9.2", + "alloy-transport", "futures", "futures-util", "thiserror 2.0.10", @@ -259,19 +197,6 @@ dependencies = [ "serde", ] -[[package]] -name = "alloy-eip7702" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ffc577390ce50234e02d841214b3dc0bea6aaaae8e04bbf3cb82e9a45da9eb" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "derive_more", - "k256", - "serde", -] - [[package]] name = "alloy-eip7702" version = "0.5.0" @@ -285,24 +210,6 @@ dependencies = [ "serde", ] -[[package]] -name = "alloy-eips" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69e06cf9c37be824b9d26d6d101114fdde6af0c87de2828b414c05c4b3daa71" -dependencies = [ - "alloy-eip2930", - "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.9.2" @@ -310,10 +217,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52dd5869ed09e399003e0e0ec6903d981b2a92e74c5d37e6b40890bad2517526" dependencies = [ "alloy-eip2930", - "alloy-eip7702 0.5.0", + "alloy-eip7702", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.9.2", + "alloy-serde", "c-kzg", "derive_more", "once_cell", @@ -321,26 +228,15 @@ dependencies = [ "sha2", ] -[[package]] -name = "alloy-genesis" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde15e14944a88bd6a57d325e9a49b75558746fe16aaccc79713ae50a6a9574c" -dependencies = [ - "alloy-primitives", - "alloy-serde 0.5.4", - "serde", -] - [[package]] name = "alloy-genesis" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7d2a7fe5c1a9bd6793829ea21a636f30fc2b3f5d2e7418ba86d96e41dd1f460" dependencies = [ - "alloy-eips 0.9.2", + "alloy-eips", "alloy-primitives", - "alloy-serde 0.9.2", + "alloy-serde", "alloy-trie", "serde", ] @@ -357,20 +253,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "alloy-json-rpc" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af5979e0d5a7bf9c7eb79749121e8256e59021af611322aee56e77e20776b4b3" -dependencies = [ - "alloy-primitives", - "alloy-sol-types", - "serde", - "serde_json", - "thiserror 1.0.69", - "tracing", -] - [[package]] name = "alloy-json-rpc" version = "0.9.2" @@ -385,43 +267,22 @@ dependencies = [ "tracing", ] -[[package]] -name = "alloy-network" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "204237129086ce5dc17a58025e93739b01b45313841f98fa339eb1d780511e57" -dependencies = [ - "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 0.5.4", - "alloy-serde 0.5.4", - "alloy-signer 0.5.4", - "alloy-sol-types", - "async-trait", - "auto_impl", - "futures-utils-wasm", - "thiserror 1.0.69", -] - [[package]] name = "alloy-network" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4556f01fe41d0677495df10a648ddcf7ce118b0e8aa9642a0e2b6dd1fb7259de" dependencies = [ - "alloy-consensus 0.9.2", + "alloy-consensus", "alloy-consensus-any", - "alloy-eips 0.9.2", - "alloy-json-rpc 0.9.2", - "alloy-network-primitives 0.9.2", + "alloy-eips", + "alloy-json-rpc", + "alloy-network-primitives", "alloy-primitives", "alloy-rpc-types-any", - "alloy-rpc-types-eth 0.9.2", - "alloy-serde 0.9.2", - "alloy-signer 0.9.2", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-signer", "alloy-sol-types", "async-trait", "auto_impl", @@ -431,29 +292,16 @@ dependencies = [ "thiserror 2.0.10", ] -[[package]] -name = "alloy-network-primitives" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514f70ee2a953db21631cd817b13a1571474ec77ddc03d47616d5e8203489fde" -dependencies = [ - "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.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f31c3c6b71340a1d076831823f09cb6e02de01de5c6630a9631bdb36f947ff80" dependencies = [ - "alloy-consensus 0.9.2", - "alloy-eips 0.9.2", + "alloy-consensus", + "alloy-eips", "alloy-primitives", - "alloy-serde 0.9.2", + "alloy-serde", "serde", ] @@ -484,46 +332,6 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "alloy-provider" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4814d141ede360bb6cd1b4b064f1aab9de391e7c4d0d4d50ac89ea4bc1e25fbd" -dependencies = [ - "alloy-chains", - "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 0.5.4", - "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 0.5.4", - "alloy-transport-ws 0.5.4", - "async-stream", - "async-trait", - "auto_impl", - "dashmap", - "futures", - "futures-utils-wasm", - "lru", - "parking_lot 0.12.3", - "pin-project", - "reqwest 0.12.12", - "schnellru", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tracing", - "url", - "wasmtimer 0.2.1", -] - [[package]] name = "alloy-provider" version = "0.9.2" @@ -531,19 +339,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a22c4441b3ebe2d77fa9cf629ba68c3f713eb91779cff84275393db97eddd82" dependencies = [ "alloy-chains", - "alloy-consensus 0.9.2", - "alloy-eips 0.9.2", - "alloy-json-rpc 0.9.2", - "alloy-network 0.9.2", - "alloy-network-primitives 0.9.2", + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-network", + "alloy-network-primitives", "alloy-primitives", - "alloy-pubsub 0.9.2", - "alloy-rpc-client 0.9.2", - "alloy-rpc-types-eth 0.9.2", - "alloy-transport 0.9.2", - "alloy-transport-http 0.9.2", - "alloy-transport-ipc 0.9.2", - "alloy-transport-ws 0.9.2", + "alloy-pubsub", + "alloy-rpc-client", + "alloy-rpc-types-eth", + "alloy-transport", + "alloy-transport-http", + "alloy-transport-ipc", + "alloy-transport-ws", "async-stream", "async-trait", "auto_impl", @@ -561,26 +369,7 @@ dependencies = [ "tokio", "tracing", "url", - "wasmtimer 0.4.1", -] - -[[package]] -name = "alloy-pubsub" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba46eb69ddf7a9925b81f15229cb74658e6eebe5dd30a5b74e2cd040380573" -dependencies = [ - "alloy-json-rpc 0.5.4", - "alloy-primitives", - "alloy-transport 0.5.4", - "bimap", - "futures", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "tower", - "tracing", + "wasmtimer", ] [[package]] @@ -589,9 +378,9 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2269fd635f7b505f27c63a3cb293148cd02301efce4c8bdd9ff54fbfc4a20e23" dependencies = [ - "alloy-json-rpc 0.9.2", + "alloy-json-rpc", "alloy-primitives", - "alloy-transport 0.9.2", + "alloy-transport", "bimap", "futures", "serde", @@ -624,45 +413,19 @@ dependencies = [ "syn 2.0.95", ] -[[package]] -name = "alloy-rpc-client" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc2bd1e7403463a5f2c61e955bcc9d3072b63aa177442b0f9aa6a6d22a941e3" -dependencies = [ - "alloy-json-rpc 0.5.4", - "alloy-primitives", - "alloy-pubsub 0.5.4", - "alloy-transport 0.5.4", - "alloy-transport-http 0.5.4", - "alloy-transport-ipc 0.5.4", - "alloy-transport-ws 0.5.4", - "futures", - "pin-project", - "reqwest 0.12.12", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "tower", - "tracing", - "url", - "wasmtimer 0.2.1", -] - [[package]] name = "alloy-rpc-client" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d06a292b37e182e514903ede6e623b9de96420e8109ce300da288a96d88b7e4b" dependencies = [ - "alloy-json-rpc 0.9.2", + "alloy-json-rpc", "alloy-primitives", - "alloy-pubsub 0.9.2", - "alloy-transport 0.9.2", - "alloy-transport-http 0.9.2", - "alloy-transport-ipc 0.9.2", - "alloy-transport-ws 0.9.2", + "alloy-pubsub", + "alloy-transport", + "alloy-transport-http", + "alloy-transport-ipc", + "alloy-transport-ws", "futures", "pin-project", "reqwest 0.12.12", @@ -673,20 +436,7 @@ dependencies = [ "tower", "tracing", "url", - "wasmtimer 0.4.1", -] - -[[package]] -name = "alloy-rpc-types" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea9bf1abdd506f985a53533f5ac01296bcd6102c5e139bbc5d40bc468d2c916" -dependencies = [ - "alloy-primitives", - "alloy-rpc-types-engine 0.5.4", - "alloy-rpc-types-eth 0.5.4", - "alloy-serde 0.5.4", - "serde", + "wasmtimer", ] [[package]] @@ -696,9 +446,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9383845dd924939e7ab0298bbfe231505e20928907d7905aa3bf112287305e06" dependencies = [ "alloy-primitives", - "alloy-rpc-types-engine 0.9.2", - "alloy-rpc-types-eth 0.9.2", - "alloy-serde 0.9.2", + "alloy-rpc-types-engine", + "alloy-rpc-types-eth", + "alloy-serde", "serde", ] @@ -709,24 +459,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca445cef0eb6c2cf51cfb4e214fbf1ebd00893ae2e6f3b944c8101b07990f988" dependencies = [ "alloy-consensus-any", - "alloy-rpc-types-eth 0.9.2", - "alloy-serde 0.9.2", -] - -[[package]] -name = "alloy-rpc-types-engine" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886d22d41992287a235af2f3af4299b5ced2bcafb81eb835572ad35747476946" -dependencies = [ - "alloy-consensus 0.5.4", - "alloy-eips 0.5.4", - "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.5.4", - "derive_more", - "serde", - "strum", + "alloy-rpc-types-eth", + "alloy-serde", ] [[package]] @@ -735,48 +469,29 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f821f30344862a0b6eb9a1c2eb91dfb2ff44c7489f37152a526cdcab79264" dependencies = [ - "alloy-consensus 0.9.2", - "alloy-eips 0.9.2", + "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.9.2", + "alloy-serde", "derive_more", "serde", "strum", ] -[[package]] -name = "alloy-rpc-types-eth" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b034779a4850b4b03f5be5ea674a1cf7d746b2da762b34d1860ab45e48ca27" -dependencies = [ - "alloy-consensus 0.5.4", - "alloy-eips 0.5.4", - "alloy-network-primitives 0.5.4", - "alloy-primitives", - "alloy-rlp", - "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.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0938bc615c02421bd86c1733ca7205cc3d99a122d9f9bff05726bd604b76a5c2" dependencies = [ - "alloy-consensus 0.9.2", + "alloy-consensus", "alloy-consensus-any", - "alloy-eips 0.9.2", - "alloy-network-primitives 0.9.2", + "alloy-eips", + "alloy-network-primitives", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.9.2", + "alloy-serde", "alloy-sol-types", "itertools 0.13.0", "serde", @@ -784,17 +499,6 @@ dependencies = [ "thiserror 2.0.10", ] -[[package]] -name = "alloy-serde" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028e72eaa9703e4882344983cfe7636ce06d8cce104a78ea62fd19b46659efc4" -dependencies = [ - "alloy-primitives", - "serde", - "serde_json", -] - [[package]] name = "alloy-serde" version = "0.9.2" @@ -806,20 +510,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "alloy-signer" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592c185d7100258c041afac51877660c7bf6213447999787197db4842f0e938e" -dependencies = [ - "alloy-primitives", - "async-trait", - "auto_impl", - "elliptic-curve", - "k256", - "thiserror 1.0.69", -] - [[package]] name = "alloy-signer" version = "0.9.2" @@ -840,10 +530,10 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eb06810c34427d499863817eb506acf57cb9ded9224b374116cae4e22dbd4e9" dependencies = [ - "alloy-consensus 0.9.2", - "alloy-network 0.9.2", + "alloy-consensus", + "alloy-network", "alloy-primitives", - "alloy-signer 0.9.2", + "alloy-signer", "async-trait", "aws-sdk-kms", "k256", @@ -852,34 +542,18 @@ dependencies = [ "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 0.5.4", - "alloy-network 0.5.4", - "alloy-primitives", - "alloy-signer 0.5.4", - "async-trait", - "eth-keystore", - "k256", - "rand", - "thiserror 1.0.69", -] - [[package]] name = "alloy-signer-local" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbdc63ce9eda1283fcbaca66ba4a414b841c0e3edbeef9c86a71242fc9e84ccc" dependencies = [ - "alloy-consensus 0.9.2", - "alloy-network 0.9.2", + "alloy-consensus", + "alloy-network", "alloy-primitives", - "alloy-signer 0.9.2", + "alloy-signer", "async-trait", + "eth-keystore", "k256", "rand", "thiserror 2.0.10", @@ -958,33 +632,13 @@ dependencies = [ "serde", ] -[[package]] -name = "alloy-transport" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be77579633ebbc1266ae6fd7694f75c408beb1aeb6865d0b18f22893c265a061" -dependencies = [ - "alloy-json-rpc 0.5.4", - "base64 0.22.1", - "futures-util", - "futures-utils-wasm", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tower", - "tracing", - "url", - "wasmtimer 0.2.1", -] - [[package]] name = "alloy-transport" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d17722a198f33bbd25337660787aea8b8f57814febb7c746bc30407bdfc39448" dependencies = [ - "alloy-json-rpc 0.9.2", + "alloy-json-rpc", "base64 0.22.1", "futures-util", "futures-utils-wasm", @@ -995,22 +649,7 @@ dependencies = [ "tower", "tracing", "url", - "wasmtimer 0.4.1", -] - -[[package]] -name = "alloy-transport-http" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fd1a5d0827939847983b46f2f79510361f901dc82f8e3c38ac7397af142c6e" -dependencies = [ - "alloy-json-rpc 0.5.4", - "alloy-transport 0.5.4", - "reqwest 0.12.12", - "serde_json", - "tower", - "tracing", - "url", + "wasmtimer", ] [[package]] @@ -1019,8 +658,8 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e1509599021330a31c4a6816b655e34bf67acb1cc03c564e09fd8754ff6c5de" dependencies = [ - "alloy-json-rpc 0.9.2", - "alloy-transport 0.9.2", + "alloy-json-rpc", + "alloy-transport", "reqwest 0.12.12", "serde_json", "tower", @@ -1028,34 +667,15 @@ dependencies = [ "url", ] -[[package]] -name = "alloy-transport-ipc" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8073d1186bfeeb8fbdd1292b6f1a0731f3aed8e21e1463905abfae0b96a887a6" -dependencies = [ - "alloy-json-rpc 0.5.4", - "alloy-pubsub 0.5.4", - "alloy-transport 0.5.4", - "bytes", - "futures", - "interprocess", - "pin-project", - "serde_json", - "tokio", - "tokio-util 0.7.13", - "tracing", -] - [[package]] name = "alloy-transport-ipc" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4da44bc9a5155ab599666d26decafcf12204b72a80eeaba7c5e234ee8ac205" dependencies = [ - "alloy-json-rpc 0.9.2", - "alloy-pubsub 0.9.2", - "alloy-transport 0.9.2", + "alloy-json-rpc", + "alloy-pubsub", + "alloy-transport", "bytes", "futures", "interprocess", @@ -1066,32 +686,14 @@ dependencies = [ "tracing", ] -[[package]] -name = "alloy-transport-ws" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f27837bb4a1d6c83a28231c94493e814882f0e9058648a97e908a5f3fc9fcf" -dependencies = [ - "alloy-pubsub 0.5.4", - "alloy-transport 0.5.4", - "futures", - "http 1.2.0", - "rustls 0.23.20", - "serde_json", - "tokio", - "tokio-tungstenite 0.24.0", - "tracing", - "ws_stream_wasm", -] - [[package]] name = "alloy-transport-ws" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58011745b2f17b334db40df9077d75b181f78360a5bc5c35519e15d4bfce15e2" dependencies = [ - "alloy-pubsub 0.9.2", - "alloy-transport 0.9.2", + "alloy-pubsub", + "alloy-transport", "futures", "http 1.2.0", "rustls 0.23.20", @@ -2776,11 +2378,11 @@ name = "eigen-cli" version = "0.1.2" source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=834b9c7#834b9c70c07a1c69eaa66773f0dd6b1a1e39689e" dependencies = [ - "alloy 0.9.2", - "alloy-json-rpc 0.9.2", + "alloy", + "alloy-json-rpc", "alloy-primitives", - "alloy-provider 0.9.2", - "alloy-transport 0.9.2", + "alloy-provider", + "alloy-transport", "ark-ec 0.5.0", "ark-ff 0.5.0", "ark-serialize 0.5.0", @@ -2810,10 +2412,10 @@ name = "eigen-client-avsregistry" version = "0.1.2" source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=834b9c7#834b9c70c07a1c69eaa66773f0dd6b1a1e39689e" dependencies = [ - "alloy 0.9.2", + "alloy", "alloy-primitives", - "alloy-signer 0.9.2", - "alloy-signer-local 0.9.2", + "alloy-signer", + "alloy-signer-local", "ark-ff 0.5.0", "async-trait", "eigen-client-elcontracts", @@ -2832,7 +2434,7 @@ name = "eigen-client-elcontracts" version = "0.1.2" source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=834b9c7#834b9c70c07a1c69eaa66773f0dd6b1a1e39689e" dependencies = [ - "alloy 0.9.2", + "alloy", "alloy-primitives", "eigen-common", "eigen-logging", @@ -2847,8 +2449,8 @@ name = "eigen-client-eth" version = "0.1.2" source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=834b9c7#834b9c70c07a1c69eaa66773f0dd6b1a1e39689e" dependencies = [ - "alloy 0.9.2", - "alloy-json-rpc 0.9.2", + "alloy", + "alloy-json-rpc", "alloy-primitives", "alloy-rlp", "async-trait", @@ -2864,11 +2466,11 @@ name = "eigen-common" version = "0.1.2" source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=834b9c7#834b9c70c07a1c69eaa66773f0dd6b1a1e39689e" dependencies = [ - "alloy-provider 0.9.2", - "alloy-pubsub 0.9.2", - "alloy-signer-local 0.9.2", - "alloy-transport 0.9.2", - "alloy-transport-http 0.9.2", + "alloy-provider", + "alloy-pubsub", + "alloy-signer-local", + "alloy-transport", + "alloy-transport-http", "url", ] @@ -2964,7 +2566,7 @@ name = "eigen-services-blsaggregation" version = "0.1.2" source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=834b9c7#834b9c70c07a1c69eaa66773f0dd6b1a1e39689e" dependencies = [ - "alloy 0.9.2", + "alloy", "alloy-primitives", "ark-bn254 0.5.0", "ark-ec 0.5.0", @@ -2987,7 +2589,7 @@ name = "eigen-services-operatorsinfo" version = "0.1.2" source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=834b9c7#834b9c70c07a1c69eaa66773f0dd6b1a1e39689e" dependencies = [ - "alloy 0.9.2", + "alloy", "alloy-primitives", "async-trait", "eigen-client-avsregistry", @@ -3010,9 +2612,9 @@ version = "0.1.2" source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=834b9c7#834b9c70c07a1c69eaa66773f0dd6b1a1e39689e" dependencies = [ "alloy-primitives", - "alloy-provider 0.9.2", - "alloy-rpc-types 0.9.2", - "alloy-transport 0.9.2", + "alloy-provider", + "alloy-rpc-types", + "alloy-transport", "eigen-common", "eigen-utils", "serde", @@ -3039,7 +2641,7 @@ name = "eigen-utils" version = "0.1.2" source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=834b9c7#834b9c70c07a1c69eaa66773f0dd6b1a1e39689e" dependencies = [ - "alloy 0.9.2", + "alloy", "reqwest 0.12.12", ] @@ -4397,11 +3999,12 @@ dependencies = [ name = "incredible-aggregator" version = "0.0.1-alpha" dependencies = [ - "alloy 0.5.4", + "alloy", "ark-bn254 0.4.0", "ark-serialize 0.4.2", "ark-std 0.4.0", "eigen-client-avsregistry", + "eigen-common", "eigen-crypto-bls", "eigen-logging", "eigen-services-avsregistry", @@ -4433,7 +4036,7 @@ dependencies = [ name = "incredible-avs" version = "0.0.1-alpha" dependencies = [ - "alloy 0.5.4", + "alloy", "clap", "eigen-nodeapi", "eyre", @@ -4458,7 +4061,7 @@ dependencies = [ name = "incredible-bindings" version = "0.0.1-alpha" dependencies = [ - "alloy 0.5.4", + "alloy", "serde", ] @@ -4466,9 +4069,10 @@ dependencies = [ name = "incredible-chainio" version = "0.0.1-alpha" dependencies = [ - "alloy 0.5.4", - "alloy-provider 0.5.4", + "alloy", + "alloy-provider", "eigen-client-avsregistry", + "eigen-common", "eigen-logging", "eigen-types", "eigen-utils", @@ -4486,8 +4090,9 @@ dependencies = [ name = "incredible-challenger" version = "0.0.1-alpha" dependencies = [ - "alloy 0.5.4", - "alloy-provider 0.5.4", + "alloy", + "alloy-provider", + "eigen-common", "eigen-utils", "eyre", "futures-util", @@ -4514,7 +4119,7 @@ dependencies = [ name = "incredible-config" version = "0.0.1-alpha" dependencies = [ - "alloy 0.5.4", + "alloy", "confy", "eigen-logging", "eigen-types", @@ -4533,8 +4138,8 @@ dependencies = [ name = "incredible-metrics" version = "0.0.1-alpha" dependencies = [ - "alloy 0.5.4", - "alloy-provider 0.5.4", + "alloy", + "alloy-provider", "eigen-metrics", "eyre", "futures-util", @@ -4551,8 +4156,8 @@ dependencies = [ name = "incredible-operator" version = "0.0.1-alpha" dependencies = [ - "alloy 0.5.4", - "alloy-provider 0.5.4", + "alloy", + "alloy-provider", "ark-ec 0.5.0", "ark-ff 0.5.0", "eigen-cli", @@ -4587,8 +4192,8 @@ dependencies = [ name = "incredible-operator-2" version = "0.0.1-alpha" dependencies = [ - "alloy 0.5.4", - "alloy-provider 0.5.4", + "alloy", + "alloy-provider", "ark-ec 0.5.0", "ark-ff 0.5.0", "eigen-cli", @@ -4624,10 +4229,11 @@ dependencies = [ name = "incredible-squaring-avs" version = "0.0.1-alpha" dependencies = [ - "alloy 0.5.4", + "alloy", "clap", "eigen-client-avsregistry", "eigen-client-elcontracts", + "eigen-common", "eigen-crypto-bls", "eigen-logging", "eigen-metrics", @@ -4654,8 +4260,9 @@ dependencies = [ name = "incredible-task-generator" version = "0.0.1-alpha" dependencies = [ - "alloy 0.5.4", - "alloy-provider 0.5.4", + "alloy", + "alloy-provider", + "eigen-common", "eigen-utils", "eyre", "futures-util", @@ -4672,7 +4279,8 @@ dependencies = [ name = "incredible-testing-utils" version = "0.0.1-alpha" dependencies = [ - "alloy 0.5.4", + "alloy", + "eigen-common", "eigen-testing-utils", "eigen-utils", "tracing", @@ -8264,20 +7872,6 @@ version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" -[[package]] -name = "wasmtimer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee" -dependencies = [ - "futures", - "js-sys", - "parking_lot 0.12.3", - "pin-utils", - "slab", - "wasm-bindgen", -] - [[package]] name = "wasmtimer" version = "0.4.1" diff --git a/Cargo.toml b/Cargo.toml index 1cd68861..f4babcaf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,8 +47,8 @@ metrics = "0.24.0" reqwest = "0.12.9" serde_json = "1.0.120" #alloy -alloy = { version = "0.5.3", features = ["full", "signer-keystore", "reqwest"] } -alloy-provider = "0.5.3" +alloy = { version = "0.9", features = ["full", "signer-keystore", "reqwest"] } +alloy-provider = "0.9" serde = "1.0.203" tracing = "0.1.40" tempfile = "3" @@ -75,6 +75,7 @@ incredible-operator-2 = { path = "crates/operator_2/", features = ["default"] } # eigensdk-rs +eigen-common = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "834b9c7" } eigen-client-avsregistry = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "834b9c7" } eigen-testing-utils = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "834b9c7" } eigen-crypto-bls = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "834b9c7" } diff --git a/bin/incredible-squaring-avs/Cargo.toml b/bin/incredible-squaring-avs/Cargo.toml index 82144093..df0f6497 100644 --- a/bin/incredible-squaring-avs/Cargo.toml +++ b/bin/incredible-squaring-avs/Cargo.toml @@ -28,6 +28,7 @@ rust-bls-bn254.workspace = true eigen-crypto-bls.workspace = true metrics-util = "0.17.0" # eigen-rs +eigen-common.workspace = true eigen-testing-utils.workspace = true eigen-logging.workspace = true eigen-utils.workspace = true diff --git a/bin/incredible-squaring-avs/src/commands/avs/mod.rs b/bin/incredible-squaring-avs/src/commands/avs/mod.rs index 48ebd426..31fa2773 100644 --- a/bin/incredible-squaring-avs/src/commands/avs/mod.rs +++ b/bin/incredible-squaring-avs/src/commands/avs/mod.rs @@ -6,6 +6,7 @@ use clap::{Args, Parser}; use eigen_client_avsregistry::writer::AvsRegistryChainWriter; use eigen_client_elcontracts::reader::ELChainReader; use eigen_client_elcontracts::{error::ElContractsError, writer::ELChainWriter}; +use eigen_common::get_provider; use eigen_crypto_bls::BlsKeyPair; use eigen_logging::{get_logger, init_logger, log_level::LogLevel}; use eigen_metrics::prometheus::init_registry; @@ -14,7 +15,6 @@ use eigen_testing_utils::anvil_constants::{ ANVIL_HTTP_URL, }; use eigen_types::operator::Operator; -use eigen_utils::get_provider; use incredible_avs::builder::{AvsBuilder, DefaultAvsLauncher, LaunchAvs}; use incredible_config::IncredibleConfig; use incredible_testing_utils::{ diff --git a/crates/aggregator/Cargo.toml b/crates/aggregator/Cargo.toml index d92bf04a..3bc99fa2 100644 --- a/crates/aggregator/Cargo.toml +++ b/crates/aggregator/Cargo.toml @@ -23,6 +23,7 @@ eyre.workspace = true incredible-chainio.workspace = true incredible-config.workspace = true incredible-metrics.workspace = true +eigen-common.workspace = true eigen-services-operatorsinfo.workspace = true eigen-logging.workspace = true eigen-client-avsregistry.workspace = true diff --git a/crates/aggregator/src/error.rs b/crates/aggregator/src/error.rs index e074357b..f3f13d98 100644 --- a/crates/aggregator/src/error.rs +++ b/crates/aggregator/src/error.rs @@ -1,7 +1,7 @@ use alloy::transports::{RpcError, TransportErrorKind}; use eigen_client_avsregistry::error::AvsRegistryError; use eigen_crypto_bls::error::BlsError; -use eigen_services_blsaggregation::bls_agg::BlsAggregationServiceError; +use eigen_services_blsaggregation::bls_aggregation_service_error::BlsAggregationServiceError; use eigen_services_operatorsinfo::operatorsinfo_inmemory::OperatorInfoServiceError; use incredible_chainio::error::ChainIoError; use incredible_config::error::ConfigError; diff --git a/crates/aggregator/src/fake_aggregator.rs b/crates/aggregator/src/fake_aggregator.rs index f470fd1a..b6439501 100644 --- a/crates/aggregator/src/fake_aggregator.rs +++ b/crates/aggregator/src/fake_aggregator.rs @@ -4,15 +4,15 @@ use alloy::providers::{ProviderBuilder, WsConnect}; use alloy::rpc::types::Filter; use alloy::sol_types::SolEvent; use eigen_client_avsregistry::reader::AvsRegistryChainReader; +use eigen_common::get_ws_provider; use eigen_crypto_bls::{convert_to_g1_point, convert_to_g2_point}; -use eigen_logging::get_test_logger; +use eigen_logging::{get_logger, get_test_logger}; use eigen_services_avsregistry::chaincaller::AvsRegistryServiceChainCaller; -use eigen_services_blsaggregation::bls_agg::{ - BlsAggregationServiceError, BlsAggregationServiceResponse, BlsAggregatorService, -}; +use eigen_services_blsaggregation::bls_agg::BlsAggregatorService; +use eigen_services_blsaggregation::bls_aggregation_service_error::BlsAggregationServiceError; +use eigen_services_blsaggregation::bls_aggregation_service_response::BlsAggregationServiceResponse; use eigen_services_operatorsinfo::operatorsinfo_inmemory::OperatorInfoServiceInMemory; use eigen_types::avs::TaskResponseDigest; -use eigen_utils::get_ws_provider; use futures_util::StreamExt; use incredible_bindings::incrediblesquaringtaskmanager::IBLSSignatureChecker::NonSignerStakesAndSignature; use incredible_bindings::incrediblesquaringtaskmanager::IIncredibleSquaringTaskManager::{ @@ -95,7 +95,8 @@ impl FakeAggregator { .await; }); - let bls_aggregation_service = BlsAggregatorService::new(avs_registry_service_chaincaller); + let bls_aggregation_service = + BlsAggregatorService::new(avs_registry_service_chaincaller, get_logger()); Self { port_address: config.aggregator_ip_addr(), diff --git a/crates/aggregator/src/lib.rs b/crates/aggregator/src/lib.rs index a96d5403..601b4515 100644 --- a/crates/aggregator/src/lib.rs +++ b/crates/aggregator/src/lib.rs @@ -12,15 +12,15 @@ use alloy::providers::{ProviderBuilder, WsConnect}; use alloy::rpc::types::Filter; use alloy::sol_types::SolEvent; use eigen_client_avsregistry::reader::AvsRegistryChainReader; +use eigen_common::get_ws_provider; use eigen_crypto_bls::{convert_to_g1_point, convert_to_g2_point}; use eigen_logging::get_logger; use eigen_services_avsregistry::chaincaller::AvsRegistryServiceChainCaller; -use eigen_services_blsaggregation::bls_agg::{ - BlsAggregationServiceError, BlsAggregationServiceResponse, BlsAggregatorService, -}; +use eigen_services_blsaggregation::bls_agg::BlsAggregatorService; +use eigen_services_blsaggregation::bls_aggregation_service_error::BlsAggregationServiceError; +use eigen_services_blsaggregation::bls_aggregation_service_response::BlsAggregationServiceResponse; use eigen_services_operatorsinfo::operatorsinfo_inmemory::OperatorInfoServiceInMemory; use eigen_types::avs::TaskResponseDigest; -use eigen_utils::get_ws_provider; pub use error::AggregatorError; use futures_util::StreamExt; use incredible_bindings::incrediblesquaringtaskmanager::IBLSSignatureChecker::NonSignerStakesAndSignature; @@ -107,7 +107,8 @@ impl Aggregator { .await; }); - let bls_aggregation_service = BlsAggregatorService::new(avs_registry_service_chaincaller); + let bls_aggregation_service = + BlsAggregatorService::new(avs_registry_service_chaincaller, get_logger()); Ok(Self { port_address: config.aggregator_ip_addr(), diff --git a/crates/chainio/Cargo.toml b/crates/chainio/Cargo.toml index 9f2a10d6..b5df29da 100644 --- a/crates/chainio/Cargo.toml +++ b/crates/chainio/Cargo.toml @@ -23,6 +23,7 @@ tracing.workspace = true reqwest.workspace = true #eigen-rs +eigen-common.workspace = true eigen-client-avsregistry.workspace = true eigen-types.workspace = true eigen-utils.workspace = true diff --git a/crates/chainio/src/fake_avs_writer.rs b/crates/chainio/src/fake_avs_writer.rs index eb342b05..562dcf92 100644 --- a/crates/chainio/src/fake_avs_writer.rs +++ b/crates/chainio/src/fake_avs_writer.rs @@ -1,6 +1,6 @@ use crate::error::ChainIoError; use alloy::primitives::{Address, TxHash}; -use eigen_utils::get_signer; +use eigen_common::get_signer; use incredible_bindings::incrediblesquaringtaskmanager::{ IBLSSignatureChecker::NonSignerStakesAndSignature, IIncredibleSquaringTaskManager::{Task, TaskResponse, TaskResponseMetadata}, diff --git a/crates/chainio/src/lib.rs b/crates/chainio/src/lib.rs index 330e9582..9cd4b7e8 100644 --- a/crates/chainio/src/lib.rs +++ b/crates/chainio/src/lib.rs @@ -9,10 +9,10 @@ use alloy::{ primitives::{Address, U256}, rpc::types::TransactionReceipt, }; +use eigen_common::{get_provider, get_signer}; use eigen_types::operator::{QuorumNum, QuorumThresholdPercentage}; -use eigen_utils::{ - get_provider, get_signer, - registrycoordinator::RegistryCoordinator::{self, serviceManagerReturn}, +use eigen_utils::middleware::registrycoordinator::RegistryCoordinator::{ + self, serviceManagerReturn, }; use error::ChainIoError; use incredible_bindings::incrediblesquaringtaskmanager::IIncredibleSquaringTaskManager::{ diff --git a/crates/challenger/Cargo.toml b/crates/challenger/Cargo.toml index d3d92047..2a151d4e 100644 --- a/crates/challenger/Cargo.toml +++ b/crates/challenger/Cargo.toml @@ -6,7 +6,7 @@ rust-version.workspace = true repository.workspace = true license.workspace = true description = "incredible squaring challenger " - + [lints] workspace = true @@ -26,7 +26,8 @@ incredible-testing-utils.workspace = true incredible-chainio.workspace = true #eigen-rs +eigen-common.workspace = true eigen-utils.workspace = true [dev-dependencies] -incredible-task-generator.workspace = true \ No newline at end of file +incredible-task-generator.workspace = true diff --git a/crates/challenger/src/fake_challenger.rs b/crates/challenger/src/fake_challenger.rs index a027cc44..542ce926 100644 --- a/crates/challenger/src/fake_challenger.rs +++ b/crates/challenger/src/fake_challenger.rs @@ -1,11 +1,8 @@ use crate::{error::ChallengerError, TaskResponseData}; +use alloy::primitives::Bytes; use alloy::rpc::types::Log; use alloy::sol_types::SolCall; -use alloy::{ - hex::FromHex, - primitives::TxHash, - rpc::types::{AccessList, Transaction}, -}; +use alloy::{hex::FromHex, primitives::TxHash}; use incredible_bindings::incrediblesquaringtaskmanager::IIncredibleSquaringTaskManager::Task; use incredible_bindings::incrediblesquaringtaskmanager::IncredibleSquaringTaskManager::{ respondToTaskCall, TaskResponded, @@ -51,9 +48,10 @@ impl FakeChallenger { } } - fn fake_transaction(&self) -> Result, ChallengerError> { - Ok(Some(Transaction { hash: alloy::primitives::FixedBytes::from_hex("0x7c26ddc3ed0f8ce05be3c5046fd72e7d3493b4e08ee33d03c8d791621183ee55").unwrap(), nonce: 6, block_hash: Some(alloy::primitives::FixedBytes::from_hex("0xc9781943aedf7d3040c117b515b9e94af34e564976cf4ddd309a1febfcf4fdb8").unwrap()), block_number: Some(108), transaction_index: Some(0), from: "0xa0ee7a142d267c1f36714e4a8f75612f20a79720".parse().unwrap(), to: Some("0x22753e4264fddc6181dc7cce468904a80a363e44".parse().unwrap()), value: "0".parse().unwrap(), gas_price: Some(829), gas: 266275, max_fee_per_gas: Some(1657), max_priority_fee_per_gas: Some(1), max_fee_per_blob_gas: None, input: alloy::primitives::Bytes::from_hex("0x5baec9a000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000006b0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000001c0225554388e71f9eb5b46bd3813aabe8f3e2de4b965ff3727ada663f39b01f6e70f1c11ddf2169ba7b050f0cdc44223363a8912f0f3a9362d1d7ce0aa78fe864a2bb844ee415b8941017bd0f88d1f4e98a33ffaf917fdce5430ba36dbc5dfc1fe10d6ada6d8aa5fa3a4309df678bf6f370301f78e514b842ae50fea2afc54585c07aad5855f9e9f70a9076612ec3898ecb82d70cb0169b2ee59bbd44526914c7d117eaf682b217e97c383748202bc08091cf63f22da67328d10c185a39ab916d80000000000000000000000000000000000000000000000000000000000000220000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001009d50828897fe208275d989abddcad762bf1bb1a089d5ad40ca5dc78e20faac256c79f6817fd79f3a4898e41b5212ccae66d5e9441c9c76f239a2966f24ba5e0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000").unwrap(), signature: Some(alloy::rpc::types::Signature { r:"36092271394955227026066375671804293921269183503734447794392882514684700159256".parse().unwrap(), s: "38481798096538394877966506194726302078101524385780537082725235490898795594893".parse().unwrap(), v: "1".parse().unwrap(), y_parity: None }), chain_id: Some(31337), blob_versioned_hashes: None, access_list: Some(AccessList([].to_vec())), transaction_type: Some(2), authorization_list: None })) + fn fake_calldata(&self) -> Bytes { + Bytes::from_hex("0x5baec9a000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000006b0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000001c0225554388e71f9eb5b46bd3813aabe8f3e2de4b965ff3727ada663f39b01f6e70f1c11ddf2169ba7b050f0cdc44223363a8912f0f3a9362d1d7ce0aa78fe864a2bb844ee415b8941017bd0f88d1f4e98a33ffaf917fdce5430ba36dbc5dfc1fe10d6ada6d8aa5fa3a4309df678bf6f370301f78e514b842ae50fea2afc54585c07aad5855f9e9f70a9076612ec3898ecb82d70cb0169b2ee59bbd44526914c7d117eaf682b217e97c383748202bc08091cf63f22da67328d10c185a39ab916d80000000000000000000000000000000000000000000000000000000000000220000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001009d50828897fe208275d989abddcad762bf1bb1a089d5ad40ca5dc78e20faac256c79f6817fd79f3a4898e41b5212ccae66d5e9441c9c76f239a2966f24ba5e0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000").unwrap() } + /// Process task response log pub(crate) async fn process_task_response_log( &mut self, @@ -96,40 +94,29 @@ impl FakeChallenger { if let Some(task_responded) = decoded_event { let tx_hash_result = task_responded.transaction_hash; if let Some(_tx_hash) = tx_hash_result { - let transaction_data_result = self.fake_transaction(); - match transaction_data_result { - Ok(transaction_data_option) => { - if let Some(transaction_data) = transaction_data_option { - let calldata = transaction_data.input; - let decoded = respondToTaskCall::abi_decode(&calldata, false); + let calldata = self.fake_calldata(); + let decoded = respondToTaskCall::abi_decode(&calldata, false); - match decoded { - Ok(decoded) => { - let non_signer_stakes_and_signature = - decoded.nonSignerStakesAndSignature; + match decoded { + Ok(decoded) => { + let non_signer_stakes_and_signature = decoded.nonSignerStakesAndSignature; - let mut non_signing_operator_pub_keys: Vec = vec![]; + let mut non_signing_operator_pub_keys: Vec = vec![]; - for (i, pub_key) in non_signer_stakes_and_signature - .nonSignerPubkeys - .iter() - .enumerate() - { - non_signing_operator_pub_keys[i] = G1Point { - X: pub_key.X, - Y: pub_key.Y, - }; - } - Ok(non_signing_operator_pub_keys) - } - - Err(e) => Err(ChallengerError::AlloySolType(e)), - } - } else { - Err(ChallengerError::TaskResponseNotFound) + for (i, pub_key) in non_signer_stakes_and_signature + .nonSignerPubkeys + .iter() + .enumerate() + { + non_signing_operator_pub_keys[i] = G1Point { + X: pub_key.X, + Y: pub_key.Y, + }; } + Ok(non_signing_operator_pub_keys) } - Err(e) => Err(e), + + Err(e) => Err(ChallengerError::AlloySolType(e)), } } else { Err(ChallengerError::TransactionHashNotFound) diff --git a/crates/challenger/src/lib.rs b/crates/challenger/src/lib.rs index ad9c20b5..b5128955 100644 --- a/crates/challenger/src/lib.rs +++ b/crates/challenger/src/lib.rs @@ -1,5 +1,6 @@ //! Challenger crate -use eigen_utils::{get_provider, get_ws_provider}; +use alloy::consensus::Transaction; +use eigen_common::{get_provider, get_ws_provider}; use incredible_bindings::incrediblesquaringtaskmanager::IIncredibleSquaringTaskManager::{ Task, TaskResponse, TaskResponseMetadata, }; @@ -241,7 +242,7 @@ impl Challenger { match transaction_data_result { Ok(transaction_data_option) => { if let Some(transaction_data) = transaction_data_option { - let calldata = transaction_data.input; + let calldata = transaction_data.inner.input(); let decoded = respondToTaskCall::abi_decode(&calldata, false); match decoded { diff --git a/crates/operator/src/builder.rs b/crates/operator/src/builder.rs index 9ff40c30..692c2039 100644 --- a/crates/operator/src/builder.rs +++ b/crates/operator/src/builder.rs @@ -161,7 +161,7 @@ impl OperatorBuilder { let encoded_response = TaskResponse::abi_encode(&task_response); let hash_msg = keccak256(encoded_response); - let signed_msg = self.key_pair.sign_message(hash_msg.as_slice()); + let signed_msg = self.key_pair.sign_message(&hash_msg); let signed_task_response = SignedTaskResponse::new(task_response, signed_msg, self.operator_id); Ok(signed_task_response) @@ -302,7 +302,7 @@ mod tests { let hash_msg = keccak256(encoded_response); assert!(verify_message( bls_key_pair.public_key_g2().g2(), - hash_msg.as_slice(), + &hash_msg, signed_task_response.signature().g1_point().g1() )); } diff --git a/crates/operator_2/src/builder.rs b/crates/operator_2/src/builder.rs index ff63f119..7cdd958e 100644 --- a/crates/operator_2/src/builder.rs +++ b/crates/operator_2/src/builder.rs @@ -159,7 +159,7 @@ impl OperatorBuilder { let encoded_response = TaskResponse::abi_encode(&task_response); let hash_msg = keccak256(encoded_response); - let signed_msg = self.key_pair.sign_message(hash_msg.as_slice()); + let signed_msg = self.key_pair.sign_message(&hash_msg); let signed_task_response = SignedTaskResponse::new(task_response, signed_msg, self.operator_id); Ok(signed_task_response) @@ -308,7 +308,7 @@ mod tests { let hash_msg = keccak256(encoded_response); assert!(verify_message( bls_key_pair.public_key_g2().g2(), - hash_msg.as_slice(), + &hash_msg, signed_task_response.signature().g1_point().g1() )); } diff --git a/crates/task_generator/Cargo.toml b/crates/task_generator/Cargo.toml index 090de088..70778774 100644 --- a/crates/task_generator/Cargo.toml +++ b/crates/task_generator/Cargo.toml @@ -6,7 +6,7 @@ rust-version.workspace = true repository.workspace = true license.workspace = true description = "eigen layer operator" - + [lints] rust.missing_docs = "allow" rust.missing_debug_implementations = "warn" @@ -30,4 +30,4 @@ reqwest.workspace = true # eigen-rs eigen-utils.workspace = true - +eigen-common.workspace = true diff --git a/crates/task_generator/src/lib.rs b/crates/task_generator/src/lib.rs index 43414b0a..b7fd5fce 100644 --- a/crates/task_generator/src/lib.rs +++ b/crates/task_generator/src/lib.rs @@ -6,7 +6,7 @@ use alloy::{ rpc::types::TransactionReceipt, signers::local::PrivateKeySigner, }; -use eigen_utils::get_signer; +use eigen_common::get_signer; use incredible_bindings::incrediblesquaringtaskmanager::IIncredibleSquaringTaskManager::{ Task, TaskResponse, }; diff --git a/crates/testing-utils/Cargo.toml b/crates/testing-utils/Cargo.toml index 66a06a9c..15148d16 100644 --- a/crates/testing-utils/Cargo.toml +++ b/crates/testing-utils/Cargo.toml @@ -6,12 +6,13 @@ rust-version.workspace = true repository.workspace = true license.workspace = true description = "eigen layer operator" - + [lints] workspace = true [dependencies] +eigen-common.workspace = true eigen-utils.workspace = true eigen-testing-utils.workspace = true alloy.workspace = true -tracing.workspace = true \ No newline at end of file +tracing.workspace = true diff --git a/crates/testing-utils/src/lib.rs b/crates/testing-utils/src/lib.rs index 3a2e9adf..d2d24721 100644 --- a/crates/testing-utils/src/lib.rs +++ b/crates/testing-utils/src/lib.rs @@ -1,10 +1,8 @@ //! testing utils for incredible squaring rs use alloy::primitives::{address, Address}; +use eigen_common::get_provider; use eigen_testing_utils::anvil_constants::ANVIL_HTTP_URL; -use eigen_utils::{ - contractsregistry::ContractsRegistry::{self, contractsReturn}, - get_provider, -}; +use eigen_utils::deploy::contractsregistry::ContractsRegistry::{self, contractsReturn}; /// Local anvil ContractsRegistry which contains a mapping of all locally deployed EL contracts. pub const CONTRACTS_REGISTRY: Address = address!("5FbDB2315678afecb367f032d93F642f64180aa3");