Release v1.2.17

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "1.2.10"
+version = "1.2.15"
 authors = ["Tangle Foundation."]
 edition = "2021"
 license = "Unlicense"
@@ -48,6 +48,7 @@ members = [
     "precompiles/assets",
     "precompiles/vesting",
     "precompiles/staking",
+    "precompiles/rewards",
     "tangle-subxt",
     "evm-tracer",
 ]
@@ -334,6 +335,7 @@ pallet-evm-precompile-verify-schnorr-signatures = { path = "precompiles/verify-s
 pallet-evm-precompile-verify-bls381-signature = { path = "precompiles/verify-bls381-signature", default-features = false }
 pallet-evm-precompile-services = { path = "precompiles/services", default-features = false }
 pallet-evm-precompile-tangle-lst = { path = "precompiles/tangle-lst", default-features = false }
+pallet-evm-precompile-rewards = { path = "precompiles/rewards", default-features = false }
 
 # Precompiles utils
 postcard = { version = "1", default-features = false }

node/Cargo.toml

@@ -85,6 +85,8 @@ pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 sc-transaction-pool-api = { workspace = true }
+pallet-ismp-runtime-api = { workspace = true }
+pallet-ismp-rpc = { workspace = true }
 
 # Frontier
 fc-api = { workspace = true }

node/src/manual_seal.rs

@@ -508,6 +508,7 @@ pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as Block
 			Some(shared_authority_set.clone()),
 		);
 
+		let backend_clone = backend.clone();
 		Box::new(
 			move |deny_unsafe, subscription_task_executor: sc_rpc::SubscriptionTaskExecutor| {
 				let deps = crate::rpc::FullDeps {
@@ -524,6 +525,7 @@ pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as Block
 						subscription_executor: subscription_task_executor.clone(),
 						finality_provider: finality_proof_provider.clone(),
 					},
+					backend: backend_clone.clone(),
 				};
 
 				crate::rpc::create_full(

node/src/rpc/mod.rs

@@ -18,10 +18,12 @@
 use jsonrpsee::RpcModule;
 use std::sync::Arc;
 // Substrate
+use pallet_ismp_rpc::{IsmpApiServer, IsmpRpcHandler};
 use sc_client_api::{
 	backend::{Backend, StorageProvider},
 	client::BlockchainEvents,
 };
+use sc_client_api::{BlockBackend, ProofProvider};
 use sc_consensus_babe::BabeWorkerHandle;
 use sc_consensus_grandpa::{
 	FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,
@@ -34,6 +36,7 @@ use sp_api::{CallApiAt, ProvideRuntimeApi};
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 use sp_consensus::SelectChain;
 use sp_consensus_babe::BabeApi;
+use sp_core::H256;
 use sp_keystore::KeystorePtr;
 use sp_runtime::traits::Block as BlockT;
 use tangle_primitives::Block;
@@ -87,6 +90,8 @@ pub struct FullDeps<C, P, A: ChainApi, CT, SC, B, CIDP> {
 	pub select_chain: SC,
 	/// GRANDPA specific dependencies.
 	pub grandpa: GrandpaDeps<B>,
+	/// Backend
+	pub backend: Arc<B>,
 }
 
 pub struct DefaultEthConfig<C, BE>(std::marker::PhantomData<(C, BE)>);
@@ -113,7 +118,7 @@ pub fn create_full<C, P, BE, A, CT, SC, B, CIDP>(
 	>,
 ) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>
 where
-	C: CallApiAt<Block> + ProvideRuntimeApi<Block>,
+	C: CallApiAt<Block> + ProvideRuntimeApi<Block> + ProofProvider<Block> + BlockBackend<Block>,
 	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
 	C::Api: sp_block_builder::BlockBuilder<Block>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
@@ -134,6 +139,7 @@ where
 		+ HeaderMetadata<Block, Error = BlockChainError>
 		+ StorageProvider<Block, BE>,
 	BE: Backend<Block> + 'static,
+	C::Api: pallet_ismp_runtime_api::IsmpRuntimeApi<Block, H256>,
 	P: TransactionPool<Block = Block> + 'static,
 	A: ChainApi<Block = Block> + 'static,
 	CT: fp_rpc::ConvertTransaction<<Block as BlockT>::Extrinsic> + Send + Sync + 'static,
@@ -150,7 +156,7 @@ where
 	use substrate_frame_rpc_system::{System, SystemApiServer};
 
 	let mut io = RpcModule::new(());
-	let FullDeps { client, pool, deny_unsafe, eth, babe, select_chain, grandpa } = deps;
+	let FullDeps { client, pool, deny_unsafe, eth, babe, select_chain, grandpa, backend } = deps;
 
 	let GrandpaDeps {
 		shared_voter_state,
@@ -164,6 +170,7 @@ where
 	io.merge(TransactionPayment::new(client.clone()).into_rpc())?;
 	io.merge(ServicesClient::new(client.clone()).into_rpc())?;
 	io.merge(RewardsClient::new(client.clone()).into_rpc())?;
+	io.merge(IsmpRpcHandler::new(client.clone(), backend)?.into_rpc())?;
 
 	if let Some(babe) = babe {
 		let BabeDeps { babe_worker_handle, keystore } = babe;
@@ -207,7 +214,7 @@ pub fn create_full<C, P, BE, A, CT, SC, B, CIDP>(
 	>,
 ) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>
 where
-	C: CallApiAt<Block> + ProvideRuntimeApi<Block>,
+	C: CallApiAt<Block> + ProvideRuntimeApi<Block> + ProofProvider<Block> + BlockBackend<Block>,
 	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
 	C::Api: sp_block_builder::BlockBuilder<Block>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
@@ -221,6 +228,7 @@ where
 		+ HeaderMetadata<Block, Error = BlockChainError>
 		+ StorageProvider<Block, BE>,
 	BE: Backend<Block> + 'static,
+	// C::Api: pallet_ismp_runtime_api::IsmpRuntimeApi<Block, H256>,
 	P: TransactionPool<Block = Block> + 'static,
 	A: ChainApi<Block = Block> + 'static,
 	CT: fp_rpc::ConvertTransaction<<Block as BlockT>::Extrinsic> + Send + Sync + 'static,
@@ -235,7 +243,9 @@ where
 	use substrate_frame_rpc_system::{System, SystemApiServer};
 
 	let mut io = RpcModule::new(());
-	let FullDeps { client, pool, deny_unsafe, eth, babe, select_chain, grandpa } = deps;
+
+	#[allow(unused_variables)]
+	let FullDeps { client, pool, deny_unsafe, eth, babe, select_chain, grandpa, backend } = deps;
 
 	if let Some(babe) = babe {
 		let BabeDeps { babe_worker_handle, keystore } = babe;
@@ -255,6 +265,7 @@ where
 
 	io.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?;
 	io.merge(TransactionPayment::new(client.clone()).into_rpc())?;
+	//io.merge(IsmpRpcHandler::new(client.clone(), backend)?.into_rpc())?;
 
 	io.merge(
 		Grandpa::new(

node/src/service.rs

@@ -525,6 +525,7 @@ pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as Block
 			Some(shared_authority_set.clone()),
 		);
 
+		let backend_clone = backend.clone();
 		Box::new(
 			move |deny_unsafe, subscription_task_executor: sc_rpc::SubscriptionTaskExecutor| {
 				let deps = crate::rpc::FullDeps {
@@ -544,6 +545,7 @@ pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as Block
 						subscription_executor: subscription_task_executor.clone(),
 						finality_provider: finality_proof_provider.clone(),
 					},
+					backend: backend_clone.clone(),
 				};
 
 				crate::rpc::create_full(