From 6ff77cc4fcaada85a2edd014d3c2a55e59ca3ee6 Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <s.pepyakin@gmail.com>
Date: Tue, 21 Nov 2023 15:31:02 +0100
Subject: [PATCH 1/5] sugondat-subxt: re-generate

---
 sugondat-subxt/src/gen.rs | 545 ++++----------------------------------
 1 file changed, 50 insertions(+), 495 deletions(-)

diff --git a/sugondat-subxt/src/gen.rs b/sugondat-subxt/src/gen.rs
index 1ed56955..937cc131 100644
--- a/sugondat-subxt/src/gen.rs
+++ b/sugondat-subxt/src/gen.rs
@@ -6,14 +6,13 @@ pub mod api {
     mod root_mod {
         pub use super::*;
     }
-    pub static PALLETS: [&str; 17usize] = [
+    pub static PALLETS: [&str; 16usize] = [
         "System",
         "ParachainSystem",
         "Timestamp",
         "ParachainInfo",
         "Balances",
         "TransactionPayment",
-        "Sudo",
         "Authorship",
         "CollatorSelection",
         "Session",
@@ -23,9 +22,9 @@ pub mod api {
         "PolkadotXcm",
         "CumulusXcm",
         "DmpQueue",
-        "Blobs",
+        "Blob",
     ];
-    pub static RUNTIME_APIS: [&str; 12usize] = [
+    pub static RUNTIME_APIS: [&str; 11usize] = [
         "AuraApi",
         "Core",
         "Metadata",
@@ -37,7 +36,6 @@ pub mod api {
         "TransactionPaymentApi",
         "TransactionPaymentCallApi",
         "CollectCollationInfo",
-        "GenesisBuilder",
     ];
     #[doc = r" The error type returned when there is a runtime issue."]
     pub type DispatchError = runtime_types::sp_runtime::DispatchError;
@@ -104,9 +102,6 @@ pub mod api {
             pub fn collect_collation_info(&self) -> collect_collation_info::CollectCollationInfo {
                 collect_collation_info::CollectCollationInfo
             }
-            pub fn genesis_builder(&self) -> genesis_builder::GenesisBuilder {
-                genesis_builder::GenesisBuilder
-            }
         }
         pub mod aura_api {
             use super::root_mod;
@@ -911,9 +906,10 @@ pub mod api {
                         "query_call_info",
                         types::QueryCallInfo { call, len },
                         [
-                            53u8, 207u8, 240u8, 63u8, 63u8, 17u8, 165u8, 113u8, 169u8, 199u8, 26u8,
-                            152u8, 15u8, 166u8, 136u8, 71u8, 145u8, 27u8, 89u8, 14u8, 28u8, 15u8,
-                            42u8, 75u8, 179u8, 28u8, 249u8, 219u8, 51u8, 138u8, 225u8, 41u8,
+                            132u8, 107u8, 80u8, 209u8, 122u8, 250u8, 200u8, 20u8, 122u8, 95u8,
+                            221u8, 185u8, 101u8, 246u8, 109u8, 160u8, 56u8, 205u8, 147u8, 248u8,
+                            58u8, 242u8, 124u8, 168u8, 231u8, 222u8, 122u8, 32u8, 94u8, 68u8, 71u8,
+                            171u8,
                         ],
                     )
                 }
@@ -933,9 +929,9 @@ pub mod api {
                         "query_call_fee_details",
                         types::QueryCallFeeDetails { call, len },
                         [
-                            252u8, 63u8, 199u8, 84u8, 172u8, 129u8, 3u8, 145u8, 182u8, 63u8, 195u8,
-                            54u8, 199u8, 11u8, 115u8, 105u8, 253u8, 211u8, 194u8, 17u8, 185u8,
-                            240u8, 94u8, 51u8, 59u8, 204u8, 42u8, 4u8, 217u8, 110u8, 85u8, 79u8,
+                            143u8, 113u8, 189u8, 249u8, 202u8, 30u8, 0u8, 75u8, 110u8, 169u8,
+                            125u8, 17u8, 6u8, 16u8, 146u8, 89u8, 42u8, 145u8, 73u8, 83u8, 186u8,
+                            112u8, 154u8, 176u8, 74u8, 226u8, 47u8, 18u8, 254u8, 50u8, 59u8, 77u8,
                         ],
                     )
                 }
@@ -1081,88 +1077,6 @@ pub mod api {
                 }
             }
         }
-        pub mod genesis_builder {
-            use super::root_mod;
-            use super::runtime_types;
-            #[doc = " API to interact with GenesisConfig for the runtime"]
-            pub struct GenesisBuilder;
-            impl GenesisBuilder {
-                #[doc = " Creates the default `GenesisConfig` and returns it as a JSON blob."]
-                #[doc = ""]
-                #[doc = " This function instantiates the default `GenesisConfig` struct for the runtime and serializes it into a JSON"]
-                #[doc = " blob. It returns a `Vec<u8>` containing the JSON representation of the default `GenesisConfig`."]
-                pub fn create_default_config(
-                    &self,
-                ) -> ::subxt::runtime_api::Payload<
-                    types::CreateDefaultConfig,
-                    ::std::vec::Vec<::core::primitive::u8>,
-                > {
-                    ::subxt::runtime_api::Payload::new_static(
-                        "GenesisBuilder",
-                        "create_default_config",
-                        types::CreateDefaultConfig {},
-                        [
-                            238u8, 5u8, 139u8, 81u8, 184u8, 155u8, 221u8, 118u8, 190u8, 76u8,
-                            229u8, 67u8, 132u8, 89u8, 83u8, 80u8, 56u8, 171u8, 169u8, 64u8, 123u8,
-                            20u8, 129u8, 159u8, 28u8, 135u8, 84u8, 52u8, 192u8, 98u8, 104u8, 214u8,
-                        ],
-                    )
-                }
-                #[doc = " Build `GenesisConfig` from a JSON blob not using any defaults and store it in the storage."]
-                #[doc = ""]
-                #[doc = " This function deserializes the full `GenesisConfig` from the given JSON blob and puts it into the storage."]
-                #[doc = " If the provided JSON blob is incorrect or incomplete or the deserialization fails, an error is returned."]
-                #[doc = " It is recommended to log any errors encountered during the process."]
-                #[doc = ""]
-                #[doc = " Please note that provided json blob must contain all `GenesisConfig` fields, no defaults will be used."]
-                pub fn build_config(
-                    &self,
-                    json: ::std::vec::Vec<::core::primitive::u8>,
-                ) -> ::subxt::runtime_api::Payload<
-                    types::BuildConfig,
-                    ::core::result::Result<(), ::std::string::String>,
-                > {
-                    ::subxt::runtime_api::Payload::new_static(
-                        "GenesisBuilder",
-                        "build_config",
-                        types::BuildConfig { json },
-                        [
-                            6u8, 98u8, 68u8, 125u8, 157u8, 26u8, 107u8, 86u8, 213u8, 227u8, 26u8,
-                            229u8, 122u8, 161u8, 229u8, 114u8, 123u8, 192u8, 66u8, 231u8, 148u8,
-                            175u8, 5u8, 185u8, 248u8, 88u8, 40u8, 122u8, 230u8, 209u8, 170u8,
-                            254u8,
-                        ],
-                    )
-                }
-            }
-            pub mod types {
-                use super::runtime_types;
-                #[derive(
-                    :: subxt :: ext :: codec :: Decode,
-                    :: subxt :: ext :: codec :: Encode,
-                    :: subxt :: ext :: scale_decode :: DecodeAsType,
-                    :: subxt :: ext :: scale_encode :: EncodeAsType,
-                    Debug,
-                )]
-                # [codec (crate = :: subxt :: ext :: codec)]
-                #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-                #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
-                pub struct CreateDefaultConfig {}
-                #[derive(
-                    :: subxt :: ext :: codec :: Decode,
-                    :: subxt :: ext :: codec :: Encode,
-                    :: subxt :: ext :: scale_decode :: DecodeAsType,
-                    :: subxt :: ext :: scale_encode :: EncodeAsType,
-                    Debug,
-                )]
-                # [codec (crate = :: subxt :: ext :: codec)]
-                #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-                #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
-                pub struct BuildConfig {
-                    pub json: ::std::vec::Vec<::core::primitive::u8>,
-                }
-            }
-        }
     }
     pub fn custom() -> CustomValuesApi {
         CustomValuesApi
@@ -1183,8 +1097,8 @@ pub mod api {
         pub fn transaction_payment(&self) -> transaction_payment::constants::ConstantsApi {
             transaction_payment::constants::ConstantsApi
         }
-        pub fn blobs(&self) -> blobs::constants::ConstantsApi {
-            blobs::constants::ConstantsApi
+        pub fn blob(&self) -> blob::constants::ConstantsApi {
+            blob::constants::ConstantsApi
         }
     }
     pub struct StorageApi;
@@ -1207,9 +1121,6 @@ pub mod api {
         pub fn transaction_payment(&self) -> transaction_payment::storage::StorageApi {
             transaction_payment::storage::StorageApi
         }
-        pub fn sudo(&self) -> sudo::storage::StorageApi {
-            sudo::storage::StorageApi
-        }
         pub fn authorship(&self) -> authorship::storage::StorageApi {
             authorship::storage::StorageApi
         }
@@ -1234,8 +1145,8 @@ pub mod api {
         pub fn dmp_queue(&self) -> dmp_queue::storage::StorageApi {
             dmp_queue::storage::StorageApi
         }
-        pub fn blobs(&self) -> blobs::storage::StorageApi {
-            blobs::storage::StorageApi
+        pub fn blob(&self) -> blob::storage::StorageApi {
+            blob::storage::StorageApi
         }
     }
     pub struct TransactionApi;
@@ -1255,9 +1166,6 @@ pub mod api {
         pub fn balances(&self) -> balances::calls::TransactionApi {
             balances::calls::TransactionApi
         }
-        pub fn sudo(&self) -> sudo::calls::TransactionApi {
-            sudo::calls::TransactionApi
-        }
         pub fn collator_selection(&self) -> collator_selection::calls::TransactionApi {
             collator_selection::calls::TransactionApi
         }
@@ -1276,8 +1184,8 @@ pub mod api {
         pub fn dmp_queue(&self) -> dmp_queue::calls::TransactionApi {
             dmp_queue::calls::TransactionApi
         }
-        pub fn blobs(&self) -> blobs::calls::TransactionApi {
-            blobs::calls::TransactionApi
+        pub fn blob(&self) -> blob::calls::TransactionApi {
+            blob::calls::TransactionApi
         }
     }
     #[doc = r" check whether the metadata provided is aligned with this statically generated code."]
@@ -1289,9 +1197,9 @@ pub mod api {
             .hash();
         runtime_metadata_hash
             == [
-                171u8, 88u8, 112u8, 183u8, 206u8, 137u8, 11u8, 224u8, 109u8, 115u8, 46u8, 243u8,
-                230u8, 216u8, 249u8, 43u8, 5u8, 165u8, 58u8, 252u8, 111u8, 64u8, 31u8, 156u8, 63u8,
-                208u8, 102u8, 23u8, 126u8, 15u8, 240u8, 20u8,
+                189u8, 123u8, 252u8, 48u8, 20u8, 56u8, 6u8, 66u8, 213u8, 23u8, 37u8, 86u8, 1u8,
+                57u8, 52u8, 154u8, 140u8, 188u8, 164u8, 183u8, 237u8, 96u8, 107u8, 121u8, 49u8,
+                81u8, 63u8, 161u8, 0u8, 38u8, 112u8, 170u8,
             ]
     }
     pub mod system {
@@ -2007,9 +1915,10 @@ pub mod api {
                         "Events",
                         vec![],
                         [
-                            100u8, 160u8, 248u8, 180u8, 9u8, 17u8, 105u8, 249u8, 114u8, 61u8, 70u8,
-                            7u8, 120u8, 94u8, 199u8, 165u8, 90u8, 175u8, 104u8, 17u8, 204u8, 152u8,
-                            46u8, 4u8, 86u8, 249u8, 61u8, 159u8, 131u8, 66u8, 194u8, 8u8,
+                            31u8, 63u8, 111u8, 80u8, 134u8, 231u8, 178u8, 125u8, 47u8, 84u8, 249u8,
+                            181u8, 203u8, 48u8, 167u8, 161u8, 102u8, 41u8, 157u8, 50u8, 14u8,
+                            199u8, 151u8, 252u8, 157u8, 245u8, 102u8, 32u8, 144u8, 115u8, 171u8,
+                            205u8,
                         ],
                     )
                 }
@@ -4243,7 +4152,7 @@ pub mod api {
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
                         runtime_types::pallet_balances::types::IdAmount<
-                            runtime_types::sugondat_runtime::RuntimeHoldReason,
+                            (),
                             ::core::primitive::u128,
                         >,
                     >,
@@ -4256,9 +4165,10 @@ pub mod api {
                         "Holds",
                         vec![],
                         [
-                            37u8, 176u8, 2u8, 18u8, 109u8, 26u8, 66u8, 81u8, 28u8, 104u8, 149u8,
-                            117u8, 119u8, 114u8, 196u8, 35u8, 172u8, 155u8, 66u8, 195u8, 98u8,
-                            37u8, 134u8, 22u8, 106u8, 221u8, 215u8, 97u8, 25u8, 28u8, 21u8, 206u8,
+                            53u8, 126u8, 215u8, 237u8, 42u8, 223u8, 188u8, 150u8, 230u8, 107u8,
+                            95u8, 24u8, 26u8, 235u8, 158u8, 149u8, 193u8, 191u8, 10u8, 194u8,
+                            231u8, 59u8, 35u8, 167u8, 186u8, 89u8, 43u8, 126u8, 215u8, 117u8, 1u8,
+                            202u8,
                         ],
                     )
                 }
@@ -4270,7 +4180,7 @@ pub mod api {
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
                         runtime_types::pallet_balances::types::IdAmount<
-                            runtime_types::sugondat_runtime::RuntimeHoldReason,
+                            (),
                             ::core::primitive::u128,
                         >,
                     >,
@@ -4285,9 +4195,10 @@ pub mod api {
                             _0.borrow(),
                         )],
                         [
-                            37u8, 176u8, 2u8, 18u8, 109u8, 26u8, 66u8, 81u8, 28u8, 104u8, 149u8,
-                            117u8, 119u8, 114u8, 196u8, 35u8, 172u8, 155u8, 66u8, 195u8, 98u8,
-                            37u8, 134u8, 22u8, 106u8, 221u8, 215u8, 97u8, 25u8, 28u8, 21u8, 206u8,
+                            53u8, 126u8, 215u8, 237u8, 42u8, 223u8, 188u8, 150u8, 230u8, 107u8,
+                            95u8, 24u8, 26u8, 235u8, 158u8, 149u8, 193u8, 191u8, 10u8, 194u8,
+                            231u8, 59u8, 35u8, 167u8, 186u8, 89u8, 43u8, 126u8, 215u8, 117u8, 1u8,
+                            202u8,
                         ],
                     )
                 }
@@ -4548,258 +4459,6 @@ pub mod api {
             }
         }
     }
-    pub mod sudo {
-        use super::root_mod;
-        use super::runtime_types;
-        #[doc = "Error for the Sudo pallet"]
-        pub type Error = runtime_types::pallet_sudo::pallet::Error;
-        #[doc = "Contains a variant per dispatchable extrinsic that this pallet has."]
-        pub type Call = runtime_types::pallet_sudo::pallet::Call;
-        pub mod calls {
-            use super::root_mod;
-            use super::runtime_types;
-            type DispatchError = runtime_types::sp_runtime::DispatchError;
-            pub mod types {
-                use super::runtime_types;
-                #[derive(
-                    :: subxt :: ext :: codec :: Decode,
-                    :: subxt :: ext :: codec :: Encode,
-                    :: subxt :: ext :: scale_decode :: DecodeAsType,
-                    :: subxt :: ext :: scale_encode :: EncodeAsType,
-                    Debug,
-                )]
-                # [codec (crate = :: subxt :: ext :: codec)]
-                #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-                #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
-                pub struct Sudo {
-                    pub call: ::std::boxed::Box<runtime_types::sugondat_runtime::RuntimeCall>,
-                }
-                impl ::subxt::blocks::StaticExtrinsic for Sudo {
-                    const PALLET: &'static str = "Sudo";
-                    const CALL: &'static str = "sudo";
-                }
-                #[derive(
-                    :: subxt :: ext :: codec :: Decode,
-                    :: subxt :: ext :: codec :: Encode,
-                    :: subxt :: ext :: scale_decode :: DecodeAsType,
-                    :: subxt :: ext :: scale_encode :: EncodeAsType,
-                    Debug,
-                )]
-                # [codec (crate = :: subxt :: ext :: codec)]
-                #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-                #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
-                pub struct SudoUncheckedWeight {
-                    pub call: ::std::boxed::Box<runtime_types::sugondat_runtime::RuntimeCall>,
-                    pub weight: runtime_types::sp_weights::weight_v2::Weight,
-                }
-                impl ::subxt::blocks::StaticExtrinsic for SudoUncheckedWeight {
-                    const PALLET: &'static str = "Sudo";
-                    const CALL: &'static str = "sudo_unchecked_weight";
-                }
-                #[derive(
-                    :: subxt :: ext :: codec :: Decode,
-                    :: subxt :: ext :: codec :: Encode,
-                    :: subxt :: ext :: scale_decode :: DecodeAsType,
-                    :: subxt :: ext :: scale_encode :: EncodeAsType,
-                    Debug,
-                )]
-                # [codec (crate = :: subxt :: ext :: codec)]
-                #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-                #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
-                pub struct SetKey {
-                    pub new: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>,
-                }
-                impl ::subxt::blocks::StaticExtrinsic for SetKey {
-                    const PALLET: &'static str = "Sudo";
-                    const CALL: &'static str = "set_key";
-                }
-                #[derive(
-                    :: subxt :: ext :: codec :: Decode,
-                    :: subxt :: ext :: codec :: Encode,
-                    :: subxt :: ext :: scale_decode :: DecodeAsType,
-                    :: subxt :: ext :: scale_encode :: EncodeAsType,
-                    Debug,
-                )]
-                # [codec (crate = :: subxt :: ext :: codec)]
-                #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-                #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
-                pub struct SudoAs {
-                    pub who: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>,
-                    pub call: ::std::boxed::Box<runtime_types::sugondat_runtime::RuntimeCall>,
-                }
-                impl ::subxt::blocks::StaticExtrinsic for SudoAs {
-                    const PALLET: &'static str = "Sudo";
-                    const CALL: &'static str = "sudo_as";
-                }
-            }
-            pub struct TransactionApi;
-            impl TransactionApi {
-                #[doc = "See [`Pallet::sudo`]."]
-                pub fn sudo(
-                    &self,
-                    call: runtime_types::sugondat_runtime::RuntimeCall,
-                ) -> ::subxt::tx::Payload<types::Sudo> {
-                    ::subxt::tx::Payload::new_static(
-                        "Sudo",
-                        "sudo",
-                        types::Sudo {
-                            call: ::std::boxed::Box::new(call),
-                        },
-                        [
-                            123u8, 120u8, 12u8, 40u8, 0u8, 86u8, 237u8, 179u8, 58u8, 209u8, 66u8,
-                            38u8, 135u8, 123u8, 159u8, 165u8, 145u8, 78u8, 187u8, 242u8, 157u8,
-                            131u8, 43u8, 67u8, 236u8, 174u8, 100u8, 213u8, 32u8, 0u8, 190u8, 115u8,
-                        ],
-                    )
-                }
-                #[doc = "See [`Pallet::sudo_unchecked_weight`]."]
-                pub fn sudo_unchecked_weight(
-                    &self,
-                    call: runtime_types::sugondat_runtime::RuntimeCall,
-                    weight: runtime_types::sp_weights::weight_v2::Weight,
-                ) -> ::subxt::tx::Payload<types::SudoUncheckedWeight> {
-                    ::subxt::tx::Payload::new_static(
-                        "Sudo",
-                        "sudo_unchecked_weight",
-                        types::SudoUncheckedWeight {
-                            call: ::std::boxed::Box::new(call),
-                            weight,
-                        },
-                        [
-                            5u8, 184u8, 122u8, 118u8, 226u8, 106u8, 218u8, 88u8, 115u8, 34u8,
-                            186u8, 205u8, 164u8, 178u8, 249u8, 153u8, 133u8, 140u8, 173u8, 171u8,
-                            15u8, 220u8, 142u8, 35u8, 109u8, 96u8, 140u8, 138u8, 29u8, 224u8,
-                            116u8, 67u8,
-                        ],
-                    )
-                }
-                #[doc = "See [`Pallet::set_key`]."]
-                pub fn set_key(
-                    &self,
-                    new: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>,
-                ) -> ::subxt::tx::Payload<types::SetKey> {
-                    ::subxt::tx::Payload::new_static(
-                        "Sudo",
-                        "set_key",
-                        types::SetKey { new },
-                        [
-                            9u8, 73u8, 39u8, 205u8, 188u8, 127u8, 143u8, 54u8, 128u8, 94u8, 8u8,
-                            227u8, 197u8, 44u8, 70u8, 93u8, 228u8, 196u8, 64u8, 165u8, 226u8,
-                            158u8, 101u8, 192u8, 22u8, 193u8, 102u8, 84u8, 21u8, 35u8, 92u8, 198u8,
-                        ],
-                    )
-                }
-                #[doc = "See [`Pallet::sudo_as`]."]
-                pub fn sudo_as(
-                    &self,
-                    who: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>,
-                    call: runtime_types::sugondat_runtime::RuntimeCall,
-                ) -> ::subxt::tx::Payload<types::SudoAs> {
-                    ::subxt::tx::Payload::new_static(
-                        "Sudo",
-                        "sudo_as",
-                        types::SudoAs {
-                            who,
-                            call: ::std::boxed::Box::new(call),
-                        },
-                        [
-                            82u8, 14u8, 134u8, 229u8, 142u8, 183u8, 64u8, 127u8, 103u8, 146u8,
-                            205u8, 73u8, 183u8, 15u8, 172u8, 24u8, 150u8, 0u8, 47u8, 189u8, 114u8,
-                            71u8, 203u8, 58u8, 47u8, 243u8, 44u8, 33u8, 61u8, 20u8, 145u8, 104u8,
-                        ],
-                    )
-                }
-            }
-        }
-        #[doc = "The `Event` enum of this pallet"]
-        pub type Event = runtime_types::pallet_sudo::pallet::Event;
-        pub mod events {
-            use super::runtime_types;
-            #[derive(
-                :: subxt :: ext :: codec :: Decode,
-                :: subxt :: ext :: codec :: Encode,
-                :: subxt :: ext :: scale_decode :: DecodeAsType,
-                :: subxt :: ext :: scale_encode :: EncodeAsType,
-                Debug,
-            )]
-            # [codec (crate = :: subxt :: ext :: codec)]
-            #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-            #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
-            #[doc = "A sudo call just took place."]
-            pub struct Sudid {
-                pub sudo_result:
-                    ::core::result::Result<(), runtime_types::sp_runtime::DispatchError>,
-            }
-            impl ::subxt::events::StaticEvent for Sudid {
-                const PALLET: &'static str = "Sudo";
-                const EVENT: &'static str = "Sudid";
-            }
-            #[derive(
-                :: subxt :: ext :: codec :: Decode,
-                :: subxt :: ext :: codec :: Encode,
-                :: subxt :: ext :: scale_decode :: DecodeAsType,
-                :: subxt :: ext :: scale_encode :: EncodeAsType,
-                Debug,
-            )]
-            # [codec (crate = :: subxt :: ext :: codec)]
-            #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-            #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
-            #[doc = "The sudo key has been updated."]
-            pub struct KeyChanged {
-                pub old_sudoer: ::core::option::Option<::subxt::utils::AccountId32>,
-            }
-            impl ::subxt::events::StaticEvent for KeyChanged {
-                const PALLET: &'static str = "Sudo";
-                const EVENT: &'static str = "KeyChanged";
-            }
-            #[derive(
-                :: subxt :: ext :: codec :: Decode,
-                :: subxt :: ext :: codec :: Encode,
-                :: subxt :: ext :: scale_decode :: DecodeAsType,
-                :: subxt :: ext :: scale_encode :: EncodeAsType,
-                Debug,
-            )]
-            # [codec (crate = :: subxt :: ext :: codec)]
-            #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-            #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
-            #[doc = "A [sudo_as](Pallet::sudo_as) call just took place."]
-            pub struct SudoAsDone {
-                pub sudo_result:
-                    ::core::result::Result<(), runtime_types::sp_runtime::DispatchError>,
-            }
-            impl ::subxt::events::StaticEvent for SudoAsDone {
-                const PALLET: &'static str = "Sudo";
-                const EVENT: &'static str = "SudoAsDone";
-            }
-        }
-        pub mod storage {
-            use super::runtime_types;
-            pub struct StorageApi;
-            impl StorageApi {
-                #[doc = " The `AccountId` of the sudo key."]
-                pub fn key(
-                    &self,
-                ) -> ::subxt::storage::address::Address<
-                    ::subxt::storage::address::StaticStorageMapKey,
-                    ::subxt::utils::AccountId32,
-                    ::subxt::storage::address::Yes,
-                    (),
-                    (),
-                > {
-                    ::subxt::storage::address::Address::new_static(
-                        "Sudo",
-                        "Key",
-                        vec![],
-                        [
-                            72u8, 14u8, 225u8, 162u8, 205u8, 247u8, 227u8, 105u8, 116u8, 57u8, 4u8,
-                            31u8, 84u8, 137u8, 227u8, 228u8, 133u8, 245u8, 206u8, 227u8, 117u8,
-                            36u8, 252u8, 151u8, 107u8, 15u8, 180u8, 4u8, 4u8, 152u8, 195u8, 144u8,
-                        ],
-                    )
-                }
-            }
-        }
-    }
     pub mod authorship {
         use super::root_mod;
         use super::runtime_types;
@@ -8724,13 +8383,13 @@ pub mod api {
             }
         }
     }
