refactor: moved helpers to utils package

Cargo.toml

@@ -71,6 +71,7 @@ union-protos = { package = "protos", git = "https://github.com/unionlabs/union",
 # Other dependencies
 reqwest = { version = "0.12", features = ["json"] }
 tokio = { version = "1", features = ["full"] }
+async-trait = "0.1"
 time = { version = "0.3", default-features = false, features = ["macros", "parsing"] }
 alloy-primitives = "0.8"
 alloy-contract = "0.5"

operator/Cargo.toml

@@ -17,13 +17,10 @@ tendermint = { workspace = true }
 tendermint-rpc = { workspace = true }
 tendermint-light-client-verifier = { workspace = true }
 
-ibc-client-tendermint = { workspace = true }
+ibc-client-tendermint-types = { workspace = true }
 ibc-core-client-types = { workspace = true }
 ibc-core-commitment-types = { workspace = true }
-ibc-core-host-types = { workspace = true, features = ["std"] }
-ibc-core-host-cosmos = { workspace = true }
 
-sp1-ics07-tendermint-update-client = { workspace = true }
 sp1-ics07-tendermint-solidity = { workspace = true, features = ["rpc"] }
 sp1-ics07-tendermint-utils = { workspace = true }
 sp1-ics07-tendermint-prover = { workspace = true }
@@ -41,7 +38,6 @@ futures = { workspace = true }
 serde_json = { workspace = true }
 serde = { workspace = true }
 serde_with = { workspace = true }
-sha2 = { workspace = true }
 dotenv = { workspace = true }
 subtle-encoding = { workspace = true }
 anyhow = { workspace = true }

operator/src/lib.rs

@@ -2,6 +2,4 @@
 #![deny(missing_docs, clippy::nursery, clippy::pedantic, warnings)]
 
 pub mod cli;
-pub mod helpers;
-pub(crate) mod rpc;
 pub mod runners;

operator/src/runners/fixtures/membership.rs

@@ -2,13 +2,11 @@
 
 use crate::{
     cli::command::{fixtures::MembershipCmd, OutputPath},
-    helpers::union::convert_to_union_proof,
-    rpc::TendermintRpcExt,
     runners::genesis::SP1ICS07TendermintGenesis,
 };
 use alloy_sol_types::SolValue;
 use core::str;
-use ibc_client_tendermint::types::ConsensusState;
+use ibc_client_tendermint_types::ConsensusState;
 use ibc_core_commitment_types::merkle::MerkleProof;
 use serde::{Deserialize, Serialize};
 use sp1_ics07_tendermint_prover::{programs::MembershipProgram, prover::SP1ICS07TendermintProver};
@@ -19,7 +17,9 @@ use sp1_ics07_tendermint_solidity::{
     },
     ISP1Msgs::SP1Proof,
 };
-use sp1_ics07_tendermint_utils::convert_tm_to_ics_merkle_proof;
+use sp1_ics07_tendermint_utils::{
+    merkle::convert_tm_to_ics_merkle_proof, rpc::TendermintRpcExt, union::convert_to_union_proof,
+};
 use sp1_sdk::HashableKey;
 use std::path::PathBuf;
 use tendermint_rpc::{Client, HttpClient};

operator/src/runners/fixtures/misbehaviour.rs

@@ -2,12 +2,10 @@
 
 use crate::{
     cli::command::{fixtures::MisbehaviourCmd, OutputPath},
-    helpers::light_block::LightBlockExt,
-    rpc::TendermintRpcExt,
     runners::genesis::SP1ICS07TendermintGenesis,
 };
 use alloy_sol_types::SolValue;
