From b7fe0a755211483ada0feb0627b9cb5f383e1739 Mon Sep 17 00:00:00 2001
From: SoraSuegami <suegamisora@gmail.com>
Date: Sat, 9 Dec 2023 14:19:15 +0900
Subject: [PATCH] Fix all tests.

---
 Cargo.lock                           | 1238 ++++++++++++--------------
 Cargo.toml                           |    6 +-
 configs/test_ex1_email_verify.config |    4 +-
 configs/test_ex2_email_verify.config |    4 +-
 src/chars_shift.rs                   |    1 +
 src/eth/mod.rs                       |    4 +-
 src/helpers.rs                       |    4 +-
 src/lib.rs                           |   59 +-
 src/regex_sha2.rs                    |    4 +-
 src/regex_sha2_base64.rs             |    4 +-
 src/utils.rs                         |    6 +-
 test_data/bodyhash_allstr.txt        |  674 +++++++-------
 test_data/bodyhash_defs.json         |    2 +-
 test_data/bodyhash_substr_0.txt      |    6 +-
 test_data/invalid_test_email1.eml    |  105 +--
 test_data/test_email1.eml            |  105 +--
 test_data/test_email2.eml            |  105 +--
 17 files changed, 1145 insertions(+), 1186 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 50ceef2..dc39c0b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -40,21 +40,22 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.10",
+ "getrandom",
  "once_cell",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.5"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
