diff --git a/Cargo.lock b/Cargo.lock index 2bc2ab9..5be0cc3 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-aws", - "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.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02b0561294ccedc6181e5528b850b4579e3fbde696507baa00109bfd9054c5bb" dependencies = [ - "alloy-consensus 0.7.3", - "alloy-contract 0.7.3", + "alloy-consensus", + "alloy-contract", "alloy-core", - "alloy-eips 0.7.3", - "alloy-genesis 0.7.3", - "alloy-network 0.7.3", - "alloy-provider 0.7.3", - "alloy-pubsub 0.7.3", - "alloy-rpc-client 0.7.3", - "alloy-rpc-types 0.7.3", - "alloy-serde 0.7.3", - "alloy-signer 0.7.3", - "alloy-signer-local 0.7.3", - "alloy-transport 0.7.3", - "alloy-transport-http 0.7.3", - "alloy-transport-ipc 0.7.3", - "alloy-transport-ws 0.7.3", + "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", + "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.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a101d4d016f47f13890a74290fdd17b05dd175191d9337bc600791fb96e4dea8" dependencies = [ - "alloy-eips 0.7.3", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.7.3", + "alloy-serde", "alloy-trie", "auto_impl", "c-kzg", @@ -168,35 +127,14 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa60357dda9a3d0f738f18844bd6d0f4a5924cc5cf00bfad2ff1369897966123" dependencies = [ - "alloy-consensus 0.7.3", - "alloy-eips 0.7.3", + "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.7.3", + "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.7.3" @@ -205,14 +143,14 @@ checksum = "2869e4fb31331d3b8c58c7db567d1e4e4e94ef64640beda3b6dd9b7045690941" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", - "alloy-network 0.7.3", - "alloy-network-primitives 0.7.3", + "alloy-network", + "alloy-network-primitives", "alloy-primitives", - "alloy-provider 0.7.3", - "alloy-pubsub 0.7.3", - "alloy-rpc-types-eth 0.7.3", + "alloy-provider", + "alloy-pubsub", + "alloy-rpc-types-eth", "alloy-sol-types", - "alloy-transport 0.7.3", + "alloy-transport", "futures", "futures-util", "thiserror 2.0.7", @@ -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.4.2" @@ -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.7.3" @@ -310,10 +217,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6755b093afef5925f25079dd5a7c8d096398b804ba60cb5275397b06b31689" dependencies = [ "alloy-eip2930", - "alloy-eip7702 0.4.2", + "alloy-eip7702", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.7.3", + "alloy-serde", "c-kzg", "derive_more", "once_cell", @@ -321,17 +228,6 @@ 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.7.3" @@ -339,7 +235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aeec8e6eab6e52b7c9f918748c9b811e87dbef7312a2e3a2ca1729a92966a6af" dependencies = [ "alloy-primitives", - "alloy-serde 0.7.3", + "alloy-serde", "alloy-trie", "serde", ] @@ -356,20 +252,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.7.3" @@ -384,43 +266,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.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "209a1882a08e21aca4aac6e2a674dc6fcf614058ef8cb02947d63782b1899552" dependencies = [ - "alloy-consensus 0.7.3", + "alloy-consensus", "alloy-consensus-any", - "alloy-eips 0.7.3", - "alloy-json-rpc 0.7.3", - "alloy-network-primitives 0.7.3", + "alloy-eips", + "alloy-json-rpc", + "alloy-network-primitives", "alloy-primitives", "alloy-rpc-types-any", - "alloy-rpc-types-eth 0.7.3", - "alloy-serde 0.7.3", - "alloy-signer 0.7.3", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-signer", "alloy-sol-types", "async-trait", "auto_impl", @@ -430,29 +291,16 @@ dependencies = [ "thiserror 2.0.7", ] -[[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.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c20219d1ad261da7a6331c16367214ee7ded41d001fabbbd656fbf71898b2773" dependencies = [ - "alloy-consensus 0.7.3", - "alloy-eips 0.7.3", + "alloy-consensus", + "alloy-eips", "alloy-primitives", - "alloy-serde 0.7.3", + "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.9", - "schnellru", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tracing", - "url", - "wasmtimer 0.2.1", -] - [[package]] name = "alloy-provider" version = "0.7.3" @@ -531,19 +339,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eefa6f4c798ad01f9b4202d02cea75f5ec11fa180502f4701e2b47965a8c0bb" dependencies = [ "alloy-chains", - "alloy-consensus 0.7.3", - "alloy-eips 0.7.3", - "alloy-json-rpc 0.7.3", - "alloy-network 0.7.3", - "alloy-network-primitives 0.7.3", + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-network", + "alloy-network-primitives", "alloy-primitives", - "alloy-pubsub 0.7.3", - "alloy-rpc-client 0.7.3", - "alloy-rpc-types-eth 0.7.3", - "alloy-transport 0.7.3", - "alloy-transport-http 0.7.3", - "alloy-transport-ipc 0.7.3", - "alloy-transport-ws 0.7.3", + "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.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aac9a7210e0812b1d814118f426f57eb7fc260a419224dd1c76d169879c06907" dependencies = [ - "alloy-json-rpc 0.7.3", + "alloy-json-rpc", "alloy-primitives", - "alloy-transport 0.7.3", + "alloy-transport", "bimap", "futures", "serde", @@ -624,45 +413,19 @@ dependencies = [ "syn 2.0.90", ] -[[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.9", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "tower", - "tracing", - "url", - "wasmtimer 0.2.1", -] - [[package]] name = "alloy-rpc-client" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed30bf1041e84cabc5900f52978ca345dd9969f2194a945e6fdec25b0620705c" dependencies = [ - "alloy-json-rpc 0.7.3", + "alloy-json-rpc", "alloy-primitives", - "alloy-pubsub 0.7.3", - "alloy-transport 0.7.3", - "alloy-transport-http 0.7.3", - "alloy-transport-ipc 0.7.3", - "alloy-transport-ws 0.7.3", + "alloy-pubsub", + "alloy-transport", + "alloy-transport-http", + "alloy-transport-ipc", + "alloy-transport-ws", "futures", "pin-project", "reqwest 0.12.9", @@ -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 = "5ab686b0fa475d2a4f5916c5f07797734a691ec58e44f0f55d4746ea39cbcefb" dependencies = [ "alloy-primitives", - "alloy-rpc-types-engine 0.7.3", - "alloy-rpc-types-eth 0.7.3", - "alloy-serde 0.7.3", + "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 = "200661999b6e235d9840be5d60a6e8ae2f0af9eb2a256dd378786744660e36ec" dependencies = [ "alloy-consensus-any", - "alloy-rpc-types-eth 0.7.3", - "alloy-serde 0.7.3", -] - -[[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.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d297268357e3eae834ddd6888b15f764cbc0f4b3be9265f5f6ec239013f3d68" dependencies = [ - "alloy-consensus 0.7.3", - "alloy-eips 0.7.3", + "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.7.3", + "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.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0600b8b5e2dc0cab12cbf91b5a885c35871789fb7b3a57b434bd4fced5b7a8b" dependencies = [ - "alloy-consensus 0.7.3", + "alloy-consensus", "alloy-consensus-any", - "alloy-eips 0.7.3", - "alloy-network-primitives 0.7.3", + "alloy-eips", + "alloy-network-primitives", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.7.3", + "alloy-serde", "alloy-sol-types", "derive_more", "itertools 0.13.0", @@ -784,17 +499,6 @@ dependencies = [ "serde_json", ] -[[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.7.3" @@ -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.7.3" @@ -836,48 +526,32 @@ dependencies = [ [[package]] name = "alloy-signer-aws" -version = "0.5.4" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a406102908a4e51834f32c4e5c1b29aa2c407b3fd23a5cad129c28b56d85e1b8" +checksum = "71ce77227fdb9059fd7a3b38a8679c0dae95d81886ee8c13ef8ad99d74866bbd" dependencies = [ - "alloy-consensus 0.5.4", - "alloy-network 0.5.4", + "alloy-consensus", + "alloy-network", "alloy-primitives", - "alloy-signer 0.5.4", + "alloy-signer", "async-trait", "aws-sdk-kms", "k256", "spki", - "thiserror 1.0.69", + "thiserror 2.0.7", "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", - "k256", - "rand", - "thiserror 1.0.69", -] - [[package]] name = "alloy-signer-local" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6d988cb6cd7d2f428a74476515b1a6e901e08c796767f9f93311ab74005c8b" dependencies = [ - "alloy-consensus 0.7.3", - "alloy-network 0.7.3", + "alloy-consensus", + "alloy-network", "alloy-primitives", - "alloy-signer 0.7.3", + "alloy-signer", "async-trait", "eth-keystore", "k256", @@ -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.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d69d36982b9e46075ae6b792b0f84208c6c2c15ad49f6c500304616ef67b70e0" dependencies = [ - "alloy-json-rpc 0.7.3", + "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.9", - "serde_json", - "tower", - "tracing", - "url", + "wasmtimer", ] [[package]] @@ -1019,8 +658,8 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e02ffd5d93ffc51d72786e607c97de3b60736ca3e636ead0ec1f7dce68ea3fd" dependencies = [ - "alloy-json-rpc 0.7.3", - "alloy-transport 0.7.3", + "alloy-json-rpc", + "alloy-transport", "reqwest 0.12.9", "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.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b6f8b87cb84bae6d81ae6604b37741c8116f84f9784a0ecc6038c302e679d23" dependencies = [ - "alloy-json-rpc 0.7.3", - "alloy-pubsub 0.7.3", - "alloy-transport 0.7.3", + "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.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c085c4e1e7680b723ffc558f61a22c061ed3f70eb3436f93f3936779c59cec1" dependencies = [ - "alloy-pubsub 0.7.3", - "alloy-transport 0.7.3", + "alloy-pubsub", + "alloy-transport", "futures", "http 1.2.0", "rustls 0.23.20", @@ -2774,14 +2376,14 @@ dependencies = [ [[package]] name = "eigen-cli" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ - "alloy 0.5.4", - "alloy-json-rpc 0.5.4", + "alloy", + "alloy-json-rpc", "alloy-primitives", - "alloy-provider 0.5.4", - "alloy-transport 0.5.4", + "alloy-provider", + "alloy-transport", "ark-ec 0.5.0", "ark-ff 0.5.0", "ark-serialize 0.5.0", @@ -2797,7 +2399,7 @@ dependencies = [ "num-bigint", "rand", "rand_core", - "rust-bls-bn254 0.2.0", + "rust-bls-bn254 0.2.1", "serde", "serde_json", "thiserror 1.0.69", @@ -2807,13 +2409,13 @@ dependencies = [ [[package]] name = "eigen-client-avsregistry" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ - "alloy 0.5.4", + "alloy", "alloy-primitives", - "alloy-signer 0.5.4", - "alloy-signer-local 0.5.4", + "alloy-signer", + "alloy-signer-local", "ark-ff 0.5.0", "async-trait", "eigen-client-elcontracts", @@ -2828,11 +2430,13 @@ dependencies = [ [[package]] name = "eigen-client-elcontracts" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ - "alloy 0.5.4", + "alloy", "alloy-primitives", + "alloy-sol-types", + "eigen-crypto-bls", "eigen-logging", "eigen-types", "eigen-utils", @@ -2842,11 +2446,11 @@ dependencies = [ [[package]] name = "eigen-client-eth" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ - "alloy 0.5.4", - "alloy-json-rpc 0.5.4", + "alloy", + "alloy-json-rpc", "alloy-primitives", "alloy-rlp", "async-trait", @@ -2859,8 +2463,8 @@ dependencies = [ [[package]] name = "eigen-crypto-bls" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ "alloy-primitives", "ark-bn254 0.5.0", @@ -2876,20 +2480,19 @@ dependencies = [ [[package]] name = "eigen-crypto-bn254" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ "ark-bn254 0.5.0", "ark-ec 0.5.0", "ark-ff 0.5.0", - "num-bigint", - "rust-bls-bn254 0.2.0", + "rust-bls-bn254 0.2.1", ] [[package]] name = "eigen-logging" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ "ctor", "once_cell", @@ -2899,8 +2502,8 @@ dependencies = [ [[package]] name = "eigen-metrics" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ "eigen-logging", "metrics 0.24.1", @@ -2910,8 +2513,8 @@ dependencies = [ [[package]] name = "eigen-metrics-collectors-rpc-calls" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ "eigen-logging", "metrics 0.24.1", @@ -2919,8 +2522,8 @@ dependencies = [ [[package]] name = "eigen-nodeapi" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ "ntex", "serde", @@ -2931,8 +2534,8 @@ dependencies = [ [[package]] name = "eigen-services-avsregistry" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ "alloy-primitives", "ark-bn254 0.5.0", @@ -2947,16 +2550,17 @@ dependencies = [ [[package]] name = "eigen-services-blsaggregation" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ - "alloy 0.5.4", + "alloy", "alloy-primitives", "ark-bn254 0.5.0", "ark-ec 0.5.0", "eigen-client-avsregistry", "eigen-crypto-bls", "eigen-crypto-bn254", + "eigen-logging", "eigen-services-avsregistry", "eigen-types", "parking_lot 0.12.3", @@ -2968,10 +2572,10 @@ dependencies = [ [[package]] name = "eigen-services-operatorsinfo" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ - "alloy 0.5.4", + "alloy", "alloy-primitives", "async-trait", "eigen-client-avsregistry", @@ -2989,13 +2593,14 @@ dependencies = [ [[package]] name = "eigen-testing-utils" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ + "alloy", "alloy-primitives", - "alloy-provider 0.5.4", - "alloy-rpc-types 0.5.4", - "alloy-transport 0.5.4", + "alloy-provider", + "alloy-rpc-types", + "alloy-transport", "eigen-utils", "serde", "serde_json", @@ -3005,8 +2610,8 @@ dependencies = [ [[package]] name = "eigen-types" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ "alloy-primitives", "eigen-crypto-bls", @@ -3018,10 +2623,10 @@ dependencies = [ [[package]] name = "eigen-utils" -version = "0.1.0" -source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=7967e1c#7967e1c462e0c0f51c77c284a67fc44e39c65cbe" +version = "0.1.1" +source = "git+https://github.com/Layr-Labs/eigensdk-rs?rev=8bc7d45#8bc7d4598ca7bb77b95dff235c261af584f9c70d" dependencies = [ - "alloy 0.5.4", + "alloy", "reqwest 0.12.9", ] @@ -4382,7 +3987,7 @@ dependencies = [ name = "incredible-aggregator" version = "0.0.1-alpha" dependencies = [ - "alloy 0.7.3", + "alloy", "ark-bn254 0.5.0", "ark-ec 0.5.0", "ark-serialize 0.4.2", @@ -4419,7 +4024,7 @@ dependencies = [ name = "incredible-avs" version = "0.0.1-alpha" dependencies = [ - "alloy 0.7.3", + "alloy", "clap", "eigen-nodeapi", "eyre", @@ -4444,7 +4049,7 @@ dependencies = [ name = "incredible-bindings" version = "0.0.1-alpha" dependencies = [ - "alloy 0.7.3", + "alloy", "serde", ] @@ -4452,7 +4057,7 @@ dependencies = [ name = "incredible-chainio" version = "0.0.1-alpha" dependencies = [ - "alloy 0.7.3", + "alloy", "eigen-client-avsregistry", "eigen-logging", "eigen-types", @@ -4471,8 +4076,8 @@ dependencies = [ name = "incredible-challenger" version = "0.0.1-alpha" dependencies = [ - "alloy 0.7.3", - "alloy-provider 0.7.3", + "alloy", + "alloy-provider", "eigen-utils", "eyre", "futures-util", @@ -4499,7 +4104,7 @@ dependencies = [ name = "incredible-config" version = "0.0.1-alpha" dependencies = [ - "alloy 0.7.3", + "alloy", "confy", "eigen-logging", "eigen-types", @@ -4518,8 +4123,8 @@ dependencies = [ name = "incredible-metrics" version = "0.0.1-alpha" dependencies = [ - "alloy 0.7.3", - "alloy-provider 0.7.3", + "alloy", + "alloy-provider", "eigen-metrics", "eyre", "futures-util", @@ -4536,8 +4141,8 @@ dependencies = [ name = "incredible-operator" version = "0.0.1-alpha" dependencies = [ - "alloy 0.7.3", - "alloy-provider 0.7.3", + "alloy", + "alloy-provider", "ark-ec 0.5.0", "ark-ff 0.5.0", "eigen-cli", @@ -4572,8 +4177,8 @@ dependencies = [ name = "incredible-operator-2" version = "0.0.1-alpha" dependencies = [ - "alloy 0.7.3", - "alloy-provider 0.7.3", + "alloy", + "alloy-provider", "ark-ec 0.5.0", "ark-ff 0.5.0", "eigen-cli", @@ -4613,7 +4218,7 @@ version = "0.0.1-alpha" name = "incredible-squaring-avs" version = "0.0.1-alpha" dependencies = [ - "alloy 0.7.3", + "alloy", "clap", "eigen-client-avsregistry", "eigen-client-elcontracts", @@ -4644,8 +4249,8 @@ dependencies = [ name = "incredible-task-generator" version = "0.0.1-alpha" dependencies = [ - "alloy 0.7.3", - "alloy-provider 0.7.3", + "alloy", + "alloy-provider", "eigen-utils", "eyre", "futures-util", @@ -4662,7 +4267,7 @@ dependencies = [ name = "incredible-testing-utils" version = "0.0.1-alpha" dependencies = [ - "alloy 0.7.3", + "alloy", "eigen-testing-utils", "eigen-utils", "tracing", @@ -6519,8 +6124,9 @@ dependencies = [ [[package]] name = "rust-bls-bn254" -version = "0.2.0" -source = "git+https://github.com/Layr-Labs/rust-bls-bn254?rev=ce3313f#ce3313feb61b0512d4c65a6458aca08ccbc8ced2" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84ab37c09dbee7ec3b610ecd703c6a79708aef66d52052ee7bfec0bbb9e7a8cd" dependencies = [ "aes", "ark-bn254 0.5.0", @@ -8173,20 +7779,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 e29ecb8..4ea59a4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -73,22 +73,22 @@ incredible-operator-2 = {path = "crates/operator_2/" , features = ["default"]} incredible-slasher = {path = "crates/slasher/"} # eigensdk-rs -eigen-client-avsregistry = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-testing-utils ={ git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-crypto-bls = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-types = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-metrics = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-utils = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-contract-bindings = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-cli ={ git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-logging ={ git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-crypto-bn254 = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-client-elcontracts = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-services-operatorsinfo = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-services-avsregistry = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-services-blsaggregation = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-metrics-collectors-rpc-calls = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-client-eth = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} -eigen-nodeapi = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "0986564"} +eigen-client-avsregistry = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-testing-utils ={ git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-crypto-bls = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-types = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-metrics = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-utils = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-contract-bindings = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-cli ={ git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-logging ={ git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-crypto-bn254 = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-client-elcontracts = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-services-operatorsinfo = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-services-avsregistry = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-services-blsaggregation = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-metrics-collectors-rpc-calls = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-client-eth = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} +eigen-nodeapi = { git = "https://github.com/Layr-Labs/eigensdk-rs", rev = "8bc7d45"} diff --git a/bin/incredible-squaring-avs/src/commands/avs/mod.rs b/bin/incredible-squaring-avs/src/commands/avs/mod.rs index a8ac0e1..9b1ec95 100644 --- a/bin/incredible-squaring-avs/src/commands/avs/mod.rs +++ b/bin/incredible-squaring-avs/src/commands/avs/mod.rs @@ -25,7 +25,6 @@ use eigen_utils::allocationmanager::IAllocationManagerTypes::{AllocateParams, Re use eigen_utils::registrycoordinator::RegistryCoordinator; use eigen_utils::{get_provider, get_signer}; use incredible_avs::builder::{AvsBuilder, DefaultAvsLauncher, LaunchAvs}; -use incredible_bindings::incrediblesquaringtaskmanager::IncredibleSquaringTaskManager; use incredible_config::IncredibleConfig; use incredible_testing_utils::{ get_incredible_squaring_operator_state_retriever, get_incredible_squaring_registry_coordinator, @@ -670,10 +669,6 @@ impl AvsCommand { mine_anvil_block(&rpc_url, current_block_number); } - let task_manager = IncredibleSquaringTaskManager::new( - incredible_squaring_task_manager_address_anvil, - get_provider(ANVIL_HTTP_URL), - ); let avs_launcher = DefaultAvsLauncher::new(); let avs_builder = AvsBuilder::new(config); let _ = avs_launcher.launch_avs(avs_builder).await; @@ -713,6 +708,7 @@ pub async fn register_operator_with_el_and_deposit_tokens_in_strategy( get_logger(), allocation_manager, delegation_manager_address, + rewards_coordinator, avs_directory_address, permission_controller_address, rpc_url.clone(), diff --git a/contracts/script/deployments/core/31337.json b/contracts/script/deployments/core/31337.json index 04a8f9d..03482e5 100644 --- a/contracts/script/deployments/core/31337.json +++ b/contracts/script/deployments/core/31337.json @@ -1 +1 @@ -{"lastUpdate":{"timestamp":"1736266784","block_number":"1"},"addresses":{"proxyAdmin":"0xe7f1725e7734ce288f8367e1bb143e90bb3f0512","delegation":"0xcf7ed3acca5a467e9e704c703e8d87f634fb0fc9","delegationManagerImpl":"0x322813fd9a801c5507c9de605d63cea4f2ce6c44","avsDirectory":"0xb7f8bc63bbcad18155201308c8f3540b07f84f5e","avsDirectoryImpl":"0x4a679253410272dd5232b3ff7cf5dbb88f295319","strategyManager":"0xa513e6e4b8f2a923d98304ec87f64353c4d5c853","strategyManagerImpl":"0x7a2088a1bfc9d81c55368ae168c2c02570cb814f","eigenPodManager":"0xc6e7df5e7b4f2a278906862b61205850344d4e7d","eigenPodManagerImpl":"0x67d269191c92caf3cd7723f116c85e6e9bf55933","strategyFactory":"0x68b1d87f95878fe05b998f19b66f4baba5de1aed","rewardsCoordinator":"0x0dcd1bf9a1b36ce34237eeafef220932846bcd82","pauserRegistry":"0x959922be3caee4b8cd9a407cc3ac1c251c2007b1","strategyBeacon":"0xa82ff9afd8f496c3d6ac40e2a0f282e47488cfc9","allocationManager":"0x8a791620dd6260079bf849dc5567adc3f2fdc318","permissionController":"0x4ed7c70f96b99c776995fb64377f0d4ab3b0e1c1"}} \ No newline at end of file +{"lastUpdate":{"timestamp":"1736327206","block_number":"1"},"addresses":{"proxyAdmin":"0xe7f1725e7734ce288f8367e1bb143e90bb3f0512","delegation":"0xcf7ed3acca5a467e9e704c703e8d87f634fb0fc9","delegationManagerImpl":"0x322813fd9a801c5507c9de605d63cea4f2ce6c44","avsDirectory":"0xb7f8bc63bbcad18155201308c8f3540b07f84f5e","avsDirectoryImpl":"0x4a679253410272dd5232b3ff7cf5dbb88f295319","strategyManager":"0xa513e6e4b8f2a923d98304ec87f64353c4d5c853","strategyManagerImpl":"0x7a2088a1bfc9d81c55368ae168c2c02570cb814f","eigenPodManager":"0xc6e7df5e7b4f2a278906862b61205850344d4e7d","eigenPodManagerImpl":"0x67d269191c92caf3cd7723f116c85e6e9bf55933","strategyFactory":"0x68b1d87f95878fe05b998f19b66f4baba5de1aed","rewardsCoordinator":"0x0dcd1bf9a1b36ce34237eeafef220932846bcd82","pauserRegistry":"0x959922be3caee4b8cd9a407cc3ac1c251c2007b1","strategyBeacon":"0xa82ff9afd8f496c3d6ac40e2a0f282e47488cfc9","allocationManager":"0x8a791620dd6260079bf849dc5567adc3f2fdc318","permissionController":"0x4ed7c70f96b99c776995fb64377f0d4ab3b0e1c1"}} \ No newline at end of file diff --git a/contracts/script/deployments/incredible-squaring/31337.json b/contracts/script/deployments/incredible-squaring/31337.json index 343103f..753b64c 100644 --- a/contracts/script/deployments/incredible-squaring/31337.json +++ b/contracts/script/deployments/incredible-squaring/31337.json @@ -1 +1 @@ -{"lastUpdate":{"timestamp":"1736266785","block_number":"44"},"addresses":{"proxyAdmin":"0x1291be112d480055dafd8a610b7d1e203891c274","IncredibleSquaringServiceManager":"0xb7278a61aa25c888815afc32ad3cc52ff24fe575","incredibleSquaringServiceManagerImpl":"0x202cce504e04bed6fc0521238ddf04bc9e8e15ab","IncredibleSquaringTaskManager":"0x7969c5ed335650692bc04293b07f5bf2e7a673c0","registryCoordinator":"0xc351628eb244ec633d5f21fbd6621e1a683b1181","blsapkRegistry":"0xcbeaf3bde82155f56486fb5a1072cb8baaf547cc","indexRegistry":"0xb0d4afd8879ed9f52b28595d31b441d079b2ca07","stakeRegistry":"0x82e01223d51eb87e16a03e24687edf0f294da6f1","operatorStateRetriever":"0xdbc43ba45381e02825b14322cddd15ec4b3164e6","strategy":"0x5e3d0fde6f793b3115a9e7f5ebc195bbeed35d6c","pauserRegistry":"0x0000000000000000000000000000000000000000","token":"0x0000000000000000000000000000000000000000","instantSlasher":"0x1fa02b2d6a771842690194cf62d91bdd92bfe28d"}} \ No newline at end of file +{"lastUpdate":{"timestamp":"1736327207","block_number":"44"},"addresses":{"proxyAdmin":"0x1291be112d480055dafd8a610b7d1e203891c274","IncredibleSquaringServiceManager":"0xb7278a61aa25c888815afc32ad3cc52ff24fe575","incredibleSquaringServiceManagerImpl":"0x202cce504e04bed6fc0521238ddf04bc9e8e15ab","IncredibleSquaringTaskManager":"0x7969c5ed335650692bc04293b07f5bf2e7a673c0","registryCoordinator":"0xc351628eb244ec633d5f21fbd6621e1a683b1181","blsapkRegistry":"0xcbeaf3bde82155f56486fb5a1072cb8baaf547cc","indexRegistry":"0xb0d4afd8879ed9f52b28595d31b441d079b2ca07","stakeRegistry":"0x82e01223d51eb87e16a03e24687edf0f294da6f1","operatorStateRetriever":"0xdbc43ba45381e02825b14322cddd15ec4b3164e6","strategy":"0x5e3d0fde6f793b3115a9e7f5ebc195bbeed35d6c","pauserRegistry":"0x0000000000000000000000000000000000000000","token":"0x0000000000000000000000000000000000000000","instantSlasher":"0x1fa02b2d6a771842690194cf62d91bdd92bfe28d"}} \ No newline at end of file diff --git a/crates/aggregator/src/lib.rs b/crates/aggregator/src/lib.rs index d9f8a56..52fd05a 100644 --- a/crates/aggregator/src/lib.rs +++ b/crates/aggregator/src/lib.rs @@ -41,7 +41,6 @@ use jsonrpc_core::serde_json; use jsonrpc_core::{Error, IoHandler, Params, Value}; use jsonrpc_http_server::{AccessControlAllowOrigin, DomainsValidation, ServerBuilder}; pub use rpc_server::SignedTaskResponse; -use serde::ser; use std::collections::HashMap; use std::net::SocketAddr; use std::sync::Arc; @@ -318,8 +317,9 @@ impl Aggregator { self.tasks_responses.insert(task_index, inner_map); } + let entry = self.task_quorum.entry(task_index).or_insert(U96::from(0)); + let old_entry = entry.clone(); let quorum_reached = { - let entry = self.task_quorum.entry(task_index).or_insert(U96::from(0)); let registry_coordinator_instance = RegistryCoordinator::new( registry_coordinator, get_provider(&self.avs_writer.rpc_url), @@ -351,7 +351,7 @@ impl Aggregator { } } } - if *entry < U96::from(4000) { + if old_entry.is_zero() { self.bls_aggregation_service .process_new_signature( task_index, @@ -360,11 +360,22 @@ impl Aggregator { signed_task_response.operator_id(), ) .await?; + } else { + if old_entry < U96::from(4800) { + self.bls_aggregation_service + .process_new_signature( + task_index, + task_response_digest, + signed_task_response.signature(), + signed_task_response.operator_id(), + ) + .await?; + } } - *entry >= U96::from(4000) //todo change this + *entry >= U96::from(4800) // total stake is 12000. quorum threshold percentag in new task is 40% . hence 4800. }; - if quorum_reached { + if quorum_reached && (old_entry < U96::from(4800)) { info!("quorum reached for task index: {:?}", task_index); if let Some(aggregated_response) = self .bls_aggregation_service @@ -380,10 +391,17 @@ impl Aggregator { .await?; } } else { - info!( - "quorum not reached yet for index:{:?}. waiting to receive more signatures ", - task_index - ); + if old_entry >= U96::from(4800) { + info!( + "quorum already reached for index{:?}, ignoring more signatures", + task_index + ); + } else { + info!( + "quorum not reached yet for index:{:?}. waiting to receive more signatures ", + task_index + ); + } } Ok(()) diff --git a/crates/chainio/src/lib.rs b/crates/chainio/src/lib.rs index 170961d..6bbdc96 100644 --- a/crates/chainio/src/lib.rs +++ b/crates/chainio/src/lib.rs @@ -175,7 +175,6 @@ impl AvsWriter { ) -> Result<(), ChainIoError> { let pr = get_signer(&self.signer, &self.rpc_url); let task_manager_contract = IncredibleSquaringTaskManager::new(self.task_manager_addr, pr); - info!("befofe responding to task"); let receipt = task_manager_contract .respondToTask(task, task_response, non_signer_stakes_and_signature) .send() diff --git a/crates/challenger/src/lib.rs b/crates/challenger/src/lib.rs index 033f891..6731499 100644 --- a/crates/challenger/src/lib.rs +++ b/crates/challenger/src/lib.rs @@ -90,15 +90,11 @@ impl Challenger { let mut task_responded_stream = task_responded_sub.into_stream(); - let task_responded_log = TaskResponded::SIGNATURE_HASH; - loop { tokio::select! { Some(log) = task_responded_stream.next() => { - info!("challenger: Picked a task response"); let task_index = self.process_task_response_log(log).await?; if self.tasks.contains_key(&task_index) { - info!("calling challenge"); self.call_challenge(task_index).await?; } }, @@ -113,11 +109,8 @@ impl Challenger { task: m.task.clone(), }; - let t_index = self.process_new_task_created_log(new_task_cr); + let _ = self.process_new_task_created_log(new_task_cr); - // if self.task_responses.contains_key(&t_index) { - // self.call_challenge(t_index).await?; - // } } }, else => { @@ -126,36 +119,6 @@ impl Challenger { break; } }; - - // let topic = log.topic0(); - - // if let Some(tp) = topic { - // if *tp == new_task_created_log { - // info!("challenger: picked up a new task "); - // let new_task_created_option = log.log_decode::().ok(); - - // if let Some(data) = new_task_created_option { - // let m = data.data(); - // let new_task_cr = NewTaskCreated { - // taskIndex: m.taskIndex, - // task: m.task.clone(), - // }; - - // let t_index = self.process_new_task_created_log(new_task_cr); - - // if self.task_responses.contains_key(&t_index) { - // self.call_challenge(t_index).await?; - // } - // } - // } else if *tp == task_responded_log { - // info!("challenger: received a task response log"); - - // let task_index = self.process_task_response_log(log).await?; - // if self.tasks.contains_key(&task_index) { - // self.call_challenge(task_index).await?; - // } - // } - // } } Ok(()) diff --git a/crates/task_generator/src/lib.rs b/crates/task_generator/src/lib.rs index c921bb6..0235ea3 100644 --- a/crates/task_generator/src/lib.rs +++ b/crates/task_generator/src/lib.rs @@ -58,7 +58,7 @@ impl TaskManager { loop { let number_to_be_squared = task_num; - let quorum_threshold_percentage = 10; + let quorum_threshold_percentage = 40; let quorum_numbers = Bytes::from_str("0x01")?; let _ = task_manager_contract