-use ibc_client_tendermint::types::Misbehaviour;
+use ibc_client_tendermint_types::Misbehaviour;
 use ibc_proto::ibc::lightclients::tendermint::v1::Misbehaviour as RawMisbehaviour;
 use serde::{Deserialize, Serialize};
 use sp1_ics07_tendermint_prover::{
@@ -18,6 +16,7 @@ use sp1_ics07_tendermint_solidity::{
     IMisbehaviourMsgs::MsgSubmitMisbehaviour,
     ISP1Msgs::SP1Proof,
 };
+use sp1_ics07_tendermint_utils::{light_block::LightBlockExt, rpc::TendermintRpcExt};
 use sp1_sdk::HashableKey;
 use std::path::PathBuf;
 use tendermint_rpc::HttpClient;

operator/src/runners/fixtures/uc_and_mem.rs

@@ -2,15 +2,13 @@
 
 use crate::{
     cli::command::{fixtures::UpdateClientAndMembershipCmd, OutputPath},
-    helpers::light_block::LightBlockExt,
-    rpc::TendermintRpcExt,
     runners::{
         fixtures::membership::SP1ICS07MembershipFixture, genesis::SP1ICS07TendermintGenesis,
     },
 };
 use alloy_sol_types::SolValue;
 use core::str;
-use ibc_client_tendermint::types::ConsensusState;
+use ibc_client_tendermint_types::ConsensusState;
 use ibc_core_commitment_types::merkle::MerkleProof;
 use sp1_ics07_tendermint_prover::{
     programs::UpdateClientAndMembershipProgram, prover::SP1ICS07TendermintProver,
@@ -21,7 +19,8 @@ use sp1_ics07_tendermint_solidity::{
     ISP1Msgs::SP1Proof,
     IUpdateClientAndMembershipMsgs::UcAndMembershipOutput,
 };
-use sp1_ics07_tendermint_utils::convert_tm_to_ics_merkle_proof;
+use sp1_ics07_tendermint_utils::merkle::convert_tm_to_ics_merkle_proof;
+use sp1_ics07_tendermint_utils::{light_block::LightBlockExt, rpc::TendermintRpcExt};
 use sp1_sdk::HashableKey;
 use std::path::PathBuf;
 use tendermint_rpc::{Client, HttpClient};

operator/src/runners/fixtures/update_client.rs

@@ -2,8 +2,6 @@
 
 use crate::{
     cli::command::{fixtures::UpdateClientCmd, OutputPath},
-    helpers::light_block::LightBlockExt,
-    rpc::TendermintRpcExt,
     runners::genesis::SP1ICS07TendermintGenesis,
 };
 use alloy_sol_types::SolValue;
@@ -16,6 +14,7 @@ use sp1_ics07_tendermint_solidity::{
     ISP1Msgs::SP1Proof,
     IUpdateClientMsgs::{MsgUpdateClient, UpdateClientOutput},
 };
+use sp1_ics07_tendermint_utils::{light_block::LightBlockExt, rpc::TendermintRpcExt};
 use sp1_sdk::HashableKey;
 use std::path::PathBuf;
 use tendermint_rpc::HttpClient;

operator/src/runners/genesis.rs

@@ -1,16 +1,13 @@
 //! Contains the runner for the genesis command.
 
-use crate::{
-    cli::command::{genesis::Args, OutputPath},
-    helpers::light_block::LightBlockExt,
-    rpc::TendermintRpcExt,
-};
+use crate::cli::command::{genesis::Args, OutputPath};
 use alloy_sol_types::SolValue;
 use sp1_ics07_tendermint_prover::programs::{
     MembershipProgram, MisbehaviourProgram, SP1Program, UpdateClientAndMembershipProgram,
     UpdateClientProgram,
 };
 use sp1_ics07_tendermint_solidity::IICS07TendermintMsgs::ConsensusState as SolConsensusState;
+use sp1_ics07_tendermint_utils::{light_block::LightBlockExt, rpc::TendermintRpcExt};
 use sp1_sdk::{utils::setup_logger, HashableKey};
 use std::path::PathBuf;
 use tendermint_light_client_verifier::types::{LightBlock, TrustThreshold};