diff --git a/Cargo.lock b/Cargo.lock
index 57770404..5b5855a0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -72,9 +72,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "alloy"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f4a4aaae80afd4be443a6aecd92a6b255dcdd000f97996928efb33d8a71e100"
+checksum = "0093d23bf026b580c1f66ed3a053d8209c104a446c5264d3ad99587f6edef24e"
 dependencies = [
  "alloy-consensus",
  "alloy-contract",
@@ -97,40 +97,65 @@ dependencies = [
 
 [[package]]
 name = "alloy-chains"
-version = "0.1.63"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "996564c1782285d4e0299c29b318bc74f24b1d7f456cef3e040810b061ee3256"
+checksum = "19a9cc9d81ace3da457883b0bdf76776e55f1b84219a9e9d55c27ad308548d3f"
 dependencies = [
- "alloy-primitives 0.8.22",
+ "alloy-primitives",
  "num_enum",
  "strum",
 ]
 
 [[package]]
 name = "alloy-consensus"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c309895995eaa4bfcc345f5515a39c7df9447798645cc8bf462b6c5bf1dc96"
+checksum = "ad451f9a70c341d951bca4e811d74dbe1e193897acd17e9dbac1353698cc430b"
 dependencies = [
  "alloy-eips",
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "alloy-rlp",
  "alloy-serde",
+ "alloy-trie",
+ "auto_impl",
  "c-kzg",
+ "derive_more 2.0.1",
+ "either",
+ "k256",
+ "once_cell",
+ "rand 0.8.5",
+ "secp256k1 0.30.0",
+ "serde",
+ "serde_with",
+ "thiserror 2.0.12",
+]
+
+[[package]]
+name = "alloy-consensus-any"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "142daffb15d5be1a2b20d2cd540edbcef03037b55d4ff69dc06beb4d06286dba"
+dependencies = [
+ "alloy-consensus",
+ "alloy-eips",
+ "alloy-primitives",
+ "alloy-rlp",
+ "alloy-serde",
  "serde",
 ]
 
 [[package]]
 name = "alloy-contract"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f4e0ef72b0876ae3068b2ed7dfae9ae1779ce13cfaec2ee1f08f5bd0348dc57"
+checksum = "ebf25443920ecb9728cb087fe4dc04a0b290bd6ac85638c58fe94aba70f1a44e"
 dependencies = [
+ "alloy-consensus",
  "alloy-dyn-abi",
  "alloy-json-abi",
  "alloy-network",
  "alloy-network-primitives",
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "alloy-provider",
  "alloy-pubsub",
  "alloy-rpc-types-eth",
@@ -138,73 +163,115 @@ dependencies = [
  "alloy-transport",
  "futures",
  "futures-util",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-core"
-version = "0.7.7"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "529fc6310dc1126c8de51c376cbc59c79c7f662bd742be7dc67055d5421a81b4"
+checksum = "5968f48d7a62587cd874bd84034831da4f7f577ce5de984828e376766efc0f32"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-json-abi",
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
+ "alloy-rlp",
  "alloy-sol-types",
 ]
 
 [[package]]
 name = "alloy-dyn-abi"
-version = "0.7.7"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413902aa18a97569e60f679c23f46a18db1656d87ab4d4e49d0e1e52042f66df"
+checksum = "f9135eb501feccf7f4cb8a183afd406a65483fdad7bbd7332d0470e5d725c92f"
 dependencies = [
  "alloy-json-abi",
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "alloy-sol-type-parser",
  "alloy-sol-types",
- "const-hex",
  "itoa",
  "serde",
  "serde_json",
- "winnow 0.6.26",
+ "winnow",
 ]
 
 [[package]]
-name = "alloy-eips"
+name = "alloy-eip2124"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "741bdd7499908b3aa0b159bba11e71c8cddd009a2c2eb7a06e825f1ec87900a5"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rlp",
+ "crc",
+ "serde",
+ "thiserror 2.0.12",
+]
+
+[[package]]
+name = "alloy-eip2930"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9431c99a3b3fe606ede4b3d4043bdfbcb780c45b8d8d226c3804e2b75cfbe68"
+checksum = "7b82752a889170df67bbb36d42ca63c531eb16274f0d7299ae2a680facba17bd"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rlp",
+ "serde",
+]
+
+[[package]]
+name = "alloy-eip7702"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d4769c6ffddca380b0070d71c8b7f30bed375543fe76bb2f74ec0acf4b7cd16"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rlp",
+ "k256",
+ "serde",
+ "thiserror 2.0.12",
+]
+
+[[package]]
+name = "alloy-eips"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3056872f6da48046913e76edb5ddced272861f6032f09461aea1a2497be5ae5d"
 dependencies = [
- "alloy-primitives 0.7.7",
+ "alloy-eip2124",
+ "alloy-eip2930",
+ "alloy-eip7702",
+ "alloy-primitives",
  "alloy-rlp",
  "alloy-serde",
+ "auto_impl",
  "c-kzg",
- "derive_more 0.99.19",
- "k256",
- "once_cell",
+ "derive_more 2.0.1",
+ "either",
  "serde",
  "sha2",
 ]
 
 [[package]]
 name = "alloy-genesis"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79614dfe86144328da11098edcc7bc1a3f25ad8d3134a9eb9e857e06f0d9840d"
+checksum = "c98fb40f07997529235cc474de814cd7bd9de561e101716289095696c0e4639d"
 dependencies = [
- "alloy-primitives 0.7.7",
+ "alloy-eips",
+ "alloy-primitives",
  "alloy-serde",
+ "alloy-trie",
  "serde",
 ]
 
 [[package]]
 name = "alloy-json-abi"
-version = "0.7.7"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc05b04ac331a9f07e3a4036ef7926e49a8bf84a99a1ccfc7e2ab55a5fcbb372"
+checksum = "8b26fdd571915bafe857fccba4ee1a4f352965800e46a53e4a5f50187b7776fa"
 dependencies = [
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "alloy-sol-type-parser",
  "serde",
  "serde_json",
@@ -212,93 +279,89 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57e2865c4c3bb4cdad3f0d9ec1ab5c0c657ba69a375651bd35e32fb6c180ccc2"
+checksum = "dc08b31ebf9273839bd9a01f9333cbb7a3abb4e820c312ade349dd18bdc79581"
 dependencies = [
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "alloy-sol-types",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "tracing",
 ]
 
 [[package]]
 name = "alloy-network"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e701fc87ef9a3139154b0b4ccb935b565d27ffd9de020fe541bf2dec5ae4ede"
+checksum = "ed117b08f0cc190312bf0c38c34cf4f0dabfb4ea8f330071c587cd7160a88cb2"
 dependencies = [
  "alloy-consensus",
+ "alloy-consensus-any",
  "alloy-eips",
  "alloy-json-rpc",
  "alloy-network-primitives",
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
+ "alloy-rpc-types-any",
  "alloy-rpc-types-eth",
  "alloy-serde",
  "alloy-signer",
  "alloy-sol-types",
  "async-trait",
  "auto_impl",
+ "derive_more 2.0.1",
  "futures-utils-wasm",
- "thiserror 1.0.69",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-network-primitives"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec9d5a0f9170b10988b6774498a022845e13eda94318440d17709d50687f67f9"
+checksum = "c7162ff7be8649c0c391f4e248d1273e85c62076703a1f3ec7daf76b283d886d"
 dependencies = [
- "alloy-primitives 0.7.7",
+ "alloy-consensus",
+ "alloy-eips",
+ "alloy-primitives",
  "alloy-serde",
  "serde",
 ]
 
 [[package]]
 name = "alloy-primitives"
-version = "0.7.7"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccb3ead547f4532bc8af961649942f0b9c16ee9226e26caa3f38420651cc0bf4"
+checksum = "a326d47106039f38b811057215a92139f46eef7983a4b77b10930a0ea5685b1e"
 dependencies = [
  "alloy-rlp",
  "bytes",
  "cfg-if",
  "const-hex",
- "derive_more 0.99.19",
- "hex-literal",
+ "derive_more 2.0.1",
+ "foldhash",
+ "hashbrown 0.15.2",
+ "indexmap 2.7.1",
  "itoa",
  "k256",
  "keccak-asm",
+ "paste",
  "proptest",
- "rand",
+ "rand 0.9.1",
  "ruint",
+ "rustc-hash",
  "serde",
- "tiny-keccak",
-]
-
-[[package]]
-name = "alloy-primitives"
-version = "0.8.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c66bb6715b7499ea755bde4c96223ae8eb74e05c014ab38b9db602879ffb825"
-dependencies = [
- "bytes",
- "cfg-if",
- "const-hex",
- "derive_more 2.0.1",
- "itoa",
- "paste",
- "ruint",
+ "sha3",
  "tiny-keccak",
 ]
 
 [[package]]
 name = "alloy-provider"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9c0ab10b93de601a6396fc7ff2ea10d3b28c46f079338fa562107ebf9857c8"
+checksum = "d84eba1fd8b6fe8b02f2acd5dd7033d0f179e304bd722d11e817db570d1fa6c4"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -306,10 +369,16 @@ dependencies = [
  "alloy-json-rpc",
  "alloy-network",
  "alloy-network-primitives",
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "alloy-pubsub",
  "alloy-rpc-client",
+ "alloy-rpc-types-anvil",
+ "alloy-rpc-types-debug",
  "alloy-rpc-types-eth",
+ "alloy-rpc-types-trace",
+ "alloy-rpc-types-txpool",
+ "alloy-signer",
+ "alloy-sol-types",
  "alloy-transport",
  "alloy-transport-http",
  "alloy-transport-ipc",
@@ -318,35 +387,41 @@ dependencies = [
  "async-trait",
  "auto_impl",
  "dashmap",
+ "either",
  "futures",
  "futures-utils-wasm",
- "lru 0.12.5",
+ "lru 0.13.0",
+ "parking_lot",
  "pin-project",
  "reqwest 0.12.12",
  "serde",
  "serde_json",
+ "thiserror 2.0.12",
  "tokio",
  "tracing",
  "url",
+ "wasmtimer",
 ]
 
 [[package]]
 name = "alloy-pubsub"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f5da2c55cbaf229bad3c5f8b00b5ab66c74ef093e5f3a753d874cfecf7d2281"
+checksum = "8550f7306e0230fc835eb2ff4af0a96362db4b6fc3f25767d161e0ad0ac765bf"
 dependencies = [
  "alloy-json-rpc",
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "alloy-transport",
  "bimap",
  "futures",
+ "parking_lot",
  "serde",
  "serde_json",
  "tokio",
  "tokio-stream",
- "tower 0.4.13",
+ "tower",
  "tracing",
+ "wasmtimer",
 ]
 
 [[package]]
@@ -373,17 +448,18 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-client"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b38e3ffdb285df5d9f60cb988d336d9b8e3505acb78750c3bc60336a7af41d3"
+checksum = "518a699422a3eab800f3dac2130d8f2edba8e4fff267b27a9c7dc6a2b0d313ee"
 dependencies = [
  "alloy-json-rpc",
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "alloy-pubsub",
  "alloy-transport",
  "alloy-transport-http",
  "alloy-transport-ipc",
  "alloy-transport-ws",
+ "async-stream",
  "futures",
  "pin-project",
  "reqwest 0.12.12",
@@ -391,110 +467,176 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-stream",
- "tower 0.4.13",
+ "tower",
  "tracing",
+ "tracing-futures",
  "url",
+ "wasmtimer",
 ]
 
 [[package]]
 name = "alloy-rpc-types"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c31a3750b8f5a350d17354e46a52b0f2f19ec5f2006d816935af599dedc521"
+checksum = "c000cab4ec26a4b3e29d144e999e1c539c2fa0abed871bf90311eb3466187ca8"
 dependencies = [
+ "alloy-primitives",
+ "alloy-rpc-types-anvil",
  "alloy-rpc-types-engine",
  "alloy-rpc-types-eth",
+ "alloy-rpc-types-trace",
+ "alloy-rpc-types-txpool",
+ "alloy-serde",
+ "serde",
+]
+
+[[package]]
+name = "alloy-rpc-types-anvil"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8abecc34549a208b5f91bc7f02df3205c36e2aa6586f1d9375c3382da1066b3b"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rpc-types-eth",
+ "alloy-serde",
+ "serde",
+]
+
+[[package]]
+name = "alloy-rpc-types-any"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "508b2fbe66d952089aa694e53802327798806498cd29ff88c75135770ecaabfc"
+dependencies = [
+ "alloy-consensus-any",
+ "alloy-rpc-types-eth",
  "alloy-serde",
+]
+
+[[package]]
+name = "alloy-rpc-types-debug"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c832f2e851801093928dbb4b7bd83cd22270faf76b2e080646b806a285c8757"
+dependencies = [
+ "alloy-primitives",
  "serde",
 ]
 
 [[package]]
 name = "alloy-rpc-types-engine"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff63f51b2fb2f547df5218527fd0653afb1947bf7fead5b3ce58c75d170b30f7"
+checksum = "cab52691970553d84879d777419fa7b6a2e92e9fe8641f9324cc071008c2f656"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "alloy-rlp",
- "alloy-rpc-types-eth",
  "alloy-serde",
- "jsonwebtoken",
- "rand",
+ "derive_more 2.0.1",
+ "rand 0.8.5",
  "serde",
- "thiserror 1.0.69",
+ "strum",
 ]
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81e18424d962d7700a882fe423714bd5b9dde74c7a7589d4255ea64068773aef"
+checksum = "fcaf7dff0fdd756a714d58014f4f8354a1706ebf9fa2cf73431e0aeec3c9431e"
 dependencies = [
  "alloy-consensus",
+ "alloy-consensus-any",
  "alloy-eips",
  "alloy-network-primitives",
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "alloy-rlp",
  "alloy-serde",
  "alloy-sol-types",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
+]
+
+[[package]]
+name = "alloy-rpc-types-trace"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e3507a04e868dd83219ad3cd6a8c58aefccb64d33f426b3934423a206343e84"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rpc-types-eth",
+ "alloy-serde",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.12",
+]
+
+[[package]]
+name = "alloy-rpc-types-txpool"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eec36272621c3ac82b47dd77f0508346687730b1c2e3e10d3715705c217c0a05"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rpc-types-eth",
+ "alloy-serde",
+ "serde",
 ]
 
 [[package]]
 name = "alloy-serde"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33feda6a53e6079895aed1d08dcb98a1377b000d80d16370fbbdb8155d547ef"