-    pub mod blobs {
+    pub mod blob {
         use super::root_mod;
         use super::runtime_types;
         #[doc = "The `Error` enum of this pallet."]
-        pub type Error = runtime_types::pallet_sugondat_blobs::pallet::Error;
+        pub type Error = runtime_types::pallet_sugondat_blob::pallet::Error;
         #[doc = "Contains a variant per dispatchable extrinsic that this pallet has."]
-        pub type Call = runtime_types::pallet_sugondat_blobs::pallet::Call;
+        pub type Call = runtime_types::pallet_sugondat_blob::pallet::Call;
         pub mod calls {
             use super::root_mod;
             use super::runtime_types;
@@ -8754,7 +8413,7 @@ pub mod api {
                     >,
                 }
                 impl ::subxt::blocks::StaticExtrinsic for SubmitBlob {
-                    const PALLET: &'static str = "Blobs";
+                    const PALLET: &'static str = "Blob";
                     const CALL: &'static str = "submit_blob";
                 }
             }
@@ -8769,7 +8428,7 @@ pub mod api {
                     >,
                 ) -> ::subxt::tx::Payload<types::SubmitBlob> {
                     ::subxt::tx::Payload::new_static(
-                        "Blobs",
+                        "Blob",
                         "submit_blob",
                         types::SubmitBlob { namespace_id, blob },
                         [
@@ -8782,7 +8441,7 @@ pub mod api {
             }
         }
         #[doc = "The `Event` enum of this pallet"]
-        pub type Event = runtime_types::pallet_sugondat_blobs::pallet::Event;
+        pub type Event = runtime_types::pallet_sugondat_blob::pallet::Event;
         pub mod events {
             use super::runtime_types;
             #[derive(
@@ -8804,7 +8463,7 @@ pub mod api {
                 pub blob_hash: [::core::primitive::u8; 32usize],
             }
             impl ::subxt::events::StaticEvent for BlobStored {
-                const PALLET: &'static str = "Blobs";
+                const PALLET: &'static str = "Blob";
                 const EVENT: &'static str = "BlobStored";
             }
         }
@@ -8823,7 +8482,7 @@ pub mod api {
                     (),
                 > {
                     ::subxt::storage::address::Address::new_static(
-                        "Blobs",
+                        "Blob",
                         "TotalBlobsSize",
                         vec![],
                         [
@@ -8839,7 +8498,7 @@ pub mod api {
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
-                        runtime_types::pallet_sugondat_blobs::pallet::SubmittedBlobMetadata<
+                        runtime_types::pallet_sugondat_blob::pallet::SubmittedBlobMetadata<
                             ::subxt::utils::AccountId32,
                         >,
                     >,
@@ -8848,7 +8507,7 @@ pub mod api {
                     (),
                 > {
                     ::subxt::storage::address::Address::new_static(
-                        "Blobs",
+                        "Blob",
                         "BlobList",
                         vec![],
                         [
@@ -8868,7 +8527,7 @@ pub mod api {
                 #[doc = " The maximum number of blobs per block."]
                 pub fn max_blobs(&self) -> ::subxt::constants::Address<::core::primitive::u32> {
                     ::subxt::constants::Address::new_static(
-                        "Blobs",
+                        "Blob",
                         "MaxBlobs",
                         [
                             98u8, 252u8, 116u8, 72u8, 26u8, 180u8, 225u8, 83u8, 200u8, 157u8,
@@ -8881,7 +8540,7 @@ pub mod api {
                 #[doc = " The maximum number of bytes in a blob."]
                 pub fn max_blob_size(&self) -> ::subxt::constants::Address<::core::primitive::u32> {
                     ::subxt::constants::Address::new_static(
-                        "Blobs",
+                        "Blob",
                         "MaxBlobSize",
                         [
                             98u8, 252u8, 116u8, 72u8, 26u8, 180u8, 225u8, 83u8, 200u8, 157u8,
@@ -8896,7 +8555,7 @@ pub mod api {
                     &self,
                 ) -> ::subxt::constants::Address<::core::primitive::u32> {
                     ::subxt::constants::Address::new_static(
-                        "Blobs",
+                        "Blob",
                         "MaxTotalBlobSize",
                         [
                             98u8, 252u8, 116u8, 72u8, 26u8, 180u8, 225u8, 83u8, 200u8, 157u8,
@@ -10632,94 +10291,7 @@ pub mod api {
                 }
             }
         }
-        pub mod pallet_sudo {
-            use super::runtime_types;
-            pub mod pallet {
-                use super::runtime_types;
-                #[derive(
-                    :: subxt :: ext :: codec :: Decode,
-                    :: subxt :: ext :: codec :: Encode,
-                    :: subxt :: ext :: scale_decode :: DecodeAsType,
-                    :: subxt :: ext :: scale_encode :: EncodeAsType,
-                    Debug,
-                )]
-                # [codec (crate = :: subxt :: ext :: codec)]
-                #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-                #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
-                #[doc = "Contains a variant per dispatchable extrinsic that this pallet has."]
-                pub enum Call {
-                    #[codec(index = 0)]
-                    #[doc = "See [`Pallet::sudo`]."]
-                    sudo {
-                        call: ::std::boxed::Box<runtime_types::sugondat_runtime::RuntimeCall>,
-                    },
-                    #[codec(index = 1)]
-                    #[doc = "See [`Pallet::sudo_unchecked_weight`]."]
-                    sudo_unchecked_weight {
-                        call: ::std::boxed::Box<runtime_types::sugondat_runtime::RuntimeCall>,
-                        weight: runtime_types::sp_weights::weight_v2::Weight,
-                    },
-                    #[codec(index = 2)]
-                    #[doc = "See [`Pallet::set_key`]."]
-                    set_key {
-                        new: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>,
-                    },
-                    #[codec(index = 3)]
-                    #[doc = "See [`Pallet::sudo_as`]."]
-                    sudo_as {
-                        who: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>,
-                        call: ::std::boxed::Box<runtime_types::sugondat_runtime::RuntimeCall>,
-                    },
-                }
-                #[derive(
-                    :: subxt :: ext :: codec :: Decode,
-                    :: subxt :: ext :: codec :: Encode,
-                    :: subxt :: ext :: scale_decode :: DecodeAsType,
-                    :: subxt :: ext :: scale_encode :: EncodeAsType,
-                    Debug,
-                )]
-                # [codec (crate = :: subxt :: ext :: codec)]
-                #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-                #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
-                #[doc = "Error for the Sudo pallet"]
-                pub enum Error {
-                    #[codec(index = 0)]
-                    #[doc = "Sender must be the Sudo account"]
-                    RequireSudo,
-                }
-                #[derive(
-                    :: subxt :: ext :: codec :: Decode,
-                    :: subxt :: ext :: codec :: Encode,
-                    :: subxt :: ext :: scale_decode :: DecodeAsType,
-                    :: subxt :: ext :: scale_encode :: EncodeAsType,
-                    Debug,
-                )]
-                # [codec (crate = :: subxt :: ext :: codec)]
-                #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-                #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
-                #[doc = "The `Event` enum of this pallet"]
-                pub enum Event {
-                    #[codec(index = 0)]
-                    #[doc = "A sudo call just took place."]
-                    Sudid {
-                        sudo_result:
-                            ::core::result::Result<(), runtime_types::sp_runtime::DispatchError>,
-                    },
-                    #[codec(index = 1)]
-                    #[doc = "The sudo key has been updated."]
-                    KeyChanged {
-                        old_sudoer: ::core::option::Option<::subxt::utils::AccountId32>,
-                    },
-                    #[codec(index = 2)]
-                    #[doc = "A [sudo_as](Pallet::sudo_as) call just took place."]
-                    SudoAsDone {
-                        sudo_result:
-                            ::core::result::Result<(), runtime_types::sp_runtime::DispatchError>,
-                    },
-                }
-            }
-        }
-        pub mod pallet_sugondat_blobs {
+        pub mod pallet_sugondat_blob {
             use super::runtime_types;
             pub mod pallet {
                 use super::runtime_types;
@@ -14832,8 +14404,6 @@ pub mod api {
                 ParachainInfo(runtime_types::parachain_info::pallet::Call),
                 #[codec(index = 10)]
                 Balances(runtime_types::pallet_balances::pallet::Call),
-                #[codec(index = 15)]
-                Sudo(runtime_types::pallet_sudo::pallet::Call),
                 #[codec(index = 21)]
                 CollatorSelection(runtime_types::pallet_collator_selection::pallet::Call),
                 #[codec(index = 22)]
@@ -14847,7 +14417,7 @@ pub mod api {
                 #[codec(index = 33)]
                 DmpQueue(runtime_types::cumulus_pallet_dmp_queue::pallet::Call),
                 #[codec(index = 40)]
-                Blobs(runtime_types::pallet_sugondat_blobs::pallet::Call),
+                Blob(runtime_types::pallet_sugondat_blob::pallet::Call),
             }
             #[derive(
                 :: subxt :: ext :: codec :: Decode,
@@ -14866,8 +14436,6 @@ pub mod api {
                 ParachainSystem(runtime_types::cumulus_pallet_parachain_system::pallet::Error),
                 #[codec(index = 10)]
                 Balances(runtime_types::pallet_balances::pallet::Error),
-                #[codec(index = 15)]
-                Sudo(runtime_types::pallet_sudo::pallet::Error),
                 #[codec(index = 21)]
                 CollatorSelection(runtime_types::pallet_collator_selection::pallet::Error),
                 #[codec(index = 22)]
@@ -14881,7 +14449,7 @@ pub mod api {
                 #[codec(index = 33)]
                 DmpQueue(runtime_types::cumulus_pallet_dmp_queue::pallet::Error),
                 #[codec(index = 40)]
-                Blobs(runtime_types::pallet_sugondat_blobs::pallet::Error),
+                Blob(runtime_types::pallet_sugondat_blob::pallet::Error),
             }
             #[derive(
                 :: subxt :: ext :: codec :: Decode,
@@ -14902,8 +14470,6 @@ pub mod api {
                 Balances(runtime_types::pallet_balances::pallet::Event),
                 #[codec(index = 11)]
                 TransactionPayment(runtime_types::pallet_transaction_payment::pallet::Event),
-                #[codec(index = 15)]
-                Sudo(runtime_types::pallet_sudo::pallet::Event),
                 #[codec(index = 21)]
                 CollatorSelection(runtime_types::pallet_collator_selection::pallet::Event),
                 #[codec(index = 22)]
@@ -14917,7 +14483,7 @@ pub mod api {
                 #[codec(index = 33)]
                 DmpQueue(runtime_types::cumulus_pallet_dmp_queue::pallet::Event),
                 #[codec(index = 40)]
-                Blobs(runtime_types::pallet_sugondat_blobs::pallet::Event),
+                Blob(runtime_types::pallet_sugondat_blob::pallet::Event),
             }
             #[derive(
                 :: subxt :: ext :: codec :: Decode,
@@ -14929,17 +14495,6 @@ pub mod api {
             # [codec (crate = :: subxt :: ext :: codec)]
             #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
             #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
-            pub enum RuntimeHoldReason {}
-            #[derive(
-                :: subxt :: ext :: codec :: Decode,
-                :: subxt :: ext :: codec :: Encode,
-                :: subxt :: ext :: scale_decode :: DecodeAsType,
-                :: subxt :: ext :: scale_encode :: EncodeAsType,
-                Debug,
-            )]
-            # [codec (crate = :: subxt :: ext :: codec)]
-            #[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-            #[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
             pub struct SessionKeys {
                 pub aura: runtime_types::sp_consensus_aura::sr25519::app_sr25519::Public,
             }

From 46daa056e6825103508bb86fab6a2c6b89c9f4c9 Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <s.pepyakin@gmail.com>
Date: Mon, 20 Nov 2023 17:24:24 +0100
Subject: [PATCH 2/5] sugondat-shim: add sugondat shim

---
 Cargo.lock                                | 174 +++++++++++++++++++-
 Cargo.toml                                |   2 +
 sugondat-shim/Cargo.toml                  |  23 +++
 sugondat-shim/common/sovereign/Cargo.toml |  17 ++
 sugondat-shim/common/sovereign/src/lib.rs |  42 +++++
 sugondat-shim/src/adapters/mod.rs         |   1 +
 sugondat-shim/src/adapters/sovereign.rs   |  77 +++++++++
 sugondat-shim/src/cli.rs                  |  70 ++++++++
 sugondat-shim/src/main.rs                 |   9 +
 sugondat-shim/src/serve.rs                |  43 +++++
 sugondat-shim/src/sugondat_rpc.rs         | 190 ++++++++++++++++++++++
 11 files changed, 640 insertions(+), 8 deletions(-)
 create mode 100644 sugondat-shim/Cargo.toml
 create mode 100644 sugondat-shim/common/sovereign/Cargo.toml
 create mode 100644 sugondat-shim/common/sovereign/src/lib.rs
 create mode 100644 sugondat-shim/src/adapters/mod.rs
 create mode 100644 sugondat-shim/src/adapters/sovereign.rs
 create mode 100644 sugondat-shim/src/cli.rs
 create mode 100644 sugondat-shim/src/main.rs
 create mode 100644 sugondat-shim/src/serve.rs
 create mode 100644 sugondat-shim/src/sugondat_rpc.rs

diff --git a/Cargo.lock b/Cargo.lock
index e78d095a..8b34bb68 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1469,6 +1469,7 @@ dependencies = [
  "anstyle",
  "clap_lex",
  "strsim",
+ "terminal_size",
 ]
 
 [[package]]
@@ -4697,10 +4698,10 @@ checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b"
 dependencies = [
  "jsonrpsee-core 0.16.3",
  "jsonrpsee-http-client 0.16.3",
- "jsonrpsee-proc-macros",
- "jsonrpsee-server",
+ "jsonrpsee-proc-macros 0.16.3",
+ "jsonrpsee-server 0.16.3",
  "jsonrpsee-types 0.16.3",
- "jsonrpsee-ws-client",
+ "jsonrpsee-ws-client 0.16.3",
  "tracing",
 ]
 
@@ -4713,7 +4714,12 @@ dependencies = [
  "jsonrpsee-client-transport 0.20.3",
  "jsonrpsee-core 0.20.3",
  "jsonrpsee-http-client 0.20.3",
+ "jsonrpsee-proc-macros 0.20.3",
+ "jsonrpsee-server 0.20.3",
  "jsonrpsee-types 0.20.3",
+ "jsonrpsee-ws-client 0.20.3",
+ "tokio",
+ "tracing",
 ]
 
 [[package]]
@@ -4799,9 +4805,12 @@ dependencies = [
  "futures-util",
  "hyper",
  "jsonrpsee-types 0.20.3",
+ "parking_lot 0.12.1",
+ "rand 0.8.5",
  "rustc-hash",
  "serde",
  "serde_json",
+ "soketto",
  "thiserror",
  "tokio",
  "tracing",
@@ -4859,6 +4868,19 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "jsonrpsee-proc-macros"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515"
+dependencies = [
+ "heck",
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "jsonrpsee-server"
 version = "0.16.3"
@@ -4881,6 +4903,29 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "jsonrpsee-server"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "jsonrpsee-core 0.20.3",
+ "jsonrpsee-types 0.20.3",
+ "route-recognizer",
+ "serde",
+ "serde_json",
+ "soketto",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "tower",
+ "tracing",
+]
+
 [[package]]
 name = "jsonrpsee-types"
 version = "0.16.3"
@@ -4921,6 +4966,19 @@ dependencies = [
  "jsonrpsee-types 0.16.3",
 ]
 
+[[package]]
+name = "jsonrpsee-ws-client"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0"
+dependencies = [
+ "http",
+ "jsonrpsee-client-transport 0.20.3",
+ "jsonrpsee-core 0.20.3",
+ "jsonrpsee-types 0.20.3",
+ "url",
+]
+
 [[package]]
 name = "k256"
 version = "0.13.2"
@@ -5734,6 +5792,15 @@ dependencies = [
  "regex-automata 0.1.10",
 ]
 
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
 [[package]]
 name = "matches"
 version = "0.1.10"
@@ -6188,6 +6255,16 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.4"
@@ -6377,6 +6454,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "p256"
 version = "0.11.1"
@@ -9721,6 +9804,12 @@ dependencies = [
  "sp-weights",
 ]
 
+[[package]]
+name = "route-recognizer"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746"
+
 [[package]]
 name = "rpassword"
 version = "7.3.1"
@@ -11008,8 +11097,8 @@ dependencies = [
  "sp-tracing",
  "thiserror",
  "tracing",
- "tracing-log",
- "tracing-subscriber",
+ "tracing-log 0.1.4",
+ "tracing-subscriber 0.2.25",
 ]
 
 [[package]]
@@ -12547,7 +12636,7 @@ dependencies = [
  "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.2.0)",
  "tracing",
  "tracing-core",
- "tracing-subscriber",
+ "tracing-subscriber 0.2.25",
 ]
 
 [[package]]
@@ -13375,6 +13464,36 @@ dependencies = [
  "sugondat-primitives",
 ]
 
+[[package]]
+name = "sugondat-shim"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "clap",
+ "futures",
+ "jsonrpsee 0.20.3",
+ "sha2 0.10.8",
+ "subxt",
+ "subxt-signer",
+ "sugondat-nmt",
+ "sugondat-shim-common-sovereign",
+ "sugondat-subxt",
+ "tokio",
+ "tracing",
+ "tracing-subscriber 0.3.18",
+]
+
+[[package]]
+name = "sugondat-shim-common-sovereign"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "jsonrpsee 0.20.3",
+ "serde",
+ "sugondat-nmt",
+]
+
 [[package]]
 name = "sugondat-submit-blob"
 version = "0.1.0"
@@ -13483,6 +13602,16 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "terminal_size"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+dependencies = [
+ "rustix 0.38.24",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "termtree"
 version = "0.4.1"
@@ -13914,6 +14043,17 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
 [[package]]
 name = "tracing-serde"
 version = "0.1.3"
@@ -13933,7 +14073,7 @@ dependencies = [
  "ansi_term",
  "chrono",
  "lazy_static",
- "matchers",
+ "matchers 0.0.1",
  "parking_lot 0.11.2",
  "regex",
  "serde",
@@ -13943,10 +14083,28 @@ dependencies = [
  "thread_local",
  "tracing",
  "tracing-core",
- "tracing-log",
+ "tracing-log 0.1.4",
  "tracing-serde",
 ]
 
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "matchers 0.1.0",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log 0.2.0",
+]
+
 [[package]]
 name = "trie-db"
 version = "0.28.0"
diff --git a/Cargo.toml b/Cargo.toml
index 52308a2a..2f62f22c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,6 +7,8 @@ members = [
     "sugondat-chain/primitives",
     "sugondat-da-adapter",
     "sugondat-nmt",
+    "sugondat-shim",
+    "sugondat-shim/common/sovereign",
     "sugondat-submit-blob",
     "sugondat-subxt"
 ]
diff --git a/sugondat-shim/Cargo.toml b/sugondat-shim/Cargo.toml
new file mode 100644
index 00000000..a888de2f
--- /dev/null
+++ b/sugondat-shim/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "sugondat-shim"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.75"
+clap = { version = "4.4.8", features = ["derive", "env", "wrap_help"] }
+futures = "0.3.29"
+jsonrpsee = { version = "0.20.3", features = ["ws-client", "server"] }
+tracing = "0.1.40"
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+tokio = { version = "1.34.0", features = ["rt-multi-thread", "macros", "net"] }
+async-trait = "0.1.74"
+subxt = { version = "0.32.1" }
+subxt-signer = {version = "0.32.1", features = ["subxt"] }
+sha2 = "0.10.8"
+
+sugondat-nmt = { path = "../sugondat-nmt", features = ["serde"] }
+sugondat-subxt = { path = "../sugondat-subxt" }
+sugondat-shim-common-sovereign = { path = "common/sovereign", features = ["server"] }
diff --git a/sugondat-shim/common/sovereign/Cargo.toml b/sugondat-shim/common/sovereign/Cargo.toml
new file mode 100644
index 00000000..b8a09112
--- /dev/null
+++ b/sugondat-shim/common/sovereign/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "sugondat-shim-common-sovereign"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-trait = "0.1.74"
+jsonrpsee = { version = "0.20.3", features = ["macros"] }
+serde = { version = "1.0.192", features = ["derive"] }
+sugondat-nmt = { path = "../../../sugondat-nmt", features = ["serde"] }
+
+[features]
+default = ["client", "server"]
+client = ["jsonrpsee/ws-client"]
+server = ["jsonrpsee/server"]
diff --git a/sugondat-shim/common/sovereign/src/lib.rs b/sugondat-shim/common/sovereign/src/lib.rs
new file mode 100644
index 00000000..5b8cbe2e
--- /dev/null
+++ b/sugondat-shim/common/sovereign/src/lib.rs
@@ -0,0 +1,42 @@
+use jsonrpsee::{proc_macros::rpc, types::ErrorObjectOwned};
+
+#[cfg(not(any(feature = "server", feature = "client")))]
+compile_error!("either feature \"server\" or \"client\" must be enabled");
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct Block {
+    // TODO: Hash should be a newtype that serializes to hex.
+    pub block_hash: [u8; 32],
+    pub prev_hash: [u8; 32],
+    pub timestamp: u64,
+    pub nmt_root: sugondat_nmt::TreeRoot,
+    pub proof: sugondat_nmt::NamespaceProof,
+    pub blobs: Vec<Blob>,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct Blob {
+    // TODO: This should be a newtype that serializes to hex.
+    pub sender: [u8; 32],
+    // TODO: This should be a newtype that serializes to hex.
+    pub data: Vec<u8>,
+}
+
+#[cfg_attr(all(feature = "client", not(feature = "server")), rpc(client))]
+#[cfg_attr(all(feature = "server", not(feature = "client")), rpc(server))]
+#[cfg_attr(all(feature = "client", feature = "server"), rpc(client, server))]
+pub trait SovereignRPC {
+    #[method(name = "sovereign_getBlock")]
+    async fn get_block(
+        &self,
+        height: u64,
+        namespace: sugondat_nmt::Namespace,
+    ) -> Result<Block, ErrorObjectOwned>;
+
+    #[method(name = "sovereign_submitBlob")]
+    async fn submit_blob(
+        &self,
+        blob: Vec<u8>,
+        namespace: sugondat_nmt::Namespace,
+    ) -> Result<(), ErrorObjectOwned>;
+}
diff --git a/sugondat-shim/src/adapters/mod.rs b/sugondat-shim/src/adapters/mod.rs
new file mode 100644
index 00000000..bce59d1d
--- /dev/null
+++ b/sugondat-shim/src/adapters/mod.rs
@@ -0,0 +1 @@
+pub mod sovereign;
diff --git a/sugondat-shim/src/adapters/sovereign.rs b/sugondat-shim/src/adapters/sovereign.rs
new file mode 100644
index 00000000..6dbcee1d
--- /dev/null
+++ b/sugondat-shim/src/adapters/sovereign.rs
@@ -0,0 +1,77 @@
+use jsonrpsee::types::ErrorObjectOwned;
+use sugondat_shim_common_sovereign::{Block, SovereignRPCServer};
+use tracing::info;
+
+use crate::sugondat_rpc;
+
+pub struct SovereignAdapter {
+    client: sugondat_rpc::Client,
+}
+
+impl SovereignAdapter {
+    pub fn new(client: sugondat_rpc::Client) -> Self {
+        Self { client }
+    }
+}
+
+#[async_trait::async_trait]
+impl SovereignRPCServer for SovereignAdapter {
+    async fn get_block(
+        &self,
+        height: u64,
+        namespace: sugondat_nmt::Namespace,
+    ) -> Result<Block, ErrorObjectOwned> {
+        info!("get_block({})", height);
+        let block_hash = self.client.wait_finalized_height(height).await.unwrap();
+        let block = self.client.get_block_at(block_hash).await.unwrap();
+        let proof = make_namespace_proof(&block, namespace);
+        let blobs = block
+            .blobs
+            .into_iter()
+            .filter(|blob| blob.namespace == namespace)
+            .map(|blob| sugondat_shim_common_sovereign::Blob {
+                sender: blob.sender,
+                data: blob.data,
+            })
+            .collect::<Vec<_>>();
+        Ok(Block {
+            block_hash,
+            prev_hash: block.parent_hash,
+            timestamp: block.timestamp,
+            nmt_root: block.tree_root,
+            proof,
+            blobs,
+        })
+    }
+
+    async fn submit_blob(
+        &self,
+        blob: Vec<u8>,
+        namespace: sugondat_nmt::Namespace,
+    ) -> Result<(), ErrorObjectOwned> {
+        info!("submit_blob({}, {:?})", blob.len(), namespace);
+        self.client.submit_blob(blob, namespace).await.unwrap();
+        Ok(())
+    }
+}
+
+/// Creates a namespace proof for the given namespace in the given block.
+fn make_namespace_proof(
+    block: &sugondat_rpc::Block,
+    namespace: sugondat_nmt::Namespace,
+) -> sugondat_nmt::NamespaceProof {
+    let mut blob_metadata = vec![];
+    for blob in &block.blobs {
+        blob_metadata.push(sugondat_nmt::BlobMetadata {
+            namespace: blob.namespace,
+            leaf: sugondat_nmt::NmtLeaf {
+                extrinsic_index: blob.extrinsic_index,
+                who: blob.sender,
+                blob_hash: blob.sha2_hash(),
+            },
+        });
+    }
+    let mut tree = sugondat_nmt::tree_from_blobs(blob_metadata);
+    let blob_proof = tree.proof(namespace);
+    blob_proof
+}
diff --git a/sugondat-shim/src/cli.rs b/sugondat-shim/src/cli.rs
new file mode 100644
index 00000000..1dc7499f
--- /dev/null
+++ b/sugondat-shim/src/cli.rs
@@ -0,0 +1,70 @@
+use crate::serve;
+use anyhow::bail;
+use clap::{Parser, Subcommand};
+use tracing_subscriber::fmt;
+use tracing_subscriber::prelude::*;
+
+#[derive(Parser, Debug)]
+#[command(author, version, about, long_about = None)]
+struct Cli {
+    #[command(subcommand)]
+    command: Commands,
+}
+
+/// Common parameters for all subcommands.
+///
+/// It's not declared on the `Cli` struct with `clap(flatten)` because of how the syntax
+/// `sugondat-shim -p 10 serve --node-url` looks unintuitive.
+#[derive(clap::Args, Debug)]
+pub struct CommonParams {
+    /// The address on which the shim should listen for incoming connections from the rollup nodes.
+    #[clap(short, long, default_value = "127.0.0.1", group = "listen")]
+    pub address: String,
+
+    /// The port on which the shim should listen for incoming connections from the rollup nodes.
+    #[clap(
+        short,
+        long,
+        env = "SUGONDAT_SHIM_PORT",
+        default_value = "10995",
+        group = "listen"
+    )]
+    pub port: u16,
+    // TODO: e.g. --submit-key, prometheus stuff, enabled adapters, etc.
+}
+
+impl CommonParams {
+    /// Whether the sovereign adapter should be enabled.
+    pub fn enable_sovereign(&self) -> bool {
+        true
+    }
+}
+
+#[derive(Subcommand, Debug)]
+enum Commands {
+    Serve(serve::Params),
+    Simulate,
+}
+
+pub async fn run() -> anyhow::Result<()> {
+    init_logging()?;
+    let cli = Cli::parse();
+    match cli.command {
+        Commands::Serve(params) => serve::run(params).await?,
+        Commands::Simulate => {
+            bail!("simulate subcommand not yet implemented")
+        }
+    }
+    Ok(())
+}
+
+fn init_logging() -> anyhow::Result<()> {
+    let filter = tracing_subscriber::EnvFilter::builder()
+        .with_default_directive(tracing_subscriber::filter::LevelFilter::INFO.into())
+        .from_env_lossy();
+    tracing_subscriber::registry()
+        .with(fmt::layer())
+        .with(filter)
+        .try_init()?;
+    Ok(())
+}
diff --git a/sugondat-shim/src/main.rs b/sugondat-shim/src/main.rs
new file mode 100644
index 00000000..e38fba30
--- /dev/null
+++ b/sugondat-shim/src/main.rs
@@ -0,0 +1,9 @@
+mod adapters;
+mod cli;
+mod serve;
+mod sugondat_rpc;
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    cli::run().await
+}
diff --git a/sugondat-shim/src/serve.rs b/sugondat-shim/src/serve.rs
new file mode 100644
index 00000000..01cbd5b3
--- /dev/null
+++ b/sugondat-shim/src/serve.rs
@@ -0,0 +1,43 @@
+use crate::{adapters::sovereign::SovereignAdapter, cli::CommonParams, sugondat_rpc::Client};
+use clap::Args;
+use jsonrpsee::{server::Server, Methods};
+use sugondat_shim_common_sovereign::SovereignRPCServer;
+use tracing::{debug, info};
+
+#[derive(Debug, Args)]
+pub struct Params {
+    /// The address of the sugondat-node to connect to.
+    #[clap(long, default_value = "ws://localhost:9944")]
+    node_url: String,
+
+    #[clap(flatten)]
+    common: CommonParams,
+}
+
+pub async fn run(params: Params) -> anyhow::Result<()> {
+    info!(
+        "starting sugondat-shim server on {}:{}",
+        params.common.address, params.common.port
+    );
+    let listen_on = (params.common.address.as_str(), params.common.port);
+    let server = Server::builder().build(listen_on).await?;
+    let client = connect_client(&params.node_url).await?;
+    let handle = server.start(init_adapters(client, &params.common));
+    handle.stopped().await;
+    Ok(())
+}
+
+async fn connect_client(url: &str) -> anyhow::Result<Client> {
+    let client = Client::new(url.to_string()).await?;
+    Ok(client)
+}
+
+fn init_adapters(client: Client, common: &CommonParams) -> Methods {
+    let mut methods = Methods::new();
+    if common.enable_sovereign() {
+        debug!("enabling sovereign adapter");
+        let adapter = SovereignAdapter::new(client.clone());
+        methods.merge(adapter.into_rpc()).unwrap();
+    }
+    methods
+}
diff --git a/sugondat-shim/src/sugondat_rpc.rs b/sugondat-shim/src/sugondat_rpc.rs
new file mode 100644
index 00000000..bacdb927
--- /dev/null
+++ b/sugondat-shim/src/sugondat_rpc.rs
@@ -0,0 +1,190 @@
+use subxt::{backend::rpc::RpcClient, rpc_params, utils::H256, OnlineClient};
+use sugondat_nmt::Namespace;
+use sugondat_subxt::{
+    sugondat::runtime_types::bounded_collections::bounded_vec::BoundedVec, Header,
+};
+
+// NOTE: we specifically avoid prolifiration of subxt types around the codebase. To that end, we
+//       avoid returning H256 and instead return [u8; 32] directly.
+
+/// A sugondat RPC client.
+///
+/// # Clone
+///
+/// This is a thin wrapper that can be cloned cheaply.
+#[derive(Clone)]
+pub struct Client {
+    raw: RpcClient,
+    subxt: sugondat_subxt::Client,
+}
+
+impl Client {
+    /// Creates a new instance of the client.
+    pub async fn new(rpc_url: String) -> anyhow::Result<Self> {
+        let raw = RpcClient::from_url(&rpc_url).await?;
+        let subxt = sugondat_subxt::Client::from_rpc_client(raw.clone()).await?;
+        Ok(Self { raw, subxt })
+    }
+
+    /// Blocks until the sugondat node has finalized a block at the given height.
+    pub async fn wait_finalized_height(&self, height: u64) -> anyhow::Result<[u8; 32]> {
+        loop {
+            let finalized_head = self.subxt.backend().latest_finalized_block_ref().await?;
+            let header = self
+                .subxt
+                .backend()
+                .block_header(finalized_head.hash())
+                .await?
+                .unwrap();
+            if header.number as u64 >= height {
+                break;
+            }
+            tracing::info!(
+                "waiting for sugondat node to finalize block at height {}",
+                height
+            );
+            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+        }
+        let block_hash: H256 = self
+            .raw
+            .request("chain_getBlockHash", rpc_params![height])
+            .await?;
+        Ok(block_hash.0)
+    }
+
+    pub async fn get_block_at(&self, block_hash: [u8; 32]) -> anyhow::Result<Block> {
+        let block_hash = H256::from(block_hash);
+        let block_api = self.subxt.blocks().at(block_hash).await?;
+        let timestamp = block_api
+            .storage()
+            .fetch(&sugondat_subxt::sugondat::storage().timestamp().now())
+            .await?
+            .ok_or(anyhow::anyhow!("no timestamp found"))?;
+        let header = block_api.header();
+        let tree_root = tree_root(header).ok_or_else(err::no_tree_root)?;
+        let extrinsics = block_api
+            .extrinsics()
+            .await?
+            .iter()
+            .collect::<Result<Vec<_>, _>>()?;
+        let blobs = extract_blobs(extrinsics);
+        tracing::info!(?blobs, "found {} blobs in block", blobs.len());
+        Ok(Block {
+            number: header.number as u64,
+            parent_hash: header.parent_hash.0,
+            tree_root,
+            timestamp,
+            blobs,
+        })
+    }
+
+    pub async fn submit_blob(
+        &self,
+        blob: Vec<u8>,
+        namespace: sugondat_nmt::Namespace,
+    ) -> anyhow::Result<()> {
+        use subxt_signer::sr25519::dev;
+
+        let namespace_id = namespace.namespace_id();
+        let extrinsic = sugondat_subxt::sugondat::tx()
+            .blob()
+            .submit_blob(namespace_id, BoundedVec(blob));
+
+        let from = dev::alice();
+        let _events = self
+            .subxt
+            .tx()
+            .sign_and_submit_then_watch_default(&extrinsic, &from)
+            .await?
+            .wait_for_finalized_success()
+            .await?;
+        Ok(())
+    }
+}
+
+/// Iterates over the extrinsics in a block and extracts the submit_blob extrinsics.
+fn extract_blobs(
+    extrinsics: Vec<
+        subxt::blocks::ExtrinsicDetails<
+            subxt::SubstrateConfig,
+            OnlineClient<subxt::SubstrateConfig>,
+        >,
+    >,
+) -> Vec<Blob> {
+    let mut blobs = vec![];
+    for (extrinsic_index, e) in extrinsics.iter().enumerate() {
+        let Some(sender) = e
+            .address_bytes()
+            .filter(|a| a.len() == 33)
+            .and_then(|a| a[1..].try_into().ok())
+        else {
+            continue;
+        };
+        let Ok(Some(submit_blob_extrinsic)) =
+            e.as_extrinsic::<sugondat_subxt::sugondat::blob::calls::types::SubmitBlob>()
+        else {
+            // Not a submit blob extrinsic, skip.
+            continue;
+        };
+        let data = submit_blob_extrinsic.blob.0;
+        blobs.push(Blob {
+            extrinsic_index: extrinsic_index as u32,
+            namespace: sugondat_nmt::Namespace::with_namespace_id(
+                submit_blob_extrinsic.namespace_id,
+            ),
+            sender,
+            data,
+        })
+    }
+    blobs
+}
+
+/// Examines the header and extracts the tree root committed as one of the logs.
+fn tree_root(header: &Header) -> Option<sugondat_nmt::TreeRoot> {
+    let mut nmt_root = None;
+    for log in &header.digest.logs {
+        match log {
+            subxt::config::substrate::DigestItem::Other(ref bytes) => {
+                if bytes.starts_with(b"snmt") {
+                    nmt_root = Some(sugondat_nmt::TreeRoot::from_raw_bytes(
+                        bytes[4..].try_into().unwrap(),
+                    ));
+                    break;
+                }
+            }
+            _ => {}
+        }
+    }
+    nmt_root
+}
+
+mod err {
+    pub fn no_tree_root() -> anyhow::Error {
+        anyhow::anyhow!("no tree root found in block header. Are you sure this is a sugondat node?")
+    }
+}
+
+/// Represents a sugondat block.
+pub struct Block {
+    pub number: u64,
+    pub parent_hash: [u8; 32],
+    pub tree_root: sugondat_nmt::TreeRoot,
+    pub timestamp: u64,
+    pub blobs: Vec<Blob>,
+}
+
+/// Represents a blob in a sugondat block.
+#[derive(Debug)]
+pub struct Blob {
+    pub extrinsic_index: u32,
+    pub namespace: Namespace,
+    pub sender: [u8; 32],
+    pub data: Vec<u8>,
+}
+
+impl Blob {
+    pub fn sha2_hash(&self) -> [u8; 32] {
+        use sha2::Digest;
+        sha2::Sha256::digest(&self.data).into()
+    }
+}

From f2286cc672782c184fc1a736eddff4620a987041 Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <s.pepyakin@gmail.com>
Date: Tue, 21 Nov 2023 15:10:11 +0100
Subject: [PATCH 3/5] sugondat-da-adapter: use shim

this removes all the subxt and substrate cruft from the sovereign
adapter.
---
 Cargo.lock                                |   6 +-
 sugondat-da-adapter/Cargo.toml            |  22 ++--
 sugondat-da-adapter/src/service.rs        | 149 +++-------------------
 sugondat-da-adapter/src/service/client.rs |  29 +++--
 sugondat-shim/common/sovereign/src/lib.rs |   8 +-
 5 files changed, 59 insertions(+), 155 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8b34bb68..512e69ca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13317,15 +13317,13 @@ dependencies = [
  "bytes",
  "digest 0.10.7",
  "hex",
+ "jsonrpsee 0.20.3",
  "parity-scale-codec",
  "serde",
  "sha2 0.10.8",
  "sov-rollup-interface",
- "sp-keyring",
- "subxt",
- "subxt-signer",
  "sugondat-nmt",
- "sugondat-subxt",
+ "sugondat-shim-common-sovereign",
  "tokio",
  "tracing",
 ]
diff --git a/sugondat-da-adapter/Cargo.toml b/sugondat-da-adapter/Cargo.toml
index 48b3848d..dfd61e41 100644
--- a/sugondat-da-adapter/Cargo.toml
+++ b/sugondat-da-adapter/Cargo.toml
@@ -8,12 +8,8 @@ edition = "2021"
 [dependencies]
 parity-scale-codec = "3.6.3"
 # The only required dependency for a DA adapter is the Sovereign SDK...
-sov-rollup-interface =  { git = "https://github.com/Sovereign-Labs/sovereign-sdk", rev = "6058b31" }
+sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk", rev = "6058b31" }
 
-sugondat-subxt = { path = "../sugondat-subxt", optional = true }
-subxt = {version = "0.32.1", optional = true }
-subxt-signer = {version = "0.32.1", optional = true, features = ["subxt"] }
-sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", optional = true, default-features = false, branch = "release-polkadot-v1.2.0" }
 tracing = "0.1.37"
 serde = { version = "1", features = ["derive"] }
 hex = { version = "0.4.3", features = ["serde"] }
@@ -25,13 +21,23 @@ bytes = { version = "1", features = ["serde"] }
 
 sha2 = { version = "0.10.6", default-features = false }
 sugondat-nmt = { path = "../sugondat-nmt", default-features = false }
-
+jsonrpsee = { version = "0.20.3", optional = true, features = ["ws-client"] }
+tokio = { version = "1", optional = true }
+sugondat-shim-common-sovereign = { path = "../sugondat-shim/common/sovereign", optional = true, default-features = false, features = [
+    "client",
+] }
 anyhow = "1.0.68"
 async-trait = "0.1.71"
-tokio = { version = "1", optional = true }
 digest = "0.10.7"
 
 [features]
 default = ["native"]
-native = ["sov-rollup-interface/native", "sugondat-nmt/serde", "sugondat-nmt/native", "dep:sugondat-subxt", "dep:subxt", "dep:subxt-signer", "dep:sp-keyring", "dep:tokio"]
+native = [
+    "sov-rollup-interface/native",
+    "sugondat-nmt/serde",
+    "sugondat-nmt/native",
+    "dep:tokio",
+    "dep:jsonrpsee",
+    "dep:sugondat-shim-common-sovereign",
+]
 verifier = ["sugondat-nmt/serde"]
diff --git a/sugondat-da-adapter/src/service.rs b/sugondat-da-adapter/src/service.rs
index 8bad8325..b104d786 100644
--- a/sugondat-da-adapter/src/service.rs
+++ b/sugondat-da-adapter/src/service.rs
@@ -1,22 +1,18 @@
 use crate::{
     spec::{ChainParams, DaLayerSpec},
-    types,
+    types::{self, Hash},
     verifier::SugondatVerifier,
 };
 use async_trait::async_trait;
 use sov_rollup_interface::da::DaSpec;
-
-use subxt::backend::rpc::{rpc_params, RpcClient};
-use sugondat_subxt::sugondat::{
-    runtime_types::bounded_collections::bounded_vec::BoundedVec, storage,
-};
+use sugondat_shim_common_sovereign::SovereignRPCClient;
 
 mod client;
 
 use client::Client;
 
 fn default_rpc_addr() -> String {
-    "ws://localhost:9988/".into()
+    "ws://localhost:10995/".into()
 }
 
 /// Runtime configuration for the DA service
@@ -54,119 +50,25 @@ impl sov_rollup_interface::services::da::DaService for DaProvider {
     // Make an RPC call to the node to get the finalized block at the given height, if one exists.
     // If no such block exists, block until one does.
     async fn get_finalized_at(&self, height: u64) -> Result<Self::FilteredBlock, Self::Error> {
-        let client = self.client.clone();
-        let namespace = self.namespace;
-        let client_url = client.url().await;
-        let client = client.client().await?;
-
-        loop {
-            let finalized_head = client.backend().latest_finalized_block_ref().await?;
-            let header = client
-                .backend()
-                .block_header(finalized_head.hash())
-                .await?
-                .unwrap();
-            if header.number as u64 >= height {
-                break;
-            }
-            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
-        }
-
-        // between version 0.29 and 0.32 they remove subxt::rpc::Rpc
-        // so this 'raw' rpc call is required to extract the hash of the block with a certain height
-        let rpc_client = RpcClient::from_url(client_url).await?;
-        let hash: subxt::utils::H256 = rpc_client
-            .request("chain_getBlockHash", rpc_params![height])
-            .await?;
-
-        let block = client.blocks().at(hash).await?;
-
-        let header = block.header().clone();
-
-        let mut nmt_root = None;
-        for log in &header.digest.logs {
-            match log {
-                subxt::config::substrate::DigestItem::Other(ref bytes) => {
-                    if bytes.starts_with(b"snmt") {
-                        nmt_root = Some(sugondat_nmt::TreeRoot::from_raw_bytes(
-                            bytes[4..].try_into().unwrap(),
-                        ));
-                        break;
-                    }
-                }
-                _ => {}
-            }
-        }
-
-        // fetch timestamp from block
-        let timestamp = block
-            .storage()
-            .fetch(&storage().timestamp().now())
-            .await?
-            .ok_or(anyhow::anyhow!("no timestamp found"))?;
-
+        let client = self.client.ensure_connected().await?;
+        let block: sugondat_shim_common_sovereign::Block =
+            client.get_block(height, self.namespace).await?;
         let header = types::Header::new(
-            types::Hash(hash.0),
-            types::Hash(header.parent_hash.0),
-            nmt_root.unwrap(),
-            header.number as u64,
-            timestamp,
+            Hash(block.block_hash),
+            Hash(block.prev_hash),
+            block.nmt_root,
+            height,
+            block.timestamp,
         );
-
-        let mut transactions = vec![];
-        for ext in block.extrinsics().await?.iter() {
-            let ext = ext?;
-            let Some(address) = ext.address_bytes().map(|a| {
-				tracing::info!("Address: {:?}", hex::encode(&a));
-				types::Address::try_from(&a[1..]).unwrap()
-			}) else {
-				continue
-			};
-            let Ok(Some(submit_blob_extrinsic)) =
-				ext.as_extrinsic::<sugondat_subxt::sugondat::blobs::calls::types::SubmitBlob>()
-			else {
-				// Not a submit blob extrinsic, skip.
-				continue
-			};
-
-            if submit_blob_extrinsic.namespace_id != namespace.namespace_id() {
-                // Not for our app.
-                continue;
-            }
-
-            let blob_data = submit_blob_extrinsic.blob.0;
-            tracing::info!("received a blob: {}", hex::encode(&blob_data));
-            transactions.push(types::BlobTransaction::new(address, blob_data));
-        }
-
-        let address = sugondat_subxt::sugondat::blobs::storage::StorageApi.blob_list();
-        let blobs = client
-            .storage()
-            .at(hash)
-            .fetch(&address)
-            .await
-            .unwrap()
-            .map(|x| x.0)
-            .unwrap_or_default();
-
-        let blobs = blobs
+        let transactions = block
+            .blobs
             .into_iter()
-            .map(|blob| sugondat_nmt::BlobMetadata {
-                namespace: sugondat_nmt::Namespace::with_namespace_id(blob.namespace_id),
-                leaf: sugondat_nmt::NmtLeaf {
-                    extrinsic_index: blob.extrinsic_index,
-                    who: blob.who.0,
-                    blob_hash: blob.blob_hash,
-                },
-            })
+            .map(|blob| types::BlobTransaction::new(types::Address(blob.sender), blob.data))
             .collect();
-        let mut tree = sugondat_nmt::tree_from_blobs(blobs);
-        let blob_proof = tree.proof(namespace);
-
         Ok(types::Block {
             header,
             transactions,
-            blob_proof,
+            blob_proof: block.proof,
         })
     }
 
@@ -200,25 +102,8 @@ impl sov_rollup_interface::services::da::DaService for DaProvider {
 
     // Send the blob to the DA layer, using the submit_blob extrinsic
     async fn send_transaction(&self, blob: &[u8]) -> Result<(), Self::Error> {
-        let client = self.client.clone();
-        let blob = blob.to_vec();
-        let namespace_id = self.namespace.namespace_id();
-        use subxt_signer::sr25519::dev;
-
-        let client = client.client().await?;
-
-        let extrinsic = sugondat_subxt::sugondat::tx()
-            .blobs()
-            .submit_blob(namespace_id, BoundedVec(blob));
-
-        let from = dev::alice();
-        let _events = client
-            .tx()
-            .sign_and_submit_then_watch_default(&extrinsic, &from)
-            .await?
-            .wait_for_finalized_success()
-            .await?;
-
+        let client = self.client.ensure_connected().await?;
+        client.submit_blob(blob.to_vec(), self.namespace).await?;
         Ok(())
     }
 }
diff --git a/sugondat-da-adapter/src/service/client.rs b/sugondat-da-adapter/src/service/client.rs
index a91ba8fb..b7b74351 100644
--- a/sugondat-da-adapter/src/service/client.rs
+++ b/sugondat-da-adapter/src/service/client.rs
@@ -10,7 +10,20 @@ pub struct Client {
 
 struct Inner {
     url: String,
-    client: Option<sugondat_subxt::Client>,
+    client: Option<ClientRef>,
+}
+
+#[derive(Clone)]
+pub struct ClientRef {
+    client: Arc<jsonrpsee::ws_client::WsClient>,
+}
+
+impl std::ops::Deref for ClientRef {
+    type Target = jsonrpsee::ws_client::WsClient;
+
+    fn deref(&self) -> &Self::Target {
+        &self.client
+    }
 }
 
 impl Client {
@@ -20,18 +33,18 @@ impl Client {
         }
     }
 
-    pub async fn url(&self) -> String {
-        let inner = self.inner.lock().await;
-        inner.url.clone()
-    }
-
-    pub async fn client(&self) -> anyhow::Result<sugondat_subxt::Client> {
+    pub async fn ensure_connected(&self) -> anyhow::Result<ClientRef> {
         let mut inner = self.inner.lock().await;
         if let Some(client) = &inner.client {
             return Ok(client.clone());
         }
 
-        let client = sugondat_subxt::Client::from_url(&inner.url).await?;
+        let client = jsonrpsee::ws_client::WsClientBuilder::new()
+            .build(inner.url.clone())
+            .await?;
+        let client = ClientRef {
+            client: Arc::new(client),
+        };
         inner.client = Some(client.clone());
         Ok(client)
     }
diff --git a/sugondat-shim/common/sovereign/src/lib.rs b/sugondat-shim/common/sovereign/src/lib.rs
index 5b8cbe2e..f2d9d8fd 100644
--- a/sugondat-shim/common/sovereign/src/lib.rs
+++ b/sugondat-shim/common/sovereign/src/lib.rs
@@ -1,8 +1,10 @@
-use jsonrpsee::{proc_macros::rpc, types::ErrorObjectOwned};
+use jsonrpsee::proc_macros::rpc;
 
 #[cfg(not(any(feature = "server", feature = "client")))]
 compile_error!("either feature \"server\" or \"client\" must be enabled");
 
+pub type JsonRPCError = jsonrpsee::types::ErrorObjectOwned;
+
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct Block {
     // TODO: Hash should be a newtype that serializes to hex.
@@ -31,12 +33,12 @@ pub trait SovereignRPC {
         &self,
         height: u64,
         namespace: sugondat_nmt::Namespace,
-    ) -> Result<Block, ErrorObjectOwned>;
+    ) -> Result<Block, JsonRPCError>;
 
     #[method(name = "sovereign_submitBlob")]
     async fn submit_blob(
         &self,
         blob: Vec<u8>,
         namespace: sugondat_nmt::Namespace,
-    ) -> Result<(), ErrorObjectOwned>;
+    ) -> Result<(), JsonRPCError>;
 }

From 8b445ca7d6fd2181a3fc7b55902ceaa7cdb01f16 Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <s.pepyakin@gmail.com>
Date: Tue, 21 Nov 2023 16:40:56 +0100
Subject: [PATCH 4/5] demo: update Cargo.lock

---
 demo/Cargo.lock | 2781 ++++-------------------------------------------
 1 file changed, 202 insertions(+), 2579 deletions(-)

diff --git a/demo/Cargo.lock b/demo/Cargo.lock
index 41f37750..871efd6f 100644
--- a/demo/Cargo.lock
+++ b/demo/Cargo.lock
@@ -23,22 +23,13 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "addr2line"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
-dependencies = [
- "gimli 0.27.3",
-]
-
 [[package]]
 name = "addr2line"
 version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
 dependencies = [
- "cpp_demangle 0.4.3",
+ "cpp_demangle",
  "fallible-iterator",
  "gimli 0.27.3",
  "memmap2",
@@ -68,7 +59,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
 ]
 
 [[package]]
@@ -81,7 +72,7 @@ dependencies = [
  "cipher 0.3.0",
  "cpufeatures",
  "ctr 0.8.0",
- "opaque-debug 0.3.0",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -115,7 +106,7 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom",
  "once_cell",
  "version_check",
 ]
@@ -127,7 +118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.11",
+ "getrandom",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -154,7 +145,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc0fac0fc16baf1f63f78b47c3d24718f3619b0714076f6a02957d808d52cbef"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "bytes",
  "smol_str",
 ]
@@ -180,15 +171,6 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "anstream"
 version = "0.6.4"
@@ -224,7 +206,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -234,7 +216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
 dependencies = [
  "anstyle",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -249,47 +231,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
 
-[[package]]
-name = "ark-bls12-381"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488"
-dependencies = [
- "ark-ec",
- "ark-ff 0.4.2",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
-]
-
-[[package]]
-name = "ark-ec"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
-dependencies = [
- "ark-ff 0.4.2",
- "ark-poly",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
- "derivative",
- "hashbrown 0.13.2",
- "itertools 0.10.5",
- "num-traits",
- "zeroize",
-]
-
-[[package]]
-name = "ark-ed-on-bls12-381-bandersnatch"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c"
-dependencies = [
- "ark-bls12-381",
- "ark-ec",
- "ark-ff 0.4.2",
- "ark-std 0.4.0",
-]
-
 [[package]]
 name = "ark-ff"
 version = "0.3.0"
@@ -373,47 +314,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "ark-poly"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
-dependencies = [
- "ark-ff 0.4.2",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
- "derivative",
- "hashbrown 0.13.2",
-]
-
-[[package]]
-name = "ark-scale"
-version = "0.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393"
-dependencies = [
- "ark-ec",
- "ark-ff 0.4.2",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
- "parity-scale-codec",
-]
-
-[[package]]
-name = "ark-secret-scalar"
-version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4"
-dependencies = [
- "ark-ec",
- "ark-ff 0.4.2",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
- "ark-transcript",
- "digest 0.10.7",
- "rand_core 0.6.4",
- "zeroize",
-]
-
 [[package]]
 name = "ark-serialize"
 version = "0.3.0"
@@ -430,23 +330,11 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
 dependencies = [
- "ark-serialize-derive",
  "ark-std 0.4.0",
  "digest 0.10.7",
  "num-bigint 0.4.4",
 ]
 
-[[package]]
-name = "ark-serialize-derive"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "ark-std"
 version = "0.3.0"
@@ -454,7 +342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -464,49 +352,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "ark-transcript"
-version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4"
-dependencies = [
- "ark-ff 0.4.2",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
- "digest 0.10.7",
- "rand_core 0.6.4",
- "sha3",
-]
-
-[[package]]
-name = "array-bytes"
-version = "6.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de17a919934ad8c5cc99a1a74de4e2dab95d6121a8f27f94755ff525b630382c"
-
-[[package]]
-name = "arrayref"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-
-[[package]]
-name = "arrayvec"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
-dependencies = [
- "nodrop",
+ "rand",
 ]
 
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -522,155 +370,15 @@ dependencies = [
  "term",
 ]
 
-[[package]]
-name = "async-channel"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
-dependencies = [
- "concurrent-queue",
- "event-listener 2.5.3",
- "futures-core",
-]
-
-[[package]]
-name = "async-executor"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0"
-dependencies = [
- "async-lock 2.8.0",
- "async-task",
- "concurrent-queue",
- "fastrand 2.0.1",
- "futures-lite 1.13.0",
- "slab",
-]
-
-[[package]]
-name = "async-fs"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
-dependencies = [
- "async-lock 2.8.0",
- "autocfg",
- "blocking",
- "futures-lite 1.13.0",
-]
-
-[[package]]
-name = "async-io"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
-dependencies = [
- "async-lock 2.8.0",
- "autocfg",
- "cfg-if",
- "concurrent-queue",
- "futures-lite 1.13.0",
- "log",
- "parking",
- "polling 2.8.0",
- "rustix 0.37.27",
- "slab",
- "socket2 0.4.10",
- "waker-fn",
-]
-
-[[package]]
-name = "async-io"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997"
-dependencies = [
- "async-lock 3.0.0",
- "cfg-if",
- "concurrent-queue",
- "futures-io",
- "futures-lite 2.0.1",
- "parking",
- "polling 3.3.0",
- "rustix 0.38.21",
- "slab",
- "tracing",
- "waker-fn",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "async-lock"
 version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
 dependencies = [
- "event-listener 2.5.3",
-]
-
-[[package]]
-name = "async-lock"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45e900cdcd39bb94a14487d3f7ef92ca222162e6c7c3fe7cb3550ea75fb486ed"
-dependencies = [
- "event-listener 3.0.1",
- "event-listener-strategy",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-net"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f"
-dependencies = [
- "async-io 1.13.0",
- "blocking",
- "futures-lite 1.13.0",
-]
-
-[[package]]
-name = "async-process"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
-dependencies = [
- "async-io 1.13.0",
- "async-lock 2.8.0",
- "async-signal",
- "blocking",
- "cfg-if",
- "event-listener 3.0.1",
- "futures-lite 1.13.0",
- "rustix 0.38.21",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "async-signal"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
-dependencies = [
- "async-io 2.2.0",
- "async-lock 2.8.0",
- "atomic-waker",
- "cfg-if",
- "futures-core",
- "futures-io",
- "rustix 0.38.21",
- "signal-hook-registry",
- "slab",
- "windows-sys 0.48.0",
+ "event-listener",
 ]
 
-[[package]]
-name = "async-task"
-version = "4.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1"
-
 [[package]]
 name = "async-trait"
 version = "0.1.74"
@@ -693,12 +401,6 @@ dependencies = [
  "rustc_version 0.4.0",
 ]
 
-[[package]]
-name = "atomic"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
-
 [[package]]
 name = "atomic-polyfill"
 version = "0.1.11"
@@ -717,12 +419,6 @@ dependencies = [
  "critical-section",
 ]
 
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
 [[package]]
 name = "attohttpc"
 version = "0.16.3"
@@ -777,39 +473,12 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "bandersnatch_vrfs"
-version = "0.0.1"
-source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4"
-dependencies = [
- "ark-bls12-381",
- "ark-ec",
- "ark-ed-on-bls12-381-bandersnatch",
- "ark-ff 0.4.2",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
- "dleq_vrf",
- "fflonk",
- "merlin 3.0.0",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
- "ring 0.1.0",
- "sha2 0.10.8",
- "zeroize",
-]
-
 [[package]]
 name = "base16ct"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
-[[package]]
-name = "base58"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581"
-
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -926,17 +595,6 @@ dependencies = [
  "syn 2.0.39",
 ]
 
-[[package]]
-name = "bip39"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f"
-dependencies = [
- "bitcoin_hashes",
- "serde",
- "unicode-normalization",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -952,12 +610,6 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
-[[package]]
-name = "bitcoin_hashes"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4"
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -995,46 +647,13 @@ dependencies = [
  "digest 0.10.7",
 ]
 
-[[package]]
-name = "blake2-rfc"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
-dependencies = [
- "arrayvec 0.4.12",
- "constant_time_eq 0.1.5",
-]
-
-[[package]]
-name = "blake2b_simd"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
-dependencies = [
- "arrayref",
- "arrayvec 0.7.4",
- "constant_time_eq 0.3.0",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding 0.1.5",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
 ]
 
 [[package]]
@@ -1043,16 +662,7 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
- "generic-array 0.14.7",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
+ "generic-array",
 ]
 
 [[package]]
@@ -1061,23 +671,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
 dependencies = [
- "generic-array 0.14.7",
-]
-
-[[package]]
-name = "blocking"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a"
-dependencies = [
- "async-channel",
- "async-lock 2.8.0",
- "async-task",
- "fastrand 2.0.1",
- "futures-io",
- "futures-lite 1.13.0",
- "piper",
- "tracing",
+ "generic-array",
 ]
 
 [[package]]
@@ -1132,7 +726,7 @@ dependencies = [
  "num_enum 0.6.1",
  "once_cell",
  "pollster",
- "rand 0.8.5",
+ "rand",
  "regress",
  "rustc-hash",
  "ryu-js",
@@ -1288,22 +882,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "bounded-collections"
-version = "0.1.9"
+name = "bs58"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd"
-dependencies = [
- "log",
- "parity-scale-codec",
- "scale-info",
- "serde",
-]
-
-[[package]]
-name = "bs58"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
+checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
 dependencies = [
  "sha2 0.10.8",
  "tinyvec",
@@ -1321,12 +903,6 @@ version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
 [[package]]
 name = "bytemuck"
 version = "1.14.0"
@@ -1473,31 +1049,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "chacha20"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6"
-dependencies = [
- "cfg-if",
- "cipher 0.3.0",
- "cpufeatures",
- "zeroize",
-]
-
-[[package]]
-name = "chacha20poly1305"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
-dependencies = [
- "aead",
- "chacha20",
- "cipher 0.3.0",
- "poly1305",
- "zeroize",
-]
-
 [[package]]
 name = "chrono"
 version = "0.4.31"
@@ -1510,7 +1061,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.48.5",
+ "windows-targets",
 ]
 
 [[package]]
@@ -1546,7 +1097,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
 ]
 
 [[package]]
@@ -1638,7 +1189,7 @@ dependencies = [
  "bs58",
  "coins-core",
  "digest 0.10.7",
- "hmac 0.12.1",
+ "hmac",
  "k256",
  "serde",
  "sha2 0.10.8",
@@ -1653,10 +1204,10 @@ checksum = "3db8fba409ce3dc04f7d804074039eb68b960b0829161f8e06c95fea3f122528"
 dependencies = [
  "bitvec",
  "coins-bip32",
- "hmac 0.12.1",
+ "hmac",
  "once_cell",
  "pbkdf2 0.12.2",
- "rand 0.8.5",
+ "rand",
  "sha2 0.10.8",
  "thiserror",
 ]
@@ -1671,7 +1222,7 @@ dependencies = [
  "bech32",
  "bs58",
  "digest 0.10.7",
- "generic-array 0.14.7",
+ "generic-array",
  "hex",
  "ripemd",
  "serde",
@@ -1687,30 +1238,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
-[[package]]
-name = "common"
-version = "0.1.0"
-source = "git+https://github.com/w3f/ring-proof?rev=8657210#86572101f4210647984ab4efedba6b3fcc890895"
-dependencies = [
- "ark-ec",
- "ark-ff 0.4.2",
- "ark-poly",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
- "fflonk",
- "merlin 3.0.0",
- "rand_chacha 0.3.1",
-]
-
-[[package]]
-name = "concurrent-queue"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "const-hex"
 version = "1.10.0"
@@ -1743,12 +1270,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
-[[package]]
-name = "constant_time_eq"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
-
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -1780,15 +1301,6 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
-[[package]]
-name = "cpp_demangle"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "cpp_demangle"
 version = "0.4.3"
@@ -1807,15 +1319,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "cranelift-entity"
-version = "0.95.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "crc"
 version = "3.0.1"
@@ -1902,20 +1405,10 @@ dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset 0.9.0",
+ "memoffset",
  "scopeguard",
 ]
 
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.16"
@@ -1937,8 +1430,8 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124"
 dependencies = [
- "generic-array 0.14.7",
- "rand_core 0.6.4",
+ "generic-array",
+ "rand_core",
  "subtle",
  "zeroize",
 ]
@@ -1949,30 +1442,10 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
  "typenum",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
-dependencies = [
- "generic-array 0.14.7",
- "subtle",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
-dependencies = [
- "generic-array 0.14.7",
- "subtle",
-]
-
 [[package]]
 name = "csv"
 version = "1.3.0"
@@ -2012,32 +1485,6 @@ dependencies = [
  "cipher 0.4.4",
 ]
 
-[[package]]
-name = "curve25519-dalek"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216"
-dependencies = [
- "byteorder",
- "digest 0.8.1",
- "rand_core 0.5.1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
-dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "4.1.1"
@@ -2074,7 +1521,7 @@ checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8"
 dependencies = [
  "byteorder",
  "digest 0.9.0",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle-ng",
  "zeroize",
 ]
@@ -2089,16 +1536,6 @@ dependencies = [
  "darling_macro 0.10.2",
 ]
 
-[[package]]
-name = "darling"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
-dependencies = [
- "darling_core 0.14.4",
- "darling_macro 0.14.4",
-]
-
 [[package]]
 name = "darling"
 version = "0.20.3"
@@ -2123,20 +1560,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "darling_core"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.10.0",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "darling_core"
 version = "0.20.3"
@@ -2162,17 +1585,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "darling_macro"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
-dependencies = [
- "darling_core 0.14.4",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "darling_macro"
 version = "0.20.3"
@@ -2223,9 +1635,9 @@ dependencies = [
  "demo-stf 0.3.0",
  "hex",
  "jsonrpsee",
- "rand 0.8.5",
+ "rand",
  "reth-primitives",
- "secp256k1 0.27.0",
+ "secp256k1",
  "serde",
  "serde_json",
  "simple-nft-module 0.3.0",
@@ -2262,7 +1674,7 @@ dependencies = [
  "hex",
  "jsonrpsee",
  "reth-primitives",
- "secp256k1 0.27.0",
+ "secp256k1",
  "serde",
  "serde_json",
  "simple-nft-module 0.3.0 (git+https://github.com/Sovereign-Labs/sovereign-sdk?rev=6058b31)",
@@ -2367,22 +1779,13 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
 [[package]]
 name = "digest"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
 ]
 
 [[package]]
@@ -2434,7 +1837,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -2455,7 +1858,7 @@ source = "git+https://github.com/sigp/discv5?rev=d2e30e04ee62418b9e57278cee907c0
 dependencies = [
  "aes 0.7.5",
  "aes-gcm",
- "arrayvec 0.7.4",
+ "arrayvec",
  "delay_map",
  "enr",
  "fnv",
@@ -2464,16 +1867,16 @@ dependencies = [
  "hex",
  "hkdf",
  "lazy_static",
- "lru 0.7.8",
+ "lru",
  "more-asserts",
  "parking_lot 0.11.2",
- "rand 0.8.5",
+ "rand",
  "rlp",
  "smallvec",
  "socket2 0.4.10",
  "tokio",
  "tracing",
- "tracing-subscriber 0.3.17",
+ "tracing-subscriber",
  "uint",
  "zeroize",
 ]
@@ -2489,23 +1892,6 @@ dependencies = [
  "syn 2.0.39",
 ]
 
-[[package]]
-name = "dleq_vrf"
-version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4"
-dependencies = [
- "ark-ec",
- "ark-ff 0.4.2",
- "ark-scale",
- "ark-secret-scalar",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
- "ark-transcript",
- "arrayvec 0.7.4",
- "rand_core 0.6.4",
- "zeroize",
-]
-
 [[package]]
 name = "dns-lookup"
 version = "1.0.8"
@@ -2530,27 +1916,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
 
-[[package]]
-name = "dyn-clonable"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e9232f0e607a262ceb9bd5141a3dfb3e4db6994b31989bbfd845878cba59fd4"
-dependencies = [
- "dyn-clonable-impl",
- "dyn-clone",
-]
-
-[[package]]
-name = "dyn-clonable-impl"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "dyn-clone"
 version = "1.0.16"
@@ -2590,7 +1955,7 @@ checksum = "3c8465edc8ee7436ffea81d21a019b16676ee3db267aa8d5a8d729581ecf998b"
 dependencies = [
  "curve25519-dalek-ng",
  "hex",
- "rand_core 0.6.4",
+ "rand_core",
  "sha2 0.9.9",
  "zeroize",
 ]
@@ -2601,28 +1966,14 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
 dependencies = [
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek",
  "ed25519",
- "rand_core 0.6.4",
+ "rand_core",
  "serde",
  "sha2 0.10.8",
  "zeroize",
 ]
 
-[[package]]
-name = "ed25519-zebra"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
-dependencies = [
- "curve25519-dalek 3.2.0",
- "hashbrown 0.12.3",
- "hex",
- "rand_core 0.6.4",
- "sha2 0.9.9",
- "zeroize",
-]
-
 [[package]]
 name = "educe"
 version = "0.4.23"
@@ -2657,10 +2008,10 @@ dependencies = [
  "crypto-bigint",
  "digest 0.10.7",
  "ff",
- "generic-array 0.14.7",
+ "generic-array",
  "group",
  "pkcs8",
- "rand_core 0.6.4",
+ "rand_core",
  "sec1",
  "subtle",
  "zeroize",
@@ -2714,9 +2065,9 @@ dependencies = [
  "hex",
  "k256",
  "log",
- "rand 0.8.5",
+ "rand",
  "rlp",
- "secp256k1 0.27.0",
+ "secp256k1",
  "serde",
  "sha3",
  "zeroize",
@@ -2758,12 +2109,6 @@ dependencies = [
  "syn 2.0.39",
 ]
 
-[[package]]
-name = "environmental"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b"
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -2786,7 +2131,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -2799,9 +2144,9 @@ dependencies = [
  "ctr 0.9.2",
  "digest 0.10.7",
  "hex",
- "hmac 0.12.1",
+ "hmac",
  "pbkdf2 0.11.0",
- "rand 0.8.5",
+ "rand",
  "scrypt",
  "serde",
  "serde_json",
@@ -2952,23 +2297,23 @@ version = "2.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0a17f0708692024db9956b31d7a20163607d2745953f5ae8125ab368ba280ad"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "bytes",
  "cargo_metadata",
  "chrono",
  "const-hex",
  "elliptic-curve",
  "ethabi",
- "generic-array 0.14.7",
+ "generic-array",
  "k256",
  "num_enum 0.7.1",
  "once_cell",
  "open-fastrlp",
- "rand 0.8.5",
+ "rand",
  "rlp",
  "serde",
  "serde_json",
- "strum 0.25.0",
+ "strum",
  "syn 2.0.39",
  "tempfile",
  "thiserror",
@@ -3068,7 +2413,7 @@ dependencies = [
  "elliptic-curve",
  "eth-keystore",
  "ethers-core",
- "rand 0.8.5",
+ "rand",
  "sha2 0.10.8",
  "thiserror",
  "tracing",
@@ -3112,27 +2457,6 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
-[[package]]
-name = "event-listener"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160"
-dependencies = [
- "event-listener 3.0.1",
- "pin-project-lite",
-]
-
 [[package]]
 name = "eyre"
 version = "0.6.8"
@@ -3143,12 +2467,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
 [[package]]
 name = "fallible-iterator"
 version = "0.2.0"
@@ -3161,15 +2479,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c"
 
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.0.1"
@@ -3182,7 +2491,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "auto_impl",
  "bytes",
 ]
@@ -3196,7 +2505,7 @@ dependencies = [
  "bitvec",
  "byteorder",
  "ff_derive",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -3216,19 +2525,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "fflonk"
-version = "0.1.0"
-source = "git+https://github.com/w3f/fflonk#1beb0585e1c8488956fac7f05da061f9b41e8948"
-dependencies = [
- "ark-ec",
- "ark-ff 0.4.2",
- "ark-poly",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
- "merlin 3.0.0",
-]
-
 [[package]]
 name = "fiat-crypto"
 version = "0.2.3"
@@ -3248,7 +2544,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand 0.8.5",
+ "rand",
  "rustc-hex",
  "static_assertions",
 ]
@@ -3309,29 +2605,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "frame-metadata"
-version = "15.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c"
-dependencies = [
- "cfg-if",
- "parity-scale-codec",
- "scale-info",
-]
-
-[[package]]
-name = "frame-metadata"
-version = "16.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692"
-dependencies = [
- "cfg-if",
- "parity-scale-codec",
- "scale-info",
- "serde",
-]
-
 [[package]]
 name = "fs2"
 version = "0.4.3"
@@ -3388,7 +2661,6 @@ dependencies = [
  "futures-core",
  "futures-task",
  "futures-util",
- "num_cpus",
 ]
 
 [[package]]
@@ -3397,31 +2669,6 @@ version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
 
-[[package]]
-name = "futures-lite"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-dependencies = [
- "fastrand 1.9.0",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
-[[package]]
-name = "futures-lite"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb"
-dependencies = [
- "futures-core",
- "pin-project-lite",
-]
-
 [[package]]
 name = "futures-locks"
 version = "0.7.1"
@@ -3494,33 +2741,13 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.12.4"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
- "zeroize",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
+ "version_check",
+ "zeroize",
 ]
 
 [[package]]
@@ -3531,7 +2758,7 @@ checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
@@ -3540,7 +2767,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99"
 dependencies = [
- "opaque-debug 0.3.0",
+ "opaque-debug",
  "polyval",
 ]
 
@@ -3551,7 +2778,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 dependencies = [
  "fallible-iterator",
- "indexmap 1.9.3",
  "stable_deref_trait",
 ]
 
@@ -3620,7 +2846,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -3655,21 +2881,6 @@ version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a"
 
-[[package]]
-name = "hash-db"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e7d7786361d7425ae2fe4f9e407eb0efaa0840f5212d109cc018c40c35c6ab4"
-
-[[package]]
-name = "hash256-std-hasher"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92c171d55b98633f4ed3860808f004099b36c1cc29c42cfc53aa8591b21efcf2"
-dependencies = [
- "crunchy",
-]
-
 [[package]]
 name = "hash32"
 version = "0.2.1"
@@ -3788,27 +2999,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
 dependencies = [
- "hmac 0.12.1",
-]
-
-[[package]]
-name = "hmac"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
-dependencies = [
- "crypto-mac 0.8.0",
- "digest 0.9.0",
-]
-
-[[package]]
-name = "hmac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-dependencies = [
- "crypto-mac 0.11.1",
- "digest 0.9.0",
+ "hmac",
 ]
 
 [[package]]
@@ -3820,24 +3011,13 @@ dependencies = [
  "digest 0.10.7",
 ]
 
-[[package]]
-name = "hmac-drbg"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
-dependencies = [
- "digest 0.9.0",
- "generic-array 0.14.7",
- "hmac 0.8.1",
-]
-
 [[package]]
 name = "home"
 version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -4141,7 +3321,7 @@ dependencies = [
  "http",
  "hyper",
  "log",
- "rand 0.8.5",
+ "rand",
  "tokio",
  "url",
  "xmltree",
@@ -4213,12 +3393,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "indexmap-nostd"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590"
-
 [[package]]
 name = "informalsystems-pbjson"
 version = "0.6.0"
@@ -4235,8 +3409,8 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
 dependencies = [
- "block-padding 0.3.3",
- "generic-array 0.14.7",
+ "block-padding",
+ "generic-array",
 ]
 
 [[package]]
@@ -4248,38 +3422,12 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "integer-sqrt"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "intx"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f38a50a899dc47a6d0ed5508e7f601a2e34c3a85303514b5d137f3c10a0c75"
-
 [[package]]
 name = "inventory"
 version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0508c56cfe9bfd5dfeb0c22ab9a6abfda2f27bdca422132e494266351ed8d83c"
 
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.9.0"
@@ -4293,8 +3441,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi",
- "rustix 0.38.21",
- "windows-sys 0.48.0",
+ "rustix",
+ "windows-sys",
 ]
 
 [[package]]
@@ -4409,7 +3557,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b"
 dependencies = [
  "anyhow",
- "async-lock 2.8.0",
+ "async-lock",
  "async-trait",
  "beef",
  "futures-timer",
@@ -4417,7 +3565,7 @@ dependencies = [
  "hyper",
  "jsonrpsee-types",
  "parking_lot 0.12.1",
- "rand 0.8.5",
+ "rand",
  "rustc-hash",
  "serde",
  "serde_json",
@@ -4674,54 +3822,6 @@ dependencies = [
  "zstd-sys",
 ]
 
-[[package]]
-name = "libsecp256k1"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1"
-dependencies = [
- "arrayref",
- "base64 0.13.1",
- "digest 0.9.0",
- "hmac-drbg",
- "libsecp256k1-core",
- "libsecp256k1-gen-ecmult",
- "libsecp256k1-gen-genmult",
- "rand 0.8.5",
- "serde",
- "sha2 0.9.9",
- "typenum",
-]
-
-[[package]]
-name = "libsecp256k1-core"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
-dependencies = [
- "crunchy",
- "digest 0.9.0",
- "subtle",
-]
-
-[[package]]
-name = "libsecp256k1-gen-ecmult"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809"
-dependencies = [
- "libsecp256k1-core",
-]
-
-[[package]]
-name = "libsecp256k1-gen-genmult"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c"
-dependencies = [
- "libsecp256k1-core",
-]
-
 [[package]]
 name = "libz-sys"
 version = "1.1.12"
@@ -4739,18 +3839,6 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.11"
@@ -4823,12 +3911,6 @@ dependencies = [
  "hashbrown 0.12.3",
 ]
 
-[[package]]
-name = "lru"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
-
 [[package]]
 name = "lz4-sys"
 version = "1.9.4"
@@ -4839,24 +3921,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "mach"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "matchers"
-version = "0.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -4898,15 +3962,6 @@ version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
-[[package]]
-name = "memfd"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
-dependencies = [
- "rustix 0.38.21",
-]
-
 [[package]]
 name = "memmap2"
 version = "0.5.10"
@@ -4916,15 +3971,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "memoffset"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "memoffset"
 version = "0.9.0"
@@ -4934,39 +3980,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "memory-db"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808b50db46293432a45e63bc15ea51e0ab4c0a1647b8eb114e31a3e698dd6fbe"
-dependencies = [
- "hash-db 0.16.0",
-]
-
-[[package]]
-name = "merlin"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42"
-dependencies = [
- "byteorder",
- "keccak",
- "rand_core 0.5.1",
- "zeroize",
-]
-
-[[package]]
-name = "merlin"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
-dependencies = [
- "byteorder",
- "keccak",
- "rand_core 0.6.4",
- "zeroize",
-]
-
 [[package]]
 name = "metrics"
 version = "0.21.1"
@@ -5017,8 +4030,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
 dependencies = [
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
+ "wasi",
+ "windows-sys",
 ]
 
 [[package]]
@@ -5117,24 +4130,6 @@ dependencies = [
  "sha2 0.10.8",
 ]
 
-[[package]]
-name = "no-std-net"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65"
-
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
-[[package]]
-name = "nohash-hasher"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -5223,16 +4218,6 @@ dependencies = [
  "syn 2.0.39",
 ]
 
-[[package]]
-name = "num-format"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
-dependencies = [
- "arrayvec 0.7.4",
- "itoa",
-]
-
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -5337,18 +4322,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "object"
-version = "0.30.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
-dependencies = [
- "crc32fast",
- "hashbrown 0.13.2",
- "indexmap 1.9.3",
- "memchr",
-]
-
 [[package]]
 name = "object"
 version = "0.31.1"
@@ -5357,7 +4330,7 @@ checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
 dependencies = [
  "flate2",
  "memchr",
- "ruzstd 0.3.1",
+ "ruzstd",
 ]
 
 [[package]]
@@ -5385,12 +4358,6 @@ version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
 [[package]]
 name = "opaque-debug"
 version = "0.3.0"
@@ -5403,7 +4370,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "786393f80485445794f6043fd3138854dd109cc6c4bd1a6383db304c9ce9b9ce"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "auto_impl",
  "bytes",
  "ethereum-types",
@@ -5503,7 +4470,7 @@ version = "3.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "bitvec",
  "byte-slice-cast",
  "bytes",
@@ -5524,12 +4491,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "parking"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
-
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -5575,7 +4536,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.4.1",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets",
 ]
 
 [[package]]
@@ -5585,7 +4546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
 dependencies = [
  "base64ct",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -5601,15 +4562,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
 
-[[package]]
-name = "pbkdf2"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
-dependencies = [
- "crypto-mac 0.11.1",
-]
-
 [[package]]
 name = "pbkdf2"
 version = "0.11.0"
@@ -5617,7 +4569,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
 dependencies = [
  "digest 0.10.7",
- "hmac 0.12.1",
+ "hmac",
  "password-hash",
  "sha2 0.10.8",
 ]
@@ -5629,7 +4581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
  "digest 0.10.7",
- "hmac 0.12.1",
+ "hmac",
 ]
 
 [[package]]
@@ -5701,7 +4653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
 dependencies = [
  "phf_shared 0.11.2",
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -5767,17 +4719,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "piper"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
-dependencies = [
- "atomic-waker",
- "fastrand 2.0.1",
- "futures-io",
-]
-
 [[package]]
 name = "pkcs8"
 version = "0.10.2"
@@ -5837,53 +4778,12 @@ dependencies = [
  "plotters-backend",
 ]
 
-[[package]]
-name = "polling"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if",
- "concurrent-queue",
- "libc",
- "log",
- "pin-project-lite",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "polling"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531"
-dependencies = [
- "cfg-if",
- "concurrent-queue",
- "pin-project-lite",
- "rustix 0.38.21",
- "tracing",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "pollster"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"
 
-[[package]]
-name = "poly1305"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
-dependencies = [
- "cpufeatures",
- "opaque-debug 0.3.0",
- "universal-hash",
-]
-
 [[package]]
 name = "polyval"
 version = "0.5.3"
@@ -5892,7 +4792,7 @@ checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "opaque-debug 0.3.0",
+ "opaque-debug",
  "universal-hash",
 ]
 
@@ -5938,10 +4838,10 @@ dependencies = [
  "byteorder",
  "bytes",
  "fallible-iterator",
- "hmac 0.12.1",
+ "hmac",
  "md-5",
  "memchr",
- "rand 0.8.5",
+ "rand",
  "sha2 0.10.8",
  "stringprep",
 ]
@@ -6114,8 +5014,8 @@ dependencies = [
  "bitflags 2.4.1",
  "lazy_static",
  "num-traits",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
+ "rand",
+ "rand_chacha",
  "rand_xorshift",
  "regex-syntax 0.7.5",
  "rusty-fork",
@@ -6225,19 +5125,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "psm"
-version = "0.1.21"
+name = "public-ip"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "public-ip"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4c40db5262d93298c363a299f8bc1b3a956a78eecddba3bc0e58b76e2f419a"
+checksum = "7b4c40db5262d93298c363a299f8bc1b3a956a78eecddba3bc0e58b76e2f419a"
 dependencies = [
  "dns-lookup",
  "futures-core",
@@ -6285,19 +5176,6 @@ dependencies = [
  "nibble_vec",
 ]
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -6305,18 +5183,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+ "rand_chacha",
+ "rand_core",
 ]
 
 [[package]]
@@ -6326,16 +5194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
+ "rand_core",
 ]
 
 [[package]]
@@ -6344,16 +5203,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.11",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
+ "getrandom",
 ]
 
 [[package]]
@@ -6362,7 +5212,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
 dependencies = [
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -6415,31 +5265,11 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom",
  "libredox",
  "thiserror",
 ]
 
-[[package]]
-name = "ref-cast"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280"
-dependencies = [
- "ref-cast-impl",
-]
-
-[[package]]
-name = "ref-cast-impl"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
 [[package]]
 name = "regex"
 version = "1.10.2"
@@ -6579,7 +5409,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "postcard",
- "rand 0.8.5",
+ "rand",
  "reth-codecs",
  "reth-interfaces",
  "reth-libmdbx",
@@ -6598,7 +5428,7 @@ source = "git+https://github.com/paradigmxyz/reth?rev=e83d3aa#e83d3aa704f87825ca
 dependencies = [
  "discv5",
  "enr",
- "generic-array 0.14.7",
+ "generic-array",
  "hex",
  "parking_lot 0.12.1",
  "reth-net-common",
@@ -6606,7 +5436,7 @@ dependencies = [
  "reth-primitives",
  "reth-rlp",
  "reth-rlp-derive",
- "secp256k1 0.27.0",
+ "secp256k1",
  "serde",
  "thiserror",
  "tokio",
@@ -6620,21 +5450,21 @@ version = "0.1.0-alpha.8"
 source = "git+https://github.com/paradigmxyz/reth?rev=e83d3aa#e83d3aa704f87825ca8cab6f593ab4d4adbf6792"
 dependencies = [
  "aes 0.8.3",
- "block-padding 0.3.3",
+ "block-padding",
  "byteorder",
  "cipher 0.4.4",
  "ctr 0.9.2",
  "digest 0.10.7",
  "educe",
  "futures",
- "generic-array 0.14.7",
- "hmac 0.12.1",
+ "generic-array",
+ "hmac",
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "reth-net-common",
  "reth-primitives",
  "reth-rlp",
- "secp256k1 0.27.0",
+ "secp256k1",
  "sha2 0.10.8",
  "sha3",
  "thiserror",
@@ -6683,7 +5513,7 @@ dependencies = [
  "modular-bitfield",
  "parity-scale-codec",
  "parking_lot 0.12.1",
- "rand 0.8.5",
+ "rand",
  "reth-codecs",
  "reth-eth-wire",
  "reth-network-api",
@@ -6793,7 +5623,7 @@ dependencies = [
  "derive_more",
  "ethers-core",
  "fixed-hash",
- "hash-db 0.15.2",
+ "hash-db",
  "hex",
  "hex-literal 0.4.1",
  "impl-serde",
@@ -6807,12 +5637,12 @@ dependencies = [
  "reth-rlp-derive",
  "revm-primitives",
  "ruint",
- "secp256k1 0.27.0",
+ "secp256k1",
  "serde",
  "serde_json",
  "serde_with",
  "sha2 0.10.8",
- "strum 0.25.0",
+ "strum",
  "sucds",
  "tempfile",
  "thiserror",
@@ -6891,7 +5721,7 @@ name = "reth-rlp"
 version = "0.1.0-alpha.8"
 source = "git+https://github.com/paradigmxyz/reth?rev=e83d3aa#e83d3aa704f87825ca8cab6f593ab4d4adbf6792"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "auto_impl",
  "bytes",
  "c-kzg 0.1.0 (git+https://github.com/ethereum/c-kzg-4844?rev=f5f6f863d475847876a2bd5ee252058d37c3a15d)",
@@ -6984,7 +5814,7 @@ dependencies = [
  "once_cell",
  "revm-primitives",
  "ripemd",
- "secp256k1 0.27.0",
+ "secp256k1",
  "sha2 0.10.8",
  "sha3",
  "substrate-bn",
@@ -7020,26 +5850,10 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
- "hmac 0.12.1",
+ "hmac",
  "subtle",
 ]
 
-[[package]]
-name = "ring"
-version = "0.1.0"
-source = "git+https://github.com/w3f/ring-proof?rev=8657210#86572101f4210647984ab4efedba6b3fcc890895"
-dependencies = [
- "ark-ec",
- "ark-ff 0.4.2",
- "ark-poly",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
- "blake2",
- "common",
- "fflonk",
- "merlin 3.0.0",
-]
-
 [[package]]
 name = "ring"
 version = "0.16.20"
@@ -7062,11 +5876,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
 dependencies = [
  "cc",
- "getrandom 0.2.11",
+ "getrandom",
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -7135,7 +5949,7 @@ checksum = "68e00222152fdc94cacc9b6682b5c0cbe8138f1ee82e80c24a64d9ad2c6d7415"
 dependencies = [
  "anyhow",
  "log",
- "rand 0.8.5",
+ "rand",
  "rayon",
  "risc0-circuit-rv32im-sys",
  "risc0-core",
@@ -7164,7 +5978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08605aec93ea22ed83f7f81f42e2d7287a5b0c749d8671f94de9d5994020045c"
 dependencies = [
  "bytemuck",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -7195,8 +6009,8 @@ dependencies = [
  "log",
  "ndarray",
  "paste",
- "rand 0.8.5",
- "rand_core 0.6.4",
+ "rand",
+ "rand_core",
  "rayon",
  "risc0-core",
  "risc0-sys",
@@ -7220,8 +6034,8 @@ dependencies = [
  "bytes",
  "cfg-if",
  "crypto-bigint",
- "generic-array 0.14.7",
- "getrandom 0.2.11",
+ "generic-array",
+ "getrandom",
  "hex",
  "lazy-regex",
  "libm",
@@ -7231,7 +6045,7 @@ dependencies = [
  "prost 0.12.1",
  "prost-build",
  "protobuf-src",
- "rand 0.8.5",
+ "rand",
  "rayon",
  "risc0-binfmt",
  "risc0-circuit-rv32im",
@@ -7317,7 +6131,7 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types",
  "proptest",
- "rand 0.8.5",
+ "rand",
  "rlp",
  "ruint-macro",
  "serde",
@@ -7367,34 +6181,6 @@ dependencies = [
  "semver 1.0.20",
 ]
 
-[[package]]
-name = "rustix"
-version = "0.36.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.1.4",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "rustix"
-version = "0.37.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.21"
@@ -7404,8 +6190,8 @@ dependencies = [
  "bitflags 2.4.1",
  "errno",
  "libc",
- "linux-raw-sys 0.4.11",
- "windows-sys 0.48.0",
+ "linux-raw-sys",
+ "windows-sys",
 ]
 
 [[package]]
@@ -7480,17 +6266,6 @@ dependencies = [
  "twox-hash",
 ]
 
-[[package]]
-name = "ruzstd"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
-dependencies = [
- "byteorder",
- "thiserror-core",
- "twox-hash",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.15"
@@ -7521,85 +6296,16 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "scale-bits"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "036575c29af9b6e4866ffb7fa055dbf623fe7a9cc159b33786de6013a6969d89"
-dependencies = [
- "parity-scale-codec",
- "scale-info",
- "serde",
-]
-
-[[package]]
-name = "scale-decode"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7789f5728e4e954aaa20cadcc370b99096fb8645fca3c9333ace44bb18f30095"
-dependencies = [
- "derive_more",
- "parity-scale-codec",
- "primitive-types",
- "scale-bits",
- "scale-decode-derive",
- "scale-info",
- "smallvec",
-]
-
-[[package]]
-name = "scale-decode-derive"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27873eb6005868f8cc72dcfe109fae664cf51223d35387bc2f28be4c28d94c47"
-dependencies = [
- "darling 0.14.4",
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "scale-encode"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d70cb4b29360105483fac1ed567ff95d65224a14dd275b6303ed0a654c78de5"
-dependencies = [
- "derive_more",
- "parity-scale-codec",
- "primitive-types",
- "scale-bits",
- "scale-encode-derive",
- "scale-info",
- "smallvec",
-]
-
-[[package]]
-name = "scale-encode-derive"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "995491f110efdc6bea96d6a746140e32bfceb4ea47510750a5467295a4707a25"
-dependencies = [
- "darling 0.14.4",
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "scale-info"
 version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60"
 dependencies = [
- "bitvec",
  "cfg-if",
  "derive_more",
  "parity-scale-codec",
  "scale-info-derive",
- "serde",
 ]
 
 [[package]]
@@ -7614,33 +6320,13 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "scale-value"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6538d1cc1af9c0baf401c57da8a6d4730ef582db0d330d2efa56ec946b5b0283"
-dependencies = [
- "base58",
- "blake2",
- "derive_more",
- "either",
- "frame-metadata 15.1.0",
- "parity-scale-codec",
- "scale-bits",
- "scale-decode",
- "scale-encode",
- "scale-info",
- "serde",
- "yap",
-]
-
 [[package]]
 name = "schannel"
 version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -7678,41 +6364,6 @@ dependencies = [
  "hashbrown 0.13.2",
 ]
 
-[[package]]
-name = "schnorrkel"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
- "curve25519-dalek 2.1.3",
- "getrandom 0.1.16",
- "merlin 2.0.1",
- "rand 0.7.3",
- "rand_core 0.5.1",
- "sha2 0.8.2",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "schnorrkel"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d"
-dependencies = [
- "arrayref",
- "arrayvec 0.7.4",
- "curve25519-dalek-ng",
- "merlin 3.0.0",
- "rand_core 0.6.4",
- "serde_bytes",
- "sha2 0.9.9",
- "subtle-ng",
- "zeroize",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -7725,7 +6376,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d"
 dependencies = [
- "hmac 0.12.1",
+ "hmac",
  "pbkdf2 0.11.0",
  "salsa20",
  "sha2 0.10.8",
@@ -7749,41 +6400,23 @@ checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
  "base16ct",
  "der",
- "generic-array 0.14.7",
+ "generic-array",
  "pkcs8",
  "subtle",
  "zeroize",
 ]
 
-[[package]]
-name = "secp256k1"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
-dependencies = [
- "secp256k1-sys 0.6.1",
-]
-
 [[package]]
 name = "secp256k1"
 version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f"
 dependencies = [
- "rand 0.8.5",
- "secp256k1-sys 0.8.1",
+ "rand",
+ "secp256k1-sys",
  "serde",
 ]
 
-[[package]]
-name = "secp256k1-sys"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "secp256k1-sys"
 version = "0.8.1"
@@ -7793,15 +6426,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "secrecy"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e"
-dependencies = [
- "zeroize",
-]
-
 [[package]]
 name = "security-framework"
 version = "2.9.2"
@@ -8008,7 +6632,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -8022,18 +6646,6 @@ dependencies = [
  "digest 0.10.7",
 ]
 
-[[package]]
-name = "sha2"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
-]
-
 [[package]]
 name = "sha2"
 version = "0.9.9"
@@ -8044,7 +6656,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -8099,7 +6711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
 dependencies = [
  "digest 0.10.7",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -8170,159 +6782,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
-name = "smol"
-version = "1.3.0"
+name = "smol_str"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1"
+checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
 dependencies = [
- "async-channel",
- "async-executor",
- "async-fs",
- "async-io 1.13.0",
- "async-lock 2.8.0",
- "async-net",
- "async-process",
- "blocking",
- "futures-lite 1.13.0",
+ "serde",
 ]
 
 [[package]]
-name = "smol_str"
-version = "0.2.0"
+name = "snap"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
+checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
+
+[[package]]
+name = "socket2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
 dependencies = [
- "serde",
+ "libc",
+ "winapi",
 ]
 
 [[package]]
-name = "smoldot"
-version = "0.8.0"
+name = "socket2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cce5e2881b30bad7ef89f383a816ad0b22c45915911f28499026de4a76d20ee"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
- "arrayvec 0.7.4",
- "async-lock 2.8.0",
- "atomic",
- "base64 0.21.5",
- "bip39",
- "blake2-rfc",
- "bs58",
- "crossbeam-queue",
- "derive_more",
- "ed25519-zebra",
- "either",
- "event-listener 2.5.3",
- "fnv",
- "futures-channel",
- "futures-util",
- "hashbrown 0.14.2",
- "hex",
- "hmac 0.12.1",
- "itertools 0.10.5",
- "libsecp256k1",
- "merlin 3.0.0",
- "no-std-net",
- "nom",
- "num-bigint 0.4.4",
- "num-rational",
- "num-traits",
- "pbkdf2 0.12.2",
- "pin-project",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "ruzstd 0.4.0",
- "schnorrkel 0.10.2",
- "serde",
- "serde_json",
- "sha2 0.10.8",
- "siphasher",
- "slab",
- "smallvec",
- "smol",
- "snow",
- "soketto",
- "tiny-keccak",
- "twox-hash",
- "wasmi",
+ "libc",
+ "windows-sys",
 ]
 
 [[package]]
-name = "smoldot-light"
-version = "0.6.0"
+name = "soketto"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2f7b4687b83ff244ef6137735ed5716ad37dcdf3ee16c4eb1a32fb9808fa47"
-dependencies = [
- "async-lock 2.8.0",
- "blake2-rfc",
- "derive_more",
- "either",
- "event-listener 2.5.3",
- "fnv",
- "futures-channel",
- "futures-util",
- "hashbrown 0.14.2",
- "hex",
- "itertools 0.10.5",
- "log",
- "lru 0.10.1",
- "parking_lot 0.12.1",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "siphasher",
- "slab",
- "smol",
- "smoldot",
-]
-
-[[package]]
-name = "snap"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
-
-[[package]]
-name = "snow"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155"
-dependencies = [
- "aes-gcm",
- "blake2",
- "chacha20poly1305",
- "curve25519-dalek 4.1.1",
- "rand_core 0.6.4",
- "rustc_version 0.4.0",
- "sha2 0.10.8",
- "subtle",
-]
-
-[[package]]
-name = "socket2"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
-dependencies = [
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "soketto"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
+checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
 dependencies = [
  "base64 0.13.1",
  "bytes",
@@ -8330,7 +6828,7 @@ dependencies = [
  "http",
  "httparse",
  "log",
- "rand 0.8.5",
+ "rand",
  "sha-1",
 ]
 
@@ -8496,7 +6994,7 @@ dependencies = [
  "reth-primitives",
  "revm",
  "risc0",
- "secp256k1 0.27.0",
+ "secp256k1",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -8522,7 +7020,7 @@ dependencies = [
  "tendermint",
  "tokio",
  "tracing",
- "tracing-subscriber 0.3.17",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -8574,7 +7072,7 @@ dependencies = [
  "reth-rpc-types-compat",
  "revm",
  "schemars",
- "secp256k1 0.27.0",
+ "secp256k1",
  "serde",
  "serde_json",
  "sov-modules-api",
@@ -8618,7 +7116,7 @@ dependencies = [
  "hex",
  "jmt",
  "jsonrpsee",
- "rand 0.8.5",
+ "rand",
  "schemars",
  "serde",
  "serde_json",
@@ -8880,345 +7378,6 @@ dependencies = [
  "risc0-zkvm-platform",
 ]
 
-[[package]]
-name = "sp-application-crypto"
-version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-core",
- "sp-io",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
-]
-
-[[package]]
-name = "sp-arithmetic"
-version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "integer-sqrt",
- "num-traits",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
- "static_assertions",
-]
-
-[[package]]
-name = "sp-core"
-version = "21.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "array-bytes",
- "bandersnatch_vrfs",
- "bitflags 1.3.2",
- "blake2",
- "bounded-collections",
- "bs58",
- "dyn-clonable",
- "ed25519-zebra",
- "futures",
- "hash-db 0.16.0",
- "hash256-std-hasher",
- "impl-serde",
- "lazy_static",
- "libsecp256k1",
- "log",
- "merlin 2.0.1",
- "parity-scale-codec",
- "parking_lot 0.12.1",
- "paste",
- "primitive-types",
- "rand 0.8.5",
- "regex",
- "scale-info",
- "schnorrkel 0.9.1",
- "secp256k1 0.24.3",
- "secrecy",
- "serde",
- "sp-core-hashing 9.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
- "sp-debug-derive",
- "sp-externalities",
- "sp-runtime-interface",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
- "sp-storage",
- "ss58-registry",
- "substrate-bip39",
- "thiserror",
- "tiny-bip39",
- "tracing",
- "zeroize",
-]
-
-[[package]]
-name = "sp-core-hashing"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ee599a8399448e65197f9a6cee338ad192e9023e35e31f22382964c3c174c68"
-dependencies = [
- "blake2b_simd",
- "byteorder",
- "digest 0.10.7",
- "sha2 0.10.8",
- "sha3",
- "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "twox-hash",
-]
-
-[[package]]
-name = "sp-core-hashing"
-version = "9.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "blake2b_simd",
- "byteorder",
- "digest 0.10.7",
- "sha2 0.10.8",
- "sha3",
- "twox-hash",
-]
-
-[[package]]
-name = "sp-debug-derive"
-version = "8.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "sp-externalities"
-version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "environmental",
- "parity-scale-codec",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
- "sp-storage",
-]
-
-[[package]]
-name = "sp-io"
-version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "bytes",
- "ed25519-dalek",
- "libsecp256k1",
- "log",
- "parity-scale-codec",
- "rustversion",
- "secp256k1 0.24.3",
- "sp-core",
- "sp-externalities",
- "sp-keystore",
- "sp-runtime-interface",
- "sp-state-machine",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
- "sp-tracing",
- "sp-trie",
- "tracing",
- "tracing-core",
-]
-
-[[package]]
-name = "sp-keyring"
-version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "lazy_static",
- "sp-core",
- "sp-runtime",
- "strum 0.24.1",
-]
-
-[[package]]
-name = "sp-keystore"
-version = "0.27.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "parity-scale-codec",
- "parking_lot 0.12.1",
- "sp-core",
- "sp-externalities",
- "thiserror",
-]
-
-[[package]]
-name = "sp-panic-handler"
-version = "8.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "backtrace",
- "lazy_static",
- "regex",
-]
-
-[[package]]
-name = "sp-runtime"
-version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "either",
- "hash256-std-hasher",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "paste",
- "rand 0.8.5",
- "scale-info",
- "serde",
- "sp-application-crypto",
- "sp-arithmetic",
- "sp-core",
- "sp-io",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
- "sp-weights",
-]
-
-[[package]]
-name = "sp-runtime-interface"
-version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "bytes",
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "primitive-types",
- "sp-externalities",
- "sp-runtime-interface-proc-macro",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
- "sp-storage",
- "sp-tracing",
- "sp-wasm-interface",
- "static_assertions",
-]
-
-[[package]]
-name = "sp-runtime-interface-proc-macro"
-version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "Inflector",
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "sp-state-machine"
-version = "0.28.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "hash-db 0.16.0",
- "log",
- "parity-scale-codec",
- "parking_lot 0.12.1",
- "rand 0.8.5",
- "smallvec",
- "sp-core",
- "sp-externalities",
- "sp-panic-handler",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
- "sp-trie",
- "thiserror",
- "tracing",
- "trie-db",
-]
-
-[[package]]
-name = "sp-std"
-version = "8.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53458e3c57df53698b3401ec0934bea8e8cfce034816873c0b0abbd83d7bac0d"
-
-[[package]]
-name = "sp-std"
-version = "8.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-
-[[package]]
-name = "sp-storage"
-version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "impl-serde",
- "parity-scale-codec",
- "ref-cast",
- "serde",
- "sp-debug-derive",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
-]
-
-[[package]]
-name = "sp-tracing"
-version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "parity-scale-codec",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
- "tracing",
- "tracing-core",
- "tracing-subscriber 0.2.25",
-]
-
-[[package]]
-name = "sp-trie"
-version = "22.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "ahash 0.8.6",
- "hash-db 0.16.0",
- "hashbrown 0.13.2",
- "lazy_static",
- "memory-db",
- "nohash-hasher",
- "parity-scale-codec",
- "parking_lot 0.12.1",
- "scale-info",
- "schnellru",
- "sp-core",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
- "thiserror",
- "tracing",
- "trie-db",
- "trie-root",
-]
-
-[[package]]
-name = "sp-wasm-interface"
-version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "anyhow",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
- "wasmtime",
-]
-
-[[package]]
-name = "sp-weights"
-version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0#72c453563937c36b895c543bc5e852e213a54f19"
-dependencies = [
- "parity-scale-codec",
- "scale-info",
- "serde",
- "smallvec",
- "sp-arithmetic",
- "sp-core",
- "sp-debug-derive",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.2.0)",
-]
-
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -9250,21 +7409,6 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
 
-[[package]]
-name = "ss58-registry"
-version = "1.44.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35935738370302d5e33963665b77541e4b990a3e919ec904c837a56cfc891de1"
-dependencies = [
- "Inflector",
- "num-format",
- "proc-macro2",
- "quote",
- "serde",
- "serde_json",
- "unicode-xid",
-]
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -9313,35 +7457,13 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
-[[package]]
-name = "strum"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
-dependencies = [
- "strum_macros 0.24.3",
-]
-
 [[package]]
 name = "strum"
 version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
 dependencies = [
- "strum_macros 0.25.3",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 1.0.109",
+ "strum_macros",
 ]
 
 [[package]]
@@ -9357,19 +7479,6 @@ dependencies = [
  "syn 2.0.39",
 ]
 
-[[package]]
-name = "substrate-bip39"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e620c7098893ba667438b47169c00aacdd9e7c10e042250ce2b60b087ec97328"
-dependencies = [
- "hmac 0.11.0",
- "pbkdf2 0.8.0",
- "schnorrkel 0.9.1",
- "sha2 0.9.9",
- "zeroize",
-]
-
 [[package]]
 name = "substrate-bn"
 version = "0.6.0"
@@ -9379,7 +7488,7 @@ dependencies = [
  "byteorder",
  "crunchy",
  "lazy_static",
- "rand 0.8.5",
+ "rand",
  "rustc-hex",
 ]
 
@@ -9390,137 +7499,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
-name = "subtle-encoding"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dcb1ed7b8330c5eed5441052651dd7a12c75e2ed88f2ec024ae1fa3a5e59945"
-dependencies = [
- "zeroize",
-]
-
-[[package]]
-name = "subtle-ng"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
-
-[[package]]
-name = "subxt"
-version = "0.32.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "588b8ce92699eeb06290f4fb02dad4f7e426c4e6db4d53889c6bcbc808cf24ac"
-dependencies = [
- "async-trait",
- "base58",
- "blake2",
- "derivative",
- "either",
- "frame-metadata 16.0.0",
- "futures",
- "hex",
- "impl-serde",
- "jsonrpsee",
- "parity-scale-codec",
- "primitive-types",
- "scale-bits",
- "scale-decode",
- "scale-encode",
- "scale-info",
- "scale-value",
- "serde",
- "serde_json",
- "sp-core-hashing 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "subxt-lightclient",
- "subxt-macro",
- "subxt-metadata",
- "thiserror",
- "tracing",
-]
-
-[[package]]
-name = "subxt-codegen"
-version = "0.32.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98f5a534c8d475919e9c845d51fc2316da4fcadd04fe17552d932d2106de930e"
-dependencies = [
- "frame-metadata 16.0.0",
- "heck",
- "hex",
- "jsonrpsee",
- "parity-scale-codec",
- "proc-macro2",
- "quote",
- "scale-info",
- "subxt-metadata",
- "syn 2.0.39",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "subxt-lightclient"
-version = "0.32.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10fd0ac9b091211f962b6ae19e26cd08e0b86efa064dfb7fac69c8f79f122329"
-dependencies = [
- "futures",
- "futures-util",
- "serde",
- "serde_json",
- "smoldot-light",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tracing",
-]
-
-[[package]]
-name = "subxt-macro"
-version = "0.32.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e8be9ab6fe88b8c13edbe15911e148482cfb905a8b8d5b8d766a64c54be0bd"
-dependencies = [
- "darling 0.20.3",
- "proc-macro-error",
- "subxt-codegen",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "subxt-metadata"
-version = "0.32.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6898275765d36a37e5ef564358e0341cf41b5f3a91683d7d8b859381b65ac8a"
-dependencies = [
- "frame-metadata 16.0.0",
- "parity-scale-codec",
- "scale-info",
- "sp-core-hashing 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "thiserror",
-]
-
-[[package]]
-name = "subxt-signer"
-version = "0.32.1"
+name = "subtle-encoding"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82e5abb896d5f5a6581d5b86a5e7f015e318122498d8163211e8f61f83b54d2"
+checksum = "7dcb1ed7b8330c5eed5441052651dd7a12c75e2ed88f2ec024ae1fa3a5e59945"
 dependencies = [
- "bip39",
- "hex",
- "hmac 0.12.1",
- "parity-scale-codec",
- "pbkdf2 0.12.2",
- "regex",
- "schnorrkel 0.10.2",
- "secp256k1 0.27.0",
- "secrecy",
- "sha2 0.10.8",
- "sp-core-hashing 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "subxt",
- "thiserror",
  "zeroize",
 ]
 
+[[package]]
+name = "subtle-ng"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
+
 [[package]]
 name = "sucds"
 version = "0.6.0"
@@ -9540,15 +7532,13 @@ dependencies = [
  "bytes",
  "digest 0.10.7",
  "hex",
+ "jsonrpsee",
  "parity-scale-codec",
  "serde",
  "sha2 0.10.8",
  "sov-rollup-interface",
- "sp-keyring",
- "subxt",
- "subxt-signer",
  "sugondat-nmt",
- "sugondat-subxt",
+ "sugondat-shim-common-sovereign",
  "tokio",
  "tracing",
 ]
@@ -9563,12 +7553,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "sugondat-subxt"
+name = "sugondat-shim-common-sovereign"
 version = "0.1.0"
 dependencies = [
- "anyhow",
- "parity-scale-codec",
- "subxt",
+ "async-trait",
+ "jsonrpsee",
+ "serde",
+ "sugondat-nmt",
 ]
 
 [[package]]
@@ -9652,12 +7643,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
-[[package]]
-name = "target-lexicon"
-version = "0.12.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
-
 [[package]]
 name = "tempfile"
 version = "3.8.1"
@@ -9665,10 +7650,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
 dependencies = [
  "cfg-if",
- "fastrand 2.0.1",
+ "fastrand",
  "redox_syscall 0.4.1",
- "rustix 0.38.21",
- "windows-sys 0.48.0",
+ "rustix",
+ "windows-sys",
 ]
 
 [[package]]
@@ -9744,26 +7729,6 @@ dependencies = [
  "thiserror-impl",
 ]
 
-[[package]]
-name = "thiserror-core"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497"
-dependencies = [
- "thiserror-core-impl",
-]
-
-[[package]]
-name = "thiserror-core-impl"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "thiserror-impl"
 version = "1.0.50"
@@ -9835,25 +7800,6 @@ dependencies = [
  "time-core",
 ]
 
-[[package]]
-name = "tiny-bip39"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861"
-dependencies = [
- "anyhow",
- "hmac 0.12.1",
- "once_cell",
- "pbkdf2 0.11.0",
- "rand 0.8.5",
- "rustc-hash",
- "sha2 0.10.8",
- "thiserror",
- "unicode-normalization",
- "wasm-bindgen",
- "zeroize",
-]
-
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -9915,7 +7861,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2 0.5.5",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -9958,7 +7904,7 @@ dependencies = [
  "pin-project-lite",
  "postgres-protocol",
  "postgres-types",
- "rand 0.8.5",
+ "rand",
  "socket2 0.5.5",
  "tokio",
  "tokio-util",
@@ -10180,45 +8126,13 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-serde"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
-dependencies = [
- "serde",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
-dependencies = [
- "ansi_term",
- "chrono",
- "lazy_static",
- "matchers 0.0.1",
- "regex",
- "serde",
- "serde_json",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
- "tracing-serde",
-]
-
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
 dependencies = [
- "matchers 0.1.0",
+ "matchers",
  "nu-ansi-term",
  "once_cell",
  "regex",
@@ -10230,35 +8144,13 @@ dependencies = [
  "tracing-log",
 ]
 
-[[package]]
-name = "trie-db"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642"
-dependencies = [
- "hash-db 0.16.0",
- "hashbrown 0.13.2",
- "log",
- "rustc-hex",
- "smallvec",
-]
-
-[[package]]
-name = "trie-root"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b"
-dependencies = [
- "hash-db 0.16.0",
-]
-
 [[package]]
 name = "triehash"
 version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1631b201eb031b563d2e85ca18ec8092508e262a3196ce9bd10a67ec87b9f5c"
 dependencies = [
- "hash-db 0.15.2",
+ "hash-db",
  "rlp",
 ]
 
@@ -10275,7 +8167,7 @@ dependencies = [
  "lazy_static",
  "log",
  "radix_trie",
- "rand 0.8.5",
+ "rand",
  "thiserror",
  "time",
  "tokio",
@@ -10299,7 +8191,7 @@ dependencies = [
  "ipnet",
  "lazy_static",
  "log",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "thiserror",
  "tinyvec",
@@ -10325,7 +8217,7 @@ dependencies = [
  "http",
  "httparse",
  "log",
- "rand 0.8.5",
+ "rand",
  "rustls",
  "sha1",
  "thiserror",
@@ -10340,8 +8232,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
- "digest 0.10.7",
- "rand 0.8.5",
  "static_assertions",
 ]
 
@@ -10453,7 +8343,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
  "subtle",
 ]
 
@@ -10519,7 +8409,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom",
  "serde",
 ]
 
@@ -10561,12 +8451,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "waker-fn"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
-
 [[package]]
 name = "walkdir"
 version = "2.4.0"
@@ -10586,12 +8470,6 @@ dependencies = [
  "try-lock",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -10664,189 +8542,6 @@ version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
 
-[[package]]
-name = "wasmi"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51fb5c61993e71158abf5bb863df2674ca3ec39ed6471c64f07aeaf751d67b4"
-dependencies = [
- "intx",
- "smallvec",
- "spin 0.9.8",
- "wasmi_arena",
- "wasmi_core",
- "wasmparser-nostd",
-]
-
-[[package]]
-name = "wasmi_arena"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468"
-
-[[package]]
-name = "wasmi_core"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624e6333e861ef49095d2d678b76ebf30b06bf37effca845be7e5b87c90071b7"
-dependencies = [
- "downcast-rs",
- "libm",
- "num-traits",
- "paste",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.102.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b"
-dependencies = [
- "indexmap 1.9.3",
- "url",
-]
-
-[[package]]
-name = "wasmparser-nostd"
-version = "0.100.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724"
-dependencies = [
- "indexmap-nostd",
-]
-
-[[package]]
-name = "wasmtime"
-version = "8.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9"
-dependencies = [
- "anyhow",
- "bincode",
- "cfg-if",
- "indexmap 1.9.3",
- "libc",
- "log",
- "object 0.30.4",
- "once_cell",
- "paste",
- "psm",
- "serde",
- "target-lexicon",
- "wasmparser",
- "wasmtime-environ",
- "wasmtime-jit",
- "wasmtime-runtime",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "wasmtime-asm-macros"
-version = "8.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "wasmtime-environ"
-version = "8.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949"
-dependencies = [
- "anyhow",
- "cranelift-entity",
- "gimli 0.27.3",
- "indexmap 1.9.3",
- "log",
- "object 0.30.4",
- "serde",
- "target-lexicon",
- "thiserror",
- "wasmparser",
- "wasmtime-types",
-]
-
-[[package]]
-name = "wasmtime-jit"
-version = "8.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244"
-dependencies = [
- "addr2line 0.19.0",
- "anyhow",
- "bincode",
- "cfg-if",
- "cpp_demangle 0.3.5",
- "gimli 0.27.3",
- "log",
- "object 0.30.4",
- "rustc-demangle",
- "serde",
- "target-lexicon",
- "wasmtime-environ",
- "wasmtime-jit-icache-coherence",
- "wasmtime-runtime",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "wasmtime-jit-debug"
-version = "8.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "wasmtime-jit-icache-coherence"
-version = "8.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd"
-dependencies = [
- "cfg-if",
- "libc",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "wasmtime-runtime"
-version = "8.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441"
-dependencies = [
- "anyhow",
- "cc",
- "cfg-if",
- "indexmap 1.9.3",
- "libc",
- "log",
- "mach",
- "memfd",
- "memoffset 0.8.0",
- "paste",
- "rand 0.8.5",
- "rustix 0.36.17",
- "wasmtime-asm-macros",
- "wasmtime-environ",
- "wasmtime-jit-debug",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "wasmtime-types"
-version = "8.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f"
-dependencies = [
- "cranelift-entity",
- "serde",
- "thiserror",
- "wasmparser",
-]
-
 [[package]]
 name = "web-sys"
 version = "0.3.65"
@@ -10872,7 +8567,7 @@ dependencies = [
  "either",
  "home",
  "once_cell",
- "rustix 0.38.21",
+ "rustix",
 ]
 
 [[package]]
@@ -10928,16 +8623,7 @@ version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
+ "windows-targets",
 ]
 
 [[package]]
@@ -10946,22 +8632,7 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets",
 ]
 
 [[package]]
@@ -10970,93 +8641,51 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -11079,7 +8708,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
  "cfg-if",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -11152,12 +8781,6 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
 
-[[package]]
-name = "yap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4524214bc4629eba08d78ceb1d6507070cc0bcbbed23af74e19e6e924a24cf"
-
 [[package]]
 name = "yoke"
 version = "0.7.2"
@@ -11275,11 +8898,11 @@ dependencies = [
  "aes 0.8.3",
  "byteorder",
  "bzip2",
- "constant_time_eq 0.1.5",
+ "constant_time_eq",
  "crc32fast",
  "crossbeam-utils",
  "flate2",
- "hmac 0.12.1",
+ "hmac",
  "pbkdf2 0.11.0",
  "sha1",
  "time",

From 90e336bff07523fcc325e8bb90965c5ba1f5b027 Mon Sep 17 00:00:00 2001
From: Sergei Shulepov <s.pepyakin@gmail.com>
Date: Tue, 21 Nov 2023 16:46:09 +0100
Subject: [PATCH 5/5] chore: update README.md

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index a358f914..c3bd121f 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,12 @@ Now you can launch 2 polkadot validators and one sugondat-chain collator
 ./zombienet.sh
 ```
 
+Then launch the sugondat-shim with:
+``` sh
+cd sugondat-shim/
+cargo run -p sugondat-shim serve --node-url=ws://localhost:9988/
+``````
+
 launch the demo rollup with:
 ``` sh
 cd demo/demo-rollup