Ensure sha3 hasher and update RISC0 to v3 (#50)

* Upgrade to risc v3

* Upgrade to risc v3

* Update metadata and Enable Sha3-256

* Update metadata and Enable Sha3-256

* Update scripts

* More logs

* Update the sha3 hasher in prover

Author: Gauthamastro

Cargo.lock

@@ -93,23 +93,20 @@ impl GrandpaLightClient {
 #[cfg(test)]
 mod tests {
 	use crate::GrandpaLightClient;
-	use gradium_client::subxt::gradium::runtime_types::bridge_common::Network;
 	use gradium_client::subxt::{GradiumHeader, GradiumHost};
-	use gradium_client::subxt_config::GradiumConfig;
 	use grandpa_primitives::{
 		bridge_pallet_outward_transfers_storage_key, OutwardTransferProofsWithFinalityProofs,
 		StorageProofs,
 	};
-	use grandpa_prover::{GrandpaProver, ProverOptions};
-	use grandpa_verifier_primitives::FinalityProof;
 	use primitive_types::H256;
 	use sp_core::bytes::from_hex;
 	use std::str::FromStr;
+	use super::*;
 
 	#[test]
 	pub fn test_storage_key_generation() {
 		let expected = from_hex("0xe6991a77b75772082ed70e0f6bfcb472ac2b29d8e83fcacefb4e9b52159a86ff9ea2d098b5f70192f96c06f38d3fbc970100000000000000").unwrap();
-		let key = bridge_pallet_outward_transfers_storage_key(1).0;
+		let key = bridge_pallet_outward_transfers_storage_key(1, super::Network::BSC).0;
 		assert_eq!(key, expected);
 	}
 
@@ -120,11 +117,12 @@ mod tests {
 			.await
 			.unwrap();
 		let previous_finalized_head =
-			H256::from_str("0x2a06949fa43d0d2d0af10001ac9e9941ff0bd7f09a4b7f0bb673cca32ca13d94")
+			H256::from_str("0x412e83325a312a308857fdc84e12a5830dde751835f8972f93b5411978a29e52")
 				.unwrap();
 		let last_finalized_header: GradiumHeader = host
 			.fetch_header(previous_finalized_head.0.into())
 			.await
+			.unwrap()
 			.unwrap();
 		let last_finalized_head = host.fetch_last_finalized_head().await.unwrap();
 		let initial_state = host
@@ -133,7 +131,7 @@ mod tests {
 			.unwrap();
 		let at = initial_state.latest_hash;
 		let mut grandpa =
-			GrandpaLightClient::initialize(initial_state.clone(), Network::BSC.into());
+			GrandpaLightClient::initialize(initial_state.clone(), super::Network::BSC.into());
 		println!("Initial: {}", grandpa.consensus_state.latest_height);
 		let finality_proof = host
 			.fetch_gradium_finality_proofs(initial_state.latest_height, 2000)

lightclients/grandpa/src/lib.rs

@@ -1,7 +1,7 @@
 use crate::subxt::gradium::bridge::calls::types::initialize_bsc_lightclient::CurrentEpochHeader;
 use crate::subxt::gradium::runtime_types::bridge_common::PendingTransactions;
 use crate::subxt::gradium::runtime_types::tron_primitives::TronLightClientState;
-use crate::subxt_config::GradiumHeader;
+pub use crate::subxt_config::GradiumHeader;
 use crate::subxt_config::{GradiumBlock, GradiumConfig};
 use alloy::hex;
 use anyhow::anyhow;
@@ -242,7 +242,7 @@ impl GradiumHost {
 		}
 
 		let target_block_number = max_height;
-		log::trace!(target:"gradium","Target block number: {target_block_number}");
+		log::trace!(target:"gradium","previous_finalized_height: {previous_finalized_height}..Target block number: {target_block_number}");
 
 		let mut target_block_hash = None;
 
@@ -256,7 +256,7 @@ impl GradiumHost {
 			unknown_headers.push(header.clone());
 
 			if let Some(_) = find_scheduled_change(&header) {
-				log::trace!(target:"gradium","Found set rotation at block number {height:?}");
+				log::trace!(target:"gradium","Found set rotation at block number {height:?} with hash: {hash:?}");
 				if height != previous_finalized_height {
 					target_block_hash = Some(hash);
 					// stop here
@@ -315,7 +315,7 @@ impl GradiumHost {
 				}
 			}
 		}
-
+		log::trace!(target:"gradium","target_block_hash: {target_block_hash:?}");
 		// If we didn't find any valid target block, return an error
 		if target_block_hash.is_none() {
 			return Err(anyhow!(
@@ -326,6 +326,7 @@ impl GradiumHost {
 		let target_block_hash =
 			target_block_hash.expect("Already checked that target_block_hash is Some; qed");
 		let block = self.fetch_block(target_block_hash).await?;
+		log::trace!(target:"gradium","target_block with hash: {target_block_hash:?} retrieved");
 		// get GRANDPA justification
 		let justification = block
 			.justifications
@@ -339,6 +340,7 @@ impl GradiumHost {
 			.fetch_block_hash(previous_finalized_height.into())
 			.await?
 			.ok_or(anyhow!("Block hash not found"))?;
+		log::trace!(target:"gradium","previously_finalized_hash: {previously_finalized_hash:?}, previous_finalized_height: {previous_finalized_height:?}");
 		let ancestry = AncestryChain::new(&unknown_headers);
 		let canonical = ancestry
 			.ancestry(

network-clients/gradium/metadata.scale

@@ -2,7 +2,7 @@ use crate::subxt::gradium::runtime_types::fp_account::EthereumSignature;
 use scale_codec::Decode;
 use sp_core::H256;
 use sp_runtime::traits::Hash;
-use subxt::config::substrate::{BlakeTwo256, SubstrateHeader};
+use subxt::config::substrate::{SubstrateHeader};
 use subxt::config::{transaction_extensions, Hasher};
 use subxt::ext::codec::Encode;
 use subxt::ext::subxt_core::utils::AccountId20;
@@ -16,14 +16,14 @@ pub enum GradiumConfig {}
 pub type BlockNumber = u32;
 
 /// The hashing algorithm used by the chain.
-// pub type Hashing = Sha3_256;
-pub type Hashing = BlakeTwo256;
+pub type Hashing = Sha3_256;
+// pub type Hashing = BlakeTwo256;
 
 /// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
 pub type Signature = EthereumSignature;
 
 /// Gradium header type
-pub type GradiumHeader = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo256>;
+pub type GradiumHeader = sp_runtime::generic::Header<u32, sha3_substrate_hashing::Sha3Hashing>;
 /// Gradium block type
 pub type GradiumBlock = sp_runtime::generic::SignedBlock<
 	sp_runtime::generic::Block<GradiumHeader, sp_runtime::OpaqueExtrinsic>,

network-clients/gradium/src/subxt.rs

@@ -14,8 +14,8 @@ clap = { workspace = true, features = ["derive"] }
 scale-codec = { workspace = true }
 hex = {workspace = true}
 quantova_methods = { path = "../quantova_methods" }
-risc0-zkvm = "2.2.0"
-risc0-ethereum-contracts = { git = "https://github.com/risc0/risc0-ethereum.git", tag = "v2.2.2" }
+risc0-zkvm = "3.0.3"
+risc0-ethereum-contracts = { git = "https://github.com/risc0/risc0-ethereum.git", tag = "v3.0.0" }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 gradium-client = { path = "../../../../network-clients/gradium" }
 tokio = { workspace = true }

network-clients/gradium/src/subxt_config.rs

@@ -107,21 +107,22 @@ async fn main() -> anyhow::Result<()> {
 			"Received last finalized header: {}",
 			last_finalized_header.hash()
 		);
-
+		println!("Fetching grandpa state...");
 		// Fetch the grandpa state at the last finalized hash
 		let grandpa_state = gradium_client
 			.fetch_grandpa_state_at(Some(last_finalized_hash.0.into()))
 			.await?;
-
+		println!("Fetching grandpa finality proofs...");
 		// Fetch the finality proof from the last accepted hash to latest finalized block in gradium
 		let finality_proof = gradium_client
 			.fetch_gradium_finality_proofs(last_finalized_header.number, args.max_block_range)
 			.await?;
-
+		println!("Fetching quantova last processed nonce...");
 		// Look at the last processed nonce in Destination
 		let last_processed_nonce = client.fetch_last_processed_nonce().await?;
 
 		let at = finality_proof.block.0;
+		println!("Fetching read proofs...");
 		// Look at last outgoing nonce in gradium
 		let (read_proof, nonces) = gradium_client
 			.fetch_read_proofs_for_pending_nonces(
@@ -156,6 +157,7 @@ async fn main() -> anyhow::Result<()> {
 		// Proof information by proving the specified ELF binary.
 		// This struct contains the receipt along with statistics about execution of the guest
 		log::info!(target:"relayer","Proving...");
+		println!("Proving...");
 		let start = std::time::Instant::now();
 		let prove_info = prover.prove_with_ctx(
 			env,

relayers/outward/evm/prover/Cargo.toml

@@ -14,7 +14,6 @@ use scale_codec::{Decode, Encode};
 use bridge_common::Network;
 
 #[test]
-#[ignore]
 fn test_zk_proving() {
 	let verifier_params = Groth16ReceiptVerifierParameters::default();
 	println!("Control root: {:?}", verifier_params.control_root);

relayers/outward/evm/prover/src/main.rs

@@ -4,7 +4,7 @@ version = "1.0.0"
 edition = "2021"
 
 [build-dependencies]
-risc0-build = "2.2.0"
+risc0-build = "3.0.3"
 
 [package.metadata.risc0]
 methods = ["grandpa"]