diff --git a/.gitignore b/.gitignore
index 32e0c2d..eee53d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /target
 config
 /testdata/downloaded
-.DS_Store
\ No newline at end of file
+bin/sgx-prover/sgx/private.pem
+.DS_Store
diff --git a/Cargo.lock b/Cargo.lock
index 4cbed70..b93bc7d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -422,6 +422,7 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525"
 dependencies = [
+ "alloy-json-abi",
  "alloy-sol-macro-input",
  "const-hex",
  "heck 0.5.0",
@@ -440,11 +441,13 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e482dc33a32b6fadbc0f599adea520bd3aaa585c141a80b404d0a3e3fa72528"
 dependencies = [
+ "alloy-json-abi",
  "const-hex",
  "dunce",
  "heck 0.5.0",
  "proc-macro2",
  "quote",
+ "serde_json",
  "syn 2.0.76",
  "syn-solidity",
 ]
@@ -465,6 +468,7 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7"
 dependencies = [
+ "alloy-json-abi",
  "alloy-primitives",
  "alloy-sol-macro",
  "const-hex",
@@ -788,7 +792,7 @@ version = "0.1.0"
 source = "git+https://github.com/automata-network/automata-sgx-sdk#86a40e22744d83cc42d306a8e886137440eb409c"
 dependencies = [
  "automata-sgx-sdk-sysroot",
- "base 1.0.0",
+ "base",
  "cc",
  "ctor",
  "serde",
@@ -821,26 +825,17 @@ dependencies = [
 
 [[package]]
 name = "base"
-version = "0.4.6"
+version = "1.0.0"
+source = "git+https://github.com/automata-network/base-rs#d189ecc97ca5aa1572ab998c332e0b432067ec14"
 dependencies = [
  "alloy",
  "async-trait",
  "chrono",
- "env_logger",
- "log",
+ "libflate",
  "secp256k1",
  "serde",
- "serde_json",
- "tokio",
-]
-
-[[package]]
-name = "base"
-version = "1.0.0"
-source = "git+https://github.com/automata-network/base-rs#42b6607918d20d4fa5b2b4ea1309792607a4f88e"
-dependencies = [
- "chrono",
  "tokio",
+ "url",
 ]
 
 [[package]]
@@ -937,6 +932,9 @@ name = "bitflags"
 version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "bitvec"
@@ -946,6 +944,7 @@ checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
 dependencies = [
  "funty",
  "radium",
+ "serde",
  "tap",
  "wyz",
 ]
@@ -959,6 +958,19 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "bls12_381"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7bc6d6292be3a19e6379786dac800f551e5865a5bb51ebbe3064ab80433f403"
+dependencies = [
+ "ff",
+ "group",
+ "pairing",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "blst"
 version = "0.3.13"
@@ -973,12 +985,13 @@ dependencies = [
 [[package]]
 name = "bn254"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/bn254#1773ed6c51f14652272056370cf135ff5d7a01c5"
+source = "git+https://github.com/scroll-tech/bn254.git?branch=master#db67681f5e9ae1736565a48ec294a6d0dacb4e0d"
 dependencies = [
  "ff",
  "getrandom",
  "rand 0.8.5",
  "rand_core 0.6.4",
+ "sp1-intrinsics",
  "subtle",
 ]
 
@@ -1164,15 +1177,6 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
-[[package]]
-name = "clients"
-version = "0.4.6"
-dependencies = [
- "alloy",
- "base 0.4.6",
- "url",
-]
-
 [[package]]
 name = "coins-bip32"
 version = "0.8.7"
@@ -1529,7 +1533,7 @@ dependencies = [
 [[package]]
 name = "encoder"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/da-codec#9e32313056ac5535b9024ed2db97db73cba3bbc3"
+source = "git+https://github.com/scroll-tech/da-codec#8c5d2f0cd707153151a5154fef702204f6ca40b3"
 dependencies = [
  "zstd",
 ]
@@ -2065,6 +2069,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash 0.8.11",
  "allocator-api2",
+ "serde",
 ]
 
 [[package]]
@@ -2642,6 +2647,21 @@ dependencies = [
  "sha3-asm",
 ]
 
+[[package]]
+name = "kzg-rs"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd9920cd4460ce3cbca19c62f3bb9a9611562478a4dc9d2c556f4a7d049c5b6b"
+dependencies = [
+ "bls12_381",
+ "glob",
+ "hex",
+ "once_cell",
+ "serde",
+ "serde_derive",
+ "serde_yaml",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -2705,10 +2725,10 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "linea-executor"
-version = "0.4.6"
+version = "0.5.0"
 dependencies = [
  "alloy",
- "base 0.4.6",
+ "base",
  "linea-zktrie",
  "log",
  "revm 13.0.0 (git+https://github.com/automata-network/linea-revm?branch=linea-revm/v41)",
@@ -2717,7 +2737,7 @@ dependencies = [
 
 [[package]]
 name = "linea-mimc"
-version = "0.4.6"
+version = "0.5.0"
 dependencies = [
  "ff_ce",
  "lazy_static",
@@ -2728,10 +2748,10 @@ dependencies = [
 
 [[package]]
 name = "linea-shomei"
-version = "0.4.6"
+version = "0.5.0"
 dependencies = [
  "alloy",
- "clients",
+ "base",
  "linea-zktrie",
  "log",
  "serde",
@@ -2740,12 +2760,11 @@ dependencies = [
 
 [[package]]
 name = "linea-test"
-version = "0.4.6"
+version = "0.5.0"
 dependencies = [
  "alloy",
- "base 0.4.6",
+ "base",
  "clap",
- "clients",
  "linea-shomei",
  "linea-verifier",
  "log",
@@ -2756,11 +2775,10 @@ dependencies = [
 
 [[package]]
 name = "linea-verifier"
-version = "0.4.6"
+version = "0.5.0"
 dependencies = [
  "alloy",
- "base 0.4.6",
- "clients",
+ "base",
  "linea-executor",
  "linea-mimc",
  "linea-shomei",
@@ -2775,11 +2793,11 @@ dependencies = [
 
 [[package]]
 name = "linea-zktrie"
-version = "0.4.6"
+version = "0.5.0"
 dependencies = [
  "alloy",
  "alloy-rlp",
- "base 0.4.6",
+ "base",
  "lazy_static",
  "linea-mimc",
  "log",
@@ -3068,6 +3086,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
+[[package]]
+name = "pairing"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f"
+dependencies = [
+ "group",
+]
+
 [[package]]
 name = "parity-scale-codec"
 version = "3.6.12"
@@ -3216,10 +3243,11 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 [[package]]
 name = "poseidon-bn254"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/poseidon-bn254?branch=master#a1174dac3d854bd91556b54274551326a94b11e6"
+source = "git+https://github.com/scroll-tech/poseidon-bn254?branch=master#a96ba028dd00987551451d8f4bd65b7ea5469a44"
 dependencies = [
  "bn254",
  "itertools 0.13.0",
+ "sp1-intrinsics",
 ]
 
 [[package]]
@@ -3316,7 +3344,7 @@ dependencies = [
 
 [[package]]
 name = "prometheus"
-version = "0.4.6"
+version = "0.5.0"
 dependencies = [
  "alloy",
 ]
@@ -3343,14 +3371,13 @@ dependencies = [
 
 [[package]]
 name = "prover"
-version = "0.4.6"
+version = "0.5.0"
 dependencies = [
  "alloy",
  "async-trait",
  "automata-sgx-sdk",
- "base 0.4.6",
+ "base",
  "clap",
- "clients",
  "env_logger",
  "hex",
  "jsonrpsee",
@@ -3359,6 +3386,7 @@ dependencies = [
  "log",
  "prometheus",
  "prover-types",
+ "scroll-da-codec",
  "scroll-executor",
  "scroll-verifier",
  "serde",
@@ -3369,11 +3397,13 @@ dependencies = [
 
 [[package]]
 name = "prover-types"
-version = "0.4.6"
+version = "0.5.0"
 dependencies = [
  "alloy",
- "base 0.4.6",
+ "base",
+ "env_logger",
  "libflate",
+ "log",
  "serde",
  "serde_json",
 ]
@@ -3758,11 +3788,13 @@ dependencies = [
  "auto_impl",
  "bitflags 2.6.0",
  "bitvec",
+ "c-kzg",
  "cfg-if",
  "dyn-clone",
  "enumn",
  "hashbrown 0.14.5",
  "hex",
+ "kzg-rs",
  "poseidon-bn254",
  "serde",
 ]
@@ -4129,11 +4161,29 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "scroll-da-codec"
+version = "0.1.0"
+source = "git+https://github.com/automata-network/scroll-prover#83efeadde5b2097bf2fc8211bc95ffa2378dff3a"
+dependencies = [
+ "base",
+ "blst",
+ "c-kzg",
+ "encoder",
+ "hex",
+ "lazy_static",
+ "log",
+ "scroll-executor",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "scroll-executor"
-version = "0.4.6"
+version = "0.1.0"
+source = "git+https://github.com/automata-network/scroll-prover#83efeadde5b2097bf2fc8211bc95ffa2378dff3a"
 dependencies = [
- "base 0.4.6",
+ "base",
  "eth-types",
  "mpt-zktrie",
  "revm 13.0.0 (git+https://github.com/automata-network/scroll-revm?branch=scroll-evm-executor/v41)",
@@ -4143,11 +4193,10 @@ dependencies = [
 
 [[package]]
 name = "scroll-test"
-version = "0.4.6"
+version = "0.5.0"
 dependencies = [
- "base 0.4.6",
+ "base",
  "clap",
- "clients",
  "env_logger",
  "hex",
  "log",
@@ -4160,19 +4209,19 @@ dependencies = [
 
 [[package]]
 name = "scroll-verifier"
-version = "0.4.6"
+version = "0.1.0"
+source = "git+https://github.com/automata-network/scroll-prover#83efeadde5b2097bf2fc8211bc95ffa2378dff3a"
 dependencies = [
  "alloy",
- "base 0.4.6",
+ "base",
  "blst",
  "c-kzg",
- "clients",
  "encoder",
  "hex",
  "lazy_static",
  "log",
- "prover-types",
  "rlp",
+ "scroll-da-codec",
  "scroll-executor",
  "scroll-zstd",
  "serde",
@@ -4182,7 +4231,7 @@ dependencies = [
 [[package]]
 name = "scroll-zstd"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/da-codec#9e32313056ac5535b9024ed2db97db73cba3bbc3"
+source = "git+https://github.com/scroll-tech/da-codec#8c5d2f0cd707153151a5154fef702204f6ca40b3"
 dependencies = [
  "encoder",
 ]
@@ -4377,6 +4426,19 @@ dependencies = [
  "syn 2.0.76",
 ]
 
+[[package]]
+name = "serde_yaml"
+version = "0.9.34+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+dependencies = [
+ "indexmap 2.4.0",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
 [[package]]
 name = "sgx-dcap-ql-rs"
 version = "0.1.0"
@@ -4395,7 +4457,7 @@ dependencies = [
 
 [[package]]
 name = "sgx-prover"
-version = "0.4.6"
+version = "0.5.0"
 dependencies = [
  "automata-build-script",
  "automata-sgx-sdk",
@@ -4625,6 +4687,14 @@ dependencies = [
  "sha1",
 ]
 
+[[package]]
+name = "sp1-intrinsics"
+version = "0.0.0"
+source = "git+https://github.com/scroll-tech/sp1-intrinsics.git?branch=master#7e038e60db0b2e847f6d8f49e148ccac8c6fc394"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -5115,6 +5185,12 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
 
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -5521,7 +5597,7 @@ dependencies = [
 [[package]]
 name = "zktrie"
 version = "0.3.0"
-source = "git+https://github.com/scroll-tech/zktrie.git?branch=main#460b8c22af65b7809164548cba1e0253b6db5a70"
+source = "git+https://github.com/scroll-tech/zktrie.git?branch=main#0527b14b29abde8ba9fbaf34315d545cf32618a0"
 dependencies = [
  "gobuild",
  "zktrie_rust",
@@ -5530,10 +5606,11 @@ dependencies = [
 [[package]]
 name = "zktrie_rust"
 version = "0.3.0"
-source = "git+https://github.com/scroll-tech/zktrie.git?branch=main#460b8c22af65b7809164548cba1e0253b6db5a70"
+source = "git+https://github.com/scroll-tech/zktrie.git?branch=main#0527b14b29abde8ba9fbaf34315d545cf32618a0"
 dependencies = [
  "hex",
  "lazy_static",
+ "log",
  "num",
  "num-derive",
  "num-traits",
diff --git a/Cargo.toml b/Cargo.toml
index 453d7ca..a52fb1f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,20 +1,20 @@
 [workspace]
 resolver = "2"
-members = ["bin/*", "crates/base", "crates/clients", "crates/prover", "crates/prover-types", "crates/prometheus", "crates/scroll/*", "crates/linea/*"]
+members = ["bin/*", "crates/prover", "crates/prover-types", "crates/prometheus", "crates/linea/*"]
 
 [workspace.package]
 edition = "2021"
-version = "0.4.6"
+version = "0.5.0"
 authors = ["Automata Team"]
 homepage = "https://www.ata.network/"
 
 [workspace.dependencies]
-clients = { path = "crates/clients" }
-base = { path = "crates/base" }
+base = { git = "https://github.com/automata-network/base-rs", features = ["prover"] }
 prover-types = { path = "crates/prover-types" }
 prometheus = { path = "crates/prometheus" }
-scroll-executor = { path = "crates/scroll/executor" }
-scroll-verifier = { path = "crates/scroll/verifier" }
+scroll-executor = { git = "https://github.com/automata-network/scroll-prover" }
+scroll-verifier = { git = "https://github.com/automata-network/scroll-prover" }
+scroll-da-codec = { git = "https://github.com/automata-network/scroll-prover" }
 linea-mimc = { path = "crates/linea/mimc" }
 linea-zktrie = { path = "crates/linea/zktrie" }
 linea-shomei = { path = "crates/linea/shomei" }
@@ -28,7 +28,7 @@ serde_json = { version = "1" }
 automata-sgx-sdk = { git = "https://github.com/automata-network/automata-sgx-sdk" }
 automata-build-script = { git = "https://github.com/automata-network/automata-sgx-sdk" }
 blst = { version = "=0.3.13" } # make sure the patch takes effect
-scroll-revm = { package = "revm", git = "https://github.com/automata-network/scroll-revm", branch = "scroll-evm-executor/v41", default-features = false, features = ["scroll-default-handler", "std", "optional_no_base_fee", "scroll-poseidon-codehash"] }
+scroll-revm = { package = "revm", git = "https://github.com/automata-network/scroll-revm", branch = "scroll-evm-executor/v41", default-features = false, features = ["scroll-default-handler", "std", "optional_no_base_fee", "scroll-poseidon-codehash", "serde"] }
 linea-revm = { package = "revm", git = "https://github.com/automata-network/linea-revm", branch = "linea-revm/v41", default-features = false, features = ["std", "secp256k1"] }
 lazy_static = "1.5.0"
 
diff --git a/bin/linea-test/Cargo.toml b/bin/linea-test/Cargo.toml
index a914973..a71588c 100644
--- a/bin/linea-test/Cargo.toml
+++ b/bin/linea-test/Cargo.toml
@@ -9,7 +9,6 @@ tokio = { version = "1.0", features = ["full"] }
 base.workspace = true
 linea-shomei.workspace = true
 log.workspace = true
-clients.workspace = true
 alloy.workspace = true
 linea-verifier.workspace = true
 serde_json.workspace = true
diff --git a/bin/linea-test/src/main.rs b/bin/linea-test/src/main.rs
index 1e252f5..56bbef3 100644
--- a/bin/linea-test/src/main.rs
+++ b/bin/linea-test/src/main.rs
@@ -15,6 +15,8 @@ struct Opt {
     shomei_version: String,
     #[clap(long, default_value = "http://127.0.0.1:8545", env = "BESU")]
     besu: String,
+    #[clap(long, default_value = "60")]
+    timeout_secs: u64,
 
     #[clap(default_value = "0")]
     block: u64,
@@ -22,7 +24,7 @@ struct Opt {
 
 #[tokio::main]
 async fn main() {
-    base::init_log();
+    prover_types::init_log();
 
     let opt = Opt::parse();
     let mut eth = None;
@@ -62,6 +64,7 @@ async fn fetch_or_gen_block_trace(
     let cfg = linea_shomei::ShomeiConfig {
         endpoint: opt.shomei.clone(),
         version: opt.shomei_version.clone(),
+        timeout_secs: Some(opt.timeout_secs),
     };
     let client = linea_shomei::Client::new(cfg).unwrap();
     if eth.is_none() {
diff --git a/bin/scroll-test/Cargo.toml b/bin/scroll-test/Cargo.toml
index ceb0b7c..fbf4d53 100644
--- a/bin/scroll-test/Cargo.toml
+++ b/bin/scroll-test/Cargo.toml
@@ -8,7 +8,6 @@ clap = { version = "4", features = ["derive"] }
 scroll-verifier.workspace = true
 scroll-executor.workspace = true
 prover-types.workspace = true
-clients.workspace = true
 hex.workspace = true
 serde_json.workspace = true
 tokio = { version = "1.0", features = ["full"] }
diff --git a/bin/sgx-prover/sgx/private.pem b/bin/sgx-prover/sgx/private.pem
deleted file mode 100644
index 529d07b..0000000
--- a/bin/sgx-prover/sgx/private.pem
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIG4gIBAAKCAYEAroOogvsj/fZDZY8XFdkl6dJmky0lRvnWMmpeH41Bla6U1qLZ
-AmZuyIF+mQC/cgojIsrBMzBxb1kKqzATF4+XwPwgKz7fmiddmHyYz2WDJfAjIveJ
-ZjdMjM4+EytGlkkJ52T8V8ds0/L2qKexJ+NBLxkeQLfV8n1mIk7zX7jguwbCG1Pr
-nEMdJ3Sew20vnje+RsngAzdPChoJpVsWi/K7cettX/tbnre1DL02GXc5qJoQYk7b
-3zkmhz31TgFrd9VVtmUGyFXAysuSAb3EN+5VnHGr0xKkeg8utErea2FNtNIgua8H
-ONfm9Eiyaav1SVKzPHlyqLtcdxH3I8Wg7yqMsaprZ1n5A1v/levxnL8+It02KseD
-5HqV4rf/cImSlCt3lpRg8U5E1pyFQ2IVEC/XTDMiI3c+AR+w2jSRB3Bwn9zJtFlW
-KHG3m1xGI4ck+Lci1JvWWLXQagQSPtZTsubxTQNx1gsgZhgv1JHVZMdbVlAbbRMC
-1nSuJNl7KPAS/VfzAgEDAoIBgHRXxaynbVP5gkO0ug6Qw/E27wzIw4SmjsxG6Wpe
-K7kfDeRskKxESdsA/xCrKkwGwhcx1iIgS5+Qscd1Yg+1D9X9asd/P7waPmWoZd+Z
-AhlKwhdPsO7PiF3e1AzHhGQwsUTt/Y/aSI1MpHBvy2/s1h9mFCslOUxTmWw0oj/Q
-ldIEgWeNR72CE2+jFIJIyml6ftnb6qzPiga8Bm48ubKh0kvySOqnkmnPzgh+JBD6
-JnBmtZbfPT97bwTT+N6rnPqOOApvfHPf15kWI8yDbprG1l4OCUaIUH1AszxLd826
-5IPM+8gINLRDP1MA6azECPjTyHXhtnSIBZCyWSVkc05vYmNXYUNiXWMajcxW9M02
-wKzFELO8NCEAkaTPxwo4SCyIjUxiK1LbQ9h8PSy4c1+gGP4LAMR8xqP4QKg6zdu9
-osUGG/xRe/uufgTBFkcjqBHtK5L5VI0jeNIUAgW/6iNbYXjBMJ0GfauLs+g1VsOm
-WfdgXzsb9DYdMa0OXXHypmV4GwKBwQDUwQj8RKJ6c8cT4vcWCoJvJF00+RFL+P3i
-Gx2DLERxRrDa8AVGfqaCjsR+3vLgG8V/py+z+dxZYSqeB80Qeo6PDITcRKoeAYh9
-xlT3LJOS+k1cJcEmlbbO2IjLkTmzSwa80fWexKu8/Xv6vv15gpqYl1ngYoqJM3pd
-vzmTIOi7MKSZ0WmEQavrZj8zK4endE3v0eAEeQ55j1GImbypSf7Idh7wOXtjZ7WD
-Dg6yWDrri+AP/L3gClMj8wsAxMV4ZR8CgcEA0fzDHkFa6raVOxWnObmRoDhAtE0a
-cjUj976NM5yyfdf2MrKy4/RhdTiPZ6b08/lBC/+xRfV3xKVGzacm6QjqjZrUpgHC
-0LKiZaMtccCJjLtPwQd0jGQEnKfMFaPsnhOc5y8qVkCzVOSthY5qhz0XNotHHFmJ
-gffVgB0iqrMTvSL7IA2yqqpOqNRlhaYhNl8TiFP3gIeMtVa9rZy31JPgT2uJ+kfo
-gV7sdTPEjPWZd7OshGxWpT6QfVDj/T9T7L6tAoHBAI3WBf2DFvxNL2KXT2QHAZ9t
-k3imC4f7U+wSE6zILaDZyzygA4RUbwG0gv8/TJVn2P/Eynf76DuWHGlaiLWnCbSz
-Az2DHBQBBaku409zDQym3j1ugMRjzzSQWzJg0SIyBH3hTmnYcn3+Uqcp/lEBvGW6
-O+rsXFt3pukqJmIV8HzLGGaLm62BHUeZf3dyWm+i3p/hQAL7Xvu04QW70xuGqdr5
-afV7p5eaeQIJXyGQJ0eylV/90+qxjMKiB1XYg6WYvwKBwQCL/ddpgOdHJGN8uRom
-e7Zq0Csi3hGheMKlKbN3vcxT5U7MdyHtTZZOJbTvxKNNUNYH/8uD+PqDGNneb29G
-BfGzvI3EASyLIcGZF3OhKwZd0jUrWk2y7Vhob91jwp2+t73vdMbkKyI4mHOuXvGv
-fg95si9oO7EBT+Oqvhccd2J+F1IVXncccYnF4u5ZGWt5lLewN/pVr7MjjykeaHqN
-t+rfnQam2psA6fL4zS2zTmZPzR2tnY8Y1GBTi0Ko1OKd1HMCgcAb5cB/7/AQlhP9
-yQa04PLH9ygQkKKptZp7dy5WcWRx0K/hAHRoi2aw1wZqfm7VBNu2SLcs90kCCCxp
-6C5sfJi6b8NpNbIPC+sc9wsFr7pGo9SFzQ78UlcWYK2Gu2FxlMjonhka5hvo4zvg
-WxlpXKEkaFt3gLd92m/dMqBrHfafH7VwOJY2zT3WIpjwuk0ZzmRg5p0pG/svVQEH
-NZmwRwlopysbR69B/n1nefJ84UO50fLh5s5Zr3gBRwbWNZyzhXk=
------END RSA PRIVATE KEY-----
diff --git a/crates/base/Cargo.toml b/crates/base/Cargo.toml
deleted file mode 100644
index eb13515..0000000
--- a/crates/base/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "base"
-version.workspace = true
-edition.workspace = true
-
-[dependencies]
-serde.workspace = true
-serde_json.workspace = true
-log.workspace = true
-env_logger.workspace = true
-chrono = "0.4.38"
-async-trait.workspace = true
-
-tokio = { version = "1.0", features = ["time", "macros", "rt-multi-thread", "sync"] }
-alloy.workspace = true
-secp256k1 = { version = "0.29.1", features = ["serde", "rand", "recovery", "global-context"] }
diff --git a/crates/base/src/alive.rs b/crates/base/src/alive.rs
deleted file mode 100644
index 2dfa83d..0000000
--- a/crates/base/src/alive.rs
+++ /dev/null
@@ -1,339 +0,0 @@
-use std::{
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        Arc,
-    },
-    time::Duration,
-};
-
-use tokio::{
-    sync::{broadcast, mpsc},
-    time::sleep,
-};
-
-use async_trait::async_trait;
-
-use crate::{SignedDuration, Time};
-
-pub struct Signal {
-    on: AtomicBool,
-    notify: broadcast::Sender<bool>,
-}
-
-impl Signal {
-    pub fn new(b: bool) -> Self {
-        let (notify, _) = broadcast::channel(1);
-        Self {
-            on: AtomicBool::new(b),
-            notify,
-        }
-    }
-
-    pub fn get(&self) -> bool {
-        self.on.load(Ordering::SeqCst)
-    }
-
-    pub fn set(&self, val: bool) {
-        self.on.store(val, Ordering::SeqCst);
-        let _ = self.notify.send(val);
-    }
-
-    pub async fn wait(&self, target: bool) {
-        let mut rx = None;
-        while self.get() != target {
-            let rx = match rx.as_mut() {
-                None => {
-                    rx = Some(self.notify.subscribe());
-                    rx.as_mut().unwrap()
-                }
-                Some(n) => n,
-            };
-            let _ = rx.recv().await.unwrap();
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct Alive {
-    alive: Arc<Signal>,
-    parent: Box<Option<Alive>>,
-    deadline: Option<Time>,
-}
-
-impl Default for Alive {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Alive {
-    pub fn new() -> Self {
-        Self {
-            alive: Arc::new(Signal::new(true)),
-            parent: Box::new(None),
-            deadline: None,
-        }
-    }
-
-    pub fn deadline(&self) -> Option<Time> {
-        self.deadline
-    }
-
-    pub fn remain_time(&self) -> Option<SignedDuration> {
-        self.deadline.map(|item| item.duration_since(Time::now()))
-    }
-
-    pub fn is_alive(&self) -> bool {
-        if !self.alive.get() {
-            return false;
-        }
-        if let Some(deadline) = self.deadline {
-            if Time::now() >= deadline {
-                return false;
-            }
-        }
-        if let Some(parent) = self.parent.as_ref() {
-            return parent.is_alive();
-        }
-        return true;
-    }
-
-    pub fn shutdown(&self) {
-        self.alive.set(false);
-    }
-
-    pub fn with_deadline(&mut self, deadline: Time) -> &mut Self {
-        self.deadline = Some(deadline);
-        self
-    }
-
-    pub fn fork_with_timeout(&self, dur: Duration) -> Self {
-        self.fork_with_deadline(Time::now() + dur)
-    }
-
-    pub fn fork_with_deadline(&self, deadline: Time) -> Self {
-        Self {
-            alive: Arc::new(Signal::new(true)),
-            parent: Box::new(Some(self.clone())),
-            deadline: Some(match self.deadline {
-                Some(d) => d.min(deadline),
-                None => deadline,
-            }),
-        }
-    }
-
-    pub fn fork(&self) -> Alive {
-        Self {
-            alive: Arc::new(Signal::new(true)),
-            parent: Box::new(Some(self.clone())),
-            deadline: self.deadline,
-        }
-    }
-
-    pub async fn sleep_ms(&self, ms: u64) -> bool {
-        self.sleep(Duration::from_millis(ms)).await
-    }
-
-    pub async fn sleep(&self, dur: Duration) -> bool {
-        self.sleep_to(Time::now() + dur).await;
-        self.is_alive()
-    }
-
-    pub async fn sleep_to(&self, deadline: Time) {
-        let max_sleep = Duration::from_secs(1);
-        loop {
-            if !self.is_alive() {
-                break;
-            }
-            let now = Time::now();
-            if now >= deadline {
-                break;
-            }
-            let dur = (deadline - now).min(max_sleep);
-
-            tokio::select! {
-                _ = sleep(dur) => {},
-                _ = self.alive.wait(false) => {},
-            }
-        }
-    }
-
-    // pub fn recv<T>(&self, r: &mpsc::Receiver<T>) -> Result<T, mpsc::RecvTimeoutError> {
-    //     let max_sleep = Duration::from_secs(1);
-    //     loop {
-    //         if !self.is_alive() {
-    //             break;
-    //         }
-    //         let mut timeout = max_sleep;
-    //         if let Some(t) = self.remain_time() {
-    //             if let Some(t) = t.duration() {
-    //                 if t < timeout {
-    //                     timeout = t;
-    //                 }
-    //             }
-    //         }
-    //         match r.recv_timeout(timeout) {
-    //             Err(mpsc::RecvTimeoutError::Timeout) => break,
-    //             other => return other,
-    //         }
-    //     }
-
-    //     return Err(mpsc::RecvTimeoutError::Timeout);
-    // }
-
-    // pub fn recv_iter<'a, T>(&'a self, r: &'a mpsc::Receiver<T>) -> AliveIter<T, RecvIter<'a, T>> {
-    //     self.iter(RecvIter {
-    //         alive: self,
-    //         dur: poll,
-    //         receiver: r,
-    //     })
-    // }
-
-    pub fn stream<N, T, II>(&self, n: N) -> AliveAsyncIter<T, II>
-    where
-        N: IntoAsyncIterator<Item = T, Iter = II>,
-        II: AsyncIterator<Item = T>,
-    {
-        let iter = n.into_async_iter();
-        AliveAsyncIter { alive: self, iter }
-    }
-
-    pub fn iter<N, I, II>(&self, n: N) -> AliveIter<I, II>
-    where
-        N: IntoIterator<Item = I, IntoIter = II>,
-        II: Iterator<Item = I>,
-    {
-        let iter = n.into_iter();
-        AliveIter { alive: self, iter }
-    }
-}
-
-pub trait IntoAsyncIterator {
-    type Item;
-    type Iter: AsyncIterator<Item = Self::Item>;
-    fn into_async_iter(self) -> Self::Iter;
-}
-
-impl<'a, T: Send> IntoAsyncIterator for &'a mut mpsc::Receiver<T> {
-    type Item = T;
-    type Iter = MpscReceiverIter<'a, T>;
-    fn into_async_iter(self) -> Self::Iter {
-        MpscReceiverIter { receiver: self }
-    }
-}
-
-pub struct MpscReceiverIter<'a, T> {
-    receiver: &'a mut mpsc::Receiver<T>,
-}
-
-#[async_trait]
-impl<'a, T: Send> AsyncIterator for MpscReceiverIter<'a, T> {
-    type Item = T;
-
-    async fn next(&mut self) -> Option<Self::Item> {
-        self.receiver.recv().await
-    }
-}
-
-// pub struct RecvIter<'a, T> {
-//     alive: &'a Alive,
-//     dur: Duration,
-//     receiver: &'a mpsc::Receiver<T>,
-// }
-
-// impl<'a, T> Iterator for RecvIter<'a, T> {
-//     type Item = T;
-//     fn next(&mut self) -> Option<Self::Item> {
-//         loop {
-//             match self.receiver.recv_timeout(self.dur) {
-//                 Ok(n) => return Some(n),
-//                 Err(mpsc::RecvTimeoutError::Disconnected) => return None,
-//                 Err(mpsc::RecvTimeoutError::Timeout) => {
-//                     if !self.alive.is_alive() {
-//                         return None;
-//                     }
-//                     continue;
-//                 }
-//             }
-//         }
-//     }
-// }
-
-#[async_trait]
-pub trait AsyncIterator: Send {
-    type Item: Send;
-
-    async fn next(&mut self) -> Option<Self::Item>;
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, None)
-    }
-
-    fn count(self) -> usize
-    where
-        Self: Sized,
-    {
-        0
-    }
-}
-
-pub struct AliveAsyncIter<'a, T, I: AsyncIterator<Item = T>> {
-    alive: &'a Alive,
-    iter: I,
-}
-
-#[async_trait]
-impl<'a, T: Send, I: AsyncIterator<Item = T>> AsyncIterator for AliveAsyncIter<'a, T, I> {
-    type Item = T;
-
-    async fn next(&mut self) -> Option<Self::Item> {
-        tokio::select! {
-            _closed = self.alive.alive.wait(false) => return None,
-            next = self.iter.next() => return next,
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.iter.size_hint()
-    }
-
-    fn count(self) -> usize
-    where
-        Self: Sized,
-    {
-        self.iter.count()
-    }
-}
-
-pub struct AliveIter<'a, T, I: Iterator<Item = T>> {
-    alive: &'a Alive,
-    iter: I,
-}
-
-impl<'a, T, I: Iterator<Item = T>> Iterator for AliveIter<'a, T, I> {
-    type Item = T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if !self.alive.is_alive() {
-            return None;
-        }
-        self.iter.next()
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.iter.size_hint()
-    }
-
-    fn count(self) -> usize
-    where
-        Self: Sized,
-    {
-        self.iter.count()
-    }
-}
-
-impl std::fmt::Debug for Alive {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        write!(f, "{}", if self.is_alive() { "ALIVE" } else { "DEAD" })
-    }
-}
diff --git a/crates/base/src/buffer_vec.rs b/crates/base/src/buffer_vec.rs
deleted file mode 100644
index e4be45b..0000000
--- a/crates/base/src/buffer_vec.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-use std::io::{Error, ErrorKind, Write};
-
-use alloy::primitives::{B256, U256};
-
-#[derive(Debug)]
-pub struct BufferVec {
-    pub raw: Vec<u8>,
-    size: usize,
-}
-
-pub trait BufferWriteBytes<T> {
-    fn write_bytes(&mut self, n: &T) -> &mut Self;
-    fn read_bytes(&mut self) -> Option<T>;
-}
-
-impl BufferWriteBytes<B256> for BufferVec {
-    fn write_bytes(&mut self, n: &B256) -> &mut Self {
-        self.copy_from(n.as_ref());
-        self
-    }
-    fn read_bytes(&mut self) -> Option<B256> {
-        let buf = self.read_n(32)?;
-        let val = B256::from_slice(buf);
-        self.rotate_left(32);
-        Some(val)
-    }
-}
-
-pub trait BufferBeEncode<T> {
-    fn write_be(&mut self, n: &T) -> &mut Self;
-    fn read_be(&mut self) -> Option<T>;
-}
-
-impl BufferBeEncode<U256> for BufferVec {
-    fn write_be(&mut self, n: &U256) -> &mut Self {
-        let n = n.to_be_bytes::<32>();
-        self.must_write(n.len()).copy_from_slice(&n);
-        self
-    }
-
-    fn read_be(&mut self) -> Option<U256> {
-        let buf = self.read_n(32)?;
-        let val = U256::from_be_slice(buf);
-        self.rotate_left(32);
-        Some(val)
-    }
-}
-
-impl From<Vec<BufferVec>> for BufferVec {
-    fn from(list: Vec<BufferVec>) -> Self {
-        let cap = list.iter().map(|b| b.cap()).sum();
-        let mut buf = Self::new(cap);
-        for mut item in list {
-            buf.copy_from(item.read());
-            item.clear();
-        }
-        buf
-    }
-}
-
-impl BufferVec {
-    pub fn new(size: usize) -> Self {
-        Self {
-            raw: vec![0_u8; size],
-            size: 0,
-        }
-    }
-
-    pub fn move_to(&mut self, target: &mut Self) {
-        target.copy_from(self.read());
-        self.clear();
-    }
-
-    pub fn from_slice(slice: &[u8], cap: usize) -> Self {
-        let mut buf = Self::new(cap);
-        buf.copy_from(slice);
-        buf
-    }
-
-    pub fn from_vec(mut vec: Vec<u8>, mut cap: usize) -> Self {
-        if cap < vec.len() {
-            cap = vec.len();
-        }
-        let size = vec.len();
-        vec.resize(cap, 0);
-        Self { raw: vec, size }
-    }
-
-    pub fn to_vec(mut self) -> Vec<u8> {
-        self.raw.truncate(self.size);
-        self.raw
-    }
-
-    pub fn len(&self) -> usize {
-        self.size
-    }
-
-    pub fn ends_with(&self, needle: &[u8]) -> bool {
-        self.read().ends_with(needle)
-    }
-
-    pub fn resize_cap(&mut self, size: usize) {
-        self.raw.resize(size, 0);
-        if self.size > self.raw.len() {
-            self.size = self.raw.len();
-        }
-    }
-
-    pub fn is_full(&self) -> bool {
-        self.raw[self.size..].len() == 0
-    }
-
-    pub fn cap(&self) -> usize {
-        self.raw.len()
-    }
-
-    pub fn read_n(&self, n: usize) -> Option<&[u8]> {
-        if self.size >= n {
-            return Some(&self.read()[..n]);
-        }
-        None
-    }
-
-    pub fn read(&self) -> &[u8] {
-        &self.raw[..self.size]
-    }
-
-    pub fn write(&mut self) -> &mut [u8] {
-        &mut self.raw[self.size..]
-    }
-
-    pub fn must_write(&mut self, n: usize) -> &mut [u8] {
-        let buf = &mut self.raw[self.size..self.size + n];
-        self.size += n;
-        buf
-    }
-
-    pub fn advance(&mut self, n: usize) {
-        self.size += n;
-    }
-
-    pub fn rotate_left(&mut self, n: usize) {
-        self.raw.rotate_left(n);
-        self.size -= n;
-    }
-
-    pub fn clear(&mut self) {
-        self.size = 0;
-    }
-
-    /// try to read from `reader` until it's fulled.
-    pub fn fill_all_with<R>(&mut self, reader: &mut R) -> Result<(), Error>
-    where
-        R: std::io::Read,
-    {
-        while !self.is_full() {
-            match reader.read(self.write()) {
-                Ok(0) => return Err(Error::new(ErrorKind::UnexpectedEof, "unexpected EOF")),
-                Ok(incoming_bytes) => {
-                    self.advance(incoming_bytes);
-                    if self.is_full() {
-                        break;
-                    }
-                }
-                Err(err) => return Err(err),
-            }
-        }
-        Ok(())
-    }
-
-    pub fn fill_with<R>(&mut self, reader: &mut R) -> Result<usize, Error>
-    where
-        R: std::io::Read,
-    {
-        match reader.read(self.write()) {
-            Ok(0) => Err(Error::new(ErrorKind::UnexpectedEof, "unexpected EOF")),
-            Ok(incoming_bytes) => {
-                self.advance(incoming_bytes);
-                Ok(incoming_bytes)
-            }
-            Err(err) => Err(err),
-        }
-    }
-
-    pub fn copy_from(&mut self, mut buf: &[u8]) -> usize {
-        if self.write().len() < buf.len() {
-            buf = &buf[..self.write().len()];
-        }
-        self.write().write_all(buf).unwrap();
-        self.advance(buf.len());
-        buf.len()
-    }
-}
diff --git a/crates/base/src/channel.rs b/crates/base/src/channel.rs
deleted file mode 100644
index 8e4a62d..0000000
--- a/crates/base/src/channel.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use std::ops::DerefMut;
-
-use tokio::sync::{
-    mpsc::{self, error::TrySendError},
-    Mutex,
-};
-
-pub struct Dispatcher<T> {
-    senders: Mutex<Vec<mpsc::Sender<T>>>,
-}
-
-impl<T> Dispatcher<T> {
-    pub fn new() -> Self {
-        Self {
-            senders: Mutex::new(Vec::new()),
-        }
-    }
-
-    pub async fn dispatch(&self, mut t: T) -> Option<T> {
-        let mut senders = self.senders.lock().await;
-        let mut idx = 0;
-        while idx < senders.len() {
-            match senders[idx].try_send(t) {
-                Ok(_) => {
-                    return None;
-                }
-                Err(TrySendError::Full(obj)) => {
-                    t = obj;
-                    idx += 1;
-                }
-                Err(TrySendError::Closed(obj)) => {
-                    t = obj;
-                    senders.remove(idx);
-                }
-            }
-        }
-        Some(t)
-    }
-
-    pub async fn close_write(&self) {
-        let mut senders = self.senders.lock().await;
-        std::mem::take(senders.deref_mut());
-    }
-
-    pub async fn subscribe(&self) -> mpsc::Receiver<T> {
-        let (sender, receiver) = mpsc::channel(1);
-        self.senders.lock().await.push(sender);
-        receiver
-    }
-}
diff --git a/crates/base/src/errors.rs b/crates/base/src/errors.rs
deleted file mode 100644
index c1e70e1..0000000
--- a/crates/base/src/errors.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-
-#[macro_export]
-macro_rules! stack_error {
-    (
-        name: $name:ident,
-        stack_name: $stack_ty_name:ident,
-        error: {
-            $($err_name:ident $(($($err_tuple:ty),*))? $( { $($err_field:ident : $err_field_type:ty),* } )? ),* $(,)*
-        },
-        stack: {
-            $($stack_name:ident( $($stack_field:ident : $stack_field_type:ty),* ),)*
-        }
-    ) => {
-        $crate::stack_error! {
-            name: $name,
-            stack_name: $stack_ty_name,
-            error: {
-                $($err_name $(($($err_tuple),*))? $( { $($err_field : $err_field_type),* } )? ),* ,
-            },
-            wrap: {
-            },
-            stack: {
-                $($stack_name( $($stack_field : $stack_field_type),* ),)*
-            }
-        }
-    };
-    (
-        name: $name:ident,
-        stack_name: $stack_ty_name:ident,
-        error: {
-            $($err_name:ident $(($($err_tuple:ty),*))? $( { $($err_field:ident : $err_field_type:ty),* } )? ),* $(,)*
-        },
-        wrap: {
-            $($wrap_name:ident $(($wrap_ty:ty))? $( { format: $wrap_str_ty:ty } )? ),* $(,)* 
-        },
-        stack: {
-            $($stack_name:ident( $($stack_field:ident : $stack_field_type:ty),* ),)*
-        }
-    ) => {
-        #[derive(Debug)]
-        pub enum $name {
-            $(
-                $err_name $(
-                    ($($err_tuple),*)
-                )? $(
-                    { $($err_field : $err_field_type),* }
-                )?,
-            )*
-            $(
-                $wrap_name $(($wrap_ty))? $((#[doc = stringify!($wrap_str_ty)] String))?,
-            )*
-            Stack { origin: Box<$name>, stack: Vec<$stack_ty_name> },
-        }
-
-        #[derive(Debug, PartialEq, Clone)]
-        pub enum $stack_ty_name {
-            $(
-                $stack_name {
-                    $($stack_field : $stack_field_type),*
-                },
-            )*
-        }
-
-        $(
-            $(
-            impl From<$wrap_ty> for $name {
-                fn from(val: $wrap_ty) -> Self {
-                    Self::$wrap_name(val)
-                }
-            }
-            )?
-            $(
-                impl From<$wrap_str_ty> for $name {
-                    fn from(val: $wrap_str_ty) -> Self {
-                        Self::$wrap_name(format!("{:?}", val))
-                    }
-                }
-            )?
-        )*
-
-        impl $name {
-            $(
-            #[allow(non_snake_case)]
-            pub fn $stack_name<'a, T>($($stack_field : &'a $stack_field_type),*) -> Box<dyn FnOnce(T) -> Self + 'a> 
-            where
-                T: Into<Self>,
-            {
-                Box::new(move |origin| {
-                    let stack_info = $stack_ty_name::$stack_name {
-                        $($stack_field : $stack_field.clone() ),*
-                    };
-                    match origin.into() {
-                        Self::Stack{origin, mut stack} => {
-                            stack.push(stack_info);
-                            Self::Stack{ origin, stack }
-                        }
-                        origin => Self::Stack {
-                            origin: Box::new(origin), 
-                            stack: vec![stack_info],
-                        }
-                    }
-                })
-            }
-            )*
-
-            pub fn origin(&self) -> &Self {
-                let mut err = self;
-                loop {
-                    match err {
-                        Self::Stack{ origin, .. } => err = origin,
-                        _ => break,
-                    }
-                }
-                err
-            }
-        }
-    }
-}
diff --git a/crates/base/src/format.rs b/crates/base/src/format.rs
deleted file mode 100644
index 07612d2..0000000
--- a/crates/base/src/format.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub fn debug<T: std::fmt::Debug>(d: T) -> String {
-    format!("{:?}", d)
-}
\ No newline at end of file
diff --git a/crates/base/src/keypair.rs b/crates/base/src/keypair.rs
deleted file mode 100644
index 8f676c2..0000000
--- a/crates/base/src/keypair.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use std::sync::{Arc, Mutex};
-
-use alloy::primitives::{keccak256, Address, U256};
-use secp256k1::{
-    ecdsa::{RecoverableSignature, RecoveryId},
-    rand::thread_rng,
-    Message, PublicKey, SECP256K1,
-};
-
-pub use secp256k1::SecretKey;
-
-use crate::debug;
-
-#[derive(Clone, Debug)]
-pub struct Keypair {
-    key: Arc<Mutex<(Option<U256>, Arc<SecretKey>, Arc<PublicKey>)>>,
-}
-
-impl Keypair {
-    pub fn new() -> Self {
-        let (sk, pk) = secp256k1::generate_keypair(&mut thread_rng());
-        Self {
-            key: Arc::new(Mutex::new((None, Arc::new(sk), Arc::new(pk)))),
-        }
-    }
-
-    pub fn address(&self) -> Address {
-        Self::public_key_to_address(&self.public_key())
-    }
-
-    fn public_key_to_address(pk: &PublicKey) -> Address {
-        let hash = keccak256(&pk.serialize_uncompressed()[1..]);
-        Address::from_slice(&hash[12..])
-    }
-
-    pub fn instance_id(&self) -> Option<U256> {
-        self.key.lock().unwrap().0.clone()
-    }
-
-    pub fn info(&self) -> Option<(U256, Address, Arc<SecretKey>)> {
-        let key = self.key.lock().unwrap();
-        let id = key.0?;
-        Some((id, Self::public_key_to_address(&key.2), key.1.clone()))
-    }
-
-    pub fn secret_key(&self) -> Arc<SecretKey> {
-        self.key.lock().unwrap().1.clone()
-    }
-
-    pub fn public_key(&self) -> Arc<PublicKey> {
-        self.key.lock().unwrap().2.clone()
-    }
-
-    pub fn rotate(&self) -> KeypairRotate {
-        KeypairRotate {
-            kp: Keypair::new(),
-            old_key: self,
-        }
-    }
-
-    pub fn sign_digest_ecdsa(sk: &SecretKey, digest: [u8; 32]) -> [u8; 65] {
-        let msg = Message::from_digest(digest);
-        let sig = SECP256K1.sign_ecdsa_recoverable(&msg, sk);
-        let (v, rs) = sig.serialize_compact();
-        let mut sig = [0_u8; 65];
-        sig[..64].copy_from_slice(&rs[..]);
-        sig[64] = v.to_i32() as u8 + 27;
-        sig
-    }
-
-    pub fn recover(digest: [u8; 32], sig: [u8; 65]) -> Result<Address, String> {
-        let msg = Message::from_digest(digest);
-        let recid = RecoveryId::from_i32(sig[64] as _).map_err(debug)?;
-        let sig = RecoverableSignature::from_compact(&sig[..64], recid).map_err(debug)?;
-        let key = SECP256K1.recover_ecdsa(&msg, &sig).map_err(debug)?;
-        Ok(Self::public_key_to_address(&key))
-    }
-}
-
-pub struct KeypairRotate<'a> {
-    kp: Keypair,
-    old_key: &'a Keypair,
-}
-
-impl<'a> KeypairRotate<'a> {
-    pub fn commit(self, instance_id: U256) {
-        let mut new_key = self.kp.key.lock().unwrap().clone();
-        new_key.0 = Some(instance_id);
-        *self.old_key.key.lock().unwrap() = new_key;
-    }
-}
-
-impl<'a> std::ops::Deref for KeypairRotate<'a> {
-    type Target = Keypair;
-    fn deref(&self) -> &Self::Target {
-        &self.kp
-    }
-}
diff --git a/crates/base/src/lib.rs b/crates/base/src/lib.rs
deleted file mode 100644
index ea9aeac..0000000
--- a/crates/base/src/lib.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-mod alive;
-pub use alive::*;
-
-pub mod errors;
-
-mod time;
-pub use time::*;
-
-mod thread;
-pub use thread::*;
-
-mod channel;
-pub use channel::*;
-
-mod format;
-pub use format::*;
-
-mod log;
-pub use log::*;
-
-mod primitive_convert;
-pub use primitive_convert::*;
-
-mod buffer_vec;
-pub use buffer_vec::*;
-
-mod keypair;
-pub use keypair::*;
\ No newline at end of file
diff --git a/crates/base/src/primitive_convert.rs b/crates/base/src/primitive_convert.rs
deleted file mode 100644
index 01b3c65..0000000
--- a/crates/base/src/primitive_convert.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use alloy::primitives::{Bytes, U256, U64};
-
-pub trait PrimitivesConvert<T> {
-    fn to(self) -> T;
-}
-
-impl<A, B> PrimitivesConvert<Option<B>> for Option<A>
-where
-    A: PrimitivesConvert<B>,
-{
-    fn to(self) -> Option<B> {
-        Some(self?.to())
-    }
-}
-
-impl PrimitivesConvert<U256> for usize {
-    fn to(self) -> U256 {
-        U256::from_be_slice(&self.to_be_bytes())
-    }
-}
-
-impl PrimitivesConvert<U256> for u64 {
-    fn to(self) -> U256 {
-        U256::from_limbs_slice(&[self])
-    }
-}
-
-impl PrimitivesConvert<U256> for u128 {
-    fn to(self) -> U256 {
-        U256::from_be_slice(&self.to_be_bytes())
-    }
-}
-
-impl PrimitivesConvert<U64> for u64 {
-    fn to(self) -> U64 {
-        U64::from_limbs([self])
-    }
-}
-
-impl PrimitivesConvert<Bytes> for Vec<u8> {
-    fn to(self) -> Bytes {
-        Bytes::from(self)
-    }
-}
\ No newline at end of file
diff --git a/crates/base/src/thread.rs b/crates/base/src/thread.rs
deleted file mode 100644
index a1014c8..0000000
--- a/crates/base/src/thread.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use std::{future::Future, sync::Arc};
-
-use tokio::{runtime::Builder, sync::Semaphore};
-
-use crate::Alive;
-
-pub async fn parallel<O, T, C, A, F, E>(
-    alive: &Alive,
-    ctx: C,
-    tasks: Vec<T>,
-    worker: usize,
-    f: F,
-) -> Result<Vec<O>, E>
-where
-    E: Send + 'static,
-    O: Send + 'static,
-    C: Clone + Send + 'static,
-    T: Send + 'static,
-    A: Future<Output = Result<O, E>> + Send + 'static,
-    F: Fn(T, C) -> A + Clone + Send + 'static,
-{
-    let _alive = alive.fork();
-
-    let rt = Builder::new_multi_thread()
-        .enable_all()
-        .max_blocking_threads(worker)
-        .build()
-        .unwrap();
-    let semaphore = Arc::new(Semaphore::new(worker));
-    let mut results = Vec::new();
-    let task_len = tasks.len();
-    for task in tasks {
-        let handler = f.clone();
-        let ctx = ctx.clone();
-        let semaphore = semaphore.clone();
-        let handle = rt.spawn(async move {
-            let _guard = semaphore.acquire().await.unwrap();
-            handler(task, ctx).await
-        });
-        results.push(handle);
-    }
-    let mut out = Vec::with_capacity(task_len);
-    for result in results {
-        match result.await.unwrap() {
-            Ok(n) => out.push(n),
-            Err(err) => {
-                rt.shutdown_background();
-                return Err(err)
-            },
-        }
-    }
-    rt.shutdown_background();
-    return Ok(out);
-
-    // let dispatcher = <Dispatcher<A>>::new();
-    // let mut handles = Vec::with_capacity(worker);
-    // let processed = Arc::new(AtomicUsize::new(0));
-    // let mut futures = Vec::with_capacity(tasks.len());
-    // for task in &tasks {
-    //     futures.push(f(task.clone()));
-    // }
-    // for i in 0..worker {
-    //     let handler = f.clone();
-    //     let mut receiver = dispatcher.subscribe().await;
-    //     let alive = alive.clone();
-    //     let processed = processed.clone();
-    //     let handle = spawn(async move {
-    //         let mut iter = alive.stream(&mut receiver);
-    //         while let Some(item) = iter.next().await {
-    //             if let Err(err) = handler(item.clone()).await {
-    //                 log::error!("parallel execution fail: task:{:?}, info: {}", item, err);
-    //                 alive.shutdown();
-    //             } else {
-    //                 processed.fetch_add(1, Ordering::SeqCst);
-    //             }
-    //         }
-    //     });
-    //     handles.push(handle);
-    // }
-    // for task in alive.iter(tasks) {
-    //     let mut result = dispatcher.dispatch(task.clone()).await;
-    //     loop {
-    //         match result {
-    //             Some(task) => {
-    //                 if !alive.sleep_ms(100).await {
-    //                     break;
-    //                 }
-    //                 result = dispatcher.dispatch(task).await;
-    //             }
-    //             None => break,
-    //         }
-    //     }
-    // }
-    // dispatcher.close_write().await;
-    // for handle in handles {
-    //     let _ = handle.await;
-    // }
-    // return processed.load(Ordering::SeqCst);
-}
diff --git a/crates/base/src/time.rs b/crates/base/src/time.rs
deleted file mode 100644
index 288612f..0000000
--- a/crates/base/src/time.rs
+++ /dev/null
@@ -1,199 +0,0 @@
-use core::{
-    cmp::Ordering,
-    ops::{Add, Sub},
-};
-
-use chrono::{DateTime, Utc};
-use std::time::{Duration, SystemTime};
-
-pub fn now() -> Duration {
-    SystemTime::now()
-        .duration_since(SystemTime::UNIX_EPOCH)
-        .unwrap()
-}
-
-#[derive(Clone, Default, Copy, PartialEq, Eq)]
-pub struct SignedDuration {
-    is_neg: bool,
-    dur: Duration,
-}
-
-impl SignedDuration {
-    pub fn sub<T>(a: T, b: T) -> Self
-    where
-        T: Sub<Output = Duration> + PartialOrd<T>,
-    {
-        let mut is_neg = false;
-        let dur = if a > b {
-            a - b
-        } else {
-            is_neg = true;
-            b - a
-        };
-        Self { is_neg, dur }
-    }
-
-    pub fn from_millis(millis: i64) -> Self {
-        Self {
-            is_neg: millis.is_negative(),
-            dur: Duration::from_millis(millis.abs() as u64),
-        }
-    }
-
-    pub fn duration(&self) -> Option<Duration> {
-        match self.is_neg {
-            true => None,
-            false => Some(self.dur.clone()),
-        }
-    }
-}
-
-impl PartialOrd<Duration> for SignedDuration {
-    fn partial_cmp(&self, other: &Duration) -> Option<Ordering> {
-        if self.is_neg {
-            Some(Ordering::Less)
-        } else {
-            Some(self.dur.cmp(other))
-        }
-    }
-}
-
-impl PartialEq<Duration> for SignedDuration {
-    fn eq(&self, other: &Duration) -> bool {
-        !self.is_neg && self.eq(other)
-    }
-}
-
-impl std::fmt::Debug for SignedDuration {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        write!(f, "{}{:?}", if self.is_neg { "-" } else { "" }, self.dur)
-    }
-}
-
-pub struct Date(DateTime<Utc>);
-
-impl From<Duration> for Date {
-    fn from(du: Duration) -> Self {
-        let nano = du.subsec_nanos() / 1_000_000 * 1_000_000;
-        Self(DateTime::from_timestamp(du.as_secs() as i64, nano).unwrap())
-    }
-}
-
-impl From<Time> for Date {
-    fn from(time: Time) -> Self {
-        time.0.into()
-    }
-}
-
-impl std::fmt::Debug for Date {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        f.write_str(&self.format())
-    }
-}
-
-impl std::fmt::Display for Date {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        f.write_str(&self.format())
-    }
-}
-
-impl Date {
-    pub fn format(&self) -> String {
-        use chrono::format::Numeric::*;
-        use chrono::format::Pad::Zero;
-        use chrono::format::{Fixed, Item};
-
-        const PREFIX: &[Item<'static>] = &[
-            Item::Numeric(Year, Zero),
-            Item::Literal("-"),
-            Item::Numeric(Month, Zero),
-            Item::Literal("-"),
-            Item::Numeric(Day, Zero),
-            Item::Literal(" "),
-            Item::Numeric(Hour, Zero),
-            Item::Literal(":"),
-            Item::Numeric(Minute, Zero),
-            Item::Literal(":"),
-            Item::Numeric(Second, Zero),
-        ];
-
-        let ssitem = Item::Fixed(Fixed::Nanosecond3);
-        self.0
-            .format_with_items(PREFIX.iter().chain([ssitem].iter()))
-            .to_string()
-    }
-}
-
-#[derive(Clone, Copy, Ord, Eq)]
-pub struct Time(Duration);
-
-impl From<Duration> for Time {
-    fn from(du: Duration) -> Self {
-        Self(du)
-    }
-}
-
-impl Time {
-    pub fn now() -> Self {
-        Self(now())
-    }
-
-    pub fn from_secs(secs: u64) -> Self {
-        Self(Duration::from_secs(secs))
-    }
-
-    pub fn saturating_duration_since(&self, earlier: Self) -> Duration {
-        self.checked_duration_since(earlier).unwrap_or_default()
-    }
-
-    pub fn duration_since(&self, earlier: Self) -> SignedDuration {
-        SignedDuration::sub(*self, earlier)
-    }
-
-    pub fn checked_duration_since(&self, earlier: Time) -> Option<Duration> {
-        self.checked_sub_time(&earlier)
-    }
-
-    pub fn checked_sub_time(&self, other: &Time) -> Option<Duration> {
-        self.0.checked_sub(other.0)
-    }
-}
-
-impl Sub<Duration> for Time {
-    type Output = Time;
-    fn sub(self, rhs: Duration) -> Self::Output {
-        Self(self.0 - rhs)
-    }
-}
-
-impl Sub<Time> for Time {
-    type Output = Duration;
-    fn sub(self, rhs: Time) -> Self::Output {
-        self.0.sub(rhs.0)
-    }
-}
-
-impl Add<Duration> for Time {
-    type Output = Time;
-    fn add(self, rhs: Duration) -> Self::Output {
-        Self(self.0.add(rhs))
-    }
-}
-
-impl std::fmt::Debug for Time {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl PartialEq<Time> for Time {
-    fn eq(&self, other: &Time) -> bool {
-        self.0.eq(&other.0)
-    }
-}
-
-impl PartialOrd<Time> for Time {
-    fn partial_cmp(&self, other: &Time) -> Option<core::cmp::Ordering> {
-        self.0.partial_cmp(&other.0)
-    }
-}
diff --git a/crates/clients/Cargo.toml b/crates/clients/Cargo.toml
deleted file mode 100644
index af10cb8..0000000
--- a/crates/clients/Cargo.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "clients"
-version.workspace = true
-edition.workspace = true
-
-[dependencies]
-base.workspace = true
-alloy = { workspace = true, features = ["signer-local", "rpc-types-eth", "sol-types", "providers", "std", "reqwest-rustls-tls", "json-rpc"] }
-url.workspace = true
diff --git a/crates/clients/src/eth.rs b/crates/clients/src/eth.rs
deleted file mode 100644
index 14572a1..0000000
--- a/crates/clients/src/eth.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-use std::{borrow::Cow, sync::Arc};
-
-use alloy::{
-    eips::BlockId,
-    primitives::{Address, Bytes, B256, U256},
-    providers::{
-        network::{Ethereum, EthereumWallet, TransactionBuilder},
-        PendingTransactionBuilder, Provider, ProviderBuilder,
-    },
-    rpc::{
-        client::{BatchRequest, RpcClientInner},
-        json_rpc::{RpcParam, RpcReturn},
-        types::{BlockTransactionsKind, Transaction, TransactionRequest},
-    },
-    signers::local::{LocalSignerError, PrivateKeySigner},
-    sol_types::{SolCall, SolInterface},
-    transports::{
-        http::{Client, Http},
-        RpcError, TransportErrorKind,
-    },
-};
-
-base::stack_error! {
-    name: EthError,
-    stack_name: EthErrorStack,
-    error: {},
-    wrap: {
-        Signer(LocalSignerError ),
-        Url(url::ParseError),
-        Rpc ( RpcError<TransportErrorKind>),
-        Type(alloy::sol_types::Error),
-    },
-    stack: {
-        OnTransact(contract: Address, sig: &'static str),
-        OnCall(contract: Address, sig: &'static str),
-        OnDecodeReturn(contract: Address, sig: &'static str, data: Bytes),
-        BatchRequestSerFail(),
-        BatchRequestDerRespFail(),
-        BatchSend(),
-    }
-}
-
-impl EthError {
-    pub fn revert(&self) -> Option<Bytes> {
-        match self.origin() {
-            Self::Rpc(RpcError::ErrorResp(payload)) => payload.as_revert_data(),
-            _ => None,
-        }
-    }
-
-    pub fn revert_data<T: SolInterface>(self) -> Result<(T, EthError), EthError> {
-        match self.origin() {
-            Self::Rpc(RpcError::ErrorResp(payload)) => match payload.as_revert_data() {
-                Some(data) => Ok((T::abi_decode(&data, true)?, self)),
-                None => Err(self),
-            },
-            _ => Err(self),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct Eth {
-    client: Arc<Box<dyn Provider<Http<Client>>>>,
-}
-
-impl Eth {
-    pub fn dial(endpoint: &str, private_key: Option<&str>) -> Result<Eth, EthError> {
-        let url = endpoint.try_into()?;
-
-        let provider: Box<dyn Provider<Http<Client>>> = match private_key {
-            Some(pk) => {
-                let signer = pk.parse::<PrivateKeySigner>()?;
-                let wallet = EthereumWallet::new(signer);
-                let provider = ProviderBuilder::new()
-                    .with_recommended_fillers()
-                    .wallet(wallet)
-                    .on_http(url);
-                Box::new(provider)
-            }
-            None => {
-                let provider = ProviderBuilder::new().on_http(url);
-                Box::new(provider)
-            }
-        };
-
-        Ok(Eth {
-            client: Arc::new(provider),
-        })
-    }
-
-    pub async fn transact<T: SolCall>(
-        &self,
-        contract: Address,
-        call: &T,
-    ) -> Result<PendingTransactionBuilder<Http<Client>, Ethereum>, EthError> {
-        let tx = TransactionRequest::default().with_call(call).to(contract);
-        let result = self
-            .client
-            .send_transaction(tx)
-            .await
-            .map_err(EthError::OnTransact(&contract, &T::SIGNATURE))?;
-        Ok(result)
-    }
-
-    pub async fn call<T: SolCall>(
-        &self,
-        contract: Address,
-        call: &T,
-    ) -> Result<T::Return, EthError> {
-        let tx = TransactionRequest::default().with_call(call).to(contract);
-        let result = self
-            .client
-            .call(&tx)
-            .await
-            .map_err(EthError::OnCall(&contract, &T::SIGNATURE))?;
-        let result = T::abi_decode_returns(&result, true).map_err(EthError::OnDecodeReturn(
-            &contract,
-            &T::SIGNATURE,
-            &result,
-        ))?;
-        Ok(result)
-    }
-
-    pub async fn select_reference_block(&self) -> Result<(U256, B256), EthError> {
-        // corner case:
-        //  1. block numbers may not sequential
-        //  2. the types.Header.Hash() may not compatible with the chain
-        let k = BlockTransactionsKind::Hashes;
-        let p = self.provider();
-        let head = p.get_block(BlockId::latest(), k).await?.unwrap();
-        let hash = head.header.parent_hash;
-        let reference_block = p.get_block(hash.into(), k).await?.unwrap();
-        let number = reference_block.header.number.unwrap();
-        Ok((U256::from_limbs_slice(&[number]), hash))
-    }
-
-    pub fn provider(&self) -> Arc<Box<dyn Provider<Http<Client>>>> {
-        self.client.clone()
-    }
-
-    pub fn client(&self) -> &RpcClientInner<Http<Client>> {
-        self.client.client()
-    }
-
-    pub async fn get_transaction(&self, hash: B256) -> Option<Transaction> {
-        let tx = self.client.get_transaction_by_hash(hash).await.unwrap();
-        tx
-    }
-
-    pub async fn batch_request<Params: RpcParam + std::fmt::Debug, Resp: RpcReturn>(
-        &self,
-        method: impl Into<Cow<'static, str>>,
-        params: &[Params],
-    ) -> Result<Vec<Resp>, EthError> {
-        let method: Cow<'static, str> = method.into();
-        let mut batch = BatchRequest::new(self.client());
-        let mut waiters = Vec::new();
-        for param in params {
-            waiters.push((
-                param,
-                batch
-                    .add_call::<_, Resp>(method.clone(), param)
-                    .map_err(EthError::BatchRequestSerFail())?,
-            ));
-        }
-        batch.send().await.map_err(EthError::BatchSend())?;
-        let mut out = Vec::new();
-        for (_params, waiter) in waiters {
-            out.push(waiter.await.map_err(EthError::BatchRequestDerRespFail())?);
-        }
-        Ok(out)
-    }
-}
diff --git a/crates/clients/src/http.rs b/crates/clients/src/http.rs
deleted file mode 100644
index 680eb89..0000000
--- a/crates/clients/src/http.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub struct Client {}
-
-impl Client {
-    pub fn new() -> Self {
-        Self {}
-    }
-}
diff --git a/crates/clients/src/lib.rs b/crates/clients/src/lib.rs
deleted file mode 100644
index 93fd7b8..0000000
--- a/crates/clients/src/lib.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod http;
-pub use http::*;
-
-mod eth;
-pub use eth::*;
\ No newline at end of file
diff --git a/crates/linea/executor/src/types.rs b/crates/linea/executor/src/types.rs
index 8ce2ee1..4faf972 100644
--- a/crates/linea/executor/src/types.rs
+++ b/crates/linea/executor/src/types.rs
@@ -5,7 +5,7 @@ use alloy::{
     consensus::{Transaction, TxEip4844Variant, TxEnvelope},
     primitives::{Address, B256, U256},
 };
-use base::PrimitivesConvert;
+use base::eth::PrimitivesConvert;
 use linea_revm::{
     db::CacheDB,
     primitives::{AccessList, BlockEnv, EVMError},
@@ -16,6 +16,7 @@ pub use linea_revm::{
 };
 
 base::stack_error! {
+    #[derive(Clone, Debug)]
     name: ExecutionError,
     stack_name: ExecutionErrorStack,
     error: {
diff --git a/crates/linea/executor/src/zktrie_state.rs b/crates/linea/executor/src/zktrie_state.rs
index 85a8331..66bc536 100644
--- a/crates/linea/executor/src/zktrie_state.rs
+++ b/crates/linea/executor/src/zktrie_state.rs
@@ -1,7 +1,8 @@
 use std::sync::Arc;
 
 use alloy::primitives::{keccak256, B256, U256};
-use base::{BufferBeEncode, BufferVec, BufferWriteBytes, PrimitivesConvert};
+use base::bytes::{BufferBeEncode, BufferVec, BufferWriteBytes};
+use base::eth::PrimitivesConvert;
 use linea_zktrie::{mimc_safe_code_hash, Database};
 use serde::{Deserialize, Serialize};
 
diff --git a/crates/linea/shomei/Cargo.toml b/crates/linea/shomei/Cargo.toml
index 29a709c..5fb41d5 100644
--- a/crates/linea/shomei/Cargo.toml
+++ b/crates/linea/shomei/Cargo.toml
@@ -9,4 +9,4 @@ serde_json.workspace = true
 log.workspace = true
 linea-zktrie.workspace = true
 alloy.workspace = true
-clients.workspace = true
+base.workspace = true
diff --git a/crates/linea/shomei/src/client.rs b/crates/linea/shomei/src/client.rs
index 795eb53..8359450 100644
--- a/crates/linea/shomei/src/client.rs
+++ b/crates/linea/shomei/src/client.rs
@@ -1,8 +1,8 @@
 use alloy::{eips::BlockId, primitives::{Address, BlockNumber, B256, U256}};
-use clients::{Eth, EthError};
+use base::eth::{Eth, EthError};
 use linea_zktrie::Trace;
 use serde::Deserialize;
-use std::collections::{BTreeMap, BTreeSet};
+use std::{collections::{BTreeMap, BTreeSet}, time::Duration};
 
 use crate::{
     MerkleAccountProof, RollupGetZkEVMStateMerkleProofV0Req, RollupGetZkEVMStateMerkleProofV0Resp,
@@ -18,11 +18,13 @@ pub struct Client {
 pub struct ShomeiConfig {
     pub endpoint: String,
     pub version: String,
+    pub timeout_secs: Option<u64>,
 }
 
 impl Client {
     pub fn new(cfg: ShomeiConfig) -> Result<Client, EthError> {
-        let client = Eth::dial(&cfg.endpoint, None)?;
+        let mut client = Eth::dial(&cfg.endpoint, None)?;
+        client.with_call_timeout(cfg.timeout_secs.map(Duration::from_secs));
         Ok(Client {
             client,
             version: cfg.version,
diff --git a/crates/linea/verifier/Cargo.toml b/crates/linea/verifier/Cargo.toml
index cb83fe1..ae40e0d 100644
--- a/crates/linea/verifier/Cargo.toml
+++ b/crates/linea/verifier/Cargo.toml
@@ -12,7 +12,6 @@ linea-revm.workspace = true
 
 prover-types.workspace = true
 
-clients.workspace = true
 base.workspace = true
 
 serde.workspace = true
diff --git a/crates/linea/verifier/src/block_trace.rs b/crates/linea/verifier/src/block_trace.rs
index 2aa7981..c924457 100644
--- a/crates/linea/verifier/src/block_trace.rs
+++ b/crates/linea/verifier/src/block_trace.rs
@@ -10,8 +10,7 @@ use alloy::{
     rlp::{encode_list, Encodable},
     rpc::types::{eth::Block, BlockTransactionsKind, TransactionReceipt},
 };
-use base::{Keypair, PrimitivesConvert};
-use clients::{Eth, EthError};
+use base::eth::{Keypair, PrimitivesConvert, Eth, EthError};
 use linea_executor::{CommitState, Context, ExecutionError, SpecId, TxEnv};
 use linea_revm::db::CacheDB;
 use linea_shomei::{Client, MerkleAccountProof};
@@ -175,7 +174,11 @@ impl Context for BlockTraceContext {
     type DB = ContextDB;
 
     fn db(&self) -> Self::DB {
-        ContextDB::new(self.bc.zk_parent_state_root_hash, self.db.clone(), self.bc.block_hashes.clone())
+        ContextDB::new(
+            self.bc.zk_parent_state_root_hash,
+            self.db.clone(),
+            self.bc.block_hashes.clone(),
+        )
     }
 
     fn spec_id(&self) -> SpecId {
@@ -294,6 +297,7 @@ impl Context for BlockTraceContext {
 }
 
 base::stack_error! {
+    #[derive(Debug)]
     name: BlockTraceError,
     stack_name: BlockTraceErrorStack,
     error: {
diff --git a/crates/linea/verifier/src/db.rs b/crates/linea/verifier/src/db.rs
index 79a772a..be7d5e7 100644
--- a/crates/linea/verifier/src/db.rs
+++ b/crates/linea/verifier/src/db.rs
@@ -5,7 +5,7 @@ use std::{
 };
 
 use alloy::primitives::{Address, Bytes, U256};
-use base::PrimitivesConvert;
+use base::eth::PrimitivesConvert;
 use linea_executor::{
     account_key, storage_slot, AccountInfo, Bytecode, CommitState, ExecutionError, ZkStateAccount,
 };
@@ -268,6 +268,7 @@ impl DatabaseRef for ContextDB {
 }
 
 base::stack_error! {
+    #[derive(Debug)]
     name: DBError,
     stack_name: DBErrorStack,
     error: {},
diff --git a/crates/linea/verifier/src/pob_context.rs b/crates/linea/verifier/src/pob_context.rs
index b846d81..e6c8238 100644
--- a/crates/linea/verifier/src/pob_context.rs
+++ b/crates/linea/verifier/src/pob_context.rs
@@ -5,7 +5,7 @@ use alloy::{
     primitives::{keccak256, Address, Bytes, U256},
     rlp::{encode_list, Encodable},
 };
-use base::Keypair;
+use base::eth::Keypair;
 use linea_executor::{Context, ExecutionError, SpecId, TxEnv};
 use linea_revm::db::CacheDB;
 use linea_zktrie::MemStore;
diff --git a/crates/linea/verifier/src/verifier.rs b/crates/linea/verifier/src/verifier.rs
index fee6b18..98a9d1c 100644
--- a/crates/linea/verifier/src/verifier.rs
+++ b/crates/linea/verifier/src/verifier.rs
@@ -1,5 +1,7 @@
-use base::{parallel, Alive};
-use clients::{Eth, EthError};
+use std::time::Duration;
+
+use base::eth::{Eth, EthError};
+use base::{thread::parallel, trace::Alive};
 use linea_executor::{CommitState, Context, ExecutionError, LineaEvmExecutor};
 use linea_revm::primitives::ExecutionResult;
 use linea_shomei::ShomeiConfig;
@@ -15,9 +17,17 @@ pub struct LineaBatchVerifier {
 }
 
 impl LineaBatchVerifier {
-    pub fn new(el: Option<&str>, shomei: Option<ShomeiConfig>) -> Result<Self, ValidateError> {
+    pub fn new(
+        el: Option<&str>,
+        timeout: Option<Duration>,
+        shomei: Option<ShomeiConfig>,
+    ) -> Result<Self, ValidateError> {
         let el = match el {
-            Some(el) => Some(Eth::dial(el, None)?),
+            Some(el) => {
+                let mut el = Eth::dial(el, None)?;
+                el.with_call_timeout(timeout);
+                Some(el)
+            }
             None => None,
         };
         let shomei = match shomei {
@@ -106,6 +116,7 @@ impl LineaBatchVerifier {
 }
 
 base::stack_error! {
+    #[derive(Debug)]
     name: ValidateError,
     stack_name: ValidateErrorStack,
     error: {
diff --git a/crates/linea/zktrie/src/lib.rs b/crates/linea/zktrie/src/lib.rs
index 09fc636..4701ea1 100644
--- a/crates/linea/zktrie/src/lib.rs
+++ b/crates/linea/zktrie/src/lib.rs
@@ -22,6 +22,7 @@ mod utils;
 pub use utils::*;
 
 base::stack_error!(
+    #[derive(Clone, Debug)]
     name: Error,
     stack_name: ErrorStack,
     error: {
@@ -45,6 +46,7 @@ base::stack_error!(
         RootNodeNotFound(B256),
         RootNodeExpectToBeBranchNode(Arc<Node>),
     },
+    wrap: {},
     stack: {
         BuildNonInclusionProofLeft(prefix: Address, key: Bytes),
         BuildNonInclusionProofRight(prefix: Address, key: Bytes),
diff --git a/crates/prover-types/Cargo.toml b/crates/prover-types/Cargo.toml
index 6b18454..c20bf20 100644
--- a/crates/prover-types/Cargo.toml
+++ b/crates/prover-types/Cargo.toml
@@ -10,3 +10,6 @@ base.workspace = true
 alloy = { workspace = true }
 libflate = "2.1.0"
 
+
+log.workspace = true
+env_logger.workspace = true
\ No newline at end of file
diff --git a/crates/prover-types/src/api.rs b/crates/prover-types/src/api.rs
index e8f395d..a12dd1a 100644
--- a/crates/prover-types/src/api.rs
+++ b/crates/prover-types/src/api.rs
@@ -1,4 +1,5 @@
 use alloy::primitives::{Bytes, B256};
+use base::prover::keccak_encode;
 use serde::{Deserialize, Serialize};
 
 use crate::{Poe, TaskType};
@@ -22,7 +23,19 @@ impl ProveTaskParams {
             None => TaskType::Scroll,
         }
     }
+    pub fn batch(&self) -> Result<&[u8], ParamsError> {
+        self.batch
+            .as_ref()
+            .ok_or(ParamsError::MissingBatch)
+            .map(|n| &n[..])
+    }
+}
+
+#[derive(Debug)]
+pub enum ParamsError {
+    MissingBatch,
 }
+
 #[derive(Clone, Debug, Serialize)]
 pub struct PoeResponse {
     pub not_ready: bool,
@@ -30,4 +43,15 @@ pub struct PoeResponse {
     pub start_block: u64,
     pub end_block: u64,
     pub poe: Option<Poe>,
+    pub poe_signature: Option<Bytes>,
 }
+
+pub fn poe_digest(poe: &Poe) -> B256 {
+    keccak_encode(|hash| {
+        hash(poe.batch_hash.as_slice());
+        hash(poe.state_hash.as_slice());
+        hash(poe.prev_state_root.as_slice());
+        hash(poe.new_state_root.as_slice());
+        hash(poe.withdrawal_root.as_slice());
+    })
+}
\ No newline at end of file
diff --git a/crates/prover-types/src/lib.rs b/crates/prover-types/src/lib.rs
index 05e140a..4cd3121 100644
--- a/crates/prover-types/src/lib.rs
+++ b/crates/prover-types/src/lib.rs
@@ -1,6 +1,3 @@
-mod pob;
-pub use pob::*;
-
 mod task_type;
 pub use task_type::*;
 
@@ -10,8 +7,10 @@ pub use string_interning::*;
 mod primitives;
 pub use primitives::*;
 
-mod poe;
-pub use poe::*;
-
 mod api;
-pub use api::*;
\ No newline at end of file
+pub use api::*;
+
+mod log;
+pub use log::*;
+
+pub use base::prover::{Pob, PobBlock, PobData, Poe, SuccinctPobList, keccak_encode};
\ No newline at end of file
diff --git a/crates/base/src/log.rs b/crates/prover-types/src/log.rs
similarity index 100%
rename from crates/base/src/log.rs
rename to crates/prover-types/src/log.rs
diff --git a/crates/prover/Cargo.toml b/crates/prover/Cargo.toml
index a4c1439..46ba2e6 100644
--- a/crates/prover/Cargo.toml
+++ b/crates/prover/Cargo.toml
@@ -11,10 +11,10 @@ crate-type = ["staticlib"]
 tstd_enclave = ["automata-sgx-sdk/tstd_enclave"]
 
 [dependencies]
-clients.workspace = true
 prover-types.workspace = true
 scroll-verifier.workspace = true
 scroll-executor.workspace = true
+scroll-da-codec.workspace = true
 automata-sgx-sdk.workspace = true
 prometheus.workspace = true
 
diff --git a/crates/prover/src/api.rs b/crates/prover/src/api.rs
index 0bd047a..55af3a1 100644
--- a/crates/prover/src/api.rs
+++ b/crates/prover/src/api.rs
@@ -8,16 +8,18 @@ use crate::{Collector, DaItemLockStatus, DaManager, Metadata, TaskManager, BUILD
 use alloy::primitives::Bytes;
 use async_trait::async_trait;
 use automata_sgx_sdk::dcap::dcap_quote;
-use base::{debug, Alive};
-use clients::Eth;
+use base::format::debug;
+use base::trace::Alive;
+use base::eth::{Eth, Keypair};
 use jsonrpsee::core::RpcResult;
 use jsonrpsee::types::{ErrorObject, ErrorObjectOwned};
 use jsonrpsee::RpcModule;
 use linea_verifier::LineaBatchVerifier;
 use prover_types::{
-    keccak_encode, Pob, Poe, PoeResponse, ProveTaskParams, SuccinctPobList, TaskType, B256,
+    keccak_encode, poe_digest, Pob, Poe, PoeResponse, ProveTaskParams, SuccinctPobList, TaskType, B256
 };
-use scroll_verifier::{BatchTask, ScrollBatchVerifier};
+use scroll_da_codec::BatchTask;
+use scroll_verifier::ScrollBatchVerifier;
 
 const POB_EXPIRED_SECS: u64 = 120;
 
@@ -31,6 +33,7 @@ pub struct ProverApi {
     pub pobda_task_mgr: Arc<TaskManager<(u64, u64, u64, B256), Poe, String>>,
     pub pob_da: Arc<DaManager<Vec<Pob>>>,
     pub metrics: Arc<Collector>,
+    pub keypair: Keypair,
 
     pub scroll: ScrollBatchVerifier,
     pub linea: LineaBatchVerifier,
@@ -65,6 +68,10 @@ impl ProverV1ApiServer for ProverApi {
             return Err(self.err(14002, "invalid report data"));
         }
         data[64 - req.len()..].copy_from_slice(&req);
+        data[0..12].copy_from_slice(&[0_u8; 12]);
+        data[12..32].copy_from_slice(self.keypair.address().as_slice());
+        
+        log::info!("report data: {:?}", Bytes::copy_from_slice(&data));
 
         let start = Instant::now();
 
@@ -102,7 +109,10 @@ impl ProverV2ApiServer for ProverApi {
             .ok_or(self.err(14006, format!("pob_hash not found: {:?}", params.pob_hash)))?;
 
         let cache_key = match ty {
-            TaskType::Scroll => self.scroll.cache_key(&params).map_err(jsonrpc_err(14001))?,
+            TaskType::Scroll => self
+                .scroll
+                .cache_key(params.batch().map_err(jsonrpc_err(14001))?, params.pob_hash)
+                .map_err(jsonrpc_err(14001))?,
             TaskType::Linea => self.linea.cache_key(&params).map_err(jsonrpc_err(14001))?,
             TaskType::Other(_) => unreachable!(),
         };
@@ -112,7 +122,11 @@ impl ProverV2ApiServer for ProverApi {
             None => {
                 let start = Instant::now();
                 let result = match ty {
-                    TaskType::Scroll => self.scroll.prove(&pob_list, params).await.map_err(debug),
+                    TaskType::Scroll => self
+                        .scroll
+                        .prove(pob_list.as_slice(), params.batch().map_err(jsonrpc_err(14001))?)
+                        .await
+                        .map_err(debug),
                     TaskType::Linea => self.linea.prove(&pob_list, params).await.map_err(debug),
                     TaskType::Other(_) => unreachable!(),
                 };
@@ -130,17 +144,25 @@ impl ProverV2ApiServer for ProverApi {
         .map_err(jsonrpc_err(15001))?;
         self.metrics.counter_prove.lock().unwrap().inc([ty.name()]);
 
+        let sig = Keypair::sign_digest_ecdsa(&self.keypair.secret_key(), poe_digest(&poe).into());
+
         Ok(PoeResponse {
             not_ready: false,
             batch_id: cache_key.0,
             start_block: cache_key.1,
             end_block: cache_key.2,
             poe: Some(poe),
+            poe_signature: Some(sig.to_vec().into()),
         })
     }
 
-    async fn prove_task_without_context(&self, task_data: Bytes, ty: u64) -> RpcResult<PoeResponse> {
-        self.prove_task_with_sample(B256::default(), Some(task_data), 0, ty).await
+    async fn prove_task_without_context(
+        &self,
+        task_data: Bytes,
+        ty: u64,
+    ) -> RpcResult<PoeResponse> {
+        self.prove_task_with_sample(B256::default(), Some(task_data), 0, ty)
+            .await
     }
 
     async fn generate_context(
@@ -215,7 +237,7 @@ impl DaApiServer for ProverApi {
         let pob_list = arg.unwrap();
         let pob_hash = keccak_encode(|hash| {
             for pob in &pob_list {
-                hash(pob.hash.as_slice());
+                hash(pob.pob_hash().as_slice());
             }
         });
         self.pob_da
@@ -246,10 +268,10 @@ impl ProverApi {
                 let Some(l1_el) = &self.l1_el else {
                     return Err(self.err(14011, "missing config for scroll_chain"));
                 };
-        
+
                 let tx = l1_el.get_transaction(tx_hash).await.unwrap();
                 tx.input
-            },
+            }
         };
         let task_data: Bytes = task_data[4..].to_owned().into();
 
diff --git a/crates/prover/src/da.rs b/crates/prover/src/da.rs
index 4ff766d..1c6ced7 100644
--- a/crates/prover/src/da.rs
+++ b/crates/prover/src/da.rs
@@ -1,5 +1,5 @@
-use base::Time;
 use core::time::Duration;
+use base::time::Time;
 use prover_types::B256;
 use serde::Deserialize;
 use serde::Serialize;
diff --git a/crates/prover/src/lib.rs b/crates/prover/src/lib.rs
index 6090c05..9934ea3 100644
--- a/crates/prover/src/lib.rs
+++ b/crates/prover/src/lib.rs
@@ -11,8 +11,8 @@ pub use task_manager::*;
 mod metrics;
 pub use metrics::*;
 
-use base::Alive;
-use clients::Eth;
+use base::{eth::Keypair, trace::Alive};
+use base::eth::Eth;
 use jsonrpsee::{
     server::{tower, ServerBuilder, TlsLayer},
     Methods,
@@ -41,7 +41,6 @@ struct Opt {
     force_with_context: bool,
 }
 
-
 pub async fn entrypoint() {
     let opt: Opt = Opt::parse();
 
@@ -49,10 +48,20 @@ pub async fn entrypoint() {
 
     let alive = Alive::new();
 
-    let scroll =
-        ScrollBatchVerifier::new(cfg.scroll_endpoint.as_ref().map(|n| n.as_str())).unwrap();
+    let keypair = Keypair::new();
+
+    let scroll = ScrollBatchVerifier::new(
+        cfg.scroll_endpoint.as_ref().map(|n| n.as_str()),
+        Some(Duration::from_secs(cfg.l2_timeout_secs)),
+    )
+    .unwrap();
 
-    let linea = LineaBatchVerifier::new(cfg.linea_endpoint.as_ref().map(|n| n.as_str()), cfg.linea_shomei).unwrap();
+    let linea = LineaBatchVerifier::new(
+        cfg.linea_endpoint.as_ref().map(|n| n.as_str()),
+        Some(Duration::from_secs(cfg.l2_timeout_secs)),
+        cfg.linea_shomei,
+    )
+    .unwrap();
 
     let l1_el = cfg
         .scroll_chain
@@ -73,6 +82,7 @@ pub async fn entrypoint() {
         pobda_task_mgr: Arc::new(TaskManager::new(100)),
         pob_da: Arc::new(DaManager::new()),
         metrics: collector.clone(),
+        keypair,
     };
 
     run_jsonrpc(&cfg.server, opt.port, api.rpc(), collector).await
diff --git a/crates/prover/src/task_manager.rs b/crates/prover/src/task_manager.rs
index 9647689..e364998 100644
--- a/crates/prover/src/task_manager.rs
+++ b/crates/prover/src/task_manager.rs
@@ -1,9 +1,8 @@
-use std::{collections::{btree_map::Entry, BTreeMap}, time::Duration};
+use std::collections::{btree_map::Entry, BTreeMap};
 
-use base::Alive;
+use base::trace::Alive;
 use tokio::sync::Mutex;
 
-
 pub struct TaskManager<K, V, E>
 where
     K: Ord + Clone,
@@ -46,7 +45,6 @@ where
 
     pub async fn process_task(&self, task: K) -> Option<Result<V, E>> {
         let alive = Alive::new();
-        let alive = alive.fork_with_timeout(Duration::from_secs(120));
 
         while alive.is_alive() {
             match self.add_task(task.clone()).await {
@@ -79,4 +77,4 @@ where
 #[derive(Clone, Debug)]
 pub struct TaskContext<T: Clone, E: Clone> {
     pub result: Option<Result<T, E>>,
-}
\ No newline at end of file
+}
diff --git a/crates/prover/src/types.rs b/crates/prover/src/types.rs
index f0cf8ea..8ab13e2 100644
--- a/crates/prover/src/types.rs
+++ b/crates/prover/src/types.rs
@@ -1,7 +1,7 @@
 use std::{collections::BTreeMap, time::Duration};
 
 use alloy::primitives::Bytes;
-use base::debug;
+use base::format::debug;
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
 use linea_shomei::ShomeiConfig;
 use prover_types::{PoeResponse, ProveTaskParams, SuccinctPobList, B256};
diff --git a/crates/scroll/verifier/Cargo.toml b/crates/scroll/verifier/Cargo.toml
index 6c3803d..0b6d9ce 100644
--- a/crates/scroll/verifier/Cargo.toml
+++ b/crates/scroll/verifier/Cargo.toml
@@ -17,5 +17,4 @@ c-kzg.workspace = true
 hex.workspace = true
 blst.workspace = true
 base.workspace = true
-clients.workspace = true
 alloy.workspace = true
\ No newline at end of file