fixes, imports

succinctlabs · Jan 17, 2024 · 2a3f086 · 2a3f086
1 parent 987d4e3
commit 2a3f086
Show file tree

Hide file tree

Showing 8 changed files with 1,129 additions and 425 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -69,19 +69,27 @@ redis = { version = "0.23.3", features = [
 ] }
 
 dotenv = "0.15.0"
-avail-subxt = { git = "https://github.com/availproject/avail.git", rev = "df16508" }
+avail-subxt = { git = "https://github.com/availproject/avail.git", rev = "e976c56" }
+subxt = { version = "0.29" }
+sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
 sha2 = { version = "0.10.8", default-features = false }
-sp-core = { version = "21.0.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "3", default-features = false, features = [
     "derive",
     "full",
     "bit-vec",
 ] }
 alloy-sol-types = "0.4.2"
 alloy-primitives = "0.4.2"
-subxt = "0.29"
 anyhow = "1.0.68"
 clap = "4.4.9"
 rs_merkle = "1.4.1"
 [dev-dependencies]
 anyhow = "1.0.68"
+
+# Dependency `subxt` uses it's own 'version' of sp-core so we need to patch it :)
+[patch.crates-io]
+sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
+sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
+sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
+sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
+sp-core-hashing = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
diff --git a/bin/genesis.rs b/bin/genesis.rs
@@ -9,9 +9,9 @@
 
 use std::env;
 
+use avail_subxt::config::Header;
 use clap::Parser;
 use log::info;
-use subxt::config::Header;
 use vectorx::input::RpcDataFetcher;
 
 #[derive(Parser, Debug, Clone)]

diff --git a/bin/indexer.rs b/bin/indexer.rs
@@ -12,12 +12,12 @@ use std::ops::Deref;
 
 use avail_subxt::api;
 use avail_subxt::config::Header as HeaderTrait;
+use avail_subxt::subxt_rpc::RpcParams;
 use codec::Encode;
 use log::debug;
 use plonky2x::frontend::ecc::curve25519::ed25519::eddsa::DUMMY_SIGNATURE;
 use sp_core::ed25519::{self};
 use sp_core::{blake2_256, Pair, H256};
-use subxt::rpc::RpcParams;
 use vectorx::input::types::{GrandpaJustification, SignerMessage, StoredJustificationData};
 use vectorx::input::RpcDataFetcher;
 
@@ -35,7 +35,10 @@ pub async fn main() {
     );
 
     let mut fetcher = RpcDataFetcher::new().await;
-    let sub: Result<avail_subxt::rpc::Subscription<GrandpaJustification>, subxt::Error> = fetcher
+    let sub: Result<
+        avail_subxt::subxt_rpc::Subscription<GrandpaJustification>,
+        subxt::error::Error,
+    > = fetcher
         .client
         .rpc()
         .deref()

diff --git a/circuits/builder/decoder.rs b/circuits/builder/decoder.rs
@@ -104,8 +104,7 @@ impl<L: PlonkParameters<D>, const D: usize> DecodingMethods for CircuitBuilder<L
             .zip(header_hashes.as_vec().iter())
             .map(|(header, header_hash)| self.decode_header::<S>(header, header_hash))
             .collect::<Vec<HeaderVariable>>()
-            .try_into()
-            .unwrap()
+            .into()
     }
 
     /// Decode a header into its components. header_hash is used for the RLC challenge.
@@ -324,7 +323,7 @@ pub mod tests {
                 let header_len = header.len();
                 header.resize(MAX_HEADER_SIZE, 0);
                 EncodedHeader {
-                    header_bytes: header.as_slice().try_into().unwrap(),
+                    header_bytes: header.as_slice().into(),
                     header_size: header_len as u32,
                 }
             })

diff --git a/circuits/builder/header.rs b/circuits/builder/header.rs
@@ -52,8 +52,7 @@ impl<L: PlonkParameters<D>, const D: usize> HeaderMethods for CircuitBuilder<L,
             .iter()
             .map(|x| self.hash_encoded_header::<MAX_HEADER_SIZE, MAX_CHUNK_SIZE>(x))
             .collect::<Vec<Bytes32Variable>>()
-            .try_into()
-            .unwrap()
+            .into()
     }
 }
 
@@ -187,7 +186,7 @@ mod tests {
                 let header_len = header.len();
                 header.resize(MAX_HEADER_SIZE, 0);
                 EncodedHeader {
-                    header_bytes: header.as_slice().try_into().unwrap(),
+                    header_bytes: header.as_slice().into(),
                     header_size: header_len as u32,
                 }
             })

diff --git a/circuits/dummy_step.rs b/circuits/dummy_step.rs
@@ -1,5 +1,5 @@
+use avail_subxt::config::Header;
 use rustx::program::Program;
-use subxt::config::Header;
 
 use crate::input::RpcDataFetcher;
 

diff --git a/circuits/input/mod.rs b/circuits/input/mod.rs
@@ -8,7 +8,7 @@ use std::time::Duration;
 use avail_subxt::avail::Client;
 use avail_subxt::config::substrate::DigestItem;
 use avail_subxt::primitives::Header;
-use avail_subxt::rpc::RpcParams;
+use avail_subxt::subxt_rpc::RpcParams;
 use avail_subxt::{api, build_client};
 use codec::{Compact, Decode, Encode};
 use ed25519_dalek::{PublicKey, Signature, Verifier};
@@ -222,7 +222,7 @@ impl RpcDataFetcher {
         let client = build_client(url.as_str(), false).await.unwrap();
         let redis_client = RedisClient::new().await;
         RpcDataFetcher {
-            client,
+            client: client.0,
             avail_url: url,
             redis_client,
             save: None,
@@ -235,7 +235,7 @@ impl RpcDataFetcher {
                 Ok(_) => return Ok(()),
                 Err(_) => match build_client(self.avail_url.as_str(), false).await {
                     Ok(new_client) => {
-                        self.client = new_client;
+                        self.client = new_client.0;
                         return Ok(());
                     }
                     Err(_) => {