From ffe1319ea1edfb86c36591100b4d902eb27bbf27 Mon Sep 17 00:00:00 2001
From: Francisco J Silva <franjs.francisco@gmail.com>
Date: Mon, 27 Jan 2025 16:53:21 +0000
Subject: [PATCH] moving get_signer function to parentchain-signer crate

---
 .../omni-executor/executor-worker/src/main.rs |  2 +-
 .../parentchain/listener/src/lib.rs           | 26 +++----------------
 .../parentchain/signer/src/lib.rs             | 24 +++++++++++++++++
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/tee-worker/omni-executor/executor-worker/src/main.rs b/tee-worker/omni-executor/executor-worker/src/main.rs
index 4ecfc0880e..c51911af4c 100644
--- a/tee-worker/omni-executor/executor-worker/src/main.rs
+++ b/tee-worker/omni-executor/executor-worker/src/main.rs
@@ -113,7 +113,7 @@ async fn main() -> Result<(), ()> {
 		},
 		Commands::GenKey(args) => {
 			let key_store = Arc::new(SubstrateKeyStore::new(args.keystore_path));
-			let _ = parentchain_listener::get_signer(key_store);
+			let _ = parentchain_signer::get_signer(key_store);
 		},
 	}
 
diff --git a/tee-worker/omni-executor/parentchain/listener/src/lib.rs b/tee-worker/omni-executor/parentchain/listener/src/lib.rs
index 42f5a0b398..346eb4eada 100644
--- a/tee-worker/omni-executor/parentchain/listener/src/lib.rs
+++ b/tee-worker/omni-executor/parentchain/listener/src/lib.rs
@@ -23,22 +23,20 @@ use crate::event_handler::EventHandler;
 use crate::fetcher::Fetcher;
 use crate::listener::ParentchainListener;
 use executor_core::intent_executor::IntentExecutor;
-use executor_core::key_store::KeyStore;
 use executor_core::listener::Listener;
 use executor_core::sync_checkpoint_repository::FileCheckpointRepository;
 use executor_storage::{AccountStoreStorage, MemberOmniAccountStorage, StorageDB};
-use log::{error, info};
+use log::error;
 use parentchain_api_interface::{
-	runtime_types::{core_primitives::teebag::types::DcapProvider, ethereum::transaction},
+	runtime_types::core_primitives::teebag::types::DcapProvider,
 	teebag::calls::types::register_enclave::{AttestationType, WorkerMode, WorkerType},
 };
 use parentchain_rpc_client::{
 	metadata::SubxtMetadataProvider, CustomConfig, SubstrateRpcClient, SubxtClient,
 	SubxtClientFactory,
 };
-use parentchain_signer::{key_store::SubstrateKeyStore, TransactionSigner};
+use parentchain_signer::{get_signer, key_store::SubstrateKeyStore, TransactionSigner};
 use std::sync::Arc;
-use subxt_core::utils::AccountId32;
 use subxt_core::Metadata;
 use subxt_signer::sr25519::Keypair;
 use tokio::runtime::Handle;
@@ -112,23 +110,6 @@ where
 	Listener::new(id, handle, fetcher, event_handler, stop_signal, last_processed_log_repository)
 }
 
-pub fn get_signer(key_store: Arc<SubstrateKeyStore>) -> Keypair {
-	let secret_key_bytes = key_store
-		.read()
-		.map_err(|e| {
-			error!("Could not unseal key: {:?}", e);
-		})
-		.unwrap();
-	let signer = subxt_signer::sr25519::Keypair::from_secret_key(secret_key_bytes)
-		.map_err(|e| {
-			error!("Could not create secret key: {:?}", e);
-		})
-		.unwrap();
-
-	info!("Substrate signer address: {}", AccountId32::from(signer.public_key()));
-	signer
-}
-
 #[allow(unused_assignments, unused_mut, unused_variables, clippy::type_complexity)]
 async fn perform_attestation(
 	client_factory: Arc<SubxtClientFactory<CustomConfig>>,
@@ -149,6 +130,7 @@ async fn perform_attestation(
 
 	#[cfg(feature = "gramine-quote")]
 	{
+		use log::info;
 		use std::fs;
 		use std::fs::File;
 		use std::io::Write;
diff --git a/tee-worker/omni-executor/parentchain/signer/src/lib.rs b/tee-worker/omni-executor/parentchain/signer/src/lib.rs
index 32d096e80a..42c1231448 100644
--- a/tee-worker/omni-executor/parentchain/signer/src/lib.rs
+++ b/tee-worker/omni-executor/parentchain/signer/src/lib.rs
@@ -1,3 +1,27 @@
 pub mod key_store;
 mod signer;
 pub use signer::TransactionSigner;
+
+use executor_core::key_store::KeyStore;
+use key_store::SubstrateKeyStore;
+use log::{error, info};
+use std::sync::Arc;
+use subxt_core::utils::AccountId32;
+use subxt_signer::sr25519::Keypair;
+
+pub fn get_signer(key_store: Arc<SubstrateKeyStore>) -> Keypair {
+	let secret_key_bytes = key_store
+		.read()
+		.map_err(|e| {
+			error!("Could not unseal key: {:?}", e);
+		})
+		.unwrap();
+	let signer = subxt_signer::sr25519::Keypair::from_secret_key(secret_key_bytes)
+		.map_err(|e| {
+			error!("Could not create secret key: {:?}", e);
+		})
+		.unwrap();
+
+	info!("Substrate signer address: {}", AccountId32::from(signer.public_key()));
+	signer
+}