From 41525475525e1e7a4d9dab5e18deefff34861e67 Mon Sep 17 00:00:00 2001
From: dancoombs <dan.coombs@alchemy.com>
Date: Wed, 10 Jan 2024 16:29:57 -0500
Subject: [PATCH] wip

---
 Cargo.lock              | 46 +++++++++++++++++++++++++++++++++++++----
 bin/tools/Cargo.toml    |  4 ++++
 crates/types/Cargo.toml |  2 ++
 crates/types/src/lib.rs |  3 +++
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4f20a1840..b27089d3d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1298,6 +1298,15 @@ dependencies = [
  "syn 2.0.32",
 ]
 
+[[package]]
+name = "envy"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f47e0157f2cb54f5ae1bd371b30a2ae4311e1c028f575cd4e81de7353215965"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -3202,6 +3211,12 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
 [[package]]
 name = "path-slash"
 version = "0.2.1"
@@ -4140,13 +4155,16 @@ dependencies = [
  "anyhow",
  "clap",
  "dotenv",
+ "envy",
  "ethers",
  "ethers-signers",
  "rundler-dev",
  "rundler-rpc",
+ "rundler-types",
  "rusoto_core",
  "rusoto_kms",
  "serde_json",
+ "serde_yaml",
  "tokio",
 ]
 
@@ -4158,6 +4176,7 @@ dependencies = [
  "chrono",
  "ethers",
  "parse-display",
+ "paste",
  "rundler-utils",
  "serde",
  "serde_json",
@@ -4554,18 +4573,18 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.160"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.160"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4633,6 +4652,19 @@ dependencies = [
  "syn 2.0.32",
 ]
 
+[[package]]
+name = "serde_yaml"
+version = "0.9.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c"
+dependencies = [
+ "indexmap 2.0.0",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
 [[package]]
 name = "sha-1"
 version = "0.9.8"
@@ -5603,6 +5635,12 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
+
 [[package]]
 name = "untrusted"
 version = "0.7.1"
diff --git a/bin/tools/Cargo.toml b/bin/tools/Cargo.toml
index a812724b0..7bd09d109 100644
--- a/bin/tools/Cargo.toml
+++ b/bin/tools/Cargo.toml
@@ -12,6 +12,7 @@ Rundler tools
 [dependencies]
 rundler-dev = { path = "../../crates/dev" }
 rundler-rpc = { path = "../../crates/rpc" }
+rundler-types = { path = "../../crates/types" }
 
 anyhow = "1.0.70"
 clap = { version = "4.2.4", features = ["derive", "env"] }
@@ -22,3 +23,6 @@ rusoto_core = { version = "0.48.0", default-features = false, features = ["rustl
 rusoto_kms = { version = "0.48.0", default-features = false, features = ["rustls"] }
 serde_json = "1.0.96"
 tokio.workspace = true
+
+envy = "0.4"
+serde_yaml = "0.9"
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index 153e8e570..87e8f5f05 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -17,5 +17,7 @@ serde.workspace = true
 serde_json.workspace = true
 strum.workspace = true
 
+paste = "1.0"
+
 [build-dependencies]
 ethers.workspace = true
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
index e7930de9b..f4116eaa4 100644
--- a/crates/types/src/lib.rs
+++ b/crates/types/src/lib.rs
@@ -44,3 +44,6 @@ pub use user_operation::UserOperationId;
 
 mod storage;
 pub use storage::StorageSlot;
+
+mod chain_spec;
+pub use chain_spec::{ChainSpec, OptionalChainSpec};