@@ -128,7 +129,7 @@ checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
 dependencies = [
  "colored",
  "num-traits",
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -154,13 +155,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.73"
+version = "0.1.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -232,9 +233,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.3"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
 [[package]]
 name = "base64ct"
@@ -280,9 +281,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "bitvec"
@@ -298,9 +299,9 @@ dependencies = [
 
 [[package]]
 name = "blake2b_simd"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc"
+checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -338,15 +339,15 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
 dependencies = [
- "sha2 0.10.7",
+ "sha2",
  "tinyvec",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "byte-slice-cast"
@@ -356,21 +357,21 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
 [[package]]
 name = "bytemuck"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 dependencies = [
  "serde",
 ]
@@ -386,9 +387,9 @@ dependencies = [
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479"
+checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff"
 dependencies = [
  "serde",
 ]
@@ -401,7 +402,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.18",
+ "semver 1.0.20",
  "serde",
  "serde_json",
  "thiserror",
@@ -424,10 +425,10 @@ dependencies = [
 
 [[package]]
 name = "cfdkim"
-version = "0.2.6"
-source = "git+https://github.com/SoraSuegami/dkim.git#abf6947b97a62d0c74b9f46d67bebc7460508ae8"
+version = "0.3.0"
+source = "git+https://github.com/SoraSuegami/dkim.git#a974a456257989fb28fd5e3a175e456a489fcb76"
 dependencies = [
- "base64 0.21.3",
+ "base64 0.21.5",
  "chrono",
  "ed25519-dalek",
  "futures",
@@ -437,7 +438,7 @@ dependencies = [
  "quick-error 2.0.1",
  "rsa",
  "sha-1",
- "sha2 0.10.7",
+ "sha2",
  "slog",
  "trust-dns-resolver",
 ]
@@ -460,15 +461,14 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.28"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
- "time",
  "wasm-bindgen",
  "windows-targets 0.48.5",
 ]
@@ -527,7 +527,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -557,7 +557,7 @@ dependencies = [
  "hmac",
  "k256",
  "serde",
- "sha2 0.10.7",
+ "sha2",
  "thiserror",
 ]
 
@@ -572,8 +572,8 @@ dependencies = [
  "hmac",
  "once_cell",
  "pbkdf2 0.12.2",
- "rand 0.8.5",
- "sha2 0.10.7",
+ "rand",
+ "sha2",
  "thiserror",
 ]
 
@@ -583,7 +583,7 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5286a0843c21f8367f7be734f89df9b822e0321d8bcce8d6e735aadff7d74979"
 dependencies = [
- "base64 0.21.3",
+ "base64 0.21.5",
  "bech32",
  "bs58",
  "digest 0.10.7",
@@ -592,7 +592,7 @@ dependencies = [
  "ripemd",
  "serde",
  "serde_derive",
- "sha2 0.10.7",
+ "sha2",
  "sha3 0.10.8",
  "thiserror",
 ]
@@ -654,12 +654,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6"
 
-[[package]]
-name = "const-oid"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
-
 [[package]]
 name = "const-oid"
 version = "0.9.5"
@@ -668,9 +662,9 @@ checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
 
 [[package]]
 name = "constant_time_eq"
-version = "0.2.6"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
 [[package]]
 name = "convert_case"
@@ -680,9 +674,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -690,9 +684,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "core-graphics"
@@ -709,9 +703,9 @@ dependencies = [
 
 [[package]]
 name = "core-graphics-types"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
@@ -732,9 +726,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
 dependencies = [
  "libc",
 ]
@@ -784,16 +778,6 @@ dependencies = [
  "itertools",
 ]
 
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.3"
@@ -835,22 +819,12 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "crypto-bigint"
-version = "0.3.2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array",
- "subtle",
-]
-
-[[package]]
-name = "crypto-bigint"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
-dependencies = [
- "generic-array",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
  "zeroize",
 ]
@@ -867,9 +841,9 @@ dependencies = [
 
 [[package]]
 name = "csv"
-version = "1.2.2"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
 dependencies = [
  "csv-core",
  "itoa",
@@ -879,9 +853,9 @@ dependencies = [
 
 [[package]]
 name = "csv-core"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
 dependencies = [
  "memchr",
 ]
@@ -897,17 +871,32 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "3.2.0"
+version = "4.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
 dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest 0.10.7",
+ "fiat-crypto",
+ "platforms",
+ "rustc_version 0.4.0",
  "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
+
 [[package]]
 name = "darling"
 version = "0.10.2"
@@ -945,9 +934,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
+checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
 [[package]]
 name = "debugid"
@@ -956,7 +945,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
 dependencies = [
  "serde",
- "uuid 1.4.1",
+ "uuid 1.6.1",
 ]
 
 [[package]]
@@ -992,31 +981,21 @@ checksum = "0f494a90671467e3de74b557b3c1fe805aad87c7239580d2be8f2dddde971824"
 dependencies = [
  "once_cell",
  "pmutil",
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "regex",
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "der"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
-dependencies = [
- "const-oid 0.7.1",
- "crypto-bigint 0.3.2",
- "pem-rfc7468",
-]
-
 [[package]]
 name = "der"
 version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
 dependencies = [
- "const-oid 0.9.5",
+ "const-oid",
+ "pem-rfc7468",
  "zeroize",
 ]
 
@@ -1080,7 +1059,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer 0.10.4",
- "const-oid 0.9.5",
+ "const-oid",
  "crypto-common",
  "subtle",
 ]
@@ -1135,38 +1114,39 @@ dependencies = [
 
 [[package]]
 name = "ecdsa"
-version = "0.16.8"
+version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
- "der 0.7.8",
+ "der",
  "digest 0.10.7",
  "elliptic-curve",
  "rfc6979",
- "signature 2.1.0",
- "spki 0.7.2",
+ "signature",
+ "spki",
 ]
 
 [[package]]
 name = "ed25519"
-version = "1.5.3"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
- "signature 1.6.4",
+ "pkcs8",
+ "signature",
 ]
 
 [[package]]
 name = "ed25519-dalek"
-version = "1.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
+checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
- "rand 0.7.3",
  "serde",
- "sha2 0.9.9",
+ "sha2",
+ "subtle",
  "zeroize",
 ]
 
@@ -1178,18 +1158,18 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "elliptic-curve"
-version = "0.13.5"
+version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
  "base16ct",
- "crypto-bigint 0.5.2",
+ "crypto-bigint",
  "digest 0.10.7",
  "ff 0.13.0",
  "generic-array",
  "group 0.13.0",
- "pkcs8 0.10.2",
- "rand_core 0.6.4",
+ "pkcs8",
+ "rand_core",
  "sec1",
  "subtle",
  "zeroize",
@@ -1224,7 +1204,7 @@ dependencies = [
  "hex",
  "k256",
  "log",
- "rand 0.8.5",
+ "rand",
  "rlp",
  "serde",
  "sha3 0.10.8",
@@ -1251,23 +1231,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.3"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
  "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1282,11 +1251,11 @@ dependencies = [
  "hex",
  "hmac",
  "pbkdf2 0.11.0",
- "rand 0.8.5",
+ "rand",
  "scrypt",
  "serde",
  "serde_json",
- "sha2 0.10.7",
+ "sha2",
  "sha3 0.10.8",
  "thiserror",
  "uuid 0.8.2",
@@ -1401,7 +1370,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "syn 2.0.29",
+ "syn 2.0.39",
  "toml",
  "walkdir",
 ]
@@ -1418,7 +1387,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_json",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -1438,12 +1407,12 @@ dependencies = [
  "num_enum 0.6.1",
  "once_cell",
  "open-fastrlp",
- "rand 0.8.5",
+ "rand",
  "rlp",
  "serde",
  "serde_json",
  "strum",
- "syn 2.0.29",
+ "syn 2.0.39",
  "tempfile",
  "thiserror",
  "tiny-keccak",
@@ -1458,7 +1427,7 @@ dependencies = [
  "ethers-core",
  "ethers-solc",
  "reqwest",
- "semver 1.0.18",
+ "semver 1.0.20",
  "serde",
  "serde_json",
  "thiserror",
@@ -1498,7 +1467,7 @@ source = "git+https://github.com/gakonst/ethers-rs.git?tag=ethers-v2.0.8#5dcd3b7
 dependencies = [
  "async-trait",
  "auto_impl",
- "base64 0.21.3",
+ "base64 0.21.5",
  "bytes",
  "enr",
  "ethers-core",
@@ -1537,8 +1506,8 @@ dependencies = [
  "eth-keystore",
  "ethers-core",
  "hex",
- "rand 0.8.5",
- "sha2 0.10.7",
+ "rand",
+ "sha2",
  "thiserror",
  "tracing",
 ]
@@ -1560,7 +1529,7 @@ dependencies = [
  "path-slash",
  "rayon",
  "regex",
- "semver 1.0.18",
+ "semver 1.0.20",
  "serde",
  "serde_json",
  "solang-parser",
@@ -1574,9 +1543,9 @@ dependencies = [
 
 [[package]]
 name = "eyre"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd"
 dependencies = [
  "indenter",
  "once_cell",
@@ -1594,15 +1563,15 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "fdeflate"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868"
 dependencies = [
  "simd-adler32",
 ]
@@ -1614,7 +1583,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
 dependencies = [
  "bitvec",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -1624,10 +1593,16 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
+[[package]]
+name = "fiat-crypto"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7"
+
 [[package]]
 name = "fixed-hash"
 version = "0.8.0"
@@ -1635,7 +1610,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand 0.8.5",
+ "rand",
  "rustc-hex",
  "static_assertions",
 ]
@@ -1648,9 +1623,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1710,9 +1685,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
@@ -1756,9 +1731,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1771,9 +1746,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1781,15 +1756,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1798,9 +1773,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
 
 [[package]]
 name = "futures-locks"
@@ -1814,26 +1789,26 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
 
 [[package]]
 name = "futures-timer"
@@ -1847,9 +1822,9 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1885,25 +1860,14 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.1.16"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "wasm-bindgen",
 ]
 
@@ -1919,9 +1883,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "glob"
@@ -1959,7 +1923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
 dependencies = [
  "ff 0.12.1",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -1970,15 +1934,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff 0.13.0",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
 [[package]]
 name = "h2"
-version = "0.3.21"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178"
 dependencies = [
  "bytes",
  "fnv",
@@ -1986,7 +1950,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 1.9.3",
+ "indexmap 2.1.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2010,7 +1974,7 @@ dependencies = [
  "num-bigint",
  "num-integer",
  "num-traits",
- "rand_chacha 0.3.1",
+ "rand_chacha",
  "rustc-hash",
 ]
 
@@ -2027,7 +1991,7 @@ dependencies = [
  "num-integer",
  "num-traits",
  "plotters",
- "rand_chacha 0.3.1",
+ "rand_chacha",
  "rustc-hash",
 ]
 
@@ -2036,14 +2000,14 @@ name = "halo2-base64"
 version = "0.1.0"
 source = "git+https://github.com/zkemail/halo2-base64.git?branch=feat/main_gate#f0b2e7b173b771c5bbceda458ff99f0520683b7a"
 dependencies = [
- "base64 0.21.3",
+ "base64 0.21.5",
  "halo2-base 0.2.2 (git+https://github.com/axiom-crypto/halo2-lib.git?rev=9860acc)",
  "hex",
  "json",
  "lazy_static",
  "once_cell",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
+ "rand",
+ "rand_chacha",
 ]
 
 [[package]]
@@ -2058,8 +2022,8 @@ dependencies = [
  "itertools",
  "log",
  "num-bigint",
- "rand 0.8.5",
- "sha2 0.10.7",
+ "rand",
+ "sha2",
 ]
 
 [[package]]
@@ -2074,9 +2038,9 @@ dependencies = [
  "num-bigint",
  "num-integer",
  "num-traits",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
+ "rand",
+ "rand_chacha",
+ "rand_core",
  "serde",
  "serde_json",
 ]
@@ -2093,9 +2057,9 @@ dependencies = [
  "num-bigint",
  "num-integer",
  "num-traits",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
+ "rand",
+ "rand_chacha",
+ "rand_core",
  "serde",
  "serde_json",
 ]
@@ -2103,7 +2067,7 @@ dependencies = [
 [[package]]
 name = "halo2-regex"
 version = "0.1.0"
-source = "git+https://github.com/zkemail/halo2-regex.git#3c7350a90be1967843b3ba8d140f9f13a9b39569"
+source = "git+https://github.com/zkemail/halo2-regex.git#e2cde46807e051a2cef5c5f35780f0ca5d93c7ea"
 dependencies = [
  "clap 4.2.1",
  "fancy-regex",
@@ -2121,21 +2085,21 @@ dependencies = [
 [[package]]
 name = "halo2-rsa"
 version = "0.1.0"
-source = "git+https://github.com/zkemail/halo2-rsa.git?branch=main#f770cfa1344efee7ea8ffdecbee754012bc8597c"
+source = "git+https://github.com/zkemail/halo2-rsa.git?branch=main#07b8bae20e13dfddd4afa1f998b44fa133faa9b9"
 dependencies = [
  "console_error_panic_hook",
- "getrandom 0.2.10",
+ "getrandom",
  "halo2-base 0.2.2 (git+https://github.com/axiom-crypto/halo2-lib.git?rev=9860acc)",
  "halo2-ecc 0.2.2 (git+https://github.com/axiom-crypto/halo2-lib.git?rev=9860acc)",
  "js-sys",
  "num-bigint",
  "num-traits",
- "rand 0.8.5",
+ "rand",
  "rayon",
  "rsa",
  "serde",
  "serde-wasm-bindgen",
- "sha2 0.10.7",
+ "sha2",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-rayon",
@@ -2147,7 +2111,7 @@ name = "halo2-zk-email"
 version = "0.1.0"
 dependencies = [
  "ark-std",
- "base64 0.21.3",
+ "base64 0.21.5",
  "cfdkim",
  "clap 4.2.1",
  "criterion",
@@ -2167,13 +2131,13 @@ dependencies = [
  "num-traits",
  "once_cell",
  "poseidon 0.2.0 (git+https://github.com/privacy-scaling-explorations/poseidon.git?rev=2fb4a2385bada39b50dce12fe50cb80d2fd33476)",
- "rand 0.8.5",
+ "rand",
  "regex",
  "rsa",
  "serde",
  "serde_json",
  "serde_regex",
- "sha2 0.10.7",
+ "sha2",
  "slog",
  "snark-verifier",
  "snark-verifier-sdk",
@@ -2192,7 +2156,7 @@ dependencies = [
  "group 0.12.1",
  "halo2curves 0.3.1 (git+https://github.com/axiom-crypto/halo2.git?tag=v2023_01_17)",
  "plotters",
- "rand_core 0.6.4",
+ "rand_core",
  "rayon",
  "rustc-hash",
  "tabbycat",
@@ -2209,7 +2173,7 @@ dependencies = [
  "group 0.12.1",
  "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations/halo2curves.git?tag=0.3.1)",
  "plotters",
- "rand_core 0.6.4",
+ "rand_core",
  "rayon",
  "sha3 0.9.1",
  "tabbycat",
@@ -2227,8 +2191,8 @@ dependencies = [
  "num-bigint",
  "num-traits",
  "pasta_curves",
- "rand 0.8.5",
- "rand_core 0.6.4",
+ "rand",
+ "rand_core",
  "static_assertions",
  "subtle",
 ]
@@ -2244,8 +2208,8 @@ dependencies = [
  "num-bigint",
  "num-traits",
  "pasta_curves",
- "rand 0.8.5",
- "rand_core 0.6.4",
+ "rand",
+ "rand_core",
  "serde",
  "static_assertions",
  "subtle",
@@ -2268,9 +2232,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 
 [[package]]
 name = "hashers"
@@ -2298,9 +2262,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
 
 [[package]]
 name = "hex"
@@ -2339,9 +2303,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
 dependencies = [
  "bytes",
  "fnv",
@@ -2388,7 +2352,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.9",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -2397,16 +2361,16 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.57"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows",
+ "windows-core",
 ]
 
 [[package]]
@@ -2437,9 +2401,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -2522,12 +2486,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.3",
 ]
 
 [[package]]
@@ -2554,7 +2518,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2 0.5.3",
+ "socket2 0.5.5",
  "widestring",
  "windows-sys 0.48.0",
  "winreg",
@@ -2562,9 +2526,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "is-terminal"
@@ -2572,7 +2536,7 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.3.2",
+ "hermit-abi 0.3.3",
  "rustix",
  "windows-sys 0.48.0",
 ]
@@ -2616,14 +2580,14 @@ source = "git+https://github.com/Bromeon/js-sandbox.git?rev=cd256ef#cd256ef88f6e
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.64"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2636,16 +2600,16 @@ checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
 
 [[package]]
 name = "k256"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
+checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b"
 dependencies = [
  "cfg-if",
  "ecdsa",
  "elliptic-curve",
  "once_cell",
- "sha2 0.10.7",
- "signature 2.1.0",
+ "sha2",
+ "signature",
 ]
 
 [[package]]
@@ -2672,7 +2636,7 @@ dependencies = [
  "lalrpop-util",
  "petgraph",
  "regex",
- "regex-syntax",
+ "regex-syntax 0.7.5",
  "string_cache",
  "term",
  "tiny-keccak",
@@ -2696,15 +2660,15 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
 
 [[package]]
 name = "libloading"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
 dependencies = [
  "cfg-if",
  "windows-sys 0.48.0",
@@ -2712,9 +2676,20 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "libredox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+dependencies = [
+ "bitflags 2.4.1",
+ "libc",
+ "redox_syscall",
+]
 
 [[package]]
 name = "linked-hash-map"
@@ -2724,15 +2699,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.5"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
 
 [[package]]
 name = "lock_api"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -2781,18 +2756,19 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "md-5"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
+ "cfg-if",
  "digest 0.10.7",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.6.2"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "memoffset"
@@ -2827,12 +2803,12 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.8"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
 dependencies = [
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.48.0",
 ]
 
@@ -2875,7 +2851,7 @@ dependencies = [
  "autocfg",
  "num-integer",
  "num-traits",
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -2890,7 +2866,7 @@ dependencies = [
  "num-integer",
  "num-iter",
  "num-traits",
- "rand 0.8.5",
+ "rand",
  "serde",
  "smallvec",
  "zeroize",
@@ -2940,9 +2916,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
  "libm",
@@ -2954,7 +2930,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.2",
+ "hermit-abi 0.3.3",
  "libc",
 ]
 
@@ -2982,7 +2958,7 @@ version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -2994,26 +2970,26 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "object"
-version = "0.32.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "oorandom"
@@ -3054,9 +3030,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.6.5"
+version = "3.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb"
+checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe"
 dependencies = [
  "arrayvec",
  "bitvec",
@@ -3068,11 +3044,11 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.6.5"
+version = "3.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260"
+checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -3090,13 +3066,13 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.8"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.3.5",
+ "redox_syscall",
  "smallvec",
  "windows-targets 0.48.5",
 ]
@@ -3111,7 +3087,7 @@ dependencies = [
  "ff 0.12.1",
  "group 0.12.1",
  "lazy_static",
- "rand 0.8.5",
+ "rand",
  "static_assertions",
  "subtle",
 ]
@@ -3134,11 +3110,11 @@ dependencies = [
 
 [[package]]
 name = "pathfinder_simd"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39fe46acc5503595e5949c17b818714d26fdf9b4920eacf3b2947f0199f4a6ff"
+checksum = "0444332826c70dc47be74a7c6a5fc44e23a7905ad6858d4162b658320455ef93"
 dependencies = [
- "rustc_version 0.3.3",
+ "rustc_version 0.4.0",
 ]
 
 [[package]]
@@ -3162,29 +3138,18 @@ dependencies = [
 
 [[package]]
 name = "pem-rfc7468"
-version = "0.3.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01de5d978f34aa4b2296576379fcc416034702fd94117c56ffd8a1a767cefb30"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
 dependencies = [
  "base64ct",
 ]
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
-
-[[package]]
-name = "pest"
-version = "2.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33"
-dependencies = [
- "memchr",
- "thiserror",
- "ucd-trie",
-]
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "petgraph"
@@ -3193,7 +3158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.0.0",
+ "indexmap 2.1.0",
 ]
 
 [[package]]
@@ -3223,7 +3188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
 dependencies = [
  "phf_shared 0.11.2",
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -3236,7 +3201,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -3274,7 +3239,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -3291,24 +3256,13 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkcs1"
-version = "0.3.3"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a78f66c04ccc83dd4486fd46c33896f4e17b24a7a3a6400dedc48ed0ddd72320"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
 dependencies = [
- "der 0.5.1",
- "pkcs8 0.8.0",
- "zeroize",
-]
-
-[[package]]
-name = "pkcs8"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
-dependencies = [
- "der 0.5.1",
- "spki 0.5.4",
- "zeroize",
+ "der",
+ "pkcs8",
+ "spki",
 ]
 
 [[package]]
@@ -3317,8 +3271,8 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
 dependencies = [
- "der 0.7.8",
- "spki 0.7.2",
+ "der",
+ "spki",
 ]
 
 [[package]]
@@ -3327,6 +3281,12 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
+[[package]]
+name = "platforms"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0"
+
 [[package]]
 name = "plotters"
 version = "0.3.5"
@@ -3431,19 +3391,19 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "primitive-types"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
+checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
 dependencies = [
  "fixed-hash",
  "impl-codec",
@@ -3460,7 +3420,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "toml_edit",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+dependencies = [
+ "toml_edit 0.20.7",
 ]
 
 [[package]]
@@ -3489,9 +3458,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -3529,19 +3498,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -3549,18 +3505,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+ "rand_chacha",
+ "rand_core",
 ]
 
 [[package]]
@@ -3570,16 +3516,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
+ "rand_core",
 ]
 
 [[package]]
@@ -3588,23 +3525,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.10",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
+ "getrandom",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
 dependencies = [
  "either",
  "rayon-core",
@@ -3612,66 +3540,55 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
 dependencies = [
- "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
- "num_cpus",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.16"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
  "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
 dependencies = [
- "getrandom 0.2.10",
- "redox_syscall 0.2.16",
+ "getrandom",
+ "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.9.4"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-automata",
- "regex-syntax",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.3.7"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -3681,12 +3598,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
-name = "reqwest"
-version = "0.11.20"
+name = "regex-syntax"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[package]]
+name = "reqwest"
+version = "0.11.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
 dependencies = [
- "base64 0.21.3",
+ "base64 0.21.5",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -3705,6 +3628,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
+ "system-configuration",
  "tokio",
  "tower-service",
  "url",
@@ -3754,7 +3678,7 @@ dependencies = [
  "primitive-types",
  "ripemd",
  "secp256k1",
- "sha2 0.10.7",
+ "sha2",
  "sha3 0.10.8",
  "substrate-bn",
 ]
@@ -3802,21 +3726,22 @@ dependencies = [
 
 [[package]]
 name = "rsa"
-version = "0.6.1"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b"
+checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
 dependencies = [
- "byteorder",
+ "const-oid",
  "digest 0.10.7",
  "num-bigint-dig",
  "num-integer",
- "num-iter",
  "num-traits",
  "pkcs1",
- "pkcs8 0.8.0",
- "rand_core 0.6.4",
+ "pkcs8",
+ "rand_core",
  "serde",
- "smallvec",
+ "sha2",
+ "signature",
+ "spki",
  "subtle",
  "zeroize",
 ]
@@ -3848,35 +3773,26 @@ dependencies = [
  "semver 0.9.0",
 ]
 
-[[package]]
-name = "rustc_version"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
-dependencies = [
- "semver 0.11.0",
-]
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.18",
+ "semver 1.0.20",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.11"
+version = "0.38.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453"
+checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3911,9 +3827,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782"
+checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60"
 dependencies = [
  "cfg-if",
  "derive_more",
@@ -3923,11 +3839,11 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29"
+checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -3948,7 +3864,7 @@ dependencies = [
  "hmac",
  "pbkdf2 0.11.0",
  "salsa20",
- "sha2 0.10.7",
+ "sha2",
 ]
 
 [[package]]
@@ -3958,9 +3874,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
  "base16ct",
- "der 0.7.8",
+ "der",
  "generic-array",
- "pkcs8 0.10.2",
+ "pkcs8",
  "subtle",
  "zeroize",
 ]
@@ -3989,23 +3905,14 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 dependencies = [
- "semver-parser 0.7.0",
+ "semver-parser",
 ]
 
 [[package]]
 name = "semver"
-version = "0.11.0"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser 0.10.2",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 dependencies = [
  "serde",
 ]
@@ -4016,15 +3923,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
 [[package]]
 name = "send_wrapper"
 version = "0.4.0"
@@ -4039,9 +3937,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
 dependencies = [
  "serde_derive",
 ]
@@ -4078,22 +3976,22 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.105"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
- "indexmap 2.0.0",
+ "indexmap 2.1.0",
  "itoa",
  "ryu",
  "serde",
@@ -4111,9 +4009,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
 dependencies = [
  "serde",
 ]
@@ -4158,22 +4056,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.9.9"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -4204,18 +4089,12 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "1.6.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-
-[[package]]
-name = "signature"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest 0.10.7",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -4247,9 +4126,9 @@ checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06"
 
 [[package]]
 name = "smallvec"
-version = "1.11.0"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "snark-verifier"
@@ -4267,7 +4146,7 @@ dependencies = [
  "num-integer",
  "num-traits",
  "poseidon 0.2.0 (git+https://github.com/privacy-scaling-explorations/poseidon?rev=2fb4a23)",
- "rand 0.8.5",
+ "rand",
  "revm",
  "rlp",
  "rustc-hash",
@@ -4289,8 +4168,8 @@ dependencies = [
  "num-bigint",
  "num-integer",
  "num-traits",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
+ "rand",
+ "rand_chacha",
  "serde",
  "serde_json",
  "snark-verifier",
@@ -4298,9 +4177,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
 dependencies = [
  "libc",
  "winapi",
@@ -4308,9 +4187,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.3"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
  "libc",
  "windows-sys 0.48.0",
@@ -4354,22 +4233,12 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "spki"
-version = "0.5.4"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
- "der 0.5.1",
-]
-
-[[package]]
-name = "spki"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
-dependencies = [
- "base64ct",
- "der 0.7.8",
+ "der",
 ]
 
 [[package]]
@@ -4420,15 +4289,15 @@ dependencies = [
 
 [[package]]
 name = "strum_macros"
-version = "0.25.2"
+version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -4440,7 +4309,7 @@ dependencies = [
  "byteorder",
  "crunchy",
  "lazy_static",
- "rand 0.8.5",
+ "rand",
  "rustc-hex",
 ]
 
@@ -4463,15 +4332,36 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.29"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "tabbycat"
 version = "0.1.2"
@@ -4491,22 +4381,22 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "temp-env"
-version = "0.3.4"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9547444bfe52cbd79515c6c8087d8ae6ca8d64d2d31a27746320f5cb81d1a15c"
+checksum = "96374855068f47402c3121c6eed88d29cb1de8f3ab27090e273e420bdabcf050"
 dependencies = [
  "parking_lot",
 ]
 
 [[package]]
 name = "tempfile"
-version = "3.8.0"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall 0.3.5",
+ "redox_syscall",
  "rustix",
  "windows-sys 0.48.0",
 ]
@@ -4533,33 +4423,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.47"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.47"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -4598,9 +4477,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.32.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4608,27 +4487,27 @@ dependencies = [
  "mio",
  "num_cpus",
  "pin-project-lite",
- "socket2 0.5.3",
+ "socket2 0.5.5",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.8"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
 dependencies = [
  "bytes",
  "futures-core",
@@ -4640,38 +4519,49 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.14"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.0.0",
+ "indexmap 2.1.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
  "winnow",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tower-service"
 version = "0.3.2"
@@ -4680,11 +4570,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -4692,20 +4581,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
 ]
@@ -4736,7 +4625,7 @@ dependencies = [
  "idna 0.2.3",
  "ipnet",
  "lazy_static",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "thiserror",
  "tinyvec",
@@ -4779,15 +4668,9 @@ checksum = "375812fa44dab6df41c195cd2f7fecb488f6c09fbaafb62807488cefab642bff"
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "uint"
@@ -4803,21 +4686,21 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
 
 [[package]]
 name = "unicode-id"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a"
+checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
@@ -4830,9 +4713,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unicode-xid"
@@ -4842,12 +4725,12 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "url"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
- "idna 0.4.0",
+ "idna 0.5.0",
  "percent-encoding",
  "serde",
 ]
@@ -4864,15 +4747,15 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.10",
+ "getrandom",
  "serde",
 ]
 
 [[package]]
 name = "uuid"
-version = "1.4.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
 
 [[package]]
 name = "v8"
@@ -4894,9 +4777,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -4911,18 +4794,6 @@ dependencies = [
  "try-lock",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -4931,9 +4802,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.87"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
 dependencies = [
  "cfg-if",
  "serde",
@@ -4943,24 +4814,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.87"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.37"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4970,9 +4841,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.87"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4980,13 +4851,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.87"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -5005,15 +4876,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.87"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
 
 [[package]]
 name = "web-sys"
-version = "0.3.64"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5027,13 +4898,14 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
 
 [[package]]
 name = "which"
-version = "4.4.0"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
 dependencies = [
  "either",
- "libc",
+ "home",
  "once_cell",
+ "rustix",
 ]
 
 [[package]]
@@ -5060,9 +4932,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
  "winapi",
 ]
@@ -5074,10 +4946,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows"
-version = "0.48.0"
+name = "windows-core"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
  "windows-targets 0.48.5",
 ]
@@ -5100,6 +4972,15 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -5130,6 +5011,21 @@ dependencies = [
  "windows_x86_64_msvc 0.48.5",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -5142,6 +5038,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -5154,6 +5056,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -5166,6 +5074,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -5178,6 +5092,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -5190,6 +5110,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -5202,6 +5128,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -5215,10 +5147,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
-name = "winnow"
-version = "0.5.15"
+name = "windows_x86_64_msvc"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
+[[package]]
+name = "winnow"
+version = "0.5.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94"
 dependencies = [
  "memchr",
 ]
@@ -5289,21 +5227,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "zeroize"
-version = "1.6.0"
+name = "zerocopy"
+version = "0.7.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "5d075cf85bbb114e933343e087b92f2146bac0d55b534cbb8188becf0039948e"
 dependencies = [
- "zeroize_derive",
+ "zerocopy-derive",
 ]
 
 [[package]]
-name = "zeroize_derive"
-version = "1.4.2"
+name = "zerocopy-derive"
+version = "0.7.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+checksum = "86cd5ca076997b97ef09d3ad65efe811fa68c9e874cb636ccb211223a813b0c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
+
+[[package]]
+name = "zeroize"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
diff --git a/Cargo.toml b/Cargo.toml
index 7cf6449..5f2be90 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 num-bigint = { version = "0.4", features = ["rand"] }
 sha2 = "0.10.6"
 rand = "0.8.5"
-rsa = { version = "0.6.1", features = ["serde"] }
+rsa = { version = "0.9.6", features = ["serde", "sha2"] }
 halo2-base = { version = "0.2.2", default-features = false, features = [
     "halo2-pse",
     "display",
@@ -20,7 +20,7 @@ halo2-ecc = { version = "0.2.2", default-features = false, features = [
 halo2-dynamic-sha256 = { git = "https://github.com/zkemail/halo2-dynamic-sha256.git", version = "0.1.0", branch = "main" }
 halo2-rsa = { git = "https://github.com/zkemail/halo2-rsa.git", version = "0.1.0", branch = "main", default-features = false }
 halo2-regex = { git = "https://github.com/zkemail/halo2-regex.git", version = "0.1.0" }
-# halo2-regex = { path = "../halo2-regex-2", version = "0.1.0" }
+# halo2-regex = { path = "../halo2-regex-1", version = "0.1.0" }
 halo2-base64 = { git = "https://github.com/zkemail/halo2-base64.git", version = "0.1.0", branch = "feat/main_gate" }
 num-traits = "0.2.15"
 base64 = "0.21"
@@ -44,7 +44,7 @@ itertools = "0.10.3"
 clap = { version = "=4.2.1", features = ["derive"] }
 serde_json = "1.0.95"
 serde = { version = "1.0.159", features = ["derive"] }
-cfdkim = { version = "0.2.6", git = "https://github.com/SoraSuegami/dkim.git" }
+cfdkim = { version = "0.3.0", git = "https://github.com/SoraSuegami/dkim.git" }
 slog = "2.7.0"
 fancy-regex = "0.11.0"
 poseidon = { version = "0.2.0", git = "https://github.com/privacy-scaling-explorations/poseidon.git", rev = "2fb4a2385bada39b50dce12fe50cb80d2fd33476" }
diff --git a/configs/test_ex1_email_verify.config b/configs/test_ex1_email_verify.config
index dc25488..98f500a 100644
--- a/configs/test_ex1_email_verify.config
+++ b/configs/test_ex1_email_verify.config
@@ -35,7 +35,9 @@
         "max_variable_byte_size": 1024,
         "substr_regexes": [
             [
-                "(?<=from:).*@.*(?=\r)"
+                "(?<=from:).*@.*(?=\r)",
+                "<?(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+@(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+>?",
+                "(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+@(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+"
             ],
             [
                 "(?<=to:).*@.*(?=\r)"
diff --git a/configs/test_ex2_email_verify.config b/configs/test_ex2_email_verify.config
index e52ac14..b759b63 100644
--- a/configs/test_ex2_email_verify.config
+++ b/configs/test_ex2_email_verify.config
@@ -35,7 +35,9 @@
         "max_variable_byte_size": 1024,
         "substr_regexes": [
             [
-                "(?<=from:).*@.*(?=\r)"
+                "(?<=from:).*@.*(?=\r)",
+                "<?(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+@(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+>?",
+                "(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+@(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+"
             ],
             [
                 "(?<=to:).*@.*(?=\r)"
diff --git a/src/chars_shift.rs b/src/chars_shift.rs
index 2de1ba6..beb2328 100644
--- a/src/chars_shift.rs
+++ b/src/chars_shift.rs
@@ -82,6 +82,7 @@ impl<F: PrimeField> CharsShiftConfig<F> {
             );
             is_target_vec.push(is_target);
         }
+        gate.assert_equal(ctx, QuantumCell::Existing(&is_target_found), QuantumCell::Constant(F::one()));
         let shifted = self.shift_variable(ctx, gate, assigned_masked_chars, &shift_value);
         let assigned_substr = &shifted[0..self.max_substr_size];
         (assigned_substr.to_vec(), is_target_vec)
diff --git a/src/eth/mod.rs b/src/eth/mod.rs
index c465dc9..887167a 100644
--- a/src/eth/mod.rs
+++ b/src/eth/mod.rs
@@ -19,7 +19,7 @@ use num_bigint::BigUint;
 use rand::rngs::OsRng;
 use rand::thread_rng;
 use regex_simple::Regex;
-use rsa::PublicKeyParts;
+use rsa::traits::PublicKeyParts;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use snark_verifier::loader::evm::{compile_yul, EvmLoader, ExecutorBuilder};
@@ -117,7 +117,7 @@ pub async fn deploy_and_call_verifiers(sols_dir: &PathBuf, runs: Option<usize>,
 
     let verifier = EmailVerifier::new(email_verifier, client.clone());
     let instance = encode(&[
-        Token::Uint(U256::from_str_radix(&instance.header_hash_commit, 10).unwrap()),
+        Token::Uint(U256::from_str_radix(&instance.sign_commit, 10).unwrap()),
         Token::Uint(U256::from_str_radix(&instance.public_key_hash, 10).unwrap()),
         Token::Array(instance.header_substrs.iter().map(|s| Token::String(s.clone())).collect_vec()),
         Token::Array(instance.header_starts.iter().map(|idx| Token::Uint(U256::from(idx.clone()))).collect_vec()),
diff --git a/src/helpers.rs b/src/helpers.rs
index 3c42749..69a7cdf 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -26,7 +26,7 @@ use num_bigint::BigUint;
 use rand::rngs::OsRng;
 use rand::thread_rng;
 use regex_simple::Regex;
-use rsa::PublicKeyParts;
+use rsa::traits::PublicKeyParts;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use snark_verifier::loader::evm::{compile_yul, EvmLoader, ExecutorBuilder};
@@ -564,7 +564,7 @@ mod test {
     };
     use halo2_rsa::RSAPubE;
     use num_bigint::BigUint;
-    use rsa::PublicKeyParts;
+    use rsa::traits::PublicKeyParts;
     use std::{fs::File, io::Read, path::Path};
     use temp_env;
 
diff --git a/src/lib.rs b/src/lib.rs
index 4036aa4..2b27639 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -74,7 +74,7 @@ use halo2_rsa::*;
 use itertools::Itertools;
 use num_bigint::BigUint;
 use regex_sha2_base64::RegexSha2Base64Config;
-use rsa::PublicKeyParts;
+use rsa::traits::PublicKeyParts;
 use sha2::{Digest, Sha256};
 use snark_verifier::loader::LoadedScalar;
 use snark_verifier_sdk::CircuitExt;
@@ -86,8 +86,8 @@ pub const EMAIL_VERIFY_CONFIG_ENV: &'static str = "EMAIL_VERIFY_CONFIG";
 /// Public input definition of [`DefaultEmailVerifyCircuit`].
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct DefaultEmailVerifyPublicInput {
-    /// A decimal string of a commitment of the email header defined as poseidon(poseidon(rsaSign), sha256(headerBytes)).
-    pub header_hash_commit: String,
+    /// A decimal string of a commitment of the signature defined as poseidon(rsaSign).
+    pub sign_commit: String,
     /// A decimal string of the poseidon hash of the `n` parameter in the RSA public key. (The e parameter is fixed to 65537.)
     pub public_key_hash: String,
     /// The start position of the substrings in the email header.
@@ -104,15 +104,16 @@ impl DefaultEmailVerifyPublicInput {
     /// Create a public input for [`DefaultEmailVerifyCircuit`].
     ///
     /// # Arguments
-    /// * `header_hash_commit` - a decimal string of a commitment of the email header defined as poseidon(poseidon(rsaSign), sha256(headerBytes)).
+    /// * `sign_commit` - a decimal string of a commitment of the signature defined as poseidon(rsaSign).
     /// * `public_key_hash` - a decimal string of the poseidon hash of the `n` parameter in the RSA public key.
     /// * `header_substrs` a vector of (the start position, the bytes) of the substrings in the email header.
     /// * `body_starts` - a vector of (the start position, the bytes) of the substrings in the email body.
     /// # Return values
     /// Return a new [`DefaultEmailVerifyPublicInput`].
-    pub fn new<F: PrimeField>(header_hash_commit: F, public_key_hash: F, header_substrs: Vec<Option<(usize, String)>>, body_substrs: Vec<Option<(usize, String)>>) -> Self {
+    pub fn new<F: PrimeField>(sign_commit: F, public_key_hash: F, header_substrs: Vec<Option<(usize, String)>>, body_substrs: Vec<Option<(usize, String)>>) -> Self {
         let mut header_starts_vec = vec![];
         let mut header_substrs_vec = vec![];
+        // println!("header_substrs {:?}", header_substrs);
         for s in header_substrs.into_iter() {
             if let Some(s) = s {
                 header_starts_vec.push(s.0);
@@ -138,7 +139,7 @@ impl DefaultEmailVerifyPublicInput {
             big.to_str_radix(10)
         };
         DefaultEmailVerifyPublicInput {
-            header_hash_commit: field2string(&header_hash_commit),
+            sign_commit: field2string(&sign_commit),
             public_key_hash: field2string(&public_key_hash),
             header_starts: header_starts_vec,
             header_substrs: header_substrs_vec,
@@ -160,7 +161,7 @@ impl DefaultEmailVerifyPublicInput {
 
     /// Output a vector of field values in the instance column.
     pub fn instances<F: PrimeField>(&self) -> Vec<F> {
-        let header_hash_commit = F::from_str_vartime(&self.header_hash_commit).unwrap();
+        let sign_commit = F::from_str_vartime(&self.sign_commit).unwrap();
         let public_key_hash = F::from_str_vartime(&self.public_key_hash).unwrap();
         let mut rlc_inputs = vec![];
         let config_params = default_config_params();
@@ -191,13 +192,13 @@ impl DefaultEmailVerifyPublicInput {
             rlc_inputs.append(&mut expected_substr_ids);
         }
         let mut rlc = F::zero();
-        let mut coeff = header_hash_commit.clone();
+        let mut coeff = sign_commit.clone();
         for input in rlc_inputs.into_iter() {
             rlc += coeff * F::from(input as u64);
-            coeff *= header_hash_commit.clone();
+            coeff *= sign_commit.clone();
         }
         println!("rlc instance {:?}", rlc);
-        vec![header_hash_commit, public_key_hash, rlc]
+        vec![sign_commit, public_key_hash, rlc]
     }
 }
 
@@ -366,44 +367,51 @@ impl<F: PrimeField> Circuit<F> for DefaultEmailVerifyCircuit<F> {
                 let (extracted_bodyhash, is_target_vec) = config
                     .chars_shift_config
                     .shift(ctx, &gate, &header_result.regex.masked_characters, &header_result.regex.all_substr_ids);
+                // for (val, id) in header_result.regex.masked_characters.iter().zip(header_result.regex.all_substr_ids.iter()) {
+                //     println!("val {:?} id {:?}", val, id);
+                // }
                 for (a, b) in extracted_bodyhash.iter().zip(body_result.encoded_hash.iter()) {
                     gate.assert_equal(ctx, QuantumCell::Existing(a), QuantumCell::Existing(b));
                 }
 
                 // 5. Compute public input values.
                 let poseidon = PoseidonChipBn254_8_58::new(ctx, &gate);
-                let sign_rand = poseidon.hash_elements(ctx, &gate, &assigned_signature.c.limbs()).unwrap().0[0].clone();
-                let header_hash_commit = assigned_commit_wtns_bytes(ctx, &gate, &poseidon, &sign_rand, &header_result.hash_bytes);
+                let sign_commit = poseidon.hash_elements(ctx, &gate, &assigned_signature.c.limbs()).unwrap().0[0].clone();
+                // let header_hash_commit = assigned_commit_wtns_bytes(ctx, &gate, &poseidon, &sign_rand, &header_result.hash_bytes);
                 let public_key_n_hash = poseidon.hash_elements(ctx, &gate, &assigned_public_key.n.limbs()).unwrap().0[0].clone();
-                public_hash_cell.push(header_hash_commit.cell());
+                public_hash_cell.push(sign_commit.cell());
                 public_hash_cell.push(public_key_n_hash.cell());
                 let mut rlc_inputs = vec![];
-                let mut bodyhash_masked_chars = vec![];
-                let mut bodyhash_masked_substr_ids = vec![];
+                let mut bodyhash_masked_header_chars = vec![];
+                let mut bodyhash_masked_header_substr_ids = vec![];
                 for idx in 0..header_params.max_variable_byte_size {
                     let is_target = &is_target_vec[idx];
-                    bodyhash_masked_chars.push(gate.select(
+                    bodyhash_masked_header_chars.push(gate.select(
                         ctx,
                         QuantumCell::Constant(F::zero()),
                         QuantumCell::Existing(&header_result.regex.masked_characters[idx]),
                         QuantumCell::Existing(is_target),
                     ));
-                    bodyhash_masked_substr_ids.push(gate.select(
+                    bodyhash_masked_header_substr_ids.push(gate.select(
                         ctx,
                         QuantumCell::Constant(F::zero()),
                         QuantumCell::Existing(&header_result.regex.all_substr_ids[idx]),
                         QuantumCell::Existing(is_target),
                     ));
                 }
-                rlc_inputs.append(&mut bodyhash_masked_chars);
-                rlc_inputs.append(&mut bodyhash_masked_substr_ids);
+                // println!("bodyhash_masked_header_chars {:?}", bodyhash_masked_header_chars);
+                // for (idx, val) in bodyhash_masked_header_chars.iter().enumerate() {
+                //     println!("idx {} val {:?}", idx, val.value().map(|v| v.get_lower_32() as u8 as char));
+                // }
+                rlc_inputs.append(&mut bodyhash_masked_header_chars);
+                rlc_inputs.append(&mut bodyhash_masked_header_substr_ids);
                 rlc_inputs.append(&mut body_result.regex.masked_characters.clone());
                 rlc_inputs.append(&mut body_result.regex.all_substr_ids.clone());
                 let mut rlc = gate.load_zero(ctx);
-                let mut coeff = header_hash_commit.clone();
+                let mut coeff = sign_commit.clone();
                 for input in rlc_inputs.into_iter() {
                     rlc = gate.mul_add(ctx, QuantumCell::Existing(&input), QuantumCell::Existing(&coeff), QuantumCell::Existing(&rlc));
-                    coeff = gate.mul(ctx, QuantumCell::Existing(&header_hash_commit), QuantumCell::Existing(&coeff));
+                    coeff = gate.mul(ctx, QuantumCell::Existing(&sign_commit), QuantumCell::Existing(&coeff));
                 }
                 public_hash_cell.push(rlc.cell());
 
@@ -480,15 +488,14 @@ impl<F: PrimeField> DefaultEmailVerifyCircuit<F> {
     /// Compute public input values as [`DefaultEmailVerifyPublicInput`] from the circuit.
     pub fn gen_default_public_input(&self) -> DefaultEmailVerifyPublicInput {
         let (header_bytes, body_bytes, signature_bytes) = canonicalize_signed_email(&self.email_bytes).unwrap();
-        let header_hash = Sha256::digest(&header_bytes).to_vec();
         let signature = BigUint::from_bytes_be(&signature_bytes);
         let config_params = default_config_params();
         let num_limbs = config_params.sign_verify_config.as_ref().unwrap().public_key_bits / LIMB_BITS;
-        let sign_rand: F = {
+        let sign_commit: F = {
             let limbs = decompose_biguint(&signature, num_limbs, LIMB_BITS);
             poseidon_hash_fields(&limbs)
         };
-        let header_hash_commit = value_commit_wtns_bytes(&sign_rand, &header_hash);
+        // let header_hash_commit = value_commit_wtns_bytes(&sign_rand, &header_hash);
         let public_key_hash = {
             let limbs = decompose_biguint(&self.public_key_n, num_limbs, LIMB_BITS);
             poseidon_hash_fields(&limbs)
@@ -498,7 +505,7 @@ impl<F: PrimeField> DefaultEmailVerifyCircuit<F> {
         let header_str = String::from_utf8(header_bytes[header_params.skip_prefix_bytes_size.unwrap_or(0)..].to_vec()).unwrap();
         let body_str = String::from_utf8(body_bytes[body_params.skip_prefix_bytes_size.unwrap_or(0)..].to_vec()).unwrap();
         let (header_substrs, body_substrs) = get_email_substrs(&header_str, &body_str, header_params.substr_regexes.clone(), body_params.substr_regexes.clone());
-        DefaultEmailVerifyPublicInput::new(header_hash_commit, public_key_hash, header_substrs, body_substrs)
+        DefaultEmailVerifyPublicInput::new(sign_commit, public_key_hash, header_substrs, body_substrs)
     }
 }
 
@@ -516,7 +523,7 @@ mod test {
     use mailparse::parse_mail;
     use num_bigint::BigUint;
     use rand::thread_rng;
-    use rsa::{PublicKeyParts, RsaPrivateKey};
+    use rsa::{traits::PublicKeyParts, RsaPrivateKey};
     use snark_verifier_sdk::CircuitExt;
     use std::{fs::File, io::Read, path::Path};
     use temp_env;
diff --git a/src/regex_sha2.rs b/src/regex_sha2.rs
index c8bd173..75ec01c 100644
--- a/src/regex_sha2.rs
+++ b/src/regex_sha2.rs
@@ -294,7 +294,7 @@ mod test {
         let mut expected_masked_chars = vec![Fr::from(0); TestRegexSha2Circuit1::<Fr>::MAX_BYTES_SIZE];
         let mut expected_substr_ids = vec![Fr::from(0); TestRegexSha2Circuit1::<Fr>::MAX_BYTES_SIZE];
         let correct_substrs = vec![
-            get_substr(&input_str, &[r"(?<=from:).*@.*(?=\r)".to_string()]).unwrap(),
+            get_substr(&input_str, &[r"(?<=from:).*@.*(?=\r)".to_string(), "<?(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+@(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+>?".to_string(), "(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+@(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+".to_string()]).unwrap(),
             get_substr(&input_str, &[r"(?<=subject:).*(?=\r)".to_string()]).unwrap(),
         ];
         for (substr_idx, (start, chars)) in correct_substrs.iter().enumerate() {
@@ -396,7 +396,7 @@ mod test {
                 ],
             )
             .unwrap(),
-            get_substr(&input_str, &[r"(?<=from:).*@.*(?=\r)".to_string()]).unwrap(),
+            get_substr(&input_str, &[r"(?<=from:).*@.*(?=\r)".to_string(), "<?(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+@(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+>?".to_string(), "(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+@(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+".to_string()]).unwrap(),
             get_substr(&input_str, &[r"(?<=to:).*@.*(?=\r)".to_string()]).unwrap(),
             get_substr(&input_str, &[
                 r"(?<=subject:).*(?=\r)".to_string(),
diff --git a/src/regex_sha2_base64.rs b/src/regex_sha2_base64.rs
index bddb145..d18135a 100644
--- a/src/regex_sha2_base64.rs
+++ b/src/regex_sha2_base64.rs
@@ -302,7 +302,7 @@ mod test {
         let mut expected_masked_chars = vec![Fr::from(0); TestRegexSha2Base64Circuit1::<Fr>::MAX_BYTES_SIZE];
         let mut expected_substr_ids = vec![Fr::from(0); TestRegexSha2Base64Circuit1::<Fr>::MAX_BYTES_SIZE];
         let correct_substrs = vec![
-            get_substr(&input_str, &[r"(?<=from:).*@.*(?=\r)".to_string()]).unwrap(),
+            get_substr(&input_str, &[r"(?<=from:).*@.*(?=\r)".to_string(), "<?(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+@(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+>?".to_string(), "(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+@(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+".to_string()]).unwrap(),
             get_substr(&input_str, &[r"(?<=subject:).*(?=\r)".to_string()]).unwrap(),
         ];
         for (substr_idx, (start, chars)) in correct_substrs.iter().enumerate() {
@@ -410,7 +410,7 @@ mod test {
                 ],
             )
             .unwrap(),
-            get_substr(&input_str, &[r"(?<=from:).*@.*(?=\r)".to_string()]).unwrap(),
+            get_substr(&input_str, &[r"(?<=from:).*@.*(?=\r)".to_string(), "<?(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+@(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+>?".to_string(), "(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+@(a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|0|1|2|3|4|5|6|7|8|9|_|\\.|-)+".to_string()]).unwrap(),
             get_substr(&input_str, &[r"(?<=to:).*@.*(?=\r)".to_string()]).unwrap(),
             get_substr(&input_str, &[r"(?<=subject:).*(?=\r)".to_string()]).unwrap(),
         ];
diff --git a/src/utils.rs b/src/utils.rs
index 17d0fbd..1db48a6 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -67,7 +67,7 @@ pub fn get_substr(input_str: &str, regexes: &[String]) -> Option<(usize, String)
     let regexes = regexes.into_iter().map(|raw| Regex::new(&raw).unwrap()).collect_vec();
     let mut start = 0;
     let mut substr = input_str;
-    // println!("first regex {}", regexes[0]);
+    println!("first regex {}", regexes[0]);
     for regex in regexes.into_iter() {
         // println!(r"regex {}", regex);
         match regex.find(substr).unwrap() {
@@ -80,7 +80,7 @@ pub fn get_substr(input_str: &str, regexes: &[String]) -> Option<(usize, String)
             }
         };
     }
-    // println!("substr {}", substr);
-    // println!("start {}", start);
+    println!("substr {}", substr);
+    println!("start {}", start);
     Some((start, substr.to_string()))
 }
diff --git a/test_data/bodyhash_allstr.txt b/test_data/bodyhash_allstr.txt
index 88bfd8c..007142a 100644
--- a/test_data/bodyhash_allstr.txt
+++ b/test_data/bodyhash_allstr.txt
@@ -197,7 +197,25 @@
 1 1 124
 1 1 125
 1 1 126
+2 6 59
+2 2 9
+2 2 10
+2 2 13
+2 2 32
+2 2 33
+2 2 34
+2 2 35
+2 2 36
+2 2 37
+2 2 38
+2 2 39
+2 2 40
+2 2 41
+2 2 42
 2 2 43
+2 2 44
+2 2 45
+2 2 46
 2 2 47
 2 2 48
 2 2 49
@@ -209,7 +227,12 @@
 2 2 55
 2 2 56
 2 2 57
+2 2 58
+2 2 60
 2 2 61
+2 2 62
+2 2 63
+2 2 64
 2 2 65
 2 2 66
 2 2 67
@@ -236,6 +259,12 @@
 2 2 88
 2 2 89
 2 2 90
+2 2 91
+2 2 92
+2 2 93
+2 2 94
+2 2 95
+2 2 96
 2 2 97
 2 2 98
 2 2 99
@@ -262,58 +291,11 @@
 2 2 120
 2 2 121
 2 2 122
-2 5 59
-2 8 13
-2 1 9
-2 1 10
-2 1 32
-2 1 33
-2 1 34
-2 1 35
-2 1 36
-2 1 37
-2 1 38
-2 1 39
-2 1 40
-2 1 41
-2 1 42
-2 1 44
-2 1 45
-2 1 46
-2 1 58
-2 1 60
-2 1 62
-2 1 63
-2 1 64
-2 1 91
-2 1 92
-2 1 93
-2 1 94
-2 1 95
-2 1 96
-2 1 123
-2 1 124
-2 1 125
-2 1 126
-3 6 59
-3 3 9
-3 3 10
-3 3 13
-3 3 32
-3 3 33
-3 3 34
-3 3 35
-3 3 36
-3 3 37
-3 3 38
-3 3 39
-3 3 40
-3 3 41
-3 3 42
+2 2 123
+2 2 124
+2 2 125
+2 2 126
 3 3 43
-3 3 44
-3 3 45
-3 3 46
 3 3 47
 3 3 48
 3 3 49
@@ -325,12 +307,7 @@
 3 3 55
 3 3 56
 3 3 57
-3 3 58
-3 3 60
 3 3 61
-3 3 62
-3 3 63
-3 3 64
 3 3 65
 3 3 66
 3 3 67
@@ -357,12 +334,6 @@
 3 3 88
 3 3 89
 3 3 90
-3 3 91
-3 3 92
-3 3 93
-3 3 94
-3 3 95
-3 3 96
 3 3 97
 3 3 98
 3 3 99
@@ -389,10 +360,39 @@
 3 3 120
 3 3 121
 3 3 122
-3 3 123
-3 3 124
-3 3 125
-3 3 126
+3 5 59
+3 2 9
+3 2 10
+3 2 13
+3 2 32
+3 2 33
+3 2 34
+3 2 35
+3 2 36
+3 2 37
+3 2 38
+3 2 39
+3 2 40
+3 2 41
+3 2 42
+3 2 44
+3 2 45
+3 2 46
+3 2 58
+3 2 60
+3 2 62
+3 2 63
+3 2 64
+3 2 91
+3 2 92
+3 2 93
+3 2 94
+3 2 95
+3 2 96
+3 2 123
+3 2 124
+3 2 125
+3 2 126
 4 8 13
 4 1 9
 4 1 10
@@ -2421,134 +2421,134 @@
 24 1 94
 24 1 95
 24 1 96
-24 1 97
-24 1 98
-24 1 99
-24 1 100
-24 1 101
-24 1 102
-24 1 103
-24 1 104
-24 1 105
-24 1 106
-24 1 107
-24 1 108
-24 1 109
-24 1 110
-24 1 111
-24 1 112
-24 1 113
-24 1 114
-24 1 115
-24 1 116
-24 1 117
-24 1 118
-24 1 119
-24 1 120
-24 1 121
-24 1 122
 24 1 123
 24 1 124
 24 1 125
 24 1 126
+24 24 97
+24 24 98
+24 24 99
+24 24 100
+24 24 101
+24 24 102
+24 24 103
+24 24 104
+24 24 105
+24 24 106
+24 24 107
+24 24 108
+24 24 109
+24 24 110
+24 24 111
+24 24 112
+24 24 113
+24 24 114
+24 24 115
+24 24 116
+24 24 117
+24 24 118
+24 24 119
+24 24 120
+24 24 121
+24 24 122
 25 1 59
-25 3 9
-25 3 10
-25 3 13
-25 3 32
-25 3 33
-25 3 34
-25 3 35
-25 3 36
-25 3 37
-25 3 38
-25 3 39
-25 3 40
-25 3 41
-25 3 42
-25 3 43
-25 3 44
-25 3 45
-25 3 46
-25 3 47
-25 3 48
-25 3 49
-25 3 50
-25 3 51
-25 3 52
-25 3 53
-25 3 54
-25 3 55
-25 3 56
-25 3 57
-25 3 58
-25 3 60
-25 3 61
-25 3 62
-25 3 63
-25 3 64
-25 3 65
-25 3 66
-25 3 67
-25 3 68
-25 3 69
-25 3 70
-25 3 71
-25 3 72
-25 3 73
-25 3 74
-25 3 75
-25 3 76
-25 3 77
-25 3 78
-25 3 79
-25 3 80
-25 3 81
-25 3 82
-25 3 83
-25 3 84
-25 3 85
-25 3 86
-25 3 87
-25 3 88
-25 3 89
-25 3 90
-25 3 91
-25 3 92
-25 3 93
-25 3 94
-25 3 95
-25 3 96
-25 3 97
-25 3 98
-25 3 99
-25 3 100
-25 3 101
-25 3 102
-25 3 103
-25 3 104
-25 3 105
-25 3 106
-25 3 107
-25 3 108
-25 3 109
-25 3 110
-25 3 111
-25 3 112
-25 3 113
-25 3 114
-25 3 115
-25 3 116
-25 3 117
-25 3 118
-25 3 119
-25 3 120
-25 3 121
-25 3 122
-25 3 123
-25 3 124
-25 3 125
-25 3 126
+25 2 9
+25 2 10
+25 2 13
+25 2 32
+25 2 33
+25 2 34
+25 2 35
+25 2 36
+25 2 37
+25 2 38
+25 2 39
+25 2 40
+25 2 41
+25 2 42
+25 2 43
+25 2 44
+25 2 45
+25 2 46
+25 2 47
+25 2 48
+25 2 49
+25 2 50
+25 2 51
+25 2 52
+25 2 53
+25 2 54
+25 2 55
+25 2 56
+25 2 57
+25 2 58
+25 2 60
+25 2 61
+25 2 62
+25 2 63
+25 2 64
+25 2 65
+25 2 66
+25 2 67
+25 2 68
+25 2 69
+25 2 70
+25 2 71
+25 2 72
+25 2 73
+25 2 74
+25 2 75
+25 2 76
+25 2 77
+25 2 78
+25 2 79
+25 2 80
+25 2 81
+25 2 82
+25 2 83
+25 2 84
+25 2 85
+25 2 86
+25 2 87
+25 2 88
+25 2 89
+25 2 90
+25 2 91
+25 2 92
+25 2 93
+25 2 94
+25 2 95
+25 2 96
+25 2 97
+25 2 98
+25 2 99
+25 2 100
+25 2 101
+25 2 102
+25 2 103
+25 2 104
+25 2 105
+25 2 106
+25 2 107
+25 2 108
+25 2 109
+25 2 110
+25 2 111
+25 2 112
+25 2 113
+25 2 114
+25 2 115
+25 2 116
+25 2 117
+25 2 118
+25 2 119
+25 2 120
+25 2 121
+25 2 122
+25 2 123
+25 2 124
+25 2 125
+25 2 126
 26 25 61
 26 8 13
 26 1 9
@@ -2617,35 +2617,35 @@
 26 1 94
 26 1 95
 26 1 96
-26 1 97
-26 1 98
-26 1 99
-26 1 100
-26 1 101
-26 1 102
-26 1 103
-26 1 105
-26 1 106
-26 1 107
-26 1 108
-26 1 109
-26 1 110
-26 1 111
-26 1 112
-26 1 113
-26 1 114
-26 1 115
-26 1 116
-26 1 117
-26 1 118
-26 1 119
-26 1 120
-26 1 121
-26 1 122
 26 1 123
 26 1 124
 26 1 125
 26 1 126
+26 24 97
+26 24 98
+26 24 99
+26 24 100
+26 24 101
+26 24 102
+26 24 103
+26 24 105
+26 24 106
+26 24 107
+26 24 108
+26 24 109
+26 24 110
+26 24 111
+26 24 112
+26 24 113
+26 24 114
+26 24 115
+26 24 116
+26 24 117
+26 24 118
+26 24 119
+26 24 120
+26 24 121
+26 24 122
 26 27 104
 27 28 61
 27 8 13
@@ -2715,131 +2715,131 @@
 27 1 94
 27 1 95
 27 1 96
-27 1 97
-27 1 98
-27 1 99
-27 1 100
-27 1 101
-27 1 102
-27 1 103
-27 1 104
-27 1 105
-27 1 106
-27 1 107
-27 1 108
-27 1 109
-27 1 110
-27 1 111
-27 1 112
-27 1 113
-27 1 114
-27 1 115
-27 1 116
-27 1 117
-27 1 118
-27 1 119
-27 1 120
-27 1 121
-27 1 122
 27 1 123
 27 1 124
 27 1 125
 27 1 126
-28 2 43
-28 2 47
-28 2 48
-28 2 49
-28 2 50
-28 2 51
-28 2 52
-28 2 53
-28 2 54
-28 2 55
-28 2 56
-28 2 57
-28 2 61
-28 2 65
-28 2 66
-28 2 67
-28 2 68
-28 2 69
-28 2 70
-28 2 71
-28 2 72
-28 2 73
-28 2 74
-28 2 75
-28 2 76
-28 2 77
-28 2 78
-28 2 79
-28 2 80
-28 2 81
-28 2 82
-28 2 83
-28 2 84
-28 2 85
-28 2 86
-28 2 87
-28 2 88
-28 2 89
-28 2 90
-28 2 97
-28 2 98
-28 2 99
-28 2 100
-28 2 101
-28 2 102
-28 2 103
-28 2 104
-28 2 105
-28 2 106
-28 2 107
-28 2 108
-28 2 109
-28 2 110
-28 2 111
-28 2 112
-28 2 113
-28 2 114
-28 2 115
-28 2 116
-28 2 117
-28 2 118
-28 2 119
-28 2 120
-28 2 121
-28 2 122
-28 8 13
-28 1 9
-28 1 10
-28 1 32
-28 1 33
-28 1 34
-28 1 35
-28 1 36
-28 1 37
-28 1 38
-28 1 39
-28 1 40
-28 1 41
-28 1 42
-28 1 44
-28 1 45
-28 1 46
-28 1 58
+27 24 97
+27 24 98
+27 24 99
+27 24 100
+27 24 101
+27 24 102
+27 24 103
+27 24 104
+27 24 105
+27 24 106
+27 24 107
+27 24 108
+27 24 109
+27 24 110
+27 24 111
+27 24 112
+27 24 113
+27 24 114
+27 24 115
+27 24 116
+27 24 117
+27 24 118
+27 24 119
+27 24 120
+27 24 121
+27 24 122
+28 3 43
+28 3 47
+28 3 48
+28 3 49
+28 3 50
+28 3 51
+28 3 52
+28 3 53
+28 3 54
+28 3 55
+28 3 56
+28 3 57
+28 3 61
+28 3 65
+28 3 66
+28 3 67
+28 3 68
+28 3 69
+28 3 70
+28 3 71
+28 3 72
+28 3 73
+28 3 74
+28 3 75
+28 3 76
+28 3 77
+28 3 78
+28 3 79
+28 3 80
+28 3 81
+28 3 82
+28 3 83
+28 3 84
+28 3 85
+28 3 86
+28 3 87
+28 3 88
+28 3 89
+28 3 90
+28 3 97
+28 3 98
+28 3 99
+28 3 100
+28 3 101
+28 3 102
+28 3 103
+28 3 104
+28 3 105
+28 3 106
+28 3 107
+28 3 108
+28 3 109
+28 3 110
+28 3 111
+28 3 112
+28 3 113
+28 3 114
+28 3 115
+28 3 116
+28 3 117
+28 3 118
+28 3 119
+28 3 120
+28 3 121
+28 3 122
 28 1 59
-28 1 60
-28 1 62
-28 1 63
-28 1 64
-28 1 91
-28 1 92
-28 1 93
-28 1 94
-28 1 95
-28 1 96
-28 1 123
-28 1 124
-28 1 125
-28 1 126
+28 2 9
+28 2 10
+28 2 13
+28 2 32
+28 2 33
+28 2 34
+28 2 35
+28 2 36
+28 2 37
+28 2 38
+28 2 39
+28 2 40
+28 2 41
+28 2 42
+28 2 44
+28 2 45
+28 2 46
+28 2 58
+28 2 60
+28 2 62
+28 2 63
+28 2 64
+28 2 91
+28 2 92
+28 2 93
+28 2 94
+28 2 95
+28 2 96
+28 2 123
+28 2 124
+28 2 125
+28 2 126
diff --git a/test_data/bodyhash_defs.json b/test_data/bodyhash_defs.json
index b44ee3c..1209e8c 100644
--- a/test_data/bodyhash_defs.json
+++ b/test_data/bodyhash_defs.json
@@ -13,7 +13,7 @@
         },
         {
             "is_public": false,
-            "regex_def": "((a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z)=(0|1|2|3|4|5|6|7|8|9|a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|!|\"|#|$|%|&|'|\\(|\\)|\\*|\\+|,|-|.|/|:|<|=|>|\\?|@|[|\\\\|]|^|_|`|{|\\||}|~| |\t|\n|\r|\\x0b|\\x0c)+; )+bh=",
+            "regex_def": "((a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z)+=(0|1|2|3|4|5|6|7|8|9|a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p|q|r|s|t|u|v|w|x|y|z|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|!|\"|#|$|%|&|'|\\(|\\)|\\*|\\+|,|-|.|/|:|<|=|>|\\?|@|[|\\\\|]|^|_|`|{|\\||}|~| |\t|\n|\r|\\x0b|\\x0c)+; )+bh=",
             "max_size": 128
         },
         {
diff --git a/test_data/bodyhash_substr_0.txt b/test_data/bodyhash_substr_0.txt
index 7ce6817..9622dc7 100644
--- a/test_data/bodyhash_substr_0.txt
+++ b/test_data/bodyhash_substr_0.txt
@@ -2,6 +2,6 @@
 0
 1023
 28 
-2 
-2 2
-28 2
+3 
+3 3
+28 3
diff --git a/test_data/invalid_test_email1.eml b/test_data/invalid_test_email1.eml
index 8642323..25294bc 100644
--- a/test_data/invalid_test_email1.eml
+++ b/test_data/invalid_test_email1.eml
@@ -1,84 +1,85 @@
 Delivered-To: emailwallet.relayer@gmail.com
-Received: by 2002:a05:6f02:223:b0:4b:d2dd:7368 with SMTP id 35csp325814rcn;
-        Wed, 26 Apr 2023 05:52:02 -0700 (PDT)
-X-Received: by 2002:a81:1d50:0:b0:54f:54c5:70d with SMTP id d77-20020a811d50000000b0054f54c5070dmr1546838ywd.20.1682513522496;
-        Wed, 26 Apr 2023 05:52:02 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1682513522; cv=none;
+Received: by 2002:a05:7108:8190:b0:35d:a7ed:3d3f with SMTP id c16csp2768901gdv;
+        Fri, 8 Dec 2023 21:16:50 -0800 (PST)
+X-Received: by 2002:a81:a08c:0:b0:5d4:207:1f82 with SMTP id x134-20020a81a08c000000b005d402071f82mr740643ywg.29.1702099010706;
+        Fri, 08 Dec 2023 21:16:50 -0800 (PST)
+ARC-Seal: i=1; a=rsa-sha256; t=1702099010; cv=none;
         d=google.com; s=arc-20160816;
-        b=V7ZV4yEo8jRH0YntoyTl+DLYAzq7QO8Da5swSvYayqXxbYM6u2YWUS4DuX1pk+Ny/n
-         3g0NHN4SemZvSmoWzaUpM0y6OYKgoOjXVov8PZWO3Pyd/voc5pe1zUZFF17GKRUT7s4h
-         YcH/YK0goaizEA/3c1DReaPHG6LlIait7oasN5YBDAxLWLtPVnqvjfWSNAZAl/+sRtIy
-         CVBWGHRQ3oE8F3NNV1f83zjiZQ71LpS+Ihlrhf+7u4OFTAAdtvUz0lQ76AUJESw5x+zu
-         dIoIjeZzNmAouQLo+jIE02SY7aCgwpWqM2jNVwFFBV1sdTludt/kpCaccos4mHn6db2b
-         hGNA==
+        b=LrwU1xgvW14mntUCpwua9czBNjOx2XCBK3ZWHCvstsEZWmbbD50+NCKukppBIV5AVs
+         P0euhEMT2SkexhHUw/hvjwYOn1r2Jq3AzA+ukViDzmx1TpjBWObOCXQNA6WeeiLIFUyW
+         Bptp/PMn2joN3nUlPDiDIwbrT+5kIPGmZ7c/3bxE4llcj6O3Ss5QdIsr+JNxpmSoHHWb
+         QfmpN0zpxaSHMXckruy/qUJyrrAC80+2M6DVwMe26ys/1advRRXeh1OfH1F0RPuhwNwF
+         PiwPnnRckXYSOI2sgixKWi1RnOBprXSpUwNNXTXFerxjEky5CAFPKK3hiPOJemohR/um
+         GzCw==
 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
         h=to:subject:message-id:date:from:mime-version:dkim-signature;
-        bh=a8aigxYi+c4F+qyWJg+TW8ur8gkehHInysko3xtlayM=;
-        b=eMbkxLZDRXHy+RfofPSzMi6IIMgsnTQXdKz8ady4kVVrMzULMfmx3kVJX6SOPZIAL4
-         AKSHY9z4x/BN/ONsrJDLhBhQ/vzRifwvU/iDP7mLyjMItnEl58fZdj8hJTqjx2QNb2xD
-         AkyECIT8EkW0Og5C3T1qhZBDJz84Tfd2UEO0cEXUVKTxNWb1dU4fS0zMcX0FJeOeLgqr
-         U4O2gZHSAUGRFuFee+fAHQEYEIhRjMuvw20N9mh+7SH8ZvVHgzhTXD1X2BEQvKEeB938
-         yoXYAitGsWx9Rj3kNC173gtNtdzSPTREj3peDO+hU4XmsNDZTuno7fkAGCd1VrmfYS2j
-         3TOg==
+        bh=hwD8MtLUC8OVft3OFE3y9c4C+6gICOY4TCDZhbU4h48=;
+        fh=AKWw92sdXoMEDdHXKLL06vnizTpObKPGCfYXnoQDKO8=;
+        b=G0+A81giQy0NQ5xkO0hLdUpzkf9Wn6NZ3vTOkzQtszEDo2oA+kX+j5zBgpKA0/Uge7
+         FulZWkG/yASEtSLuANNotPty4tkXS9+0MaQYt6mfANbrwgl7x1fz6EJY98mxBlzjnR0U
+         Uwc1iQFnvIQVqUJxWup3sESmVYFFmjxozh0ldDEkNfEIxKDq8swc8OaPIkTIJJwic+vK
+         v1oR60z3EGr8H+pdBg16eWD8V9840MjkqKNiKA4DdsTCp+yQExTAmZZSzEaFqLFlmaTu
+         LK29d8bVQ9Q5WDimuisALX5nW8jUB/6K06JSX9xaNmAZrHbOkesAZwRvHNPvcyr65j0s
+         sIqA==
 ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@gmail.com header.s=20221208 header.b=Wz0UznEW;
+       dkim=pass header.i=@gmail.com header.s=20230601 header.b=VY2ksR+X;
        spf=pass (google.com: domain of suegamisora@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=suegamisora@gmail.com;
        dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
 Return-Path: <suegamisora@gmail.com>
 Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
-        by mx.google.com with SMTPS id l15-20020a0de20f000000b0054543658926sor10362452ywe.30.2023.04.26.05.52.02
+        by mx.google.com with SMTPS id i64-20020a0df843000000b005d8df62cb53sor1151241ywf.1.2023.12.08.21.16.50
         for <emailwallet.relayer@gmail.com>
         (Google Transport Security);
-        Wed, 26 Apr 2023 05:52:02 -0700 (PDT)
+        Fri, 08 Dec 2023 21:16:50 -0800 (PST)
 Received-SPF: pass (google.com: domain of suegamisora@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;
 Authentication-Results: mx.google.com;
-       dkim=pass header.i=@gmail.com header.s=20221208 header.b=Wz0UznEW;
+       dkim=pass header.i=@gmail.com header.s=20230601 header.b=VY2ksR+X;
        spf=pass (google.com: domain of suegamisora@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=suegamisora@gmail.com;
        dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20221208; t=1682513522; x=1685105522;
+        d=gmail.com; s=20230601; t=1702099010; x=1702703810; dara=google.com;
         h=to:subject:message-id:date:from:mime-version:from:to:cc:subject
          :date:message-id:reply-to;
-        bh=a8aigxYi+c4F+qyWJg+TW8ur8gkehHInysko3xtlayM=;
-        b=Wz0UznEWIbLbaz8dtnj/4voLjDCg5o+eQqiypZ3j2dK7vTiDrDlOCjFh2162Kcxytn
-         UThbtc8vYLBhcDY61Xim5kHmD0Pmwhy+UzpMt9ftr8TgL3uH+QlU+aBQzodV7EhEb0z6
-         Yr1oBUwN7htypqL5r89yIVCmHsaZ3QhkR1oaOfzU8b+mC8yEbI4v9X29IABYO4tH8Ff6
-         0vL7fHFGghlIO5he+KjHotOq04IXUUDNNcBw43hhyyBXkEl9w/uPXIJWQ99Ev1KynLs9
-         Dr+E2prgEh/1w85vQF9DgPFX4FlPKDB67FR6k5Vc+8wCw1nng1MACBMW9+LngrSITewD
-         Swdw==
+        bh=hwD8MtLUC8OVft3OFE3y9c4C+6gICOY4TCDZhbU4h48=;
+        b=VY2ksR+XOniZ7S2YbJV6SaKkrHKJ4zo/Sx6ReYzZuzdj9gHOGfU0Ved7y+vXbmf8x2
+         1PU28fdOmPDmxbHioaiWhVF2Qvhkcv07w99003cF2aP8D2/ESTCqzideXB+SDLOwVXLY
+         GVMdjggZg1UCbLiS5aTeRql0lO7OKn8qF0w2GIEnn6f/1WRFycpHn9XOUSllA8fuG3Nb
+         bcWRRlWrrlmq0avvT0JQzEgo3Jew4IsFbFqlxFQfaxjMXRvBTy1VDIKxn6lFgHYJTfHM
+         yOEvcKGmf5amV8iaSXou1a60j0afd7k/DjO4VV3Qhw9+o4ePskBp2ahzlj+NAb2wr/jO
+         gc3A==
 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20221208; t=1682513522; x=1685105522;
+        d=1e100.net; s=20230601; t=1702099010; x=1702703810;
         h=to:subject:message-id:date:from:mime-version:x-gm-message-state
          :from:to:cc:subject:date:message-id:reply-to;
-        bh=a8aigxYi+c4F+qyWJg+TW8ur8gkehHInysko3xtlayM=;
-        b=DgtjDvHFk/2etev3b7h6L3iVIq0rXQ3hlh2OXMoj6r/1DzqRw8CHUEsEoVZn0LtQqA
-         86pNnAK2nFY1gsyldcWx5WiABQVWSglwgBfcTr5RGvpQdyHsTqR2+MXHDoNv+AhSctoi
-         kelofXkZ/JSZXWKLzQw7opTc+BoojvNbb2Ip8AmxmWUtotM9B0MPXl8az2l0rB4U6+nC
-         WtMyM84ZOTtPTm2n0NmqWxtCKKDBw+fs4Cdg3Vp7wp2AjvMKXhyF+m6bx7Wr7ETem3xJ
-         ZDjSuwXyznS8HaZgmqDf/XN02Sy+YLzvY+cnlEY/IyTbQIp+2loX3HoFWSXhISXSaz+t
-         eXYw==
-X-Gm-Message-State: AC+VfDy/hE85DVQn/zV/g8LvtSd8uxeMx1SF7iM2KQv4Ia2VrGlJwgbk
-	8dFwSIPK1TLcyIJStSd7pUrKuP24ZX8Cm8O5un9zW33A5Xw=
-X-Google-Smtp-Source: ACHHUZ68RCzHDn94TqqfFcqDphjrAVbC6E89iwoJk8QCL/pByfOV62VkNAutdIl3vHFbxkvMLcb4zZhvUj969pqh6xk=
-X-Received: by 2002:a81:9903:0:b0:555:ca01:b279 with SMTP id
- q3-20020a819903000000b00555ca01b279mr1433241ywg.26.1682513521817; Wed, 26 Apr
- 2023 05:52:01 -0700 (PDT)
+        bh=hwD8MtLUC8OVft3OFE3y9c4C+6gICOY4TCDZhbU4h48=;
+        b=ECAS2lGdMjr/tbpMptELu2RnjWrmOoArMxmcydGKojS7Ui0iVGxzgIobNo8TGh32h/
+         5A7tNS1EvMv5I2DzclK0wiEgerhSgxaFv2LsCFu+o8P8XUueaeJTW7x8oyGMZJIdY54s
+         M9H/llMVMWS1D+x7NJf+zBf0yTxbOtyB8m2mbrkSVxgOiitln7Sr06MOR+t3rz3wTXAf
+         JaNK6zss2Hp30iUTOzohbUHmOx2tA6hSGCb2YgYnuM5ju8/ZsYCJ1vONLck+ej5aiWNT
+         UW6XJNjDVcZm/O7HsE/Yc+gi2B8D6IwJOst53TSgfm50dc1eN5Vy/lVIEnP/4iRP3UT0
+         8otQ==
+X-Gm-Message-State: AOJu0Yz+alZ2Lx8dan4FitErLzN1V5Xx/9tJ+4UTRzxVBZxNQCZnxICg
+	gCPMGp6qS3pwWU40DSodZyaEwIdrww5FJw/WZfzK3IvJF8JDpw==
+X-Google-Smtp-Source: AGHT+IEl9CDl5x7uuQbH4YOFOf9aR0lKm9dNw+SYLSqExFNydLc2bwqM/U2suTfOKPNqvBFD5emlyy/pzfRBTeEIrkY=
+X-Received: by 2002:a81:8397:0:b0:59f:535b:52a7 with SMTP id
+ t145-20020a818397000000b0059f535b52a7mr656194ywf.48.1702099010152; Fri, 08
+ Dec 2023 21:16:50 -0800 (PST)
 MIME-Version: 1.0
-From: suegamisora@gmail.com
-Date: Wed, 26 Apr 2023 21:51:51 +0900
-Message-ID: <CAJ7Y6jcGpKEhYf_KJq+4UodZ-Je_9ZghVRmmVKRu5WgOM6HWxw@mail.gmail.com>
+From: Sora Suegami <suegamisora@gmail.com>
+Date: Sat, 9 Dec 2023 14:16:39 +0900
+Message-ID: <CAJ7Y6jdhrOmdbu8YjtzVDLcviDOziAsm3eYun8L5hh5VpYJkRg@mail.gmail.com>
 Subject: Email Wallet Manipulation ID 1
 To: emailwallet.relayer@gmail.com
-Content-Type: multipart/alternative; boundary="000000000000cc3b1d05fa3cb400"
+Content-Type: multipart/alternative; boundary="000000000000df6f8a060c0ccee6"
 
---000000000000cc3b1d05fa3cb400
+--000000000000df6f8a060c0ccee6
 Content-Type: text/plain; charset="UTF-8"
 
 Not Transfer 0.2 ETH to alice@gmail.com
 
---000000000000cc3b1d05fa3cb400
+--000000000000df6f8a060c0ccee6
 Content-Type: text/html; charset="UTF-8"
 
-<div dir="ltr">Not Transfer 0.2 ETH to <a href="mailto:alice@gmail.com">alice@gmail.com</a></div>
+<div dir="ltr">Not Transfer 0.2 ETH to <a href="mailto:alice@gmail.com">alice@gmail.com</a><br><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature"></div></div>
 
---000000000000cc3b1d05fa3cb400--
+--000000000000df6f8a060c0ccee6--
diff --git a/test_data/test_email1.eml b/test_data/test_email1.eml
index ab40b86..8407036 100644
--- a/test_data/test_email1.eml
+++ b/test_data/test_email1.eml
@@ -1,84 +1,85 @@
 Delivered-To: emailwallet.relayer@gmail.com
-Received: by 2002:a05:6f02:223:b0:4b:d2dd:7368 with SMTP id 35csp1748137rcn;
-        Mon, 17 Apr 2023 02:28:48 -0700 (PDT)
-X-Received: by 2002:a81:84c2:0:b0:54f:b4cc:cdb7 with SMTP id u185-20020a8184c2000000b0054fb4cccdb7mr13413410ywf.29.1681723727841;
-        Mon, 17 Apr 2023 02:28:47 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1681723727; cv=none;
+Received: by 2002:a05:7108:8190:b0:35d:a7ed:3d3f with SMTP id c16csp1590035gdv;
+        Thu, 7 Dec 2023 04:15:58 -0800 (PST)
+X-Received: by 2002:a81:91c7:0:b0:5d8:1426:4b32 with SMTP id i190-20020a8191c7000000b005d814264b32mr1721713ywg.30.1701951358629;
+        Thu, 07 Dec 2023 04:15:58 -0800 (PST)
+ARC-Seal: i=1; a=rsa-sha256; t=1701951358; cv=none;
         d=google.com; s=arc-20160816;
-        b=PQA7YduVb4ucujSnxI9su8o1YhcqLQVY/ahege2BT6d81AIT3BsDCDF9d45XkI+28l
-         10uZ7Q5SU+w7kWe+ijShdiF/0kPiU7VtqzZzOshlBgnlyrWjUaMmWCJqQV9M7K+2ad1G
-         ug/CJqaZi6lcj7RSYEDkRqK3XjueV4LOcc6WFY6LJOd86srX1tKMnb5UyzaexUnKgrWi
-         pkpSo8rmm6QMPCnMi4WlWknJBUTh8VuRV+a3fuD+lBpXRNcYTDov0rLG5952FnC2jodA
-         /P0ufKmkhFXYNiWR8BcpMD6rHtxF9p030sF5uyUTkwhj/zyijkunCyZ8gSfBOPZ2L0lx
-         MLzA==
+        b=q0lh+kItNjA/YkqYi0QSG4ee70ANVh1AYQ37hufJtuVfg9X8WpOdFlBJlITrZ7DEi7
+         rsXDfBy5m1zukIrqu0qROqhT+mmkb2Y96jjKB+r5do1HD4FtJxlnCZ1XcDS2hpAqcZPr
+         FG2xsEa74FYuCFcNsm6YyCWeia0OuP8goLUCeuDxzyOj0gUCDK9YJMoBxsPNPpZC29+O
+         rFEdbM9NDAZeF9XwOZOwU7oIWTXLVkbu//mPQz1sZi6OWsjcmbIvVwbF+FZ0jVEydK31
+         kaFVFVMAwLGb4r+6QnBfHHNDMacR9aSLCFyVLeFLXBOi32nUKUUfDUzsWHMPI3GINxLI
+         Kpng==
 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
         h=to:subject:message-id:date:from:mime-version:dkim-signature;
-        bh=GxMlgwLiypnVrE2C0Sf4yzhcWTkAhSZ5+WERhKhXtlU=;
-        b=WojT20fIEr20cPMtIhtMYcnkzsCZAQxXDoXn2zMkBkV1/8DfgI37tmYCMbSsB9NwPV
-         zmZMSuBmGqDY2wAXKV72VM0m6NEnltkeP6snX2aF3HrMlwXtqUzdReyFASSk/PmgHEHS
-         Q7PP7w9RaEi1nxr6pzaaKY5WfrHOiHekqIEkoJUwZvhO/Qob7M1p0Mm+JhxE9KuSQSLq
-         cJDUFxmHNGkBLXMXEIAflqhcoHGlxNGyln0vl+2A/m0XI86R6Pjci2tQOyLeqqwOu6aq
-         D7mLPcQ6LCCPRWxlHBAa5/ARb9GqcMFXFCOUQOa3x/NGW5Xn/N4UHdvFttWNS5Bj3nCn
-         giMA==
+        bh=hkFBQYBHK911ZQcZ9OiE8ymbJmrbTRh0ZNdXyXkQYnw=;
+        fh=AKWw92sdXoMEDdHXKLL06vnizTpObKPGCfYXnoQDKO8=;
+        b=ZXiK964kGEOrNE9FzkIqDmHT9RkPEmJm9QThaxBSgk2gwLZ7NctZCgtpr13q2mXDMB
+         VCDgwfK/F/65JX63Jitxw2CIo/Kprlyr2yTEW74Hs3THj44X6QGLZH1nvN7XrHkoJuKY
+         KFydW+0GakO8eLkk3elLWtNAzlrb5srZLthPw36/+UQ5PGw96NopWfhJ2hmTCrU9wi5l
+         heue6XEaqlVCd6GZosYz3DAOP5MAnPrG8DgbB3UpPGRkFfDK0yu/pjnXjltXSHCN8Aiq
+         weZhya21vdky52qe6aMMBZpLsezqooAO+zIwIN+N1IaLtn4hHfdbwhc75oEuD8q4e4OW
+         KyiQ==
 ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@gmail.com header.s=20221208 header.b=i8cm4rYS;
+       dkim=pass header.i=@gmail.com header.s=20230601 header.b="VbtNZ/aO";
        spf=pass (google.com: domain of suegamisora@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=suegamisora@gmail.com;
        dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
 Return-Path: <suegamisora@gmail.com>
 Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
-        by mx.google.com with SMTPS id e9-20020a81a709000000b00545a1523196sor5625036ywh.172.2023.04.17.02.28.47
+        by mx.google.com with SMTPS id u134-20020a0deb8c000000b005d2c44563a7sor472973ywe.15.2023.12.07.04.15.58
         for <emailwallet.relayer@gmail.com>
         (Google Transport Security);
-        Mon, 17 Apr 2023 02:28:47 -0700 (PDT)
+        Thu, 07 Dec 2023 04:15:58 -0800 (PST)
 Received-SPF: pass (google.com: domain of suegamisora@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;
 Authentication-Results: mx.google.com;
-       dkim=pass header.i=@gmail.com header.s=20221208 header.b=i8cm4rYS;
+       dkim=pass header.i=@gmail.com header.s=20230601 header.b="VbtNZ/aO";
        spf=pass (google.com: domain of suegamisora@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=suegamisora@gmail.com;
        dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20221208; t=1681723727; x=1684315727;
+        d=gmail.com; s=20230601; t=1701951358; x=1702556158; dara=google.com;
         h=to:subject:message-id:date:from:mime-version:from:to:cc:subject
          :date:message-id:reply-to;
-        bh=GxMlgwLiypnVrE2C0Sf4yzhcWTkAhSZ5+WERhKhXtlU=;
-        b=i8cm4rYSohdpsiDrG2XjT91iwIizCzq2Jsb2ptKaBdgJ7vBx9ItSQGpdYLJD+LcnQe
-         loz7+xk5Hyz2i9HVHMGGuOsWzH+BDt//hmt62asn3dWt+HJwok4PJ5qepVyP2u02ZYfk
-         DVFBWsrzFlCLWgj+WwVBGB8XRSuJMz4re5pzNmHUgDLCh/Uj+n68Nb/n5eAe5ZYWrcVo
-         dl9G9xoeHw31dD8vMHNj8ajVaYaS+y03PYOKuI0/g7BI9/HH0FxVP0yYhIql73FKdeps
-         DdPwdSBBPsvCpCZFo7FA/jPZO1R1XimhudqmvQiPqpgIJyS/9Us/dOgJGALjPyexEAtC
-         RAFg==
+        bh=hkFBQYBHK911ZQcZ9OiE8ymbJmrbTRh0ZNdXyXkQYnw=;
+        b=VbtNZ/aODzht0E5FQNKZfjbkbJbDjX7qnGJnCwsSmoAiLleLUZIy+jhQP0lP+wTB7G
+         6u+fKAnaoL6LyQEZUeJEToCurOQSAq36g3lrkzyfb1TZl8nJBn6YBmYziQSyzmmGJEx2
+         DkBxfR2HD3O4nRpmbXJlnXxPFrqfUrCyYcyas1oOa6+lTeM6Uxw90yRv4sRINqbRD/lI
+         jmzbR61KvNwWfZ11wxAqbv6IsphANpG6QOs0bRNKfqQ8HaGbjRHFf4iHOjNvMTnIAYht
+         ihPrKEOfH6X9BgNtTPITDKZpQRygd+cAcTc/7vYe7djjQr9m/8g75sMVj+NjF675QXlO
+         hroA==
 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20221208; t=1681723727; x=1684315727;
+        d=1e100.net; s=20230601; t=1701951358; x=1702556158;
         h=to:subject:message-id:date:from:mime-version:x-gm-message-state
          :from:to:cc:subject:date:message-id:reply-to;
-        bh=GxMlgwLiypnVrE2C0Sf4yzhcWTkAhSZ5+WERhKhXtlU=;
-        b=jUEhasjhEHyB23/M0uNh8v3IeLqUzJZoHRXF6Gkpus3i9MJx7hhEx4qTzIGncZD2Pf
-         U3fSqoUxtzJaQtD3kGosSD1ABVv3COwEB+C4BT9mLg7hm6pExQaO6p3hyZXfSCCJTW0I
-         dhCTAsbHXDgsujyMa6t8RDJ65KNsf0FWkivQjArTWjZ1ByLNmtm9h/aXwwiwroQinifw
-         AnyF8NxFMmNqCBWXan2N5qQ4Uk0rFgoElp5U2d1Shu5fxYpPkj/Xyw3ne/USzhX2uFqe
-         06kWU+Oor3vobnFTrWplgG4LLtB4DsjfUKnr+rydhYlPSCdmzkb+C+TR2o/6FvlWgQ2C
-         t9LQ==
-X-Gm-Message-State: AAQBX9dG0ehlwYNWizW0lPEvTSG7jxDJIu77RimRFDEY03MyWXzpkIBc
-	aJYughe0/2bKabCSNNAYBVRo65LU09yCU47FHCWTeSlEvKVP4Ggz
-X-Google-Smtp-Source: AKy350ZrTDE6vBpAYRuqfU/TVE0s2FGoszD27OvBAJYbgen4ClggpFF3jeh34H4kBl6IeV14I4aPlcwut9HgLTXSd5Q=
-X-Received: by 2002:a81:af62:0:b0:54c:bdc:ef18 with SMTP id
- x34-20020a81af62000000b0054c0bdcef18mr8946649ywj.5.1681723727164; Mon, 17 Apr
- 2023 02:28:47 -0700 (PDT)
+        bh=hkFBQYBHK911ZQcZ9OiE8ymbJmrbTRh0ZNdXyXkQYnw=;
+        b=aVKW+NChKhFBE6wfvuhCvML/a7Joubi2lgAyI1Kt20M2F21VgWDTyAxtBKTHYVxY9r
+         ajUKFCAdhvcbIL6rEr3xWQ+b28498GIOSmIzrjJrdE4QTPbaGtKp21/LvLAfmJQmpolc
+         T/qDMrpol1pcj0XZ02zOvKPqw39PifjLpr9WAMHkmGZG+3o4DaUyGma1GQ+aYSxOD/+H
+         gZY9jUh/OiNOceK2AdLae2xeSKWmMJYXEGCxilnOqihDHzh4+o4anRGzNjcCSnWlMa1y
+         cf8eMLRGhCwnC15avlk4vi31JqFjc62tVoEi3AbFGoaL7kv9QEHXYrGNK+bLPYCiVjdh
+         76lQ==
+X-Gm-Message-State: AOJu0Yy5kFknqgytRK6TfETDv6IQvML7B+CZCHovLHLa2JOW/Gz+SB46
+	7Asb6jf8WDRlXEblEJSak5zQgRdqWquYVBkIFvRSc+kQH/DQPQ==
+X-Google-Smtp-Source: AGHT+IHtT3xx8qo8q7Y9Kn6krUeAgRW25xHlrGWiJkUtSUY/y0l9+NwcgtS0uKKDWJaq+stnjdZSgFt+9Pww7Gw/iLc=
+X-Received: by 2002:a25:41d5:0:b0:db7:dacf:4d76 with SMTP id
+ o204-20020a2541d5000000b00db7dacf4d76mr1784617yba.114.1701951357986; Thu, 07
+ Dec 2023 04:15:57 -0800 (PST)
 MIME-Version: 1.0
-From: suegamisora@gmail.com
-Date: Mon, 17 Apr 2023 18:28:36 +0900
-Message-ID: <CAJ7Y6jdwGaGPMm0Wb4tt_AzkrfGrC=G2X=Z4iPSts=MPWrFU+Q@mail.gmail.com>
+From: Sora Suegami <suegamisora@gmail.com>
+Date: Thu, 7 Dec 2023 21:15:47 +0900
+Message-ID: <CAJ7Y6jdVq=uJ4h8pp4Qn8TFHXmBXZ2zkbPznvpAaA57HrXpAWQ@mail.gmail.com>
 Subject: Email Wallet Manipulation ID 1
 To: emailwallet.relayer@gmail.com
-Content-Type: multipart/alternative; boundary="0000000000005e38be05f984d137"
+Content-Type: multipart/alternative; boundary="0000000000001e3a5b060bea6e5c"
 
---0000000000005e38be05f984d137
+--0000000000001e3a5b060bea6e5c
 Content-Type: text/plain; charset="UTF-8"
 
 Transfer 0.2 ETH to alice@gmail.com
 
---0000000000005e38be05f984d137
+--0000000000001e3a5b060bea6e5c
 Content-Type: text/html; charset="UTF-8"
 
-<div dir="ltr">Transfer 0.2 ETH to <a href="mailto:alice@gmail.com">alice@gmail.com</a><br></div>
+<div dir="ltr">Transfer 0.2 ETH to <a href="mailto:alice@gmail.com">alice@gmail.com</a><br><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature"></div></div>
 
---0000000000005e38be05f984d137--
+--0000000000001e3a5b060bea6e5c--
diff --git a/test_data/test_email2.eml b/test_data/test_email2.eml
index d2d9af0..7854efa 100644
--- a/test_data/test_email2.eml
+++ b/test_data/test_email2.eml
@@ -1,84 +1,85 @@
 Delivered-To: emailwallet.relayer@gmail.com
-Received: by 2002:a05:6f02:223:b0:4b:d2dd:7368 with SMTP id 35csp2635602rcn;
-        Sun, 23 Apr 2023 21:06:16 -0700 (PDT)
-X-Received: by 2002:a25:209:0:b0:b92:3c0e:d9bf with SMTP id 9-20020a250209000000b00b923c0ed9bfmr7306208ybc.26.1682309176238;
-        Sun, 23 Apr 2023 21:06:16 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1682309176; cv=none;
+Received: by 2002:a05:7108:8190:b0:35d:a7ed:3d3f with SMTP id c16csp2764136gdv;
+        Fri, 8 Dec 2023 21:02:36 -0800 (PST)
+X-Received: by 2002:a5e:a706:0:b0:7b4:28f8:f7a with SMTP id b6-20020a5ea706000000b007b428f80f7amr1029479iod.27.1702098156237;
+        Fri, 08 Dec 2023 21:02:36 -0800 (PST)
+ARC-Seal: i=1; a=rsa-sha256; t=1702098156; cv=none;
         d=google.com; s=arc-20160816;
-        b=NDJKnKE0Qfjv3uHAnN0vKKL8UzBClFOd4ljs63rBhxy7ykjIqKabI3ACxGQZi7NO20
-         lLZhhfqZiva+fJ/amLY3YEpCPs1I2YXnQzjFo6StgQo807Gg0oE7dqTm4bEXmjsJgQjX
-         dNiGvuO8CJcpzU3/xYc3bzStLIo104/2ZqLSiqwcbUnb3SzJwaFa5Jm2PzwOHBj8wcD6
-         n6nLTzmqcDdu+BpgCODLvgvksfD4/X3GyzvkBpb76gyqDxunA1b8H27H8HrarN/viq96
-         etvbObBzl7U6/dgrgxce5vVBd4Qc3mGmqKGiAlFw2hKLSozwzw80fuw6U8kP3QfaMQ9x
-         G4Kw==
+        b=c7D4WAdoez+S05fQSNZdQ3N3OOfzDmJe7ZiFUGkkMDdrZNb9rkGcYNvcoykpKuQjb0
+         HZdXYah62FCcfVsUS8+20eij4SMYzpzq2naQLgsCghJmF/BKHxjYV1cOpekPDaOX9Oc4
+         SyQu7yuubtJInWahwW59+tmoYAWJ/yOJNfPrmJslV6eisIYjh7/rgvjqXXbGRhtpTkW8
+         719IfiEvMMz+48b0wsEkcIG/viT7Ao4Y2ijSBZL6QVwA0Se8dLY7x8jNY2lPLh6ADjCE
+         hlYqHtlXUBpX8bpk/hNmWS9dEVWRTu2NOzzsumlCXgffD/WP8tfnBDm/oLW/c6+osmVn
+         yniQ==
 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
         h=to:subject:message-id:date:from:mime-version:dkim-signature;
-        bh=YQl5mZXdjibPYA3eg5R108LHYUONSTVXRDO+TdPl9KM=;
-        b=jy6nrPBTZTXVyIqdDysZsqZbDaP+w80jQ30BhU3DHL6JB/APmajHt0PnHw6SaQUutD
-         r+9ZSGGu+FpEOT7l6weDyql/eWM0qciRuQoZIsR13SZBp6pGIP2smrxZIiNaITWk3eK2
-         D3877BY9gyEcbJI3+zD4uQHPcRB2+1GqEhyYnVON3aVm76K4Pneb3/OiucbPt8vdK0Re
-         Yklznmh8AC0OOS6iCYmRQDfl3VHAEEJ3//qPqH9bji2zM/Izo1t8xoqeel5MpIudDXDT
-         w5AZjBfxvXuy33FB3P66D5URRVlCM4iTIzQcM4NnlFwYd+/DnI6Dep8920+nruZOTwiE
-         uGrA==
+        bh=4DwRXLIMbIDGJeXzvMkyz+9rmebuwY1E7LYJj4j5sTQ=;
+        fh=AKWw92sdXoMEDdHXKLL06vnizTpObKPGCfYXnoQDKO8=;
+        b=SkewKeVYIFV7RqzmHg3atuw07u/jHH4bO1IWy2rPSpuD94r1+sp5NuC/Ta2h/YPEDn
+         hPKWzkeQGyYF79b7tc/iv52QDVeF0fvLTwp8GxdgNk80gpfxlNSKAmOUW5rJjXtUTqIE
+         gf6g6ExWQmBvFMHyb620x625PfzKrTnjtJF8/Fj057buleNaMMpE7iVbeDLZ+6fW/S/j
+         VyDyYgmjv8/hVqZ09usZ5mmLASVaIlJfNKaXR6k8NwMOI3BqkPupdKYzbqJJmlPt1XlY
+         Ev+iwjvp78vEV5EX1qxMC6yTPe42eOC5N9gUKTTcyNQjpiu7ti0IvvL0zWM1h2luzvU8
+         zdVg==
 ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@gmail.com header.s=20221208 header.b=prhwD3bb;
+       dkim=pass header.i=@gmail.com header.s=20230601 header.b=HiZre0F8;
        spf=pass (google.com: domain of suegamisora@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=suegamisora@gmail.com;
        dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
 Return-Path: <suegamisora@gmail.com>
 Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
-        by mx.google.com with SMTPS id n80-20020a25da53000000b00b8f5ed194bdsor1334423ybf.168.2023.04.23.21.06.16
+        by mx.google.com with SMTPS id r9-20020a5edb49000000b007b703910c6asor1332736iop.8.2023.12.08.21.02.36
         for <emailwallet.relayer@gmail.com>
         (Google Transport Security);
-        Sun, 23 Apr 2023 21:06:16 -0700 (PDT)
+        Fri, 08 Dec 2023 21:02:36 -0800 (PST)
 Received-SPF: pass (google.com: domain of suegamisora@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;
 Authentication-Results: mx.google.com;
-       dkim=pass header.i=@gmail.com header.s=20221208 header.b=prhwD3bb;
+       dkim=pass header.i=@gmail.com header.s=20230601 header.b=HiZre0F8;
        spf=pass (google.com: domain of suegamisora@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=suegamisora@gmail.com;
        dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20221208; t=1682309175; x=1684901175;
+        d=gmail.com; s=20230601; t=1702098155; x=1702702955; dara=google.com;
         h=to:subject:message-id:date:from:mime-version:from:to:cc:subject
          :date:message-id:reply-to;
-        bh=YQl5mZXdjibPYA3eg5R108LHYUONSTVXRDO+TdPl9KM=;
-        b=prhwD3bb71Cq3H9OGLVBVxQEqQGmBWWcs7T0w/LZLELVyG35+uy38Cl1zEy3rgUynm
-         ivE0lD1YT1PhMjlfD/nz7h7Yzm7svZo2rc2p/mZ6yAcHpWtDEB5j0nRHRgeHDo6RE0q2
-         2Gcq+0CA0kNpRZyvnoz5bRrrO43wZariKId1ujoaA9vh+fsWNzkTjrR+CLOLEquwe1jR
-         5/s1NLyH9Yz4UX80esn16oBvA9NkOjnx0LA7DkUGUrMnflYk3J9bpz83FD6C+prlawFw
-         J1yE+wLQJ6Crxsvw6DcywseODiDfTjYgQ5/CaIrLQfcG8MVNP4bs/X2WeU6Rq3jrUQZZ
-         0jEA==
+        bh=4DwRXLIMbIDGJeXzvMkyz+9rmebuwY1E7LYJj4j5sTQ=;
+        b=HiZre0F8300f1j5SNC6lo9waGWZosX90guzJ3hS1VxDZKNjC9yoahRpM+vzU14wvpT
+         PrQYb4EL1IGx8E7QJ6lMWcPWctsqcnapGVsQQHVtNEjfrmic9UDwRin1jjmFYf/HEXdA
+         Nk5F1pN52BFhXgLVSGtk+fTkju8lDJ6v2133id0xO+80YJv7sz4ykp/qDIjbhD4ny/Td
+         Bl4AQ2j5LK4ojb4mMhlbAgdfwCHaweaPAljn7U1Ca/ZDYYkxjCVnzVEIliLNZRAd0MRO
+         Fli+miExAq9fTjuNButFmp3KSoBedVPVPI1EXdshu6cNHt+ZTNnRpagzlIXgW86g8eIw
+         +A/w==
 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20221208; t=1682309175; x=1684901175;
+        d=1e100.net; s=20230601; t=1702098155; x=1702702955;
         h=to:subject:message-id:date:from:mime-version:x-gm-message-state
          :from:to:cc:subject:date:message-id:reply-to;
-        bh=YQl5mZXdjibPYA3eg5R108LHYUONSTVXRDO+TdPl9KM=;
-        b=NxPmslRUXi/a/q0Mm3Lw9xZCXbk5A50b+cTNl+wZFxJRXjBNgtr7mt7mfwoIXwM/J4
-         r5HI8YruGpORbJl+fxHgZkJ+T8zB5np1ZfOXgWpzpHdR+Fvyl5ESGVmSb+r90YxaW88K
-         D1EE4ihzewMg7JHER1JGcejQGsbRt+jSdQVBnhb6H6CwYPRjiYkmiO1zVZJR/bN2nkwr
-         pVte01/V1Y3LW7oUGrTeuYTf6PTqmXc/RZwCU60VzrPhHIoMKSd+m5Ng17vxhjNbucaR
-         kBjJX3z+C4+KDe/uKitc/g2D4eanZtSD8ZtzpBWoBvIcqd6cgZ8MqBWvWK57Wq+67Li3
-         la7w==
-X-Gm-Message-State: AAQBX9fbSATScnmni51Fo51U80diOhjNO1JoyomX/Qf/c/n4JPJKQaEk
-	7LJxwq93B0PRe7gtGLuZNSpJSw7NXRODYvWQ7tzMvVytR84=
-X-Google-Smtp-Source: AKy350bTypGdCwhtOZwGIf0H8m9t4YGTLrQO6i27XLehFDS7LkntdoLw0KEMbg41Bv1dN5v8Hd3sjkKUh7IytXfN5gk=
-X-Received: by 2002:a05:6902:72d:b0:b8f:3eda:30b7 with SMTP id
- l13-20020a056902072d00b00b8f3eda30b7mr10800795ybt.13.1682309175464; Sun, 23
- Apr 2023 21:06:15 -0700 (PDT)
+        bh=4DwRXLIMbIDGJeXzvMkyz+9rmebuwY1E7LYJj4j5sTQ=;
+        b=Pg5gviMXWC+33CpjBeeWBy9Y7TcpW+CJBTr0z6sW8744l+Gl4PLKdAJRrhnHLwea8x
+         +loLkSeTZCty1Hcr9R4X0hBPUnm8WzCtX1xQK/a4cTdHaH5pKHjubP3U86RHbXnU8ATX
+         41Idz5yFbETIZaAKGh1HiqCVtA7EhsI3WRpnS+5O+CTBS5rlsuRZC46R7xyk4jVj+GT5
+         G6cniVvoTMemZ147TECIPNZt6C/GU+wz/kMS6oQPRGdUrCzt/rk9DkSQg6AnoZi3D0yl
+         0Dpbh638oBhbmWXWa/DitB9jnk0yJeFCncdGuVg4KHkkGy/VPnQ+N23xtktWA4FgVSl2
+         nIJQ==
+X-Gm-Message-State: AOJu0YzxXrofvHCT7JZUG806yU4FfMYfk4tRG3n4qTXR2YfBznLLew0q
+	KAjnxhlJ/KWPuZvWhFbVZOCxGQz2QQLU/hPQdtq68dQ7q/I=
+X-Google-Smtp-Source: AGHT+IH2ln8AwcRAsObRMtkPfZBS1x7vGFWPiXIcww5GMn3sjPNlmy4+a+NoRCt4iglMqdLPsZJXV05yi8DF6z3LyRY=
+X-Received: by 2002:a05:6e02:1948:b0:35d:59a2:bb8 with SMTP id
+ x8-20020a056e02194800b0035d59a20bb8mr1269907ilu.78.1702098155496; Fri, 08 Dec
+ 2023 21:02:35 -0800 (PST)
 MIME-Version: 1.0
-From: suegamisora@gmail.com
-Date: Mon, 24 Apr 2023 13:06:00 +0900
-Message-ID: <CAJ7Y6jf6jYXKYoPV+y2HuVQm_zhQnORtSzhwoyh16kNyxa6r3g@mail.gmail.com>
+From: Sora Suegami <suegamisora@gmail.com>
+Date: Sat, 9 Dec 2023 14:02:24 +0900
+Message-ID: <CAJ7Y6jfUrgUOhd9-R0w=V1chdLiFGvBG6Wwir3qqRBHm=JLQkw@mail.gmail.com>
 Subject: Email Wallet Manipulation ID 2
 To: emailwallet.relayer@gmail.com
-Content-Type: multipart/alternative; boundary="000000000000ce565f05fa0d208e"
+Content-Type: multipart/alternative; boundary="000000000000ee6b52060c0c9b66"
 
---000000000000ce565f05fa0d208e
+--000000000000ee6b52060c0c9b66
 Content-Type: text/plain; charset="UTF-8"
 
 Swap 0.000005 ETH to DAI via Uniswap
 
---000000000000ce565f05fa0d208e
+--000000000000ee6b52060c0c9b66
 Content-Type: text/html; charset="UTF-8"
 
-<div dir="ltr">Swap 0.000005 ETH to DAI via Uniswap</div>
+<div dir="ltr">Swap 0.000005 ETH to DAI via Uniswap<br><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature"></div></div>
 
---000000000000ce565f05fa0d208e--
+--000000000000ee6b52060c0c9b66--