Move util files from ether-email-auth to utils repo

zkemail · Sep 16, 2024 · 856015a · 856015a
1 parent 3506483
commit 856015a
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 347 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/relayer/Cargo.toml b/packages/relayer/Cargo.toml
@@ -24,7 +24,8 @@ serde_json = "1.0.68"
 tiny_http = "0.12.0"
 lettre = { version = "0.10.4", features = ["tokio1", "tokio1-native-tls"] }
 ethers = { version = "2.0.10", features = ["abigen"] }
-relayer-utils = { version = "0.3.7", git = "https://github.com/zkemail/relayer-utils.git" }
+# relayer-utils = { version = "0.3.7", git = "https://github.com/zkemail/relayer-utils.git" }
+relayer-utils = { path = "../../../relayer-utils" }
 futures = "0.3.28"
 sqlx = { version = "=0.7.3", features = ["postgres", "runtime-tokio"] }
 regex = "1.10.2"

diff --git a/packages/relayer/src/chain.rs b/packages/relayer/src/chain.rs
@@ -4,6 +4,7 @@ use ethers::middleware::Middleware;
 use ethers::prelude::*;
 use ethers::signers::Signer;
 use relayer_utils::converters::u64_to_u8_array_32;
+use relayer_utils::TemplateValue;
 
 const CONFIRMATIONS: usize = 1;
 

diff --git a/packages/relayer/src/core.rs b/packages/relayer/src/core.rs
@@ -10,7 +10,10 @@ use ethers::{
     abi::{encode, Token},
     utils::keccak256,
 };
-use relayer_utils::{extract_substr_idxes, generate_email_circuit_input, EmailCircuitParams, LOG};
+use relayer_utils::{
+    extract_substr_idxes, extract_template_vals_from_command, generate_email_circuit_input,
+    generate_proof, EmailCircuitParams, LOG,
+};
 
 const DOMAIN_FIELDS: usize = 9;
 const COMMAND_FIELDS: usize = 20;

diff --git a/packages/relayer/src/lib.rs b/packages/relayer/src/lib.rs
@@ -8,7 +8,7 @@ pub mod config;
 pub mod core;
 pub mod database;
 pub mod modules;
-pub mod utils;
+pub mod strings;
 
 pub use abis::*;
 pub use chain::*;
@@ -17,7 +17,7 @@ pub use core::*;
 pub use database::*;
 pub use modules::*;
 use relayer_utils::LOG;
-pub use utils::*;
+pub use strings::*;
 
 use tokio::sync::Mutex;
 

diff --git a/packages/relayer/src/modules/web_server/rest_api.rs b/packages/relayer/src/modules/web_server/rest_api.rs
@@ -3,7 +3,7 @@ use anyhow::Result;
 use axum::Json;
 use hex::decode;
 use rand::Rng;
-use relayer_utils::LOG;
+use relayer_utils::{calculate_account_salt, extract_template_vals, TemplateValue, LOG};
 use serde::{Deserialize, Serialize};
 use std::str;
 

diff --git a/packages/relayer/src/utils/strings.rs → packages/relayer/src/strings.rs b/packages/relayer/src/utils/strings.rs → packages/relayer/src/strings.rs
diff --git a/packages/relayer/src/utils/mod.rs b/packages/relayer/src/utils/mod.rs
diff --git a/packages/relayer/src/utils/subject_templates.rs b/packages/relayer/src/utils/subject_templates.rs