+checksum = "730e8f2edf2fc224cabd1c25d090e1655fa6137b2e409f92e5eec735903f1507"
 dependencies = [
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "alloy-signer"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "740a25b92e849ed7b0fa013951fe2f64be9af1ad5abe805037b44fb7770c5c47"
+checksum = "6b0d2428445ec13edc711909e023d7779618504c4800be055a5b940025dbafe3"
 dependencies = [
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "async-trait",
  "auto_impl",
+ "either",
  "elliptic-curve 0.13.8",
  "k256",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-signer-local"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b0707d4f63e4356a110b30ef3add8732ab6d181dd7be4607bf79b8777105cee"
+checksum = "e14fe6fedb7fe6e0dfae47fe020684f1d8e063274ef14bca387ddb7a6efa8ec1"
 dependencies = [
  "alloy-consensus",
  "alloy-network",
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "alloy-signer",
  "async-trait",
  "k256",
- "rand",
- "thiserror 1.0.69",
+ "rand 0.8.5",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-sol-macro"
-version = "0.7.7"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09"
+checksum = "d4be1ce1274ddd7fdfac86e5ece1b225e9bba1f2327e20fbb30ee6b9cc1423fe"
 dependencies = [
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
- "proc-macro-error",
+ "proc-macro-error2",
  "proc-macro2",
  "quote",
  "syn 2.0.99",
@@ -502,16 +644,16 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-macro-expander"
-version = "0.7.7"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525"
+checksum = "01e92f3708ea4e0d9139001c86c051c538af0146944a2a9c7181753bd944bf57"
 dependencies = [
  "alloy-json-abi",
  "alloy-sol-macro-input",
  "const-hex",
  "heck",
- "indexmap",
- "proc-macro-error",
+ "indexmap 2.7.1",
+ "proc-macro-error2",
  "proc-macro2",
  "quote",
  "syn 2.0.99",
@@ -521,14 +663,15 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-macro-input"
-version = "0.7.7"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e482dc33a32b6fadbc0f599adea520bd3aaa585c141a80b404d0a3e3fa72528"
+checksum = "9afe1bd348a41f8c9b4b54dfb314886786d6201235b0b3f47198b9d910c86bb2"
 dependencies = [
  "alloy-json-abi",
  "const-hex",
  "dunce",
  "heck",
+ "macro-string",
  "proc-macro2",
  "quote",
  "serde_json",
@@ -538,66 +681,69 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-type-parser"
-version = "0.7.7"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98"
+checksum = "d6195df2acd42df92a380a8db6205a5c7b41282d0ce3f4c665ecf7911ac292f1"
 dependencies = [
  "serde",
- "winnow 0.6.26",
+ "winnow",
 ]
 
 [[package]]
 name = "alloy-sol-types"
-version = "0.7.7"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7"
+checksum = "6185e98a79cf19010722f48a74b5a65d153631d2f038cabd250f4b9e9813b8ad"
 dependencies = [
  "alloy-json-abi",
- "alloy-primitives 0.7.7",
+ "alloy-primitives",
  "alloy-sol-macro",
- "const-hex",
  "serde",
 ]
 
 [[package]]
 name = "alloy-transport"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d0590afbdacf2f8cca49d025a2466f3b6584a016a8b28f532f29f8da1007bae"
+checksum = "a712bdfeff42401a7dd9518f72f617574c36226a9b5414537fedc34350b73bf9"
 dependencies = [
  "alloy-json-rpc",
+ "alloy-primitives",
  "base64 0.22.1",
- "futures-util",
+ "derive_more 2.0.1",
+ "futures",
  "futures-utils-wasm",
+ "parking_lot",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "tokio",
- "tower 0.4.13",
+ "tower",
  "tracing",
  "url",
+ "wasmtimer",
 ]
 
 [[package]]
 name = "alloy-transport-http"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2437d145d80ea1aecde8574d2058cceb8b3c9cba05f6aea8e67907c660d46698"
+checksum = "7ea5a76d7f2572174a382aedf36875bedf60bcc41116c9f031cf08040703a2dc"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
  "reqwest 0.12.12",
  "serde_json",
- "tower 0.4.13",
+ "tower",
  "tracing",
  "url",
 ]
 
 [[package]]
 name = "alloy-transport-ipc"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804494366e20468776db4e18f9eb5db7db0fe14f1271eb6dbf155d867233405c"
+checksum = "606af17a7e064d219746f6d2625676122c79d78bf73dfe746d6db9ecd7dbcb85"
 dependencies = [
  "alloy-json-rpc",
  "alloy-pubsub",
@@ -606,6 +752,7 @@ dependencies = [
  "futures",
  "interprocess",
  "pin-project",
+ "serde",
  "serde_json",
  "tokio",
  "tokio-util",
@@ -614,9 +761,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ws"
-version = "0.2.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af855163e7df008799941aa6dd324a43ef2bf264b08ba4b22d44aad6ced65300"
+checksum = "e0c6f9b37cd8d44aab959613966cc9d4d7a9b429c575cec43b3e5b46ea109a79"
 dependencies = [
  "alloy-pubsub",
  "alloy-transport",
@@ -630,6 +777,22 @@ dependencies = [
  "ws_stream_wasm",
 ]
 
+[[package]]
+name = "alloy-trie"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "983d99aa81f586cef9dae38443245e585840fcf0fc58b09aee0b1f27aed1d500"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rlp",
+ "arrayvec",
+ "derive_more 2.0.1",
+ "nybbles",
+ "serde",
+ "smallvec",
+ "tracing",
+]
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -1129,7 +1292,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c"
 dependencies = [
  "num-traits",
- "rand",
+ "rand 0.8.5",
 ]
 
 [[package]]
@@ -1139,7 +1302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
 dependencies = [
  "num-traits",
- "rand",
+ "rand 0.8.5",
 ]
 
 [[package]]
@@ -1150,7 +1313,7 @@ checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a"
 dependencies = [
  "colored",
  "num-traits",
- "rand",
+ "rand 0.8.5",
  "rayon",
 ]
 
@@ -1165,6 +1328,9 @@ name = "arrayvec"
 version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "async-channel"
@@ -1793,7 +1959,7 @@ dependencies = [
  "bitcoin_hashes",
  "hex-conservative",
  "hex_lit",
- "secp256k1",
+ "secp256k1 0.29.1",
  "serde",
 ]
 
@@ -1916,8 +2082,8 @@ dependencies = [
  "num-bigint 0.4.6",
  "num-traits",
  "paste",
- "rand",
- "rand_chacha",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
  "regex",
  "serde",
  "serde_json",
@@ -2055,9 +2221,9 @@ dependencies = [
  "num-traits",
  "openssh",
  "openssh-sftp-client",
- "rand",
+ "rand 0.8.5",
  "regex",
- "secp256k1",
+ "secp256k1 0.29.1",
  "serde",
  "serde_json",
  "serial_test",
@@ -2129,9 +2295,9 @@ dependencies = [
 
 [[package]]
 name = "c-kzg"
-version = "1.0.3"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0307f72feab3300336fb803a57134159f6e20139af1357f36c54cb90d8e8928"
+checksum = "7318cfa722931cb5fe0838b98d3ce5621e75f6a6408abc21721d80de9223f2e4"
 dependencies = [
  "blst",
  "cc",
@@ -2206,6 +2372,7 @@ dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits",
+ "serde",
  "windows-link",
 ]
 
@@ -2340,12 +2507,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -2527,7 +2688,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
 dependencies = [
  "generic-array",
- "rand_core",
+ "rand_core 0.6.4",
  "subtle",
  "zeroize",
 ]
@@ -2548,7 +2709,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array",
- "rand_core",
+ "rand_core 0.6.4",
  "subtle",
  "zeroize",
 ]
@@ -2563,13 +2724,49 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "darling"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.99",
+]
+
 [[package]]
 name = "dashmap"
-version = "5.5.3"
+version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
 dependencies = [
  "cfg-if",
+ "crossbeam-utils",
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
@@ -2609,6 +2806,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
  "powerfmt",
+ "serde",
 ]
 
 [[package]]
@@ -2650,10 +2848,8 @@ version = "0.99.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3da29a38df43d6f156149c9b43ded5e018ddff2a855cf2cfd62e8cd7d079c69f"
 dependencies = [
- "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version 0.4.1",
  "syn 2.0.99",
 ]
 
@@ -2793,7 +2989,7 @@ checksum = "9ac1e888d6830712d565b2f3a974be3200be9296bc1b03db8251a4cbf18a4a34"
 dependencies = [
  "digest 0.10.7",
  "futures",
- "rand",
+ "rand 0.8.5",
  "reqwest 0.12.12",
  "thiserror 1.0.69",
  "tokio",
@@ -2827,6 +3023,7 @@ dependencies = [
  "digest 0.10.7",
  "elliptic-curve 0.13.8",
  "rfc6979 0.4.0",
+ "serdect",
  "signature 2.2.0",
  "spki 0.7.3",
 ]
@@ -2845,9 +3042,12 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "elf"
@@ -2869,7 +3069,7 @@ dependencies = [
  "generic-array",
  "group 0.12.1",
  "pkcs8 0.9.0",
- "rand_core",
+ "rand_core 0.6.4",
  "sec1 0.3.0",
  "subtle",
  "zeroize",
@@ -2888,8 +3088,9 @@ dependencies = [
  "generic-array",
  "group 0.13.0",
  "pkcs8 0.10.2",
- "rand_core",
+ "rand_core 0.6.4",
  "sec1 0.7.3",
+ "serdect",
  "subtle",
  "zeroize",
 ]
@@ -3050,7 +3251,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
 dependencies = [
- "rand_core",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
@@ -3063,7 +3264,7 @@ dependencies = [
  "bitvec",
  "byteorder",
  "ff_derive",
- "rand_core",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
@@ -3112,7 +3313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand",
+ "rand 0.8.5",
  "rustc-hex",
  "static_assertions",
 ]
@@ -3405,10 +3606,10 @@ dependencies = [
  "itertools 0.13.0",
  "musig2",
  "num-traits",
- "rand",
+ "rand 0.8.5",
  "regex",
  "reqwest 0.11.27",
- "secp256k1",
+ "secp256k1 0.29.1",
  "serde",
  "serde_json",
  "serial_test",
@@ -3427,7 +3628,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
 dependencies = [
  "ff 0.12.1",
- "rand_core",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
@@ -3438,7 +3639,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff 0.13.0",
- "rand_core",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
@@ -3454,13 +3655,19 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap",
+ "indexmap 2.7.1",
  "slab",
  "tokio",
  "tokio-util",
  "tracing",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
 [[package]]
 name = "hashbrown"
 version = "0.13.2"
@@ -3485,6 +3692,7 @@ dependencies = [
  "allocator-api2",
  "equivalent",
  "foldhash",
+ "serde",
 ]
 
 [[package]]
@@ -3907,6 +4115,12 @@ dependencies = [
  "syn 2.0.99",
 ]
 
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "idna"
 version = "1.0.3"
@@ -3948,6 +4162,17 @@ dependencies = [
  "syn 2.0.99",
 ]
 
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
 [[package]]
 name = "indexmap"
 version = "2.7.1"
@@ -3956,6 +4181,7 @@ checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.2",
+ "serde",
 ]
 
 [[package]]
@@ -4046,21 +4272,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "jsonwebtoken"
-version = "9.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde"
-dependencies = [
- "base64 0.22.1",
- "js-sys",
- "pem",
- "ring",
- "serde",
- "serde_json",
- "simple_asn1",
-]
-
 [[package]]
 name = "k256"
 version = "0.13.4"
@@ -4071,6 +4282,7 @@ dependencies = [
  "ecdsa 0.16.9",
  "elliptic-curve 0.13.8",
  "once_cell",
+ "serdect",
  "sha2",
 ]
 
@@ -4229,6 +4441,17 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "macro-string"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -4281,7 +4504,7 @@ checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
 dependencies = [
  "byteorder",
  "keccak",
- "rand_core",
+ "rand_core 0.6.4",
  "zeroize",
 ]
 
@@ -4359,9 +4582,9 @@ dependencies = [
  "base16ct 0.2.0",
  "hmac",
  "once_cell",
- "rand",
+ "rand 0.8.5",
  "secp",
- "secp256k1",
+ "secp256k1 0.29.1",
  "serde",
  "serdect",
  "sha2",
@@ -4429,7 +4652,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
- "rand",
+ "rand 0.8.5",
 ]
 
 [[package]]
@@ -4516,6 +4739,19 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "nybbles"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8983bb634df7248924ee0c4c3a749609b5abcb082c28fffe3254b3eb3602b307"
+dependencies = [
+ "alloy-rlp",
+ "const-hex",
+ "proptest",
+ "serde",
+ "smallvec",
+]
+
 [[package]]
 name = "objc"
 version = "0.2.7"
@@ -4547,9 +4783,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.3"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "openssh"
@@ -4802,16 +5038,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
-[[package]]
-name = "pem"
-version = "3.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
-dependencies = [
- "base64 0.22.1",
- "serde",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -4997,6 +5223,28 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.94"
@@ -5017,8 +5265,8 @@ dependencies = [
  "bitflags 2.9.0",
  "lazy_static",
  "num-traits",
- "rand",
- "rand_chacha",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
  "rand_xorshift",
  "regex-syntax",
  "rusty-fork",
@@ -5119,7 +5367,7 @@ checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
  "getrandom 0.2.15",
- "rand",
+ "rand 0.8.5",
  "ring",
  "rustc-hash",
  "rustls 0.23.23",
@@ -5167,8 +5415,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+ "serde",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
+ "serde",
 ]
 
 [[package]]
@@ -5178,7 +5438,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
@@ -5190,13 +5460,23 @@ dependencies = [
  "getrandom 0.2.15",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.1",
+ "serde",
+]
+
 [[package]]
 name = "rand_xorshift"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
 dependencies = [
- "rand_core",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -5367,7 +5647,7 @@ dependencies = [
  "tokio",
  "tokio-native-tls",
  "tokio-rustls 0.26.2",
- "tower 0.5.2",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -5510,7 +5790,7 @@ dependencies = [
  "hex",
  "lazy-regex",
  "metal",
- "rand",
+ "rand 0.8.5",
  "rayon",
  "risc0-circuit-recursion-sys",
  "risc0-core",
@@ -5554,7 +5834,7 @@ dependencies = [
  "num-bigint 0.4.6",
  "num-derive",
  "num-traits",
- "rand",
+ "rand 0.8.5",
  "rayon",
  "risc0-binfmt",
  "risc0-circuit-rv32im-sys",
@@ -5588,7 +5868,7 @@ dependencies = [
  "bytemuck",
  "nvtx",
  "puffin",
- "rand_core",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -5645,8 +5925,8 @@ dependencies = [
  "ndarray",
  "parking_lot",
  "paste",
- "rand",
- "rand_core",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
  "rayon",
  "risc0-core",
  "risc0-sys",
@@ -5677,7 +5957,7 @@ dependencies = [
  "num-bigint 0.4.6",
  "num-traits",
  "prost",
- "rand",
+ "rand 0.8.5",
  "rayon",
  "risc0-binfmt",
  "risc0-build",
@@ -5734,9 +6014,9 @@ dependencies = [
 
 [[package]]
 name = "ruint"
-version = "1.13.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "825df406ec217a8116bd7b06897c6cc8f65ffefc15d030ae2c9540acc9ed50b6"
+checksum = "11256b5fe8c68f56ac6f39ef0720e592f33d2367a4782740d9c9142e889c7fb4"
 dependencies = [
  "alloy-rlp",
  "ark-ff 0.3.0",
@@ -5750,7 +6030,8 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types",
  "proptest",
- "rand",
+ "rand 0.8.5",
+ "rand 0.9.1",
  "rlp",
  "ruint-macro",
  "serde",
@@ -6009,6 +6290,7 @@ dependencies = [
  "der 0.7.9",
  "generic-array",
  "pkcs8 0.10.2",
+ "serdect",
  "subtle",
  "zeroize",
 ]
@@ -6021,8 +6303,8 @@ checksum = "dd426921f62c7e334ca27173743cd90a7263566a3be76ef0b47773d631633cf9"
 dependencies = [
  "base16ct 0.2.0",
  "once_cell",
- "rand",
- "secp256k1",
+ "rand 0.8.5",
+ "secp256k1 0.29.1",
  "serde",
  "serdect",
  "subtle",
@@ -6035,7 +6317,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
 dependencies = [
  "bitcoin_hashes",
- "rand",
+ "rand 0.8.5",
+ "secp256k1-sys",
+ "serde",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252"
+dependencies = [
+ "bitcoin_hashes",
+ "rand 0.8.5",
  "secp256k1-sys",
  "serde",
 ]
@@ -6170,6 +6464,36 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_with"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
+dependencies = [
+ "base64 0.22.1",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.7.1",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
 [[package]]
 name = "serdect"
 version = "0.2.0"
@@ -6227,6 +6551,16 @@ dependencies = [
  "digest 0.10.7",
 ]
 
+[[package]]
+name = "sha3"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+dependencies = [
+ "digest 0.10.7",
+ "keccak",
+]
+
 [[package]]
 name = "sha3-asm"
 version = "0.1.4"
@@ -6286,7 +6620,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 dependencies = [
  "digest 0.10.7",
- "rand_core",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -6296,7 +6630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest 0.10.7",
- "rand_core",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -6305,18 +6639,6 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
-[[package]]
-name = "simple_asn1"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb"
-dependencies = [
- "num-bigint 0.4.6",
- "num-traits",
- "thiserror 2.0.12",
- "time",
-]
-
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -6331,6 +6653,9 @@ name = "smallvec"
 version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "socket2"
@@ -6485,9 +6810,9 @@ dependencies = [
 
 [[package]]
 name = "syn-solidity"
-version = "0.7.7"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c837dc8852cb7074e46b444afb81783140dab12c58867b49fb3898fbafedf7ea"
+checksum = "14c8c8f496c33dc6343dac05b4be8d9e0bca180a4caa81d7b8416b10cc2273cd"
 dependencies = [
  "paste",
  "proc-macro2",
@@ -6787,9 +7112,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-tungstenite"
-version = "0.23.1"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
+checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
 dependencies = [
  "futures-util",
  "log",
@@ -6835,24 +7160,9 @@ version = "0.22.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
 dependencies = [
- "indexmap",
+ "indexmap 2.7.1",
  "toml_datetime",
- "winnow 0.7.3",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tower-layer",
- "tower-service",
- "tracing",
+ "winnow",
 ]
 
 [[package]]
@@ -6926,6 +7236,18 @@ dependencies = [
  "valuable",
 ]
 
+[[package]]
+name = "tracing-futures"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
+dependencies = [
+ "futures",
+ "futures-task",
+ "pin-project",
+ "tracing",
+]
+
 [[package]]
 name = "tracing-subscriber"
 version = "0.2.25"
@@ -6954,21 +7276,20 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "tungstenite"
-version = "0.23.0"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
+checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
 dependencies = [
- "byteorder",
  "bytes",
  "data-encoding",
  "http 1.2.0",
  "httparse",
  "log",
- "rand",
+ "rand 0.9.1",
  "rustls 0.23.23",
  "rustls-pki-types",
  "sha1",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "utf-8",
 ]
 
@@ -7265,6 +7586,20 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "wasmtimer"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0048ad49a55b9deb3953841fa1fc5858f0efbcb7a18868c899a360269fac1b23"
+dependencies = [
+ "futures",
+ "js-sys",
+ "parking_lot",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.77"
@@ -7521,15 +7856,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "winnow"
-version = "0.6.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "0.7.3"
@@ -7732,7 +8058,7 @@ dependencies = [
  "crossbeam-utils",
  "displaydoc",
  "flate2",
- "indexmap",
+ "indexmap 2.7.1",
  "memchr",
  "thiserror 2.0.12",
  "zopfli",
diff --git a/Cargo.toml b/Cargo.toml
index 9f86f267..f6dfa12b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,7 +49,7 @@ async-trait = "0.1.81"
 suppaftp = { version = "6.0.1", features = ["async", "async-native-tls"] }
 openssh-sftp-client = { version = "0.14.6", features = ["openssh"] }
 openssh = { version = "0.10.4", features = ["native-mux"] }
-alloy = { version = "0.2.1", features = ["full"] }
+alloy = { version = "1.0.9", features = ["full"] }
 clap = { version = "4.5.23", features = ["derive", "cargo", "env"] }
 toml = "0.5.11"
 colored = "2.0.0"
diff --git a/bitvm/src/chunk/api.rs b/bitvm/src/chunk/api.rs
index 50da078a..feca92d9 100644
--- a/bitvm/src/chunk/api.rs
+++ b/bitvm/src/chunk/api.rs
@@ -1372,6 +1372,6 @@ mod test {
                 index_of_bitcommitted_msg.push(seg.id);
             }
             println!("script {i} bitcoms: {:?}", index_of_bitcommitted_msg);
-        };
+        }
     }
 }
diff --git a/bridge/src/client/chain/ethereum_adaptor.rs b/bridge/src/client/chain/ethereum_adaptor.rs
index e270d3a3..3b540d64 100644
--- a/bridge/src/client/chain/ethereum_adaptor.rs
+++ b/bridge/src/client/chain/ethereum_adaptor.rs
@@ -5,6 +5,9 @@ use alloy::rpc::types::Log;
 use super::{
     chain::PegInEvent, chain::PegOutBurntEvent, chain::PegOutEvent, chain_adaptor::ChainAdaptor,
 };
+use alloy::network::Ethereum;
+use alloy::providers::fillers::{FillProvider, JoinFill, RecommendedFillers};
+use alloy::providers::Identity;
 use alloy::sol_types::SolEvent;
 use alloy::{
     eips::BlockNumberOrTag,
@@ -12,7 +15,7 @@ use alloy::{
     providers::{Provider, ProviderBuilder, RootProvider},
     rpc::types::Filter,
     sol,
-    transports::http::{reqwest::Url, Client, Http},
+    transports::http::reqwest::Url,
 };
 use async_trait::async_trait;
 use bitcoin::hashes::Hash;
@@ -52,7 +55,10 @@ sol!(
 pub struct EthereumAdaptor {
     bridge_address: EvmAddress,
     bridge_creation_block: u64,
-    provider: RootProvider<Http<Client>>,
+    provider: FillProvider<
+        JoinFill<Identity, <Ethereum as RecommendedFillers>::RecommendedFillers>,
+        RootProvider,
+    >,
     to_block: Option<BlockNumberOrTag>,
 }
 
@@ -236,7 +242,7 @@ impl EthereumAdaptor {
         Self {
             bridge_address: config.bridge_address,
             bridge_creation_block: config.bridge_creation_block,
-            provider: ProviderBuilder::new().on_http(config.rpc_url),
+            provider: ProviderBuilder::new().connect_http(config.rpc_url),
             to_block: config.to_block,
         }
     }
diff --git a/goat/src/bin/goat-bridge/commands.rs b/goat/src/bin/goat-bridge/commands.rs
index b3e1353a..2b3d9ba6 100644
--- a/goat/src/bin/goat-bridge/commands.rs
+++ b/goat/src/bin/goat-bridge/commands.rs
@@ -2,48 +2,45 @@ use clap::Subcommand;
 
 #[derive(Subcommand)]
 pub(crate) enum Commands {
-    /// -GENERAL----: generate disprove scripts 
-    GenerateDisproveScripts{
-    },
+    /// -GENERAL----: generate disprove scripts
+    GenerateDisproveScripts {},
 
     /// -GENERAL----: generate all necessary bitvm2 transactions (unsigned)
-    GenerateBitvmInstanace {
-    },
+    GenerateBitvmInstanace {},
 
     /// -DEPOSITOR--: generate pegin-prepare, pegin-comfirm & pegin-refund txns
     GeneratePeginTx {
         /// (sats)  deposit amount of pegin tx
-        #[arg(long="amount")]
+        #[arg(long = "amount")]
         deposit_amount: u64,
 
         /// (sats)  fee amount of pegin tx
-        #[arg(long="fee")]
+        #[arg(long = "fee")]
         fee_amount: u64,
 
         /// (Address) address to receive change
-        #[arg(long="change")]
+        #[arg(long = "change")]
         change_address: String,
 
         /// (array of strings) input utxos for pegin tx
-        /// format: "txid:vout:amount" 
+        /// format: "txid:vout:amount"
         /// example: "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16:0:10000000000"
         #[arg(long="inputs", num_args = 1.., value_delimiter = ',', required = true)]
         tx_inputs: Vec<String>,
     },
 
     /// -FEDERATION-: push federation members' pre-signature for necessary txns, include: pegin_comfirm, take_1, take_2, assert_final, disprove
-    FederationPresign {
-    },
+    FederationPresign {},
 
-    /// -OPERATOR---: generate winternitz public-keys & secret-keys 
+    /// -OPERATOR---: generate winternitz public-keys & secret-keys
     /// (⚠ Warning: This feature is for testing and development purposes only. It may not be secure enough for production use.)
     GenerateWotsKeys {
         /// (String) a random seed used to generate wots keypairs
         // #[arg(short = 's', long = "seed")]
         secret_seed: String,
-    }, 
+    },
 
-    /// -OPERATOR---: generate winternitz signatures for groth16-proof & intermediate-values 
+    /// -OPERATOR---: generate winternitz signatures for groth16-proof & intermediate-values
     SignProof {
         /// skip verifying the correctness of generated sigs
         #[arg(long)]
@@ -51,16 +48,17 @@ pub(crate) enum Commands {
     },
 
     /// -OPERATOR---: generate pre-kickoff(pegout-confirm) tx
-    GeneratePrekickoffTx { /// (sats)  stake amount of pre-kickof tx
-        #[arg(long="amount")]
+    GeneratePrekickoffTx {
+        /// (sats)  stake amount of pre-kickof tx
+        #[arg(long = "amount")]
         stake_amount: u64,
 
         /// (sats)  fee amount of pre-kickof tx
-        #[arg(long="fee")]
+        #[arg(long = "fee")]
         fee_amount: u64,
 
         /// (Address) address to receive change
-        #[arg(long="change")]
+        #[arg(long = "change")]
         change_address: String,
 
         /// (array of formatted strings) input utxos for prekickoff tx
@@ -71,8 +69,7 @@ pub(crate) enum Commands {
     },
 
     /// -OPERATOR---: push operator's pre-signature necessary txns, include: challenge
-    OperatorPresign {
-    },
+    OperatorPresign {},
 
     /// -OPERATOR---: operator sign txns: include: kickoff, take-1, assert, take-2
     OperatorSign {
@@ -97,25 +94,22 @@ pub(crate) enum Commands {
         take_2: bool,
     },
 
-    /// -CHALLENGER-: check if the groth16-proof(bitcommitments) is valid 
-    VerifyProof {
-    },
+    /// -CHALLENGER-: check if the groth16-proof(bitcommitments) is valid
+    VerifyProof {},
 
     /// -CHALLENGER-: send disprove tx
     Disprove {
         /// address that will receive challenger success reward
         reward_address: String,
     },
-
-
-    /* 
+    /*
     /// -FEDERATION-: generate psbt for federation members
     GenerateFederationPsbt {
         /// (hex String) federation member's public-key
         // #[arg(long)]
         pubkey: String,
     },
-    
+
     /// -OPERATOR---: generate psbt for operator
     GenerateOperatorPsbt {
         // #[arg(long)]
@@ -135,8 +129,8 @@ pub(crate) enum Commands {
     ValidateKickoff {
     },
 
-    /// -CHALLENGER-: check if the groth16-proof(bitcommitments) submitted by operator in assert-tx is valid 
+    /// -CHALLENGER-: check if the groth16-proof(bitcommitments) submitted by operator in assert-tx is valid
     ValidateAssert {
     },
     */
-}
\ No newline at end of file
+}
diff --git a/goat/src/bin/goat-bridge/config.rs b/goat/src/bin/goat-bridge/config.rs
index f5b2a672..b45e38cb 100644
--- a/goat/src/bin/goat-bridge/config.rs
+++ b/goat/src/bin/goat-bridge/config.rs
@@ -1,5 +1,5 @@
-use serde::Deserialize;
 use bitcoin::Network;
+use serde::Deserialize;
 
 pub const DEFAULT_WOTS_SECRET_FILE: &str = "data/private/wots_sec.json";
 pub const DEFAULT_WOTS_PUBKEY_FILE: &str = "data/public/wots_pub.json";
@@ -30,23 +30,22 @@ pub const ASSERT_FINAL_FILE_NAME: &str = "assert-final.json";
 pub const TAKE2_FILE_NAME: &str = "take-2.json";
 pub const DISPROVE_FILE_NAME: &str = "disprove.json";
 
-
 #[derive(Deserialize, Debug, Clone)]
 pub struct Config {
-    #[serde(default)] 
+    #[serde(default)]
     pub general: GeneralConfig,
-    #[serde(default)] 
+    #[serde(default)]
     pub depositor: DepositorConfig,
-    #[serde(default)] 
+    #[serde(default)]
     pub operator: OperatorConfig,
-    #[serde(default)] 
+    #[serde(default)]
     pub federation: FederationConfig,
-    #[serde(default)] 
+    #[serde(default)]
     pub challenger: ChallengerConfig,
 }
 
 #[derive(Deserialize, Debug, Clone)]
-pub struct GeneralConfig {    
+pub struct GeneralConfig {
     #[serde(default = "default_network")]
     pub network: String,
 
@@ -54,7 +53,6 @@ pub struct GeneralConfig {
     pub federation_taproot_pubkey: Option<String>,
     pub operator_pubkey: Option<String>,
     // pub operator_taproot_pubkey: Option<String>,
-
     #[serde(default = "default_txns_dir")]
     pub txns_dir: String,
     #[serde(default = "default_signed_txns_dir")]
@@ -79,29 +77,29 @@ pub struct GeneralConfig {
 }
 
 #[derive(Deserialize, Debug, Default, Clone)]
-pub struct DepositorConfig {    
+pub struct DepositorConfig {
     pub depositor_evm_address: Option<String>,
     // pub depositor_taproot_public_key: Option<String>,
     pub depositor_pubkey: Option<String>,
-    pub depositor_seckey: Option<String>,  
+    pub depositor_seckey: Option<String>,
 }
 
 #[derive(Deserialize, Debug, Clone)]
-pub struct OperatorConfig {   
+pub struct OperatorConfig {
     #[serde(default = "default_operator_wots_secret_file")]
     pub operator_wots_seckey_file: String,
-    pub operator_seckey: Option<String>,  
+    pub operator_seckey: Option<String>,
 }
 
 #[derive(Deserialize, Debug, Default, Clone)]
-pub struct FederationConfig {  
-    pub federation_seckeys: Option<Vec<String>>,  
+pub struct FederationConfig {
+    pub federation_seckeys: Option<Vec<String>>,
 }
 
 #[derive(Deserialize, Debug, Clone)]
-pub struct ChallengerConfig {   
+pub struct ChallengerConfig {
     #[serde(default = "default_disprove_witness_file")]
-    pub disprove_witness_file: String, 
+    pub disprove_witness_file: String,
 }
 
 pub fn load_config(file: &str) -> Config {
@@ -202,4 +200,3 @@ fn default_signed_assertions_file() -> String {
 fn default_disprove_witness_file() -> String {
     DFFAULT_DISPROVE_WITNESS_FILE.to_string()
 }
-
diff --git a/goat/src/bin/goat-bridge/files.rs b/goat/src/bin/goat-bridge/files.rs
index 4c8eb764..16d7eab0 100644
--- a/goat/src/bin/goat-bridge/files.rs
+++ b/goat/src/bin/goat-bridge/files.rs
@@ -1,31 +1,27 @@
-use bitvm::treepp::*;
-use bitvm::chunk::api::{Signatures as Groth16WotsSignatures, PublicKeys as Groth16WotsPublicKeys, NUM_PUBS, NUM_HASH, NUM_U256};
-use bitvm::signatures::wots_api::{wots256, wots_hash};
-use bitvm::signatures::signing_winternitz::{WinternitzPublicKey, WinternitzSecret};
 use ark_bn254::Bn254;
-use bitcoin::{ScriptBuf, Transaction, Txid, consensus, Wtxid};
-use goat::proof::{deserialize_proof, deserialize_vk, deserialize_pubin};
+use bitcoin::{consensus, ScriptBuf, Transaction, Txid, Wtxid};
+use bitvm::chunk::api::{
+    PublicKeys as Groth16WotsPublicKeys, Signatures as Groth16WotsSignatures, NUM_HASH, NUM_PUBS,
+    NUM_U256,
+};
+use bitvm::signatures::signing_winternitz::{WinternitzPublicKey, WinternitzSecret};
+use bitvm::signatures::wots_api::{wots256, wots_hash};
+use bitvm::treepp::*;
 use goat::commitments::NUM_KICKOFF;
+use goat::proof::{deserialize_proof, deserialize_pubin, deserialize_vk};
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::io::{Write, BufReader};
-use std::fs::{File, self};
+use std::fs::{self, File};
+use std::io::{BufReader, Write};
 use std::path::Path;
-use serde::{Serialize, Deserialize};
 
 const NUM_SIGS: usize = NUM_PUBS + NUM_HASH + NUM_U256;
 pub type KickoffWotsSecretKeys = [WinternitzSecret; NUM_KICKOFF];
 pub type Groth16WotsSecretKeys = [String; NUM_SIGS];
-pub type WotsSecretKeys = (
-    KickoffWotsSecretKeys,
-    Groth16WotsSecretKeys,
-);
+pub type WotsSecretKeys = (KickoffWotsSecretKeys, Groth16WotsSecretKeys);
 
 pub type KickoffWotsPublicKeys = [WinternitzPublicKey; NUM_KICKOFF];
-pub type WotsPublicKeys = (
-    KickoffWotsPublicKeys,
-    Groth16WotsPublicKeys,
-);
-
+pub type WotsPublicKeys = (KickoffWotsPublicKeys, Groth16WotsPublicKeys);
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
 pub struct SignedTransaction {
@@ -47,8 +43,7 @@ impl SignedTransaction {
     }
 }
 
-
-pub fn write_signed_assertions_to_file(file: &str, sigs: Groth16WotsSignatures) { 
+pub fn write_signed_assertions_to_file(file: &str, sigs: Groth16WotsSignatures) {
     let mut sigs_map: HashMap<u32, Vec<Vec<u8>>> = HashMap::new();
     let mut index = 0;
     for ss in *sigs.0 {
@@ -89,13 +84,17 @@ pub fn load_signed_assertions_from_file(file: &str) -> Groth16WotsSignatures {
     let (min, max) = (0, NUM_PUBS);
     for i in min..max {
         let v = sigs_map.get(&(i as u32)).unwrap();
-        assert!(v.len() == W256_LEN as usize, "Invalid wots siganture length");
+        assert!(
+            v.len() == W256_LEN as usize,
+            "Invalid wots siganture length"
+        );
         let mut res: Vec<([u8; 20], u8)> = Vec::new();
         let sig_len = W256_LEN / 2;
         for i in 0..sig_len {
             res.push((
-                v[(2*i) as usize].clone().try_into().unwrap(), 
-                v[(2*i+1) as usize][0]));
+                v[(2 * i) as usize].clone().try_into().unwrap(),
+                v[(2 * i + 1) as usize][0],
+            ));
         }
         let sig: wots256::Signature = res.try_into().unwrap();
         psig.push(sig);
@@ -106,13 +105,17 @@ pub fn load_signed_assertions_from_file(file: &str) -> Groth16WotsSignatures {
     let (min, max) = (max, max + NUM_U256);
     for i in min..max {
         let v = sigs_map.get(&(i as u32)).unwrap();
-        assert!(v.len() == W256_LEN as usize, "Invalid wots siganture length");
+        assert!(
+            v.len() == W256_LEN as usize,
+            "Invalid wots siganture length"
+        );
         let mut res: Vec<([u8; 20], u8)> = Vec::new();
         let sig_len = W256_LEN / 2;
         for i in 0..sig_len {
             res.push((
-                v[(2*i) as usize].clone().try_into().unwrap(), 
-                v[(2*i+1) as usize][0]));
+                v[(2 * i) as usize].clone().try_into().unwrap(),
+                v[(2 * i + 1) as usize][0],
+            ));
         }
         let sig: wots256::Signature = res.try_into().unwrap();
         fsig.push(sig);
@@ -123,13 +126,17 @@ pub fn load_signed_assertions_from_file(file: &str) -> Groth16WotsSignatures {
     let (min, max) = (max, max + NUM_HASH);
     for i in min..max {
         let v = sigs_map.get(&(i as u32)).unwrap();
-        assert!(v.len() == WHASH_LEN as usize, "Invalid wots siganture length");
+        assert!(
+            v.len() == WHASH_LEN as usize,
+            "Invalid wots siganture length"
+        );
         let mut res: Vec<([u8; 20], u8)> = Vec::new();
         let sig_len = WHASH_LEN / 2;
         for i in 0..sig_len {
             res.push((
-                v[(2*i) as usize].clone().try_into().unwrap(), 
-                v[(2*i+1) as usize][0]));
+                v[(2 * i) as usize].clone().try_into().unwrap(),
+                v[(2 * i + 1) as usize][0],
+            ));
         }
         let sig: wots_hash::Signature = res.try_into().unwrap();
         hsig.push(sig);
@@ -157,15 +164,19 @@ pub fn write_wots_seckeys(file: &str, seckeys: WotsSecretKeys) {
     create_necessary_dir(file);
     let json = serde_json::to_vec_pretty(&(seckeys.0.to_vec(), seckeys.1.to_vec())).unwrap();
     let mut file = File::create(file).unwrap();
-    file.write_all(&json).unwrap();  
+    file.write_all(&json).unwrap();
 }
 pub fn load_wots_seckeys(file: &str) -> WotsSecretKeys {
     create_necessary_dir(file);
     let file = File::open(file).expect(&format!("fail to open {:?}", file));
     let reader = BufReader::new(file);
-    let seckeys_vec: (Vec<WinternitzSecret>, Vec<String>) = serde_json::from_reader(reader).unwrap();
+    let seckeys_vec: (Vec<WinternitzSecret>, Vec<String>) =
+        serde_json::from_reader(reader).unwrap();
     (
-        seckeys_vec.0.try_into().unwrap_or_else(|_e| panic!("kickoff bitcom keys number not match")),
+        seckeys_vec
+            .0
+            .try_into()
+            .unwrap_or_else(|_e| panic!("kickoff bitcom keys number not match")),
         seckeys_vec.1.try_into().unwrap(),
     )
 }
@@ -173,8 +184,8 @@ pub fn load_wots_seckeys(file: &str) -> WotsSecretKeys {
 pub fn write_wots_pubkeys(file: &str, pubkeys: WotsPublicKeys) {
     let mut pubkeys_map: HashMap<u32, Vec<Vec<u8>>> = HashMap::new();
     let mut index = 0;
-    // wots pk for groth16 proof 
-    for pk in pubkeys.1.0 {
+    // wots pk for groth16 proof
+    for pk in pubkeys.1 .0 {
         let mut v: Vec<Vec<u8>> = Vec::new();
         for d in pk {
             v.push(d.to_vec());
@@ -182,7 +193,7 @@ pub fn write_wots_pubkeys(file: &str, pubkeys: WotsPublicKeys) {
         pubkeys_map.insert(index, v);
         index += 1;
     }
-    for pk in pubkeys.1.1 {
+    for pk in pubkeys.1 .1 {
         let mut v: Vec<Vec<u8>> = Vec::new();
         for d in pk {
             v.push(d.to_vec());
@@ -190,7 +201,7 @@ pub fn write_wots_pubkeys(file: &str, pubkeys: WotsPublicKeys) {
         pubkeys_map.insert(index, v);
         index += 1;
     }
-    for pk in pubkeys.1.2 {
+    for pk in pubkeys.1 .2 {
         let mut v: Vec<Vec<u8>> = Vec::new();
         for d in pk {
             v.push(d.to_vec());
@@ -219,7 +230,10 @@ pub fn load_wots_pubkeys(file: &str) -> WotsPublicKeys {
     let (min, max) = (0, NUM_PUBS);
     for i in min..max {
         let v = pubkeys_map.get(&(i as u32)).unwrap();
-        assert!(v.len() == W256_LEN as usize, "Invalid wots public-key length");
+        assert!(
+            v.len() == W256_LEN as usize,
+            "Invalid wots public-key length"
+        );
         let mut res: Vec<[u8; 20]> = Vec::new();
         for i in 0..W256_LEN {
             res.push(v[i as usize].clone().try_into().unwrap());
@@ -233,7 +247,10 @@ pub fn load_wots_pubkeys(file: &str) -> WotsPublicKeys {
     let (min, max) = (max, max + NUM_U256);
     for i in min..max {
         let v = pubkeys_map.get(&(i as u32)).unwrap();
-        assert!(v.len() == W256_LEN as usize, "Invalid wots public-key length");
+        assert!(
+            v.len() == W256_LEN as usize,
+            "Invalid wots public-key length"
+        );
         let mut res: Vec<[u8; 20]> = Vec::new();
         for i in 0..W256_LEN {
             res.push(v[i as usize].clone().try_into().unwrap());
@@ -247,7 +264,10 @@ pub fn load_wots_pubkeys(file: &str) -> WotsPublicKeys {
     let (min, max) = (max, max + NUM_HASH);
     for i in min..max {
         let v = pubkeys_map.get(&(i as u32)).unwrap();
-        assert!(v.len() == WHASH_LEN as usize, "Invalid wots public-key length");
+        assert!(
+            v.len() == WHASH_LEN as usize,
+            "Invalid wots public-key length"
+        );
         let mut res: Vec<[u8; 20]> = Vec::new();
         for i in 0..WHASH_LEN {
             res.push(v[i as usize].clone().try_into().unwrap());
@@ -261,38 +281,43 @@ pub fn load_wots_pubkeys(file: &str) -> WotsPublicKeys {
     let (min, max) = (max, max + NUM_KICKOFF);
     for i in min..max {
         let v = pubkeys_map.get(&(i as u32)).unwrap();
-        assert!(v.len() == NUM_KICKOFF, "Invalid kickoff wots public-key number");
+        assert!(
+            v.len() == NUM_KICKOFF,
+            "Invalid kickoff wots public-key number"
+        );
         for i in 0..NUM_KICKOFF {
-            pk_kickoff.push(
-                serde_json::from_slice(&v[i as usize].clone()).unwrap()
-            );
+            pk_kickoff.push(serde_json::from_slice(&v[i as usize].clone()).unwrap());
         }
     }
-    let pk_kickoff: [WinternitzPublicKey; NUM_KICKOFF] = pk_kickoff.try_into().unwrap_or_else(|_e| panic!("kickoff bitcom keys number not match"));
+    let pk_kickoff: [WinternitzPublicKey; NUM_KICKOFF] = pk_kickoff
+        .try_into()
+        .unwrap_or_else(|_e| panic!("kickoff bitcom keys number not match"));
 
-    let res = (
-        pk_kickoff,
-        (pk0, pk1, pk2),
-    );
+    let res = (pk_kickoff, (pk0, pk1, pk2));
     res
 }
 
 pub fn write_scripts_to_file(file: &str, scripts: Vec<Script>) {
     create_necessary_dir(file);
-    let scripts_bytes: Vec<Vec<u8>> = scripts.into_iter().map(|x| x.compile().to_bytes()).collect();
+    let scripts_bytes: Vec<Vec<u8>> = scripts
+        .into_iter()
+        .map(|x| x.compile().to_bytes())
+        .collect();
     let json = serde_json::to_vec_pretty(&scripts_bytes).unwrap();
     let mut file = File::create(file).unwrap();
     file.write_all(&json).unwrap();
 }
 pub fn load_scripts_from_file(file: &str) -> Vec<Script> {
     let scripts_bytes = load_scripts_bytes_from_file(file);
-    scripts_bytes.into_iter()
+    scripts_bytes
+        .into_iter()
         .map(|x| {
             let sc = script! {};
             let bf = ScriptBuf::from_bytes(x);
             let sc = sc.push_script(bf);
             sc
-        }).collect()
+        })
+        .collect()
 }
 pub fn load_scripts_bytes_from_file(file: &str) -> Vec<Vec<u8>> {
     let file = File::open(file).expect(&format!("fail to open {:?}", file));
@@ -311,7 +336,7 @@ pub fn write_disprove_witness(file: &str, index: usize, witness: Script) {
 pub fn load_disprove_witness(file: &str) -> (usize, Script) {
     let file = File::open(file).expect(&format!("fail to open {:?}", file));
     let reader = BufReader::new(file);
-    let (index, witness_bytes): (usize, Vec<u8>)  = serde_json::from_reader(reader).unwrap();
+    let (index, witness_bytes): (usize, Vec<u8>) = serde_json::from_reader(reader).unwrap();
     let sc = script! {};
     let bf = ScriptBuf::from_bytes(witness_bytes);
     let sc = sc.push_script(bf);
@@ -324,7 +349,7 @@ pub(crate) fn file_exists(file: &str) -> bool {
 
 pub(crate) fn create_necessary_dir(path: &str) {
     if let Some(parent) = Path::new(path).parent() {
-        fs::create_dir_all(parent).unwrap(); 
+        fs::create_dir_all(parent).unwrap();
     };
 }
 
diff --git a/goat/src/bin/goat-bridge/handles.rs b/goat/src/bin/goat-bridge/handles.rs
index ddee421f..5f539d2a 100644
--- a/goat/src/bin/goat-bridge/handles.rs
+++ b/goat/src/bin/goat-bridge/handles.rs
@@ -1,73 +1,63 @@
 use crate::config::{
-    match_network, Config,
-    PRE_KICKOFF_FILE_NAME, KICKOFF_FILE_NAME, TAKE1_FILE_NAME,
-    CHALLENGE_FILE_NAME, ASSERT_INIT_FILE_NAME,
-    ASSERT_COMMIT_FILE_NAME, ASSERT_FINAL_FILE_NAME, 
-    TAKE2_FILE_NAME, DISPROVE_FILE_NAME, PEGIN_FILE_NAME
+    match_network, Config, ASSERT_COMMIT_FILE_NAME, ASSERT_FINAL_FILE_NAME, ASSERT_INIT_FILE_NAME,
+    CHALLENGE_FILE_NAME, DISPROVE_FILE_NAME, KICKOFF_FILE_NAME, PEGIN_FILE_NAME,
+    PRE_KICKOFF_FILE_NAME, TAKE1_FILE_NAME, TAKE2_FILE_NAME,
 };
 use crate::files::{
-    file_exists, load_disprove_witness, load_groth16_proof, load_groth16_pubin, load_groth16_vk, load_scripts_bytes_from_file, load_scripts_from_file, load_signed_assertions_from_file, load_wots_pubkeys, load_wots_seckeys, write_bytes_to_file, write_disprove_witness, write_scripts_to_file, write_signed_assertions_to_file, write_wots_pubkeys, write_wots_seckeys 
+    file_exists, load_disprove_witness, load_groth16_proof, load_groth16_pubin, load_groth16_vk,
+    load_scripts_bytes_from_file, load_scripts_from_file, load_signed_assertions_from_file,
+    load_wots_pubkeys, load_wots_seckeys, write_bytes_to_file, write_disprove_witness,
+    write_scripts_to_file, write_signed_assertions_to_file, write_wots_pubkeys, write_wots_seckeys,
+};
+use crate::files::{Groth16WotsSecretKeys, SignedTransaction, WotsPublicKeys, WotsSecretKeys};
+use bitcoin::{Address, Amount, OutPoint, PublicKey, Witness, XOnlyPublicKey};
+use bitvm::chunk::api::type_conversion_utils::{
+    script_to_witness, utils_raw_witnesses_from_signatures,
 };
-use crate::files::{WotsSecretKeys, WotsPublicKeys, SignedTransaction, Groth16WotsSecretKeys};
-use bitvm::chunk::api::type_conversion_utils::{script_to_witness, utils_raw_witnesses_from_signatures};
 use bitvm::chunk::api::{
-    api_generate_full_tapscripts, api_generate_partial_script, 
-    generate_signatures, generate_signatures_lit, validate_assertions, 
-    NUM_PUBS, NUM_HASH, NUM_U256, PublicKeys as Groth16WotsPublicKeys,
-    Signatures as Groth16WotsSignatures,
+    api_generate_full_tapscripts, api_generate_partial_script, generate_signatures,
+    generate_signatures_lit, validate_assertions, PublicKeys as Groth16WotsPublicKeys,
+    Signatures as Groth16WotsSignatures, NUM_HASH, NUM_PUBS, NUM_U256,
 };
 use bitvm::signatures::{
+    signing_winternitz::{WinternitzPublicKey, WinternitzSecret, WinternitzSigningInputs, LOG_D},
+    winternitz::Parameters,
     wots_api::{wots256, wots_hash, HASH_LEN},
-    signing_winternitz::{
-        WinternitzPublicKey, WinternitzSecret, LOG_D, WinternitzSigningInputs,
-    },
-    winternitz::Parameters, 
 };
-use goat::commitments::{NUM_KICKOFF, KICKOFF_MSG_SIZE, CommitmentMessageId};
+use goat::commitments::{CommitmentMessageId, KICKOFF_MSG_SIZE, NUM_KICKOFF};
+use goat::connectors::{
+    connector_0::Connector0, connector_3::Connector3, connector_4::Connector4,
+    connector_5::Connector5, connector_6::Connector6, connector_a::ConnectorA,
+    connector_b::ConnectorB, connector_c::ConnectorC, connector_d::ConnectorD,
+};
+use goat::contexts::{
+    base::{generate_keys_from_secret, generate_n_of_n_public_key},
+    operator::OperatorContext,
+    verifier::VerifierContext,
+};
 use goat::transactions::assert::utils::{convert_to_connector_c_commits_public_key, COMMIT_TX_NUM};
 use goat::transactions::{
-    base::{Input, CROWDFUNDING_AMOUNT, BaseTransaction}, 
-    pre_signed::PreSignedTransaction,
-    pre_signed_musig2::PreSignedMusig2Transaction,
+    assert::assert_commit::AssertCommitTransactionSet,
+    assert::assert_final::AssertFinalTransaction,
+    assert::assert_initial::AssertInitialTransaction,
+    assert::utils::{AllCommitConnectorsE, AssertCommitConnectorsF},
+    base::{BaseTransaction, Input, CROWDFUNDING_AMOUNT},
+    challenge::ChallengeTransaction,
+    disprove::DisproveTransaction,
+    kick_off::KickOffTransaction,
     peg_in::peg_in::PegInTransaction,
     peg_out_confirm::PreKickoffTransaction,
-    kick_off::KickOffTransaction,
+    pre_signed::PreSignedTransaction,
+    pre_signed_musig2::PreSignedMusig2Transaction,
     take_1::Take1Transaction,
-    challenge::ChallengeTransaction,
-    assert::utils::{
-        AllCommitConnectorsE, AssertCommitConnectorsF,
-    },
-    assert::assert_initial::AssertInitialTransaction,
-    assert::assert_commit::AssertCommitTransactionSet,
-    assert::assert_final::AssertFinalTransaction,
     take_2::Take2Transaction,
-    disprove::DisproveTransaction,
-};
-use goat::connectors::{
-    connector_0::Connector0,
-    connector_3::Connector3,
-    connector_4::Connector4,
-    connector_5::Connector5,
-    connector_6::Connector6,
-    connector_a::ConnectorA,
-    connector_b::ConnectorB,
-    connector_c::ConnectorC,
-    connector_d::ConnectorD,
-};
-use goat::contexts::{
-    base::{generate_n_of_n_public_key, generate_keys_from_secret},
-    verifier::VerifierContext,
-    operator::OperatorContext,
-};
-use sha2::{Sha256, Digest};
-use bitcoin::{
-    Address, Amount, OutPoint, PublicKey, Witness, XOnlyPublicKey
 };
 use musig2::SecNonce;
+use sha2::{Digest, Sha256};
 use std::collections::HashMap;
-use std::str::FromStr;
 use std::fs::File;
 use std::io::BufReader;
+use std::str::FromStr;
 
 pub(crate) fn handle_generate_disprove_scripts(conf: Config) {
     println!("\n----------------generate-disprove-scripts----------------");
@@ -76,27 +66,39 @@ pub(crate) fn handle_generate_disprove_scripts(conf: Config) {
     let ark_vkey = load_groth16_vk(&conf.general.vkey_file);
 
     println!("\nloading operator wots public-key...");
-    assert!(file_exists(&conf.general.operator_wots_pubkey_file), "operator wots public key is not provided");
+    assert!(
+        file_exists(&conf.general.operator_wots_pubkey_file),
+        "operator wots public key is not provided"
+    );
     let pubkeys = load_wots_pubkeys(&conf.general.operator_wots_pubkey_file);
 
     let partial_scripts = if file_exists(&conf.general.partial_scripts_file) {
-        println!("\nloading existing partial scripts from {}...", &conf.general.partial_scripts_file);
+        println!(
+            "\nloading existing partial scripts from {}...",
+            &conf.general.partial_scripts_file
+        );
         load_scripts_from_file(&conf.general.partial_scripts_file)
     } else {
         println!("\ngenerating partial scripts...");
         let scrs = api_generate_partial_script(&ark_vkey);
         write_scripts_to_file(&conf.general.partial_scripts_file, scrs.clone());
-        println!("\npartial scripts was written to {}", &conf.general.partial_scripts_file);
+        println!(
+            "\npartial scripts was written to {}",
+            &conf.general.partial_scripts_file
+        );
         scrs
     };
 
     println!("\ngenerating disprove scripts...");
     let disprove_scripts = api_generate_full_tapscripts(pubkeys.1, &partial_scripts);
     write_scripts_to_file(&conf.general.disprove_scripts_file, disprove_scripts);
-    println!("\ndisprove scripts was written to {}", &conf.general.disprove_scripts_file);
+    println!(
+        "\ndisprove scripts was written to {}",
+        &conf.general.disprove_scripts_file
+    );
 
     println!("-------------------done-------------------------");
-} 
+}
 
 pub(crate) fn handle_generate_wots_keys(conf: Config, seed: &str) {
     println!("\n----------------generate-wots-keys-------------------");
@@ -106,8 +108,7 @@ pub(crate) fn handle_generate_wots_keys(conf: Config, seed: &str) {
     write_wots_pubkeys(&conf.general.operator_wots_pubkey_file, pubkeys);
     println!(
         "public keys was written to {}\nsecret was keys written to {}",
-        &conf.general.operator_wots_pubkey_file,
-        &conf.operator.operator_wots_seckey_file,
+        &conf.general.operator_wots_pubkey_file, &conf.operator.operator_wots_seckey_file,
     );
     println!("-------------------done-------------------------");
 }
@@ -123,11 +124,17 @@ pub(crate) fn handle_sign_proof(conf: Config, _skip_validation: bool) {
     let ark_proof = load_groth16_proof(&conf.general.proof_file);
 
     println!("loading public-inputs ...");
-    assert!(file_exists(&conf.general.pubin_file), "public-inputs not provided");
+    assert!(
+        file_exists(&conf.general.pubin_file),
+        "public-inputs not provided"
+    );
     let ark_pubin = load_groth16_pubin(&conf.general.pubin_file);
 
     println!("\nloading operator wots secret keys ...");
-    assert!(file_exists(&conf.operator.operator_wots_seckey_file), "operator_wots_seckey_file not provided");
+    assert!(
+        file_exists(&conf.operator.operator_wots_seckey_file),
+        "operator_wots_seckey_file not provided"
+    );
     let wots_sec = load_wots_seckeys(&conf.operator.operator_wots_seckey_file);
 
     let skip_validation = true;
@@ -137,9 +144,12 @@ pub(crate) fn handle_sign_proof(conf: Config, _skip_validation: bool) {
         generate_signatures(ark_proof, ark_pubin, &ark_vkey, wots_sec.1.to_vec()).unwrap()
     };
     write_signed_assertions_to_file(&conf.general.signed_assertions_file, proof_sigs);
-    println!("signed assertions was written to {}", &conf.general.signed_assertions_file);
+    println!(
+        "signed assertions was written to {}",
+        &conf.general.signed_assertions_file
+    );
     println!("-------------------done-------------------------");
-}   
+}
 
 pub(crate) fn handle_verify_proof(conf: Config) {
     println!("\n----------------verify-proof--------------------");
@@ -148,23 +158,37 @@ pub(crate) fn handle_verify_proof(conf: Config) {
     let ark_vkey = load_groth16_vk(&conf.general.vkey_file);
 
     println!("\nloading proof signatures ...");
-    assert!(file_exists(&conf.general.proof_file), "proof-sigs not provided");
+    assert!(
+        file_exists(&conf.general.proof_file),
+        "proof-sigs not provided"
+    );
     let proof_sigs = load_signed_assertions_from_file(&conf.general.signed_assertions_file);
-    
+
     println!("\nloading operator wots public-key...");
-    assert!(file_exists(&conf.general.operator_wots_pubkey_file), "operator wots public key is not provided");
+    assert!(
+        file_exists(&conf.general.operator_wots_pubkey_file),
+        "operator wots public key is not provided"
+    );
     let pubkey = load_wots_pubkeys(&conf.general.operator_wots_pubkey_file);
 
     println!("\nloading disprove scripts...");
-    assert!(file_exists(&conf.general.disprove_scripts_file), "disprove scripts is not provided");
-    let disprove_scripts = load_scripts_from_file(&conf.general.disprove_scripts_file).try_into().unwrap();
+    assert!(
+        file_exists(&conf.general.disprove_scripts_file),
+        "disprove scripts is not provided"
+    );
+    let disprove_scripts = load_scripts_from_file(&conf.general.disprove_scripts_file)
+        .try_into()
+        .unwrap();
 
     let res = validate_assertions(&ark_vkey, proof_sigs, pubkey.1, &disprove_scripts);
     match res {
-        Some((index,witness)) => {
+        Some((index, witness)) => {
             write_disprove_witness(&conf.challenger.disprove_witness_file, index, witness);
-            println!("\nProof is invalid! Disprove witness is written to: {}", &conf.challenger.disprove_witness_file);
-        },
+            println!(
+                "\nProof is invalid! Disprove witness is written to: {}",
+                &conf.challenger.disprove_witness_file
+            );
+        }
         _ => {
             println!("\nProof is Ok.");
         }
@@ -172,38 +196,58 @@ pub(crate) fn handle_verify_proof(conf: Config) {
     println!("-------------------done-------------------------");
 }
 
-pub(crate) fn handle_generate_pegin_tx(conf: Config, inputs: Vec<Input>, deposit_amount: Amount, fee_amount: Amount, change_address: Address) {
+pub(crate) fn handle_generate_pegin_tx(
+    conf: Config,
+    inputs: Vec<Input>,
+    deposit_amount: Amount,
+    fee_amount: Amount,
+    change_address: Address,
+) {
     println!("\n--------------generate-pegin-------------------");
     println!("\nloading config...");
     let network = match_network(&conf.general.network).unwrap();
 
-    let federation_taproot_pubkey = &conf.general.federation_taproot_pubkey.expect("federation_taproot_pubkey is not provided in the configuration file");
-    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey).expect("invalid federation_taproot_pubkey");
-
-    let federation_pubkeys = conf.general.federation_pubkeys.expect("federation_pubkeys is not provided in the configuration file");
-    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys.into_iter()
+    let federation_taproot_pubkey = &conf
+        .general
+        .federation_taproot_pubkey
+        .expect("federation_taproot_pubkey is not provided in the configuration file");
+    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey)
+        .expect("invalid federation_taproot_pubkey");
+
+    let federation_pubkeys = conf
+        .general
+        .federation_pubkeys
+        .expect("federation_pubkeys is not provided in the configuration file");
+    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys
+        .into_iter()
         .map(|str| PublicKey::from_str(&str).expect("invalid federation_pubkey {str}"))
         .collect();
 
-    let depositor_evm_address = conf.depositor.depositor_evm_address.expect("depositor_evm_address is not provided in the configuration file");
-    let depositor_evm_address = hex::decode(depositor_evm_address.trim_start_matches("0x")).expect("fail to decode depositor evm address");
-    let depositor_evm_address: [u8; 20] = depositor_evm_address.try_into().expect("invalid evm address length");
-
-    let (_,aggregated_federation_taproot_pubkey) = generate_n_of_n_public_key(&federation_pubkeys);
-    assert_eq!(aggregated_federation_taproot_pubkey, federation_taproot_pubkey, "federation_taproot_pubkey is not aggregated from federation_pubkeys");
-
-    let connector_0 = Connector0::new(
-        network,
-        &federation_taproot_pubkey,
+    let depositor_evm_address = conf
+        .depositor
+        .depositor_evm_address
+        .expect("depositor_evm_address is not provided in the configuration file");
+    let depositor_evm_address = hex::decode(depositor_evm_address.trim_start_matches("0x"))
+        .expect("fail to decode depositor evm address");
+    let depositor_evm_address: [u8; 20] = depositor_evm_address
+        .try_into()
+        .expect("invalid evm address length");
+
+    let (_, aggregated_federation_taproot_pubkey) = generate_n_of_n_public_key(&federation_pubkeys);
+    assert_eq!(
+        aggregated_federation_taproot_pubkey, federation_taproot_pubkey,
+        "federation_taproot_pubkey is not aggregated from federation_pubkeys"
     );
 
-    // pegin 
+    let connector_0 = Connector0::new(network, &federation_taproot_pubkey);
+
+    // pegin
     println!("\ngenerating pegin_tx...");
     let pegin_tx = PegInTransaction::new_for_validation(
-        &connector_0, 
-        inputs, 
-        deposit_amount, 
-        fee_amount, 
+        &connector_0,
+        inputs,
+        deposit_amount,
+        fee_amount,
         change_address,
         depositor_evm_address.to_vec(),
     );
@@ -215,29 +259,42 @@ pub(crate) fn handle_generate_pegin_tx(conf: Config, inputs: Vec<Input>, deposit
     println!("-------------------done-------------------------");
 }
 
-pub(crate) fn handle_generate_prekickoff_tx(conf: Config, inputs: Vec<Input>, stake_amount: Amount, fee_amount: Amount, change_address: Address) {
+pub(crate) fn handle_generate_prekickoff_tx(
+    conf: Config,
+    inputs: Vec<Input>,
+    stake_amount: Amount,
+    fee_amount: Amount,
+    change_address: Address,
+) {
     println!("\n--------------generate-prekickoff-------------------");
     println!("\nloading config...");
     let network = match_network(&conf.general.network).unwrap();
 
-    let operator_pubkey = &conf.general.operator_pubkey.expect("operator_pubkey is not provided in the configuration file");
+    let operator_pubkey = &conf
+        .general
+        .operator_pubkey
+        .expect("operator_pubkey is not provided in the configuration file");
     let operator_pubkey = PublicKey::from_str(operator_pubkey).expect("invalid operator_pubkey");
     let operator_taproot_pubkey = XOnlyPublicKey::from(operator_pubkey);
 
     println!("\nloading operator wots public-key...");
-    assert!(file_exists(&conf.general.operator_wots_pubkey_file), "operator wots public key not provided");
+    assert!(
+        file_exists(&conf.general.operator_wots_pubkey_file),
+        "operator wots public key not provided"
+    );
     let operator_wots_pubkey = load_wots_pubkeys(&conf.general.operator_wots_pubkey_file);
-    let kickoff_wots_commitment_keys = CommitmentMessageId::pubkey_map_for_kickoff(&operator_wots_pubkey.0);
+    let kickoff_wots_commitment_keys =
+        CommitmentMessageId::pubkey_map_for_kickoff(&operator_wots_pubkey.0);
     let connector_6 = Connector6::new(
-        network, 
-        &operator_taproot_pubkey, 
+        network,
+        &operator_taproot_pubkey,
         &kickoff_wots_commitment_keys,
     );
 
-    // prekickoff 
+    // prekickoff
     println!("generating prekickoff tx...");
     let prekickoff_tx = PreKickoffTransaction::new_unsigned(
-        &connector_6, 
+        &connector_6,
         inputs,
         stake_amount,
         fee_amount,
@@ -248,7 +305,10 @@ pub(crate) fn handle_generate_prekickoff_tx(conf: Config, inputs: Vec<Input>, st
     let prekickoff_tx_file = format!("{}{}", &conf.general.txns_dir, PRE_KICKOFF_FILE_NAME);
     write_bytes_to_file(&prekickoff_tx_bytes, &prekickoff_tx_file);
     println!("\npre_kickoff_tx was written to {}", prekickoff_tx_file);
-    println!("pre_kickoff_txid: {:?}", prekickoff_tx.tx().compute_txid().to_string());
+    println!(
+        "pre_kickoff_txid: {:?}",
+        prekickoff_tx.tx().compute_txid().to_string()
+    );
     println!("-------------------done-------------------------");
 }
 
@@ -257,15 +317,22 @@ pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
     println!("\nloading config...");
     let network = match_network(&conf.general.network).unwrap();
 
-    let federation_taproot_pubkey = &conf.general.federation_taproot_pubkey.expect("federation_taproot_pubkey is not provided in the configuration file");
-    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey).expect("invalid federation_taproot_pubkey");
-        
+    let federation_taproot_pubkey = &conf
+        .general
+        .federation_taproot_pubkey
+        .expect("federation_taproot_pubkey is not provided in the configuration file");
+    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey)
+        .expect("invalid federation_taproot_pubkey");
+
     // let federation_pubkeys = conf.general.federation_pubkeys.expect("federation_pubkeys is not provided in the configuration file");
     // let federation_pubkeys: Vec<PublicKey> = federation_pubkeys.into_iter()
     //     .map(|str| PublicKey::from_str(&str).expect("invalid federation_pubkey {str}"))
     //     .collect();
 
-    let operator_pubkey = &conf.general.operator_pubkey.expect("operator_pubkey is not provided in the configuration file");
+    let operator_pubkey = &conf
+        .general
+        .operator_pubkey
+        .expect("operator_pubkey is not provided in the configuration file");
     let operator_pubkey = PublicKey::from_str(operator_pubkey).expect("invalid operator_pubkey");
     let operator_taproot_pubkey = XOnlyPublicKey::from(operator_pubkey);
 
@@ -279,29 +346,38 @@ pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
 
     println!("loading pre-kickoff-tx...");
     let pre_kickoff_file = format!("{}{}", &conf.general.txns_dir, PRE_KICKOFF_FILE_NAME);
-    assert!(file_exists(&pre_kickoff_file), "pre-kickoff tx not provided");
-    let file = File::open(pre_kickoff_file.clone()).expect(&format!("fail to open {:?}", pre_kickoff_file));
+    assert!(
+        file_exists(&pre_kickoff_file),
+        "pre-kickoff tx not provided"
+    );
+    let file = File::open(pre_kickoff_file.clone())
+        .expect(&format!("fail to open {:?}", pre_kickoff_file));
     let reader = BufReader::new(file);
     let pre_kickoff_tx: PreKickoffTransaction = serde_json::from_reader(reader).unwrap();
     let pre_kickoff_txid = pre_kickoff_tx.tx().compute_txid();
 
     println!("loading operator wots public-keys...");
-    assert!(file_exists(&conf.general.operator_wots_pubkey_file), "operator wots public key not provided");
+    assert!(
+        file_exists(&conf.general.operator_wots_pubkey_file),
+        "operator wots public key not provided"
+    );
     let operator_wots_pubkeys = load_wots_pubkeys(&conf.general.operator_wots_pubkey_file);
-    let kickoff_wots_commitment_keys = CommitmentMessageId::pubkey_map_for_kickoff(&operator_wots_pubkeys.0);
+    let kickoff_wots_commitment_keys =
+        CommitmentMessageId::pubkey_map_for_kickoff(&operator_wots_pubkeys.0);
     let assert_wots_pubkeys = &operator_wots_pubkeys.1;
-    let assert_wots_commitment_keys = convert_to_connector_c_commits_public_key(assert_wots_pubkeys);
+    let assert_wots_commitment_keys =
+        convert_to_connector_c_commits_public_key(assert_wots_pubkeys);
 
     println!("loading disprove scripts...");
-    assert!(file_exists(&conf.general.disprove_scripts_file), "disprove scripts not provided");
+    assert!(
+        file_exists(&conf.general.disprove_scripts_file),
+        "disprove scripts not provided"
+    );
     let disprove_scripts_bytes = load_scripts_bytes_from_file(&conf.general.disprove_scripts_file);
 
     // kickoff
     println!("\ngenerating kickoff tx...");
-    let connector_3 = Connector3::new(
-        network,
-        &operator_pubkey,
-    );
+    let connector_3 = Connector3::new(network, &operator_pubkey);
     let connector_6 = Connector6::new(
         network,
         &operator_taproot_pubkey,
@@ -312,10 +388,7 @@ pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
         &operator_taproot_pubkey,
         &federation_taproot_pubkey,
     );
-    let connector_b = ConnectorB::new(
-        network,
-        &operator_taproot_pubkey,
-    );
+    let connector_b = ConnectorB::new(network, &operator_taproot_pubkey);
     let kickoff_input_0_vout: usize = 0;
     let kickoff_input_0 = Input {
         outpoint: OutPoint {
@@ -339,10 +412,7 @@ pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
 
     // take-1
     println!("\ngenerating take_1 tx...");
-    let connector_0 = Connector0::new(
-        network,
-        &federation_taproot_pubkey,
-    );
+    let connector_0 = Connector0::new(network, &federation_taproot_pubkey);
     let take1_input_0_vout: usize = 0;
     let take1_input_0 = Input {
         outpoint: OutPoint {
@@ -393,10 +463,10 @@ pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
         amount: kickoff_tx.tx().output[challenge_input_0_vout].value,
     };
     let challenge_tx = ChallengeTransaction::new_for_validation(
-        network, 
-        &operator_pubkey, 
-        &connector_a, 
-        challenge_input_0, 
+        network,
+        &operator_pubkey,
+        &connector_a,
+        challenge_input_0,
         Amount::from_sat(CROWDFUNDING_AMOUNT),
     );
     let challenge_tx_bytes = serde_json::to_vec_pretty(&challenge_tx).unwrap();
@@ -406,15 +476,9 @@ pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
 
     // assert-initial
     println!("\ngenerating assert-initial tx...");
-    let connector_d = ConnectorD::new(
-        network,
-        &federation_taproot_pubkey,
-    );
-    let all_assert_commit_connectors_e = AllCommitConnectorsE::new(
-        network,
-        &operator_pubkey,
-        &assert_wots_pubkeys,
-    );
+    let connector_d = ConnectorD::new(network, &federation_taproot_pubkey);
+    let all_assert_commit_connectors_e =
+        AllCommitConnectorsE::new(network, &operator_pubkey, &assert_wots_pubkeys);
     let assert_init_input_0_vout: usize = 2;
     let assert_init_input_0 = Input {
         outpoint: OutPoint {
@@ -424,9 +488,9 @@ pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
         amount: kickoff_tx.tx().output[assert_init_input_0_vout].value,
     };
     let assert_init_tx = AssertInitialTransaction::new_for_validation(
-        &connector_b, 
-        &connector_d, 
-        &all_assert_commit_connectors_e, 
+        &connector_b,
+        &connector_d,
+        &all_assert_commit_connectors_e,
         assert_init_input_0,
     );
     let assert_init_tx_bytes = serde_json::to_vec_pretty(&assert_init_tx).unwrap();
@@ -437,10 +501,7 @@ pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
 
     // assert-commit
     println!("\ngenerating assert-commit txns...");
-    let connectors_f = AssertCommitConnectorsF::new(
-        network,
-        &operator_pubkey,
-    );
+    let connectors_f = AssertCommitConnectorsF::new(network, &operator_pubkey);
     let vout_base: usize = 1;
     let assert_commit_inputs = (0..all_assert_commit_connectors_e.connectors_num())
         .map(|idx| Input {
@@ -452,8 +513,8 @@ pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
         })
         .collect();
     let assert_commit_txns = AssertCommitTransactionSet::new(
-        &all_assert_commit_connectors_e, 
-        &connectors_f, 
+        &all_assert_commit_connectors_e,
+        &connectors_f,
         assert_commit_inputs,
     );
     let assert_commit_tx_bytes = serde_json::to_vec_pretty(&assert_commit_txns).unwrap();
@@ -463,14 +524,8 @@ pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
 
     // assert-final
     println!("\ngenerating assert-final tx...");
-    let connector_4 = Connector4::new(
-        network,
-        &operator_pubkey,
-    );
-    let connector_5 = Connector5::new(
-        network,
-        &federation_taproot_pubkey,
-    );
+    let connector_4 = Connector4::new(network, &operator_pubkey);
+    let connector_5 = Connector5::new(network, &federation_taproot_pubkey);
     let connector_c = ConnectorC::new_from_scripts(
         network,
         &operator_taproot_pubkey,
@@ -487,22 +542,23 @@ pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
     };
     let assert_final_input_f_vout: usize = 0;
     let assert_final_inputs_f: [Input; COMMIT_TX_NUM] = (0..COMMIT_TX_NUM)
-        .map(|i| {
-            Input {
-                outpoint: OutPoint {
-                    txid: assert_commit_txns.commit_txns[i].tx().compute_txid(),
-                    vout: assert_final_input_f_vout as u32,
-                },
-                amount: assert_commit_txns.commit_txns[i].tx().output[assert_final_input_f_vout].value,
-            }
-        }).collect::<Vec<Input>>().try_into().unwrap_or_else(|_e| panic!("impossible"));
+        .map(|i| Input {
+            outpoint: OutPoint {
+                txid: assert_commit_txns.commit_txns[i].tx().compute_txid(),
+                vout: assert_final_input_f_vout as u32,
+            },
+            amount: assert_commit_txns.commit_txns[i].tx().output[assert_final_input_f_vout].value,
+        })
+        .collect::<Vec<Input>>()
+        .try_into()
+        .unwrap_or_else(|_e| panic!("impossible"));
     let assert_final_tx = AssertFinalTransaction::new_for_validation(
-        &connector_4, 
-        &connector_5, 
-        &connector_c, 
-        &connector_d, 
-        &connectors_f, 
-        assert_final_input_0, 
+        &connector_4,
+        &connector_5,
+        &connector_c,
+        &connector_d,
+        &connectors_f,
+        assert_final_input_0,
         assert_final_inputs_f,
     );
     let assert_final_tx_bytes = serde_json::to_vec_pretty(&assert_final_tx).unwrap();
@@ -546,15 +602,15 @@ pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
         amount: assert_final_tx.tx().output[take2_input_3_vout].value,
     };
     let take2_tx = Take2Transaction::new_for_validation(
-        network, 
-        &operator_pubkey, 
-        &connector_0, 
-        &connector_4, 
-        &connector_5, 
-        &connector_c, 
-        take2_input_0, 
-        take2_input_1, 
-        take2_input_2, 
+        network,
+        &operator_pubkey,
+        &connector_0,
+        &connector_4,
+        &connector_5,
+        &connector_c,
+        take2_input_0,
+        take2_input_1,
+        take2_input_2,
         take2_input_3,
     );
     let take2_tx_bytes = serde_json::to_vec_pretty(&take2_tx).unwrap();
@@ -581,10 +637,10 @@ pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
         amount: assert_final_tx.tx().output[disprove_input_1_vout].value,
     };
     let disprove_tx = DisproveTransaction::new_for_validation(
-        network, 
-        &connector_5, 
-        &connector_c, 
-        disprove_input_0, 
+        network,
+        &connector_5,
+        &connector_c,
+        disprove_input_0,
         disprove_input_1,
     );
     let disprove_tx_bytes = serde_json::to_vec_pretty(&disprove_tx).unwrap();
@@ -599,27 +655,38 @@ pub(crate) fn handle_federation_presign(conf: Config) {
     println!("\nloading config...");
     let network = match_network(&conf.general.network).unwrap();
 
-    let federation_taproot_pubkey = &conf.general.federation_taproot_pubkey.expect("federation_taproot_pubkey is not provided in the configuration file");
-    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey).expect("invalid federation_taproot_pubkey");
-
-    let federation_seckeys = &conf.federation.federation_seckeys.expect("federation_seckeys not provided");
-    let federation_pubkeys: Vec<PublicKey> = federation_seckeys.iter()
+    let federation_taproot_pubkey = &conf
+        .general
+        .federation_taproot_pubkey
+        .expect("federation_taproot_pubkey is not provided in the configuration file");
+    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey)
+        .expect("invalid federation_taproot_pubkey");
+
+    let federation_seckeys = &conf
+        .federation
+        .federation_seckeys
+        .expect("federation_seckeys not provided");
+    let federation_pubkeys: Vec<PublicKey> = federation_seckeys
+        .iter()
         .map(|sec| {
-            let (_,pubkey) = generate_keys_from_secret(network, sec);
+            let (_, pubkey) = generate_keys_from_secret(network, sec);
             pubkey
         })
         .collect();
 
-    let (_,aggregated_federation_taproot_pubkey) = generate_n_of_n_public_key(&federation_pubkeys);
-    assert_eq!(aggregated_federation_taproot_pubkey, federation_taproot_pubkey, "federation_taproot_pubkey is not aggregated from federation_seckeys");
-    
-    let signer_contexts: Vec<VerifierContext> = federation_seckeys.iter()
-        .map(|sec| {
-            VerifierContext::new(network, sec, &federation_pubkeys)  
-        })
+    let (_, aggregated_federation_taproot_pubkey) = generate_n_of_n_public_key(&federation_pubkeys);
+    assert_eq!(
+        aggregated_federation_taproot_pubkey, federation_taproot_pubkey,
+        "federation_taproot_pubkey is not aggregated from federation_seckeys"
+    );
+
+    let signer_contexts: Vec<VerifierContext> = federation_seckeys
+        .iter()
+        .map(|sec| VerifierContext::new(network, sec, &federation_pubkeys))
         .collect();
 
-    'take_1: {   // take-1 pre-sign
+    'take_1: {
+        // take-1 pre-sign
         println!("\nloading take1-tx...");
         let take1_file = format!("{}{}", &conf.general.txns_dir, TAKE1_FILE_NAME);
         assert!(file_exists(&take1_file), "take-1 tx not provided");
@@ -631,27 +698,29 @@ pub(crate) fn handle_federation_presign(conf: Config) {
             break 'take_1;
         }
         println!("pre-signing take1-tx...");
-        let connector_0 = Connector0::new(
-            network,
-            &federation_taproot_pubkey,
-        );
-        let take1_sec_nonces: Vec<(&VerifierContext, HashMap<usize, SecNonce>)> = signer_contexts.iter()
-            .map(|context| {
-                (context, take1_tx.push_nonces(&context))
-            }).collect();
+        let connector_0 = Connector0::new(network, &federation_taproot_pubkey);
+        let take1_sec_nonces: Vec<(&VerifierContext, HashMap<usize, SecNonce>)> = signer_contexts
+            .iter()
+            .map(|context| (context, take1_tx.push_nonces(&context)))
+            .collect();
         for (context, sec_nonce_map) in take1_sec_nonces {
             take1_tx.pre_sign(context, &connector_0, &sec_nonce_map);
-        };
+        }
         let take1_tx_bytes = serde_json::to_vec_pretty(&take1_tx).unwrap();
         write_bytes_to_file(&take1_tx_bytes, &take1_file);
         println!("pre-signed take-1_tx was written back to {}", take1_file);
     }
 
-    'assert_final: {   // assert-final pre-sign
+    'assert_final: {
+        // assert-final pre-sign
         println!("\nloading assert-final-tx...");
         let assert_final_file = format!("{}{}", &conf.general.txns_dir, ASSERT_FINAL_FILE_NAME);
-        assert!(file_exists(&assert_final_file), "assert-final tx not provided");
-        let file = File::open(assert_final_file.clone()).expect(&format!("fail to open {:?}", assert_final_file));
+        assert!(
+            file_exists(&assert_final_file),
+            "assert-final tx not provided"
+        );
+        let file = File::open(assert_final_file.clone())
+            .expect(&format!("fail to open {:?}", assert_final_file));
         let reader = BufReader::new(file);
         let mut assert_final_tx: AssertFinalTransaction = serde_json::from_reader(reader).unwrap();
         if assert_final_tx.musig2_signatures().len() != 0 {
@@ -659,23 +728,25 @@ pub(crate) fn handle_federation_presign(conf: Config) {
             break 'assert_final;
         }
         println!("pre-signing assert-final-tx...");
-        let connector_d = ConnectorD::new(
-            network,
-            &federation_taproot_pubkey,
-        );
-        let assert_final_sec_nonces: Vec<(&VerifierContext, HashMap<usize, SecNonce>)> = signer_contexts.iter()
-            .map(|context| {
-                (context, assert_final_tx.push_nonces(&context))
-            }).collect();
+        let connector_d = ConnectorD::new(network, &federation_taproot_pubkey);
+        let assert_final_sec_nonces: Vec<(&VerifierContext, HashMap<usize, SecNonce>)> =
+            signer_contexts
+                .iter()
+                .map(|context| (context, assert_final_tx.push_nonces(&context)))
+                .collect();
         for (context, sec_nonce_map) in assert_final_sec_nonces {
             assert_final_tx.pre_sign(context, &connector_d, &sec_nonce_map);
-        };
+        }
         let assert_final_tx_bytes = serde_json::to_vec_pretty(&assert_final_tx).unwrap();
         write_bytes_to_file(&assert_final_tx_bytes, &assert_final_file);
-        println!("pre-signed assert-final-tx was written back to {}", assert_final_file);
+        println!(
+            "pre-signed assert-final-tx was written back to {}",
+            assert_final_file
+        );
     }
 
-    'take_2: {   // take-2 pre-sign
+    'take_2: {
+        // take-2 pre-sign
         println!("\nloading take2-tx...");
         let take2_file = format!("{}{}", &conf.general.txns_dir, TAKE2_FILE_NAME);
         assert!(file_exists(&take2_file), "take-2 tx not provided");
@@ -687,31 +758,27 @@ pub(crate) fn handle_federation_presign(conf: Config) {
             break 'take_2;
         }
         println!("pre-signing take2-tx...");
-        let connector_0 = Connector0::new(
-            network,
-            &federation_taproot_pubkey,
-        );
-        let connector_5 = Connector5::new(
-            network,
-            &federation_taproot_pubkey,
-        );
-        let take2_sec_nonces: Vec<(&VerifierContext, HashMap<usize, SecNonce>)> = signer_contexts.iter()
-            .map(|context| {
-                (context, take2_tx.push_nonces(&context))
-            }).collect();
+        let connector_0 = Connector0::new(network, &federation_taproot_pubkey);
+        let connector_5 = Connector5::new(network, &federation_taproot_pubkey);
+        let take2_sec_nonces: Vec<(&VerifierContext, HashMap<usize, SecNonce>)> = signer_contexts
+            .iter()
+            .map(|context| (context, take2_tx.push_nonces(&context)))
+            .collect();
         for (context, sec_nonce_map) in take2_sec_nonces {
             take2_tx.pre_sign(context, &connector_0, &connector_5, &sec_nonce_map);
-        };
+        }
         let take2_tx_bytes = serde_json::to_vec_pretty(&take2_tx).unwrap();
         write_bytes_to_file(&take2_tx_bytes, &take2_file);
         println!("pre-signed take-2-tx was written back to {}", take2_file);
     }
 
-    'disprove: {   // disprove pre-sign
+    'disprove: {
+        // disprove pre-sign
         println!("\nloading disprove-tx...");
         let disprove_file = format!("{}{}", &conf.general.txns_dir, DISPROVE_FILE_NAME);
         assert!(file_exists(&disprove_file), "disprove tx not provided");
-        let file = File::open(disprove_file.clone()).expect(&format!("fail to open {:?}", disprove_file));
+        let file =
+            File::open(disprove_file.clone()).expect(&format!("fail to open {:?}", disprove_file));
         let reader = BufReader::new(file);
         let mut disprove_tx: DisproveTransaction = serde_json::from_reader(reader).unwrap();
         if disprove_tx.musig2_signatures().len() != 0 {
@@ -719,20 +786,21 @@ pub(crate) fn handle_federation_presign(conf: Config) {
             break 'disprove;
         }
         println!("pre-signing disprove-tx...");
-        let connector_5 = Connector5::new(
-            network,
-            &federation_taproot_pubkey,
-        );
-        let disprove_sec_nonces: Vec<(&VerifierContext, HashMap<usize, SecNonce>)> = signer_contexts.iter()
-            .map(|context| {
-                (context, disprove_tx.push_nonces(&context))
-            }).collect();
+        let connector_5 = Connector5::new(network, &federation_taproot_pubkey);
+        let disprove_sec_nonces: Vec<(&VerifierContext, HashMap<usize, SecNonce>)> =
+            signer_contexts
+                .iter()
+                .map(|context| (context, disprove_tx.push_nonces(&context)))
+                .collect();
         for (context, sec_nonce_map) in disprove_sec_nonces {
             disprove_tx.pre_sign(context, &connector_5, &sec_nonce_map);
-        };
+        }
         let disprove_tx_bytes = serde_json::to_vec_pretty(&disprove_tx).unwrap();
         write_bytes_to_file(&disprove_tx_bytes, &disprove_file);
-        println!("pre-signed disprove-tx was written back to {}", disprove_file);
+        println!(
+            "pre-signed disprove-tx was written back to {}",
+            disprove_file
+        );
     }
     println!("-------------------done-------------------------");
 }
@@ -741,29 +809,51 @@ pub(crate) fn handle_operator_presign(conf: Config) {
     println!("\n--------------operator-presign---------------------");
     println!("\nloading config...");
     let network = match_network(&conf.general.network).unwrap();
-       
-    let federation_taproot_pubkey = &conf.general.federation_taproot_pubkey.expect("federation_taproot_pubkey is not provided in the configuration file");
-    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey).expect("invalid federation_taproot_pubkey");
-        
-    let federation_pubkeys = conf.general.federation_pubkeys.expect("federation_pubkeys is not provided in the configuration file");
-    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys.into_iter()
+
+    let federation_taproot_pubkey = &conf
+        .general
+        .federation_taproot_pubkey
+        .expect("federation_taproot_pubkey is not provided in the configuration file");
+    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey)
+        .expect("invalid federation_taproot_pubkey");
+
+    let federation_pubkeys = conf
+        .general
+        .federation_pubkeys
+        .expect("federation_pubkeys is not provided in the configuration file");
+    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys
+        .into_iter()
         .map(|str| PublicKey::from_str(&str).expect("invalid federation_pubkey {str}"))
         .collect();
 
-    let operator_seckey = &conf.operator.operator_seckey.expect("operator_seckey not provided");
-    let operator_pubkey = &conf.general.operator_pubkey.expect("operator_pubkey is not provided in the configuration file");
+    let operator_seckey = &conf
+        .operator
+        .operator_seckey
+        .expect("operator_seckey not provided");
+    let operator_pubkey = &conf
+        .general
+        .operator_pubkey
+        .expect("operator_pubkey is not provided in the configuration file");
     let operator_pubkey = PublicKey::from_str(operator_pubkey).expect("invalid operator_pubkey");
     let operator_taproot_pubkey = XOnlyPublicKey::from(operator_pubkey);
-    let (_,pubkey_from_sec) = generate_keys_from_secret(network, operator_seckey);
-    assert_eq!(pubkey_from_sec, operator_pubkey, "operatot_seckey & operator_pubkey not match");
+    let (_, pubkey_from_sec) = generate_keys_from_secret(network, operator_seckey);
+    assert_eq!(
+        pubkey_from_sec, operator_pubkey,
+        "operatot_seckey & operator_pubkey not match"
+    );
     let operator_context = OperatorContext::new(network, operator_seckey, &federation_pubkeys);
-    assert_eq!(operator_context.n_of_n_taproot_public_key, federation_taproot_pubkey, "federation_taproot_pubkey not aggregated from federation_pubkeys");
+    assert_eq!(
+        operator_context.n_of_n_taproot_public_key, federation_taproot_pubkey,
+        "federation_taproot_pubkey not aggregated from federation_pubkeys"
+    );
 
-    'challenge: {   // challenge pre-sign
+    'challenge: {
+        // challenge pre-sign
         println!("\nloading challenge-tx...");
         let challenge_file = format!("{}{}", &conf.general.txns_dir, CHALLENGE_FILE_NAME);
         assert!(file_exists(&challenge_file), "challenge tx not provided");
-        let file = File::open(challenge_file.clone()).expect(&format!("fail to open {:?}", challenge_file));
+        let file = File::open(challenge_file.clone())
+            .expect(&format!("fail to open {:?}", challenge_file));
         let reader = BufReader::new(file);
         let mut challenge_tx: ChallengeTransaction = serde_json::from_reader(reader).unwrap();
         if challenge_tx.tx().input[0].witness != Witness::default() {
@@ -789,30 +879,57 @@ pub(crate) fn handle_operator_sign_kickoff(conf: Config, evm_txid: [u8; 32]) {
     println!("\nloading config...");
     let network = match_network(&conf.general.network).unwrap();
 
-    let federation_taproot_pubkey = &conf.general.federation_taproot_pubkey.expect("federation_taproot_pubkey is not provided in the configuration file");
-    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey).expect("invalid federation_taproot_pubkey");
-        
-    let federation_pubkeys = conf.general.federation_pubkeys.expect("federation_pubkeys is not provided in the configuration file");
-    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys.into_iter()
+    let federation_taproot_pubkey = &conf
+        .general
+        .federation_taproot_pubkey
+        .expect("federation_taproot_pubkey is not provided in the configuration file");
+    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey)
+        .expect("invalid federation_taproot_pubkey");
+
+    let federation_pubkeys = conf
+        .general
+        .federation_pubkeys
+        .expect("federation_pubkeys is not provided in the configuration file");
+    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys
+        .into_iter()
         .map(|str| PublicKey::from_str(&str).expect("invalid federation_pubkey {str}"))
         .collect();
 
-    let operator_seckey = &conf.operator.operator_seckey.expect("operator_seckey not provided");
-    let operator_pubkey = &conf.general.operator_pubkey.expect("operator_pubkey is not provided in the configuration file");
+    let operator_seckey = &conf
+        .operator
+        .operator_seckey
+        .expect("operator_seckey not provided");
+    let operator_pubkey = &conf
+        .general
+        .operator_pubkey
+        .expect("operator_pubkey is not provided in the configuration file");
     let operator_pubkey = PublicKey::from_str(operator_pubkey).expect("invalid operator_pubkey");
     let operator_taproot_pubkey = XOnlyPublicKey::from(operator_pubkey);
-    let (_,pubkey_from_sec) = generate_keys_from_secret(network, operator_seckey);
-    assert_eq!(pubkey_from_sec, operator_pubkey, "operatot_seckey & operator_pubkey not match");
+    let (_, pubkey_from_sec) = generate_keys_from_secret(network, operator_seckey);
+    assert_eq!(
+        pubkey_from_sec, operator_pubkey,
+        "operatot_seckey & operator_pubkey not match"
+    );
     let operator_context = OperatorContext::new(network, operator_seckey, &federation_pubkeys);
-    assert_eq!(operator_context.n_of_n_taproot_public_key, federation_taproot_pubkey, "federation_taproot_pubkey not aggregated from federation_pubkeys");
+    assert_eq!(
+        operator_context.n_of_n_taproot_public_key, federation_taproot_pubkey,
+        "federation_taproot_pubkey not aggregated from federation_pubkeys"
+    );
 
     println!("loading operator wots public-keys...");
-    assert!(file_exists(&conf.general.operator_wots_pubkey_file), "operator wots public key not provided");
+    assert!(
+        file_exists(&conf.general.operator_wots_pubkey_file),
+        "operator wots public key not provided"
+    );
     let operator_wots_pubkeys = load_wots_pubkeys(&conf.general.operator_wots_pubkey_file);
-    let kickoff_wots_commitment_keys = CommitmentMessageId::pubkey_map_for_kickoff(&operator_wots_pubkeys.0);
+    let kickoff_wots_commitment_keys =
+        CommitmentMessageId::pubkey_map_for_kickoff(&operator_wots_pubkeys.0);
 
     println!("loading operator wots secret keys ...");
-    assert!(file_exists(&conf.operator.operator_wots_seckey_file), "operator_wots_seckey_file not provided");
+    assert!(
+        file_exists(&conf.operator.operator_wots_seckey_file),
+        "operator_wots_seckey_file not provided"
+    );
     let wots_sec = load_wots_seckeys(&conf.operator.operator_wots_seckey_file);
 
     println!("loading kickoff-tx...");
@@ -832,13 +949,10 @@ pub(crate) fn handle_operator_sign_kickoff(conf: Config, evm_txid: [u8; 32]) {
         message: &evm_txid.to_vec(),
         signing_key: &wots_sec.0[0],
     };
-    kickoff_tx.sign(
-        &operator_context, 
-        &connector_6, 
-        &evm_txid_inputs,
-    );
+    kickoff_tx.sign(&operator_context, &connector_6, &evm_txid_inputs);
 
-    let signed_kickoff_tx_bytes =  serde_json::to_vec_pretty(&SignedTransaction::new(kickoff_tx.finalize())).unwrap();
+    let signed_kickoff_tx_bytes =
+        serde_json::to_vec_pretty(&SignedTransaction::new(kickoff_tx.finalize())).unwrap();
     let signed_kickoff_tx_file = format!("{}{}", &conf.general.signed_txns_dir, KICKOFF_FILE_NAME);
     write_bytes_to_file(&signed_kickoff_tx_bytes, &signed_kickoff_tx_file);
     println!("signed kickoff_tx written to {}", signed_kickoff_tx_file);
@@ -850,22 +964,42 @@ pub(crate) fn handle_operator_sign_take1(conf: Config) {
     println!("\nloading config...");
     let network = match_network(&conf.general.network).unwrap();
 
-    let federation_taproot_pubkey = &conf.general.federation_taproot_pubkey.expect("federation_taproot_pubkey is not provided in the configuration file");
-    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey).expect("invalid federation_taproot_pubkey");
-        
-    let federation_pubkeys = conf.general.federation_pubkeys.expect("federation_pubkeys is not provided in the configuration file");
-    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys.into_iter()
+    let federation_taproot_pubkey = &conf
+        .general
+        .federation_taproot_pubkey
+        .expect("federation_taproot_pubkey is not provided in the configuration file");
+    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey)
+        .expect("invalid federation_taproot_pubkey");
+
+    let federation_pubkeys = conf
+        .general
+        .federation_pubkeys
+        .expect("federation_pubkeys is not provided in the configuration file");
+    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys
+        .into_iter()
         .map(|str| PublicKey::from_str(&str).expect("invalid federation_pubkey {str}"))
         .collect();
 
-    let operator_seckey = &conf.operator.operator_seckey.expect("operator_seckey not provided");
-    let operator_pubkey = &conf.general.operator_pubkey.expect("operator_pubkey is not provided in the configuration file");
+    let operator_seckey = &conf
+        .operator
+        .operator_seckey
+        .expect("operator_seckey not provided");
+    let operator_pubkey = &conf
+        .general
+        .operator_pubkey
+        .expect("operator_pubkey is not provided in the configuration file");
     let operator_pubkey = PublicKey::from_str(operator_pubkey).expect("invalid operator_pubkey");
     let operator_taproot_pubkey = XOnlyPublicKey::from(operator_pubkey);
-    let (_,pubkey_from_sec) = generate_keys_from_secret(network, operator_seckey);
-    assert_eq!(pubkey_from_sec, operator_pubkey, "operatot_seckey & operator_pubkey not match");
+    let (_, pubkey_from_sec) = generate_keys_from_secret(network, operator_seckey);
+    assert_eq!(
+        pubkey_from_sec, operator_pubkey,
+        "operatot_seckey & operator_pubkey not match"
+    );
     let operator_context = OperatorContext::new(network, operator_seckey, &federation_pubkeys);
-    assert_eq!(operator_context.n_of_n_taproot_public_key, federation_taproot_pubkey, "federation_taproot_pubkey not aggregated from federation_pubkeys");
+    assert_eq!(
+        operator_context.n_of_n_taproot_public_key, federation_taproot_pubkey,
+        "federation_taproot_pubkey not aggregated from federation_pubkeys"
+    );
 
     println!("loading take1-tx...");
     let take1_file = format!("{}{}", &conf.general.txns_dir, TAKE1_FILE_NAME);
@@ -873,7 +1007,10 @@ pub(crate) fn handle_operator_sign_take1(conf: Config) {
     let file = File::open(take1_file.clone()).expect(&format!("fail to open {:?}", take1_file));
     let reader = BufReader::new(file);
     let mut take1_tx: Take1Transaction = serde_json::from_reader(reader).unwrap();
-    assert!(take1_tx.tx().input[0].witness != Witness::default(), "take_1 not presigned");
+    assert!(
+        take1_tx.tx().input[0].witness != Witness::default(),
+        "take_1 not presigned"
+    );
 
     println!("signing take1-tx...");
     let connector_a = ConnectorA::new(
@@ -881,15 +1018,11 @@ pub(crate) fn handle_operator_sign_take1(conf: Config) {
         &operator_taproot_pubkey,
         &federation_taproot_pubkey,
     );
-    take1_tx.sign_input_1(
-        &operator_context, 
-        &connector_a,
-    );
-    take1_tx.sign_input_2(
-        &operator_context,
-    );
+    take1_tx.sign_input_1(&operator_context, &connector_a);
+    take1_tx.sign_input_2(&operator_context);
 
-    let signed_take1_tx_bytes =  serde_json::to_vec_pretty(&SignedTransaction::new(take1_tx.finalize())).unwrap();
+    let signed_take1_tx_bytes =
+        serde_json::to_vec_pretty(&SignedTransaction::new(take1_tx.finalize())).unwrap();
     let signed_take1_tx_file = format!("{}{}", &conf.general.signed_txns_dir, TAKE1_FILE_NAME);
     write_bytes_to_file(&signed_take1_tx_bytes, &signed_take1_tx_file);
     println!("take1_tx was written to {}", signed_take1_tx_file);
@@ -901,98 +1034,153 @@ pub(crate) fn handle_operator_sign_assert(conf: Config) {
     println!("\nloading config...");
     let network = match_network(&conf.general.network).unwrap();
 
-    let federation_taproot_pubkey = &conf.general.federation_taproot_pubkey.expect("federation_taproot_pubkey is not provided in the configuration file");
-    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey).expect("invalid federation_taproot_pubkey");
-        
-    let federation_pubkeys = conf.general.federation_pubkeys.expect("federation_pubkeys is not provided in the configuration file");
-    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys.into_iter()
+    let federation_taproot_pubkey = &conf
+        .general
+        .federation_taproot_pubkey
+        .expect("federation_taproot_pubkey is not provided in the configuration file");
+    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey)
+        .expect("invalid federation_taproot_pubkey");
+
+    let federation_pubkeys = conf
+        .general
+        .federation_pubkeys
+        .expect("federation_pubkeys is not provided in the configuration file");
+    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys
+        .into_iter()
         .map(|str| PublicKey::from_str(&str).expect("invalid federation_pubkey {str}"))
         .collect();
 
-    let operator_seckey = &conf.operator.operator_seckey.expect("operator_seckey not provided");
-    let operator_pubkey = &conf.general.operator_pubkey.expect("operator_pubkey is not provided in the configuration file");
+    let operator_seckey = &conf
+        .operator
+        .operator_seckey
+        .expect("operator_seckey not provided");
+    let operator_pubkey = &conf
+        .general
+        .operator_pubkey
+        .expect("operator_pubkey is not provided in the configuration file");
     let operator_pubkey = PublicKey::from_str(operator_pubkey).expect("invalid operator_pubkey");
     let operator_taproot_pubkey = XOnlyPublicKey::from(operator_pubkey);
-    let (_,pubkey_from_sec) = generate_keys_from_secret(network, operator_seckey);
-    assert_eq!(pubkey_from_sec, operator_pubkey, "operatot_seckey & operator_pubkey not match");
+    let (_, pubkey_from_sec) = generate_keys_from_secret(network, operator_seckey);
+    assert_eq!(
+        pubkey_from_sec, operator_pubkey,
+        "operatot_seckey & operator_pubkey not match"
+    );
     let operator_context = OperatorContext::new(network, operator_seckey, &federation_pubkeys);
-    assert_eq!(operator_context.n_of_n_taproot_public_key, federation_taproot_pubkey, "federation_taproot_pubkey not aggregated from federation_pubkeys");
+    assert_eq!(
+        operator_context.n_of_n_taproot_public_key, federation_taproot_pubkey,
+        "federation_taproot_pubkey not aggregated from federation_pubkeys"
+    );
 
     println!("loading operator wots public-keys...");
-    assert!(file_exists(&conf.general.operator_wots_pubkey_file), "operator wots public key not provided");
+    assert!(
+        file_exists(&conf.general.operator_wots_pubkey_file),
+        "operator wots public key not provided"
+    );
     let operator_wots_pubkeys = load_wots_pubkeys(&conf.general.operator_wots_pubkey_file);
     let assert_wots_pubkeys = &operator_wots_pubkeys.1;
 
     println!("loading proof signatures ...");
-    assert!(file_exists(&conf.general.proof_file), "proof-sigs not provided");
+    assert!(
+        file_exists(&conf.general.proof_file),
+        "proof-sigs not provided"
+    );
     let proof_sigs = load_signed_assertions_from_file(&conf.general.signed_assertions_file);
     let assert_commit_witness = utils_raw_witnesses_from_signatures(&proof_sigs);
 
-    {   // assert-inital
+    {
+        // assert-inital
         println!("\nloading assert-inital-tx...");
         let assert_init_file = format!("{}{}", &conf.general.txns_dir, ASSERT_INIT_FILE_NAME);
-        assert!(file_exists(&assert_init_file), "assert_init_file tx not provided");
-        let file = File::open(assert_init_file.clone()).expect(&format!("fail to open {:?}", assert_init_file));
+        assert!(
+            file_exists(&assert_init_file),
+            "assert_init_file tx not provided"
+        );
+        let file = File::open(assert_init_file.clone())
+            .expect(&format!("fail to open {:?}", assert_init_file));
         let reader = BufReader::new(file);
         let mut assert_init_tx: AssertInitialTransaction = serde_json::from_reader(reader).unwrap();
         println!("signing assert-inital-tx...");
-        let connector_b = ConnectorB::new(
-            network,
-            &operator_taproot_pubkey,
-        );
-        assert_init_tx.sign_input_0(
-            &operator_context, 
-            &connector_b,
-        );
-    
-        let signed_assert_init_tx_bytes =  serde_json::to_vec_pretty(&SignedTransaction::new(assert_init_tx.finalize())).unwrap();
-        let signed_assert_init_tx_file = format!("{}{}", &conf.general.signed_txns_dir, ASSERT_INIT_FILE_NAME);
+        let connector_b = ConnectorB::new(network, &operator_taproot_pubkey);
+        assert_init_tx.sign_input_0(&operator_context, &connector_b);
+
+        let signed_assert_init_tx_bytes =
+            serde_json::to_vec_pretty(&SignedTransaction::new(assert_init_tx.finalize())).unwrap();
+        let signed_assert_init_tx_file =
+            format!("{}{}", &conf.general.signed_txns_dir, ASSERT_INIT_FILE_NAME);
         write_bytes_to_file(&signed_assert_init_tx_bytes, &signed_assert_init_tx_file);
-        println!("assert_init_tx was written to {}", signed_assert_init_tx_file);
+        println!(
+            "assert_init_tx was written to {}",
+            signed_assert_init_tx_file
+        );
     }
 
-    {   // assert-commit
+    {
+        // assert-commit
         println!("\nloading assert-commit-txns...");
         let assert_commit_file = format!("{}{}", &conf.general.txns_dir, ASSERT_COMMIT_FILE_NAME);
-        assert!(file_exists(&assert_commit_file), "assert_commit_file tx not provided");
-        let file = File::open(assert_commit_file.clone()).expect(&format!("fail to open {:?}", assert_commit_file));
+        assert!(
+            file_exists(&assert_commit_file),
+            "assert_commit_file tx not provided"
+        );
+        let file = File::open(assert_commit_file.clone())
+            .expect(&format!("fail to open {:?}", assert_commit_file));
         let reader = BufReader::new(file);
-        let mut assert_commit_txns: AssertCommitTransactionSet = serde_json::from_reader(reader).unwrap();
+        let mut assert_commit_txns: AssertCommitTransactionSet =
+            serde_json::from_reader(reader).unwrap();
         println!("signing assert-commit-tx...");
-        let all_assert_commit_connectors_e = AllCommitConnectorsE::new(
-            network,
-            &operator_pubkey,
-            &assert_wots_pubkeys,
+        let all_assert_commit_connectors_e =
+            AllCommitConnectorsE::new(network, &operator_pubkey, &assert_wots_pubkeys);
+        assert_commit_txns.sign(&all_assert_commit_connectors_e, assert_commit_witness);
+        let pure_txns: Vec<SignedTransaction> = assert_commit_txns
+            .commit_txns
+            .iter()
+            .map(|tx| SignedTransaction::new(tx.finalize()))
+            .collect();
+        let signed_assert_commit_txns_bytes = serde_json::to_vec_pretty(&pure_txns).unwrap();
+        let signed_assert_commit_txns_file = format!(
+            "{}{}",
+            &conf.general.signed_txns_dir, ASSERT_COMMIT_FILE_NAME
         );
-        assert_commit_txns.sign(
-            &all_assert_commit_connectors_e, 
-            assert_commit_witness,
+        write_bytes_to_file(
+            &signed_assert_commit_txns_bytes,
+            &signed_assert_commit_txns_file,
+        );
+        println!(
+            "assert_commit_txns was written to {}",
+            signed_assert_commit_txns_file
         );
-        let pure_txns: Vec<SignedTransaction> = assert_commit_txns.commit_txns.iter()
-            .map(|tx| {
-                SignedTransaction::new(tx.finalize())
-            }).collect();
-        let signed_assert_commit_txns_bytes =  serde_json::to_vec_pretty(&pure_txns).unwrap();
-        let signed_assert_commit_txns_file = format!("{}{}", &conf.general.signed_txns_dir, ASSERT_COMMIT_FILE_NAME);
-        write_bytes_to_file(&signed_assert_commit_txns_bytes, &signed_assert_commit_txns_file);
-        println!("assert_commit_txns was written to {}", signed_assert_commit_txns_file);
     }
 
-    {   // assert-final
+    {
+        // assert-final
         println!("\nloading assert-final-tx...");
         let assert_final_file = format!("{}{}", &conf.general.txns_dir, ASSERT_FINAL_FILE_NAME);
-        assert!(file_exists(&assert_final_file), "assert_final_file tx not provided");
-        let file = File::open(assert_final_file.clone()).expect(&format!("fail to open {:?}", assert_final_file));
+        assert!(
+            file_exists(&assert_final_file),
+            "assert_final_file tx not provided"
+        );
+        let file = File::open(assert_final_file.clone())
+            .expect(&format!("fail to open {:?}", assert_final_file));
         let reader = BufReader::new(file);
         let mut assert_final_tx: AssertFinalTransaction = serde_json::from_reader(reader).unwrap();
-        assert!(assert_final_tx.tx().input[0].witness != Witness::default(), "assert_final_tx not pre-signed");
+        assert!(
+            assert_final_tx.tx().input[0].witness != Witness::default(),
+            "assert_final_tx not pre-signed"
+        );
         println!("signing assert-final-tx...");
         assert_final_tx.sign_commit_inputs(&operator_context);
 
-        let signed_assert_final_tx_bytes =  serde_json::to_vec_pretty(&SignedTransaction::new(assert_final_tx.finalize())).unwrap();
-        let signed_assert_final_tx_file = format!("{}{}", &conf.general.signed_txns_dir, ASSERT_FINAL_FILE_NAME);
+        let signed_assert_final_tx_bytes =
+            serde_json::to_vec_pretty(&SignedTransaction::new(assert_final_tx.finalize())).unwrap();
+        let signed_assert_final_tx_file = format!(
+            "{}{}",
+            &conf.general.signed_txns_dir, ASSERT_FINAL_FILE_NAME
+        );
         write_bytes_to_file(&signed_assert_final_tx_bytes, &signed_assert_final_tx_file);
-        println!("assert_final_tx was written to {}", signed_assert_final_tx_file);
+        println!(
+            "assert_final_tx was written to {}",
+            signed_assert_final_tx_file
+        );
     }
     println!("-------------------done-------------------------");
 }
@@ -1002,28 +1190,52 @@ pub(crate) fn handle_operator_sign_take2(conf: Config) {
     println!("\nloading config...");
     let network = match_network(&conf.general.network).unwrap();
 
-    let federation_taproot_pubkey = &conf.general.federation_taproot_pubkey.expect("federation_taproot_pubkey is not provided in the configuration file");
-    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey).expect("invalid federation_taproot_pubkey");
-        
-    let federation_pubkeys = conf.general.federation_pubkeys.expect("federation_pubkeys is not provided in the configuration file");
-    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys.into_iter()
+    let federation_taproot_pubkey = &conf
+        .general
+        .federation_taproot_pubkey
+        .expect("federation_taproot_pubkey is not provided in the configuration file");
+    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey)
+        .expect("invalid federation_taproot_pubkey");
+
+    let federation_pubkeys = conf
+        .general
+        .federation_pubkeys
+        .expect("federation_pubkeys is not provided in the configuration file");
+    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys
+        .into_iter()
         .map(|str| PublicKey::from_str(&str).expect("invalid federation_pubkey {str}"))
         .collect();
 
-    let operator_seckey = &conf.operator.operator_seckey.expect("operator_seckey not provided");
-    let operator_pubkey = &conf.general.operator_pubkey.expect("operator_pubkey is not provided in the configuration file");
+    let operator_seckey = &conf
+        .operator
+        .operator_seckey
+        .expect("operator_seckey not provided");
+    let operator_pubkey = &conf
+        .general
+        .operator_pubkey
+        .expect("operator_pubkey is not provided in the configuration file");
     let operator_pubkey = PublicKey::from_str(operator_pubkey).expect("invalid operator_pubkey");
     let operator_taproot_pubkey = XOnlyPublicKey::from(operator_pubkey);
-    let (_,pubkey_from_sec) = generate_keys_from_secret(network, operator_seckey);
-    assert_eq!(pubkey_from_sec, operator_pubkey, "operatot_seckey & operator_pubkey not match");
+    let (_, pubkey_from_sec) = generate_keys_from_secret(network, operator_seckey);
+    assert_eq!(
+        pubkey_from_sec, operator_pubkey,
+        "operatot_seckey & operator_pubkey not match"
+    );
     let operator_context = OperatorContext::new(network, operator_seckey, &federation_pubkeys);
-    assert_eq!(operator_context.n_of_n_taproot_public_key, federation_taproot_pubkey, "federation_taproot_pubkey not aggregated from federation_pubkeys");
+    assert_eq!(
+        operator_context.n_of_n_taproot_public_key, federation_taproot_pubkey,
+        "federation_taproot_pubkey not aggregated from federation_pubkeys"
+    );
 
     println!("loading operator wots public-keys...");
-    assert!(file_exists(&conf.general.operator_wots_pubkey_file), "operator wots public key not provided");
+    assert!(
+        file_exists(&conf.general.operator_wots_pubkey_file),
+        "operator wots public key not provided"
+    );
     let operator_wots_pubkeys = load_wots_pubkeys(&conf.general.operator_wots_pubkey_file);
     let assert_wots_pubkeys = &operator_wots_pubkeys.1;
-    let assert_wots_commitment_keys = convert_to_connector_c_commits_public_key(assert_wots_pubkeys);
+    let assert_wots_commitment_keys =
+        convert_to_connector_c_commits_public_key(assert_wots_pubkeys);
 
     println!("\nloading take2-tx...");
     let take2_file = format!("{}{}", &conf.general.txns_dir, TAKE2_FILE_NAME);
@@ -1031,14 +1243,21 @@ pub(crate) fn handle_operator_sign_take2(conf: Config) {
     let file = File::open(take2_file.clone()).expect(&format!("fail to open {:?}", take2_file));
     let reader = BufReader::new(file);
     let mut take2_tx: Take2Transaction = serde_json::from_reader(reader).unwrap();
-    assert!(take2_tx.tx().input[0].witness != Witness::default(), "take2_tx not pre-signed");
-    assert!(take2_tx.tx().input[2].witness != Witness::default(), "take2_tx not pre-signed");
-    println!("signing take2-tx...");
-    take2_tx.sign_input_1(
-        &operator_context,
+    assert!(
+        take2_tx.tx().input[0].witness != Witness::default(),
+        "take2_tx not pre-signed"
     );
+    assert!(
+        take2_tx.tx().input[2].witness != Witness::default(),
+        "take2_tx not pre-signed"
+    );
+    println!("signing take2-tx...");
+    take2_tx.sign_input_1(&operator_context);
     println!("loading disprove scripts...");
-    assert!(file_exists(&conf.general.disprove_scripts_file), "disprove scripts not provided");
+    assert!(
+        file_exists(&conf.general.disprove_scripts_file),
+        "disprove scripts not provided"
+    );
     let disprove_scripts_bytes = load_scripts_bytes_from_file(&conf.general.disprove_scripts_file);
     let connector_c = ConnectorC::new_from_scripts(
         network,
@@ -1046,60 +1265,93 @@ pub(crate) fn handle_operator_sign_take2(conf: Config) {
         assert_wots_commitment_keys,
         disprove_scripts_bytes,
     );
-    take2_tx.sign_input_3(
-        &operator_context, 
-        &connector_c,
-    );
+    take2_tx.sign_input_3(&operator_context, &connector_c);
 
-    let signed_take2_tx_bytes =  serde_json::to_vec_pretty(&SignedTransaction::new(take2_tx.finalize())).unwrap();
+    let signed_take2_tx_bytes =
+        serde_json::to_vec_pretty(&SignedTransaction::new(take2_tx.finalize())).unwrap();
     let signed_take2_tx_file = format!("{}{}", &conf.general.signed_txns_dir, TAKE2_FILE_NAME);
     write_bytes_to_file(&signed_take2_tx_bytes, &signed_take2_tx_file);
     println!("take2_tx was written to {}", signed_take2_tx_file);
     println!("-------------------done-------------------------");
 }
 
-pub(crate) fn handle_challenger_sign_disprove(conf: Config, reward_address: Address) { 
+pub(crate) fn handle_challenger_sign_disprove(conf: Config, reward_address: Address) {
     println!("\n----------------sign-disprove---------------------");
     println!("\nloading config...");
     let network = match_network(&conf.general.network).unwrap();
 
-    let federation_taproot_pubkey = &conf.general.federation_taproot_pubkey.expect("federation_taproot_pubkey is not provided in the configuration file");
-    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey).expect("invalid federation_taproot_pubkey");
-        
-    let federation_pubkeys = conf.general.federation_pubkeys.expect("federation_pubkeys is not provided in the configuration file");
-    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys.into_iter()
+    let federation_taproot_pubkey = &conf
+        .general
+        .federation_taproot_pubkey
+        .expect("federation_taproot_pubkey is not provided in the configuration file");
+    let federation_taproot_pubkey = XOnlyPublicKey::from_str(federation_taproot_pubkey)
+        .expect("invalid federation_taproot_pubkey");
+
+    let federation_pubkeys = conf
+        .general
+        .federation_pubkeys
+        .expect("federation_pubkeys is not provided in the configuration file");
+    let federation_pubkeys: Vec<PublicKey> = federation_pubkeys
+        .into_iter()
         .map(|str| PublicKey::from_str(&str).expect("invalid federation_pubkey {str}"))
         .collect();
 
-    let operator_seckey = &conf.operator.operator_seckey.expect("operator_seckey not provided");
-    let operator_pubkey = &conf.general.operator_pubkey.expect("operator_pubkey is not provided in the configuration file");
+    let operator_seckey = &conf
+        .operator
+        .operator_seckey
+        .expect("operator_seckey not provided");
+    let operator_pubkey = &conf
+        .general
+        .operator_pubkey
+        .expect("operator_pubkey is not provided in the configuration file");
     let operator_pubkey = PublicKey::from_str(operator_pubkey).expect("invalid operator_pubkey");
     let operator_taproot_pubkey = XOnlyPublicKey::from(operator_pubkey);
-    let (_,pubkey_from_sec) = generate_keys_from_secret(network, operator_seckey);
-    assert_eq!(pubkey_from_sec, operator_pubkey, "operatot_seckey & operator_pubkey not match");
+    let (_, pubkey_from_sec) = generate_keys_from_secret(network, operator_seckey);
+    assert_eq!(
+        pubkey_from_sec, operator_pubkey,
+        "operatot_seckey & operator_pubkey not match"
+    );
     let operator_context = OperatorContext::new(network, operator_seckey, &federation_pubkeys);
-    assert_eq!(operator_context.n_of_n_taproot_public_key, federation_taproot_pubkey, "federation_taproot_pubkey not aggregated from federation_pubkeys");
+    assert_eq!(
+        operator_context.n_of_n_taproot_public_key, federation_taproot_pubkey,
+        "federation_taproot_pubkey not aggregated from federation_pubkeys"
+    );
 
     println!("loading operator wots public-keys...");
-    assert!(file_exists(&conf.general.operator_wots_pubkey_file), "operator wots public key not provided");
+    assert!(
+        file_exists(&conf.general.operator_wots_pubkey_file),
+        "operator wots public key not provided"
+    );
     let operator_wots_pubkeys = load_wots_pubkeys(&conf.general.operator_wots_pubkey_file);
     let assert_wots_pubkeys = &operator_wots_pubkeys.1;
-    let assert_wots_commitment_keys = convert_to_connector_c_commits_public_key(assert_wots_pubkeys);
+    let assert_wots_commitment_keys =
+        convert_to_connector_c_commits_public_key(assert_wots_pubkeys);
 
     println!("loading disprove witness...");
-    assert!(file_exists(&conf.challenger.disprove_witness_file), "disprove witness not provided, please verify proof first");
-    let (input_script_index, input_script_witness) = load_disprove_witness(&conf.challenger.disprove_witness_file);
+    assert!(
+        file_exists(&conf.challenger.disprove_witness_file),
+        "disprove witness not provided, please verify proof first"
+    );
+    let (input_script_index, input_script_witness) =
+        load_disprove_witness(&conf.challenger.disprove_witness_file);
 
     println!("\nloading disprove-tx...");
     let disprove_file = format!("{}{}", &conf.general.txns_dir, DISPROVE_FILE_NAME);
     assert!(file_exists(&disprove_file), "disprove_file tx not provided");
-    let file = File::open(disprove_file.clone()).expect(&format!("fail to open {:?}", disprove_file));
+    let file =
+        File::open(disprove_file.clone()).expect(&format!("fail to open {:?}", disprove_file));
     let reader = BufReader::new(file);
     let mut disprove_tx: DisproveTransaction = serde_json::from_reader(reader).unwrap();
-    assert!(disprove_tx.tx().input[0].witness != Witness::default(), "disprove_tx not pre-signed");
+    assert!(
+        disprove_tx.tx().input[0].witness != Witness::default(),
+        "disprove_tx not pre-signed"
+    );
     println!("signing disprove-tx...");
     println!("loading disprove scripts...");
-    assert!(file_exists(&conf.general.disprove_scripts_file), "disprove scripts not provided");
+    assert!(
+        file_exists(&conf.general.disprove_scripts_file),
+        "disprove scripts not provided"
+    );
     let disprove_scripts_bytes = load_scripts_bytes_from_file(&conf.general.disprove_scripts_file);
 
     let connector_c = ConnectorC::new_from_scripts(
@@ -1109,15 +1361,17 @@ pub(crate) fn handle_challenger_sign_disprove(conf: Config, reward_address: Addr
         disprove_scripts_bytes,
     );
     disprove_tx.add_input_output(
-        &connector_c, 
-        input_script_index as u32, 
+        &connector_c,
+        input_script_index as u32,
         script_to_witness(input_script_witness),
         reward_address.script_pubkey(),
-        1.0
+        1.0,
     );
 
-    let signed_disprove_tx_bytes =  serde_json::to_vec_pretty(&SignedTransaction::new(disprove_tx.finalize())).unwrap();
-    let signed_disprove_tx_file = format!("{}{}", &conf.general.signed_txns_dir, DISPROVE_FILE_NAME);
+    let signed_disprove_tx_bytes =
+        serde_json::to_vec_pretty(&SignedTransaction::new(disprove_tx.finalize())).unwrap();
+    let signed_disprove_tx_file =
+        format!("{}{}", &conf.general.signed_txns_dir, DISPROVE_FILE_NAME);
     write_bytes_to_file(&signed_disprove_tx_bytes, &signed_disprove_tx_file);
     println!("disprove_tx was written to {}", signed_disprove_tx_file);
     println!("-------------------done-------------------------");
@@ -1130,12 +1384,12 @@ pub(crate) fn secrets_to_pubkeys(secrets: &WotsSecretKeys) -> WotsPublicKeys {
     }
     let mut fq_arr = vec![];
     for i in 0..NUM_U256 {
-        let p256 = wots256::generate_public_key(&secrets.1[i+NUM_PUBS]);
+        let p256 = wots256::generate_public_key(&secrets.1[i + NUM_PUBS]);
         fq_arr.push(p256);
     }
     let mut h_arr = vec![];
     for i in 0..NUM_HASH {
-        let p160 = wots_hash::generate_public_key(&secrets.1[i+NUM_PUBS+NUM_U256]);
+        let p160 = wots_hash::generate_public_key(&secrets.1[i + NUM_PUBS + NUM_U256]);
         h_arr.push(p160);
     }
     let g16_wotspubkey: Groth16WotsPublicKeys = (
@@ -1150,21 +1404,24 @@ pub(crate) fn secrets_to_pubkeys(secrets: &WotsSecretKeys) -> WotsPublicKeys {
     }
 
     (
-        kickoff_wotspubkey.try_into().unwrap_or_else(|_e| panic!("kickoff bitcom key number not match")), 
+        kickoff_wotspubkey
+            .try_into()
+            .unwrap_or_else(|_e| panic!("kickoff bitcom key number not match")),
         g16_wotspubkey,
     )
 }
 pub(crate) fn seed_to_secrets(seed: &str) -> WotsSecretKeys {
     let seed_hash = sha256(seed);
-    let g16_wotsseckey = (0..NUM_PUBS+NUM_U256+NUM_HASH)
+    let g16_wotsseckey = (0..NUM_PUBS + NUM_U256 + NUM_HASH)
         .map(|idx| {
             let sec_i = sha256_with_id(&seed_hash, 1);
             let sec_i = sha256_with_id(&sec_i, idx);
             format!("{sec_i}{:04x}{:04x}", 1, idx)
         })
         .collect::<Vec<String>>()
-        .try_into().unwrap();
-    
+        .try_into()
+        .unwrap();
+
     let kickoff_wotsseckey = (0..NUM_KICKOFF)
         .map(|idx| {
             let sec_i = sha256_with_id(&seed_hash, 0);
@@ -1174,7 +1431,8 @@ pub(crate) fn seed_to_secrets(seed: &str) -> WotsSecretKeys {
             WinternitzSecret::from_string(&sec_str, &parameters)
         })
         .collect::<Vec<WinternitzSecret>>()
-        .try_into().unwrap_or_else(|_e| panic!("kickoff bitcom key number not match"));
+        .try_into()
+        .unwrap_or_else(|_e| panic!("kickoff bitcom key number not match"));
     (kickoff_wotsseckey, g16_wotsseckey)
 }
 fn sha256(input: &str) -> String {
@@ -1189,7 +1447,11 @@ fn sha256_with_id(input: &str, idx: usize) -> String {
 }
 
 #[allow(dead_code)]
-pub(crate) fn corrupt(proof_sigs: &mut Groth16WotsSignatures, wots_sec: &Groth16WotsSecretKeys, index: usize) {
+pub(crate) fn corrupt(
+    proof_sigs: &mut Groth16WotsSignatures,
+    wots_sec: &Groth16WotsSecretKeys,
+    index: usize,
+) {
     let mut scramble: [u8; 32] = [1u8; 32];
     scramble[16] = 37;
     let mut scramble2: [u8; HASH_LEN as usize] = [1u8; HASH_LEN as usize];
diff --git a/goat/src/bin/goat-bridge/main.rs b/goat/src/bin/goat-bridge/main.rs
index bf46eb5a..a75387b5 100644
--- a/goat/src/bin/goat-bridge/main.rs
+++ b/goat/src/bin/goat-bridge/main.rs
@@ -3,14 +3,18 @@ pub mod config;
 pub mod files;
 pub mod handles;
 
-use core::str::FromStr;
-use bitcoin::{OutPoint, Txid, Amount, Address};
+use bitcoin::{Address, Amount, OutPoint, Txid};
 use clap::{arg, command, Parser};
 use commands::Commands;
 use config::{load_config, match_network};
+use core::str::FromStr;
 use goat::transactions::base::Input;
 use handles::{
-    handle_challenger_sign_disprove, handle_federation_presign, handle_generate_bitvm_instance, handle_generate_disprove_scripts, handle_generate_pegin_tx, handle_generate_prekickoff_tx, handle_generate_wots_keys, handle_operator_presign, handle_operator_sign_assert, handle_operator_sign_kickoff, handle_operator_sign_take1, handle_operator_sign_take2, handle_sign_proof, handle_verify_proof
+    handle_challenger_sign_disprove, handle_federation_presign, handle_generate_bitvm_instance,
+    handle_generate_disprove_scripts, handle_generate_pegin_tx, handle_generate_prekickoff_tx,
+    handle_generate_wots_keys, handle_operator_presign, handle_operator_sign_assert,
+    handle_operator_sign_kickoff, handle_operator_sign_take1, handle_operator_sign_take2,
+    handle_sign_proof, handle_verify_proof,
 };
 
 #[derive(Parser)]
@@ -24,7 +28,6 @@ struct Cli {
     command: Commands,
 }
 
-
 #[derive(Debug)]
 struct TxInputValue(Txid, u32, u64);
 
@@ -37,9 +40,15 @@ impl FromStr for TxInputValue {
             return Err(format!("invalid format: `{s}`,should be `string:u32:u64`"));
         }
 
-        let txid = parts[0].parse::<Txid>().map_err(|e| format!("fail to parse input.txid: `{}`: {:?}", parts[0], e))?;
-        let vout = parts[1].parse::<u32>().map_err(|e| format!("fail to parse input.vout: `{}`: {:?}", parts[1], e))?;
-        let amount = parts[2].parse::<u64>().map_err(|e| format!("fail to parse input.amount: `{}`: {:?}", parts[2], e))?;
+        let txid = parts[0]
+            .parse::<Txid>()
+            .map_err(|e| format!("fail to parse input.txid: `{}`: {:?}", parts[0], e))?;
+        let vout = parts[1]
+            .parse::<u32>()
+            .map_err(|e| format!("fail to parse input.vout: `{}`: {:?}", parts[1], e))?;
+        let amount = parts[2]
+            .parse::<u64>()
+            .map_err(|e| format!("fail to parse input.amount: `{}`: {:?}", parts[2], e))?;
 
         Ok(TxInputValue(txid, vout, amount))
     }
@@ -50,80 +59,109 @@ async fn main() {
     let cli = Cli::parse();
 
     match &cli.command {
-        Commands::GenerateDisproveScripts{} => { 
+        Commands::GenerateDisproveScripts {} => {
             let conf = load_config(&cli.config_file);
             handle_generate_disprove_scripts(conf);
-        },
-        Commands::GenerateWotsKeys {secret_seed} => {
+        }
+        Commands::GenerateWotsKeys { secret_seed } => {
             let conf = load_config(&cli.config_file);
             handle_generate_wots_keys(conf, secret_seed);
-        },
-        Commands::SignProof {skip_validation} => {
+        }
+        Commands::SignProof { skip_validation } => {
             let conf = load_config(&cli.config_file);
             handle_sign_proof(conf, *skip_validation);
-        },
-        Commands::VerifyProof{} => {
+        }
+        Commands::VerifyProof {} => {
             let conf = load_config(&cli.config_file);
             handle_verify_proof(conf);
-        },
-        Commands::GeneratePeginTx { tx_inputs, deposit_amount, fee_amount, change_address } => {
+        }
+        Commands::GeneratePeginTx {
+            tx_inputs,
+            deposit_amount,
+            fee_amount,
+            change_address,
+        } => {
             let conf = load_config(&cli.config_file);
             let network = match_network(&conf.general.network).unwrap();
-            let inputs = tx_inputs.iter()
+            let inputs = tx_inputs
+                .iter()
                 .map(|input| {
                     let txin = TxInputValue::from_str(input).expect("fail to parse tx inputs");
                     Input {
-                        outpoint: OutPoint { 
-                            txid: txin.0, 
-                            vout: txin.1
+                        outpoint: OutPoint {
+                            txid: txin.0,
+                            vout: txin.1,
                         },
                         amount: Amount::from_sat(txin.2),
                     }
-                }).collect();
+                })
+                .collect();
             let deposit_amount = Amount::from_sat(*deposit_amount);
             let fee_amount = Amount::from_sat(*fee_amount);
-            let change_address = Address::from_str(change_address).expect("fail to parse change address")
-                .require_network(network).expect("address failed the network check");
+            let change_address = Address::from_str(change_address)
+                .expect("fail to parse change address")
+                .require_network(network)
+                .expect("address failed the network check");
             handle_generate_pegin_tx(conf, inputs, deposit_amount, fee_amount, change_address);
-        },
-        Commands::GeneratePrekickoffTx { tx_inputs, stake_amount, fee_amount, change_address } => {
+        }
+        Commands::GeneratePrekickoffTx {
+            tx_inputs,
+            stake_amount,
+            fee_amount,
+            change_address,
+        } => {
             let conf = load_config(&cli.config_file);
             let network = match_network(&conf.general.network).unwrap();
-            let inputs = tx_inputs.iter()
+            let inputs = tx_inputs
+                .iter()
                 .map(|input| {
                     let txin = TxInputValue::from_str(input).expect("fail to parse tx inputs");
                     Input {
-                        outpoint: OutPoint { 
-                            txid: txin.0, 
-                            vout: txin.1
+                        outpoint: OutPoint {
+                            txid: txin.0,
+                            vout: txin.1,
                         },
                         amount: Amount::from_sat(txin.2),
                     }
-                }).collect();
+                })
+                .collect();
             let stake_amount = Amount::from_sat(*stake_amount);
             let fee_amount = Amount::from_sat(*fee_amount);
-            let change_address = Address::from_str(change_address).expect("fail to parse change address")
-                .require_network(network).expect("address fail to pass network check");
+            let change_address = Address::from_str(change_address)
+                .expect("fail to parse change address")
+                .require_network(network)
+                .expect("address fail to pass network check");
             handle_generate_prekickoff_tx(conf, inputs, stake_amount, fee_amount, change_address);
-        },
+        }
         Commands::GenerateBitvmInstanace {} => {
             let conf = load_config(&cli.config_file);
             handle_generate_bitvm_instance(conf);
-        },
-        Commands::FederationPresign { } => {
+        }
+        Commands::FederationPresign {} => {
             let conf = load_config(&cli.config_file);
             handle_federation_presign(conf);
-        },
-        Commands::OperatorPresign { } => {
+        }
+        Commands::OperatorPresign {} => {
             let conf = load_config(&cli.config_file);
             handle_operator_presign(conf);
-        },
-        Commands::OperatorSign { kickoff, evm_withdraw_txid, take_1, assert, take_2 } => {
+        }
+        Commands::OperatorSign {
+            kickoff,
+            evm_withdraw_txid,
+            take_1,
+            assert,
+            take_2,
+        } => {
             let conf = load_config(&cli.config_file);
             if *kickoff {
-                let evm_withdraw_txid = evm_withdraw_txid.clone().expect("please provide --evm-withdraw-txid when signing kickoff tx");
-                let evm_withdraw_txid = hex::decode(evm_withdraw_txid.trim_start_matches("0x")).expect("fail to decode evm_txid");
-                let evm_withdraw_txid: [u8; 32] = evm_withdraw_txid.try_into().expect("invalid evm txid length");
+                let evm_withdraw_txid = evm_withdraw_txid
+                    .clone()
+                    .expect("please provide --evm-withdraw-txid when signing kickoff tx");
+                let evm_withdraw_txid = hex::decode(evm_withdraw_txid.trim_start_matches("0x"))
+                    .expect("fail to decode evm_txid");
+                let evm_withdraw_txid: [u8; 32] = evm_withdraw_txid
+                    .try_into()
+                    .expect("invalid evm txid length");
                 handle_operator_sign_kickoff(conf.clone(), evm_withdraw_txid);
             }
             if *take_1 {
@@ -135,12 +173,14 @@ async fn main() {
             if *take_2 {
                 handle_operator_sign_take2(conf);
             }
-        },
+        }
         Commands::Disprove { reward_address } => {
             let conf = load_config(&cli.config_file);
             let network = match_network(&conf.general.network).unwrap();
-            let reward_address = Address::from_str(reward_address).expect("fail to parse reward address")
-                .require_network(network).expect("address fail to pass network check");
+            let reward_address = Address::from_str(reward_address)
+                .expect("fail to parse reward address")
+                .require_network(network)
+                .expect("address fail to pass network check");
             handle_challenger_sign_disprove(conf, reward_address);
         }
     }
@@ -148,19 +188,21 @@ async fn main() {
 
 #[test]
 fn generate_test_keys() {
+    use bitcoin::{Network, PublicKey};
     use goat::contexts::{
-        base::generate_keys_from_secret,
-        depositor::DepositorContext,
-        operator::OperatorContext,
+        base::generate_keys_from_secret, depositor::DepositorContext, operator::OperatorContext,
         verifier::VerifierContext,
     };
-    use bitcoin::{PublicKey, Network};
 
     let source_network = Network::Regtest;
-    const OPERATOR_SECRET: &str = "3076ca1dfc1e383be26d5dd3c0c427340f96139fa8c2520862cf551ec2d670ac";
-    const VERIFIER_0_SECRET: &str = "ee0817eac0c13aa8ee2dd3256304041f09f0499d1089b56495310ae8093583e2";
-    const VERIFIER_1_SECRET: &str = "fc294c70faf210d4d0807ea7a3dba8f7e41700d90c119e1ae82a0687d89d297f";
-    const DEPOSITOR_SECRET: &str = "b8f17ea979be24199e7c3fec71ee88914d92fd4ca508443f765d56ce024ef1d7";
+    const OPERATOR_SECRET: &str =
+        "3076ca1dfc1e383be26d5dd3c0c427340f96139fa8c2520862cf551ec2d670ac";
+    const VERIFIER_0_SECRET: &str =
+        "ee0817eac0c13aa8ee2dd3256304041f09f0499d1089b56495310ae8093583e2";
+    const VERIFIER_1_SECRET: &str =
+        "fc294c70faf210d4d0807ea7a3dba8f7e41700d90c119e1ae82a0687d89d297f";
+    const DEPOSITOR_SECRET: &str =
+        "b8f17ea979be24199e7c3fec71ee88914d92fd4ca508443f765d56ce024ef1d7";
 
     let (_, verifier_0_public_key) = generate_keys_from_secret(source_network, VERIFIER_0_SECRET);
     let (_, verifier_1_public_key) = generate_keys_from_secret(source_network, VERIFIER_1_SECRET);
@@ -197,7 +239,6 @@ fn generate_test_keys() {
     // dbg!(verifier_1_context.n_of_n_public_keys[0].to_string());
     // dbg!(verifier_1_context.n_of_n_public_keys[1].to_string());
     // dbg!(VERIFIER_1_SECRET);
-
 }
 
 #[test]
@@ -209,48 +250,73 @@ fn generate_corrupt_proof() {
     let target_bitcom_index: usize = 8;
 
     println!("loading operator wots secret keys ...");
-    assert!(files::file_exists(&conf.operator.operator_wots_seckey_file), "operator_wots_seckey_file not provided");
+    assert!(
+        files::file_exists(&conf.operator.operator_wots_seckey_file),
+        "operator_wots_seckey_file not provided"
+    );
     let wots_sec = files::load_wots_seckeys(&conf.operator.operator_wots_seckey_file);
 
     println!("loading proof signatures ...");
-    assert!(files::file_exists(&conf.general.proof_file), "proof-sigs not provided");
-    let mut proof_sigs = files::load_signed_assertions_from_file(&conf.general.signed_assertions_file);
-    
+    assert!(
+        files::file_exists(&conf.general.proof_file),
+        "proof-sigs not provided"
+    );
+    let mut proof_sigs =
+        files::load_signed_assertions_from_file(&conf.general.signed_assertions_file);
+
     handles::corrupt(&mut proof_sigs, &wots_sec.1, target_bitcom_index);
 
     println!("loading vkey ...");
-    assert!(files::file_exists(&conf.general.vkey_file), "vkey not provided");
+    assert!(
+        files::file_exists(&conf.general.vkey_file),
+        "vkey not provided"
+    );
     let ark_vkey = files::load_groth16_vk(&conf.general.vkey_file);
-    
+
     println!("loading operator wots public-key...");
-    assert!(files::file_exists(&conf.general.operator_wots_pubkey_file), "operator wots public key is not provided");
+    assert!(
+        files::file_exists(&conf.general.operator_wots_pubkey_file),
+        "operator wots public key is not provided"
+    );
     let pubkey = files::load_wots_pubkeys(&conf.general.operator_wots_pubkey_file);
 
     println!("loading disprove scripts...");
-    assert!(files::file_exists(&conf.general.disprove_scripts_file), "disprove scripts is not provided");
-    let disprove_scripts = files::load_scripts_from_file(&conf.general.disprove_scripts_file).try_into().unwrap();
-
-    let res = bitvm::chunk::api::validate_assertions(&ark_vkey, proof_sigs, pubkey.1, &disprove_scripts);
+    assert!(
+        files::file_exists(&conf.general.disprove_scripts_file),
+        "disprove scripts is not provided"
+    );
+    let disprove_scripts = files::load_scripts_from_file(&conf.general.disprove_scripts_file)
+        .try_into()
+        .unwrap();
+
+    let res =
+        bitvm::chunk::api::validate_assertions(&ark_vkey, proof_sigs, pubkey.1, &disprove_scripts);
     match res {
-        Some((index,witness)) => {
+        Some((index, witness)) => {
             files::write_disprove_witness(&conf.challenger.disprove_witness_file, index, witness);
-            println!("\nProof is invalid! Disprove witness is written to: {}", &conf.challenger.disprove_witness_file);
-        },
+            println!(
+                "\nProof is invalid! Disprove witness is written to: {}",
+                &conf.challenger.disprove_witness_file
+            );
+        }
         _ => {
             println!("\nProof is Ok.");
         }
     };
-    
-}   
+}
 
 #[test]
 #[ignore]
 fn test_disprove_scripts_size() {
     let conf_file = "./src/bin/goat-bridge/example.config.toml";
     let conf = load_config(&conf_file);
-    
-    assert!(files::file_exists(&conf.general.disprove_scripts_file), "disprove scripts not provided");
-    let disprove_scripts_bytes = files::load_scripts_bytes_from_file(&conf.general.disprove_scripts_file);
+
+    assert!(
+        files::file_exists(&conf.general.disprove_scripts_file),
+        "disprove scripts not provided"
+    );
+    let disprove_scripts_bytes =
+        files::load_scripts_bytes_from_file(&conf.general.disprove_scripts_file);
 
     let scr_num = disprove_scripts_bytes.len();
     let mut sum_bytes = 0;
@@ -268,7 +334,7 @@ fn test_disprove_scripts_size() {
     println!("total {scr_num} scripts");
     println!("total {sum_bytes} bytes");
     println!("min script: {:?} , size: {:?}", min_scr.0, min_scr.1);
-}   
+}
 
 #[test]
 #[ignore]
@@ -280,59 +346,63 @@ fn generate_test_fund_address() {
     let conf = load_config(&conf_file);
     let network = match_network(&conf.general.network).unwrap();
     let fund_address_sec = conf.operator.operator_seckey.unwrap();
-    let (_,fund_address_pub) = generate_keys_from_secret(network, &fund_address_sec);
+    let (_, fund_address_pub) = generate_keys_from_secret(network, &fund_address_sec);
     let fund_address = generate_pay_to_pubkey_script_address(network, &fund_address_pub);
-    let pegin_fund_amount = Amount::from_sat(100_000); 
-    let kickoff_fund_amount = Amount::from_sat(5_000_000); 
-    let challenge_fund_amount = Amount::from_sat(100_000); 
-    println!("Pegin Fund Address: {fund_address} Amount: {} btc", pegin_fund_amount.to_btc());
-    println!("Kickoff Fund Address: {fund_address} Amount: {} btc", kickoff_fund_amount.to_btc());
-    println!("Challenge Fund Address: {fund_address} Amount: {} btc", challenge_fund_amount.to_btc());
+    let pegin_fund_amount = Amount::from_sat(100_000);
+    let kickoff_fund_amount = Amount::from_sat(5_000_000);
+    let challenge_fund_amount = Amount::from_sat(100_000);
+    println!(
+        "Pegin Fund Address: {fund_address} Amount: {} btc",
+        pegin_fund_amount.to_btc()
+    );
+    println!(
+        "Kickoff Fund Address: {fund_address} Amount: {} btc",
+        kickoff_fund_amount.to_btc()
+    );
+    println!(
+        "Challenge Fund Address: {fund_address} Amount: {} btc",
+        challenge_fund_amount.to_btc()
+    );
 }
 
 #[test]
 #[ignore]
 #[allow(unused_imports)]
 fn sign_test_fund_tx() {
-    use goat::contexts::base::generate_keys_from_secret;
-    use goat::scripts::{generate_pay_to_pubkey_script_address, generate_pay_to_pubkey_script};
-    use goat::transactions::signing::populate_p2wsh_witness;
-    use bitcoin::{PublicKey, Network, Amount, Transaction, consensus, Txid, Wtxid, ScriptBuf, EcdsaSighashType};
     use bitcoin::secp256k1::Keypair;
-    use std::io::BufReader;
-    use files::*;
+    use bitcoin::{
+        consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, Transaction, Txid,
+        Wtxid,
+    };
     use config::*;
-    use std::fs::File;
+    use files::*;
+    use goat::contexts::base::generate_keys_from_secret;
+    use goat::scripts::{generate_pay_to_pubkey_script, generate_pay_to_pubkey_script_address};
+    use goat::transactions::signing::populate_p2wsh_witness;
     use goat::transactions::{
+        peg_in::peg_in::PegInTransaction, peg_out_confirm::PreKickoffTransaction,
         pre_signed::PreSignedTransaction,
-        peg_in::peg_in::PegInTransaction,
-        peg_out_confirm::PreKickoffTransaction,
     };
+    use std::fs::File;
+    use std::io::BufReader;
 
     fn sign_p2wsh_tx(
-        tx_mut: &mut Transaction, 
-        input_index: usize, 
-        script: ScriptBuf, 
+        tx_mut: &mut Transaction,
+        input_index: usize,
+        script: ScriptBuf,
         value: Amount,
-        sighash_type:  EcdsaSighashType,
+        sighash_type: EcdsaSighashType,
         keypairs: &Vec<&Keypair>,
     ) {
-        populate_p2wsh_witness(
-            tx_mut,
-            input_index,
-            sighash_type,
-            &script,
-            value,
-            keypairs,
-        );
+        populate_p2wsh_witness(tx_mut, input_index, sighash_type, &script, value, keypairs);
     }
-    
+
     let conf_file = "./src/bin/goat-bridge/example.config.toml";
     let conf = load_config(&conf_file);
     let network = match_network(&conf.general.network).unwrap();
-    let pegin_fund_amount = Amount::from_sat(100_000); 
-    let kickoff_fund_amount = Amount::from_sat(5_000_000); 
-    // let challenge_fund_amount = Amount::from_sat(100_000); 
+    let pegin_fund_amount = Amount::from_sat(100_000);
+    let kickoff_fund_amount = Amount::from_sat(5_000_000);
+    // let challenge_fund_amount = Amount::from_sat(100_000);
     let fund_address_sec = conf.operator.operator_seckey.unwrap();
     let (keypair, fund_address_pub) = generate_keys_from_secret(network, &fund_address_sec);
     let fund_script = generate_pay_to_pubkey_script(&fund_address_pub);
@@ -344,15 +414,17 @@ fn sign_test_fund_tx() {
             let reader = BufReader::new(file);
             let mut pegin_tx: PegInTransaction = serde_json::from_reader(reader).unwrap();
             sign_p2wsh_tx(
-                pegin_tx.tx_mut(), 
-                0, 
-                fund_script.clone(), 
-                pegin_fund_amount, 
-                EcdsaSighashType::All, 
+                pegin_tx.tx_mut(),
+                0,
+                fund_script.clone(),
+                pegin_fund_amount,
+                EcdsaSighashType::All,
                 &vec![&keypair],
             );
-            let signed_pegin_tx_bytes =  serde_json::to_vec_pretty(&SignedTransaction::new(pegin_tx.tx().clone())).unwrap();
-            let signed_pegin_tx_file = format!("{}{}", &conf.general.signed_txns_dir, PEGIN_FILE_NAME);
+            let signed_pegin_tx_bytes =
+                serde_json::to_vec_pretty(&SignedTransaction::new(pegin_tx.tx().clone())).unwrap();
+            let signed_pegin_tx_file =
+                format!("{}{}", &conf.general.signed_txns_dir, PEGIN_FILE_NAME);
             write_bytes_to_file(&signed_pegin_tx_bytes, &signed_pegin_tx_file);
             println!("signed pegin tx written to {}", signed_pegin_tx_file);
         } else {
@@ -363,21 +435,29 @@ fn sign_test_fund_tx() {
     {
         let pre_kickoff_file = format!("{}{}", &conf.general.txns_dir, PRE_KICKOFF_FILE_NAME);
         if file_exists(&pre_kickoff_file) {
-            let file = File::open(&pre_kickoff_file).expect(&format!("fail to open {:?}", pre_kickoff_file));
+            let file = File::open(&pre_kickoff_file)
+                .expect(&format!("fail to open {:?}", pre_kickoff_file));
             let reader = BufReader::new(file);
-            let mut pre_kickoff_tx: PreKickoffTransaction = serde_json::from_reader(reader).unwrap();
+            let mut pre_kickoff_tx: PreKickoffTransaction =
+                serde_json::from_reader(reader).unwrap();
             sign_p2wsh_tx(
-                pre_kickoff_tx.tx_mut(), 
-                0, 
-                fund_script, 
-                kickoff_fund_amount, 
-                EcdsaSighashType::All, 
+                pre_kickoff_tx.tx_mut(),
+                0,
+                fund_script,
+                kickoff_fund_amount,
+                EcdsaSighashType::All,
                 &vec![&keypair],
             );
-            let signed_prekickoff_tx_bytes =  serde_json::to_vec_pretty(&SignedTransaction::new(pre_kickoff_tx.tx().clone())).unwrap();
-            let signed_prekickoff_tx_file = format!("{}{}", &conf.general.signed_txns_dir, PRE_KICKOFF_FILE_NAME);
+            let signed_prekickoff_tx_bytes =
+                serde_json::to_vec_pretty(&SignedTransaction::new(pre_kickoff_tx.tx().clone()))
+                    .unwrap();
+            let signed_prekickoff_tx_file =
+                format!("{}{}", &conf.general.signed_txns_dir, PRE_KICKOFF_FILE_NAME);
             write_bytes_to_file(&signed_prekickoff_tx_bytes, &signed_prekickoff_tx_file);
-            println!("signed pre-kickoff tx written to {}", signed_prekickoff_tx_file);
+            println!(
+                "signed pre-kickoff tx written to {}",
+                signed_prekickoff_tx_file
+            );
         } else {
             println!("pre-kickoff tx not provided, skipped")
         };
@@ -388,25 +468,26 @@ fn sign_test_fund_tx() {
 #[ignore]
 #[allow(unused_imports)]
 fn sign_test_challenge_tx() {
-    use goat::contexts::base::generate_keys_from_secret;
-    use goat::scripts::{generate_pay_to_pubkey_script_address, generate_pay_to_pubkey_script};
-    use goat::transactions::signing::populate_p2wsh_witness;
-    use bitcoin::{PublicKey, Network, Amount, Transaction, consensus, Txid, Wtxid, ScriptBuf, EcdsaSighashType};
     use bitcoin::secp256k1::Keypair;
-    use std::io::BufReader;
-    use files::*;
+    use bitcoin::{
+        consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, Transaction, Txid,
+        Wtxid,
+    };
     use config::*;
-    use std::fs::File;
+    use files::*;
+    use goat::contexts::base::generate_keys_from_secret;
+    use goat::scripts::{generate_pay_to_pubkey_script, generate_pay_to_pubkey_script_address};
+    use goat::transactions::signing::populate_p2wsh_witness;
     use goat::transactions::{
-        base::InputWithScript,
-        pre_signed::PreSignedTransaction,
-        challenge::ChallengeTransaction,
+        base::InputWithScript, challenge::ChallengeTransaction, pre_signed::PreSignedTransaction,
     };
-    
+    use std::fs::File;
+    use std::io::BufReader;
+
     let conf_file = "./src/bin/goat-bridge/example.config.toml";
     let conf = load_config(&conf_file);
     let network = match_network(&conf.general.network).unwrap();
-    let challenge_fund_amount = Amount::from_sat(100_000); 
+    let challenge_fund_amount = Amount::from_sat(100_000);
     let fund_address_sec = conf.operator.operator_seckey.unwrap();
     let (keypair, fund_address_pub) = generate_keys_from_secret(network, &fund_address_sec);
     let fund_script = generate_pay_to_pubkey_script(&fund_address_pub);
@@ -414,22 +495,32 @@ fn sign_test_challenge_tx() {
 
     let challenge_file = format!("{}{}", &conf.general.txns_dir, CHALLENGE_FILE_NAME);
     if file_exists(&challenge_file) {
-        let file = File::open(&challenge_file).expect(&format!("fail to open {:?}", challenge_file));
+        let file =
+            File::open(&challenge_file).expect(&format!("fail to open {:?}", challenge_file));
         let reader = BufReader::new(file);
         let mut challenge_tx: ChallengeTransaction = serde_json::from_reader(reader).unwrap();
         let challenge_input = InputWithScript {
-            outpoint: OutPoint { 
-                txid: Txid::from_str("TODO").unwrap(), 
-                vout: 0, 
+            outpoint: OutPoint {
+                txid: Txid::from_str("TODO").unwrap(),
+                vout: 0,
             },
             amount: challenge_fund_amount,
             script: &fund_script,
         };
-        challenge_tx.add_inputs_and_output(&vec![challenge_input], &keypair, fund_address.script_pubkey());
-        let signed_challenge_tx_bytes =  serde_json::to_vec_pretty(&SignedTransaction::new(challenge_tx.tx().clone())).unwrap();
-        let signed_challenge_tx_file = format!("{}{}", &conf.general.signed_txns_dir, CHALLENGE_FILE_NAME);
+        challenge_tx.add_inputs_and_output(
+            &vec![challenge_input],
+            &keypair,
+            fund_address.script_pubkey(),
+        );
+        let signed_challenge_tx_bytes =
+            serde_json::to_vec_pretty(&SignedTransaction::new(challenge_tx.tx().clone())).unwrap();
+        let signed_challenge_tx_file =
+            format!("{}{}", &conf.general.signed_txns_dir, CHALLENGE_FILE_NAME);
         write_bytes_to_file(&signed_challenge_tx_bytes, &signed_challenge_tx_file);
-        println!("signed challenge tx written to {}", signed_challenge_tx_file);
+        println!(
+            "signed challenge tx written to {}",
+            signed_challenge_tx_file
+        );
     } else {
         println!("challenge tx not provided, skipped")
     };
diff --git a/goat/src/bin/tx-sender/main.rs b/goat/src/bin/tx-sender/main.rs
index ce6bf954..78db2460 100644
--- a/goat/src/bin/tx-sender/main.rs
+++ b/goat/src/bin/tx-sender/main.rs
@@ -1,7 +1,7 @@
-use bitcoin::{Transaction, consensus, Txid, Wtxid};
-use serde::{Serialize, Deserialize};
+use bitcoin::{consensus, Transaction, Txid, Wtxid};
 use clap::Parser;
 use reqwest::blocking::Client;
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug)]
@@ -30,9 +30,10 @@ fn read_txns(file: &str) -> Vec<SignedTransaction> {
 
     match parsed {
         Value::Array(arr) => {
-            let res: Vec<SignedTransaction> = arr.into_iter().map(|item| {
-                serde_json::from_value(item).unwrap()
-            }).collect();
+            let res: Vec<SignedTransaction> = arr
+                .into_iter()
+                .map(|item| serde_json::from_value(item).unwrap())
+                .collect();
             res
         }
 
@@ -41,7 +42,7 @@ fn read_txns(file: &str) -> Vec<SignedTransaction> {
             vec![res]
         }
 
-        _ => panic!()
+        _ => panic!(),
     }
 }
 
@@ -53,13 +54,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         println!("Sending {}...", tx.txid);
         let tx_hex = bitcoin::consensus::encode::serialize_hex(&tx.tx);
         let client = Client::new();
-        let res = client.post(&args.url)
-            .body(tx_hex)
-            .send()?;
-    
+        let res = client.post(&args.url).body(tx_hex).send()?;
+
         let status = res.status();
         let body = res.text()?;
-    
+
         println!("Status: {}", status);
         println!("Response:\n{}", body);
     }
diff --git a/goat/src/commitments.rs b/goat/src/commitments.rs
index 2ea7e492..3db0e771 100644
--- a/goat/src/commitments.rs
+++ b/goat/src/commitments.rs
@@ -4,10 +4,12 @@ use serde::{Deserialize, Serialize};
 use strum::{Display, EnumIter, IntoEnumIterator};
 
 use bitvm::{
-    chunk::api::{
-        PublicKeys as ApiPublicKeys, NUM_HASH, NUM_PUBS, NUM_U256
-    }, 
-    signatures::{signing_winternitz::{WinternitzPublicKey, WinternitzSecret, LOG_D}, winternitz::Parameters, wots_api::HASH_LEN}
+    chunk::api::{PublicKeys as ApiPublicKeys, NUM_HASH, NUM_PUBS, NUM_U256},
+    signatures::{
+        signing_winternitz::{WinternitzPublicKey, WinternitzSecret, LOG_D},
+        winternitz::Parameters,
+        wots_api::HASH_LEN,
+    },
 };
 
 use super::constants::EVM_TXID_LENGTH;
@@ -70,16 +72,15 @@ impl TryFrom<String> for CommitmentMessageId {
 }
 
 impl CommitmentMessageId {
-    pub fn pubkey_map_for_kickoff(raw_pubkeys: &[WinternitzPublicKey; NUM_KICKOFF]) -> HashMap<CommitmentMessageId, WinternitzPublicKey> {
-        HashMap::from([
-            (
-                CommitmentMessageId::EvmWithdrawTxid,
-                raw_pubkeys[0].clone(),
-            ),
-        ])
+    pub fn pubkey_map_for_kickoff(
+        raw_pubkeys: &[WinternitzPublicKey; NUM_KICKOFF],
+    ) -> HashMap<CommitmentMessageId, WinternitzPublicKey> {
+        HashMap::from([(CommitmentMessageId::EvmWithdrawTxid, raw_pubkeys[0].clone())])
     }
 
-    pub fn pubkey_map_for_assert(raw_pubkeys: &ApiPublicKeys) -> HashMap<CommitmentMessageId, WinternitzPublicKey> {
+    pub fn pubkey_map_for_assert(
+        raw_pubkeys: &ApiPublicKeys,
+    ) -> HashMap<CommitmentMessageId, WinternitzPublicKey> {
         let mut commitment_map = HashMap::new();
         for i in 0..NUM_PUBS {
             commitment_map.insert(
@@ -87,7 +88,7 @@ impl CommitmentMessageId {
                 WinternitzPublicKey {
                     public_key: raw_pubkeys.0[i].to_vec(),
                     parameters: Parameters::new_by_bit_length(8 * 32, LOG_D),
-                }
+                },
             );
         }
         for i in 0..NUM_U256 {
@@ -96,32 +97,32 @@ impl CommitmentMessageId {
                 WinternitzPublicKey {
                     public_key: raw_pubkeys.1[i].to_vec(),
                     parameters: Parameters::new_by_bit_length(8 * 32, LOG_D),
-                }
+                },
             );
         }
         for i in 0..NUM_HASH {
             commitment_map.insert(
-                CommitmentMessageId::Groth16IntermediateValues((format!("{}", i + NUM_PUBS + NUM_U256), HASH_LEN as usize)),
+                CommitmentMessageId::Groth16IntermediateValues((
+                    format!("{}", i + NUM_PUBS + NUM_U256),
+                    HASH_LEN as usize,
+                )),
                 WinternitzPublicKey {
                     public_key: raw_pubkeys.2[i].to_vec(),
                     parameters: Parameters::new_by_bit_length(8 * HASH_LEN, LOG_D),
-                }
+                },
             );
         }
 
         commitment_map
     }
 
-
     // btree map is a copy of chunker related commitments
     pub fn generate_commitment_secrets() -> HashMap<CommitmentMessageId, WinternitzSecret> {
         println!("Generating commitment secrets ...");
-        let mut commitment_map = HashMap::from([
-            (
-                CommitmentMessageId::EvmWithdrawTxid,
-                WinternitzSecret::new(EVM_TXID_LENGTH),
-            ),
-        ]);
+        let mut commitment_map = HashMap::from([(
+            CommitmentMessageId::EvmWithdrawTxid,
+            WinternitzSecret::new(EVM_TXID_LENGTH),
+        )]);
 
         for i in 0..NUM_PUBS {
             commitment_map.insert(
@@ -137,7 +138,10 @@ impl CommitmentMessageId {
         }
         for i in 0..NUM_HASH {
             commitment_map.insert(
-                CommitmentMessageId::Groth16IntermediateValues((format!("{}", i + NUM_PUBS + NUM_U256), HASH_LEN as usize)),
+                CommitmentMessageId::Groth16IntermediateValues((
+                    format!("{}", i + NUM_PUBS + NUM_U256),
+                    HASH_LEN as usize,
+                )),
                 WinternitzSecret::new(HASH_LEN as usize),
             );
         }
@@ -145,4 +149,3 @@ impl CommitmentMessageId {
         commitment_map
     }
 }
-
diff --git a/goat/src/connectors/base.rs b/goat/src/connectors/base.rs
index ed126c11..d714833b 100644
--- a/goat/src/connectors/base.rs
+++ b/goat/src/connectors/base.rs
@@ -83,9 +83,13 @@ where
     K: Eq + Hash,
     V: Clone,
 {
-    fn new(capacity: usize) -> Self { Self(HashMap::with_capacity(capacity)) }
+    fn new(capacity: usize) -> Self {
+        Self(HashMap::with_capacity(capacity))
+    }
 
-    pub fn push(&mut self, key: K, value: V) -> Option<V> { self.0.insert(key, value) }
+    pub fn push(&mut self, key: K, value: V) -> Option<V> {
+        self.0.insert(key, value)
+    }
 
     pub fn get<Q: ?Sized>(&self, key: &Q) -> Option<&V>
     where
@@ -103,4 +107,3 @@ where
         self.0.contains_key(key)
     }
 }
-
diff --git a/goat/src/connectors/connector_0.rs b/goat/src/connectors/connector_0.rs
index 374388a8..1f581f2c 100644
--- a/goat/src/connectors/connector_0.rs
+++ b/goat/src/connectors/connector_0.rs
@@ -28,13 +28,17 @@ impl Connector0 {
         generate_pay_to_pubkey_taproot_script(&self.n_of_n_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 
     fn generate_taproot_leaf_1_script(&self) -> ScriptBuf {
         generate_pay_to_pubkey_taproot_script(&self.n_of_n_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
 
 impl TaprootConnector for Connector0 {
diff --git a/goat/src/connectors/connector_5.rs b/goat/src/connectors/connector_5.rs
index 20433cca..2a680a86 100644
--- a/goat/src/connectors/connector_5.rs
+++ b/goat/src/connectors/connector_5.rs
@@ -28,13 +28,17 @@ impl Connector5 {
         generate_pay_to_pubkey_taproot_script(&self.n_of_n_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 
     fn generate_taproot_leaf_1_script(&self) -> ScriptBuf {
         generate_pay_to_pubkey_taproot_script(&self.n_of_n_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
 
 impl TaprootConnector for Connector5 {
diff --git a/goat/src/connectors/connector_6.rs b/goat/src/connectors/connector_6.rs
index ec1fbcf3..c650169f 100644
--- a/goat/src/connectors/connector_6.rs
+++ b/goat/src/connectors/connector_6.rs
@@ -1,9 +1,7 @@
 use std::collections::HashMap;
 
 use crate::{
-    commitments::CommitmentMessageId,
-    constants::EVM_TXID_LENGTH,
-    transactions::base::Input,
+    commitments::CommitmentMessageId, constants::EVM_TXID_LENGTH, transactions::base::Input,
 };
 
 use bitvm::{
@@ -48,10 +46,13 @@ impl Connector6 {
             { winternitz_message_checksig_verify(evm_withdraw_txid_pubkey, EVM_TXID_LENGTH * 2) }
             { self.operator_taproot_public_key }
             OP_CHECKSIG
-        }.compile()
+        }
+        .compile()
     }
 
-    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
 
 impl TaprootConnector for Connector6 {
diff --git a/goat/src/connectors/connector_a.rs b/goat/src/connectors/connector_a.rs
index 114e03bd..4eaf5092 100644
--- a/goat/src/connectors/connector_a.rs
+++ b/goat/src/connectors/connector_a.rs
@@ -34,13 +34,17 @@ impl ConnectorA {
         generate_pay_to_pubkey_taproot_script(&self.operator_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 
     fn generate_taproot_leaf_1_script(&self) -> ScriptBuf {
         generate_pay_to_pubkey_taproot_script(&self.operator_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
 
 impl TaprootConnector for ConnectorA {
diff --git a/goat/src/connectors/connector_b.rs b/goat/src/connectors/connector_b.rs
index 99cefb2c..2479f16c 100644
--- a/goat/src/connectors/connector_b.rs
+++ b/goat/src/connectors/connector_b.rs
@@ -5,7 +5,7 @@ use bitcoin::{
 use secp256k1::SECP256K1;
 use serde::{Deserialize, Serialize};
 
-use crate::{scripts::*, transactions::base::Input, connectors::base::*};
+use crate::{connectors::base::*, scripts::*, transactions::base::Input};
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
 pub struct ConnectorB {
@@ -15,10 +15,7 @@ pub struct ConnectorB {
 
 // TODO: timelock & n-n-pubkey OR just operator-pubkey?
 impl ConnectorB {
-    pub fn new(
-        network: Network,
-        operator_taproot_public_key: &XOnlyPublicKey,
-    ) -> Self {
+    pub fn new(network: Network, operator_taproot_public_key: &XOnlyPublicKey) -> Self {
         ConnectorB {
             network,
             operator_taproot_public_key: *operator_taproot_public_key,
@@ -29,7 +26,9 @@ impl ConnectorB {
         generate_pay_to_pubkey_taproot_script(&self.operator_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
 
 impl TaprootConnector for ConnectorB {
diff --git a/goat/src/connectors/connector_c.rs b/goat/src/connectors/connector_c.rs
index ef6fb6f5..c509f3df 100644
--- a/goat/src/connectors/connector_c.rs
+++ b/goat/src/connectors/connector_c.rs
@@ -31,12 +31,13 @@ use serde::{
 
 use bitvm::{
     chunk::api::{
-        api_generate_full_tapscripts, api_generate_partial_script, 
+        api_generate_full_tapscripts, api_generate_partial_script,
         type_conversion_utils::{
-            script_to_witness, utils_signatures_from_raw_witnesses, utils_typed_pubkey_from_raw, RawProof, RawWitness
-        }, 
+            script_to_witness, utils_signatures_from_raw_witnesses, utils_typed_pubkey_from_raw,
+            RawProof, RawWitness,
+        },
         validate_assertions, PublicKeys,
-    }, 
+    },
     signatures::signing_winternitz::WinternitzPublicKey,
 };
 
@@ -56,8 +57,7 @@ const MAX_CACHE_FILES: u32 = 90; //~1GB in total, based on lock scripts cache be
 
 fn get_lock_scripts_cache_path(cache_id: &str) -> PathBuf {
     let lock_scripts_file_name = format!("{LOCK_SCRIPTS_FILE_PREFIX}{}.bin", cache_id);
-    Path::new(CACHE_DIRECTORY_NAME)
-        .join(lock_scripts_file_name)
+    Path::new(CACHE_DIRECTORY_NAME).join(lock_scripts_file_name)
 }
 
 #[derive(Eq, PartialEq, Clone)]
@@ -213,7 +213,6 @@ impl ConnectorC {
         commit_2_witness: Vec<RawWitness>,
         vk: &ZkProofVerifyingKey,
     ) -> Result<(usize, RawWitness), Error> {
-
         let mut sorted_pks: Vec<(u32, WinternitzPublicKey)> = vec![];
         self.commitment_public_keys
             .clone()
@@ -225,20 +224,30 @@ impl ConnectorC {
                 }
             });
         sorted_pks.sort_by(|a, b| a.0.cmp(&b.0));
-        let sorted_pks = sorted_pks.iter().map(|f| &f.1).collect::<Vec<&WinternitzPublicKey>>();
+        let sorted_pks = sorted_pks
+            .iter()
+            .map(|f| &f.1)
+            .collect::<Vec<&WinternitzPublicKey>>();
 
-        
         let mut commit_witness = commit_1_witness.clone();
         commit_witness.extend_from_slice(&commit_2_witness);
-        
+
         let sigs = utils_signatures_from_raw_witnesses(&commit_witness);
         let pubs = utils_typed_pubkey_from_raw(sorted_pks);
-        let locs: Vec<bitcoin_script::builder::StructuredScript> = self.lock_scripts_bytes.clone().into_iter().map(|f| bitcoin_script::builder::StructuredScript::new("").push_script(ScriptBuf::from_bytes(f))).collect();
+        let locs: Vec<bitcoin_script::builder::StructuredScript> = self
+            .lock_scripts_bytes
+            .clone()
+            .into_iter()
+            .map(|f| {
+                bitcoin_script::builder::StructuredScript::new("")
+                    .push_script(ScriptBuf::from_bytes(f))
+            })
+            .collect();
         let locs = locs.try_into().unwrap();
         let exec_res = validate_assertions(vk, sigs, pubs, &locs);
         if exec_res.is_some() {
             let exec_res = exec_res.unwrap();
-            let wit: RawWitness =  script_to_witness(exec_res.1);
+            let wit: RawWitness = script_to_witness(exec_res.1);
             return Ok((exec_res.0, wit));
         }
         return Err(Error::Chunker(ChunkerError::ValidProof));
@@ -354,24 +363,27 @@ pub fn generate_assert_leaves(
     println!("Generating new lock scripts...");
     // hash map to btree map
     let mut sorted_pks: Vec<(u32, WinternitzPublicKey)> = vec![];
-    commits_public_keys
-        .clone()
-        .into_iter()
-        .for_each(|(k, v)| {
-            if let CommitmentMessageId::Groth16IntermediateValues((name, _)) = k {
-                let index = u32::from_str_radix(&name, 10).unwrap();
-                sorted_pks.push((index, v));
-            }
-        });
-    
+    commits_public_keys.clone().into_iter().for_each(|(k, v)| {
+        if let CommitmentMessageId::Groth16IntermediateValues((name, _)) = k {
+            let index = u32::from_str_radix(&name, 10).unwrap();
+            sorted_pks.push((index, v));
+        }
+    });
+
     sorted_pks.sort_by(|a, b| a.0.cmp(&b.0));
-    let sorted_pks = sorted_pks.iter().map(|f| &f.1).collect::<Vec<&WinternitzPublicKey>>();
+    let sorted_pks = sorted_pks
+        .iter()
+        .map(|f| &f.1)
+        .collect::<Vec<&WinternitzPublicKey>>();
 
     let default_proof = RawProof::default(); // mock a default proof to generate scripts
     let partial_scripts = api_generate_partial_script(&default_proof.vk);
     let pks: PublicKeys = utils_typed_pubkey_from_raw(sorted_pks);
-    let locks= api_generate_full_tapscripts(pks, &partial_scripts);
-    let locks = locks.into_iter().map(|f| f.compile().into_bytes()).collect();
+    let locks = api_generate_full_tapscripts(pks, &partial_scripts);
+    let locks = locks
+        .into_iter()
+        .map(|f| f.compile().into_bytes())
+        .collect();
     locks
 }
 
diff --git a/goat/src/connectors/connector_d.rs b/goat/src/connectors/connector_d.rs
index f263c4ee..98345712 100644
--- a/goat/src/connectors/connector_d.rs
+++ b/goat/src/connectors/connector_d.rs
@@ -28,7 +28,9 @@ impl ConnectorD {
         generate_pay_to_pubkey_taproot_script(&self.n_of_n_taproot_public_key)
     }
 
-    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
 
 impl TaprootConnector for ConnectorD {
diff --git a/goat/src/connectors/connector_f.rs b/goat/src/connectors/connector_f.rs
index 0de3627f..abc5ea75 100644
--- a/goat/src/connectors/connector_f.rs
+++ b/goat/src/connectors/connector_f.rs
@@ -33,5 +33,7 @@ impl P2wshConnector for ConnectorF {
         )
     }
 
-    fn generate_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
diff --git a/goat/src/connectors/connector_z.rs b/goat/src/connectors/connector_z.rs
index 6e6df77a..292522cb 100644
--- a/goat/src/connectors/connector_z.rs
+++ b/goat/src/connectors/connector_z.rs
@@ -64,7 +64,9 @@ impl ConnectorZ {
         .compile()
     }
 
-    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn {
+        generate_default_tx_in(input)
+    }
 }
 
 impl TaprootConnector for ConnectorZ {
diff --git a/goat/src/connectors/mod.rs b/goat/src/connectors/mod.rs
index 492dff21..9cbc2608 100644
--- a/goat/src/connectors/mod.rs
+++ b/goat/src/connectors/mod.rs
@@ -10,4 +10,4 @@ pub mod connector_c;
 pub mod connector_d;
 pub mod connector_e;
 pub mod connector_f;
-pub mod connector_z;
\ No newline at end of file
+pub mod connector_z;
diff --git a/goat/src/constants.rs b/goat/src/constants.rs
index 17c85c28..9dd69750 100644
--- a/goat/src/constants.rs
+++ b/goat/src/constants.rs
@@ -18,4 +18,3 @@ pub const CONNECTOR_Z_TIMELOCK: u32 = NUM_BLOCKS_PER_2_WEEKS;
 // Commitment message parameters. Hardcoded number of bytes per message.
 pub const EVM_TXID_LENGTH: usize = 64;
 pub const BITCOIN_TXID_LENGTH: usize = 64;
-
diff --git a/goat/src/contexts/depositor.rs b/goat/src/contexts/depositor.rs
index ca07e3b7..840c8629 100644
--- a/goat/src/contexts/depositor.rs
+++ b/goat/src/contexts/depositor.rs
@@ -16,10 +16,18 @@ pub struct DepositorContext {
 }
 
 impl BaseContext for DepositorContext {
-    fn network(&self) -> Network { self.network }
-    fn n_of_n_public_keys(&self) -> &Vec<PublicKey> { &self.n_of_n_public_keys }
-    fn n_of_n_public_key(&self) -> &PublicKey { &self.n_of_n_public_key }
-    fn n_of_n_taproot_public_key(&self) -> &XOnlyPublicKey { &self.n_of_n_taproot_public_key }
+    fn network(&self) -> Network {
+        self.network
+    }
+    fn n_of_n_public_keys(&self) -> &Vec<PublicKey> {
+        &self.n_of_n_public_keys
+    }
+    fn n_of_n_public_key(&self) -> &PublicKey {
+        &self.n_of_n_public_key
+    }
+    fn n_of_n_taproot_public_key(&self) -> &XOnlyPublicKey {
+        &self.n_of_n_taproot_public_key
+    }
 }
 
 impl DepositorContext {
diff --git a/goat/src/contexts/operator.rs b/goat/src/contexts/operator.rs
index a0e57169..52efa624 100644
--- a/goat/src/contexts/operator.rs
+++ b/goat/src/contexts/operator.rs
@@ -16,10 +16,18 @@ pub struct OperatorContext {
 }
 
 impl BaseContext for OperatorContext {
-    fn network(&self) -> Network { self.network }
-    fn n_of_n_public_keys(&self) -> &Vec<PublicKey> { &self.n_of_n_public_keys }
-    fn n_of_n_public_key(&self) -> &PublicKey { &self.n_of_n_public_key }
-    fn n_of_n_taproot_public_key(&self) -> &XOnlyPublicKey { &self.n_of_n_taproot_public_key }
+    fn network(&self) -> Network {
+        self.network
+    }
+    fn n_of_n_public_keys(&self) -> &Vec<PublicKey> {
+        &self.n_of_n_public_keys
+    }
+    fn n_of_n_public_key(&self) -> &PublicKey {
+        &self.n_of_n_public_key
+    }
+    fn n_of_n_taproot_public_key(&self) -> &XOnlyPublicKey {
+        &self.n_of_n_taproot_public_key
+    }
 }
 
 impl OperatorContext {
diff --git a/goat/src/contexts/verifier.rs b/goat/src/contexts/verifier.rs
index df9c6ca8..d6aad205 100644
--- a/goat/src/contexts/verifier.rs
+++ b/goat/src/contexts/verifier.rs
@@ -15,10 +15,18 @@ pub struct VerifierContext {
 }
 
 impl BaseContext for VerifierContext {
-    fn network(&self) -> Network { self.network }
-    fn n_of_n_public_keys(&self) -> &Vec<PublicKey> { &self.n_of_n_public_keys }
-    fn n_of_n_public_key(&self) -> &PublicKey { &self.n_of_n_public_key }
-    fn n_of_n_taproot_public_key(&self) -> &XOnlyPublicKey { &self.n_of_n_taproot_public_key }
+    fn network(&self) -> Network {
+        self.network
+    }
+    fn n_of_n_public_keys(&self) -> &Vec<PublicKey> {
+        &self.n_of_n_public_keys
+    }
+    fn n_of_n_public_key(&self) -> &PublicKey {
+        &self.n_of_n_public_key
+    }
+    fn n_of_n_taproot_public_key(&self) -> &XOnlyPublicKey {
+        &self.n_of_n_taproot_public_key
+    }
 }
 
 impl VerifierContext {
diff --git a/goat/src/error.rs b/goat/src/error.rs
index f8786a42..2a14bd5a 100644
--- a/goat/src/error.rs
+++ b/goat/src/error.rs
@@ -44,5 +44,7 @@ pub enum Error {
 }
 
 impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{:?}", self) }
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:?}", self)
+    }
 }
diff --git a/goat/src/lib.rs b/goat/src/lib.rs
index a38983de..372010f6 100644
--- a/goat/src/lib.rs
+++ b/goat/src/lib.rs
@@ -1,11 +1,11 @@
-pub mod connectors;
-pub mod contexts;
-pub mod transactions;
 pub mod commitments;
 pub mod common;
+pub mod connectors;
 pub mod constants;
+pub mod contexts;
 pub mod error;
 pub mod proof;
 pub mod scripts;
 pub mod serialization;
-pub mod utils;
\ No newline at end of file
+pub mod transactions;
+pub mod utils;
diff --git a/goat/src/proof.rs b/goat/src/proof.rs
index 195e1993..7f49457b 100644
--- a/goat/src/proof.rs
+++ b/goat/src/proof.rs
@@ -1,34 +1,39 @@
-use bitvm::chunk::api::type_conversion_utils::RawProof;
 use ark_bn254::Bn254;
-use ark_serialize::{CanonicalSerialize, CanonicalDeserialize, Compress, Validate};
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize, Compress, Validate};
+use bitvm::chunk::api::type_conversion_utils::RawProof;
 
 // TODO
-pub fn get_proof() -> RawProof { 
+pub fn get_proof() -> RawProof {
     RawProof::default()
 }
 
 pub fn serialize_proof(proof: ark_groth16::Proof<Bn254>) -> Vec<u8> {
     let mut proof_sered = vec![0; proof.serialized_size(Compress::Yes)];
-    proof.serialize_with_mode(&mut proof_sered[..], Compress::Yes).expect("fail to serialize proof");
+    proof
+        .serialize_with_mode(&mut proof_sered[..], Compress::Yes)
+        .expect("fail to serialize proof");
     proof_sered
 }
 pub fn serialize_vk(vk: ark_groth16::VerifyingKey<Bn254>) -> Vec<u8> {
     let mut vk_sered = vec![0; vk.serialized_size(Compress::Yes)];
-    vk.serialize_with_mode(&mut vk_sered[..], Compress::Yes).expect("fail to serialize vk");
+    vk.serialize_with_mode(&mut vk_sered[..], Compress::Yes)
+        .expect("fail to serialize vk");
     vk_sered
 }
 pub fn serialize_pubin(pubin: Vec<ark_bn254::Fr>) -> Vec<u8> {
     fn tmp_fr_serialization(f: ark_bn254::Fr) -> Vec<u8> {
-        use ark_ff::PrimeField;
         use ark_ff::BigInt;
-    
-        let f_big = match f.into_bigint() { BigInt(x) => x };
+        use ark_ff::PrimeField;
+
+        let f_big = match f.into_bigint() {
+            BigInt(x) => x,
+        };
         let mut res = Vec::with_capacity(f_big.len() * 8);
         for &num in f_big.iter() {
             res.extend_from_slice(&num.to_le_bytes());
         }
         res
-    }  
+    }
 
     let mut public_inputs_sered = Vec::new();
     for f in pubin {
@@ -39,16 +44,26 @@ pub fn serialize_pubin(pubin: Vec<ark_bn254::Fr>) -> Vec<u8> {
     bincode::serialize(&public_inputs_sered).unwrap()
 }
 pub fn deserialize_proof(buffer: Vec<u8>) -> ark_groth16::Proof<Bn254> {
-    ark_groth16::Proof::<Bn254>::deserialize_with_mode(buffer.as_slice(), Compress::Yes, Validate::Yes).unwrap()
+    ark_groth16::Proof::<Bn254>::deserialize_with_mode(
+        buffer.as_slice(),
+        Compress::Yes,
+        Validate::Yes,
+    )
+    .unwrap()
 }
 pub fn deserialize_vk(buffer: Vec<u8>) -> ark_groth16::VerifyingKey<Bn254> {
-    ark_groth16::VerifyingKey::<Bn254>::deserialize_with_mode(buffer.as_slice(), Compress::Yes, Validate::Yes).unwrap()
+    ark_groth16::VerifyingKey::<Bn254>::deserialize_with_mode(
+        buffer.as_slice(),
+        Compress::Yes,
+        Validate::Yes,
+    )
+    .unwrap()
 }
 pub fn deserialize_pubin(buffer: Vec<u8>) -> Vec<ark_bn254::Fr> {
     fn tmp_fr_deserialization(v: Vec<u8>) -> ark_bn254::Fr {
-        use ark_ff::PrimeField;
         use ark_ff::BigInt;
-    
+        use ark_ff::PrimeField;
+
         let mut arr = [0u64; 4];
         for (i, chunk) in v.chunks(8).enumerate() {
             arr[i] = u64::from_le_bytes(chunk.try_into().expect("Invalid fr length"));
@@ -57,7 +72,7 @@ pub fn deserialize_pubin(buffer: Vec<u8>) -> Vec<ark_bn254::Fr> {
     }
 
     let buffer: Vec<Vec<u8>> = bincode::deserialize(&buffer).unwrap();
-    let mut pubin= vec![];
+    let mut pubin = vec![];
     for i in 0..buffer.len() {
         let f = tmp_fr_deserialization(buffer[i].clone());
         pubin.push(f);
@@ -65,21 +80,19 @@ pub fn deserialize_pubin(buffer: Vec<u8>) -> Vec<ark_bn254::Fr> {
     pubin
 }
 
-
 #[test]
 #[ignore]
 fn verify_zkm2_proof() {
     /// TODO: Update NUM_PUBS, NUM_256, NUM_160, mock_proof
     /// NUM_PUBS = 2
     /// NUM_256 = 14
-    /// NUM_160 = 367 
+    /// NUM_160 = 367
     /// generate_segments_using_mock_proof: mocked_eval_ins.ks: vec![fr.into()] => vec![fr.into(); NUM_PUBS]
     use bitvm::chunk::api::{
-        NUM_PUBS, NUM_U256, NUM_HASH, PublicKeys,
-        api_generate_partial_script, api_generate_full_tapscripts,
-        generate_signatures, validate_assertions,
+        api_generate_full_tapscripts, api_generate_partial_script, generate_signatures,
+        validate_assertions, PublicKeys, NUM_HASH, NUM_PUBS, NUM_U256,
     };
-    use bitvm::signatures::wots_api::{wots_hash, wots256};
+    use bitvm::signatures::wots_api::{wots256, wots_hash};
     fn get_pubkeys(secret_key: Vec<String>) -> PublicKeys {
         let mut pubins = vec![];
         for i in 0..NUM_PUBS {
@@ -87,12 +100,12 @@ fn verify_zkm2_proof() {
         }
         let mut fq_arr = vec![];
         for i in 0..NUM_U256 {
-            let p256 = wots256::generate_public_key(secret_key[i+NUM_PUBS].as_str());
+            let p256 = wots256::generate_public_key(secret_key[i + NUM_PUBS].as_str());
             fq_arr.push(p256);
         }
         let mut h_arr = vec![];
         for i in 0..NUM_HASH {
-            let p160 = wots_hash::generate_public_key(secret_key[i+NUM_PUBS+NUM_U256].as_str());
+            let p160 = wots_hash::generate_public_key(secret_key[i + NUM_PUBS + NUM_U256].as_str());
             h_arr.push(p160);
         }
         let wotspubkey: PublicKeys = (
@@ -117,19 +130,32 @@ fn verify_zkm2_proof() {
 
     println!("STEP 1 GENERATE TAPSCRIPTS");
     let secret_key: &str = "a138982ce17ac813d505a5b40b665d404e9528e7";
-    let secrets = (0..NUM_PUBS+NUM_U256+NUM_HASH).map(|idx| format!("{secret_key}{:04x}", idx)).collect::<Vec<String>>();
+    let secrets = (0..NUM_PUBS + NUM_U256 + NUM_HASH)
+        .map(|idx| format!("{secret_key}{:04x}", idx))
+        .collect::<Vec<String>>();
     let pubkeys = get_pubkeys(secrets.clone());
 
     let partial_scripts = api_generate_partial_script(&ark_vkey);
     let disprove_scripts = api_generate_full_tapscripts(pubkeys, &partial_scripts);
 
     println!("STEP 2 GENERATE SIGNED ASSERTIONS");
-    let proof_sigs = generate_signatures(ark_proof, ark_public_inputs.to_vec(), &ark_vkey, secrets.clone()).unwrap();
+    let proof_sigs = generate_signatures(
+        ark_proof,
+        ark_public_inputs.to_vec(),
+        &ark_vkey,
+        secrets.clone(),
+    )
+    .unwrap();
     println!("num assertion; 256-bit numbers {}", NUM_PUBS + NUM_U256);
     println!("num assertion; 160-bit numbers {}", NUM_HASH);
 
     println!("STEP 3 VALIDATE SIGNED ASSERTIONS");
-    let validate_res = validate_assertions(&ark_vkey, proof_sigs, pubkeys, &disprove_scripts.try_into().unwrap());
+    let validate_res = validate_assertions(
+        &ark_vkey,
+        proof_sigs,
+        pubkeys,
+        &disprove_scripts.try_into().unwrap(),
+    );
     assert!(validate_res.is_none());
 }
 
@@ -154,7 +180,11 @@ fn read_bin() {
     dbg!(&ark_vkey);
     dbg!(&ark_public_inputs);
 
-    let ok = Groth16::<Bn254, LibsnarkReduction>::verify_proof(&ark_vkey.into(), &ark_proof, &ark_public_inputs)
+    let ok = Groth16::<Bn254, LibsnarkReduction>::verify_proof(
+        &ark_vkey.into(),
+        &ark_proof,
+        &ark_public_inputs,
+    )
     .unwrap();
     assert!(ok);
 }
@@ -179,7 +209,7 @@ fn genearte_test_proof() {
         pub num_variables: usize,
         pub num_constraints: usize,
     }
-    
+
     impl<F: PrimeField> Clone for DummyCircuit<F> {
         fn clone(&self) -> Self {
             DummyCircuit {
@@ -190,7 +220,7 @@ fn genearte_test_proof() {
             }
         }
     }
-    
+
     impl<F: PrimeField> ConstraintSynthesizer<F> for DummyCircuit<F> {
         fn generate_constraints(self, cs: ConstraintSystemRef<F>) -> Result<(), SynthesisError> {
             let a = cs.new_witness_variable(|| self.a.ok_or(SynthesisError::AssignmentMissing))?;
@@ -198,20 +228,21 @@ fn genearte_test_proof() {
             let c = cs.new_input_variable(|| {
                 let a = self.a.ok_or(SynthesisError::AssignmentMissing)?;
                 let b = self.b.ok_or(SynthesisError::AssignmentMissing)?;
-    
+
                 Ok(a * b)
             })?;
-    
+
             for _ in 0..(self.num_variables - 3) {
-                let _ = cs.new_witness_variable(|| self.a.ok_or(SynthesisError::AssignmentMissing))?;
+                let _ =
+                    cs.new_witness_variable(|| self.a.ok_or(SynthesisError::AssignmentMissing))?;
             }
-    
+
             for _ in 0..self.num_constraints - 1 {
                 cs.enforce_constraint(lc!() + a, lc!() + b, lc!() + c)?;
             }
-    
+
             cs.enforce_constraint(lc!(), lc!(), lc!())?;
-    
+
             Ok(())
         }
     }
@@ -238,6 +269,4 @@ fn genearte_test_proof() {
     std::fs::write("test-groth16/proof.bin", &proof_bin).unwrap();
     std::fs::write("test-groth16/vkey.bin", &vk_bin).unwrap();
     std::fs::write("test-groth16/pubin.bin", &pubin_bin).unwrap();
-    
 }
-
diff --git a/goat/src/scripts.rs b/goat/src/scripts.rs
index 4e8feff8..5dd2a376 100644
--- a/goat/src/scripts.rs
+++ b/goat/src/scripts.rs
@@ -159,13 +159,11 @@ pub fn generate_timelock_taproot_script_address(
     )
 }
 
-pub fn generate_opreturn_script(
-    msg: Vec<u8>,
-) -> ScriptBuf {
+pub fn generate_opreturn_script(msg: Vec<u8>) -> ScriptBuf {
     assert!(msg.len() <= 75, "message must less than 75 bytes");
     script! {
         OP_RETURN
         {msg}
-    }.compile()
+    }
+    .compile()
 }
-
diff --git a/goat/src/serialization.rs b/goat/src/serialization.rs
index bed807c7..f5302a60 100644
--- a/goat/src/serialization.rs
+++ b/goat/src/serialization.rs
@@ -1,6 +1,8 @@
 use serde::{Deserialize, Serialize};
 
-pub fn serialize(object: &impl Serialize) -> String { serde_json::to_string(object).unwrap() }
+pub fn serialize(object: &impl Serialize) -> String {
+    serde_json::to_string(object).unwrap()
+}
 
 pub fn deserialize<'a, T>(data: &'a str) -> T
 where
diff --git a/goat/src/transactions/assert/assert_commit.rs b/goat/src/transactions/assert/assert_commit.rs
index e6bb08ec..3e331708 100644
--- a/goat/src/transactions/assert/assert_commit.rs
+++ b/goat/src/transactions/assert/assert_commit.rs
@@ -2,7 +2,9 @@ use bitcoin::{absolute, consensus, Amount, ScriptBuf, Transaction, TxOut};
 use bitvm::{chunk::api::type_conversion_utils::RawWitness, execute_raw_script_with_inputs};
 use serde::{Deserialize, Serialize};
 
-use crate::transactions::{assert::utils::MAX_CONNECTORS_E_PER_TX, signing::populate_taproot_input_witness};
+use crate::transactions::{
+    assert::utils::MAX_CONNECTORS_E_PER_TX, signing::populate_taproot_input_witness,
+};
 
 use super::{
     super::{
@@ -11,13 +13,13 @@ use super::{
         pre_signed::*,
     },
     utils::{
-        AllCommitConnectorsE, SingleCommitConnectorsE, AssertCommitConnectorsF, COMMIT_TX_NUM,
+        AllCommitConnectorsE, AssertCommitConnectorsF, SingleCommitConnectorsE, COMMIT_TX_NUM,
     },
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
 pub struct AssertCommitTransactionSet {
-    pub commit_txns: [AssertCommitTransaction; COMMIT_TX_NUM]
+    pub commit_txns: [AssertCommitTransaction; COMMIT_TX_NUM],
 }
 impl AssertCommitTransactionSet {
     pub fn new(
@@ -40,13 +42,15 @@ impl AssertCommitTransactionSet {
             ));
         }
         AssertCommitTransactionSet {
-            commit_txns: commit_txns.try_into().unwrap_or_else(|_e| panic!("impossible")),
+            commit_txns: commit_txns
+                .try_into()
+                .unwrap_or_else(|_e| panic!("impossible")),
         }
     }
 
     pub fn sign(
-        &mut self, 
-        all_connectors_e: &AllCommitConnectorsE, 
+        &mut self,
+        all_connectors_e: &AllCommitConnectorsE,
         all_witnesses: Vec<RawWitness>,
     ) {
         for (i, witness) in (0..COMMIT_TX_NUM).zip(all_witnesses.chunks(MAX_CONNECTORS_E_PER_TX)) {
@@ -68,13 +72,21 @@ pub struct AssertCommitTransaction {
 }
 
 impl PreSignedTransaction for AssertCommitTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl AssertCommitTransaction {
@@ -164,7 +176,10 @@ impl AssertCommitTransaction {
 }
 
 impl BaseTransaction for AssertCommitTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-    fn name(&self) -> &'static str { "AssertCommit" }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "AssertCommit"
+    }
 }
-
diff --git a/goat/src/transactions/assert/assert_final.rs b/goat/src/transactions/assert/assert_final.rs
index 32d72912..ba98bcc7 100644
--- a/goat/src/transactions/assert/assert_final.rs
+++ b/goat/src/transactions/assert/assert_final.rs
@@ -10,7 +10,8 @@ use super::{
     super::{
         super::{
             connectors::{
-                base::*, connector_4::Connector4, connector_5::Connector5, connector_c::ConnectorC, connector_d::ConnectorD,
+                base::*, connector_4::Connector4, connector_5::Connector5, connector_c::ConnectorC,
+                connector_d::ConnectorD,
             },
             contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
             transactions::base::DUST_AMOUNT,
@@ -37,17 +38,27 @@ pub struct AssertFinalTransaction {
 }
 
 impl PreSignedTransaction for AssertFinalTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for AssertFinalTransaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -67,7 +78,9 @@ impl PreSignedMusig2Transaction for AssertFinalTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
-    fn verifier_inputs(&self) -> Vec<usize> { vec![0] }
+    fn verifier_inputs(&self) -> Vec<usize> {
+        vec![0]
+    }
 }
 
 impl AssertFinalTransaction {
@@ -114,30 +127,24 @@ impl AssertFinalTransaction {
 
         // input_0 : connector_d
         let input_0_leaf = 0;
-        txins.push(
-            connector_d.generate_taproot_leaf_tx_in(input_0_leaf, &input_0)
-        );
+        txins.push(connector_d.generate_taproot_leaf_tx_in(input_0_leaf, &input_0));
         prev_outs.push(TxOut {
             value: input_0.amount,
             script_pubkey: connector_d.generate_taproot_address().script_pubkey(),
         });
-        prev_scripts.push(
-            connector_d.generate_taproot_leaf_script(input_0_leaf)
-        );
+        prev_scripts.push(connector_d.generate_taproot_leaf_script(input_0_leaf));
         total_input_amount += input_0.amount;
 
         // other inputs: connectors_f
         for i in 0..COMMIT_TX_NUM {
-            txins.push(
-                assert_commit_connectors_f.connectors_f[i].generate_tx_in(&input_f[i])
-            );
+            txins.push(assert_commit_connectors_f.connectors_f[i].generate_tx_in(&input_f[i]));
             prev_outs.push(TxOut {
                 value: input_f[i].amount,
-                script_pubkey: assert_commit_connectors_f.connectors_f[i].generate_address().script_pubkey(),
+                script_pubkey: assert_commit_connectors_f.connectors_f[i]
+                    .generate_address()
+                    .script_pubkey(),
             });
-            prev_scripts.push(
-                assert_commit_connectors_f.connectors_f[i].generate_script(),
-            );
+            prev_scripts.push(assert_commit_connectors_f.connectors_f[i].generate_script());
             total_input_amount += input_f[i].amount;
         }
         let total_output_amount = total_input_amount - Amount::from_sat(MIN_RELAY_FEE_ASSERT_FINAL);
@@ -197,7 +204,7 @@ impl AssertFinalTransaction {
     }
 
     pub fn sign_commit_inputs(&mut self, context: &OperatorContext) {
-        for input_index in 1..(COMMIT_TX_NUM+1) {
+        for input_index in 1..(COMMIT_TX_NUM + 1) {
             pre_sign_p2wsh_input(
                 self,
                 input_index,
@@ -258,6 +265,10 @@ impl AssertFinalTransaction {
 }
 
 impl BaseTransaction for AssertFinalTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-    fn name(&self) -> &'static str { "AssertFinal" }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "AssertFinal"
+    }
 }
diff --git a/goat/src/transactions/assert/assert_initial.rs b/goat/src/transactions/assert/assert_initial.rs
index bbaeb84d..63df444f 100644
--- a/goat/src/transactions/assert/assert_initial.rs
+++ b/goat/src/transactions/assert/assert_initial.rs
@@ -1,21 +1,16 @@
-use bitcoin::{
-    absolute, consensus, Amount, ScriptBuf, TapSighashType, Transaction, TxOut,
-};
+use bitcoin::{absolute, consensus, Amount, ScriptBuf, TapSighashType, Transaction, TxOut};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-        connectors::{base::*, connector_b::ConnectorB, connector_d::ConnectorD},
-        contexts::operator::OperatorContext,
-        transactions::{
-            base::*,
-            pre_signed::*,
-            assert::utils::{
-                AllCommitConnectorsE, COMMIT_TX_NUM,
-            }, 
-            base::DUST_AMOUNT,
-        },
-    }
-;
+    connectors::{base::*, connector_b::ConnectorB, connector_d::ConnectorD},
+    contexts::operator::OperatorContext,
+    transactions::{
+        assert::utils::{AllCommitConnectorsE, COMMIT_TX_NUM},
+        base::DUST_AMOUNT,
+        base::*,
+        pre_signed::*,
+    },
+};
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
 pub struct AssertInitialTransaction {
@@ -27,13 +22,21 @@ pub struct AssertInitialTransaction {
 }
 
 impl PreSignedTransaction for AssertInitialTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl AssertInitialTransaction {
@@ -44,12 +47,8 @@ impl AssertInitialTransaction {
         all_commit_connectors_e: &AllCommitConnectorsE,
         input_0: Input,
     ) -> Self {
-        let mut this = Self::new_for_validation(
-            connector_b,
-            connector_d,
-            all_commit_connectors_e,
-            input_0,
-        );
+        let mut this =
+            Self::new_for_validation(connector_b, connector_d, all_commit_connectors_e, input_0);
 
         this.sign_input_0(&context, &connector_b);
 
@@ -92,7 +91,7 @@ impl AssertInitialTransaction {
                         .generate_taproot_address()
                         .script_pubkey(),
                 });
-            }            
+            }
         }
 
         AssertInitialTransaction {
@@ -123,6 +122,10 @@ impl AssertInitialTransaction {
 }
 
 impl BaseTransaction for AssertInitialTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-    fn name(&self) -> &'static str { "AssertInitial" }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "AssertInitial"
+    }
 }
diff --git a/goat/src/transactions/assert/utils.rs b/goat/src/transactions/assert/utils.rs
index 3ee38469..5d537fb5 100644
--- a/goat/src/transactions/assert/utils.rs
+++ b/goat/src/transactions/assert/utils.rs
@@ -1,19 +1,19 @@
-use bitcoin::{PublicKey, Network};
+use bitcoin::{Network, PublicKey};
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, HashMap};
 
 use crate::{
-    commitments::CommitmentMessageId,
-    connectors::connector_e::ConnectorE,
+    commitments::CommitmentMessageId, connectors::connector_e::ConnectorE,
     connectors::connector_f::ConnectorF,
 };
 
 use bitvm::{
     chunk::api::{
-        generate_signatures_for_any_proof, PublicKeys as ApiPublicKeys, NUM_HASH, NUM_U256, NUM_PUBS,
-        type_conversion_utils::{utils_raw_witnesses_from_signatures, RawProof, RawWitness}
-    }, 
-    signatures::signing_winternitz::{WinternitzPublicKey, WinternitzSecret}
+        generate_signatures_for_any_proof,
+        type_conversion_utils::{utils_raw_witnesses_from_signatures, RawProof, RawWitness},
+        PublicKeys as ApiPublicKeys, NUM_HASH, NUM_PUBS, NUM_U256,
+    },
+    signatures::signing_winternitz::{WinternitzPublicKey, WinternitzSecret},
 };
 
 pub const MAX_CONNECTORS_E_PER_TX: usize = 100;
@@ -32,20 +32,20 @@ impl SingleCommitConnectorsE {
         commitment_public_keys: &Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>,
     ) -> Self {
         SingleCommitConnectorsE {
-            connectors_e: commitment_public_keys.iter()
-                .map(|x| {
-                    ConnectorE::new(
-                        network,
-                        operator_pubkey,
-                        x,
-                    )
-                }).collect(),
+            connectors_e: commitment_public_keys
+                .iter()
+                .map(|x| ConnectorE::new(network, operator_pubkey, x))
+                .collect(),
         }
     }
 
-    pub fn connectors_num(&self) -> usize { self.connectors_e.len() }
+    pub fn connectors_num(&self) -> usize {
+        self.connectors_e.len()
+    }
 
-    pub fn get_connector_e(&self, idx: usize) -> &ConnectorE { &self.connectors_e[idx] }
+    pub fn get_connector_e(&self, idx: usize) -> &ConnectorE {
+        &self.connectors_e[idx]
+    }
 
     pub fn commitment_public_keys(
         &self,
@@ -63,26 +63,23 @@ pub struct AllCommitConnectorsE {
 }
 
 impl AllCommitConnectorsE {
-    pub fn new(
-        network: Network,
-        operator_pubkey: &PublicKey,
-        raw_pubkeys: &ApiPublicKeys
-    ) -> Self {
+    pub fn new(network: Network, operator_pubkey: &PublicKey, raw_pubkeys: &ApiPublicKeys) -> Self {
         let split_pubkeys_map = split_pubkeys(raw_pubkeys);
         AllCommitConnectorsE {
-            commit_connectors_e_vec: split_pubkeys_map.iter()
-            .map(|wpks| {
-                SingleCommitConnectorsE::new(
-                    network,
-                    operator_pubkey,
-                    wpks,
-                )
-            }).collect::<Vec<SingleCommitConnectorsE>>().try_into().unwrap_or_else(|_e| panic!("impossible"))
+            commit_connectors_e_vec: split_pubkeys_map
+                .iter()
+                .map(|wpks| SingleCommitConnectorsE::new(network, operator_pubkey, wpks))
+                .collect::<Vec<SingleCommitConnectorsE>>()
+                .try_into()
+                .unwrap_or_else(|_e| panic!("impossible")),
         }
     }
 
-    pub fn connectors_num(&self) -> usize { 
-        self.commit_connectors_e_vec.iter().map(|e| e.connectors_num()).sum()
+    pub fn connectors_num(&self) -> usize {
+        self.commit_connectors_e_vec
+            .iter()
+            .map(|e| e.connectors_num())
+            .sum()
     }
 }
 
@@ -92,12 +89,9 @@ pub struct AssertCommitConnectorsF {
 }
 
 impl AssertCommitConnectorsF {
-    pub fn new(
-        network: Network,
-        operator_public_key: &PublicKey,
-    ) -> Self {
+    pub fn new(network: Network, operator_public_key: &PublicKey) -> Self {
         AssertCommitConnectorsF {
-            connectors_f: [ConnectorF::new(network,operator_public_key); COMMIT_TX_NUM]
+            connectors_f: [ConnectorF::new(network, operator_public_key); COMMIT_TX_NUM],
         }
     }
 }
@@ -107,28 +101,29 @@ pub fn sign_assert_tx_with_groth16_proof(
     proof: &RawProof,
 ) -> Vec<RawWitness> {
     let mut sorted_secrets: Vec<(u32, String)> = vec![];
-    commitment_secrets
-        .clone()
-        .into_iter()
-        .for_each(|(k, v)| {
-            if let CommitmentMessageId::Groth16IntermediateValues((name, _)) = k {
-                let index = u32::from_str_radix(&name, 10).unwrap();
-                sorted_secrets.push((index, hex::encode(v.secret_key)));
-            }
-        });
-    
+    commitment_secrets.clone().into_iter().for_each(|(k, v)| {
+        if let CommitmentMessageId::Groth16IntermediateValues((name, _)) = k {
+            let index = u32::from_str_radix(&name, 10).unwrap();
+            sorted_secrets.push((index, hex::encode(v.secret_key)));
+        }
+    });
+
     sorted_secrets.sort_by(|a, b| a.0.cmp(&b.0));
     let secrets = sorted_secrets.iter().map(|f| f.1.clone()).collect();
 
-    let sigs = generate_signatures_for_any_proof(proof.proof.clone(), proof.public.clone(), &proof.vk, secrets);
+    let sigs = generate_signatures_for_any_proof(
+        proof.proof.clone(),
+        proof.public.clone(),
+        &proof.vk,
+        secrets,
+    );
 
     utils_raw_witnesses_from_signatures(&sigs)
 }
 
 pub fn split_pubkeys(
-    raw_pubkeys: &ApiPublicKeys
-) -> [Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>; COMMIT_TX_NUM] 
-{
+    raw_pubkeys: &ApiPublicKeys,
+) -> [Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>; COMMIT_TX_NUM] {
     let commitment_pubkeys = CommitmentMessageId::pubkey_map_for_assert(raw_pubkeys);
     let mut pubkeys_vec = vec![];
     for (message_id, pubkey) in commitment_pubkeys.iter() {
@@ -139,24 +134,24 @@ pub fn split_pubkeys(
     }
     pubkeys_vec.sort_by(|a, b| a.0.cmp(&b.0));
 
-    let res: Vec<Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>> =  
-    pubkeys_vec.chunks(MAX_CONNECTORS_E_PER_TX)
+    let res: Vec<Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>> = pubkeys_vec
+        .chunks(MAX_CONNECTORS_E_PER_TX)
         .map(|chunk| {
-            chunk.iter()
+            chunk
+                .iter()
                 .map(|&(_, (message_id, pubkey))| {
-                    BTreeMap::from(
-                        [(message_id.clone(), pubkey.clone())]
-                    )
-                }).collect()
-        }).collect();
+                    BTreeMap::from([(message_id.clone(), pubkey.clone())])
+                })
+                .collect()
+        })
+        .collect();
 
     res.try_into().unwrap_or_else(|_e| panic!("impossible"))
 }
 
 pub fn groth16_commitment_secrets_to_public_keys(
     commitment_secrets: &HashMap<CommitmentMessageId, WinternitzSecret>,
-) -> [Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>; COMMIT_TX_NUM]  
-{
+) -> [Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>; COMMIT_TX_NUM] {
     // hash map to btree map
     let commitment_secrets: BTreeMap<CommitmentMessageId, WinternitzSecret> =
         commitment_secrets.clone().into_iter().collect();
@@ -170,22 +165,25 @@ pub fn groth16_commitment_secrets_to_public_keys(
     }
     secrets_vec.sort_by(|a, b| a.0.cmp(&b.0));
 
-    let res: Vec<Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>> =  
-    secrets_vec.chunks(MAX_CONNECTORS_E_PER_TX)
+    let res: Vec<Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>> = secrets_vec
+        .chunks(MAX_CONNECTORS_E_PER_TX)
         .map(|chunk| {
-            chunk.iter()
+            chunk
+                .iter()
                 .map(|&(_, (message_id, secret))| {
-                    BTreeMap::from(
-                        [(message_id.clone(), WinternitzPublicKey::from(secret))]
-                    )
-                }).collect()
-        }).collect();
+                    BTreeMap::from([(message_id.clone(), WinternitzPublicKey::from(secret))])
+                })
+                .collect()
+        })
+        .collect();
 
     res.try_into().unwrap_or_else(|_e| panic!("impossible"))
 }
 
 pub fn merge_to_connector_c_commits_public_key(
-    connectors_e_commitment_public_keys: &[Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>]
+    connectors_e_commitment_public_keys: &[Vec<
+        BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+    >],
 ) -> BTreeMap<CommitmentMessageId, WinternitzPublicKey> {
     let mut connector_c_commitment_public_keys = BTreeMap::new();
     for tree_vec in connectors_e_commitment_public_keys {
@@ -213,6 +211,6 @@ pub fn convert_to_connector_c_commits_public_key(
     let mut connector_c_commitment_public_keys = BTreeMap::new();
     for (_, (message_id, pubkey)) in pubkeys_vec {
         connector_c_commitment_public_keys.insert(message_id.clone(), pubkey.clone());
-    };
+    }
     connector_c_commitment_public_keys
 }
diff --git a/goat/src/transactions/base.rs b/goat/src/transactions/base.rs
index 908bed3f..09d97b57 100644
--- a/goat/src/transactions/base.rs
+++ b/goat/src/transactions/base.rs
@@ -1,17 +1,17 @@
 use super::assert::utils::COMMIT_TX_NUM;
 use super::pre_signed_musig2::{verify_public_nonce, PreSignedMusig2Transaction};
-use bitcoin::{Amount, OutPoint, PublicKey, Script, Transaction, Txid, XOnlyPublicKey, consensus};
 use bitcoin::policy::{DEFAULT_MIN_RELAY_TX_FEE, DUST_RELAY_TX_FEE};
+use bitcoin::{consensus, Amount, OutPoint, PublicKey, Script, Transaction, Txid, XOnlyPublicKey};
 use core::cmp;
 use itertools::Itertools;
 use musig2::{secp256k1::schnorr::Signature, PubNonce};
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use serde::{Serialize, Deserialize};
 
 pub const CROWDFUNDING_AMOUNT: u64 = 100_000; // 0.001 btc
-// for commonly used type in codebase - p2wsh txout
-// 67 = (32 + 4 + 1 + (107 / WITNESS_SCALE_FACTOR) + 4) for segwit TxOut
-// TODO: Use lower dust amount for other txout types
+                                              // for commonly used type in codebase - p2wsh txout
+                                              // 67 = (32 + 4 + 1 + (107 / WITNESS_SCALE_FACTOR) + 4) for segwit TxOut
+                                              // TODO: Use lower dust amount for other txout types
 pub const DUST_AMOUNT: u64 = (43 + 67) * DUST_RELAY_FEE_RATE;
 pub const MIN_RELAY_FEE_RATE: u64 = (DEFAULT_MIN_RELAY_TX_FEE / 1000) as u64;
 pub const DUST_RELAY_FEE_RATE: u64 = (DUST_RELAY_TX_FEE / 1000) as u64;
@@ -33,7 +33,9 @@ pub const PEG_OUT_FEE: u64 = MIN_RELAY_FEE_PEG_OUT_CONFIRM // depth 0
 pub const PEG_IN_FEE: u64 =
     MIN_RELAY_FEE_PEG_IN_DEPOSIT + max(MIN_RELAY_FEE_PEG_IN_CONFIRM, MIN_RELAY_FEE_PEG_IN_REFUND);
 
-pub const fn max(a: u64, b: u64) -> u64 { [a, b][(a < b) as usize] }
+pub const fn max(a: u64, b: u64) -> u64 {
+    [a, b][(a < b) as usize]
+}
 
 // TODO: set to larger value to be compatible with future tx modifications
 // TODO: consider use CPFP to avoid uncertainty
diff --git a/goat/src/transactions/challenge.rs b/goat/src/transactions/challenge.rs
index bc81a83e..a10cbad5 100644
--- a/goat/src/transactions/challenge.rs
+++ b/goat/src/transactions/challenge.rs
@@ -25,13 +25,21 @@ pub struct ChallengeTransaction {
 }
 
 impl PreSignedTransaction for ChallengeTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl ChallengeTransaction {
@@ -172,7 +180,9 @@ impl ChallengeTransaction {
         merge_transactions(&mut self.tx, &challenge.tx);
     }
 
-    pub fn min_crowdfunding_amount(&self) -> u64 { self.input_amount_crowdfunding.to_sat() }
+    pub fn min_crowdfunding_amount(&self) -> u64 {
+        self.input_amount_crowdfunding.to_sat()
+    }
 }
 
 impl BaseTransaction for ChallengeTransaction {
@@ -183,5 +193,7 @@ impl BaseTransaction for ChallengeTransaction {
 
         self.tx.clone()
     }
-    fn name(&self) -> &'static str { "Challenge" }
+    fn name(&self) -> &'static str {
+        "Challenge"
+    }
 }
diff --git a/goat/src/transactions/disprove.rs b/goat/src/transactions/disprove.rs
index c0e41fed..cbe18379 100644
--- a/goat/src/transactions/disprove.rs
+++ b/goat/src/transactions/disprove.rs
@@ -6,7 +6,6 @@ use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
-
 use super::{
     super::{
         connectors::{base::*, connector_5::Connector5, connector_c::ConnectorC},
@@ -34,17 +33,27 @@ pub struct DisproveTransaction {
 }
 
 impl PreSignedTransaction for DisproveTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for DisproveTransaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -64,7 +73,9 @@ impl PreSignedMusig2Transaction for DisproveTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
-    fn verifier_inputs(&self) -> Vec<usize> { vec![0] }
+    fn verifier_inputs(&self) -> Vec<usize> {
+        vec![0]
+    }
 }
 
 impl DisproveTransaction {
@@ -230,8 +241,12 @@ impl DisproveTransaction {
         );
 
         // Deduct relay fee
-        let fee_amount = Amount::from_sat((self.tx.weight().to_vbytes_ceil() as f64 * fee_rate).ceil() as u64);
-        assert!(fee_amount <= self.tx.output[output_index].value, "reward does not cover relay fee");
+        let fee_amount =
+            Amount::from_sat((self.tx.weight().to_vbytes_ceil() as f64 * fee_rate).ceil() as u64);
+        assert!(
+            fee_amount <= self.tx.output[output_index].value,
+            "reward does not cover relay fee"
+        );
         self.tx.output[output_index].value -= fee_amount;
     }
 
@@ -249,5 +264,7 @@ impl BaseTransaction for DisproveTransaction {
 
         self.tx.clone()
     }
-    fn name(&self) -> &'static str { "Disprove" }
+    fn name(&self) -> &'static str {
+        "Disprove"
+    }
 }
diff --git a/goat/src/transactions/kick_off.rs b/goat/src/transactions/kick_off.rs
index c04d8bde..520ea2b7 100644
--- a/goat/src/transactions/kick_off.rs
+++ b/goat/src/transactions/kick_off.rs
@@ -1,17 +1,15 @@
-use bitcoin::{
-    absolute, consensus, Amount, ScriptBuf, TapSighashType, Transaction, TxOut,
-};
+use bitcoin::{absolute, consensus, Amount, ScriptBuf, TapSighashType, Transaction, TxOut};
 use serde::{Deserialize, Serialize};
 
 use super::{
     super::{
         connectors::{
-            base::*, connector_3::Connector3, connector_6::Connector6, 
-            connector_a::ConnectorA, connector_b::ConnectorB,
+            base::*, connector_3::Connector3, connector_6::Connector6, connector_a::ConnectorA,
+            connector_b::ConnectorB,
         },
         contexts::operator::OperatorContext,
     },
-    base::{*, DUST_AMOUNT},
+    base::{DUST_AMOUNT, *},
     pre_signed::*,
     signing::{generate_taproot_leaf_schnorr_signature, populate_taproot_input_witness},
 };
@@ -27,13 +25,21 @@ pub struct KickOffTransaction {
 }
 
 impl PreSignedTransaction for KickOffTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl KickOffTransaction {
@@ -44,13 +50,7 @@ impl KickOffTransaction {
         connector_b: &ConnectorB,
         input_0: Input,
     ) -> Self {
-        Self::new_for_validation(
-            connector_3,
-            connector_6,
-            connector_a,
-            connector_b,
-            input_0,
-        )
+        Self::new_for_validation(connector_3, connector_6, connector_a, connector_b, input_0)
     }
 
     pub fn new_for_validation(
@@ -65,7 +65,6 @@ impl KickOffTransaction {
 
         let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_KICK_OFF);
 
-
         let _output_0 = TxOut {
             value: Amount::from_sat(DUST_AMOUNT),
             script_pubkey: connector_3.generate_address().script_pubkey(),
@@ -90,7 +89,7 @@ impl KickOffTransaction {
             },
             prev_outs: vec![TxOut {
                 value: input_0.amount,
-                script_pubkey: connector_6.generate_taproot_address().script_pubkey(), 
+                script_pubkey: connector_6.generate_taproot_address().script_pubkey(),
             }],
             prev_scripts: vec![connector_6.generate_taproot_leaf_script(input_0_leaf)],
         }
@@ -137,15 +136,15 @@ impl KickOffTransaction {
         connector_6: &Connector6,
         evm_txid_inputs: &WinternitzSigningInputs,
     ) {
-        self.sign_input_0(
-            context,
-            connector_6,
-            evm_txid_inputs,
-        );
+        self.sign_input_0(context, connector_6, evm_txid_inputs);
     }
 }
 
 impl BaseTransaction for KickOffTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-    fn name(&self) -> &'static str { "KickOff" }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "KickOff"
+    }
 }
diff --git a/goat/src/transactions/mod.rs b/goat/src/transactions/mod.rs
index 4e046ac1..ae7096be 100644
--- a/goat/src/transactions/mod.rs
+++ b/goat/src/transactions/mod.rs
@@ -1,13 +1,13 @@
 pub mod assert;
-pub mod peg_in;
 pub mod base;
 pub mod challenge;
 pub mod disprove;
 pub mod kick_off;
+pub mod peg_in;
 pub mod peg_out_confirm;
-pub mod pre_signed_musig2;
 pub mod pre_signed;
-pub mod signing_musig2;
+pub mod pre_signed_musig2;
 pub mod signing;
+pub mod signing_musig2;
 pub mod take_1;
-pub mod take_2;
\ No newline at end of file
+pub mod take_2;
diff --git a/goat/src/transactions/peg_in/mod.rs b/goat/src/transactions/peg_in/mod.rs
index 00dec365..0740c521 100644
--- a/goat/src/transactions/peg_in/mod.rs
+++ b/goat/src/transactions/peg_in/mod.rs
@@ -1,4 +1,4 @@
+pub mod peg_in;
 pub mod peg_in_confirm;
 pub mod peg_in_deposit;
 pub mod peg_in_refund;
-pub mod peg_in;
\ No newline at end of file
diff --git a/goat/src/transactions/peg_in/peg_in.rs b/goat/src/transactions/peg_in/peg_in.rs
index 5e2825e6..01e90bd3 100644
--- a/goat/src/transactions/peg_in/peg_in.rs
+++ b/goat/src/transactions/peg_in/peg_in.rs
@@ -1,6 +1,4 @@
-use bitcoin::{
-    absolute, consensus, Address, Amount, Transaction, TxIn, TxOut
-};
+use bitcoin::{absolute, consensus, Address, Amount, Transaction, TxIn, TxOut};
 use serde::{Deserialize, Serialize};
 
 use crate::scripts::generate_opreturn_script;
@@ -25,19 +23,21 @@ impl PegInTransaction {
         inputs: Vec<Input>,
         deposit_amount: Amount,
         fee_amount: Amount,
-        change_address: Address, 
+        change_address: Address,
         message: Vec<u8>,
     ) -> Self {
         let mut total_input_amount = Amount::ZERO;
         let input_amounts: Vec<Amount> = inputs.iter().map(|input| input.amount).collect();
-        let txins: Vec<TxIn> = inputs.iter()
+        let txins: Vec<TxIn> = inputs
+            .iter()
             .map(|input| {
                 total_input_amount += input.amount;
                 generate_default_tx_in(input)
-            }).collect();
+            })
+            .collect();
         let change_amount = total_input_amount - deposit_amount - fee_amount;
         let mut txouts = vec![];
-        let output_0 =  TxOut {
+        let output_0 = TxOut {
             value: deposit_amount,
             script_pubkey: connector_0.generate_taproot_address().script_pubkey(),
         };
@@ -58,7 +58,7 @@ impl PegInTransaction {
             fee_amount += change_amount;
         }
 
-        PegInTransaction { 
+        PegInTransaction {
             tx: Transaction {
                 version: bitcoin::transaction::Version(2),
                 lock_time: absolute::LockTime::ZERO,
@@ -69,13 +69,21 @@ impl PegInTransaction {
             input_amounts,
         }
     }
-    
-    pub fn tx(&self) -> &Transaction { &self.tx }
 
-    pub fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    pub fn tx(&self) -> &Transaction {
+        &self.tx
+    }
+
+    pub fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 }
 
 impl BaseTransaction for PegInTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-    fn name(&self) -> &'static str { "PegIn" }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "PegIn"
+    }
 }
diff --git a/goat/src/transactions/peg_in/peg_in_confirm.rs b/goat/src/transactions/peg_in/peg_in_confirm.rs
index 8120171c..3d00155b 100644
--- a/goat/src/transactions/peg_in/peg_in_confirm.rs
+++ b/goat/src/transactions/peg_in/peg_in_confirm.rs
@@ -34,17 +34,27 @@ pub struct PegInConfirmTransaction {
 }
 
 impl PreSignedTransaction for PegInConfirmTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for PegInConfirmTransaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -64,7 +74,9 @@ impl PreSignedMusig2Transaction for PegInConfirmTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
-    fn verifier_inputs(&self) -> Vec<usize> { vec![0] }
+    fn verifier_inputs(&self) -> Vec<usize> {
+        vec![0]
+    }
 }
 
 impl PegInConfirmTransaction {
@@ -207,10 +219,10 @@ impl PegInConfirmTransaction {
     }
 
     pub fn try_finalize_input_0(
-        &mut self, 
-        context: &dyn BaseContext, 
-        connector_z: &ConnectorZ, 
-        depositor_signature: bitcoin::taproot::Signature
+        &mut self,
+        context: &dyn BaseContext,
+        connector_z: &ConnectorZ,
+        depositor_signature: bitcoin::taproot::Signature,
     ) {
         let input_index = 0;
         assert!(self.has_all_signatures(), "pre-sign not finished");
@@ -254,6 +266,10 @@ impl PegInConfirmTransaction {
 }
 
 impl BaseTransaction for PegInConfirmTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-    fn name(&self) -> &'static str { PEG_IN_CONFIRM_TX_NAME }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        PEG_IN_CONFIRM_TX_NAME
+    }
 }
diff --git a/goat/src/transactions/peg_in/peg_in_deposit.rs b/goat/src/transactions/peg_in/peg_in_deposit.rs
index b9339c13..ac951484 100644
--- a/goat/src/transactions/peg_in/peg_in_deposit.rs
+++ b/goat/src/transactions/peg_in/peg_in_deposit.rs
@@ -1,5 +1,8 @@
 use bitcoin::{
-    absolute, consensus::{self}, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, Sequence, Transaction, TxIn, TxOut, Witness
+    absolute,
+    consensus::{self},
+    Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, Sequence, Transaction, TxIn, TxOut,
+    Witness,
 };
 use serde::{Deserialize, Serialize};
 
@@ -46,7 +49,7 @@ impl PegInDepositTransactionGeneral {
                 lock_time: absolute::LockTime::ZERO,
                 input: vec![_input_0],
                 output: vec![_output_0],
-            }
+            },
         }
     }
 
@@ -54,14 +57,22 @@ impl PegInDepositTransactionGeneral {
         self.tx.input[0].witness = witness
     }
 
-    pub fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    pub fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    pub fn tx(&self) -> &Transaction { &self.tx }
+    pub fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 }
 
 impl BaseTransaction for PegInDepositTransactionGeneral {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-    fn name(&self) -> &'static str { "PegInDeposit" }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "PegInDeposit"
+    }
 }
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -74,13 +85,21 @@ pub struct PegInDepositTransaction {
 }
 
 impl PreSignedTransaction for PegInDepositTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PegInDepositTransaction {
@@ -166,6 +185,10 @@ impl PegInDepositTransaction {
 }
 
 impl BaseTransaction for PegInDepositTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-    fn name(&self) -> &'static str { "PegInDeposit" }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "PegInDeposit"
+    }
 }
diff --git a/goat/src/transactions/peg_in/peg_in_refund.rs b/goat/src/transactions/peg_in/peg_in_refund.rs
index ea6da3cc..c46ad04f 100644
--- a/goat/src/transactions/peg_in/peg_in_refund.rs
+++ b/goat/src/transactions/peg_in/peg_in_refund.rs
@@ -24,13 +24,21 @@ pub struct PegInRefundTransaction {
 }
 
 impl PreSignedTransaction for PegInRefundTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PegInRefundTransaction {
@@ -124,6 +132,10 @@ impl PegInRefundTransaction {
 }
 
 impl BaseTransaction for PegInRefundTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-    fn name(&self) -> &'static str { "PegInRefund" }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "PegInRefund"
+    }
 }
diff --git a/goat/src/transactions/peg_out_confirm.rs b/goat/src/transactions/peg_out_confirm.rs
index cf4c6e18..119ce913 100644
--- a/goat/src/transactions/peg_out_confirm.rs
+++ b/goat/src/transactions/peg_out_confirm.rs
@@ -1,6 +1,6 @@
 use bitcoin::{
-    absolute, consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, Transaction,
-    TxOut, Witness, Address, TxIn
+    absolute, consensus, Address, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf,
+    Transaction, TxIn, TxOut, Witness,
 };
 use serde::{Deserialize, Serialize};
 
@@ -29,18 +29,20 @@ impl PreKickoffTransaction {
         inputs: Vec<Input>,
         stake_amount: Amount,
         fee_amount: Amount,
-        change_address: Address, 
+        change_address: Address,
     ) -> Self {
         let mut total_input_amount = Amount::ZERO;
         let input_amounts: Vec<Amount> = inputs.iter().map(|input| input.amount).collect();
-        let txins: Vec<TxIn> = inputs.iter()
+        let txins: Vec<TxIn> = inputs
+            .iter()
             .map(|input| {
                 total_input_amount += input.amount;
                 generate_default_tx_in(input)
-            }).collect();
+            })
+            .collect();
         let change_amount = total_input_amount - stake_amount - fee_amount;
         let mut txouts = vec![];
-        let output_0 =  TxOut {
+        let output_0 = TxOut {
             value: stake_amount,
             script_pubkey: connector_6.generate_taproot_address().script_pubkey(),
         };
@@ -72,14 +74,22 @@ impl PreKickoffTransaction {
         self.tx.input[input_index].witness = witness
     }
 
-    pub fn tx(&self) -> &Transaction { &self.tx }
+    pub fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    pub fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    pub fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 }
 
 impl BaseTransaction for PreKickoffTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-    fn name(&self) -> &'static str { "PreKickoff" }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "PreKickoff"
+    }
 }
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -92,13 +102,21 @@ pub struct PegOutConfirmTransaction {
 }
 
 impl PreSignedTransaction for PegOutConfirmTransaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PegOutConfirmTransaction {
@@ -158,6 +176,10 @@ impl PegOutConfirmTransaction {
 }
 
 impl BaseTransaction for PegOutConfirmTransaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-    fn name(&self) -> &'static str { "PegOutConfirm" }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "PegOutConfirm"
+    }
 }
diff --git a/goat/src/transactions/pre_signed_musig2.rs b/goat/src/transactions/pre_signed_musig2.rs
index b25f211d..aaf55983 100644
--- a/goat/src/transactions/pre_signed_musig2.rs
+++ b/goat/src/transactions/pre_signed_musig2.rs
@@ -1,31 +1,32 @@
 use bitcoin::{
     hashes::{sha256, Hash},
-    taproot::TaprootSpendInfo, key::Keypair,
+    key::Keypair,
+    taproot::TaprootSpendInfo,
     PublicKey, TapSighashType, XOnlyPublicKey,
 };
 use musig2::{
     secp::MaybeScalar,
     secp256k1::{schnorr::Signature, Message},
-    BinaryEncoding, PartialSignature, PubNonce, SecNonce
+    BinaryEncoding, PartialSignature, PubNonce, SecNonce,
 };
 use std::collections::HashMap;
 
 use super::{
     super::contexts::{base::BaseContext, verifier::VerifierContext},
+    super::error::Error,
     pre_signed::PreSignedTransaction,
     signing::push_taproot_leaf_script_and_control_block_to_witness,
     signing_musig2::{
         generate_aggregated_nonce, generate_nonce, generate_taproot_aggregated_signature,
         generate_taproot_partial_signature,
     },
-    super::error::Error,
 };
 
-pub fn generate_nonce_and_sign(signer_keypair: Keypair) -> (SecNonce, PubNonce, Signature) { 
+pub fn generate_nonce_and_sign(signer_keypair: Keypair) -> (SecNonce, PubNonce, Signature) {
     let secret_nonce = generate_nonce();
     let public_nonce = secret_nonce.public_nonce();
-    let nonce_signature = signer_keypair
-        .sign_schnorr(get_nonce_message(&secret_nonce.public_nonce()));
+    let nonce_signature =
+        signer_keypair.sign_schnorr(get_nonce_message(&secret_nonce.public_nonce()));
     (secret_nonce, public_nonce, nonce_signature)
 }
 
@@ -105,16 +106,22 @@ pub trait PreSignedMusig2Transaction: PreSignedTransaction {
         &mut self,
         verifier_pubkey: &PublicKey,
         nonces_with_sigs: &HashMap<usize, (PubNonce, Signature)>,
-    ) -> Option<Error> { 
+    ) -> Option<Error> {
         for index in self.verifier_inputs() {
             let (pub_nonce, nonce_signature) = match nonces_with_sigs.get(&index) {
                 Some(v) => v,
-                _ => return Some(Error::Other("PubNonce for {index}'th input not found"))
+                _ => return Some(Error::Other("PubNonce for {index}'th input not found")),
             };
-            if !verify_public_nonce(nonce_signature, pub_nonce, &XOnlyPublicKey::from(*verifier_pubkey)) {
-                return Some(Error::Other("invalid nonce signature for PubNonce of {index}'th input"))
+            if !verify_public_nonce(
+                nonce_signature,
+                pub_nonce,
+                &XOnlyPublicKey::from(*verifier_pubkey),
+            ) {
+                return Some(Error::Other(
+                    "invalid nonce signature for PubNonce of {index}'th input",
+                ));
             }
-            
+
             // push pub_nonce
             let musig2_nonces = self.musig2_nonces_mut();
             if musig2_nonces.get(&index).is_none() {
@@ -134,7 +141,6 @@ pub trait PreSignedMusig2Transaction: PreSignedTransaction {
                 .get_mut(&index)
                 .unwrap()
                 .insert(*verifier_pubkey, nonce_signature.clone());
-
         }
         None
     }
@@ -147,7 +153,11 @@ pub trait PreSignedMusig2Transaction: PreSignedTransaction {
         for index in self.verifier_inputs() {
             let partial_signature = match partial_sigs.get(&index) {
                 Some(v) => v,
-                _ => return Some(Error::Other("partial signature for {index}'th input not found"))
+                _ => {
+                    return Some(Error::Other(
+                        "partial signature for {index}'th input not found",
+                    ))
+                }
             };
 
             let musig2_signatures = self.musig2_signatures_mut();
@@ -158,7 +168,6 @@ pub trait PreSignedMusig2Transaction: PreSignedTransaction {
                 .get_mut(&index)
                 .unwrap()
                 .insert(*verifier_pubkey, *partial_signature);
-
         }
         None
     }
@@ -273,31 +282,27 @@ pub fn finalize_musig2_taproot_input<T: PreSignedTransaction + PreSignedMusig2Tr
 
 #[test]
 fn test_musig2() {
-    use super::super::contexts::{
-        base::generate_keys_from_secret,
-        operator::OperatorContext,
-        verifier::VerifierContext,
-    };
     use super::super::connectors::{
-        connector_0::Connector0,
-        connector_3::Connector3,
-        connector_a::ConnectorA,
+        connector_0::Connector0, connector_3::Connector3, connector_a::ConnectorA,
     };
-    use super::{
-        base::Input,
-        take_1::Take1Transaction,
+    use super::super::contexts::{
+        base::generate_keys_from_secret, operator::OperatorContext, verifier::VerifierContext,
     };
+    use super::{base::Input, take_1::Take1Transaction};
     use bitcoin::{
-        PublicKey, Network, Amount, OutPoint, Txid, 
-        sighash::{SighashCache, Prevouts}, TapLeafHash,
+        sighash::{Prevouts, SighashCache},
         taproot::LeafVersion,
+        Amount, Network, OutPoint, PublicKey, TapLeafHash, Txid,
     };
     use std::str::FromStr;
 
     let source_network = Network::Testnet;
-    const OPERATOR_SECRET: &str = "3076ca1dfc1e383be26d5dd3c0c427340f96139fa8c2520862cf551ec2d670ac";
-    const VERIFIER_0_SECRET: &str = "ee0817eac0c13aa8ee2dd3256304041f09f0499d1089b56495310ae8093583e2";
-    const VERIFIER_1_SECRET: &str = "fc294c70faf210d4d0807ea7a3dba8f7e41700d90c119e1ae82a0687d89d297f";
+    const OPERATOR_SECRET: &str =
+        "3076ca1dfc1e383be26d5dd3c0c427340f96139fa8c2520862cf551ec2d670ac";
+    const VERIFIER_0_SECRET: &str =
+        "ee0817eac0c13aa8ee2dd3256304041f09f0499d1089b56495310ae8093583e2";
+    const VERIFIER_1_SECRET: &str =
+        "fc294c70faf210d4d0807ea7a3dba8f7e41700d90c119e1ae82a0687d89d297f";
 
     let (_, verifier_0_public_key) = generate_keys_from_secret(source_network, VERIFIER_0_SECRET);
     let (_, verifier_1_public_key) = generate_keys_from_secret(source_network, VERIFIER_1_SECRET);
@@ -312,15 +317,11 @@ fn test_musig2() {
     let verifier_1_context =
         VerifierContext::new(source_network, VERIFIER_1_SECRET, &n_of_n_public_keys);
 
-
     let connector_0 = Connector0::new(
         source_network,
         &verifier_0_context.n_of_n_taproot_public_key,
     );
-    let connector_3 = Connector3::new(
-        source_network,
-        &operator_context.operator_public_key,
-    );
+    let connector_3 = Connector3::new(source_network, &operator_context.operator_public_key);
     let connector_a = ConnectorA::new(
         source_network,
         &operator_context.operator_taproot_public_key,
@@ -328,29 +329,34 @@ fn test_musig2() {
     );
     let mock_input = Input {
         outpoint: OutPoint {
-            txid: Txid::from_str("a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d").unwrap(),
+            txid: Txid::from_str(
+                "a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d",
+            )
+            .unwrap(),
             vout: 0,
         },
         amount: Amount::from_sat(100000),
     };
 
     let mut take_1 = Take1Transaction::new_for_validation(
-        source_network, 
-        &operator_context.operator_public_key, 
-        &connector_0, 
-        &connector_3, 
-        &connector_a, 
-        mock_input.clone(), 
-        mock_input.clone(), 
+        source_network,
+        &operator_context.operator_public_key,
+        &connector_0,
+        &connector_3,
+        &connector_a,
+        mock_input.clone(),
+        mock_input.clone(),
         mock_input.clone(),
     );
     let pre_sign_input_index = 0;
     let sighash_type = TapSighashType::All;
 
-    let (sec_nonce_0, pub_nonce_0, _) = generate_nonce_and_sign(verifier_0_context.verifier_keypair);
-    let (sec_nonce_1, pub_nonce_1, _) = generate_nonce_and_sign(verifier_1_context.verifier_keypair);
+    let (sec_nonce_0, pub_nonce_0, _) =
+        generate_nonce_and_sign(verifier_0_context.verifier_keypair);
+    let (sec_nonce_1, pub_nonce_1, _) =
+        generate_nonce_and_sign(verifier_1_context.verifier_keypair);
     let agg_nonce = generate_aggregated_nonce(&vec![pub_nonce_0, pub_nonce_1]);
-    
+
     let partial_sig_0 = generate_taproot_partial_signature(
         &verifier_0_context,
         take_1.tx(),
@@ -360,7 +366,8 @@ fn test_musig2() {
         take_1.prev_outs(),
         &take_1.prev_scripts()[pre_sign_input_index],
         sighash_type,
-    ).unwrap();
+    )
+    .unwrap();
     let partial_sig_1 = generate_taproot_partial_signature(
         &verifier_1_context,
         take_1.tx(),
@@ -370,7 +377,8 @@ fn test_musig2() {
         take_1.prev_outs(),
         &take_1.prev_scripts()[pre_sign_input_index],
         sighash_type,
-    ).unwrap();
+    )
+    .unwrap();
 
     let agg_sig = generate_taproot_aggregated_signature(
         &operator_context,
@@ -381,20 +389,18 @@ fn test_musig2() {
         &take_1.prev_scripts()[pre_sign_input_index],
         sighash_type,
         vec![partial_sig_0, partial_sig_1],
-    ).unwrap();
+    )
+    .unwrap();
 
     let final_signature = bitcoin::taproot::Signature {
         signature: agg_sig.into(),
         sighash_type,
     };
 
-    take_1.push_pre_sigs(
-        &connector_0, 
-        final_signature,
-    );
+    take_1.push_pre_sigs(&connector_0, final_signature);
 
     let leaf_hash = TapLeafHash::from_script(
-        &take_1.prev_scripts()[pre_sign_input_index], 
+        &take_1.prev_scripts()[pre_sign_input_index],
         LeafVersion::TapScript,
     );
     let prevouts = take_1.prev_outs().clone();
@@ -408,8 +414,8 @@ fn test_musig2() {
         )
         .expect("Failed to construct sighash");
     let success = verify_schnorr_signature(
-        &final_signature.signature, 
-        &Message::from(sighash), 
+        &final_signature.signature,
+        &Message::from(sighash),
         &operator_context.n_of_n_taproot_public_key,
     );
     assert!(success);
diff --git a/goat/src/transactions/signing_musig2.rs b/goat/src/transactions/signing_musig2.rs
index e29d360d..b8e70c53 100644
--- a/goat/src/transactions/signing_musig2.rs
+++ b/goat/src/transactions/signing_musig2.rs
@@ -1,21 +1,25 @@
 #![allow(clippy::too_many_arguments)]
 use bitcoin::{
     sighash::{Prevouts, SighashCache},
-    taproot::LeafVersion, 
+    taproot::LeafVersion,
     Script, TapLeafHash, TapSighashType, Transaction, TxOut,
 };
 use musig2::{
     aggregate_partial_signatures,
     errors::{SigningError, VerifyError},
-    secp::{MaybeScalar, Point}, 
+    secp::{MaybeScalar, Point},
     sign_partial, AggNonce, KeyAggContext, LiftedSignature, PartialSignature, PubNonce, SecNonce,
 };
 
 use super::super::contexts::{base::BaseContext, verifier::VerifierContext};
 
-pub fn generate_nonce() -> SecNonce { SecNonce::build(&mut rand::rngs::OsRng).build() }
+pub fn generate_nonce() -> SecNonce {
+    SecNonce::build(&mut rand::rngs::OsRng).build()
+}
 
-pub fn generate_aggregated_nonce(nonces: &Vec<PubNonce>) -> AggNonce { AggNonce::sum(nonces) }
+pub fn generate_aggregated_nonce(nonces: &Vec<PubNonce>) -> AggNonce {
+    AggNonce::sum(nonces)
+}
 
 pub fn generate_taproot_partial_signature(
     context: &VerifierContext,
@@ -89,5 +93,3 @@ pub fn generate_taproot_aggregated_signature(
         sighash_cache,
     )
 }
-
-
diff --git a/goat/src/transactions/take_1.rs b/goat/src/transactions/take_1.rs
index 7607253c..7b9dc8ed 100644
--- a/goat/src/transactions/take_1.rs
+++ b/goat/src/transactions/take_1.rs
@@ -34,17 +34,27 @@ pub struct Take1Transaction {
 }
 
 impl PreSignedTransaction for Take1Transaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for Take1Transaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -64,7 +74,9 @@ impl PreSignedMusig2Transaction for Take1Transaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
-    fn verifier_inputs(&self) -> Vec<usize> { vec![0, 3] }
+    fn verifier_inputs(&self) -> Vec<usize> {
+        vec![0, 3]
+    }
 }
 
 impl Take1Transaction {
@@ -248,6 +260,10 @@ impl Take1Transaction {
 }
 
 impl BaseTransaction for Take1Transaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-    fn name(&self) -> &'static str { "Take1" }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "Take1"
+    }
 }
diff --git a/goat/src/transactions/take_2.rs b/goat/src/transactions/take_2.rs
index 0b62d8de..3b48179b 100644
--- a/goat/src/transactions/take_2.rs
+++ b/goat/src/transactions/take_2.rs
@@ -1,6 +1,6 @@
 use bitcoin::{
-    absolute, consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, TapSighashType,
-    Transaction, TxOut, TapNodeHash,
+    absolute, consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, TapNodeHash,
+    TapSighashType, Transaction, TxOut,
 };
 use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
 use serde::{Deserialize, Serialize};
@@ -35,17 +35,27 @@ pub struct Take2Transaction {
 }
 
 impl PreSignedTransaction for Take2Transaction {
-    fn tx(&self) -> &Transaction { &self.tx }
+    fn tx(&self) -> &Transaction {
+        &self.tx
+    }
 
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+    fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
 
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+    fn prev_outs(&self) -> &Vec<TxOut> {
+        &self.prev_outs
+    }
 
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> {
+        &self.prev_scripts
+    }
 }
 
 impl PreSignedMusig2Transaction for Take2Transaction {
-    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> { &self.musig2_nonces }
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &self.musig2_nonces
+    }
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
         &mut self.musig2_nonces
     }
@@ -65,7 +75,9 @@ impl PreSignedMusig2Transaction for Take2Transaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
-    fn verifier_inputs(&self) -> Vec<usize> { vec![0, 2] }
+    fn verifier_inputs(&self) -> Vec<usize> {
+        vec![0, 2]
+    }
 }
 
 impl Take2Transaction {
@@ -242,7 +254,11 @@ impl Take2Transaction {
         );
     }
 
-    pub fn sign_input_3_lit(&mut self, context: &OperatorContext, connector_c_taproot_merkle_root: TapNodeHash) {
+    pub fn sign_input_3_lit(
+        &mut self,
+        context: &OperatorContext,
+        connector_c_taproot_merkle_root: TapNodeHash,
+    ) {
         let input_index = 3;
         let prev_outs = &self.prev_outs().clone();
 
@@ -278,7 +294,8 @@ impl Take2Transaction {
         input_0_sig: bitcoin::taproot::Signature,
         input_2_sig: bitcoin::taproot::Signature,
     ) {
-        {   // input_0: connector_0
+        {
+            // input_0: connector_0
             let input_index = 0;
             let script = self.prev_scripts()[input_index].clone();
             let spend_info = connector_0.generate_taproot_spend_info();
@@ -297,7 +314,8 @@ impl Take2Transaction {
             );
         }
 
-        {   // input_2: connector_5
+        {
+            // input_2: connector_5
             let input_index = 2;
             let script = self.prev_scripts()[input_index].clone();
             let spend_info = connector_5.generate_taproot_spend_info();
@@ -342,6 +360,10 @@ impl Take2Transaction {
 }
 
 impl BaseTransaction for Take2Transaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-    fn name(&self) -> &'static str { "Take2" }
+    fn finalize(&self) -> Transaction {
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str {
+        "Take2"
+    }
 }