Remove direct dependency to sp-core

client/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.12.0
 
+- Switch to `avail-rust`
 - Move `crawl` feature to separate bin
 - Binary name changed from `avail-light` to `avail-light-client`
 - Core changes are enumerated in [`core` CHANGELOG](../core/CHANGELOG.md) under the version 1.12.0

client/Cargo.toml

@@ -15,7 +15,6 @@ color-eyre = { workspace = true }
 confy = "0.4.0"
 hex = { workspace = true }
 libp2p = { workspace = true }
-sp-core = { version = "28.0.0", features = ["serde"] }
 strip-ansi-escapes = "0.2.0"
 tokio = { workspace = true }
 tokio-stream = { workspace = true }

client/src/main.rs

@@ -23,6 +23,7 @@ use avail_light_core::{
 use avail_rust::{
 	avail_core::AppId,
 	kate_recovery::{com::AppData, couscous},
+	sp_core::blake2_128,
 };
 use clap::Parser;
 use color_eyre::{
@@ -148,7 +149,7 @@ async fn run(
 
 	let pp = Arc::new(couscous::public_params());
 	let raw_pp = pp.to_raw_var_bytes();
-	let public_params_hash = hex::encode(sp_core::blake2_128(&raw_pp));
+	let public_params_hash = hex::encode(blake2_128(&raw_pp));
 	let public_params_len = hex::encode(raw_pp).len();
 	trace!("Public params ({public_params_len}): hash: {public_params_hash}");
 

core/Cargo.toml

@@ -41,7 +41,6 @@ semver = { workspace = true }
 serde = { workspace = true }
 serde_json = "1.0.125"
 smallvec = "1.6.1"
-sp-core = { version = "28.0.0", features = ["serde"] }
 strip-ansi-escapes = "0.2.0"
 sysinfo = "0.30.12"
 threadpool = "1.8.1"

core/src/api/v2/types.rs

@@ -5,6 +5,7 @@ use avail_rust::{
 	},
 	avail_core::kate::COMMITMENT_SIZE,
 	kate_recovery::{com::AppData, commitments},
+	sp_core::{blake2_256, H256},
 	subxt::config::substrate::{Digest as ApiDigest, DigestItem as ApiDigestItem},
 	AvailHeader,
 };
@@ -17,7 +18,6 @@ use color_eyre::{
 use derive_more::From;
 use hyper::{http, StatusCode};
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
-use sp_core::{blake2_256, H256};
 use std::{
 	collections::{HashMap, HashSet},
 	sync::Arc,
@@ -883,8 +883,9 @@ pub enum WsError {
 mod tests {
 	use std::time::Duration;
 
-	use avail_rust::avail::runtime_types::avail_core::data_lookup::compact::CompactDataLookup;
-	use sp_core::H256;
+	use avail_rust::{
+		avail::runtime_types::avail_core::data_lookup::compact::CompactDataLookup, sp_core::H256,
+	};
 	use tokio::sync::mpsc;
 
 	use crate::{

core/src/data.rs

@@ -2,10 +2,9 @@ use crate::{
 	network::rpc::Node as RpcNode,
 	types::{BlockRange, Uuid},
 };
-use avail_rust::AvailHeader;
+use avail_rust::{sp_core::ed25519, AvailHeader};
 use codec::{Decode, Encode};
 use serde::{Deserialize, Serialize};
-use sp_core::ed25519;
 
 mod keys;
 use keys::*;

core/src/fat_client.rs

@@ -15,14 +15,14 @@ use avail_rust::{
 		data::{self, Cell},
 		matrix::{Dimensions, Partition, Position, RowIndex},
 	},
+	sp_core::blake2_256,
 	AvailHeader, H256,
 };
 use codec::Encode;
 use color_eyre::{eyre::WrapErr, Result};
 use futures::future::join_all;
 use mockall::automock;
 use serde::{Deserialize, Serialize};
-use sp_core::blake2_256;
 use std::{
 	sync::Arc,
 	time::{Duration, Instant},

core/src/finality.rs

@@ -1,13 +1,13 @@
 use std::collections::HashMap;
 
-use codec::Encode;
-use itertools::Itertools;
-use serde::{Deserialize, Serialize};
-use sp_core::{
+use avail_rust::sp_core::{
 	blake2_256,
 	ed25519::{self, Public},
 	Pair, H256,
 };
+use codec::Encode;
+use itertools::Itertools;
+use serde::{Deserialize, Serialize};
 use tracing::{info, warn};
 
 use crate::types::{GrandpaJustification, SignerMessage};
@@ -126,12 +126,16 @@ fn confirm_ancestry(
 mod tests {
 	use super::{check_finality, ValidatorSet};
 	use crate::types::{Commit, GrandpaJustification, Precommit, SignerMessage};
-	use avail_rust::AvailHeader;
+	use avail_rust::{
+		sp_core::{
+			ed25519::{self, Public, Signature},
+			Pair as PairT,
+		},
+		AvailHeader,
+	};
 	use codec::Encode;
 	use hex::FromHex;
 	use serde::{Deserialize, Serialize};
-	use sp_core::ed25519::{self, Public, Signature};
-	use sp_core::Pair as PairT;
 	use std::fs::File;
 	use test_case::test_case;
 

core/src/light_client.rs

@@ -19,11 +19,11 @@
 
 use avail_rust::{
 	kate_recovery::{commitments, matrix::Dimensions},
+	sp_core::blake2_256,
 	AvailHeader, H256,
 };
 use codec::Encode;
 use color_eyre::Result;
-use sp_core::blake2_256;
 use std::{sync::Arc, time::Instant};
 use tracing::{error, info};
 

core/src/network.rs

@@ -5,13 +5,13 @@ use avail_rust::{
 		data::Cell,
 		matrix::{Dimensions, Position},
 	},
+	sp_core::H256,
 };
 use clap::ValueEnum;
 use color_eyre::{eyre::WrapErr, Result};
 use dusk_plonk::prelude::PublicParameters;
 use libp2p::{Multiaddr, PeerId};
 use mockall::automock;
-use sp_core::H256;
 use std::{str::FromStr, sync::Arc, time::Duration};
 use strum::Display;
 use tokio::time::Instant;

core/src/network/rpc.rs

@@ -1,13 +1,13 @@
 use avail_rust::{
 	kate_recovery::matrix::{Dimensions, Position},
+	sp_core::bytes::from_hex,
 	AvailHeader, H256,
 };
 use codec::{Decode, Encode};
 use color_eyre::{eyre::eyre, Result};
 use configuration::RPCConfig;
 use rand::{seq::SliceRandom, thread_rng, Rng};
 use serde::{de, Deserialize, Serialize};
-use sp_core::bytes::from_hex;
 use std::{collections::HashSet, fmt::Display};
 use tokio::{
 	sync::broadcast,

core/src/network/rpc/client.rs

@@ -3,6 +3,7 @@ use avail_rust::{
 	avail_core::AppId,
 	kate_recovery::{data::Cell, matrix::Position},
 	primitives::kate::{Cells, GProof, GRawScalar, Rows},
+	sp_core::{bytes::from_hex, crypto, ed25519::Public, H256, U256},
 	subxt::{
 		self, backend::legacy::rpc_methods::StorageKey, client::RuntimeVersion, rpc_params,
 		tx::SubmittableExtrinsic, utils::AccountId32,
@@ -14,7 +15,6 @@ use color_eyre::{
 	Report, Result,
 };
 use futures::{Stream, TryFutureExt, TryStreamExt};
-use sp_core::{bytes::from_hex, ed25519::Public, H256, U256};
 use std::sync::Arc;
 use tokio::sync::RwLock;
 use tokio_retry::Retry;
@@ -620,10 +620,9 @@ impl<D: Database> Client<D> {
 	) -> Result<Option<AccountId32>> {
 		let res = self
 			.with_retries(|client| {
-				let session_key_key_owner = avail::storage().session().key_owner(
-					KeyTypeId(sp_core::crypto::key_types::GRANDPA.0),
-					public_key.0,
-				);
+				let session_key_key_owner = avail::storage()
+					.session()
+					.key_owner(KeyTypeId(crypto::key_types::GRANDPA.0), public_key.0);
 				async move {
 					client
 						.api

core/src/network/rpc/subscriptions.rs

@@ -1,10 +1,13 @@
-use avail_rust::{primitives::block::grandpa::AuthorityId, AvailHeader};
+use avail_rust::{
+	primitives::block::grandpa::AuthorityId,
+	sp_core::{
+		blake2_256,
+		ed25519::{self, Public},
+	},
+	AvailHeader,
+};
 use codec::Encode;
 use color_eyre::{eyre::eyre, Result};
-use sp_core::{
-	blake2_256,
-	ed25519::{self, Public},
-};
 use std::time::Instant;
 use tokio::sync::broadcast::Sender;
 use tokio_stream::StreamExt;

core/src/sync_client.rs

@@ -31,6 +31,7 @@ use crate::{
 use async_trait::async_trait;
 use avail_rust::{
 	kate_recovery::{commitments, matrix::Dimensions},
+	sp_core::{blake2_256, H256},
 	AvailHeader,
 };
 use codec::Encode;
@@ -39,7 +40,6 @@ use color_eyre::{
 	Result,
 };
 use mockall::automock;
-use sp_core::{blake2_256, H256};
 use std::{ops::Range, time::Instant};
 use tokio::sync::broadcast;
 use tracing::{error, info, warn};

core/src/sync_finality.rs

@@ -1,5 +1,6 @@
 use async_trait::async_trait;
 use avail_rust::{
+	sp_core::{blake2_256, ed25519, twox_128, H256},
 	subxt::{backend::legacy::rpc_methods::StorageKey, utils::AccountId32},
 	AvailHeader,
 };
@@ -9,7 +10,6 @@ use color_eyre::{
 	Result,
 };
 use futures::future::join_all;
-use sp_core::{blake2_256, ed25519, twox_128, H256};
 use std::iter::zip;
 use tracing::{error, info, trace};
 

core/src/types.rs

@@ -8,6 +8,10 @@ use crate::utils::{extract_app_lookup, extract_kate};
 use avail_rust::{
 	avail_core::DataLookup,
 	kate_recovery::{commitments, matrix::Dimensions},
+	sp_core::{
+		crypto::{self, Ss58Codec},
+		{blake2_256, bytes, ed25519, H256},
+	},
 	subxt_signer::{
 		bip39::{Language, Mnemonic},
 		SecretString, SecretUri,
@@ -19,8 +23,6 @@ use color_eyre::{eyre::eyre, Report, Result};
 use libp2p::kad::Mode as KadMode;
 use libp2p::{Multiaddr, PeerId};
 use serde::{de::Error, Deserialize, Serialize};
-use sp_core::crypto::Ss58Codec;
-use sp_core::{blake2_256, bytes, ed25519, H256};
 use std::fmt::{self, Display, Formatter};
 use std::ops::Range;
 use std::str::FromStr;
@@ -573,7 +575,7 @@ impl IdentityConfig {
 
 		let avail_key_pair = Keypair::from_uri(&suri)?;
 		let avail_address = avail_key_pair.public_key().to_account_id();
-		let avail_address = sp_core::crypto::AccountId32::from(avail_address.0).to_ss58check();
+		let avail_address = crypto::AccountId32::from(avail_address.0).to_ss58check();
 		let avail_public_key = hex::encode(avail_key_pair.public_key());
 
 		Ok(IdentityConfig {