diff --git a/.env.sample b/.env.sample
new file mode 100644
index 000000000..01f969f8b
--- /dev/null
+++ b/.env.sample
@@ -0,0 +1,27 @@
+export BRIDGE_DATA_STORE_CLIENT_DATA_SUFFIX=-"bridge-client-data.json"
+
+export BRIDGE_AWS_ACCESS_KEY_ID=""
+export BRIDGE_AWS_SECRET_ACCESS_KEY=""
+export BRIDGE_AWS_REGION=""
+export BRIDGE_AWS_BUCKET=""
+export KEY_DIR=""
+export VERIFIERS=""
+export ENVIRONMENT=""
+
+# export BRIDGE_SFTP_HOST=""
+# export BRIDGE_SFTP_PORT="22"
+# export BRIDGE_SFTP_USERNAME=""
+# export BRIDGE_SFTP_KEYFILE_PATH=""
+# export BRIDGE_SFTP_BASE_PATH="/bitvm"
+
+# export BRIDGE_FTP_HOST=""
+# export BRIDGE_FTP_PORT="21"
+# export BRIDGE_FTP_USERNAME=""
+# export BRIDGE_FTP_PASSWORD=""
+# export BRIDGE_FTP_BASE_PATH="/bitvm"
+
+# export BRIDGE_FTPS_HOST=""
+# export BRIDGE_FTPS_PORT="21"
+# export BRIDGE_FTPS_USERNAME=""
+# export BRIDGE_FTPS_PASSWORD=""
+# export BRIDGE_FTPS_BASE_PATH="/bitvm"
\ No newline at end of file
diff --git a/.env.test.sample b/.env.test.sample
new file mode 100644
index 000000000..e03ab30ca
--- /dev/null
+++ b/.env.test.sample
@@ -0,0 +1,2 @@
+# Desired block time in seconds for the regtest network
+REGTEST_BLOCK_TIME=5
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
new file mode 100644
index 000000000..fb347a77f
--- /dev/null
+++ b/.github/workflows/CI.yml
@@ -0,0 +1,115 @@
+name: BitVM CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    branches: ["*"]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  clippy:
+    if: github.event.pull_request.draft == false
+    timeout-minutes: 60
+    runs-on: self-hosted
+    steps:
+    - uses: actions/checkout@v4
+    - name: Run clippy (no guests)
+      run: cargo clippy --workspace --exclude header-chain-circuit --exclude final-spv-circuit
+
+  guest:
+    if: github.event.pull_request.draft == false
+    timeout-minutes: 60
+    runs-on: self-hosted
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build guests
+      run: |
+        REPR_GUEST_BUILD=1 BITCOIN_NETWORK=mainnet cargo build -p header-chain-circuit --release
+        REPR_GUEST_BUILD=1 BITCOIN_NETWORK=mainnet cargo build -p final-spv-circuit --release
+
+  build:
+    if: github.event.pull_request.draft == false
+    timeout-minutes: 60
+    runs-on: self-hosted
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Cache Build Artifacts
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          target/
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: Build
+      run: cargo build
+  
+  test_script:
+    if: github.event.pull_request.draft == false
+    timeout-minutes: 120
+    needs: build
+    runs-on: self-hosted
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Cache Build Artifacts
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          target/
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: Build
+      run: cargo build
+
+    - name: Run tests
+      run: |
+        cargo test -- --skip bridge:: --skip tests::test_final_circuit
+  
+#  test_bridge:
+#    if: github.event.pull_request.draft == false
+#    timeout-minutes: 200
+#    needs: build
+#    runs-on: self-hosted
+#    steps:
+#    - uses: actions/checkout@v4
+#    
+#    - name: Cache Build Artifacts
+#      uses: actions/cache@v4
+#      with:
+#        path: |
+#          ~/.cargo/bin/
+#          ~/.cargo/registry/index/
+#          ~/.cargo/registry/cache/
+#          ~/.cargo/git/db/
+#          target/
+#        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+#
+#    - name: Build
+#      run: cargo build
+#
+#    - name: Run bridge tests
+#      env: 
+#        BRIDGE_DATA_STORE_CLIENT_DATA_SUFFIX: bridge-client-data.json
+#        BRIDGE_AWS_ACCESS_KEY_ID: ${{ secrets.BRIDGE_AWS_ACCESS_KEY_ID }}
+#        BRIDGE_AWS_SECRET_ACCESS_KEY: ${{ secrets.BRIDGE_AWS_SECRET_ACCESS_KEY }}
+#        BRIDGE_AWS_REGION: ap-southeast-1
+#        BRIDGE_AWS_BUCKET: bitvm
+#      run: |
+#        cp .env.test.sample .env.test
+#        cd regtest
+#        ./install.sh <<< "."
+#        ./start.sh
+#        cargo test -- --test bridge::
diff --git a/.gitignore b/.gitignore
index 041de6eac..4ff3d66dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@ target/
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
+#Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
@@ -15,6 +15,7 @@ Cargo.lock
 
 # Ignore .env files
 .env
+.env.test
 
 # Added by cargo
 
@@ -25,7 +26,15 @@ Cargo.lock
 
 .DS_Store
 
+tmp
+
 # Bridge public and private files
 bridge_data/
 
-chunk_stats.txt
+# Esplora regtest data
+nohup.out
+data_path
+esplora-bitcoin-regtest-data
+
+# test cache
+test_cache/
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 000000000..58b8fd6c2
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,7796 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "addchain"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2e69442aa5628ea6951fa33e24efe8313f4321a91bd729fc2f75bdfc858570"
+dependencies = [
+ "num-bigint 0.3.3",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+dependencies = [
+ "cpp_demangle",
+ "fallible-iterator",
+ "gimli 0.29.0",
+ "memmap2",
+ "object 0.35.0",
+ "rustc-demangle",
+ "smallvec",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli 0.31.1",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[package]]
+name = "alloy"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f4a4aaae80afd4be443a6aecd92a6b255dcdd000f97996928efb33d8a71e100"
+dependencies = [
+ "alloy-consensus",
+ "alloy-contract",
+ "alloy-core",
+ "alloy-eips",
+ "alloy-genesis",
+ "alloy-network",
+ "alloy-provider",
+ "alloy-pubsub",
+ "alloy-rpc-client",
+ "alloy-rpc-types",
+ "alloy-serde",
+ "alloy-signer",
+ "alloy-signer-local",
+ "alloy-transport",
+ "alloy-transport-http",
+ "alloy-transport-ipc",
+ "alloy-transport-ws",
+]
+
+[[package]]
+name = "alloy-chains"
+version = "0.1.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "996564c1782285d4e0299c29b318bc74f24b1d7f456cef3e040810b061ee3256"
+dependencies = [
+ "alloy-primitives 0.8.22",
+ "num_enum",
+ "strum",
+]
+
+[[package]]
+name = "alloy-consensus"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04c309895995eaa4bfcc345f5515a39c7df9447798645cc8bf462b6c5bf1dc96"
+dependencies = [
+ "alloy-eips",
+ "alloy-primitives 0.7.7",
+ "alloy-rlp",
+ "alloy-serde",
+ "c-kzg",
+ "serde",
+]
+
+[[package]]
+name = "alloy-contract"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f4e0ef72b0876ae3068b2ed7dfae9ae1779ce13cfaec2ee1f08f5bd0348dc57"
+dependencies = [
+ "alloy-dyn-abi",
+ "alloy-json-abi",
+ "alloy-network",
+ "alloy-network-primitives",
+ "alloy-primitives 0.7.7",
+ "alloy-provider",
+ "alloy-pubsub",
+ "alloy-rpc-types-eth",
+ "alloy-sol-types",
+ "alloy-transport",
+ "futures",
+ "futures-util",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "alloy-core"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "529fc6310dc1126c8de51c376cbc59c79c7f662bd742be7dc67055d5421a81b4"
+dependencies = [
+ "alloy-dyn-abi",
+ "alloy-json-abi",
+ "alloy-primitives 0.7.7",
+ "alloy-sol-types",
+]
+
+[[package]]
+name = "alloy-dyn-abi"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413902aa18a97569e60f679c23f46a18db1656d87ab4d4e49d0e1e52042f66df"
+dependencies = [
+ "alloy-json-abi",
+ "alloy-primitives 0.7.7",
+ "alloy-sol-type-parser",
+ "alloy-sol-types",
+ "const-hex",
+ "itoa",
+ "serde",
+ "serde_json",
+ "winnow 0.6.26",
+]
+
+[[package]]
+name = "alloy-eips"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9431c99a3b3fe606ede4b3d4043bdfbcb780c45b8d8d226c3804e2b75cfbe68"
+dependencies = [
+ "alloy-primitives 0.7.7",
+ "alloy-rlp",
+ "alloy-serde",
+ "c-kzg",
+ "derive_more 0.99.19",
+ "k256",
+ "once_cell",
+ "serde",
+ "sha2",
+]
+
+[[package]]
+name = "alloy-genesis"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79614dfe86144328da11098edcc7bc1a3f25ad8d3134a9eb9e857e06f0d9840d"
+dependencies = [
+ "alloy-primitives 0.7.7",
+ "alloy-serde",
+ "serde",
+]
+
+[[package]]
+name = "alloy-json-abi"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc05b04ac331a9f07e3a4036ef7926e49a8bf84a99a1ccfc7e2ab55a5fcbb372"
+dependencies = [
+ "alloy-primitives 0.7.7",
+ "alloy-sol-type-parser",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "alloy-json-rpc"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57e2865c4c3bb4cdad3f0d9ec1ab5c0c657ba69a375651bd35e32fb6c180ccc2"
+dependencies = [
+ "alloy-primitives 0.7.7",
+ "alloy-sol-types",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.69",
+ "tracing",
+]
+
+[[package]]
+name = "alloy-network"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e701fc87ef9a3139154b0b4ccb935b565d27ffd9de020fe541bf2dec5ae4ede"
+dependencies = [
+ "alloy-consensus",
+ "alloy-eips",
+ "alloy-json-rpc",
+ "alloy-network-primitives",
+ "alloy-primitives 0.7.7",
+ "alloy-rpc-types-eth",
+ "alloy-serde",
+ "alloy-signer",
+ "alloy-sol-types",
+ "async-trait",
+ "auto_impl",
+ "futures-utils-wasm",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "alloy-network-primitives"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec9d5a0f9170b10988b6774498a022845e13eda94318440d17709d50687f67f9"
+dependencies = [
+ "alloy-primitives 0.7.7",
+ "alloy-serde",
+ "serde",
+]
+
+[[package]]
+name = "alloy-primitives"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccb3ead547f4532bc8af961649942f0b9c16ee9226e26caa3f38420651cc0bf4"
+dependencies = [
+ "alloy-rlp",
+ "bytes",
+ "cfg-if",
+ "const-hex",
+ "derive_more 0.99.19",
+ "hex-literal",
+ "itoa",
+ "k256",
+ "keccak-asm",
+ "proptest",
+ "rand",
+ "ruint",
+ "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",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "alloy-provider"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9c0ab10b93de601a6396fc7ff2ea10d3b28c46f079338fa562107ebf9857c8"
+dependencies = [
+ "alloy-chains",
+ "alloy-consensus",
+ "alloy-eips",
+ "alloy-json-rpc",
+ "alloy-network",
+ "alloy-network-primitives",
+ "alloy-primitives 0.7.7",
+ "alloy-pubsub",
+ "alloy-rpc-client",
+ "alloy-rpc-types-eth",
+ "alloy-transport",
+ "alloy-transport-http",
+ "alloy-transport-ipc",
+ "alloy-transport-ws",
+ "async-stream",
+ "async-trait",
+ "auto_impl",
+ "dashmap",
+ "futures",
+ "futures-utils-wasm",
+ "lru",
+ "pin-project",
+ "reqwest 0.12.12",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "alloy-pubsub"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f5da2c55cbaf229bad3c5f8b00b5ab66c74ef093e5f3a753d874cfecf7d2281"
+dependencies = [
+ "alloy-json-rpc",
+ "alloy-primitives 0.7.7",
+ "alloy-transport",
+ "bimap",
+ "futures",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-stream",
+ "tower 0.4.13",
+ "tracing",
+]
+
+[[package]]
+name = "alloy-rlp"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6c1d995bff8d011f7cd6c81820d51825e6e06d6db73914c1630ecf544d83d6"
+dependencies = [
+ "alloy-rlp-derive",
+ "arrayvec",
+ "bytes",
+]
+
+[[package]]
+name = "alloy-rlp-derive"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a40e1ef334153322fd878d07e86af7a529bcb86b2439525920a88eba87bcf943"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "alloy-rpc-client"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b38e3ffdb285df5d9f60cb988d336d9b8e3505acb78750c3bc60336a7af41d3"
+dependencies = [
+ "alloy-json-rpc",
+ "alloy-primitives 0.7.7",
+ "alloy-pubsub",
+ "alloy-transport",
+ "alloy-transport-http",
+ "alloy-transport-ipc",
+ "alloy-transport-ws",
+ "futures",
+ "pin-project",
+ "reqwest 0.12.12",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-stream",
+ "tower 0.4.13",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "alloy-rpc-types"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c31a3750b8f5a350d17354e46a52b0f2f19ec5f2006d816935af599dedc521"
+dependencies = [
+ "alloy-rpc-types-engine",
+ "alloy-rpc-types-eth",
+ "alloy-serde",
+ "serde",
+]
+
+[[package]]
+name = "alloy-rpc-types-engine"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff63f51b2fb2f547df5218527fd0653afb1947bf7fead5b3ce58c75d170b30f7"
+dependencies = [
+ "alloy-consensus",
+ "alloy-eips",
+ "alloy-primitives 0.7.7",
+ "alloy-rlp",
+ "alloy-rpc-types-eth",
+ "alloy-serde",
+ "jsonwebtoken",
+ "rand",
+ "serde",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "alloy-rpc-types-eth"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81e18424d962d7700a882fe423714bd5b9dde74c7a7589d4255ea64068773aef"
+dependencies = [
+ "alloy-consensus",
+ "alloy-eips",
+ "alloy-network-primitives",
+ "alloy-primitives 0.7.7",
+ "alloy-rlp",
+ "alloy-serde",
+ "alloy-sol-types",
+ "itertools 0.13.0",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "alloy-serde"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e33feda6a53e6079895aed1d08dcb98a1377b000d80d16370fbbdb8155d547ef"
+dependencies = [
+ "alloy-primitives 0.7.7",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "alloy-signer"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "740a25b92e849ed7b0fa013951fe2f64be9af1ad5abe805037b44fb7770c5c47"
+dependencies = [
+ "alloy-primitives 0.7.7",
+ "async-trait",
+ "auto_impl",
+ "elliptic-curve 0.13.8",
+ "k256",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "alloy-signer-local"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b0707d4f63e4356a110b30ef3add8732ab6d181dd7be4607bf79b8777105cee"
+dependencies = [
+ "alloy-consensus",
+ "alloy-network",
+ "alloy-primitives 0.7.7",
+ "alloy-signer",
+ "async-trait",
+ "k256",
+ "rand",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "alloy-sol-macro"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09"
+dependencies = [
+ "alloy-sol-macro-expander",
+ "alloy-sol-macro-input",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "alloy-sol-macro-expander"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525"
+dependencies = [
+ "alloy-json-abi",
+ "alloy-sol-macro-input",
+ "const-hex",
+ "heck",
+ "indexmap",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+ "syn-solidity",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "alloy-sol-macro-input"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e482dc33a32b6fadbc0f599adea520bd3aaa585c141a80b404d0a3e3fa72528"
+dependencies = [
+ "alloy-json-abi",
+ "const-hex",
+ "dunce",
+ "heck",
+ "proc-macro2",
+ "quote",
+ "serde_json",
+ "syn 2.0.99",
+ "syn-solidity",
+]
+
+[[package]]
+name = "alloy-sol-type-parser"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98"
+dependencies = [
+ "serde",
+ "winnow 0.6.26",
+]
+
+[[package]]
+name = "alloy-sol-types"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7"
+dependencies = [
+ "alloy-json-abi",
+ "alloy-primitives 0.7.7",
+ "alloy-sol-macro",
+ "const-hex",
+ "serde",
+]
+
+[[package]]
+name = "alloy-transport"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d0590afbdacf2f8cca49d025a2466f3b6584a016a8b28f532f29f8da1007bae"
+dependencies = [
+ "alloy-json-rpc",
+ "base64 0.22.1",
+ "futures-util",
+ "futures-utils-wasm",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.69",
+ "tokio",
+ "tower 0.4.13",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "alloy-transport-http"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2437d145d80ea1aecde8574d2058cceb8b3c9cba05f6aea8e67907c660d46698"
+dependencies = [
+ "alloy-json-rpc",
+ "alloy-transport",
+ "reqwest 0.12.12",
+ "serde_json",
+ "tower 0.4.13",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "alloy-transport-ipc"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "804494366e20468776db4e18f9eb5db7db0fe14f1271eb6dbf155d867233405c"
+dependencies = [
+ "alloy-json-rpc",
+ "alloy-pubsub",
+ "alloy-transport",
+ "bytes",
+ "futures",
+ "interprocess",
+ "pin-project",
+ "serde_json",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "alloy-transport-ws"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af855163e7df008799941aa6dd324a43ef2bf264b08ba4b22d44aad6ced65300"
+dependencies = [
+ "alloy-pubsub",
+ "alloy-transport",
+ "futures",
+ "http 1.2.0",
+ "rustls 0.23.23",
+ "serde_json",
+ "tokio",
+ "tokio-tungstenite",
+ "tracing",
+ "ws_stream_wasm",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+dependencies = [
+ "anstyle",
+ "once_cell",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.97"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+
+[[package]]
+name = "arbitrary"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+dependencies = [
+ "derive_arbitrary",
+]
+
+[[package]]
+name = "arc-swap"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+
+[[package]]
+name = "ark-bn254"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f"
+dependencies = [
+ "ark-ec 0.4.2",
+ "ark-ff 0.4.2",
+ "ark-std 0.4.0",
+]
+
+[[package]]
+name = "ark-bn254"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc"
+dependencies = [
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-std 0.5.0",
+]
+
+[[package]]
+name = "ark-crypto-primitives"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3a13b34da09176a8baba701233fdffbaa7c1b1192ce031a3da4e55ce1f1a56"
+dependencies = [
+ "ark-ec 0.4.2",
+ "ark-ff 0.4.2",
+ "ark-relations 0.4.0",
+ "ark-serialize 0.4.2",
+ "ark-snark 0.4.0",
+ "ark-std 0.4.0",
+ "blake2",
+ "derivative",
+ "digest 0.10.7",
+ "sha2",
+]
+
+[[package]]
+name = "ark-crypto-primitives"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0c292754729c8a190e50414fd1a37093c786c709899f29c9f7daccecfa855e"
+dependencies = [
+ "ahash",
+ "ark-crypto-primitives-macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-relations 0.5.1",
+ "ark-serialize 0.5.0",
+ "ark-snark 0.5.1",
+ "ark-std 0.5.0",
+ "blake2",
+ "derivative",
+ "digest 0.10.7",
+ "fnv",
+ "merlin",
+ "rayon",
+ "sha2",
+]
+
+[[package]]
+name = "ark-crypto-primitives"
+version = "0.5.0"
+source = "git+https://github.com/arkworks-rs/crypto-primitives?branch=release-0.5.0#c71d09d85c99aded77be076d6626707224f90a7c"
+dependencies = [
+ "ahash",
+ "ark-crypto-primitives-macros 0.5.0 (git+https://github.com/arkworks-rs/crypto-primitives?branch=release-0.5.0)",
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-relations 0.5.1",
+ "ark-serialize 0.5.0",
+ "ark-snark 0.5.1",
+ "ark-std 0.5.0",
+ "blake2",
+ "derivative",
+ "digest 0.10.7",
+ "fnv",
+ "merlin",
+ "sha2",
+]
+
+[[package]]
+name = "ark-crypto-primitives-macros"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7e89fe77d1f0f4fe5b96dfc940923d88d17b6a773808124f21e764dfb063c6a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "ark-crypto-primitives-macros"
+version = "0.5.0"
+source = "git+https://github.com/arkworks-rs/crypto-primitives?branch=release-0.5.0#c71d09d85c99aded77be076d6626707224f90a7c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "ark-ec"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
+dependencies = [
+ "ark-ff 0.4.2",
+ "ark-poly 0.4.2",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+ "derivative",
+ "hashbrown 0.13.2",
+ "itertools 0.10.5",
+ "num-traits",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ec"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce"
+dependencies = [
+ "ahash",
+ "ark-ff 0.5.0",
+ "ark-poly 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "educe",
+ "fnv",
+ "hashbrown 0.15.2",
+ "itertools 0.13.0",
+ "num-bigint 0.4.6",
+ "num-integer",
+ "num-traits",
+ "rayon",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6"
+dependencies = [
+ "ark-ff-asm 0.3.0",
+ "ark-ff-macros 0.3.0",
+ "ark-serialize 0.3.0",
+ "ark-std 0.3.0",
+ "derivative",
+ "num-bigint 0.4.6",
+ "num-traits",
+ "paste",
+ "rustc_version 0.3.3",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba"
+dependencies = [
+ "ark-ff-asm 0.4.2",
+ "ark-ff-macros 0.4.2",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+ "derivative",
+ "digest 0.10.7",
+ "itertools 0.10.5",
+ "num-bigint 0.4.6",
+ "num-traits",
+ "paste",
+ "rustc_version 0.4.1",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a177aba0ed1e0fbb62aa9f6d0502e9b46dad8c2eab04c14258a1212d2557ea70"
+dependencies = [
+ "ark-ff-asm 0.5.0",
+ "ark-ff-macros 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "arrayvec",
+ "digest 0.10.7",
+ "educe",
+ "itertools 0.13.0",
+ "num-bigint 0.4.6",
+ "num-traits",
+ "paste",
+ "rayon",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff-asm"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-ff-asm"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-ff-asm"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60"
+dependencies = [
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20"
+dependencies = [
+ "num-bigint 0.4.6",
+ "num-traits",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
+dependencies = [
+ "num-bigint 0.4.6",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09be120733ee33f7693ceaa202ca41accd5653b779563608f1234f78ae07c4b3"
+dependencies = [
+ "num-bigint 0.4.6",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "ark-groth16"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20ceafa83848c3e390f1cbf124bc3193b3e639b3f02009e0e290809a501b95fc"
+dependencies = [
+ "ark-crypto-primitives 0.4.0",
+ "ark-ec 0.4.2",
+ "ark-ff 0.4.2",
+ "ark-poly 0.4.2",
+ "ark-relations 0.4.0",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+]
+
+[[package]]
+name = "ark-groth16"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88f1d0f3a534bb54188b8dcc104307db6c56cdae574ddc3212aec0625740fc7e"
+dependencies = [
+ "ark-crypto-primitives 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-poly 0.5.0",
+ "ark-relations 0.5.1",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "rayon",
+]
+
+[[package]]
+name = "ark-poly"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
+dependencies = [
+ "ark-ff 0.4.2",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+ "derivative",
+ "hashbrown 0.13.2",
+]
+
+[[package]]
+name = "ark-poly"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27"
+dependencies = [
+ "ahash",
+ "ark-ff 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "educe",
+ "fnv",
+ "hashbrown 0.15.2",
+ "rayon",
+]
+
+[[package]]
+name = "ark-relations"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00796b6efc05a3f48225e59cb6a2cda78881e7c390872d5786aaf112f31fb4f0"
+dependencies = [
+ "ark-ff 0.4.2",
+ "ark-std 0.4.0",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "ark-relations"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec46ddc93e7af44bcab5230937635b06fb5744464dd6a7e7b083e80ebd274384"
+dependencies = [
+ "ark-ff 0.5.0",
+ "ark-std 0.5.0",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "ark-serialize"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671"
+dependencies = [
+ "ark-std 0.3.0",
+ "digest 0.9.0",
+]
+
+[[package]]
+name = "ark-serialize"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
+dependencies = [
+ "ark-serialize-derive 0.4.2",
+ "ark-std 0.4.0",
+ "digest 0.10.7",
+ "num-bigint 0.4.6",
+]
+
+[[package]]
+name = "ark-serialize"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7"
+dependencies = [
+ "ark-serialize-derive 0.5.0",
+ "ark-std 0.5.0",
+ "arrayvec",
+ "digest 0.10.7",
+ "num-bigint 0.4.6",
+ "rayon",
+]
+
+[[package]]
+name = "ark-serialize-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-serialize-derive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "ark-snark"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84d3cc6833a335bb8a600241889ead68ee89a3cf8448081fb7694c0fe503da63"
+dependencies = [
+ "ark-ff 0.4.2",
+ "ark-relations 0.4.0",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+]
+
+[[package]]
+name = "ark-snark"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d368e2848c2d4c129ce7679a7d0d2d612b6a274d3ea6a13bad4445d61b381b88"
+dependencies = [
+ "ark-ff 0.5.0",
+ "ark-relations 0.5.1",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c"
+dependencies = [
+ "num-traits",
+ "rand",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
+dependencies = [
+ "num-traits",
+ "rand",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a"
+dependencies = [
+ "colored",
+ "num-traits",
+ "rand",
+ "rayon",
+]
+
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
+[[package]]
+name = "async-channel"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 2.5.3",
+ "futures-core",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
+dependencies = [
+ "async-channel 2.3.1",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+]
+
+[[package]]
+name = "async-io"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+dependencies = [
+ "event-listener 5.4.0",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-native-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9343dc5acf07e79ff82d0c37899f079db3534d99f189a1837c8e549c99405bec"
+dependencies = [
+ "futures-util",
+ "native-tls",
+ "thiserror 1.0.69",
+ "url",
+]
+
+[[package]]
+name = "async-std"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615"
+dependencies = [
+ "async-channel 1.9.0",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-stream"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-trait"
+version = "0.1.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "async_io_stream"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c"
+dependencies = [
+ "futures",
+ "pharos",
+ "rustc_version 0.4.1",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "auto_impl"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "auto_ops"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7460f7dd8e100147b82a63afca1a20eb6c231ee36b90ba7272e14951cb58af59"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "awaitable"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70af449c9a763cb655c6a1e5338b42d99c67190824ff90658c1e30be844c0775"
+dependencies = [
+ "awaitable-error",
+ "cfg-if",
+]
+
+[[package]]
+name = "awaitable-error"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5b3469636cdf8543cceab175efca534471f36eee12fb8374aba00eb5e7e7f8a"
+
+[[package]]
+name = "aws-credential-types"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-runtime"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76dd04d39cc12844c0994f2c9c5a6f5184c22e9188ec1ff723de41910a21dcad"
+dependencies = [
+ "aws-credential-types",
+ "aws-sigv4",
+ "aws-smithy-async",
+ "aws-smithy-eventstream",
+ "aws-smithy-http",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes",
+ "fastrand",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "tracing",
+ "uuid",
+]
+
+[[package]]
+name = "aws-sdk-s3"
+version = "1.77.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34e87342432a3de0e94e82c99a7cbd9042f99de029ae1f4e368160f9e9929264"
+dependencies = [
+ "aws-credential-types",
+ "aws-runtime",
+ "aws-sigv4",
+ "aws-smithy-async",
+ "aws-smithy-checksums",
+ "aws-smithy-eventstream",
+ "aws-smithy-http",
+ "aws-smithy-json",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-smithy-xml",
+ "aws-types",
+ "bytes",
+ "fastrand",
+ "hex",
+ "hmac",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "lru",
+ "once_cell",
+ "percent-encoding",
+ "regex-lite",
+ "sha2",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "aws-sigv4"
+version = "1.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bfe75fad52793ce6dec0dc3d4b1f388f038b5eb866c8d4d7f3a8e21b5ea5051"
+dependencies = [
+ "aws-credential-types",
+ "aws-smithy-eventstream",
+ "aws-smithy-http",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "bytes",
+ "crypto-bigint 0.5.5",
+ "form_urlencoded",
+ "hex",
+ "hmac",
+ "http 0.2.12",
+ "http 1.2.0",
+ "once_cell",
+ "p256",
+ "percent-encoding",
+ "ring",
+ "sha2",
+ "subtle",
+ "time",
+ "tracing",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-smithy-async"
+version = "1.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa59d1327d8b5053c54bf2eaae63bf629ba9e904434d0835a28ed3c0ed0a614e"
+dependencies = [
+ "futures-util",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "aws-smithy-checksums"
+version = "0.63.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2dc8d842d872529355c72632de49ef8c5a2949a4472f10e802f28cf925770c"
+dependencies = [
+ "aws-smithy-http",
+ "aws-smithy-types",
+ "bytes",
+ "crc32c",
+ "crc32fast",
+ "crc64fast-nvme",
+ "hex",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "md-5",
+ "pin-project-lite",
+ "sha1",
+ "sha2",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-eventstream"
+version = "0.60.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b18559a41e0c909b77625adf2b8c50de480a8041e5e4a3f5f7d177db70abc5a"
+dependencies = [
+ "aws-smithy-types",
+ "bytes",
+ "crc32fast",
+]
+
+[[package]]
+name = "aws-smithy-http"
+version = "0.60.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7809c27ad8da6a6a68c454e651d4962479e81472aa19ae99e59f9aba1f9713cc"
+dependencies = [
+ "aws-smithy-eventstream",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "bytes",
+ "bytes-utils",
+ "futures-core",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "pin-utils",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-json"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "623a51127f24c30776c8b374295f2df78d92517386f77ba30773f15a30ce1422"
+dependencies = [
+ "aws-smithy-types",
+]
+
+[[package]]
+name = "aws-smithy-runtime"
+version = "1.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d526a12d9ed61fadefda24abe2e682892ba288c2018bcb38b1b4c111d13f6d92"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "bytes",
+ "fastrand",
+ "h2",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "http-body 1.0.1",
+ "httparse",
+ "hyper 0.14.32",
+ "hyper-rustls 0.24.2",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "rustls 0.21.12",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-runtime-api"
+version = "1.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-types",
+ "bytes",
+ "http 0.2.12",
+ "http 1.2.0",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-smithy-types"
+version = "1.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7b8a53819e42f10d0821f56da995e1470b199686a1809168db6ca485665f042"
+dependencies = [
+ "base64-simd",
+ "bytes",
+ "bytes-utils",
+ "futures-core",
+ "http 0.2.12",
+ "http 1.2.0",
+ "http-body 0.4.6",
+ "http-body 1.0.1",
+ "http-body-util",
+ "itoa",
+ "num-integer",
+ "pin-project-lite",
+ "pin-utils",
+ "ryu",
+ "serde",
+ "time",
+ "tokio",
+ "tokio-util",
+]
+
+[[package]]
+name = "aws-smithy-xml"
+version = "0.60.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc"
+dependencies = [
+ "xmlparser",
+]
+
+[[package]]
+name = "aws-types"
+version = "1.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbd0a668309ec1f66c0f6bda4840dd6d4796ae26d699ebc266d7cc95c6d040f"
+dependencies = [
+ "aws-credential-types",
+ "aws-smithy-async",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "rustc_version 0.4.1",
+ "tracing",
+]
+
+[[package]]
+name = "backtrace"
+version = "0.3.74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+dependencies = [
+ "addr2line 0.24.2",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object 0.36.7",
+ "rustc-demangle",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "base16ct"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
+[[package]]
+name = "base58ck"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"
+dependencies = [
+ "bitcoin-internals",
+ "bitcoin_hashes",
+]
+
+[[package]]
+name = "base64"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "base64-simd"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195"
+dependencies = [
+ "outref",
+ "vsimd",
+]
+
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
+[[package]]
+name = "bech32"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
+
+[[package]]
+name = "bimap"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
+
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
+[[package]]
+name = "bitcode"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18c1406a27371b2f76232a2259df6ab607b91b5a0a7476a7729ff590df5a969a"
+dependencies = [
+ "arrayvec",
+ "bitcode_derive",
+ "bytemuck",
+ "glam",
+ "serde",
+]
+
+[[package]]
+name = "bitcode_derive"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42b6b4cb608b8282dc3b53d0f4c9ab404655d562674c682db7e6c0458cc83c23"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "bitcoin"
+version = "0.32.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6bc65742dea50536e35ad42492b234c27904a27f0abdcbce605015cb4ea026"
+dependencies = [
+ "base58ck",
+ "bech32",
+ "bitcoin-internals",
+ "bitcoin-io",
+ "bitcoin-units",
+ "bitcoin_hashes",
+ "hex-conservative",
+ "hex_lit",
+ "secp256k1",
+ "serde",
+]
+
+[[package]]
+name = "bitcoin-internals"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30bdbe14aa07b06e6cfeffc529a1f099e5fbe249524f8125358604df99a4bed2"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bitcoin-io"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf"
+
+[[package]]
+name = "bitcoin-script"
+version = "0.3.0"
+source = "git+https://github.com/BitVM/rust-bitcoin-script#cda22ff17ba3e471f76fa1caa0995f20058ac2a3"
+dependencies = [
+ "bincode",
+ "bitcoin",
+ "lazy_static",
+ "script-macro",
+ "serde",
+ "stdext",
+]
+
+[[package]]
+name = "bitcoin-script-stack"
+version = "0.0.1"
+source = "git+https://github.com/BitVM/rust-bitcoin-script-stack#bb397b6023b149aa2031306620b079f9b70adc92"
+dependencies = [
+ "bitcoin",
+ "bitcoin-script",
+ "bitcoin-scriptexec",
+ "hex",
+]
+
+[[package]]
+name = "bitcoin-scriptexec"
+version = "0.0.0"
+source = "git+https://github.com/BitVM/rust-bitcoin-scriptexec#b24608bff855ea8932ae236c7a04f13f730ab9f8"
+dependencies = [
+ "bitcoin",
+ "clap",
+ "console_error_panic_hook",
+ "getrandom 0.2.15",
+ "lazy_static",
+ "serde",
+ "serde-wasm-bindgen",
+ "serde_json",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "bitcoin-units"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2"
+dependencies = [
+ "bitcoin-internals",
+ "serde",
+]
+
+[[package]]
+name = "bitcoin_hashes"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
+dependencies = [
+ "bitcoin-io",
+ "hex-conservative",
+ "serde",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "bitvm"
+version = "0.1.0"
+dependencies = [
+ "ark-bn254 0.5.0",
+ "ark-crypto-primitives 0.5.0 (git+https://github.com/arkworks-rs/crypto-primitives?branch=release-0.5.0)",
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-groth16 0.5.0",
+ "ark-relations 0.5.1",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "bitcoin",
+ "bitcoin-script",
+ "bitcoin-script-stack",
+ "bitcoin-scriptexec",
+ "blake3",
+ "colored",
+ "hex",
+ "itertools 0.13.0",
+ "num-bigint 0.4.6",
+ "num-traits",
+ "paste",
+ "rand",
+ "rand_chacha",
+ "regex",
+ "serde",
+ "serde_json",
+ "sha2",
+ "tqdm",
+]
+
+[[package]]
+name = "bitvm-fuzz"
+version = "0.0.0"
+dependencies = [
+ "arbitrary",
+ "bitvm",
+ "libfuzzer-sys",
+]
+
+[[package]]
+name = "blake2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "blake3"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+]
+
+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+dependencies = [
+ "async-channel 2.3.1",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "blst"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47c79a94619fade3c0b887670333513a67ac28a6a7e653eb260bf0d4103db38d"
+dependencies = [
+ "cc",
+ "glob",
+ "threadpool",
+ "zeroize",
+]
+
+[[package]]
+name = "borsh"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5430e3be710b68d984d1391c854eb431a9d548640711faa54eecb1df93db91cc"
+dependencies = [
+ "borsh-derive",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8b668d39970baad5356d7c83a86fee3a539e6f93bf6764c97368243e17a0487"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "bridge"
+version = "0.1.0"
+dependencies = [
+ "alloy",
+ "ark-bn254 0.5.0",
+ "ark-crypto-primitives 0.5.0 (git+https://github.com/arkworks-rs/crypto-primitives?branch=release-0.5.0)",
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-groth16 0.5.0",
+ "ark-relations 0.5.1",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "async-trait",
+ "aws-sdk-s3",
+ "bitcode",
+ "bitcoin",
+ "bitcoin-script",
+ "bitcoin-scriptexec",
+ "bitvm",
+ "clap",
+ "colored",
+ "dotenv",
+ "esplora-client",
+ "futures",
+ "hex",
+ "human_bytes",
+ "itertools 0.13.0",
+ "musig2",
+ "num-traits",
+ "openssh",
+ "openssh-sftp-client",
+ "rand",
+ "regex",
+ "secp256k1",
+ "serde",
+ "serde_json",
+ "serial_test",
+ "sha2",
+ "strum",
+ "strum_macros",
+ "suppaftp",
+ "tokio",
+ "toml",
+ "zstd",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+
+[[package]]
+name = "byte-slice-cast"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d"
+
+[[package]]
+name = "bytemuck"
+version = "1.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bytes-utils"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35"
+dependencies = [
+ "bytes",
+ "either",
+]
+
+[[package]]
+name = "c-kzg"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0307f72feab3300336fb803a57134159f6e20139af1357f36c54cb90d8e8928"
+dependencies = [
+ "blst",
+ "cc",
+ "glob",
+ "hex",
+ "libc",
+ "once_cell",
+ "serde",
+]
+
+[[package]]
+name = "camino"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver 1.0.26",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+dependencies = [
+ "jobserver",
+ "libc",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "chrono"
+version = "0.4.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "windows-link",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
+[[package]]
+name = "colored"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
+dependencies = [
+ "lazy_static",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "concurrent_arena"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ef19a8d27aefd2a86b39ee61a6e83bc98ee97dacc93ce87770adab2413392a6"
+dependencies = [
+ "arc-swap",
+ "parking_lot",
+ "triomphe",
+]
+
+[[package]]
+name = "console_error_panic_hook"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "const-hex"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "hex",
+ "proptest",
+ "serde",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "const_format"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "constant_time_eq"
+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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "libc",
+]
+
+[[package]]
+name = "cpp_demangle"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc"
+version = "3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
+[[package]]
+name = "crc32c"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47"
+dependencies = [
+ "rustc_version 0.4.1",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crc64fast-nvme"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4955638f00a809894c947f85a024020a20815b65a5eea633798ea7924edab2b3"
+dependencies = [
+ "crc",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crossterm"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
+dependencies = [
+ "bitflags 1.3.2",
+ "crossterm_winapi",
+ "libc",
+ "mio 0.8.11",
+ "parking_lot",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+
+[[package]]
+name = "crossterm_winapi"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "crunchy"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
+
+[[package]]
+name = "crypto-bigint"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-bigint"
+version = "0.5.2"
+source = "git+https://github.com/risc0/RustCrypto-crypto-bigint?tag=v0.5.2-risczero.0#8b30304277cfe553b51a78a0e693f48bbb059eb3"
+dependencies = [
+ "getrandom 0.2.15",
+ "subtle",
+]
+
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "dashmap"
+version = "5.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
+
+[[package]]
+name = "der"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
+[[package]]
+name = "der"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_arbitrary"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "derive_destructure2"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64b697ac90ff296f0fc031ee5a61c7ac31fb9fff50e3fb32873b09223613fc0c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "derive_more"
+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",
+]
+
+[[package]]
+name = "derive_more"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+dependencies = [
+ "derive_more-impl 1.0.0",
+]
+
+[[package]]
+name = "derive_more"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+dependencies = [
+ "derive_more-impl 2.0.1",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+ "unicode-xid",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+ "unicode-xid",
+]
+
+[[package]]
+name = "digest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "directories"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "docker-generate"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf673e0848ef09fa4aeeba78e681cf651c0c7d35f76ee38cec8e55bc32fa111"
+
+[[package]]
+name = "doctest-file"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562"
+
+[[package]]
+name = "dotenv"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
+[[package]]
+name = "downloader"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ac1e888d6830712d565b2f3a974be3200be9296bc1b03db8251a4cbf18a4a34"
+dependencies = [
+ "digest 0.10.7",
+ "futures",
+ "rand",
+ "reqwest 0.12.12",
+ "thiserror 1.0.69",
+ "tokio",
+]
+
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
+[[package]]
+name = "ecdsa"
+version = "0.14.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
+dependencies = [
+ "der 0.6.1",
+ "elliptic-curve 0.12.3",
+ "rfc6979 0.3.1",
+ "signature 1.6.4",
+]
+
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der 0.7.9",
+ "digest 0.10.7",
+ "elliptic-curve 0.13.8",
+ "rfc6979 0.4.0",
+ "signature 2.2.0",
+ "spki 0.7.3",
+]
+
+[[package]]
+name = "educe"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7bc049e1bd8cdeb31b68bbd586a9464ecf9f3944af3958a7a9d0f8b9799417"
+dependencies = [
+ "enum-ordinalize",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "either"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d"
+
+[[package]]
+name = "elf"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b"
+
+[[package]]
+name = "elliptic-curve"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+dependencies = [
+ "base16ct 0.1.1",
+ "crypto-bigint 0.4.9",
+ "der 0.6.1",
+ "digest 0.10.7",
+ "ff 0.12.1",
+ "generic-array",
+ "group 0.12.1",
+ "pkcs8 0.9.0",
+ "rand_core",
+ "sec1 0.3.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
+dependencies = [
+ "base16ct 0.2.0",
+ "crypto-bigint 0.5.5",
+ "digest 0.10.7",
+ "ff 0.13.0",
+ "generic-array",
+ "group 0.13.0",
+ "pkcs8 0.10.2",
+ "rand_core",
+ "sec1 0.7.3",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "enum-map"
+version = "2.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9"
+dependencies = [
+ "enum-map-derive",
+]
+
+[[package]]
+name = "enum-map-derive"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "enum-ordinalize"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5"
+dependencies = [
+ "enum-ordinalize-derive",
+]
+
+[[package]]
+name = "enum-ordinalize-derive"
+version = "4.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "erased-serde"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
+[[package]]
+name = "errno"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "esplora-client"
+version = "0.11.0"
+source = "git+https://github.com/BitVM/rust-esplora-client#7befb9147b69126edaad8b9dbd0b13259f2e9ea0"
+dependencies = [
+ "bitcoin",
+ "hex-conservative",
+ "log",
+ "minreq",
+ "reqwest 0.11.27",
+ "serde",
+ "tokio",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "event-listener"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
+dependencies = [
+ "event-listener 5.4.0",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fallible-iterator"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "fastrlp"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418"
+dependencies = [
+ "arrayvec",
+ "auto_impl",
+ "bytes",
+]
+
+[[package]]
+name = "fastrlp"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce8dba4714ef14b8274c371879b175aa55b16b30f269663f19d576f380018dc4"
+dependencies = [
+ "arrayvec",
+ "auto_impl",
+ "bytes",
+]
+
+[[package]]
+name = "ff"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+dependencies = [
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "bitvec",
+ "byteorder",
+ "ff_derive",
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "ff_derive"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9f54704be45ed286151c5e11531316eaef5b8f5af7d597b806fdb8af108d84a"
+dependencies = [
+ "addchain",
+ "cfg-if",
+ "num-bigint 0.3.3",
+ "num-integer",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "final-spv"
+version = "0.1.0"
+dependencies = [
+ "bitcoin",
+ "blake3",
+ "borsh",
+ "crypto-bigint 0.5.5",
+ "header-chain",
+ "hex",
+ "hex-literal",
+ "risc0-zkvm",
+ "serde",
+ "sha2",
+]
+
+[[package]]
+name = "final-spv-circuit"
+version = "0.1.0"
+dependencies = [
+ "risc0-build",
+]
+
+[[package]]
+name = "fixed-hash"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
+dependencies = [
+ "byteorder",
+ "rand",
+ "rustc-hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "flate2"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foldhash"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-lite"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "futures-utils-wasm"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9"
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+ "zeroize",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "gimli"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+dependencies = [
+ "fallible-iterator",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "glam"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17fcdf9683c406c2fc4d124afd29c0d595e22210d633cbdb8695ba9935ab1dc6"
+
+[[package]]
+name = "glob"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "goat-bridge"
+version = "0.1.0"
+dependencies = [
+ "alloy",
+ "ark-bn254 0.5.0",
+ "ark-crypto-primitives 0.5.0 (git+https://github.com/arkworks-rs/crypto-primitives?branch=release-0.5.0)",
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-groth16 0.5.0",
+ "ark-relations 0.5.1",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "bincode",
+ "bitcode",
+ "bitcoin",
+ "bitcoin-script",
+ "bitcoin-scriptexec",
+ "bitvm",
+ "clap",
+ "colored",
+ "hex",
+ "itertools 0.13.0",
+ "musig2",
+ "num-traits",
+ "rand",
+ "regex",
+ "secp256k1",
+ "serde",
+ "serde_json",
+ "serial_test",
+ "sha2",
+ "strum",
+ "strum_macros",
+ "tokio",
+ "toml",
+ "zstd",
+]
+
+[[package]]
+name = "group"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+dependencies = [
+ "ff 0.12.1",
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff 0.13.0",
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 0.2.12",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
+[[package]]
+name = "header-chain"
+version = "0.1.0"
+dependencies = [
+ "bitcoin",
+ "borsh",
+ "crypto-bigint 0.5.5",
+ "hex",
+ "hex-literal",
+ "risc0-zkvm",
+ "serde",
+ "sha2",
+]
+
+[[package]]
+name = "header-chain-circuit"
+version = "0.1.0"
+dependencies = [
+ "risc0-build",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "hex-conservative"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "hex-literal"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
+
+[[package]]
+name = "hex_lit"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http 0.2.12",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http 1.2.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "human_bytes"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e"
+dependencies = [
+ "ryu",
+]
+
+[[package]]
+name = "hyper"
+version = "0.14.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
+dependencies = [
+ "futures-util",
+ "http 0.2.12",
+ "hyper 0.14.32",
+ "log",
+ "rustls 0.21.12",
+ "rustls-native-certs",
+ "tokio",
+ "tokio-rustls 0.24.1",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
+dependencies = [
+ "futures-util",
+ "http 1.2.0",
+ "hyper 1.6.0",
+ "hyper-util",
+ "rustls 0.23.23",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.2",
+ "tower-service",
+ "webpki-roots",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper 0.14.32",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.6.0",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "hyper 1.6.0",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "impl-codec"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
+dependencies = [
+ "parity-scale-codec",
+]
+
+[[package]]
+name = "impl-trait-for-tuples"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.2",
+]
+
+[[package]]
+name = "interprocess"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "894148491d817cb36b6f778017b8ac46b17408d522dd90f539d677ea938362eb"
+dependencies = [
+ "doctest-file",
+ "futures-core",
+ "libc",
+ "recvmsg",
+ "tokio",
+ "widestring",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "inventory"
+version = "0.3.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab08d7cd2c5897f2c949e5383ea7c7db03fb19130ffcfbf7eda795137ae3cb83"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "jobserver"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+dependencies = [
+ "once_cell",
+ "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b"
+dependencies = [
+ "cfg-if",
+ "ecdsa 0.16.9",
+ "elliptic-curve 0.13.8",
+ "once_cell",
+ "sha2",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "keccak-asm"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "505d1856a39b200489082f90d897c3f07c455563880bc5952e38eabf731c83b6"
+dependencies = [
+ "digest 0.10.7",
+ "sha3-asm",
+]
+
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "lazy-regex"
+version = "3.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60c7310b93682b36b98fa7ea4de998d3463ccbebd94d935d6b48ba5b6ffa7126"
+dependencies = [
+ "lazy-regex-proc_macros",
+ "once_cell",
+ "regex",
+]
+
+[[package]]
+name = "lazy-regex-proc_macros"
+version = "3.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ba01db5ef81e17eb10a5e0f2109d1b3a3e29bac3070fdbd7d156bf7dbd206a1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "libc"
+version = "0.2.170"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
+
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf78f52d400cf2d84a3a973a78a592b4adc535739e0a5597a0da6f0c357adc75"
+dependencies = [
+ "arbitrary",
+ "cc",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.9.0",
+ "libc",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "litemap"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "lockfree-object-pool"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+
+[[package]]
+name = "log"
+version = "0.4.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+dependencies = [
+ "value-bag",
+]
+
+[[package]]
+name = "lru"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
+dependencies = [
+ "hashbrown 0.15.2",
+]
+
+[[package]]
+name = "lzma-sys"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "matrixmultiply"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a"
+dependencies = [
+ "autocfg",
+ "rawpointer",
+]
+
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memmap2"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "merlin"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
+dependencies = [
+ "byteorder",
+ "keccak",
+ "rand_core",
+ "zeroize",
+]
+
+[[package]]
+name = "metal"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
+dependencies = [
+ "bitflags 2.9.0",
+ "block",
+ "core-graphics-types",
+ "foreign-types 0.5.0",
+ "log",
+ "objc",
+ "paste",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "minreq"
+version = "2.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0c420feb01b9fb5061f8c8f452534361dd783756dcf38ec45191ce55e7a161"
+dependencies = [
+ "base64 0.12.3",
+ "log",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "log",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+dependencies = [
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "musig2"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c89bee285da6010ad76c3467c4de8265bb4fa46fba0017df95ae55cad4436528"
+dependencies = [
+ "base16ct 0.2.0",
+ "hmac",
+ "once_cell",
+ "rand",
+ "secp",
+ "secp256k1",
+ "serde",
+ "serdect",
+ "sha2",
+ "subtle",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "ndarray"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "882ed72dce9365842bf196bdeedf5055305f11fc8c03dee7bb0194a6cad34841"
+dependencies = [
+ "matrixmultiply",
+ "num-complex",
+ "num-integer",
+ "num-traits",
+ "portable-atomic",
+ "portable-atomic-util",
+ "rawpointer",
+ "rayon",
+]
+
+[[package]]
+name = "non-zero-byte-slice"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89daa1daa11c9df05d1181bcd0936d8066f8543144d77b09808eb78d65e38024"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+ "rand",
+]
+
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "nvtx"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad2e855e8019f99e4b94ac33670eb4e4f570a2e044f3749a0b2c7f83b841e52c"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+]
+
+[[package]]
+name = "object"
+version = "0.35.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
+dependencies = [
+ "flate2",
+ "memchr",
+ "ruzstd",
+]
+
+[[package]]
+name = "object"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+
+[[package]]
+name = "openssh"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330f4b61092456dc0aaa0cf9a205d956cae07d8127a69ffeff6760a72549c77f"
+dependencies = [
+ "libc",
+ "once_cell",
+ "openssh-mux-client",
+ "shell-escape",
+ "tempfile",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-pipe",
+]
+
+[[package]]
+name = "openssh-mux-client"
+version = "0.17.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d091692d0a7d9035a3cdc5f8c3572abe401e64e30eac5404e517fb54e554c9bc"
+dependencies = [
+ "cfg-if",
+ "non-zero-byte-slice",
+ "once_cell",
+ "openssh-mux-client-error",
+ "sendfd",
+ "serde",
+ "ssh_format",
+ "tokio",
+ "tokio-io-utility",
+ "typed-builder",
+]
+
+[[package]]
+name = "openssh-mux-client-error"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9879168afb48a235200e30d93df320b7191568cda8621df02f145c1c0f1af95a"
+dependencies = [
+ "ssh_format_error",
+ "thiserror 2.0.12",
+]
+
+[[package]]
+name = "openssh-sftp-client"
+version = "0.14.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f472c9c38ea60bc161f8b5df4d04c79057003cdc12572eaad7f6dcc74e6fca5"
+dependencies = [
+ "bytes",
+ "derive_destructure2",
+ "futures-core",
+ "once_cell",
+ "openssh",
+ "openssh-sftp-client-lowlevel",
+ "openssh-sftp-error",
+ "pin-project",
+ "scopeguard",
+ "tokio",
+ "tokio-io-utility",
+ "tokio-util",
+]
+
+[[package]]
+name = "openssh-sftp-client-lowlevel"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a84f1a52761901fcf5b10885544085348a872e57294531ec9188145d9a83042"
+dependencies = [
+ "awaitable",
+ "bytes",
+ "concurrent_arena",
+ "derive_destructure2",
+ "openssh-sftp-error",
+ "openssh-sftp-protocol",
+ "pin-project",
+ "tokio",
+ "tokio-io-utility",
+]
+
+[[package]]
+name = "openssh-sftp-error"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61a5aea093d714df10186f481a6003e3f906f6fc8360c026737a841f4f182996"
+dependencies = [
+ "awaitable-error",
+ "openssh",
+ "openssh-sftp-protocol-error",
+ "ssh_format_error",
+ "thiserror 1.0.69",
+ "tokio",
+]
+
+[[package]]
+name = "openssh-sftp-protocol"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9c862e0c56553146306507f55958c11ff554e02c46de287e6976e50d815b350"
+dependencies = [
+ "bitflags 2.9.0",
+ "num-derive",
+ "num-traits",
+ "openssh-sftp-protocol-error",
+ "serde",
+ "ssh_format",
+ "vec-strings",
+]
+
+[[package]]
+name = "openssh-sftp-protocol-error"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42b54df62ccfd9a7708a83a9d60c46293837e478f9f4c0829360dcfa60ede8d2"
+dependencies = [
+ "serde",
+ "thiserror 2.0.12",
+ "vec-strings",
+]
+
+[[package]]
+name = "openssl"
+version = "0.10.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
+dependencies = [
+ "bitflags 2.9.0",
+ "cfg-if",
+ "foreign-types 0.3.2",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "outref"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
+
+[[package]]
+name = "p256"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
+dependencies = [
+ "ecdsa 0.14.8",
+ "elliptic-curve 0.12.3",
+ "sha2",
+]
+
+[[package]]
+name = "parity-scale-codec"
+version = "3.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9fde3d0718baf5bc92f577d652001da0f8d54cd03a7974e118d04fc888dc23d"
+dependencies = [
+ "arrayvec",
+ "bitvec",
+ "byte-slice-cast",
+ "const_format",
+ "impl-trait-for-tuples",
+ "parity-scale-codec-derive",
+ "rustversion",
+ "serde",
+]
+
+[[package]]
+name = "parity-scale-codec-derive"
+version = "3.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581c837bb6b9541ce7faa9377c20616e4fb7650f6b0f68bc93c827ee504fb7b3"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "paste"
+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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pest"
+version = "2.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
+dependencies = [
+ "memchr",
+ "thiserror 2.0.12",
+ "ucd-trie",
+]
+
+[[package]]
+name = "pharos"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414"
+dependencies = [
+ "futures",
+ "rustc_version 0.4.1",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+dependencies = [
+ "der 0.6.1",
+ "spki 0.6.0",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der 0.7.9",
+ "spki 0.7.3",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "polling"
+version = "3.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi 0.4.0",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "primitive-types"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
+dependencies = [
+ "fixed-hash",
+ "impl-codec",
+ "uint",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proptest"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
+dependencies = [
+ "bit-set",
+ "bit-vec",
+ "bitflags 2.9.0",
+ "lazy_static",
+ "num-traits",
+ "rand",
+ "rand_chacha",
+ "rand_xorshift",
+ "regex-syntax",
+ "rusty-fork",
+ "tempfile",
+ "unarray",
+]
+
+[[package]]
+name = "prost"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
+dependencies = [
+ "anyhow",
+ "itertools 0.14.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "prover"
+version = "0.1.0"
+dependencies = [
+ "bitcoin",
+ "blake3",
+ "borsh",
+ "crypto-bigint 0.5.2",
+ "final-spv",
+ "header-chain",
+ "hex",
+ "hex-literal",
+ "num-bigint 0.4.6",
+ "num-traits",
+ "risc0-binfmt",
+ "risc0-circuit-recursion",
+ "risc0-groth16",
+ "risc0-zkp",
+ "risc0-zkvm",
+ "serde_json",
+ "sha2",
+ "tempfile",
+]
+
+[[package]]
+name = "puffin"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa9dae7b05c02ec1a6bc9bcf20d8bc64a7dcbf57934107902a872014899b741f"
+dependencies = [
+ "anyhow",
+ "byteorder",
+ "cfg-if",
+ "itertools 0.10.5",
+ "once_cell",
+ "parking_lot",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+[[package]]
+name = "quinn"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
+dependencies = [
+ "bytes",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls 0.23.23",
+ "socket2",
+ "thiserror 2.0.12",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
+dependencies = [
+ "bytes",
+ "getrandom 0.2.15",
+ "rand",
+ "ring",
+ "rustc-hash",
+ "rustls 0.23.23",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.12",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rawpointer"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "recvmsg"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+dependencies = [
+ "bitflags 2.9.0",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+dependencies = [
+ "getrandom 0.2.15",
+ "libredox",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-lite"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "reqwest"
+version = "0.11.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+dependencies = [
+ "base64 0.21.7",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.32",
+ "hyper-tls 0.5.0",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile 1.0.4",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 0.1.2",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tokio-socks",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.6.0",
+ "hyper-rustls 0.27.5",
+ "hyper-tls 0.6.0",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls 0.23.23",
+ "rustls-pemfile 2.2.0",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 1.0.2",
+ "tokio",
+ "tokio-native-tls",
+ "tokio-rustls 0.26.2",
+ "tower 0.5.2",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "webpki-roots",
+ "windows-registry",
+]
+
+[[package]]
+name = "rfc6979"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+dependencies = [
+ "crypto-bigint 0.4.9",
+ "hmac",
+ "zeroize",
+]
+
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da5349ae27d3887ca812fb375b45a4fbb36d8d12d2df394968cd86e35683fe73"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.15",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "risc0-binfmt"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9d893807e609dd44942644aef5137ad87d178a032c5932b0c68cdec538c3370"
+dependencies = [
+ "anyhow",
+ "borsh",
+ "elf",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-build"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98bcfd51f182f7e94209249ca3a0c64df0ab0dbfe151bd5fcbe2b708c4f9f17f"
+dependencies = [
+ "anyhow",
+ "cargo_metadata",
+ "dirs",
+ "docker-generate",
+ "hex",
+ "risc0-binfmt",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "serde",
+ "serde_json",
+ "tempfile",
+]
+
+[[package]]
+name = "risc0-build-kernel"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9be0b201426fa79c1517ea919f6f37091489748c6b11b984ab3e6e452b9c5a6a"
+dependencies = [
+ "cc",
+ "directories",
+ "glob",
+ "hex",
+ "rayon",
+ "sha2",
+ "tempfile",
+]
+
+[[package]]
+name = "risc0-circuit-keccak"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16d1d4f248ccf111a9d58a6cd9ae5bfb4c3830e100e75874c39622a2952ef5a9"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "cfg-if",
+ "keccak",
+ "paste",
+ "rayon",
+ "risc0-binfmt",
+ "risc0-circuit-keccak-sys",
+ "risc0-circuit-recursion",
+ "risc0-core",
+ "risc0-sys",
+ "risc0-zkp",
+ "tracing",
+ "xz2",
+]
+
+[[package]]
+name = "risc0-circuit-keccak-sys"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d9256fd78de19c09bb2131ab86a02b841e1569f2e4d474c3ae3928ce273283"
+dependencies = [
+ "cc",
+ "derive_more 1.0.0",
+ "glob",
+ "risc0-build-kernel",
+ "risc0-core",
+ "risc0-sys",
+]
+
+[[package]]
+name = "risc0-circuit-recursion"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5ab005ed38c1119c0511b9260cd18d95adbb226ad849eccfdb650eebecd769c"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "cfg-if",
+ "downloader",
+ "hex",
+ "lazy-regex",
+ "metal",
+ "rand",
+ "rayon",
+ "risc0-circuit-recursion-sys",
+ "risc0-core",
+ "risc0-sys",
+ "risc0-zkp",
+ "serde",
+ "sha2",
+ "tracing",
+ "zip",
+]
+
+[[package]]
+name = "risc0-circuit-recursion-sys"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "202ceb200e1248534e808ffc00e5f302c2fe68d5ade99231d61fbb65b7945214"
+dependencies = [
+ "glob",
+ "risc0-build-kernel",
+ "risc0-core",
+ "risc0-sys",
+]
+
+[[package]]
+name = "risc0-circuit-rv32im"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d64420292f716e468cba1e17eb56146a525d612d967ee09566eda80b423a54a"
+dependencies = [
+ "anyhow",
+ "auto_ops",
+ "bytemuck",
+ "byteorder",
+ "cfg-if",
+ "crossbeam",
+ "crypto-bigint 0.5.5",
+ "derive_more 1.0.0",
+ "enum-map",
+ "lazy-regex",
+ "metal",
+ "num-bigint 0.4.6",
+ "num-derive",
+ "num-traits",
+ "rand",
+ "rayon",
+ "risc0-binfmt",
+ "risc0-circuit-rv32im-sys",
+ "risc0-core",
+ "risc0-sys",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "serde",
+ "sha2",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-rv32im-sys"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d161d7a468272e803655856a11d379e5754d347fd01146b079aaaa8b4536c0c6"
+dependencies = [
+ "glob",
+ "risc0-build-kernel",
+ "risc0-core",
+ "risc0-sys",
+]
+
+[[package]]
+name = "risc0-core"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2492abd92da4eb2a6e5e9e74757d00b1c29c03bb867266c85752cb22a03a920"
+dependencies = [
+ "bytemuck",
+ "nvtx",
+ "puffin",
+ "rand_core",
+]
+
+[[package]]
+name = "risc0-groth16"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0017c18151e017a154f4b4bbeec2a0656a3a7822fab3cd0dc1a15e2654dde4fe"
+dependencies = [
+ "anyhow",
+ "ark-bn254 0.4.0",
+ "ark-ec 0.4.2",
+ "ark-groth16 0.4.0",
+ "ark-serialize 0.4.2",
+ "bytemuck",
+ "hex",
+ "num-bigint 0.4.6",
+ "num-traits",
+ "risc0-binfmt",
+ "risc0-core",
+ "risc0-zkp",
+ "serde",
+ "serde_json",
+ "stability",
+ "tempfile",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-sys"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3ea764e96dd881a9e568deae0ad4cf0a603f0d685a622ed5f1b1afed8d62d30"
+dependencies = [
+ "anyhow",
+ "risc0-build-kernel",
+]
+
+[[package]]
+name = "risc0-zkp"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a6e3c078d7a7d27eda9383db8d080f7200ac4e5e65c1971d454a0286c00cae"
+dependencies = [
+ "anyhow",
+ "blake2",
+ "borsh",
+ "bytemuck",
+ "cfg-if",
+ "digest 0.10.7",
+ "ff 0.13.0",
+ "hex",
+ "hex-literal",
+ "metal",
+ "ndarray",
+ "parking_lot",
+ "paste",
+ "rand",
+ "rand_core",
+ "rayon",
+ "risc0-core",
+ "risc0-sys",
+ "risc0-zkvm-platform",
+ "serde",
+ "sha2",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-zkvm"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fd97c60815994da62fa000dec9470c0d0e3045a554354e279695f2213b0182f"
+dependencies = [
+ "addr2line 0.22.0",
+ "anyhow",
+ "bincode",
+ "borsh",
+ "bytemuck",
+ "bytes",
+ "elf",
+ "enum-map",
+ "getrandom 0.2.15",
+ "hex",
+ "keccak",
+ "lazy-regex",
+ "num-bigint 0.4.6",
+ "num-traits",
+ "prost",
+ "rand",
+ "rayon",
+ "risc0-binfmt",
+ "risc0-build",
+ "risc0-circuit-keccak",
+ "risc0-circuit-recursion",
+ "risc0-circuit-rv32im",
+ "risc0-core",
+ "risc0-groth16",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "rrs-lib",
+ "rustc-demangle",
+ "semver 1.0.26",
+ "serde",
+ "sha2",
+ "stability",
+ "tempfile",
+ "tracing",
+ "typetag",
+]
+
+[[package]]
+name = "risc0-zkvm-platform"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "778e0235c87d8e18f13da5c71bfe69b1beb7c08694c75d19eae9dbed09a59c57"
+dependencies = [
+ "bytemuck",
+ "cfg-if",
+ "getrandom 0.2.15",
+ "libm",
+ "stability",
+]
+
+[[package]]
+name = "rlp"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
+dependencies = [
+ "bytes",
+ "rustc-hex",
+]
+
+[[package]]
+name = "rrs-lib"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4382d3af3a4ebdae7f64ba6edd9114fff92c89808004c4943b393377a25d001"
+dependencies = [
+ "downcast-rs",
+ "paste",
+]
+
+[[package]]
+name = "ruint"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "825df406ec217a8116bd7b06897c6cc8f65ffefc15d030ae2c9540acc9ed50b6"
+dependencies = [
+ "alloy-rlp",
+ "ark-ff 0.3.0",
+ "ark-ff 0.4.2",
+ "bytes",
+ "fastrlp 0.3.1",
+ "fastrlp 0.4.0",
+ "num-bigint 0.4.6",
+ "num-integer",
+ "num-traits",
+ "parity-scale-codec",
+ "primitive-types",
+ "proptest",
+ "rand",
+ "rlp",
+ "ruint-macro",
+ "serde",
+ "valuable",
+ "zeroize",
+]
+
+[[package]]
+name = "ruint-macro"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
+[[package]]
+name = "rustc-hex"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
+
+[[package]]
+name = "rustc_version"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
+dependencies = [
+ "semver 0.11.0",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver 1.0.26",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+dependencies = [
+ "bitflags 2.9.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.21.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki 0.101.7",
+ "sct",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
+dependencies = [
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile 1.0.4",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64 0.21.7",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+dependencies = [
+ "web-time",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+
+[[package]]
+name = "rusty-fork"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+dependencies = [
+ "fnv",
+ "quick-error",
+ "tempfile",
+ "wait-timeout",
+]
+
+[[package]]
+name = "ruzstd"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b"
+dependencies = [
+ "byteorder",
+ "derive_more 0.99.19",
+ "twox-hash",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "scc"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea091f6cac2595aa38993f04f4ee692ed43757035c36e67c180b6828356385b1"
+dependencies = [
+ "sdd",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "script-macro"
+version = "0.3.0"
+source = "git+https://github.com/BitVM/rust-bitcoin-script#cda22ff17ba3e471f76fa1caa0995f20058ac2a3"
+dependencies = [
+ "bitcoin",
+ "hex",
+ "lazy_static",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "sdd"
+version = "3.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b07779b9b918cc05650cb30f404d4d7835d26df37c235eded8a6832e2fb82cca"
+
+[[package]]
+name = "sec1"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+dependencies = [
+ "base16ct 0.1.1",
+ "der 0.6.1",
+ "generic-array",
+ "pkcs8 0.9.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct 0.2.0",
+ "der 0.7.9",
+ "generic-array",
+ "pkcs8 0.10.2",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "secp"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd426921f62c7e334ca27173743cd90a7263566a3be76ef0b47773d631633cf9"
+dependencies = [
+ "base16ct 0.2.0",
+ "once_cell",
+ "rand",
+ "secp256k1",
+ "serde",
+ "serdect",
+ "subtle",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
+dependencies = [
+ "bitcoin_hashes",
+ "rand",
+ "secp256k1-sys",
+ "serde",
+]
+
+[[package]]
+name = "secp256k1-sys"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.9.0",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "semver"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2"
+dependencies = [
+ "pest",
+]
+
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
+
+[[package]]
+name = "sendfd"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798"
+dependencies = [
+ "libc",
+ "tokio",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.218"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-wasm-bindgen"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b"
+dependencies = [
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.218"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.140"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serdect"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177"
+dependencies = [
+ "base16ct 0.2.0",
+ "serde",
+]
+
+[[package]]
+name = "serial_test"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9"
+dependencies = [
+ "futures",
+ "log",
+ "once_cell",
+ "parking_lot",
+ "scc",
+ "serial_test_derive",
+]
+
+[[package]]
+name = "serial_test_derive"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha3-asm"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46"
+dependencies = [
+ "cc",
+ "cfg-if",
+]
+
+[[package]]
+name = "shell-escape"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-mio"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
+dependencies = [
+ "libc",
+ "mio 0.8.11",
+ "signal-hook",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "signature"
+version = "1.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core",
+]
+
+[[package]]
+name = "simd-adler32"
+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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+
+[[package]]
+name = "socket2"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "spki"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
+dependencies = [
+ "base64ct",
+ "der 0.6.1",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der 0.7.9",
+]
+
+[[package]]
+name = "ssh_format"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24ab31081d1c9097c327ec23550858cb5ffb4af6b866c1ef4d728455f01f3304"
+dependencies = [
+ "bytes",
+ "serde",
+ "ssh_format_error",
+]
+
+[[package]]
+name = "ssh_format_error"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be3c6519de7ca611f71ef7e8a56eb57aa1c818fecb5242d0a0f39c83776c210c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "stability"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac"
+dependencies = [
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "stdext"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4af28eeb7c18ac2dbdb255d40bee63f203120e1db6b0024b177746ebec7049c1"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "strum"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "suppaftp"
+version = "6.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "821742c6eeb5a90b95566abae78cc4bab5b96d9c230d29ea9e1a2e3181e57885"
+dependencies = [
+ "async-native-tls",
+ "async-std",
+ "async-trait",
+ "chrono",
+ "futures-lite",
+ "lazy-regex",
+ "log",
+ "pin-project",
+ "thiserror 2.0.12",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn-solidity"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c837dc8852cb7074e46b444afb81783140dab12c58867b49fb3898fbafedf7ea"
+dependencies = [
+ "paste",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tempfile"
+version = "3.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "getrandom 0.3.1",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thin-vec"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b"
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+dependencies = [
+ "thiserror-impl 2.0.12",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "threadpool"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
+dependencies = [
+ "num_cpus",
+]
+
+[[package]]
+name = "time"
+version = "0.3.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.43.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio 1.0.3",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "tokio-io-utility"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d672654d175710e52c7c41f6aec77c62b3c0954e2a7ebce9049d1e94ed7c263"
+dependencies = [
+ "bytes",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-pipe"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f213a84bffbd61b8fa0ba8a044b4bbe35d471d0b518867181e82bd5c15542784"
+dependencies = [
+ "libc",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls 0.21.12",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+dependencies = [
+ "rustls 0.23.23",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-socks"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
+dependencies = [
+ "either",
+ "futures-util",
+ "thiserror 1.0.69",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
+dependencies = [
+ "futures-util",
+ "log",
+ "rustls 0.23.23",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.2",
+ "tungstenite",
+ "webpki-roots",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+
+[[package]]
+name = "toml_edit"
+version = "0.22.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
+dependencies = [
+ "indexmap",
+ "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",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper 1.0.2",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tqdm"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2d2932240205a99b65f15d9861992c95fbb8c9fb280b3a1f17a92db6dc611f"
+dependencies = [
+ "anyhow",
+ "crossterm",
+ "once_cell",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
+dependencies = [
+ "tracing-core",
+]
+
+[[package]]
+name = "triomphe"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
+dependencies = [
+ "arc-swap",
+ "serde",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "tungstenite"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http 1.2.0",
+ "httparse",
+ "log",
+ "rand",
+ "rustls 0.23.23",
+ "rustls-pki-types",
+ "sha1",
+ "thiserror 1.0.69",
+ "utf-8",
+]
+
+[[package]]
+name = "twox-hash"
+version = "1.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
+dependencies = [
+ "cfg-if",
+ "static_assertions",
+]
+
+[[package]]
+name = "typed-builder"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e14ed59dc8b7b26cacb2a92bad2e8b1f098806063898ab42a3bd121d7d45e75"
+dependencies = [
+ "typed-builder-macro",
+]
+
+[[package]]
+name = "typed-builder-macro"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "560b82d656506509d43abe30e0ba64c56b1953ab3d4fe7ba5902747a7a3cedd5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "typeid"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
+
+[[package]]
+name = "typenum"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+
+[[package]]
+name = "typetag"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f22b40dd7bfe8c14230cf9702081366421890435b2d625fa92b4acc4c3de6f"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
+
+[[package]]
+name = "typetag-impl"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35f5380909ffc31b4de4f4bdf96b877175a016aa2ca98cee39fcfd8c4d53d952"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "ucd-trie"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
+
+[[package]]
+name = "uint"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
+dependencies = [
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "unarray"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "uuid"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
+
+[[package]]
+name = "valuable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+
+[[package]]
+name = "value-bag"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "vec-strings"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8509489e2a7ee219522238ad45fd370bec6808811ac15ac6b07453804e77659"
+dependencies = [
+ "serde",
+ "thin-vec",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "vsimd"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
+
+[[package]]
+name = "wait-timeout"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.26.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "widestring"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.9.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "ws_stream_wasm"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5"
+dependencies = [
+ "async_io_stream",
+ "futures",
+ "js-sys",
+ "log",
+ "pharos",
+ "rustc_version 0.4.1",
+ "send_wrapper",
+ "thiserror 1.0.69",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "xmlparser"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
+
+[[package]]
+name = "xz2"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
+dependencies = [
+ "lzma-sys",
+]
+
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "zip"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b280484c454e74e5fff658bbf7df8fdbe7a07c6b2de4a53def232c15ef138f3a"
+dependencies = [
+ "arbitrary",
+ "crc32fast",
+ "crossbeam-utils",
+ "displaydoc",
+ "flate2",
+ "indexmap",
+ "memchr",
+ "thiserror 2.0.12",
+ "zopfli",
+]
+
+[[package]]
+name = "zopfli"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "lockfree-object-pool",
+ "log",
+ "once_cell",
+ "simd-adler32",
+]
+
+[[package]]
+name = "zstd"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3051792fbdc2e1e143244dc28c60f73d8470e93f3f9cbd0ead44da5ed802722"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.14+zstd.1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fb060d4926e4ac3a3ad15d864e99ceb5f343c6b34f5bd6d81ae6ed417311be5"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 3e2d4edd7..e5e4f0e73 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,76 +1,65 @@
-[package]
-name = "bitvm"
-version = "0.1.0"
-edition = "2021"
-exclude = ["tests"]
+[workspace]
+resolver = "2"
+members = [
+    "bitvm",
+    "bridge",
+    "fuzz",
+    "goat",
+    "header-chain",
+    "header-chain/header-chain-guest",
+    "final-spv",
+    "final-spv/final-spv-guest",
+    "prover",
+]
 
-[dependencies]
-#bitcoin-script = { path = "../rust-bitcoin-script"}
-#bitcoin-scriptexec = { path = "../rust-bitcoin-scriptexec"}
-bitcoin-script = { git = "https://github.com/BitVM/rust-bitcoin-script", branch= "chunker" }
-bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", branch = "bitvm", features = ["rand-std"]}
-strum = "0.26"
-strum_macros = "0.26"
+[workspace.dependencies]
+bitcoin-script = { git = "https://github.com/BitVM/rust-bitcoin-script" }
+bitcoin = { version = "0.32.5", features = ["rand-std"] }
+strum = "0.27"
+strum_macros = "0.27"
 hex = "0.4.3"
-bitcoin-scriptexec = { git = "https://github.com/BitVM/rust-bitcoin-scriptexec/"}
+bitcoin-scriptexec = { git = "https://github.com/BitVM/rust-bitcoin-scriptexec" }
 serde = { version = "1.0.197", features = ["derive"] }
-num-bigint = "0.4.4"
 num-traits = "0.2.18"
-ark-bn254 = { git = "https://github.com/Antalpha-Labs/algebra/", features = ["curve"], default-features = false }
-ark-ff = { git = "https://github.com/Antalpha-Labs/algebra/" }
-ark-ec = { git = "https://github.com/Antalpha-Labs/algebra/" }
-ark-groth16 = { git = "https://github.com/Antalpha-Labs/groth16" }
+ark-bn254 = { version = "0.5.0", features = ["curve", "scalar_field"], default-features = false }
+ark-ff = "0.5.0"
+ark-ec = "0.5.0"
+ark-groth16 = "0.5.0"
+ark-serialize = "0.5.0"
 sha2 = "0.10.8"
 tokio = { version = "1.37.0", features = ["full"] }
 esplora-client = { git = "https://github.com/BitVM/rust-esplora-client" }
 serde_json = "1.0.116"
-lazy_static = "1.4.0"
-bitcoin-script-stack = { git = "https://github.com/FairgateLabs/rust-bitcoin-script-stack"}
+bitcoin-script-stack = { git = "https://github.com/BitVM/rust-bitcoin-script-stack" }
 rand = "0.8.5"
 rand_chacha = "0.3.1"
-once_cell = "1.19.0"
 dotenv = "0.15.0"
 aws-sdk-s3 = "1.40.0"
 regex = "1.10.5"
 blake3 = "=1.5.1"
 paste = "1.0.15"
-musig2 = { version = "0.0.11", features = ["serde", "rand"] }
+musig2 = { version = "0.1.0", features = ["serde", "rand"] }
 futures = "0.3.30"
 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"] }
-
-[dev-dependencies]
+clap = { version = "4.5.23", features = ["derive", "cargo", "env"] }
+toml = "0.5.11"
+colored = "2.0.0"
+itertools = "0.13.0"
+serde-big-array = "0.5.1"
 num-bigint = { version = "0.4.4", features = ["rand"] }
-ark-std = { version = "0.4.0", default-features = false, features = ["print-trace"] }
-ark-crypto-primitives = { git = "https://github.com/Antalpha-Labs/crypto-primitives", features = ["snark", "sponge"] }
-ark-relations = { git = "https://github.com/Antalpha-Labs/snark/" }
+ark-std = { version = "0.5.0", default-features = false, features = ["print-trace"] }
+ark-crypto-primitives = { git = "https://github.com/arkworks-rs/crypto-primitives", branch = "release-0.5.0", features = ["snark", "sponge"] }
+ark-relations = "0.5.0"
+serial_test = "*"
+tqdm = "0.7"
+secp256k1 = { version = "0.29.1", features = ["global-context"]}
 
 [profile.dev]
 opt-level = 3
 
 [profile.release]
-lto = true
-
-[patch.crates-io]
-base58check = { git = "https://github.com/rust-bitcoin/rust-bitcoin", branch = "bitvm"}
-bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", branch = "bitvm"}
-bitcoin_hashes = { git = "https://github.com/rust-bitcoin/rust-bitcoin", branch = "bitvm"}
-bitcoin-internals = { git = "https://github.com/rust-bitcoin/rust-bitcoin", branch = "bitvm"}
-bitcoin-io = { git = "https://github.com/rust-bitcoin/rust-bitcoin", branch = "bitvm"}
-bitcoin-units = { git = "https://github.com/rust-bitcoin/rust-bitcoin", branch = "bitvm"}
-
-ark-ff = { git = "https://github.com/Antalpha-Labs/algebra/" }
-ark-ec = { git = "https://github.com/Antalpha-Labs/algebra/" }
-ark-poly = { git = "https://github.com/Antalpha-Labs/algebra/" }
-ark-serialize = { git = "https://github.com/Antalpha-Labs/algebra/" }
-ark-bn254 = { git = "https://github.com/Antalpha-Labs/algebra/", features = ["curve"], default-features = false }
-
-ark-r1cs-std = { git = "https://github.com/Antalpha-Labs/r1cs-std/" }
-ark-crypto-primitives = { git = "https://github.com/Antalpha-Labs/crypto-primitives/" }
-
-ark-relations = { git = "https://github.com/Antalpha-Labs/snark/" }
-ark-snark = { git = "https://github.com/Antalpha-Labs/snark/" }
-ark-groth16 = { git = "https://github.com/Antalpha-Labs/groth16" }
+lto = true
\ No newline at end of file
diff --git a/DEMO_INSTRUCTIONS.md b/DEMO_INSTRUCTIONS.md
new file mode 100644
index 000000000..d6edaf6b1
--- /dev/null
+++ b/DEMO_INSTRUCTIONS.md
@@ -0,0 +1,261 @@
+Before running the demo for the first time, see [Environment Setup](#environment-setup) section below.
+
+# Demo Prep: Funding UTXOs
+The bridge peg-in and peg-out execution consumes three funding UTXOs. For convenience, prepare them before running the demo. This process remains the same across all scenarios. You can use the recommended amounts as below:
+
+1. Peg-in graph - 'peg-in depost' tx input: **2097447 SAT** - will be spent by [DEPOSITOR] (use `-d` to get their address)
+2. Peg-out graph - 'peg-out confirm' tx input: **3562670 SAT** - will be spent by [OPERATOR] (use `-o` to get their address)
+3. Withdrawer peg-out - 'peg-out' tx input: **2097274 SAT** - will be spent by [OPERATOR] (use `-o` to get their address)
+
+# Demo Steps
+The following is the list of command line arguments that are passed to the CLI tool in sequence by the respective actors. The arguments can be used either with `cargo run --bin bridge --` or when running the CLI binary directly.
+
+## Rejected Disprove Scenario (a.k.a. 'happy peg-out' execution path).
+#### [DEPOSITOR] Initiate peg-in
+`<TXID>:<VOUT>` = Bridge deposit UTXO that includes the expected peg-in amount. It must be spendable by the depositor private key. Suggested test amount: `2097447 sats`. It is the UTXO #1 in [Demo Prep](#demo-prep-funding-utxos).
+```
+-n -u <TXID>:<VOUT> -d <EVM_ADDRESS>
+```
+#### [OPERATOR] Create peg-out graph
+`<TXID>:<VOUT>` = UTXO funding the peg-out confirm tx. Must be spendable by the operator private key. Suggested test amount: `3562670 sats`. It is the UTXO #2 in [Demo Prep](#demo-prep-funding-utxos).
+```
+-t -u <TXID>:<VOUT> -i <PEG_IN_GRAPH_ID>
+```
+#### [VERIFIER_0] Push verifier_0 nonces for peg-in graph
+```
+-c -i <GRAPH_ID>
+```
+#### [VERIFIER_1] Push verifier_1 nonces for peg-in graph
+```
+-c -i <GRAPH_ID>
+```
+#### [VERIFIER_0] Push verifier_0 signatures for peg-in graph
+```
+-g -i <GRAPH_ID>
+```
+#### [VERIFIER_1] Push verifier_1 signatures for peg-in graph
+```
+-g -i <GRAPH_ID>
+```
+#### [OPERATOR] or [VERIFIER_0] or [VERIFIER_1] Broadcast peg-in confirm
+```
+-b pegin -g <PEG_IN_GRAPH_ID> confirm
+```
+Record the peg-in confirm txid.
+#### [VERIFIER_0] Push verifier_0 nonces for peg-out graph
+```
+-c -i <GRAPH_ID>
+```
+#### [VERIFIER_1] Push verifier_1 nonces for peg-out graph
+```
+-c -i <GRAPH_ID>
+```
+#### [VERIFIER_0] Push verifier_0 signatures for peg-out graph
+```
+-g -i <GRAPH_ID>
+```
+#### [VERIFIER_1] Push verifier_1 signatures for peg-out graph
+```
+-g -i <GRAPH_ID>
+```
+#### [OPERATOR] Mock L2 peg-out event (requires peg-in confirm txid mined earlier)
+> [!IMPORTANT]
+> Start the CLI in interactive mode here.
+
+`<TXID>:<VOUT>` = The peg-in confirm txid recorded above and output index 0.
+```
+-x -u <TXID>:<VOUT>
+```
+#### [OPERATOR] Broadcast peg-out
+`<TXID>:<VOUT>` = UTXO funding the payout to the withdrawer. Must be spendable by the operator private key. Suggested test amount: `2097274 sats`. It is the UTXO #3 in [Demo Prep](#demo-prep-funding-utxos).
+```
+-b tx -g <GRAPH_ID> -u <TXID>:<VOUT> peg_out
+```
+#### [OPERATOR] Broadcast peg-out confirm
+```
+-b tx -g <GRAPH_ID> peg_out_confirm
+```
+#### [OPERATOR] Broadcast kick-off 1
+```
+-b tx -g <GRAPH_ID> kick_off_1
+```
+#### [OPERATOR] Broadcast kick-off 2
+```
+-b tx -g <GRAPH_ID> kick_off_2
+```
+#### [OPERATOR] Broadcast assert-initial
+```
+-b tx -g <GRAPH_ID> assert_initial
+```
+#### [OPERATOR] Broadcast assert-commit 1
+```
+-b tx -g <GRAPH_ID> assert_commit_1
+```
+#### [OPERATOR] Broadcast assert-commit 2
+```
+-b tx -g <GRAPH_ID> assert_commit_2
+```
+#### [OPERATOR] Broadcast assert-final
+```
+-b tx -g <GRAPH_ID> assert_final
+```
+#### [VERIFIER_1] Broadcast disprove (should fail)
+`<BTC_ADDRESS>` = Receiver of the disprove reward.
+```
+-b tx -g <GRAPH_ID> -a <BTC_ADDRESS> disprove
+```
+#### [OPERATOR] Broadcast take 2
+```
+-b tx -g <GRAPH_ID> take_2
+```
+
+## Successful Disprove Scenario (a.k.a. 'unhappy peg-out' execution path).
+#### [DEPOSITOR] Initiate peg-in
+`<TXID>:<VOUT>` = Bridge deposit UTXO that includes the expected peg-in amount. It must be spendable by the depositor private key. Suggested test amount: `2097447 sats`.
+```
+-n -u <TXID>:<VOUT> -d <EVM_ADDRESS>
+```
+#### [OPERATOR] Create peg-out graph
+`<TXID>:<VOUT>` = UTXO funding the peg-out confirm tx. Must be spendable by the operator private key. Suggested test amount: `3562670 sats`.
+```
+-t -u <TXID>:<VOUT> -i <PEG_IN_GRAPH_ID>
+```
+#### [VERIFIER_0] Push verifier_0 nonces for peg-in graph
+```
+-c -i <GRAPH_ID>
+```
+#### [VERIFIER_1] Push verifier_1 nonces for peg-in graph
+```
+-c -i <GRAPH_ID>
+```
+#### [VERIFIER_0] Push verifier_0 signatures for peg-in graph
+```
+-g -i <GRAPH_ID>
+```
+#### [VERIFIER_0] Push verifier_1 signatures for peg-in graph
+```
+-g -i <GRAPH_ID>
+```
+#### [OPERATOR] or [VERIFIER_0] or [VERIFIER_1] Broadcast peg-in confirm
+```
+-b pegin -g <PEG_IN_GRAPH_ID> confirm
+```
+Record the peg-in confirm txid.
+#### [VERIFIER_0] Push verifier_0 nonces for peg-out graph
+```
+-c -i <GRAPH_ID>
+```
+#### [VERIFIER_1] Push verifier_1 nonces for peg-out graph
+```
+-c -i <GRAPH_ID>
+```
+#### [VERIFIER_0] Push verifier_0 signatures for peg-out graph
+```
+-g -i <GRAPH_ID>
+```
+#### [VERIFIER_1] Push verifier_1 signatures for peg-out graph
+```
+-g -i <GRAPH_ID>
+```
+#### [OPERATOR] Mock L2 peg-out event (requires peg-in confirm txid mined earlier)
+> [!IMPORTANT]
+> Start the CLI in interactive mode here.
+
+`<TXID>:<VOUT>` = The peg-in confirm txid recorded above and output index 0.
+```
+-x -u <TXID>:<VOUT>
+```
+#### [OPERATOR] Broadcast peg-out
+`<TXID>:<VOUT>` = UTXO funding the payout to the withdrawer. Must be spendable by the operator private key. Suggested test amount: `2097274 sats`.
+```
+-b tx -g <GRAPH_ID> -u <TXID>:<VOUT> peg_out
+```
+#### [OPERATOR] Broadcast peg-out confirm
+```
+-b tx -g <GRAPH_ID> peg_out_confirm
+```
+#### [OPERATOR] Broadcast kick-off 1
+```
+-b tx -g <GRAPH_ID> kick_off_1
+```
+#### [OPERATOR] Broadcast kick-off 2
+```
+-b tx -g <GRAPH_ID> kick_off_2
+```
+#### [OPERATOR] Broadcast assert-initial
+```
+-b tx -g <GRAPH_ID> assert_initial
+```
+#### [OPERATOR] Broadcast assert-commit 1 with invalid proof
+```
+-b tx -g <GRAPH_ID> assert_commit_1_invalid
+```
+#### [OPERATOR] Broadcast assert-commit 2 with invalid proof
+```
+-b tx -g <GRAPH_ID> assert_commit_2_invalid
+```
+#### [OPERATOR] Broadcast assert-final
+```
+-b tx -g <GRAPH_ID> assert_final
+```
+#### [VERIFIER_1] Broadcast disprove
+`<BTC_ADDRESS>` = Receiver of the disprove reward.
+```
+-b tx -g <GRAPH_ID> -a <BTC_ADDRESS> disprove
+```
+
+# Environment Setup
+Clone and build this repository. The CLI executable is called `bridge`.
+
+## [DEPOSITOR] and [OPERATOR] and [VERIFIER_0]
+All the above users can execute commands using a single setup (from the same directory).
+
+#### `bridge.toml`
+Sample `bridge.toml` file that contains private keys of protocol participants and the ZK proof verifying key:
+```toml
+[keys]
+depositor = "b8f17ea979be24199e7c3fec71ee88914d92fd4ca508443f765d56ce024ef1d7"
+operator = "3076ca1dfc1e383be26d5dd3c0c427340f96139fa8c2520862cf551ec2d670ac"
+verifier = "ee0817eac0c13aa8ee2dd3256304041f09f0499d1089b56495310ae8093583e2"
+verifying_key = "9c3815c2ec66950b63e60c86dc9a2a658e0224d55ea45efe1f633be052dc7d867aff76a9e983210318f1b808aacbbba1dc04b6ac4e6845fa0cc887aeacaf5a068ab9aeaf8142740612ff2f3377ce7bfa7433936aaa23e3f3749691afaa06301fd03f043c097556e7efdf6862007edf3eb868c736d917896c014c54754f65182ae0c198157f92e667b6572ba60e6a52d58cb70dbeb3791206e928ea5e65c6199d25780cedb51796a8a43e40e192d1b23d0cfaf2ddd03e4ade7c327dbc427999244bf4b47b560cf65d672c86ef448eb5061870d3f617bd3658ad6917d0d32d9296020000000000000008f167c3f26c93dbfb91f3077b66bc0092473a15ef21c30f43d3aa96776f352a33622830e9cfcb48bdf8d3145aa0cf364bd19bbabfb3c73e44f56794ee65dc8a"
+```
+Place the file in `.bitvm-bridge` directory in the user home directory.
+
+#### `.env`
+Sample `.env` file that must be present in the same directory as the CLI tool or any of its parent directories (if you clone this repository, you can put it in the root directory).
+```
+export BRIDGE_DATA_STORE_CLIENT_DATA_SUFFIX=-"bridge-client-data-demo-feb-2025.json"
+
+export BRIDGE_AWS_ACCESS_KEY_ID=""
+export BRIDGE_AWS_SECRET_ACCESS_KEY=""
+export BRIDGE_AWS_REGION=""
+export BRIDGE_AWS_BUCKET=""
+
+# All verifier public keys
+export VERIFIERS="026cc14f56ad7e8fdb323378287895c6c0bcdbb37714c74fba175a0c5f0cd0d56f,02452556ed6dbac394cbb7441fbaf06c446d1321467fa5a138895c6c9e246793dd"
+```
+
+## [VERIFIER_1]
+Install the CLI tool in a different directory and make sure it doesn't share the `.env` file with the setup above. You can either clone this repository at another location or just copy the binary along with the .env.
+
+#### `bridge.toml`
+Create a 'bitvm-bridge-verifier-1' directory there and put the following `bridge.toml` file there:
+```toml
+[keys]
+verifier = "fc294c70faf210d4d0807ea7a3dba8f7e41700d90c119e1ae82a0687d89d297f"
+verifying_key = "9c3815c2ec66950b63e60c86dc9a2a658e0224d55ea45efe1f633be052dc7d867aff76a9e983210318f1b808aacbbba1dc04b6ac4e6845fa0cc887aeacaf5a068ab9aeaf8142740612ff2f3377ce7bfa7433936aaa23e3f3749691afaa06301fd03f043c097556e7efdf6862007edf3eb868c736d917896c014c54754f65182ae0c198157f92e667b6572ba60e6a52d58cb70dbeb3791206e928ea5e65c6199d25780cedb51796a8a43e40e192d1b23d0cfaf2ddd03e4ade7c327dbc427999244bf4b47b560cf65d672c86ef448eb5061870d3f617bd3658ad6917d0d32d9296020000000000000008f167c3f26c93dbfb91f3077b66bc0092473a15ef21c30f43d3aa96776f352a33622830e9cfcb48bdf8d3145aa0cf364bd19bbabfb3c73e44f56794ee65dc8a"
+```
+#### `.env`
+```
+export BRIDGE_DATA_STORE_CLIENT_DATA_SUFFIX=-"bridge-client-data-demo-feb-2025.json"
+
+export BRIDGE_AWS_ACCESS_KEY_ID=""
+export BRIDGE_AWS_SECRET_ACCESS_KEY=""
+export BRIDGE_AWS_REGION=""
+export BRIDGE_AWS_BUCKET=""
+
+export KEY_DIR="bitvm-bridge-verifier-1"
+
+# All verifier public keys
+export VERIFIERS="026cc14f56ad7e8fdb323378287895c6c0bcdbb37714c74fba175a0c5f0cd0d56f,02452556ed6dbac394cbb7441fbaf06c446d1321467fa5a138895c6c9e246793dd"
+```
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..245b2918c
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 BitVM
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
index c8053323d..3c3337fc9 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,270 @@
-# BitVM: Smarter Bitcoin Contracts
+# BitVM Bridge: A Trust-minimized Bitcoin Bridge
 
-The official implementation of [BitVM2](https://bitvm.org/bitvm2), running a [SNARK verifier](https://bitvm.org/snark). Work in progress.
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
-We are following the implementation of [Arkworks](https://github.com/arkworks-rs)
+> [!WARNING]
+> DO NOT USE IN PRODUCTION!
 
+The official implementation of [BitVM2](https://bitvm.org/bitvm2),
+running a [SNARK verifier](https://bitvm.org/snark).
 
-## Overview 
+The code follows the implementation of [Arkworks](https://github.com/arkworks-rs)
 
-- Winternitz signatures
-- BigInt arithmetic
-- Bn254
-    - Field operations
-    - Extension fields
-    - Curve operations
-    - Pairings
-- Fflonk verifier
-- Groth16 verifier
+## Overview
 
+The repository contains the implementation of a groth16 SNARK verifier that is executable via the optimistic BitVM paradigm on Bitcoin without any soft forks.
 
 
-[BitVM1](https://github.com/BitVM/BitVM/tree/1dce989d1963b90c35391b77b451c6823302d503)
+It is designed to be modular, allowing developers to reuse bitcoin scripts for u32 data types, hashes and curve operations.
+
+## Components
+
+BitVM is composed of several components.
+Below is a list of the components and their purpose.
+
+- [**`u32` Operations**](bitvm/src/u32/):
+  Basic arithmetic operations of `u32` for hash functions,
+  including `add`, `sub`, `or`, `xor`, `rotation`, `shift`.
+
+- [**`u4` Operations**](bitvm/src/u4):
+  `u4` version arithmetic operations,
+  providing a more efficient way to construct hashes.
+
+- [**Hash Functions**](bitvm/src/hash/):
+  Two types of hash functions:
+
+  - `SHA256`: comparing block headers and measuring Bitcoin difficulty.
+  - `BLAKE3`: compressing intermediate states in the chunker.
+
+- [**Big Integer**](bitvm/src/bigint/):
+  Variable-length big integer operations,
+  including of `add`, `sub`, `mul`, `div`, `inverse` and other operations.
+
+- [**BN254**](bitvm/src/bn254/):
+  Point expression of BN254 elliptic curves and operations based on BN254,
+  including addition, multiplication, pairing.
+  The pairing part is related to the "Algorithm 9" in the paper "On Proving Pairings"
+
+- [**Groth16**](bitvm/src/groth16/):
+  Groth16 uses BN254 to verify proof, the script is currently around 1 GB.
+  Some hints are precomputed in this part, which is related to the paper "On Proving Pairings".
+
+- [**Chunker**](bitvm/src/chunker/):
+  Splits Groth16 into chunks.
+  These chunks make sure two principles:
+
+  1. Any chunks shouldn't be success with a right proof.
+  2. There are always some successful chunks with a wrong proof.
+
+- [**Signatures**](bitvm/src/signatures/):
+  Bit commitment using
+  [Winternitz signature](https://en.wikipedia.org/wiki/Lamport_signature#Short_keys_and_signature).
+
+- [**Bridge**](bridge/):
+  Definitions for the context (roles), connectors, Bitcoin transaction construction,
+  Bitcoin client wrapper, etc.
+
+## BitVM1
+
+If you are looking for the deprectated BitVM1 implementation, please check out
+[BitVM1](https://github.com/BitVM/BitVM/tree/1dce989d1963b90c35391b77b451c6823302d503).
+
+
+## BitVM CLI
+
+### Overview
+
+The **BitVM CLI** is a command-line interface for interacting with the BitVM protocol, enabling users to manage Bitcoin keys, initiate peg-ins, retrieve addresses and UTXOs, and monitor the status of transactions within the BitVM network. 
+
+This CLI supports multiple Bitcoin network environments, including `mainnet` and `testnet`.
+
+### Features
+
+- **Manage Bitcoin Keys**: Easily manage keys for different roles (depositor, operator, verifier, withdrawer).
+- **Retrieve Depositor Address**: Get the address associated with the registered depositor key.
+- **Retrieve Depositor UTXOs**: List unspent transaction outputs (UTXOs) for the depositor.
+- **Initiate Peg-Ins**: Start the process of peg-ins by creating peg-in graphs.
+- **Broadcast Transactions**: Send various types of transactions related to peg-ins and peg-outs.
+- **Interactive Mode**: Use an interactive command-line interface for manual command issuance and management.
+
+## Requirements
+
+- Rust programming language (latest stable version)
+- Cargo (Rust package manager)
+
+## Installation
+
+1. **Clone the Repository**:
+   ```bash
+   git clone <repository-url>
+   cd <repository-directory>
+   ```
+2. **Build the Project**:
+   ```bash
+   cargo build --release
+   ```
+3. **Run the Application**:
+   ```bash
+   ./target/release/bridge
+   ```
+
+## Usage
+
+The BitVM CLI application can be invoked with various commands. The general syntax is:
+
+```
+./target/release/bridge [OPTIONS] <SUBCOMMAND>
+```
+
+### Global Options
+
+- -r, --verifiers <VERIFIER_PUBKEYS>: Comma-separated list of public keys for verifiers (max: 1000). Can also be set via the VERIFIERS environment variable.
+- -e, --environment <ENVIRONMENT>: Optional; Specify the Bitcoin network environment (mainnet, testnet, regtest). Defaults to testnet. Can also be set via the ENVIRONMENT environment variable.
+- --key-dir <DIRECTORY>: Optional; Directory containing the private keys. Can also be set via the KEY_DIR environment variable.
+- -p, --user-profile <USER_PROFILE>: Optional; An arbitrary name of the user running the client (e.g. 'operator_one', 'verifier_0'). Used as a namespace separator in the local file path for storing private and public client data. Can also be set by the USER_PROFILE environment variable.
+
+### Available Commands
+
+#### Keys Management:
+
+1. Description: Manage secret keys for different contexts (depositor, operator, verifier, withdrawer).
+2. Usage:
+```bash
+./target/release/bridge keys [OPTIONS]
+```
+
+3. Options:
+- -d, --depositor <SECRET_KEY>: Secret key for the depositor.
+- -o, --operator <SECRET_KEY>: Secret key for the operator.
+- -v, --verifier <SECRET_KEY>: Secret key for the verifier.
+- -w, --withdrawer <SECRET_KEY>: Secret key for the withdrawer.
+- -k, --vk <KEY>: Zero-knowledge proof verifying key.
+
+#### Get Operator Address:
+1. Description: Retrieve the address spendable by the registered operator key.
+2. Usage:
+```bash
+./target/release/bridge get-operator-address
+```
+
+#### Get Operator UTXOs:
+1. Description: Retrieve a list of the operator's UTXOs.
+2. Usage:
+```bash
+./target/release/bridge get-operator-utxos
+```
+
+#### Get Depositor Address:
+1. Description: Retrieve the address spendable by the registered depositor key.
+2. Usage:
+```bash
+./target/release/bridge get-depositor-address
+```
+
+#### Get Depositor UTXOs:
+1. Description: Retrieve a list of the depositor's UTXOs.
+2. Usage:
+```bash
+./target/release/bridge get-depositor-utxos
+```
+
+#### Initiate Peg-In:
+1. Description: Start the peg-in process by creating a peg-in graph.
+2. Usage:
+```bash
+./target/release/bridge initiate-peg-in --utxo <TXID>:<VOUT> --destination_address <EVM_ADDRESS>
+```
+
+#### Create Peg-Out graph:
+1. Description: Create the peg-out graph for the corresponding peg-in graph.
+2. Usage:
+```bash
+./target/release/bridge create-peg-out --utxo <TXID>:<VOUT> --peg_in_id <PEG_IN_GRAPH_ID>
+```
+
+#### Push nonces (MuSig2 signing process):
+1. Description: Push nonces for the corresponding peg-out or peg-in graph.
+2. Usage:
+```bash
+./target/release/bridge push-nonces --id <GRAPH_ID>
+```
+
+#### Push signatures (MuSig2 signing process):
+1. Description: Push signatures for the corresponding peg-out or peg-in graph.
+2. Usage:
+```bash
+./target/release/bridge push-signatures --id <GRAPH_ID>
+```
+
+#### Mock L2 peg-out event:
+1. Description: FOR TEST PURPOSES ONLY! Mocks L2 chain service with specified peg-in-confirm txid.
+2. Usage:
+```bash
+./target/release/bridge mock-l2-pegout-event --utxo <TXID>:<VOUT>
+```
+
+#### Broadcast Transactions:
+1. Description: Send various types of transactions related to peg-ins and peg-outs.
+2. Usage:
+```bash
+./target/release/bridge broadcast [COMMAND] [OPTIONS]
+```
+
+#### Automatic Mode:
+1. Description: Enable automatic mode to poll for status updates and handle transactions.
+2. Usage:
+```bash
+./target/release/bridge automatic
+```
+
+#### Interactive Mode:
+1. Description: Enter into an interactive command prompt for manual command execution.
+2. Usage:
+```bash
+./target/release/bridge interactive
+```
+
+#### Show Status:
+1. Description: Display the current status of the BitVM client.
+2. Usage:
+```bash
+./target/release/bridge status
+```
+
+### Environment Variables
+
+You can set the following environment variables to configure the CLI:
+
+#### General Environment Variables
+
+- BRIDGE_DATA_STORE_CLIENT_DATA_SUFFIX : Specifies the suffix for the bridge client data file. Default value is "bridge-client-data.json".
+- BRIDGE_AWS_ACCESS_KEY_ID : Your AWS access key ID for authenticating with AWS services. Required if using AWS for storage.
+- BRIDGE_AWS_SECRET_ACCESS_KEY : Your AWS secret access key for authenticating with AWS services. Required if using AWS for storage.
+- BRIDGE_AWS_REGION : The AWS region where your storage bucket is located. Required if using AWS for storage.
+- BRIDGE_AWS_BUCKET : The name of the S3 bucket where files will be stored. Required if using AWS for storage.
+
+- KEY_DIR: Optional; Directory containing private keys.
+- VERIFIERS: Comma-separated list of public keys for verifiers.
+- ENVIRONMENT: Optional; Bitcoin network environment (default: testnet).
+- USER_PROFILE: Optional; An arbitrary name of the user running the client (e.g. 'operator_one', 'verifier_0'). Used as a namespace separator in the local file path for storing private and public client data.
+
+#### FTP/SFTP Environment Variables
+
+- BRIDGE_SFTP_HOST : Hostname or IP address of the SFTP server for secure file transfers.
+- BRIDGE_SFTP_PORT : Port number for the SFTP connection. Default is 22.
+- BRIDGE_SFTP_USERNAME : Username for authenticating to the SFTP server.
+- BRIDGE_SFTP_KEYFILE_PATH : Path to the private key file used for authenticating to the SFTP server.
+BRIDGE_SFTP_BASE_PATH : Base path on the SFTP server where BitVM data will be stored. Default is /bitvm.
+- BRIDGE_FTP_HOST : Hostname or IP address of the FTP server for file transfers.
+- BRIDGE_FTP_PORT : Port number for the FTP connection. Default is 21.
+- BRIDGE_FTP_USERNAME : Username for authenticating to the FTP server.
+- BRIDGE_FTP_PASSWORD : Password for authenticating to the FTP server.
+- BRIDGE_FTP_BASE_PATH : Base path on the FTP server where BitVM data will be stored. Default is /bitvm.
+- BRIDGE_FTPS_HOST : Hostname or IP address of the FTPS server for secure file transfers over FTP.
+- BRIDGE_FTPS_PORT : Port number for the FTPS connection. Default is 21.
+- BRIDGE_FTPS_USERNAME : Username for authenticating to the FTPS server.
+- BRIDGE_FTPS_PASSWORD : Password for authenticating to the FTPS server.
+- BRIDGE_FTPS_BASE_PATH : Base path on the FTPS server where BitVM data will be stored. Default is /bitvm.
+
+### Configuration File
+The BitVM Bridge CLI uses a configuration file (bridge.toml) located in the specified key directory (default: `~/.bitvm-bridge/`). This file is used to store the keys for the depositor, operator, verifier, and withdrawer.
diff --git a/bitvm/Cargo.toml b/bitvm/Cargo.toml
new file mode 100644
index 000000000..5119fe69e
--- /dev/null
+++ b/bitvm/Cargo.toml
@@ -0,0 +1,45 @@
+[package]
+name = "bitvm"
+version = "0.1.0"
+edition = "2021"
+exclude = ["tests"]
+
+
+[dependencies]
+bitcoin-script.workspace = true
+bitcoin.workspace = true
+hex.workspace = true
+bitcoin-scriptexec.workspace = true
+serde.workspace = true
+num-traits.workspace = true
+ark-bn254.workspace = true
+ark-ff.workspace = true
+ark-ec.workspace = true
+ark-groth16.workspace = true
+ark-serialize.workspace = true
+sha2.workspace = true
+bitcoin-script-stack.workspace = true
+rand.workspace = true
+rand_chacha.workspace = true
+blake3.workspace = true
+paste.workspace = true
+colored.workspace = true
+itertools.workspace = true
+num-bigint.workspace = true
+ark-std.workspace = true
+ark-crypto-primitives.workspace = true
+ark-relations.workspace = true
+tqdm.workspace = true
+regex.workspace = true
+
+[features]
+fuzzing = []
+
+[dev-dependencies]
+serde_json.workspace = true
+
+[profile.dev]
+opt-level = 3
+
+[profile.release]
+lto = true
diff --git a/src/bigint/add.rs b/bitvm/src/bigint/add.rs
similarity index 63%
rename from src/bigint/add.rs
rename to bitvm/src/bigint/add.rs
index 151524543..d122d77bc 100644
--- a/src/bigint/add.rs
+++ b/bitvm/src/bigint/add.rs
@@ -63,52 +63,50 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
         }
     }
 
-    pub fn add1() -> Script {
+    /// Double the BigInt on top of the stack
+    /// 
+    /// # Note
+    ///
+    /// This function allows overflow of the underlying integer types during
+    /// doubling operation.
+    pub fn double_allow_overflow() -> Script {
         script! {
-            1
             { 1 << LIMB_SIZE }
 
-            // A0 + 1
-            limb_add_carry OP_TOALTSTACK
+            // Double the limb, take the result to the alt stack, and add initial carry
+            OP_SWAP limb_double_without_carry OP_TOALTSTACK
+
 
-            // from     A1        + carry_0
-            //   to     A{N-2}    + carry_{N-3}
             for _ in 0..Self::N_LIMBS - 2 {
-                OP_SWAP
-                limb_add_carry OP_TOALTSTACK
+                OP_ROT limb_double_with_carry OP_TOALTSTACK
             }
 
-            // A{N-1} + carry_{N-2}
-            OP_NIP
-            { limb_add_nocarry(Self::HEAD_OFFSET) }
+            // When we got {limb} {base} {carry} on the stack, we drop the base
+            OP_NIP // {limb} {carry}
+            OP_SWAP { limb_double_with_carry_allow_overflow(Self::HEAD_OFFSET) }
 
+            // Take all limbs from the alt stack to the main stack
             for _ in 0..Self::N_LIMBS - 1 {
                 OP_FROMALTSTACK
             }
         }
     }
 
-    /// Double the BigInt on top of the stack
-    /// 
-    /// # Note
-    ///
-    /// This function allows overflow of the underlying integer types during
-    /// doubling operation.
-    pub fn double_allow_overflow() -> Script {
+    pub fn double_allow_overflow_keep_element(n: u32) -> Script {
         script! {
+            // OP_DEPTH OP_1SUB OP_PICK
             { 1 << LIMB_SIZE }
 
             // Double the limb, take the result to the alt stack, and add initial carry
-            limb_double_without_carry OP_TOALTSTACK
+            { n + 1 } OP_PICK limb_double_without_carry OP_TOALTSTACK
 
-
-            for _ in 0..Self::N_LIMBS - 2 {
-                limb_double_with_carry OP_TOALTSTACK
+            for i in 0..Self::N_LIMBS - 2 {
+                { n + i +  3 } OP_PICK limb_double_with_carry OP_TOALTSTACK
             }
 
             // When we got {limb} {base} {carry} on the stack, we drop the base
             OP_NIP // {limb} {carry}
-            { limb_double_with_carry_allow_overflow(Self::HEAD_OFFSET) }
+            { n + 9 } OP_PICK { limb_double_with_carry_allow_overflow(Self::HEAD_OFFSET) } 
 
             // Take all limbs from the alt stack to the main stack
             for _ in 0..Self::N_LIMBS - 1 {
@@ -128,11 +126,11 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
             { 1 << LIMB_SIZE }
 
             // Double the limb, take the result to the alt stack, and add initial carry
-            limb_double_without_carry OP_TOALTSTACK
+            OP_SWAP limb_double_without_carry OP_TOALTSTACK
 
 
             for _ in 0..Self::N_LIMBS - 2 {
-                limb_double_with_carry OP_TOALTSTACK
+                OP_ROT limb_double_with_carry OP_TOALTSTACK
             }
 
             // When we got {limb} {base} {carry} on the stack, we drop the base
@@ -173,6 +171,42 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
         }
     }
 
+    pub fn add_ref_with_top(b: u32) -> Script {
+        let b_depth = b * Self::N_LIMBS;
+        assert_ne!(b, 0);
+        script! {
+            { b_depth } OP_PICK
+            OP_OVER
+            OP_ADD
+
+            // OP_DEPTH OP_1SUB OP_PICK 
+            { 1 << LIMB_SIZE }
+            OP_SWAP
+
+            { limb_add_create_carry() } 
+            OP_TOALTSTACK
+
+            for i in 0..Self::N_LIMBS - 2 {
+                { i + 3 } OP_PICK
+                OP_ADD
+                { b_depth + i + 3 } OP_PICK
+                OP_ADD { limb_add_create_carry() } OP_TOALTSTACK
+            }
+
+            OP_NIP
+            { b_depth + Self::N_LIMBS } OP_PICK
+            { Self::N_LIMBS + 1 } OP_PICK
+            OP_ROT
+            { limb_add_with_carry_prevent_overflow(Self::HEAD_OFFSET) }
+
+            for _ in 0..Self::N_LIMBS - 1 {
+                OP_FROMALTSTACK
+            }
+        }
+    }
+
+
+    
     /// Add BigInt on top of the stack to a BigInt at `b` depth in the stack
     ///
     /// # Note
@@ -181,31 +215,32 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
     /// the referenced BigInt
     pub fn add_ref(b: u32) -> Script {
         let b_depth = b * Self::N_LIMBS;
-        if b > 1 {
-            script! {
-                { b_depth }
-                { Self::_add_ref_inner() }
+        assert_ne!(b, 0);
+        script! {
+            { b_depth } OP_PICK
+            OP_ADD
+
+            // OP_DEPTH OP_1SUB OP_PICK 
+            { 1 << LIMB_SIZE }
+            OP_SWAP
+
+            { limb_add_create_carry() } 
+            OP_TOALTSTACK
+
+            for _ in 0..Self::N_LIMBS - 2 {
+                OP_ROT
+                { b_depth + 2 } OP_PICK
+                OP_ADD
+                OP_ADD { limb_add_create_carry() } OP_TOALTSTACK
             }
-        } else {
-            script! {
-                {b_depth} OP_PICK
-                { 1 << LIMB_SIZE }
-                limb_add_carry OP_TOALTSTACK
-                for i in 1..Self::N_LIMBS {
-                    { b_depth + 2 } OP_PICK
-                    if i < Self::N_LIMBS - 1 {
-                        OP_ADD
-                        OP_SWAP
-                        limb_add_carry OP_TOALTSTACK
-                    } else {
-                        OP_ROT OP_DROP
-                        OP_SWAP { limb_add_with_carry_prevent_overflow(Self::HEAD_OFFSET) }
-                        // OP_SWAP { limb_add_nocarry(Self::HEAD_OFFSET) }
-                    }
-                }
-                for _ in 0..Self::N_LIMBS - 1 {
-                    OP_FROMALTSTACK
-                }
+
+            OP_NIP
+            { b_depth + 1 } OP_PICK
+            OP_ROT
+            { limb_add_with_carry_prevent_overflow(Self::HEAD_OFFSET) }
+
+            for _ in 0..Self::N_LIMBS - 1 {
+                OP_FROMALTSTACK
             }
         }
     }
@@ -239,11 +274,15 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
             // OP_ELSE
                 3 OP_ADD
                 { 1 << LIMB_SIZE }
-                0
-                for _ in 0..Self::N_LIMBS-1 {
-                    2 OP_PICK
-                    OP_PICK
-                    OP_ADD
+                for i in 0..Self::N_LIMBS-1 {
+                    if i == 0 {
+                        OP_OVER OP_1SUB
+                        OP_PICK
+                    } else {
+                        2 OP_PICK
+                        OP_PICK
+                        OP_ADD
+                    }
                     3 OP_ROLL
                     OP_ADD
                     OP_2DUP
@@ -265,6 +304,17 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
     }
 }
 
+pub fn limb_add_create_carry() -> Script {
+    script! {
+        OP_2DUP
+        OP_LESSTHANOREQUAL
+        OP_TUCK
+        OP_IF
+            2 OP_PICK OP_SUB
+        OP_ENDIF
+    }
+}
+
 /// Compute the sum of two limbs, including the carry bit
 ///
 /// Optimized by: @stillsaiko
@@ -296,34 +346,31 @@ pub fn limb_add_nocarry(head_offset: u32) -> Script {
 }
 
 fn limb_add_with_carry_prevent_overflow(head_offset: u32) -> Script {
-    script! {
+    script!{
         // {a} {b} {c:carry}
-        OP_3DUP                                           // {a} {b} {c} {a} {b} {c}
-        OP_ADD OP_ADD OP_NIP                              // {a} {b} {a+b+c}
-        OP_ROT                                            // {b} {a+b+c} {a}
-        { head_offset >> 1 } OP_LESSTHAN                  // {b} {a+b+c} {sign_a}
-        OP_ROT                                            // {a+b+c} {sign_a} {b}
-        { head_offset >> 1 } OP_LESSTHAN                  // {a+b+c} {sign_a} {sign_b}
-        OP_ADD                                            // {a+b+c} {sign_a+b} -> both neg: 0, both diff: 1, both pos: 2
-        OP_SWAP                                           // {sign_a+b} {a+b+c}
-        OP_DUP { head_offset } OP_GREATERTHANOREQUAL      // {sign_a+b} {a+b+c} {L:0/1} // limb overflow
-        OP_TUCK                                           // {sign_a+b} {L:0/1} {a+b+c} {L:0/1}
-        OP_IF { head_offset } OP_SUB OP_ENDIF             // {sign_a+b} {L:0/1} {a+b+c_nlo}
-        OP_DUP { head_offset >> 1 } OP_GREATERTHANOREQUAL // {sign_a+b} {L:0/1} {a+b+c_nlo} {I:0/1} // integer overflow
-        OP_2SWAP                                          // {a+b+c_nlo} {I:0/1} {sign_a+b} {L:0/1}
-        OP_IF                                             // {a+b+c_nlo} {I:0/1} {sign_a+b}
-            OP_NOTIF OP_VERIFY 0 OP_ENDIF                 // {a+b+c_nlo} 0
-        OP_ELSE
-            OP_1SUB OP_IF OP_NOT OP_VERIFY 0 OP_ENDIF    // {a+b+c_nlo} 0
-        OP_ENDIF
-        OP_DROP                                          // {a+b+c_nlo}
+        OP_3DUP OP_ADD OP_ADD OP_NIP                         // {a} {b} {a+b+c}
+        { head_offset >> 1 }                                 // {a} {b} {a+b+c} {x}
+        OP_TUCK OP_DUP OP_ADD                                // {a} {b} {x} {a+b+c} {2x}
+        OP_2DUP                                              // {a} {b} {x} {a+b+c} {2x} {a+b+c} {2x}
+        OP_GREATERTHANOREQUAL                                // {a} {b} {x} {a+b+c} {2x} {L:0/1}
+        OP_NOTIF OP_NOT OP_ENDIF                             // {a} {b} {x} {a+b+c} {0/2x}
+        OP_SUB                                               // {a} {b} {x} {a+b+c_nlo}
+        OP_SWAP                                              // {a} {b} {a+b+c_nlo} {x}
+        OP_2DUP                                              // {a} {b} {a+b+c_nlo} {x} {a+b+c_nlo} {x}
+        OP_2ROT                                              // {a+b+c_nlo} {x} {a+b+c_nlo} {x} {a} {b}
+        2 OP_PICK                                            // {a+b+c_nlo} {x} {a+b+c_nlo} {x} {a} {b} {x}
+        OP_LESSTHAN                                          // {a+b+c_nlo} {x} {a+b+c_nlo} {x} {a} {sign_b}
+        OP_2SWAP                                             // {a+b+c_nlo} {x} {a} {sign_b} {a+b+c_nlo} {x}
+        OP_GREATERTHANOREQUAL                                // {a+b+c_nlo} {x} {a} {sign_b} {I:0/1}
+        OP_2SWAP                                             // {a+b+c_nlo} {sign_b} {I:0/1} {x} {a}
+        OP_GREATERTHANOREQUAL                                // {a+b+c_nlo} {sign_b} {I:0/1} {sign_a}
+        OP_ADD OP_ADD 1 3 OP_WITHIN OP_VERIFY                // verify (sign_a, sign_b, I) is not (0, 0, 0) or (1, 1, 1) which would mean overflow
     }
 }
 
 fn limb_double_without_carry() -> Script {
     script! {
-        // {limb} {base}
-        OP_SWAP // {base} {limb}
+        // {base} {limb}
         { NMUL(2) } // {base} {2*limb}
         OP_2DUP // {base} {2*limb} {base} {2*limb}
         OP_LESSTHANOREQUAL // {base} {2*limb} {base<=2*limb}
@@ -336,8 +383,7 @@ fn limb_double_without_carry() -> Script {
 
 fn limb_double_with_carry() -> Script {
     script! {
-        // {limb} {base} {carry}
-        OP_ROT // {base} {carry} {limb}
+        // {base} {carry} {limb}
         { NMUL(2) } // {base} {carry} {2*limb}
         OP_ADD // {base} {2*limb + carry}
         OP_2DUP // {base} {2*limb + carry} {base} {2*limb + carry}
@@ -351,7 +397,7 @@ fn limb_double_with_carry() -> Script {
 
 fn limb_double_with_carry_allow_overflow(head_offset: u32) -> Script {
     script! {
-        OP_SWAP // {carry} {limb}
+        // {carry} {limb}
         { NMUL(2) } // {carry} {2*limb}
         OP_ADD // {carry + 2*limb}
         { head_offset } OP_2DUP
@@ -369,22 +415,15 @@ fn limb_double_with_carry_prevent_overflow(head_offset: u32) -> Script {
         // {a} {c:carry}
         OP_OVER                                          // {a} {c} {a}
         OP_DUP OP_ADD OP_ADD                             // {a} {2a+c}
-        OP_SWAP                                          // {2a+c} {a}
-        { head_offset >> 1 } OP_LESSTHAN                 // {2a+c} {sign_a} // neg: 0, pos: 1
-        OP_SWAP                                          // {sign_a} {2a+c}
-        OP_DUP { head_offset } OP_GREATERTHANOREQUAL     // {sign_a} {2a+c} {L:0/1} // limb overflow
-
-        OP_TUCK                                          // {sign_a} {L:0/1} {2a+c} {L:0/1}
-        OP_IF { head_offset } OP_SUB OP_ENDIF            // {sign_a} {L:0/1} {2a+c_nlo}
-        OP_DUP {head_offset >> 1 } OP_GREATERTHANOREQUAL // {sign_a} {L:0/1} {2a+c_nlo} {I:0/1}
-        OP_2SWAP                                         // {2a+c_nlo} {I:0/1} {sign_a} {L:0/1}
-
-        OP_IF                                            // {2a+c_nlo} {I:0/1} {sign_a}
-            OP_NOTIF OP_VERIFY 0 OP_ENDIF                // {2a+c_nlo} 0
-        OP_ELSE                                          // {2a+c_nlo} {I:0/1} {sign_a}
-            OP_IF OP_NOT OP_VERIFY 0 OP_ENDIF            // {2a+c_nlo} 0
-        OP_ENDIF
-        OP_DROP                                          // {2a+c_nlo}
+        { head_offset >> 1 }                             // {a} {2a+c} {x}
+        OP_TUCK OP_DUP OP_ADD                            // {a} {x} {2a+c} {2x}
+        OP_2DUP OP_GREATERTHANOREQUAL                    // {a} {x} {2a+c} {2x} {L:0/1}
+        OP_NOTIF OP_NOT OP_ENDIF OP_SUB                  // {a} {x} {2a+c_nlo}
+        OP_2DUP OP_LESSTHAN                              // {a} {x} {2a+c_nlo} {I:0/1}
+        OP_2SWAP                                         // {2a+c_nlo} {I:0/1} {a} {x}
+        OP_LESSTHAN                                      // {2a+c_nlo} {I:0/1} {sign_a}
+
+        OP_NUMNOTEQUAL OP_VERIFY                         // sign_a must be different than I
     }
 }
 
@@ -427,32 +466,29 @@ fn limb_lshift_with_carry(bits: u32) -> Script {
 fn limb_lshift_with_carry_prevent_overflow(bits: u32, head: u32) -> Script {
     script! {
         // {a} {c..}
-        { bits } OP_PICK     // {a} {c..} {a}
+        { bits } OP_ROLL                                     // {c..} {a}
+        { 1 << (head - 1) }                                  // {c..} {a} {x}
+        OP_DUP OP_TOALTSTACK                                 // {c..} {a} {x} | {x}
+        OP_2DUP OP_LESSTHAN                                  // {c..} {a} {x} {sign_a} | {x}
+        OP_IF OP_NOT OP_ENDIF                                // {c..} {a} {0/x} | {x}
+        OP_DUP OP_ADD OP_SUB                                 // {c..} {a/a-2x} | {x}
+
         for i in 0..bits {
-            { NMUL(2) }                     // {a} {c..} {2*a}
+            { NMUL(2) }
             if i < bits - 1 {
                 { bits - i } OP_ROLL
             }
-            OP_ADD                          // {a} {c..} {2*a+c0}
-        }                                   // {a} {2*a+c..}
-
-        OP_SWAP                                          // {2a+c} {a}
-        { 1 << (head - 1) } OP_LESSTHAN                  // {2a+c} {sign_a} // neg: 0, pos: 1
-        OP_SWAP                                          // {sign_a} {2a+c}
-
-        OP_DUP { 1 << head } OP_GREATERTHANOREQUAL          // {sign_a} {2a+c} {L:0/1} // limb overflow
-        OP_TUCK                                             // {sign_a} {L:0/1} {2a+c} {L:0/1}
-        OP_IF { ((1 << bits) - 1) << head } OP_SUB OP_ENDIF // {sign_a} {L:0/1} {2a+c_nlo}
-        OP_DUP { 1 << head } OP_LESSTHAN OP_VERIFY
-        OP_DUP { 1 << (head - 1) } OP_GREATERTHANOREQUAL // {sign_a} {L:0/1} {2a+c_nlo} {I:0/1}
-        OP_2SWAP                                         // {2a+c_nlo} {I:0/1} {sign_a} {L:0/1}
-
-        OP_IF                                            // {2a+c_nlo} {I:0/1} {sign_a}
-            OP_NOTIF OP_VERIFY 0 OP_ENDIF                // {2a+c_nlo} 0
-        OP_ELSE                                          // {2a+c_nlo} {I:0/1} {sign_a}
-            OP_IF OP_NOT OP_VERIFY 0 OP_ENDIF            // {2a+c_nlo} 0
-        OP_ENDIF
-        OP_DROP                                          // {2a+c_nlo}
+            OP_ADD
+        }                                                    // {result_signed} | {x}
+        
+        OP_FROMALTSTACK                                      // {result_signed} {x}
+        OP_OVER                                              // {result_signed} {x} {result_signed}
+        OP_2DUP OP_SWAP                                      // {result_signed} {x} {result_signed} {result_signed} {x}
+        OP_DUP OP_NEGATE OP_SWAP                             // {result_signed} {x} {result_signed} {result_signed} {-x} {x}
+        OP_WITHIN OP_VERIFY                                  // {result_signed} {x} {result_signed}
+        0 OP_GREATERTHANOREQUAL                              // {result_signed} {x} {sign_result}
+        OP_IF OP_NOT OP_ENDIF                                // {result_signed} {0/x}
+        OP_DUP OP_ADD OP_ADD                                 // {result}
     }
 }
 
@@ -460,7 +496,7 @@ fn limb_lshift_with_carry_prevent_overflow(bits: u32, head: u32) -> Script {
 mod test {
     use crate::bigint::{U254, U64};
     use crate::treepp::*;
-    use core::ops::{Add, Rem, Shl};
+    use core::ops::{Rem, Shl};
     use num_bigint::{BigUint, RandomBits};
     use num_traits::One;
     use rand::{Rng, SeedableRng};
@@ -483,8 +519,7 @@ mod test {
                 { U254::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -500,8 +535,7 @@ mod test {
                 { U64::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -520,8 +554,7 @@ mod test {
                 { U254::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -535,43 +568,7 @@ mod test {
                 { U64::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_1add() {
-        println!("U254.add1: {} bytes", U254::add1().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        for _ in 0..100 {
-            let a: BigUint = prng.sample(RandomBits::new(254));
-            let c: BigUint = (a.clone().add(BigUint::one())).rem(BigUint::one().shl(254));
-
-            let script = script! {
-                { U254::push_u32_le(&a.to_u32_digits()) }
-                { U254::add1() }
-                { U254::push_u32_le(&c.to_u32_digits()) }
-                { U254::equalverify(1, 0) }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-
-        for _ in 0..100 {
-            let a: u64 = prng.gen();
-            let c = a.wrapping_add(1u64);
-
-            let script = script! {
-                { U64::push_u64_le(&[a]) }
-                { U64::add1() }
-                { U64::push_u64_le(&[c]) }
-                { U64::equalverify(1, 0) }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 }
diff --git a/src/bigint/bits.rs b/bitvm/src/bigint/bits.rs
similarity index 89%
rename from src/bigint/bits.rs
rename to bitvm/src/bigint/bits.rs
index 2feb5c4c3..9b29524c1 100644
--- a/src/bigint/bits.rs
+++ b/bitvm/src/bigint/bits.rs
@@ -1,5 +1,3 @@
-use bitcoin::opcodes::all::OP_FROMALTSTACK;
-
 use crate::bigint::BigIntImpl;
 use crate::treepp::{script, Script};
 use std::cmp::min;
@@ -227,7 +225,6 @@ mod test {
     use super::{limb_to_be_bits, limb_to_le_bits};
     use crate::bigint::{U254, U64};
     use crate::run;
-    use crate::treepp::execute_script;
     use bitcoin_script::script;
     use core::ops::ShrAssign;
     use num_bigint::{BigUint, RandomBits};
@@ -262,9 +259,7 @@ mod test {
                 }
                 OP_TRUE
             };
-
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -288,8 +283,7 @@ mod test {
                 OP_TRUE
             };
 
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for a in 0..4 {
@@ -299,9 +293,7 @@ mod test {
                 { a >> 1 } OP_EQUALVERIFY
                 { a & 1 } OP_EQUAL
             };
-
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for a in 0..2 {
@@ -310,17 +302,13 @@ mod test {
                 { limb_to_be_bits(1) }
                 { a } OP_EQUAL
             };
-
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         let script = script! {
             0 { limb_to_be_bits(0) } 0 OP_EQUAL
         };
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
+        run(script);
     }
 
     #[test]
@@ -352,8 +340,7 @@ mod test {
                 OP_TRUE
             };
 
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -377,8 +364,7 @@ mod test {
                 OP_TRUE
             };
 
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for a in 0..4 {
@@ -388,9 +374,7 @@ mod test {
                 { a & 1 } OP_EQUALVERIFY
                 { a >> 1 } OP_EQUAL
             };
-
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for a in 0..2 {
@@ -399,17 +383,13 @@ mod test {
                 { limb_to_le_bits(1) }
                 { a } OP_EQUAL
             };
-
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         let script = script! {
             0 { limb_to_le_bits(0) } 0 OP_EQUAL
         };
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
+        run(script);
     }
 
     #[test]
@@ -435,9 +415,7 @@ mod test {
                 }
                 OP_TRUE
             };
-
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..10 {
@@ -460,8 +438,7 @@ mod test {
                 OP_TRUE
             };
 
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -489,8 +466,7 @@ mod test {
                 OP_TRUE
             };
 
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..10 {
@@ -513,8 +489,7 @@ mod test {
                 OP_TRUE
             };
 
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -543,8 +518,7 @@ mod test {
                 OP_TRUE
             };
 
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..10 {
@@ -568,8 +542,7 @@ mod test {
                 OP_TRUE
             };
 
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -598,8 +571,7 @@ mod test {
                 OP_TRUE
             };
 
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..10 {
@@ -623,8 +595,7 @@ mod test {
                 OP_TRUE
             };
 
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -640,10 +611,8 @@ mod test {
             { 0x01121314 }
             OP_EQUAL
         };
-        let exec_result = execute_script(script);
-        println!("result: {}", exec_result);
-        assert!(exec_result.success);
-        
+        run(script);
+
         let script = script! {
             { 0x00 }
             { 0x01 }
@@ -653,9 +622,7 @@ mod test {
             { 0x00011314 }
             OP_EQUAL
         };
-        let exec_result = execute_script(script);
-        println!("result: {}", exec_result);
-        assert!(exec_result.success);
+        run(script);
     }
     #[test]
     fn test_u254_from_bytes() {
diff --git a/src/bigint/cmp.rs b/bitvm/src/bigint/cmp.rs
similarity index 86%
rename from src/bigint/cmp.rs
rename to bitvm/src/bigint/cmp.rs
index 68127d4e5..72e6243c2 100644
--- a/src/bigint/cmp.rs
+++ b/bitvm/src/bigint/cmp.rs
@@ -117,8 +117,7 @@ mod test {
                 { a_lessthan }
                 OP_EQUAL
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -137,8 +136,7 @@ mod test {
                 { a_lessthanorequal }
                 OP_EQUAL
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -157,8 +155,7 @@ mod test {
                 { a_greaterthan }
                 OP_EQUAL
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -177,8 +174,7 @@ mod test {
                 { a_greaterthanorequal }
                 OP_EQUAL
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -202,8 +198,7 @@ mod test {
                 { a_lessthan }
                 OP_EQUAL
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -222,8 +217,7 @@ mod test {
                 { a_lessthanorequal }
                 OP_EQUAL
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -242,8 +236,7 @@ mod test {
                 { a_greaterthan }
                 OP_EQUAL
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -262,8 +255,7 @@ mod test {
                 { a_greaterthanorequal }
                 OP_EQUAL
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -282,8 +274,7 @@ mod test {
                 { U254::drop() }
                 OP_FROMALTSTACK
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -295,8 +286,7 @@ mod test {
                 { U254::is_zero(0) }
                 OP_NOT
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -310,8 +300,7 @@ mod test {
                 { U64::drop() }
                 OP_FROMALTSTACK
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -323,8 +312,7 @@ mod test {
                 { U64::is_zero(0) }
                 OP_NOT
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         let script = script! {
@@ -334,15 +322,13 @@ mod test {
             { U254::drop() }
             OP_FROMALTSTACK
         };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
+        run(script);
 
         let script = script! {
             { U254::push_u32_le(&[0]) }
             { U254::is_zero(0) }
         };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
+        run(script);
 
         let script = script! {
             { U64::push_u32_le(&[0]) }
@@ -351,14 +337,12 @@ mod test {
             { U64::drop() }
             OP_FROMALTSTACK
         };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
+        run(script);
 
         let script = script! {
             { U64::push_u32_le(&[0]) }
             { U64::is_zero(0) }
         };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
+        run(script);
     }
 }
diff --git a/src/bigint/inv.rs b/bitvm/src/bigint/inv.rs
similarity index 94%
rename from src/bigint/inv.rs
rename to bitvm/src/bigint/inv.rs
index e7552874e..54c3ce95e 100644
--- a/src/bigint/inv.rs
+++ b/bitvm/src/bigint/inv.rs
@@ -2,7 +2,6 @@ use crate::bigint::BigIntImpl;
 use crate::pseudo::OP_NDUP;
 use crate::treepp::*;
 use core::ops::{Mul, Rem, Sub};
-use bitcoin::opcodes::all::{OP_FROMALTSTACK, OP_TOALTSTACK};
 use num_bigint::BigUint;
 use num_traits::Num;
 
@@ -103,7 +102,7 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
                         // roll the 2 * s
                         { Self::roll(2) }
                         { Self::toaltstack() }
-                        
+
                         // roll the v
                         { Self::roll(3) }
                         { Self::toaltstack() }
@@ -118,7 +117,7 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
 
                         // remove the unused s
                         { Self::drop() }
-                        
+
                         // remove the unused u
                         { Self::drop() }
 
@@ -137,7 +136,7 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
                             // start stack: u, r, v, s, 2 * s, 2 * r, u/2, v/2 | k
 
                             { Self::toaltstack() }
-                            
+
                             // remove the unused u/2
                             { Self::drop() }
                             { Self::toaltstack() }
@@ -203,7 +202,7 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
                                 // final stack: (u/2 - v/2), r + s, v, 2 * s | k
                             OP_ELSE
                                 // start stack: u, v, 2 * s, 2 * r, (v/2 - u/2), r + s | k
-                                
+
                                 // remove the unused v
                                 { Self::roll(4) }
                                 { Self::drop() }
@@ -234,7 +233,7 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
             // final stack: s k
         }
     }
-    
+
     pub fn inv_stage2(modulus_hex: &str) -> Script {
         let modulus = BigUint::from_str_radix(modulus_hex, 16).unwrap();
 
@@ -367,6 +366,7 @@ mod test {
     use crate::bigint::inv::{limb_div3_carry, limb_shr1_carry};
     use crate::bigint::{U254, U64};
     use crate::treepp::*;
+
     use core::ops::{Div, Shr};
     use num_bigint::{BigUint, RandomBits};
     use rand::{Rng, SeedableRng};
@@ -389,8 +389,7 @@ mod test {
                 { a >> 1 } OP_EQUAL
             };
 
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -405,8 +404,7 @@ mod test {
                 { (1 << 28) | (a >> 1) } OP_EQUAL
             };
 
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -432,8 +430,7 @@ mod test {
                     { c } OP_EQUAL
                 };
 
-                let exec_result = execute_script(script);
-                assert!(exec_result.success);
+                run(script);
             }
         }
     }
@@ -453,8 +450,7 @@ mod test {
                 { U254::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -468,8 +464,7 @@ mod test {
                 { U64::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -488,8 +483,7 @@ mod test {
                 { U254::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -503,8 +497,7 @@ mod test {
                 { U64::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 }
diff --git a/src/bigint/mod.rs b/bitvm/src/bigint/mod.rs
similarity index 77%
rename from src/bigint/mod.rs
rename to bitvm/src/bigint/mod.rs
index 68dad85b0..2a2de2190 100644
--- a/src/bigint/mod.rs
+++ b/bitvm/src/bigint/mod.rs
@@ -5,16 +5,17 @@ pub mod inv;
 pub mod mul;
 pub mod std;
 pub mod sub;
-pub mod u29x9;
 
 pub struct BigIntImpl<const N_BITS: u32, const LIMB_SIZE: u32> {}
 
 impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
     pub const N_BITS: u32 = N_BITS;
-    pub const N_LIMBS: u32 = (N_BITS + LIMB_SIZE - 1) / LIMB_SIZE;
+    pub const LIMB_SIZE: u32 = LIMB_SIZE;
+    pub const N_LIMBS: u32 = N_BITS.div_ceil(LIMB_SIZE);
     pub const HEAD: u32 = N_BITS - (Self::N_LIMBS - 1) * LIMB_SIZE;
     pub const HEAD_OFFSET: u32 = 1u32 << Self::HEAD;
 }
 
 pub type U254 = BigIntImpl<254, 29>;
 pub type U64 = BigIntImpl<64, 16>;
+pub type U256 = BigIntImpl<256, 29>;
diff --git a/src/bigint/mul.rs b/bitvm/src/bigint/mul.rs
similarity index 69%
rename from src/bigint/mul.rs
rename to bitvm/src/bigint/mul.rs
index e93522b39..6a7a3d544 100644
--- a/src/bigint/mul.rs
+++ b/bitvm/src/bigint/mul.rs
@@ -42,7 +42,7 @@ impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
 #[cfg(test)]
 mod test {
     use crate::bigint::{U254, U64};
-    use crate::{execute_script_as_chunks, treepp::*};
+    use crate::treepp::*;
     use core::ops::{Mul, Rem, Shl};
     use num_bigint::{BigUint, RandomBits};
     use num_traits::One;
@@ -65,8 +65,7 @@ mod test {
                 { U254::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..3 {
@@ -82,29 +81,7 @@ mod test {
                 { U64::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
-
-    #[test]
-    fn test_mul_as_chunks() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        let a: BigUint = prng.sample(RandomBits::new(254));
-        let b: BigUint = prng.sample(RandomBits::new(254));
-        let c: BigUint = (a.clone().mul(b.clone())).rem(BigUint::one().shl(254));
-
-        let script = script! {
-            { U254::push_u32_le(&a.to_u32_digits()) }
-            { U254::push_u32_le(&b.to_u32_digits()) }
-            { U254::mul() }
-            { U254::push_u32_le(&c.to_u32_digits()) }
-            { U254::equalverify(1, 0) }
-            OP_TRUE
-        };
-        println!("compiled size: {:?}", script.clone().compile().len());
-        let exec_result = execute_script_as_chunks(script, 20000, 400);
-        println!("Execute info: {}", exec_result);
-        assert!(exec_result.success);
-    }
 }
diff --git a/bitvm/src/bigint/std.rs b/bitvm/src/bigint/std.rs
new file mode 100644
index 000000000..7c8e6e32c
--- /dev/null
+++ b/bitvm/src/bigint/std.rs
@@ -0,0 +1,1078 @@
+use bitcoin::script::read_scriptint;
+use num_bigint::BigUint;
+use num_traits::Num;
+use std::str::FromStr;
+use std::cmp::Ordering;
+
+use crate::bigint::BigIntImpl;
+use crate::pseudo::{push_to_stack, NMUL};
+use crate::treepp::*;
+
+/// Struct to store the information of each step in `transform_limbsize` function.
+/// ## Fields:
+/// - current_limb_remaining_bits: the number of bits left in the current source limb that is being processed.
+/// - extract_window: the number of bits to extract from the current limb.
+/// - drop_currentlimb: signals to drop the current limb and bring another from altstack.
+/// - initiate_targetlimb: signals to start a new target limb.
+#[derive(Debug)]
+struct TransformStep {
+    current_limb_remaining_bits: u32,
+    extract_window: u32,
+    drop_currentlimb: bool,
+    initiate_targetlimb: bool,
+}
+
+impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
+    pub fn push_u32_le(v: &[u32]) -> Script {
+        let mut bits = vec![];
+        for elem in v.iter() {
+            for i in 0..32 {
+                bits.push((elem & (1 << i)) != 0);
+            }
+        }
+        bits.resize(N_BITS as usize, false);
+
+        let mut limbs = vec![];
+        for chunk in bits.chunks(LIMB_SIZE as usize) {
+            let mut chunk_vec = chunk.to_vec();
+            chunk_vec.resize(LIMB_SIZE as usize, false);
+
+            let mut elem = 0u32;
+            for (i, chunk_i) in chunk_vec.iter().enumerate() {
+                if *chunk_i {
+                    elem += 1 << i;
+                }
+            }
+
+            limbs.push(elem);
+        }
+
+        limbs.reverse();
+
+        script! {
+            for limb in &limbs {
+                { *limb }
+            }
+            { push_to_stack(0,Self::N_LIMBS as usize - limbs.len()) }
+        }
+    }
+
+    pub fn read_u32_le(mut witness: Vec<Vec<u8>>) -> Vec<u32> {
+        assert_eq!(witness.len() as u32, Self::N_LIMBS);
+
+        witness.reverse();
+
+        let mut bits: Vec<bool> = vec![];
+        for element in witness.iter() {
+            let limb = read_scriptint(element).unwrap();
+            for i in 0..LIMB_SIZE {
+                bits.push((limb & (1 << i)) != 0);
+            }
+        }
+
+        bits.resize(N_BITS as usize, false);
+
+        let mut u32s = vec![];
+
+        for chunk in bits.chunks(32) {
+            let mut chunk_vec = chunk.to_vec();
+            chunk_vec.resize(32, false);
+
+            let mut elem = 0u32;
+            for i in 0..32 as usize {
+                if chunk_vec[i] {
+                    elem += 1 << i;
+                }
+            }
+
+            u32s.push(elem);
+        }
+
+        u32s
+    }
+
+    pub fn push_u64_le(v: &[u64]) -> Script {
+        let v = v
+            .iter()
+            .flat_map(|v| {
+                [
+                    (v & 0xffffffffu64) as u32,
+                    ((v >> 32) & 0xffffffffu64) as u32,
+                ]
+            })
+            .collect::<Vec<u32>>();
+
+        Self::push_u32_le(&v)
+    }
+
+    /// Zip the top two u{16N} elements
+    /// input:  a0 ... a{N-1} b0 ... b{N-1}
+    /// output: a0 b0 ... ... a{N-1} b{N-1}
+    pub fn zip(mut a: u32, mut b: u32) -> Script {
+        a = (a + 1) * Self::N_LIMBS - 1;
+        b = (b + 1) * Self::N_LIMBS - 1;
+
+        assert_ne!(a, b);
+        if a < b {
+            script! {
+                for i in 0..Self::N_LIMBS {
+                    { a + i }
+                    OP_ROLL
+                    { b }
+                    OP_ROLL
+                }
+            }
+        } else {
+            script! {
+                for i in 0..Self::N_LIMBS {
+                    { a }
+                    OP_ROLL
+                    { b + i + 1 }
+                    OP_ROLL
+                }
+            }
+        }
+    }
+
+    pub fn copy_zip(mut a: u32, mut b: u32) -> Script {
+        a = (a + 1) * Self::N_LIMBS - 1;
+        b = (b + 1) * Self::N_LIMBS - 1;
+
+        script! {
+            for i in 0..Self::N_LIMBS {
+                { a + i } OP_PICK { b + 1 + i } OP_PICK
+            }
+        }
+    }
+
+    pub fn dup_zip(mut a: u32) -> Script {
+        a = (a + 1) * Self::N_LIMBS - 1;
+
+        script! {
+            for i in 0..Self::N_LIMBS {
+                { a + i } OP_ROLL OP_DUP
+            }
+        }
+    }
+
+    pub fn copy(mut a: u32) -> Script {
+        a = (a + 1) * Self::N_LIMBS - 1;
+
+        script! {
+            if a < 134 {
+                for _ in 0..Self::N_LIMBS {
+                    { a } OP_PICK
+                }
+            } else {
+                { a + 1 }
+                for _ in 0..Self::N_LIMBS - 1 {
+                    OP_DUP OP_PICK OP_SWAP
+                }
+                OP_1SUB OP_PICK
+            }
+        }
+    }
+
+    pub fn roll(mut a: u32) -> Script {
+        if a == 0 {
+            return script! {};
+        }
+        a = (a + 1) * Self::N_LIMBS - 1;
+
+        script! {
+            for _ in 0..Self::N_LIMBS {
+                { a } OP_ROLL
+            }
+        }
+    }
+
+    pub fn drop() -> Script {
+        script! {
+            for _ in 0..Self::N_LIMBS / 2 {
+                OP_2DROP
+            }
+            if Self::N_LIMBS & 1 == 1 {
+                OP_DROP
+            }
+        }
+    }
+
+    pub fn push_dec(dec_string: &str) -> Script {
+        Self::push_u32_le(&BigUint::from_str(dec_string).unwrap().to_u32_digits())
+    }
+
+    pub fn push_hex(hex_string: &str) -> Script {
+        Self::push_u32_le(
+            &BigUint::from_str_radix(hex_string, 16)
+                .unwrap()
+                .to_u32_digits(),
+        )
+    }
+
+    #[inline]
+    pub fn push_zero() -> Script {
+        push_to_stack(0, Self::N_LIMBS as usize)
+    }
+
+    #[inline]
+    pub fn push_one() -> Script {
+        script! {
+            { push_to_stack(0,(Self::N_LIMBS - 1) as usize) }
+            1
+        }
+    }
+
+    pub fn is_zero_keep_element(a: u32) -> Script {
+        let a = Self::N_LIMBS * a;
+        script! {
+            1
+            for i in 0..Self::N_LIMBS {
+                { a + i+1 } OP_PICK
+                OP_NOT
+                OP_BOOLAND
+            }
+        }
+    }
+
+    pub fn is_zero(a: u32) -> Script {
+        let a = Self::N_LIMBS * a;
+        script! {
+            1
+            for _ in 0..Self::N_LIMBS {
+                { a +1 } OP_ROLL
+                OP_NOT
+                OP_BOOLAND
+            }
+        }
+    }
+
+    pub fn is_one_keep_element(a: u32) -> Script {
+        let a = Self::N_LIMBS * a;
+        script! {
+            1
+            { a + 1 } OP_PICK
+            1 OP_EQUAL OP_BOOLAND
+            for i in 1..Self::N_LIMBS {
+                { a + i + 1 } OP_PICK
+                OP_NOT
+                OP_BOOLAND
+            }
+        }
+    }
+
+    pub fn is_one(a: u32) -> Script {
+        let a = Self::N_LIMBS * a;
+        script! {
+            1
+            { a + 1 } OP_ROLL
+            1 OP_EQUAL OP_BOOLAND
+            for _ in 1..Self::N_LIMBS {
+                { a + 1 } OP_ROLL
+                OP_NOT
+                OP_BOOLAND
+            }
+        }
+    }
+
+    pub fn toaltstack() -> Script {
+        script! {
+            for _ in 0..Self::N_LIMBS {
+                OP_TOALTSTACK
+            }
+        }
+    }
+
+    pub fn fromaltstack() -> Script {
+        script! {
+            for _ in 0..Self::N_LIMBS {
+                OP_FROMALTSTACK
+            }
+        }
+    }
+
+    pub fn is_negative(depth: u32) -> Script {
+        script! {
+            { (1 + depth) * Self::N_LIMBS - 1 } OP_PICK
+            { Self::HEAD_OFFSET >> 1 }
+            OP_GREATERTHANOREQUAL
+        }
+    }
+
+    pub fn is_positive(depth: u32) -> Script {
+        script! {
+            { Self::is_zero_keep_element(depth) } OP_NOT
+            { (1 + depth) * Self::N_LIMBS } OP_PICK
+            { Self::HEAD_OFFSET >> 1 }
+            OP_LESSTHAN OP_BOOLAND
+        }
+    }
+
+    /// Resize positive numbers
+    ///
+    /// # Note
+    ///
+    /// Does not work for negative numbers
+    pub fn resize<const T_BITS: u32>() -> Script {
+        let n_limbs_self = N_BITS.div_ceil(LIMB_SIZE);
+        let n_limbs_target = T_BITS.div_ceil(LIMB_SIZE);
+
+        match n_limbs_target.cmp(&n_limbs_self) {
+            Ordering::Equal => script! {},
+            Ordering::Greater => {
+                let n_limbs_to_add = n_limbs_target - n_limbs_self;
+                script! {
+                    if n_limbs_to_add > 0 {
+                        {0} {crate::pseudo::OP_NDUP((n_limbs_to_add - 1) as usize)} // Pushing zeros to the stack
+                    }
+                    for _ in 0..n_limbs_self {
+                        { n_limbs_target - 1 } OP_ROLL
+                    }
+                }
+            },
+            Ordering::Less => {
+                let n_limbs_to_remove = n_limbs_self - n_limbs_target;
+                script! {
+                    for _ in 0..n_limbs_to_remove {
+                        { n_limbs_target } OP_ROLL OP_DROP
+                    }
+                }
+            }
+        }
+    }
+
+    /// Generates a vector of TransformStep struct that encodes all the information needed to
+    /// convert BigInt form one limbsize represention (source) to another (target).
+    /// used as a helper function for `transform_limbsize`
+
+    fn get_transform_steps(source_limb_size: u32, target_limb_size: u32) -> Vec<TransformStep> {
+
+        //define an empty vector to store Transform steps
+        let mut transform_steps: Vec<TransformStep> = Vec::new();
+
+        // compute the number of limbs for target and source
+        let target_n_limbs = N_BITS.div_ceil(target_limb_size);
+        let mut target_limb_remaining_bits = Self::N_BITS - (target_n_limbs - 1) * target_limb_size;
+        let source_n_limbs = N_BITS.div_ceil(source_limb_size);
+        let source_head = Self::N_BITS - (source_n_limbs - 1) * source_limb_size;
+
+        // define a vector of limbsizes of source
+        let mut limb_sizes: Vec<u32> = Vec::with_capacity(source_n_limbs as usize);
+        let mut first_iter_flag = true;
+        for _ in 0..(source_n_limbs - 1) {
+            limb_sizes.push(source_limb_size);
+        }
+        limb_sizes.push(source_head);
+
+        //iterate until all limbs of source are processed
+        while limb_sizes.len() > 0 {
+            //iterate until the target limb is filled completely
+            while target_limb_remaining_bits > 0 {
+                let source_limb_last_idx = limb_sizes.len() - 1;
+                let source_limb_remaining_bits = limb_sizes[source_limb_last_idx];
+
+                match source_limb_remaining_bits.cmp(&target_limb_remaining_bits) {
+                    Ordering::Less => {
+                        transform_steps.push(TransformStep {
+                            current_limb_remaining_bits: source_limb_remaining_bits.clone(),
+                            extract_window: source_limb_remaining_bits.clone(),
+                            drop_currentlimb: true,
+                            initiate_targetlimb: first_iter_flag,
+                        });
+                        target_limb_remaining_bits -= source_limb_remaining_bits.clone();
+                        limb_sizes.pop();
+                    }
+                    Ordering::Equal => {
+                        transform_steps.push(TransformStep {
+                            current_limb_remaining_bits: source_limb_remaining_bits.clone(),
+                            extract_window: target_limb_remaining_bits,
+                            drop_currentlimb: true,
+                            initiate_targetlimb: first_iter_flag,
+                        });
+                        target_limb_remaining_bits = 0;
+                        limb_sizes.pop();
+                    }
+                    Ordering::Greater => {
+                        transform_steps.push(TransformStep {
+                            current_limb_remaining_bits: source_limb_remaining_bits.clone(),
+                            extract_window: target_limb_remaining_bits,
+                            drop_currentlimb: false,
+                            initiate_targetlimb: first_iter_flag,
+                        });
+                        limb_sizes[source_limb_last_idx] = source_limb_remaining_bits - target_limb_remaining_bits;
+                        target_limb_remaining_bits = 0;
+                    }
+                }
+                first_iter_flag = false;
+            }
+            target_limb_remaining_bits = target_limb_size;
+            first_iter_flag = true;
+        }
+        transform_steps
+    }
+
+    /// Transform Limbsize for BigInt
+    /// This function changes the representation of BigInt present on stack as multiple limbs of source limbsize to 
+    /// any another limbsize within 1 and 31 (inclusive). 
+    /// Specifically, This can be used to transform limbs into nibbles, limbs into bits ans vice-versa to aid optimizetions.
+    /// 
+    /// ## Assumptions:
+    /// - Does NOT do input validation.
+    /// - The message is placed such that LSB is on top of stack. (MSB pushed first)
+    ///
+    /// ## Stack Effects:
+    /// The original BigInt which that was in stack is dropped
+    /// The same BigInt with target_limbsize is left on stack
+    ///  
+    /// ## Panics:
+    /// - If the source or target limb size lies outside of 0 to 31 (inclusive), fails with assertion error.
+    /// - If the source or target limb size is greater than number of bits, fails with assertion error.
+    /// - If the elements do not fit on the stack. (few satck elements are also used for intermediate computation).
+    /// - The number of bits in the BigInt must be 32 or larger.
+
+    pub fn transform_limbsize(source_limb_size: u32, target_limb_size: u32) -> Script {
+        // ensure that source and target limb sizes are between 0 and 31 inclusive
+        assert!(
+            source_limb_size < 32 && source_limb_size > 0,
+            "source limb size must lie between 1 and 31 inclusive"
+        );
+        assert!(
+            target_limb_size < 32 && target_limb_size > 0,
+            "target limb size must lie between 1 and 31 inclusive"
+        );
+
+        //ensure that source and target limb size aren't greater than N_BITS
+        assert!(
+            source_limb_size <= Self::N_BITS,
+            "source limb size mustn't be greater than number of bits in bigInt"
+        );
+        assert!(
+            target_limb_size <= Self::N_BITS,
+            "target limb size mustn't be greater than number of bits in bigInt"
+        );
+
+        //ensure that the N_BITS are larger than or equal to 32
+        assert!(
+            Self::N_BITS >= 32,
+            "The number of bits in BigInt must be atleast 32"
+        );
+
+        // if both source and target limb size are same, do nothing
+        if source_limb_size == target_limb_size {
+            script!()
+        } else {
+            let steps = Self::get_transform_steps(source_limb_size, target_limb_size);
+
+            let source_n_limbs = N_BITS.div_ceil(source_limb_size);
+            script!(
+            // send all limbs except the first to alt stack so that the MSB is handled first
+            for _ in 0..(source_n_limbs - 1){OP_TOALTSTACK}
+
+            for (index, step) in steps.iter().enumerate() {
+                    {extract_digits(step.current_limb_remaining_bits, step.extract_window)}
+
+                    if !step.initiate_targetlimb{
+                        // add
+                        OP_ROT
+                        for _ in 0..step.extract_window {OP_DUP OP_ADD}
+                        OP_ROT
+                        OP_ADD
+                        OP_SWAP
+                    }
+
+                    if step.drop_currentlimb{
+                        OP_DROP
+                        //except when its the last limb, we pull a new limb from altstack
+                        if index != (steps.len() - 1){
+                        OP_FROMALTSTACK
+                        }
+                    }
+                }
+            )
+        }
+    }
+}
+
+/// Extracts a window of bits from a u32 limb on top of stack
+/// 
+/// ## Assumptions;
+/// Doesn't do input validation
+/// All the bits before start_index must be 0 for the extract to work properly
+/// 
+/// ## Panics: 
+/// - If the start_index is not between the range 1 and 31 (inclusive), fails with assertion error
+/// - If the window is larger than the start_index, fails with assertion error
+/// 
+/// ## Stack behaviour:
+/// - extracts the desired window as a stack element
+/// - leaves the original limb with extracted bits set to zero on top of stack
+pub fn extract_digits(start_index: u32, window: u32) -> Script {
+    // doesnot work if start_index is 32
+    assert!(start_index < 32 && start_index > 0, "start_index must lie between 1 and 31 (inclusive)");
+
+    //panics if the window exceeds the number of bits on the left of start_index
+    assert!(
+        start_index >= window,
+        "not enough bits left of start_index to fill the window!"
+    );
+
+    script! {
+        0
+        OP_SWAP
+        for i in 0..window {
+            OP_TUCK
+            { 1 << (start_index - i - 1) }
+            OP_GREATERTHANOREQUAL
+            OP_TUCK
+            OP_ADD
+            if i < window - 1 { { NMUL(2) } }
+            OP_ROT OP_ROT
+            OP_IF
+                { 1 << (start_index - i - 1) }
+                OP_SUB
+            OP_ENDIF
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::bigint::std::extract_digits;
+    use crate::bigint::{BigIntImpl, U254};
+    use crate::run;
+    
+    use bitcoin_script::script;
+    use rand::{Rng, SeedableRng};
+    use rand_chacha::ChaCha20Rng;
+
+    #[test]
+    fn test_zip() {
+        const N_BITS: u32 = 1450;
+        const N_U30_LIMBS: u32 = 50;
+
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..50 {
+            let mut v = vec![];
+            for _ in 0..N_U30_LIMBS {
+                v.push(prng.gen::<i32>());
+            }
+            for _ in 0..N_U30_LIMBS {
+                v.push(prng.gen::<i32>());
+            }
+
+            let mut expected = vec![];
+            for i in 0..N_U30_LIMBS {
+                expected.push(v[i as usize]);
+                expected.push(v[(N_U30_LIMBS + i) as usize]);
+            }
+
+            let script = script! {
+                for i in 0..N_U30_LIMBS * 2 {
+                    { v[i as usize] }
+                }
+                { BigIntImpl::<N_BITS, 29>::zip(1, 0) }
+                for i in 0..N_U30_LIMBS * 2 {
+                    { expected[(N_U30_LIMBS * 2 - 1 - i) as usize] }
+                    OP_EQUALVERIFY
+                }
+                OP_TRUE
+            };
+            run(script);
+        }
+
+        for _ in 0..50 {
+            let mut v = vec![];
+            for _ in 0..N_U30_LIMBS {
+                v.push(prng.gen::<i32>());
+            }
+            for _ in 0..N_U30_LIMBS {
+                v.push(prng.gen::<i32>());
+            }
+
+            let mut expected = vec![];
+            for i in 0..N_U30_LIMBS {
+                expected.push(v[(N_U30_LIMBS + i) as usize]);
+                expected.push(v[i as usize]);
+            }
+
+            let script = script! {
+                for i in 0..N_U30_LIMBS * 2 {
+                    { v[i as usize] }
+                }
+                { BigIntImpl::<N_BITS, 29>::zip(0, 1) }
+                for i in 0..N_U30_LIMBS * 2 {
+                    { expected[(N_U30_LIMBS * 2 - 1 - i) as usize] }
+                    OP_EQUALVERIFY
+                }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_copy() {
+        println!("U254.copy(0): {} bytes", U254::copy(0).len());
+        println!("U254.copy(13): {} bytes", U254::copy(13).len());
+        println!("U254.copy(14): {} bytes", U254::copy(14).len());
+        const N_U30_LIMBS: u32 = 9;
+
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..50 {
+            let mut v = vec![];
+            for _ in 0..N_U30_LIMBS {
+                v.push(prng.gen::<i32>());
+            }
+            for _ in 0..N_U30_LIMBS {
+                v.push(prng.gen::<i32>());
+            }
+
+            let mut expected = vec![];
+            for i in 0..N_U30_LIMBS {
+                expected.push(v[i as usize]);
+            }
+
+            let script = script! {
+                for i in 0..N_U30_LIMBS * 2 {
+                    { v[i as usize] }
+                }
+                { U254::copy(1) }
+                for i in 0..N_U30_LIMBS {
+                    { expected[(N_U30_LIMBS - 1 - i) as usize] }
+                    OP_EQUALVERIFY
+                }
+                { U254::drop() }
+                { U254::drop() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_roll() {
+        const N_U30_LIMBS: u32 = 9;
+
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..50 {
+            let mut v = vec![];
+            for _ in 0..N_U30_LIMBS {
+                v.push(prng.gen::<i32>());
+            }
+            for _ in 0..N_U30_LIMBS {
+                v.push(prng.gen::<i32>());
+            }
+
+            let mut expected = vec![];
+            for i in 0..N_U30_LIMBS {
+                expected.push(v[i as usize]);
+            }
+
+            let script = script! {
+                for i in 0..N_U30_LIMBS * 2 {
+                    { v[i as usize] }
+                }
+                { U254::roll(1) }
+                for i in 0..N_U30_LIMBS {
+                    { expected[(N_U30_LIMBS - 1 - i) as usize] }
+                    OP_EQUALVERIFY
+                }
+                { U254::drop() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_copy_zip() {
+        const N_U30_LIMBS: u32 = 9;
+
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..50 {
+            let mut v = vec![];
+            for _ in 0..N_U30_LIMBS {
+                v.push(prng.gen::<i32>());
+            }
+            for _ in 0..N_U30_LIMBS {
+                v.push(prng.gen::<i32>());
+            }
+
+            let mut expected = vec![];
+            for i in 0..N_U30_LIMBS {
+                expected.push(v[i as usize]);
+                expected.push(v[(N_U30_LIMBS + i) as usize]);
+            }
+
+            let script = script! {
+                for i in 0..N_U30_LIMBS * 2 {
+                    { v[i as usize] }
+                }
+                { U254::copy_zip(1, 0) }
+                for i in 0..N_U30_LIMBS * 2 {
+                    { expected[(N_U30_LIMBS * 2 - 1 - i) as usize] }
+                    OP_EQUALVERIFY
+                }
+                { U254::drop() }
+                { U254::drop() }
+                OP_TRUE
+            };
+            run(script);
+
+            let mut expected = vec![];
+            for i in 0..N_U30_LIMBS {
+                expected.push(v[(N_U30_LIMBS + i) as usize]);
+                expected.push(v[i as usize]);
+            }
+
+            let script = script! {
+                for i in 0..N_U30_LIMBS * 2 {
+                    { v[i as usize] }
+                }
+                { U254::copy_zip(0, 1) }
+                for i in 0..N_U30_LIMBS * 2 {
+                    { expected[(N_U30_LIMBS * 2 - 1 - i) as usize] }
+                    OP_EQUALVERIFY
+                }
+                { U254::drop() }
+                { U254::drop() }
+                OP_TRUE
+            };
+            run(script);
+
+            let mut expected = vec![];
+            for i in 0..N_U30_LIMBS {
+                expected.push(v[i as usize]);
+                expected.push(v[i as usize]);
+            }
+
+            let script = script! {
+                for i in 0..N_U30_LIMBS * 2 {
+                    { v[i as usize] }
+                }
+                { U254::copy_zip(1, 1) }
+                for i in 0..N_U30_LIMBS * 2 {
+                    { expected[(N_U30_LIMBS * 2 - 1 - i) as usize] }
+                    OP_EQUALVERIFY
+                }
+                { U254::drop() }
+                { U254::drop() }
+                OP_TRUE
+            };
+            run(script);
+
+            let script = script! {
+                for i in 0..N_U30_LIMBS * 2 {
+                    { v[i as usize] }
+                }
+                { U254::dup_zip(1) }
+                for i in 0..N_U30_LIMBS * 2 {
+                    { expected[(N_U30_LIMBS * 2 - 1 - i) as usize] }
+                    OP_EQUALVERIFY
+                }
+                { U254::drop() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn push_hex() {
+        run(script! {
+            { U254::push_hex("30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47") }
+            { 0x187cfd47 } OP_EQUALVERIFY // 410844487
+            { 0x10460b6 } OP_EQUALVERIFY // 813838427
+            { 0x1c72a34f } OP_EQUALVERIFY // 119318739
+            { 0x2d522d0 } OP_EQUALVERIFY // 542811226
+            { 0x1585d978 } OP_EQUALVERIFY // 22568343
+            { 0x2db40c0 } OP_EQUALVERIFY // 18274822
+            { 0xa6e141 } OP_EQUALVERIFY // 436378501
+            { 0xe5c2634 } OP_EQUALVERIFY // 329037900
+            { 0x30644e } OP_EQUAL // 12388
+        });
+    }
+
+    // test the extract window fn
+    #[test]
+    fn test_extract_window(){
+        let mut prng = ChaCha20Rng::seed_from_u64(8);
+
+        for _ in 0..100{
+            // generate random start_index and window
+            let start_index = prng.gen_range(1..=31);
+            let window = prng.gen_range(1..=start_index);
+
+            // generate a random u32
+            let random_u32: u32 = prng.gen();
+
+            // compute the values by shifting
+            let initial_limb = random_u32 >> (32u32 - start_index);
+            let expected_window = initial_limb >> (start_index - window);
+            let modified_limb = if start_index == window {0} else {(initial_limb << (32u32 - start_index + window)) >> (32u32 - start_index + window)};
+
+            let script = script!(
+                {initial_limb}
+
+                {extract_digits(start_index,window)}
+
+                {modified_limb}
+                OP_EQUALVERIFY
+
+                {expected_window}
+                OP_EQUAL
+            );
+
+            let res = crate::execute_script(script.clone());
+            assert!(res.success);
+        }
+    }
+
+    // manual test of transform to and from U256.
+    #[test]
+    fn test_transform_to_and_from_u256() {
+        type U256 = BigIntImpl<256, 29>;
+        let script = script!(
+            {0b010101010010101010100101}
+            {0b10000000100000011111111011111}
+            {0b00000101000000100000000000000}
+            {0b01010101001010101000000000000}
+            {0b11010101001010101001010111111}
+            {0b11111111111000000000000000000}
+            {0b01010010101001010010010101001}
+            {0b00000000000000000000000000000}
+            {0b11111111111111111111111111111}
+            {U256::transform_limbsize(29, 4)}
+            {U256::transform_limbsize(4, 1)}
+            {U256::transform_limbsize(1, 31)}
+            {U256::transform_limbsize(31, 2)}
+            {U256::transform_limbsize(2, 10)}
+            {U256::transform_limbsize(10, 31)}
+            {U256::transform_limbsize(31, 27)}
+            {U256::transform_limbsize(27, 8)}
+            {U256::transform_limbsize(8, 9)}
+            {U256::transform_limbsize(9, 9)}
+            {U256::transform_limbsize(9, 4)}
+            {U256::transform_limbsize(4, 4)}
+            {U256::transform_limbsize(4,29)}
+            {0b010101010010101010100101}
+            {0b10000000100000011111111011111}
+            {0b00000101000000100000000000000}
+            {0b01010101001010101000000000000}
+            {0b11010101001010101001010111111}
+            {0b11111111111000000000000000000}
+            {0b01010010101001010010010101001}
+            {0b00000000000000000000000000000}
+            {0b11111111111111111111111111111}
+
+
+            for i in (2..10).rev(){
+                {i}
+                OP_ROLL
+                OP_EQUALVERIFY
+            } 
+            OP_EQUAL
+        );
+        let res = crate::execute_script(script.clone());
+        assert!(res.success);
+    }
+
+    // Testing all ones manually for U1773
+    #[test]
+    fn test_transform_allones_to_and_from_u1773() {
+        type U1773 = BigIntImpl<1773, 21>;
+        let script = script!(
+            // push all ones in U1773 assuming limb size of 23
+            {0b11}
+            for _ in 0..77{
+                {0b11111111111111111111111}
+            }
+
+            {U1773::transform_limbsize(23,21)}
+            {U1773::transform_limbsize(21,2)}
+            {U1773::transform_limbsize(2,3)}
+            {U1773::transform_limbsize(3,19)}
+            {U1773::transform_limbsize(19,23)}
+           
+            for _ in 0..77{
+                {0b11111111111111111111111}
+                OP_EQUALVERIFY
+            }
+            {0b11}
+            OP_EQUAL
+
+        );
+        let res = crate::execute_script(script.clone());
+        assert!(res.success);
+    }
+
+    // Testing all ones manually for U1773
+    #[test]
+    fn test_transform_allzeros_to_and_from_u1773() {
+        type U1773 = BigIntImpl<1773, 21>;
+        let script = script!(
+            // push all ones in U1773 assuming limb size of 23
+            {0b11}
+            for _ in 0..77{
+                {0b11111111111111111111111}
+            }
+
+            {U1773::transform_limbsize(23,21)}
+            {U1773::transform_limbsize(21,2)}
+            {U1773::transform_limbsize(2,3)}
+            {U1773::transform_limbsize(3,19)}
+            {U1773::transform_limbsize(19,23)}
+
+           // push the same input in reverse and verify
+            for _ in 0..77{
+                {0b11111111111111111111111}
+                OP_EQUALVERIFY
+            }
+            {0b11}
+            OP_EQUAL
+
+        );
+        let res = crate::execute_script(script.clone());
+        assert!(res.success);
+    }
+
+    // Testing all ones manually for U1773
+    #[test]
+    fn test_transform_allzeros_to_and_from_u876() {
+        type U876 = BigIntImpl<876, 14>;
+        let script = script!(
+            // push all zeros in U876 assuming limb size of 14
+            {0b00000000}
+            for _ in 0..62{
+                {0b00000000000000}
+            }
+
+            {U876::transform_limbsize(14, 9)}
+            {U876::transform_limbsize(9, 10)}
+            {U876::transform_limbsize(10, 31)}
+            {U876::transform_limbsize(31, 1)}
+            {U876::transform_limbsize(1, 2)}
+            {U876::transform_limbsize(2, 4)}
+            {U876::transform_limbsize(4, 8)}
+            {U876::transform_limbsize(8, 19)}
+            {U876::transform_limbsize(19, 27)}
+            {U876::transform_limbsize(27, 14)}
+
+           //push the same input in reverse and verify
+            for _ in 0..62{
+                {0b00000000000000}
+                OP_EQUALVERIFY
+            }
+            {0b00000000}
+            OP_EQUAL
+
+        );
+        let res = crate::execute_script(script.clone());
+        assert!(res.success);
+    }
+
+    #[test]
+    #[should_panic(expected = "source limb size must lie between 1 and 31 inclusive")]
+    fn test_source_limbsize_too_high() {
+        script!({ U254::transform_limbsize(32, 3) });
+    }
+
+    #[test]
+    #[should_panic(expected = "source limb size must lie between 1 and 31 inclusive")]
+    fn test_source_limbsize_too_low() {
+        script!({ U254::transform_limbsize(0, 29) });
+    }
+
+    #[test]
+    #[should_panic(expected = "target limb size must lie between 1 and 31 inclusive")]
+    fn test_target_limbsize_too_high() {
+        script!({ U254::transform_limbsize(29, 32) });
+    }
+
+    #[test]
+    #[should_panic(expected = "target limb size must lie between 1 and 31 inclusive")]
+    fn test_target_limbsize_too_low() {
+        script!({ U254::transform_limbsize(29, 0) });
+    }
+
+    // test for properties that gen_transform_steps must satisfy
+    // sum of extracts window must be equal to the number of bits
+    // count of drop_current_limb must be equal to number of limbs in source representation
+    // count of initiate_targetlimb must be equal to number of limbs in target representation
+    #[test]
+    fn test_generate_steps_sum_of_extarct_windows() {
+        type U256 = BigIntImpl<256, 29>;
+        let mut prng = ChaCha20Rng::seed_from_u64(1);
+        for _ in 0..100 {
+            // generate random source and target limbsizes
+            let source = prng.gen_range(1..=31);
+            let target = prng.gen_range(1..=31);
+
+            let steps = U256::get_transform_steps(source, target);
+
+            let mut extract_windows_sum = 0;
+            let mut drop_currentlimb_count = 0;
+            let mut initiate_targetlimb_count = 0;
+            for step in steps {
+                extract_windows_sum += step.extract_window;
+                drop_currentlimb_count += if step.drop_currentlimb { 1 } else { 0 };
+                initiate_targetlimb_count+= if step.initiate_targetlimb { 1 } else { 0 };
+            }
+            assert_eq!(extract_windows_sum, U256::N_BITS);
+            assert_eq!(drop_currentlimb_count, U256::N_BITS.div_ceil(source));
+            assert_eq!(initiate_targetlimb_count, U256::N_BITS.div_ceil(target));
+        }
+    }
+
+    #[test]
+    fn test_transform_limbsize_u256_random_vals(){
+        type U256 = BigIntImpl<256,29>;
+        let mut prng = ChaCha20Rng::seed_from_u64(1);
+
+        for _ in 0..100{
+
+            // create a vector to store the inputs
+            let mut input_vals: Vec<u32> = Vec::new();
+            
+            // generate random u32 for input
+            for i in 0..9{
+                let input_val:u32 = prng.gen();
+                // ensure that the initial bits are zero as needed
+                if i == 0{
+                    input_vals.push(input_val >> 8);
+                }else{
+                    input_vals.push(input_val >> 3);
+                }
+            }
+
+            // generate random source and target limbsizes
+            let source = prng.gen_range(1..=31);
+            let target = prng.gen_range(1..=31);
+
+            let script = script!(
+
+                // insert the values
+                for val in input_vals.clone(){
+                    {val}
+                }
+
+                // do random transforms
+                {U256::transform_limbsize(29,source)}
+                {U256::transform_limbsize(source,target)}
+                {U256::transform_limbsize(target,29)}
+
+                // verify that the transformation and its inverse leaves the input unchanged
+                for val in input_vals.iter().rev(){
+                    {*val}
+                    OP_EQUALVERIFY
+                }
+                OP_TRUE
+            );
+            let res = crate::execute_script(script.clone());
+            assert!(res.success); 
+        }
+    }
+}
diff --git a/src/bigint/sub.rs b/bitvm/src/bigint/sub.rs
similarity index 90%
rename from src/bigint/sub.rs
rename to bitvm/src/bigint/sub.rs
index 9daf336ee..537632aa2 100644
--- a/src/bigint/sub.rs
+++ b/bitvm/src/bigint/sub.rs
@@ -94,8 +94,7 @@ mod test {
                 { U254::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
 
             let script = script! {
                 { U254::push_u32_le(&b.to_u32_digits()) }
@@ -105,8 +104,7 @@ mod test {
                 { U254::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         for _ in 0..100 {
@@ -123,8 +121,7 @@ mod test {
                 { U64::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
 
             let script = script! {
                 { U64::push_u32_le(&b.to_u32_digits()) }
@@ -134,8 +131,7 @@ mod test {
                 { U64::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 }
diff --git a/src/bn254/ell_coeffs.rs b/bitvm/src/bn254/ell_coeffs.rs
similarity index 51%
rename from src/bn254/ell_coeffs.rs
rename to bitvm/src/bn254/ell_coeffs.rs
index fadbbe215..5c1631695 100644
--- a/src/bn254/ell_coeffs.rs
+++ b/bitvm/src/bn254/ell_coeffs.rs
@@ -2,12 +2,16 @@
 // Cannot directly obtain G2 because of visibility
 
 use ark_ec::bn::g2::G2Prepared as ark_G2Prepared;
+use ark_bn254::Config;
 use ark_ec::bn::{BnConfig, TwistType};
+use ark_ec::pairing::{MillerLoopOutput, Pairing, PairingOutput};
 use ark_ec::short_weierstrass::Affine;
 use ark_ec::short_weierstrass::SWCurveConfig;
 use ark_ec::{AffineRepr, CurveGroup};
-use ark_ff::AdditiveGroup;
 use ark_ff::Field;
+use ark_ff::{AdditiveGroup, CyclotomicMultSubgroup};
+use ark_std::cfg_chunks_mut;
+use itertools::Itertools;
 use num_traits::One;
 
 pub type G2Affine<P> = Affine<<P as BnConfig>::G2Config>;
@@ -35,43 +39,43 @@ impl G2HomProjective {
         // Formula for line function when working with
         // homogeneous projective coordinates.
 
-        let mut a = self.x * &self.y;
+        let mut a = self.x * self.y;
         a.mul_assign_by_fp(two_inv);
         let b = self.y.square();
         let c = self.z.square();
-        let e = ark_bn254::g2::Config::COEFF_B * &(c.double() + &c);
-        let f = e.double() + &e;
-        let mut g = b + &f;
+        let e = ark_bn254::g2::Config::COEFF_B * (c.double() + c);
+        let f = e.double() + e;
+        let mut g = b + f;
         g.mul_assign_by_fp(two_inv);
-        let h = (self.y + &self.z).square() - &(b + &c);
-        let i = e - &b;
+        let h = (self.y + self.z).square() - (b + c);
+        let i = e - b;
         let j = self.x.square();
         let e_square = e.square();
 
-        self.x = a * &(b - &f);
-        self.y = g.square() - &(e_square.double() + &e_square);
-        self.z = b * &h;
+        self.x = a * (b - f);
+        self.y = g.square() - (e_square.double() + e_square);
+        self.z = b * h;
         match ark_bn254::Config::TWIST_TYPE {
-            TwistType::M => (i, j.double() + &j, -h),
-            TwistType::D => (-h, j.double() + &j, i),
+            TwistType::M => (i, j.double() + j, -h),
+            TwistType::D => (-h, j.double() + j, i),
         }
     }
 
     fn add_in_place(&mut self, q: &ark_bn254::G2Affine) -> EllCoeff {
         // Formula for line function when working with
         // homogeneous projective coordinates.
-        let theta = self.y - &(q.y * &self.z);
-        let lambda = self.x - &(q.x * &self.z);
+        let theta = self.y - (q.y * self.z);
+        let lambda = self.x - (q.x * self.z);
         let c = theta.square();
         let d = lambda.square();
-        let e = lambda * &d;
-        let f = self.z * &c;
-        let g = self.x * &d;
-        let h = e + &f - &g.double();
-        self.x = lambda * &h;
-        self.y = theta * &(g - &h) - &(e * &self.y);
-        self.z *= &e;
-        let j = theta * &q.x - &(lambda * &q.y);
+        let e = lambda * d;
+        let f = self.z * c;
+        let g = self.x * d;
+        let h = e + f - g.double();
+        self.x = lambda * h;
+        self.y = theta * (g - h) - (e * self.y);
+        self.z *= e;
+        let j = theta * q.x - (lambda * q.y);
 
         match ark_bn254::Config::TWIST_TYPE {
             TwistType::M => (j, -theta, lambda),
@@ -96,7 +100,7 @@ impl G2Prepared {
         // intercept: bias = y - alpha * x
         let mut alpha = t.x.square();
         alpha /= t.y;
-        alpha.mul_assign_by_fp(&three_div_two);
+        alpha.mul_assign_by_fp(three_div_two);
         let bias = t.y - alpha * t.x;
 
         // update T
@@ -125,6 +129,7 @@ impl G2Prepared {
         (ark_bn254::Fq2::ONE, alpha, -bias)
     }
 
+    /// !!! this method cannot be used directly for users, so we need reuse the `from` trait already exists
     pub fn from_affine(q: ark_bn254::G2Affine) -> Self {
         if q.infinity {
             G2Prepared {
@@ -136,7 +141,7 @@ impl G2Prepared {
             let three_div_two = (ark_bn254::Fq::one().double() + ark_bn254::Fq::one()) * two_inv;
 
             let mut ell_coeffs = vec![];
-            let mut r = q.clone();
+            let mut r = q;
 
             let neg_q = -q;
 
@@ -179,38 +184,7 @@ impl From<ark_bn254::G2Affine> for G2Prepared {
                 infinity: true,
             }
         } else {
-            let two_inv = ark_bn254::Fq::one().double().inverse().unwrap();
-            let mut ell_coeffs = vec![];
-            let mut r = G2HomProjective {
-                x: q.x,
-                y: q.y,
-                z: ark_bn254::Fq2::one(),
-            };
-
-            let neg_q = -q;
-
-            for bit in ark_bn254::Config::ATE_LOOP_COUNT.iter().rev().skip(1) {
-                ell_coeffs.push(r.double_in_place(&two_inv));
-
-                match bit {
-                    1 => ell_coeffs.push(r.add_in_place(&q)),
-                    -1 => ell_coeffs.push(r.add_in_place(&neg_q)),
-                    _ => continue,
-                }
-            }
-
-            let q1 = mul_by_char(q);
-            let mut q2 = mul_by_char(q1);
-
-            q2.y = -q2.y;
-
-            ell_coeffs.push(r.add_in_place(&q1));
-            ell_coeffs.push(r.add_in_place(&q2));
-
-            Self {
-                ell_coeffs,
-                infinity: false,
-            }
+           Self::from_affine(q)
         }
     }
 }
@@ -258,6 +232,10 @@ impl<'a> From<&'a ark_G2Prepared<ark_bn254::Config>> for G2Prepared {
     }
 }
 
+impl G2Prepared {
+    pub fn is_zero(&self) -> bool { self.infinity }
+}
+
 pub fn mul_by_char(r: ark_bn254::G2Affine) -> ark_bn254::G2Affine {
     // multiply by field characteristic
 
@@ -270,8 +248,147 @@ pub fn mul_by_char(r: ark_bn254::G2Affine) -> ark_bn254::G2Affine {
     s
 }
 
+// Define the AffinePairing trait for our affine mode operations
+pub trait AffinePairing {
+    /// Computes the product of Miller loops for some number of (G1, G2) pairs, where the line functions are in affine mode
+    fn multi_miller_loop_affine(
+        &self,
+        a: impl IntoIterator<Item = impl Into<ark_ec::bn::G1Prepared<ark_bn254::Config>>>,
+        b: impl IntoIterator<Item = impl Into<G2Prepared>>,
+    ) -> MillerLoopOutput<ark_bn254::Bn254>;
+
+    /// Performs multiple pairing operations, where the line functions are in affine mode
+    fn multi_pairing_affine(
+        &self,
+        a: impl IntoIterator<Item = impl Into<ark_ec::bn::G1Prepared<ark_bn254::Config>>>,
+        b: impl IntoIterator<Item = impl Into<G2Prepared>>,
+    ) -> PairingOutput<ark_bn254::Bn254>;
+
+    /// Performs a single pairing operation, where the line functions are in affine mode
+    fn pairing_affine(
+        &self,
+        p: impl Into<ark_ec::bn::G1Prepared<ark_bn254::Config>>,
+        q: impl Into<G2Prepared>,
+    ) -> PairingOutput<ark_bn254::Bn254>;
+}
+
+// Create a struct to implement AffinePairing
+pub struct BnAffinePairing;
+
+// Helper function to perform line function evaluation in affine coordinates
+fn ell_affine(
+    f: &mut ark_bn254::Fq12,
+    coeffs: &EllCoeff,
+    xx: &ark_bn254::Fq,
+    yy: &ark_bn254::Fq,
+) {
+    // c0 is a trivial value 1
+    let c0 = coeffs.0;
+    let mut c1 = coeffs.1;
+    let mut c2 = coeffs.2;
+
+    match Config::TWIST_TYPE {
+        TwistType::M => {
+            c1.mul_assign_by_fp(xx);
+            c2.mul_assign_by_fp(yy);
+            f.mul_by_014(&c0, &c1, &c2);
+        },
+        // line evaluation is y' * f_Q(P), coefficients are (1, x' * lambda, -y' * bias)
+        TwistType::D => {
+            c1.mul_assign_by_fp(xx);
+            c2.mul_assign_by_fp(yy);
+            f.mul_by_034(&c0, &c1, &(c2));
+        },
+    }
+}
+
+impl AffinePairing for BnAffinePairing {
+    fn multi_miller_loop_affine(
+        &self,
+        a: impl IntoIterator<Item = impl Into<ark_ec::bn::G1Prepared<ark_bn254::Config>>>,
+        b: impl IntoIterator<Item = impl Into<G2Prepared>>,
+    ) -> MillerLoopOutput<ark_bn254::Bn254> {
+        let mut pairs = a
+            .into_iter()
+            .zip_eq(b)
+            .filter_map(|(p, q)| {
+                // if input q is projective coordinates, then we will enter `into` computing pairing mode
+                // otherwise if input q is affine coordinates, then we will enter `into` verifying pairing mode
+                let (p, q) = (p.into(), q.into());
+                match !p.is_zero() && !q.is_zero() {
+                    true => Some((
+                        -p.0.x / p.0.y,
+                        p.0.y.inverse().unwrap(),
+                        q.ell_coeffs.into_iter(),
+                    )),
+                    false => None,
+                }
+            })
+            .collect::<Vec<_>>();
+
+        let mut f = cfg_chunks_mut!(pairs, 4)
+            .map(|pairs| {
+                let mut f = ark_bn254::Fq12::one();
+                for i in (1..Config::ATE_LOOP_COUNT.len()).rev() {
+                    if i != Config::ATE_LOOP_COUNT.len() - 1 {
+                        f.square_in_place();
+                    }
+
+                    for (coeff_1, coeff_2, coeffs) in pairs.iter_mut() {
+                        ell_affine(&mut f, &coeffs.next().unwrap(), coeff_1, coeff_2);
+                    }
+
+                    let bit = Config::ATE_LOOP_COUNT[i - 1];
+                    if bit == 1 || bit == -1 {
+                        for (coeff_1, coeff_2, coeffs) in pairs.iter_mut() {
+                            ell_affine(
+                                &mut f,
+                                &coeffs.next().unwrap(),
+                                coeff_1,
+                                coeff_2,
+                            );
+                        }
+                    }
+                }
+                f
+            })
+            .product::<ark_bn254::Fq12>();
+
+        if Config::X_IS_NEGATIVE {
+            f.cyclotomic_inverse_in_place();
+        }
+
+        for (coeff_1, coeff_2, coeffs) in &mut pairs {
+            ell_affine(&mut f, &coeffs.next().unwrap(), coeff_1, coeff_2);
+        }
+
+        for (coeff_1, coeff_2, coeffs) in &mut pairs {
+            ell_affine(&mut f, &coeffs.next().unwrap(), coeff_1, coeff_2);
+        }
+
+        MillerLoopOutput(f)
+    }
+
+    fn multi_pairing_affine(
+        &self,
+        a: impl IntoIterator<Item = impl Into<ark_ec::bn::G1Prepared<ark_bn254::Config>>>,
+        b: impl IntoIterator<Item = impl Into<G2Prepared>>,
+    ) -> PairingOutput<ark_bn254::Bn254> {
+        ark_bn254::Bn254::final_exponentiation(self.multi_miller_loop_affine(a, b)).unwrap()
+    }
+
+    fn pairing_affine(
+        &self,
+        p: impl Into<ark_ec::bn::G1Prepared<ark_bn254::Config>>,
+        q: impl Into<G2Prepared>,
+    ) -> PairingOutput<ark_bn254::Bn254> {
+        self.multi_pairing_affine([p], [q])
+    }
+}
+
 #[cfg(test)]
 mod tests {
+    use super::*;
     use ark_bn254::{Fq, Fq2};
 
     use ark_ec::short_weierstrass::SWCurveConfig;
@@ -293,9 +410,7 @@ mod tests {
         };
 
         println!("1/2 = {:?}\n\n", two_inv.to_string());
-
         println!("COEFF_B = {}\n\n", ark_bn254::g2::Config::COEFF_B);
-
         println!("before double line:");
         println!("r.x = {:?}", r.x.to_string());
         println!("r.y = {:?}", r.y.to_string());
@@ -311,4 +426,24 @@ mod tests {
         println!("s.1 = {:?}", s.1.to_string());
         println!("s.2 = {:?}", s.2.to_string());
     }
+
+    #[test]
+    fn test_affine_vs_projective() {
+        let mut rng = test_rng();
+
+        // Generate random points
+        let g1 = ark_bn254::G1Projective::rand(&mut rng).into_affine();
+        let g2 = ark_bn254::G2Projective::rand(&mut rng).into_affine();
+
+        // Compute pairing using standard method
+        let result1 = ark_bn254::Bn254::pairing(g1, g2);
+
+        // Compute pairing using our affine method
+        let affine_pairing = BnAffinePairing;
+        let g2_prepared = G2Prepared::from_affine(g2);
+        let result2 = affine_pairing.pairing_affine(g1, g2_prepared);
+
+        // Results should be equal
+        assert_eq!(result1, result2);
+    }
 }
diff --git a/bitvm/src/bn254/fp254impl.rs b/bitvm/src/bn254/fp254impl.rs
new file mode 100644
index 000000000..5a564c770
--- /dev/null
+++ b/bitvm/src/bn254/fp254impl.rs
@@ -0,0 +1,836 @@
+use crate::bigint::add::limb_add_carry;
+use crate::bigint::sub::limb_sub_borrow;
+use crate::bigint::U254;
+use crate::bn254::fq::Fq;
+use crate::bn254::utils::Hint;
+use crate::treepp::*;
+use ark_ff::PrimeField;
+use bitcoin_script::script;
+use num_bigint::{BigInt, BigUint};
+use num_traits::Num;
+use std::str::FromStr;
+use std::sync::OnceLock;
+
+#[allow(clippy::declare_interior_mutable_const)]
+pub trait Fp254Impl {
+    const N_LIMBS: u32 = U254::N_LIMBS;
+    const N_BITS: u32 = U254::N_BITS;
+
+    const MODULUS: &'static str;
+    const MODULUS_LIMBS: [u32; U254::N_LIMBS as usize];
+
+    const P_PLUS_ONE_DIV2: &'static str;
+    const TWO_P_PLUS_ONE_DIV3: &'static str;
+    const P_PLUS_TWO_DIV3: &'static str;
+
+    const ADD_ONCELOCK: OnceLock<Script> = OnceLock::new();
+    const SUB_ONCELOCK: OnceLock<Script> = OnceLock::new();
+
+    type ConstantType: PrimeField;
+
+    #[inline]
+    fn copy(a: u32) -> Script {
+        U254::copy(a)
+    }
+
+    #[inline]
+    fn roll(a: u32) -> Script {
+        U254::roll(a)
+    }
+
+    #[inline]
+    fn drop() -> Script {
+        U254::drop()
+    }
+
+    #[inline]
+    fn toaltstack() -> Script {
+        U254::toaltstack()
+    }
+
+    #[inline]
+    fn fromaltstack() -> Script {
+        U254::fromaltstack()
+    }
+
+    #[inline]
+    fn zip(a: u32, b: u32) -> Script {
+        U254::zip(a, b)
+    }
+
+    #[inline]
+    fn push_modulus() -> Script {
+        U254::push_hex(Self::MODULUS)
+    }
+
+    #[inline]
+    fn push_zero() -> Script {
+        U254::push_zero()
+    }
+
+    #[inline]
+    fn push_one() -> Script {
+        U254::push_one()
+    }
+
+    #[inline]
+    fn push_u32_le(v: &[u32]) -> Script {
+        script! {
+            { U254::push_u32_le(&BigUint::from_slice(v).to_u32_digits()) }
+        }
+    }
+
+    #[inline]
+    fn read_u32_le(witness: Vec<Vec<u8>>) -> Vec<u32> {
+        U254::read_u32_le(witness)
+    }
+
+    #[inline]
+    fn push_dec(dec_string: &str) -> Script {
+        let v = BigUint::from_str_radix(dec_string, 10).unwrap();
+        script! {
+            { U254::push_u32_le(&v.to_u32_digits()) }
+        }
+    }
+
+    #[inline]
+    fn push_hex(hex_string: &str) -> Script {
+        let v = BigUint::from_str_radix(hex_string, 16).unwrap();
+        script! {
+            { U254::push_u32_le(&v.to_u32_digits()) }
+        }
+    }
+
+    #[inline]
+    fn equal(a: u32, b: u32) -> Script {
+        U254::equal(a, b)
+    }
+
+    #[inline]
+    fn equalverify(a: u32, b: u32) -> Script {
+        U254::equalverify(a, b)
+    }
+
+    fn is_zero(a: u32) -> Script {
+        U254::is_zero(a)
+    }
+
+    fn is_zero_keep_element(a: u32) -> Script {
+        U254::is_zero_keep_element(a)
+    }
+
+    fn is_one() -> Script {
+        script! {
+            { Self::push_one() }
+            { Self::equal(1, 0) }
+        }
+    }
+
+    fn is_one_keep_element(a: u32) -> Script {
+        script! {
+            { Self::copy(a) }
+            { Self::is_one() }
+        }
+    }
+
+    fn is_field() -> Script {
+        script! {
+            // Each limb must not be negative
+            for i in 0..Self::N_LIMBS - 1 {
+                { i } OP_PICK
+                0 OP_GREATERTHANOREQUAL OP_TOALTSTACK
+            }
+            { Self::N_LIMBS - 1 } OP_PICK
+            0 OP_GREATERTHANOREQUAL
+            for _ in 0..Self::N_LIMBS - 1 {
+                OP_FROMALTSTACK OP_BOOLAND
+            }
+            OP_TOALTSTACK
+
+            { Self::push_modulus() }
+            { U254::lessthan(1, 0) }
+
+            OP_FROMALTSTACK OP_BOOLAND
+        }
+    }
+
+    #[inline]
+    fn convert_to_le_bits_toaltstack() -> Script {
+        U254::convert_to_le_bits_toaltstack()
+    }
+
+    // A + B mod M
+    // Ci⁺ overflow carry bit (A+B)
+    // Ci⁻ overflow carry bit (A-B)
+    fn add(a: u32, b: u32) -> Script {
+        let binding = Self::ADD_ONCELOCK;
+        let add_script = binding.get_or_init(|| {
+            script! {
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ A₀ B₀
+                { 0x20000000 }
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ A₀ B₀ 2²⁹
+
+                // A₀ + B₀
+                limb_add_carry
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ 2²⁹ C₀⁺ A₀+B₀
+                OP_DUP
+                OP_TOALTSTACK
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ 2²⁹ C₀⁺ A₀+B₀ | A₀+B₀
+                OP_ROT
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁺ A₀+B₀ 2²⁹
+                { Self::MODULUS_LIMBS[0] }
+                OP_SWAP
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁺ A₀+B₀ M₀ 2²⁹
+                limb_sub_borrow
+                OP_TOALTSTACK
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁺ 2²⁹ C₀⁻ | (A₀+B₀)-M₀
+
+                // from     A₁      + B₁        + carry_0
+                //   to     A{N-2}  + B{N-2}    + carry_{N-3}
+                for i in 1..Self::N_LIMBS-1 {
+                    OP_2SWAP
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ 2²⁹ C₀⁻ B₁ C₀⁺
+                    OP_ADD
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ 2²⁹ C₀⁻ B₁+C₀⁺
+                    OP_2SWAP
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₀⁻ B₁+C₀⁺ A₁ 2²⁹
+                    limb_add_carry
+                    OP_DUP
+                    OP_TOALTSTACK
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₀⁻ 2²⁹ C₁⁺ (B₁+C₀)+A₁ | (B₁+C₀)+A₁
+                    OP_2SWAP
+                    OP_SWAP
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁺ (B₁+C₀)+A₁ 2²⁹ C₀⁻
+                    { Self::MODULUS_LIMBS[i as usize] }
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁺ (B₁+C₀)+A₁ 2²⁹ C₀⁻ M₁
+                    OP_ADD
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁺ (B₁+C₀)+A₁ 2²⁹ C₀⁻+M₁
+                    OP_ROT
+                    OP_SWAP
+                    OP_ROT
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁺ (B₁+C₀)+A₁ C₀⁻+M₁ 2²⁹
+                    limb_sub_borrow
+                    OP_TOALTSTACK
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁺ 2²⁹ C₁⁻ | ((B₁+C₀)+A₁)-(C₀⁻+M₁)
+                }
+                // ⋯ A₈ B₈ C₇⁺ 2²⁹ C₇⁻
+                OP_2SWAP
+                OP_ADD
+                // ⋯ A₈ 2²⁹ C₇⁻ B₈+C₇⁺
+                OP_2SWAP
+                OP_ROT
+                OP_ROT
+                // ⋯ C₇⁻ 2²⁹ B₈+C₇⁺ A₈
+                OP_ADD
+                // ⋯ C₇⁻ 2²⁹ (B₈+C₇⁺)+A₈
+                OP_DUP
+                OP_TOALTSTACK
+                OP_ROT
+                // ⋯ 2²⁹ (B₈+C₇⁺)+A₈ C₇⁻
+                { *Self::MODULUS_LIMBS.last().unwrap() }
+                // ⋯ 2²⁹ (B₈+C₇⁺)+A₈ C₇⁻ M₈
+                OP_ADD
+                OP_ROT
+                // ⋯ (B₈+C₇⁺)+A₈ C₇⁻+M₈ 2²⁹
+                limb_sub_borrow
+                OP_TOALTSTACK
+                // ⋯ 2²⁹ C₈⁻ | ((B₈+C₇⁺)+A₈)-(C₇⁻+M₈)
+                OP_NIP
+                OP_DUP
+
+                // ⋯ C₈⁻ C₈⁻
+                OP_IF
+                    OP_FROMALTSTACK
+                    OP_DROP
+                OP_ENDIF
+
+                OP_FROMALTSTACK
+                // ⋯ (B₈+C₇⁺)+A₈ C₈⁻ | ((B₇+C₆⁺)+A₇)-(C₆⁻+M₇)
+                // ⋯ ((B₈+C₇⁺)+A₈)-(C₇⁻+M₈) C₈⁻ | (B₈+C₇⁺)+A₈
+                for _ in 0..Self::N_LIMBS-1 {
+                    OP_FROMALTSTACK  OP_DROP
+                    OP_FROMALTSTACK
+                }
+                // ⋯ (B₈+C₇⁺)+A₈ (B₇+C₆⁺)+A₇ ... (B₂+C₁⁺)+A₂ (B₁+C₀⁺)+A₁ A₀+B₀ C₈⁻
+                // ⋯ ((B₈+C₇⁺)+A₈)-(C₇⁻+M₈) ... (A₀+B₀)-M₀ C₈⁻ | A₀+B₀
+                { Self::N_LIMBS }
+                OP_ROLL
+                OP_NOTIF
+                    OP_FROMALTSTACK
+                    OP_DROP
+                OP_ENDIF
+                // ⋯ (B₈+C₇⁺)+A₈ (B₇+C₆⁺)+A₇ ... (B₁+C₀⁺)+A₁ A₀+B₀
+                // ⋯ ((B₈+C₇⁺)+A₈)-(C₇⁻+M₈) ... (A₀+B₀)-M₀
+            }
+        });
+        script! {
+            { Self::zip(a, b) }
+            { add_script.clone() }
+        }
+    }
+
+    fn neg(a: u32) -> Script {
+        script! {
+            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ ⋯
+            { Self::roll(a) }
+            { Self::is_zero_keep_element(0) }
+            OP_NOTIF
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀
+                { Self::MODULUS_LIMBS[0] } OP_SWAP { 0x20000000 }
+                limb_sub_borrow OP_TOALTSTACK
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ 2²⁹ C₀⁻ | M₀-A₀ ⋯
+                OP_ROT OP_ADD
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ 2²⁹ C₀⁻+A₁
+                { Self::MODULUS_LIMBS[1] } OP_SWAP OP_ROT
+                limb_sub_borrow OP_TOALTSTACK
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ 2²⁹ C₁⁻ | M₁-(C₀⁻+A₁) ⋯
+                OP_ROT OP_ADD
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ 2²⁹ C₁⁻+A₂
+                { Self::MODULUS_LIMBS[2] } OP_SWAP OP_ROT
+                limb_sub_borrow OP_TOALTSTACK
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ 2²⁹ C₂⁻ | M₂-(C₁⁻+A₂) ⋯
+                OP_ROT OP_ADD
+                // ⋯ A₈ A₇ A₆ A₅ A₄ 2²⁹ C₂⁻+A₃
+                { Self::MODULUS_LIMBS[3] } OP_SWAP OP_ROT
+                limb_sub_borrow OP_TOALTSTACK
+                // ⋯ A₈ A₇ A₆ A₅ A₄ 2²⁹ C₃⁻ | M₃-(C₂⁻+A₃) ⋯
+                OP_ROT OP_ADD
+                // ⋯ A₈ A₇ A₆ A₅ 2²⁹ C₃⁻+A₄
+                { Self::MODULUS_LIMBS[4] } OP_SWAP OP_ROT
+                limb_sub_borrow OP_TOALTSTACK
+                // ⋯ A₈ A₇ A₆ A₅ 2²⁹ C₄⁻ | M₄-(C₃⁻+A₄) ⋯
+                OP_ROT OP_ADD
+                // ⋯ A₈ A₇ A₆ 2²⁹ C₄⁻+A₅
+                { Self::MODULUS_LIMBS[5] } OP_SWAP OP_ROT
+                limb_sub_borrow OP_TOALTSTACK
+                // ⋯ A₈ A₇ A₆ 2²⁹ C₅⁻ | M₅-(C₄⁻+A₅) ⋯
+                OP_ROT OP_ADD
+                // ⋯ A₈ A₇ 2²⁹ C₅⁻+A₆
+                { Self::MODULUS_LIMBS[6] } OP_SWAP OP_ROT
+                limb_sub_borrow OP_TOALTSTACK
+                // ⋯ A₈ A₇ 2²⁹ C₆⁻ | M₆-(C₅⁻+A₆) ⋯
+                OP_ROT OP_ADD
+                // ⋯ A₈ 2²⁹ C₆⁻+A₇
+                { Self::MODULUS_LIMBS[7] } OP_SWAP OP_ROT
+                limb_sub_borrow OP_TOALTSTACK
+                // ⋯ A₈ 2²⁹ C₇⁻ | M₇-(C₆⁻+A₇) ⋯
+                OP_NIP OP_ADD
+                // ⋯ C₇⁻+A₈
+                { Self::MODULUS_LIMBS[8] } OP_SWAP OP_SUB
+                // ⋯ M₈-(C₇⁻+A₈)
+                OP_FROMALTSTACK OP_FROMALTSTACK OP_FROMALTSTACK OP_FROMALTSTACK
+                OP_FROMALTSTACK OP_FROMALTSTACK OP_FROMALTSTACK OP_FROMALTSTACK
+            OP_ENDIF
+        }
+    }
+
+    // A - B mod M
+    // Ci⁻ overflow carry bit (A-B)
+    // Ci⁺ overflow carry bit (A+B)
+    fn sub(a: u32, b: u32) -> Script {
+        let binding = Self::SUB_ONCELOCK;
+        let sub_script = binding.get_or_init(|| {
+            script! {
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ A₀ B₀
+                { 0x20000000 }
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ A₀ B₀ 2²⁹
+
+                // A₀ - B₀
+                limb_sub_borrow
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ 2²⁹ C₀⁻ A₀-B₀
+                OP_DUP
+                OP_TOALTSTACK
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ 2²⁹ C₀⁻ A₀-B₀ | A₀-B₀
+                OP_ROT
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁻ A₀-B₀ 2²⁹
+                { Self::MODULUS_LIMBS[0] }
+                OP_SWAP
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁻ A₀-B₀ M₀ 2²⁹
+                limb_add_carry
+                OP_TOALTSTACK
+                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁻ 2²⁹ C₀⁺ | (A₀-B₀)+M₀
+
+                // from     A₁      - B₁        - carry_0
+                //   to     A{N-2}  - B{N-2}    - carry_{N-3}
+                for i in 1..Self::N_LIMBS-1 {
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁻ 2²⁹ C₀⁺
+                    OP_2SWAP
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ 2²⁹ C₀⁺ B₁ C₀⁻
+                    OP_ADD
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ 2²⁹ C₀⁺ B₁+C₀⁻
+                    OP_2SWAP
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₀⁺ B₁+C₀⁻ A₁ 2²⁹
+                    OP_TOALTSTACK OP_SWAP OP_FROMALTSTACK
+                    limb_sub_borrow
+                    OP_DUP
+                    OP_TOALTSTACK
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₀⁺ 2²⁹ C₁⁻ A₁-(B₁+C₀) | A₁-(B₁+C₀)
+                    OP_2SWAP
+                    OP_SWAP
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁻ A₁-(B₁+C₀) 2²⁹ C₀⁺
+                    { Self::MODULUS_LIMBS[i as usize] }
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁻ A₁-(B₁+C₀) 2²⁹ C₀⁺ M₁
+                    OP_ADD
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁻ A₁-(B₁+C₀) 2²⁹ C₀⁺+M₁
+                    OP_SWAP
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁻ A₁-(B₁+C₀) C₀⁺+M₁ 2²⁹
+                    limb_add_carry
+                    OP_TOALTSTACK
+                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁻ 2²⁹ C₁⁺ | (A₁-(B₁+C₀))+(C₀⁺+M₁)
+                }
+                // ⋯ A₈ B₈ C₇⁻ 2²⁹ C₇⁺
+                OP_2SWAP
+                OP_ADD
+                // ⋯ A₈ 2²⁹ C₇⁺ B₈+C₇⁻
+                OP_2SWAP
+                // ⋯ C₇⁺ B₈+C₇⁻ A₈ 2²⁹
+                OP_TOALTSTACK OP_SWAP OP_FROMALTSTACK
+                // ⋯ C₇⁺ A₈ B₈+C₇⁻ 2²⁹
+                limb_sub_borrow
+                // ⋯ C₇⁺ 2²⁹ C₈⁻ A₈-(B₈+C₇⁻)
+                OP_DUP
+                OP_TOALTSTACK
+                // ⋯ C₇⁺ 2²⁹ C₈⁻ A₈-(B₈+C₇⁻) | A₈-(B₈+C₇⁻)
+                OP_ROT OP_TOALTSTACK
+                // ⋯ C₇⁺ C₈⁻ A₈-(B₈+C₇⁻) | 2²⁹ A₈-(B₈+C₇⁻)
+                OP_ROT { *Self::MODULUS_LIMBS.last().unwrap() }
+                // ⋯ C₈⁻ (A₈-(B₈+C₇⁻)) C₇⁺ M₈
+                OP_ADD OP_ADD
+                // ⋯ C₈⁻ (A₈-(B₈+C₇⁻))+(C₇⁺+M₈)
+                OP_FROMALTSTACK OP_2DUP OP_GREATERTHANOREQUAL
+                OP_IF OP_SUB OP_ELSE OP_DROP OP_ENDIF
+                OP_TOALTSTACK
+                // ⋯ C₈⁻ | (A₈-(B₈+C₇⁻))+(C₇⁺+M)₈ A₈-(B₈+C₇⁻)
+                OP_DUP
+                // ⋯ C₈⁻ C₈⁻
+                OP_NOTIF
+                    OP_FROMALTSTACK
+                    OP_DROP
+                OP_ENDIF
+
+                OP_FROMALTSTACK
+                // ⋯ C₈⁻ A₈-(B₈+C₇⁻) | (A₇-(B₇+C₆⁻))+(C₆⁺+M₇)
+                // ⋯ C₈⁻ (A₈-(B₈+C₇⁻))+(C₇⁺+M₈) | (B₈+C₇⁻)+A₈
+                for _ in 0..Self::N_LIMBS-1 {
+                    OP_FROMALTSTACK  OP_DROP
+                    OP_FROMALTSTACK
+                }
+                // ⋯ C₈⁻ A₈-(B₈+C₇⁻) A₇-(B₇+C₆⁻) ... A₂-(B₂+C₁⁻) A₁-(B₁+C₀⁻) A₀+B₀
+                // ⋯ C₈⁻ (A₈-(B₈+C₇⁻))+(C₇⁺+M₈) ... (A₀+B₀)-M₀ | A₀+B₀
+                { Self::N_LIMBS }
+                OP_ROLL
+                OP_IF
+                    OP_FROMALTSTACK
+                    OP_DROP
+                OP_ENDIF
+                // ⋯ A₈-(B₈+C₇⁻) A₇-(B₇+C₆⁻) ... A₁-(B₁+C₀⁻) A₀+B₀
+                // ⋯ (A₈-(B₈+C₇⁻))+(C₇⁺+M₈) ... (A₀-B₀)+M₀
+            }
+        });
+        script! {
+            { Self::zip(a, b) }
+            { sub_script.clone() }
+        }
+    }
+
+    fn double(a: u32) -> Script {
+        script! {
+            { Self::roll(a) }
+            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀
+            OP_DUP
+            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ A₀
+            { 0x20000000 }
+            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ A₀ 2²⁹
+
+            // A₀ + A₀
+            limb_add_carry
+            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ 2²⁹ C₀⁺ 2⋅A₀
+            OP_DUP
+            OP_TOALTSTACK
+            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ 2²⁹ C₀⁺ 2⋅A₀ | 2⋅A₀
+            OP_ROT
+            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ C₀⁺ 2⋅A₀ 2²⁹
+            { Self::MODULUS_LIMBS[0] }
+            OP_SWAP
+            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ C₀⁺ 2⋅A₀ M₀ 2²⁹
+            limb_sub_borrow
+            OP_TOALTSTACK
+            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ C₀⁺ 2²⁹ C₀⁻ | 2⋅A₀-M₀
+
+            // from     A₁      + A₁        + carry_0
+            //   to     A{N-2}  + A{N-2}    + carry_{N-3}
+            for i in 1..Self::N_LIMBS-1 {
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ C₀⁺ 2²⁹ C₀⁻
+                OP_SWAP OP_2SWAP
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₀⁻ 2²⁹ A₁ C₀⁺
+                OP_OVER OP_ADD
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₀⁻ 2²⁹ A₁ A₁+C₀⁺
+                OP_ROT
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₀⁻ A₁ A₁+C₀⁺ 2²⁹
+                limb_add_carry
+                OP_DUP
+                OP_TOALTSTACK
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₀⁻ 2²⁹ C₁⁺ 2⋅A₁+C₀⁺ | 2⋅A₁+C₀⁺
+                OP_ROT OP_TOALTSTACK OP_ROT
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₁⁺ 2⋅A₁+C₀⁺ C₀⁻ | 2²⁹
+                { Self::MODULUS_LIMBS[i as usize] }
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₁⁺ 2⋅A₁+C₀⁺ C₀⁻ M₁
+                OP_ADD
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₁⁺ 2⋅A₁+C₀⁺ C₀⁻+M₁
+                OP_FROMALTSTACK
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₁⁺ 2⋅A₁+C₀⁺ C₀⁻+M₁ 2²⁹
+                limb_sub_borrow
+                OP_TOALTSTACK
+                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₁⁺ 2²⁹ C₁⁻ | (2⋅A₁+C₀⁺)-(C₀⁻+M₁)
+            }
+            // ⋯ A₈ C₇⁺ 2²⁹ C₇⁻
+            OP_2SWAP
+            // ⋯ 2²⁹ C₇⁻ A₈ C₇⁺
+            OP_OVER OP_ADD
+            // ⋯ 2²⁹ C₇⁻ A₈ A₈+C₇⁺
+            OP_ADD
+            // ⋯ 2²⁹ C₇⁻ 2⋅A₈+C₇⁺
+            OP_DUP OP_TOALTSTACK
+            // ⋯ 2²⁹ C₇⁻ 2⋅A₈+C₇⁺ | 2⋅A₈+C₇⁺
+            OP_SWAP
+            // ⋯ 2²⁹ 2⋅A₈+C₇⁺ C₇⁻
+            { *Self::MODULUS_LIMBS.last().unwrap() }
+            // ⋯ 2²⁹ 2⋅A₈+C₇⁺ C₇⁻ M₈
+            OP_ADD
+            OP_ROT
+            // ⋯ 2⋅A₈+C₇⁺ C₇⁻+M₈ 2²⁹
+            limb_sub_borrow
+            OP_TOALTSTACK
+            // ⋯ 2²⁹ C₈⁻ | (2⋅A₈+C₇⁺)-(C₇⁻+M₈)
+            OP_NIP
+            OP_DUP
+            // ⋯ C₈⁻ C₈⁻
+            OP_IF
+                OP_FROMALTSTACK
+                OP_DROP
+            OP_ENDIF
+
+            OP_FROMALTSTACK
+            // ⋯ 2⋅A₈+C₇⁺ C₈⁻ | (2⋅A₇+C₆⁺)-(C₆⁻+M₇)
+            // ⋯ (2⋅A₈+C₇⁺)-(C₇⁻+M₈) C₈⁻ | 2⋅A₈+C₇⁺
+            for _ in 0..Self::N_LIMBS-1 {
+                OP_FROMALTSTACK  OP_DROP
+                OP_FROMALTSTACK
+            }
+            // ⋯ 2⋅A₈+C₇⁺ 2⋅A₇+C₆⁺ ... 2⋅A₂+C₁⁺ 2⋅A₁+C₀⁺ 2⋅A₀ C₈⁻
+            // ⋯ (2⋅A₈+C₇⁺)-(C₇⁻+M₈) ... 2⋅A₀-M₀ C₈⁻ | 2⋅A₀
+            { Self::N_LIMBS }
+            OP_ROLL
+            OP_NOTIF
+                OP_FROMALTSTACK
+                OP_DROP
+            OP_ENDIF
+            // ⋯ 2⋅A₈+C₇⁺ 2⋅A₇+C₆⁺ ... 2⋅A₁+C₀⁺ 2⋅A₀
+            // ⋯ (2⋅A₈+C₇⁺)-(C₇⁻+M₈) ... 2⋅A₀-M₀
+        }
+    }
+
+    fn div2() -> Script {
+        script! {
+            { U254::div2rem() }
+            OP_IF
+                { U254::push_hex(Self::P_PLUS_ONE_DIV2) }
+                { Self::add(1, 0) }
+            OP_ENDIF
+        }
+    }
+
+    fn div3() -> Script {
+        script! {
+            { U254::div3rem() }
+            OP_DUP
+            0 OP_GREATERTHAN
+            OP_IF
+                OP_1SUB
+                OP_IF
+                    { U254::push_hex(Self::P_PLUS_TWO_DIV3) }
+                    { Self::add(1, 0) }
+                OP_ELSE
+                    { U254::push_hex(Self::TWO_P_PLUS_ONE_DIV3) }
+                    { Self::add(1, 0) }
+                OP_ENDIF
+            OP_ELSE
+                OP_DROP
+            OP_ENDIF
+        }
+    }
+
+    fn hinted_mul(
+        mut a_depth: u32,
+        mut a: ark_bn254::Fq,
+        mut b_depth: u32,
+        mut b: ark_bn254::Fq,
+    ) -> (Script, Vec<Hint>) {
+        assert_ne!(a_depth, b_depth);
+        if a_depth > b_depth {
+            (a_depth, b_depth) = (b_depth, a_depth);
+            (a, b) = (b, a);
+        }
+
+        let mut hints = Vec::new();
+        let x = BigInt::from_str(&a.to_string()).unwrap();
+        let y = BigInt::from_str(&b.to_string()).unwrap();
+        let modulus = &Fq::modulus_as_bigint();
+        let q = (x * y) / modulus;
+
+        let script = script! {
+            for _ in 0..Self::N_LIMBS {
+                OP_DEPTH OP_1SUB OP_ROLL // hints
+            }
+            // { Fq::push(ark_bn254::Fq::from_str(&q.to_string()).unwrap()) }
+            { Fq::roll(a_depth + 1) }
+            { Fq::roll(b_depth + 1) }
+            { Fq::tmul() }
+        };
+        hints.push(Hint::BigIntegerTmulLC1(q));
+
+        (script, hints)
+    }
+
+    // TODO: Optimize by using the constant feature
+    fn hinted_mul_by_constant(a: ark_bn254::Fq, constant: &ark_bn254::Fq) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+        let x = BigInt::from_str(&a.to_string()).unwrap();
+        let y = BigInt::from_str(&constant.to_string()).unwrap();
+        let modulus = &Fq::modulus_as_bigint();
+        let q = (x * y) / modulus;
+
+        let script = script! {
+            for _ in 0..Self::N_LIMBS {
+                OP_DEPTH OP_1SUB OP_ROLL // hints
+            }
+            // { Fq::push(ark_bn254::Fq::from_str(&q.to_string()).unwrap()) }
+            { Fq::roll(1) }
+            { Fq::push(*constant) }
+            { Fq::tmul() }
+        };
+        hints.push(Hint::BigIntegerTmulLC1(q));
+
+        (script, hints)
+    }
+
+    fn hinted_mul_keep_element(
+        mut a_depth: u32,
+        mut a: ark_bn254::Fq,
+        mut b_depth: u32,
+        mut b: ark_bn254::Fq,
+    ) -> (Script, Vec<Hint>) {
+        assert_ne!(a_depth, b_depth);
+        if a_depth > b_depth {
+            (a_depth, b_depth) = (b_depth, a_depth);
+            (a, b) = (b, a);
+        }
+
+        let mut hints = Vec::new();
+        let x = BigInt::from_str(&a.to_string()).unwrap();
+        let y = BigInt::from_str(&b.to_string()).unwrap();
+        let modulus = &Fq::modulus_as_bigint();
+        let q = (x * y) / modulus;
+
+        let script = script! {
+            for _ in 0..Self::N_LIMBS {
+                OP_DEPTH OP_1SUB OP_ROLL // hints
+            }
+            // { Fq::push(ark_bn254::Fq::from_str(&q.to_string()).unwrap()) }
+            { Fq::copy(a_depth + 1) }
+            { Fq::copy(b_depth + 2) }
+            { Fq::tmul() }
+        };
+        hints.push(Hint::BigIntegerTmulLC1(q));
+
+        (script, hints)
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn hinted_mul_lc2(
+        a_depth: u32,
+        a: ark_bn254::Fq,
+        b_depth: u32,
+        b: ark_bn254::Fq,
+        c_depth: u32,
+        c: ark_bn254::Fq,
+        d_depth: u32,
+        d: ark_bn254::Fq,
+    ) -> (Script, Vec<Hint>) {
+        assert!(a_depth > b_depth && b_depth > c_depth && c_depth > d_depth);
+
+        let mut hints = Vec::new();
+
+        let modulus = &Fq::modulus_as_bigint();
+
+        let x = BigInt::from_str(&a.to_string()).unwrap();
+        let y = BigInt::from_str(&b.to_string()).unwrap();
+        let z = BigInt::from_str(&c.to_string()).unwrap();
+        let w = BigInt::from_str(&d.to_string()).unwrap();
+
+        let q = (x * z + y * w) / modulus;
+
+        let script = script! {
+            for _ in 0..Self::N_LIMBS {
+                OP_DEPTH OP_1SUB OP_ROLL // hints
+            }
+            // { Fq::push(ark_bn254::Fq::from_str(&q.to_string()).unwrap()) }
+            { Fq::roll(a_depth + 1) }
+            { Fq::roll(b_depth + 2) }
+            { Fq::roll(c_depth + 3) }
+            { Fq::roll(d_depth + 4) }
+            { Fq::tmul_lc2() }
+        };
+        hints.push(Hint::BigIntegerTmulLC2(q));
+
+        (script, hints)
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn hinted_mul_lc4(
+        a_depth: u32,
+        a: ark_bn254::Fq,
+        b_depth: u32,
+        b: ark_bn254::Fq,
+        c_depth: u32,
+        c: ark_bn254::Fq,
+        d_depth: u32,
+        d: ark_bn254::Fq,
+
+        e_depth: u32,
+        e: ark_bn254::Fq,
+        f_depth: u32,
+        f: ark_bn254::Fq,
+        g_depth: u32,
+        g: ark_bn254::Fq,
+        h_depth: u32,
+        h: ark_bn254::Fq,
+    ) -> (Script, Vec<Hint>) {
+        assert!(a_depth > b_depth && b_depth > c_depth && c_depth > d_depth && d_depth > e_depth && e_depth > f_depth && f_depth > g_depth && g_depth > h_depth);
+
+        let mut hints = Vec::new();
+
+        let modulus = &Fq::modulus_as_bigint();
+
+        let x1 = BigInt::from_str(&a.to_string()).unwrap();
+        let y1 = BigInt::from_str(&b.to_string()).unwrap();
+        let z1 = BigInt::from_str(&c.to_string()).unwrap();
+        let w1 = BigInt::from_str(&d.to_string()).unwrap();
+
+        let x2 = BigInt::from_str(&e.to_string()).unwrap();
+        let y2 = BigInt::from_str(&f.to_string()).unwrap();
+        let z2 = BigInt::from_str(&g.to_string()).unwrap();
+        let w2 = BigInt::from_str(&h.to_string()).unwrap();
+
+        let q = (x1 * x2 + y1 * y2 + z1 * z2 + w1 * w2) / modulus;
+
+        let script = script! {
+            for _ in 0..Self::N_LIMBS {
+                OP_DEPTH OP_1SUB OP_ROLL // hints
+            }
+            // { fq_push(ark_bn254::Fq::from_str(&q.to_string()).unwrap()) }
+            { Fq::roll(a_depth + 1) }
+            { Fq::roll(b_depth + 2) }
+            { Fq::roll(c_depth + 3) }
+            { Fq::roll(d_depth + 4) }
+            { Fq::roll(e_depth + 5) }
+            { Fq::roll(f_depth + 6) }
+            { Fq::roll(g_depth + 7) }
+            { Fq::roll(h_depth + 8) }
+            { Fq::tmul_lc4() }
+        };
+        hints.push(Hint::BigIntegerTmulLC4(q));
+
+        (script, hints)
+    }
+    
+    #[allow(clippy::too_many_arguments)]
+    fn hinted_mul_lc2_keep_elements(
+        a_depth: u32,
+        a: ark_bn254::Fq,
+        b_depth: u32,
+        b: ark_bn254::Fq,
+        c_depth: u32,
+        c: ark_bn254::Fq,
+        d_depth: u32,
+        d: ark_bn254::Fq,
+    ) -> (Script, Vec<Hint>) {
+        assert!(a_depth > b_depth && b_depth > c_depth && c_depth > d_depth);
+
+        let mut hints = Vec::new();
+
+        let modulus = &Fq::modulus_as_bigint();
+
+        let x = BigInt::from_str(&a.to_string()).unwrap();
+        let y = BigInt::from_str(&b.to_string()).unwrap();
+        let z = BigInt::from_str(&c.to_string()).unwrap();
+        let w = BigInt::from_str(&d.to_string()).unwrap();
+
+        let q = (x * z + y * w) / modulus;
+
+        let script = script! {
+            for _ in 0..Self::N_LIMBS {
+                OP_DEPTH OP_1SUB OP_ROLL // hints
+            }
+            // { Fq::push(ark_bn254::Fq::from_str(&q.to_string()).unwrap()) }
+            { Fq::copy(a_depth + 1) }
+            { Fq::copy(b_depth + 2) }
+            { Fq::copy(c_depth + 3) }
+            { Fq::copy(d_depth + 4) }
+            { Fq::tmul_lc2() }
+        };
+        hints.push(Hint::BigIntegerTmulLC2(q));
+
+        (script, hints)
+    }
+
+    // TODO: Optimize using the sqaure feature
+    fn hinted_square(a: ark_bn254::Fq) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+        let x = &BigInt::from_str(&a.to_string()).unwrap();
+        let modulus = &Fq::modulus_as_bigint();
+        let q = (x * x) / modulus;
+        let script = script! {
+            for _ in 0..Self::N_LIMBS {
+                OP_DEPTH OP_1SUB OP_ROLL // hints
+            }
+            // { Fq::push(ark_bn254::Fq::from_str(&q.to_string()).unwrap()) }
+            { Fq::roll(1) }
+            { Fq::copy(0) }
+            { Fq::tmul() }
+        };
+        hints.push(Hint::BigIntegerTmulLC1(q));
+
+        (script, hints)
+    }
+
+    fn hinted_inv(a: ark_bn254::Fq) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+        let x = &BigInt::from_str(&a.to_string()).unwrap();
+        let modulus = &Fq::modulus_as_bigint();
+        let y = &x.modinv(modulus).unwrap();
+        let q = (x * y) / modulus;
+        let script = script! {
+            for _ in 0..Self::N_LIMBS {
+                OP_DEPTH OP_1SUB OP_ROLL // hints
+            }
+            for _ in 0..Self::N_LIMBS {
+                OP_DEPTH OP_1SUB OP_ROLL // hints
+            }
+            // { Fq::push(ark_bn254::Fq::from_str(&y.to_string()).unwrap()) }
+            // { Fq::push(ark_bn254::Fq::from_str(&q.to_string()).unwrap()) }
+            // x, y, q
+            { Fq::roll(2) }
+            { Fq::copy(2) }
+            // y, q, x, y
+            { Fq::tmul() }
+            // y, 1
+            { Fq::push_one() }
+            { Fq::equalverify(1, 0) }
+        };
+        hints.push(Hint::Fq(ark_bn254::Fq::from_str(&y.to_string()).unwrap()));
+        hints.push(Hint::BigIntegerTmulLC1(q));
+
+        (script, hints)
+    }
+}
diff --git a/src/bn254/fq.rs b/bitvm/src/bn254/fq.rs
similarity index 66%
rename from src/bn254/fq.rs
rename to bitvm/src/bn254/fq.rs
index 931b6b73d..eb4a31ed0 100644
--- a/src/bn254/fq.rs
+++ b/bitvm/src/bn254/fq.rs
@@ -1,4 +1,5 @@
-use num_bigint::BigInt;
+#![allow(clippy::reversed_empty_ranges)]
+use num_bigint::{BigInt, BigUint};
 use num_traits::{FromPrimitive, Num, ToPrimitive};
 
 use crate::bigint::BigIntImpl;
@@ -12,18 +13,10 @@ impl Fp254Impl for Fq {
     const MODULUS: &'static str =
         "30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47";
 
-    // 2²⁶¹ mod p  <=>  0xdc83629563d44755301fa84819caa36fb90a6020ce148c34e8384eb157ccc21
-    const MONTGOMERY_ONE: &'static str =
-        "dc83629563d44755301fa84819caa36fb90a6020ce148c34e8384eb157ccc21";
-
     // p = 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47
     const MODULUS_LIMBS: [u32; Self::N_LIMBS as usize] = [
-        0x187cfd47, 0x10460b6, 0x1c72a34f, 0x2d522d0, 0x1585d978, 0x2db40c0, 0xa6e141, 0xe5c2634, 0x30644e
-    ];
-
-    // inv₂₆₁ p  <=>  0x100a85dd486e7773942750342fe7cc257f6121829ae1359536782df87d1b799c77
-    const MODULUS_INV_261: [u32; Self::N_LIMBS as usize] = [
-        0x1B799C77, 0x16FC3E8, 0xD654D9E, 0x30535C2, 0x257F612, 0x1A17F3E6, 0xE509D40, 0x90DCEEE, 0x100A85DD
+        0x187cfd47, 0x10460b6, 0x1c72a34f, 0x2d522d0, 0x1585d978, 0x2db40c0, 0xa6e141, 0xe5c2634,
+        0x30644e,
     ];
 
     const P_PLUS_ONE_DIV2: &'static str =
@@ -35,21 +28,79 @@ impl Fp254Impl for Fq {
     const P_PLUS_TWO_DIV3: &'static str =
         "10216f7ba065e00de81ac1e7808072c9dd2b2385cd7b438469602eb24829a9c3";
     type ConstantType = ark_bn254::Fq;
-
 }
 
-
 impl Fq {
-    fn modulus_as_bigint() -> BigInt {
+    pub fn modulus_as_bigint() -> BigInt {
         BigInt::from_str_radix(Self::MODULUS, 16).unwrap()
     }
+
+    pub fn tmul() -> Script {
+        script! {
+            { <Fq as Fp254Mul>::tmul() }
+        }
+    }
+
+    pub fn tmul_lc2() -> Script {
+        script! {
+            { <Fq as Fp254Mul2LC>::tmul() }
+        }
+    }
+
+    pub fn tmul_lc4() -> Script {
+        script!{ 
+            { <Fq as Fp254Mul4LC>::tmul() }
+        }
+    }
+
+    pub const fn bigint_tmul_lc_1() -> (u32, u32) {
+        const X: u32 = <Fq as Fp254Mul>::T::N_BITS;
+        const Y: u32 = <Fq as Fp254Mul>::LIMB_SIZE;
+        (X, Y)
+    }
+
+    pub const fn bigint_tmul_lc_2() -> (u32, u32) {
+        const X: u32 = <Fq as Fp254Mul2LC>::T::N_BITS;
+        const Y: u32 = <Fq as Fp254Mul2LC>::LIMB_SIZE;
+        (X, Y)
+    }
+
+    pub const fn bigint_tmul_lc_4() -> (u32, u32) {
+        const X: u32 = <Fq as Fp254Mul4LC>::T::N_BITS;
+        const Y: u32 = <Fq as Fp254Mul4LC>::LIMB_SIZE;
+        (X, Y)
+    }
+    
+    #[inline]
+    pub fn push(a: ark_bn254::Fq) -> Script {
+        script! {
+            { Fq::push_u32_le(&BigUint::from(a).to_u32_digits()) }
+        }
+    }
+}
+
+pub fn bigint_to_u32_limbs(n: BigInt, n_bits: u32) -> Vec<u32> {
+    const LIMB_SIZE: u64 = 32;
+    let mut limbs = vec![];
+    let mut limb: u32 = 0;
+    for i in 0..n_bits as u64 {
+        if i > 0 && i % LIMB_SIZE == 0 {
+            limbs.push(limb);
+            limb = 0;
+        }
+        if n.bit(i) {
+            limb += 1 << (i % LIMB_SIZE);
+        }
+    }
+    limbs.push(limb);
+    limbs
 }
 
 macro_rules! fp_lc_mul {
     ($NAME:ident, $MOD_WIDTH:literal, $VAR_WIDTH:literal, $LCS:expr) => {
         paste::paste! {
             trait [<Fp254 $NAME>] {
-                const LIMB_SIZE: u32 = 30;
+                const LIMB_SIZE: u32 = 29;
                 const LCS: [bool; $LCS.len()] = $LCS;
                 const LC_BITS: u32 = usize::BITS - $LCS.len().leading_zeros() - 1;
                 type U;
@@ -58,6 +109,7 @@ macro_rules! fp_lc_mul {
             }
 
             impl [<Fp254 $NAME>] for Fq {
+
                 type U = BigIntImpl<{ Self::N_BITS }, { <Self as [<Fp254 $NAME>]>::LIMB_SIZE }>;
                 type T = BigIntImpl<{ Self::N_BITS + $VAR_WIDTH + <Self as [<Fp254 $NAME>]>::LC_BITS + 1 }, { <Self as [<Fp254 $NAME>]>::LIMB_SIZE }>;
 
@@ -68,6 +120,8 @@ macro_rules! fp_lc_mul {
                     const MOD_WIDTH: u32 = $MOD_WIDTH;
                     const VAR_WIDTH: u32 = $VAR_WIDTH;
 
+                    assert_eq!(MOD_WIDTH, VAR_WIDTH);
+
                     let lc_signs = <Fq as [<Fp254 $NAME>]>::LCS;
 
                     type U = <Fq as [<Fp254 $NAME>]>::U;
@@ -75,8 +129,8 @@ macro_rules! fp_lc_mul {
 
                     // N_BITS for the extended number used during intermediate computation
                     const MAIN_LOOP_END: u32 = {
-                        let n_bits_mod_width = ((N_BITS + MOD_WIDTH - 1) / MOD_WIDTH) * MOD_WIDTH;
-                        let n_bits_var_width = ((N_BITS + VAR_WIDTH - 1) / VAR_WIDTH) * VAR_WIDTH;
+                        let n_bits_mod_width = N_BITS.div_ceil(MOD_WIDTH) * MOD_WIDTH;
+                        let n_bits_var_width = N_BITS.div_ceil(VAR_WIDTH) * VAR_WIDTH;
                         let mut u = n_bits_mod_width;
                         if n_bits_var_width > u {
                             u = n_bits_var_width;
@@ -96,7 +150,8 @@ macro_rules! fp_lc_mul {
                         }
                     };
 
-                    const N_WINDOW: u32 = MAIN_LOOP_END / VAR_WIDTH;
+                    const N_VAR_WINDOW: u32 = MAIN_LOOP_END / VAR_WIDTH;
+                    const N_MOD_WINDOW: u32 = MAIN_LOOP_END / MOD_WIDTH;
 
                     // Pre-computed lookup table's size
                     fn size_table(window: u32) -> u32 { (1 << window) - 1 }
@@ -104,7 +159,7 @@ macro_rules! fp_lc_mul {
                     // Initialize the lookup table
                     fn init_table(window: u32) -> Script {
                         assert!(
-                            1 <= window && window <= 6,
+                            (1..=6).contains(&window),
                             "expected 1<=window<=6; got window={}",
                             window
                         );
@@ -112,11 +167,9 @@ macro_rules! fp_lc_mul {
                             for i in 2..=window {
                                 for j in 1 << (i - 1)..1 << i {
                                     if j % 2 == 0 {
-                                        { T::copy(j/2 - 1) }
-                                        { T::double_allow_overflow() }
+                                        { T::double_allow_overflow_keep_element( (j/2 - 1) * T::N_LIMBS ) }
                                     } else {
-                                        { T::copy(0) }
-                                        { T::add_ref(j - 1) }
+                                        { T::add_ref_with_top(j - 2) }
                                     }
                                 }
                             }
@@ -134,7 +187,7 @@ macro_rules! fp_lc_mul {
 
                     // Get modulus window at given index
                     fn mod_window(index: u32) -> u32 {
-                        let shift_by = MOD_WIDTH * (N_WINDOW - index - 1);
+                        let shift_by = MOD_WIDTH * (N_MOD_WINDOW - index - 1);
                         let bit_mask = BigInt::from_i32((1 << MOD_WIDTH) - 1).unwrap() << shift_by;
                         ((Fq::modulus_as_bigint() & bit_mask) >> shift_by).to_u32().unwrap()
                     }
@@ -142,7 +195,7 @@ macro_rules! fp_lc_mul {
                     // Get var windows at given index
                     fn var_windows_script(index: u32) -> Script {
                         let stack_top = T::N_LIMBS;
-                        let iter = N_WINDOW - index;
+                        let iter = N_VAR_WINDOW - index;
 
                         let s_bit = iter * VAR_WIDTH - 1; // start bit
                         let e_bit = (iter - 1) * VAR_WIDTH; // end bit
@@ -150,44 +203,82 @@ macro_rules! fp_lc_mul {
                         let s_limb = s_bit / LIMB_SIZE; // start bit limb
                         let e_limb = e_bit / LIMB_SIZE; // end bit limb
 
+                        let mut st = 0;
+                        if (e_bit % LIMB_SIZE == 0) || (s_limb > e_limb) {
+                            st = (s_bit % LIMB_SIZE) + 1;
+                        }
+
                         script! {
                             for j in 0..N_LC {
-                                { 0 }
-                                if iter == N_WINDOW { // initialize accumulator to track reduced limb
-
-                                    { stack_top + T::N_LIMBS * j + s_limb + 1 } OP_PICK
+                                if iter == N_VAR_WINDOW { // initialize accumulator to track reduced limb
+                                    { stack_top + T::N_LIMBS * j + s_limb } OP_PICK
 
                                 } else if (s_bit + 1) % LIMB_SIZE == 0  { // drop current and initialize next accumulator
                                     OP_FROMALTSTACK OP_DROP
-                                    { stack_top + T::N_LIMBS * j   + s_limb + 1 } OP_PICK
+                                    { stack_top + T::N_LIMBS * j   + s_limb } OP_PICK
 
                                 } else {
                                     OP_FROMALTSTACK // load accumulator from altstack
                                 }
 
-                                for i in 0..VAR_WIDTH {
+                                if (e_bit % LIMB_SIZE == 0) || (s_limb > e_limb) {
+                                    if s_limb > e_limb {
+                                        { NMUL(2) }
+                                    } else {
+                                        0
+                                    }
+                                }
+                                for i in st..VAR_WIDTH {
                                     if s_limb > e_limb {
                                         if i % LIMB_SIZE == (s_bit % LIMB_SIZE) + 1 {
                                             // window is split between multiple limbs
-                                            OP_DROP
                                             { stack_top + T::N_LIMBS * j + e_limb + 1 } OP_PICK
                                         }
                                     }
-                                    OP_TUCK
-                                    { (1 << ((s_bit - i) % LIMB_SIZE)) - 1 }
-                                    OP_GREATERTHAN
-                                    OP_TUCK
-                                    OP_ADD
-                                    if i < VAR_WIDTH - 1 { { NMUL(2) } }
-                                    OP_ROT OP_ROT
-                                    OP_IF
+                                    if ( i == 0){
                                         { 1 << ((s_bit - i) % LIMB_SIZE) }
-                                        OP_SUB
-                                    OP_ENDIF
+                                        OP_2DUP
+                                        OP_GREATERTHANOREQUAL
+                                        OP_IF
+                                            OP_SUB
+                                            2
+                                        OP_ELSE
+                                            OP_DROP
+                                            0
+                                        OP_ENDIF
+                                        OP_SWAP
+                                    } else{
+                                        if (s_bit - i) % LIMB_SIZE > 7 {
+                                            { 1 << ((s_bit - i) % LIMB_SIZE) }
+                                            OP_2DUP
+                                            OP_GREATERTHANOREQUAL
+                                            OP_IF
+                                                OP_SUB
+                                                OP_SWAP OP_1ADD
+                                            OP_ELSE
+                                                OP_DROP
+                                                OP_SWAP
+                                            OP_ENDIF
+                                            if i < VAR_WIDTH - 1 { { NMUL(2) } }
+                                            OP_SWAP
+                                        } else {
+                                            OP_TUCK
+                                            { (1 << ((s_bit - i) % LIMB_SIZE)) - 1 }
+                                            OP_GREATERTHAN
+                                            OP_TUCK
+                                            OP_ADD
+                                            if i < VAR_WIDTH - 1 { { NMUL(2) } }
+                                            OP_ROT OP_ROT
+                                            OP_IF
+                                                { 1 << ((s_bit - i) % LIMB_SIZE) }
+                                                OP_SUB
+                                            OP_ENDIF
+                                        }
+                                    }
                                 }
 
                                 if j+1 < N_LC {
-                                    if iter == N_WINDOW {
+                                    if iter == N_VAR_WINDOW {
                                         OP_TOALTSTACK
                                         OP_TOALTSTACK
                                     } else {
@@ -243,11 +334,6 @@ macro_rules! fp_lc_mul {
 
                         // Main loop
                         for i in MAIN_LOOP_START..=MAIN_LOOP_END {
-                            // z -= q*p[i]
-                            if i % MOD_WIDTH == 0 && mod_window(i/MOD_WIDTH - 1) != 0  {
-                                { T::add_ref(1 + N_LC + size_table(MOD_WIDTH) +
-                                    N_LC * size_table(VAR_WIDTH) - mod_window(i/MOD_WIDTH - 1)) }
-                            }
                             // z += x*y[i]
                             if i % VAR_WIDTH == 0 {
                                 { var_windows_script(i/VAR_WIDTH - 1) }
@@ -261,10 +347,28 @@ macro_rules! fp_lc_mul {
                                         { 1 + N_LC + (N_LC - j) * size_table(VAR_WIDTH)  }
                                         OP_SWAP
                                         OP_SUB
-                                        { T::add_ref_stack() }
+                                        if i + j == MAIN_LOOP_START && j == 0 {
+                                            for _ in 0..Self::N_LIMBS {
+                                                OP_NIP
+                                            }
+                                            { NMUL(Self::N_LIMBS) }
+                                            OP_DUP OP_PICK
+                                            for _ in 0..Self::N_LIMBS-1 {
+                                                OP_SWAP
+                                                OP_DUP OP_PICK
+                                            }
+                                            OP_NIP
+                                        } else {
+                                            { T::add_ref_stack() }
+                                        }
                                     OP_ENDIF
                                 }
                             }
+                            // z -= q*p[i]
+                            if i % MOD_WIDTH == 0 && mod_window(i/MOD_WIDTH - 1) != 0  {
+                                { T::add_ref(1 + N_LC + size_table(MOD_WIDTH) +
+                                    N_LC * size_table(VAR_WIDTH) - mod_window(i/MOD_WIDTH - 1)) }
+                            }
                             if i < MAIN_LOOP_END {
                                 if MOD_WIDTH == VAR_WIDTH {
                                     if i % VAR_WIDTH == 0 {
@@ -304,37 +408,46 @@ macro_rules! fp_lc_mul {
 
 fp_lc_mul!(Mul, 4, 4, [true]);
 fp_lc_mul!(Mul2LC, 3, 3, [true, true]);
+fp_lc_mul!(Mul4LC, 3, 3, [true, true, true, true]);
 
 #[cfg(test)]
 mod test {
+    use crate::{bn254::fp254impl::Fp254Impl, ExecuteInfo};
     use crate::bn254::fq::Fq;
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bigint::U254;
     use crate::treepp::*;
-    use ark_ff::{BigInteger, Field, PrimeField};
+    use ark_ff::Field;
     use ark_std::UniformRand;
-
+    use ark_ff::AdditiveGroup;
     use core::ops::{Add, Mul, Rem, Sub};
     use num_bigint::{BigInt, BigUint, RandBigInt, RandomBits};
     use num_traits::{Num, Signed};
     use rand::{Rng, SeedableRng};
     use rand_chacha::ChaCha20Rng;
-    use ark_ff::AdditiveGroup;
-
     use super::*;
 
+    fn extract_witness_from_stack(res: ExecuteInfo) -> Vec<Vec<u8>> {
+        res.final_stack.0.iter_str().fold(vec![], |mut vector, x| {
+            vector.push(x);
+            vector
+        })
+    }
+
     #[test]
-    fn test_decode_montgomery() {
-        println!("Fq.decode_montgomery: {} bytes", Fq::decode_montgomery().len());
+    fn test_read_from_stack() {
+        let _m = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap();
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let a: BigUint = prng.sample(RandomBits::new(254));
+
         let script = script! {
-            { Fq::push_one() }
-            { Fq::push_u32_le(&BigUint::from_str_radix(Fq::MONTGOMERY_ONE, 16).unwrap().to_u32_digits()) }
-            { Fq::decode_montgomery() }
-            { Fq::equalverify(1, 0) }
-            OP_TRUE
+            { Fq::push_u32_le(&a.to_u32_digits()) }
         };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
+
+        let res = execute_script(script);
+        let witness = extract_witness_from_stack(res);
+
+        let u32s = Fq::read_u32_le(witness);
+        let read_a = BigUint::from_slice(&u32s);
+        assert_eq!(read_a, a);
     }
 
     #[test]
@@ -361,8 +474,7 @@ mod test {
                 { Fq::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -390,8 +502,7 @@ mod test {
                 { Fq::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -413,165 +524,7 @@ mod test {
                 { Fq::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_mul() {
-        println!("Fq.mul: {} bytes", Fq::mul().len());
-        let m = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap();
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        for _ in 0..3 {
-            let a: BigUint = prng.sample(RandomBits::new(254));
-            let b: BigUint = prng.sample(RandomBits::new(254));
-
-            let a = a.rem(&m);
-            let b = b.rem(&m);
-            let c: BigUint = a.clone().mul(b.clone()).rem(&m);
-
-            let script = script! {
-                { Fq::push_u32_le(&a.to_u32_digits()) }
-                { Fq::push_u32_le(&b.to_u32_digits()) }
-                { Fq::mul() }
-                { Fq::push_u32_le(&c.to_u32_digits()) }
-                { Fq::equalverify(1, 0) }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-        let script = script! {
-            // Mont(1) * Mont(1)
-            { Fq::push_one() }
-            { Fq::push_one() }
-            { Fq::mul() }
-            { 0x157CCC21 } OP_EQUALVERIFY
-            { 0x141C2758 } OP_EQUALVERIFY
-            { 0x185230D3 } OP_EQUALVERIFY
-            { 0x14C0419 } OP_EQUALVERIFY
-            { 0xAA36FB9 } OP_EQUALVERIFY
-            { 0x1D4240CE } OP_EQUALVERIFY
-            { 0x11D54C07 } OP_EQUALVERIFY
-            { 0x52AC7A8 } OP_EQUALVERIFY
-            { 0xDC836 } OP_EQUALVERIFY
-            // 1 * 1
-            { U254::push_one() }
-            { U254::push_one() }
-            { Fq::mul() }
-            { 0x584ee8b } OP_EQUALVERIFY
-            { 0x1cdb2f68 } OP_EQUALVERIFY
-            { 0x247987e } OP_EQUALVERIFY
-            { 0x1b5610a2 } OP_EQUALVERIFY
-            { 0xc602ae5 } OP_EQUALVERIFY
-            { 0x1ffe0537 } OP_EQUALVERIFY
-            { 0x5157382 } OP_EQUALVERIFY
-            { 0xe2c8bce } OP_EQUALVERIFY
-            { 0x18223d } OP_EQUALVERIFY
-
-            // NOTE: Debugging Fq2::mul_by_fq
-
-            { Fq::push_hex("1eaea6410b7b58843c06c0d8fca3dc0a7d82b11dfd91b7cb0c0ad3ba0ff345d8") } // a.c0
-            { Fq::push_hex("2adca7063c3e4dd8c35651e75e9feb1d044425f7b9bea3692eb980797d8988a4") } // b
-            { Fq::mul() }
-            { Fq::push_hex("300d597ee82eaa630fdd084fd83805977b383d68c9bcc1363aa85368abf77bc9") } // c.c0
-            { Fq::equalverify(1, 0) }
-
-            { Fq::push_hex("116ec221126bf493b71e1e746a3abed3b8006c4af6720dd9272fa65e3d6ee095") } // a.c1
-            { Fq::push_hex("2adca7063c3e4dd8c35651e75e9feb1d044425f7b9bea3692eb980797d8988a4") } // b
-            { Fq::mul() }
-            { Fq::push_hex("155d7d7c80e274580d99b001eb02c88b736321f9fdbd02c88dee511f74f45447") } // c.c1
-            { Fq::equalverify(1, 0) }
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_mul_bucket() {
-        println!("Fq.mul_bucket: {} bytes", Fq::mul_bucket().len());
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        for _ in 0..1 {
-            let a = ark_bn254::Fq::rand(&mut prng);
-            let b = ark_bn254::Fq::rand(&mut prng);
-            let r = a * b;
-
-            let q_big = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap();
-            let p = ((BigUint::from(a.clone()) * BigUint::from(b.clone())) - BigUint::from(r))
-                / q_big.clone();
-            let p = ark_bn254::Fq::from(p);
-
-            let script = script! {
-                { U254::push_u32_le(&BigUint::from(a.clone()).to_u32_digits()) }
-                { U254::push_u32_le(&BigUint::from(b.clone()).to_u32_digits()) }
-                { U254::push_u32_le(&BigUint::from(p.clone()).to_u32_digits()) }
-                { Fq::mul_bucket() }
-                { U254::push_u32_le(&BigUint::from(r.clone()).to_u32_digits()) }
-                { U254::equalverify(1,0) }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script.clone());
-            assert!(exec_result.success);
-            dbg!(exec_result.stats.max_nb_stack_items);
-        }
-    }
-
-    #[test]
-    fn test_mul_by_constant_bucket() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        for _ in 0..1 {
-            let a = ark_bn254::Fq::rand(&mut prng);
-            let b = ark_bn254::Fq::rand(&mut prng);
-            let r = a * b;
-
-            println!(
-                "Fq.mul_by_constant_bucket: {} bytes",
-                Fq::mul_by_constant_bucket(&b).len()
-            );
-
-            let q_big = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap();
-            let p = ((BigUint::from(a.clone()) * BigUint::from(b.clone())) - BigUint::from(r))
-                / q_big.clone();
-            let p = ark_bn254::Fq::from(p);
-
-            let script = script! {
-                { U254::push_u32_le(&BigUint::from(a.clone()).to_u32_digits()) }
-                { U254::push_u32_le(&BigUint::from(p.clone()).to_u32_digits()) }
-                { Fq::mul_by_constant_bucket(&b) }
-                { U254::push_u32_le(&BigUint::from(r.clone()).to_u32_digits()) }
-                { U254::equalverify(1,0) }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script.clone());
-            assert!(exec_result.success);
-            dbg!(exec_result.stats.max_nb_stack_items);
-        }
-    }
-
-    #[test]
-    fn test_square() {
-        println!("Fq.square: {} bytes", Fq::square().len());
-        let m = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap();
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        for _ in 0..10 {
-            let a: BigUint = prng.sample(RandomBits::new(254));
-
-            let a = a.rem(&m);
-            let c: BigUint = a.clone().mul(a.clone()).rem(&m);
-
-            let script = script! {
-                { Fq::push_u32_le(&a.to_u32_digits()) }
-                { Fq::square() }
-                { Fq::push_u32_le(&c.to_u32_digits()) }
-                { Fq::equalverify(1, 0) }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -592,29 +545,7 @@ mod test {
                 { Fq::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_inv() {
-        println!("Fq.inv: {} bytes", Fq::inv().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq::rand(&mut prng);
-            let c = a.inverse().unwrap();
-
-            let script = script! {
-                { Fq::push_u32_le(&BigUint::from(a).to_u32_digits()) }
-                { Fq::inv() }
-                { Fq::push_u32_le(&BigUint::from(c).to_u32_digits()) }
-                { Fq::equalverify(1, 0) }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -634,8 +565,7 @@ mod test {
                 { Fq::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -656,27 +586,35 @@ mod test {
                 { Fq::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
     #[test]
     fn test_is_one() {
-        println!("Fq.is_one: {} bytes", Fq::is_one(0).len());
-        println!("Fq.is_one_keep_element: {} bytes", Fq::is_one_keep_element(0).len());
+        println!("Fq.is_one: {} bytes", Fq::is_one().len());
+        println!(
+            "Fq.is_one_keep_element: {} bytes",
+            Fq::is_one_keep_element(0).len()
+        );
         let script = script! {
             { Fq::push_one() }
             { Fq::is_one_keep_element(0) }
-            { Fq::is_one(1) }
+            OP_TOALTSTACK
+            { Fq::is_one() }
+            OP_FROMALTSTACK
             OP_BOOLAND
         };
+        run(script);
     }
 
     #[test]
     fn test_is_zero() {
         println!("Fq.is_zero: {} bytes", Fq::is_zero(0).len());
-        println!("Fq.is_zero_keep_element: {} bytes", Fq::is_zero_keep_element(0).len());
+        println!(
+            "Fq.is_zero_keep_element: {} bytes",
+            Fq::is_zero_keep_element(0).len()
+        );
         let mut prng = ChaCha20Rng::seed_from_u64(0);
 
         for _ in 0..10 {
@@ -710,40 +648,7 @@ mod test {
                 { Fq::is_zero(0) }
                 OP_BOOLAND
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_mul_by_constant() {
-        let m = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap();
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for i in 0..10 {
-            let a: BigUint = prng.sample(RandomBits::new(254));
-            let a = a.rem(&m);
-
-            let b: BigUint = prng.sample(RandomBits::new(254));
-            let b = b.rem(&m);
-
-            let mul_by_constant = Fq::mul_by_constant(&ark_bn254::Fq::from(b.clone()));
-
-            if i == 0 {
-                println!("Fq.mul_by_constant: {} bytes", mul_by_constant.len());
-            }
-
-            let c: BigUint = a.clone().mul(b.clone()).rem(&m);
-
-            let script = script! {
-                { Fq::push_u32_le(&a.to_u32_digits()) }
-                { mul_by_constant.clone() }
-                { Fq::push_u32_le(&c.to_u32_digits()) }
-                { Fq::equalverify(1, 0) }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -762,8 +667,7 @@ mod test {
                 { Fq::push_u32_le(&a.to_u32_digits()) }
                 { Fq::is_field() }
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         let script = script! {
@@ -771,8 +675,7 @@ mod test {
             { Fq::is_field() }
             OP_NOT
         };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
+        run(script);
 
         let script = script! {
             { Fq::push_modulus() } OP_1 OP_SUB
@@ -780,61 +683,201 @@ mod test {
             { Fq::is_field() }
             OP_NOT
         };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
+        run(script);
     }
 
     #[test]
-    fn test_convert_to_be_bytes() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
+    fn test_hinted_mul() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
 
-        let convert_to_be_bytes_script = Fq::convert_to_be_bytes();
-        println!(
-            "Fq.convert_to_be_bytes: {} bytes",
-            convert_to_be_bytes_script.len()
-        );
+        for _ in 0..100 {
+            let a = ark_bn254::Fq::rand(&mut prng);
+            let b = ark_bn254::Fq::rand(&mut prng);
+            let c = a.mul(&b);
 
-        for _ in 0..10 {
-            let fq = ark_bn254::Fq::rand(&mut prng);
-            let bytes = fq.into_bigint().to_bytes_be();
+            let (hinted_mul, hints) = Fq::hinted_mul(1, a, 0, b);
+            println!("Fq::hinted_mul: {} bytes", hinted_mul.len());
 
             let script = script! {
-                { Fq::push_u32_le(&BigUint::from(fq).to_u32_digits()) }
-                { convert_to_be_bytes_script.clone() }
-                for i in 0..32 {
-                    { bytes[i] } OP_EQUALVERIFY
+                for hint in hints {
+                    { hint.push() }
                 }
-                OP_TRUE
+                { Fq::push(a) }
+                { Fq::push(b) }
+                { hinted_mul.clone() }
+                { Fq::push(c) }
+                { Fq::equal(0, 1) }
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
-    fn rand_bools<const SIZE: usize>(seed: u64) -> [bool; SIZE] {
-        let mut bools = [true; SIZE];
-        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(seed);
-        for i in 0..SIZE {
-            bools[i] = prng.gen_bool(0.5);
+    #[test]
+    fn test_hinted_mul_keep_element() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..100 {
+            let a = ark_bn254::Fq::rand(&mut prng);
+            let b = ark_bn254::Fq::rand(&mut prng);
+            let c = a.mul(&b);
+
+            let (hinted_mul_keep_element, hints) = Fq::hinted_mul_keep_element(1, a, 0, b);
+            println!("Fq::hinted_mul: {} bytes", hinted_mul_keep_element.len());
+
+            let script = script! {
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq::push(a) }
+                { Fq::push(b) }
+                { hinted_mul_keep_element.clone() }
+                { Fq::push(c) }
+                { Fq::equal(0, 1) }
+                OP_TOALTSTACK
+                { Fq::drop() }
+                { Fq::drop() }
+                OP_FROMALTSTACK
+            };
+            run(script);
         }
-        bools
     }
 
-    fn bigint_to_u32_limbs(n: BigInt, n_bits: u32) -> Vec<u32> {
-        const limb_size: u64 = 32;
-        let mut limbs = vec![];
-        let mut limb: u32 = 0;
-        for i in 0..n_bits as u64 {
-            if i > 0 && i % limb_size == 0 {
-                limbs.push(limb);
-                limb = 0;
-            }
-            if n.bit(i) {
-                limb += 1 << (i % limb_size);
-            }
+    #[test]
+    fn test_hinted_mul_by_constant() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..100 {
+            let a = ark_bn254::Fq::rand(&mut prng);
+            let b = ark_bn254::Fq::rand(&mut prng);
+            let c = a.mul(&b);
+
+            let (hinted_mul_by_constant, hints) = Fq::hinted_mul_by_constant(a, &b);
+            println!("Fq::hinted_mul_by_constant: {} bytes", hinted_mul_by_constant.len());
+
+            let script = script! {
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq::push(a) }
+                { hinted_mul_by_constant.clone() }
+                { Fq::push(c) }
+                { Fq::equal(0, 1) }
+            };
+            run(script);
         }
-        limbs.push(limb);
-        limbs
+    }
+
+    #[test]
+    fn test_hinted_mul_lc2() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..100 {
+            let a = ark_bn254::Fq::rand(&mut prng);
+            let b = ark_bn254::Fq::rand(&mut prng);
+            let c = ark_bn254::Fq::rand(&mut prng);
+            let d = ark_bn254::Fq::rand(&mut prng);
+            let e = a.mul(&c).add(b.mul(&d));
+
+            let (hinted_mul_lc2, hints) = Fq::hinted_mul_lc2(3, a, 2, b, 1, c, 0, d);
+            println!("Fq::hinted_mul_lc2: {} bytes", hinted_mul_lc2.len());
+
+            let script = script! {
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq::push(a) }
+                { Fq::push(b) }
+                { Fq::push(c) }
+                { Fq::push(d) }
+                { hinted_mul_lc2.clone() }
+                { Fq::push(e) }
+                { Fq::equal(0, 1) }
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_hinted_mul_lc2_keep_elements() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..100 {
+            let a = ark_bn254::Fq::rand(&mut prng);
+            let b = ark_bn254::Fq::rand(&mut prng);
+            let c = ark_bn254::Fq::rand(&mut prng);
+            let d = ark_bn254::Fq::rand(&mut prng);
+            let e = a.mul(&c).add(b.mul(&d));
+
+            let (hinted_mul_lc2_keep_element, hints) = Fq::hinted_mul_lc2_keep_elements(3, a, 2, b, 1, c, 0, d);
+            println!("Fq::hinted_mul_lc2_keep_element: {} bytes", hinted_mul_lc2_keep_element.len());
+
+            let script = script! {
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq::push(a) }
+                { Fq::push(b) }
+                { Fq::push(c) }
+                { Fq::push(d) }
+                { hinted_mul_lc2_keep_element.clone() }
+                { Fq::push(e) }
+                { Fq::equal(0, 1) }
+                OP_TOALTSTACK
+                { Fq::drop() }
+                { Fq::drop() }
+                { Fq::drop() }
+                { Fq::drop() }
+                OP_FROMALTSTACK
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_hinted_square() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..100 {
+            let a = ark_bn254::Fq::rand(&mut prng);
+            let c = a.mul(&a);
+
+            let (hinted_square, hints) = Fq::hinted_square(a);
+            println!("Fq::hinted_square: {} bytes", hinted_square.len());
+
+            let script = script! {
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq::push(a) }
+                { hinted_square.clone() }
+                { Fq::push(c) }
+                { Fq::equal(0, 1) }
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_hinted_inv() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        let a = ark_bn254::Fq::rand(&mut prng);
+        let c = a.inverse().unwrap();
+
+        let (hinted_inv, hints) = Fq::hinted_inv(a);
+        println!("Fq::hinted_inv: {} bytes", hinted_inv.len());
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            { Fq::push_u32_le(&BigUint::from(a).to_u32_digits()) }
+            { hinted_inv }
+            { Fq::push_u32_le(&BigUint::from(c).to_u32_digits()) }
+            { Fq::equalverify(1, 0) }
+            OP_TRUE
+        };
+        run(script);
     }
 
     #[test]
@@ -842,7 +885,6 @@ mod test {
         type U = <Fq as Fp254Mul>::U;
         type T = <Fq as Fp254Mul>::T;
 
-
         let zero = &BigInt::ZERO;
         let modulus = &Fq::modulus_as_bigint();
 
@@ -892,7 +934,11 @@ mod test {
             max_stack = max_stack.max(res.stats.max_nb_stack_items);
         }
 
-        println!("<Fq as Fp254Mul>::tmul: {} @ {} stack", <Fq as Fp254Mul>::tmul().len(), max_stack);
+        println!(
+            "<Fq as Fp254Mul>::tmul: {} @ {} stack",
+            <Fq as Fp254Mul>::tmul().len(),
+            max_stack
+        );
     }
 
     #[test]
@@ -971,7 +1017,8 @@ mod test {
 
         println!(
             "<Fq as Fp254Mul2LC>::tmul: {} @ {} stack",
-            <Fq as Fp254Mul2LC>::tmul().len(), max_stack
+            <Fq as Fp254Mul2LC>::tmul().len(),
+            max_stack
         );
     }
 }
diff --git a/bitvm/src/bn254/fq12.rs b/bitvm/src/bn254/fq12.rs
new file mode 100644
index 000000000..e94263459
--- /dev/null
+++ b/bitvm/src/bn254/fq12.rs
@@ -0,0 +1,453 @@
+use crate::bn254::fp254impl::Fp254Impl;
+use crate::bn254::fq::Fq;
+use crate::bn254::fq2::Fq2;
+use crate::bn254::fq6::Fq6;
+use crate::bn254::utils::Hint;
+use crate::treepp::{script, Script};
+use ark_ff::{Field, Fp12Config};
+use num_bigint::BigUint;
+
+pub struct Fq12;
+
+impl Fq12 {
+    pub fn copy(a: u32) -> Script {
+        script! {
+            { Fq6::copy(a + 6) }
+            { Fq6::copy(a + 6) }
+        }
+    }
+
+    pub fn roll(a: u32) -> Script {
+        script! {
+            { Fq6::roll(a + 6) }
+            { Fq6::roll(a + 6) }
+        }
+    }
+
+    pub fn drop() -> Script {
+        script! {
+            { Fq6::drop() }
+            { Fq6::drop() }
+        }
+    }
+
+    pub fn toaltstack() -> Script {
+        script! {
+            { Fq6::toaltstack() }
+            { Fq6::toaltstack() }
+        }
+    }
+
+    pub fn fromaltstack() -> Script {
+        script! {
+            { Fq6::fromaltstack() }
+            { Fq6::fromaltstack() }
+        }
+    }
+
+    pub fn push(a: ark_bn254::Fq12) -> Script {
+        script! {
+            for elem in a.to_base_prime_field_elements() {
+                { Fq::push_u32_le(&BigUint::from(elem).to_u32_digits()) }
+           }
+        }
+    }
+
+    pub fn push_zero() -> Script {
+        script! {
+            { Fq6::push_zero() }
+            { Fq6::push_zero() }
+        }
+    }
+
+    pub fn equalverify() -> Script {
+        script! {
+            for i in 0..12 {
+                { Fq::equalverify(23 - i * 2, 11 - i) }
+            }
+        }
+    }
+
+    pub fn add(mut a: u32, mut b: u32) -> Script {
+        if a < b {
+            (a, b) = (b, a);
+        }
+        script! {
+            { Fq6::add(a + 6, b + 6) }
+            { Fq6::add(a, b + 6) }
+        }
+    }
+
+    pub fn sub(a: u32, b: u32) -> Script {
+        if a > b {
+            script! {
+                { Fq6::sub(a + 6, b + 6) }
+                { Fq6::sub(a, b + 6) }
+            }
+        } else {
+            script! {
+                { Fq6::sub(a + 6, b + 6) }
+                { Fq6::sub(a + 6, b) }
+            }
+        }
+    }
+
+    pub fn double(a: u32) -> Script {
+        script! {
+            { Fq6::double(a + 6) }
+            { Fq6::double(a + 6) }
+        }
+    }
+
+    pub fn mul_fq6_by_nonresidue() -> Script {
+        script! {
+            { Fq6::mul_fq2_by_nonresidue() }
+            { Fq2::roll(4) }
+            { Fq2::roll(4) }
+        }
+    }
+
+    pub fn hinted_mul(
+        mut a_depth: u32,
+        mut a: ark_bn254::Fq12,
+        mut b_depth: u32,
+        mut b: ark_bn254::Fq12,
+    ) -> (Script, Vec<Hint>) {
+        if a_depth < b_depth {
+            (a_depth, b_depth) = (b_depth, a_depth);
+            (a, b) = (b, a);
+        }
+        assert_ne!(a_depth, b_depth);
+        let mut hints = Vec::new();
+
+        let (hinted_script1, hint1) = Fq6::hinted_mul(6, a.c0, 0, b.c0);
+        let (hinted_script2, hint2) = Fq6::hinted_mul(6, a.c1, 0, b.c1);
+        let (hinted_script3, hint3) = Fq6::hinted_mul(6, a.c0 + a.c1, 0, b.c0 + b.c1);
+
+        let script = script! {
+            { Fq6::copy(a_depth + 6) }
+            { Fq6::copy(b_depth + 12) }
+            { hinted_script1 }
+            { Fq6::copy(a_depth + 6) }
+            { Fq6::copy(b_depth + 12) }
+            { hinted_script2 }
+            { Fq6::add(a_depth + 12, a_depth + 18) }
+            { Fq6::add(b_depth + 18, b_depth + 24) }
+            { hinted_script3 }
+            { Fq6::copy(12) }
+            { Fq6::copy(12) }
+            { Fq12::mul_fq6_by_nonresidue() }
+            { Fq6::add(6, 0) }
+            { Fq6::add(18, 12) }
+            { Fq6::sub(12, 0) }
+        };
+
+        hints.extend(hint1);
+        hints.extend(hint2);
+        hints.extend(hint3);
+
+        (script, hints)
+    }
+
+    // input:
+    //   p   (12 elements)
+    //   c3  (2 elements)
+    //   c4  (2 elements)
+    // where c0 is a trival value ONE, so we can ignore it
+    pub fn hinted_mul_by_34(
+        p: ark_bn254::Fq12,
+        c3: ark_bn254::Fq2,
+        c4: ark_bn254::Fq2,
+    ) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+
+        let (hinted_script1, hint1) = Fq6::hinted_mul_by_01(p.c1, c3, c4);
+        let (hinted_script2, hint2) =
+            Fq6::hinted_mul_by_01(p.c0 + p.c1, c3 + ark_bn254::Fq2::ONE, c4);
+
+        let script = script! {
+            // copy p.c1, c3, c4
+            { Fq6::copy(4) }
+            { Fq2::copy(8) }
+            { Fq2::copy(8) }
+            // [p, c3, c4, p.c1, c3, c4]
+
+            // compute b = p.c1 * (c3, c4)
+            { hinted_script1 }
+            // [p, c3, c4, b]
+
+            // a = p.c0 * c0, where c0 = 1
+            { Fq6::copy(16) }
+            // [p, c3, c4, b, a]
+
+            // compute beta * b
+            { Fq6::copy(6) }
+            { Fq12::mul_fq6_by_nonresidue() }
+            // [p, c3, c4, b, a, beta * b]
+
+            // compute final c0 = a + beta * b
+            { Fq6::copy(6) }
+            { Fq6::add(6, 0) }
+            // [p, c3, c4, b, a, c0]
+
+            // compute e = p.c0 + p.c1
+            { Fq6::add(28, 22) }
+            // [c3, c4, b, a, c0, e]
+
+            // compute c0 + c3, where c0 = 1
+            { Fq2::roll(26) }
+            { Fq2::push_one() }
+            { Fq2::add(2, 0) }
+            // [c4, b, a, c0, e, 1 + c3]
+
+            // update e = e * (c0 + c3, c4), where c0 = 1
+            { Fq2::roll(26) }
+            { hinted_script2 }
+            // [b, a, c0, e]
+
+            // sum a and b
+            { Fq6::add(18, 12) }
+            // [c0, e, a + b]
+
+            // compute final c1 = e - (a + b)
+            { Fq6::sub(6, 0) }
+        };
+
+        hints.extend(hint1);
+        hints.extend(hint2);
+
+        (script, hints)
+    }
+
+    pub fn hinted_square(a: ark_bn254::Fq12) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+
+        let (hinted_script1, hints1) = Fq6::hinted_mul(12, a.c1, 18, a.c0);
+        let mut beta_ac1 = a.c1;
+        ark_bn254::Fq12Config::mul_fp6_by_nonresidue_in_place(&mut beta_ac1);
+        let (hinted_script2, hints2) = Fq6::hinted_mul(12, a.c0 + a.c1, 6, a.c0 + beta_ac1);
+
+        let script = script! {
+            // v0 = c0 + c1
+            { Fq6::copy(6) }
+            { Fq6::copy(6) }
+            { Fq6::add(6, 0) }
+            // v3 = c0 + beta * c1
+            { Fq6::copy(6) }
+            { Fq12::mul_fq6_by_nonresidue() }
+            { Fq6::copy(18) }
+            { Fq6::add(0, 6) }
+            // v2 = c0 * c1
+            { hinted_script1 }
+            // v0 = v0 * v3
+            { hinted_script2 }
+            // final c0 = v0 - (beta + 1) * v2
+            { Fq6::copy(6) }
+            { Fq12::mul_fq6_by_nonresidue() }
+            { Fq6::copy(12) }
+            { Fq6::add(6, 0) }
+            { Fq6::sub(6, 0) }
+            // final c1 = 2 * v2
+            { Fq6::double(6) }
+        };
+
+        hints.extend(hints1);
+        hints.extend(hints2);
+
+        (script, hints)
+    }
+
+    pub fn hinted_frobenius_map(i: usize, a: ark_bn254::Fq12) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+
+        let (hinted_script1, hint1) = Fq6::hinted_frobenius_map(i, a.c0);
+        let (hinted_script2, hint2) = Fq6::hinted_frobenius_map(i, a.c1);
+        let (hinted_script3, hint3) = Fq6::hinted_mul_by_fp2_constant(
+            a.c1.frobenius_map(i),
+            &ark_bn254::Fq12Config::FROBENIUS_COEFF_FP12_C1
+                [i % ark_bn254::Fq12Config::FROBENIUS_COEFF_FP12_C1.len()],
+        );
+
+        let script = script! {
+            { Fq6::roll(6) }
+            { hinted_script1 }
+            { Fq6::roll(6) }
+            { hinted_script2 }
+            { hinted_script3 }
+        };
+
+        hints.extend(hint1);
+        hints.extend(hint2);
+        hints.extend(hint3);
+
+        (script, hints)
+    }    
+}
+
+#[cfg(test)]
+mod test {
+    use crate::bn254::fq12::Fq12;
+    use crate::bn254::fq2::Fq2;
+    use crate::treepp::*;
+    use ark_ff::AdditiveGroup;
+    use ark_ff::Field;
+    use ark_std::UniformRand;
+    use core::ops::Mul;
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+
+    #[test]
+    fn test_bn254_fq12_add() {
+        println!("Fq12.add: {} bytes", Fq12::add(12, 0).len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..50 {
+            let a = ark_bn254::Fq12::rand(&mut prng);
+            let b = ark_bn254::Fq12::rand(&mut prng);
+            let c = a + b;
+
+            let script = script! {
+                { Fq12::push(a) }
+                { Fq12::push(b) }
+                { Fq12::add(12, 0) }
+                { Fq12::push(c) }
+                { Fq12::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq12_double() {
+        println!("Fq12.double: {} bytes", Fq12::double(0).len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..50 {
+            let a = ark_bn254::Fq12::rand(&mut prng);
+            let c = a.double();
+
+            let script = script! {
+                { Fq12::push(a) }
+                { Fq12::double(0) }
+                { Fq12::push(c) }
+                { Fq12::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq12_hinted_mul() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..1 {
+            let a = ark_bn254::Fq12::rand(&mut prng);
+            let b = ark_bn254::Fq12::rand(&mut prng);
+            let c = a.mul(&b);
+
+            let (hinted_mul, hints) = Fq12::hinted_mul(12, a, 0, b);
+            println!("Fq12.hinted_mul: {} bytes", hinted_mul.len());
+
+            let script = script! {
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq12::push(a) }
+                { Fq12::push(b) }
+                { hinted_mul.clone() }
+                { Fq12::push(c) }
+                { Fq12::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq12_hinted_mul_by_34() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..1 {
+            let a = ark_bn254::Fq12::rand(&mut prng);
+            let c0 = ark_bn254::Fq2::ONE;
+            let c3 = ark_bn254::Fq2::rand(&mut prng);
+            let c4 = ark_bn254::Fq2::rand(&mut prng);
+            let mut b = a;
+            b.mul_by_034(&c0, &c3, &c4);
+            let (hinted_mul_by_34, hints) = Fq12::hinted_mul_by_34(a, c3, c4);
+            println!("Fq12.hinted_mul_by_34: {} bytes", hinted_mul_by_34.len());
+
+            let script = script! {
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq12::push(a) }
+                { Fq2::push(c3) }
+                { Fq2::push(c4) }
+                { hinted_mul_by_34.clone() }
+                { Fq12::push(b) }
+                { Fq12::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq12_hinted_square() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..1 {
+            let a = ark_bn254::Fq12::rand(&mut prng);
+            let b = a.square();
+
+            let (hinted_square, hints) = Fq12::hinted_square(a);
+            println!("Fq12.hinted_square: {} bytes", hinted_square.len());
+
+            let script = script! {
+                for hint in hints {
+                    { hint.push() }
+                }
+                { Fq12::push(a) }
+                { hinted_square.clone() }
+                { Fq12::push(b) }
+                { Fq12::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq12_hinted_frobenius_map() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..1 {
+            for i in 0..12 {
+                let a = ark_bn254::Fq12::rand(&mut prng);
+                let b = a.frobenius_map(i);
+
+                let (hinted_frobenius_map, hints) = Fq12::hinted_frobenius_map(i, a);
+                println!(
+                    "Fq12.hinted_frobenius_map({}): {} bytes",
+                    i,
+                    hinted_frobenius_map.len()
+                );
+
+                let script = script! {
+                    for hint in hints {
+                        { hint.push() }
+                    }
+                    { Fq12::push(a) }
+                    { hinted_frobenius_map.clone() }
+                    { Fq12::push(b) }
+                    { Fq12::equalverify() }
+                    OP_TRUE
+                };
+                run(script);
+            }
+        }
+    }
+}
diff --git a/bitvm/src/bn254/fq2.rs b/bitvm/src/bn254/fq2.rs
new file mode 100644
index 000000000..483042f54
--- /dev/null
+++ b/bitvm/src/bn254/fq2.rs
@@ -0,0 +1,577 @@
+use crate::bn254::fp254impl::Fp254Impl;
+use crate::bn254::fq::Fq;
+use crate::treepp::{script, Script};
+use crate::bn254::utils::Hint;
+use ark_ff::Fp2Config;
+use num_bigint::BigUint;
+
+pub struct Fq2;
+
+impl Fq2 {
+    pub fn copy(a: u32) -> Script {
+        script! {
+            { Fq::copy(a + 1) }
+            { Fq::copy(a + 1) }
+        }
+    }
+
+    pub fn roll(a: u32) -> Script {
+        script! {
+            { Fq::roll(a + 1) }
+            { Fq::roll(a + 1) }
+        }
+    }
+
+    pub fn drop() -> Script {
+        script! {
+            { Fq::drop() }
+            { Fq::drop() }
+        }
+    }
+
+    pub fn toaltstack() -> Script {
+        script! {
+            { Fq::toaltstack() }
+            { Fq::toaltstack() }
+        }
+    }
+
+    pub fn fromaltstack() -> Script {
+        script! {
+            { Fq::fromaltstack() }
+            { Fq::fromaltstack() }
+        }
+    }
+
+    pub fn push(a: ark_bn254::Fq2) -> Script {
+        script! {
+            { Fq::push_u32_le(&BigUint::from(a.c0).to_u32_digits()) }
+            { Fq::push_u32_le(&BigUint::from(a.c1).to_u32_digits()) }
+        }
+    }
+
+    pub fn push_zero() -> Script {
+        script! {
+            { Fq::push_zero() }
+            { Fq::push_zero() }
+        }
+    }
+
+    pub fn push_one() -> Script {
+        script! {
+            { Fq::push_one() }
+            { Fq::push_zero() }
+        }
+    }
+
+    pub fn read_from_stack(witness: Vec<Vec<u8>>) -> ark_bn254::Fq2 {
+        assert_eq!(witness.len() as u32, Fq::N_LIMBS * 2);
+        let c0 = Fq::read_u32_le(witness[0..Fq::N_LIMBS as usize].to_vec());
+        let c1 = Fq::read_u32_le(
+            witness[Fq::N_LIMBS as usize..2 * Fq::N_LIMBS as usize].to_vec(),
+        );
+        ark_bn254::Fq2 {
+            c0: BigUint::from_slice(&c0).into(),
+            c1: BigUint::from_slice(&c1).into(),
+        }
+    }
+
+    pub fn equalverify() -> Script {
+        script! {
+            { Fq::equalverify(3, 1) }
+            { Fq::equalverify(1, 0) }
+        }
+    }
+
+    pub fn equal() -> Script {
+        script! {
+            { Fq::equal(3, 1) }
+            OP_TOALTSTACK
+            { Fq::equal(1, 0) }
+            OP_FROMALTSTACK
+            OP_BOOLAND
+        }
+    }
+    
+    pub fn add(mut a: u32, mut b: u32) -> Script {
+        if a < b {
+            (a, b) = (b, a);
+        }
+
+        script! {
+            { Fq::add(a + 1, b + 1) }
+            { Fq::add(a, b + 1) }
+        }
+    }
+
+    pub fn sub(a: u32, b: u32) -> Script {
+        if a > b {
+            script! {
+                { Fq::sub(a + 1, b + 1) }
+                { Fq::sub(a, b + 1) }
+            }
+        } else {
+            script! {
+                { Fq::sub(a + 1, b + 1) }
+                { Fq::sub(a + 1, b) }
+            }
+        }
+    }
+
+    pub fn double(a: u32) -> Script {
+        script! {
+            { Fq::double(a + 1) }
+            { Fq::double(a + 1) }
+        }
+    }
+
+    pub fn triple(a: u32) -> Script {
+        script! {
+            { Fq2::copy(a) }
+            { Fq2::double(a + 2) }
+            { Fq2::add(2, 0) }
+        }
+    }
+
+    pub fn div2() -> Script {
+        script! {
+            { Fq::roll(1) }
+            { Fq::div2() }
+            { Fq::roll(1) }
+            { Fq::div2() }
+        }
+    }
+
+    pub fn div3() -> Script {
+        script! {
+            { Fq::roll(1) }
+            { Fq::div3() }
+            { Fq::roll(1) }
+            { Fq::div3() }
+        }
+    }
+
+    pub fn neg(a: u32) -> Script {
+        script! {
+            { Fq::neg(a + 1) }
+            { Fq::neg(a + 1) }
+        }
+    }
+
+    pub fn hinted_mul(mut a_depth: u32, mut a: ark_bn254::Fq2, mut b_depth: u32, mut b: ark_bn254::Fq2) -> (Script, Vec<Hint>) {
+        if a_depth < b_depth {
+            (a_depth, b_depth) = (b_depth, a_depth);
+            (a, b) = (b, a);
+        }
+        assert_ne!(a_depth, b_depth);
+
+        let mut hints = Vec::new();
+
+        let (hinted_script1, hint1) = Fq::hinted_mul_lc2_keep_elements(3, a.c0, 2, a.c1, 1, b.c1, 0, b.c0);
+        let (hinted_script2, hint2) = Fq::hinted_mul_lc2(3, a.c0, 2, a.c1, 1, b.c0, 0, -b.c1);
+
+        let script = script! {
+            { Fq2::roll(a_depth) }
+            { Fq2::roll(b_depth + 2) }                       // a.c0 a.c1 b.c0 b.c1
+            { Fq::roll(1) }                                  // a.c0 a.c1 b.c1 b.c0
+            { hinted_script1 }                               // a.c0 a.c1 b.c1 b.c0 a.c0*b.c1+a.c1*b.c0
+            { Fq::toaltstack() }                             // a.c0 a.c1 b.c1 b.c0 | a.c0*b.c1+a.c1*b.c0
+            { Fq::roll(1) }                                  // a.c0 a.c1 b.c0 b.c1 | a.c0*b.c1+a.c1*b.c0
+            { Fq::neg(0) }                                   // a.c0 a.c1 b.c0 -b.c1 | a.c0*b.c1+a.c1*b.c0
+            { hinted_script2 }                               // a.c0*b.c0-a.c1*b.c1 | a.c0*b.c1+a.c1*b.c0
+            { Fq::fromaltstack() }                           // a.c0*b.c0-a.c1*b.c1 a.c0*b.c1+a.c1*b.c0
+        };
+
+        hints.extend(hint1);
+        hints.extend(hint2);
+
+        (script, hints)
+    }
+
+    pub fn hinted_mul_by_constant(a: ark_bn254::Fq2, constant: &ark_bn254::Fq2) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+
+        let (hinted_script1, hint1) = Fq::hinted_mul_by_constant(a.c0, &constant.c0);
+        let (hinted_script2, hint2) = Fq::hinted_mul_by_constant(a.c1, &constant.c1);
+        let (hinted_script3, hint3) = Fq::hinted_mul_by_constant(a.c0+a.c1, &(constant.c0+constant.c1));
+
+        let script = script! {
+            { Fq::copy(1) }
+            { hinted_script1 }
+            { Fq::copy(1) }
+            { hinted_script2 }
+            { Fq::add(3, 2) }
+            { hinted_script3 }
+            { Fq::copy(2) }
+            { Fq::copy(2) }
+            { Fq::add(1, 0) }
+            { Fq::sub(1, 0) }
+            { Fq::sub(2, 1) }
+            { Fq::roll(1) }
+        };
+
+        hints.extend(hint1);
+        hints.extend(hint2);
+        hints.extend(hint3);
+
+        (script, hints)
+    }
+
+    pub fn hinted_mul_lc4_keep_elements(
+        a: ark_bn254::Fq2, b:ark_bn254::Fq2, c:ark_bn254::Fq2, d:ark_bn254::Fq2
+    ) -> (Script, Vec<Hint>) {
+
+        let mut hints = Vec::new();
+
+        let (hinted_script1, hint1) = Fq::hinted_mul_lc4(7, a.c0, 6, -a.c1, 5, c.c0, 4, -c.c1, 3, b.c0, 2, b.c1, 1, d.c0, 0, d.c1);
+        let (hinted_script2, hint2) = Fq::hinted_mul_lc4(7, a.c0, 6, a.c1, 5, c.c0, 4, c.c1, 3, b.c1, 2, b.c0, 1, d.c1, 0, d.c0);
+
+        let script = script! {
+            // [a, b, c, d] 
+            {Fq2::copy(6)}
+            {Fq::neg(0)}
+            // [a, b, c, d, -a]
+            {Fq2::copy(4)}
+            {Fq::neg(0)}
+            // [a, b, c, d, -a, -c]
+            {Fq2::copy(8)}
+            // [a, b, c, d, -a, -c, b]
+            {Fq2::copy(6)}
+            // [a, b, c, d, -a, -c, b, d]
+            {hinted_script1}
+            {Fq::toaltstack()}
+            // [a, b, c, d]
+            {Fq2::copy(6)} {Fq2::copy(6)} {Fq2::copy(6)} {Fq2::copy(6)} 
+            // [a, b, c, d, a, b, c, d]
+            {Fq2::toaltstack()} {Fq2::roll(2)} 
+            // [a, c, b, d]
+            {Fq::roll(1)}
+            {Fq2::fromaltstack()}
+            {Fq::roll(1)}
+            // [a, c, b', d']
+            {hinted_script2}
+            {Fq::fromaltstack()}
+            {Fq::roll(1)}
+        };
+
+        hints.extend(hint1);
+        hints.extend(hint2);
+
+        (script, hints)
+    }
+
+    
+    /// Square the top Fq2 element
+    pub fn hinted_square(a: ark_bn254::Fq2) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+        let (hinted_script1, hint1) = Fq::hinted_mul_keep_element(1, a.c0, 0, a.c1);
+        let (hinted_script2, hint2) = Fq::hinted_mul(1, a.c0 - a.c1, 0, a.c0 + a.c1);
+
+        let script = script! {
+            // a0, a1
+            { Fq::copy(1) }
+            { Fq::copy(1) }
+            // a0, a1, a0, a1
+            { hinted_script1 }
+            // a0, a1, a0, a1, a0*a1
+            { Fq::double(0) }
+            // a0, a1, a0, a1, 2*a0*a1
+            { Fq::sub(2, 1) }
+            { Fq::add(3, 2) }
+            // 2*a0*a1, a0-a1, a0+a1
+            { hinted_script2 }
+            // 2*a0*a1, a0^2-a1^2
+            { Fq::roll(1) }
+            // a0^2-a1^2, 2*a0*a1
+        };
+
+        hints.extend(hint1);
+        hints.extend(hint2);
+        (script, hints)
+    }
+
+    pub fn hinted_frobenius_map(i: usize, a: ark_bn254::Fq2) -> (Script, Vec<Hint>) {
+        Fq::hinted_mul_by_constant(a.c1, &ark_bn254::Fq2Config::FROBENIUS_COEFF_FP2_C1[i % ark_bn254::Fq2Config::FROBENIUS_COEFF_FP2_C1.len()])
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::bn254::fq2::Fq2;
+    use crate::treepp::*;
+    use ark_ff::Field;
+    use ark_std::UniformRand;
+    use core::ops::{Add, Mul};
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+    use ark_ff::AdditiveGroup;
+
+    #[test]
+    fn test_bn254_fq2_add() {
+        println!("Fq2.add: {} bytes", Fq2::add(2, 0).len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..50 {
+            let a = ark_bn254::Fq2::rand(&mut prng);
+            let b = ark_bn254::Fq2::rand(&mut prng);
+            let c = a + b;
+
+            let script = script! {
+                { Fq2::push(a) }
+                { Fq2::push(b) }
+                { Fq2::add(2, 0) }
+                { Fq2::push(c) }
+                { Fq2::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+
+            let script = script! {
+                { Fq2::push(a) }
+                { Fq2::push(b) }
+                { Fq2::add(0, 2) }
+                { Fq2::push(c) }
+                { Fq2::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq2_sub() {
+        println!("Fq2.sub: {} bytes", Fq2::sub(2, 0).len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..50 {
+            let a = ark_bn254::Fq2::rand(&mut prng);
+            let b = ark_bn254::Fq2::rand(&mut prng);
+            let c = a - b;
+
+            let script = script! {
+                { Fq2::push(a) }
+                { Fq2::push(b) }
+                { Fq2::sub(2, 0) }
+                { Fq2::push(c) }
+                { Fq2::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+
+            let script = script! {
+                { Fq2::push(b) }
+                { Fq2::push(a) }
+                { Fq2::sub(0, 2) }
+                { Fq2::push(c) }
+                { Fq2::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq2_double() {
+        println!("Fq2.double: {} bytes", Fq2::double(0).len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..50 {
+            let a = ark_bn254::Fq2::rand(&mut prng);
+            let c = a.double();
+
+            let script = script! {
+                { Fq2::push(a) }
+                { Fq2::double(0) }
+                { Fq2::push(c) }
+                { Fq2::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq2_triple() {
+        println!("Fq2.triple: {} bytes", Fq2::triple(0).len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..1 {
+            let a = ark_bn254::Fq2::rand(&mut prng);
+            let b = a.double();
+            let c = a.add(b);
+
+            let script = script! {
+                { Fq2::push(a) }
+                { Fq2::triple(0) }
+                { Fq2::push(c) }
+                { Fq2::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq2_div2() {
+        println!("Fq2.div2: {} bytes", Fq2::div2().len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..1 {
+            let a = ark_bn254::Fq2::rand(&mut prng);
+            let b = a.double();
+
+            let script = script! {
+                { Fq2::push(b) }
+                { Fq2::div2() }
+                { Fq2::push(a) }
+                { Fq2::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq2_div3() {
+        println!("Fq2.div3: {} bytes", Fq2::div3().len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..1 {
+            let a = ark_bn254::Fq2::rand(&mut prng);
+            let b = a.double();
+            let c = a.add(b);
+
+            let script = script! {
+                { Fq2::push(c) }
+                { Fq2::div3() }
+                { Fq2::push(a) }
+                { Fq2::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_bn254_fq2_hinted_mul() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..100 {
+            let a = ark_bn254::Fq2::rand(&mut prng);
+            let b = ark_bn254::Fq2::rand(&mut prng);
+            let c = a.mul(&b);
+
+            let (hinted_mul, hints) = Fq2::hinted_mul(2, a, 0, b);
+            println!("Fq2::hinted_mul: {} bytes", hinted_mul.len());
+
+            let script = script! {
+                for hint in hints { 
+                    { hint.push() }
+                }
+                { Fq2::push(a) }
+                { Fq2::push(b) }
+                { hinted_mul.clone() }
+                { Fq2::push(c) }
+                { Fq2::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+
+    }
+
+    #[test]
+    fn test_bn254_fq2_hinted_mul_by_constant() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..100 {
+            let a = ark_bn254::Fq2::rand(&mut prng);
+            let b = ark_bn254::Fq2::rand(&mut prng);
+            let c = a.mul(&b);
+
+            let (hinted_mul_by_constant, hints) = Fq2::hinted_mul_by_constant(a, &b);
+            println!("Fq2::hinted_mul_by_constant: {} bytes", hinted_mul_by_constant.len());
+
+            let script = script! {
+                for hint in hints { 
+                    { hint.push() }
+                }
+                { Fq2::push(a) }
+                { hinted_mul_by_constant.clone() }
+                { Fq2::push(c) }
+                { Fq2::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+
+    }
+
+    #[test]
+    fn test_bn254_fq2_hinted_square() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..100 {
+            let a = ark_bn254::Fq2::rand(&mut prng);
+            let c = a.mul(&a);
+
+            let (hinted_square, hints) = Fq2::hinted_square(a);
+            println!("Fq2::hinted_square: {} bytes", hinted_square.len());
+
+            let script = script! {
+                for hint in hints { 
+                    { hint.push() }
+                }
+                { Fq2::push(a) }
+                { hinted_square.clone() }
+                { Fq2::push(c) }
+                { Fq2::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+
+    }
+
+    #[test]
+    fn test_bn254_fq2_hinted_frobenius_map() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..3 {
+            let a = ark_bn254::Fq2::rand(&mut prng);
+            let b = a.frobenius_map(0);
+
+            let (hinted_frobenius_map_0, hints) = Fq2::hinted_frobenius_map(0, a);
+            println!("Fq2.hinted_frobenius_map(0): {} bytes", hinted_frobenius_map_0.len());
+
+            let script = script! {
+                for hint in hints { 
+                    { hint.push() }
+                }
+                { Fq2::push(a) }
+                { hinted_frobenius_map_0 }
+                { Fq2::push(b) }
+                { Fq2::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+
+            let b = a.frobenius_map(1);
+
+            let (hinted_frobenius_map_1, hints) = Fq2::hinted_frobenius_map(1, a);
+            println!("Fq2.hinted_frobenius_map(1): {} bytes", hinted_frobenius_map_1.len());
+
+            let script = script! {
+                for hint in hints { 
+                    { hint.push() }
+                }
+                { Fq2::push(a) }
+                { hinted_frobenius_map_1 }
+                { Fq2::push(b) }
+                { Fq2::equalverify() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+}
diff --git a/src/bn254/fq6.rs b/bitvm/src/bn254/fq6.rs
similarity index 50%
rename from src/bn254/fq6.rs
rename to bitvm/src/bn254/fq6.rs
index 6612d1d53..bb3913e75 100644
--- a/src/bn254/fq6.rs
+++ b/bitvm/src/bn254/fq6.rs
@@ -1,13 +1,95 @@
 use crate::bn254::fp254impl::Fp254Impl;
 use crate::bn254::fq::Fq;
+use crate::bn254::fq12::Fq12;
 use crate::bn254::fq2::Fq2;
 use crate::treepp::{script, Script};
-use ark_ff::Fp6Config;
+use crate::bn254::utils::Hint;
+use ark_ff::{AdditiveGroup, Field, Fp6Config};
 use num_bigint::BigUint;
 
 pub struct Fq6;
 
 impl Fq6 {
+    pub fn copy(a: u32) -> Script {
+        script! {
+            { Fq2::copy(a + 4) }
+            { Fq2::copy(a + 4) }
+            { Fq2::copy(a + 4) }
+        }
+    }
+
+    pub fn roll(a: u32) -> Script {
+        script! {
+            { Fq2::roll(a + 4) }
+            { Fq2::roll(a + 4) }
+            { Fq2::roll(a + 4) }
+        }
+    }
+
+    pub fn drop() -> Script {
+        script! {
+            { Fq2::drop() }
+            { Fq2::drop() }
+            { Fq2::drop() }
+        }
+    }
+
+    pub fn toaltstack() -> Script {
+        script! {
+            { Fq2::toaltstack() }
+            { Fq2::toaltstack() }
+            { Fq2::toaltstack() }
+        }
+    }
+
+    pub fn is_zero() -> Script {
+        script! (
+            for _ in 0..6 {
+                {Fq::push(ark_bn254::Fq::ZERO)}
+                {Fq::equal(1, 0)}
+                OP_TOALTSTACK
+            }
+            {1}
+            for _ in 0..6 {
+                OP_FROMALTSTACK
+                OP_BOOLAND
+            }
+        )
+        // Fq6::ZERO -> {1} else {0}
+    }
+
+    pub fn fromaltstack() -> Script {
+        script! {
+            { Fq2::fromaltstack() }
+            { Fq2::fromaltstack() }
+            { Fq2::fromaltstack() }
+        }
+    }
+    
+    pub fn push(a: ark_bn254::Fq6) -> Script {
+        script! {
+            for elem in a.to_base_prime_field_elements() {
+                { Fq::push_u32_le(&BigUint::from(elem).to_u32_digits()) }
+           }
+        }
+    }
+
+    pub fn push_zero() -> Script {
+        script! {
+            { Fq2::push_zero() }
+            { Fq2::push_zero() }
+            { Fq2::push_zero() }
+        }
+    }
+
+    pub fn equalverify() -> Script {
+        script! {
+            for i in 0..6 {
+                { Fq::equalverify(11 - i * 2, 5 - i) }
+            }
+        }
+    }
+
     pub fn add(mut a: u32, mut b: u32) -> Script {
         if a < b {
             (a, b) = (b, a);
@@ -43,11 +125,11 @@ impl Fq6 {
         }
     }
 
-    pub fn equalverify() -> Script {
+    pub fn neg(a: u32) -> Script {
         script! {
-            for i in 0..6 {
-                { Fq::equalverify(11 - i * 2, 5 - i) }
-            }
+            { Fq2::neg(a + 4) }
+            { Fq2::neg(a + 4) }
+            { Fq2::neg(a + 4) }
         }
     }
 
@@ -66,138 +148,193 @@ impl Fq6 {
         }
     }
 
-    // input:
-    //   p  (6 elements)
-    //   x  (2 elements)
-    pub fn mul_by_fp2() -> Script {
-        script! {
-            // compute p.c0 * c0
-            { Fq2::roll(6) }
-            { Fq2::copy(2) }
-            { Fq2::mul(2, 0) }
+    pub fn hinted_square(a: ark_bn254::Fq6) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
 
-            // compute p.c1 * c1
-            { Fq2::roll(6) }
-            { Fq2::copy(4) }
-            { Fq2::mul(2, 0) }
+        let (hinted_script1, hints1) = Fq2::hinted_square(a.c0);
+        let (hinted_script2, hints2) = Fq2::hinted_square(a.c0 + a.c1 + a.c2);
+        let (hinted_script3, hints3) = Fq2::hinted_square(a.c0 - a.c1 + a.c2);
+        let (hinted_script4, hints4) = Fq2::hinted_mul(2, a.c1,0, a.c2);
+        let (hinted_script5, hints5) = Fq2::hinted_square(a.c2);
 
-            // compute p.c2 * c2
-            { Fq2::roll(6) }
-            { Fq2::roll(6) }
-            { Fq2::mul(2, 0) }
-        }
-    }
+        let mut script = script! {};
+        let script_lines = [
+            // compute s_0 = a_0 ^ 2
+            Fq2::copy(4),
+            hinted_script1,
 
-    pub fn mul_by_fp2_constant(constant: &ark_bn254::Fq2) -> Script {
-        script! {
-            // compute p.c0 * c0
-            { Fq2::roll(4) }
-            { Fq2::mul_by_constant(constant) }
+            // compute a_0 + a_2
+            Fq2::roll(6),
+            Fq2::copy(4),
+            Fq2::add(2, 0),
 
-            // compute p.c1 * c1
-            { Fq2::roll(4) }
-            { Fq2::mul_by_constant(constant) }
+            // compute s_1 = (a_0 + a_1 + a_2) ^ 2
+            Fq2::copy(0),
+            Fq2::copy(8),
+            Fq2::add(2, 0),
+            hinted_script2,
 
-            // compute p.c2 * c2
-            { Fq2::roll(4) }
-            { Fq2::mul_by_constant(constant) }
-        }
+            // compute s_2 = (a_0 - a_1 + a_2) ^ 2
+            Fq2::copy(8),
+            Fq2::sub(4, 0),
+            hinted_script3,
+
+            // compute s_3 = 2a_1a_2
+            Fq2::roll(8),
+            Fq2::copy(8),
+            hinted_script4,
+            Fq2::double(0),
+
+            // compute s_4 = a_2 ^ 2
+            Fq2::roll(8),
+            hinted_script5,
+
+            // compute t_1 = (s_1 + s_2) / 2
+            Fq2::copy(6),
+            Fq2::roll(6),
+            Fq2::add(2, 0),
+            Fq2::div2(),
+
+            // at this point, we have s_0, s_1, s_3, s_4, t_1
+
+            // compute c_0 = s_0 + \beta s_3
+            Fq2::copy(4),
+            Fq6::mul_fq2_by_nonresidue(),
+            Fq2::copy(10),
+            Fq2::add(2, 0),
+
+            // compute c_1 = s_1 - s_3 - t_1 + \beta s_4
+            Fq2::copy(4),
+            Fq6::mul_fq2_by_nonresidue(),
+            Fq2::copy(4),
+            Fq2::add(10, 0),
+            Fq2::sub(10, 0),
+            Fq2::add(2, 0),
+
+            // compute c_2 = t_1 - s_0 - s_4
+            Fq2::add(8, 6),
+            Fq2::sub(6, 0),
+        ];
+        for script_line in script_lines {
+            script = script.push_script(script_line.compile());
+        }
+
+        hints.extend(hints1);
+        hints.extend(hints2);
+        hints.extend(hints3);
+        hints.extend(hints4);
+        hints.extend(hints5);
+        
+        (script, hints)
     }
 
-    pub fn push_one() -> Script {
-        script! {
-            { Fq2::push_one() }
-            { Fq2::push_zero() }
-            { Fq2::push_zero() }
-        }
+    // Input: [A, B]
+    // Output: [C] where C = A x B
+    pub fn hinted_mul(a_depth: u32, a: ark_bn254::Fq6, b_depth: u32, b: ark_bn254::Fq6) -> (Script, Vec<Hint>) {
+        Self::hinted_mul_core(a_depth, a, b_depth, b, script!{})
     }
 
-    pub fn push_zero() -> Script {
-        script! {
-            { Fq2::push_zero() }
-            { Fq2::push_zero() }
-            { Fq2::push_zero() }
-        }
+    // Input: [A, B]
+    // Output: [A, B, C] where C = A x B
+    pub fn hinted_mul_keep_elements(a_depth: u32, a: ark_bn254::Fq6, b_depth: u32, b: ark_bn254::Fq6) -> (Script, Vec<Hint>) {
+        let preserve_scr = script!{
+            {Fq6::toaltstack()}
+            {Fq12::copy(0)}
+            {Fq6::fromaltstack()}
+        };
+        
+        Self::hinted_mul_core(a_depth, a, b_depth, b, preserve_scr)
     }
 
-    pub fn mul(mut a: u32, mut b: u32) -> Script {
+    fn hinted_mul_core(mut a_depth: u32, mut a: ark_bn254::Fq6, mut b_depth: u32, mut b: ark_bn254::Fq6, keep_elements_scr: Script) -> (Script, Vec<Hint>) {
         // The degree-6 extension on BN254 Fq2 is under the polynomial y^3 - x - 9
         // Toom-Cook-3 from https://eprint.iacr.org/2006/471.pdf
-        if a < b {
+        if a_depth < b_depth {
+            (a_depth, b_depth) = (b_depth, a_depth);
             (a, b) = (b, a);
         }
+        assert_ne!(a_depth, b_depth);
+        let mut hints = Vec::new();
 
-        script! {
+        let (hinted_script1, hint1) = Fq2::hinted_mul(2, a.c0, 0, b.c0);
+        let (hinted_script2, hint2) = Fq2::hinted_mul(6, a.c0+a.c1+a.c2, 2, b.c0+b.c1+b.c2);
+        let (hinted_script3, hint3) = Fq2::hinted_mul(4, a.c0-a.c1+a.c2, 2, b.c0-b.c1+b.c2);
+        let (hinted_script4, hint4) = Fq2::hinted_mul(2, a.c0+a.c1+a.c1+a.c2+a.c2+a.c2+a.c2, 
+                                                                                0, b.c0+b.c1+b.c1+b.c2+b.c2+b.c2+b.c2);
+        let (hinted_script5, hint5) = Fq2::hinted_mul(2, a.c2, 0, b.c2);
+
+        let script = script! {
             // compute ad = P(0)
-            { Fq2::copy(b + 4) }
-            { Fq2::copy(a + 6) }
-            { Fq2::mul(2, 0) }
+            { Fq2::copy(a_depth + 4) }
+            { Fq2::copy(b_depth + 6) }
+            { hinted_script1 }
 
             // compute a+c
-            { Fq2::copy(a + 6) }
-            { Fq2::copy(a + 4) }
+            { Fq2::copy(a_depth + 6) }
+            { Fq2::copy(a_depth + 4) }
             { Fq2::add(2, 0) }
 
             // compute a+b+c, a-b+c
             { Fq2::copy(0) }
-            { Fq2::copy(a + 8) }
+            { Fq2::copy(a_depth + 8) }
             { Fq2::copy(0) }
             { Fq2::add(4, 0) }
             { Fq2::sub(4, 2) }
 
             // compute d+f
-            { Fq2::copy(b + 10) }
-            { Fq2::copy(b + 8) }
+            { Fq2::copy(b_depth + 10) }
+            { Fq2::copy(b_depth + 8) }
             { Fq2::add(2, 0) }
 
             // compute d+e+f, d-e+f
             { Fq2::copy(0) }
-            { Fq2::copy(b + 12) }
+            { Fq2::copy(b_depth + 12) }
             { Fq2::copy(0) }
             { Fq2::add(4, 0) }
             { Fq2::sub(4, 2) }
 
             // compute (a+b+c)(d+e+f) = P(1)
-            { Fq2::mul(6, 2) }
+            { hinted_script2 }
 
             // compute (a-b+c)(d-e+f) = P(-1)
-            { Fq2::mul(4, 2) }
+            { hinted_script3 }
+
+            { keep_elements_scr }
 
             // compute 2b
-            { Fq2::roll(a + 8) }
+            { Fq2::roll(a_depth + 8) }
             { Fq2::double(0) }
 
             // compute 4c
-            { Fq2::copy(a + 8) }
+            { Fq2::copy(a_depth + 8) }
             { Fq2::double(0) }
             { Fq2::double(0) }
-
             // compute a+2b+4c
             { Fq2::add(2, 0) }
-            { Fq2::roll(a + 10) }
+            { Fq2::roll(a_depth + 10) }
             { Fq2::add(2, 0) }
 
             // compute 2e
-            { Fq2::roll(b + 10) }
+            { Fq2::roll(b_depth + 10) }
             { Fq2::double(0) }
 
             // compute 4f
-            { Fq2::copy(b + 10) }
+            { Fq2::copy(b_depth + 10) }
             { Fq2::double(0) }
             { Fq2::double(0) }
 
             // compute d+2e+4f
             { Fq2::add(2, 0) }
-            { Fq2::roll(b + 12) }
+            { Fq2::roll(b_depth + 12) }
             { Fq2::add(2, 0) }
 
             // compute (a+2b+4c)(d+2e+4f) = P(2)
-            { Fq2::mul(2, 0) }
+            { hinted_script4 }
 
             // compute cf = P(inf)
-            { Fq2::roll(b + 8) }
-            { Fq2::roll(a + 4) }
-            { Fq2::mul(2, 0) }
+            { Fq2::roll(a_depth + 4) }
+            { Fq2::roll(b_depth + 10) }
+            { hinted_script5 }
 
             // // at this point, we have v_0, v_1, v_2, v_3, v_4
 
@@ -268,7 +405,14 @@ impl Fq6 {
             { Fq2::roll(4) }
             { Fq2::div2() }
             { Fq2::div3() }
-        }
+        };
+        hints.extend(hint1);
+        hints.extend(hint2);
+        hints.extend(hint3);
+        hints.extend(hint4);
+        hints.extend(hint5);
+
+        (script, hints)
     }
 
     // input:
@@ -277,17 +421,25 @@ impl Fq6 {
     //    p.c2   (2 elements)
     //    c0  (2 elements)
     //    c1  (2 elements)
-    pub fn mul_by_01() -> Script {
-        script! {
+    pub fn hinted_mul_by_01(p: ark_bn254::Fq6, c0: ark_bn254::Fq2, c1: ark_bn254::Fq2) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+
+        let (hinted_script1, hint1) = Fq2::hinted_mul(2, p.c0, 0, c0);
+        let (hinted_script2, hint2) = Fq2::hinted_mul(2, p.c1, 0, c1);
+        let (hinted_script3, hint3) = Fq2::hinted_mul(2, p.c1+p.c2, 0, c1);
+        let (hinted_script4, hint4) = Fq2::hinted_mul(2, p.c0+p.c1, 0, c0+c1);
+        let (hinted_script5, hint5) = Fq2::hinted_mul(10, c0, 0, p.c0+p.c2);
+
+        let script = script! {
             // compute a_a = p.c0 * c0
             { Fq2::copy(8) }
             { Fq2::copy(4) }
-            { Fq2::mul(2, 0) }
+            { hinted_script1 }
 
             // compute b_b = p.c1 * c1
             { Fq2::copy(8) }
             { Fq2::copy(4) }
-            { Fq2::mul(2, 0) }
+            { hinted_script2 }
 
             // compute tmp = p.c1 + p.c2
             { Fq2::copy(10) }
@@ -296,7 +448,7 @@ impl Fq6 {
 
             // t1 = c1 * tmp
             { Fq2::copy(6) }
-            { Fq2::mul(2, 0) }
+            { hinted_script3 }
 
             // t1 = t1 - b_b
             { Fq2::copy(2) }
@@ -320,7 +472,7 @@ impl Fq6 {
             { Fq2::add(2, 0) }
 
             // t2 = t2 * tmp
-            { Fq2::mul(2, 0) }
+            { hinted_script4 }
 
             // t2 = t2 - a_a
             { Fq2::copy(6) }
@@ -334,285 +486,82 @@ impl Fq6 {
             { Fq2::add(12, 10) }
 
             // t3 = c0 * tmp
-            { Fq2::mul(10, 0) }
+            { hinted_script5 }
 
             // t3 = t3 - a_a
             { Fq2::sub(0, 8) }
 
             // t3 = t3 + b_b
             { Fq2::add(0, 6) }
-        }
-    }
-
-    // input:
-    //    p.c0   (2 elements)
-    //    p.c1   (2 elements)
-    //    p.c2   (2 elements)
-    //    c0     (2 elements)
-    pub fn mul_by_01_with_1_constant(constant: &ark_bn254::Fq2) -> Script {
-        script! {
-            // compute a_a = p.c0 * c0
-            { Fq2::copy(6) }
-            { Fq2::copy(2) }
-            { Fq2::mul(2, 0) }
-
-            // compute b_b = p.c1 * c1
-            { Fq2::copy(6) }
-            { Fq2::mul_by_constant(constant) }
-
-            // compute tmp = p.c1 + p.c2
-            { Fq2::copy(8) }
-            { Fq2::copy(8) }
-            { Fq2::add(2, 0) }
-
-            // t1 = c1 * tmp
-            { Fq2::mul_by_constant(constant) }
-
-            // t1 = t1 - b_b
-            { Fq2::copy(2) }
-            { Fq2::sub(2, 0) }
-
-            // t1 = t1 * nonresidue
-            { Fq6::mul_fq2_by_nonresidue() }
-
-            // t1 = t1 + a_a
-            { Fq2::copy(4) }
-            { Fq2::add(2, 0) }
-
-            // compute tmp = p.c0 + p.c1
-            { Fq2::copy(12) }
-            { Fq2::roll(12) }
-            { Fq2::add(2, 0) }
-
-            // t2 = c0 + c1
-            { Fq2::copy(8) }
-            { Fq::push_u32_le(&BigUint::from(constant.c0).to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from(constant.c1).to_u32_digits()) }
-            { Fq2::add(2, 0) }
+        };
+        hints.extend(hint1);
+        hints.extend(hint2);
+        hints.extend(hint3);
+        hints.extend(hint4);
+        hints.extend(hint5);
 
-            // t2 = t2 * tmp
-            { Fq2::mul(2, 0) }
-
-            // t2 = t2 - a_a
-            { Fq2::copy(6) }
-            { Fq2::sub(2, 0) }
-
-            // t2 = t2 - b_b
-            { Fq2::copy(4) }
-            { Fq2::sub(2, 0) }
-
-            // compute tmp = p.c0 + p.c2
-            { Fq2::add(12, 10) }
-
-            // t3 = c0 * tmp
-            { Fq2::mul(10, 0) }
+        (script, hints)
 
-            // t3 = t3 - a_a
-            { Fq2::sub(0, 8) }
-
-            // t3 = t3 + b_b
-            { Fq2::add(0, 6) }
-        }
     }
 
-    /// Square the top Fq6 element
-    ///
-    /// Optimized by: @Hakkush-07
-    pub fn square() -> Script {
-        // CH-SQR3 from https://eprint.iacr.org/2006/471.pdf
-        script! {
-            // compute s_0 = a_0 ^ 2
-            { Fq2::copy(4) }
-            { Fq2::square() }
-
-            // compute a_0 + a_2
-            { Fq2::roll(6) }
-            { Fq2::copy(4) }
-            { Fq2::add(2, 0) }
-
-            // compute s_1 = (a_0 + a_1 + a_2) ^ 2
-            { Fq2::copy(0) }
-            { Fq2::copy(8) }
-            { Fq2::add(2, 0) }
-            { Fq2::square() }
-
-            // compute s_2 = (a_0 - a_1 + a_2) ^ 2
-            { Fq2::copy(8) }
-            { Fq2::sub(4, 0) }
-            { Fq2::square() }
-
-            // compute s_3 = 2a_1a_2
-            { Fq2::roll(8) }
-            { Fq2::copy(8) }
-            { Fq2::mul(2, 0) }
-            { Fq2::double(0) }
-
-            // compute s_4 = a_2 ^ 2
-            { Fq2::roll(8) }
-            { Fq2::square() }
-
-            // compute t_1 = (s_1 + s_2) / 2
-            { Fq2::copy(6) }
-            { Fq2::roll(6) }
-            { Fq2::add(2, 0) }
-            { Fq2::div2() }
-
-            // at this point, we have s_0, s_1, s_3, s_4, t_1
-
-            // compute c_0 = s_0 + \beta s_3
-            { Fq2::copy(4) }
-            { Fq6::mul_fq2_by_nonresidue() }
-            { Fq2::copy(10) }
-            { Fq2::add(2, 0) }
-
-            // compute c_1 = s_1 - s_3 - t_1 + \beta s_4
-            { Fq2::copy(4) }
-            { Fq6::mul_fq2_by_nonresidue() }
-            { Fq2::copy(4) }
-            { Fq2::add(10, 0) }
-            { Fq2::sub(10, 0) }
-            { Fq2::add(2, 0) }
-
-            // compute c_2 = t_1 - s_0 - s_4
-            { Fq2::add(8, 6) }
-            { Fq2::sub(6, 0) }
-        }
-    }
+    pub fn hinted_mul_by_fp2_constant(a: ark_bn254::Fq6, constant: &ark_bn254::Fq2) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
 
-    pub fn copy(a: u32) -> Script {
-        script! {
-            { Fq2::copy(a + 4) }
-            { Fq2::copy(a + 4) }
-            { Fq2::copy(a + 4) }
-        }
-    }
+        let (hinted_script1, hint1) = Fq2::hinted_mul_by_constant(a.c0, constant);
+        let (hinted_script2, hint2) = Fq2::hinted_mul_by_constant(a.c1, constant);
+        let (hinted_script3, hint3) = Fq2::hinted_mul_by_constant(a.c2, constant);
 
-    pub fn roll(a: u32) -> Script {
-        script! {
-            { Fq2::roll(a + 4) }
-            { Fq2::roll(a + 4) }
-            { Fq2::roll(a + 4) }
-        }
-    }
+        let script = script! {
+            // compute p.c0 * c0
+            { Fq2::roll(4) }
+            { hinted_script1 }
+            // compute p.c1 * c1
+            { Fq2::roll(4) }
+            { hinted_script2 }
+            // compute p.c2 * c2
+            { Fq2::roll(4) }
+            { hinted_script3 }
+        };
+        hints.extend(hint1);
+        hints.extend(hint2);
+        hints.extend(hint3);
 
-    pub fn neg(a: u32) -> Script {
-        script! {
-            { Fq2::neg(a + 4) }
-            { Fq2::neg(a + 4) }
-            { Fq2::neg(a + 4) }
-        }
+        (script, hints)
     }
 
-    pub fn inv() -> Script {
-        script! {
-            // compute t0 = c0^2, t1 = c1^2, t2 = c2^2
-            { Fq2::copy(4) }
-            { Fq2::square() }
-            { Fq2::copy(4) }
-            { Fq2::square() }
-            { Fq2::copy(4) }
-            { Fq2::square() }
-
-            // compute t3 = c0 * c1, t4 = c0 * c2, t5 = c1 * c2
-            { Fq2::copy(10) }
-            { Fq2::copy(10) }
-            { Fq2::mul(2, 0) }
-            { Fq2::copy(12) }
-            { Fq2::copy(10) }
-            { Fq2::mul(2, 0) }
-            { Fq2::copy(12) }
-            { Fq2::copy(12) }
-            { Fq2::mul(2, 0) }
-
-            // update t5 = t5 * beta
-            { Fq6::mul_fq2_by_nonresidue() }
-
-            // compute s0 = t0 - t5
-            { Fq2::sub(10, 0) }
-
-            // compute s1 = t2 * beta - t3
-            { Fq2::roll(6) }
-            { Fq6::mul_fq2_by_nonresidue() }
-            { Fq2::sub(0, 6) }
+    pub fn hinted_frobenius_map(i: usize, a: ark_bn254::Fq6) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
 
-            // compute s2 = t1 - t4
-            { Fq2::sub(6, 4) }
-
-            // compute a1 = c2 * s1
-            { Fq2::copy(2) }
-            { Fq2::mul(8, 0) }
-
-            // compute a2 = c1 * s2
-            { Fq2::copy(2) }
-            { Fq2::mul(10, 0) }
-
-            // compute a3 = beta * (a1 + a2)
-            { Fq2::add(2, 0) }
-            { Fq6::mul_fq2_by_nonresidue() }
-
-            // compute t6 = c0 * s0 + a3
-            { Fq2::copy(6) }
-            { Fq2::mul(10, 0) }
-            { Fq2::add(2, 0) }
-
-            // inverse t6
-            { Fq2::inv() }
-
-            // compute final c0 = s0 * t6
-            { Fq2::copy(0) }
-            { Fq2::mul(8, 0) }
-
-            // compute final c1 = s1 * t6
-            { Fq2::copy(2) }
-            { Fq2::mul(8, 0) }
-
-            // compute final c2 = s2 * t6
-            { Fq2::mul(6, 4) }
-        }
-    }
+        let (hinted_script1, hint1) = Fq2::hinted_frobenius_map(i, a.c0);
+        let (hinted_script2, hint2) = Fq2::hinted_frobenius_map(i, a.c1);
+        let (hinted_script3, hint3) = Fq2::hinted_mul_by_constant(a.c1.frobenius_map(i), &ark_bn254::Fq6Config::FROBENIUS_COEFF_FP6_C1[i % ark_bn254::Fq6Config::FROBENIUS_COEFF_FP6_C1.len()]);
+        let (hinted_script4, hint4) = Fq2::hinted_frobenius_map(i, a.c2);
+        let (hinted_script5, hint5) = Fq2::hinted_mul_by_constant(a.c2.frobenius_map(i), &ark_bn254::Fq6Config::FROBENIUS_COEFF_FP6_C2[i % ark_bn254::Fq6Config::FROBENIUS_COEFF_FP6_C2.len()]);
 
-    pub fn frobenius_map(i: usize) -> Script {
-        script! {
+        let script = script! {
             { Fq2::roll(4) }
-            { Fq2::frobenius_map(i) }
+            { hinted_script1 }
             { Fq2::roll(4) }
-            { Fq2::frobenius_map(i) }
-            { Fq2::mul_by_constant(&ark_bn254::Fq6Config::FROBENIUS_COEFF_FP6_C1[i % ark_bn254::Fq6Config::FROBENIUS_COEFF_FP6_C1.len()]) }
+            { hinted_script2 }
+            { hinted_script3 }
             { Fq2::roll(4) }
-            { Fq2::frobenius_map(i) }
-            { Fq2::mul_by_constant(&ark_bn254::Fq6Config::FROBENIUS_COEFF_FP6_C2[i % ark_bn254::Fq6Config::FROBENIUS_COEFF_FP6_C2.len()]) }
-        }
-    }
-
-    pub fn toaltstack() -> Script {
-        script! {
-            { Fq2::toaltstack() }
-            { Fq2::toaltstack() }
-            { Fq2::toaltstack() }
-        }
-    }
-
-    pub fn fromaltstack() -> Script {
-        script! {
-            { Fq2::fromaltstack() }
-            { Fq2::fromaltstack() }
-            { Fq2::fromaltstack() }
-        }
-    }
-
-    pub fn drop() -> Script {
-        script! {
-            { Fq2::drop() }
-            { Fq2::drop() }
-            { Fq2::drop() }
-        }
+            { hinted_script4 }
+            { hinted_script5 }
+        };
+        hints.extend(hint1);
+        hints.extend(hint2);
+        hints.extend(hint3);
+        hints.extend(hint4);
+        hints.extend(hint5);
+
+        (script, hints)
     }
 }
 
 #[cfg(test)]
 mod test {
+    use crate::bn254::fq2::Fq2;
     use crate::bn254::fq6::Fq6;
-    use crate::bn254::utils::{fq2_push, fq6_push};
     use crate::treepp::*;
     use ark_ff::Field;
     use ark_std::UniformRand;
@@ -629,18 +578,17 @@ mod test {
         for _ in 0..50 {
             let a = ark_bn254::Fq6::rand(&mut prng);
             let b = ark_bn254::Fq6::rand(&mut prng);
-            let c = &a + &b;
+            let c = a + b;
 
             let script = script! {
-                { fq6_push(a) }
-                { fq6_push(b) }
+                { Fq6::push(a) }
+                { Fq6::push(b) }
                 { Fq6::add(6, 0) }
-                { fq6_push(c) }
+                { Fq6::push(c) }
                 { Fq6::equalverify() }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -652,29 +600,27 @@ mod test {
         for _ in 0..50 {
             let a = ark_bn254::Fq6::rand(&mut prng);
             let b = ark_bn254::Fq6::rand(&mut prng);
-            let c = &a - &b;
+            let c = a - b;
 
             let script = script! {
-                { fq6_push(a) }
-                { fq6_push(b) }
+                { Fq6::push(a) }
+                { Fq6::push(b) }
                 { Fq6::sub(6, 0) }
-                { fq6_push(c) }
+                { Fq6::push(c) }
                 { Fq6::equalverify() }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
 
             let script = script! {
-                { fq6_push(b) }
-                { fq6_push(a) }
+                { Fq6::push(b) }
+                { Fq6::push(a) }
                 { Fq6::sub(0, 6) }
-                { fq6_push(c) }
+                { Fq6::push(c) }
                 { Fq6::equalverify() }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -688,134 +634,76 @@ mod test {
             let c = a.double();
 
             let script = script! {
-                { fq6_push(a) }
+                { Fq6::push(a) }
                 { Fq6::double(0) }
-                { fq6_push(c) }
+                { Fq6::push(c) }
                 { Fq6::equalverify() }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
     #[test]
-    fn test_bn254_fq6_mul() {
-        println!("Fq6.mul: {} bytes", Fq6::mul(6, 0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
+    fn test_bn254_fq6_hinted_mul() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
 
-        for _ in 0..1 {
+        for _ in 0..100 {
             let a = ark_bn254::Fq6::rand(&mut prng);
             let b = ark_bn254::Fq6::rand(&mut prng);
             let c = a.mul(&b);
 
+            let (hinted_mul, hints) = Fq6::hinted_mul(6, a, 0, b);
+            println!("Fq6::hinted_mul: {} bytes", hinted_mul.len());
+
             let script = script! {
-                { fq6_push(a) }
-                { fq6_push(b) }
-                { Fq6::mul(6, 0) }
-                { fq6_push(c) }
+                for hint in hints { 
+                    { hint.push() }
+                }
+                { Fq6::push(a) }
+                { Fq6::push(b) }
+                { hinted_mul.clone() }
+                { Fq6::push(c) }
                 { Fq6::equalverify() }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
     #[test]
-    fn test_bn254_fq6_mul_by_01() {
-        println!("Fq6.mul_by_01: {} bytes", Fq6::mul_by_01().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
+    fn test_bn254_fq6_hinted_mul_by_01() {
+        let mut prng: ChaCha20Rng = ChaCha20Rng::seed_from_u64(0);
 
-        for _ in 0..1 {
+        for _ in 0..100 {
             let a = ark_bn254::Fq6::rand(&mut prng);
             let c0 = ark_bn254::Fq2::rand(&mut prng);
             let c1 = ark_bn254::Fq2::rand(&mut prng);
             let mut b = a;
             b.mul_by_01(&c0, &c1);
 
-            let script = script! {
-                { fq6_push(a) }
-                { fq2_push(c0) }
-                { fq2_push(c1) }
-                { Fq6::mul_by_01() }
-                { fq6_push(b) }
-                { Fq6::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_mul_by_fp2() {
-        println!("Fq6.mul_by_fp2: {} bytes", Fq6::mul_by_fp2().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq6::rand(&mut prng);
-            let b = ark_bn254::Fq2::rand(&mut prng);
-            let mut c = a;
-            c.mul_by_fp2(&b);
-
-            let script = script! {
-                { fq6_push(a) }
-                { fq2_push(b) }
-                { Fq6::mul_by_fp2() }
-                { fq6_push(c) }
-                { Fq6::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq6_inv() {
-        println!("Fq6.inv: {} bytes", Fq6::inv().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq6::rand(&mut prng);
-            let b = a.inverse().unwrap();
+            let (hinted_mul_by_01, hints) = Fq6::hinted_mul_by_01(a, c0, c1);
+            println!("Fq6::hinted_mul_by_01: {} bytes", hinted_mul_by_01.len());
 
             let script = script! {
-                { fq6_push(a) }
-                { Fq6::inv() }
-                { fq6_push(b) }
+                for hint in hints { 
+                    { hint.push() }
+                }
+                { Fq6::push(a) }
+                { Fq2::push(c0) }
+                { Fq2::push(c1) }
+                { hinted_mul_by_01.clone() }
+                { Fq6::push(b) }
                 { Fq6::equalverify() }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
-    }
 
-    #[test]
-    fn test_bn254_fq6_square() {
-        println!("Fq6.square: {} bytes", Fq6::square().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq6::rand(&mut prng);
-            let b = a.square();
-
-            let script = script! {
-                { fq6_push(a) }
-                { Fq6::square() }
-                { fq6_push(b) }
-                { Fq6::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
     }
 
     #[test]
-    fn test_bn254_fq6_frobenius_map() {
+    fn test_bn254_fq6_hinted_frobenius_map() {
         let mut prng = ChaCha20Rng::seed_from_u64(0);
 
         for _ in 0..1 {
@@ -823,18 +711,20 @@ mod test {
                 let a = ark_bn254::Fq6::rand(&mut prng);
                 let b = a.frobenius_map(i);
 
-                let frobenius_map = Fq6::frobenius_map(i);
-                println!("Fq6.frobenius_map({}): {} bytes", i, frobenius_map.len());
+                let (hinted_frobenius_map, hints) = Fq6::hinted_frobenius_map(i, a);
+                println!("Fq6.hinted_frobenius_map({}): {} bytes", i, hinted_frobenius_map.len());
 
                 let script = script! {
-                    { fq6_push(a) }
-                    { frobenius_map.clone() }
-                    { fq6_push(b) }
+                    for hint in hints { 
+                        { hint.push() }
+                    }
+                    { Fq6::push(a) }
+                    { hinted_frobenius_map.clone() }
+                    { Fq6::push(b) }
                     { Fq6::equalverify() }
                     OP_TRUE
                 };
-                let exec_result = execute_script(script);
-                assert!(exec_result.success);
+                run(script);
             }
         }
     }
diff --git a/src/bn254/fr.rs b/bitvm/src/bn254/fr.rs
similarity index 53%
rename from src/bn254/fr.rs
rename to bitvm/src/bn254/fr.rs
index 9089403f0..9b0fbdadf 100644
--- a/src/bn254/fr.rs
+++ b/bitvm/src/bn254/fr.rs
@@ -1,4 +1,12 @@
+#![allow(clippy::reversed_empty_ranges)]
+use bitcoin_script::script;
+use num_bigint::{BigInt, BigUint};
+use num_traits::{FromPrimitive, Num, ToPrimitive};
+
+use crate::bigint::BigIntImpl;
 use crate::bn254::fp254impl::Fp254Impl;
+use crate::pseudo::NMUL;
+use crate::treepp::Script;
 
 pub struct Fr;
 
@@ -6,17 +14,10 @@ impl Fp254Impl for Fr {
     const MODULUS: &'static str =
         "30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001";
 
-    // 2²⁶¹ mod p  <=>  0xdc83629563d44755301fa84819caa8075bba827a494b01a2fd4e1568fffff57
-    const MONTGOMERY_ONE: &'static str =
-        "dc83629563d44755301fa84819caa8075bba827a494b01a2fd4e1568fffff57";
-
     // p = 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001
     const MODULUS_LIMBS: [u32; Self::N_LIMBS as usize] = [
-        0x10000001, 0x1f0fac9f, 0xe5c2450, 0x7d090f3, 0x1585d283, 0x2db40c0, 0xa6e141, 0xe5c2634, 0x30644e
-    ];
-    // inv₂₆₁ p  <=>  0xd8c07d0e2f27cbe4d1c6567d766f9dc6e9a7979b4b396ee4c3d1e0a6c10000001
-    const MODULUS_INV_261: [u32; Self::N_LIMBS as usize] = [
-        0x10000001, 0x8f05360, 0x5bb930f, 0x12f36967, 0x1dc6e9a7, 0x13ebb37c, 0x19347195, 0x1c5e4f97, 0xd8c07d0
+        0x10000001, 0x1f0fac9f, 0xe5c2450, 0x7d090f3, 0x1585d283, 0x2db40c0, 0xa6e141, 0xe5c2634,
+        0x30644e,
     ];
 
     const P_PLUS_ONE_DIV2: &'static str =
@@ -28,36 +29,35 @@ impl Fp254Impl for Fr {
     const P_PLUS_TWO_DIV3: &'static str =
         "10216f7ba065e00de81ac1e7808072c9b8114d6d7de87adb16a0a73150000001";
     type ConstantType = ark_bn254::Fr;
+}
+
+impl Fr {
+    pub fn modulus_as_bigint() -> BigInt {
+        BigInt::from_str_radix(Self::MODULUS, 16).unwrap()
+    }
+
 
+    #[inline]
+    pub fn push(a: ark_bn254::Fr) -> Script {
+        script! {
+            { Fr::push_u32_le(&BigUint::from(a).to_u32_digits()) }
+        }
+    }
 }
 
+
 #[cfg(test)]
 mod test {
     use crate::bn254::fp254impl::Fp254Impl;
     use crate::bn254::fr::Fr;
     use crate::treepp::*;
-    use ark_ff::{BigInteger, Field, PrimeField};
+    use ark_ff::AdditiveGroup;
     use ark_std::UniformRand;
-    use core::ops::{Add, Mul, Rem, Sub};
+    use core::ops::{Add, Rem, Sub};
     use num_bigint::{BigUint, RandomBits};
     use num_traits::Num;
     use rand::{Rng, SeedableRng};
     use rand_chacha::ChaCha20Rng;
-    use ark_ff::AdditiveGroup;
-
-    #[test]
-    fn test_decode_montgomery() {
-        println!("Fr.decode_montgomery: {} bytes", Fr::decode_montgomery().len());
-        let script = script! {
-            { Fr::push_one() }
-            { Fr::push_u32_le(&BigUint::from_str_radix(Fr::MONTGOMERY_ONE, 16).unwrap().to_u32_digits()) }
-            { Fr::decode_montgomery() }
-            { Fr::equalverify(1, 0) }
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
 
     #[test]
     fn test_add() {
@@ -83,8 +83,7 @@ mod test {
                 { Fr::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -112,8 +111,7 @@ mod test {
                 { Fr::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -135,58 +133,7 @@ mod test {
                 { Fr::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_mul() {
-        println!("Fr.mul: {} bytes", Fr::mul().len());
-        let m = BigUint::from_str_radix(Fr::MODULUS, 16).unwrap();
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        for _ in 0..3 {
-            let a: BigUint = prng.sample(RandomBits::new(254));
-            let b: BigUint = prng.sample(RandomBits::new(254));
-
-            let a = a.rem(&m);
-            let b = b.rem(&m);
-            let c: BigUint = a.clone().mul(b.clone()).rem(&m);
-
-            let script = script! {
-                { Fr::push_u32_le(&a.to_u32_digits()) }
-                { Fr::push_u32_le(&b.to_u32_digits()) }
-                { Fr::mul() }
-                { Fr::push_u32_le(&c.to_u32_digits()) }
-                { Fr::equalverify(1, 0) }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_square() {
-        println!("Fr.square: {} bytes", Fr::square().len());
-        let m = BigUint::from_str_radix(Fr::MODULUS, 16).unwrap();
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        for _ in 0..10 {
-            let a: BigUint = prng.sample(RandomBits::new(254));
-
-            let a = a.rem(&m);
-            let c: BigUint = a.clone().mul(a.clone()).rem(&m);
-
-            let script = script! {
-                { Fr::push_u32_le(&a.to_u32_digits()) }
-                { Fr::square() }
-                { Fr::push_u32_le(&c.to_u32_digits()) }
-                { Fr::equalverify(1, 0) }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -207,29 +154,7 @@ mod test {
                 { Fr::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_inv() {
-        println!("Fr.inv: {} bytes", Fr::inv().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fr::rand(&mut prng);
-            let c = a.inverse().unwrap();
-
-            let script = script! {
-                { Fr::push_u32_le(&BigUint::from(a).to_u32_digits()) }
-                { Fr::inv() }
-                { Fr::push_u32_le(&BigUint::from(c).to_u32_digits()) }
-                { Fr::equalverify(1, 0) }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -249,8 +174,7 @@ mod test {
                 { Fr::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -271,27 +195,35 @@ mod test {
                 { Fr::equalverify(1, 0) }
                 OP_TRUE
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
     #[test]
     fn test_is_one() {
-        println!("Fr.is_one: {} bytes", Fr::is_one(0).len());
-        println!("Fr.is_one_keep_element: {} bytes", Fr::is_one_keep_element(0).len());
+        println!("Fr.is_one: {} bytes", Fr::is_one().len());
+        println!(
+            "Fr.is_one_keep_element: {} bytes",
+            Fr::is_one_keep_element(0).len()
+        );
         let script = script! {
             { Fr::push_one() }
             { Fr::is_one_keep_element(0) }
-            { Fr::is_one(1) }
+            OP_TOALTSTACK
+            { Fr::is_one() }
+            OP_FROMALTSTACK
             OP_BOOLAND
         };
+        run(script);
     }
 
     #[test]
     fn test_is_zero() {
         println!("Fr.is_zero: {} bytes", Fr::is_zero(0).len());
-        println!("Fr.is_zero_keep_element: {} bytes", Fr::is_zero_keep_element(0).len());
+        println!(
+            "Fr.is_zero_keep_element: {} bytes",
+            Fr::is_zero_keep_element(0).len()
+        );
         let mut prng = ChaCha20Rng::seed_from_u64(0);
 
         for _ in 0..10 {
@@ -325,40 +257,7 @@ mod test {
                 { Fr::is_zero(0) }
                 OP_BOOLAND
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_mul_by_constant() {
-        let m = BigUint::from_str_radix(Fr::MODULUS, 16).unwrap();
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for i in 0..3 {
-            let a: BigUint = prng.sample(RandomBits::new(254));
-            let a = a.rem(&m);
-
-            let b: BigUint = prng.sample(RandomBits::new(254));
-            let b = b.rem(&m);
-
-            let mul_by_constant = Fr::mul_by_constant(&ark_bn254::Fr::from(b.clone()));
-
-            if i == 0 {
-                println!("Fr.mul_by_constant: {} bytes", mul_by_constant.len());
-            }
-
-            let c: BigUint = a.clone().mul(b.clone()).rem(&m);
-
-            let script = script! {
-                { Fr::push_u32_le(&a.to_u32_digits()) }
-                { mul_by_constant.clone() }
-                { Fr::push_u32_le(&c.to_u32_digits()) }
-                { Fr::equalverify(1, 0) }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
     }
 
@@ -377,8 +276,7 @@ mod test {
                 { Fr::push_u32_le(&a.to_u32_digits()) }
                 { Fr::is_field() }
             };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
+            run(script);
         }
 
         let script = script! {
@@ -386,8 +284,7 @@ mod test {
             { Fr::is_field() }
             OP_NOT
         };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
+        run(script);
 
         let script = script! {
             { Fr::push_modulus() } OP_1 OP_SUB
@@ -395,34 +292,6 @@ mod test {
             { Fr::is_field() }
             OP_NOT
         };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_convert_to_be_bytes() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        let convert_to_be_bytes_script = Fr::convert_to_be_bytes();
-        println!(
-            "Fr.convert_to_be_bytes: {} bytes",
-            convert_to_be_bytes_script.len()
-        );
-
-        for _ in 0..10 {
-            let fr = ark_bn254::Fr::rand(&mut prng);
-            let bytes = fr.into_bigint().to_bytes_be();
-
-            let script = script! {
-                { Fr::push_u32_le(&BigUint::from(fr).to_u32_digits()) }
-                { convert_to_be_bytes_script.clone() }
-                for i in 0..32 {
-                    { bytes[i] } OP_EQUALVERIFY
-                }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
+        run(script);
     }
 }
diff --git a/bitvm/src/bn254/g1.rs b/bitvm/src/bn254/g1.rs
new file mode 100644
index 000000000..a91510686
--- /dev/null
+++ b/bitvm/src/bn254/g1.rs
@@ -0,0 +1,915 @@
+use ark_ec::{AffineRepr};
+use ark_ff::{AdditiveGroup, Field};
+use num_bigint::{BigUint};
+use crate::bn254::fp254impl::Fp254Impl;
+use crate::bn254::fq::Fq;
+use crate::bn254::utils::Hint;
+use crate::treepp::{script, Script};
+
+use super::fq2::Fq2;
+
+pub struct G1Affine;
+
+impl G1Affine {
+    /// check line through one point, that is:
+    ///     y - alpha * x - bias = 0
+    ///
+    /// input on stack:
+    ///     x (1 elements)
+    ///     y (1 elements)
+    ///
+    /// input of parameters:
+    ///     c3: alpha
+    ///     c4: -bias
+    ///
+    /// output:
+    ///     true or false (consumed on stack)
+    pub fn hinted_check_line_through_point(
+        x: ark_bn254::Fq,
+        c3: ark_bn254::Fq,
+    ) -> (Script, Vec<Hint>) {
+        let (hinted_script1, hint1) = Fq::hinted_mul(1, x, 3, c3);
+        let script = script! {          //c3 c4 x y
+            {hinted_script1}                              //c4 y x*c3
+            {Fq::sub(1, 0)}                               //c4 y-x*c3
+            {Fq::add(1, 0)}                               //c4+y-x*c3
+            {Fq::push_zero()}
+            {Fq::equal(1, 0)}
+        };
+
+        let mut hints = vec![];
+        hints.extend(hint1);
+        (script, hints)
+    }
+
+    /// check whether a tuple coefficient (alpha, -bias) of a chord line is satisfied with expected points T and Q (both are affine cooordinates)
+    /// two aspects:
+    ///     1. T.y - alpha * T.x - bias = 0
+    ///     2. Q.y - alpha * Q.x - bias = 0, make sure the alpha/-bias are the right ONEs
+    ///
+    /// input on stack:
+    ///     T.x (1 elements)
+    ///     T.y (1 elements)
+    ///     Q.x (1 elements)
+    ///     Q.y (1 elements)
+    ///
+    /// input of parameters:
+    ///     c3: alpha
+    ///     c4: -bias
+    /// output:
+    ///     true or false (consumed on stack)
+    pub fn hinted_check_chord_line(
+        t: ark_bn254::G1Affine,
+        q: ark_bn254::G1Affine,
+        c3: ark_bn254::Fq,
+    ) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+
+        let (hinted_script1, hint1) = Self::hinted_check_line_through_point(q.x, c3);
+        let (hinted_script2, hint2) = Self::hinted_check_line_through_point(t.x, c3);
+        let script = script! {  //c3 c4 tx ty qx qy
+            {Fq::copy(5)}                       //c3 c4 tx ty qx qy c3
+            {Fq::copy(5)}                       //c3 c4 tx ty qx qy c3 c4
+            {Fq::roll(3)}                       //c3 c4 tx ty qy c3 c4 qx
+            {Fq::roll(3)}                       //c3 c4 tx ty c3 c4 qx qy
+            {hinted_script1}                    //c3 c4 tx ty (0/1)
+            OP_TOALTSTACK                       //c3 c4 tx ty | (0/1)
+            {hinted_script2}                    //(0/1)| (0/1)
+            OP_FROMALTSTACK                     //(0/1) (0/1)
+            OP_BOOLAND                          //(0/1)
+        };
+        hints.extend(hint1);
+        hints.extend(hint2);
+
+        (script, hints)
+    }
+
+    /// check whether a tuple coefficient (alpha, -bias) of a tangent line is satisfied with expected point T (affine)
+    /// two aspects:
+    ///     1. alpha * (2 * T.y) = 3 * T.x^2, make sure the alpha is the right ONE
+    ///     2. T.y - alpha * T.x - bias = 0, make sure the -bias is the right ONE
+    ///
+    /// input on stack:
+    ///     T.x (1 element)
+    ///     T.y (1 element)
+    ///
+    /// input of parameters:
+    ///     c3: alpha
+    ///     c4: -bias
+    ///
+    /// output:
+    ///     true or false (consumed on stack)
+    pub fn hinted_check_tangent_line(
+        t: ark_bn254::G1Affine,
+        c3: ark_bn254::Fq,
+    ) -> (Script, Vec<Hint>) {
+        let mut hints = vec![];
+
+        let (hinted_script1, hint1) = Fq::hinted_mul(1, t.y + t.y, 0, c3);
+        let (hinted_script2, hint2) = Fq::hinted_square(t.x);
+        let (hinted_script3, hint3) = Self::hinted_check_line_through_point(t.x, c3);
+
+        let script = script! {                    // rest of hints..., c3 (alpha), c4 (-bias), t.x t.y
+            { Fq::copy(0) }                                         // alpha, -bias, x, y, y
+            { Fq::double(0) }                                       // alpha, -bias, x, y, 2y
+            { Fq::copy(4) }                                         // alpha, -bias, x, y, 2y, alpha
+            { hinted_script1 }                                      // alpha, -bias, x, y, alpha * (2 * y)
+            { Fq::copy(2) }                                         // alpha, -bias, x, y, alpha * (2 * y), x
+            { hinted_script2 }                                      // alpha, -bias, x, y, alpha * (2 * y), x^2
+            { Fq::copy(0) }                                         // alpha, -bias, x, y, alpha * (2 * y), x^2, x^2
+            { Fq::double(0) }                                       // alpha, -bias, x, y, alpha * (2 * y), x^2, 2x^2
+            { Fq::add(1, 0) }                                       // alpha, -bias, x, y, alpha * (2 * y), 3 * x^2
+            { Fq::sub(1, 0) }                                       // alpha, -bias, x, y, alpha * (2 * y) - 3 * x^2
+            { Fq::is_zero(0) }                                      // alpha, -bias, x, y, condition_one
+            OP_TOALTSTACK                                           // alpha, -bias, x, y  alt: condition_one
+            { hinted_script3 }                                      // conditon_two  alt: condition_one
+            OP_FROMALTSTACK OP_BOOLAND                              // result
+        };
+        hints.extend(hint1);
+        hints.extend(hint2);
+        hints.extend(hint3);
+
+        (script, hints)
+    }
+
+    pub fn push_zero() -> Script {
+        script! {
+            { Fq::push_zero() }
+            { Fq::push_zero() }
+        }
+    }
+
+    pub fn push(element: ark_bn254::G1Affine) -> Script {
+        script! {
+            { Fq::push_u32_le(&BigUint::from(element.x).to_u32_digits()) }
+            { Fq::push_u32_le(&BigUint::from(element.y).to_u32_digits()) }
+        }
+    }
+
+    pub fn read_from_stack(witness: Vec<Vec<u8>>) -> ark_bn254::G1Affine {
+        assert_eq!(witness.len() as u32, Fq::N_LIMBS * 2);
+        let x = Fq::read_u32_le(witness[0..Fq::N_LIMBS as usize].to_vec());
+        let y = Fq::read_u32_le(
+            witness[Fq::N_LIMBS as usize..2 * Fq::N_LIMBS as usize].to_vec(),
+        );
+        ark_bn254::G1Affine {
+            x: BigUint::from_slice(&x).into(),
+            y: BigUint::from_slice(&y).into(),
+            infinity: false,
+        }
+    }
+
+    
+    pub fn hinted_check_add(
+        t: ark_bn254::G1Affine,
+        q: ark_bn254::G1Affine,
+    ) -> (Script, Vec<Hint>) {
+        let mut hints = vec![];
+
+        let (alpha, bias) = if !t.is_zero() && !q.is_zero() {
+            let alpha = (t.y - q.y) / (t.x - q.x);
+            let bias = t.y - alpha * t.x;
+            (alpha, bias)
+        } else {
+            (ark_bn254::Fq::ZERO, ark_bn254::Fq::ZERO)
+        };
+
+        let (hinted_script1, hint1) = Self::hinted_check_chord_line(t, q, alpha);
+        let (hinted_script2, hint2) = Self::hinted_add(t.x, q.x, alpha);
+
+        let script = script! {        // tx ty qx qy
+            { G1Affine::is_zero_keep_element() }
+            OP_IF
+                { G1Affine::drop() }
+            OP_ELSE
+                { G1Affine::roll(1) }
+                { G1Affine::is_zero_keep_element() }
+                OP_IF
+                    { G1Affine::drop() }
+                OP_ELSE                                // qx qy tx ty
+                    for _ in 0..Fq::N_LIMBS {
+                        OP_DEPTH OP_1SUB OP_ROLL
+                    }
+                    for _ in 0..Fq::N_LIMBS {
+                        OP_DEPTH OP_1SUB OP_ROLL
+                    }                                  // qx qy tx ty c3 c4
+                    { Fq::copy(1) }
+                    { Fq::copy(1) }                    // qx qy tx ty c3 c4 c3 c4
+                    { Fq::copy(5) }
+                    { Fq::roll(5) }                    // qx qy tx c3 c4 c3 c4 tx ty
+                    { Fq::copy(8) }
+                    { Fq::roll(8) }                    // qx tx c3 c4 c3 c4 tx ty qx qy
+                    { hinted_script1 }                 // qx tx c3 c4 0/1
+                    OP_VERIFY
+                    { Fq::roll(2) }
+                    { Fq::roll(3) }                    // c3 c4 tx qx
+                    { hinted_script2 }                 // x' y'
+                OP_ENDIF
+            OP_ENDIF
+        };
+
+        if !t.is_zero() && !q.is_zero() {
+            hints.push(Hint::Fq(alpha));
+            hints.push(Hint::Fq(-bias));
+            hints.extend(hint1);
+            hints.extend(hint2);
+        }
+
+        (script, hints)
+    }
+
+    /// add two points T and Q
+    ///     x' = alpha^2 - T.x - Q.x
+    ///     y' = -bias - alpha * x'
+    ///
+    /// input on stack:
+    ///     T.x (1 elements)
+    ///     Q.x (1 elements)
+    ///
+    /// input of parameters:
+    ///     c3: alpha - line slope
+    ///     c4: -bias - line intercept
+    ///
+    /// output on stack:
+    ///     T'.x (1 elements)
+    ///     T'.y (1 elements)
+    pub fn hinted_add(
+        tx: ark_bn254::Fq,
+        qx: ark_bn254::Fq,
+        c3: ark_bn254::Fq,
+    ) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+        let var1 = c3.square(); //alpha^2
+        let var2 = var1 - qx - tx; // calculate x' = alpha^2 - T.x - Q.x
+                                   //let var3 = var2 * c3; //  alpha * x'
+
+        let (hinted_script1, hint1) = Fq::hinted_square(c3);
+        let (hinted_script2, hint2) = Fq::hinted_mul(2, c3, 0, var2);
+        hints.extend(hint1);
+        hints.extend(hint2);
+
+        let script = script! {        //c3 c4 tx qx
+            {Fq::add(1, 0)}                             //c3 c4 (tx+qx)
+            {Fq::roll(2)}                               //c4 (qx+tx) c3
+            {Fq::copy(0)}                               //c4 (qx+tx) c3 c3
+            {hinted_script1}                            //c4 (qx+tx) c3 c3^2
+            {Fq::sub(0, 2)}                             //c4 c3 c3^2-(qx+tx)
+            {Fq::copy(0)}                               //c4 c3 var2 var2
+            {hinted_script2}                            //c4 var2 var2*c3
+            {Fq::sub(2, 0)}                             //var2 -var2*c3+c4
+        };
+
+        (script, hints)
+    }
+
+    /// double a point T:
+    ///     x' = alpha^2 - 2 * T.x
+    ///     y' = -bias - alpha* x'
+    ///
+    /// input on stack:
+    ///     T.x (1 elements)
+    ///
+    /// output on stack:
+    ///     T'.x (1 elements)
+    ///     T'.y (1 elements)
+    pub fn hinted_double(t: ark_bn254::G1Affine, c3: ark_bn254::Fq) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+
+        let var1 = c3.square(); //alpha^2
+        let var2 = var1 - t.x - t.x; // calculate x' = alpha^2 - 2 * T.x
+
+        let (hinted_script1, hint1) = Fq::hinted_square(c3);
+        let (hinted_script2, hint2) = Fq::hinted_mul(2, c3, 0, var2);
+        hints.extend(hint1);
+        hints.extend(hint2);
+
+        let script = script! {  // c3 (alpha), c4 (-bias), x
+            { Fq::double(0) }                     // alpha, -bias, 2x
+            { Fq::roll(2) }                       // -bias, 2x, alpha
+            { Fq::copy(0) }                       // -bias, 2x, alpha, alpha
+            { hinted_script1 }                    // -bias, 2x, alpha, alpha^2
+            { Fq::sub(0, 2) }                     // -bias, alpha, alpha^2-2x = x'
+            { Fq::copy(0) }                       // -bias, alpha, x', x'
+            { hinted_script2 }                    // -bias, x', alpha * x'
+            { Fq::sub(2, 0) }                     // x', -alpha * x' - bias = y'
+        };
+
+        (script, hints)
+    }
+
+    pub fn hinted_check_double(t: ark_bn254::G1Affine) -> (Script, Vec<Hint>) {
+        let mut hints = vec![];
+
+        let (alpha, bias) = if t.is_zero() {
+            (ark_bn254::Fq::ZERO, ark_bn254::Fq::ZERO)
+        } else {
+            let alpha = (t.x.square() + t.x.square() + t.x.square()) / (t.y + t.y);
+            let bias = t.y - alpha * t.x;
+            (alpha, bias)
+        };
+
+        let (hinted_script1, hint1) = Self::hinted_check_tangent_line(t, alpha);
+        let (hinted_script2, hint2) = Self::hinted_double(t, alpha);
+
+        if !t.is_zero() {
+            hints.push(Hint::Fq(alpha));
+            hints.push(Hint::Fq(-bias));
+            hints.extend(hint1);
+            hints.extend(hint2);
+        }
+        let script = script! {
+            { G1Affine::is_zero_keep_element() }         // ... (dependent on input),  x, y, 0/1
+            OP_NOTIF                                     // c3 (alpha), c4 (-bias), ... (other hints), x, y
+                for _ in 0..Fq::N_LIMBS {
+                    OP_DEPTH OP_1SUB OP_ROLL
+                }                                        // -bias, ...,  x, y, alpha
+                for _ in 0..Fq::N_LIMBS {
+                    OP_DEPTH OP_1SUB OP_ROLL
+                }                                        // x, y, alpha, -bias
+                { Fq::copy(1) }                          // x, y, alpha, -bias, alpha
+                { Fq::copy(1) }                          // x, y, alpha, -bias, alpha, -bias
+                { Fq::copy(5) }                          // x, y, alpha, -bias, alpha, -bias, x
+                { Fq::roll(5) }                          // x, alpha, -bias, alpha, -bias, x, y
+                { hinted_script1 }                       // x, alpha, -bias, is_tangent_line_correct
+                OP_VERIFY                                // x, alpha, -bias
+                { Fq::roll(2) }                          // alpha, -bias, x
+                { hinted_script2 }                       // x', y'
+            OP_ENDIF
+        };
+        (script, hints)
+    }
+
+    
+    pub fn identity() -> Script {
+        script! {
+            { Fq::push_zero() }
+            { Fq::push_zero() }
+        }
+    }
+
+    pub fn hinted_is_on_curve(x: ark_bn254::Fq, y: ark_bn254::Fq) -> (Script, Vec<Hint>) {
+        let (x_sq, x_sq_hint) = Fq::hinted_square(x);
+        let (x_cu, x_cu_hint) = Fq::hinted_mul(0, x, 1, x*x);
+        let (y_sq, y_sq_hint) = Fq::hinted_square(y);
+
+        let mut hints = Vec::new();
+        hints.extend(x_sq_hint);
+        hints.extend(x_cu_hint);
+        hints.extend(y_sq_hint);
+        let scr = script! {
+            { Fq::copy(1) }
+            { x_sq }
+            { Fq::roll(2) }
+            { x_cu }
+            { Fq::push_hex("3") }
+            { Fq::add(1, 0) }
+            { Fq::roll(1) }
+            { y_sq }
+            { Fq::equal(1, 0) }
+        };
+        (scr, hints)
+    }
+
+    // Init stack: [x1,y1,x2,y2)
+    pub fn equalverify() -> Script {
+        script! {
+            { Fq::roll(2) }
+            { Fq::equalverify(1, 0) }
+            { Fq::equalverify(1, 0) }
+        }
+    }
+
+    pub fn is_zero() -> Script {
+        script! {
+            { Fq::is_zero(0) }
+            OP_TOALTSTACK
+            { Fq::is_zero(0) }
+            OP_FROMALTSTACK
+            OP_BOOLAND
+        }
+    }
+
+    pub fn is_zero_keep_element() -> Script {
+        script! {
+            { Fq::is_zero_keep_element(0) }
+            OP_TOALTSTACK
+            { Fq::is_zero_keep_element(1) }
+            OP_FROMALTSTACK
+            OP_BOOLAND
+        }
+    }
+
+    pub fn drop() -> Script {
+        script! {
+            { Fq::drop() }
+            { Fq::drop() }
+        }
+    }
+
+    pub fn roll(mut a: u32) -> Script {
+        a *= 2;
+        script! {
+            { Fq::roll(a + 1) }
+            { Fq::roll(a + 1) }
+        }
+    }
+}
+
+/// input of func (params):
+///      p.x, p.y
+/// Input Hints On Stack
+///      tmul hints, p.y_inverse
+/// output on stack:
+///      x' = -p.x / p.y
+pub fn hinted_x_from_eval_point(p: ark_bn254::G1Affine, py_inv: ark_bn254::Fq) -> (Script, Vec<Hint>) {
+    let mut hints = Vec::new();
+
+    let (hinted_script1, hint1) = Fq::hinted_mul(1, p.y, 0, py_inv);
+    let (hinted_script2, hint2) = Fq::hinted_mul(1, py_inv, 0, -p.x);
+    let script = script!{   // Stack: [hints, pyd, px, py] 
+        {Fq::copy(2)}                        // Stack: [hints, pyd, px, py, pyd] 
+        {hinted_script1}
+        {Fq::push_one()}
+        {Fq::equalverify(1, 0)}              // Stack: [hints, pyd, px]
+        {Fq::neg(0)}                        // Stack: [hints, pyd, -px]
+        {hinted_script2}
+    };
+    hints.extend(hint1);
+    hints.extend(hint2);
+    (script, hints)
+}
+
+/// input of func (params):
+///      p.y
+/// Input Hints On Stack
+///      tmul hints, p.y_inverse
+/// output on stack:
+///      []
+pub fn hinted_y_from_eval_point(py: ark_bn254::Fq, py_inv: ark_bn254::Fq) -> (Script, Vec<Hint>) {
+    let mut hints = Vec::new();
+
+
+    let (hinted_script1, hint1) = Fq::hinted_mul(1, py_inv, 0, py);
+    let script = script!{// [hints,..., pyd_calc, py]
+        {hinted_script1}
+        {Fq::push_one()}
+        {Fq::equalverify(1,0)}
+    };
+    hints.extend(hint1);
+
+    (script, hints)
+}
+
+/// input of func (params):
+///      p.x, p.y
+/// Input Hints On Stack
+///      tmul hints, p.y_inverse
+/// output on stack:
+///      x' = -p.x / p.y
+///      y' = 1 / p.y
+pub fn hinted_from_eval_point(p: ark_bn254::G1Affine) -> (Script, Vec<Hint>) {
+    let mut hints = Vec::new();
+
+    let py_inv = p.y().unwrap().inverse().unwrap();
+
+    let (hinted_script1, hint1) = hinted_y_from_eval_point(p.y, py_inv);
+    let (hinted_script2, hint2) = hinted_x_from_eval_point(p, py_inv);
+    let script = script! {
+
+        // [hints, yinv, x, y]
+        {Fq::copy(2)}
+        {Fq::copy(1)}
+
+        {hinted_script1}
+
+        // [hints, yinv, x, y]
+        {Fq::copy(2)}
+        {Fq::toaltstack()}
+        {hinted_script2}
+        {Fq::fromaltstack()}
+    };
+    hints.extend(hint1);
+    hints.extend(hint2);
+
+    (script, hints)
+}
+
+pub fn hinted_from_eval_points(p: ark_bn254::G1Affine) -> (Script, Vec<Hint>) {
+    let mut hints = Vec::new();
+
+    let py_inv = p.y().unwrap().inverse().unwrap();
+
+    let (hinted_script1, hint1) = hinted_y_from_eval_point(p.y, py_inv);
+    let (hinted_script2, hint2) = hinted_x_from_eval_point(p, py_inv);
+
+    let script = script!{
+        // [yinv, hints,.., x, y]
+        {Fq2::toaltstack()}
+        for _ in 0..Fq::N_LIMBS {
+            OP_DEPTH OP_1SUB OP_ROLL 
+        }
+        {Fq2::fromaltstack()}
+        // [hints, yinv, x, y]
+        {Fq::copy(2)}
+        {Fq::copy(1)}
+        {hinted_script1}
+        // [hints, yinv, x, y]
+        {Fq::copy(2)}
+        {Fq::toaltstack()}
+        {hinted_script2}
+        {Fq::fromaltstack()}
+    };
+
+
+    hints.push(Hint::Fq(py_inv));
+    hints.extend(hint1);
+    hints.extend(hint2);
+
+    (script, hints)
+}
+
+#[cfg(test)]
+mod test {
+    use crate::bn254::fq2::Fq2;
+    use crate::bn254::g1::G1Affine;
+    use crate::bn254::g2::G2Affine;
+    use crate::bn254::fp254impl::Fp254Impl;
+    use crate::bn254::fq::Fq;
+    use crate::bn254::fr::Fr;
+    
+    use crate::{execute_script_without_stack_limit, treepp::*, ExecuteInfo};
+    use super::*;
+    use ark_ec::CurveGroup;
+    use ark_ff::Field;
+    use ark_std::{test_rng, UniformRand};
+    use core::ops::Mul;
+    use num_bigint::BigUint;
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+
+    fn extract_witness_from_stack(res: ExecuteInfo) -> Vec<Vec<u8>> {
+        res.final_stack.0.iter_str().fold(vec![], |mut vector, x| {
+            vector.push(x);
+            vector
+        })
+    }
+
+    #[test]
+    fn test_read_from_stack() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let a = ark_bn254::G1Affine::rand(&mut prng);
+        let script = script! {
+            {G1Affine::push(a)}
+        };
+
+        let res = execute_script(script);
+        let witness = extract_witness_from_stack(res);
+        let recovered_a = G1Affine::read_from_stack(witness);
+
+        assert_eq!(a, recovered_a);
+
+        let b = ark_bn254::G2Affine::rand(&mut prng);
+        let script = script! {
+            {G2Affine::push(b)}
+        };
+
+        let res = execute_script(script);
+        let witness = extract_witness_from_stack(res);
+        let recovered_b = G2Affine::read_from_stack(witness);
+
+        assert_eq!(b, recovered_b);
+    }
+
+    #[test]
+    fn test_affine_identity() {
+        let equalverify = G1Affine::equalverify();
+        println!("G1Affine.equalverify: {} bytes", equalverify.len());
+
+        for _ in 0..1 {
+            let expect = ark_bn254::G1Affine::identity();
+
+            let script = script! {
+                { G1Affine::identity() }
+                { G1Affine::push(expect) }
+                { equalverify.clone() }
+                OP_TRUE
+            };
+            println!("curves::test_affine_identity = {} bytes", script.len());
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_g1_affine_hinted_check_line_through_point() {
+        //println!("G1.hinted_add: {} bytes", G1Affine::check_add().len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G1Affine::rand(&mut prng);
+        let q = ark_bn254::G1Affine::rand(&mut prng);
+        let alpha = (t.y - q.y) / (t.x - q.x);
+        // -bias
+        let bias_minus = alpha * t.x - t.y;
+
+        let (hinted_check_line_through_point, hints) =
+            G1Affine::hinted_check_line_through_point(t.x, alpha);
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            { Fq::push(alpha) }
+            { Fq::push(bias_minus) }
+            { Fq::push(t.x) }
+            { Fq::push(t.y) }
+            { hinted_check_line_through_point.clone()}
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+        println!(
+            "hinted_check_line_through_point: {} @ {} stack",
+            hinted_check_line_through_point.len(),
+            exec_result.stats.max_nb_stack_items
+        );
+    }
+
+    #[test]
+    fn test_g1_affine_hinted_check_chord_line() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G1Affine::rand(&mut prng);
+        let q = ark_bn254::G1Affine::rand(&mut prng);
+        let alpha = (t.y - q.y) / (t.x - q.x);
+        // -bias
+        let bias_minus = alpha * t.x - t.y;
+
+        let (hinted_check_chord_line, hints) = G1Affine::hinted_check_chord_line(t, q, alpha);
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            { Fq::push(alpha) }
+            { Fq::push(bias_minus) }
+            { Fq::push(t.x) }
+            { Fq::push(t.y) }
+            { Fq::push(q.x) }
+            { Fq::push(q.y) }
+            { hinted_check_chord_line.clone()}
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+        println!(
+            "hinted_check_chord_line: {} @ {} stack",
+            hinted_check_chord_line.len(),
+            exec_result.stats.max_nb_stack_items
+        );
+    }
+
+    #[test]
+    fn test_g1_affine_hinted_add() {
+        //println!("G1.hinted_add: {} bytes", G1Affine::check_add().len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G1Affine::rand(&mut prng);
+        let q = ark_bn254::G1Affine::rand(&mut prng);
+        let alpha = (t.y - q.y) / (t.x - q.x);
+        // -bias
+        let bias_minus = alpha * t.x - t.y;
+
+        let x = alpha.square() - t.x - q.x;
+        let y = bias_minus - alpha * x;
+        let (hinted_add, hints) = G1Affine::hinted_add(t.x, q.x, alpha);
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            { Fq::push(alpha) }
+            { Fq::push(bias_minus) }
+            { Fq::push(t.x) }
+            { Fq::push(q.x) }
+            { hinted_add.clone() }
+            // [x']
+            { Fq::push(y) }
+            // [x', y', y]
+            { Fq::equalverify(1,0) }
+            // [x']
+            { Fq::push(x) }
+            // [x', x]
+            { Fq::equalverify(1,0) }
+            // []
+            OP_TRUE
+            // [OP_TRUE]
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+        println!(
+            "hinted_add_line: {} @ {} stack",
+            hinted_add.len(),
+            exec_result.stats.max_nb_stack_items
+        );
+    }
+
+    #[test]
+    fn test_g1_affine_hinted_check_add() {
+        //println!("G1.hinted_add: {} bytes", G1Affine::check_add().len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G1Affine::rand(&mut prng);
+        let q = ark_bn254::G1Affine::rand(&mut prng);
+        let alpha = (t.y - q.y) / (t.x - q.x);
+        // -bias
+        let bias_minus = alpha * t.x - t.y;
+
+        let x = alpha.square() - t.x - q.x;
+        let y = bias_minus - alpha * x;
+
+        let (hinted_check_add, hints) = G1Affine::hinted_check_add(t, q);
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            { Fq::push(t.x) }
+            { Fq::push(t.y) }
+            { Fq::push(q.x) }
+            { Fq::push(q.y) }
+            { hinted_check_add.clone() }
+            // [x']
+            { Fq::push(y) }
+            // [x', y', y]
+            { Fq::equalverify(1,0) }
+            // [x']
+            { Fq::push(x) }
+            // [x', x]
+            { Fq::equalverify(1,0) }
+            // []
+            OP_TRUE
+            // [OP_TRUE]
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+        println!(
+            "hinted_add_line: {} @ {} stack",
+            hinted_check_add.len(),
+            exec_result.stats.max_nb_stack_items
+        );
+    }
+
+    #[test]
+    fn test_g1_affine_hinted_check_double() {
+        //println!("G1.hinted_add: {} bytes", G1Affine::check_add().len());
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G1Affine::rand(&mut prng);
+        let alpha = (t.x.square() + t.x.square() + t.x.square()) / (t.y + t.y);
+        // -bias
+        let bias_minus = alpha * t.x - t.y;
+
+        let x = alpha.square() - t.x - t.x;
+        let y = bias_minus - alpha * x;
+
+        let (hinted_check_double, hints) = G1Affine::hinted_check_double(t);
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            { Fq::push(t.x) }
+            { Fq::push(t.y) }
+            { hinted_check_double.clone() }
+            { Fq::push(y) }
+            { Fq::equalverify(1,0) }
+            { Fq::push(x) }
+            { Fq::equalverify(1,0) }
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+        println!(
+            "hinted_check_double: {} @ {} stack",
+            hinted_check_double.len(),
+            exec_result.stats.max_nb_stack_items
+        );
+    }
+
+    #[test]
+    fn test_affine_equalverify() {
+        let equalverify = G1Affine::equalverify();
+        println!("G1Affine.equalverify: {} bytes", equalverify.len());
+
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..1 {
+            let scalar = ark_bn254::Fr::rand(&mut prng);
+
+            let p = ark_bn254::G1Projective::rand(&mut prng).mul(scalar);
+            let q = p.into_affine();
+
+            let script = script! {
+                { G1Affine::push(p.into_affine()) }
+                { G1Affine::push(q) }
+                { equalverify.clone() }
+                OP_TRUE
+            };
+            println!("curves::test_equalverify = {} bytes", script.len());
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_hinted_affine_is_on_curve() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..3 {
+            let p = ark_bn254::G1Affine::rand(&mut prng);
+            let (affine_is_on_curve, hints) = G1Affine::hinted_is_on_curve(p.x, p.y);
+
+            let script = script! {
+                for hint in hints { 
+                    { hint.push() }
+                }
+                { Fq::push(p.x) }
+                { Fq::push(p.y) }
+                { affine_is_on_curve.clone() }
+            };
+            let res = execute_script(script);
+            assert!(res.success);
+
+            let (affine_is_on_curve, hints) = G1Affine::hinted_is_on_curve(p.x, p.y + p.y);
+            let script = script! {
+                for hint in hints { 
+                    { hint.push() }
+                }
+                { Fq::push(p.x) }
+                { Fq::push(p.y) }
+                { Fq::double(0) }
+                { affine_is_on_curve.clone() }
+                OP_NOT
+            };
+            println!("curves::test_affine_is_on_curve = {} bytes", script.len());
+            let res = execute_script(script);
+            assert!(res.success);
+        }
+    }
+
+    #[test]
+    fn test_hinted_from_eval_point() {
+        let mut prng = ChaCha20Rng::seed_from_u64(1);
+        let p = ark_bn254::G1Affine::rand(&mut prng);
+        let (eval_scr, hints) = hinted_from_eval_point(p);
+        let pyinv = p.y.inverse().unwrap();
+
+        let script = script! {
+            for tmp in hints {
+                { tmp.push() }
+            }
+            { Fq::push_u32_le(&BigUint::from(pyinv).to_u32_digits()) } // aux hint
+
+            { Fq::push_u32_le(&BigUint::from(p.x).to_u32_digits()) } // input
+            { Fq::push_u32_le(&BigUint::from(p.y).to_u32_digits()) }
+            { eval_scr }
+            { Fq::push_u32_le(&BigUint::from(-p.x / p.y).to_u32_digits()) } // expected output
+            { Fq::push_u32_le(&BigUint::from(pyinv).to_u32_digits()) }
+            { Fq2::equalverify() }
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+    }
+    
+
+    #[test]
+    fn test_hintedx_from_eval_point() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let p = ark_bn254::G1Affine::rand(&mut prng);
+        let (ell_by_constant_affine_script, hints) = hinted_x_from_eval_point(p, p.y.inverse().unwrap());
+        let script = script! {
+            for tmp in hints { 
+                { tmp.push() }
+            }
+            { Fq::push_u32_le(&BigUint::from(p.y.inverse().unwrap()).to_u32_digits()) }
+            { Fq::push_u32_le(&BigUint::from(p.x).to_u32_digits()) }
+            { Fq::push_u32_le(&BigUint::from(p.y).to_u32_digits()) }
+            { ell_by_constant_affine_script.clone() }
+            { Fq::push_u32_le(&BigUint::from(-p.x / p.y).to_u32_digits()) }
+            {Fq::equalverify(1,0)}
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+    }
+
+    #[test]
+    fn test_hintedy_from_eval_point() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let p = ark_bn254::G1Affine::rand(&mut prng);
+        let (ell_by_constant_affine_script, hints) = hinted_y_from_eval_point(p.y, p.y.inverse().unwrap());
+        let script = script! {
+            for tmp in hints { 
+                { tmp.push() }
+            }
+            { Fq::push_u32_le(&BigUint::from(p.y.inverse().unwrap()).to_u32_digits()) }
+            { Fq::push_u32_le(&BigUint::from(p.y).to_u32_digits()) }
+            { ell_by_constant_affine_script.clone() }
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+    }
+}
diff --git a/bitvm/src/bn254/g2.rs b/bitvm/src/bn254/g2.rs
new file mode 100644
index 000000000..0ce3c24d0
--- /dev/null
+++ b/bitvm/src/bn254/g2.rs
@@ -0,0 +1,1250 @@
+use crate::bn254::fp254impl::Fp254Impl;
+use crate::bn254::fq::Fq;
+use crate::bn254::fq2::Fq2;
+use crate::bn254::fq12::Fq12;
+use crate::bn254::ell_coeffs::EllCoeff;
+use crate::bn254::ell_coeffs::G2Prepared;
+use crate::treepp::{script, Script};
+use super::utils::Hint;
+use ark_ff::{AdditiveGroup, Field};
+use num_bigint::BigUint;
+use std::str::FromStr;
+use ark_ec::bn::BnConfig;
+
+pub struct G2Affine;
+
+impl G2Affine {
+
+    pub fn is_zero_keep_element() -> Script {
+        // [px0, px1, qx0, qx1]
+        script! (
+            for i in 0..4 {
+                {Fq::copy(i)}
+                {Fq::is_zero(0)}
+                OP_TOALTSTACK
+            }
+            {1}
+            for _ in 0..4 {
+                OP_FROMALTSTACK
+                OP_BOOLAND
+            }
+        )
+    }
+
+    pub fn drop() -> Script {
+        script! {
+            { Fq2::drop() }
+            { Fq2::drop() }
+        }
+    }
+
+    pub fn roll(mut a: u32) -> Script {
+        a *= 4;
+        script! {
+            { Fq::roll(a + 3) }
+            { Fq::roll(a + 3) }
+            { Fq::roll(a + 3) }
+            { Fq::roll(a + 3) }
+        }
+    }
+
+    // [ax, ay, bx, by]
+    pub fn copy(mut a: u32) -> Script {
+        a *= 4;
+        script! {
+            { Fq::copy(a + 3) }
+            { Fq::copy(a + 3) }
+            { Fq::copy(a + 3) }
+            { Fq::copy(a + 3) }
+        }
+    }
+
+    // [ax, ay, bx, by, a'x, a'y, b'x, b'y]
+    pub fn equal() -> Script {
+        script! {
+            {Fq2::roll(4)}
+            {Fq2::equal()}
+            OP_TOALTSTACK
+            {Fq2::equal()}
+            OP_FROMALTSTACK
+            OP_BOOLAND
+        }
+    }
+
+    pub fn toaltstack() -> Script {
+        script! {
+            {Fq2::toaltstack()}
+            {Fq2::toaltstack()}
+        }
+    }
+
+    pub fn fromaltstack() -> Script {
+        script! {
+            {Fq2::fromaltstack()}
+            {Fq2::fromaltstack()}
+        }
+    }
+
+    pub fn hinted_is_on_curve(x: ark_bn254::Fq2, y: ark_bn254::Fq2) -> (Script, Vec<Hint>) {
+        let (x_sq, x_sq_hint) = Fq2::hinted_square(x);
+        let (x_cu, x_cu_hint) = Fq2::hinted_mul(0, x, 2, x*x);
+        let (y_sq, y_sq_hint) = Fq2::hinted_square(y);
+
+        let mut hints = Vec::new();
+        hints.extend(x_sq_hint);
+        hints.extend(x_cu_hint);
+        hints.extend(y_sq_hint);
+
+        let scr = script! {
+            { Fq2::copy(2) }
+            { x_sq }
+            { Fq2::roll(4) }
+            { x_cu }
+            { Fq::push_dec("19485874751759354771024239261021720505790618469301721065564631296452457478373") }
+            { Fq::push_dec("266929791119991161246907387137283842545076965332900288569378510910307636690") }
+            { Fq2::add(2, 0) }
+            { Fq2::roll(2) }
+            { y_sq }
+            { Fq2::equal() }
+        };
+        (scr, hints)
+    }
+
+    pub fn push(element: ark_bn254::G2Affine) -> Script {
+        script! {
+            { Fq2::push(element.x) }
+            { Fq2::push(element.y) }
+        }
+    }
+
+    pub fn read_from_stack(witness: Vec<Vec<u8>>) -> ark_bn254::G2Affine {
+        assert_eq!(witness.len() as u32, Fq::N_LIMBS * 4);
+        let x = Fq2::read_from_stack(witness[0..2 * Fq::N_LIMBS as usize].to_vec());
+        let y = Fq2::read_from_stack(
+            witness[2 * Fq::N_LIMBS as usize..4 * Fq::N_LIMBS as usize].to_vec(),
+        );
+        ark_bn254::G2Affine {
+            x,
+            y,
+            infinity: false,
+        }
+    }
+}
+
+        // Stack: [q] q /in G2Affine
+    // compute q' = (q.x*beta_22, q.y) 
+    pub fn hinted_mul_by_char_on_phi_q(q: ark_bn254::G2Affine) -> (ark_bn254::G2Affine, Script, Vec<Hint>) {
+        let beta_22x = BigUint::from_str(
+            "21888242871839275220042445260109153167277707414472061641714758635765020556616",
+        )
+        .unwrap();
+        let beta_22y = BigUint::from_str("0").unwrap();
+        let beta_22 = ark_bn254::Fq2::from_base_prime_field_elems([
+            ark_bn254::Fq::from(beta_22x.clone()),
+            ark_bn254::Fq::from(beta_22y.clone()),
+        ])
+        .unwrap();
+    
+        let mut qq = q;
+        let (beta22_mul, hints) = Fq2::hinted_mul(2, q.x, 0, beta_22);
+        qq.x *= beta_22;
+
+        let scr = script!{
+            // [q.x, q.y]
+            {Fq2::toaltstack()}
+            {Fq2::push(beta_22)} // beta_22
+            {beta22_mul}
+            {Fq2::fromaltstack()}
+        };
+        (qq, scr, hints)
+    }
+
+    // Stack: [q] q /in G2Affine
+    // compute q' = (q.x.conjugate()*beta_12, q.y.conjugate() * beta_13)
+    pub fn hinted_mul_by_char_on_q(q: ark_bn254::G2Affine) -> (ark_bn254::G2Affine, Script, Vec<Hint>) {
+        let beta_12x = BigUint::from_str(
+            "21575463638280843010398324269430826099269044274347216827212613867836435027261",
+        )
+        .unwrap();
+        let beta_12y = BigUint::from_str(
+            "10307601595873709700152284273816112264069230130616436755625194854815875713954",
+        )
+        .unwrap();
+        let beta_12 = ark_bn254::Fq2::from_base_prime_field_elems([
+            ark_bn254::Fq::from(beta_12x.clone()),
+            ark_bn254::Fq::from(beta_12y.clone()),
+        ])
+        .unwrap();
+        let beta_13x = BigUint::from_str(
+            "2821565182194536844548159561693502659359617185244120367078079554186484126554",
+        )
+        .unwrap();
+        let beta_13y = BigUint::from_str(
+            "3505843767911556378687030309984248845540243509899259641013678093033130930403",
+        )
+        .unwrap();
+        let beta_13 = ark_bn254::Fq2::from_base_prime_field_elems([
+            ark_bn254::Fq::from(beta_13x.clone()),
+            ark_bn254::Fq::from(beta_13y.clone()),
+        ])
+        .unwrap();
+
+        let mut qq = q;
+        qq.x.conjugate_in_place();
+        let (beta12_mul_scr, hint_beta12_mul) = Fq2::hinted_mul(2, qq.x, 0, beta_12);
+        qq.x *= beta_12;
+
+        qq.y.conjugate_in_place();
+        let (beta13_mul_scr, hint_beta13_mul) = Fq2::hinted_mul(2, qq.y, 0, beta_13);
+        qq.y *= beta_13;
+
+        let mut frob_hint: Vec<Hint> = vec![];
+        for hint in hint_beta13_mul {
+            frob_hint.push(hint);
+        }
+        for hint in hint_beta12_mul {
+            frob_hint.push(hint);
+        }
+
+        let scr = script!{
+            // [q.x, q.y]
+            {Fq::neg(0)}
+            {Fq2::push(beta_13)} // beta_13
+            {beta13_mul_scr}
+            {Fq2::toaltstack()}
+            {Fq::neg(0)}
+            {Fq2::push(beta_12)} // beta_12
+            {beta12_mul_scr}
+            {Fq2::fromaltstack()}
+        };
+        (qq, scr, frob_hint)
+    }
+
+    
+        // Stack: [q] q /in G2Affine
+    // compute q' = (q.x.conjugate()*beta_12, q.y.conjugate() * beta_13)
+    pub fn hinted_mul_by_char_on_phi_sq_q(q: ark_bn254::G2Affine) -> (ark_bn254::G2Affine, Script, Vec<Hint>) {
+        let beta_32x = BigUint::from_str(
+            "3772000881919853776433695186713858239009073593817195771773381919316419345261",
+        )
+        .unwrap();
+        let beta_32y = BigUint::from_str("2236595495967245188281701248203181795121068902605861227855261137820944008926").unwrap();
+        let beta_32 = ark_bn254::Fq2::from_base_prime_field_elems([
+            ark_bn254::Fq::from(beta_32x.clone()),
+            ark_bn254::Fq::from(beta_32y.clone()),
+        ])
+        .unwrap();
+    
+        let beta_33x = BigUint::from_str(
+            "19066677689644738377698246183563772429336693972053703295610958340458742082029",
+        )
+        .unwrap();
+        let beta_33y = BigUint::from_str("18382399103927718843559375435273026243156067647398564021675359801612095278180").unwrap();
+        let beta_33 = ark_bn254::Fq2::from_base_prime_field_elems([
+            ark_bn254::Fq::from(beta_33x.clone()),
+            ark_bn254::Fq::from(beta_33y.clone()),
+        ])
+        .unwrap();
+    
+
+        let mut qq = q;
+        qq.x.conjugate_in_place();
+        let (beta12_mul_scr, hint_beta12_mul) = Fq2::hinted_mul(2, qq.x, 0, beta_32);
+        qq.x *= beta_32;
+
+        qq.y.conjugate_in_place();
+        let (beta13_mul_scr, hint_beta13_mul) = Fq2::hinted_mul(2, qq.y, 0, beta_33);
+        qq.y *= beta_33;
+
+        let mut frob_hint: Vec<Hint> = vec![];
+        for hint in hint_beta13_mul {
+            frob_hint.push(hint);
+        }
+        for hint in hint_beta12_mul {
+            frob_hint.push(hint);
+        }
+
+        let scr = script!{
+            // [q.x, q.y]
+            {Fq::neg(0)}
+            {Fq2::push(beta_33)} // beta_13
+            {beta13_mul_scr}
+            {Fq2::toaltstack()}
+            {Fq::neg(0)}
+            {Fq2::push(beta_32)} // beta_12
+            {beta12_mul_scr}
+            {Fq2::fromaltstack()}
+        };
+        (qq, scr, frob_hint)
+    }
+
+    
+
+
+pub fn hinted_ell_by_constant_affine_and_sparse_mul(
+    f: ark_bn254::Fq12,
+    x: ark_bn254::Fq,
+    y: ark_bn254::Fq,
+    constant: &EllCoeff,
+) -> (Script, Vec<Hint>) {
+    assert_eq!(constant.0, ark_bn254::Fq2::ONE);
+    let mut hints = Vec::new();
+
+    let (hinted_script_ell, hint_ell) = hinted_ell_by_constant_affine(x, y, constant.1, constant.2);
+
+    let mut c1 = constant.1;
+    c1.mul_assign_by_fp(&x);
+    let mut c2 = constant.2;
+    c2.mul_assign_by_fp(&y);
+    let (hinted_script5, hint5) = Fq12::hinted_mul_by_34(f, c1, c2);
+
+    let hinted_script_constant = script! {
+        for _ in 0..4 {
+            for _ in 0..Fq::N_LIMBS {
+                OP_DEPTH OP_1SUB OP_ROLL 
+            }  
+        }
+     };
+    let script = script! {
+        {hinted_script_constant}
+         // // [slope, bias, f,  x', y']
+         // {Fq2::roll(16)}, {Fq2::roll(16)},
+         // [f, x', y', slope, bias]
+         {Fq2::roll(4)}
+         // [f, slope, bias, x', y']
+         {hinted_script_ell}
+         // [f, c1', c2']
+         // compute the new f with c1'(c3) and c2'(c4), where c1 is trival value 1
+         {hinted_script5}
+         // [f]
+    };
+
+    hints.extend_from_slice(&[Hint::Fq(constant.1.c0),
+        Hint::Fq(constant.1.c1),
+        Hint::Fq(constant.2.c0),
+        Hint::Fq(constant.2.c1)]);
+
+    hints.extend(hint_ell);
+    hints.extend(hint5);
+
+
+    (script, hints)
+}
+
+// input:
+//  f            12 elements
+//  p.x          1 element
+//  p.y          1 element
+//
+// output:
+//  new f        12 elements
+pub fn hinted_ell_by_constant_affine(x: ark_bn254::Fq, y: ark_bn254::Fq, slope: ark_bn254::Fq2, bias: ark_bn254::Fq2) -> (Script, Vec<Hint>) {
+    let mut hints = Vec::new();
+
+    let (hinted_script1, hint1) = Fq::hinted_mul(1, x, 0, slope.c0);
+    let (hinted_script2, hint2) = Fq::hinted_mul(1, x, 0, slope.c1);
+    let (hinted_script3, hint3) = Fq::hinted_mul(1, y, 0, bias.c0);
+    let (hinted_script4, hint4) = Fq::hinted_mul(1, y, 0, bias.c1);
+
+    let script = script!{
+        // [slope, bias, x', y']
+        // update c1, c1' = x' * c1
+        {Fq::copy(1)}
+        // [slope0, slope1, bias0, bias1, x', y', x']
+        {Fq::roll(6)}
+        // [slope1, bias0, bias1, x', y', x', slope0]
+        {hinted_script1}
+        // [slope1, bias0, bias1, x', y', x'* slope0]
+
+        {Fq::roll(2)}
+        // [slope1, bias0, bias1, y', x'* slope0, x']
+        {Fq::roll(5)}
+        // [bias0, bias1, y', x'* slope0, x', slope1]
+        {hinted_script2}
+        // [bias0, bias1, y', x'* slope0, x'* slope1]
+
+        // update c2, c2' = -y' * c2
+        {Fq::copy(2)}
+        // [bias0, bias1, y', x'* slope0, x'* slope1, y']
+        {Fq::roll(5)}
+        // [bias1, y', x'* slope0, x'* slope1, y', bias0]
+        {hinted_script3}  
+        // [bias1, y', x'* slope0, x'* slope1, y'*bias0]
+        {Fq::roll(3)}
+        // [bias1, x'* slope0, x'* slope1, y'*bias0, y']
+        {Fq::roll(4)}
+        // [x'* slope0, x'* slope1, y'*bias0, y', bias1]
+        {hinted_script4}
+        // [x'* slope0, x'* slope1, y'*bias0, y'* bias1]
+    };
+ 
+    hints.extend(hint1);
+    hints.extend(hint2);
+    hints.extend(hint3);
+    hints.extend(hint4);
+    
+    (script, hints)
+
+}
+
+pub fn collect_line_coeffs(
+    constants: Vec<G2Prepared>,
+) -> Vec<Vec<Vec<(ark_bn254::Fq2, ark_bn254::Fq2, ark_bn254::Fq2)>>> {
+    let mut constant_iters = constants
+        .iter()
+        .map(|item| item.ell_coeffs.iter())
+        .collect::<Vec<_>>();
+    let mut all_line_coeffs = vec![];
+
+    for i in (1..ark_bn254::Config::ATE_LOOP_COUNT.len()).rev() {
+        let mut line_coeffs = vec![];
+        for constant in &mut constant_iters {
+            // double line coeff
+            let mut line_coeff = vec![];
+            line_coeff.push(*constant.next().unwrap());
+            // add line coeff
+            if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == 1
+                || ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1
+            {
+                line_coeff.push(*constant.next().unwrap());
+            }
+            // line coeff for single point
+            line_coeffs.push(line_coeff);
+        }
+        // line coeffs for all points
+        all_line_coeffs.push(line_coeffs);
+    }
+    {
+        let mut line_coeffs = vec![];
+        for constant in &mut constant_iters {
+            // add line coeff
+            line_coeffs.push(vec![*constant.next().unwrap()]);
+        }
+        all_line_coeffs.push(line_coeffs);
+    }
+    {
+        let mut line_coeffs = vec![];
+        for constant in &mut constant_iters {
+            // add line coeff
+            line_coeffs.push(vec![*constant.next().unwrap()]);
+        }
+        all_line_coeffs.push(line_coeffs);
+    }
+    for constant in &mut constant_iters {
+        assert_eq!(constant.next(), None);
+    }
+    assert_eq!(
+        all_line_coeffs.len(),
+        ark_bn254::Config::ATE_LOOP_COUNT.len() - 1 + 2
+    );
+    all_line_coeffs
+}
+
+/// add two points T and Q
+///     x' = alpha^2 - T.x - Q.x
+///     y' = -bias - alpha * x'
+///
+/// input on stack:
+///     T.x (2 elements)
+///     Q.x (2 elements)
+///
+/// input of parameters:
+///     c3: alpha - line slope
+///     c4: -bias - line intercept
+///
+/// output on stack:
+///     T'.x (2 elements)
+///     T'.y (2 elements)
+pub fn hinted_affine_add_line(
+    tx: ark_bn254::Fq2,
+    qx: ark_bn254::Fq2,
+    c3: ark_bn254::Fq2,
+    _c4: ark_bn254::Fq2,
+) -> (Script, Vec<Hint>) {
+    let mut hints = Vec::new();
+    let (hinted_script0, hint0) = Fq2::hinted_square(c3);
+    let (hinted_script1, hint1) = Fq2::hinted_mul(4, c3, 0, c3.square() - tx - qx);
+
+    let script = script! {
+        // [c3, c4, T.x, Q.x]
+        {Fq2::neg(0)}
+        // [c3, c4,T.x, -Q.x]
+        {Fq2::roll(2)}
+        // [c3, c4,-Q.x, T.x]
+        {Fq2::neg(0)}
+        // [c3, c4, -Q.x. -T.x]
+        {Fq2::add(2, 0)}
+        // [c3, c4, -T.x - Q.x]
+       {Fq2::copy(4)} // Fq2::push(c3),
+        // [c3, c4, -T.x - Q.x, alpha]
+        {Fq2::copy(0)}
+        {hinted_script0} // Fq2::push(c3.square()),
+        // [c3, c4, -T.x - Q.x, alpha, alpha^2]
+        // calculate x' = alpha^2 - T.x - Q.x
+        {Fq2::add(4, 0)}
+        // [c3, c4, alpha, x']
+        {Fq2::copy(0)}
+        // [c3, c4, alpha, x', x']
+        {hinted_script1}
+        // [c3, c4, x', alpha * x']
+       {Fq2::neg(0)}
+        // [c3, c4, x', -alpha * x']
+        {Fq2::copy(4)}// Fq2::push(c4),
+        // [x', -alpha * x', -bias]
+        // compute y' = -bias - alpha * x'
+        {Fq2::add(2, 0)}
+        // [c3, c4, x', y']
+
+
+
+
+    };
+    hints.extend(hint0);
+    hints.extend(hint1);
+
+    (script, hints)
+}
+
+/// double a point T:
+///     x' = alpha^2 - 2 * T.x
+///     y' = -bias - alpha* x'
+///
+/// input on stack:
+///     T.x (2 elements)
+///
+/// output on stack:
+///     T'.x (2 elements)
+///     T'.y (2 elements)
+pub fn hinted_affine_double_line(
+    tx: ark_bn254::Fq2,
+    c3: ark_bn254::Fq2,
+    _c4: ark_bn254::Fq2,
+) -> (Script, Vec<Hint>) {
+    let mut hints = Vec::new();
+
+    let (hinted_script0, hint0) = Fq2::hinted_square(c3);
+    let (hinted_script1, hint1) = Fq2::hinted_mul(4, c3, 0, c3.square() - tx - tx);
+
+    let script = script! {//[c3(2), c4(2), t.x(2)]
+        {Fq2::double(0)}
+        {Fq2::neg(0)}                           // [c3(2), c4(2), - 2 * T.x(2)]
+        {Fq2::copy(4)}                          // Fq2::push(c3),
+        {Fq2::copy(0)}
+        {hinted_script0}                        // [c3(2), c4(2), - 2 * T.x, alpha, alpha^2]
+        {Fq2::add(4, 0)}
+        {Fq2::copy(0)}                          // [c3(2), c4(2), alpha, x', x']
+        {hinted_script1}
+        {Fq2::neg(0)}                           // [c3(2), c4(2), x', -alpha * x']
+        {Fq2::copy(4)}                          // [c3(2), c4(2), x', -alpha * x', c4(2)]
+        {Fq2::add(2, 0)}                        // [c3(2), c4(2), x', y']
+    };
+
+    hints.extend(hint0);
+    hints.extend(hint1);
+
+    (script, hints)
+}
+
+/// check whether a tuple coefficient (alpha, -bias) of a tangent line is satisfied with expected point T (affine)
+/// two aspects:
+///     1. alpha * (2 * T.y) = 3 * T.x^2, make sure the alpha is the right ONE
+///     2. T.y - alpha * T.x - bias = 0, make sure the -bias is the right ONE
+///
+/// input on stack:
+///     T.x (2 element)
+///     T.y (2 element)
+///
+/// input of parameters:
+///     c3: alpha
+///     c4: -bias
+///
+/// output:
+///     true or false (consumed on stack)
+pub fn hinted_check_tangent_line(
+    t: ark_bn254::G2Affine,
+    c3: ark_bn254::Fq2,
+    c4: ark_bn254::Fq2,
+) -> (Script, Vec<Hint>) {
+    let mut hints = Vec::new();
+
+    // let (hinted_script1, hint1) = Fq2::hinted_mul_by_constant(t.y.double(), &c3);
+    let (hinted_script1, hint1) = Fq2::hinted_mul(2, t.y.double(), 0, c3);
+    let (hinted_script2, hint2) = Fq2::hinted_square(t.x);
+    let (hinted_script3, hint3) = hinted_check_line_through_point(t.x, c3, c4);
+    
+    // [c3(2),c4(2),t(4) ]
+    let script = script!{
+        // alpha * (2 * T.y) = 3 * T.x^2
+        { Fq2::copy(0) }
+        { Fq2::double(0) }
+        // [c3(2),c4(2),t(4),t.y*2 (2)]
+        { Fq2::copy(8) }
+        // [c3(2),c4(2),t(4),t.y*2 (2), c3(2)]
+        { hinted_script1 }
+        // [c3(2),c4(2), T.x(2), T.y(2), alpha * 2 * T.y (2)]
+        { Fq2::copy(4) }
+        // [c3(2),c4(2), T.x(2), T.y(2), alpha * 2 * T.y (2), T.x(2)]
+        { hinted_script2 }
+        // [c3(2),c4(2), T.x(2), T.y(2), alpha * 2 * T.y (2), T.x^2(2)]
+        { Fq2::copy(0) }
+        // [c3(2),c4(2), T.x(2), T.y(2), alpha * 2 * T.y (2), T.x^2(2), T.x^2(2) ]
+        { Fq2::double(0) }
+        // [c3(2),c4(2), T.x(2), T.y(2), alpha * 2 * T.y (2), T.x^2(2), 2 * T.x^2(2) ]
+        { Fq2::add(2, 0) }
+        // [c3(2),c4(2), T.x(2), T.y(2), alpha * 2 * T.y(2), 3 * T.x^2(2)]
+        { Fq2::neg(0) }
+        { Fq2::add(2, 0) }
+        { Fq2::push_zero() }
+        { Fq2::equalverify() }
+        // [c3(2),c4(2), T.x(2), T.y(2)]
+
+        // check: T.y - alpha * T.x - bias = 0
+        { hinted_script3 }
+        // [c3(2),c4(2)]
+    };
+    hints.extend(hint1);
+    hints.extend(hint2);
+    hints.extend(hint3);
+
+    (script, hints)
+}
+
+pub fn hinted_check_tangent_line_keep_elements(
+    t: ark_bn254::G2Affine,
+    c3: ark_bn254::Fq2,
+    c4: ark_bn254::Fq2,
+) -> (Script, Vec<Hint>) {
+    let mut hints = Vec::new();
+
+    let (hinted_script3, hint3) = hinted_check_line_through_point(t.x, c3, c4);
+    let (hinted_script1, hint1) = Fq2::hinted_mul(2, t.y.double(), 0, c3);
+    let (hinted_script2, hint2) = Fq2::hinted_square(t.x);
+
+    // [a, b, x, y]
+    let scr = script!(
+        // [a, b, x, y]
+        {Fq2::copy(2)}  {Fq2::copy(2)}
+        // [a, b, x, y, x, y]
+        {Fq2::toaltstack()}  {Fq2::toaltstack()}
+        // [a, b, x, y]
+        {hinted_script3}
+        // [a, b]
+        {Fq2::fromaltstack()} {Fq2::fromaltstack()}
+         // [a, b, x, y]
+        // alpha * (2 * T.y) = 3 * T.x^2
+        {Fq2::copy(0)}
+        {Fq2::double(0)}
+        {// [a, b, x, y, 2y]
+        Fq2::copy(8)}
+        {// [a, b, x, y, 2y, a]
+        hinted_script1}
+        {// [T.x, T.y, alpha * (2 * T.y)]
+        Fq2::copy(4)}
+        {hinted_script2}
+        {Fq2::copy(0)}
+        {Fq2::double(0)}
+        {Fq2::add(2, 0)}
+        {// [T.x, T.y, alpha * (2 * T.y), 3 * T.x^2]
+        Fq2::neg(0)}
+        {Fq2::add(2, 0)}
+        {Fq2::push_zero()}
+        {Fq2::equalverify()}
+        // [T.x, T.y]
+        // [a, b, x, y]
+    );
+
+    hints.extend(hint3);
+    hints.extend(hint1);
+    hints.extend(hint2);
+
+    (scr, hints)
+}
+
+
+/// check line through one point, that is:
+///     y - alpha * x - bias = 0
+///
+/// input on stack:
+///     x (2 elements)
+///     y (2 elements)
+///
+/// input of parameters:
+///     c3: alpha
+///     c4: -bias
+///
+/// output:
+///     true or false (consumed on stack)
+pub fn hinted_check_line_through_point(
+    x: ark_bn254::Fq2,
+    c3: ark_bn254::Fq2,
+    _c4: ark_bn254::Fq2,
+) -> (Script, Vec<Hint>) {
+    let mut hints: Vec<Hint> = Vec::new();
+
+    // let (hinted_script1, hint1) = Fq2::hinted_mul_by_constant(x, &c3);
+    let (hinted_script1, hint1) = Fq2::hinted_mul(2, x, 0, c3);
+
+    let script = script! {
+
+           // [c3, c4, x, y]
+           {Fq2::roll(2)}
+           // [c3, c4, y, x]
+           {Fq2::copy(6)}
+           // [c3, c4, y, x,c3]
+           {hinted_script1}
+           // [c3, c4, y, alpha * x]
+           {Fq2::neg(0)}
+           // [c3, c4, y, -alpha * x]
+           {Fq2::add(2, 0)}
+           // [c3, c4, y - alpha * x]
+           {Fq2::copy(2)} // Fq2::push(c4),
+           // [c3, c4, y - alpha * x, -bias]
+           {Fq2::add(2, 0)}
+           // [c3, c4, y - alpha * x - bias]
+           {Fq2::push_zero()}
+           // [c3, c4, y - alpha * x - bias, 0]
+           {Fq2::equalverify()}
+           // [c3, c4]
+    };
+    hints.extend(hint1);
+
+    (script, hints)
+}
+
+/// check whether a tuple coefficient (alpha, -bias) of a chord line is satisfied with expected points T and Q (both are affine cooordinates)
+/// two aspects:
+///     1. T.y - alpha * T.x - bias = 0
+///     2. Q.y - alpha * Q.x - bias = 0, make sure the alpha/-bias are the right ONEs
+///
+/// input on stack:
+///     T.x (2 elements)
+///     T.y (2 elements)
+///     Q.x (2 elements)
+///     Q.y (2 elements)
+///
+/// input of parameters:
+///     c3: alpha
+///     c4: -bias
+/// output:
+///     true or false (consumed on stack)
+pub fn hinted_check_chord_line(
+    t: ark_bn254::G2Affine,
+    q: ark_bn254::G2Affine,
+    c3: ark_bn254::Fq2,
+    c4: ark_bn254::Fq2,
+) -> (Script, Vec<Hint>) {
+    let mut hints = Vec::new();
+
+    let (script1, hint1) = hinted_check_line_through_point(q.x, c3, c4);
+    let (script2, hint2) = hinted_check_line_through_point(t.x, c3, c4);
+
+    let script = script! {//[c3(2),c4(2),t(4),q(4)]
+        {Fq2::copy(10)}                         // [c3(2),c4(2),t(4),q(4),c3(2)]
+        {Fq2::copy(10)}                         // [c3(2),c4(2),t(4),q(4),c3(2),c4(2)]
+        {Fq2::roll(6)}
+        {Fq2::roll(6)}                          //[c3(2),c4(2),t(4),c3(2),c4(2),q(4)]
+        {script1}                               //[c3(2),c4(2),t4(4),c3(2),c4(2)]
+        {Fq2::roll(6)}
+        {Fq2::roll(6)}                          // [c3(2),c4(2),c3(2),c4(2),t4(4)]
+        {script2}                               // [c3(2),c4(2),c3(2),c4(2)]
+        {Fq2::drop()}
+        {Fq2::drop()}                           // [c3(2),c4(2)]
+    };
+
+    hints.extend(hint1);
+    hints.extend(hint2);
+
+    (script, hints)
+}
+
+#[cfg(test)]
+mod test {
+    use crate::bn254::g1::{hinted_from_eval_point, G1Affine};
+    use crate::bn254::g2::G2Affine;
+    use crate::bn254::fq::Fq;
+    use crate::bn254::fq2::Fq2;
+    use crate::{treepp::*, ExecuteInfo};
+    use super::*;
+    use ark_std::UniformRand;
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+    use ark_ff::AdditiveGroup;
+    use num_traits::One;
+
+    fn extract_witness_from_stack(res: ExecuteInfo) -> Vec<Vec<u8>> {
+        res.final_stack.0.iter_str().fold(vec![], |mut vector, x| {
+            vector.push(x);
+            vector
+        })
+    }
+
+    #[test]
+    fn test_read_from_stack() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let a = ark_bn254::G1Affine::rand(&mut prng);
+        let script = script! {
+            {G1Affine::push(a)}
+        };
+
+        let res = execute_script(script);
+        let witness = extract_witness_from_stack(res);
+        let recovered_a = G1Affine::read_from_stack(witness);
+
+        assert_eq!(a, recovered_a);
+
+        let b = ark_bn254::G2Affine::rand(&mut prng);
+        let script = script! {
+            {G2Affine::push(b)}
+        };
+
+        let res = execute_script(script);
+        let witness = extract_witness_from_stack(res);
+        let recovered_b = G2Affine::read_from_stack(witness);
+
+        assert_eq!(b, recovered_b);
+    }
+
+    #[test]
+    fn test_hinted_g2_affine_is_on_curve() {
+
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..3 {
+            let point = ark_bn254::G2Affine::rand(&mut prng);
+            let (scr, hints) = G2Affine::hinted_is_on_curve(point.x, point.y);
+            let script = script! {
+                for hint in hints { 
+                    { hint.push() }
+                }
+                { Fq2::push(point.x) }
+                { Fq2::push(point.y) }
+                { scr}
+            };
+            println!("curves::test_affine_is_on_curve = {} bytes", script.len());
+            let res = execute_script(script);
+            assert!(res.success);
+
+            let (scr, hints) = G2Affine::hinted_is_on_curve(point.x, point.y + point.y);
+            let script = script! {
+                for hint in hints { 
+                    { hint.push() }
+                }
+                { Fq2::push(point.x) }
+                { Fq2::push(point.y) }
+                {Fq2::double(0)}
+                { scr}
+                OP_NOT
+            };
+            println!("curves::test_affine_is_on_curve = {} bytes", script.len());
+            let res = execute_script(script);
+            assert!(res.success);
+        }
+    }
+
+    #[test]
+    fn test_hinted_ell_by_constant_affine() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        let b = ark_bn254::g2::G2Affine::rand(&mut prng);
+        let p = ark_bn254::g1::G1Affine::rand(&mut prng);
+
+        // affine mode
+        let coeffs = G2Prepared::from_affine(b).ell_coeffs[0];
+        let (ell_by_constant_affine_script, hints) = hinted_ell_by_constant_affine(
+            p.x,
+            p.y,
+            coeffs.1,
+            coeffs.2,
+        );
+        println!(
+            "Pairing.ell_by_constant_affine: {} bytes",
+            ell_by_constant_affine_script.len()
+        );
+
+        let script = script! {
+            for tmp in hints {
+                { tmp.push() }
+            }
+            // aux hints: Ellcoeffs: [slope, biasminus]
+            { Fq2::push(coeffs.1) } // slope
+            { Fq2::push(coeffs.2) } // biasminus
+
+            // runtime input: P
+            { Fq::push(p.x) }
+            { Fq::push(p.y) }
+            { ell_by_constant_affine_script }
+
+            // validate output
+            {Fq::push(coeffs.2.c0 * p.y)}
+            {Fq::push(coeffs.2.c1 * p.y)}
+            { Fq2::equalverify() }
+
+            {Fq::push(coeffs.1.c0 * p.x)}
+            {Fq::push(coeffs.1.c1 * p.x)}
+            { Fq2::equalverify() }
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);        
+    }
+
+    #[test]
+    fn test_hinted_ell_by_constant_affine_and_sparse_mul() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        let f = ark_bn254::Fq12::rand(&mut prng);
+        let b = ark_bn254::g2::G2Affine::rand(&mut prng);
+        let p = ark_bn254::g1::G1Affine::rand(&mut prng);
+
+        // affine mode
+        let coeffs = G2Prepared::from_affine(b);
+        let (from_eval_point_script, hints_eval) = hinted_from_eval_point(p);
+        let (ell_by_constant_affine_script, hints) = hinted_ell_by_constant_affine_and_sparse_mul(
+            f,
+            -p.x / p.y,
+            p.y.inverse().unwrap(),
+            &coeffs.ell_coeffs[0],
+        );
+        println!(
+            "Pairing.ell_by_constant_affine: {} bytes",
+            ell_by_constant_affine_script.len()
+        );
+
+        // affine mode as well
+        let hint = {
+            assert_eq!(coeffs.ell_coeffs[0].0, ark_bn254::fq2::Fq2::ONE);
+
+            let mut f1 = f;
+            let mut c1new = coeffs.ell_coeffs[0].1;
+            c1new.mul_assign_by_fp(&(-p.x / p.y));
+
+            let mut c2new = coeffs.ell_coeffs[0].2;
+            c2new.mul_assign_by_fp(&(p.y.inverse().unwrap()));
+
+            f1.mul_by_034(&coeffs.ell_coeffs[0].0, &c1new, &c2new);
+            f1
+        };
+
+        let script = script! {
+            for tmp in hints_eval {
+                { tmp.push() }
+            }
+            for tmp in hints {
+                { tmp.push() }
+            }
+            { Fq12::push(f) }
+
+            { Fq::push(p.y.inverse().unwrap()) }
+            { Fq::push(p.x) }
+            { Fq::push(p.y) }
+            { from_eval_point_script }
+
+            { ell_by_constant_affine_script.clone() }
+            { Fq12::push(hint) }
+            { Fq12::equalverify() }
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+    }
+
+    #[test]
+    fn test_hinted_affine_add_line() {
+        // alpha = (t.y - q.y) / (t.x - q.x)
+        // bias = t.y - alpha * t.x
+        // x' = alpha^2 - T.x - Q.x
+        // y' = -bias - alpha * x'
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G2Affine::rand(&mut prng);
+        let q = ark_bn254::G2Affine::rand(&mut prng);
+        let alpha = (t.y - q.y) / (t.x - q.x);
+        // -bias
+        let bias_minus = alpha * t.x - t.y;
+
+        let x = alpha.square() - t.x - q.x;
+        let y = bias_minus - alpha * x;
+        let (hinted_add_line, hints) = hinted_affine_add_line(t.x, q.x, alpha, bias_minus);
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            { Fq2::push(alpha) }
+            { Fq2::push(bias_minus) }
+            { Fq2::push(t.x) }
+            { Fq2::push(q.x) }
+            { hinted_add_line.clone() }
+            // [c3(2),c4(2),add(4)]
+            { Fq2::roll(6) }
+            { Fq2::roll(6) }
+            { Fq2::drop() }
+            { Fq2::drop() }
+            // [x']
+            { Fq2::push(y) }
+            // [x', y', y]
+            { Fq2::equalverify() }
+            // [x']
+            { Fq2::push(x) }
+            // [x', x]
+            { Fq2::equalverify() }
+            // []
+            OP_TRUE
+            // [OP_TRUE]
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+        println!(
+            "hinted_add_line: {} @ {} stack",
+            hinted_add_line.len(),
+            exec_result.stats.max_nb_stack_items
+        );
+    }
+
+    #[test]
+    fn test_hinted_check_line_through_point() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G2Affine::rand(&mut prng);
+        let two_inv = ark_bn254::Fq::one().double().inverse().unwrap();
+        let three_div_two = (ark_bn254::Fq::one().double() + ark_bn254::Fq::one()) * two_inv;
+        let mut alpha = t.x.square();
+        alpha /= t.y;
+        alpha.mul_assign_by_fp(&three_div_two);
+        // -bias
+        let bias_minus = alpha * t.x - t.y;
+
+        let (scr, hints) = hinted_check_line_through_point(t.x, alpha, bias_minus);
+        println!("hinted_check_line_through_point: {}", scr.len());
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            { Fq2::push(alpha) }
+            { Fq2::push(bias_minus) }
+            
+            { Fq2::push(t.x) }
+            { Fq2::push(t.y) }
+            {scr}
+            { Fq2::drop() }
+            { Fq2::drop() }
+            OP_TRUE
+        };
+        assert!(execute_script(script).success);
+
+
+    }
+
+    #[test]
+    fn test_hinted_affine_double_line() {
+        // slope: alpha = 3 * x^2 / 2 * y
+        // intercept: bias = y - alpha * x
+        // x' = alpha^2 - 2 * x
+        // y' = -bias - alpha * x'
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G2Affine::rand(&mut prng);
+        let two_inv = ark_bn254::Fq::one().double().inverse().unwrap();
+        let three_div_two = (ark_bn254::Fq::one().double() + ark_bn254::Fq::one()) * two_inv;
+        let mut alpha = t.x.square();
+        alpha /= t.y;
+        alpha.mul_assign_by_fp(&three_div_two);
+        // -bias
+        let bias_minus = alpha * t.x - t.y;
+
+        let x = alpha.square() - t.x.double();
+        let y = bias_minus - alpha * x;
+        let (hinted_double_line, hints) = hinted_affine_double_line(t.x, alpha, bias_minus);
+        println!("hinted_affine_double_line: {}", hinted_double_line.len());
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            { Fq2::push(alpha) }
+            { Fq2::push(bias_minus) }
+            { Fq2::push(t.x) }
+            { hinted_double_line }
+            // [c3(2),c4(2),add(4)]
+            { Fq2::roll(6) }
+            { Fq2::roll(6) }
+            { Fq2::drop() }
+            { Fq2::drop() }
+            // [x']
+            { Fq2::push(y) }
+            // [x', y', y]
+            { Fq2::equalverify() }
+            // [x']
+            { Fq2::push(x) }
+            // [x', x]
+            { Fq2::equalverify() }
+            // []
+            OP_TRUE
+            // [OP_TRUE]
+        };
+        assert!(execute_script(script).success);
+    }
+
+    #[test]
+    fn test_hinted_check_tangent_line() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G2Affine::rand(&mut prng);
+        let two_inv = ark_bn254::Fq::one().double().inverse().unwrap();
+        let three_div_two = (ark_bn254::Fq::one().double() + ark_bn254::Fq::one()) * two_inv;
+        let mut alpha = t.x.square();
+        alpha /= t.y;
+        alpha.mul_assign_by_fp(&three_div_two);
+        // -bias
+        let bias_minus = alpha * t.x - t.y;
+        assert_eq!(alpha * t.x - t.y, bias_minus);
+
+        let (hinted_check_line, hints) = hinted_check_tangent_line(t, alpha, bias_minus);
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            { Fq2::push(alpha) }
+            { Fq2::push(bias_minus) }
+            { Fq2::push(t.x) }
+            { Fq2::push(t.y) }
+            { hinted_check_line.clone() }
+            { Fq2::drop() }
+            { Fq2::drop() }
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+        println!(
+            "hinted_check_line: {} @ {} stack",
+            hinted_check_line.len(),
+            exec_result.stats.max_nb_stack_items
+        );
+    }
+
+    #[test]
+    fn test_hinted_check_tangent_line_keep_elements() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G2Affine::rand(&mut prng);
+        let two_inv = ark_bn254::Fq::one().double().inverse().unwrap();
+        let three_div_two = (ark_bn254::Fq::one().double() + ark_bn254::Fq::one()) * two_inv;
+        let mut alpha = t.x.square();
+        alpha /= t.y;
+        alpha.mul_assign_by_fp(&three_div_two);
+        // -bias
+        let bias_minus = alpha * t.x - t.y;
+        assert_eq!(alpha * t.x - t.y, bias_minus);
+
+        let (hinted_check_line, hints) = hinted_check_tangent_line_keep_elements(t, alpha, bias_minus);
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            { Fq2::push(alpha) }
+            { Fq2::push(bias_minus) }
+            { Fq2::push(t.x) }
+            { Fq2::push(t.y) }
+            { hinted_check_line.clone() }
+            for v in vec![t.y, t.x, bias_minus, alpha] {
+                {Fq2::push(v)}
+                {Fq2::equalverify()}
+            }
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        for i in 0..exec_result.final_stack.len() {
+            println!("{i:3}: {:?}", exec_result.final_stack.get(i));
+        }
+        assert!(exec_result.success);
+        println!(
+            "hinted_check_line: {} @ {} stack",
+            hinted_check_line.len(),
+            exec_result.stats.max_nb_stack_items
+        );
+    }
+
+    #[test]
+    fn test_hinted_check_chord_line() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G2Affine::rand(&mut prng);
+        let q = ark_bn254::G2Affine::rand(&mut prng);
+        let alpha = (t.y - q.y) / (t.x - q.x);
+        // -bias
+        let bias_minus = alpha * t.x - t.y;
+        assert_eq!(alpha * t.x - t.y, bias_minus);
+        let (hinted_check_line, hints) = hinted_check_chord_line(t, q, alpha, bias_minus);
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            { Fq2::push(alpha) }
+            { Fq2::push(bias_minus) }
+            { Fq2::push(t.x) }
+            { Fq2::push(t.y) }
+            { Fq2::push(q.x) }
+            { Fq2::push(q.y) }
+            { hinted_check_line.clone() }
+            { Fq2::drop() }
+            { Fq2::drop() }
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+        println!(
+            "hinted_check_line: {} @ {} stack",
+            hinted_check_line.len(),
+            exec_result.stats.max_nb_stack_items
+        );
+    }
+
+    #[test]
+    fn test_hinted_mul_by_char_on_q() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let q = ark_bn254::G2Affine::rand(&mut prng);
+        let (qdash, scr_endo, hints) = hinted_mul_by_char_on_q(q);
+
+        let script_len = scr_endo.len();
+        let script = script!(
+            for hint in hints {
+                {hint.push()}
+            }
+            {G2Affine::push(q)}
+            {scr_endo}
+            {Fq2::push(qdash.y)}
+            {Fq2::equalverify()}
+            {Fq2::push(qdash.x)}
+            {Fq2::equalverify()}
+            OP_TRUE
+        );
+
+        let exec_result = execute_script(script);
+        println!("hinted_p_power_endomorphism script {} and stack {}", script_len, exec_result.stats.max_nb_stack_items);
+        assert!(exec_result.success);
+    }
+
+    #[test]
+    fn test_hinted_mul_by_char_on_phi_q() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let q = ark_bn254::G2Affine::rand(&mut prng);
+        let (qdash, scr_endo, hints) = hinted_mul_by_char_on_phi_q(q);
+
+        let script_len = scr_endo.len();
+        let script = script!(
+            for hint in hints {
+                {hint.push()}
+            }
+            {G2Affine::push(q)}
+            {scr_endo}
+            {Fq2::push(qdash.y)}
+            {Fq2::equalverify()}
+            {Fq2::push(qdash.x)}
+            {Fq2::equalverify()}
+            OP_TRUE
+        );
+
+        let exec_result = execute_script(script);
+        println!("hinted_endomorphism_affine script {} and stack {}", script_len, exec_result.stats.max_nb_stack_items);
+        assert!(exec_result.success);
+    }
+}
+
diff --git a/src/bn254/mod.rs b/bitvm/src/bn254/mod.rs
similarity index 86%
rename from src/bn254/mod.rs
rename to bitvm/src/bn254/mod.rs
index 967c40e3e..088e83fb4 100644
--- a/src/bn254/mod.rs
+++ b/bitvm/src/bn254/mod.rs
@@ -3,8 +3,8 @@ pub mod fq12;
 pub mod fq2;
 pub mod fq6;
 pub mod fr;
-
-pub mod curves;
+pub mod g1;
+pub mod g2;
 
 pub mod pairing;
 
diff --git a/bitvm/src/bn254/msm.rs b/bitvm/src/bn254/msm.rs
new file mode 100644
index 000000000..99a317f9c
--- /dev/null
+++ b/bitvm/src/bn254/msm.rs
@@ -0,0 +1,497 @@
+/// Compute MSM = [a]P + [b]Q
+/// Binary decomposition of scalar 'a' is given by an addition-chain like a = a0 + 2.a1 + 4.a2 + ..
+/// W-windowed decomposition of the same expression is given by a = a0 + 2^(w.1) a1 + 2 ^(w.2) a2 + ...
+/// Therefore, point scalar multiplication [a]P can be expressed as:
+/// [a]P = [a0]P + [a1] (2^w P) + [a2] (2^2w P) +..
+/// Since P is a constant derived from verification key, the expression (2 ^ w.i P) can be baked into the Script
+/// Same procedure is repeated separately for [b]Q and their results can be combined to yield the total MSM result
+/// 
+/// For our purposes we select w = 8 (WINDOW_G1_MSM), the scalar a is a 254-bit scalar element, as such we obtain 254/8 ~ 32 addition terms
+/// Each of the w-bit doubling lookup table querying + addition with the accumulator consumes some script size k
+/// We batch multiple such double+add Scripts inside a single chunk. For w = 8, BATCH_SIZE_PER_CHUNK = 8 where k * BATCH_SIZE_PER_CHUNK < 4M
+/// 
+/// As such a batch of double+addition terms is implemented on a chunk, thus a single point-scalar multiplication requires around 32/8 = 4 chunks
+/// This number increases linearly as the number of scalar grows.
+
+
+use super::fq2::Fq2;
+use super::utils::{fq_to_bits, Hint};
+use crate::bn254::fp254impl::Fp254Impl;
+use crate::bn254::{g1::G1Affine, fr::Fr};
+use crate::treepp::*;
+use ark_ec::{AffineRepr, CurveGroup};
+use ark_ff::{ One, PrimeField};
+use itertools::Itertools;
+use num_bigint::BigUint;
+
+// Function used to compile a single msm tapscript for unchunked verifier only
+pub fn hinted_msm_with_constant_bases_affine(
+    bases: &[ark_bn254::G1Affine],
+    scalars: &[ark_bn254::Fr],
+) -> (Script, Vec<Hint>) {
+    println!("use hinted_msm_with_constant_bases_affine");
+    assert_eq!(bases.len(), scalars.len());
+
+    let all_rows = g1_multi_scalar_mul(bases.to_vec(), scalars.to_vec());
+    let mut all_hints: Vec<Hint> = vec![];
+    let mut prev = ark_bn254::G1Affine::identity();
+    let mut scr = script!();
+
+    let all_rows_len = all_rows.len();
+    let num_scalars = scalars.len();
+    let psm_len = all_rows.len()/num_scalars;
+
+    for (idx, (row_out, row_scr, row_hints)) in all_rows.into_iter().enumerate() {
+
+        all_hints.extend_from_slice(&row_hints);
+        
+        let temp_scr = script!{
+            // [hints, t, scalar]
+            {G1Affine::push(prev)}
+            {Fr::push(scalars[idx/psm_len] )} // fq0, fq1
+            {row_scr}
+            if idx == all_rows_len-1 { // save final output
+                {Fq2::copy(0)}
+                {Fq2::toaltstack()}
+            }
+            {G1Affine::push(row_out)}
+            {G1Affine::equalverify()}
+            {G1Affine::push(prev) }
+            {G1Affine::equalverify()}
+            if idx == all_rows_len-1 {
+                {Fq2::fromaltstack()}
+            }
+        };
+
+        scr = script!{
+            {scr}
+            {temp_scr}
+        };
+        prev = row_out;
+    }
+
+    (scr, all_hints)
+}
+
+pub const WINDOW_G1_MSM: u32 = 8;
+pub const BATCH_SIZE_PER_CHUNK: u32 = 8;
+
+// Core function generates lookup table
+// A lookup table is a series of if-conditionals that take as input a w-bit scalar slice
+pub(crate) fn dfs_with_constant_mul(
+    index: u32,
+    depth: u32,
+    mask: u32,
+    p_mul: &Vec<ark_bn254::G1Affine>,
+) -> Script {
+    if depth == 0 {
+        return script! {
+            OP_IF
+                { G1Affine::push(p_mul[(mask + (1 << index)) as usize]) }
+            OP_ELSE
+                if mask == 0 {
+                    { G1Affine::push_zero() }
+                } else {
+                    { G1Affine::push(p_mul[mask as usize]) }
+                }
+            OP_ENDIF
+        };
+    }
+    script! {
+        OP_IF
+            { dfs_with_constant_mul(index + 1, depth - 1, mask + (1 << index), p_mul) }
+        OP_ELSE
+            { dfs_with_constant_mul(index + 1, depth - 1, mask, p_mul) }
+        OP_ENDIF
+    }
+}
+
+// Given a curve point 'q', the function generates separate lookup tables for each of the Fr::N_BITS(254)/window terms in addition chain
+// Table for i-th term in addition-chain is for (2^(w.i) P).
+// Each table contains 2^w rows formed by repeated doubling of (2^(w.i)P)
+// This way [a_j] (2^(w.i)P) can be obtained by checking the a_j-the entry of this table, 
+// where a_j is a w-bit scalar slice i.e. a_j \in [0..2^w -1]
+
+// This function returns N-Tables each pairing with an addition term
+// Output includes an array of tables-entries and an array of precomputed table scripts.
+fn generate_lookup_tables(q: ark_bn254::G1Affine, window: usize) -> (Vec<Vec<ark_bn254::G1Affine>>, Vec<Script>) {
+    let num_tables = (Fr::N_BITS as usize + window - 1)/window;
+
+    let mut all_tables_scr = vec![];
+    let mut all_tables = vec![];
+
+    for i in 0..num_tables {
+        let doubling_factor = BigUint::one() << (i * window); // (2^(w.i))
+        let doubled_base = (q * ark_bn254::Fr::from(doubling_factor)).into_affine(); // (2^(w.i) P)
+        
+        let mut p_mul: Vec<ark_bn254::G1Affine> = Vec::new();
+        p_mul.push(ark_bn254::G1Affine::zero()); // [a_0] (2^(w.i) P)
+        for _ in 1..(1 << window) {
+            let entry = (*p_mul.last().unwrap() + doubled_base).into_affine();  // [a_i] (2^(w.i) P)
+            p_mul.push(entry);
+        }
+
+        let p_mul_scr = {dfs_with_constant_mul(0, window as u32 - 1, 0, &p_mul) };
+        all_tables_scr.push(p_mul_scr);
+        all_tables.push(p_mul);
+    }
+    (all_tables, all_tables_scr)
+}
+
+// This function computes the slice (w-bit segment) of scalar that is used as an index to 
+// the corresponding row of a table.
+// The index of slice of scalar i.e {a_i} and the index of tables (chunks) i.e {(2^2wi P)} match
+// Output is a value and a script to generate that value from a scalar
+fn get_query_for_table_index(scalar: ark_bn254::Fr, window: usize, table_index: usize) -> (u32, Script) {
+    let num_tables: u32 = (Fr::N_BITS + window as u32 - 1)/window as u32;
+    // Split Scalar into bits and group window size 
+    let chunks = fq_to_bits(scalar.into_bigint(), window); // {a_0, ..,a_N}
+    // Get Scalar slice (w-bit segment) at index position i.e. a_i
+    let elem = chunks[table_index];
+    let size = num_tables * window as u32;
+    let scr = script!{
+        // [scalar]
+        {Fr::convert_to_le_bits_toaltstack()}
+        // [254-bits]
+        for _ in Fr::N_BITS..size {
+            {0}
+        }
+        // [W*NUM_TABLES-bits]
+        for _ in 0..Fr::N_BITS {
+            OP_FROMALTSTACK
+        }
+        for i in 0..size {
+            if i/window as u32 == (table_index as u32) {
+                OP_TOALTSTACK // preserve all bits for the corresponding table-index
+            } else {
+                OP_DROP
+            }
+        }
+        for _ in 0..window {
+            OP_FROMALTSTACK
+        }
+        // w-bit value a_i
+    };
+    (elem, scr)
+}
+
+// Given a precomputed table of some table index
+// Lookup a_i-th row and return result
+// The result is a G1Affine element corresponding to [a_i] (2^(w.i) P)
+fn query_table(table: (Vec<ark_bn254::G1Affine>, Script), row_index: (usize, Script)) -> (ark_bn254::G1Affine, Script) {
+    let row = table.0[row_index.0];
+    let scr = script!{
+        // [scalar]
+        {row_index.1}
+        // [scalar slice] => a_i
+        {table.1}
+        // [a_i] (2 ^ (w.i) P)
+    };
+    (row, scr)
+}
+
+/// Compute: Sum of [a_i] (2^ (wi) P) for i = 0..N, N is the number of terms in addition chain
+/// BATCH_SIZE_PER_CHUNK such terms are batached inside a chunk
+/// init_acc is the starting value of the accumulator; for chained point-scalar multiplication it is the output of previous point scalar mul
+/// Output is an array of (value, script, hints) required for execution of each of the chunks
+fn accumulate_addition_chain_for_a_scalar_mul(init_acc: ark_bn254::G1Affine, base: ark_bn254::G1Affine, scalar: ark_bn254::Fr, window: usize) ->  Vec<(ark_bn254::G1Affine, Script, Vec<Hint>)> {
+    let mut all_tables_result: Vec<(ark_bn254::G1Affine, Script, Vec<Hint>)> = vec![];
+
+    let num_tables = (Fr::N_BITS as usize + window - 1)/window;   
+    let tables = generate_lookup_tables(base, window);
+
+    let mut prev = init_acc;    
+
+    for batched_table_indices in &(0..num_tables).chunks(BATCH_SIZE_PER_CHUNK as usize) {
+        let mut vec_row_g1_scr = Vec::new();
+        let mut vec_add_scr = Vec::new();
+        let mut vec_add_hints = Vec::new();
+
+        for table_index in batched_table_indices {
+            let (scalar_slice, scalar_slice_script) = get_query_for_table_index(scalar, window as usize, table_index as usize);
+            let (selected_table_vec, selected_table_script )  = (tables.0[table_index as usize].clone(), tables.1[table_index as usize].clone());
+            let (row_g1, row_g1_scr) = query_table((selected_table_vec, selected_table_script), (scalar_slice as usize, scalar_slice_script));
+
+            // accumulate value using hinted_check_add
+            let (add_scr, add_hints) = G1Affine::hinted_check_add(prev, row_g1);
+
+            prev = (prev + row_g1).into_affine(); // output of this chunk: t + q
+            vec_row_g1_scr.push(row_g1_scr);
+            vec_add_scr.push(add_scr);
+            vec_add_hints.extend(add_hints);
+        }
+
+        let n = vec_row_g1_scr.len();
+
+        let scr = script!{
+            // [hints, t, scalar]
+            {Fq2::copy(1)} {Fq2::toaltstack()}
+            // [hints, t, scalar] [t]
+
+            for i in 0..n {
+                // [hints, t, scalar]
+                {Fr::copy(0)} {Fr::toaltstack()}
+                // [hints, t, scalar] [t, scalar]
+                {vec_row_g1_scr[i].clone()}
+                // [hints, t, q] where q = row_g1 =  [scalar_slice] (2^(w*table_index) base)
+                {vec_add_scr[i].clone()}
+                // [hints, t+q]
+                {Fr::fromaltstack()}
+                // [hints, t+q, scalar]
+            }
+            // [t+q, scalar] [t]
+            {Fr::drop()}
+            {Fq2::fromaltstack()}
+            {Fq2::roll(2)}
+            // [t, t+q]
+        };
+
+        all_tables_result.push((prev, scr, vec_add_hints)); // (output_of_chunk, Script_of_chunk, Hints_for_chunk)
+    }
+
+    // output for all tables
+    all_tables_result
+}
+
+// This function wraps over multiple point scalar multiplications to form a single MSM
+// result of one point-scalar mul is passed as initial value for the next chain of point-scalar mul
+pub(crate) fn g1_multi_scalar_mul(bases: Vec<ark_bn254::G1Affine>, scalars: Vec<ark_bn254::Fr>)->  Vec<(ark_bn254::G1Affine, Script, Vec<Hint>)> {
+    assert_eq!(bases.len(), scalars.len());
+    let mut prev = ark_bn254::G1Affine::identity();
+    let window = WINDOW_G1_MSM as usize;
+    let mut aggregate_result_of_all_scalar_muls = vec![];
+
+    for i in 0..bases.len() {
+        let scalar_mul_res = accumulate_addition_chain_for_a_scalar_mul(prev, bases[i], scalars[i], window);
+        prev = scalar_mul_res[scalar_mul_res.len()-1].0;
+        aggregate_result_of_all_scalar_muls.extend_from_slice(&scalar_mul_res);
+    }
+    aggregate_result_of_all_scalar_muls
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::bn254::g1::G1Affine;
+    use crate::execute_script_without_stack_limit;
+    use ark_ec::{CurveGroup, VariableBaseMSM};
+    use ark_std::{end_timer, start_timer, test_rng, UniformRand};
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+
+
+    #[test]
+    fn test_get_query_for_table_index() {
+        let mut prng = ChaCha20Rng::seed_from_u64(1);
+        for _ in 0..5 {
+            let fq = ark_bn254::Fr::rand(&mut prng);
+            let window = (u32::rand(&mut prng) % WINDOW_G1_MSM)  + 1;
+            let num_tables: u32 = (Fr::N_BITS + window as u32 - 1)/window as u32;
+            let random_index = u32::rand(&mut prng) % num_tables as u32;
+            let (value, slice_scr) = get_query_for_table_index(fq, window as usize, random_index as usize);
+    
+            let scr = script!{
+                {Fr::push(fq)}
+                {slice_scr}
+                for _ in 0..window {
+                    OP_TOALTSTACK
+                }
+                // sum up bits to tally with value
+                {0}
+                for i in 0..window {
+                    OP_FROMALTSTACK
+                    OP_ADD
+                    if i != window-1 {
+                        OP_DUP
+                        OP_ADD
+                    }
+                }
+                {value}
+                OP_EQUAL OP_VERIFY
+                OP_TRUE
+            };
+            let res = execute_script(scr);
+            if res.final_stack.len() > 1 {
+                for i in 0..res.final_stack.len() {
+                    println!("{i:} {:?}", res.final_stack.get(i));
+                }
+            }
+            assert!(res.success);
+            assert!(res.final_stack.len() == 1);
+        }
+
+    }
+
+    #[test]
+    fn test_query_table() {
+        let mut prng = ChaCha20Rng::seed_from_u64(1);
+        let q = ark_bn254::G1Affine::rand(&mut prng);
+        let window = WINDOW_G1_MSM as usize;
+        let tables = generate_lookup_tables(q, window);
+        let num_tables = tables.1.len();
+        let table_index = u32::rand(&mut prng) % num_tables as u32;
+
+        let fq = ark_bn254::Fr::rand(&mut prng);
+        
+        let (value, slice_scr) = get_query_for_table_index(fq, window as usize, table_index as usize);
+
+        let selected_table  = (tables.0[table_index as usize].clone(), tables.1[table_index as usize].clone());
+        let (row, row_scr) = query_table(selected_table, (value as usize, slice_scr));
+
+        let tap_len = row_scr.len();
+        let scr = script!{
+            {Fr::push(fq)}
+            {row_scr}
+            {G1Affine::push(row)}
+            {G1Affine::equalverify()}
+            OP_TRUE
+        };
+
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(res.success);
+        assert!(res.final_stack.len() == 1);
+        println!("tap len {} stack len {}", tap_len, res.stats.max_nb_stack_items);
+    }
+
+
+
+    #[test]
+    fn test_hinted_msm_with_constant_bases_affine_script() {
+        let n = 2;
+        let rng = &mut test_rng();
+
+        let scalars = (0..n).map(|_| ark_bn254::Fr::rand(rng)).collect::<Vec<_>>();
+
+        let bases = (0..n)
+            .map(|_| ark_bn254::G1Projective::rand(rng).into_affine())
+            .collect::<Vec<_>>();
+
+        let expect = ark_bn254::G1Projective::msm(&bases, &scalars).unwrap();
+        let expect = expect.into_affine();
+        let (msm, hints) = hinted_msm_with_constant_bases_affine(&bases, &scalars);
+
+        let start = start_timer!(|| "collect_script");
+        println!("hints {:?}", hints.len());
+        let tap_len = msm.len();
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            } 
+            { msm }
+
+            { G1Affine::push(expect) }
+            { G1Affine::equalverify() }
+            OP_TRUE
+        };
+        end_timer!(start);
+
+        println!("hinted_msm_with_constant_bases: = {} bytes", tap_len);
+        let start = start_timer!(|| "execute_msm_script");
+        let exec_result = execute_script_without_stack_limit(script);
+        if exec_result.final_stack.len() > 1 {
+            for i in 0..exec_result.final_stack.len() {
+                println!("{i:} {:?}", exec_result.final_stack.get(i));
+            }
+        }
+        end_timer!(start);
+        assert!(exec_result.success);
+    }
+
+    #[test]
+    fn test_accumulate_rows() {
+        let mut prng = ChaCha20Rng::seed_from_u64(1);
+        let q = ark_bn254::G1Affine::rand(&mut prng);
+        let fq = ark_bn254::Fr::rand(&mut prng);
+        let window = WINDOW_G1_MSM as usize;
+        let mut prev = ark_bn254::G1Affine::identity();
+        let all_rows = accumulate_addition_chain_for_a_scalar_mul(prev, q, fq, window);
+
+        let expected_msm = (q * fq).into_affine();
+        let calculated_msm = all_rows[all_rows.len()-1].0;
+        assert_eq!(expected_msm, calculated_msm);
+
+        for (row_out, row_scr, row_hints) in all_rows {
+
+            let tap_len = row_scr.len();
+            let scr = script!{
+                // [hints, t, scalar]
+                for h in &row_hints {
+                    {h.push()}
+                }
+                {G1Affine::push(prev)}
+                {Fr::push(fq)}
+                {row_scr}
+                {G1Affine::push(row_out)}
+                {G1Affine::equalverify()}
+                {G1Affine::push(prev) }
+                {G1Affine::equalverify()}
+                OP_TRUE
+            };
+
+            let res = execute_script(scr);
+            if res.final_stack.len() > 1 {
+                for i in 0..res.final_stack.len() {
+                    println!("{i:} {:?}", res.final_stack.get(i));
+                }
+            }
+            prev = row_out;
+            assert!(res.success);
+            println!("accumulate_addition_terms {:?} max_stat {:?}", tap_len, res.stats.max_nb_stack_items);
+        }
+
+    }
+
+
+    #[test]
+    fn test_accumulate_multiple_rows() {
+        let mut prng = ChaCha20Rng::seed_from_u64(1);
+        let q0 = ark_bn254::G1Affine::rand(&mut prng);
+        let fq0 = ark_bn254::Fr::rand(&mut prng);
+        let q1 = ark_bn254::G1Affine::rand(&mut prng);
+        let fq1 = ark_bn254::Fr::rand(&mut prng);
+        let bases = vec![q0, q1];
+        let scalars = vec![fq0, fq1];
+
+        let num_scalars = scalars.len();
+        let all_rows = g1_multi_scalar_mul(bases, scalars.clone());
+        let psm_len = all_rows.len()/num_scalars;
+
+        let expected_msm = (q0 * fq0 + q1 * fq1).into_affine();
+        let calculated_msm = all_rows[all_rows.len()-1].0;
+        assert_eq!(expected_msm, calculated_msm);
+
+        let mut prev = ark_bn254::G1Affine::identity();
+        for (idx, (row_out, row_scr, row_hints)) in all_rows.into_iter().enumerate() {
+
+            let scr = script!{
+                // [hints, t, scalar]
+                for h in &row_hints {
+                    {h.push()}
+                }
+                {G1Affine::push(prev)}
+                {Fr::push(scalars[idx/psm_len] )} // fq0, fq1
+                {row_scr}
+                {G1Affine::push(row_out)}
+                {G1Affine::equalverify()}
+                {G1Affine::push(prev) }
+                {G1Affine::equalverify()}
+                OP_TRUE
+            };
+            let res = execute_script(scr);
+            if res.final_stack.len() > 1 {
+                for i in 0..res.final_stack.len() {
+                    println!("{i:} {:?}", res.final_stack.get(i));
+                }
+            }
+            prev = row_out;
+
+            assert!(res.success);
+        }
+
+    }
+}
diff --git a/bitvm/src/bn254/pairing.rs b/bitvm/src/bn254/pairing.rs
new file mode 100644
index 000000000..e941256cf
--- /dev/null
+++ b/bitvm/src/bn254/pairing.rs
@@ -0,0 +1,850 @@
+#![allow(non_snake_case)]
+use super::utils::Hint;
+use crate::bn254::ell_coeffs::G2Prepared;
+use crate::bn254::fp254impl::Fp254Impl;
+use crate::bn254::fq::Fq;
+use crate::bn254::fq12::Fq12;
+use crate::bn254::fq2::Fq2;
+use crate::bn254::g2::*;
+use crate::treepp::*;
+use ark_ec::bn::BnConfig;
+use ark_ff::{AdditiveGroup, Field};
+use num_bigint::BigUint;
+use num_traits::One;
+use std::{ops::Neg, str::FromStr};
+
+pub struct Pairing;
+
+impl Pairing {
+    // refer algorithm 9 of https://eprint.iacr.org/2024/640.pdf
+    // four pairings in total, where three of them is fixed on G2, only one is non-fixed on G2 (specially for groth16 verifier for now)
+    //
+    // input on stack:
+    //     [beta_12, beta_13, beta_22, P1', P2', P3', P4', Q4, c, c_inv, wi, T4]
+    //     P1', P2', P3', P4' are variants of points P1, P2, P3, P4 individually, such as P1' = (-P1.x / P1.y, 1 / P1.y)
+    //     Q1, Q2 and Q3 are fixed, Q4 is non-fixed and provided by prover
+    //     T4 is accumulator for Q4, initial T4 = Q4, will do double and add operations for T4
+    //
+    // input of parameters:
+    //     [L(Q1), L(Q2), L(Q3), L(Q4)] (line coefficients in affine mode)
+    pub fn hinted_quad_miller_loop_with_c_wi(
+        constants: Vec<G2Prepared>,
+        c: ark_bn254::Fq12,
+        c_inv: ark_bn254::Fq12,
+        wi: ark_bn254::Fq12,
+        p_lst: Vec<ark_bn254::G1Affine>,
+        q4: ark_bn254::G2Affine,
+    ) -> (Script, Vec<Hint>) {
+        assert_eq!(constants.len(), 4);
+        let num_line_groups = constants.len();
+        let num_constant = 3;
+
+        let line_coeffs = collect_line_coeffs(constants);
+        let num_lines = line_coeffs.len();
+
+        let mut hints = Vec::new();
+        let mut scripts = Vec::new();
+
+        let mut f = c_inv;
+        let mut t4 = q4;
+
+        for i in (1..ark_bn254::Config::ATE_LOOP_COUNT.len()).rev() {
+            let fx = f.square();
+            let (hinted_script, hint) = Fq12::hinted_square(f);
+            scripts.push(hinted_script);
+            hints.extend(hint);
+            f = fx;
+
+            if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == 1 {
+                let fx = f * c_inv;
+                let (hinted_script, hint) = Fq12::hinted_mul(12, f, 0, c_inv);
+                scripts.push(hinted_script);
+                hints.extend(hint);
+                f = fx;
+            } else if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
+                let fx = f * c;
+                let (hinted_script, hint) = Fq12::hinted_mul(12, f, 0, c);
+                scripts.push(hinted_script);
+                hints.extend(hint);
+                f = fx;
+            }
+
+            for (j, p) in p_lst.iter().enumerate().take(num_line_groups) {
+                if j == 2 { continue; }
+                let coeffs = &line_coeffs[num_lines - (i + 2)][j][0];
+                assert_eq!(coeffs.0, ark_bn254::Fq2::ONE);
+                let mut fx = f;
+                let mut c1new = coeffs.1;
+                c1new.mul_assign_by_fp(&(-p.x / p.y));
+                let mut c2new = coeffs.2;
+                c2new.mul_assign_by_fp(&(p.y.inverse().unwrap()));
+                fx.mul_by_034(&coeffs.0, &c1new, &c2new);
+
+                let (hinted_script, hint) =
+                    hinted_ell_by_constant_affine_and_sparse_mul(f, -p.x / p.y, p.y.inverse().unwrap(), coeffs);
+                scripts.push(hinted_script);
+                hints.extend(hint);
+                f = fx;
+
+                if j == num_constant {
+                    let two_inv = ark_bn254::Fq::one().double().inverse().unwrap();
+                    let three_div_two =
+                        (ark_bn254::Fq::one().double() + ark_bn254::Fq::one()) * two_inv;
+                    let mut alpha = t4.x.square();
+                    alpha /= t4.y;
+                    alpha.mul_assign_by_fp(&three_div_two);
+                    let bias_minus = alpha * t4.x - t4.y;
+                    let x = alpha.square() - t4.x.double();
+                    let y = bias_minus - alpha * x;
+                    let t4x = ark_bn254::G2Affine::new(x, y);
+
+                    let (hinted_script, hint) = hinted_check_tangent_line(
+                        t4,
+                        line_coeffs[num_lines - (i + 2)][j][0].1,
+                        line_coeffs[num_lines - (i + 2)][j][0].2,
+                    );
+                    scripts.push(hinted_script);
+                    hints.extend(hint);
+
+                    let (hinted_script, hint) = hinted_affine_double_line(
+                        t4.x,
+                        line_coeffs[num_lines - (i + 2)][j][0].1,
+                        line_coeffs[num_lines - (i + 2)][j][0].2,
+                    );
+                    scripts.push(hinted_script);
+                    hints.extend(hint);
+
+                    t4 = t4x;
+                }
+            }
+
+            if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == 1
+                || ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1
+            {
+                for (j, p) in p_lst.iter().enumerate().take(num_line_groups) {
+                    if j == 2 { continue; }
+                    let coeffs = &line_coeffs[num_lines - (i + 2)][j][1];
+                    assert_eq!(coeffs.0, ark_bn254::Fq2::ONE);
+                    let mut fx = f;
+                    let mut c1new = coeffs.1;
+                    c1new.mul_assign_by_fp(&(-p.x / p.y));
+                    let mut c2new = coeffs.2;
+                    c2new.mul_assign_by_fp(&(p.y.inverse().unwrap()));
+                    fx.mul_by_034(&coeffs.0, &c1new, &c2new);
+
+                    let (hinted_script, hint) = hinted_ell_by_constant_affine_and_sparse_mul(
+                        f,
+                        -p.x / p.y,
+                        p.y.inverse().unwrap(),
+                        coeffs,
+                    );
+                    scripts.push(hinted_script);
+                    hints.extend(hint);
+                    f = fx;
+
+                    if j == num_constant {
+                        let mut pm_q4 = q4;
+                        if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
+                            pm_q4 = q4.neg();
+                        }
+                        let alpha = (t4.y - pm_q4.y) / (t4.x - pm_q4.x);
+                        let bias_minus = alpha * t4.x - t4.y;
+                        let x = alpha.square() - t4.x - pm_q4.x;
+                        let y = bias_minus - alpha * x;
+                        let t4x = ark_bn254::G2Affine::new(x, y);
+
+                        let (hinted_script, hint) = hinted_check_chord_line(
+                            t4,
+                            pm_q4,
+                            line_coeffs[num_lines - (i + 2)][j][1].1,
+                            line_coeffs[num_lines - (i + 2)][j][1].2,
+                        );
+                        scripts.push(hinted_script);
+                        hints.extend(hint);
+
+                        let (hinted_script, hint) = hinted_affine_add_line(
+                            t4.x,
+                            q4.x,
+                            line_coeffs[num_lines - (i + 2)][j][1].1,
+                            line_coeffs[num_lines - (i + 2)][j][1].2,
+                        );
+                        scripts.push(hinted_script);
+                        hints.extend(hint);
+
+                        t4 = t4x;
+                    }
+                }
+            }
+        }
+
+        let c_inv_p = c_inv.frobenius_map(1);
+        let (hinted_script, hint) = Fq12::hinted_frobenius_map(1, c_inv);
+        scripts.push(hinted_script);
+        hints.extend(hint);
+
+        let fx = f * c_inv_p;
+        let (hinted_script, hint) = Fq12::hinted_mul(12, f, 0, c_inv_p);
+        scripts.push(hinted_script);
+        hints.extend(hint);
+        f = fx;
+
+        let c_p2 = c.frobenius_map(2);
+        let (hinted_script, hint) = Fq12::hinted_frobenius_map(2, c);
+        scripts.push(hinted_script);
+        hints.extend(hint);
+
+        let fx = f * c_p2;
+        let (hinted_script, hint) = Fq12::hinted_mul(12, f, 0, c_p2);
+        scripts.push(hinted_script);
+        hints.extend(hint);
+        f = fx;
+
+        let c_inv_p3 = c_inv.frobenius_map(3);
+        let (hinted_script, hint) = Fq12::hinted_frobenius_map(3, c_inv);
+        scripts.push(hinted_script);
+        hints.extend(hint);
+
+        let fx = f * c_inv_p3;
+        let (hinted_script, hint) = Fq12::hinted_mul(12, f, 0, c_inv_p3);
+        scripts.push(hinted_script);
+        hints.extend(hint);
+        f = fx;
+
+        let fx = f * wi;
+        let (hinted_script, hint) = Fq12::hinted_mul(12, f, 0, wi);
+        scripts.push(hinted_script);
+        hints.extend(hint);
+        f = fx;
+
+        for (j, p) in p_lst.iter().enumerate().take(num_line_groups) {
+            if j == 2 { continue; }
+            let coeffs = &line_coeffs[num_lines - 2][j][0];
+            assert_eq!(coeffs.0, ark_bn254::Fq2::ONE);
+            let mut fx = f;
+            let mut c1new = coeffs.1;
+            c1new.mul_assign_by_fp(&(-p.x / p.y));
+            let mut c2new = coeffs.2;
+            c2new.mul_assign_by_fp(&(p.y.inverse().unwrap()));
+            fx.mul_by_034(&coeffs.0, &c1new, &c2new);
+
+            let (hinted_script, hint) =
+                hinted_ell_by_constant_affine_and_sparse_mul(f, -p.x / p.y, p.y.inverse().unwrap(), coeffs);
+            scripts.push(hinted_script);
+            hints.extend(hint);
+            f = fx;
+
+            if j == num_constant {
+                let beta_12x = BigUint::from_str(
+                    "21575463638280843010398324269430826099269044274347216827212613867836435027261",
+                )
+                .unwrap();
+                let beta_12y = BigUint::from_str(
+                    "10307601595873709700152284273816112264069230130616436755625194854815875713954",
+                )
+                .unwrap();
+                let beta_12 = ark_bn254::Fq2::from_base_prime_field_elems([
+                    ark_bn254::Fq::from(beta_12x.clone()),
+                    ark_bn254::Fq::from(beta_12y.clone()),
+                ])
+                .unwrap();
+                let beta_13x = BigUint::from_str(
+                    "2821565182194536844548159561693502659359617185244120367078079554186484126554",
+                )
+                .unwrap();
+                let beta_13y = BigUint::from_str(
+                    "3505843767911556378687030309984248845540243509899259641013678093033130930403",
+                )
+                .unwrap();
+                let beta_13 = ark_bn254::Fq2::from_base_prime_field_elems([
+                    ark_bn254::Fq::from(beta_13x.clone()),
+                    ark_bn254::Fq::from(beta_13y.clone()),
+                ])
+                .unwrap();
+                let mut q4x = q4.x;
+                q4x.conjugate_in_place();
+
+                let (hinted_script, hint) = Fq2::hinted_mul(2, q4x, 0, beta_12);
+                scripts.push(hinted_script);
+                hints.extend(hint);
+
+                q4x *= beta_12;
+                let mut q4y = q4.y;
+                q4y.conjugate_in_place();
+
+                let (hinted_script, hint) = Fq2::hinted_mul(2, q4y, 0, beta_13);
+                scripts.push(hinted_script);
+                hints.extend(hint);
+
+                q4y *= beta_13;
+                let alpha = (t4.y - q4y) / (t4.x - q4x);
+                let bias_minus = alpha * t4.x - t4.y;
+                let x = alpha.square() - t4.x - q4x;
+                let y = bias_minus - alpha * x;
+                let t4x = ark_bn254::G2Affine::new(x, y);
+                let q4_new = ark_bn254::G2Affine::new(q4x, q4y);
+
+                let (hinted_script, hint) = hinted_check_chord_line(
+                    t4,
+                    q4_new,
+                    line_coeffs[num_lines - 2][j][0].1,
+                    line_coeffs[num_lines - 2][j][0].2,
+                );
+                scripts.push(hinted_script);
+                hints.extend(hint);
+
+                let (hinted_script, hint) = hinted_affine_add_line(
+                    t4.x,
+                    q4_new.x,
+                    line_coeffs[num_lines - 2][j][0].1,
+                    line_coeffs[num_lines - 2][j][0].2,
+                );
+                scripts.push(hinted_script);
+                hints.extend(hint);
+
+                t4 = t4x;
+            }
+        }
+
+        for (j, p) in p_lst.iter().enumerate().take(num_line_groups) {
+            if j == 2 { continue; }
+            let coeffs = &line_coeffs[num_lines - 1][j][0];
+            assert_eq!(coeffs.0, ark_bn254::Fq2::ONE);
+            let mut fx = f;
+            let mut c1new = coeffs.1;
+            c1new.mul_assign_by_fp(&(-p.x / p.y));
+            let mut c2new = coeffs.2;
+            c2new.mul_assign_by_fp(&(p.y.inverse().unwrap()));
+            fx.mul_by_034(&coeffs.0, &c1new, &c2new);
+
+            let (hinted_script, hint) =
+                hinted_ell_by_constant_affine_and_sparse_mul(f, -p.x / p.y, p.y.inverse().unwrap(), coeffs);
+            scripts.push(hinted_script);
+            hints.extend(hint);
+            f = fx;
+
+            if j == num_constant {
+                let beta_22x = BigUint::from_str(
+                    "21888242871839275220042445260109153167277707414472061641714758635765020556616",
+                )
+                .unwrap();
+                let beta_22y = BigUint::from_str("0").unwrap();
+                let beta_22 = ark_bn254::Fq2::from_base_prime_field_elems([
+                    ark_bn254::Fq::from(beta_22x.clone()),
+                    ark_bn254::Fq::from(beta_22y.clone()),
+                ])
+                .unwrap();
+
+                let (hinted_script, hint) = Fq2::hinted_mul(2, q4.x, 0, beta_22);
+                scripts.push(hinted_script);
+                hints.extend(hint);
+
+                let q4_new = ark_bn254::G2Affine::new(q4.x * beta_22, q4.y);
+
+                let (hinted_script, hint) = hinted_check_chord_line(
+                    t4,
+                    q4_new,
+                    line_coeffs[num_lines - 1][j][0].1,
+                    line_coeffs[num_lines - 1][j][0].2,
+                );
+                scripts.push(hinted_script);
+                hints.extend(hint);
+            }
+        }
+
+        println!("final f {}", f);
+
+        let mut scripts_iter = scripts.into_iter();
+
+        let script=script!{
+
+            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4)]
+            // 1. f = c_inv
+            { Fq12::copy(16) }
+            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
+
+            // ATE_LOOP_COUNT len: 65
+            for i in (1..ark_bn254::Config::ATE_LOOP_COUNT.len()).rev() {
+                // update f, squaring
+                { scripts_iter.next().unwrap() }
+                // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
+
+                // update f, multiplying
+                // f = f * c_inv, if digit == 1
+                // f = f * c, if digit == -1
+                if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == 1 {
+                    // copy c_inv
+                    { Fq12::copy(28) }
+                    // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12), c_inv(12)]
+                    // f = f * c_inv
+                    { scripts_iter.next().unwrap() }
+                } else if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
+                    // copy c
+                    { Fq12::copy(40) }
+                    // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12), c(12)]
+                    // f = f * c
+                    { scripts_iter.next().unwrap() }
+                }
+                // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
+
+                // update f with double line evaluation
+                for j in [0, 1, 3] {
+                    // copy P_j(p1, p2, p3, p4) to stack
+                    { Fq2::copy((26 + 36 - j * 2) as u32) }
+                    // update f with double line evaluation
+                    { scripts_iter.next().unwrap() } // ell_by_constant_affine(&line_coeffs[num_lines - (i + 2)][j][0])
+                                                                    // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
+
+                    // non-fixed part
+                    if j == num_constant {
+                        // check line coeff is satisfied with T4
+                        { Fq12::toaltstack() }
+                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4) | f(12)]
+                        { Fq2::copy(2) }
+                        { Fq2::copy(2) }
+                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), T4(4) | f(12)]
+
+                        // -- push c3,c4 to stack  
+                        { Fq2::push(line_coeffs[num_lines - (i + 2)][j][0].1) } 
+                        { Fq2::push(line_coeffs[num_lines - (i + 2)][j][0].2) }     
+                        // [...T4(4),T4(4),C3(2),C4(2)]
+                        // -- move t4 to stack top 
+                        { Fq2::roll(6) }
+                        { Fq2::roll(6) }
+                        // -- [...T4(4),C3(2),C4(2),T4(4)]
+                        { scripts_iter.next().unwrap() } // check_tangent_line(line_coeffs[num_lines - (i + 2)][j][0].1, line_coeffs[num_lines - (i + 2)][j][0].2)
+                                                                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4) | f(12)]
+
+                        // -- [...T4(4),c3(2),c4(2)]
+                        // -- move c3,c4 to alt stack 
+                        { Fq2::toaltstack() }
+                        { Fq2::toaltstack() }
+                        // -- [...T4(4), | c3(2),c4(2),f(12)]
+                        // 
+                        // update T4
+                        // drop T4.y, leave T4.x
+                        { Fq2::drop() }
+
+                        // -- [...T4.x(2),| c3(2),c4(2),fq(12)]
+                        // -- move c3 c4 to stack   
+                        { Fq2::fromaltstack() }
+                        { Fq2::fromaltstack() }
+                        // -- [...T4.x(2),c3(2),c4(2)|f(12)]
+                        // -- move T4.x(2) to stack top 
+                        { Fq2::roll(4) }
+                        // -- [...,c3(2),c4(2),T4.x(2)|f(12)]
+                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4.x(2) | f(12)]
+                        { scripts_iter.next().unwrap() } // affine_double_line(line_coeffs[num_lines - (i + 2)][j][0].1, line_coeffs[num_lines - (i + 2)][j][0].2)
+                                                                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4) | f(12)]
+                        // -- [...c3(2),c4(2),T4(4)|f(12)]
+                        // -- drop c3,c4 [...T4(4)|f(12)]
+                        { Fq2::roll(6) }
+                        { Fq2::roll(6) }
+                        { Fq2::drop() }
+                        { Fq2::drop() }
+
+                        { Fq12::fromaltstack() }
+                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
+                    }
+                }
+
+                // update f with add line evaluation
+                if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == 1
+                    || ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1
+                {
+                    for j in [0, 1, 3] {
+                        // copy P_j(p1, p2, p3, p4) to stack
+                        { Fq2::copy((26 + 36 - j * 2) as u32) }
+                        // update f with adding line evaluation
+                        { scripts_iter.next().unwrap() } // ell_by_constant_affine(&line_coeffs[num_lines - (i + 2)][j][1])
+                                                                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
+
+                        // non-fixed part
+                        if j == num_constant {
+                            { Fq12::toaltstack() }
+                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4) | f(12)]
+
+                            // copy T4
+                            { Fq2::copy(2) }
+                            { Fq2::copy(2) }
+                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), T4(4) | f(12)]
+
+                            // copy Q4
+                            { Fq2::copy(10 + 36) }
+                            { Fq2::copy(10 + 36) }
+                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), T4(4), Q4(4) | f(12)]
+                            if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
+                                { Fq2::neg(0) }
+                            }
+                            // -- push c3,c4 to stack 
+                            { Fq2::push(line_coeffs[num_lines - (i + 2)][j][1].1) } 
+                            { Fq2::push(line_coeffs[num_lines - (i + 2)][j][1].2) } 
+                            // -- [...T4(4),Q4(4),c3(2),c4(2)|f(12)]
+                            // -- move t4,q4 to stack top 
+                            { Fq2::roll(10) }
+                            { Fq2::roll(10) }
+                            { Fq2::roll(10) }
+                            { Fq2::roll(10) }
+                            // -- [...c3(2),c4(2),T4(4),Q4(4),|f(12)]
+                            { scripts_iter.next().unwrap() } // check_chord_line(line_coeffs[num_lines - (i + 2)][j][1].1, line_coeffs[num_lines - (i + 2)][j][1].2)
+                                                                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4) | f(12)]
+
+                            //  -- [...T4(4),c3(2),c4(2)|f(12)]
+                            //  -- move c3 c4 to altstack 
+                            { Fq2::toaltstack() }
+                            { Fq2::toaltstack() }
+                            // -- [...T4(4)|c3(2),c4(2),f(12)]
+                            // update T4
+                            // drop T4.y, leave T4.x
+                            { Fq2::drop() }
+                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4.x(2) | f(12)]
+                            // copy Q4.x
+                            { Fq2::copy(4 + 36) }
+                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4.x(2), Q4.x(2) | f(12)]
+                            
+                            // -- move c3,c4 to stack 
+                            { Fq2::fromaltstack() }
+                            { Fq2::fromaltstack() }
+                            // -- [...T4.x(2), Q4.x(2),c3(2),c4(2) | f(12)]
+                            // -- move t4.x,q4.x to stack top 
+                            { Fq2::roll(6) }
+                            { Fq2::roll(6) }
+                            // -- [...,c3(2),c4(2),T4.x(2), Q4.x(2) | f(12)]
+                            { scripts_iter.next().unwrap() } // affine_add_line(line_coeffs[num_lines - (i + 2)][j][1].1, line_coeffs[num_lines - (i + 2)][j][1].2)
+                                                                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4) | f(12)]
+                            // -- [... c3(2),c4(2),T4(4)|f(12)]
+                            // -- drop c3,c4 [... T4(4)|f(12)]
+                            { Fq2::roll(6) }
+                            { Fq2::roll(6) }
+                            { Fq2::drop() }
+                            { Fq2::drop() }
+
+                            { Fq12::fromaltstack() }
+                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
+                        }
+                    }
+                }
+            }
+
+            // update f with frobenius of c, say f = f * c_inv^p * c^{p^2}
+            { Fq12::roll(28) }
+            { Fq12::copy(0) }
+            { Fq12::toaltstack() }
+            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), wi(12), T4(4), f(12), c_inv(12)]
+            { scripts_iter.next().unwrap() } // Fq12::frobenius_map(1)
+                                                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), wi(12), T4(4), f(12), c_inv^p(12)]
+            { scripts_iter.next().unwrap() } // Fq12::mul(12, 0)
+                                                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), wi(12), T4(4), f(12)]
+            { Fq12::roll(28) }
+            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), wi(12), T4(4), f(12), c(12)]
+            { scripts_iter.next().unwrap() } // Fq12::frobenius_map(2)
+                                                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), wi(12), T4(4), f(12), c^{p^2}(12)]
+            { scripts_iter.next().unwrap() } // Fq12::mul(12, 0)
+                                                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), wi(12), T4(4), f(12)]
+
+            { Fq12::fromaltstack() }         // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), wi(12), T4(4), f(12), c_inv(12)]
+            { scripts_iter.next().unwrap() } // Fq12::frobenius_map(3)
+                                                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), wi(12), T4(4), f(12), c_inv^{p^3}(12)]
+            { scripts_iter.next().unwrap() } // Fq12::mul(12, 0)
+                                                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), wi(12), T4(4), f(12)]
+                                                            // update f with scalar wi, say f = f * wi
+            { Fq12::roll(16) }
+            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), f(12), wi(12)]
+            { scripts_iter.next().unwrap() } // Fq12::mul(12, 0)
+                                                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), f(12)]
+
+            // update f with add line evaluation of one-time of frobenius map on Q4
+            for j in [0, 1, 3] {
+                // copy P_j(p1, p2, p3, p4) to stack
+                { Fq2::copy((26 - j * 2) as u32) }
+                // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), f(12), P_j(2)]
+                { scripts_iter.next().unwrap() } // ell_by_constant_affine(&line_coeffs[num_lines - 2][j][0])
+                                                                // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), f(12)]
+
+                // non-fixed part
+                if j == num_constant {
+                    { Fq12::toaltstack() }
+                    // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4) | f(12)]
+
+                    // Qx' = Qx.conjugate * beta^{2 * (p - 1) / 6}
+                    { Fq2::copy(6) }
+                    // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), Q4.x(2) | f(12)]
+                    { Fq::neg(0) }
+                    // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), -Q4.x(2) | f(12)]
+                    { Fq2::roll(22) }
+                    // [beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), -Q4.x(2), beta_12(2) | f(12)]
+                    { scripts_iter.next().unwrap() } // Fq2::mul(2, 0)
+                                                                    // Q4.x' = -Q4.x * beta_12 (2)
+                                                                    // [beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), Q4.x'(2) | f(12)]
+
+                    // Qy' = Qy.conjugate * beta^{3 * (p - 1) / 6}
+                    { Fq2::copy(6) }
+                    // [beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), Q4.x'(2), Q4.y(2) | f(12)]
+                    { Fq::neg(0) }
+                    // [beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), Q4.x'(2), -Q4.y(2) | f(12)]
+                    { Fq2::roll(22) }
+                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), Q4.x'(2), -Q4.y(2), beta_13(2) | f(12)]
+                    { scripts_iter.next().unwrap() } // Fq2::mul(2, 0)
+                                                                    // Q4.y' = -Q4.y * beta_13 (2)
+                                                                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), Q4.x'(2), Q4.y'(2) | f(12)]
+                                                                    // phi(Q4) = (Q4.x', Q4.y')
+                                                                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), phi(Q4)(4) | f(12)]
+
+                    // check chord line
+                    { Fq2::copy(6) }
+                    { Fq2::copy(6) }
+                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), phi(Q4)(4), T4(4) | f(12)]
+                    { Fq2::copy(6) }
+                    { Fq2::copy(6) }
+                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), phi(Q4)(4), T4(4), phi(Q4)(4) | f(12)]
+                    
+                    // -- [...T4(4),Q4(4), T4(4),Q4(4)|f(12)]
+                    // -- push c3,c4 to stack      
+                    { Fq2::push(line_coeffs[num_lines - 2][j][0].1) } 
+                    { Fq2::push(line_coeffs[num_lines - 2][j][0].2) } 
+                    // -- [... T4(4),Q4(4),T4(4),Q4(4),c3(2),c4(2)|f(12)]
+                    // -- move T4,Q4 to stack top  
+                    { Fq2::roll(10) }
+                    { Fq2::roll(10) }
+                    { Fq2::roll(10) }
+                    { Fq2::roll(10) }
+                    // -- [... T4(4),Q4(4),c3(2),c4(2),T4(4),Q4(4),|f(12)]
+                    { scripts_iter.next().unwrap() } // check_chord_line(line_coeffs[num_lines - 2][j][0].1, line_coeffs[num_lines - 2][j][0].2)
+                                                                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), phi(Q4)(4) | f(12)]
+                    // -- [... T4(4),Q4(4),c3(2),c4(2)|f(12)]
+                    // -- move c3,c4 to altstack 
+                    { Fq2::toaltstack() }
+                    { Fq2::toaltstack() }
+                    // -- [... T4(4),Q4(4)|,c3(2),c4(2),f(12)]
+                    // update T4
+                    { Fq2::drop() }
+                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), phi(Q4).x(2) | f(12)]
+                    { Fq2::toaltstack() }
+                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4) | phi(Q4).x(2), f(12)]
+                    { Fq2::drop() }
+                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4.x(2) | phi(Q4).x(2), f(12)]
+                    { Fq2::fromaltstack() }
+                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4.x(2), phi(Q4).x(2) | f(12)]
+                    // -- move c3,c4 to stack          
+                    { Fq2::fromaltstack() }
+                    { Fq2::fromaltstack() }
+                    // -- [... T4.x(2), phi(Q4).x(2) ,c3(2),c4(2)|f(12)]
+                    // -- move T4.x Q4.x to stack top  
+                    { Fq2::roll(6) } //  [... phi(Q4).x(2) ,c3(2),c4(2),T4.x(2), |f(12)]
+                    { Fq2::roll(6) }
+                    // -- [... ,c3(2),c4(2), T4.x(2), phi(Q4).x(2) |f(12)]
+                    { scripts_iter.next().unwrap() } // affine_add_line(line_coeffs[num_lines - 2][j][0].1, line_coeffs[num_lines - 2][j][0].2)
+                                                                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4) | f(12)]
+                    // -- [...c3(2),c4(2),T4(4)|f(12)]
+                    // -- drop c3,c4 
+                    { Fq2::roll(6) }
+                    { Fq2::roll(6) }
+                    { Fq2::drop() }
+                    { Fq2::drop() }
+                    // -- [...,T4(4)|f(12)]
+                    { Fq12::fromaltstack() }
+                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), f(12)]
+                }
+            }
+
+            // update f with add line evaluation of two-times of frobenius map on Q4
+            for j in 0..num_line_groups {
+                // update f with adding line evaluation by rolling each Pi(2) element to the right(stack top)
+                { Fq2::roll((26 - j * 2) as u32) }
+                if j == 2 {
+                    { Fq2::drop() }
+                }
+                else {
+                    { scripts_iter.next().unwrap() } // ell_by_constant_affine(&line_coeffs[num_lines - 1][j][0])
+                                                                // [beta_22(2), Q4(4), T4(4), f(12)]
+                }
+
+                // non-fixed part(Q4)
+                if j == num_constant {
+                    { Fq12::toaltstack() }
+                    // [beta_22(2), Q4(4), T4(4) | f(12)]
+                    { Fq2::roll(8) }
+                    // [Q4(4), T4(4), beta_22(2) | f(12)]
+                    { Fq2::roll(8) }
+                    // [Q4.y(2), T4(4), beta_22(2), Q4.x(2) | f(12)]
+                    { scripts_iter.next().unwrap() } // Fq2::mul(2, 0)
+                                                                    // [Q4.y(2), T4(4), beta_22(2) * Q4.x(2) | f(12)]
+                                                                    // Q4.x' = Q4.x * beta^{2 * (p^2 - 1) / 6}
+                                                                    // [Q4.y(2), T4(4), Q4.x'(2) | f(12)]
+                    { Fq2::roll(6) }
+                    // [T4(4), Q4.x'(2), Q4.y(2) | f(12)]
+                    // phi(Q4)^2 = (Q4.x', Qy)
+                    // [T4(4), phi(Q4)^2(4) | f(12)]
+
+                    // -- push c3,c4 to stack    
+                    { Fq2::push(line_coeffs[num_lines - 1][j][0].1) } 
+                    { Fq2::push(line_coeffs[num_lines - 1][j][0].2) } 
+                    // [T4.x(2),T4.y(2),Q4.x(2),Q4.y(2),c3(2),c4(2)|f(12)]
+                    // -- move T4,Q4 to stack top 
+                    { Fq2::roll(10) }// [T4.y(2),Q4.x(2),Q4.y(2),c3(2),c4(2),T4.x(2),|f(12)]
+                    { Fq2::roll(10) }// [Q4.x(2),Q4.y(2),c3(2),c4(2),T4.x(2),T4.y(2),|f(12)]
+                    { Fq2::roll(10) }// [Q4.y(2),c3(2),c4(2),T4.x(2),T4.y(2),Q4.x(2),|f(12)]
+                    { Fq2::roll(10) }// [c3(2),c4(2),T4.x(2),T4.y(2),Q4.x(2),Q4.y(2),|f(12)]
+                    // -- [c3(2),c4(2),T4(4),Q4.x(2),Q4.y(2)|f(12)]
+                    // check whether the chord line through T4 and phi(Q4)^2
+                    { scripts_iter.next().unwrap() } // check_chord_line(line_coeffs[num_lines - 1][j][0].1, line_coeffs[num_lines - 1][j][0].2)
+                                                                    // [ | f(12)]
+                    // -- [c3(2),c4(2)|f(12)]
+                    // -- drop c3,c4  
+                    { Fq2::drop() }//[c3(2)|f(12)]
+                    { Fq2::drop() }//[|f(12)]
+                    // -- [|f(12)]                                               
+                    { Fq12::fromaltstack() }
+                    // [f(12)]
+                }
+            }
+        };
+        (script, hints)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::bn254::ell_coeffs::{BnAffinePairing, AffinePairing, G2Prepared};
+    use crate::bn254::fp254impl::Fp254Impl;
+    use crate::bn254::fq::Fq;
+    use crate::bn254::fq12::Fq12;
+    use crate::bn254::fq2::Fq2;
+    use crate::bn254::pairing::Pairing;
+    use crate::bn254::g1::hinted_from_eval_point;
+    use crate::groth16::constants::LAMBDA;
+    use crate::{execute_script_without_stack_limit, treepp::*};
+    use ark_bn254::Bn254;
+    use ark_ec::pairing::Pairing as _;
+    use ark_ff::Field;
+    use ark_std::UniformRand;
+    use num_bigint::BigUint;
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+    use std::str::FromStr;
+
+    #[test]
+    fn test_hinted_quad_miller_loop_with_c_wi() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        // random c and wi
+        let c = ark_bn254::Fq12::rand(&mut prng);
+        let c_inv = c.inverse().unwrap();
+        let wi = ark_bn254::Fq12::rand(&mut prng);
+
+        let p1 = ark_bn254::G1Affine::rand(&mut prng);
+        let p2 = ark_bn254::G1Affine::rand(&mut prng);
+        let p3 = ark_bn254::G1Affine::rand(&mut prng);
+        let p4 = ark_bn254::G1Affine::rand(&mut prng);
+        let p_lst = vec![p1, p2, p3, p4];
+
+        let q1 = ark_bn254::g2::G2Affine::rand(&mut prng);
+        let q2 = ark_bn254::g2::G2Affine::rand(&mut prng);
+        let q3 = ark_bn254::g2::G2Affine::rand(&mut prng);
+        let q4 = ark_bn254::g2::G2Affine::rand(&mut prng);
+        let q1_prepared = G2Prepared::from_affine(q1);
+        let q2_prepared = G2Prepared::from_affine(q2);
+        let q3_prepared = G2Prepared::from_affine(q3);
+        let q4_prepared = G2Prepared::from_affine(q4);
+
+        let t4 = q4;
+
+        let mut hints = Vec::new();
+
+        let (from_eval_p1, hints1) = hinted_from_eval_point(p1);
+        let (from_eval_p2, hints2) = hinted_from_eval_point(p2);
+
+        let (from_eval_p3, hints3) = hinted_from_eval_point(p3);
+        let (from_eval_p4, hints4) = hinted_from_eval_point(p4);
+
+        let (quad_miller_loop_affine_script, hints5) = Pairing::hinted_quad_miller_loop_with_c_wi(
+            [q1_prepared, q2_prepared, q3_prepared, q4_prepared].to_vec(),
+            c,
+            c_inv,
+            wi,
+            p_lst,
+            q4,
+        );
+
+        hints.extend(hints1);
+        hints.extend(hints2);
+        hints.extend(hints3);
+        hints.extend(hints4);
+        hints.extend(hints5);
+
+        println!(
+            "Pairing.quad_miller_loop: {} bytes",
+            quad_miller_loop_affine_script.len()
+        );
+
+        let pairing = BnAffinePairing;
+        let f_without_3 = pairing.multi_miller_loop_affine([p1, p2, p4], [q1, q2, q4]).0;
+
+        let result = f_without_3 * wi * (c_inv.pow(LAMBDA.to_u64_digits()));
+
+        // [beta_12, beta_13, beta_22, P1, P2, P3, P4, Q4, c,  c_inv, wi, T4]: p1-p4: (-p.x / p.y, 1 / p.y)
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+
+            // beta_12
+            { Fq::push_u32_le(&BigUint::from_str("21575463638280843010398324269430826099269044274347216827212613867836435027261").unwrap().to_u32_digits()) }
+            { Fq::push_u32_le(&BigUint::from_str("10307601595873709700152284273816112264069230130616436755625194854815875713954").unwrap().to_u32_digits()) }
+            // beta_13
+            { Fq::push_u32_le(&BigUint::from_str("2821565182194536844548159561693502659359617185244120367078079554186484126554").unwrap().to_u32_digits()) }
+            { Fq::push_u32_le(&BigUint::from_str("3505843767911556378687030309984248845540243509899259641013678093033130930403").unwrap().to_u32_digits()) }
+            // beta_22
+            { Fq::push_u32_le(&BigUint::from_str("21888242871839275220042445260109153167277707414472061641714758635765020556616").unwrap().to_u32_digits()) }
+            { Fq::push_u32_le(&BigUint::from_str("0").unwrap().to_u32_digits()) }
+
+            // p1, p2, p3, p4
+            {Fq::push(p1.y.inverse().unwrap())}
+            {Fq::push(p1.x)}
+            {Fq::push(p1.y)}
+            { from_eval_p1 }
+            {Fq::push(p2.y.inverse().unwrap())}
+            {Fq::push(p2.x)}
+            {Fq::push(p2.y)}
+            {from_eval_p2 }// utils::from_eval_point(p2),
+            {Fq::push(p3.y.inverse().unwrap())}
+            {Fq::push(p3.x)}
+            {Fq::push(p3.y)}
+            {from_eval_p3 }// utils::from_eval_point(p3),
+            {Fq::push(p4.y.inverse().unwrap())}
+            {Fq::push(p4.x)}
+            {Fq::push(p4.y)}
+            { from_eval_p4 }
+
+            // q4
+            { Fq2::push(q4.x) }
+            { Fq2::push(q4.y) }
+
+            // c, c_inv, wi
+            { Fq12::push(c) }
+            { Fq12::push(c_inv) }
+            { Fq12::push(wi) }
+
+            // t4
+            { Fq2::push(t4.x) }
+            { Fq2::push(t4.y) }
+
+            { quad_miller_loop_affine_script }
+
+            { Fq12::push(result) }
+
+            { Fq12::equalverify() }
+
+            OP_TRUE
+        };
+        let exec_result = execute_script_without_stack_limit(script);
+        println!("{}", exec_result);
+        if !exec_result.success {
+            println!(
+                "Remaining script size: {}, last opcode: {}",
+                exec_result.remaining_script.len(),
+                exec_result.last_opcode.unwrap(),
+            );
+        }
+        assert!(exec_result.success);
+    }
+}
\ No newline at end of file
diff --git a/bitvm/src/bn254/utils.rs b/bitvm/src/bn254/utils.rs
new file mode 100644
index 000000000..43d0b74d9
--- /dev/null
+++ b/bitvm/src/bn254/utils.rs
@@ -0,0 +1,71 @@
+use crate::bigint::BigIntImpl;
+use crate::bigint::U256;
+use crate::bn254::fq::bigint_to_u32_limbs;
+use crate::bn254::fq::Fq;
+use crate::bn254::fr::Fr;
+use crate::treepp::*;
+use ark_ff::BigInt;
+
+#[derive(Debug, Clone)]
+pub enum Hint {
+    Fq(ark_bn254::Fq),
+    Fr(ark_bn254::Fr),
+    Hash([u32; U256::N_LIMBS as usize]),
+    U256(num_bigint::BigInt),
+    BigIntegerTmulLC1(num_bigint::BigInt),
+    BigIntegerTmulLC2(num_bigint::BigInt),
+    BigIntegerTmulLC4(num_bigint::BigInt),
+}
+
+impl Hint {
+    pub fn push(&self) -> Script {
+        const K1: (u32, u32) = Fq::bigint_tmul_lc_1();
+        const K2: (u32, u32) = Fq::bigint_tmul_lc_2();
+        const K4: (u32, u32) = Fq::bigint_tmul_lc_4();
+        pub type T1 = BigIntImpl<{ K1.0 }, { K1.1 }>;
+        pub type T2 = BigIntImpl<{ K2.0 }, { K2.1 }>;
+        pub type T4 = BigIntImpl<{ K4.0 }, { K4.1 }>;
+        match self {
+            Hint::Fq(fq) => script! {
+                { Fq::push(*fq) }
+            },
+            Hint::Fr(fr) => script! {
+                { Fr::push(*fr) }
+            },
+            Hint::Hash(hash) => script! {
+                for h in hash {
+                    {*h}
+                }
+            },
+            Hint::U256(num) => script! {
+                { U256::push_u32_le(&bigint_to_u32_limbs(num.clone(), 256)) }
+            },
+            Hint::BigIntegerTmulLC1(a) => script! {
+                { T1::push_u32_le(&bigint_to_u32_limbs(a.clone(), T1::N_BITS)) }
+            },
+            Hint::BigIntegerTmulLC2(a) => script! {
+                { T2::push_u32_le(&bigint_to_u32_limbs(a.clone(), T2::N_BITS)) }
+            },
+            Hint::BigIntegerTmulLC4(a) => script! {
+                { T2::push_u32_le(&bigint_to_u32_limbs(a.clone(), T4::N_BITS)) }
+            },
+        }
+    }
+}
+
+pub fn fq_to_bits(fq: BigInt<4>, limb_size: usize) -> Vec<u32> {
+    let mut bits: Vec<bool> = ark_ff::BitIteratorBE::new(fq.as_ref()).skip(2).collect();
+    bits.reverse();
+
+    bits.chunks(limb_size)
+        .map(|chunk| {
+            let mut factor = 1;
+            let res = chunk.iter().fold(0, |acc, &x| {
+                let r = acc + if x { factor } else { 0 };
+                factor *= 2;
+                r
+            });
+            res
+        })
+        .collect()
+}
\ No newline at end of file
diff --git a/bitvm/src/chunk/api.rs b/bitvm/src/chunk/api.rs
new file mode 100644
index 000000000..895ba3af0
--- /dev/null
+++ b/bitvm/src/chunk/api.rs
@@ -0,0 +1,948 @@
+use crate::chunk::api_runtime_utils::{execute_script_from_signature, get_assertion_from_segments, get_assertions_from_signature, get_segments_from_assertion, get_segments_from_groth16_proof};
+use crate::chunk::api_compiletime_utils::{ append_bitcom_locking_script_to_partial_scripts, generate_segments_using_mock_vk_and_mock_proof, generate_partial_script, partial_scripts_from_segments};
+
+use crate::signatures::wots_api::{wots160, wots256};
+use crate::treepp::*;
+use ark_bn254::Bn254;
+use ark_ec::bn::Bn;
+
+
+use super::api_runtime_utils::{execute_script_from_assertion, get_pubkeys, get_signature_from_assertion};
+use super::wrap_hasher::BLAKE3_HASH_LENGTH;
+
+pub const NUM_PUBS: usize = 1;
+pub const NUM_U256: usize = 14;
+pub const NUM_U160: usize = 363;
+const VALIDATING_TAPS: usize = 1;
+const HASHING_TAPS: usize = NUM_U160;
+pub const NUM_TAPS: usize = HASHING_TAPS + VALIDATING_TAPS; 
+
+pub type PublicInputs = [ark_bn254::Fr; NUM_PUBS];
+
+pub type PublicKeys = (
+    [wots256::PublicKey; NUM_PUBS],
+    [wots256::PublicKey; NUM_U256],
+    [wots160::PublicKey; NUM_U160],
+);
+
+pub type Signatures = (
+    Box<[wots256::Signature; NUM_PUBS]>,
+    Box<[wots256::Signature; NUM_U256]>,
+    Box<[wots160::Signature; NUM_U160]>,
+);
+
+pub type Assertions = (
+    [[u8; 32]; NUM_PUBS],
+    [[u8; 32]; NUM_U256],
+    [[u8; BLAKE3_HASH_LENGTH]; NUM_U160],
+);
+
+
+pub fn api_get_signature_from_assertion(assn: Assertions, secrets: Vec<String>)-> Signatures {
+    get_signature_from_assertion(assn, secrets)
+}
+
+pub fn api_get_assertions_from_signature(signed_asserts: Signatures) -> Assertions {
+    get_assertions_from_signature(signed_asserts)
+}
+
+pub mod type_conversion_utils {
+    use crate::{chunk::api::{NUM_PUBS, NUM_U160, NUM_U256}, execute_script, signatures::{signing_winternitz::WinternitzPublicKey, wots_api::{wots160, wots256}}, treepp::Script};
+    use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
+    use crate::chunk::api::Signatures;
+
+    use super::PublicKeys;
+
+    pub type RawWitness = Vec<Vec<u8>>;
+
+    #[derive(Clone, Debug, PartialEq, CanonicalDeserialize, CanonicalSerialize)]
+    pub struct RawProof {
+        pub proof: ark_groth16::Proof<ark_bn254::Bn254>,
+        pub public: Vec<ark_bn254::Fr>,
+        pub vk: ark_groth16::VerifyingKey<ark_bn254::Bn254>,
+    }
+
+    impl Default for RawProof {
+        fn default() -> Self {
+            // note this proof shouldn't be used in onchain environment
+            let serialize_data = "687a30a694bb4fb69f2286196ad0d811e702488557c92a923c19499e9c1b3f0105f749dae2cd41b2d9d3998421aa8e86965b1911add198435d50a08892c7cd01a47c01cbf65ccc3b4fc6695671734c3b631a374fbf616e58bcb0a3bd59a9030d7d17433d53adae2232f9ac3caa5c67053d7a728714c81272a8a51507d5c43906010000000000000043a510e31de87bdcda497dfb3ea3e8db414a10e7d4802fc5dddd26e18d2b3a279c3815c2ec66950b63e60c86dc9a2a658e0224d55ea45efe1f633be052dc7d867aff76a9e983210318f1b808aacbbba1dc04b6ac4e6845fa0cc887aeacaf5a068ab9aeaf8142740612ff2f3377ce7bfa7433936aaa23e3f3749691afaa06301fd03f043c097556e7efdf6862007edf3eb868c736d917896c014c54754f65182ae0c198157f92e667b6572ba60e6a52d58cb70dbeb3791206e928ea5e65c6199d25780cedb51796a8a43e40e192d1b23d0cfaf2ddd03e4ade7c327dbc427999244bf4b47b560cf65d672c86ef448eb5061870d3f617bd3658ad6917d0d32d9296020000000000000008f167c3f26c93dbfb91f3077b66bc0092473a15ef21c30f43d3aa96776f352a33622830e9cfcb48bdf8d3145aa0cf364bd19bbabfb3c73e44f56794ee65dc8a";
+            let bytes = hex::decode(serialize_data).unwrap();
+            RawProof::deserialize_compressed(&*bytes).unwrap()
+        }
+    }
+
+    pub fn utils_signatures_from_raw_witnesses(raw_wits: &Vec<RawWitness>) -> Signatures {
+        fn raw_witness_to_sig(sigs: RawWitness) -> Vec<([u8; 20], u8)> {
+            let mut sigs_vec: Vec<([u8; 20], u8)> = Vec::new();
+            for i in (0..sigs.len()).step_by(2) {
+                let preimage: [u8; 20] = if sigs[i].len() == 0 {
+                    [0; 20]
+                } else {
+                    sigs[i].clone().try_into().unwrap()
+                };
+                let digit_arr: [u8; 1] = if sigs[i + 1].len() == 0 {
+                    [0]
+                } else {
+                    sigs[i + 1].clone().try_into().unwrap()
+                };
+                sigs_vec.push((preimage, digit_arr[0]));
+            }
+            sigs_vec
+        }
+
+        assert_eq!(raw_wits.len(), NUM_PUBS + NUM_U256 + NUM_U160);
+        let mut asigs = vec![];
+        for i in 0..NUM_PUBS {
+            let a: wots256::Signature = raw_witness_to_sig(raw_wits[i].clone()).try_into().unwrap();
+            asigs.push(a);
+        }
+        let mut bsigs = vec![];
+        for i in 0..NUM_U256 {
+            let a: wots256::Signature = raw_witness_to_sig(raw_wits[i+NUM_PUBS].clone()).try_into().unwrap();
+            bsigs.push(a);
+        }
+        let mut csigs = vec![];
+        for i in 0..NUM_U160 {
+            let a: wots160::Signature = raw_witness_to_sig(raw_wits[i + NUM_PUBS + NUM_U256].clone()).try_into().unwrap();
+            csigs.push(a);
+        }
+        let asigs = asigs.try_into().unwrap();
+        let bsigs = bsigs.try_into().unwrap();
+        let csigs = csigs.try_into().unwrap();
+        (asigs, bsigs, csigs)
+    }
+
+
+    pub fn utils_raw_witnesses_from_signatures(signatures: &Signatures) -> Vec<RawWitness> {
+        // Helper: Convert a signature (which can be converted into Vec<([u8;20], u8)>)
+        // back into its RawWitness representation.
+        fn sig_to_raw_witness<T>(signature: T) -> RawWitness
+        where
+            T: Into<Vec<([u8; 20], u8)>>,
+        {
+            let sig_pairs: Vec<([u8; 20], u8)> = signature.into();
+            let mut raw = Vec::with_capacity(sig_pairs.len() * 2);
+            for (preimage, digit) in sig_pairs {
+                // In the original conversion an empty vector was used to represent [0;20].
+                // So we “invert” that: if preimage is all zeroes, output an empty vector.
+                raw.push(if preimage == [0; 20] {
+                    vec![]
+                } else {
+                    preimage.to_vec()
+                });
+                // Similarly, if the digit is 0 then output an empty vector.
+                raw.push(if digit == 0 {
+                    vec![]
+                } else {
+                    vec![digit]
+                });
+            }
+            raw
+        }
+
+        // Assume Signatures is a tuple: (asigs, bsigs, csigs) where:
+        // - asigs: Vec<wots256::Signature> of length NUM_PUBS
+        // - bsigs: Vec<wots256::Signature> of length NUM_U256
+        // - csigs: Vec<wots160::Signature> of length NUM_U160 (or NUM_PUBS if they are equal)
+        let (asigs, bsigs, csigs) = signatures;
+        let mut raw_wits = Vec::with_capacity(asigs.len() + bsigs.len() + csigs.len());
+
+        for sig in asigs.iter() {
+            raw_wits.push(sig_to_raw_witness(sig));
+        }
+        for sig in bsigs.iter() {
+            raw_wits.push(sig_to_raw_witness(sig));
+        }
+        for sig in csigs.iter() {
+            raw_wits.push(sig_to_raw_witness(sig));
+        }
+
+        raw_wits
+    }
+
+
+    pub fn script_to_witness(scr: Script) -> Vec<Vec<u8>> {
+        let res = execute_script(scr);
+        let wit = res.final_stack.0.iter_str().fold(vec![], |mut vector, x| {
+                vector.push(x);
+                vector
+            });
+        wit
+    }
+
+    pub fn utils_typed_pubkey_from_raw(commits_public_keys: Vec<&WinternitzPublicKey>) -> PublicKeys {
+        let mut apubs = vec![];
+        let mut bpubs = vec![];
+        let mut cpubs = vec![];
+        for idx in 0..commits_public_keys.len() {
+            let f = commits_public_keys[idx];
+            if idx < NUM_PUBS {
+                let p: wots256::PublicKey = f.public_key.clone().try_into().unwrap();
+                apubs.push(p);
+            } else if idx < NUM_PUBS + NUM_U256 {
+                let p: wots256::PublicKey = f.public_key.clone().try_into().unwrap();
+                bpubs.push(p);
+            } else if idx < NUM_PUBS + NUM_U256 + NUM_U160 {
+                let p: wots160::PublicKey = f.public_key.clone().try_into().unwrap();
+                cpubs.push(p);
+            }
+        }
+
+        let pks: PublicKeys = (apubs.try_into().unwrap(), bpubs.try_into().unwrap(), cpubs.try_into().unwrap());
+        pks
+    }
+}
+
+
+// Step 1
+// The function takes public parameters (here verifying key) and generates partial script
+// partial script is essentially disprove script minus the bitcommitment locking script
+pub fn api_generate_partial_script(vk: &ark_groth16::VerifyingKey<Bn254>) -> Vec<Script> {
+    generate_partial_script(vk)
+}
+
+// Step 2
+// given public keys and the partial scripts generated in api_generate_partial_script()
+// it generates the complete disprove scripts
+pub fn api_generate_full_tapscripts(
+    inpubkeys: PublicKeys,
+    ops_scripts_per_link: &[Script],
+) -> Vec<Script> {
+    println!("api_generate_full_tapscripts; append_bitcom_locking_script_to_partial_scripts");
+    let taps_per_link = append_bitcom_locking_script_to_partial_scripts(
+        inpubkeys,
+        ops_scripts_per_link.to_vec(),
+    );
+    assert_eq!(ops_scripts_per_link.len(), taps_per_link.len());
+    taps_per_link
+}
+
+// Step 3
+// given public and runtime parameters (proof and scalars) generate Assertions
+pub fn generate_assertions(
+    proof: ark_groth16::Proof<Bn<ark_bn254::Config>>,
+    scalars: Vec<ark_bn254::Fr>,
+    vk: &ark_groth16::VerifyingKey<Bn254>,
+) -> Result<Assertions, String> {
+    let (success, segments) = get_segments_from_groth16_proof(proof, scalars, vk);
+    if !success {
+        return Err(format!("generate_assertions; get_segments_from_groth16_proof; success false; num_aggregated segments {}", segments.len()));
+    }
+    assert!(success);
+    let assts = get_assertion_from_segments(&segments);
+    let exec_res = execute_script_from_assertion(&segments, assts);
+
+    if let Some(fault) = exec_res {
+        println!("generate_assertions; execute_script_from_assertion return fault at script index {}", fault.0);
+        return Err(format!("generate_assertions; execute_script_from_assertion return fault at script index {}", fault.0));
+    } else {
+        println!("generate_assertions; validated assertion by executing all scripts");
+    }
+    return Ok(assts);
+}
+
+
+// Alternate Step 3
+// given public and runtime parameters (proof and scalars) generate Assertions
+pub fn generate_signatures(
+    proof: ark_groth16::Proof<Bn<ark_bn254::Config>>,
+    scalars: Vec<ark_bn254::Fr>,
+    vk: &ark_groth16::VerifyingKey<Bn254>,
+    secrets: Vec<String>,
+) -> Result<Signatures, String> {
+    println!("generate_signatures; get_segments_from_groth16_proof");
+    let (success, segments) = get_segments_from_groth16_proof(proof, scalars, vk);
+    if !success {
+        return Err(format!("generate_signatures; get_segments_from_groth16_proof; success false; num_aggregated segments {}", segments.len()));
+    }
+    println!("generate_signatures; get_assertion_from_segments");
+    let assn = get_assertion_from_segments(&segments);
+    println!("generate_signatures; get_signature_from_assertion");
+    let sigs = get_signature_from_assertion(assn, secrets.clone());
+    println!("generate_signatures; get_pubkeys");
+    let pubkeys = get_pubkeys(secrets);
+
+    println!("generate_signatures; partial_scripts_from_segments");
+    let partial_scripts: Vec<Script> = partial_scripts_from_segments(&segments).into_iter().collect();
+    let partial_scripts: [Script; NUM_TAPS] = partial_scripts.try_into().unwrap();
+    println!("generate_signatures; append_bitcom_locking_script_to_partial_scripts");
+    let disprove_scripts = append_bitcom_locking_script_to_partial_scripts( pubkeys, partial_scripts.to_vec());
+    let disprove_scripts: [Script; NUM_TAPS] = disprove_scripts.try_into().unwrap();
+
+    println!("generate_signatures; execute_script_from_signature");
+    let exec_res = execute_script_from_signature(&segments, sigs.clone(), &disprove_scripts);
+    if let Some(fault) = exec_res {
+        println!("generate_signatures; execute_script_from_assertion return fault at script index {}", fault.0);
+        return Err(format!("generate_signatures; execute_script_from_assertion return fault at script index {}", fault.0));
+    } else {
+        println!("generate_signatures; validated assertion by executing all scripts");
+    }
+    Ok(sigs)
+}
+
+// skip validations
+pub fn generate_signatures_lit(
+    proof: ark_groth16::Proof<Bn<ark_bn254::Config>>,
+    scalars: Vec<ark_bn254::Fr>,
+    vk: &ark_groth16::VerifyingKey<Bn254>,
+    secrets: Vec<String>,
+) -> Result<Signatures, String> {
+    println!("generate_signatures; get_segments_from_groth16_proof");
+    let (success, segments) = get_segments_from_groth16_proof(proof, scalars, vk);
+    if !success {
+        return Err(format!("generate_signatures; get_segments_from_groth16_proof; success false; num_aggregated segments {}", segments.len()));
+    }
+    println!("generate_signatures; get_assertion_from_segments");
+    let assn = get_assertion_from_segments(&segments);
+    println!("generate_signatures; get_signature_from_assertion");
+    Ok(get_signature_from_assertion(assn, secrets.clone()))
+}
+
+// Step 4
+// validate signed assertions
+// returns index of disprove script generated in Step 2 
+// and the witness required to execute this Disprove Script incase of failure
+pub fn validate_assertions(
+    vk: &ark_groth16::VerifyingKey<Bn254>,
+    signed_asserts: Signatures,
+    _inpubkeys: PublicKeys,
+    disprove_scripts: &[Script; NUM_TAPS],
+) -> Option<(usize, Script)> {
+    println!("validate_assertions; get_assertions_from_signature");
+    let asserts = get_assertions_from_signature(signed_asserts.clone());
+    println!("validate_assertions; get_segments_from_assertion");
+    let (success, segments) = get_segments_from_assertion(asserts, vk.clone());
+    if !success {
+        println!("invalid tapscript at segment {}", segments.len());
+    }
+    println!("validate_assertions; execute_script_from_signature");
+    let exec_result = execute_script_from_signature(&segments, signed_asserts, disprove_scripts);
+    assert_eq!(success, exec_result.is_none(), "ensure script execution matches rust execution match");
+    exec_result
+}
+
+// doesn't crash even if the proof may be incorrect
+// should be used only for test purposes, 
+// as in production, its best to throw error
+// if assertion is invalid <- always assuming honest operator
+pub fn generate_signatures_for_any_proof(
+    proof: ark_groth16::Proof<Bn<ark_bn254::Config>>,
+    scalars: Vec<ark_bn254::Fr>,
+    vk: &ark_groth16::VerifyingKey<Bn254>,
+    secrets: Vec<String>,
+) -> Signatures {
+    println!("generate_signatures; get_segments_from_groth16_proof");
+    let (success, mut segments) = get_segments_from_groth16_proof(proof, scalars, vk);
+    if segments.len() != NUM_PUBS + NUM_U256 + NUM_U160 + VALIDATING_TAPS {
+        let mock_segments = generate_segments_using_mock_vk_and_mock_proof();
+        segments.extend_from_slice(&mock_segments[segments.len()..]);
+    }
+
+    println!("generate_signatures; get_segments_from_groth16_proof {}", success);
+    println!("generate_signatures; segments len{}", segments.len());
+    println!("generate_signatures; get_assertion_from_segments");
+    let assn = get_assertion_from_segments(&segments);
+    println!("generate_signatures; get_signature_from_assertion");
+    let sigs = get_signature_from_assertion(assn, secrets.clone());
+    println!("generate_signatures; get_pubkeys");
+    let pubkeys = get_pubkeys(secrets);
+
+    println!("generate_signatures; partial_scripts_from_segments");
+    let partial_scripts: Vec<Script> = partial_scripts_from_segments(&segments)
+        .into_iter()
+        .collect();
+    let partial_scripts: [Script; NUM_TAPS] = partial_scripts.try_into().unwrap();
+    println!("generate_signatures; append_bitcom_locking_script_to_partial_scripts");
+    let disprove_scripts =
+        append_bitcom_locking_script_to_partial_scripts(pubkeys, partial_scripts.to_vec());
+    let disprove_scripts: [Script; NUM_TAPS] = disprove_scripts.try_into().unwrap();
+
+    println!("generate_signatures; execute_script_from_signature");
+    let exec_res = execute_script_from_signature(&segments, sigs.clone(), &disprove_scripts);
+    if exec_res.is_some() {
+        let fault = exec_res.unwrap();
+        println!(
+            "execute_script_from_assertion return fault at script index {}",
+            fault.0
+        );
+    } else {
+        println!("generate_signatures; validated signatures by executing all scripts");
+    }
+    sigs
+}
+
+
+
+#[cfg(test)]
+mod test {
+    use std::collections::HashMap;
+
+    use ark_bn254::Bn254;
+    use ark_ff::UniformRand;
+    use ark_serialize::CanonicalDeserialize;
+    use bitcoin_script::script;
+    use rand::{Rng, SeedableRng};
+    use rand_chacha::ChaCha20Rng;
+    use test_utils::{read_asserts_from_file, read_scripts_from_file, write_asserts_to_file, write_scripts_to_file, write_scripts_to_separate_files};
+    use crate::chunk::api::generate_signatures_for_any_proof;
+    use crate::chunk::api_compiletime_utils::{append_bitcom_locking_script_to_partial_scripts, partial_scripts_from_segments};
+    use crate::chunk::api_runtime_utils::{execute_script_from_signature, get_assertion_from_segments, get_segments_from_groth16_proof};
+    use crate::chunk::wrap_hasher::{BLAKE3_HASH_LENGTH};
+    use crate::chunk::wrap_wots::{byte_array_to_wots160_sig, byte_array_to_wots256_sig};
+    use crate::signatures::wots_api::{wots160, wots256};
+    use crate::treepp::Script;
+
+    use crate::{chunk::{api::{api_generate_full_tapscripts, api_generate_partial_script, generate_assertions, generate_signatures, validate_assertions, Assertions}, api::{NUM_PUBS, NUM_TAPS, NUM_U160, NUM_U256}, api_runtime_utils::{get_assertions_from_signature, get_pubkeys, get_signature_from_assertion}}, execute_script};
+
+    use super::Signatures;
+
+
+    mod test_utils {
+        use crate::chunk::api::Assertions;
+        use crate::chunk::api::NUM_PUBS;
+        use crate::chunk::api::NUM_U160;
+        use crate::chunk::api::NUM_U256;
+        use crate::treepp::*;
+        use bitcoin::ScriptBuf;
+        use std::collections::HashMap;
+        use std::error::Error;
+        use std::fs::File;
+        use std::io::BufReader;
+        use std::io::Write;
+
+
+        pub(crate) fn write_map_to_file(
+            map: &HashMap<u32, Vec<Vec<u8>>>,
+            filename: &str,
+        ) -> Result<(), Box<dyn Error>> {
+            // Serialize the map to a JSON string
+            let json = serde_json::to_string(map)?;
+
+            // Write the JSON string to a file
+            let mut file = File::create(filename)?;
+            file.write_all(json.as_bytes())?;
+            Ok(())
+        }
+
+        pub(crate) fn read_map_from_file(
+            filename: &str,
+        ) -> Result<HashMap<u32, Vec<Vec<u8>>>, Box<dyn Error>> {
+            let file = File::open(filename)?;
+            let reader = BufReader::new(file);
+            let map = serde_json::from_reader(reader)?;
+            Ok(map)
+        }
+
+        pub fn write_scripts_to_file(sig_cache: HashMap<u32, Vec<Script>>, file: &str) {
+            let mut buf: HashMap<u32, Vec<Vec<u8>>> = HashMap::new();
+            for (k, v) in sig_cache {
+                let vs = v.into_iter().map(|x| x.compile().to_bytes()).collect();
+                buf.insert(k, vs);
+            }
+            write_map_to_file(&buf, file).unwrap();
+        }
+
+        pub fn write_scripts_to_separate_files(sig_cache: HashMap<u32, Vec<Script>>, file: &str) {
+            let mut buf: HashMap<u32, Vec<Vec<u8>>> = HashMap::new();
+            std::fs::create_dir_all("bridge_data/chunker_data")
+                .expect("Failed to create directory structure");
+
+            for (k, v) in sig_cache {
+                let file = format!("bridge_data/chunker_data/{file}_{k}.json");
+                let vs = v.into_iter().map(|x| x.compile().to_bytes()).collect();
+                buf.insert(k, vs);
+                write_map_to_file(&buf, &file).unwrap();
+                buf.clear();
+            }
+        }
+
+        pub fn read_scripts_from_file(file: &str) -> HashMap<u32, Vec<Script>> {
+            let mut scr: HashMap<u32, Vec<Script>> = HashMap::new();
+            let f = read_map_from_file(file).unwrap();
+            for (k, v) in f {
+                let vs: Vec<Script> = v
+                    .into_iter()
+                    .map(|x| {
+                        let sc = script! {};
+                        let bf = ScriptBuf::from_bytes(x);
+                        
+                        sc.push_script(bf)
+                    })
+                    .collect();
+                scr.insert(k, vs);
+            }
+            scr
+        }
+
+        pub fn write_asserts_to_file(proof_asserts: Assertions, filename: &str) {
+            //let proof_asserts = mock_asserts();
+            let mut proof_vec: Vec<Vec<u8>> = vec![];
+            for k in proof_asserts.0 {
+                proof_vec.push(k.to_vec());
+            }
+            for k in proof_asserts.1 {
+                proof_vec.push(k.to_vec());
+            }
+            for k in proof_asserts.2 {
+                proof_vec.push(k.to_vec());
+            }
+            let mut obj: HashMap<u32, Vec<Vec<u8>>> = HashMap::new();
+            obj.insert(0, proof_vec);
+    
+            write_map_to_file(&obj, filename).unwrap();
+        }
+    
+        pub fn read_asserts_from_file(filename: &str) -> Assertions {
+            let res = read_map_from_file(filename).unwrap();
+            let proof_vec = res.get(&0).unwrap();
+            
+            let mut assert1 = vec![];
+            for i in 0..NUM_PUBS {
+                let v:[u8;32] = proof_vec[i].clone().try_into().unwrap();
+                assert1.push(v);
+            }
+            let assert1: [[u8; 32]; NUM_PUBS] = assert1.try_into().unwrap();
+    
+            let mut assert2 = vec![];
+            for i in 0..NUM_U256 {
+                let v:[u8;32] = proof_vec[NUM_PUBS + i].clone().try_into().unwrap();
+                assert2.push(v);
+            }
+            let assert2: [[u8; 32]; NUM_U256] = assert2.try_into().unwrap();
+    
+            let mut assert3 = vec![];
+            for i in 0..NUM_U160 {
+                let v:[u8;20] = proof_vec[NUM_PUBS + NUM_U256 + i].clone().try_into().unwrap();
+                assert3.push(v);
+            }
+            let assert3: [[u8; 20]; NUM_U160] = assert3.try_into().unwrap();
+            (assert1, assert2, assert3)
+        }
+
+    }
+
+    
+
+
+    #[test]
+    fn full_e2e_execution() {
+        println!("Use mock groth16 proof");
+        let vk_bytes = [115, 158, 251, 51, 106, 255, 102, 248, 22, 171, 229, 158, 80, 192, 240, 217, 99, 162, 65, 107, 31, 137, 197, 79, 11, 210, 74, 65, 65, 203, 243, 14, 123, 2, 229, 125, 198, 247, 76, 241, 176, 116, 6, 3, 241, 1, 134, 195, 39, 5, 124, 47, 31, 43, 164, 48, 120, 207, 150, 125, 108, 100, 48, 155, 137, 132, 16, 193, 139, 74, 179, 131, 42, 119, 25, 185, 98, 13, 235, 118, 92, 11, 154, 142, 134, 220, 191, 220, 169, 250, 244, 104, 123, 7, 247, 33, 178, 155, 121, 59, 75, 188, 206, 198, 182, 97, 0, 64, 231, 45, 55, 92, 100, 17, 56, 159, 79, 13, 219, 221, 33, 39, 193, 24, 36, 58, 105, 8, 70, 206, 176, 209, 146, 45, 201, 157, 226, 84, 213, 135, 143, 178, 156, 112, 137, 246, 123, 248, 215, 168, 51, 95, 177, 47, 57, 29, 199, 224, 98, 48, 144, 253, 15, 201, 192, 142, 62, 143, 13, 228, 89, 51, 58, 6, 226, 139, 99, 207, 22, 113, 215, 79, 91, 158, 166, 210, 28, 90, 218, 111, 151, 4, 55, 230, 76, 90, 209, 149, 113, 248, 245, 50, 231, 137, 51, 157, 40, 29, 184, 198, 201, 108, 199, 89, 67, 136, 239, 96, 216, 237, 172, 29, 84, 3, 128, 240, 2, 218, 169, 217, 118, 179, 34, 226, 19, 227, 59, 193, 131, 108, 20, 113, 46, 170, 196, 156, 45, 39, 151, 218, 22, 132, 250, 209, 183, 46, 249, 115, 239, 14, 176, 200, 134, 158, 148, 139, 212, 167, 152, 205, 183, 236, 242, 176, 96, 177, 187, 184, 252, 14, 226, 127, 127, 173, 147, 224, 220, 8, 29, 63, 73, 215, 92, 161, 110, 20, 154, 131, 23, 217, 116, 145, 196, 19, 167, 84, 185, 16, 89, 175, 180, 110, 116, 57, 198, 237, 147, 183, 164, 169, 220, 172, 52, 68, 175, 113, 244, 62, 104, 134, 215, 99, 132, 199, 139, 172, 108, 143, 25, 238, 201, 128, 85, 24, 73, 30, 186, 142, 186, 201, 79, 3, 176, 185, 70, 66, 89, 127, 188, 158, 209, 83, 17, 22, 187, 153, 8, 63, 58, 174, 236, 132, 226, 43, 145, 97, 242, 198, 117, 105, 161, 21, 241, 23, 84, 32, 62, 155, 245, 172, 30, 78, 41, 199, 219, 180, 149, 193, 163, 131, 237, 240, 46, 183, 186, 42, 201, 49, 249, 142, 188, 59, 212, 26, 253, 23, 27, 205, 231, 163, 76, 179, 135, 193, 152, 110, 91, 5, 218, 67, 204, 164, 128, 183, 221, 82, 16, 72, 249, 111, 118, 182, 24, 249, 91, 215, 215, 155, 2, 0, 0, 0, 0, 0, 0, 0, 212, 110, 6, 228, 73, 146, 46, 184, 158, 58, 94, 4, 141, 241, 158, 0, 175, 140, 72, 75, 52, 6, 72, 49, 112, 215, 21, 243, 151, 67, 106, 22, 158, 237, 80, 204, 41, 128, 69, 52, 154, 189, 124, 203, 35, 107, 132, 241, 234, 31, 3, 165, 87, 58, 10, 92, 252, 227, 214, 99, 176, 66, 118, 22, 177, 20, 120, 198, 252, 236, 7, 148, 207, 78, 152, 132, 94, 207, 50, 243, 4, 169, 146, 240, 79, 98, 0, 212, 106, 137, 36, 193, 21, 175, 180, 1, 26, 107, 39, 198, 89, 152, 26, 220, 138, 105, 243, 45, 63, 106, 163, 80, 74, 253, 176, 207, 47, 52, 7, 84, 59, 151, 47, 178, 165, 112, 251, 161].to_vec();
+        let proof_bytes: Vec<u8> = [162, 50, 57, 98, 3, 171, 250, 108, 49, 206, 73, 126, 25, 35, 178, 148, 35, 219, 98, 90, 122, 177, 16, 91, 233, 215, 222, 12, 72, 184, 53, 2, 62, 166, 50, 68, 98, 171, 218, 218, 151, 177, 133, 223, 129, 53, 114, 236, 181, 215, 223, 91, 102, 225, 52, 122, 122, 206, 36, 122, 213, 38, 186, 170, 235, 210, 179, 221, 122, 37, 74, 38, 79, 0, 26, 94, 59, 146, 46, 252, 70, 153, 236, 126, 194, 169, 17, 144, 100, 218, 118, 22, 99, 226, 132, 40, 24, 248, 232, 197, 195, 220, 254, 52, 36, 248, 18, 167, 167, 206, 108, 29, 120, 188, 18, 78, 86, 8, 121, 217, 144, 185, 122, 58, 12, 34, 44, 6, 233, 80, 177, 183, 5, 8, 150, 74, 241, 141, 65, 150, 35, 98, 15, 150, 137, 254, 132, 167, 228, 104, 63, 133, 11, 209, 39, 79, 138, 185, 88, 20, 242, 102, 69, 73, 243, 88, 29, 91, 127, 157, 82, 192, 52, 95, 143, 49, 227, 83, 19, 26, 108, 63, 232, 213, 169, 64, 221, 159, 214, 220, 246, 174, 35, 43, 143, 80, 168, 142, 29, 103, 179, 58, 235, 33, 163, 198, 255, 188, 20, 3, 91, 47, 158, 122, 226, 201, 175, 138, 18, 24, 178, 219, 78, 12, 96, 10, 2, 133, 35, 230, 149, 235, 206, 1, 177, 211, 245, 168, 74, 62, 25, 115, 70, 42, 38, 131, 92, 103, 103, 176, 212, 223, 177, 242, 94, 14].to_vec();
+        let scalar = [232, 255, 255, 239, 147, 245, 225, 67, 145, 112, 185, 121, 72, 232, 51, 40, 93, 88, 129, 129, 182, 69, 80, 184, 41, 160, 49, 225, 114, 78, 100, 48].to_vec();
+
+
+        let proof: ark_groth16::Proof<Bn254> = ark_groth16::Proof::deserialize_uncompressed(&proof_bytes[..]).unwrap();
+        let vk: ark_groth16::VerifyingKey<Bn254> = ark_groth16::VerifyingKey::deserialize_uncompressed(&vk_bytes[..]).unwrap();
+        let scalar: ark_bn254::Fr = ark_bn254::Fr::deserialize_uncompressed(&scalar[..]).unwrap();
+        let scalars = [scalar];
+
+        println!("STEP 1 GENERATE TAPSCRIPTS");
+        let secret_key: &str = "a138982ce17ac813d505a5b40b665d404e9528e7";
+        let secrets = (0..NUM_PUBS+NUM_U256+NUM_U160).map(|idx| format!("{secret_key}{:04x}", idx)).collect::<Vec<String>>();
+        let pubkeys = get_pubkeys(secrets.clone());
+
+        let partial_scripts = api_generate_partial_script(&vk);
+        let disprove_scripts = api_generate_full_tapscripts(pubkeys, &partial_scripts);
+
+        println!("STEP 2 GENERATE SIGNED ASSERTIONS");
+        let proof_sigs = generate_signatures(proof, scalars.to_vec(), &vk, secrets.clone()).unwrap();
+
+        println!("num assertion; 256-bit numbers {}", NUM_PUBS + NUM_U256);
+        println!("num assertion; 160-bit numbers {}", NUM_U160);
+
+        println!("STEP 3 CORRUPT AND DISPROVE SIGNED ASSERTIONS");
+        let mut proof_asserts = get_assertions_from_signature(proof_sigs);
+        corrupt_at_random_index(&mut proof_asserts);
+        let corrupt_signed_asserts = get_signature_from_assertion(proof_asserts, secrets);
+        let disprove_scripts: [Script; NUM_TAPS] = disprove_scripts.try_into().unwrap();
+
+        let invalid_tap = validate_assertions(&vk, corrupt_signed_asserts, pubkeys, &disprove_scripts);
+        assert!(invalid_tap.is_some());
+        let (index, hint_script) = invalid_tap.unwrap();
+        println!("STEP 4 EXECUTING DISPROVE SCRIPT at index {}", index);
+        let scr = script!{
+            {hint_script.clone()}
+            {disprove_scripts[index].clone()}
+        };
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            println!("Stack ");
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+
+        assert_eq!(res.final_stack.len(), 1);
+        assert!(res.success);
+        println!("DONE");
+
+        fn corrupt_at_random_index(proof_asserts: &mut Assertions) {
+            let mut rng = rand::thread_rng();
+            let index = rng.gen_range(0..NUM_PUBS + NUM_U256 + NUM_U160);
+            let mut scramble: [u8; 32] = [0u8; 32];
+            scramble[32/2] = 37;
+            let mut scramble2: [u8; BLAKE3_HASH_LENGTH] = [0u8; BLAKE3_HASH_LENGTH];
+            scramble2[BLAKE3_HASH_LENGTH/2] = 37;
+            println!("demo: manually corrupt assertion at index at {:?}", index);
+            if index < NUM_PUBS {
+                if index == 0 {
+                    if proof_asserts.0[0] == scramble {
+                        scramble[16] += 1;
+                    }
+                    proof_asserts.0[0] = scramble;
+                } 
+            } else if index < NUM_PUBS + NUM_U256 {
+                let index = index - NUM_PUBS;
+                if proof_asserts.1[index] == scramble {
+                    scramble[16] += 1;
+                }
+                proof_asserts.1[index] = scramble;
+            } else if index < NUM_PUBS + NUM_U256+NUM_U160 {
+                let index = index - NUM_PUBS - NUM_U256;
+                if proof_asserts.2[index] == scramble2 {
+                    scramble2[10] += 1;
+                }
+                proof_asserts.2[index] = scramble2;
+            }
+        }
+
+
+    }
+
+
+    #[test]
+    #[ignore]
+    fn full_e2e_exec_invalid_proof() {
+
+        let vk_bytes = [115, 158, 251, 51, 106, 255, 102, 248, 22, 171, 229, 158, 80, 192, 240, 217, 99, 162, 65, 107, 31, 137, 197, 79, 11, 210, 74, 65, 65, 203, 243, 14, 123, 2, 229, 125, 198, 247, 76, 241, 176, 116, 6, 3, 241, 1, 134, 195, 39, 5, 124, 47, 31, 43, 164, 48, 120, 207, 150, 125, 108, 100, 48, 155, 137, 132, 16, 193, 139, 74, 179, 131, 42, 119, 25, 185, 98, 13, 235, 118, 92, 11, 154, 142, 134, 220, 191, 220, 169, 250, 244, 104, 123, 7, 247, 33, 178, 155, 121, 59, 75, 188, 206, 198, 182, 97, 0, 64, 231, 45, 55, 92, 100, 17, 56, 159, 79, 13, 219, 221, 33, 39, 193, 24, 36, 58, 105, 8, 70, 206, 176, 209, 146, 45, 201, 157, 226, 84, 213, 135, 143, 178, 156, 112, 137, 246, 123, 248, 215, 168, 51, 95, 177, 47, 57, 29, 199, 224, 98, 48, 144, 253, 15, 201, 192, 142, 62, 143, 13, 228, 89, 51, 58, 6, 226, 139, 99, 207, 22, 113, 215, 79, 91, 158, 166, 210, 28, 90, 218, 111, 151, 4, 55, 230, 76, 90, 209, 149, 113, 248, 245, 50, 231, 137, 51, 157, 40, 29, 184, 198, 201, 108, 199, 89, 67, 136, 239, 96, 216, 237, 172, 29, 84, 3, 128, 240, 2, 218, 169, 217, 118, 179, 34, 226, 19, 227, 59, 193, 131, 108, 20, 113, 46, 170, 196, 156, 45, 39, 151, 218, 22, 132, 250, 209, 183, 46, 249, 115, 239, 14, 176, 200, 134, 158, 148, 139, 212, 167, 152, 205, 183, 236, 242, 176, 96, 177, 187, 184, 252, 14, 226, 127, 127, 173, 147, 224, 220, 8, 29, 63, 73, 215, 92, 161, 110, 20, 154, 131, 23, 217, 116, 145, 196, 19, 167, 84, 185, 16, 89, 175, 180, 110, 116, 57, 198, 237, 147, 183, 164, 169, 220, 172, 52, 68, 175, 113, 244, 62, 104, 134, 215, 99, 132, 199, 139, 172, 108, 143, 25, 238, 201, 128, 85, 24, 73, 30, 186, 142, 186, 201, 79, 3, 176, 185, 70, 66, 89, 127, 188, 158, 209, 83, 17, 22, 187, 153, 8, 63, 58, 174, 236, 132, 226, 43, 145, 97, 242, 198, 117, 105, 161, 21, 241, 23, 84, 32, 62, 155, 245, 172, 30, 78, 41, 199, 219, 180, 149, 193, 163, 131, 237, 240, 46, 183, 186, 42, 201, 49, 249, 142, 188, 59, 212, 26, 253, 23, 27, 205, 231, 163, 76, 179, 135, 193, 152, 110, 91, 5, 218, 67, 204, 164, 128, 183, 221, 82, 16, 72, 249, 111, 118, 182, 24, 249, 91, 215, 215, 155, 2, 0, 0, 0, 0, 0, 0, 0, 212, 110, 6, 228, 73, 146, 46, 184, 158, 58, 94, 4, 141, 241, 158, 0, 175, 140, 72, 75, 52, 6, 72, 49, 112, 215, 21, 243, 151, 67, 106, 22, 158, 237, 80, 204, 41, 128, 69, 52, 154, 189, 124, 203, 35, 107, 132, 241, 234, 31, 3, 165, 87, 58, 10, 92, 252, 227, 214, 99, 176, 66, 118, 22, 177, 20, 120, 198, 252, 236, 7, 148, 207, 78, 152, 132, 94, 207, 50, 243, 4, 169, 146, 240, 79, 98, 0, 212, 106, 137, 36, 193, 21, 175, 180, 1, 26, 107, 39, 198, 89, 152, 26, 220, 138, 105, 243, 45, 63, 106, 163, 80, 74, 253, 176, 207, 47, 52, 7, 84, 59, 151, 47, 178, 165, 112, 251, 161].to_vec();
+        let proof_bytes: Vec<u8> = [162, 50, 57, 98, 3, 171, 250, 108, 49, 206, 73, 126, 25, 35, 178, 148, 35, 219, 98, 90, 122, 177, 16, 91, 233, 215, 222, 12, 72, 184, 53, 2, 62, 166, 50, 68, 98, 171, 218, 218, 151, 177, 133, 223, 129, 53, 114, 236, 181, 215, 223, 91, 102, 225, 52, 122, 122, 206, 36, 122, 213, 38, 186, 170, 235, 210, 179, 221, 122, 37, 74, 38, 79, 0, 26, 94, 59, 146, 46, 252, 70, 153, 236, 126, 194, 169, 17, 144, 100, 218, 118, 22, 99, 226, 132, 40, 24, 248, 232, 197, 195, 220, 254, 52, 36, 248, 18, 167, 167, 206, 108, 29, 120, 188, 18, 78, 86, 8, 121, 217, 144, 185, 122, 58, 12, 34, 44, 6, 233, 80, 177, 183, 5, 8, 150, 74, 241, 141, 65, 150, 35, 98, 15, 150, 137, 254, 132, 167, 228, 104, 63, 133, 11, 209, 39, 79, 138, 185, 88, 20, 242, 102, 69, 73, 243, 88, 29, 91, 127, 157, 82, 192, 52, 95, 143, 49, 227, 83, 19, 26, 108, 63, 232, 213, 169, 64, 221, 159, 214, 220, 246, 174, 35, 43, 143, 80, 168, 142, 29, 103, 179, 58, 235, 33, 163, 198, 255, 188, 20, 3, 91, 47, 158, 122, 226, 201, 175, 138, 18, 24, 178, 219, 78, 12, 96, 10, 2, 133, 35, 230, 149, 235, 206, 1, 177, 211, 245, 168, 74, 62, 25, 115, 70, 42, 38, 131, 92, 103, 103, 176, 212, 223, 177, 242, 94, 14].to_vec();
+        let scalar = [232, 255, 255, 239, 147, 245, 225, 67, 145, 112, 185, 121, 72, 232, 51, 40, 93, 88, 129, 129, 182, 69, 80, 184, 41, 160, 49, 225, 114, 78, 100, 48].to_vec();
+
+
+        let proof: ark_groth16::Proof<Bn254> = ark_groth16::Proof::deserialize_uncompressed(&proof_bytes[..]).unwrap();
+        let vk: ark_groth16::VerifyingKey<Bn254> = ark_groth16::VerifyingKey::deserialize_uncompressed(&vk_bytes[..]).unwrap();
+        let scalar: ark_bn254::Fr = ark_bn254::Fr::deserialize_uncompressed(&scalar[..]).unwrap();
+        let scalars = [scalar];
+
+        println!("STEP 1 GENERATE TAPSCRIPTS");
+        let secret_key: &str = "a138982ce17ac813d505a5b40b665d404e9528e7";
+        let secrets = (0..NUM_PUBS+NUM_U256+NUM_U160).map(|idx| format!("{secret_key}{:04x}", idx)).collect::<Vec<String>>();
+
+        let pubkeys = get_pubkeys(secrets.clone());
+
+        let partial_scripts = api_generate_partial_script(&vk);
+        let disprove_scripts = api_generate_full_tapscripts(pubkeys, &partial_scripts);
+        let disprove_scripts = disprove_scripts.try_into().unwrap();
+
+        println!("STEP 2 GENERATE SIGNED ASSERTIONS");
+        println!("corrupting proof for demo");
+        let mut incorrect_proof = proof.clone();
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        incorrect_proof.a = ark_bn254::G1Affine::rand(&mut prng);
+
+        let proof_sigs = generate_signatures_for_any_proof(incorrect_proof, scalars.to_vec(), &vk, secrets);
+
+        let invalid_tap = validate_assertions(&vk, proof_sigs, pubkeys, &disprove_scripts);
+        assert!(invalid_tap.is_some());
+        let (index, hint_script) = invalid_tap.unwrap();
+        println!("STEP 4 EXECUTING DISPROVE SCRIPT at index {}", index);
+        let scr = script!{
+            {hint_script.clone()}
+            {disprove_scripts[index].clone()}
+        };
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            println!("Stack ");
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+
+        assert_eq!(res.final_stack.len(), 1);
+        assert!(res.success);
+        println!("DONE");
+
+    }
+    fn sign_assertions(assn: Assertions) -> Signatures {
+        let (ps, fs, hs) = (assn.0, assn.1, assn.2);
+        let secret = MOCK_SECRET;
+        
+        let mut psig: Vec<wots256::Signature> = vec![];
+        for i in 0..NUM_PUBS {
+            let psi = byte_array_to_wots256_sig(&format!("{secret}{:04x}", i), &ps[i]);
+            psig.push(psi);
+        }
+        let psig: Box<[wots256::Signature; NUM_PUBS]> = Box::new(psig.try_into().unwrap());
+
+        let mut fsig: Vec<wots256::Signature> = vec![];
+        for i in 0..NUM_U256 {
+            let fsi = byte_array_to_wots256_sig(&format!("{secret}{:04x}", NUM_PUBS + i), &fs[i]);
+            fsig.push(fsi);
+        }
+        let fsig: Box<[wots256::Signature; NUM_U256]> = Box::new(fsig.try_into().unwrap());
+
+        let mut hsig: Vec<wots160::Signature> = vec![];
+        for i in 0..NUM_U160 {
+            let hsi = byte_array_to_wots160_sig(&format!("{secret}{:04x}", NUM_PUBS + NUM_U256 + i), &hs[i]);
+            hsig.push(hsi);
+        }
+        let hsig: Box<[wots160::Signature; NUM_U160]> = Box::new(hsig.try_into().unwrap());
+        
+        (psig, fsig, hsig)
+    }
+
+    // Step 1: Anyone can Generate Operation (mul & hash) part of tapscript: same for all vks
+    #[test]
+    #[ignore]
+    fn test_fn_compile() {
+        let vk_bytes = [115, 158, 251, 51, 106, 255, 102, 248, 22, 171, 229, 158, 80, 192, 240, 217, 99, 162, 65, 107, 31, 137, 197, 79, 11, 210, 74, 65, 65, 203, 243, 14, 123, 2, 229, 125, 198, 247, 76, 241, 176, 116, 6, 3, 241, 1, 134, 195, 39, 5, 124, 47, 31, 43, 164, 48, 120, 207, 150, 125, 108, 100, 48, 155, 137, 132, 16, 193, 139, 74, 179, 131, 42, 119, 25, 185, 98, 13, 235, 118, 92, 11, 154, 142, 134, 220, 191, 220, 169, 250, 244, 104, 123, 7, 247, 33, 178, 155, 121, 59, 75, 188, 206, 198, 182, 97, 0, 64, 231, 45, 55, 92, 100, 17, 56, 159, 79, 13, 219, 221, 33, 39, 193, 24, 36, 58, 105, 8, 70, 206, 176, 209, 146, 45, 201, 157, 226, 84, 213, 135, 143, 178, 156, 112, 137, 246, 123, 248, 215, 168, 51, 95, 177, 47, 57, 29, 199, 224, 98, 48, 144, 253, 15, 201, 192, 142, 62, 143, 13, 228, 89, 51, 58, 6, 226, 139, 99, 207, 22, 113, 215, 79, 91, 158, 166, 210, 28, 90, 218, 111, 151, 4, 55, 230, 76, 90, 209, 149, 113, 248, 245, 50, 231, 137, 51, 157, 40, 29, 184, 198, 201, 108, 199, 89, 67, 136, 239, 96, 216, 237, 172, 29, 84, 3, 128, 240, 2, 218, 169, 217, 118, 179, 34, 226, 19, 227, 59, 193, 131, 108, 20, 113, 46, 170, 196, 156, 45, 39, 151, 218, 22, 132, 250, 209, 183, 46, 249, 115, 239, 14, 176, 200, 134, 158, 148, 139, 212, 167, 152, 205, 183, 236, 242, 176, 96, 177, 187, 184, 252, 14, 226, 127, 127, 173, 147, 224, 220, 8, 29, 63, 73, 215, 92, 161, 110, 20, 154, 131, 23, 217, 116, 145, 196, 19, 167, 84, 185, 16, 89, 175, 180, 110, 116, 57, 198, 237, 147, 183, 164, 169, 220, 172, 52, 68, 175, 113, 244, 62, 104, 134, 215, 99, 132, 199, 139, 172, 108, 143, 25, 238, 201, 128, 85, 24, 73, 30, 186, 142, 186, 201, 79, 3, 176, 185, 70, 66, 89, 127, 188, 158, 209, 83, 17, 22, 187, 153, 8, 63, 58, 174, 236, 132, 226, 43, 145, 97, 242, 198, 117, 105, 161, 21, 241, 23, 84, 32, 62, 155, 245, 172, 30, 78, 41, 199, 219, 180, 149, 193, 163, 131, 237, 240, 46, 183, 186, 42, 201, 49, 249, 142, 188, 59, 212, 26, 253, 23, 27, 205, 231, 163, 76, 179, 135, 193, 152, 110, 91, 5, 218, 67, 204, 164, 128, 183, 221, 82, 16, 72, 249, 111, 118, 182, 24, 249, 91, 215, 215, 155, 2, 0, 0, 0, 0, 0, 0, 0, 212, 110, 6, 228, 73, 146, 46, 184, 158, 58, 94, 4, 141, 241, 158, 0, 175, 140, 72, 75, 52, 6, 72, 49, 112, 215, 21, 243, 151, 67, 106, 22, 158, 237, 80, 204, 41, 128, 69, 52, 154, 189, 124, 203, 35, 107, 132, 241, 234, 31, 3, 165, 87, 58, 10, 92, 252, 227, 214, 99, 176, 66, 118, 22, 177, 20, 120, 198, 252, 236, 7, 148, 207, 78, 152, 132, 94, 207, 50, 243, 4, 169, 146, 240, 79, 98, 0, 212, 106, 137, 36, 193, 21, 175, 180, 1, 26, 107, 39, 198, 89, 152, 26, 220, 138, 105, 243, 45, 63, 106, 163, 80, 74, 253, 176, 207, 47, 52, 7, 84, 59, 151, 47, 178, 165, 112, 251, 161].to_vec();
+        let mock_vk: ark_groth16::VerifyingKey<Bn254> = ark_groth16::VerifyingKey::deserialize_uncompressed(&vk_bytes[..]).unwrap();
+        assert_eq!(mock_vk.gamma_abc_g1.len(), NUM_PUBS + 1); 
+
+        let partial_scripts = api_generate_partial_script(&mock_vk);
+
+
+        let mut script_cache = HashMap::new();
+        for i in 0..partial_scripts.len() {
+            script_cache.insert(i as u32, vec![partial_scripts[i].clone()]);
+        }
+
+        write_scripts_to_separate_files(script_cache, "tapnode");
+    }
+
+    const MOCK_SECRET: &str = "a138982ce17ac813d505a5b40b665d404e9528e7";
+    // Step 2: Operator Generates keypairs and broadcasts pubkeys for a Bitvm setup; 
+    // Anyone can create Bitcomm part of tapscript; yields complete tapscript
+    #[test]
+    #[ignore]
+    fn test_fn_generate_tapscripts() {
+        println!("start");
+
+        let vk_bytes = [115, 158, 251, 51, 106, 255, 102, 248, 22, 171, 229, 158, 80, 192, 240, 217, 99, 162, 65, 107, 31, 137, 197, 79, 11, 210, 74, 65, 65, 203, 243, 14, 123, 2, 229, 125, 198, 247, 76, 241, 176, 116, 6, 3, 241, 1, 134, 195, 39, 5, 124, 47, 31, 43, 164, 48, 120, 207, 150, 125, 108, 100, 48, 155, 137, 132, 16, 193, 139, 74, 179, 131, 42, 119, 25, 185, 98, 13, 235, 118, 92, 11, 154, 142, 134, 220, 191, 220, 169, 250, 244, 104, 123, 7, 247, 33, 178, 155, 121, 59, 75, 188, 206, 198, 182, 97, 0, 64, 231, 45, 55, 92, 100, 17, 56, 159, 79, 13, 219, 221, 33, 39, 193, 24, 36, 58, 105, 8, 70, 206, 176, 209, 146, 45, 201, 157, 226, 84, 213, 135, 143, 178, 156, 112, 137, 246, 123, 248, 215, 168, 51, 95, 177, 47, 57, 29, 199, 224, 98, 48, 144, 253, 15, 201, 192, 142, 62, 143, 13, 228, 89, 51, 58, 6, 226, 139, 99, 207, 22, 113, 215, 79, 91, 158, 166, 210, 28, 90, 218, 111, 151, 4, 55, 230, 76, 90, 209, 149, 113, 248, 245, 50, 231, 137, 51, 157, 40, 29, 184, 198, 201, 108, 199, 89, 67, 136, 239, 96, 216, 237, 172, 29, 84, 3, 128, 240, 2, 218, 169, 217, 118, 179, 34, 226, 19, 227, 59, 193, 131, 108, 20, 113, 46, 170, 196, 156, 45, 39, 151, 218, 22, 132, 250, 209, 183, 46, 249, 115, 239, 14, 176, 200, 134, 158, 148, 139, 212, 167, 152, 205, 183, 236, 242, 176, 96, 177, 187, 184, 252, 14, 226, 127, 127, 173, 147, 224, 220, 8, 29, 63, 73, 215, 92, 161, 110, 20, 154, 131, 23, 217, 116, 145, 196, 19, 167, 84, 185, 16, 89, 175, 180, 110, 116, 57, 198, 237, 147, 183, 164, 169, 220, 172, 52, 68, 175, 113, 244, 62, 104, 134, 215, 99, 132, 199, 139, 172, 108, 143, 25, 238, 201, 128, 85, 24, 73, 30, 186, 142, 186, 201, 79, 3, 176, 185, 70, 66, 89, 127, 188, 158, 209, 83, 17, 22, 187, 153, 8, 63, 58, 174, 236, 132, 226, 43, 145, 97, 242, 198, 117, 105, 161, 21, 241, 23, 84, 32, 62, 155, 245, 172, 30, 78, 41, 199, 219, 180, 149, 193, 163, 131, 237, 240, 46, 183, 186, 42, 201, 49, 249, 142, 188, 59, 212, 26, 253, 23, 27, 205, 231, 163, 76, 179, 135, 193, 152, 110, 91, 5, 218, 67, 204, 164, 128, 183, 221, 82, 16, 72, 249, 111, 118, 182, 24, 249, 91, 215, 215, 155, 2, 0, 0, 0, 0, 0, 0, 0, 212, 110, 6, 228, 73, 146, 46, 184, 158, 58, 94, 4, 141, 241, 158, 0, 175, 140, 72, 75, 52, 6, 72, 49, 112, 215, 21, 243, 151, 67, 106, 22, 158, 237, 80, 204, 41, 128, 69, 52, 154, 189, 124, 203, 35, 107, 132, 241, 234, 31, 3, 165, 87, 58, 10, 92, 252, 227, 214, 99, 176, 66, 118, 22, 177, 20, 120, 198, 252, 236, 7, 148, 207, 78, 152, 132, 94, 207, 50, 243, 4, 169, 146, 240, 79, 98, 0, 212, 106, 137, 36, 193, 21, 175, 180, 1, 26, 107, 39, 198, 89, 152, 26, 220, 138, 105, 243, 45, 63, 106, 163, 80, 74, 253, 176, 207, 47, 52, 7, 84, 59, 151, 47, 178, 165, 112, 251, 161].to_vec();
+        let mock_vk: ark_groth16::VerifyingKey<Bn254> = ark_groth16::VerifyingKey::deserialize_uncompressed(&vk_bytes[..]).unwrap();
+     
+        println!("compiled circuit");
+
+        assert!(mock_vk.gamma_abc_g1.len() == NUM_PUBS + 1); 
+        let secrets = (0..NUM_PUBS+NUM_U256+NUM_U160).map(|idx| format!("{MOCK_SECRET}{:04x}", idx)).collect::<Vec<String>>();
+
+        let mock_pubs = get_pubkeys(secrets);
+        let mut op_scripts = vec![];
+
+        println!("load scripts from file");
+        for index in 0..NUM_TAPS {
+            let read = read_scripts_from_file(&format!("bridge_data/chunker_data/tapnode_{index}.json"));
+            let read_scr = read.get(&(index as u32)).unwrap();
+            assert_eq!(read_scr.len(), 1);
+            let tap_node = read_scr[0].clone();
+            op_scripts.push(tap_node);
+        }
+        println!("done");
+
+        let ops_scripts: [Script; NUM_TAPS] = op_scripts.try_into().unwrap(); //compile_verifier(mock_vk);
+
+        let tapscripts = api_generate_full_tapscripts(mock_pubs, &ops_scripts);
+        assert_eq!(tapscripts.len(), NUM_TAPS);
+        let tapscripts: [Script; NUM_TAPS] = tapscripts.try_into().unwrap(); 
+        println!(
+            "tapscript.lens: {:?}",
+            tapscripts.clone().map(|script| script.len())
+        );
+    }
+
+
+    // Step 3: Operator Generates Assertions, Signs it and submit on chain
+
+    #[test]
+    #[ignore]
+    fn test_fn_generate_assertions() {
+        let vk_bytes = [115, 158, 251, 51, 106, 255, 102, 248, 22, 171, 229, 158, 80, 192, 240, 217, 99, 162, 65, 107, 31, 137, 197, 79, 11, 210, 74, 65, 65, 203, 243, 14, 123, 2, 229, 125, 198, 247, 76, 241, 176, 116, 6, 3, 241, 1, 134, 195, 39, 5, 124, 47, 31, 43, 164, 48, 120, 207, 150, 125, 108, 100, 48, 155, 137, 132, 16, 193, 139, 74, 179, 131, 42, 119, 25, 185, 98, 13, 235, 118, 92, 11, 154, 142, 134, 220, 191, 220, 169, 250, 244, 104, 123, 7, 247, 33, 178, 155, 121, 59, 75, 188, 206, 198, 182, 97, 0, 64, 231, 45, 55, 92, 100, 17, 56, 159, 79, 13, 219, 221, 33, 39, 193, 24, 36, 58, 105, 8, 70, 206, 176, 209, 146, 45, 201, 157, 226, 84, 213, 135, 143, 178, 156, 112, 137, 246, 123, 248, 215, 168, 51, 95, 177, 47, 57, 29, 199, 224, 98, 48, 144, 253, 15, 201, 192, 142, 62, 143, 13, 228, 89, 51, 58, 6, 226, 139, 99, 207, 22, 113, 215, 79, 91, 158, 166, 210, 28, 90, 218, 111, 151, 4, 55, 230, 76, 90, 209, 149, 113, 248, 245, 50, 231, 137, 51, 157, 40, 29, 184, 198, 201, 108, 199, 89, 67, 136, 239, 96, 216, 237, 172, 29, 84, 3, 128, 240, 2, 218, 169, 217, 118, 179, 34, 226, 19, 227, 59, 193, 131, 108, 20, 113, 46, 170, 196, 156, 45, 39, 151, 218, 22, 132, 250, 209, 183, 46, 249, 115, 239, 14, 176, 200, 134, 158, 148, 139, 212, 167, 152, 205, 183, 236, 242, 176, 96, 177, 187, 184, 252, 14, 226, 127, 127, 173, 147, 224, 220, 8, 29, 63, 73, 215, 92, 161, 110, 20, 154, 131, 23, 217, 116, 145, 196, 19, 167, 84, 185, 16, 89, 175, 180, 110, 116, 57, 198, 237, 147, 183, 164, 169, 220, 172, 52, 68, 175, 113, 244, 62, 104, 134, 215, 99, 132, 199, 139, 172, 108, 143, 25, 238, 201, 128, 85, 24, 73, 30, 186, 142, 186, 201, 79, 3, 176, 185, 70, 66, 89, 127, 188, 158, 209, 83, 17, 22, 187, 153, 8, 63, 58, 174, 236, 132, 226, 43, 145, 97, 242, 198, 117, 105, 161, 21, 241, 23, 84, 32, 62, 155, 245, 172, 30, 78, 41, 199, 219, 180, 149, 193, 163, 131, 237, 240, 46, 183, 186, 42, 201, 49, 249, 142, 188, 59, 212, 26, 253, 23, 27, 205, 231, 163, 76, 179, 135, 193, 152, 110, 91, 5, 218, 67, 204, 164, 128, 183, 221, 82, 16, 72, 249, 111, 118, 182, 24, 249, 91, 215, 215, 155, 2, 0, 0, 0, 0, 0, 0, 0, 212, 110, 6, 228, 73, 146, 46, 184, 158, 58, 94, 4, 141, 241, 158, 0, 175, 140, 72, 75, 52, 6, 72, 49, 112, 215, 21, 243, 151, 67, 106, 22, 158, 237, 80, 204, 41, 128, 69, 52, 154, 189, 124, 203, 35, 107, 132, 241, 234, 31, 3, 165, 87, 58, 10, 92, 252, 227, 214, 99, 176, 66, 118, 22, 177, 20, 120, 198, 252, 236, 7, 148, 207, 78, 152, 132, 94, 207, 50, 243, 4, 169, 146, 240, 79, 98, 0, 212, 106, 137, 36, 193, 21, 175, 180, 1, 26, 107, 39, 198, 89, 152, 26, 220, 138, 105, 243, 45, 63, 106, 163, 80, 74, 253, 176, 207, 47, 52, 7, 84, 59, 151, 47, 178, 165, 112, 251, 161].to_vec();
+        let proof_bytes: Vec<u8> = [162, 50, 57, 98, 3, 171, 250, 108, 49, 206, 73, 126, 25, 35, 178, 148, 35, 219, 98, 90, 122, 177, 16, 91, 233, 215, 222, 12, 72, 184, 53, 2, 62, 166, 50, 68, 98, 171, 218, 218, 151, 177, 133, 223, 129, 53, 114, 236, 181, 215, 223, 91, 102, 225, 52, 122, 122, 206, 36, 122, 213, 38, 186, 170, 235, 210, 179, 221, 122, 37, 74, 38, 79, 0, 26, 94, 59, 146, 46, 252, 70, 153, 236, 126, 194, 169, 17, 144, 100, 218, 118, 22, 99, 226, 132, 40, 24, 248, 232, 197, 195, 220, 254, 52, 36, 248, 18, 167, 167, 206, 108, 29, 120, 188, 18, 78, 86, 8, 121, 217, 144, 185, 122, 58, 12, 34, 44, 6, 233, 80, 177, 183, 5, 8, 150, 74, 241, 141, 65, 150, 35, 98, 15, 150, 137, 254, 132, 167, 228, 104, 63, 133, 11, 209, 39, 79, 138, 185, 88, 20, 242, 102, 69, 73, 243, 88, 29, 91, 127, 157, 82, 192, 52, 95, 143, 49, 227, 83, 19, 26, 108, 63, 232, 213, 169, 64, 221, 159, 214, 220, 246, 174, 35, 43, 143, 80, 168, 142, 29, 103, 179, 58, 235, 33, 163, 198, 255, 188, 20, 3, 91, 47, 158, 122, 226, 201, 175, 138, 18, 24, 178, 219, 78, 12, 96, 10, 2, 133, 35, 230, 149, 235, 206, 1, 177, 211, 245, 168, 74, 62, 25, 115, 70, 42, 38, 131, 92, 103, 103, 176, 212, 223, 177, 242, 94, 14].to_vec();
+        let scalar = [232, 255, 255, 239, 147, 245, 225, 67, 145, 112, 185, 121, 72, 232, 51, 40, 93, 88, 129, 129, 182, 69, 80, 184, 41, 160, 49, 225, 114, 78, 100, 48].to_vec();
+        let proof: ark_groth16::Proof<Bn254> = ark_groth16::Proof::deserialize_uncompressed(&proof_bytes[..]).unwrap();
+        let mock_vk: ark_groth16::VerifyingKey<Bn254> = ark_groth16::VerifyingKey::deserialize_uncompressed(&vk_bytes[..]).unwrap();
+        let scalar: ark_bn254::Fr = ark_bn254::Fr::deserialize_uncompressed(&scalar[..]).unwrap();
+        let public_inputs = [scalar];
+
+
+
+        assert!(mock_vk.gamma_abc_g1.len() == NUM_PUBS + 1);
+        let proof_asserts = generate_assertions(proof, public_inputs.to_vec(), &mock_vk).unwrap();
+        println!("signed_asserts {:?}", proof_asserts);
+    
+        std::fs::create_dir_all("bridge_data/chunker_data")
+        .expect("Failed to create directory structure");
+    
+        write_asserts_to_file(proof_asserts, "bridge_data/chunker_data/assert.json");
+        let _signed_asserts = sign_assertions(proof_asserts);
+    }
+
+
+    // Step 3: Operator Generates Assertions, Signs it and submit on chain
+    #[test]
+    #[ignore]
+    fn test_fn_generate_signatures() {
+        let vk_bytes = [115, 158, 251, 51, 106, 255, 102, 248, 22, 171, 229, 158, 80, 192, 240, 217, 99, 162, 65, 107, 31, 137, 197, 79, 11, 210, 74, 65, 65, 203, 243, 14, 123, 2, 229, 125, 198, 247, 76, 241, 176, 116, 6, 3, 241, 1, 134, 195, 39, 5, 124, 47, 31, 43, 164, 48, 120, 207, 150, 125, 108, 100, 48, 155, 137, 132, 16, 193, 139, 74, 179, 131, 42, 119, 25, 185, 98, 13, 235, 118, 92, 11, 154, 142, 134, 220, 191, 220, 169, 250, 244, 104, 123, 7, 247, 33, 178, 155, 121, 59, 75, 188, 206, 198, 182, 97, 0, 64, 231, 45, 55, 92, 100, 17, 56, 159, 79, 13, 219, 221, 33, 39, 193, 24, 36, 58, 105, 8, 70, 206, 176, 209, 146, 45, 201, 157, 226, 84, 213, 135, 143, 178, 156, 112, 137, 246, 123, 248, 215, 168, 51, 95, 177, 47, 57, 29, 199, 224, 98, 48, 144, 253, 15, 201, 192, 142, 62, 143, 13, 228, 89, 51, 58, 6, 226, 139, 99, 207, 22, 113, 215, 79, 91, 158, 166, 210, 28, 90, 218, 111, 151, 4, 55, 230, 76, 90, 209, 149, 113, 248, 245, 50, 231, 137, 51, 157, 40, 29, 184, 198, 201, 108, 199, 89, 67, 136, 239, 96, 216, 237, 172, 29, 84, 3, 128, 240, 2, 218, 169, 217, 118, 179, 34, 226, 19, 227, 59, 193, 131, 108, 20, 113, 46, 170, 196, 156, 45, 39, 151, 218, 22, 132, 250, 209, 183, 46, 249, 115, 239, 14, 176, 200, 134, 158, 148, 139, 212, 167, 152, 205, 183, 236, 242, 176, 96, 177, 187, 184, 252, 14, 226, 127, 127, 173, 147, 224, 220, 8, 29, 63, 73, 215, 92, 161, 110, 20, 154, 131, 23, 217, 116, 145, 196, 19, 167, 84, 185, 16, 89, 175, 180, 110, 116, 57, 198, 237, 147, 183, 164, 169, 220, 172, 52, 68, 175, 113, 244, 62, 104, 134, 215, 99, 132, 199, 139, 172, 108, 143, 25, 238, 201, 128, 85, 24, 73, 30, 186, 142, 186, 201, 79, 3, 176, 185, 70, 66, 89, 127, 188, 158, 209, 83, 17, 22, 187, 153, 8, 63, 58, 174, 236, 132, 226, 43, 145, 97, 242, 198, 117, 105, 161, 21, 241, 23, 84, 32, 62, 155, 245, 172, 30, 78, 41, 199, 219, 180, 149, 193, 163, 131, 237, 240, 46, 183, 186, 42, 201, 49, 249, 142, 188, 59, 212, 26, 253, 23, 27, 205, 231, 163, 76, 179, 135, 193, 152, 110, 91, 5, 218, 67, 204, 164, 128, 183, 221, 82, 16, 72, 249, 111, 118, 182, 24, 249, 91, 215, 215, 155, 2, 0, 0, 0, 0, 0, 0, 0, 212, 110, 6, 228, 73, 146, 46, 184, 158, 58, 94, 4, 141, 241, 158, 0, 175, 140, 72, 75, 52, 6, 72, 49, 112, 215, 21, 243, 151, 67, 106, 22, 158, 237, 80, 204, 41, 128, 69, 52, 154, 189, 124, 203, 35, 107, 132, 241, 234, 31, 3, 165, 87, 58, 10, 92, 252, 227, 214, 99, 176, 66, 118, 22, 177, 20, 120, 198, 252, 236, 7, 148, 207, 78, 152, 132, 94, 207, 50, 243, 4, 169, 146, 240, 79, 98, 0, 212, 106, 137, 36, 193, 21, 175, 180, 1, 26, 107, 39, 198, 89, 152, 26, 220, 138, 105, 243, 45, 63, 106, 163, 80, 74, 253, 176, 207, 47, 52, 7, 84, 59, 151, 47, 178, 165, 112, 251, 161].to_vec();
+        let proof_bytes: Vec<u8> = [162, 50, 57, 98, 3, 171, 250, 108, 49, 206, 73, 126, 25, 35, 178, 148, 35, 219, 98, 90, 122, 177, 16, 91, 233, 215, 222, 12, 72, 184, 53, 2, 62, 166, 50, 68, 98, 171, 218, 218, 151, 177, 133, 223, 129, 53, 114, 236, 181, 215, 223, 91, 102, 225, 52, 122, 122, 206, 36, 122, 213, 38, 186, 170, 235, 210, 179, 221, 122, 37, 74, 38, 79, 0, 26, 94, 59, 146, 46, 252, 70, 153, 236, 126, 194, 169, 17, 144, 100, 218, 118, 22, 99, 226, 132, 40, 24, 248, 232, 197, 195, 220, 254, 52, 36, 248, 18, 167, 167, 206, 108, 29, 120, 188, 18, 78, 86, 8, 121, 217, 144, 185, 122, 58, 12, 34, 44, 6, 233, 80, 177, 183, 5, 8, 150, 74, 241, 141, 65, 150, 35, 98, 15, 150, 137, 254, 132, 167, 228, 104, 63, 133, 11, 209, 39, 79, 138, 185, 88, 20, 242, 102, 69, 73, 243, 88, 29, 91, 127, 157, 82, 192, 52, 95, 143, 49, 227, 83, 19, 26, 108, 63, 232, 213, 169, 64, 221, 159, 214, 220, 246, 174, 35, 43, 143, 80, 168, 142, 29, 103, 179, 58, 235, 33, 163, 198, 255, 188, 20, 3, 91, 47, 158, 122, 226, 201, 175, 138, 18, 24, 178, 219, 78, 12, 96, 10, 2, 133, 35, 230, 149, 235, 206, 1, 177, 211, 245, 168, 74, 62, 25, 115, 70, 42, 38, 131, 92, 103, 103, 176, 212, 223, 177, 242, 94, 14].to_vec();
+        let scalar = [232, 255, 255, 239, 147, 245, 225, 67, 145, 112, 185, 121, 72, 232, 51, 40, 93, 88, 129, 129, 182, 69, 80, 184, 41, 160, 49, 225, 114, 78, 100, 48].to_vec();
+        let proof: ark_groth16::Proof<Bn254> = ark_groth16::Proof::deserialize_uncompressed(&proof_bytes[..]).unwrap();
+        let mock_vk: ark_groth16::VerifyingKey<Bn254> = ark_groth16::VerifyingKey::deserialize_uncompressed(&vk_bytes[..]).unwrap();
+        let scalar: ark_bn254::Fr = ark_bn254::Fr::deserialize_uncompressed(&scalar[..]).unwrap();
+        let public_inputs = [scalar];
+
+        assert!(mock_vk.gamma_abc_g1.len() == NUM_PUBS + 1);
+        let secrets = (0..NUM_PUBS+NUM_U256+NUM_U160).map(|idx| format!("{MOCK_SECRET}{:04x}", idx)).collect::<Vec<String>>();
+        let sigs = generate_signatures(proof, public_inputs.to_vec(), &mock_vk, secrets).unwrap();
+        let proof_asserts = get_assertions_from_signature(sigs);
+        println!("signed_asserts {:?}", proof_asserts);
+    
+        std::fs::create_dir_all("bridge_data/chunker_data")
+        .expect("Failed to create directory structure");
+    
+        write_asserts_to_file(proof_asserts, "bridge_data/chunker_data/assert.json");
+        let _signed_asserts = sign_assertions(proof_asserts);
+    }
+
+    #[test]
+    #[ignore]
+    fn test_fn_validate_assertions() {
+        let vk_bytes = [115, 158, 251, 51, 106, 255, 102, 248, 22, 171, 229, 158, 80, 192, 240, 217, 99, 162, 65, 107, 31, 137, 197, 79, 11, 210, 74, 65, 65, 203, 243, 14, 123, 2, 229, 125, 198, 247, 76, 241, 176, 116, 6, 3, 241, 1, 134, 195, 39, 5, 124, 47, 31, 43, 164, 48, 120, 207, 150, 125, 108, 100, 48, 155, 137, 132, 16, 193, 139, 74, 179, 131, 42, 119, 25, 185, 98, 13, 235, 118, 92, 11, 154, 142, 134, 220, 191, 220, 169, 250, 244, 104, 123, 7, 247, 33, 178, 155, 121, 59, 75, 188, 206, 198, 182, 97, 0, 64, 231, 45, 55, 92, 100, 17, 56, 159, 79, 13, 219, 221, 33, 39, 193, 24, 36, 58, 105, 8, 70, 206, 176, 209, 146, 45, 201, 157, 226, 84, 213, 135, 143, 178, 156, 112, 137, 246, 123, 248, 215, 168, 51, 95, 177, 47, 57, 29, 199, 224, 98, 48, 144, 253, 15, 201, 192, 142, 62, 143, 13, 228, 89, 51, 58, 6, 226, 139, 99, 207, 22, 113, 215, 79, 91, 158, 166, 210, 28, 90, 218, 111, 151, 4, 55, 230, 76, 90, 209, 149, 113, 248, 245, 50, 231, 137, 51, 157, 40, 29, 184, 198, 201, 108, 199, 89, 67, 136, 239, 96, 216, 237, 172, 29, 84, 3, 128, 240, 2, 218, 169, 217, 118, 179, 34, 226, 19, 227, 59, 193, 131, 108, 20, 113, 46, 170, 196, 156, 45, 39, 151, 218, 22, 132, 250, 209, 183, 46, 249, 115, 239, 14, 176, 200, 134, 158, 148, 139, 212, 167, 152, 205, 183, 236, 242, 176, 96, 177, 187, 184, 252, 14, 226, 127, 127, 173, 147, 224, 220, 8, 29, 63, 73, 215, 92, 161, 110, 20, 154, 131, 23, 217, 116, 145, 196, 19, 167, 84, 185, 16, 89, 175, 180, 110, 116, 57, 198, 237, 147, 183, 164, 169, 220, 172, 52, 68, 175, 113, 244, 62, 104, 134, 215, 99, 132, 199, 139, 172, 108, 143, 25, 238, 201, 128, 85, 24, 73, 30, 186, 142, 186, 201, 79, 3, 176, 185, 70, 66, 89, 127, 188, 158, 209, 83, 17, 22, 187, 153, 8, 63, 58, 174, 236, 132, 226, 43, 145, 97, 242, 198, 117, 105, 161, 21, 241, 23, 84, 32, 62, 155, 245, 172, 30, 78, 41, 199, 219, 180, 149, 193, 163, 131, 237, 240, 46, 183, 186, 42, 201, 49, 249, 142, 188, 59, 212, 26, 253, 23, 27, 205, 231, 163, 76, 179, 135, 193, 152, 110, 91, 5, 218, 67, 204, 164, 128, 183, 221, 82, 16, 72, 249, 111, 118, 182, 24, 249, 91, 215, 215, 155, 2, 0, 0, 0, 0, 0, 0, 0, 212, 110, 6, 228, 73, 146, 46, 184, 158, 58, 94, 4, 141, 241, 158, 0, 175, 140, 72, 75, 52, 6, 72, 49, 112, 215, 21, 243, 151, 67, 106, 22, 158, 237, 80, 204, 41, 128, 69, 52, 154, 189, 124, 203, 35, 107, 132, 241, 234, 31, 3, 165, 87, 58, 10, 92, 252, 227, 214, 99, 176, 66, 118, 22, 177, 20, 120, 198, 252, 236, 7, 148, 207, 78, 152, 132, 94, 207, 50, 243, 4, 169, 146, 240, 79, 98, 0, 212, 106, 137, 36, 193, 21, 175, 180, 1, 26, 107, 39, 198, 89, 152, 26, 220, 138, 105, 243, 45, 63, 106, 163, 80, 74, 253, 176, 207, 47, 52, 7, 84, 59, 151, 47, 178, 165, 112, 251, 161].to_vec();
+        let proof_bytes: Vec<u8> = [162, 50, 57, 98, 3, 171, 250, 108, 49, 206, 73, 126, 25, 35, 178, 148, 35, 219, 98, 90, 122, 177, 16, 91, 233, 215, 222, 12, 72, 184, 53, 2, 62, 166, 50, 68, 98, 171, 218, 218, 151, 177, 133, 223, 129, 53, 114, 236, 181, 215, 223, 91, 102, 225, 52, 122, 122, 206, 36, 122, 213, 38, 186, 170, 235, 210, 179, 221, 122, 37, 74, 38, 79, 0, 26, 94, 59, 146, 46, 252, 70, 153, 236, 126, 194, 169, 17, 144, 100, 218, 118, 22, 99, 226, 132, 40, 24, 248, 232, 197, 195, 220, 254, 52, 36, 248, 18, 167, 167, 206, 108, 29, 120, 188, 18, 78, 86, 8, 121, 217, 144, 185, 122, 58, 12, 34, 44, 6, 233, 80, 177, 183, 5, 8, 150, 74, 241, 141, 65, 150, 35, 98, 15, 150, 137, 254, 132, 167, 228, 104, 63, 133, 11, 209, 39, 79, 138, 185, 88, 20, 242, 102, 69, 73, 243, 88, 29, 91, 127, 157, 82, 192, 52, 95, 143, 49, 227, 83, 19, 26, 108, 63, 232, 213, 169, 64, 221, 159, 214, 220, 246, 174, 35, 43, 143, 80, 168, 142, 29, 103, 179, 58, 235, 33, 163, 198, 255, 188, 20, 3, 91, 47, 158, 122, 226, 201, 175, 138, 18, 24, 178, 219, 78, 12, 96, 10, 2, 133, 35, 230, 149, 235, 206, 1, 177, 211, 245, 168, 74, 62, 25, 115, 70, 42, 38, 131, 92, 103, 103, 176, 212, 223, 177, 242, 94, 14].to_vec();
+        let scalar = [232, 255, 255, 239, 147, 245, 225, 67, 145, 112, 185, 121, 72, 232, 51, 40, 93, 88, 129, 129, 182, 69, 80, 184, 41, 160, 49, 225, 114, 78, 100, 48].to_vec();
+        let _proof: ark_groth16::Proof<Bn254> = ark_groth16::Proof::deserialize_uncompressed(&proof_bytes[..]).unwrap();
+        let mock_vk: ark_groth16::VerifyingKey<Bn254> = ark_groth16::VerifyingKey::deserialize_uncompressed(&vk_bytes[..]).unwrap();
+        let scalar: ark_bn254::Fr = ark_bn254::Fr::deserialize_uncompressed(&scalar[..]).unwrap();
+        let _public_inputs = [scalar];
+
+        assert!(mock_vk.gamma_abc_g1.len() == NUM_PUBS + 1);
+
+        let mut op_scripts = vec![];
+        println!("load scripts from file");
+        for index in 0..NUM_TAPS {
+            let read = read_scripts_from_file(&format!("bridge_data/chunker_data/tapnode_{index}.json"));
+            let read_scr = read.get(&(index as u32)).unwrap();
+            assert_eq!(read_scr.len(), 1);
+            let tap_node = read_scr[0].clone();
+            op_scripts.push(tap_node);
+        }
+        println!("done");
+        let ops_scripts: [Script; NUM_TAPS] = op_scripts.try_into().unwrap();
+
+        let secrets = (0..NUM_PUBS+NUM_U256+NUM_U160).map(|idx| format!("{MOCK_SECRET}{:04x}", idx)).collect::<Vec<String>>();
+       let mock_pubks = get_pubkeys(secrets);
+       let verifier_scripts = api_generate_full_tapscripts(mock_pubks, &ops_scripts);
+       let verifier_scripts = verifier_scripts.try_into().unwrap();
+
+    //     // let proof_asserts = generate_proof_assertions(mock_vk.clone(), proof, public_inputs);
+        let proof_asserts = read_asserts_from_file("bridge_data/chunker_data/assert.json");
+        let signed_asserts = sign_assertions(proof_asserts);
+    //     let mock_pubks = mock_pubkeys(MOCK_SECRET);
+
+        println!("verify_signed_assertions");
+        let fault = validate_assertions(&mock_vk, signed_asserts, mock_pubks, &verifier_scripts);
+        assert!(fault.is_none());
+    }
+    
+
+    // Step 4: Challenger finds fault given signatures
+    #[test]
+    #[ignore]
+    fn test_fn_disprove_invalid_assertions() {
+        let vk_bytes = [115, 158, 251, 51, 106, 255, 102, 248, 22, 171, 229, 158, 80, 192, 240, 217, 99, 162, 65, 107, 31, 137, 197, 79, 11, 210, 74, 65, 65, 203, 243, 14, 123, 2, 229, 125, 198, 247, 76, 241, 176, 116, 6, 3, 241, 1, 134, 195, 39, 5, 124, 47, 31, 43, 164, 48, 120, 207, 150, 125, 108, 100, 48, 155, 137, 132, 16, 193, 139, 74, 179, 131, 42, 119, 25, 185, 98, 13, 235, 118, 92, 11, 154, 142, 134, 220, 191, 220, 169, 250, 244, 104, 123, 7, 247, 33, 178, 155, 121, 59, 75, 188, 206, 198, 182, 97, 0, 64, 231, 45, 55, 92, 100, 17, 56, 159, 79, 13, 219, 221, 33, 39, 193, 24, 36, 58, 105, 8, 70, 206, 176, 209, 146, 45, 201, 157, 226, 84, 213, 135, 143, 178, 156, 112, 137, 246, 123, 248, 215, 168, 51, 95, 177, 47, 57, 29, 199, 224, 98, 48, 144, 253, 15, 201, 192, 142, 62, 143, 13, 228, 89, 51, 58, 6, 226, 139, 99, 207, 22, 113, 215, 79, 91, 158, 166, 210, 28, 90, 218, 111, 151, 4, 55, 230, 76, 90, 209, 149, 113, 248, 245, 50, 231, 137, 51, 157, 40, 29, 184, 198, 201, 108, 199, 89, 67, 136, 239, 96, 216, 237, 172, 29, 84, 3, 128, 240, 2, 218, 169, 217, 118, 179, 34, 226, 19, 227, 59, 193, 131, 108, 20, 113, 46, 170, 196, 156, 45, 39, 151, 218, 22, 132, 250, 209, 183, 46, 249, 115, 239, 14, 176, 200, 134, 158, 148, 139, 212, 167, 152, 205, 183, 236, 242, 176, 96, 177, 187, 184, 252, 14, 226, 127, 127, 173, 147, 224, 220, 8, 29, 63, 73, 215, 92, 161, 110, 20, 154, 131, 23, 217, 116, 145, 196, 19, 167, 84, 185, 16, 89, 175, 180, 110, 116, 57, 198, 237, 147, 183, 164, 169, 220, 172, 52, 68, 175, 113, 244, 62, 104, 134, 215, 99, 132, 199, 139, 172, 108, 143, 25, 238, 201, 128, 85, 24, 73, 30, 186, 142, 186, 201, 79, 3, 176, 185, 70, 66, 89, 127, 188, 158, 209, 83, 17, 22, 187, 153, 8, 63, 58, 174, 236, 132, 226, 43, 145, 97, 242, 198, 117, 105, 161, 21, 241, 23, 84, 32, 62, 155, 245, 172, 30, 78, 41, 199, 219, 180, 149, 193, 163, 131, 237, 240, 46, 183, 186, 42, 201, 49, 249, 142, 188, 59, 212, 26, 253, 23, 27, 205, 231, 163, 76, 179, 135, 193, 152, 110, 91, 5, 218, 67, 204, 164, 128, 183, 221, 82, 16, 72, 249, 111, 118, 182, 24, 249, 91, 215, 215, 155, 2, 0, 0, 0, 0, 0, 0, 0, 212, 110, 6, 228, 73, 146, 46, 184, 158, 58, 94, 4, 141, 241, 158, 0, 175, 140, 72, 75, 52, 6, 72, 49, 112, 215, 21, 243, 151, 67, 106, 22, 158, 237, 80, 204, 41, 128, 69, 52, 154, 189, 124, 203, 35, 107, 132, 241, 234, 31, 3, 165, 87, 58, 10, 92, 252, 227, 214, 99, 176, 66, 118, 22, 177, 20, 120, 198, 252, 236, 7, 148, 207, 78, 152, 132, 94, 207, 50, 243, 4, 169, 146, 240, 79, 98, 0, 212, 106, 137, 36, 193, 21, 175, 180, 1, 26, 107, 39, 198, 89, 152, 26, 220, 138, 105, 243, 45, 63, 106, 163, 80, 74, 253, 176, 207, 47, 52, 7, 84, 59, 151, 47, 178, 165, 112, 251, 161].to_vec();
+        let proof_bytes: Vec<u8> = [162, 50, 57, 98, 3, 171, 250, 108, 49, 206, 73, 126, 25, 35, 178, 148, 35, 219, 98, 90, 122, 177, 16, 91, 233, 215, 222, 12, 72, 184, 53, 2, 62, 166, 50, 68, 98, 171, 218, 218, 151, 177, 133, 223, 129, 53, 114, 236, 181, 215, 223, 91, 102, 225, 52, 122, 122, 206, 36, 122, 213, 38, 186, 170, 235, 210, 179, 221, 122, 37, 74, 38, 79, 0, 26, 94, 59, 146, 46, 252, 70, 153, 236, 126, 194, 169, 17, 144, 100, 218, 118, 22, 99, 226, 132, 40, 24, 248, 232, 197, 195, 220, 254, 52, 36, 248, 18, 167, 167, 206, 108, 29, 120, 188, 18, 78, 86, 8, 121, 217, 144, 185, 122, 58, 12, 34, 44, 6, 233, 80, 177, 183, 5, 8, 150, 74, 241, 141, 65, 150, 35, 98, 15, 150, 137, 254, 132, 167, 228, 104, 63, 133, 11, 209, 39, 79, 138, 185, 88, 20, 242, 102, 69, 73, 243, 88, 29, 91, 127, 157, 82, 192, 52, 95, 143, 49, 227, 83, 19, 26, 108, 63, 232, 213, 169, 64, 221, 159, 214, 220, 246, 174, 35, 43, 143, 80, 168, 142, 29, 103, 179, 58, 235, 33, 163, 198, 255, 188, 20, 3, 91, 47, 158, 122, 226, 201, 175, 138, 18, 24, 178, 219, 78, 12, 96, 10, 2, 133, 35, 230, 149, 235, 206, 1, 177, 211, 245, 168, 74, 62, 25, 115, 70, 42, 38, 131, 92, 103, 103, 176, 212, 223, 177, 242, 94, 14].to_vec();
+        let scalar = [232, 255, 255, 239, 147, 245, 225, 67, 145, 112, 185, 121, 72, 232, 51, 40, 93, 88, 129, 129, 182, 69, 80, 184, 41, 160, 49, 225, 114, 78, 100, 48].to_vec();
+        let _proof: ark_groth16::Proof<Bn254> = ark_groth16::Proof::deserialize_uncompressed(&proof_bytes[..]).unwrap();
+        let mock_vk: ark_groth16::VerifyingKey<Bn254> = ark_groth16::VerifyingKey::deserialize_uncompressed(&vk_bytes[..]).unwrap();
+        let scalar: ark_bn254::Fr = ark_bn254::Fr::deserialize_uncompressed(&scalar[..]).unwrap();
+        let _public_inputs = [scalar];
+
+        assert_eq!(mock_vk.gamma_abc_g1.len(), NUM_PUBS+1); 
+
+        let mut op_scripts = vec![];
+        println!("load scripts from file");
+        for index in 0..NUM_TAPS {
+            let read = read_scripts_from_file(&format!("bridge_data/chunker_data/tapnode_{index}.json"));
+            let read_scr = read.get(&(index as u32)).unwrap();
+            assert_eq!(read_scr.len(), 1);
+            let tap_node = read_scr[0].clone();
+            op_scripts.push(tap_node);
+        }
+        println!("done");
+        let ops_scripts: [Script; NUM_TAPS] = op_scripts.try_into().unwrap();
+
+        let secrets = (0..NUM_PUBS+NUM_U256+NUM_U160).map(|idx| format!("{MOCK_SECRET}{:04x}", idx)).collect::<Vec<String>>();
+        let mock_pubks = get_pubkeys(secrets);
+        let verifier_scripts = api_generate_full_tapscripts(mock_pubks, &ops_scripts);
+        let verifier_scripts = verifier_scripts.try_into().unwrap();
+
+
+        fn corrupt(proof_asserts: &mut Assertions, random: Option<usize>) {
+            let mut rng = rand::thread_rng();
+    
+            let mut index = rng.gen_range(0..NUM_PUBS + NUM_U256 + NUM_U160);
+            if random.is_some() {
+                index = random.unwrap();
+            }
+            let mut scramble: [u8; 32] = [0u8; 32];
+            scramble[16] = 37;
+            let mut scramble2: [u8; 20] = [0u8; 20];
+            scramble2[10] = 37;
+            println!("corrupted assertion at index {}", index);
+            if index < NUM_PUBS {
+                if index == 0 {
+                    if proof_asserts.0[0] == scramble {
+                        scramble[16] += 1;
+                    }
+                    proof_asserts.0[0] = scramble;
+                } 
+            } else if index < NUM_PUBS + NUM_U256 {
+                let index = index - NUM_PUBS;
+                if proof_asserts.1[index] == scramble {
+                    scramble[16] += 1;
+                }
+                proof_asserts.1[index] = scramble;
+            } else if index < NUM_PUBS + NUM_U256 + NUM_U160 {
+                let index = index - NUM_PUBS - NUM_U256;
+                if proof_asserts.2[index] == scramble2 {
+                    scramble2[10] += 1;
+                }
+                proof_asserts.2[index] = scramble2;
+            }
+        }
+    
+
+
+        let _total = NUM_PUBS + NUM_U256 + NUM_U160;
+        for i in 0.._total {
+            println!("ITERATION {:?}", i);
+            let mut proof_asserts = read_asserts_from_file("bridge_data/chunker_data/assert.json");
+            corrupt(&mut proof_asserts, Some(i));
+            let signed_asserts = sign_assertions(proof_asserts);
+    
+            let fault = validate_assertions(&mock_vk, signed_asserts, mock_pubks, &verifier_scripts);
+            assert!(fault.is_some());
+            if fault.is_some() {
+                let (index, hint_script) = fault.unwrap();
+                println!("taproot index {:?}", index);
+                let scr = script!{
+                    {hint_script.clone()}
+                    {verifier_scripts[index].clone()}
+                };
+                let res = execute_script(scr);
+                for i in 0..res.final_stack.len() {
+                    println!("{i:} {:?}", res.final_stack.get(i));
+                }
+                let mut disprove_map: HashMap<u32, Vec<Script>> = HashMap::new();
+                let disprove_f = &format!("bridge_data/chunker_data/disprove_{index}.json");
+                disprove_map.insert(index as u32, vec![hint_script]);
+                write_scripts_to_file(disprove_map, disprove_f);
+                assert!(res.success);
+            }
+        }
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/bitvm/src/chunk/api_compiletime_utils.rs b/bitvm/src/chunk/api_compiletime_utils.rs
new file mode 100644
index 000000000..f7a0241c2
--- /dev/null
+++ b/bitvm/src/chunk/api_compiletime_utils.rs
@@ -0,0 +1,236 @@
+
+use std::collections::HashMap;
+use std::str::FromStr;
+
+use ark_bn254::Bn254;
+use ark_ec::bn::BnConfig;
+use ark_ec::pairing::Pairing;
+use ark_ec::{AffineRepr, CurveGroup};
+use ark_ff::Field;
+use bitcoin_script::script;
+use num_bigint::BigUint;
+use treepp::Script;
+use std::hash::{DefaultHasher, Hash, Hasher};
+use std::ops::Neg;
+use crate::bn254::ell_coeffs::AffinePairing;
+use crate::bn254::ell_coeffs::BnAffinePairing;
+use crate::bn254::fp254impl::Fp254Impl;
+use crate::bn254::fq::Fq;
+use crate::chunk::api::{NUM_PUBS, NUM_TAPS};
+use crate::chunk::elements::ElementType;
+use crate::{treepp};
+
+use super::api::PublicKeys;
+use super::g16_runner_core::{InputProof, PublicParams};
+use super::wrap_hasher::hash_messages;
+use super::wrap_wots::checksig_verify_to_limbs;
+use super::{g16_runner_core::{groth16_generate_segments}, g16_runner_utils::{ScriptType, Segment}, wrap_wots::WOTSPubKey};
+
+pub const ATE_LOOP_COUNT: &[i8] = ark_bn254::Config::ATE_LOOP_COUNT;
+
+pub(crate) struct Vkey {
+    pub(crate) q2: ark_bn254::G2Affine,
+    pub(crate) q3: ark_bn254::G2Affine,
+    pub(crate) p3vk: Vec<ark_bn254::G1Affine>,
+    pub(crate) p1q1: ark_bn254::Fq12,
+    pub(crate) vky0: ark_bn254::G1Affine,
+}
+
+pub(crate) fn generate_partial_script(
+    vk: &ark_groth16::VerifyingKey<Bn254>,
+) -> Vec<bitcoin_script::Script>  {
+    println!("generate_partial_script");
+    assert!(vk.gamma_abc_g1.len() == NUM_PUBS + 1); 
+
+    let p1 = vk.alpha_g1;
+    let (q3, q2, q1) = (
+        vk.gamma_g2.into_group().neg().into_affine(),
+        vk.delta_g2.into_group().neg().into_affine(),
+        -vk.beta_g2,
+    );
+
+    let pairing = BnAffinePairing; 
+    let p1q1 = pairing.multi_miller_loop_affine([p1], [q1]).0;
+    let mut p3vk = vk.gamma_abc_g1.clone(); // vk.vk_pubs[0]
+    p3vk.reverse();
+    let vky0 = p3vk.pop().unwrap();
+    
+    let vk = Vkey {
+        q2,
+        q3,
+        p3vk,
+        p1q1,
+        vky0,
+    };
+
+
+    println!("generate_partial_script; generate_segments_using_mock_proof");
+    let segments = generate_segments_using_mock_proof(vk, false);
+    println!("generate_partial_script; partial_scripts_from_segments");
+    let op_scripts: Vec<Script> = partial_scripts_from_segments(&segments).into_iter().collect();
+    assert_eq!(op_scripts.len(), NUM_TAPS);
+    op_scripts
+}
+
+
+// we can use mock_vk and mock_proof here because generating bitcommitments only requires knowledge
+// of how the chunks are connected and the public keys to generate locking_script
+// we do not need values at the input or outputs of tapscript
+pub(crate) fn append_bitcom_locking_script_to_partial_scripts(
+    inpubkeys: PublicKeys,
+    ops_scripts: Vec<bitcoin_script::Script>,
+) ->  Vec<bitcoin_script::Script> {
+    println!("append_bitcom_locking_script_to_partial_scripts; generage_segments_using_mock_vk_and_mock_proof");
+    // mock_vk can be used because generating locking_script doesn't depend upon values or partial scripts; it's only a function of pubkey and ordering of input/outputs
+    let mock_segments = generate_segments_using_mock_vk_and_mock_proof();
+
+    println!("append_bitcom_locking_script_to_partial_scripts; bitcom_scripts_from_segments");
+    let bitcom_scripts: Vec<treepp::Script> = bitcom_scripts_from_segments(&mock_segments, inpubkeys).into_iter().filter(|f| f.len() > 0).collect();
+    assert_eq!(ops_scripts.len(), bitcom_scripts.len());
+    let res: Vec<treepp::Script>  = ops_scripts.into_iter().zip(bitcom_scripts).map(|(op_scr, bit_scr)| 
+        script!{
+            {bit_scr}
+            {op_scr}
+        }   
+    ).collect();
+
+    res
+}
+
+fn generate_segments_using_mock_proof(vk: Vkey, skip_evaluation: bool) -> Vec<Segment> {
+    // values known only at runtime, can be mocked
+    let q4xc0: ark_bn254::Fq = ark_bn254::Fq::from(BigUint::from_str("18327300221956260726652878806040774028373651771658608258634994907375058801387").unwrap());
+    let q4xc1: ark_bn254::Fq = ark_bn254::Fq::from(BigUint::from_str("2791853351403597124265928925229664715548948431563105825401192338793643440152").unwrap());
+    let q4yc0: ark_bn254::Fq = ark_bn254::Fq::from(BigUint::from_str("9203020065248672543175273161372438565462224153828027408202959864555260432617").unwrap());
+    let q4yc1: ark_bn254::Fq = ark_bn254::Fq::from(BigUint::from_str("21242559583226289516723159151189961292041850314492937202099045542257932723954").unwrap());
+    let tx = ark_bn254::Fq2::new(q4xc0, q4xc1);
+    let ty =  ark_bn254::Fq2::new(q4yc0, q4yc1);
+    let t2 = ark_bn254::G2Affine::new(tx, ty);
+
+    let g1x: ark_bn254::Fq = ark_bn254::Fq::from(BigUint::from_str("5567084537907487155917146166615783238769284480674905823618779044732684151587").unwrap());
+    let g1y: ark_bn254::Fq = ark_bn254::Fq::from(BigUint::from_str("6500138522353517220105129525103627482682148482121078429366182801568786680416").unwrap());
+    let t1 = ark_bn254::G1Affine::new(g1x, g1y);
+
+    let mut segments: Vec<Segment> = vec![];
+    let g1 = t1;
+    let g2 = t2;
+    let fr : ark_ff::BigInt<4> = ark_ff::BigInt::from(1u64);
+    let c = ark_bn254::Fq6::ONE;
+    let mocked_eval_ins: InputProof = InputProof { p2: g1, p4: g1, q4: g2, c, ks: vec![fr.into()] };
+
+    // public values known at compile time
+    let pubs: PublicParams = PublicParams { q2: vk.q2, q3: vk.q3, fixed_acc: vk.p1q1.c1/vk.p1q1.c0, ks_vks: vk.p3vk, vky0: vk.vky0 };
+    groth16_generate_segments(skip_evaluation, &mut segments, mocked_eval_ins.to_raw(), pubs, &mut None);
+    segments
+}
+
+pub(crate) fn generate_segments_using_mock_vk_and_mock_proof() -> Vec<Segment> {
+    let mock_vk = Vkey {
+        q2: ark_bn254::G2Affine::identity(),
+        q3: ark_bn254::G2Affine::identity(),
+        p3vk: (0..NUM_PUBS).map(|_| ark_bn254::G1Affine::identity()).collect(),
+        p1q1: ark_bn254::Fq12::ONE,
+        vky0: ark_bn254::G1Affine::identity(),
+    };
+    generate_segments_using_mock_proof(mock_vk, true)
+}
+
+pub(crate) fn partial_scripts_from_segments(segments: &Vec<Segment>) -> Vec<treepp::Script> {
+   fn serialize_element_types(elems: &[ElementType]) -> String {
+        // 1. Convert each variant to its string representation.
+        let joined = elems
+            .iter()
+            .map(|elem| format!("{:?}", elem)) // uses #[derive(Debug)]
+            .collect::<Vec<String>>()
+            .join("_");
+    
+        // 2. Compute a simple 64-bit hash of that string
+        let mut hasher = DefaultHasher::new();
+        joined.hash(&mut hasher);
+        let unique_hash = hasher.finish();
+    
+        // 3. Concatenate final result as "ENUM1-ENUM2-ENUM3|hash"
+        format!("{}|{}", joined, unique_hash)
+    }
+
+    let mut op_scripts: Vec<treepp::Script> = vec![];
+
+    // cache hashing script as it is repititive
+    let mut hashing_script_cache: HashMap<String, Script> = HashMap::new();
+    for s in segments {
+        if s.scr_type.is_final_script() || s.scr_type == ScriptType::NonDeterministic {
+            continue;
+        }
+        let mut elem_types_to_hash: Vec<ElementType> = s.parameter_ids.iter().rev().map(|f| f.1).collect();
+        elem_types_to_hash.push(s.result.1);
+        let elem_types_str_as_key = serialize_element_types(&elem_types_to_hash);
+        hashing_script_cache.entry(elem_types_str_as_key).or_insert_with(|| {
+            let hash_scr = script! {
+                {hash_messages(elem_types_to_hash)}
+                OP_TRUE
+            };
+            hash_scr
+        });
+    };
+
+    for i in 0..segments.len() {
+        let seg= &segments[i];
+        let scr_type = seg.scr_type.clone();
+        if scr_type == ScriptType::NonDeterministic {
+            continue;
+        }
+
+        let op_scr  = seg.scr.clone();
+
+        if seg.scr_type.is_final_script() { // validating segments do not have output hash, so don't add hashing layer; they are self sufficient
+            op_scripts.push(op_scr);
+        } else {
+
+            // fetch hashing script from cache for these element types
+            let mut elem_types_to_hash: Vec<ElementType> = seg.parameter_ids.iter().rev().map(|(_, param_seg_type)| *param_seg_type).collect();
+            elem_types_to_hash.push(seg.result.1);
+            let elem_types_str = serialize_element_types(&elem_types_to_hash);
+            let hash_scr = hashing_script_cache.get(&elem_types_str).unwrap();
+
+            op_scripts.push(script!{
+                {op_scr}
+                {hash_scr.clone()}
+            });
+        }
+    }
+    op_scripts
+}
+
+pub(crate) fn bitcom_scripts_from_segments(segments: &Vec<Segment>, wots_pubkeys: PublicKeys) -> Vec<treepp::Script> {
+    let mut bitcom_scripts: Vec<treepp::Script> = vec![];
+
+    let mut pubkeys_arr = vec![];
+    pubkeys_arr.extend_from_slice(&wots_pubkeys.0.iter().map(|f| WOTSPubKey::P256(*f)).collect::<Vec<WOTSPubKey>>());
+    pubkeys_arr.extend_from_slice(&wots_pubkeys.1.iter().map(|f| WOTSPubKey::P256(*f)).collect::<Vec<WOTSPubKey>>());
+    pubkeys_arr.extend_from_slice(&wots_pubkeys.2.iter().map(|f| WOTSPubKey::P160(*f)).collect::<Vec<WOTSPubKey>>());
+
+    for seg in segments {
+        if seg.scr_type == ScriptType::NonDeterministic {
+            continue;
+        }
+
+        let mut index_of_bitcommitted_msg = vec![];
+        if !seg.scr_type.is_final_script() {
+            index_of_bitcommitted_msg.push(seg.id);
+        };
+        let sec_in: Vec<u32> = seg.parameter_ids.iter().map(|(f, _)| *f).collect();
+        index_of_bitcommitted_msg.extend_from_slice(&sec_in);
+
+        let mut locking_scr = script! {};
+        for index in index_of_bitcommitted_msg {
+            locking_scr = script!{
+                {locking_scr}
+                {checksig_verify_to_limbs(&pubkeys_arr[index as usize])}
+                {Fq::toaltstack()}
+            };
+        }
+        bitcom_scripts.push(locking_scr);
+
+    }
+    bitcom_scripts
+}
diff --git a/bitvm/src/chunk/api_runtime_utils.rs b/bitvm/src/chunk/api_runtime_utils.rs
new file mode 100644
index 000000000..e5e21b473
--- /dev/null
+++ b/bitvm/src/chunk/api_runtime_utils.rs
@@ -0,0 +1,580 @@
+use std::ops::Neg;
+
+use ark_bn254::{Bn254};
+use ark_ec::bn::Bn;
+use ark_ec::{pairing::Pairing, AffineRepr, CurveGroup};
+use ark_ff::Field;
+use bitcoin_script::script;
+use crate::bn254::ell_coeffs::AffinePairing;
+use crate::bn254::ell_coeffs::BnAffinePairing;
+use crate::bn254::fp254impl::Fp254Impl;
+use crate::bn254::fq::Fq;
+use crate::chunk::elements::HashBytes;
+use crate::chunk::g16_runner_core::{groth16_generate_segments, InputProof, InputProofRaw, PublicParams};
+use crate::chunk::api_compiletime_utils::partial_scripts_from_segments;
+use crate::chunk::wrap_wots::{byte_array_to_wots160_sig, byte_array_to_wots256_sig};
+use crate::groth16::offchain_checker::compute_c_wi;
+use crate::signatures::wots_api::{wots160, wots256, SignatureImpl};
+use crate::treepp::Script;
+
+use crate::{bn254::utils::Hint, execute_script};
+
+
+use super::api::{Assertions, PublicKeys, Signatures, NUM_TAPS, NUM_PUBS, NUM_U160, NUM_U256};
+use super::g16_runner_utils::{ScriptType, Segment};
+use super::wrap_hasher::BLAKE3_HASH_LENGTH;
+use super::{elements::CompressedStateObject, wrap_wots::{wots160_sig_to_byte_array, wots256_sig_to_byte_array}};
+
+#[derive(Debug, Clone)]
+enum SigData {
+    Sig256(wots256::Signature),
+    Sig160(wots160::Signature),
+}
+
+// Segments are collected in the order [PublicInputSegment, ProofInputSegments, IntermediateHashSegments, FinalScriptSegment]
+// mirror of the function get_segments_from_assertion()
+pub(crate) fn get_assertion_from_segments(segments: &Vec<Segment>) -> Assertions {
+    // extract output {hash or field elements} from all but final script (final script doesn't have output)
+    let mut arr_of_output_state: Vec<CompressedStateObject> = vec![];
+    for v in segments {
+        if v.scr_type.is_final_script() {
+            continue;
+        }
+        let x = v.result.0.to_hash();
+        arr_of_output_state.push(x);
+    }
+
+    // Serialize and Collect:
+    // Segments that were collected in order [PublicInputSegments, ProofInputSegments, IntermediateHashSegment, FinalScriptSegment]
+    // are now serialized in the same order and collected as such => [PublicInputAssertion, ProofInputAssertion, IntermediateHashAssertion]
+    let mut public_input_assertion_data = vec![];
+    for i in 0..NUM_PUBS {
+        let val = &arr_of_output_state[i];
+        let val: [u8; 32] = val.serialize_to_byte_array().try_into().unwrap();
+        public_input_assertion_data.push(val);
+    }
+    let public_input_assertion_data: [[u8; 32]; NUM_PUBS] = public_input_assertion_data.try_into().unwrap();
+
+    let len = public_input_assertion_data.len();
+    let mut proof_input_assertion_data = vec![];
+    for i in 0..NUM_U256 {
+        let val = &arr_of_output_state[i + len];
+        let val: [u8; 32] = val.serialize_to_byte_array().try_into().unwrap();
+        proof_input_assertion_data.push(val);
+    }
+    let proof_input_assertion_data: [[u8; 32]; NUM_U256] = proof_input_assertion_data.try_into().unwrap();
+
+    let len = public_input_assertion_data.len() + proof_input_assertion_data.len();
+    let mut intermediate_hash_assertion_data = vec![];
+    for i in 0..NUM_U160 {
+        let val = &arr_of_output_state[i+len];
+        let val: [u8; BLAKE3_HASH_LENGTH] = val.serialize_to_byte_array().try_into().unwrap();
+        intermediate_hash_assertion_data.push(val);
+    }
+    let batch3: [[u8; BLAKE3_HASH_LENGTH]; NUM_U160] = intermediate_hash_assertion_data.try_into().unwrap();
+
+    (public_input_assertion_data, proof_input_assertion_data, batch3)
+}
+
+// deserialize assertions to CompressedState (i.e. concrete types of bigint and hasbytes) and get proof
+fn utils_deserialize_assertions(asserts: Assertions) -> ([CompressedStateObject; NUM_PUBS], [CompressedStateObject; NUM_U256], [CompressedStateObject; NUM_U160]) {
+    let mut cobj_pubs = vec![];
+    for i in 0..NUM_PUBS {
+        let nibs = asserts.0[i].to_vec();
+        let cobj = CompressedStateObject::deserialize_from_byte_array(nibs);
+        cobj_pubs.push(cobj);
+    }
+    let cobj_pubs: [CompressedStateObject; NUM_PUBS] = cobj_pubs.try_into().unwrap();
+
+    let mut cobj_fqs = vec![];
+    for i in 0..NUM_U256 {
+        let nibs = asserts.1[i].to_vec();
+        let cobj = CompressedStateObject::deserialize_from_byte_array(nibs);
+        cobj_fqs.push(cobj);
+    }
+    let cobj_fqs: [CompressedStateObject; NUM_U256] = cobj_fqs.try_into().unwrap();
+
+    let mut cobj_hashes = vec![];
+    for i in 0..NUM_U160 {
+        let nibs = asserts.2[i].to_vec();
+        let cobj = CompressedStateObject::deserialize_from_byte_array(nibs);
+        cobj_hashes.push(cobj);
+    }
+    let cobj_hashes: [CompressedStateObject; NUM_U160] = cobj_hashes.try_into().unwrap();
+
+    let cobjs: ([CompressedStateObject; NUM_PUBS], [CompressedStateObject; NUM_U256], [CompressedStateObject; NUM_U160]) = (cobj_pubs, cobj_fqs, cobj_hashes);
+
+    cobjs
+}
+
+// mirror of the funtion get_assertion_from_segments
+pub(crate) fn get_segments_from_assertion(assertions: Assertions, vk: ark_groth16::VerifyingKey<Bn254>) -> (bool, Vec<Segment>) {
+
+    fn extract_proof_from_assertions(state_pubs: [CompressedStateObject; NUM_PUBS], state_fqs: [CompressedStateObject; NUM_U256]) -> Option<InputProofRaw> { 
+        let mut ks: Vec<ark_ff::BigInt<4>> = vec![];
+        for i in 0..NUM_PUBS {
+            let cobj = &state_pubs[i];
+            if let CompressedStateObject::U256(cobj) = cobj {
+                ks.push(*cobj);
+            } else {
+                return None;
+            }
+        }
+        let ks:[ark_ff::BigInt<4>; NUM_PUBS] = ks.try_into().unwrap();
+    
+        let mut numfqs: Vec<ark_ff::BigInt<4>> = vec![];
+        for i in 0..NUM_U256 {
+            let cobj = &state_fqs[i];
+            if let CompressedStateObject::U256(cobj) = cobj {
+                numfqs.push(*cobj);
+            } else {
+                return None;
+            }
+        }
+        
+        let p4 = [numfqs[1], numfqs[0]];
+        let p2 = [numfqs[3], numfqs[2]];
+        let step = 4;
+        let c = [
+                numfqs[step], numfqs[step+1],
+                numfqs[step+2], numfqs[step+3],
+                numfqs[step+4], numfqs[step+5],
+        ];       
+        let step = step + 6;
+    
+        let q4 = [
+            numfqs[step], numfqs[step+1],
+            numfqs[step+2], numfqs[step+3],
+        ];
+    
+        let eval_ins: InputProofRaw = InputProofRaw { p2, p4, q4, c, ks };
+        Some(eval_ins)
+    }
+
+    fn extract_hashes_from_assertions(state_hashes: [CompressedStateObject; NUM_U160]) -> Option<Vec<HashBytes>> { // Intermediates
+        let mut hashes: Vec<HashBytes> = vec![];
+        for i in 0..NUM_U160 {
+            let cobj = &state_hashes[i];
+            if let CompressedStateObject::Hash(cobj) = cobj {
+                hashes.push(*cobj);
+            } else {
+                return None;
+            }
+        }
+        hashes.reverse();
+        Some(hashes)
+    }
+
+    fn extract_public_params(vk: &ark_groth16::VerifyingKey<Bn254>) -> PublicParams {
+        let mut msm_gs = vk.gamma_abc_g1.clone(); // vk.vk_pubs[0]
+        msm_gs.reverse();
+        let vky0 = msm_gs.pop().unwrap();
+    
+        let (q3, q2, q1) = (
+            vk.gamma_g2.into_group().neg().into_affine(),
+            vk.delta_g2.into_group().neg().into_affine(),
+            -vk.beta_g2,
+        );
+
+        let pairing = BnAffinePairing;
+        let fixed_acc = pairing.multi_miller_loop_affine([vk.alpha_g1], [q1]).0;
+        
+        let pubs: PublicParams = PublicParams { q2, q3, fixed_acc: fixed_acc.c1/fixed_acc.c0, ks_vks: msm_gs.clone(), vky0 };
+        pubs
+    }
+    
+    let states = utils_deserialize_assertions(assertions);
+
+    let proof_raw = extract_proof_from_assertions(states.0, states.1);
+    let proof_raw = proof_raw.unwrap();
+    let pubs = extract_public_params(&vk);
+    let intermediates = extract_hashes_from_assertions(states.2);
+    let intermediates = intermediates.unwrap();
+
+    let mut segments: Vec<Segment> = vec![];
+    let success = groth16_generate_segments(false, &mut segments, proof_raw, pubs, &mut Some(intermediates));
+    (success, segments)
+}
+
+
+pub(crate) fn get_segments_from_groth16_proof(
+    proof: ark_groth16::Proof<Bn<ark_bn254::Config>>,
+    scalars: Vec<ark_bn254::Fr>,
+    vk: &ark_groth16::VerifyingKey<Bn254>,
+) -> (bool, Vec<Segment>) {
+    assert_eq!(scalars.len(), NUM_PUBS);
+
+    let mut msm_scalar = scalars.clone();
+    msm_scalar.reverse();
+    let mut msm_gs = vk.gamma_abc_g1.clone(); // vk.vk_pubs[0]
+    msm_gs.reverse();
+    let vky0 = msm_gs.pop().unwrap();
+
+    let mut p3 = vky0 * ark_bn254::Fr::ONE;
+    for i in 0..NUM_PUBS {
+        p3 += msm_gs[i] * msm_scalar[i];
+    }
+    let p3 = p3.into_affine();
+
+    let (p2, p1, p4) = (proof.c, vk.alpha_g1, proof.a);
+    let (q3, q2, q1, q4) = (
+        vk.gamma_g2.into_group().neg().into_affine(),
+        vk.delta_g2.into_group().neg().into_affine(),
+        -vk.beta_g2,
+        proof.b,
+    );
+    let pairing = BnAffinePairing;
+    let f_fixed = pairing.multi_miller_loop_affine([p1], [q1]).0;
+    let f = pairing.multi_miller_loop_affine([p1, p2, p3, p4], [q1, q2, q3, q4]).0;
+    let (c, _) = compute_c_wi(f);
+    let eval_ins: InputProof = InputProof {
+        p2,
+        p4,
+        q4,
+        c: c.c1/c.c0,
+        ks: msm_scalar.clone(),
+    };
+
+    let pubs: PublicParams = PublicParams {
+        q2, 
+        q3, 
+        fixed_acc: f_fixed.c1/f_fixed.c0, 
+        ks_vks: msm_gs, 
+        vky0
+    };
+
+    let mut segments: Vec<Segment> = vec![];
+    println!("get_segments_from_groth16_proof; groth16_generate_segments");
+    let success = groth16_generate_segments(false, &mut segments, eval_ins.to_raw(), pubs, &mut None);
+    (success, segments)    
+}
+
+// wots sign byte array using secrets
+// mirror of get_assertions_from_signature
+pub(crate) fn get_signature_from_assertion(assn: Assertions, secrets: Vec<String>) -> Signatures {
+    println!("get_signature_from_assertion");
+    // sign and return Signatures
+    let (ps, fs, hs) = (assn.0, assn.1, assn.2);
+    
+    let mut psig: Vec<wots256::Signature> = vec![];
+    for i in 0..NUM_PUBS {
+        let psi = wots256::get_signature(secrets[i].as_str(), &ps[i]);
+        psig.push(psi);
+    }
+    let psig: Box<[wots256::Signature; NUM_PUBS]> = Box::new(psig.try_into().unwrap());
+
+    let mut fsig: Vec<wots256::Signature> = vec![];
+    for i in 0..fs.len() {
+        let fsi = wots256::get_signature(secrets[i+NUM_PUBS].as_str(), &fs[i]);
+        fsig.push(fsi);
+    }
+    let fsig: Box<[wots256::Signature; NUM_U256]> = Box::new(fsig.try_into().unwrap());
+
+    let mut hsig: Vec<wots160::Signature> = vec![];
+    for i in 0..hs.len() {
+        let hsi =
+            wots160::get_signature(secrets[i+NUM_PUBS+NUM_U256].as_str(), &hs[i]);
+        hsig.push(hsi);
+    }
+    let hsig: Box<[wots160::Signature; NUM_U160]> = Box::new(hsig.try_into().unwrap());
+    
+    (psig, fsig, hsig)
+}
+
+// decode signature to assertion
+// mirror of get_signature_from_assertion
+pub(crate) fn get_assertions_from_signature(signed_asserts: Signatures) -> Assertions {
+    println!("get_assertions_from_signature");
+    let mut ks: Vec<[u8;32]> = vec![];
+    for i in 0..NUM_PUBS {
+        let nibs = wots256_sig_to_byte_array(signed_asserts.0[i]);
+        let nibs:[u8;32] = nibs.try_into().unwrap();
+        ks.push(nibs);
+    }
+    let ks:[[u8;32]; NUM_PUBS] = ks.try_into().unwrap();
+
+    let mut numfqs: Vec<[u8;32]> = vec![];
+    for i in 0..NUM_U256 {
+        let nibs = wots256_sig_to_byte_array(signed_asserts.1[i]);
+        let nibs:[u8;32] = nibs.try_into().unwrap();
+        numfqs.push(nibs);
+    }
+    let num_fqs: [[u8;32]; NUM_U256] = numfqs.try_into().unwrap();
+
+    let mut numhashes: Vec<[u8;BLAKE3_HASH_LENGTH]> = vec![];
+    for i in 0..NUM_U160 {
+        let nibs = wots160_sig_to_byte_array(signed_asserts.2[i]);
+        let nibs: [u8;BLAKE3_HASH_LENGTH] = nibs.try_into().unwrap();
+        numhashes.push(nibs);
+    }
+
+    let num_hashes: [[u8;BLAKE3_HASH_LENGTH]; NUM_U160] = numhashes.try_into().unwrap();
+
+    let asst: Assertions = (ks, num_fqs, num_hashes);
+    asst
+}
+
+
+fn utils_collect_mul_hints_per_segment(segments: &Vec<Segment>) -> Vec<Vec<Hint>> {
+    let aux_hints: Vec<Vec<Hint>> = segments.iter().map(|seg| {
+        let mut hints = seg.hints.clone();
+        // hashing preimage for input
+        seg.parameter_ids.iter().rev().for_each(|(param_seg_id, param_seg_type)| {
+            let param_seg = &segments[*(param_seg_id) as usize];
+            if !param_seg.result.0.output_is_field_element() {
+                let preimage_hints = param_seg.result.0.to_witness(*param_seg_type);
+                hints.extend_from_slice(&preimage_hints);
+            }
+        });
+        // hashing preimage for output
+        if seg.scr_type == ScriptType::FoldedFp12Multiply || seg.scr_type == ScriptType::MillerSquaring || seg.scr_type == ScriptType::MillerPointOpsStep2 {
+            hints.extend_from_slice(&seg.result.0.to_witness(seg.result.1));
+        }
+        hints
+    }).collect();
+    aux_hints
+}
+
+fn utils_execute_chunked_g16(aux_hints: Vec<Vec<Hint>>, bc_hints: Vec<Script>, segments: &Vec<Segment>, disprove_scripts: &[Script; NUM_TAPS]) -> Option<(usize, Script)> {
+    let mut tap_script_index = 0;
+    for i in 0..aux_hints.len() {
+        if segments[i].scr_type == ScriptType::NonDeterministic  {
+            continue;
+        }
+        let hint_script = script!{
+            for h in &aux_hints[i] {
+                {h.push()}
+            }
+            {bc_hints[i].clone()}
+        };
+        let total_script = script!{
+            {hint_script.clone()}
+            {disprove_scripts[tap_script_index].clone()}
+        };
+        let exec_result = execute_script(total_script);
+        if exec_result.final_stack.len() > 1 {
+            for i in 0..exec_result.final_stack.len() {
+                println!("{i:} {:?}", exec_result.final_stack.get(i));
+            }
+        }
+        if !exec_result.success {
+            if exec_result.final_stack.len() != 1 {
+                println!("final {:?}", i);
+                println!("final {:?}", segments[i].scr_type);
+                assert!(false);
+            }
+        } else {
+            println!("disprove script {}: tapindex {}, {:?}",i,tap_script_index, segments[i].scr_type);
+            let disprove_hint = (
+                tap_script_index,
+                hint_script,
+            );
+            return Some(disprove_hint);
+        }
+        tap_script_index += 1;
+    }
+    None
+}
+
+pub(crate) fn execute_script_from_assertion(segments: &Vec<Segment>, assts: Assertions) -> Option<(usize, Script)> {
+
+    // if there is partial disprove script; with no locking script; i can directly push hashes
+    // segments and assertions
+    fn collect_wots_msg_as_witness_per_segment(segments: &Vec<Segment>, assts: Assertions) -> Vec<Script> {
+        let bitcom_msg = utils_deserialize_assertions(assts);
+        let mut bitcom_msg_arr = vec![];
+        bitcom_msg_arr.extend_from_slice(&bitcom_msg.0);
+        bitcom_msg_arr.extend_from_slice(&bitcom_msg.1);
+        bitcom_msg_arr.extend_from_slice(&bitcom_msg.2);
+
+        let mut all_bc_hints = vec![];
+        for i in 0..segments.len() {
+            let mut index_of_bitcommitted_msg: Vec<u32> = vec![];
+
+            let seg = &segments[i];
+
+            // final script doesn't have output
+            if !seg.scr_type.is_final_script() {
+                let sec_out = (seg.id, segments[seg.id as usize].result.0.output_is_field_element());
+                index_of_bitcommitted_msg.push(sec_out.0);
+            }
+
+            let sec_in: Vec<u32> = seg.parameter_ids.iter().map(|(k, _)| {*k}).collect();
+            index_of_bitcommitted_msg.extend_from_slice(&sec_in);
+            // index_of_bitcom_msg => [output, inputn-1, ..input0]
+
+            let mut bc_hint = script! {};
+            for skey in index_of_bitcommitted_msg {
+                let bcelem = bitcom_msg_arr[skey as usize].clone();
+                let h = bcelem.as_hint_type();
+                bc_hint = script!{
+                    {bc_hint}
+                    {h.push()}
+                    {Fq::toaltstack()}
+                }; // Altstack: [outputhash, inputN-1Hash, ..., input0Hash]
+            }  
+
+            all_bc_hints.push(bc_hint);
+        }
+        all_bc_hints
+    }
+
+    // collect partial scripts
+    let partial_scripts: Vec<Script> = partial_scripts_from_segments(segments).into_iter().collect();
+    let partial_scripts: [Script; NUM_TAPS] = partial_scripts.try_into().unwrap();
+    // collect witness
+    let mul_hints = utils_collect_mul_hints_per_segment(segments);
+    let bc_hints = collect_wots_msg_as_witness_per_segment(segments, assts);
+    
+    // execute_chunked_g16
+    utils_execute_chunked_g16(mul_hints, bc_hints, segments, &partial_scripts)
+}
+
+pub(crate) fn execute_script_from_signature(segments: &Vec<Segment>, signed_assts: Signatures, disprove_scripts: &[Script; NUM_TAPS]) -> Option<(usize, Script)> {
+    
+    // if there is a disprove script; with locking script; i can use bitcom witness
+    // segments and signatures
+    fn collect_wots_sig_as_witness_per_segment(segments: &Vec<Segment>, signed_asserts: Signatures) -> Vec<Script> {
+        let scalar_sigs: Vec<SigData> = signed_asserts.0.iter().map(|f| SigData::Sig256(*f)).collect();
+        let felts_sigs: Vec<SigData> = signed_asserts.1.iter().map(|f| SigData::Sig256(*f)).collect();
+        let hash_sigs: Vec<SigData> = signed_asserts.2.iter().map(|f| SigData::Sig160(*f)).collect();
+        let mut bitcom_sig_arr = vec![];
+        bitcom_sig_arr.extend_from_slice(&scalar_sigs);
+        bitcom_sig_arr.extend_from_slice(&felts_sigs);
+        bitcom_sig_arr.extend_from_slice(&hash_sigs);
+
+
+        let mut bitcom_sig_as_witness = vec![];
+
+        for i in 0..segments.len() {
+            let mut index_of_bitcommitted_msg: Vec<u32> = vec![];
+
+            let seg = &segments[i];
+            let sec_in: Vec<u32> = seg.parameter_ids.iter().rev().map(|(k, _)| {*k}).collect();
+            index_of_bitcommitted_msg.extend_from_slice(&sec_in);
+
+            if !seg.scr_type.is_final_script() { // final script doesn't have output
+                let sec_out = (seg.id, segments[seg.id as usize].result.0.output_is_field_element());
+                index_of_bitcommitted_msg.push(sec_out.0);
+            }
+
+            let mut sig_preimages = script! {};
+            for index in index_of_bitcommitted_msg {
+                let sig_data = &bitcom_sig_arr[index as usize];
+                let sig_preimage = match sig_data {
+                    SigData::Sig160(signature) => signature.to_compact_script(),
+                    SigData::Sig256(signature) => signature.to_compact_script(),
+                };
+                sig_preimages = script!{
+                    {sig_preimages}
+                    {sig_preimage}
+                };
+            }
+            bitcom_sig_as_witness.push(sig_preimages);
+        }
+        bitcom_sig_as_witness
+    }
+
+
+    // collect witness
+    let mul_hints = utils_collect_mul_hints_per_segment(segments);
+    let bc_hints = collect_wots_sig_as_witness_per_segment(segments, signed_assts);
+    
+    // execute_chunked_g16
+    utils_execute_chunked_g16(mul_hints, bc_hints, segments, disprove_scripts)
+}
+
+pub(crate) fn get_pubkeys(secret_key: Vec<String>) -> PublicKeys {
+
+    let mut pubins = vec![];
+    for i in 0..NUM_PUBS {
+        pubins.push(wots256::generate_public_key(secret_key[i].as_str()));
+    }
+    let mut fq_arr = vec![];
+    for i in 0..NUM_U256 {
+        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_U160 {
+        let p160 = wots160::generate_public_key(secret_key[i+NUM_PUBS+NUM_U256].as_str());
+        h_arr.push(p160);
+    }
+    let wotspubkey: PublicKeys = (
+        pubins.try_into().unwrap(),
+        fq_arr.try_into().unwrap(),
+        h_arr.try_into().unwrap(),
+    );
+    wotspubkey
+}
+
+
+#[cfg(test)]
+mod test {
+    use ark_serialize::CanonicalDeserialize;
+    use crate::chunk::api_compiletime_utils::append_bitcom_locking_script_to_partial_scripts;
+
+    use super::*;
+
+    #[test]
+    fn test_runtime_execution_looped() {
+        let vk_bytes = [115, 158, 251, 51, 106, 255, 102, 248, 22, 171, 229, 158, 80, 192, 240, 217, 99, 162, 65, 107, 31, 137, 197, 79, 11, 210, 74, 65, 65, 203, 243, 14, 123, 2, 229, 125, 198, 247, 76, 241, 176, 116, 6, 3, 241, 1, 134, 195, 39, 5, 124, 47, 31, 43, 164, 48, 120, 207, 150, 125, 108, 100, 48, 155, 137, 132, 16, 193, 139, 74, 179, 131, 42, 119, 25, 185, 98, 13, 235, 118, 92, 11, 154, 142, 134, 220, 191, 220, 169, 250, 244, 104, 123, 7, 247, 33, 178, 155, 121, 59, 75, 188, 206, 198, 182, 97, 0, 64, 231, 45, 55, 92, 100, 17, 56, 159, 79, 13, 219, 221, 33, 39, 193, 24, 36, 58, 105, 8, 70, 206, 176, 209, 146, 45, 201, 157, 226, 84, 213, 135, 143, 178, 156, 112, 137, 246, 123, 248, 215, 168, 51, 95, 177, 47, 57, 29, 199, 224, 98, 48, 144, 253, 15, 201, 192, 142, 62, 143, 13, 228, 89, 51, 58, 6, 226, 139, 99, 207, 22, 113, 215, 79, 91, 158, 166, 210, 28, 90, 218, 111, 151, 4, 55, 230, 76, 90, 209, 149, 113, 248, 245, 50, 231, 137, 51, 157, 40, 29, 184, 198, 201, 108, 199, 89, 67, 136, 239, 96, 216, 237, 172, 29, 84, 3, 128, 240, 2, 218, 169, 217, 118, 179, 34, 226, 19, 227, 59, 193, 131, 108, 20, 113, 46, 170, 196, 156, 45, 39, 151, 218, 22, 132, 250, 209, 183, 46, 249, 115, 239, 14, 176, 200, 134, 158, 148, 139, 212, 167, 152, 205, 183, 236, 242, 176, 96, 177, 187, 184, 252, 14, 226, 127, 127, 173, 147, 224, 220, 8, 29, 63, 73, 215, 92, 161, 110, 20, 154, 131, 23, 217, 116, 145, 196, 19, 167, 84, 185, 16, 89, 175, 180, 110, 116, 57, 198, 237, 147, 183, 164, 169, 220, 172, 52, 68, 175, 113, 244, 62, 104, 134, 215, 99, 132, 199, 139, 172, 108, 143, 25, 238, 201, 128, 85, 24, 73, 30, 186, 142, 186, 201, 79, 3, 176, 185, 70, 66, 89, 127, 188, 158, 209, 83, 17, 22, 187, 153, 8, 63, 58, 174, 236, 132, 226, 43, 145, 97, 242, 198, 117, 105, 161, 21, 241, 23, 84, 32, 62, 155, 245, 172, 30, 78, 41, 199, 219, 180, 149, 193, 163, 131, 237, 240, 46, 183, 186, 42, 201, 49, 249, 142, 188, 59, 212, 26, 253, 23, 27, 205, 231, 163, 76, 179, 135, 193, 152, 110, 91, 5, 218, 67, 204, 164, 128, 183, 221, 82, 16, 72, 249, 111, 118, 182, 24, 249, 91, 215, 215, 155, 2, 0, 0, 0, 0, 0, 0, 0, 212, 110, 6, 228, 73, 146, 46, 184, 158, 58, 94, 4, 141, 241, 158, 0, 175, 140, 72, 75, 52, 6, 72, 49, 112, 215, 21, 243, 151, 67, 106, 22, 158, 237, 80, 204, 41, 128, 69, 52, 154, 189, 124, 203, 35, 107, 132, 241, 234, 31, 3, 165, 87, 58, 10, 92, 252, 227, 214, 99, 176, 66, 118, 22, 177, 20, 120, 198, 252, 236, 7, 148, 207, 78, 152, 132, 94, 207, 50, 243, 4, 169, 146, 240, 79, 98, 0, 212, 106, 137, 36, 193, 21, 175, 180, 1, 26, 107, 39, 198, 89, 152, 26, 220, 138, 105, 243, 45, 63, 106, 163, 80, 74, 253, 176, 207, 47, 52, 7, 84, 59, 151, 47, 178, 165, 112, 251, 161].to_vec();
+        let proof_bytes: Vec<u8> = [162, 50, 57, 98, 3, 171, 250, 108, 49, 206, 73, 126, 25, 35, 178, 148, 35, 219, 98, 90, 122, 177, 16, 91, 233, 215, 222, 12, 72, 184, 53, 2, 62, 166, 50, 68, 98, 171, 218, 218, 151, 177, 133, 223, 129, 53, 114, 236, 181, 215, 223, 91, 102, 225, 52, 122, 122, 206, 36, 122, 213, 38, 186, 170, 235, 210, 179, 221, 122, 37, 74, 38, 79, 0, 26, 94, 59, 146, 46, 252, 70, 153, 236, 126, 194, 169, 17, 144, 100, 218, 118, 22, 99, 226, 132, 40, 24, 248, 232, 197, 195, 220, 254, 52, 36, 248, 18, 167, 167, 206, 108, 29, 120, 188, 18, 78, 86, 8, 121, 217, 144, 185, 122, 58, 12, 34, 44, 6, 233, 80, 177, 183, 5, 8, 150, 74, 241, 141, 65, 150, 35, 98, 15, 150, 137, 254, 132, 167, 228, 104, 63, 133, 11, 209, 39, 79, 138, 185, 88, 20, 242, 102, 69, 73, 243, 88, 29, 91, 127, 157, 82, 192, 52, 95, 143, 49, 227, 83, 19, 26, 108, 63, 232, 213, 169, 64, 221, 159, 214, 220, 246, 174, 35, 43, 143, 80, 168, 142, 29, 103, 179, 58, 235, 33, 163, 198, 255, 188, 20, 3, 91, 47, 158, 122, 226, 201, 175, 138, 18, 24, 178, 219, 78, 12, 96, 10, 2, 133, 35, 230, 149, 235, 206, 1, 177, 211, 245, 168, 74, 62, 25, 115, 70, 42, 38, 131, 92, 103, 103, 176, 212, 223, 177, 242, 94, 14].to_vec();
+        let scalar = [232, 255, 255, 239, 147, 245, 225, 67, 145, 112, 185, 121, 72, 232, 51, 40, 93, 88, 129, 129, 182, 69, 80, 184, 41, 160, 49, 225, 114, 78, 100, 48].to_vec();
+
+
+        println!("Preparing Input");
+        let proof: ark_groth16::Proof<Bn254> = ark_groth16::Proof::deserialize_uncompressed(&proof_bytes[..]).unwrap();
+        let vk: ark_groth16::VerifyingKey<Bn254> = ark_groth16::VerifyingKey::deserialize_uncompressed(&vk_bytes[..]).unwrap();
+        let scalar: ark_bn254::Fr = ark_bn254::Fr::deserialize_uncompressed(&scalar[..]).unwrap();
+        let scalars = [scalar];
+
+        // generate segments
+        println!("get_segments_from_groth16_proof");
+        let (success, segments) = get_segments_from_groth16_proof(proof, scalars.to_vec(), &vk);
+        assert!(success);
+
+        // segments to assertion
+        println!("get_assertion_from_segments");
+        let assts = get_assertion_from_segments(&segments);
+        println!("execute_script_from_assertion");
+        let res = execute_script_from_assertion(&segments, assts);
+        assert!(res.is_none());
+
+        println!("get_segments_from_assertion");
+        let (success, new_segments) = get_segments_from_assertion(assts, vk);
+        assert!(success);
+        println!("again get_assertion_from_segments");
+        let new_assts = get_assertion_from_segments(&new_segments);
+        println!("again execute_script_from_assertion");
+        let res = execute_script_from_assertion(&new_segments, new_assts);
+        assert!(res.is_none());
+
+        println!("ensure reruns match");
+        assert_eq!(assts, new_assts);
+
+
+        // get_sig from assts
+        const MOCK_SECRET: &str = "a238982ce17ac813d505a5b40b665d404e9528e7";
+        println!("get_signature_from_assertion");
+        let secrets = (0..NUM_PUBS+NUM_U256+NUM_U160).map(|idx| format!("{MOCK_SECRET}{:04x}", idx)).collect::<Vec<String>>();
+        let signed_assts = get_signature_from_assertion(assts, secrets.clone());
+
+        println!("get_assertions_from_signature");
+        let new_assts = get_assertions_from_signature(signed_assts.clone());
+        assert_eq!(assts, new_assts);
+
+
+        println!("get_pubkeys");
+        let secrets = (0..NUM_PUBS+NUM_U256+NUM_U160).map(|idx| format!("{MOCK_SECRET}{:04x}", idx)).collect::<Vec<String>>();
+        let pubkeys = get_pubkeys(secrets);
+        println!("execute_script_from_signature");
+        let partial_scripts: Vec<Script> = partial_scripts_from_segments(&segments).into_iter().collect();
+        let disprove_scripts = append_bitcom_locking_script_to_partial_scripts( pubkeys, partial_scripts.to_vec());
+        let disprove_scripts: [Script; NUM_TAPS] = disprove_scripts.try_into().unwrap();
+
+        let res = execute_script_from_signature(&segments, signed_assts, &disprove_scripts);
+        assert!(res.is_none());
+        println!("finished test");
+    }
+}
\ No newline at end of file
diff --git a/bitvm/src/chunk/elements.rs b/bitvm/src/chunk/elements.rs
new file mode 100644
index 000000000..e4d6ae8fa
--- /dev/null
+++ b/bitvm/src/chunk/elements.rs
@@ -0,0 +1,376 @@
+use std::str::FromStr;
+
+use crate::{bn254::utils::Hint, chunk::{helpers::{extern_bigint_to_nibbles, extern_hash_nibbles, extern_nibbles_to_bigint}, wrap_hasher::{BLAKE3_HASH_LENGTH}}};
+use ark_ff::Field;
+use num_bigint::{BigInt, BigUint};
+use std::fmt::Debug;
+
+use super::helpers::{extern_hash_fps, extern_nibbles_to_limbs};
+
+/// Data Structure to hold values passed around in pairing check
+#[derive(Debug, Clone, Copy)]
+pub enum DataType {
+    /// Fp6 elements
+    Fp6Data(ark_bn254::Fq6), 
+
+    /// point accumulator and partial products (Refer: ElementType)
+    G2EvalData(ElemG2Eval),
+
+    /// G1Affine points
+    G1Data(ark_bn254::G1Affine),
+
+    /// BigIntegers - Field & Scalar elements
+    U256Data(ark_ff::BigInt<4>), 
+}
+
+/// Helper macro to reduce repetitive code for `TryFrom<Element>`.
+macro_rules! impl_try_from_element {
+    ($t:ty, { $($variant:ident),+ }) => {
+        impl TryFrom<DataType> for $t {
+            type Error = String;
+
+            fn try_from(value: DataType) -> Result<Self, Self::Error> {
+                match value {
+                    $(
+                        DataType::$variant(v) => Ok(v),
+                    )+
+                    other => {
+                        Err(format!("attempted: {:?} found: {:?}",
+                        stringify!($t),
+                        other,
+                    ))},
+                }
+            }
+        }
+    };
+}
+
+impl_try_from_element!(ark_bn254::Fq6, { Fp6Data });
+impl_try_from_element!(ark_ff::BigInt<4>, { U256Data });
+impl_try_from_element!(ark_bn254::G1Affine, { G1Data });
+impl_try_from_element!(ElemG2Eval, { G2EvalData });
+
+/// Abstraction over DataType that specifies how the 
+/// data moved around Pairing Check will be interpreted
+/// Example: Uint256 is DataType, 
+/// FieldElement (ark_bn254::Fq) or ScalarElement (ark_bn254::Fr) are ElementTypes
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
+pub(crate) enum ElementType {
+
+    /// type to represent second coefficient of normalized Fp12
+    Fp6,
+
+    /// type to represent field elements
+    FieldElem, 
+
+    /// type to represent scalar elements, which are public inputs of groth16 verifier
+    ScalarElem, 
+
+    /// type to represent G1Affine points, which can be from groth16 proof or its intermediate computations
+    G1, 
+
+    // The following ElementTypes are wrappers of ElemG2Eval [t(4), partial_product(14)]
+    // We merkelize ElemG2Eval because all of its contents aren't used within a single tapscript
+    // Therefore a tapscript can only include preimage of the values it needs (t or partial_product) for calculation,
+    // and use sibling hash (Hash_partial_product or Hash_t respectively) to show that the preimage are part of the merkle tree
+
+    /// type to represent point G2 accumulator with hash of partial product of line evaluation
+    G2EvalPoint, // t, Hash_partial_product
+
+    /// type to represent partial product of line evaluation with hash of G2 point accumulator
+    G2EvalMul,  // partial_product, Hash_t
+
+    /// type to represent G2 point accumulator and partial product of line evaluation  
+    G2Eval,    // t, partial_product
+
+}
+
+
+impl ElementType {
+    pub fn number_of_limbs_of_hashing_preimage(&self) -> usize {
+        match self {
+            ElementType::Fp6 => 6, // six coefficients of field element
+            ElementType::FieldElem => 0, // field element is not hashed, directly bit-comitted
+            ElementType::G1 => 2, // x, y co-ordinates
+            ElementType::ScalarElem => 0, // scalar element is not hashed, directly bit-comitted
+            ElementType::G2EvalPoint => 4 + 1, // t, Hash_partial_product
+            ElementType::G2EvalMul => 14 + 1, // partial_product, Hash_t
+            ElementType::G2Eval => 14 + 4, // t, partial_product
+        }
+    }
+}
+
+pub(crate) type HashBytes = [u8; 64];
+
+/// Data Type to represent an Assertion data (i.e output State of a tapscript).
+/// For intermediate values, the type is always HashBytes.
+/// For the input groth16 proof, the type is always BigInt.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum CompressedStateObject {
+    Hash(HashBytes),
+    U256(ark_ff::BigInt<4>)
+}
+
+impl CompressedStateObject {
+    // helper function to represent State as hint
+    // used in tests to check the validity of checksig_verify()
+    pub(crate) fn as_hint_type(self) -> Hint {
+        match self {
+            CompressedStateObject::Hash(h) => Hint::Hash(extern_nibbles_to_limbs(h)),
+            CompressedStateObject::U256(f) => {
+                let fuint: BigUint = f.into();
+                let fint: BigInt = BigInt::from_biguint(num_bigint::Sign::Plus, fuint);
+                Hint::U256(fint)
+            }
+        }
+    }
+
+    // Serialize StateObject to byte array so that it can be wots-signed
+    pub(crate) fn serialize_to_byte_array(&self) -> Vec<u8> {
+        fn nib_to_byte_array(digits: &[u8]) -> Vec<u8> {
+            let mut msg_bytes = Vec::with_capacity(digits.len() / 2);
+        
+            for nibble_pair in digits.chunks(2) {
+                let byte = (nibble_pair[1] << 4) | (nibble_pair[0] & 0b00001111);
+                msg_bytes.push(byte);
+            }
+        
+            msg_bytes
+        }
+        match self {
+            CompressedStateObject::Hash(h) => {
+                let bal: [u8; 32] = nib_to_byte_array(h).try_into().unwrap();
+                let bal: [u8; BLAKE3_HASH_LENGTH] = bal[32-BLAKE3_HASH_LENGTH..32].try_into().unwrap();
+                bal.to_vec()
+            }
+            CompressedStateObject::U256(n) => {
+                let n = extern_bigint_to_nibbles(*n);
+                let bal: [u8; 32] = nib_to_byte_array(&n).try_into().unwrap();
+                bal.to_vec()
+            }
+        }
+    }
+
+    // Deserialize wots-signed byte array to object
+    pub(crate)  fn deserialize_from_byte_array(byte_array: Vec<u8>) -> Self {
+        assert!(byte_array.len() == BLAKE3_HASH_LENGTH || byte_array.len() == 32);
+        fn byte_array_to_nib(bytes: &[u8]) -> Vec<u8> {
+            let mut nibbles = Vec::with_capacity(bytes.len() * 2);
+            for &b in bytes {
+                let high = b >> 4;
+                let low = b & 0x0F;
+                nibbles.push(low);
+                nibbles.push(high);
+            }
+            nibbles
+        }
+       if byte_array.len() == BLAKE3_HASH_LENGTH {
+            let nib_arr = byte_array_to_nib(&byte_array);
+            let nib_arr: [u8; BLAKE3_HASH_LENGTH*2] = nib_arr.try_into().unwrap();
+            let mut padded_nibs = [0u8; 64]; // initialize with zeros
+            padded_nibs[64-(BLAKE3_HASH_LENGTH*2)..64].copy_from_slice(&nib_arr[0..BLAKE3_HASH_LENGTH*2]);
+            CompressedStateObject::Hash(padded_nibs)
+       } else {
+            let nib_arr = byte_array_to_nib(&byte_array);
+            let nib_arr: [u8; 64] = nib_arr.try_into().unwrap();
+            let fint = extern_nibbles_to_bigint(nib_arr);
+            CompressedStateObject::U256(fint)
+       }
+    }
+
+
+}
+
+impl DataType {
+    // Blake3 Hash data types
+    // For U256Data (which is a single BigInteger) we do not hash but return as is
+    // BigInt are used to represent groth16 proof
+    pub fn to_hash(self) -> CompressedStateObject {
+        match self {
+            DataType::G2EvalData(r) => {
+                let hash_t = r.hash_t();
+                let hash_le = r.hash_le();
+                let hash = extern_hash_nibbles(vec![hash_t, hash_le]);
+                CompressedStateObject::Hash(hash)
+            },
+            DataType::Fp6Data(r) => {
+                let hash = extern_hash_fps(
+                    r.to_base_prime_field_elements().collect::<Vec<ark_bn254::Fq>>(),
+                );
+                CompressedStateObject::Hash(hash)
+            }
+            DataType::U256Data(f) => {
+                CompressedStateObject::U256(f)
+            },
+            DataType::G1Data(r) => {
+                let hash = extern_hash_fps(vec![r.x, r.y]);
+                CompressedStateObject::Hash(hash)
+            }
+        }
+    }
+
+    pub fn output_is_field_element(&self) -> bool {
+        matches!(self, DataType::U256Data(_))
+    }
+
+    // hashing pre-image for the DataType
+    pub(crate) fn to_witness(&self, elem_type: ElementType) -> Vec<Hint> {
+        match (elem_type, self) {
+            (ElementType::G2EvalPoint, DataType::G2EvalData(g)) => {
+                as_hints_g2evalpointtype_g2evaldata(*g)
+            },
+            (ElementType::G2EvalMul, DataType::G2EvalData(g)) => {
+                as_hints_g2evalmultype_g2evaldata(*g)
+            },
+            (ElementType::Fp6, DataType::Fp6Data(r)) => {
+                as_hints_fq6type_fq6data(*r)
+            },
+            (ElementType::G1, DataType::G1Data(r)) => {
+                as_hints_g1type_g1data(*r)
+            },
+            (ElementType::FieldElem, DataType::U256Data(r)) => {
+                as_hints_fieldelemtype_u256data(*r)
+            },
+            (ElementType::ScalarElem, DataType::U256Data(r)) => {
+                as_hints_scalarelemtype_u256data(*r)
+            }
+            _ => {
+                println!("Unhandled ElementType {:?} ", elem_type);
+                unreachable!();
+            }
+        }
+    }
+}
+
+/// returns coefficients of Fp6 element
+fn as_hints_fq6type_fq6data(elem: ark_bn254::Fq6) -> Vec<Hint> {
+    let hints: Vec<Hint> = elem.to_base_prime_field_elements().map(Hint::Fq).collect();
+    hints
+}
+
+/// returns g2 point accumulator (t) and hash of partial product (Hash_partial_product)
+fn as_hints_g2evalpointtype_g2evaldata(g: ElemG2Eval) -> Vec<Hint> {
+    let hints = vec![
+        Hint::Fq(g.t.x.c0),
+        Hint::Fq(g.t.x.c1),
+        Hint::Fq(g.t.y.c0),
+        Hint::Fq(g.t.y.c1),
+        Hint::Hash(extern_nibbles_to_limbs(g.hash_le())),
+    ];
+    hints
+}
+
+/// returns partial_product and hash of g2 point accumulator (Hash_t)
+fn as_hints_g2evalmultype_g2evaldata(g: ElemG2Eval) -> Vec<Hint> {
+    let mut hints: Vec<Hint> = g.a_plus_b
+        .iter()
+        .flat_map(|pt| [pt.c0, pt.c1]) // each point gives two values
+        .chain(g.one_plus_ab_j_sq.to_base_prime_field_elements())
+        .chain(g.p2le.iter().flat_map(|pt| [pt.c0, pt.c1]))
+        // .chain(g.res_hint.to_base_prime_field_elements())
+        .map(Hint::Fq)
+        .collect();
+    hints.push(Hint::Hash(extern_nibbles_to_limbs(g.hash_t())));
+    hints
+}
+
+fn as_hints_fieldelemtype_u256data(elem: ark_ff::BigInt<4>) -> Vec<Hint> {
+    let v: BigUint = elem.into();
+    let v = num_bigint::BigInt::from_biguint(num_bigint::Sign::Plus, v);
+    let hints = vec![Hint::U256(v)];
+    hints
+}
+
+fn as_hints_scalarelemtype_u256data(elem: ark_ff::BigInt<4>) -> Vec<Hint> {
+    let v: BigUint = elem.into();
+    let v = num_bigint::BigInt::from_biguint(num_bigint::Sign::Plus, v);
+    let hints = vec![Hint::U256(v)];
+    hints
+}
+
+fn as_hints_g1type_g1data(r: ark_bn254::G1Affine) -> Vec<Hint> {
+    let hints = vec![Hint::Fq(r.x), Hint::Fq(r.y)];
+    hints
+}
+
+
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
+pub struct ElemG2Eval {
+    /// G2 point accumulator of Miller's Algorithm
+    pub(crate) t: ark_bn254::G2Affine,
+
+    // We have,
+    // A <- (1 + a), B <- (1 + b), C <- (1 + c), C = A x B
+    // c = [(a+b)/(1 + ab w^2)]
+    // c = [a_plus_b/ one_plus_ab_j_sq]
+    // In our context,
+    //  A <- evaluate_line_throught_t3_q3(at_p3),  B <- evaluate_line_throught_t4_q4(at_p4)
+    // a_plus_b and one_plus_ab_j_sq are values corresponding to product of line evaluations
+    // It's "partial" because we haven't computed the entire result i.e. 
+    // lev = evaluate_line_throught_t2_q2(at_p2) x evaluate_line_throught_t3_q3(at_p3) x evaluate_line_throught_t4_q4(at_p4)
+
+    /// partial product term for a+b
+    pub(crate) a_plus_b: [ark_bn254::Fq2;2],
+
+    /// partial product term for (1 + ab w^2)
+    pub(crate) one_plus_ab_j_sq: ark_bn254::Fq6,
+
+    /// partial product term for p2le = evaluate_line_throught_t2_q2(at_p2)
+    pub(crate) p2le: [ark_bn254::Fq2;2],
+}
+
+impl ElemG2Eval {
+    pub(crate) fn hash_t(&self) -> HashBytes {
+        extern_hash_fps(vec![self.t.x.c0, self.t.x.c1, self.t.y.c0, self.t.y.c1])
+    }
+
+    pub(crate) fn hash_le(&self) -> HashBytes {
+        let mut le = vec![];
+        le.extend_from_slice(&[self.a_plus_b[0].c0, self.a_plus_b[0].c1, self.a_plus_b[1].c0, self.a_plus_b[1].c1]);
+        le.extend_from_slice(&self.one_plus_ab_j_sq.to_base_prime_field_elements().collect::<Vec<ark_bn254::Fq>>());
+        le.extend_from_slice(&[self.p2le[0].c0, self.p2le[0].c1, self.p2le[1].c0, self.p2le[1].c1]);
+        extern_hash_fps(le)
+    }
+
+    pub(crate) fn mock() -> Self {
+        let q4xc0: ark_bn254::Fq = ark_bn254::Fq::from(BigUint::from_str("18327300221956260726652878806040774028373651771658608258634994907375058801387").unwrap());
+        let q4xc1: ark_bn254::Fq = ark_bn254::Fq::from(BigUint::from_str("2791853351403597124265928925229664715548948431563105825401192338793643440152").unwrap());
+        let q4yc0: ark_bn254::Fq = ark_bn254::Fq::from(BigUint::from_str("9203020065248672543175273161372438565462224153828027408202959864555260432617").unwrap());
+        let q4yc1: ark_bn254::Fq = ark_bn254::Fq::from(BigUint::from_str("21242559583226289516723159151189961292041850314492937202099045542257932723954").unwrap());
+        let tx = ark_bn254::Fq2::new(q4xc0, q4xc1);
+        let ty =  ark_bn254::Fq2::new(q4yc0, q4yc1);
+        let t = ark_bn254::G2Affine::new(tx, ty);
+        ElemG2Eval { t, p2le: [ark_bn254::Fq2::ONE; 2], a_plus_b:[ark_bn254::Fq2::ONE; 2], one_plus_ab_j_sq: ark_bn254::Fq6::ONE }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use ark_ff::UniformRand;
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+    use bitcoin_script::script;
+    use crate::{bn254::{fp254impl::Fp254Impl, fq::Fq}, chunk::{wrap_hasher::hash_messages, elements::ElementType}, execute_script};
+
+
+    #[test]
+    fn test_hash_witness() {
+        let mut prng = ChaCha20Rng::seed_from_u64(117);
+        let fld = ark_bn254::Fq6::rand(&mut prng);
+        let elem = super::DataType::Fp6Data(fld);
+
+        let check_output_bit = 1;
+        let preim = elem.to_witness(ElementType::Fp6);
+        let scr = script!{
+            for p in preim {
+                {p.push()}
+            }
+            {check_output_bit}
+            {elem.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+            {hash_messages(vec![ElementType::Fp6])}
+        };
+        let res = execute_script(scr);
+        assert!(!res.success && res.final_stack.len() == 1);
+    }
+}
\ No newline at end of file
diff --git a/bitvm/src/chunk/g16_runner_core.rs b/bitvm/src/chunk/g16_runner_core.rs
new file mode 100644
index 000000000..d241a2707
--- /dev/null
+++ b/bitvm/src/chunk/g16_runner_core.rs
@@ -0,0 +1,851 @@
+
+use ark_ec::CurveGroup;
+use ark_ff::{Field, PrimeField};
+use bitcoin_script::script;
+use crate::chunk::{elements::CompressedStateObject, taps_point_ops::frob_q_power, g16_runner_utils::*};
+
+
+use super::{api::NUM_PUBS, api_compiletime_utils::ATE_LOOP_COUNT, elements::{DataType, ElementType, HashBytes}};
+
+
+#[derive(Debug)]
+pub struct PublicParams {
+    pub q2: ark_bn254::G2Affine,
+    pub q3: ark_bn254::G2Affine,
+    pub fixed_acc: ark_bn254::Fq6, // precomputable fp12 accumulator from fixed pairing arguments
+    pub ks_vks: Vec<ark_bn254::G1Affine>,
+    pub vky0: ark_bn254::G1Affine,
+}
+
+#[derive(Debug)]
+pub(crate) struct InputProof {
+    pub(crate) p2: ark_bn254::G1Affine,
+    pub(crate) p4: ark_bn254::G1Affine,
+    pub(crate) q4: ark_bn254::G2Affine,
+    pub(crate) c: ark_bn254::Fq6,
+    pub(crate) ks: Vec<ark_bn254::Fr>,
+}
+
+impl InputProof {
+    pub(crate) fn to_raw(&self) -> InputProofRaw {
+        let p2x = self.p2.x.into_bigint();
+        let p2y = self.p2.y.into_bigint();
+        let p4x = self.p4.x.into_bigint();
+        let p4y = self.p4.y.into_bigint();
+        let q4x0 = self.q4.x.c0.into_bigint();
+        let q4x1 = self.q4.x.c1.into_bigint();
+        let q4y0 = self.q4.y.c0.into_bigint();
+        let q4y1 = self.q4.y.c1.into_bigint();
+        let c: Vec<ark_ff::BigInt<4>> = self.c.to_base_prime_field_elements().map(|f| f.into_bigint()).collect();
+        let ks: Vec<ark_ff::BigInt<4>> = self.ks.iter().map(|f| f.into_bigint()).collect();
+
+        InputProofRaw {
+            p2: [p2x, p2y],
+            p4: [p4x, p4y],
+            q4: [q4x0, q4x1, q4y0, q4y1],
+            c: c.try_into().unwrap(),
+            ks: ks.try_into().unwrap(),
+        }
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct InputProofRaw {
+    pub(crate) p2: [ark_ff::BigInt<4>; 2],
+    pub(crate) p4: [ark_ff::BigInt<4>; 2],
+    pub(crate) q4: [ark_ff::BigInt<4>; 4],
+    pub(crate) c: [ark_ff::BigInt<4>; 6],
+    pub(crate) ks: [ark_ff::BigInt<4>; NUM_PUBS],
+}
+
+
+
+fn compare(hint_out: &DataType, claimed_assertions: &mut Option<Vec<HashBytes>>) -> Option<bool> {
+    if claimed_assertions.is_none() {
+        return None;
+    }
+    assert!(!hint_out.output_is_field_element());
+
+    let hint_out_hash = hint_out.to_hash();
+    let matches = if let CompressedStateObject::Hash(hash) = hint_out_hash {
+        if let Some(claimed_assertions) = claimed_assertions {
+            claimed_assertions.pop().unwrap() == hash
+        } else {
+            unreachable!(); // verified that claimed_assertions is_some()
+        }
+    } else {
+       unreachable!(); // verified that hint_out is hash above
+    };
+    
+    Some(matches) 
+}
+
+pub(crate) fn groth16_generate_segments(
+    skip_evaluation: bool,
+    all_output_hints: &mut Vec<Segment>,
+    eval_ins: InputProofRaw,
+    pubs: PublicParams,
+    claimed_assertions: &mut Option<Vec<HashBytes>>,
+) -> bool {
+    macro_rules! push_compare_or_return {
+        ($seg:ident) => {{
+            all_output_hints.push($seg.clone());
+            if $seg.scr_type.is_final_script() {
+                if let DataType::U256Data(felem) = $seg.result.0 {
+                    if felem != ark_ff::BigInt::<4>::one() {
+                        return false;
+                    }
+                } else {
+                    unreachable!();
+                }
+            } else if $seg.is_valid_input == false {
+                return false;
+            } else {
+                let matches = compare(&$seg.result.0, claimed_assertions);
+                if matches.is_some() && matches.unwrap() == false {
+                    return false;
+                }
+            }
+        }};
+    }
+    let vky = pubs.ks_vks;
+    let vky0 = pubs.vky0;
+
+    let (gp2, gp4, gq4, gc, pub_scalars) = raw_input_proof_to_segments(eval_ins, all_output_hints);
+    let (gp2x, gp2y) = (gp2[0].clone(), gp2[1].clone());
+    let (gp4x, gp4y) = (gp4[0].clone(), gp4[1].clone());
+    let (q4xc0, q4xc1, q4yc0, q4yc1) = (gq4[0].clone(), gq4[1].clone(), gq4[2].clone(), gq4[3].clone());
+    let gc = gc.to_vec();
+
+    let pub_scalars = pub_scalars.to_vec();
+
+    let p4 = wrap_hints_precompute_p(skip_evaluation, all_output_hints.len(), &gp4y, &gp4x);
+    push_compare_or_return!(p4);
+
+    let p2 = wrap_hints_precompute_p(skip_evaluation, all_output_hints.len(), &gp2y, &gp2x);
+    push_compare_or_return!(p2);
+
+    let msms = wrap_hint_msm(skip_evaluation, all_output_hints.len(), pub_scalars.clone(), vky.clone());
+    for msm in &msms {
+        push_compare_or_return!(msm);
+    }
+
+    let p_vk0 = wrap_hint_hash_p(skip_evaluation, all_output_hints.len(), &msms[msms.len()-1], vky0);
+    push_compare_or_return!(p_vk0);
+
+    let p3 = wrap_hints_precompute_p_from_hash(skip_evaluation, all_output_hints.len(), &p_vk0);
+    push_compare_or_return!(p3);
+
+    let c = wrap_hint_hash_c(skip_evaluation, all_output_hints.len(), gc.clone());
+    push_compare_or_return!(c);
+
+    let gcinv = wrap_hint_hash_c_inv(skip_evaluation, all_output_hints.len(),gc);
+    push_compare_or_return!(gcinv);
+
+    let mut t4 = wrap_hint_init_t4(skip_evaluation, all_output_hints.len(), &q4yc1, &q4yc0, &q4xc1, &q4xc0);
+    push_compare_or_return!(t4);
+
+    let (mut t2, mut t3) = (pubs.q2, pubs.q3);
+    let mut f_acc = gcinv.clone();
+
+    for j in (1..ATE_LOOP_COUNT.len()).rev() {
+        if !skip_evaluation {
+            println!("Processing {:?}-th iteration of Miller Loop", j);
+        }
+        let ate = ATE_LOOP_COUNT[j - 1];
+        let sq = wrap_hint_squaring(skip_evaluation, all_output_hints.len(), &f_acc);
+        push_compare_or_return!(sq);
+        f_acc = sq;
+
+        t4 = wrap_chunk_point_ops_and_multiply_line_evals_step_1(
+            skip_evaluation, all_output_hints.len(), true, None, None,
+            &t4, &p4, None, &p3, t3, None, &p2, t2, None
+        );
+        push_compare_or_return!(t4);
+        (t2, t3) = ((t2 + t2).into_affine(), (t3 + t3).into_affine());
+
+        let lev = wrap_chunk_point_ops_and_multiply_line_evals_step_2(skip_evaluation, all_output_hints.len(), &t4);
+        push_compare_or_return!(lev);
+
+        f_acc = wrap_hints_dense_dense_mul(skip_evaluation, all_output_hints.len(), &f_acc, &lev);
+        push_compare_or_return!(f_acc);
+
+        if ate == 0 {
+            continue;
+        }
+
+        let c_or_cinv = if ate == -1 { c.clone() } else { gcinv.clone() };
+        f_acc = wrap_hints_dense_dense_mul(skip_evaluation, all_output_hints.len(), &f_acc, &c_or_cinv);
+        push_compare_or_return!(f_acc);
+
+
+        t4 = wrap_chunk_point_ops_and_multiply_line_evals_step_1(
+            skip_evaluation, all_output_hints.len(), false, Some(false), Some(ate),
+            &t4, &p4, Some(gq4.to_vec()), &p3, t3, Some(pubs.q3), &p2, t2, Some(pubs.q2)
+        );
+        push_compare_or_return!(t4);
+        if ate == 1 {
+            (t2, t3) = ((t2 + pubs.q2).into_affine(), (t3 + pubs.q3).into_affine());
+        } else {
+            (t2, t3) = ((t2 - pubs.q2).into_affine(), (t3 - pubs.q3).into_affine());
+        }
+
+        let lev = wrap_chunk_point_ops_and_multiply_line_evals_step_2(skip_evaluation, all_output_hints.len(), &t4);
+        push_compare_or_return!(lev);
+
+        f_acc = wrap_hints_dense_dense_mul(skip_evaluation, all_output_hints.len(), &f_acc, &lev);
+        push_compare_or_return!(f_acc);
+    }
+
+    let cp = wrap_hints_frob_fp12(skip_evaluation, all_output_hints.len(), &gcinv, 1);
+    push_compare_or_return!(cp);
+
+    let cp2 = wrap_hints_frob_fp12(skip_evaluation, all_output_hints.len(), &c, 2);
+    push_compare_or_return!(cp2);
+
+    let cp3 = wrap_hints_frob_fp12(skip_evaluation, all_output_hints.len(), &gcinv, 3);
+    push_compare_or_return!(cp3);
+
+    f_acc = wrap_hints_dense_dense_mul(skip_evaluation, all_output_hints.len(), &f_acc, &cp);
+    push_compare_or_return!(f_acc);
+
+    f_acc = wrap_hints_dense_dense_mul(skip_evaluation, all_output_hints.len(), &f_acc, &cp2);
+    push_compare_or_return!(f_acc);
+
+    f_acc = wrap_hints_dense_dense_mul(skip_evaluation, all_output_hints.len(), &f_acc, &cp3);
+    push_compare_or_return!(f_acc);
+
+    t4 = wrap_chunk_point_ops_and_multiply_line_evals_step_1(
+        skip_evaluation, all_output_hints.len(), false, Some(true), Some(1),
+        &t4, &p4, Some(gq4.to_vec()), &p3, t3, Some(pubs.q3), &p2, t2, Some(pubs.q2)
+    );
+    push_compare_or_return!(t4);
+
+    // (t2, t3) = (le.t2, le.t3);
+    let tmp_q2f = frob_q_power(pubs.q2, 1);
+    t2 = (t2 + tmp_q2f).into_affine();
+    let tmp_q3f = frob_q_power(pubs.q3, 1);
+    t3 = (t3 + tmp_q3f).into_affine();
+    let lev = wrap_chunk_point_ops_and_multiply_line_evals_step_2(skip_evaluation, all_output_hints.len(), &t4);
+    push_compare_or_return!(lev);
+
+    f_acc = wrap_hints_dense_dense_mul(skip_evaluation, all_output_hints.len(), &f_acc, &lev);
+    push_compare_or_return!(f_acc);
+
+    t4 = wrap_chunk_point_ops_and_multiply_line_evals_step_1(
+        skip_evaluation, all_output_hints.len(), false, Some(true), Some(-1),
+        &t4, &p4, Some(gq4.to_vec()), &p3, t3, Some(pubs.q3), &p2, t2, Some(pubs.q2)
+    );
+    push_compare_or_return!(t4);
+
+    // (t2, t3) = (le.t2, le.t3);
+    let tmp_q2f = frob_q_power(pubs.q2, -1);
+    t2 = (t2 + tmp_q2f).into_affine();
+    let tmp_q3f = frob_q_power(pubs.q3, -1);
+    t3 = (t3 + tmp_q3f).into_affine();
+    let lev = wrap_chunk_point_ops_and_multiply_line_evals_step_2(skip_evaluation, all_output_hints.len(), &t4);
+    push_compare_or_return!(lev);
+
+    f_acc = wrap_hints_dense_dense_mul(skip_evaluation, all_output_hints.len(), &f_acc, &lev);
+    push_compare_or_return!(f_acc);
+
+
+    let valid_facc = wrap_chunk_final_verify(skip_evaluation, all_output_hints.len(), &f_acc, &t4,gq4.to_vec(), pubs.fixed_acc);
+    push_compare_or_return!(valid_facc);
+
+    let is_valid: ark_ff::BigInt::<4> = valid_facc.result.0.try_into().unwrap();
+
+    
+    is_valid == ark_ff::BigInt::<4>::one()
+}
+
+fn raw_input_proof_to_segments(eval_ins: InputProofRaw, all_output_hints: &mut Vec<Segment>) -> ([Segment;2], [Segment;2], [Segment;4], [Segment;6], [Segment; NUM_PUBS]) {
+    let pub_scalars: Vec<Segment> = eval_ins.ks.iter().enumerate().map(|(idx, f)| Segment {
+        id: (all_output_hints.len() + idx) as u32,
+        parameter_ids: vec![],
+        is_valid_input: true,
+        result: (DataType::U256Data(*f), ElementType::ScalarElem),
+        hints: vec![],
+        scr_type: ScriptType::NonDeterministic,
+        scr: script! {},
+    }).collect();
+    all_output_hints.extend_from_slice(&pub_scalars);
+
+    let p4vec: Vec<Segment> = [eval_ins.p4[1], eval_ins.p4[0], eval_ins.p2[1], eval_ins.p2[0]].iter().enumerate().map(|(idx, f)| Segment {
+        id: (all_output_hints.len() + idx) as u32,
+        parameter_ids: vec![],
+        is_valid_input: true,
+        result: (DataType::U256Data(*f), ElementType::FieldElem),
+        hints: vec![],
+        scr_type: ScriptType::NonDeterministic,
+        scr: script! {},
+    }).collect();
+    all_output_hints.extend_from_slice(&p4vec);
+    let (gp4y, gp4x, gp2y, gp2x) = (&p4vec[0], &p4vec[1], &p4vec[2], &p4vec[3]);
+
+    let gc: Vec<Segment> = eval_ins.c.iter().enumerate().map(|(idx, f)| Segment {
+        id: (all_output_hints.len() + idx) as u32,
+        parameter_ids: vec![],
+        is_valid_input: true,
+        result: (DataType::U256Data(*f), ElementType::FieldElem),
+        hints: vec![],
+        scr_type: ScriptType::NonDeterministic,
+        scr: script! {},
+    }).collect();
+    all_output_hints.extend_from_slice(&gc);
+
+    let temp_q4: Vec<Segment> = [eval_ins.q4[0], eval_ins.q4[1], eval_ins.q4[2], eval_ins.q4[3]].iter().enumerate().map(|(idx, f)| Segment {
+        id: (all_output_hints.len() + idx) as u32,
+        parameter_ids: vec![],
+        is_valid_input: true,
+        result: (DataType::U256Data(*f), ElementType::FieldElem),
+        hints: vec![],
+        scr_type: ScriptType::NonDeterministic,
+        scr: script! {},
+    }).collect();
+    all_output_hints.extend_from_slice(&temp_q4);
+
+    ([gp2x.clone(), gp2y.clone()], [gp4x.clone(), gp4y.clone()], temp_q4.try_into().unwrap(), gc.try_into().unwrap(), pub_scalars.try_into().unwrap())
+}
+
+
+#[cfg(test)]
+mod test {
+    use std::{ops::Neg, str::FromStr};
+    use crate::bn254::ell_coeffs::AffinePairing;
+    use ark_bn254::Bn254;
+    use ark_ec::{bn::BnConfig, pairing::Pairing, AffineRepr, CurveGroup};
+    use ark_ff::{AdditiveGroup, Field};
+    use ark_serialize::CanonicalDeserialize;
+    use bitcoin_script::script;
+    use num_bigint::BigUint;
+
+    use crate::{bn254::ell_coeffs::BnAffinePairing, chunk::{api::NUM_PUBS, taps_point_ops::{chunk_point_ops_and_multiply_line_evals_step_1, frob_q_power}}, groth16::offchain_checker::compute_c_wi};
+
+    use super::{groth16_generate_segments, InputProof, PublicParams, Segment};
+
+
+    #[test]
+    fn test_groth16() {
+        let vk_bytes = [115, 158, 251, 51, 106, 255, 102, 248, 22, 171, 229, 158, 80, 192, 240, 217, 99, 162, 65, 107, 31, 137, 197, 79, 11, 210, 74, 65, 65, 203, 243, 14, 123, 2, 229, 125, 198, 247, 76, 241, 176, 116, 6, 3, 241, 1, 134, 195, 39, 5, 124, 47, 31, 43, 164, 48, 120, 207, 150, 125, 108, 100, 48, 155, 137, 132, 16, 193, 139, 74, 179, 131, 42, 119, 25, 185, 98, 13, 235, 118, 92, 11, 154, 142, 134, 220, 191, 220, 169, 250, 244, 104, 123, 7, 247, 33, 178, 155, 121, 59, 75, 188, 206, 198, 182, 97, 0, 64, 231, 45, 55, 92, 100, 17, 56, 159, 79, 13, 219, 221, 33, 39, 193, 24, 36, 58, 105, 8, 70, 206, 176, 209, 146, 45, 201, 157, 226, 84, 213, 135, 143, 178, 156, 112, 137, 246, 123, 248, 215, 168, 51, 95, 177, 47, 57, 29, 199, 224, 98, 48, 144, 253, 15, 201, 192, 142, 62, 143, 13, 228, 89, 51, 58, 6, 226, 139, 99, 207, 22, 113, 215, 79, 91, 158, 166, 210, 28, 90, 218, 111, 151, 4, 55, 230, 76, 90, 209, 149, 113, 248, 245, 50, 231, 137, 51, 157, 40, 29, 184, 198, 201, 108, 199, 89, 67, 136, 239, 96, 216, 237, 172, 29, 84, 3, 128, 240, 2, 218, 169, 217, 118, 179, 34, 226, 19, 227, 59, 193, 131, 108, 20, 113, 46, 170, 196, 156, 45, 39, 151, 218, 22, 132, 250, 209, 183, 46, 249, 115, 239, 14, 176, 200, 134, 158, 148, 139, 212, 167, 152, 205, 183, 236, 242, 176, 96, 177, 187, 184, 252, 14, 226, 127, 127, 173, 147, 224, 220, 8, 29, 63, 73, 215, 92, 161, 110, 20, 154, 131, 23, 217, 116, 145, 196, 19, 167, 84, 185, 16, 89, 175, 180, 110, 116, 57, 198, 237, 147, 183, 164, 169, 220, 172, 52, 68, 175, 113, 244, 62, 104, 134, 215, 99, 132, 199, 139, 172, 108, 143, 25, 238, 201, 128, 85, 24, 73, 30, 186, 142, 186, 201, 79, 3, 176, 185, 70, 66, 89, 127, 188, 158, 209, 83, 17, 22, 187, 153, 8, 63, 58, 174, 236, 132, 226, 43, 145, 97, 242, 198, 117, 105, 161, 21, 241, 23, 84, 32, 62, 155, 245, 172, 30, 78, 41, 199, 219, 180, 149, 193, 163, 131, 237, 240, 46, 183, 186, 42, 201, 49, 249, 142, 188, 59, 212, 26, 253, 23, 27, 205, 231, 163, 76, 179, 135, 193, 152, 110, 91, 5, 218, 67, 204, 164, 128, 183, 221, 82, 16, 72, 249, 111, 118, 182, 24, 249, 91, 215, 215, 155, 2, 0, 0, 0, 0, 0, 0, 0, 212, 110, 6, 228, 73, 146, 46, 184, 158, 58, 94, 4, 141, 241, 158, 0, 175, 140, 72, 75, 52, 6, 72, 49, 112, 215, 21, 243, 151, 67, 106, 22, 158, 237, 80, 204, 41, 128, 69, 52, 154, 189, 124, 203, 35, 107, 132, 241, 234, 31, 3, 165, 87, 58, 10, 92, 252, 227, 214, 99, 176, 66, 118, 22, 177, 20, 120, 198, 252, 236, 7, 148, 207, 78, 152, 132, 94, 207, 50, 243, 4, 169, 146, 240, 79, 98, 0, 212, 106, 137, 36, 193, 21, 175, 180, 1, 26, 107, 39, 198, 89, 152, 26, 220, 138, 105, 243, 45, 63, 106, 163, 80, 74, 253, 176, 207, 47, 52, 7, 84, 59, 151, 47, 178, 165, 112, 251, 161].to_vec();
+        let proof_bytes: Vec<u8> = [162, 50, 57, 98, 3, 171, 250, 108, 49, 206, 73, 126, 25, 35, 178, 148, 35, 219, 98, 90, 122, 177, 16, 91, 233, 215, 222, 12, 72, 184, 53, 2, 62, 166, 50, 68, 98, 171, 218, 218, 151, 177, 133, 223, 129, 53, 114, 236, 181, 215, 223, 91, 102, 225, 52, 122, 122, 206, 36, 122, 213, 38, 186, 170, 235, 210, 179, 221, 122, 37, 74, 38, 79, 0, 26, 94, 59, 146, 46, 252, 70, 153, 236, 126, 194, 169, 17, 144, 100, 218, 118, 22, 99, 226, 132, 40, 24, 248, 232, 197, 195, 220, 254, 52, 36, 248, 18, 167, 167, 206, 108, 29, 120, 188, 18, 78, 86, 8, 121, 217, 144, 185, 122, 58, 12, 34, 44, 6, 233, 80, 177, 183, 5, 8, 150, 74, 241, 141, 65, 150, 35, 98, 15, 150, 137, 254, 132, 167, 228, 104, 63, 133, 11, 209, 39, 79, 138, 185, 88, 20, 242, 102, 69, 73, 243, 88, 29, 91, 127, 157, 82, 192, 52, 95, 143, 49, 227, 83, 19, 26, 108, 63, 232, 213, 169, 64, 221, 159, 214, 220, 246, 174, 35, 43, 143, 80, 168, 142, 29, 103, 179, 58, 235, 33, 163, 198, 255, 188, 20, 3, 91, 47, 158, 122, 226, 201, 175, 138, 18, 24, 178, 219, 78, 12, 96, 10, 2, 133, 35, 230, 149, 235, 206, 1, 177, 211, 245, 168, 74, 62, 25, 115, 70, 42, 38, 131, 92, 103, 103, 176, 212, 223, 177, 242, 94, 14].to_vec();
+        let scalar = [232, 255, 255, 239, 147, 245, 225, 67, 145, 112, 185, 121, 72, 232, 51, 40, 93, 88, 129, 129, 182, 69, 80, 184, 41, 160, 49, 225, 114, 78, 100, 48].to_vec();
+
+        let proof: ark_groth16::Proof<Bn254> = ark_groth16::Proof::deserialize_uncompressed(&proof_bytes[..]).unwrap();
+        let vk: ark_groth16::VerifyingKey<Bn254> = ark_groth16::VerifyingKey::deserialize_uncompressed(&vk_bytes[..]).unwrap();
+        let scalar: ark_bn254::Fr = ark_bn254::Fr::deserialize_uncompressed(&scalar[..]).unwrap();
+        let scalars = [scalar];
+
+
+        let mut msm_scalar = scalars.to_vec();
+        msm_scalar.reverse();
+        let mut msm_gs = vk.gamma_abc_g1.clone(); // vk.vk_pubs[0]
+        msm_gs.reverse();
+        let vky0 = msm_gs.pop().unwrap();
+    
+        let mut pp3 = vky0 * ark_bn254::Fr::ONE;
+        for i in 0..NUM_PUBS {
+            pp3 += msm_gs[i] * msm_scalar[i];
+        }
+        let p3 = pp3.into_affine();
+    
+        let (p2, p1, p4) = (proof.c, vk.alpha_g1, proof.a);
+        let (q3, q2, q1, q4) = (
+            vk.gamma_g2.into_group().neg().into_affine(),
+            vk.delta_g2.into_group().neg().into_affine(),
+            -vk.beta_g2,
+            proof.b,
+        );
+        let pairing = BnAffinePairing;
+        let f_fixed = pairing.multi_miller_loop_affine([p1], [q1]).0;
+        let f = pairing.multi_miller_loop_affine([p1, p2, p3, p4], [q1, q2, q3, q4]).0;
+        let (c, s) = compute_c_wi(f);
+        let eval_ins: InputProof = InputProof {
+            p2,
+            p4,
+            q4,
+            c: c.c1/c.c0,
+            ks: msm_scalar.clone(),
+        };
+
+        let eval_ins_raw = eval_ins.to_raw();
+    
+        let pubs: PublicParams = PublicParams {
+            q2, 
+            q3, 
+            fixed_acc: f_fixed.c1/f_fixed.c0, 
+            ks_vks: msm_gs, 
+            vky0
+        };
+        let mut segments: Vec<Segment> = vec![];
+        let pass = groth16_generate_segments(false, &mut segments, eval_ins_raw, pubs, &mut None);
+        assert!(pass);
+        // hint_to_data(segments.clone());
+    }
+
+    // rust version of pairing verification check with normalized (1 + a. J) representation
+    fn verify_pairing(ps: Vec<ark_bn254::G1Affine>, qs: Vec<ark_bn254::G2Affine>, gc: ark_bn254::Fq12, s: ark_bn254::Fq12, p1q1: ark_bn254::Fq6) {
+        let mut cinv = gc.inverse().unwrap();
+        cinv = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, cinv.c1/cinv.c0);
+        let mut c =  gc;
+        c = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, c.c1/c.c0);
+        
+        let mut f = cinv;
+        
+        let mut ts = qs.clone();
+        let ps: Vec<ark_bn254::G1Affine> = ps.iter().map(|p1|ark_bn254::G1Affine::new_unchecked(-p1.x/p1.y, p1.y.inverse().unwrap())).collect();
+        let num_pairings = ps.len();
+        for itr in (1..ark_bn254::Config::ATE_LOOP_COUNT.len()).rev() {
+            let ate_bit = ark_bn254::Config::ATE_LOOP_COUNT[itr - 1];
+            // square
+            f = f * f;
+            f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+
+
+            // double and eval
+            for i in 0..num_pairings {
+                let t = ts[i];
+                let p = ps[i];
+                let alpha = (t.x.square() + t.x.square() + t.x.square()) / (t.y + t.y); 
+                let neg_bias = alpha * t.x - t.y;
+                let mut le0 = alpha;
+                le0.mul_assign_by_fp(&p.x);
+                let mut le1 = neg_bias;
+                le1.mul_assign_by_fp(&p.y);
+                let mut le = ark_bn254::Fq12::ZERO;
+                le.c0.c0 = ark_bn254::fq2::Fq2::ONE;
+                le.c1.c0 = le0;
+                le.c1.c1 = le1;
+
+                f *= le;
+                f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+        
+                ts[i] = (t + t).into_affine();
+            }
+
+            if ate_bit == 1 || ate_bit == -1 {
+                let c_or_cinv = if ate_bit == -1 { c } else { cinv };
+                f *= c_or_cinv;
+                f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+
+                for i in 0..num_pairings {
+                    let t = ts[i];
+                    let mut q = qs[i];
+                    let p = ps[i];
+
+                    if ate_bit == -1 {
+                        q = q.neg();
+                    };
+                    let alpha = (t.y - q.y) / (t.x - q.x);
+                    let neg_bias = alpha * t.x - t.y;
+        
+                    let mut le0 = alpha;
+                    le0.mul_assign_by_fp(&p.x);
+                    let mut le1 = neg_bias;
+                    le1.mul_assign_by_fp(&p.y);
+                    let mut le = ark_bn254::Fq12::ZERO;
+                    le.c0.c0 = ark_bn254::fq2::Fq2::ONE;
+                    le.c1.c0 = le0;
+                    le.c1.c1 = le1;
+        
+                    f *= le;
+                    f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+
+                    ts[i] = (t + q).into_affine();
+                }
+            }
+        }
+        let cinv_q = cinv.frobenius_map(1);
+        let c_q2 = c.frobenius_map(2);
+        let cinv_q3 = cinv.frobenius_map(3);
+
+        for mut cq in vec![cinv_q, c_q2, cinv_q3] {
+            cq = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, cq.c1/cq.c0); 
+            f *= cq;
+            f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+        }
+
+        // f *= s;
+        // f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+
+        for i in 0..num_pairings {
+            let mut q = qs[i];
+            let t = ts[i];
+            let p = ps[i];
+            
+            q = frob_q_power(q, 1);
+
+            let alpha = (t.y - q.y) / (t.x - q.x);
+            let neg_bias = alpha * t.x - t.y;
+            let mut le0 = alpha;
+            le0.mul_assign_by_fp(&p.x);
+            let mut le1 = neg_bias;
+            le1.mul_assign_by_fp(&p.y);
+            let mut le = ark_bn254::Fq12::ZERO;
+            le.c0.c0 = ark_bn254::fq2::Fq2::ONE;
+            le.c1.c0 = le0;
+            le.c1.c1 = le1;
+        
+            f *= le;
+            f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+        
+            ts[i] = (t + q).into_affine();
+        }
+
+        // t + q^3
+        for i in 0..num_pairings {
+            let mut q = qs[i];
+            let t = ts[i];
+            let p = ps[i];
+
+            q = frob_q_power(q, -1);
+        
+            let alpha = (t.y - q.y) / (t.x - q.x);
+            let neg_bias = alpha * t.x - t.y;
+            let mut le0 = alpha;
+            le0.mul_assign_by_fp(&p.x);
+            let mut le1 = neg_bias;
+            le1.mul_assign_by_fp(&p.y);
+            let mut le = ark_bn254::Fq12::ZERO;
+            le.c0.c0 = ark_bn254::fq2::Fq2::ONE;
+            le.c1.c0 = le0;
+            le.c1.c1 = le1;
+        
+            f *= le;
+            f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+            ts[i] = (t + q).into_affine();
+        }
+
+        // t + q^3
+        for i in 0..num_pairings {
+            let mut q = qs[i];
+            let t = ts[i];
+            q = frob_q_power(q, 3);
+        
+            ts[i] = (t + q).into_affine();
+        }
+        assert_eq!(f.c1+p1q1, ark_bn254::Fq6::ZERO); // final check, f: (a+b == 0 => (1 + a) * (1 + b) == Fq12::ONE)
+    }
+
+    // Pairing verification check with normalized (1 + a. J) representation
+    // Includes equivalent bitcoin script in for each functions
+    pub fn verify_pairing_scripted(ps: Vec<ark_bn254::G1Affine>, qs: Vec<ark_bn254::G2Affine>, gc: ark_bn254::Fq12, s: ark_bn254::Fq12, p1q1: ark_bn254::Fq6) {
+        use crate::chunk::{taps_mul::{chunk_dense_dense_mul, chunk_fq12_square}, taps_point_ops::{chunk_point_ops_and_multiply_line_evals_step_2, chunk_init_t4, frob_q_power}, taps_ext_miller::chunk_frob_fp12};
+
+        let beta_12x = BigUint::from_str(
+            "21575463638280843010398324269430826099269044274347216827212613867836435027261",
+        )
+        .unwrap();
+        let beta_12y = BigUint::from_str(
+            "10307601595873709700152284273816112264069230130616436755625194854815875713954",
+        )
+        .unwrap();
+        let beta_12 = ark_bn254::Fq2::from_base_prime_field_elems([
+            ark_bn254::Fq::from(beta_12x.clone()),
+            ark_bn254::Fq::from(beta_12y.clone()),
+        ])
+        .unwrap();
+        let beta_13x = BigUint::from_str(
+            "2821565182194536844548159561693502659359617185244120367078079554186484126554",
+        )
+        .unwrap();
+        let beta_13y = BigUint::from_str(
+            "3505843767911556378687030309984248845540243509899259641013678093033130930403",
+        )
+        .unwrap();
+        let beta_13 = ark_bn254::Fq2::from_base_prime_field_elems([
+            ark_bn254::Fq::from(beta_13x.clone()),
+            ark_bn254::Fq::from(beta_13y.clone()),
+        ])
+        .unwrap();
+        let beta_22x = BigUint::from_str(
+            "21888242871839275220042445260109153167277707414472061641714758635765020556616",
+        )
+        .unwrap();
+        let beta_22y = BigUint::from_str("0").unwrap();
+        let beta_22 = ark_bn254::Fq2::from_base_prime_field_elems([
+            ark_bn254::Fq::from(beta_22x.clone()),
+            ark_bn254::Fq::from(beta_22y.clone()),
+        ])
+        .unwrap();
+
+        let mut cinv = gc.inverse().unwrap();
+        cinv = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, cinv.c1/cinv.c0);
+        let mut c =  gc;
+        c = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, c.c1/c.c0);
+        
+        let mut f = cinv;
+        let mut g = cinv.c1;
+        
+        let mut ts = qs.clone();
+        let ps: Vec<ark_bn254::G1Affine> = ps.iter().map(|p1|ark_bn254::G1Affine::new_unchecked(-p1.x/p1.y, p1.y.inverse().unwrap())).collect();
+        let num_pairings = ps.len();
+
+        let mut total_script_size = 0;
+        let mut temp_scr = script! {};
+
+        let (mut t4, _, scr, _) = chunk_init_t4([qs[2].x.c0.into(), qs[2].x.c1.into(), qs[2].y.c0.into(), qs[2].y.c1.into()]);
+        total_script_size += scr.len();
+        let mut t3 = qs[1];
+        let mut t2 = qs[0];
+
+
+        for itr in (1..ark_bn254::Config::ATE_LOOP_COUNT.len()).rev() {
+            let ate_bit = ark_bn254::Config::ATE_LOOP_COUNT[itr - 1];
+            println!("itr {} ate_bit {}", itr, ate_bit);
+            // square
+            f = f * f;
+            f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+            (g, _, temp_scr, _) = chunk_fq12_square(g);
+            total_script_size += temp_scr.len();
+
+            assert_eq!(g, f.c1);
+
+            // double and eval
+            for i in 0..num_pairings {
+                let t = ts[i];
+                let p = ps[i];
+                let alpha = (t.x.square() + t.x.square() + t.x.square()) / (t.y + t.y); 
+                let neg_bias = alpha * t.x - t.y;
+                let mut le0 = alpha;
+                le0.mul_assign_by_fp(&p.x);
+                let mut le1 = neg_bias;
+                le1.mul_assign_by_fp(&p.y);
+                let mut le = ark_bn254::Fq12::ZERO;
+                le.c0.c0 = ark_bn254::fq2::Fq2::ONE;
+                le.c1.c0 = le0;
+                le.c1.c1 = le1;
+
+                f *= le;
+                f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+        
+                ts[i] = (t + t).into_affine();
+            }
+            (t4, _, temp_scr, _) = chunk_point_ops_and_multiply_line_evals_step_1(true, None, None, t4, ps[2], None, ps[1], t3, None, ps[0], t2, None);
+            total_script_size += temp_scr.len();
+
+            t3 = (t3 + t3).into_affine();
+            t2 = (t2 + t2).into_affine();
+            let (lev, _, scr, _) = chunk_point_ops_and_multiply_line_evals_step_2(t4);
+            total_script_size += scr.len();
+            (g, _, temp_scr, _) = chunk_dense_dense_mul(g, lev);
+            total_script_size += temp_scr.len();
+
+            assert_eq!(g, f.c1);
+            
+
+            if ate_bit == 1 || ate_bit == -1 {
+                let c_or_cinv = if ate_bit == -1 { c } else { cinv };
+                f *= c_or_cinv;
+                f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+                (g, _, temp_scr, _) = chunk_dense_dense_mul(g, c_or_cinv.c1);
+                total_script_size += temp_scr.len();
+
+                assert_eq!(g, f.c1);
+
+                for i in 0..num_pairings {
+                    let t = ts[i];
+                    let mut q = qs[i];
+                    let p = ps[i];
+
+                    if ate_bit == -1 {
+                        q = q.neg();
+                    };
+                    let alpha = (t.y - q.y) / (t.x - q.x);
+                    let neg_bias = alpha * t.x - t.y;
+        
+                    let mut le0 = alpha;
+                    le0.mul_assign_by_fp(&p.x);
+                    let mut le1 = neg_bias;
+                    le1.mul_assign_by_fp(&p.y);
+                    let mut le = ark_bn254::Fq12::ZERO;
+                    le.c0.c0 = ark_bn254::fq2::Fq2::ONE;
+                    le.c1.c0 = le0;
+                    le.c1.c1 = le1;
+        
+                    f *= le;
+                    f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+
+                    ts[i] = (t + q).into_affine();
+                    // println!("pair {:?} ts {:?}", i, ts[i]);
+                }
+
+                (t4, _, temp_scr, _) = chunk_point_ops_and_multiply_line_evals_step_1(
+                    false, Some(false), Some(ate_bit), 
+                    t4, ps[2], Some(qs[2]), 
+                    ps[1], t3, Some(qs[1]), 
+                    ps[0], t2, Some(qs[0]));
+                total_script_size += temp_scr.len();
+                
+                if ate_bit == 1 {
+                    t3 = (t3 + qs[1]).into_affine();
+                    t2 = (t2 + qs[0]).into_affine();
+                } else {
+                    t3 = (t3 + qs[1].neg()).into_affine();
+                    t2 = (t2 + qs[0].neg()).into_affine();
+                }
+
+                let (lev, _, scr, _) = chunk_point_ops_and_multiply_line_evals_step_2(t4);
+                total_script_size += scr.len();
+
+                (g, _, temp_scr, _) = chunk_dense_dense_mul(g, lev);
+                total_script_size += temp_scr.len();
+            }
+            assert_eq!(g, f.c1);
+        }
+
+        let cinv_q = cinv.frobenius_map(1);
+        let c_q2 = c.frobenius_map(2);
+        let cinv_q3 = cinv.frobenius_map(3);
+
+        let (sc_cinv_q, _, scr, _) = chunk_frob_fp12(cinv.c1, 1);
+        total_script_size += scr.len();
+        let (sc_c_q2, _, scr, _) = chunk_frob_fp12(c.c1, 2);
+        total_script_size += scr.len();
+        let (sc_cinv_q3, _, scr, _) = chunk_frob_fp12(cinv.c1, 3);
+        total_script_size += scr.len();
+
+        for mut cq in vec![cinv_q, c_q2, cinv_q3] {
+            cq = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, cq.c1/cq.c0); 
+            f *= cq;
+            f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+        }
+        for sc_cq in vec![sc_cinv_q, sc_c_q2, sc_cinv_q3] {
+            (g, _, temp_scr, _) = chunk_dense_dense_mul(g, sc_cq);
+            total_script_size += temp_scr.len();
+        }
+        assert_eq!(g, f.c1);
+
+        for i in 0..num_pairings {
+            let mut q = qs[i];
+            let t = ts[i];
+            let p = ps[i];
+            
+            q.x.conjugate_in_place();
+            q.x *= beta_12;
+            q.y.conjugate_in_place();
+            q.y *= beta_13;
+            let alpha = (t.y - q.y) / (t.x - q.x);
+            let neg_bias = alpha * t.x - t.y;
+            let mut le0 = alpha;
+            le0.mul_assign_by_fp(&p.x);
+            let mut le1 = neg_bias;
+            le1.mul_assign_by_fp(&p.y);
+            let mut le = ark_bn254::Fq12::ZERO;
+            le.c0.c0 = ark_bn254::fq2::Fq2::ONE;
+            le.c1.c0 = le0;
+            le.c1.c1 = le1;
+        
+            f *= le;
+            f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+        
+            ts[i] = (t + q).into_affine();
+        }
+        (t4, _, temp_scr, _) = chunk_point_ops_and_multiply_line_evals_step_1(false, Some(true), Some(1), t4, ps[2], Some(qs[2]), ps[1], t3, Some(qs[1]), ps[0], t2, Some(qs[0]));
+        total_script_size += temp_scr.len();
+        
+        let (lev, _, scr, _) = chunk_point_ops_and_multiply_line_evals_step_2(t4);
+        total_script_size += scr.len();
+
+        (g, _, temp_scr, _) = chunk_dense_dense_mul(g, lev);
+        total_script_size += temp_scr.len();
+        let tmp_q2f = frob_q_power(qs[0], 1);
+        t2 = (t2 + tmp_q2f).into_affine();
+        let tmp_q3f = frob_q_power(qs[1], 1);
+        t3 = (t3 + tmp_q3f).into_affine();
+        assert_eq!(g, f.c1);
+
+        // t + q^3
+        for i in 0..num_pairings {
+            let mut q = qs[i];
+            let t = ts[i];
+            let p = ps[i];
+
+            q.x *= beta_22;
+        
+            let alpha = (t.y - q.y) / (t.x - q.x);
+            let neg_bias = alpha * t.x - t.y;
+            let mut le0 = alpha;
+            le0.mul_assign_by_fp(&p.x);
+            let mut le1 = neg_bias;
+            le1.mul_assign_by_fp(&p.y);
+            let mut le = ark_bn254::Fq12::ZERO;
+            le.c0.c0 = ark_bn254::fq2::Fq2::ONE;
+            le.c1.c0 = le0;
+            le.c1.c1 = le1;
+        
+            f *= le;
+            f = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+
+            ts[i] = (t + q).into_affine();
+        }
+        (t4, _, temp_scr, _) = chunk_point_ops_and_multiply_line_evals_step_1(false, Some(true), Some(-1), t4, ps[2], Some(qs[2]), ps[1], t3, Some(qs[1]), ps[0], t2, Some(qs[0]));
+        total_script_size += temp_scr.len();
+
+        let (lev, _, scr, _) = chunk_point_ops_and_multiply_line_evals_step_2(t4);
+        total_script_size += scr.len();
+        
+        (g, _, temp_scr, _) = chunk_dense_dense_mul(g, lev);
+        total_script_size += temp_scr.len();
+
+        println!("total script size {:?}", total_script_size);
+        
+        let tmp_q2f = frob_q_power(qs[0], -1);
+        t2 = (t2 + tmp_q2f).into_affine();
+        let tmp_q3f = frob_q_power(qs[1], -1);
+        t3 = (t3 + tmp_q3f).into_affine();
+        assert_eq!(g, f.c1);
+
+        assert_eq!(g+p1q1, ark_bn254::Fq6::ZERO); // final check, f: (a+b == 0 => (1 + a) * (1 + b) == Fq12::ONE)    
+        assert_eq!(f.c1+p1q1, ark_bn254::Fq6::ZERO); // final check, f: (a+b == 0 => (1 + a) * (1 + b) == Fq12::ONE)
+    }
+
+    #[test]
+    fn test_verify_pairing() {
+        let vk_bytes = [115, 158, 251, 51, 106, 255, 102, 248, 22, 171, 229, 158, 80, 192, 240, 217, 99, 162, 65, 107, 31, 137, 197, 79, 11, 210, 74, 65, 65, 203, 243, 14, 123, 2, 229, 125, 198, 247, 76, 241, 176, 116, 6, 3, 241, 1, 134, 195, 39, 5, 124, 47, 31, 43, 164, 48, 120, 207, 150, 125, 108, 100, 48, 155, 137, 132, 16, 193, 139, 74, 179, 131, 42, 119, 25, 185, 98, 13, 235, 118, 92, 11, 154, 142, 134, 220, 191, 220, 169, 250, 244, 104, 123, 7, 247, 33, 178, 155, 121, 59, 75, 188, 206, 198, 182, 97, 0, 64, 231, 45, 55, 92, 100, 17, 56, 159, 79, 13, 219, 221, 33, 39, 193, 24, 36, 58, 105, 8, 70, 206, 176, 209, 146, 45, 201, 157, 226, 84, 213, 135, 143, 178, 156, 112, 137, 246, 123, 248, 215, 168, 51, 95, 177, 47, 57, 29, 199, 224, 98, 48, 144, 253, 15, 201, 192, 142, 62, 143, 13, 228, 89, 51, 58, 6, 226, 139, 99, 207, 22, 113, 215, 79, 91, 158, 166, 210, 28, 90, 218, 111, 151, 4, 55, 230, 76, 90, 209, 149, 113, 248, 245, 50, 231, 137, 51, 157, 40, 29, 184, 198, 201, 108, 199, 89, 67, 136, 239, 96, 216, 237, 172, 29, 84, 3, 128, 240, 2, 218, 169, 217, 118, 179, 34, 226, 19, 227, 59, 193, 131, 108, 20, 113, 46, 170, 196, 156, 45, 39, 151, 218, 22, 132, 250, 209, 183, 46, 249, 115, 239, 14, 176, 200, 134, 158, 148, 139, 212, 167, 152, 205, 183, 236, 242, 176, 96, 177, 187, 184, 252, 14, 226, 127, 127, 173, 147, 224, 220, 8, 29, 63, 73, 215, 92, 161, 110, 20, 154, 131, 23, 217, 116, 145, 196, 19, 167, 84, 185, 16, 89, 175, 180, 110, 116, 57, 198, 237, 147, 183, 164, 169, 220, 172, 52, 68, 175, 113, 244, 62, 104, 134, 215, 99, 132, 199, 139, 172, 108, 143, 25, 238, 201, 128, 85, 24, 73, 30, 186, 142, 186, 201, 79, 3, 176, 185, 70, 66, 89, 127, 188, 158, 209, 83, 17, 22, 187, 153, 8, 63, 58, 174, 236, 132, 226, 43, 145, 97, 242, 198, 117, 105, 161, 21, 241, 23, 84, 32, 62, 155, 245, 172, 30, 78, 41, 199, 219, 180, 149, 193, 163, 131, 237, 240, 46, 183, 186, 42, 201, 49, 249, 142, 188, 59, 212, 26, 253, 23, 27, 205, 231, 163, 76, 179, 135, 193, 152, 110, 91, 5, 218, 67, 204, 164, 128, 183, 221, 82, 16, 72, 249, 111, 118, 182, 24, 249, 91, 215, 215, 155, 2, 0, 0, 0, 0, 0, 0, 0, 212, 110, 6, 228, 73, 146, 46, 184, 158, 58, 94, 4, 141, 241, 158, 0, 175, 140, 72, 75, 52, 6, 72, 49, 112, 215, 21, 243, 151, 67, 106, 22, 158, 237, 80, 204, 41, 128, 69, 52, 154, 189, 124, 203, 35, 107, 132, 241, 234, 31, 3, 165, 87, 58, 10, 92, 252, 227, 214, 99, 176, 66, 118, 22, 177, 20, 120, 198, 252, 236, 7, 148, 207, 78, 152, 132, 94, 207, 50, 243, 4, 169, 146, 240, 79, 98, 0, 212, 106, 137, 36, 193, 21, 175, 180, 1, 26, 107, 39, 198, 89, 152, 26, 220, 138, 105, 243, 45, 63, 106, 163, 80, 74, 253, 176, 207, 47, 52, 7, 84, 59, 151, 47, 178, 165, 112, 251, 161].to_vec();
+        let proof_bytes: Vec<u8> = [162, 50, 57, 98, 3, 171, 250, 108, 49, 206, 73, 126, 25, 35, 178, 148, 35, 219, 98, 90, 122, 177, 16, 91, 233, 215, 222, 12, 72, 184, 53, 2, 62, 166, 50, 68, 98, 171, 218, 218, 151, 177, 133, 223, 129, 53, 114, 236, 181, 215, 223, 91, 102, 225, 52, 122, 122, 206, 36, 122, 213, 38, 186, 170, 235, 210, 179, 221, 122, 37, 74, 38, 79, 0, 26, 94, 59, 146, 46, 252, 70, 153, 236, 126, 194, 169, 17, 144, 100, 218, 118, 22, 99, 226, 132, 40, 24, 248, 232, 197, 195, 220, 254, 52, 36, 248, 18, 167, 167, 206, 108, 29, 120, 188, 18, 78, 86, 8, 121, 217, 144, 185, 122, 58, 12, 34, 44, 6, 233, 80, 177, 183, 5, 8, 150, 74, 241, 141, 65, 150, 35, 98, 15, 150, 137, 254, 132, 167, 228, 104, 63, 133, 11, 209, 39, 79, 138, 185, 88, 20, 242, 102, 69, 73, 243, 88, 29, 91, 127, 157, 82, 192, 52, 95, 143, 49, 227, 83, 19, 26, 108, 63, 232, 213, 169, 64, 221, 159, 214, 220, 246, 174, 35, 43, 143, 80, 168, 142, 29, 103, 179, 58, 235, 33, 163, 198, 255, 188, 20, 3, 91, 47, 158, 122, 226, 201, 175, 138, 18, 24, 178, 219, 78, 12, 96, 10, 2, 133, 35, 230, 149, 235, 206, 1, 177, 211, 245, 168, 74, 62, 25, 115, 70, 42, 38, 131, 92, 103, 103, 176, 212, 223, 177, 242, 94, 14].to_vec();
+        let scalar = [232, 255, 255, 239, 147, 245, 225, 67, 145, 112, 185, 121, 72, 232, 51, 40, 93, 88, 129, 129, 182, 69, 80, 184, 41, 160, 49, 225, 114, 78, 100, 48].to_vec();
+
+        let proof: ark_groth16::Proof<Bn254> = ark_groth16::Proof::deserialize_uncompressed(&proof_bytes[..]).unwrap();
+        let vk: ark_groth16::VerifyingKey<Bn254> = ark_groth16::VerifyingKey::deserialize_uncompressed(&vk_bytes[..]).unwrap();
+        let scalar: ark_bn254::Fr = ark_bn254::Fr::deserialize_uncompressed(&scalar[..]).unwrap();
+        let scalars = [scalar];
+
+        // compute msm
+        let mut msm_scalar = scalars.to_vec();
+        msm_scalar.reverse();
+        let mut msm_gs = vk.gamma_abc_g1.clone(); // vk.vk_pubs[0]
+        msm_gs.reverse();
+        let vky0 = msm_gs.pop().unwrap();
+        let mut p3 = vky0 * ark_bn254::Fr::ONE;
+        for i in 0..NUM_PUBS {
+            p3 += msm_gs[i] * msm_scalar[i];
+        }
+        let p3 = p3.into_affine();
+
+        let (p2, p1, p4) = (proof.c, vk.alpha_g1, proof.a);
+        let (q3, q2, q1, q4) = (
+            vk.gamma_g2.into_group().neg().into_affine(),
+            vk.delta_g2.into_group().neg().into_affine(),
+            -vk.beta_g2,
+            proof.b,
+        );
+
+        // precompute c, s
+        let pairing = BnAffinePairing;
+        let mut g = pairing.multi_miller_loop_affine([p1, p2, p3, p4], [q1, q2, q3, q4]).0;
+        let fixed_p1q1 = pairing.multi_miller_loop_affine([p1], [q1]).0;
+        let fixed_p1q1 = fixed_p1q1.c1/fixed_p1q1.c0;
+        if g.c1 != ark_bn254::Fq6::ZERO {
+            g = ark_bn254::Fq12::new( ark_bn254::Fq6::ONE, g.c1/g.c0);
+        }
+        let (c, wi) = compute_c_wi(g);
+
+        // actual scripted verification
+        verify_pairing(vec![p2, p3, p4], vec![q2, q3, q4], c, wi, fixed_p1q1);
+        verify_pairing_scripted(vec![p2, p3, p4], vec![q2, q3, q4], c, wi, fixed_p1q1);
+
+    }
+
+    
+}
\ No newline at end of file
diff --git a/bitvm/src/chunk/g16_runner_utils.rs b/bitvm/src/chunk/g16_runner_utils.rs
new file mode 100644
index 000000000..7a6d432b6
--- /dev/null
+++ b/bitvm/src/chunk/g16_runner_utils.rs
@@ -0,0 +1,523 @@
+
+
+
+use crate::{bn254::{fp254impl::Fp254Impl, fr::Fr, msm::{BATCH_SIZE_PER_CHUNK, WINDOW_G1_MSM}, utils::Hint}, chunk::taps_msm::chunk_msm};
+
+use super::{elements::{DataType, ElemG2Eval, ElementType}, taps_ext_miller::*, taps_msm::chunk_hash_p, taps_mul::{chunk_dense_dense_mul, chunk_fq12_square}, taps_point_ops::{chunk_init_t4, chunk_point_ops_and_multiply_line_evals_step_1, chunk_point_ops_and_multiply_line_evals_step_2}};
+use ark_ff::{AdditiveGroup, Field};
+use bitcoin_script::script;
+
+
+use super::taps_ext_miller::{chunk_final_verify, chunk_frob_fp12, chunk_hash_c, chunk_hash_c_inv};
+use crate::treepp::Script;
+
+pub type SegmentID = u32;
+
+#[derive(Debug, Clone)]
+pub(crate) struct Segment {
+    pub id: SegmentID,
+    pub parameter_ids: Vec<(SegmentID, ElementType)>,   
+    pub result: (DataType, ElementType),
+    pub hints: Vec<Hint>,
+    pub scr_type: ScriptType,
+    pub scr: Script,
+    pub is_valid_input: bool,
+}
+
+
+/// After the returned `script` and `witness` are executed together, only `OP_FALSE` left on the stack.
+/// If operator gives a wrong intermediate value, `OP_TRUE` will left on the stack and challenger will finish the slash.
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum ScriptType {
+    NonDeterministic,
+    MSM(u32),
+    ValidateG1IsOnCurve,
+    ValidateG1HashIsOnCurve,
+    ValidateG2IsOnCurve,
+    ValidateFq6OnField,
+
+    PreMillerInitT4,
+    PreMillerPrecomputeP,
+    PreMillerPrecomputePFromHash,
+    PreMillerHashC,
+    PreMillerHashCInv,
+
+    PreMillerHashP,
+
+    MillerSquaring,
+    MillerPointOpsStep1(bool, Option<i8>, Option<bool>),
+    MillerPointOpsStep2,
+    FoldedFp12Multiply,
+    PostMillerFrobFp12(u8),
+
+    PostMillerFinalVerify,
+}
+
+impl ScriptType {
+    pub fn is_final_script(&self) -> bool {
+        matches!(self, ScriptType::PostMillerFinalVerify)
+    }
+}
+
+
+// final verify
+// sq
+pub(crate) fn wrap_hint_squaring(
+    skip: bool,
+    segment_id: usize,
+    in_a: &Segment,
+) -> Segment {
+    
+    let input_segment_info: Vec<(SegmentID, ElementType)> = vec![(in_a.id, ElementType::Fp6)];
+
+    let f_acc = in_a.result.0.try_into().unwrap();
+
+    let (mut sq, mut is_valid_input, mut scr, mut op_hints) = (ark_bn254::Fq6::ONE, true, script! {}, vec![]);
+    if !skip {
+        (sq, is_valid_input, scr, op_hints) = chunk_fq12_square(f_acc);
+    }
+
+    Segment {
+        id: segment_id as u32,
+        is_valid_input,
+        parameter_ids: input_segment_info,
+        result: (DataType::Fp6Data(sq), ElementType::Fp6),
+        hints: op_hints,
+        scr_type: ScriptType::MillerSquaring,
+        scr
+    }
+}
+
+// init_t4
+pub(crate) fn wrap_hint_init_t4(
+    skip: bool,
+    segment_id: usize,
+    in_q4yc1: &Segment,
+    in_q4yc0: &Segment,
+    in_q4xc1: &Segment,
+    in_q4xc0: &Segment,
+) -> Segment {
+    
+    let input_segment_info: Vec<(SegmentID, ElementType)> = vec![
+        (in_q4yc1.id, ElementType::FieldElem),
+        (in_q4yc0.id, ElementType::FieldElem),
+        (in_q4xc1.id, ElementType::FieldElem),
+        (in_q4xc0.id, ElementType::FieldElem),
+    ];
+
+    let q4xc0: ark_ff::BigInt<4> =  in_q4xc0.result.0.try_into().unwrap();
+    let q4xc1: ark_ff::BigInt<4> =  in_q4xc1.result.0.try_into().unwrap();
+    let q4yc0: ark_ff::BigInt<4> =  in_q4yc0.result.0.try_into().unwrap();
+    let q4yc1: ark_ff::BigInt<4> =  in_q4yc1.result.0.try_into().unwrap();
+
+    let (mut tmpt4, mut is_valid_input, mut scr, mut op_hints) = (ElemG2Eval::mock(), true, script! {}, vec![]);
+    if !skip {
+        (tmpt4, is_valid_input, scr, op_hints) = chunk_init_t4(
+            [q4xc0, q4xc1, q4yc0, q4yc1],
+        );
+    }
+    
+    Segment {
+        id: segment_id as u32,
+        is_valid_input,
+        parameter_ids: input_segment_info,
+        result: (DataType::G2EvalData(tmpt4), ElementType::G2EvalPoint),
+        hints: op_hints,
+        scr_type: ScriptType::PreMillerInitT4,
+        scr,
+    }
+}
+
+// dmul
+pub(crate) fn wrap_hints_dense_dense_mul(
+    skip: bool,
+    segment_id: usize,
+    in_a: &Segment,
+    in_b: &Segment,
+) -> Segment {
+
+    let input_segment_info: Vec<(SegmentID, ElementType)> = vec![
+        (in_b.id, ElementType::Fp6),
+        (in_a.id, ElementType::Fp6),
+    ];
+
+    let a: ark_bn254::Fq6 = in_a.result.0.try_into().unwrap();
+    let b: ark_bn254::Fq6 = in_b.result.0.try_into().unwrap();
+
+    
+    let (mut dmul0, mut is_valid_input, mut scr, mut op_hints) = (ark_bn254::Fq6::ONE, true, script! {}, vec![]);
+    if !skip {
+        (dmul0, is_valid_input, scr, op_hints) = chunk_dense_dense_mul(a, b);
+    }
+    
+    Segment {
+        id: segment_id as u32,
+        is_valid_input,
+        parameter_ids: input_segment_info,
+        result: (DataType::Fp6Data(dmul0), ElementType::Fp6),
+        hints: op_hints,
+        scr_type: ScriptType::FoldedFp12Multiply,
+        scr,
+    }
+}
+
+// frob
+pub(crate) fn wrap_hints_frob_fp12(
+    skip: bool,
+    segment_id: usize,
+    in_f: &Segment,
+    power: usize,
+) -> Segment {
+
+    let input_segment_info: Vec<(SegmentID, ElementType)> = vec![(in_f.id, ElementType::Fp6)];
+    let f = in_f.result.0.try_into().unwrap();
+
+    let (mut cp, mut is_valid_input, mut scr, mut op_hints) = (ark_bn254::Fq6::ONE, true, script! {}, vec![]);
+    if !skip {
+        (cp, is_valid_input, scr, op_hints) = chunk_frob_fp12(f, power);
+        // op_hints.extend_from_slice(&Element::Fp12v0(f).get_hash_preimage_as_hints());
+    }
+    
+    Segment {
+        id: segment_id as u32,
+        is_valid_input,
+        parameter_ids: input_segment_info,
+        result: (DataType::Fp6Data(cp), ElementType::Fp6),
+        hints: op_hints,
+        scr_type: ScriptType::PostMillerFrobFp12(power as u8),
+        scr,
+    }
+}
+
+
+// ops
+pub(crate) fn wrap_chunk_point_ops_and_multiply_line_evals_step_1(
+    skip: bool,
+    segment_id: usize,
+    is_dbl: bool, is_frob: Option<bool>, ate_bit: Option<i8>,
+    in_t4: &Segment, in_p4: &Segment, 
+    in_q4: Option<Vec<Segment>>,
+    in_p3: &Segment,
+    t3: ark_bn254::G2Affine, q3: Option<ark_bn254::G2Affine>,
+    in_p2: &Segment,
+    t2: ark_bn254::G2Affine, q2: Option<ark_bn254::G2Affine>,
+) -> Segment {
+    
+    let mut input_segment_info: Vec<(SegmentID, ElementType)> = vec![
+        (in_p2.id, ElementType::G1),
+        (in_p3.id, ElementType::G1),
+        (in_p4.id, ElementType::G1),
+        (in_t4.id, ElementType::G2EvalPoint),
+    ]; 
+
+    let t4: ElemG2Eval = in_t4.result.0.try_into().unwrap();
+    let p4: ark_bn254::G1Affine = in_p4.result.0.try_into().unwrap();
+    let p3: ark_bn254::G1Affine = in_p3.result.0.try_into().unwrap();
+    let p2: ark_bn254::G1Affine = in_p2.result.0.try_into().unwrap();
+    let mut q4: Option<ark_bn254::G2Affine> = None;
+
+    if !is_dbl {
+        let in_q4 = in_q4.unwrap();
+        for v in in_q4.iter().rev() {
+            input_segment_info.push((v.id, ElementType::FieldElem))
+        }
+
+        let q4xc0: ark_ff::BigInt<4> =  in_q4[0].result.0.try_into().unwrap();
+        let q4xc1: ark_ff::BigInt<4> =  in_q4[1].result.0.try_into().unwrap();
+        let q4yc0: ark_ff::BigInt<4> =  in_q4[2].result.0.try_into().unwrap();
+        let q4yc1: ark_ff::BigInt<4> =  in_q4[3].result.0.try_into().unwrap();
+        q4 = Some(ark_bn254::G2Affine::new_unchecked(ark_bn254::Fq2::new(q4xc0.into(), q4xc1.into()), ark_bn254::Fq2::new(q4yc0.into(), q4yc1.into())));
+    }
+
+    let (mut dbladd, mut is_valid_input, mut scr, mut op_hints) = (ElemG2Eval::mock(), true, script! {}, vec![]);
+    if !skip {
+        (dbladd, is_valid_input, scr, op_hints) = chunk_point_ops_and_multiply_line_evals_step_1(
+            is_dbl, is_frob, ate_bit,
+            t4, p4, q4,
+            p3, t3, q3,
+            p2, t2, q2
+        );
+    }
+
+    
+    Segment {
+        id: segment_id as u32,
+        is_valid_input,
+        parameter_ids: input_segment_info,
+        result: (DataType::G2EvalData(dbladd), ElementType::G2Eval),
+        hints: op_hints,
+        scr_type: ScriptType::MillerPointOpsStep1(is_dbl, ate_bit, is_frob),
+        scr
+    }
+}
+
+// complete
+pub(crate) fn wrap_chunk_point_ops_and_multiply_line_evals_step_2(
+    skip: bool,
+    segment_id: usize,
+    in_f: &Segment
+) -> Segment {
+    let input_segment_info: Vec<(SegmentID, ElementType)> = vec![
+        (in_f.id, ElementType::G2EvalMul),
+    ];
+
+    let f = in_f.result.0.try_into().unwrap();
+
+    let (mut cp, mut is_valid_input, mut scr, mut op_hints) = (ark_bn254::Fq6::ONE, true, script! {}, vec![]);
+    if !skip {
+        (cp, is_valid_input, scr, op_hints) = chunk_point_ops_and_multiply_line_evals_step_2(f);
+        // op_hints.extend_from_slice(&Element::Fp12v0(f).get_hash_preimage_as_hints());
+    }
+    
+    Segment {
+        id: segment_id as u32,
+        is_valid_input,
+        parameter_ids: input_segment_info,
+        result: (DataType::Fp6Data(cp), ElementType::Fp6),
+        hints: op_hints,
+        scr_type: ScriptType::MillerPointOpsStep2,
+        scr,
+    }
+}
+
+pub(crate) fn wrap_hint_msm(
+    skip: bool,
+    segment_id: usize,
+    scalars: Vec<Segment>,
+    pub_vky: Vec<ark_bn254::G1Affine>,
+) -> Vec<Segment> {
+    let num_chunks_per_scalar = (Fr::N_BITS + WINDOW_G1_MSM - 1)/(WINDOW_G1_MSM * BATCH_SIZE_PER_CHUNK);
+
+    let hint_scalars: Vec<ark_ff::BigInt<4>> = scalars
+    .iter()
+    .map(|f| {
+        f.result.0.try_into().unwrap() 
+    })
+    .collect();
+
+
+
+    let mut segments = vec![];
+    let mut prev_input = ark_bn254::G1Affine::new_unchecked(ark_bn254::Fq::ZERO, ark_bn254::Fq::ZERO);
+    if !skip {
+        let houts = chunk_msm( hint_scalars, pub_vky.clone());
+        assert_eq!(houts.len(), num_chunks_per_scalar as usize * scalars.len());
+        for (msm_chunk_index, (hout_msm, is_valid_input, scr, op_hints)) in houts.into_iter().enumerate() {
+            let mut input_segment_info: Vec<(SegmentID, ElementType)> = vec![];
+            if msm_chunk_index > 0 {
+                let prev_msm_id = (segment_id + msm_chunk_index -1) as u32;
+                input_segment_info.push((prev_msm_id, ElementType::G1));
+            }
+
+            let sc= &scalars[msm_chunk_index/num_chunks_per_scalar as usize];
+            input_segment_info.push((sc.id, ElementType::ScalarElem));
+
+            prev_input = hout_msm;
+
+            segments.push(Segment { 
+                id: (segment_id + msm_chunk_index) as u32, 
+                is_valid_input,
+                parameter_ids: input_segment_info, 
+                result: (DataType::G1Data(hout_msm), ElementType::G1), 
+                hints: op_hints, scr_type: ScriptType::MSM(msm_chunk_index as u32),
+                scr,
+            });
+        }
+    } else {
+        let hout_msm: ark_bn254::G1Affine = ark_bn254::G1Affine::identity();
+        for msm_chunk_index in 0..num_chunks_per_scalar*scalars.len() as u32 {
+            let mut input_segment_info: Vec<(SegmentID, ElementType)> = vec![];
+            if msm_chunk_index > 0 {
+                let prev_msm_id = segment_id as u32 + msm_chunk_index -1;
+                input_segment_info.push((prev_msm_id, ElementType::G1));
+            }
+            let sc= &scalars[(msm_chunk_index/num_chunks_per_scalar) as usize];
+            input_segment_info.push((sc.id, ElementType::ScalarElem));
+
+            segments.push(Segment { 
+                id: (segment_id as u32 + msm_chunk_index), 
+                is_valid_input: true,
+                parameter_ids: input_segment_info, 
+                result: (DataType::G1Data(hout_msm), ElementType::G1), 
+                hints: vec![], scr_type: ScriptType::MSM(msm_chunk_index),
+                scr: script! {},
+            });
+        }
+    }
+    segments
+}
+
+
+pub(crate) fn wrap_hint_hash_p(
+    skip: bool,
+    segment_id: usize,
+    in_t: &Segment,
+    pub_vky0: ark_bn254::G1Affine,
+) -> Segment {
+    let mut input_segment_info: Vec<(SegmentID, ElementType)> = vec![];
+    input_segment_info.push((in_t.id, ElementType::G1));
+
+    let t = in_t.result.0.try_into().unwrap();
+    let (mut p3, mut is_valid_input, mut scr, mut op_hints) = (ark_bn254::G1Affine::identity(), true, script! {}, vec![]);
+    if !skip {
+        (p3, is_valid_input, scr, op_hints) = chunk_hash_p(
+            t,
+            pub_vky0,
+        );
+        // op_hints.extend_from_slice(&DataType::G1Data(t).get_hash_preimage_as_hints());
+    }
+    Segment { id: segment_id as u32, is_valid_input, parameter_ids: input_segment_info, result: (DataType::G1Data(p3), ElementType::G1), hints: op_hints, scr_type: ScriptType::PreMillerHashP, scr }
+}
+
+pub(crate) fn wrap_hints_precompute_p(
+    skip: bool,
+    segment_id: usize,
+    in_py: &Segment,
+    in_px: &Segment,
+) -> Segment {
+    
+    let mut input_segment_info: Vec<(SegmentID, ElementType)> = vec![];
+    input_segment_info.push((in_py.id, ElementType::FieldElem));
+    input_segment_info.push((in_px.id, ElementType::FieldElem));
+
+    let (mut p3d, mut is_valid_input, mut scr, mut op_hints) = (ark_bn254::G1Affine::identity(), true, script! {}, vec![]);
+    // let mut tap_prex = script! {};
+    if !skip {
+        let in_py = in_py.result.0.try_into().unwrap();
+        let in_px = in_px.result.0.try_into().unwrap();
+        (p3d, is_valid_input, scr, op_hints) = chunk_precompute_p(in_py, in_px);
+    }
+    
+    Segment { id:  segment_id as u32, is_valid_input, parameter_ids: input_segment_info, result: (DataType::G1Data(p3d), ElementType::G1), hints: op_hints, scr_type: ScriptType::PreMillerPrecomputeP, scr }
+}
+
+pub(crate) fn wrap_hints_precompute_p_from_hash(
+    skip: bool,
+    segment_id: usize,
+    in_p: &Segment,
+) -> Segment {
+    
+    let mut input_segment_info: Vec<(SegmentID, ElementType)> = vec![];
+    input_segment_info.push((in_p.id, ElementType::G1));
+
+    let (mut p3d, mut is_valid_input, mut scr, mut op_hints) = (ark_bn254::G1Affine::identity(), true, script! {}, vec![]);
+    if !skip {
+        let in_p = in_p.result.0.try_into().unwrap();
+        (p3d, is_valid_input, scr, op_hints) = chunk_precompute_p_from_hash(in_p);
+    }
+    
+    Segment { id:  segment_id as u32, is_valid_input, parameter_ids: input_segment_info, result: (DataType::G1Data(p3d), ElementType::G1), hints: op_hints, scr_type: ScriptType::PreMillerPrecomputePFromHash, scr }
+}
+
+pub(crate) fn wrap_hint_hash_c(  
+    skip: bool,  
+    segment_id: usize,
+    in_c: Vec<Segment>,
+) -> Segment {
+    
+    let mut input_segment_info: Vec<(SegmentID, ElementType)> = vec![];
+    let fqvec: Vec<ark_ff::BigInt<4>> = in_c
+    .iter()
+    .map(|f| {
+        f.result.0.try_into().unwrap()
+    })
+    .collect();
+
+    in_c
+    .iter()
+    .rev()
+    .for_each(|f| {
+        input_segment_info.push((f.id, ElementType::FieldElem));
+    });
+
+    let (mut c, mut is_valid_input, mut scr, mut op_hints) = (ark_bn254::Fq6::ONE, true, script! {}, vec![]);
+    if !skip {
+        (c, is_valid_input, scr, op_hints) = chunk_hash_c(fqvec);
+    }
+    
+    Segment { id:  segment_id as u32, is_valid_input, parameter_ids: input_segment_info, result: (DataType::Fp6Data(c), ElementType::Fp6), hints: op_hints, scr_type: ScriptType::PreMillerHashC, scr }
+}
+
+pub(crate) fn wrap_hint_hash_c_inv(  
+    skip: bool,  
+    segment_id: usize,
+    in_c: Vec<Segment>,
+) -> Segment {
+    
+    let mut input_segment_info: Vec<(SegmentID, ElementType)> = vec![];
+    let fqvec: Vec<ark_ff::BigInt<4>> = in_c
+    .iter()
+    .map(|f| {
+        f.result.0.try_into().unwrap()
+    })
+    .collect();
+
+    in_c
+    .iter()
+    .rev()
+    .for_each(|f| {
+        input_segment_info.push((f.id, ElementType::FieldElem));
+    });
+
+    let (mut c, mut is_valid_input, mut scr, mut op_hints) = (ark_bn254::Fq6::ONE, true, script! {}, vec![]);
+    if !skip {
+        (c, is_valid_input, scr, op_hints) = chunk_hash_c_inv(fqvec);
+    }
+    
+    Segment { id:  segment_id as u32, is_valid_input, parameter_ids: input_segment_info, result: (DataType::Fp6Data(c), ElementType::Fp6), hints: op_hints, scr_type: ScriptType::PreMillerHashCInv, scr }
+}
+
+
+pub(crate) fn wrap_chunk_final_verify(
+    skip: bool,
+    segment_id: usize,
+    in_a: &Segment,
+    in_t4: &Segment,
+    in_q4: Vec<Segment>,
+    fixedacc_const: ark_bn254::Fq6,
+) -> Segment {
+
+    let mut input_segment_info: Vec<(SegmentID, ElementType)> = vec![
+        (in_t4.id, ElementType::G2EvalPoint),
+        (in_a.id, ElementType::Fp6),
+    ];
+    let t4: ElemG2Eval = in_t4.result.0.try_into().unwrap();
+    let a: ark_bn254::Fq6  = in_a.result.0.try_into().unwrap();
+    for v in in_q4.iter().rev() {
+        input_segment_info.push((v.id, ElementType::FieldElem))
+    }
+    let q4xc0: ark_ff::BigInt<4> =  in_q4[0].result.0.try_into().unwrap();
+    let q4xc1: ark_ff::BigInt<4> =  in_q4[1].result.0.try_into().unwrap();
+    let q4yc0: ark_ff::BigInt<4> =  in_q4[2].result.0.try_into().unwrap();
+    let q4yc1: ark_ff::BigInt<4> =  in_q4[3].result.0.try_into().unwrap();
+    let q4 = ark_bn254::G2Affine::new_unchecked(ark_bn254::Fq2::new(q4xc0.into(), q4xc1.into()), ark_bn254::Fq2::new(q4yc0.into(), q4yc1.into()));
+
+    let (mut is_valid, mut scr, mut op_hints) = (true, script! {}, vec![]);
+    if !skip {
+        (is_valid, scr, op_hints) = chunk_final_verify(
+            a,
+            fixedacc_const,
+            t4.t,
+            q4,
+        );
+
+        // op_hints.extend_from_slice(&Element::Fp12v0(a).get_hash_preimage_as_hints());
+    }
+    let is_valid_fq = if is_valid {
+        ark_ff::BigInt::<4>::one()
+    } else {
+        ark_ff::BigInt::<4>::zero()
+    };
+
+    
+    Segment {
+        id: segment_id as u32,
+        is_valid_input: true,
+        parameter_ids: input_segment_info,
+        result: (DataType::U256Data(is_valid_fq), ElementType::FieldElem),
+        hints: op_hints,
+        scr_type: ScriptType::PostMillerFinalVerify,
+        scr
+    }
+}
\ No newline at end of file
diff --git a/bitvm/src/chunk/helpers.rs b/bitvm/src/chunk/helpers.rs
new file mode 100644
index 000000000..429ed36a2
--- /dev/null
+++ b/bitvm/src/chunk/helpers.rs
@@ -0,0 +1,230 @@
+use ark_ff::{BigInt, BigInteger};
+
+use crate::bigint::U256;
+use crate::chunk::wrap_hasher::BLAKE3_HASH_LENGTH;
+use crate::treepp::*;
+
+const LIMB_SIZE: u32 = U256::LIMB_SIZE; 
+
+#[cfg(test)]
+pub(crate) fn unpack_limbs_to_nibbles() -> Script {
+    U256::transform_limbsize(LIMB_SIZE,4)
+}
+
+pub fn pack_nibbles_to_limbs() -> Script {
+    U256::transform_limbsize(4,LIMB_SIZE)
+}
+
+pub fn pack_bytes_to_limbs() -> Script {
+    U256::transform_limbsize(8,LIMB_SIZE)
+}
+
+pub(crate) fn extern_bigint_to_nibbles(msg: ark_ff::BigInt<4>) -> [u8; 64] {
+    let v = fq_to_chunked_bits(msg, 4);
+    let vu8: Vec<u8> = v.iter().map(|x| (*x) as u8).collect();
+    vu8.try_into().unwrap()
+}
+
+fn fq_to_chunked_bits(fq: BigInt<4>, limb_size: usize) -> Vec<u32> {
+    let bits: Vec<bool> = ark_ff::BitIteratorBE::new(fq.as_ref()).collect();
+    assert!(bits.len() == 256);
+    bits.chunks(limb_size)
+        .map(|chunk| {
+            let mut factor = 1;
+                let res = chunk.iter().rev().fold(0, |acc, &x| {
+                    let r = acc + if x { factor } else { 0 };
+                    factor *= 2;
+                    r
+                });
+                res
+        })
+        .collect()
+}
+
+pub(crate) fn extern_hash_fps(fqs: Vec<ark_bn254::Fq>) -> [u8; 64] {
+    let mut msgs: Vec<[u8; 64]> = Vec::new();
+    for fq in fqs {
+        let v = fq_to_chunked_bits(fq.into(), 4);
+        let nib_arr: Vec<u8> = v.into_iter().map(|x| x as u8).collect();
+        msgs.push(nib_arr.try_into().unwrap());
+    }
+    extern_hash_nibbles(msgs)
+}
+
+pub(crate) fn extern_hash_nibbles(msgs: Vec<[u8; 64]>) -> [u8; 64] {
+    assert!(msgs.len() == 4 || msgs.len() == 2 || msgs.len() == 12 || msgs.len() == 14 || msgs.len() == 6 || msgs.len() == 8);
+
+    fn hex_string_to_nibble_array(hex_string: &str) -> Vec<u8> {
+        hex_string
+            .chars()
+            .map(|c| c.to_digit(16).expect("Invalid hex character") as u8) // Convert each char to a nibble
+            .collect()
+    }
+
+    fn nib_to_byte_array(digits: &[u8]) -> Vec<u8> {
+        let mut msg_bytes = Vec::with_capacity(digits.len() / 2);
+    
+        for nibble_pair in digits.chunks(2) {
+            let byte = (nibble_pair[0] << 4) | (nibble_pair[1] & 0b00001111);
+            msg_bytes.push(byte);
+        }
+    
+        fn le_to_be_byte_array(byte_array: Vec<u8>) -> Vec<u8> {
+            assert!(byte_array.len() % 4 == 0, "Byte array length must be a multiple of 4");
+            byte_array
+                .chunks(4) // Process each group of 4 bytes (one u32)
+                .flat_map(|chunk| chunk.iter().rev().cloned()) // Reverse each chunk
+                .collect()
+        }
+        le_to_be_byte_array(msg_bytes)
+    }
+
+    fn replace_first_n_with_zero(hex_string: &str, n: usize) -> String {
+        let mut result = String::new();
+    
+        if hex_string.len() <= n {
+            result.push_str(&"0".repeat(hex_string.len())); // If n >= string length, replace all
+        } else {
+            result.push_str(&"0".repeat(n)); // Replace first n characters
+            result.push_str(&hex_string[0..(hex_string.len()-n)]); // Keep the rest of the string
+        }
+        result
+    }
+
+    fn extern_hash_fp_var(fqs: Vec<[u8; 64]>) -> [u8;64] {
+        let mut vs = Vec::new();
+        for fq in fqs {
+            let v = fq.to_vec();
+            vs.extend_from_slice(&v);
+        }
+        let nib_arr: Vec<u8> = vs.clone().into_iter().collect();
+        let p_bytes:Vec<u8> = nib_to_byte_array(&nib_arr);
+
+        let hash_out = blake3::hash(&p_bytes).to_string();
+
+        let hash_out = replace_first_n_with_zero(&hash_out.to_string(), (32-BLAKE3_HASH_LENGTH)*2);
+        let res = hex_string_to_nibble_array(&hash_out);
+        res.try_into().unwrap()
+    }
+
+    extern_hash_fp_var(msgs)
+}
+
+pub(crate) fn extern_nibbles_to_bigint(nibble_array: [u8; 64]) -> ark_ff::BigInt<4> {
+    let bit_array: Vec<bool> = nibble_array
+    .iter()
+    .flat_map(|&nibble| (0..4).rev().map(move |i| (nibble >> i) & 1 != 0)) // Extract each bit
+    .collect();
+
+    let r: ark_ff::BigInt<4> = BigInt::from_bits_be(&bit_array);
+    r
+}
+
+pub(crate) fn extern_nibbles_to_limbs(nibble_array: [u8; 64]) -> [u32; U256::N_LIMBS as usize] {
+    let bit_array: Vec<bool> = nibble_array
+    .iter()
+    .flat_map(|&nibble| (0..4).rev().map(move |i| (nibble >> i) & 1 != 0)) // Extract each bit
+    .collect();
+
+    let r: ark_ff::BigInt<4> = BigInt::from_bits_be(&bit_array);
+    fn bigint_to_limbs(n: num_bigint::BigInt, n_bits: u32) -> Vec<u32> {
+        let mut limbs = vec![];
+        let mut limb: u32 = 0;
+        for i in 0..n_bits as u64 {
+            if i > 0 && i % (LIMB_SIZE as u64) == 0 {
+                limbs.push(limb);
+                limb = 0;
+            }
+            if n.bit(i) {
+                limb += 1 << (i % (LIMB_SIZE as u64));
+            }
+        }
+        limbs.push(limb);
+        limbs
+    }
+
+    let mut limbs = bigint_to_limbs(r.into(), 256);
+    limbs.reverse();
+    limbs.try_into().unwrap()
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use ark_ff::{Field, PrimeField, UniformRand};
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+
+    use crate::{chunk::wrap_hasher::hash_utils::{hash_fp14, hash_fp2, hash_fp4, hash_fp6}, execute_script};
+    use crate::bn254::fq::Fq;
+
+    #[test]
+    fn test_emulate_fq_to_nibbles() {
+        let mut prng = ChaCha20Rng::seed_from_u64(1777);
+        let p = ark_bn254::Fq::rand(&mut prng);
+        pub(crate) fn emulate_fq_to_nibbles_scripted(msg: ark_bn254::Fq) -> [u8; 64] {
+            let scr = script! {
+                {Fq::push(msg)}
+                {unpack_limbs_to_nibbles()}
+            };
+            let exec_result = execute_script(scr);
+            let mut arr = [0u8; 64];
+            for i in 0..exec_result.final_stack.len() {
+                let v = exec_result.final_stack.get(i);
+                if v.is_empty() {
+                    arr[i] = 0;
+                } else {
+                    arr[i] = v[0];
+                }
+            }
+            arr
+        }
+        let pb1 = extern_bigint_to_nibbles(p.into_bigint());
+        let pb2 = emulate_fq_to_nibbles_scripted(p);
+        assert_eq!(pb1, pb2);
+    }
+
+    #[test]
+    fn test_emulate_external_hash() {
+        fn emulate_extern_hash_fps_scripted(msgs: Vec<ark_bn254::Fq>) -> [u8; 64] {
+            assert!(msgs.len() == 4 || msgs.len() == 2 || msgs.len() == 12 || msgs.len() == 14 || msgs.len() == 6 || msgs.len() == 8);
+
+            let scr = script! {
+                for i in 0..msgs.len() {
+                    {Fq::push(msgs[i])}
+                }
+                if msgs.len() == 4 {
+                    {hash_fp4()}
+                } else if msgs.len() == 2 {
+                    {hash_fp2()}
+                } else if msgs.len() == 6 {
+                    {hash_fp6()}
+                } else if msgs.len() == 14 {
+                    {hash_fp14()}
+                }
+                {unpack_limbs_to_nibbles()}
+            };
+            let exec_result = execute_script(scr.clone());
+            let mut arr = [0u8; 64];
+            for i in 0..exec_result.final_stack.len() {
+                let v = exec_result.final_stack.get(i);
+                if v.is_empty() {
+                    arr[i] = 0;
+                } else {
+                    arr[i] = v[0];
+                }
+            }
+            arr
+        }
+    
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let _f = ark_bn254::Fq12::rand(&mut prng);
+
+        let ps = vec![ark_bn254::Fq::ONE + ark_bn254::Fq::ONE; 14];
+        let res = emulate_extern_hash_fps_scripted(ps.clone());
+        let res2 = extern_hash_fps(ps);
+        assert_eq!(res, res2);
+    }
+
+}
+
diff --git a/bitvm/src/chunk/mod.rs b/bitvm/src/chunk/mod.rs
new file mode 100644
index 000000000..bad30cd06
--- /dev/null
+++ b/bitvm/src/chunk/mod.rs
@@ -0,0 +1,17 @@
+mod wrap_hasher;
+mod wrap_wots;
+
+mod helpers;
+mod elements;
+
+pub mod api;
+mod api_runtime_utils;
+pub mod api_compiletime_utils;
+
+pub mod g16_runner_core;
+pub mod g16_runner_utils;
+
+mod taps_msm;
+mod taps_point_ops;
+mod taps_ext_miller;
+mod taps_mul;
\ No newline at end of file
diff --git a/bitvm/src/chunk/taps_ext_miller.rs b/bitvm/src/chunk/taps_ext_miller.rs
new file mode 100644
index 000000000..8fca3d84e
--- /dev/null
+++ b/bitvm/src/chunk/taps_ext_miller.rs
@@ -0,0 +1,763 @@
+use crate::bigint::U254;
+use crate::bn254::fq12::Fq12;
+use crate::bn254::fq6::Fq6;
+use crate::bn254::g2::{hinted_mul_by_char_on_phi_sq_q, G2Affine};
+use crate::bn254::utils::*;
+use crate::bn254::g1::{hinted_from_eval_points, G1Affine};
+use crate::bn254::fq2::Fq2;
+use crate::chunk::wrap_hasher::hash_messages;
+use crate::chunk::elements::ElementType;
+use crate::{
+    bn254::{fp254impl::Fp254Impl, fq::Fq},
+    treepp::*,
+};
+use ark_ff::{AdditiveGroup, Field, PrimeField};
+use bitcoin::opcodes::all::{OP_BOOLAND, OP_FROMALTSTACK, OP_TOALTSTACK};
+use core::ops::Neg;
+
+use super::wrap_hasher::hash_utils::{hash_fp6, hash_g2acc_with_hashed_le};
+
+
+
+pub(crate) fn chunk_precompute_p(
+    hint_in_py: ark_ff::BigInt<4>,
+    hint_in_px: ark_ff::BigInt<4>,
+) -> (ark_bn254::G1Affine, bool, Script, Vec<Hint>) {
+    let mut hints = vec![];
+
+    // is py and px less than f_p i.e. are they field elements
+    let mut px: ark_bn254::Fq = ark_bn254::Fq::ONE;
+    let mut py: ark_bn254::Fq = ark_bn254::Fq::ONE;
+
+    let are_valid_field_elems = hint_in_py < ark_bn254::Fq::MODULUS && hint_in_px < ark_bn254::Fq::MODULUS && hint_in_py != ark_ff::BigInt::<4>::zero();
+    if are_valid_field_elems {
+        px = hint_in_px.into();
+        py = hint_in_py.into();
+    }
+
+    let (on_curve_scr, on_curve_hint) = G1Affine::hinted_is_on_curve(px, py);
+    if are_valid_field_elems {
+        hints.extend_from_slice(&on_curve_hint);
+    }
+
+    let p = ark_bn254::G1Affine::new_unchecked(px, py);
+    let (eval_xy, eval_hints) =  hinted_from_eval_points(p);
+
+    let valid_point = are_valid_field_elems && py != ark_bn254::Fq::ZERO && p.is_on_curve();
+    let mock_pd = ark_bn254::G1Affine::new_unchecked(ark_bn254::Fq::ONE, ark_bn254::Fq::ONE);
+    
+    let pd = if valid_point {
+        hints.extend_from_slice(&eval_hints);
+
+        let pdy = py.inverse().unwrap();
+        let pdx = -px * pdy;
+        
+        ark_bn254::G1Affine::new_unchecked(pdx, pdy)
+    } else {
+        mock_pd
+    };
+
+    let drop_and_return_scr = script! {
+        // [px, py] [pdhash]
+        {G1Affine::drop()}
+        // [] [pdhash]
+        {G1Affine::push(mock_pd)} // mock values for pd,these values won't be useful as we add {0} <- skip output hash check for invalid input
+        // [pd] [pdhash]
+        {0} // skip output hash check because input was invalid
+    };
+    let scr = script! {
+        // [hints] [pdhash, py, px]
+        {Fq2::fromaltstack()}
+        // [hints, px, py] [pdhash]
+        // {is_field_element}
+        // [hints, px, py, px, py]
+        {Fq2::copy(0)}
+
+        { Fq::push_hex(Fq::MODULUS) }
+        { U254::lessthan(1, 0) } // py < p
+        OP_TOALTSTACK
+        { Fq::push_hex(Fq::MODULUS) }
+        { U254::lessthan(1, 0) } // px < p
+        OP_FROMALTSTACK 
+        OP_BOOLAND
+        OP_IF // IS_VALID_FIELD_ELEM
+            // px, py <p : valid field elems
+            // [hints, px, py] [pdhash]
+            {Fq::is_zero_keep_element(0)}
+            OP_IF // PY = 0
+                {drop_and_return_scr.clone()}
+            OP_ELSE // PY != 0
+                // [hints, px, py]
+                {Fq2::copy(0)}
+                // [hints, px, py, px, py]
+                {on_curve_scr}
+                OP_IF // IS_ON_CURVE
+                    // [hints, px, py]
+                    {eval_xy}
+                    // [pdx, pdy] [pdhash]
+                    {1}
+                    // [pdx, pdy, 1] [pdhash]
+                OP_ELSE  // IS_NOT_ON_CURVE
+                    {drop_and_return_scr.clone()}
+                OP_ENDIF
+            OP_ENDIF
+        OP_ELSE // IS_NOT_VALID_FIELD_ELEM
+            // px | py > p : at least one invalid field elem
+            {drop_and_return_scr}
+        OP_ENDIF
+        // [pd, 0/1] [pdhash]
+    };
+
+    let _hash_scr = script! {
+        {hash_messages(vec![ElementType::G1])}
+        OP_TRUE     
+    };
+
+    (pd, valid_point, scr, hints)
+}
+
+// precompute P
+pub(crate) fn chunk_precompute_p_from_hash(
+    hint_in_p: ark_bn254::G1Affine,
+) -> (ark_bn254::G1Affine, bool, Script, Vec<Hint>) {
+    let mut hints = vec![];
+
+    let mut px: ark_bn254::Fq = ark_bn254::Fq::ONE;
+    let mut py: ark_bn254::Fq = ark_bn254::Fq::ONE;
+
+    let py_is_not_zero =  hint_in_p.y != ark_bn254::Fq::ZERO;
+    if py_is_not_zero {
+        px = hint_in_p.x;
+        py = hint_in_p.y;
+    }
+
+    let (on_curve_scr, on_curve_hint) = G1Affine::hinted_is_on_curve(px, py);
+    if py_is_not_zero {
+        hints.extend_from_slice(&on_curve_hint);
+    }
+
+    let p = ark_bn254::G1Affine::new_unchecked(px, py);
+    let (eval_xy, eval_hints) =  hinted_from_eval_points(p);
+
+    let valid_point = py_is_not_zero && p.is_on_curve();
+    let mock_pd = ark_bn254::G1Affine::new_unchecked(ark_bn254::Fq::ONE, ark_bn254::Fq::ONE);
+    
+    let pd = if valid_point {
+        hints.extend_from_slice(&eval_hints);
+
+        let pdy = p.y.inverse().unwrap();
+        let pdx = -p.x * pdy;
+        
+        ark_bn254::G1Affine::new_unchecked(pdx, pdy)
+    } else {
+        mock_pd
+    };
+
+    let drop_and_return_scr = script! {
+        // [px, py] [pdhash, phash]
+        {G1Affine::push(mock_pd)} // mock values for pd,these values won't be useful as we add {0} <- skip output hash check for invalid input
+        // [p, pd] [pdhash, phash]
+        {0} // skip output hash check because input was invalid
+    };
+    let scr = script! {
+        // [hints, px, py] [pdhash, phash]
+        {Fq::is_zero_keep_element(0)}
+        OP_IF // PY = 0
+            {drop_and_return_scr.clone()}
+        OP_ELSE // PY != 0
+            // [hints, px, py]
+            {Fq2::copy(0)}
+            // [hints, px, py, px, py]
+            {on_curve_scr}
+            OP_IF // IS_ON_CURVE
+                // [hints, px, py]
+                {Fq2::copy(0)}
+                // [hints, px, py, px, py]
+                {eval_xy}
+                // [px, py, pdx, pdy] [pdhash, phash]
+                {1}
+                // [p, pd, 1] [pdhash, phash]
+            OP_ELSE  // IS_NOT_ON_CURVE
+                {drop_and_return_scr.clone()}
+            OP_ENDIF
+        OP_ENDIF
+
+    // [pd, 0/1] [pdhash]
+    };
+
+    let _hash_scr = script! {
+        {hash_messages(vec![ElementType::G1, ElementType::G1])}
+        OP_TRUE     
+    };
+
+    (pd, valid_point, scr, hints)
+}
+
+// Assumes (1 + f) is valid Fp12 i.e. f != Fq6::ZERO
+// power is in the range (0, 1, 2)
+pub(crate) fn chunk_frob_fp12(f: ark_bn254::Fq6, power: usize) -> (ark_bn254::Fq6, bool, Script, Vec<Hint>) {
+    let fp12 = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f);
+    let (hinted_frob_scr, hints_frobenius_map) = Fq12::hinted_frobenius_map(power, fp12);
+    let g = fp12.frobenius_map(power);
+
+    let ops_scr = script! {
+        // [f]
+        {Fq6::push(ark_bn254::Fq6::ONE)}
+        {Fq6::copy(6)}
+        // [f, (1, f)]
+        {hinted_frob_scr}
+        // [f, (1, g)]
+        {Fq6::roll(6)} 
+        {Fq6::push(ark_bn254::Fq6::ONE)}
+        {Fq6::equalverify()}
+        // [f, g]
+        {1} // input was valid
+    };
+
+    let valid_input = true;
+    (g.c1, valid_input, ops_scr, hints_frobenius_map)
+}
+ 
+pub(crate) fn chunk_hash_c(
+    hint_in_c: Vec<ark_ff::BigInt<4>>,
+) -> (ark_bn254::Fq6, bool, Script, Vec<Hint>) {
+    assert_eq!(hint_in_c.len(), 6);
+
+    let mock_f = ark_bn254::Fq6::ONE;
+    let are_valid_fps = hint_in_c.iter().filter(|f| **f < ark_bn254::Fq::MODULUS).count() == hint_in_c.len();
+
+    let f = if are_valid_fps {
+        let fvec = hint_in_c.iter().map(|f| ark_bn254::Fq::from(*f)).collect::<Vec<ark_bn254::Fq>>();
+        ark_bn254::Fq6::new(
+            ark_bn254::Fq2::new(fvec[0], fvec[1]),
+            ark_bn254::Fq2::new(fvec[2], fvec[3]),
+            ark_bn254::Fq2::new(fvec[4], fvec[5]),
+        )
+    } else {
+        mock_f
+    };
+
+    let ops_scr = script! {
+        // [] [fhash, fqs]
+        for _ in 0..6 {
+            {Fq::fromaltstack()}
+        }
+        // [fqs, fqs] [fhash]
+        {Fq6::copy(0)}
+        for _ in 0..6 {
+            { Fq::push_hex(Fq::MODULUS) }
+            { U254::lessthan(1, 0) } // a < p
+            OP_TOALTSTACK
+        }
+        {1}
+        for _ in 0..6 {
+            OP_FROMALTSTACK
+            OP_BOOLAND
+        }
+        // are_valid_fps -> 1 -> verify_final_hash
+        // not_valid_fps -> 0 -> skip verify_final_hash 
+        // [fqs, 0/1] [fhash]
+        OP_IF 
+            // [fs] [fhash]
+            {1} // verify_final_hash
+            // [fs, 1] [fhash]
+        OP_ELSE
+            // [fs] [fhash]
+            {Fq6::drop()}
+            {Fq6::push(mock_f)}
+            {0} // skip verify_final hash
+            // [mock_fs, 0] [fhash]
+        OP_ENDIF
+        // [fs, 0/1] [fhash]
+    };
+    let _hash_scr = script! {
+        {hash_messages(vec![ElementType::Fp6])}
+        OP_TRUE
+    };
+
+    (
+        f,
+        are_valid_fps,
+        ops_scr,
+        vec![],
+    )
+}
+
+pub(crate) fn chunk_hash_c_inv(
+    hint_in_c: Vec<ark_ff::BigInt<4>>,
+) -> (ark_bn254::Fq6, bool, Script, Vec<Hint>) {
+    assert_eq!(hint_in_c.len(), 6);
+
+    let mock_f = ark_bn254::Fq6::ONE;
+    let are_valid_fps = hint_in_c.iter().filter(|f| **f < ark_bn254::Fq::MODULUS).count() == hint_in_c.len();
+    
+    let f = if are_valid_fps {
+        let fvec = hint_in_c.iter().map(|f| ark_bn254::Fq::from(*f)).collect::<Vec<ark_bn254::Fq>>();
+        let tmp = ark_bn254::Fq6::new(
+            ark_bn254::Fq2::new(fvec[0], fvec[1]),
+            ark_bn254::Fq2::new(fvec[2], fvec[3]),
+            ark_bn254::Fq2::new(fvec[4], fvec[5]),
+        );
+        
+        tmp.neg()
+    } else {
+        mock_f
+    };
+
+    let ops_scr = script! {
+        // [] [fneghash, fqs]
+        for _ in 0..6 {
+            {Fq::fromaltstack()}
+        }
+        // [fqs] [fneghash]
+        {Fq6::copy(0)}
+        // [fqs, fqs] [fneghash]
+        for _ in 0..6 {
+            { Fq::push_hex(Fq::MODULUS) }
+            { U254::lessthan(1, 0) } // a < p
+            OP_TOALTSTACK
+        }
+        {1}
+        for _ in 0..6 {
+            OP_FROMALTSTACK
+            OP_BOOLAND
+        }
+        // are_valid_fps -> 1 -> verify_final_hash
+        // not_valid_fps -> 0 -> skip verify_final_hash 
+        // [fqs, 0/1] [fneghash]
+        OP_IF 
+            // [fs] [fneghash]
+            for _ in 0..6 {
+                {Fq::roll(5)}
+                {Fq::neg(0)}
+            }
+            // [-fs] [fneghash]
+            {1} // verify_final_hash
+            // [-fs, 1] [fneghash]
+        OP_ELSE
+            // [fs] [fneghash]
+            {Fq6::drop()}
+            {Fq6::push(mock_f)}
+            {0} // skip verify_final hash
+            // [fs, 0] [fneghash]
+        OP_ENDIF
+        // [fs, 0/1] [fneghash]
+    };
+    let _hash_scr = script! {
+        {hash_messages(vec![ElementType::Fp6])}
+        OP_TRUE
+    };
+
+    (
+        f,
+        are_valid_fps,
+        ops_scr,
+        vec![],
+    )
+}
+
+pub(crate) fn chunk_final_verify(
+    f: ark_bn254::Fq6,  
+    fixed_p1q1: ark_bn254::Fq6,
+
+    t4: ark_bn254::G2Affine,
+    q4: ark_bn254::G2Affine,
+) -> (bool, Script, Vec<Hint>) {
+
+
+    let (qq, precomp_q_scr, hints) = hinted_mul_by_char_on_phi_sq_q(q4);
+
+    let t4_is_in_subgroup = t4 == -qq;
+    let fp12_is_unity = f + fixed_p1q1 == ark_bn254::Fq6::ZERO;
+    let is_valid = t4_is_in_subgroup && fp12_is_unity;
+
+    let fp12_is_unity_scr = script!(
+        // [f]
+        {Fq6::push(fixed_p1q1)}
+        {Fq6::add(6, 0)}
+        for _ in 0..6 {
+            {Fq::push(ark_bn254::Fq::ZERO)}
+            {Fq::equal(1, 0)}
+            OP_TOALTSTACK
+        }
+        {1}
+        for _ in 0..6 {
+            OP_FROMALTSTACK
+            OP_BOOLAND
+        }
+        // [0/1]
+    );
+
+    let ops_scr = script! {
+        // [f, {t4, ht4_le}] [in_t4hash, in_fhash, q4]
+        {Fq::toaltstack()}
+        {G2Affine::toaltstack()}
+        // [f] [in_t4hash, in_fhash, q4, ht4le, t4]
+        {Fq6::copy(0)}
+        {fp12_is_unity_scr}
+        // [f, fp12_is_unity]  [in_t4hash, in_fhash, q4, ht4le, t4]
+        {G2Affine::fromaltstack()}
+        {Fq::fromaltstack()}
+        // [f, fp12_is_unity, {t4, ht4le}] [in_t4hash, in_fhash, q4]
+        {G2Affine::fromaltstack()}
+        // [f, fp12_is_unity, {t4, ht4le}, q4] [in_t4hash, in_fhash]
+        {precomp_q_scr}
+        // [f, fp12_is_unity, {t4, ht4le}, q4_dash] [in_t4hash, in_fhash]
+        {Fq::toaltstack()}
+        {Fq::neg(0)}
+        {Fq::fromaltstack()}
+        {Fq::neg(0)}
+        // [f, fp12_is_unity, {t4, ht4le}, -q4_dash] [in_t4hash, in_fhash]
+        for _ in 0..4 {
+            {Fq::copy(8)}
+        }
+        // [f, fp12_is_unity, {t4, ht4le}, -q4_dash, t4] [in_t4hash, in_fhash]
+        {G2Affine::equal()}
+        // [f, fp12_is_unity, {t4, ht4le}, t4_is_in_subgroup] [in_t4hash, in_fhash]
+        OP_TOALTSTACK
+        // [f, fp12_is_unity, {t4, ht4le}] [in_t4hash, in_fhash, t4_is_in_subgroup]
+        {45} OP_ROLL
+        // [f, {t4, ht4le}, fp12_is_unity] [in_t4hash, in_fhash, t4_is_in_subgroup]
+        OP_FROMALTSTACK 
+        OP_BOOLAND
+        // [f, {t4, ht4le}, is_valid] [in_t4hash, in_fhash,]
+        {Fq::fromaltstack()} {Fq::fromaltstack()}
+        {18} OP_ROLL
+        // [f, {t4, ht4le}, in_fhash, in_t4hash, is_valid] []
+        OP_TOALTSTACK
+        {Fq::toaltstack()} {Fq::toaltstack()}
+        // [f, {t4, ht4le}] [is_valid, in_t4hash, in_fhash]
+    };
+
+    let hash_scr = script! {
+        // [f, {t4, ht4le}] [is_valid, in_t4hash, in_fhash]
+        {Fq::toaltstack()}
+        {G2Affine::toaltstack()}
+        // [ f ] [is_valid, in_t4hash, in_fhash, {ht4le, t4}]
+        {hash_fp6()}
+        // [ Hash_f ] [is_valid, in_t4hash, in_fhash, {ht4le, t4}]
+        {G2Affine::fromaltstack()}
+        {Fq::fromaltstack()}
+        // [ Hash_f {t4, ht4le}] [is_valid, in_t4hash, in_fhash]
+        {Fq::roll(5)} {Fq::fromaltstack()}
+        {Fq::equalverify(1, 0)}
+        // [ {t4, ht4le}] [is_valid, in_t4hash]
+        {hash_g2acc_with_hashed_le()}
+        {Fq::fromaltstack()}
+        {Fq::equalverify(1, 0)}
+
+        OP_FROMALTSTACK
+        // [is_valid]
+        OP_NOT
+        // [is_not_valid]
+    };
+
+    let scr = script! {
+        {ops_scr}
+        {hash_scr}
+    };
+
+    (
+        is_valid,
+        scr,
+        hints,
+    )
+}
+
+
+#[cfg(test)] 
+mod test {
+    use crate::bn254::fp254impl::Fp254Impl;
+    use crate::bn254::fq::Fq;
+    use crate::bn254::fq2::Fq2;
+    
+    use crate::chunk::helpers::extern_hash_nibbles;
+    use crate::chunk::taps_point_ops::frob_q_power;
+    use crate::chunk::wrap_hasher::hash_messages;
+    use crate::chunk::elements::{CompressedStateObject, DataType, ElemG2Eval, ElementType};
+    use crate::chunk::taps_ext_miller::{chunk_final_verify, chunk_hash_c};
+    
+    use crate::chunk::taps_ext_miller::*;
+    use ark_ff::{BigInt, Field, PrimeField};
+    use ark_std::UniformRand;
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+
+    #[test]
+    fn test_chunk_frob_fp12() {
+        let mut prng = ChaCha20Rng::seed_from_u64(1);
+        let f = ark_bn254::Fq12::rand(&mut prng);
+        let f_n = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+
+        for (power, should_corrupt_output_hash) in [(1, true), (2, true), (3, true), (1, false), (2, false), (3, false)] { // data points
+            let (hout, input_is_valid, hout_scr, hout_hints) = chunk_frob_fp12(f_n.c1, power);
+            assert!(input_is_valid);
+            let hout = DataType::Fp6Data(hout);
+            let f_n_c1_elem = DataType::Fp6Data(f_n.c1);
+    
+            let mut output_hash = hout.to_hash();
+            if should_corrupt_output_hash {
+                if let CompressedStateObject::Hash(r) = output_hash {
+                    let random_hash = extern_hash_nibbles(vec![r, r]);
+                    output_hash = CompressedStateObject::Hash(random_hash);
+                }
+            }
+            let bitcom_scr = script!{
+                {output_hash.as_hint_type().push()}
+                {Fq::toaltstack()}
+                {f_n_c1_elem.to_hash().as_hint_type().push()}
+                {Fq::toaltstack()}
+            };
+    
+            let hash_scr = script! {
+                {hash_messages(vec![ElementType::Fp6, ElementType::Fp6])}
+                OP_TRUE
+            };
+    
+            let tap_len = hash_scr.len() + hout_scr.len();
+    
+            let scr = script! {
+                for h in hout_hints {
+                    {h.push()}
+                }
+                for h in f_n_c1_elem.to_witness(ElementType::Fp6) {
+                    {h.push()}
+                }
+                {bitcom_scr}
+                {hout_scr}
+                {hash_scr}
+            };
+    
+            let res = execute_script(scr);
+            if res.final_stack.len() > 1 {
+                for i in 0..res.final_stack.len() {
+                    println!("{i:} {:?}", res.final_stack.get(i));
+                }
+            }
+            assert_eq!(should_corrupt_output_hash, res.success); // if output is corrupted, should have successful disprove
+            assert!(res.final_stack.len() == 1);
+            assert!(res.stats.max_nb_stack_items < 1000);
+            println!("chunk_frob_fp12(power: {}) disprovable({}) script {} stack {:?}", power, should_corrupt_output_hash, tap_len, res.stats.max_nb_stack_items);
+
+        }
+    
+    
+    }
+
+    #[test]
+    fn test_tap_hash_c() {
+        let mut prng = ChaCha20Rng::seed_from_u64(179);
+        let f = ark_bn254::Fq6::rand(&mut prng);
+        let fqvec = f.to_base_prime_field_elements().collect::<Vec<ark_bn254::Fq>>();
+        let fqvec1 = fqvec.clone().into_iter().map(|f| f.into()).collect::<Vec<ark_ff::BigInt<4>>>(); // random
+        let fqvec2 = (0..6).map(|_| ark_bn254::Fq::MODULUS).collect::<Vec<BigInt<4>>>(); // not a field elem
+        let fqvec3 = (0..6).map(|_| ark_ff::BigInt::zero()).collect::<Vec<BigInt<4>>>(); // all zeros
+        let fqvec4 = (0..6).map(|_| { ark_ff::BigInt::<4>::one() << 255}).collect::<Vec<BigInt<4>>>(); // > 254 bit
+
+        for (fqvec, disprovable) in [(fqvec1, false), (fqvec2, true), (fqvec3, false), (fqvec4, true)] {
+            let (hint_out, input_is_valid, tap_hash_c, hint_script) = chunk_hash_c(fqvec.clone());
+            assert_eq!(input_is_valid, !disprovable);
+
+            let fqvec: Vec<DataType> = fqvec.into_iter().map(DataType::U256Data).collect();
+            let hint_out = DataType::Fp6Data(hint_out);
+    
+            let bitcom_scr = script!{
+                {hint_out.to_hash().as_hint_type().push()}
+                {Fq::toaltstack()}
+                for f in fqvec.iter().rev() {
+                    {f.to_hash().as_hint_type().push()}
+                    {Fq::toaltstack()}                
+                }
+            };
+            let hash_scr = script! {
+                {hash_messages(vec![ElementType::Fp6])}
+                OP_TRUE
+            };
+    
+            let tap_len = tap_hash_c.len() + hash_scr.len();
+            let script = script! {
+                for h in hint_script {
+                    { h.push() }
+                }
+                {bitcom_scr}
+                {tap_hash_c}
+                {hash_scr}
+            };
+            let res = execute_script(script);
+            if res.final_stack.len() > 1 {
+                for i in 0..res.final_stack.len() {
+                    println!("{i:} {:?}", res.final_stack.get(i));
+                }
+            }
+            assert_eq!(res.success, disprovable);
+            assert!(res.final_stack.len() == 1);
+            println!("chunk_hash_c disprovable({}) script {} stack {}", disprovable, tap_len, res.stats.max_nb_stack_items);
+        }
+    }
+
+    #[test]
+    fn test_tap_precompute_p() {
+        // runtime
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let p = ark_bn254::G1Affine::rand(&mut prng);
+
+        let p0 = [ark_ff::BigInt::<4>::one(), ark_ff::BigInt::<4>::zero()];
+        let p1 = [ark_ff::BigInt::<4>::zero(), ark_ff::BigInt::<4>::zero()];
+        let p2 = [ark_ff::BigInt::<4>::zero(), ark_ff::BigInt::<4>::one()];
+        let p3 = [ark_ff::BigInt::<4>::one() << 255, ark_ff::BigInt::<4>::one() << 255]; 
+        let p4: [ark_ff::BigInt::<4>; 2] = [p.x.into(), p.y.into()]; 
+        let p5: [ark_ff::BigInt::<4>; 2] = [p.x.double().into(), p.y.into()]; 
+        let dataset = vec![(p0, true), (p1, true), (p2, true), (p3, true), (p4, false), (p5, true)];
+
+        for (p, disprovable) in dataset {
+            let (hint_out, input_is_valid, tap_prex, hint_script) = chunk_precompute_p(p[1], p[0]);
+            assert_eq!(input_is_valid, !disprovable);
+            let hint_out = DataType::G1Data(hint_out);
+            let bitcom_scr = script!{
+                {hint_out.to_hash().as_hint_type().push()}
+                {Fq::toaltstack()}    
+                {Hint::U256(p[0].into()).push()}
+                {Hint::U256(p[1].into()).push()}
+                {Fq2::toaltstack()}     
+            };
+            let hash_scr = script! {
+                {hash_messages(vec![ElementType::G1])}
+                OP_TRUE     
+            };
+    
+            let tap_len = tap_prex.len();
+            let script = script! {
+                for h in hint_script {
+                    { h.push() }
+                }
+                {bitcom_scr}
+                {tap_prex}
+                {hash_scr}
+            };
+            let res = execute_script(script);
+            if res.final_stack.len() > 1 {
+                for i in 0..res.final_stack.len() {
+                    println!("{i:} {:?}", res.final_stack.get(i));
+                }
+            }
+            assert_eq!(res.success, disprovable);
+            assert!(res.final_stack.len() == 1);
+            println!("chunk_precompute_p disprovable({}) script {} stack {}", disprovable, tap_len, res.stats.max_nb_stack_items);
+        }
+    }
+
+    #[test]
+    fn test_tap_precompute_p_from_hash() {
+        // runtime
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let p1 = ark_bn254::G1Affine::rand(&mut prng);
+        let p2 = ark_bn254::G1Affine::new_unchecked(ark_bn254::Fq::ONE, ark_bn254::Fq::ZERO);
+        let p3 = ark_bn254::G1Affine::new_unchecked(ark_bn254::Fq::ZERO, ark_bn254::Fq::ZERO);
+        let p4 = ark_bn254::G1Affine::new_unchecked(p1.x, p1.x);
+        let dataset = vec![(p1, false), (p2, true), (p3, true), (p4, true)];
+
+        for (p, disprovable) in dataset {
+            let (hint_out, input_is_valid, tap_prex, hint_script) = chunk_precompute_p_from_hash(p);
+            assert_eq!(input_is_valid, !disprovable);
+            let hint_out = DataType::G1Data(hint_out);
+            let p = DataType::G1Data(p);
+    
+            let bitcom_scr = script!{
+                {hint_out.to_hash().as_hint_type().push()}
+                {Fq::toaltstack()}    
+                {p.to_hash().as_hint_type().push()}
+                {Fq::toaltstack()}
+            };
+            let preim_hints = p.to_witness(ElementType::G1);
+            let hash_scr = script! {
+                {hash_messages(vec![ElementType::G1, ElementType::G1])}
+                OP_TRUE     
+            };
+    
+            let tap_len = tap_prex.len();
+            let script = script! {
+                for h in hint_script {
+                    { h.push() }
+                }
+                for h in preim_hints {
+                    {h.push()}
+                }
+                {bitcom_scr}
+                {tap_prex}
+                {hash_scr}
+            };
+            let res = execute_script(script);
+            if res.final_stack.len() > 1 {
+                for i in 0..res.final_stack.len() {
+                    println!("{i:} {:?}", res.final_stack.get(i));
+                }
+            }
+            assert_eq!(res.success, disprovable);
+            assert!(res.final_stack.len() == 1);
+            println!("chunk_precompute_p_from_hash disprovable({}) script {} stack {}", disprovable, tap_len, res.stats.max_nb_stack_items);
+        }
+    }
+
+    #[test]
+    fn test_tap_verify_fp12_is_unity() {
+        // runtime
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let f = ark_bn254::Fq12::rand(&mut prng);
+        let g = f.inverse().unwrap();
+        let f =  ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+        let g =  ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, g.c1/g.c0);
+
+        let q4 = ark_bn254::G2Affine::rand(&mut prng);
+        let t = frob_q_power(q4, 3).neg();
+        let t4 = ElemG2Eval {t, p2le:[ark_bn254::Fq2::ONE; 2], one_plus_ab_j_sq: ark_bn254::Fq6::ONE, a_plus_b: [ark_bn254::Fq2::ONE; 2]};
+
+
+
+        let (is_valid, tap_scr, mut hint_script) = chunk_final_verify(f.c1, g.c1, t4.t, q4);
+        assert!(is_valid);
+
+        let f_c1 = DataType::Fp6Data(f.c1);
+        let t4 = DataType::G2EvalData(t4);
+        
+        // [f, t]
+        hint_script.extend_from_slice(&f_c1.to_witness(ElementType::Fp6));
+        hint_script.extend_from_slice(&t4.to_witness(ElementType::G2EvalPoint));
+    
+        let bitcom_scr = script!{
+            // thash
+            {t4.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+            // fhash
+            {f_c1.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+
+            {Fq::push(q4.y.c1)}
+            {Fq::toaltstack()}
+            {Fq::push(q4.y.c0)}
+            {Fq::toaltstack()}
+            {Fq::push(q4.x.c1)}
+            {Fq::toaltstack()}
+            {Fq::push(q4.x.c0)} 
+            {Fq::toaltstack()}
+        };
+    
+        let tap_len = tap_scr.len();
+        let script = script! {
+            for h in hint_script {
+                { h.push() }
+            }
+            {bitcom_scr}
+            {tap_scr}
+        };
+        let res = execute_script(script);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(!res.success);
+        assert!(res.final_stack.len() == 1);
+        println!("chunk_final_verify: disprovable(false) script {} stack {}", tap_len, res.stats.max_nb_stack_items);
+    }
+
+}
diff --git a/bitvm/src/chunk/taps_msm.rs b/bitvm/src/chunk/taps_msm.rs
new file mode 100644
index 000000000..bb7d0c7a1
--- /dev/null
+++ b/bitvm/src/chunk/taps_msm.rs
@@ -0,0 +1,541 @@
+
+use crate::bigint::U254;
+use crate::bn254::fq::Fq;
+use crate::bn254::g1::G1Affine;
+use crate::bn254::fr::Fr;
+use crate::bn254::msm;
+use crate::bn254::utils::Hint;
+use crate::chunk::api::NUM_PUBS;
+use crate::{
+    bn254::fp254impl::Fp254Impl,
+    treepp::*,
+};
+use ark_ec::{AffineRepr, CurveGroup};
+use ark_ff::{AdditiveGroup, Field, PrimeField};
+
+use super::wrap_hasher::hash_messages;
+use super::elements::{ ElementType};
+use crate::bn254::fq2::Fq2;
+
+pub(crate) fn chunk_msm(input_ks: Vec<ark_ff::BigInt<4>>, qs: Vec<ark_bn254::G1Affine>) -> Vec<(ark_bn254::G1Affine, bool, Script, Vec<Hint>)> {
+    assert_eq!(qs.len(), NUM_PUBS);
+    assert_eq!(input_ks.len(), NUM_PUBS);
+    let num_pubs = input_ks.len();
+
+    let mut ks = (0..num_pubs).map(|_| ark_ff::BigInt::<4>::from(1u64)).collect::<Vec<ark_ff::BigInt::<4>>>();
+    let scalars_are_valid_elems = input_ks.iter().filter(|f| **f < ark_bn254::Fr::MODULUS).count() == num_pubs;
+    if scalars_are_valid_elems {
+        ks = input_ks.clone();
+    }
+
+    let chunks = msm::g1_multi_scalar_mul(qs.clone(), ks.into_iter().map(|f| f.into()).collect());
+
+    // [G1AccDashHash, G1AccHash, k0, k1, k2]
+    // [hints, G1Acc]
+
+    let mut chunk_scripts = vec![];
+    for (msm_tap_index, chunk) in chunks.iter().enumerate() {
+        let ops_script = 
+        if msm_tap_index == 0 {
+            script! {
+                { G1Affine::push( ark_bn254::G1Affine::new_unchecked(ark_bn254::Fq::ZERO, ark_bn254::Fq::ZERO))}
+                { Fr::fromaltstack()}
+
+                { Fr::copy(0)}
+                { Fr::push_hex(Fr::MODULUS) }
+                { U254::lessthan(1, 0) }
+
+                // [hints, G1Acc, k, 0/1]
+                OP_IF
+                    // [hints, G1Acc, k]
+                    {chunk.1.clone()}
+                    // [G1Acc, G1AccDash]
+                    {Fq2::roll(2)} {Fq2::drop()}
+                    //M: [G1AccDash]
+                    //A: [G1AccDashHash]
+                    {1}
+                OP_ELSE 
+                    // [G1Acc, k]
+                    {Fr::drop()}
+                    {G1Affine::drop()}
+                    // [] [G1AccDashHash]
+                    {Fq::push(ark_bn254::Fq::ONE)}
+                    {Fq::push(ark_bn254::Fq::ZERO)}
+                    //M: [Mock_G1AccDash]
+                    //A: [G1AccDashHash]
+                    {0}
+                OP_ENDIF
+            }
+        } else {
+            script! {
+                // [hints, G1Acc] [G1AccDashHash, G1AccHash]
+                {Fr::fromaltstack()}
+
+                {Fr::copy(0)}
+                { Fr::push_hex(Fr::MODULUS) }
+                { U254::lessthan(1, 0) }
+
+                // [hints, G1Acc, k, 0/1] [G1AccDashHash, G1AccHash]
+                OP_IF
+                    // [hints, G1Acc, k]
+                    // [hints, G1Acc, k] [G1AccDashHash, G1AccHash]
+                    {chunk.1.clone()}
+                    // [G1Acc, G1AccDash] [G1AccDashHash, G1AccHash]
+                    {1}
+                    // [G1Acc, G1AccDash, 1] [G1AccDashHash, G1AccHash]
+                OP_ELSE 
+                    // [G1Acc, k]
+                    for _ in 0..num_pubs {
+                        {Fr::drop()}
+                    }
+                    {Fq::push(ark_bn254::Fq::ONE)}
+                    {Fq::push(ark_bn254::Fq::ZERO)}
+                    // [G1Acc, Mock_G1AccDash] [G1AccDashHash, G1AccHash]
+                    {0}
+                    // [G1Acc, Mock_G1AccDash, 0] [G1AccDashHash, G1AccHash]
+                OP_ENDIF
+            }
+            // [G1Acc, Mock_G1AccDash, 1/0] [G1AccDashHash, G1AccHash]
+        };
+
+        let _hash_script = script! {
+            if msm_tap_index == 0 {
+                //M: [G1AccDash]
+                //A: [G1AccDashHash]
+                {hash_messages(vec![ElementType::G1])}
+            } else {
+                // [G1Acc, G1AccDash] [G1AccDashHash, G1AccHash]
+                {hash_messages(vec![ElementType::G1, ElementType::G1])}
+            }
+            OP_TRUE
+        };
+
+        let sc = script! {
+            {ops_script}
+            // {hash_script}
+        };
+
+        if scalars_are_valid_elems {
+            chunk_scripts.push((chunk.0, scalars_are_valid_elems, sc, chunk.2.clone()));
+        } else {
+            chunk_scripts.push((chunk.0, scalars_are_valid_elems, sc, vec![]));
+        }
+
+    }
+    chunk_scripts
+}
+
+// Hash P
+//vk0: G1Affine
+
+pub(crate) fn chunk_hash_p(
+    hint_in_t: ark_bn254::G1Affine,
+    hint_in_q: ark_bn254::G1Affine,
+) -> (ark_bn254::G1Affine, bool, Script, Vec<Hint>) {
+    // r (gp3) = t(msm) + q(vk0)
+    let (tx, qx, ty, qy) = (hint_in_t.x, hint_in_q.x, hint_in_t.y, hint_in_q.y);
+    let t = ark_bn254::G1Affine::new_unchecked(tx, ty);
+    let q = ark_bn254::G1Affine::new_unchecked(qx, qy);
+    let (add_scr, add_hints) = G1Affine::hinted_check_add(t, q);
+    let r = (t + q).into_affine();
+    
+    let ops_script = script!{
+        // [t] [hash_r, hash_t]
+        { Fq2::copy(0)} 
+        // [t, t]
+        {G1Affine::push(q)}
+        // [t, t, q]
+        {add_scr}
+        // [t, r]
+        {1}
+    };
+
+    let _hash_script = script! {
+        {hash_messages(vec![ElementType::G1, ElementType::G1])}
+        OP_TRUE
+    };
+
+    let sc = script! {
+        {ops_script}
+        // {hash_script}
+    };
+
+    let mut all_hints = vec![];
+    all_hints.extend_from_slice(&add_hints);
+
+    let valid_inputs = true;
+    (r, valid_inputs, sc, all_hints)
+}
+
+
+#[cfg(test)]
+mod test {
+
+    use crate::{
+        bn254::{fq::Fq, fq2::Fq2, msm::dfs_with_constant_mul}, chunk::{elements::{CompressedStateObject, DataType}, helpers::extern_hash_nibbles}, execute_script_without_stack_limit
+    };
+    use super::*;
+    use ark_ff::{BigInt, Field, UniformRand};
+    
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+
+    fn u32_to_bits_vec(value: u32, window: usize) -> Vec<u8> {
+        let mut bits = Vec::with_capacity(window);
+        for i in (0..window).rev() {
+            bits.push(((value >> i) & 1) as u8);
+        }
+        bits
+    }
+
+    #[test]
+    fn test_precompute_table() {
+        let window = 8;
+        let mut prng = ChaCha20Rng::seed_from_u64(2);
+        let q = ark_bn254::G1Affine::rand(&mut prng);
+        let mut p_mul: Vec<ark_bn254::G1Affine> = Vec::new();
+        p_mul.push(ark_bn254::G1Affine::zero());
+        for _ in 1..(1 << window) {
+            p_mul.push((*p_mul.last().unwrap() + q).into_affine());
+        }
+
+        let scr = script!{ 
+            
+            {dfs_with_constant_mul(0, window as u32 - 1, 0, &p_mul) }
+        };
+        let index = 1; //u32::rand(&mut prng) % (1 << window);
+        let index_bits = u32_to_bits_vec(index, window);
+
+        println!("index_bits {:?}", index_bits);
+        println!("script len {:?}", scr.len());
+        let script = script! {
+            for i in index_bits {
+                {i}
+            }
+            {scr}
+            {Fq::push(p_mul[index as usize].y)}
+            {Fq::equalverify(1, 0)}
+            {Fq::push(p_mul[index as usize].x)}
+            {Fq::equalverify(1, 0)}
+            OP_TRUE
+        };
+        let res = execute_script(script);
+        for i in 0..res.final_stack.len() {
+            println!("{i:} {:?}", res.final_stack.get(i));
+        }
+        assert!(res.success);
+    }
+
+
+    #[test]
+    fn test_hinted_check_tangent_line() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G1Affine::rand(&mut prng);
+        let two_inv = ark_bn254::Fq::ONE.double().inverse().unwrap();
+        let three_div_two = (ark_bn254::Fq::ONE.double() + ark_bn254::Fq::ONE) * two_inv;
+        let mut alpha = t.x.square();
+        alpha /= t.y;
+        alpha *= three_div_two;
+        // -bias
+        let bias_minus = alpha * t.x - t.y;
+        assert_eq!(alpha * t.x - t.y, bias_minus);
+
+        let nx = alpha.square() - t.x.double();
+        let ny = bias_minus - alpha * nx;
+
+        let (hinted_check_line, hints) = G1Affine::hinted_check_tangent_line(t, alpha);
+        let (hinted_double_line, hintsd) = G1Affine::hinted_double(t, alpha);
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            {Fq::push(alpha)}
+            {Fq::push(bias_minus)}
+            { Fq::push(t.x) }
+            { Fq::push(t.y) }
+            { hinted_check_line.clone() }
+            OP_VERIFY
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+        println!(
+            "hinted_check_line: {} @ {} stack",
+            hinted_check_line.len(),
+            exec_result.stats.max_nb_stack_items
+        );
+
+        let script = script! {
+            for hint in hintsd {
+                { hint.push() }
+            }
+            {Fq::push(alpha)}
+            {Fq::push(bias_minus)}
+            { Fq::push(t.x) }
+            { hinted_double_line.clone() }
+            {Fq::push(nx)}
+            {Fq::push(ny)}
+            {Fq2::equalverify()}
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+        println!(
+            "hinted_double_line: {} @ {} stack",
+            hinted_double_line.len(),
+            exec_result.stats.max_nb_stack_items
+        );
+
+        // doubling check
+    }
+
+    #[test]
+    fn test_hinted_affine_add_line() {
+        // alpha = (t.y - q.y) / (t.x - q.x)
+        // bias = t.y - alpha * t.x
+        // x' = alpha^2 - T.x - Q.x
+        // y' = -bias - alpha * x'
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G1Affine::rand(&mut prng);
+        let q = ark_bn254::G1Affine::rand(&mut prng);
+        let alpha = (t.y - q.y) / (t.x - q.x);
+        // -bias
+        let bias_minus = alpha * t.x - t.y;
+
+        let x = alpha.square() - t.x - q.x;
+        let y = bias_minus - alpha * x;
+        let (hinted_add_line, hints) = G1Affine::hinted_add(t.x, q.x, alpha);
+
+        let script = script! {
+            for hint in hints {
+                { hint.push() }
+            }
+            {Fq::push(alpha)}
+            {Fq::push(bias_minus)}
+            { Fq::push(t.x) }
+            { Fq::push(q.x) }
+            { hinted_add_line.clone() }
+            { Fq::push(x) }
+            { Fq::push(y) }
+            { Fq2::equalverify() }
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+        println!(
+            "hinted_add_line: {} @ {} stack",
+            hinted_add_line.len(),
+            exec_result.stats.max_nb_stack_items
+        );
+    }
+
+    #[test]
+    fn test_tap_hash_var_p() {
+        let mut prng = ChaCha20Rng::seed_from_u64(1);
+        let q = ark_bn254::G1Affine::rand(&mut prng);
+        let t = ark_bn254::G1Affine::rand(&mut prng);
+        let r = (t + q).into_affine();
+
+        for should_corrupt_output_hash in [true, false] {
+            let (hint_out, input_is_valid,  op_scr, mut hint_script) = chunk_hash_p( t, q);
+            assert!(input_is_valid);
+            assert_eq!(r, hint_out);
+            let t = DataType::G1Data(t);
+            let hint_out = DataType::G1Data(hint_out);
+            hint_script.extend_from_slice(&t.to_witness(ElementType::G1));
+            
+            let mut output_hash = hint_out.to_hash();
+
+            if should_corrupt_output_hash {
+                if let CompressedStateObject::Hash(r) = output_hash {
+                    let random_hash = extern_hash_nibbles(vec![r, r]);
+                    output_hash = CompressedStateObject::Hash(random_hash);
+                }
+            }
+    
+            let bitcom_scr = script!{
+                {output_hash.as_hint_type().push()}
+                {Fq::toaltstack()}
+                {t.to_hash().as_hint_type().push()}
+                {Fq::toaltstack()}
+            };
+            let hash_script = script! {
+                {hash_messages(vec![ElementType::G1, ElementType::G1])}
+                OP_TRUE
+            };
+    
+            let tap_len = op_scr.len();
+            let script = script! {
+                for h in hint_script {
+                    { h.push() }
+                }
+                {bitcom_scr}
+                {op_scr}
+                {hash_script}
+            };
+    
+            let res = execute_script(script);
+            if res.final_stack.len() > 1 {
+                for i in 0..res.final_stack.len() {
+                    println!("{i:} {:?}", res.final_stack.get(i));
+                }
+            }
+            assert_eq!(res.success, should_corrupt_output_hash);
+            assert!(res.final_stack.len() == 1);
+    
+            println!("chunk_hash_p disprovable({}) script {} stack {}", should_corrupt_output_hash, tap_len, res.stats.max_nb_stack_items);
+        }
+    }
+
+
+    #[test]
+    fn test_tap_msm_valid_inputs() {
+        let mut prng = ChaCha20Rng::seed_from_u64(1);
+        let q = ark_bn254::G1Affine::rand(&mut prng);
+        let scalar = ark_bn254::Fr::rand(&mut prng);
+        let scalars = vec![scalar.into()];
+        let qs = vec![q];
+
+        let hints_msm = chunk_msm(scalars.clone(), qs.clone());
+
+        for msm_chunk_index in 0..hints_msm.len() {
+            let input_is_valid = hints_msm[msm_chunk_index].1;
+            assert!(input_is_valid);
+            let hint_in = if msm_chunk_index > 0 {
+                DataType::G1Data(hints_msm[msm_chunk_index-1].0)
+            } else {
+                DataType::G1Data(ark_bn254::G1Affine::identity())
+            };
+            let hint_out = DataType::G1Data(hints_msm[msm_chunk_index].0);
+            
+            let bitcom_scr = script!{
+                {hint_out.to_hash().as_hint_type().push()}
+                {Fq::toaltstack()}
+                if msm_chunk_index > 0 {
+                    {hint_in.to_hash().as_hint_type().push()}
+                    {Fq::toaltstack()}
+                }
+
+                {Fr::push(ark_bn254::Fr::from(scalar))}
+                {Fr::toaltstack()}  
+            };
+    
+            let mut op_hints = vec![];
+            if msm_chunk_index > 0 {
+                op_hints.extend_from_slice(&hint_in.to_witness(ElementType::G1));
+            }
+
+            let hash_script = script! {
+                if msm_chunk_index == 0 {
+                    //M: [G1AccDash]
+                    //A: [G1AccDashHash]
+                    {hash_messages(vec![ElementType::G1])}
+                } else {
+                    // [G1Acc, G1AccDash] [G1AccDashHash, G1AccHash]
+                    {hash_messages(vec![ElementType::G1, ElementType::G1])}
+                }
+                OP_TRUE
+            };
+            let script = script! {
+                for h in &hints_msm[msm_chunk_index].3 {
+                    {h.push()}
+                }
+                for i in op_hints {
+                    {i.push()}
+                }
+                {bitcom_scr}
+                {hints_msm[msm_chunk_index].2.clone()}
+                {hash_script}
+            };
+    
+            let tap_len = script.len();
+
+            let res = execute_script(script);
+            if res.final_stack.len() > 1 {
+                for i in 0..res.final_stack.len() {
+                    println!("{i:} {:?}", res.final_stack.get(i));
+                }
+            }
+            assert!(!res.success);
+            assert!(res.final_stack.len() == 1);
+
+            println!("script {} stack {}", tap_len, res.stats.max_nb_stack_items);
+        }
+
+
+    }
+
+    #[test]
+    fn test_tap_msm_invalid_inputs_scalar_not_fr() {
+        let mut prng = ChaCha20Rng::seed_from_u64(1);
+        let q = ark_bn254::G1Affine::rand(&mut prng);
+        let scalar = BigInt::one() << 255;
+        let scalars = vec![scalar];
+        let qs = vec![q];
+
+        let hints_msm = chunk_msm(scalars.clone(), qs.clone());
+
+        for msm_chunk_index in 0..hints_msm.len() {
+            let input_is_valid = hints_msm[msm_chunk_index].1;
+            assert!(!input_is_valid);
+            let hint_in = if msm_chunk_index > 0 {
+                DataType::G1Data(hints_msm[msm_chunk_index-1].0)
+            } else {
+                DataType::G1Data(ark_bn254::G1Affine::identity())
+            };
+            let hint_out = DataType::G1Data(hints_msm[msm_chunk_index].0);
+            
+            let bitcom_scr = script!{
+                {hint_out.to_hash().as_hint_type().push()}
+                {Fq::toaltstack()}
+                if msm_chunk_index > 0 {
+                    {hint_in.to_hash().as_hint_type().push()}
+                    {Fq::toaltstack()}
+                }
+                {Hint::U256(scalar.into()).push()}
+                {Fr::toaltstack()}  
+            };
+    
+            let mut op_hints = vec![];
+            if msm_chunk_index > 0 {
+                op_hints.extend_from_slice(&hint_in.to_witness(ElementType::G1));
+            }
+            let hash_script = script! {
+                if msm_chunk_index == 0 {
+                    //M: [G1AccDash]
+                    //A: [G1AccDashHash]
+                    {hash_messages(vec![ElementType::G1])}
+                } else {
+                    // [G1Acc, G1AccDash] [G1AccDashHash, G1AccHash]
+                    {hash_messages(vec![ElementType::G1, ElementType::G1])}
+                }
+                OP_TRUE
+            };
+            let script = script! {
+                for h in &hints_msm[msm_chunk_index].3 {
+                    {h.push()}
+                }
+                for i in op_hints {
+                    {i.push()}
+                }
+                {bitcom_scr}
+                {hints_msm[msm_chunk_index].2.clone()}
+                {hash_script}
+            };
+    
+            let res = execute_script(script);
+            if res.final_stack.len() > 1 {
+                for i in 0..res.final_stack.len() {
+                    println!("{i:} {:?}", res.final_stack.get(i));
+                }
+            }
+            assert!(res.success);
+            assert!(res.final_stack.len() == 1);
+        }
+
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/bitvm/src/chunk/taps_mul.rs b/bitvm/src/chunk/taps_mul.rs
new file mode 100644
index 000000000..10899f4f2
--- /dev/null
+++ b/bitvm/src/chunk/taps_mul.rs
@@ -0,0 +1,892 @@
+use ark_ff::{AdditiveGroup, Field};
+use crate::bn254::fq6::Fq6;
+use crate::bn254::g2::{hinted_ell_by_constant_affine};
+use crate::bn254::utils::{Hint};
+use crate::bn254::{fq12::Fq12, fq2::Fq2};
+use crate::chunk::wrap_hasher::hash_messages;
+use crate::treepp::*;
+use ark_ff::{ Fp12Config, Fp6Config};
+
+use super::elements::{ElementType};
+
+/// Input two sparse Fq6 elements where the third coefficient is Fq2::ZERO
+/// Multiply these elements and return result.
+/// Given m = (a, b, 0) n = (d, e, 0).
+/// Compute mxn = (ad, bd + ae, be)
+pub(crate) fn utils_fq6_ss_mul(m: ark_bn254::Fq6, n: ark_bn254::Fq6) -> (ark_bn254::Fq6, Script, Vec<Hint>) {
+    let a = m.c0;
+    let b = m.c1;
+    let d = n.c0;
+    let e = n.c1;
+
+    let g = a * d;
+    let h = b * d + a * e;
+    let i = b * e;
+    let result = ark_bn254::Fq6::new(g, h, i);
+
+    let (g_scr, g_hints) = Fq2::hinted_mul(2, d, 0, a);
+    // We use lc4 to compute h as it requires lesser number of tmul hints compared to doing the same thing with two LC2s
+    let (h_scr, h_hints) = Fq2::hinted_mul_lc4_keep_elements(b, d, e, a);
+    let (i_scr, i_hints) = Fq2::hinted_mul(2, e, 0, b);
+
+    let mut hints = vec![];
+    for hint in [i_hints, g_hints, h_hints] {
+        hints.extend_from_slice(&hint);
+    }
+
+    let scr = script! {
+        // [a, b, d, e]
+        {Fq2::copy(0)} {Fq2::copy(6)}
+        // [a, b, d, e, e, b]
+        {i_scr}
+        // [a, b, d, e, i]
+        {Fq2::toaltstack()}
+        // [a, b, d, e]
+        {Fq2::toaltstack()}
+        {Fq2::copy(0)} {Fq2::copy(6)}
+        // [a, b, d, d, a] [i, e]
+        {g_scr}
+        // [a, b, d, g] [i, e]
+        {Fq2::fromaltstack()} {Fq2::roll(2)}
+        {Fq2::toaltstack()}
+        // [a, b, d, e] [i, g]
+        {Fq2::roll(6)}
+        // [b, d, e, a] [i, g]
+        {h_scr} {Fq2::toaltstack()}
+        // [b, d, e, a] [i, g, h]
+        {Fq6::roll(2)}
+        // [a, b, d, e] [i, g, h]
+        {Fq2::fromaltstack()} {Fq2::fromaltstack()}
+        {Fq2::roll(2)} {Fq2::fromaltstack()}
+        // [a, b, d, e, g, h, i] 
+    };
+    (result, scr, hints)
+}
+
+/// Input a dense Fq6 element m <- (a, b, c) and a sparse Fq6 element n <- (d, e, 0)
+/// Multiply these elements and return result.
+/// Compute mxn = (ad + ce J^2, bd + ae, cd + be)
+pub(crate) fn utils_fq6_sd_mul(m: ark_bn254::Fq6, n: ark_bn254::Fq6) -> (ark_bn254::Fq6, Script, Vec<Hint>) {
+    let a = m.c0;
+    let b = m.c1;
+    let c = m.c2;
+    let d = n.c0;
+    let e = n.c1;
+    assert_eq!(n.c2, ark_bn254::Fq2::ZERO);
+
+    let g = a*d + c * e * ark_bn254::Fq6Config::NONRESIDUE;
+    let h = (b*d ) + (a * e);
+    let i = c * d + b * e;
+    let result = ark_bn254::Fq6::new(g, h, i);
+
+    let mut hints = vec![];
+    let (i_scr, i_hints) = Fq2::hinted_mul_lc4_keep_elements(c, d, e, b);
+    let (h_scr, h_hints) = Fq2::hinted_mul_lc4_keep_elements(d, b, e, a); 
+    let (g_scr, g_hints) = Fq2::hinted_mul_lc4_keep_elements(e * ark_bn254::Fq6Config::NONRESIDUE, c, d, a);
+
+
+    for hint in [i_hints, h_hints, g_hints] {
+        hints.extend_from_slice(&hint);
+    }
+
+    let mul_by_beta_sq_scr = script! {
+        {Fq6::mul_fq2_by_nonresidue()}
+    };
+
+    let scr = script! {
+        // [a, b, c, d, e]
+        {Fq2::roll(6)}
+         // [a, c, d, e, b]
+        {i_scr}
+        // [a, c, d, e, b, i]
+        {Fq2::toaltstack()}
+
+        // [a, c, d, e, b]
+        {Fq2::roll(2)}  {Fq2::roll(8)}
+        // [c, d, b, e, a]
+        {h_scr} 
+        {Fq2::toaltstack()}
+        // [c, d, b, e, a] [i, h]
+        {Fq2::copy(2)} {Fq2::toaltstack()}
+        // [c, d, b, e, a] [i, h, e]
+        {Fq2::toaltstack()}
+        {mul_by_beta_sq_scr}
+        // [c, d, b, ebeta] [i, h, e, a]
+        {Fq2::roll(6)}
+        // [d, b, ebeta, c] [i, h, e, a]
+        {Fq2::roll(6)}
+        // [b, ebeta, c, d] [i, h, e, a]
+        {Fq2::fromaltstack()}
+        // [b, ebeta, c, d, a] [i, h, e]
+        {g_scr}
+        // [b, ebeta, c, d, a, g] [i, h , e]
+        {Fq2::toaltstack()}
+        // [b, ebeta, c, d, a] [i, h, e, g]
+        {Fq2::roll(6)} {Fq2::drop()}
+         // [b, c, d, a] [i, h, e g]
+        {Fq6::roll(2)}
+         // [a,b, c, d,] [i, h, e, g]
+        {Fq2::fromaltstack()} {Fq2::fromaltstack()} 
+         // [a,b, c, d, g, e] [i, h]
+         {Fq2::roll(2)} {Fq2::toaltstack()}
+        //  {Fq2::push(ark_bn254::Fq2::ZERO)}
+        // [a,b, c, d, e, _f] [i, h, g]
+        {Fq6::fromaltstack()}
+        // [a, b, c, d, e, _f, g, h, i]
+    };
+    (result, scr, hints)
+}
+
+
+/// Given line evaluation f, line coeff (alpha_t3, neg_bias_t3) and point P3,
+/// Compute line evaluation 'g' at P3 and multiply it with f.
+/// Return Script and Hints for the computation and return the line evaluation g.
+/// Compute g = le_{t3} (P3); h = f * g;
+/// Return (g, Script(Compute), Hints(Compute))
+pub(crate) fn utils_multiply_by_line_eval(
+    f: ark_bn254::Fq6,
+    alpha_t3: ark_bn254::Fq2,
+    neg_bias_t3: ark_bn254::Fq2,
+    p3: ark_bn254::G1Affine,
+) -> (ark_bn254::Fq6, Script, Vec<Hint>) {
+
+    assert_eq!(f.c2, ark_bn254::Fq2::ZERO);
+
+    let mut l0_t3 = alpha_t3;
+    l0_t3.mul_assign_by_fp(&p3.x);
+    let mut l1_t3 = neg_bias_t3;
+    l1_t3.mul_assign_by_fp(&p3.y);
+
+    let (hinted_ell_t3, hints_ell_t3) = hinted_ell_by_constant_affine(p3.x, p3.y, alpha_t3, neg_bias_t3);
+
+    let g = ark_bn254::Fq6::new(l0_t3, l1_t3, ark_bn254::Fq2::ZERO);
+    let (_, fg_scr, fg_hints) = utils_fq6_ss_mul(g, f);
+    
+    let scr = script! {
+        // [f, p3]
+        {Fq2::copy(0)}
+        // [f, p3, p3]
+        {Fq2::push(alpha_t3)}
+        {Fq2::push(neg_bias_t3)}
+        // [f, p3, p3, a, b]
+        {Fq2::roll(4)}
+        // [f, p3, a, b, p3]
+        {hinted_ell_t3}
+        // [f, p3, le0, le1]
+        // [f, p3, g]
+        {Fq2::roll(8)} {Fq2::roll(8)}
+        // [p3, g, f]
+        {fg_scr}
+        // [p3, g, f, fg]
+    };
+
+    let mut hints = vec![];
+    hints.extend_from_slice(&hints_ell_t3);
+    hints.extend_from_slice(&fg_hints);
+
+    (g, scr, hints)
+
+}
+
+
+/// Compute product of two Fq12 elements in normalized form (1 + c J) <- (1 + a J) x (1 + b J).
+/// Input a, b and output c.
+// In this form (1 + c J) <- 1 + {(a+b)/(1 + ab J^2)}
+// => c . (1 + ab J^2) =?= (a + b)
+// a, b and c are passed as input to the script and the above equation is validated to show that c is the correct output
+// For invalid input i.e (1 + ab J ^2) == 0, return [a, b, c]
+pub(crate) fn utils_fq12_dd_mul(a: ark_bn254::Fq6, b: ark_bn254::Fq6) -> (ark_bn254::Fq6, bool, Script, Vec<Hint>) {
+    let mut hints = vec![];
+    let mock_value = ark_bn254::Fq6::ONE;
+
+    // compute ab in Script
+    let (ab_scr, ab_hints) = Fq6::hinted_mul(6, a, 0, b);
+    hints.extend_from_slice(&ab_hints);
+
+    // calculate denom
+    let beta_sq = ark_bn254::Fq12Config::NONRESIDUE;
+    let denom = ark_bn254::Fq6::ONE + a * b * beta_sq;
+
+    // is input valid ? output: mock_output
+    let (denom_mul_c_scr, c) = if denom != ark_bn254::Fq6::ZERO {
+        let c = (a + b) / denom;
+        let res = Fq6::hinted_mul(6, denom, 0, c);
+        hints.extend_from_slice(&res.1);
+        (res.0, c)
+    } else {
+        let scr = Fq6::hinted_mul(6, ark_bn254::Fq6::ONE, 0, ark_bn254::Fq6::ONE).0;
+        (scr, mock_value)
+    };
+
+    let mul_by_beta_sq_scr = script! {
+        {Fq6::mul_fq2_by_nonresidue()}
+        {Fq2::roll(4)} {Fq2::roll(4)}
+    };
+
+    let scr = script! {
+        // [hints a, b, c] []
+        {Fq6::toaltstack()}
+        // [hints a, b] [c]
+        {Fq12::copy(0)}
+        // [hints a, b, a, b] [c]
+        {ab_scr}
+        // [hints, a, b, ab]
+        {mul_by_beta_sq_scr}
+        // [hints, a, b, ab*beta_sq]
+        {Fq6::push(ark_bn254::Fq6::ONE)}
+        {Fq6::add(6, 0)}
+        // [hints, a, b, denom] [c]
+        {Fq6::copy(0)}
+        {Fq6::is_zero()} // denom =?= 0
+        OP_IF 
+            // [a, b, denom] [c]
+            {Fq6::drop()}
+            {Fq6::fromaltstack()}
+            // [a, b c] []
+            {Fq6::drop()}
+            {Fq6::push(mock_value)}
+            {0}
+            // [a, b mock_c, 0] []
+        OP_ELSE
+            {Fq6::fromaltstack()}
+            // [hints, a, b, denom, c]
+            {Fq6::copy(0)}
+            // [hints, a, b, denom, c, c]
+            {Fq12::roll(6)}
+            // [hints, a, b, c, denom, c]
+
+            {denom_mul_c_scr}
+
+            // [a, b c, denom_c]
+            {Fq12::copy(12)}
+            // [a, b c, denom_c, a b]
+            {Fq6::add(6, 0)}
+            // [a, b c, denom_c, a+b]
+            {Fq6::equalverify()}
+            // [a, b, c] []
+            {1}
+            // {a, b, c, 1}
+        OP_ENDIF
+        // [a, b, c, 0/1] []
+    };
+
+    let input_is_valid = denom != ark_bn254::Fq6::ZERO;
+    (c, input_is_valid, scr, hints)
+}
+
+/// Compute square of an Fq12 elements in normalized form (1 + c J) <- (1 + a J) x (1 + a J).
+/// Input a, and output c.
+// In this form (1 + c J) <- 1 + {(2a)/(1 + a^2 J^2)}
+// => c . (1 + a^2 J^2) =?= 2a
+// a c are passed as input to the script and the above equation is validated to show that c is the correct output
+// Assumes input a is valid i.e (1 + a^2 J ^2) != 0
+pub(crate) fn utils_fq12_square(a: ark_bn254::Fq6) -> (ark_bn254::Fq6, bool, Script, Vec<Hint>) {
+    let mut hints = vec![];
+    let mock_value = ark_bn254::Fq6::ONE;
+
+    // compute ab in Script
+    let (asq_scr, ab_hints) = Fq6::hinted_square(a);
+    hints.extend_from_slice(&ab_hints);
+
+    // calculate denom
+    let beta_sq = ark_bn254::Fq12Config::NONRESIDUE;
+    let denom = ark_bn254::Fq6::ONE + a * a * beta_sq;
+
+    // is input valid ? output: mock_output
+    let (denom_mul_c_scr, c) = if denom != ark_bn254::Fq6::ZERO {
+        let c = (a + a) / denom;
+        let res = Fq6::hinted_mul(6, denom, 0, c);
+        hints.extend_from_slice(&res.1);
+        (res.0, c)
+    } else {
+        let scr = Fq6::hinted_mul(6, ark_bn254::Fq6::ONE, 0, ark_bn254::Fq6::ONE).0;
+        (scr, mock_value)
+    };
+
+    let mul_by_beta_sq_scr = script! {
+        {Fq6::mul_fq2_by_nonresidue()}
+        {Fq2::roll(4)} {Fq2::roll(4)}
+    };
+
+    let scr = script! {
+        // [hints a, c] []
+        {Fq6::toaltstack()}
+        // [hints, a], [c]
+        {Fq6::copy(0)}
+        // [hints a, a] [c]
+        {asq_scr}
+        // [hints, a, asq]
+        {mul_by_beta_sq_scr}
+        // [hints, a, asq*beta_sq]
+        {Fq6::push(ark_bn254::Fq6::ONE)}
+        {Fq6::add(6, 0)}
+        // [hints, a, denom] [c]
+        {Fq6::copy(0)}
+        {Fq6::is_zero()}
+        OP_IF 
+            // [a, denom] [c]
+            {Fq6::drop()}
+            {Fq6::push(mock_value)}
+            {0}
+            // [a, mock_c, 0]
+        OP_ELSE
+            {Fq6::fromaltstack()}
+            // [hints, a, denom, c]
+            {Fq6::copy(0)}
+            // [hints, a, denom, c, c]
+            {Fq6::roll(12)} {Fq6::roll(12)}
+            // [hints, a, c, denom, c]
+            {denom_mul_c_scr}
+            // [a, c, denom_c]
+            {Fq6::copy(12)}
+            // [a, c, denom_c, a]
+            {Fq6::double(0)}
+            // [a, c, denom_c, 2a]
+            {Fq6::equalverify()}
+            // [a,c] []
+            {1}
+        OP_ENDIF
+        // [a, c, 0/1]
+    };
+
+    let input_is_valid = denom != ark_bn254::Fq6::ZERO;
+    (c, input_is_valid, scr, hints)
+}
+
+pub(crate) fn chunk_fq12_square(a: ark_bn254::Fq6) -> (ark_bn254::Fq6, bool, Script, Vec<Hint>) {
+    let (asq, is_valid_input, asq_scr, asq_hints) = utils_fq12_square(a);
+    let _hash_scr = hash_messages(vec![ElementType::Fp6, ElementType::Fp6]);
+    let scr = script! {
+        // [hints, a, c] [chash, ahash]
+        {asq_scr}
+        // [a, asq, 0/1] [chash, ahash]
+    };
+
+    (asq, is_valid_input, scr, asq_hints)
+}
+
+pub(crate) fn chunk_dense_dense_mul(a: ark_bn254::Fq6, b:ark_bn254::Fq6) -> (ark_bn254::Fq6, bool, Script, Vec<Hint>) {
+    let (amulb, input_is_valid, amulb_scr, amulb_hints) = utils_fq12_dd_mul(a, b);
+    let _hash_scr = script! {
+        {hash_messages(vec![ElementType::Fp6, ElementType::Fp6, ElementType::Fp6])}
+    };
+    let scr = script! {
+        // [hints, a, b, c] [chash, bhash, ahash]
+        {amulb_scr}
+        // [a, b, amulb, 0/1] [chash, bhash, ahash]
+    };
+
+    (amulb, input_is_valid, scr, amulb_hints)
+}
+
+
+#[cfg(test)]
+mod test {
+
+    use ark_ff::{AdditiveGroup, Field, Fp12Config, UniformRand};
+    use bitcoin_script::script;
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+
+    use crate::{bn254::{fp254impl::Fp254Impl, fq::Fq, fq2::Fq2, fq6::Fq6}, chunk::{wrap_hasher::hash_messages, elements::{DataType, ElementType},  taps_mul::{chunk_dense_dense_mul, chunk_fq12_square, utils_fq12_dd_mul, utils_fq12_square, utils_fq6_sd_mul, utils_fq6_ss_mul}}, execute_script, execute_script_without_stack_limit };
+
+    
+    #[test]
+    fn test_utils_fq12_square_valid_data() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let f = ark_bn254::Fq12::rand(&mut prng);
+        let f_n = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+
+        let h = f * f;
+        let h_n =ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, h.c1/h.c0);
+
+        let (hint_out, is_valid_input, h_scr, mut mul_hints) = utils_fq12_square(f_n.c1);
+        assert_eq!(h_n.c1, hint_out);
+        assert!(is_valid_input);
+        let f_n_c1 = DataType::Fp6Data(f_n.c1);
+        let h_n_c1 = DataType::Fp6Data(h_n.c1);
+
+        let f6_hints = f_n_c1.to_witness(ElementType::Fp6);
+        let h6_hints = h_n_c1.to_witness(ElementType::Fp6);
+        mul_hints.extend_from_slice(&f6_hints);
+        mul_hints.extend_from_slice(&h6_hints);
+
+        let tap_len = h_scr.len();
+        let scr= script! {
+            for h in mul_hints {
+                {h.push()}
+            }
+            {h_scr}
+            OP_VERIFY
+            {Fq6::push(hint_out)}
+            {Fq6::equalverify()}
+            {Fq6::push(f_n.c1)}
+            {Fq6::equalverify()}
+            OP_TRUE
+        };
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(res.success); 
+        assert!(res.final_stack.len() == 1);
+        println!("utils_fq12_square disprovable(false) script {} stack {:?}", tap_len, res.stats.max_nb_stack_items);
+    }
+
+    #[test]
+    fn test_utils_fq12_square_valid_data_zero() {
+        let f_n = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, ark_bn254::Fq6::ZERO);
+        let h = f_n * f_n;
+        let h_n =ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, h.c1/h.c0);
+
+        let (hint_out, is_valid_input, h_scr, mut mul_hints) = utils_fq12_square(f_n.c1);
+        assert!(is_valid_input);
+        let f_n_c1 = DataType::Fp6Data(f_n.c1);
+        let h_n_c1 = DataType::Fp6Data(h_n.c1);
+
+        let f6_hints = f_n_c1.to_witness(ElementType::Fp6);
+        let h6_hints = h_n_c1.to_witness(ElementType::Fp6);
+        mul_hints.extend_from_slice(&f6_hints);
+        mul_hints.extend_from_slice(&h6_hints);
+
+        let tap_len = h_scr.len();
+        let scr= script! {
+            for h in mul_hints {
+                {h.push()}
+            }
+            {h_scr}
+            OP_VERIFY
+            {Fq6::push(hint_out)}
+            {Fq6::equalverify()}
+            {Fq6::push(f_n.c1)}
+            {Fq6::equalverify()}
+            OP_TRUE
+        };
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(res.success); 
+        assert!(res.final_stack.len() == 1);
+        println!("utils_fq12_square disprovable(false) script {} stack {:?}", tap_len, res.stats.max_nb_stack_items);
+    }
+
+    #[test]
+    fn test_chunk_hinted_square() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let f = ark_bn254::Fq12::rand(&mut prng);
+        let f_n = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+
+        let h = f * f;
+        let h_n =ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, h.c1/h.c0);
+
+        let (hint_out, input_is_valid, h_scr, mul_hints) = chunk_fq12_square(f_n.c1);
+        assert_eq!(h_n.c1, hint_out);
+        assert!(input_is_valid);
+
+        let f_n_c1 = DataType::Fp6Data(f_n.c1);
+        let h_n_c1 = DataType::Fp6Data(h_n.c1);
+        let hint_out = DataType::Fp6Data(hint_out);
+
+        let mut preimage_hints = vec![];
+        let f6_hints = f_n_c1.to_witness(ElementType::Fp6);
+        let h6_hints = h_n_c1.to_witness(ElementType::Fp6);
+        preimage_hints.extend_from_slice(&f6_hints);
+        preimage_hints.extend_from_slice(&h6_hints);
+
+        let bitcom_scr = script! {
+            {hint_out.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+            {f_n_c1.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+        };
+
+        let hash_scr = script! {
+            {hash_messages(vec![ElementType::Fp6, ElementType::Fp6])}
+            OP_TRUE
+        };
+
+        let tap_len = h_scr.len() + hash_scr.len();
+        let scr= script! {
+            for h in mul_hints {
+                {h.push()}
+            }
+            for h in preimage_hints {
+                {h.push()}
+            }
+            {bitcom_scr}
+            {h_scr}
+            {hash_scr}
+        };
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(!res.success); 
+        assert!(res.final_stack.len() == 1);
+        println!("chunk_fq12_square disprovable(false) script {} stack {:?}", tap_len, res.stats.max_nb_stack_items);
+    }
+
+    #[test]
+    fn test_utils_fq12_dd_mul_valid_data() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let f = ark_bn254::Fq12::rand(&mut prng);
+        let f_n = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+
+        let g = ark_bn254::Fq12::rand(&mut prng);
+        let g_n = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, g.c1/g.c0);
+
+        let h = f * g;
+        let h_n =ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, h.c1/h.c0);
+
+        let (hint_out, is_valid_input, h_scr, mul_hints) = utils_fq12_dd_mul(f_n.c1, g_n.c1);
+        assert_eq!(h_n.c1, hint_out);
+        assert!(is_valid_input);
+
+        let f_n_c1 = DataType::Fp6Data(f_n.c1);
+        let g_n_c1 = DataType::Fp6Data(g_n.c1);
+        let h_n_c1 = DataType::Fp6Data(h_n.c1);
+
+        let mut preimage_hints = vec![];
+        let f6_hints = f_n_c1.to_witness(ElementType::Fp6);
+        let g6_hints = g_n_c1.to_witness(ElementType::Fp6);
+        let h6_hints = h_n_c1.to_witness(ElementType::Fp6);
+        preimage_hints.extend_from_slice(&f6_hints);
+        preimage_hints.extend_from_slice(&g6_hints);
+        preimage_hints.extend_from_slice(&h6_hints);
+
+        let tap_len = h_scr.len();
+        let scr= script! {
+            for h in mul_hints {
+                {h.push()}
+            }
+            for h in &preimage_hints {
+                {h.push()}
+            }
+            // [hints, f, g, h]
+            {h_scr}
+            // [f, g, h, 1]
+            OP_VERIFY
+            {Fq6::push(hint_out)}
+            {Fq6::equalverify()}
+            for h in g6_hints.iter().rev() {
+                {h.push()}
+                {Fq::equalverify(1, 0)}
+            }
+            for h in f6_hints.iter().rev() {
+                {h.push()}
+                {Fq::equalverify(1, 0)}
+            }
+            OP_TRUE
+        };
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(res.success); 
+        assert!(res.final_stack.len() == 1);
+        println!("utils_fq12_dd_mul disprovable(false) script {} stack {:?}", tap_len, res.stats.max_nb_stack_items);
+    }
+
+    #[test]
+    fn test_utils_fq12_dd_mul_dataset() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let f = ark_bn254::Fq12::rand(&mut prng);
+        let f_n = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+
+        // a + b == 0
+        // b = -a
+        let invalid_g_n = -f_n.c1; 
+        let g_n = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, invalid_g_n);
+        run_for_invalid_inputs(f_n, g_n, true);
+
+        // 1 + ab J^2 == 0
+        // b = -1/(a J^2)
+        let invalid_g_n = -(f_n.c1 * ark_bn254::Fq12Config::NONRESIDUE).inverse().unwrap(); 
+        let g_n = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, invalid_g_n);
+        run_for_invalid_inputs(f_n, g_n, false);
+        
+        fn run_for_invalid_inputs(f_n: ark_bn254::Fq12, g_n: ark_bn254::Fq12, is_valid_in: bool) {
+            let h_n = f_n * g_n;
+
+            let h_n = if h_n.c0 != ark_bn254::Fq6::ZERO {
+                ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, h_n.c1/h_n.c0)
+            } else {
+                ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, ark_bn254::Fq6::ZERO)
+            };
+    
+            let (hint_out, is_valid_input, h_scr, mul_hints) = utils_fq12_dd_mul(f_n.c1, g_n.c1);
+            assert!(is_valid_input == is_valid_in);         
+    
+            let f_n_c1 = DataType::Fp6Data(f_n.c1);
+            let g_n_c1 = DataType::Fp6Data(g_n.c1);
+            let h_n_c1 = DataType::Fp6Data(h_n.c1);
+    
+            let mut preimage_hints = vec![];
+            let f6_hints = f_n_c1.to_witness(ElementType::Fp6);
+            let g6_hints = g_n_c1.to_witness(ElementType::Fp6);
+            let h6_hints = h_n_c1.to_witness(ElementType::Fp6);
+            preimage_hints.extend_from_slice(&f6_hints);
+            preimage_hints.extend_from_slice(&g6_hints);
+            preimage_hints.extend_from_slice(&h6_hints);
+    
+            let tap_len = h_scr.len();
+            let scr= script! {
+                for h in mul_hints {
+                    {h.push()}
+                }
+                for h in &preimage_hints {
+                    {h.push()}
+                }
+                // [hints, f, g, h]
+                {h_scr}
+                // [f, g, hint_out, 0/1]
+                if !is_valid_in {
+                    OP_NOT
+                }
+                OP_VERIFY
+                {Fq6::push(hint_out)}
+                {Fq6::equalverify()}
+                for h in g6_hints.iter().rev() {
+                    {h.push()}
+                    {Fq::equalverify(1, 0)}
+                }
+                for h in f6_hints.iter().rev() {
+                    {h.push()}
+                    {Fq::equalverify(1, 0)}
+                }
+                OP_TRUE
+            };
+            let res = execute_script(scr);
+            if res.final_stack.len() > 1 {
+                for i in 0..res.final_stack.len() {
+                    println!("{i:} {:?}", res.final_stack.get(i));
+                }
+            }
+            assert!(res.success); 
+            assert!(res.final_stack.len() == 1);
+            println!("utils_fq12_dd_mul disprovable({}) script {} stack {:?}", !is_valid_in, tap_len, res.stats.max_nb_stack_items);
+        }
+
+    }
+
+    #[test]
+    fn test_chunk_dense_dense_mul() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let f = ark_bn254::Fq12::rand(&mut prng);
+        let f_n = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+
+        let g = ark_bn254::Fq12::rand(&mut prng);
+        let g_n = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, g.c1/g.c0);
+
+        let h = f_n * g_n;
+        let h_n =ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, h.c1/h.c0);
+
+        let (hint_out, is_valid_input, h_scr, mul_hints) = chunk_dense_dense_mul(f_n.c1, g_n.c1);
+        assert_eq!(h_n.c1, hint_out);
+
+        let f_n_c1 = DataType::Fp6Data(f_n.c1);
+        let g_n_c1 = DataType::Fp6Data(g_n.c1);
+        let h_n_c1 = DataType::Fp6Data(h_n.c1);
+        let hint_out = DataType::Fp6Data(hint_out);
+
+        let mut preimage_hints = vec![];
+        let f6_hints = f_n_c1.to_witness(ElementType::Fp6);
+        let g6_hints = g_n_c1.to_witness(ElementType::Fp6);
+        let h6_hints = h_n_c1.to_witness(ElementType::Fp6);
+        preimage_hints.extend_from_slice(&f6_hints);
+        preimage_hints.extend_from_slice(&g6_hints);
+        preimage_hints.extend_from_slice(&h6_hints);
+
+        let bitcom_scr = script! {
+            {hint_out.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+            {g_n_c1.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+            {f_n_c1.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+        };
+
+        let hash_scr = script! {
+            {hash_messages(vec![ElementType::Fp6, ElementType::Fp6, ElementType::Fp6])}
+            OP_TRUE
+        };
+
+        let tap_len = h_scr.len() + hash_scr.len();
+        let scr= script! {
+            for h in mul_hints {
+                {h.push()}
+            }
+            for h in preimage_hints {
+                {h.push()}
+            }
+            {bitcom_scr}
+            {h_scr}
+            {hash_scr}
+        };
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert_eq!(res.success, !is_valid_input); 
+        assert!(res.final_stack.len() == 1);
+        println!("chunk_dense_dense_mul disprovable({}) script {} stack {:?}", !is_valid_input, tap_len, res.stats.max_nb_stack_items);
+    }
+
+    #[test]
+    fn test_chunk_dense_dense_mul_numerator_zero() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let f = ark_bn254::Fq12::rand(&mut prng);
+        let f_n = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, f.c1/f.c0);
+
+        let g_n = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, -f.c1/f.c0);
+
+        let h = f_n * g_n;
+        let h_n =ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, h.c1/h.c0);
+
+        let (hint_out, is_invalid_input, h_scr, mul_hints) = chunk_dense_dense_mul(f_n.c1, g_n.c1);
+        assert!(is_invalid_input);
+
+        let f_n_c1 = DataType::Fp6Data(f_n.c1);
+        let g_n_c1 = DataType::Fp6Data(g_n.c1);
+        let h_n_c1 = DataType::Fp6Data(h_n.c1);
+        let hint_out = DataType::Fp6Data(hint_out);
+
+        let mut preimage_hints = vec![];
+        let f6_hints = f_n_c1.to_witness(ElementType::Fp6);
+        let g6_hints = g_n_c1.to_witness(ElementType::Fp6);
+        let h6_hints = h_n_c1.to_witness(ElementType::Fp6);
+        preimage_hints.extend_from_slice(&f6_hints);
+        preimage_hints.extend_from_slice(&g6_hints);
+        preimage_hints.extend_from_slice(&h6_hints);
+
+        let bitcom_scr = script! {
+            {hint_out.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+            {g_n_c1.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+            {f_n_c1.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+        };
+
+        let hash_scr = script! {
+            {hash_messages(vec![ElementType::Fp6, ElementType::Fp6, ElementType::Fp6])}
+            OP_TRUE
+        };
+
+        let tap_len = h_scr.len() + hash_scr.len();
+        let scr= script! {
+            for h in mul_hints {
+                {h.push()}
+            }
+            for h in preimage_hints {
+                {h.push()}
+            }
+            {bitcom_scr}
+            {h_scr}
+            {hash_scr}
+        };
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(!res.success); 
+        assert!(res.final_stack.len() == 1);
+        println!("chunk_dense_dense_mul disprovable(true) script {} stack {:?}", tap_len, res.stats.max_nb_stack_items);
+    }
+
+    #[test]
+    fn test_utils_fq6_sd_mul() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let m = ark_bn254::Fq6::rand(&mut prng);
+        let mut n = ark_bn254::Fq6::rand(&mut prng);
+        n.c2 = ark_bn254::Fq2::ZERO;
+        let o = m * n;
+
+        let (res, ops_scr, hints) = utils_fq6_sd_mul(m, n);
+
+        assert_eq!(res, o);
+        let ops_len = ops_scr.len();
+        let scr = script! {
+            for h in hints {
+                {h.push()}
+            }
+            {Fq2::push(m.c0)}
+            {Fq2::push(m.c1)}
+            {Fq2::push(m.c2)}
+            {Fq2::push(n.c0)}
+            {Fq2::push(n.c1)}
+            {ops_scr}
+            {Fq6::push(o)}
+            {Fq6::equalverify()}
+            {Fq2::push(n.c1)}
+            {Fq2::equalverify()}
+            {Fq2::push(n.c0)}
+            {Fq2::equalverify()}
+            {Fq6::push(m)}
+            {Fq6::equalverify()}
+            OP_TRUE
+        };
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(res.success); 
+        println!("utils_fq6_sd_mul disprovable(false) scr len {:?} @ stack {:?}", ops_len, res.stats.max_nb_stack_items);
+
+    }
+
+    #[test]
+    fn test_utils_fq6_ss_mul() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let mut m = ark_bn254::Fq6::rand(&mut prng);
+        let mut n = ark_bn254::Fq6::rand(&mut prng);
+        m.c2 = ark_bn254::Fq2::ZERO;
+        n.c2 = ark_bn254::Fq2::ZERO;
+        let o = m * n;
+
+        let (res, ops_scr, hints) = utils_fq6_ss_mul(m, n);
+        assert_eq!(res, o);
+        let ops_len = ops_scr.len();
+        let scr = script! {
+            for h in hints {
+                {h.push()}
+            }
+            {Fq2::push(m.c0)}
+            {Fq2::push(m.c1)}
+            {Fq2::push(n.c0)}
+            {Fq2::push(n.c1)}
+            {ops_scr}
+            {Fq6::push(o)}
+            {Fq6::equalverify()}
+            for v in vec![n.c1, n.c0, m.c1, m.c0] {
+                {Fq2::push(v)}
+                {Fq2::equalverify()}
+            }
+            OP_TRUE
+        };
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(res.success); 
+        println!("utils_fq6_ss_mul disprovable(false) scr len {:?} @ stack {:?}", ops_len, res.stats.max_nb_stack_items);
+
+    }
+}
diff --git a/bitvm/src/chunk/taps_point_ops.rs b/bitvm/src/chunk/taps_point_ops.rs
new file mode 100644
index 000000000..01ce05c5e
--- /dev/null
+++ b/bitvm/src/chunk/taps_point_ops.rs
@@ -0,0 +1,1605 @@
+use crate::bigint::U256;
+use crate::bn254::fq12::Fq12;
+use crate::bn254::fq6::Fq6;
+use crate::bn254::g2::{hinted_affine_add_line, hinted_affine_double_line, hinted_check_line_through_point, hinted_check_tangent_line_keep_elements, hinted_ell_by_constant_affine, hinted_mul_by_char_on_phi_q, hinted_mul_by_char_on_q, G2Affine};
+use crate::bn254::{utils::*};
+use crate::bn254::{fq2::Fq2};
+use crate::chunk::taps_mul::{utils_fq6_sd_mul, utils_fq6_ss_mul};
+use crate::{
+    bn254::{fp254impl::Fp254Impl, fq::Fq},
+    treepp::*,
+};
+use ark_ec::{AffineRepr, CurveGroup}; 
+use ark_ff::{AdditiveGroup, Field, Fp12Config, PrimeField};
+use num_bigint::BigUint;
+use std::ops::Neg;
+use std::str::FromStr;
+
+use super::wrap_hasher::hash_messages;
+use super::elements::{ElemG2Eval, ElementType};
+use super::helpers::extern_nibbles_to_limbs;
+use super::taps_mul::utils_multiply_by_line_eval;
+
+
+// [q1, -q2, q3]
+pub(crate) fn frob_q_power(q: ark_bn254::G2Affine, ate: i8) -> ark_bn254::G2Affine {
+    let beta_12x = BigUint::from_str(
+        "21575463638280843010398324269430826099269044274347216827212613867836435027261",
+    )
+    .unwrap();
+    let beta_12y = BigUint::from_str(
+        "10307601595873709700152284273816112264069230130616436755625194854815875713954",
+    )
+    .unwrap();
+    let beta_12 = ark_bn254::Fq2::from_base_prime_field_elems([
+        ark_bn254::Fq::from(beta_12x.clone()),
+        ark_bn254::Fq::from(beta_12y.clone()),
+    ])
+    .unwrap();
+    let beta_13x = BigUint::from_str(
+        "2821565182194536844548159561693502659359617185244120367078079554186484126554",
+    )
+    .unwrap();
+    let beta_13y = BigUint::from_str(
+        "3505843767911556378687030309984248845540243509899259641013678093033130930403",
+    )
+    .unwrap();
+    let beta_13 = ark_bn254::Fq2::from_base_prime_field_elems([
+        ark_bn254::Fq::from(beta_13x.clone()),
+        ark_bn254::Fq::from(beta_13y.clone()),
+    ])
+    .unwrap();
+
+    let beta_22x = BigUint::from_str(
+        "21888242871839275220042445260109153167277707414472061641714758635765020556616",
+    )
+    .unwrap();
+    let beta_22y = BigUint::from_str("0").unwrap();
+    let beta_22 = ark_bn254::Fq2::from_base_prime_field_elems([
+        ark_bn254::Fq::from(beta_22x.clone()),
+        ark_bn254::Fq::from(beta_22y.clone()),
+    ])
+    .unwrap();
+
+
+    let beta_32x = BigUint::from_str(
+        "3772000881919853776433695186713858239009073593817195771773381919316419345261",
+    )
+    .unwrap();
+    let beta_32y = BigUint::from_str("2236595495967245188281701248203181795121068902605861227855261137820944008926").unwrap();
+    let beta_32 = ark_bn254::Fq2::from_base_prime_field_elems([
+        ark_bn254::Fq::from(beta_32x.clone()),
+        ark_bn254::Fq::from(beta_32y.clone()),
+    ])
+    .unwrap();
+
+
+    let beta_33x = BigUint::from_str(
+        "19066677689644738377698246183563772429336693972053703295610958340458742082029",
+    )
+    .unwrap();
+    let beta_33y = BigUint::from_str("18382399103927718843559375435273026243156067647398564021675359801612095278180").unwrap();
+    let beta_33 = ark_bn254::Fq2::from_base_prime_field_elems([
+        ark_bn254::Fq::from(beta_33x.clone()),
+        ark_bn254::Fq::from(beta_33y.clone()),
+    ])
+    .unwrap();
+
+
+    let mut qq = q;
+    if ate == 1 {
+        qq.x.conjugate_in_place();
+        qq.x *= beta_12;
+        qq.y.conjugate_in_place();
+        qq.y *= beta_13; // = phi(q)
+    } else if ate == -1 {
+        qq.x *= beta_22; // = - phi(phi(q))
+    } else if ate == 3 {
+        qq.x.conjugate_in_place();
+        qq.x *= beta_32;
+        qq.y.conjugate_in_place();
+        qq.y *= beta_33;    // = phi(phi(phi(q)))
+    }
+
+    qq
+}
+
+fn utils_point_double_eval(t: ark_bn254::G2Affine, p: ark_bn254::G1Affine) -> ((ark_bn254::G2Affine, (ark_bn254::Fq2, ark_bn254::Fq2)), Script, Vec<Hint>) {
+    let mut hints = vec![];
+
+    let t_is_zero = t.is_zero() || (t == ark_bn254::G2Affine::new_unchecked(ark_bn254::Fq2::ZERO, ark_bn254::Fq2::ZERO)); // t is none or Some(0)
+    let is_valid_input = !t_is_zero;
+    let (alpha, bias) = if is_valid_input {
+        let alpha = (t.x.square() + t.x.square() + t.x.square()) / (t.y + t.y); 
+        let bias = t.y - alpha * t.x;
+        (alpha, bias)
+    } else {
+        (ark_bn254::Fq2::ZERO, ark_bn254::Fq2::ZERO)
+    };
+
+    let (hinted_script1, hint1) = hinted_check_tangent_line_keep_elements(t,alpha, -bias);
+    let (hinted_script2, hint2) = hinted_affine_double_line(t.x,alpha, -bias);
+    let (hinted_script3, hint3) = hinted_ell_by_constant_affine(p.x, p.y,alpha, -bias);
+    
+    let result = if is_valid_input {
+        let mut dbl_le0 = alpha;
+        dbl_le0.mul_assign_by_fp(&p.x);
+        let mut dbl_le1 = -bias;
+        dbl_le1.mul_assign_by_fp(&p.y);
+        ((t + t).into_affine(), (dbl_le0, dbl_le1))
+    } else {
+        let zero_pt =  ark_bn254::G2Affine::new_unchecked(ark_bn254::Fq2::ZERO, ark_bn254::Fq2::ZERO);
+        (zero_pt, (ark_bn254::Fq2::ZERO, ark_bn254::Fq2::ZERO))
+    };
+     
+
+    if is_valid_input { 
+        hints.push(Hint::Fq(alpha.c0));
+        hints.push(Hint::Fq(alpha.c1));
+        hints.push(Hint::Fq(-bias.c0));
+        hints.push(Hint::Fq(-bias.c1));
+        hints.extend(hint1);
+        hints.extend(hint2);
+        hints.extend(hint3);
+    }
+ 
+    let script = script! {    
+        // tx, ty, px, py
+        { Fq2::toaltstack()}
+        { G2Affine::is_zero_keep_element() }         // ... (dependent on input),  x, y, 0/1
+        OP_IF
+            // [t] [p]
+            {Fq2::fromaltstack()} {Fq2::drop()}
+            // [t]
+            {Fq2::push(ark_bn254::Fq2::ZERO)}
+            {Fq2::push(ark_bn254::Fq2::ZERO)}
+            // [t, nt]
+            {Fq2::push(ark_bn254::Fq2::ZERO)}
+            {Fq2::push(ark_bn254::Fq2::ZERO)}
+            // [t, nt, le]
+        OP_ELSE                                     
+            // c3 (alpha), c4 (-bias), ... (other hints), x, y
+            for _ in 0..Fq::N_LIMBS * 2 {
+                OP_DEPTH OP_1SUB OP_ROLL 
+            }                                        // -bias, ...,  x, y, alpha
+            for _ in 0..Fq::N_LIMBS * 2 {
+                OP_DEPTH OP_1SUB OP_ROLL 
+            }                  
+            // [tx ty a b]                     
+            {Fq2::roll(6)} {Fq2::roll(6)}          // alpha, -bias, x, y
+            // [a b tx ty]      
+            { hinted_script1 }  
+            // [a b tx ty]                           
+            {Fq2::roll(6)} {Fq2::roll(6)}
+             // [tx ty a b] 
+            { Fq2::copy(2) } {Fq2::copy(2)}           
+             // [tx ty a b a b] 
+            { Fq2::copy(10) }   
+             // [tx ty a b a b tx]                       
+            { hinted_script2 }                       // x, y, alpha, -bias, c3, c4 x', y'
+            {Fq2::toaltstack()} {Fq2::toaltstack()}
+            {Fq2::drop()} {Fq2::drop()}
+            {Fq2::fromaltstack()} {Fq2::fromaltstack()}
+             
+            {Fq2::fromaltstack()}                   // x, y, alpha, -bias, x', y', px, py
+            {Fq2::roll(4)} {Fq2::roll(4)}           // x, y, alpha, -bias, px, py,  x', y'
+            {Fq2::toaltstack()} {Fq2::toaltstack()}
+            { hinted_script3 }                                     // x, y, le,
+            {Fq2::fromaltstack()} {Fq2::fromaltstack()}  // x, y, le0, le1, x', y'
+            {Fq2::roll(6)} {Fq2::roll(6)}                            // x, y, x', y', le
+        OP_ENDIF
+        // [tx, ty, x', y', le0, le1]
+    };
+    (result, script, hints)
+}
+
+
+fn utils_point_add_eval(t: ark_bn254::G2Affine, q4: ark_bn254::G2Affine, p: ark_bn254::G1Affine, is_frob:bool, ate_bit: i8) -> ((ark_bn254::G2Affine, (ark_bn254::Fq2, ark_bn254::Fq2)), Script, Vec<Hint>) {
+    let mut hints = vec![];
+
+    // Precompute Q
+    let temp_q = q4;
+    let (qq, precomp_q_scr, precomp_q_hint) =
+    if is_frob {
+        if ate_bit == 1 {
+            hinted_mul_by_char_on_q(temp_q)
+        } else {
+            hinted_mul_by_char_on_phi_q(temp_q)
+        }
+    } else if ate_bit == -1 {
+        (temp_q.neg(), script! {
+            // [q4]
+            {Fq::toaltstack()}
+            {Fq::neg(0)}
+            {Fq::fromaltstack()}
+            {Fq::neg(0)}
+            // [-q4]
+        }, vec![])                
+    } else {
+        (temp_q, script! {}, vec![])
+    };
+    hints.extend(precomp_q_hint);
+
+
+    // Point Add
+    let t_is_zero = t.is_zero() || (t == ark_bn254::G2Affine::new_unchecked(ark_bn254::Fq2::ZERO, ark_bn254::Fq2::ZERO)); // t is none or Some(0)
+    let q_is_zero = qq.is_zero() || (qq == ark_bn254::G2Affine::new_unchecked(ark_bn254::Fq2::ZERO, ark_bn254::Fq2::ZERO)); // q is none or Some(0)
+    let is_valid_input = !t_is_zero && !q_is_zero && t != -qq;
+
+    // if it's valid input, you can compute line coefficients, else hardcode degenerate values
+    let (alpha, bias) = if is_valid_input { 
+        if t == qq {
+            let alpha = (t.x.square() + t.x.square() + t.x.square()) / (t.y + t.y); 
+            let bias = t.y - alpha * t.x;
+            (alpha, bias)
+        } else {
+            let alpha = (t.y - qq.y) / (t.x - qq.x);
+            let bias = t.y - alpha * t.x;
+            (alpha, bias)
+        }
+    } else {
+        (ark_bn254::Fq2::ZERO, ark_bn254::Fq2::ZERO)
+    };
+
+    let (hinted_script11, hint11) = hinted_check_line_through_point(t.x, alpha, -bias); // todo: remove unused arg: bias
+    let (hinted_script12, hint12) = hinted_check_line_through_point(qq.x, alpha, -bias); // todo: remove unused arg: bias
+    let (hinted_script2, hint2) = hinted_affine_add_line(t.x, qq.x, alpha, -bias);
+    let (hinted_script3, hint3) = hinted_ell_by_constant_affine(p.x, p.y,alpha, -bias);
+
+    // if it's valid input, you can compute result, else degenerate values
+    let result = if is_valid_input {
+        let mut add_le0 = alpha;
+        add_le0.mul_assign_by_fp(&p.x);
+        let mut add_le1 = -bias;
+        add_le1.mul_assign_by_fp(&p.y);
+        ((t + qq).into_affine(), (add_le0, add_le1))
+    } else {
+        let zero_pt =  ark_bn254::G2Affine::new_unchecked(ark_bn254::Fq2::ZERO, ark_bn254::Fq2::ZERO);
+        (zero_pt, (ark_bn254::Fq2::ZERO, ark_bn254::Fq2::ZERO))
+    };
+
+    // if it's valid input, you need hints to run computation
+    if is_valid_input {
+        hints.push(Hint::Fq(alpha.c0));
+        hints.push(Hint::Fq(alpha.c1));
+        hints.push(Hint::Fq(-bias.c0));
+        hints.push(Hint::Fq(-bias.c1));
+        hints.extend(hint11);
+        hints.extend(hint12);
+        hints.extend(hint2);
+        hints.extend(hint3);
+    }
+
+    let drop_and_insert_zero = script! {
+        // [.., tx, ty, qx, qy], [px, py]
+        { G2Affine::drop() }
+        {Fq2::fromaltstack()} {Fq2::drop()}
+        // [tx, ty]
+        {Fq2::push(ark_bn254::Fq2::ZERO)}
+        {Fq2::push(ark_bn254::Fq2::ZERO)}
+        // [t, nt]
+        {Fq2::push(ark_bn254::Fq2::ZERO)}
+        {Fq2::push(ark_bn254::Fq2::ZERO)}
+        // [t, nt, le]
+    };
+
+    let script = script! {        // tx ty qx qy
+        // a, b, tx, ty, qx, qy, px, py
+        {Fq2::toaltstack()}
+        // [qx qy]
+        {precomp_q_scr}
+        // [qx qy]
+        { G2Affine::is_zero_keep_element() }
+        OP_IF // q == 0
+             // [.., tx, ty, qx, qy], [px, py]
+            {drop_and_insert_zero.clone()}
+        OP_ELSE
+            // [t, q]
+            { G2Affine::roll(1) }
+            { G2Affine::is_zero_keep_element() }
+            OP_IF // t == 0
+                // [q, t]
+                {G2Affine::roll(1)}
+                {drop_and_insert_zero.clone()}
+            OP_ELSE  
+                // qx qy tx ty                             
+                {G2Affine::copy(1)}
+                // qx qy tx ty qx qy
+                { Fq2::neg(0)}
+                // qx qy tx ty qx -qy
+                {G2Affine::copy(1)}
+                // qx qy tx ty qx -qy tx ty
+                {G2Affine::equal()} // q = -t ?
+                // qx qy tx ty 0/1
+                OP_IF // q == -t
+                    // [q, t]
+                    {G2Affine::roll(1)}
+                    // [t, q]
+                    {drop_and_insert_zero}
+                OP_ELSE
+                    // [qx, qy, tx, ty]
+                    for _ in 0..Fq::N_LIMBS * 2 {
+                        OP_DEPTH OP_1SUB OP_ROLL 
+                    }
+                    for _ in 0..Fq::N_LIMBS * 2 {
+                        OP_DEPTH OP_1SUB OP_ROLL 
+                    }        
+                    // [qx, qy, tx, ty, c3, c4]                          
+                    {Fq2::roll(6)} {Fq2::roll(6)}
+                    // [qx, qy, c3, c4, tx, ty] 
+                    {Fq2::copy(2)} {Fq2::copy(2)} 
+                    {Fq2::toaltstack()} {Fq2::toaltstack()}   
+                    // [qx, qy, c3, c4, tx, ty] [tx, y]
+                    {hinted_script11}
+                    // [qx, qy, c3, c4 ]
+                    {Fq2::fromaltstack()} {Fq2::fromaltstack()}   
+                    // [qx, qy, c3, c4, tx, ty]   
+                    {Fq2::roll(6)} {Fq2::roll(6)}
+                    // [qx, qy, tx, ty, c3, c4]   
+                    { Fq2::copy(10) }
+                    { Fq2::roll(10) }  
+                    // [qx, tx, ty, c3, c4, qx, qy]                 
+                    { hinted_script12 }                 
+                    // [qx, tx, ty, c3, c4]
+
+                    {Fq2::copy(2)} {Fq2::copy(2)}
+                    // [qx, tx, ty, c3, c4, c3, c4]
+                    { Fq2::copy(10) }
+                    // [qx, tx, ty, c3, c4, c3, c4, tx]                    
+                    { Fq2::roll(14) }                   
+                    // [tx, ty, c3, c4, c3, c4, tx, qx]
+                    { hinted_script2 }                
+                    // [tx, ty, c3, c4, c3, c4, x', y']
+                    {Fq2::toaltstack()} {Fq2::toaltstack()}
+                    {Fq2::drop()} {Fq2::drop()}
+                    {Fq2::fromaltstack()} {Fq2::fromaltstack()}
+                    // [tx, ty, c3, c4, x', y']
+                    {Fq2::fromaltstack()}
+                    // [tx, ty, c3, c4, x', y', px, py]
+                    {Fq2::roll(4)} {Fq2::roll(4)}           
+                    // [tx, ty, c3, c4, px, py, x', y']
+                    {Fq2::toaltstack()} {Fq2::toaltstack()}
+                    // [tx, ty, c3, c4, px, py]
+                    { hinted_script3 }
+                    // [tx, ty,le0, le1]                         
+                    {Fq2::fromaltstack()} {Fq2::fromaltstack()}
+                    // [tx, ty, le0, le1, x', y']                   
+                    {Fq2::roll(6)} {Fq2::roll(6)}
+                     // [tx, ty, x', y', le0, le1]      
+                OP_ENDIF
+                // [tx, ty, x', y', le0, le1]
+            OP_ENDIF
+        OP_ENDIF
+    };
+    (result, script, hints)
+}
+
+
+fn point_ops_and_multiply_line_evals_step_1(
+    is_dbl: bool, is_frob: Option<bool>, ate_bit: Option<i8>,
+    t4: ark_bn254::G2Affine, p4: ark_bn254::G1Affine, 
+    q4: Option<ark_bn254::G2Affine>,
+
+    p3: ark_bn254::G1Affine,
+    t3: ark_bn254::G2Affine, q3: Option<ark_bn254::G2Affine>,
+    p2: ark_bn254::G1Affine,
+    t2: ark_bn254::G2Affine, q2: Option<ark_bn254::G2Affine>,
+) -> (ElemG2Eval, bool, Script, Vec<Hint> ) {
+    // a, b, tx, ty, px, py
+    let ((nt, (le4_0, le4_1)), nt_scr, nt_hints) = if is_dbl {
+        //[a, b, tx, ty, px, py]
+        utils_point_double_eval(t4, p4)
+    } else {
+        // a, b, tx, ty, qx, qy, px, py
+        assert!(q4.is_some());
+        utils_point_add_eval(t4, q4.unwrap(), p4, is_frob.unwrap(), ate_bit.unwrap())
+    };
+    let le4 = ark_bn254::Fq6::new(le4_0, le4_1, ark_bn254::Fq2::ZERO);
+
+
+    let (alpha_t3, neg_bias_t3) = if is_dbl {
+        let alpha_t3 = (t3.x.square() + t3.x.square() + t3.x.square()) / (t3.y + t3.y); 
+        let neg_bias_t3 = alpha_t3 * t3.x - t3.y;
+        (alpha_t3, neg_bias_t3)
+    } else {
+        let ate_bit = ate_bit.unwrap();
+        let is_frob = is_frob.unwrap();
+        let temp_q = q3.unwrap();
+        let q3 = if is_frob {
+            if ate_bit == 1 {
+                hinted_mul_by_char_on_q(temp_q).0
+            } else {
+                hinted_mul_by_char_on_phi_q(temp_q).0
+            }
+        } else if ate_bit == -1 {
+            temp_q.neg()
+        } else {
+            temp_q
+        };
+
+        let alpha_t3 = (t3.y - q3.y) / (t3.x - q3.x); 
+        let neg_bias_t3 = alpha_t3 * t3.x - t3.y;
+        (alpha_t3, neg_bias_t3)
+    };
+
+    let (alpha_t2, neg_bias_t2) = if is_dbl {
+        let alpha_t2 = (t2.x.square() + t2.x.square() + t2.x.square()) / (t2.y + t2.y); 
+        let neg_bias_t2 = alpha_t2 * t2.x - t2.y;
+        (alpha_t2, neg_bias_t2)
+    } else {
+        let ate_bit = ate_bit.unwrap();
+        let is_frob = is_frob.unwrap();
+        let temp_q = q2.unwrap();
+        let q2 = if is_frob {
+            if ate_bit == 1 {
+                hinted_mul_by_char_on_q(temp_q).0
+            } else {
+                hinted_mul_by_char_on_phi_q(temp_q).0
+            }
+        } else if ate_bit == -1 {
+            temp_q.neg()
+        } else {
+            temp_q
+        };
+
+        let alpha_t2 = (t2.y - q2.y) / (t2.x - q2.x); 
+        let neg_bias_t2 = alpha_t2 * t2.x - t2.y;
+        (alpha_t2, neg_bias_t2)
+    };
+
+    let (g, fg_scr, fg_hints) = utils_multiply_by_line_eval(le4, alpha_t3, neg_bias_t3, p3);
+    let one_plus_fg_j_sq = (le4 * g * ark_bn254::Fq12Config::NONRESIDUE) + ark_bn254::Fq6::ONE;
+    let fpg = le4 + g;
+
+
+    let (hinted_ell_t2, hints_ell_t2) = hinted_ell_by_constant_affine(p2.x, p2.y, alpha_t2, neg_bias_t2);
+    let mut t2le_a = alpha_t2;
+    t2le_a.mul_assign_by_fp(&p2.x);
+    let mut t2le_b = neg_bias_t2;
+    t2le_b.mul_assign_by_fp(&p2.y);
+
+    let mut t3le_a = alpha_t3;
+    t3le_a.mul_assign_by_fp(&p3.x);
+    let mut t3le_b = neg_bias_t3;
+    t3le_b.mul_assign_by_fp(&p3.y);
+
+    let mut hints = vec![];
+    hints.extend_from_slice(&nt_hints);
+    hints.extend_from_slice(&fg_hints);
+    hints.extend_from_slice(&hints_ell_t2);
+
+    let mul_by_beta_sq_scr = script! {
+        {Fq6::mul_fq2_by_nonresidue()}
+        {Fq2::roll(4)} {Fq2::roll(4)}
+    };
+
+    let ops_scr = script! {
+        // [hints, t4, (q4), p4, p3, p2]
+        {Fq2::toaltstack()}
+        {Fq2::copy(2)} {Fq2::toaltstack()}
+        {Fq2::toaltstack()}
+        // [hints, t4, (q4), p4] [p2, p4, p3]
+        {nt_scr}
+        // [hints, t4, nt4, le0, le1] [p2, p4, p3]
+        // [hints, t4, nt4, le] [p2, p4, p3]
+        {Fq2::fromaltstack()}
+        // [hints, t4, nt4, le, p3] [p2, p4]
+        {fg_scr}
+        // [t4, nt4, p3, g, f, fg] [p2, p4]
+        {mul_by_beta_sq_scr}
+        // [t4, nt4, p3, g, f, fg_beta_sq] [p2, p4]
+        {Fq6::push(ark_bn254::Fq6::ONE)}
+        {Fq6::add(6, 0)}
+        // [t4, nt4, p3, g, f, fg_beta_sq+1] [p2, p4]
+        // [t4, nt4, p3, g, f, fg'] [p2, p4]
+        {Fq6::toaltstack()}
+        // [t4, nt4, p3, g0, g1, f0, f1] [p2, p4, fg']
+        {Fq2::add(6, 2)}
+        {Fq2::add(4, 2)} 
+        {Fq6::fromaltstack()}
+        // [t4, nt4, p3, g+f, fg'] [p2, p4]
+        {Fq2::fromaltstack()}
+        // [t4, nt4, p3, g+f, fg', p4] [p2]
+        {Fq2::fromaltstack()}
+        {Fq2::copy(0)}
+        {Fq2::push(alpha_t2)}
+        {Fq2::push(neg_bias_t2)}
+        // [t4, nt4, p3, g+f, fg', p4, p2, p2, a, b] []
+        {Fq2::roll(4)}
+        {hinted_ell_t2}
+        // [t4, nt4, p3, g+f, fg', p4, p2, p2le] []
+    };
+
+    // rearrange elements order
+    let rearrange_scr = script! {
+        // [t4, nt4, p3, g+f, fg', p4, p2, p2le] 
+        {Fq6::toaltstack()}
+        {Fq2::roll(12)}
+        {Fq2::fromaltstack()}
+        // [t4, nt4, g+f, fg', p4, p3, p2] [p2le]
+        {Fq2::roll(18)} {Fq2::roll(18)}
+         // [t4, g+f, fg', p4, p3, p2, nt4] [p2le]
+
+        for _ in 0..5 {
+            {Fq2::roll(18)}
+        }
+         // [t4, p4, p3, p2, nt4, g+f, fg'] [p2le]
+        {Fq2::fromaltstack()} {Fq2::fromaltstack()}
+        // [t4, p4, p3, p2, nt4, g+f, fg', p2le]
+    };
+
+    // check if g+f == 0 || fg' == 0 
+    let input_validity_scr = script! {
+        // [t4, p4, p3, p2, nt4, g+f, fg', p2le]
+        {Fq6::copy(4)} 
+        // [t4, p4, p3, p2, nt4, g+f, fg', p2le, fg']
+        {Fq6::is_zero()} OP_NOT OP_TOALTSTACK // fg'_is_not_zero()
+        // [t4, p4, p3, p2, nt4, g+f, fg', p2le]
+        {Fq2::copy(16)} {Fq2::copy(16)}
+        // [t4, p4, p3, p2, nt4, g+f, fg', p2le, nt4]
+        {G2Affine::is_zero_keep_element()}
+        OP_NOT OP_TOALTSTACK
+        // [t4, p4, p3, p2, nt4, g+f, fg', p2le, nt4]
+        {G2Affine::drop()}
+        //[t4, p4, p3, p2, nt4, g+f, fg', p2le] [0/1, 0/1, 0/1]
+        OP_FROMALTSTACK OP_FROMALTSTACK
+        // [ .., nt4.is_not_zero() fg'_is_not_zero()] []
+        OP_BOOLAND
+        OP_IF
+            // none are zero
+            {1}
+            // [t4, p4, p3, p2, nt4, g+f, fg', p2le, {1}]
+        OP_ELSE  
+            // at least one is zero
+            {0}
+            // [t4, p4, p3, p2, nt4, g+f, fg', p2le, {0}]
+        OP_ENDIF
+        // [t4, p4, p3, p2, nt4, g+f, fg', p2le, 0/1]
+    };
+
+    let scr = script! {
+        {ops_scr}
+        {rearrange_scr}
+        {input_validity_scr}
+    };
+
+    let hout = ElemG2Eval{
+        t: nt,
+        p2le: [t2le_a, t2le_b],
+        one_plus_ab_j_sq: one_plus_fg_j_sq, 
+        a_plus_b: [fpg.c0, fpg.c1],
+    };
+    
+    let input_is_valid = one_plus_fg_j_sq != ark_bn254::Fq6::ZERO && 
+    (nt != ark_bn254::G2Affine::zero() && nt != ark_bn254::G2Affine::new_unchecked(ark_bn254::Fq2::ZERO, ark_bn254::Fq2::ZERO));
+
+    (hout, input_is_valid, scr, hints)
+
+}
+
+
+pub(crate) fn chunk_point_ops_and_multiply_line_evals_step_1(
+    is_dbl: bool, is_frob: Option<bool>, ate_bit: Option<i8>,
+    t4: ElemG2Eval, p4: ark_bn254::G1Affine, 
+    q4: Option<ark_bn254::G2Affine>,
+    p3: ark_bn254::G1Affine,
+    t3: ark_bn254::G2Affine, q3: Option<ark_bn254::G2Affine>,
+    p2: ark_bn254::G1Affine,
+    t2: ark_bn254::G2Affine, q2: Option<ark_bn254::G2Affine>,
+) -> (ElemG2Eval, bool, Script, Vec<Hint> ) {
+    let (hint_out, is_valid, ops_scr, hints) = point_ops_and_multiply_line_evals_step_1(is_dbl, is_frob, ate_bit, t4.t, p4, q4, p3, t3, q3, p2, t2, q2);
+    let pre_hash_scr = script! {
+        // [t4, p4, p3, p2, nt4, F, 0/1] [outhash, p2hash, p3hash, p4hash, in_t4hash, ht4_le]
+        {Fq::fromaltstack()}
+        {9} OP_ROLL OP_TOALTSTACK
+        // [t4, p4, p3, p2, nt4, F, ht4_le] [outhash, p3hash, p4hash, in_t4hash,  0/1]
+        for _ in 0..(2+2+2+4+14) {
+            {Fq::roll(24)}
+        }
+        // [t4, ht4_le, p4, p3, p2, nt4, F] [outhash, p3hash, p4hash, in_t4hash, 0/1]
+        OP_FROMALTSTACK
+        // [t4, ht4_le, p4, p3, p2, nt4, F, 0/1] [outhash, p3hash, p4hash, in_t4hash]
+    };
+    let _hash_scr = script! {
+        // [t4, ht4_le, p4, p3, nt4, fg] [outhash, p3hash, p4hash, in_t4hash]
+        {hash_messages(vec![ElementType::G2EvalPoint, ElementType::G1, ElementType::G1, ElementType::G1, ElementType::G2Eval])}
+    };
+
+    let pre_ops_scr = script! {
+        // [hints, {t4, ht4_le}, p4, p3, p2] [outhash, p2hash, p3hash, p4hash, in_t4hash (q4)]
+        if !is_dbl {
+            // [hints, {t4, ht4_le}, p4, p3, p2] [outhash, p2hash, p3hash, p4hash, in_t4hash q4]
+            for _ in 0..4 {
+                {Fq::fromaltstack()} // q
+            }
+            // [hints, {t4, ht4_le}, p4, p3, p2, q4] [outhash, p2hash, p3hash, p4hash, in_t4hash]
+            {Fq::roll(10)} {Fq::toaltstack()}
+            // [hints, t4, p4, p3, p2, q4] [outhash, p2hash, p3hash, p4hash, in_t4hash, ht4_le]
+            {Fq6::roll(4)}
+            // [hints, t4, q4, p4, p3, p2] [outhash, p2hash, p3hash, p4hash, in_t4hash, ht4_le]
+        } else {
+            // [hints, {t4, ht4_le}, p4, p3, p2] [outhash, p2hash, p3hash, p4hash, in_t4hash, ht4_le]
+            {Fq::roll(6)} {Fq::toaltstack()}
+            // [hints, t4, p4, p3, p2] [outhash, p2hash, p3hash, p4hash, in_t4hash, ht4_le]
+        }
+    };
+
+    let scr = script! {
+        {pre_ops_scr}
+        // [hints, t4, (q4), p4, p3, p2] [outhash, p2hash, p3hash, p4hash, in_t4hash, ht4_le]
+        {ops_scr}
+        // [t4, p4, p3, p2, nt4, F, 0/1] [outhash, p2hash, p3hash, p4hash, in_t4hash, ht4_le]
+        {pre_hash_scr}
+        // [t4, in_t4hash, p4, p3, p2, nt4, F, 0/1] [outhash, p3hash, p4hash, in_t4hash]
+        // {hash_scr}
+    };
+
+    (hint_out, is_valid, scr, hints)
+}
+
+pub(crate) fn chunk_point_ops_and_multiply_line_evals_step_2(f: ElemG2Eval) -> (ark_bn254::Fq6, bool, Script, Vec<Hint>) {
+    let (ops_res, is_valid_input, ops_scr, ops_hints) = point_ops_and_multiply_line_evals_step_2(f);
+    let scr = script! {
+        // [hints, apb, Ab, c, Haux_in, h] [hash_h, hash_in]
+        {Fq::roll(6)} {Fq::toaltstack()}
+        // [hints, {apb, Ab, c}, h] [hash_h, hash_in, Haux_in]
+        {ops_scr}
+
+        // [{apb, Ab, c}, h, 0/1] [hash_h, hash_in, Haux_in]
+        {Fq::fromaltstack()} 
+        // [{apb, Ab, c}, h, 0/1 Haux_in] [hash_h, hash_in]
+        {9} OP_ROLL OP_TOALTSTACK
+        // [{apb, Ab, c}, h, Haux_in] [hash_h, hash_in, 0/1]
+        {Fq6::roll(1)} OP_FROMALTSTACK
+        // [{apb, Ab, c, Haux_in}, h, 0/1] [hash_h, hash_in]
+    };
+
+    let _hash_scr = script! {
+        // [t4, ht4_le, p4, p3, nt4, fg] [outhash, p3hash, p4hash, in_t4hash]
+        {hash_messages(vec![ElementType::G2EvalMul, ElementType::Fp6])}
+        OP_TRUE
+    };
+
+    (ops_res, is_valid_input, scr, ops_hints)
+}
+
+pub(crate) fn point_ops_and_multiply_line_evals_step_2(
+    f: ElemG2Eval,
+) -> (ark_bn254::Fq6, bool, Script, Vec<Hint>) {
+
+    let ab = f.one_plus_ab_j_sq;
+    let apb = ark_bn254::Fq6::new( f.a_plus_b[0],  f.a_plus_b[1], ark_bn254::Fq2::ZERO);
+
+    assert_ne!(ab, ark_bn254::Fq6::ZERO);
+    let le2_c1 = ark_bn254::Fq6::new( f.p2le[0],  f.p2le[1], ark_bn254::Fq2::ZERO);
+    let le2 = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, le2_c1);
+    let le4_mul_le3 = ark_bn254::Fq12::new(ark_bn254::Fq6::ONE, apb/ab);
+    let le4_mul_le3_mul_le2 = le4_mul_le3 * le2;
+    let abc = ab * le2_c1;
+    let numerator = apb + abc;
+    
+    let apb_mul_c = le2_c1 * apb;
+    let denom = ab + apb_mul_c * ark_bn254::Fq12Config::NONRESIDUE;
+
+    let (abc_out, abc_scr, abc_hints) = utils_fq6_sd_mul(ab, le2_c1);
+    assert_eq!(abc_out, ab*le2_c1);
+    
+    let (apb_mul_c_out, apb_mul_c_scr, apb_mul_c_hints) = utils_fq6_ss_mul(apb, le2_c1);
+    assert_eq!(apb_mul_c, apb_mul_c_out);
+
+    let mut hints = vec![];
+    hints.extend_from_slice(&abc_hints);
+    hints.extend_from_slice(&apb_mul_c_hints);
+
+    let mock_output = ark_bn254::Fq6::ONE;
+
+    let is_valid_input = denom != ark_bn254::Fq6::ZERO;
+    let (g, den_mul_h_scr) = if is_valid_input {
+        let g = le4_mul_le3_mul_le2.c1/le4_mul_le3_mul_le2.c0;
+        assert_eq!(g * denom, numerator);
+        let (den_mul_h_scr, den_mul_h_hints) = Fq6::hinted_mul_keep_elements(6, denom, 0, g);
+        hints.extend_from_slice(&den_mul_h_hints);
+        (g, den_mul_h_scr)
+    } else {
+        let den_mul_h_scr= Fq6::hinted_mul_keep_elements(6, ark_bn254::Fq6::ONE, 0, ark_bn254::Fq6::ONE).0;
+        (mock_output, den_mul_h_scr)
+    };
+
+    let mul_by_beta_sq_scr = script! {
+        {Fq6::mul_fq2_by_nonresidue()}
+        {Fq2::roll(4)} {Fq2::roll(4)}
+    };
+
+    let scr = script! {
+        {Fq6::toaltstack()}
+        // [hints, apb, Ab, c] [h]
+        {abc_scr}
+        // [hints, apb, Ab, c, Abc] [h]
+        // [hints, apb, Ab, c, Abc] [h]
+        {Fq2::copy(18)} {Fq2::copy(18)}
+        // [hints, apb, Ab, c, Abc, apb] [h]
+        {Fq2::copy(12)} {Fq2::copy(12)}
+        // [hints, apb, Ab, c, Abc, apb, c] [h]
+        {apb_mul_c_scr}        
+        // [hints, apb, Ab, c, Abc, apb, c, Apb_mul_C] [h]
+        {mul_by_beta_sq_scr}
+        // [hints, apb, Ab, c, Abc, apb, c, Apb_mul_C_beta_sq] [h]
+        {Fq6::copy(24)}
+        // [hints, apb, Ab, c, Abc, apb, c, Apb_mul_C_beta_sq, Ab] [h]
+        {Fq6::add(6, 0)}
+        // [hints, apb, Ab, c, Abc, apb, c, denom] [h]
+        {Fq6::toaltstack()}
+        // [hints, apb, Ab, c, Abc, apb, c] [h, denom]
+        {Fq2::drop()} {Fq2::drop()}
+        // [hints, apb, Ab, c, Abc, apb] [h, denom]
+        {Fq2::push(ark_bn254::Fq2::ZERO)}
+        {Fq6::add(6, 0)}
+        // [hints, apb, Ab, c, numerator] [h, denom]
+        {Fq6::fromaltstack()}
+        // [hints, apb, Ab, c, numerator, denom] [h]
+
+        {Fq6::copy(0)} {Fq6::is_zero()} OP_NOT // denom_is_not_zero
+        OP_IF
+            // [hints, apb, Ab, c, numerator, denom] [h]
+            {Fq6::fromaltstack()}
+            // [hints, apb, Ab, c, numerator, denom, h]
+            {den_mul_h_scr}
+            // [hints, apb, Ab, c, numerator, denom, h, denom_mul_h]
+            {Fq12::roll(12)}
+            // [hints, apb, Ab, c, h, denom_mul_h, numerator, denom]
+            {Fq6::drop()}
+            // [apb, Ab, c, h, denom_mul_h, numerator]
+            {Fq6::equalverify()}
+            // [ apb, Ab, c, h ]
+            {1} // input was valid
+            // [ apb, Ab, c, h, 1]
+        OP_ELSE
+            // any of the inputs was invalid
+            // [ apb, Ab, c, numerator, denom] [h]
+            {Fq6::drop()} {Fq6::drop()} {Fq6::fromaltstack()}
+            // [apb, Ab, c, h]
+            {Fq6::drop()}
+            {Fq6::push(mock_output)}
+            // [apb, Ab, c, mock_h]
+            {0} // input was invalid
+
+        OP_ENDIF
+        // [ apb, Ab, c, h, 0/1]
+    };
+    (g, is_valid_input, scr, hints)
+}
+
+
+pub(crate) fn chunk_init_t4(ts: [ark_ff::BigInt<4>; 4]) -> (ElemG2Eval, bool, Script, Vec<Hint>) {
+    let mut hints = vec![];
+
+    let mock_t = ark_bn254::G2Affine::new_unchecked(ark_bn254::Fq2::ONE, ark_bn254::Fq2::ONE);
+
+    let are_valid_fps = ts.iter().filter(|f| **f < ark_bn254::Fq::MODULUS).count() == ts.len();
+
+    let mut t4: ElemG2Eval =  ElemG2Eval {
+        t: mock_t,
+        p2le: [ark_bn254::Fq2::ZERO; 2],
+        one_plus_ab_j_sq: ark_bn254::Fq6::ZERO,
+        a_plus_b: [ark_bn254::Fq2::ZERO; 2],
+    };
+    if are_valid_fps {
+        t4.t = ark_bn254::G2Affine::new_unchecked(ark_bn254::Fq2::new(ts[0].into(), ts[1].into()), ark_bn254::Fq2::new(ts[2].into(), ts[3].into()));
+    }
+    
+    let (on_curve_scr, on_curve_hints) = G2Affine::hinted_is_on_curve(t4.t.x, t4.t.y);
+    if are_valid_fps {
+        hints.extend_from_slice(&on_curve_hints);
+    }
+    let is_valid_input = are_valid_fps && t4.t.is_on_curve(); 
+
+    let aux_hash_le = t4.hash_le(); // aux_hash_le doesn't include t4.t, is constant, so hash_le can be hardcoded
+
+    let ops_scr = script! {
+        // [hints] [f_hash_claim, y1, y0, x1, x0]
+        for _ in 0..4 {
+            {Fq::fromaltstack()}
+        }
+
+        {Fq2::copy(2)} {Fq2::copy(2)}
+        for _ in 0..4 {
+            { Fq::push_hex(Fq::MODULUS) }
+            { U256::lessthan(1, 0) } // a < p
+            OP_TOALTSTACK
+        }
+        {1}
+        for _ in 0..4 {
+            OP_FROMALTSTACK
+            OP_BOOLAND
+        }
+
+        OP_IF 
+            // [hints, x0, x1, y0, y1] [f_hash_claim]
+            {Fq2::copy(2)} {Fq2::copy(2)}
+            // [hints, x0, x1, y0, y1, x0, x1, y0, y1] [f_hash_claim]
+            {on_curve_scr}
+            OP_IF
+                // [x0, x1, y0, y1] [f_hash_claim]
+                for le in extern_nibbles_to_limbs(aux_hash_le) {
+                    {le}
+                }
+                // [x0, x1, y0, y1, aux_hash_le] [f_hash_claim]
+                {1}
+            OP_ELSE
+                for _ in 0..4 {
+                    {Fq::drop()}
+                }
+                {G2Affine::push(mock_t)}
+                // [mock_t] [f_hash_claim]
+                for le in extern_nibbles_to_limbs(aux_hash_le) {
+                    {le}
+                }
+                // [mock_t, aux_hash_le] [f_hash_claim]
+                {0}
+            OP_ENDIF
+            // [T4, HashT4Aux, {0/1}] [NT4_hash_claim]
+        OP_ELSE
+            // [x0, x1, y0, y1] [f_hash_claim]
+            for _ in 0..4 {
+                {Fq::drop()}
+            }
+            {G2Affine::push(mock_t)}
+            for le in extern_nibbles_to_limbs(aux_hash_le) {
+                {le}
+            }
+            // [mock_t, aux_hash_le] [f_hash_claim]
+            {0}
+        OP_ENDIF
+
+    };
+    let _hash_scr = script! {
+        {hash_messages(vec![ElementType::G2EvalPoint])}
+        OP_TRUE
+    };
+    (t4, is_valid_input, ops_scr, hints)
+}
+
+
+
+#[cfg(test)]
+mod test {
+    use std::str::FromStr;
+
+    use ark_ec::AffineRepr;
+    use ark_ff::{AdditiveGroup, BigInt, Field, MontFp, UniformRand};
+    use bitcoin_script::script;
+    use num_bigint::BigUint;
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+    use crate::{bn254::{fp254impl::Fp254Impl, fq::Fq, fq2::Fq2, fq6::Fq6, g1::G1Affine, g2::G2Affine, utils::Hint}, chunk::{wrap_hasher::hash_messages, elements::{DataType, ElemG2Eval, ElementType}, taps_point_ops::{chunk_point_ops_and_multiply_line_evals_step_2, chunk_init_t4, chunk_point_ops_and_multiply_line_evals_step_1, point_ops_and_multiply_line_evals_step_2, point_ops_and_multiply_line_evals_step_1, utils_point_add_eval}}, execute_script};
+
+    use super::{frob_q_power, utils_point_double_eval};
+
+
+    #[test]
+    fn test_point_double_eval() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G2Affine::rand(&mut prng);
+        let p = ark_bn254::G1Affine::rand(&mut prng);
+        
+        let ((r, le), scr, hints) = utils_point_double_eval(t, p);
+        // a, b, tx, ty, px, py
+
+        let script = script! {
+            for h in hints {
+                {h.push()}
+            }
+            {G2Affine::push(t)}
+            {G1Affine::push(p)}
+            // [hints, tx, ty, px, py]
+            {scr}
+            // t, R, dbl_le
+            {Fq2::push(le.1)}
+            {Fq2::equalverify()}
+            {Fq2::push(le.0)}
+            {Fq2::equalverify()}
+
+            {Fq2::push(r.y)}
+            {Fq2::equalverify()}
+            {Fq2::push(r.x)}
+            {Fq2::equalverify()}
+
+
+            {Fq2::push(t.y)}
+            {Fq2::equalverify()}
+
+
+            {Fq2::push(t.x)}
+            {Fq2::equalverify()}
+
+            
+            OP_TRUE
+        };
+        let res = execute_script(script);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(res.success);
+        assert!(res.final_stack.len() == 1);    
+        println!("utils_point_double_eval disprovable(false) max_stack {:?}", res.stats.max_nb_stack_items);
+    }
+
+
+    #[test]
+    fn test_point_add_eval() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let t = ark_bn254::G2Affine::rand(&mut prng);
+        let q = ark_bn254::G2Affine::rand(&mut prng);
+        let p = ark_bn254::G1Affine::rand(&mut prng);
+
+        let beta_22x = BigUint::from_str(
+            "21888242871839275220042445260109153167277707414472061641714758635765020556616",
+        )
+        .unwrap();
+        let beta_22y = BigUint::from_str("0").unwrap();
+        let beta_22 = ark_bn254::Fq2::from_base_prime_field_elems([
+            ark_bn254::Fq::from(beta_22x.clone()),
+            ark_bn254::Fq::from(beta_22y.clone()),
+        ])
+        .unwrap();
+        let qb = ark_bn254::G2Affine::new_unchecked(q.x * beta_22, q.y);
+
+        let zero = ark_bn254::G2Affine::identity();
+
+        for (t, q, p, frob, ate) in vec![
+                // test vectors
+                (zero, q, p, false, 1), // t = 0 
+                (t, zero, p, false, 1), // q = 0
+                (t, zero, p, false, -1), // q = neg 0 
+                (zero, q, p, false, -1), // t = zero, q = neg
+
+                (zero, q, p, true, 1), // t = 0 
+                (t, zero, p, true, 1), // q = 0
+                (t, zero, p, true, -1), // q = neg 0 
+                (zero, q, p, true, -1), // t = zero, q = neg 
+
+                (t, q, p, false, 1), // add 
+                (t, q, p, false, -1), // neg
+                (t, -t, p, false, 1), // t = -q
+                (t, t, p, false, -1), // t = -q
+                (t, t, p, false, 1), // t = q
+                (t, -t, p, false, -1), // t = q
+                (t, q, p, true, 1), // frob pow 1 
+                (t, q, p, true, -1), // frob pow 2
+                (qb, q, p, true, -1), // frob pow 2
+                (qb, -q, p, true, -1), // frob pow 2
+            ] {
+            let ((r, le), hinted_check_add, hints) = utils_point_add_eval(t, q, p, frob, ate);
+
+            let script = script! {
+                for hint in hints {
+                    { hint.push() }
+                }
+    
+                { Fq2::push(t.x) }
+                { Fq2::push(t.y) }
+                { Fq2::push(q.x) }
+                { Fq2::push(q.y) }
+                { G1Affine::push(p) }
+                { hinted_check_add.clone() }
+                // [x']
+    
+    
+                {Fq2::push(le.1)}
+                {Fq2::equalverify()}
+                {Fq2::push(le.0)}
+                {Fq2::equalverify()}
+    
+                {Fq2::push(r.y)}
+                {Fq2::equalverify()}
+                {Fq2::push(r.x)}
+                {Fq2::equalverify()}
+                
+                
+                {Fq2::push(t.y)}
+                {Fq2::equalverify()}
+    
+                {Fq2::push(t.x)}
+                {Fq2::equalverify()}
+                // []
+                OP_TRUE
+                // [OP_TRUE]
+            };
+            let exec_result = execute_script(script);
+            if exec_result.final_stack.len() > 1 {
+                for i in 0..exec_result.final_stack.len() {
+                    println!("{i:} {:?}", exec_result.final_stack.get(i));
+                }
+            }
+            assert!(exec_result.success);
+            assert!(exec_result.final_stack.len() == 1);
+            println!(
+                "utils_point_add_eval disprovable(false) {} @ {} stack; r.is_inf({})",
+                hinted_check_add.len(),
+                exec_result.stats.max_nb_stack_items,
+                r.is_zero() || (r.x == ark_bn254::Fq2::ZERO && r.y == ark_bn254::Fq2::ZERO)
+            );
+        }
+
+    }
+
+
+    
+
+    #[test]
+    fn test_tap_init_t4() {
+        let mut prng = ChaCha20Rng::seed_from_u64(1);
+        let temp_q1 = ark_bn254::G2Affine::rand(&mut prng);
+        let q1: [BigInt::<4>; 4] = [temp_q1.x.c0.into(), temp_q1.x.c1.into(), temp_q1.y.c0.into(), temp_q1.y.c1.into()];
+        let q2 = [ark_ff::BigInt::<4>::zero(), ark_ff::BigInt::<4>::zero(), ark_ff::BigInt::<4>::zero(), ark_ff::BigInt::<4>::zero()];
+        let q3 = [ark_ff::BigInt::<4>::one() << 255, ark_ff::BigInt::<4>::one() << 255, ark_ff::BigInt::<4>::one() << 255, ark_ff::BigInt::<4>::one() << 255];
+        let q4 = [ark_ff::BigInt::<4>::one(), ark_ff::BigInt::<4>::one(), ark_ff::BigInt::<4>::zero(), ark_ff::BigInt::<4>::zero()];
+
+        let test_set = vec![(q1, false), (q2, true), (q3, true), (q4, true)];
+        for (q, is_disprovable) in test_set {
+            let (hint_out, is_valid_input, init_t4_tap,  hint_script) = chunk_init_t4(q);
+            assert_eq!(is_valid_input, !is_disprovable);
+
+            let hint_out = DataType::G2EvalData(hint_out);
+    
+            let bitcom_script = script!{
+                {hint_out.to_hash().as_hint_type().push()}
+                {Fq::toaltstack()}
+    
+                for temp in q.into_iter().rev() {
+                    {Hint::U256(temp.into()).push()}
+                    {Fq::toaltstack()}
+                }
+            };
+            let hash_scr = script! {
+                {hash_messages(vec![ElementType::G2EvalPoint])}
+                OP_TRUE
+            };
+    
+            let tap_len = init_t4_tap.len() + hash_scr.len();
+            let script = script! {
+                for h in hint_script {
+                    { h.push() }
+                }
+                {bitcom_script}
+                {init_t4_tap}
+                {hash_scr}
+            };
+    
+            let res = execute_script(script);
+            if res.final_stack.len() > 1 {
+                for i in 0..res.final_stack.len() {
+                    println!("{i:} {:?}", res.final_stack.get(i));
+                }
+            }
+            assert_eq!(res.success, is_disprovable); 
+            assert!(res.final_stack.len() == 1);
+            println!("chunk_init_t4: disprovable({}) script {} stack {}", is_disprovable, tap_len, res.stats.max_nb_stack_items);
+        }
+    }
+
+    #[test]
+    fn test_point_ops_and_multiply_line_evals_step_1_valid_data() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        let t4 = ark_bn254::G2Affine::rand(&mut prng);
+        let q4 = ark_bn254::G2Affine::rand(&mut prng);
+        let p4 = ark_bn254::G1Affine::rand(&mut prng);
+        
+        let t3 = ark_bn254::G2Affine::rand(&mut prng);
+        let q3 = ark_bn254::G2Affine::rand(&mut prng);
+        let p3 = ark_bn254::G1Affine::rand(&mut prng);
+
+        let t2 = ark_bn254::G2Affine::rand(&mut prng);
+        let q2 = ark_bn254::G2Affine::rand(&mut prng);
+        let p2 = ark_bn254::G1Affine::rand(&mut prng);
+
+        let is_dbl = false;
+        let is_frob: Option<bool> = Some(true);
+        let ate_bit: Option<i8> = Some(1);
+
+        assert_eq!(is_dbl, is_frob.is_none() && ate_bit.is_none());
+        assert_eq!(!is_dbl, is_frob.is_some() && ate_bit.is_some());
+
+        let (hint_out,is_valid_input, ops_scr, ops_hints) = point_ops_and_multiply_line_evals_step_1(is_dbl, is_frob, ate_bit, t4, p4, Some(q4), p3, t3, Some(q3), p2, t2, Some(q2));
+        assert!(is_valid_input);
+
+        let mut preimage_hints = vec![];
+        preimage_hints.extend_from_slice(&[Hint::Fq(t4.x.c0),
+            Hint::Fq(t4.x.c1),
+            Hint::Fq(t4.y.c0),
+            Hint::Fq(t4.y.c1)]);
+
+        if !is_dbl {
+            preimage_hints.extend_from_slice(&[Hint::Fq(q4.x.c0),
+                Hint::Fq(q4.x.c1),
+                Hint::Fq(q4.y.c0),
+                Hint::Fq(q4.y.c1)]);
+        }
+
+
+        preimage_hints.extend_from_slice(&[Hint::Fq(p4.x),
+            Hint::Fq(p4.y)]);
+        preimage_hints.extend_from_slice(&[Hint::Fq(p3.x),
+            Hint::Fq(p3.y)]);
+        preimage_hints.extend_from_slice(&[Hint::Fq(p2.x),
+            Hint::Fq(p2.y)]);
+
+        let tap_len = ops_scr.len();
+        // [hints, t4, (q2), p4, p3, p2]
+        let scr = script! {
+            for h in &ops_hints {
+                {h.push()}
+            }
+            for h in &preimage_hints {
+                {h.push()}
+            }
+            {ops_scr}
+            OP_VERIFY // valid input
+             // [t4, p4, p3, p2, nt4, gpf, fg, p2le]
+            {Fq2::push(hint_out.p2le[1])}
+            {Fq2::equalverify()}
+            {Fq2::push(hint_out.p2le[0])}
+            {Fq2::equalverify()}
+            {Fq6::push(hint_out.one_plus_ab_j_sq)}
+            {Fq6::equalverify()}
+            {Fq2::push(hint_out.a_plus_b[1])}
+            {Fq2::equalverify()}
+            {Fq2::push(hint_out.a_plus_b[0])}
+            {Fq2::equalverify()}
+            {Fq2::push(hint_out.t.y)}
+            {Fq2::equalverify()}
+            {Fq2::push(hint_out.t.x)}
+            {Fq2::equalverify()}
+            {G1Affine::push(p2)}
+            {Fq2::equalverify()}
+            {G1Affine::push(p3)}
+            {Fq2::equalverify()}
+            {G1Affine::push(p4)}
+            {Fq2::equalverify()}
+            {Fq2::push(t4.y)}
+            {Fq2::equalverify()}
+            {Fq2::push(t4.x)}
+            {Fq2::equalverify()}
+            OP_TRUE
+        };
+
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(res.success); 
+        assert!(res.final_stack.len() == 1);
+        println!("point_ops_and_multiply_line_evals_step_1 disprovable(false) script {} stack {:?}", tap_len, res.stats.max_nb_stack_items);
+    }
+
+    #[test]
+    fn test_point_ops_and_multiply_line_evals_step_1_numerator_zero() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        let t4 = ark_bn254::G2Affine::rand(&mut prng);
+        let q4 = ark_bn254::G2Affine::rand(&mut prng);
+        let p4 = ark_bn254::G1Affine::rand(&mut prng);
+        
+        let t3 = t4; // ark_bn254::G2Affine::rand(&mut prng);
+        let q3 = q4; //ark_bn254::G2Affine::rand(&mut prng);
+        let p3 = ark_bn254::G1Affine::new_unchecked(-p4.x, -p4.y); //ark_bn254::G1Affine::rand(&mut prng);
+
+        let t2 = ark_bn254::G2Affine::rand(&mut prng);
+        let q2 = ark_bn254::G2Affine::rand(&mut prng);
+        let p2 = ark_bn254::G1Affine::rand(&mut prng);
+
+        let is_dbl = false;
+        let is_frob: Option<bool> = Some(false);
+        let ate_bit: Option<i8> = Some(1);
+
+        assert_eq!(is_dbl, is_frob.is_none() && ate_bit.is_none());
+        assert_eq!(!is_dbl, is_frob.is_some() && ate_bit.is_some());
+
+        let (hint_out, is_valid_input, ops_scr, ops_hints) = point_ops_and_multiply_line_evals_step_1(is_dbl, is_frob, ate_bit, t4, p4, Some(q4), p3, t3, Some(q3), p2, t2, Some(q2));
+        assert!(is_valid_input);
+
+        let mut preimage_hints = vec![];
+        preimage_hints.extend_from_slice(&[Hint::Fq(t4.x.c0),
+            Hint::Fq(t4.x.c1),
+            Hint::Fq(t4.y.c0),
+            Hint::Fq(t4.y.c1)]);
+
+        if !is_dbl {
+            preimage_hints.extend_from_slice(&[Hint::Fq(q4.x.c0),
+                Hint::Fq(q4.x.c1),
+                Hint::Fq(q4.y.c0),
+                Hint::Fq(q4.y.c1)]);
+        }
+
+
+        preimage_hints.extend_from_slice(&[Hint::Fq(p4.x),
+            Hint::Fq(p4.y)]);
+        preimage_hints.extend_from_slice(&[Hint::Fq(p3.x),
+            Hint::Fq(p3.y)]);
+        preimage_hints.extend_from_slice(&[Hint::Fq(p2.x),
+            Hint::Fq(p2.y)]);
+
+        let tap_len = ops_scr.len();
+        // [hints, t4, (q2), p4, p3, p2]
+        let scr = script! {
+            for h in &ops_hints {
+                {h.push()}
+            }
+            for h in &preimage_hints {
+                {h.push()}
+            }
+            {ops_scr}
+            OP_VERIFY // valid input
+             // [t4, p4, p3, p2, nt4, gpf, fg, p2le]
+            {Fq2::push(hint_out.p2le[1])}
+            {Fq2::equalverify()}
+            {Fq2::push(hint_out.p2le[0])}
+            {Fq2::equalverify()}
+            {Fq6::push(hint_out.one_plus_ab_j_sq)}
+            {Fq6::equalverify()}
+            {Fq2::push(hint_out.a_plus_b[1])}
+            {Fq2::equalverify()}
+            {Fq2::push(hint_out.a_plus_b[0])}
+            {Fq2::equalverify()}
+            {Fq2::push(hint_out.t.y)}
+            {Fq2::equalverify()}
+            {Fq2::push(hint_out.t.x)}
+            {Fq2::equalverify()}
+            {G1Affine::push(p2)}
+            {Fq2::equalverify()}
+            {G1Affine::push(p3)}
+            {Fq2::equalverify()}
+            {G1Affine::push(p4)}
+            {Fq2::equalverify()}
+            {Fq2::push(t4.y)}
+            {Fq2::equalverify()}
+            {Fq2::push(t4.x)}
+            {Fq2::equalverify()}
+            OP_TRUE
+        };
+
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(res.success); 
+        assert!(res.final_stack.len() == 1);
+        println!("point_ops_and_multiply_line_evals_step_1 disprovable(true) script {} stack {:?}", tap_len, res.stats.max_nb_stack_items);
+    }
+
+    #[test]
+    fn test_point_ops_and_multiply_line_evals_step_2_numerator_zero() {
+        let is_dbl = true;
+
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        let t4 = ark_bn254::G2Affine::rand(&mut prng);
+        let q4 = ark_bn254::G2Affine::rand(&mut prng);
+        let p4 = ark_bn254::G1Affine::rand(&mut prng);
+        let t3 = ark_bn254::G2Affine::rand(&mut prng);
+        let q3 = ark_bn254::G2Affine::rand(&mut prng);
+        let p3 = ark_bn254::G1Affine::rand(&mut prng);
+
+        let t2 = ark_bn254::G2Affine::rand(&mut prng);
+        let q2 = ark_bn254::G2Affine::rand(&mut prng);
+        let p2 = ark_bn254::G1Affine::rand(&mut prng);
+
+        
+        let t4 = ElemG2Eval {t: t4, p2le:[ark_bn254::Fq2::ONE; 2], one_plus_ab_j_sq: ark_bn254::Fq6::ONE, a_plus_b: [ark_bn254::Fq2::ONE; 2]};
+        let (mut inp, is_valid_input, _, _) = chunk_point_ops_and_multiply_line_evals_step_1(is_dbl, None, None, t4, p4, Some(q4), p3, t3, Some(q3), p2, t2, Some(q2));
+        assert!(is_valid_input);
+
+        let apb = ark_bn254::Fq6::new(inp.a_plus_b[0], inp.a_plus_b[1], ark_bn254::Fq2::ZERO);
+        let le2 = ark_bn254::Fq6::new(inp.p2le[0], inp.p2le[1], ark_bn254::Fq2::ZERO);
+        // apb/ab + le2 = 0 => apb/ab = -le2 => ab = ab = -apb/le2
+        let new_ab = -apb/le2;
+        inp.one_plus_ab_j_sq = new_ab; // numerator will be zero
+
+        let (hout, is_valid_input, ops_scr, ops_hints) = point_ops_and_multiply_line_evals_step_2(inp);
+        assert!(is_valid_input);
+        
+        let mut preimage_hints = vec![];
+        let hint_apb: Vec<Hint> = vec![inp.a_plus_b[0].c0, inp.a_plus_b[0].c1, inp.a_plus_b[1].c0, inp.a_plus_b[1].c1].into_iter().map(Hint::Fq).collect();
+        let hint_ab: Vec<Hint> = inp.one_plus_ab_j_sq.to_base_prime_field_elements().map(Hint::Fq).collect();
+        let hint_p2le: Vec<Hint> = vec![inp.p2le[0].c0, inp.p2le[0].c1, inp.p2le[1].c0, inp.p2le[1].c1].into_iter().map(Hint::Fq).collect();
+        let hint_result: Vec<Hint> = hout.to_base_prime_field_elements().map(Hint::Fq).collect();
+
+        preimage_hints.extend_from_slice(&hint_apb);
+        preimage_hints.extend_from_slice(&hint_ab);
+        preimage_hints.extend_from_slice(&hint_p2le);
+        preimage_hints.extend_from_slice(&hint_result);
+
+
+        // [hints, apb, ab, c] [h]
+        let tap_len= ops_scr.len();
+        let scr = script! {
+            for h in ops_hints {
+                {h.push()}
+            }
+            for h in &preimage_hints {
+                {h.push()}
+            }
+            {ops_scr}
+            OP_VERIFY
+            for h in preimage_hints.iter().rev() {
+                {h.push()}
+                {Fq::equalverify(1, 0)}
+            }
+            OP_TRUE
+        };
+
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(res.success); 
+        assert!(res.final_stack.len() == 1);
+        println!("point_ops_and_multiply_line_evals_step_2 disprovable(true) script {} stack {:?}", tap_len, res.stats.max_nb_stack_items);
+
+
+    }
+
+
+
+    #[test]
+    fn test_point_ops_and_multiply_line_evals_step_2() {
+        let is_dbl = true;
+
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        let t4 = ark_bn254::G2Affine::rand(&mut prng);
+        let q4 = ark_bn254::G2Affine::rand(&mut prng);
+        let p4 = ark_bn254::G1Affine::rand(&mut prng);
+        let t3 = ark_bn254::G2Affine::rand(&mut prng);
+        let q3 = ark_bn254::G2Affine::rand(&mut prng);
+        let p3 = ark_bn254::G1Affine::rand(&mut prng);
+
+        let t2 = ark_bn254::G2Affine::rand(&mut prng);
+        let q2 = ark_bn254::G2Affine::rand(&mut prng);
+        let p2 = ark_bn254::G1Affine::rand(&mut prng);
+
+        let t4 = ElemG2Eval {t: t4, p2le:[ark_bn254::Fq2::ONE; 2], one_plus_ab_j_sq: ark_bn254::Fq6::ONE, a_plus_b: [ark_bn254::Fq2::ONE; 2]};
+        let (inp, is_valid_input, _, _) = chunk_point_ops_and_multiply_line_evals_step_1(is_dbl, None, None, t4, p4, Some(q4), p3, t3, Some(q3), p2, t2, Some(q2));
+        assert!(is_valid_input);
+
+        let (hout, is_valid_input, ops_scr, ops_hints) = point_ops_and_multiply_line_evals_step_2(inp);
+        assert!(is_valid_input);
+        
+        let mut preimage_hints = vec![];
+        let hint_apb: Vec<Hint> = vec![inp.a_plus_b[0].c0, inp.a_plus_b[0].c1, inp.a_plus_b[1].c0, inp.a_plus_b[1].c1].into_iter().map(Hint::Fq).collect();
+        let hint_ab: Vec<Hint> = inp.one_plus_ab_j_sq.to_base_prime_field_elements().map(Hint::Fq).collect();
+        let hint_p2le: Vec<Hint> = vec![inp.p2le[0].c0, inp.p2le[0].c1, inp.p2le[1].c0, inp.p2le[1].c1].into_iter().map(Hint::Fq).collect();
+        let hint_result: Vec<Hint> = hout.to_base_prime_field_elements().map(Hint::Fq).collect();
+
+        preimage_hints.extend_from_slice(&hint_apb);
+        preimage_hints.extend_from_slice(&hint_ab);
+        preimage_hints.extend_from_slice(&hint_p2le);
+        preimage_hints.extend_from_slice(&hint_result);
+
+
+        // [hints, apb, ab, c] [h]
+        let tap_len= ops_scr.len();
+        let scr = script! {
+            for h in ops_hints {
+                {h.push()}
+            }
+            for h in &preimage_hints {
+                {h.push()}
+            }
+            {ops_scr}
+            OP_VERIFY
+            for h in preimage_hints.iter().rev() {
+                {h.push()}
+                {Fq::equalverify(1, 0)}
+            }
+            OP_TRUE
+        };
+
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(res.success); 
+        assert!(res.final_stack.len() == 1);
+        println!("point_ops_and_multiply_line_evals_step_2 disprovable(false) script {} stack {:?}", tap_len, res.stats.max_nb_stack_items);
+
+
+    }
+
+    #[test]
+    fn test_chunk_point_ops_and_multiply_line_evals_step_2() {
+        let is_dbl = true;
+
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        let t4 = ark_bn254::G2Affine::rand(&mut prng);
+        let q4 = ark_bn254::G2Affine::rand(&mut prng);
+        let p4 = ark_bn254::G1Affine::rand(&mut prng);
+        let t3 = ark_bn254::G2Affine::rand(&mut prng);
+        let q3 = ark_bn254::G2Affine::rand(&mut prng);
+        let p3 = ark_bn254::G1Affine::rand(&mut prng);
+
+        let t2 = ark_bn254::G2Affine::rand(&mut prng);
+        let q2 = ark_bn254::G2Affine::rand(&mut prng);
+        let p2 = ark_bn254::G1Affine::rand(&mut prng);
+
+        let t4 = ElemG2Eval {t: t4, p2le:[ark_bn254::Fq2::ONE; 2], one_plus_ab_j_sq: ark_bn254::Fq6::ONE, a_plus_b: [ark_bn254::Fq2::ONE; 2]};
+        let (inp, is_valid_input,_, _) = chunk_point_ops_and_multiply_line_evals_step_1(is_dbl, None, None, t4, p4, Some(q4), p3, t3, Some(q3), p2, t2, Some(q2));
+        assert!(is_valid_input);
+
+        let (hint_out, is_valid_input, ops_scr, ops_hints) = chunk_point_ops_and_multiply_line_evals_step_2(inp);
+        assert!(is_valid_input);
+
+        let inp = DataType::G2EvalData(inp);
+        let hint_out = DataType::Fp6Data(hint_out);
+        let mut preimage_hints =  inp.to_witness(ElementType::G2EvalMul);
+        preimage_hints.extend_from_slice(&hint_out.to_witness(ElementType::Fp6)); 
+
+        let bitcom_scr = script! {
+            {hint_out.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+            {inp.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+        };
+
+        let hash_scr = script! {
+            {hash_messages(vec![ElementType::G2EvalMul, ElementType::Fp6])}
+            OP_TRUE
+        };
+
+        let tap_len= ops_scr.len() + hash_scr.len();
+        let scr = script! {
+            for h in ops_hints {
+                {h.push()}
+            }
+            for h in &preimage_hints {
+                {h.push()}
+            }
+            {bitcom_scr}
+            {ops_scr}
+            {hash_scr}
+        };
+
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(!res.success); 
+        assert!(res.final_stack.len() == 1);
+        println!("chunk_point_ops_and_multiply_line_evals_step_2 disprovable(false) script {} stack {:?}", tap_len, res.stats.max_nb_stack_items);
+
+
+    }
+    
+    #[test]
+    fn test_chunk_point_ops_and_multiply_line_evals_step_1() {
+        let is_dbl = false;
+        let is_frob: Option<bool> = Some(true);
+        let ate_bit: Option<i8> = Some(1);
+        // let is_dbl = true;
+        // let is_frob: Option<bool> = None;
+        // let ate_bit: Option<i8> = None;
+
+        assert_eq!(is_dbl, is_frob.is_none() && ate_bit.is_none());
+        assert_eq!(!is_dbl, is_frob.is_some() && ate_bit.is_some());
+
+
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+
+        let t4 = ark_bn254::G2Affine::rand(&mut prng);
+        let q4 = ark_bn254::G2Affine::rand(&mut prng);
+        let p4 = ark_bn254::G1Affine::rand(&mut prng);
+        let t3 = ark_bn254::G2Affine::rand(&mut prng);
+        let q3 = ark_bn254::G2Affine::rand(&mut prng);
+        let p3 = ark_bn254::G1Affine::rand(&mut prng);
+
+        let t2 = ark_bn254::G2Affine::rand(&mut prng);
+        let q2 = ark_bn254::G2Affine::rand(&mut prng);
+        let p2 = ark_bn254::G1Affine::rand(&mut prng);
+
+        let t4 = ElemG2Eval {t: t4, p2le:[ark_bn254::Fq2::ONE; 2], one_plus_ab_j_sq: ark_bn254::Fq6::ONE, a_plus_b: [ark_bn254::Fq2::ONE; 2]};
+        let (hint_out, is_valid_input, ops_scr, ops_hints) = chunk_point_ops_and_multiply_line_evals_step_1(is_dbl, is_frob, ate_bit, t4, p4, Some(q4), p3, t3, Some(q3), p2, t2, Some(q2));
+        assert!(is_valid_input);
+
+        let t4 = DataType::G2EvalData(t4);
+        let hint_out = DataType::G2EvalData(hint_out);
+        let p4 = DataType::G1Data(p4);
+        let p3 = DataType::G1Data(p3);
+        let p2 = DataType::G1Data(p2);
+     
+        let mut preimage_hints = vec![];
+        preimage_hints.extend_from_slice(&t4.to_witness(ElementType::G2EvalPoint));
+        preimage_hints.extend_from_slice(&p4.to_witness(ElementType::G1));
+        preimage_hints.extend_from_slice(&p3.to_witness(ElementType::G1));
+        preimage_hints.extend_from_slice(&p2.to_witness(ElementType::G1));
+
+        // chunk_point_eval_and_mul(hint_out);
+
+        let bitcom_scr = script! {
+            {hint_out.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+            {p2.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+            {p3.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+            {p4.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+            {t4.to_hash().as_hint_type().push()}
+            {Fq::toaltstack()}
+
+            if !is_dbl {
+                {Fq::push(q4.y.c1)}
+                {Fq::toaltstack()}
+                {Fq::push(q4.y.c0)}
+                {Fq::toaltstack()}
+                {Fq::push(q4.x.c1)}
+                {Fq::toaltstack()}
+                {Fq::push(q4.x.c0)} 
+                {Fq::toaltstack()}
+            }
+        };
+
+        let hash_scr = script! {
+            {hash_messages(vec![ElementType::G2EvalPoint, ElementType::G1, ElementType::G1, ElementType::G1, ElementType::G2Eval])}
+            OP_TRUE
+        };
+
+        let tap_len = ops_scr.len() + hash_scr.len();
+        // [hints, t4, (q2), p4, p3]
+        let scr = script! {
+            for h in &ops_hints {
+                {h.push()}
+            }
+            for h in &preimage_hints {
+                {h.push()}
+            }
+            {bitcom_scr}
+            {ops_scr}
+            {hash_scr}
+        };
+
+        let res = execute_script(scr);
+        if res.final_stack.len() > 1 {
+            for i in 0..res.final_stack.len() {
+                println!("{i:} {:?}", res.final_stack.get(i));
+            }
+        }
+        assert!(!res.success); 
+        assert!(res.final_stack.len() == 1);
+        println!("chunk_point_ops_and_multiply_line_evals_step_1 disprovable(true) script {} stack {:?}", tap_len, res.stats.max_nb_stack_items);
+    }
+
+
+    #[test]
+    fn test_frob() {
+        let mut prng = ChaCha20Rng::seed_from_u64(0);
+        let p = ark_bn254::G2Affine::rand(&mut prng);
+
+        // compute frob_q_power iteratively
+        let q1 = frob_q_power(p, 1);
+        let q2 = frob_q_power(q1, 1);
+        let q3 = frob_q_power(q2, 1);
+
+        // compute frob_q_power directly
+        let q2d = frob_q_power(p, -1);
+        let q3d = frob_q_power(p, 3);
+
+
+        assert_eq!(-q2d, q2);
+        assert_eq!(q3d, q3);
+    }
+
+}
\ No newline at end of file
diff --git a/bitvm/src/chunk/wrap_hasher.rs b/bitvm/src/chunk/wrap_hasher.rs
new file mode 100644
index 000000000..4c31ec07e
--- /dev/null
+++ b/bitvm/src/chunk/wrap_hasher.rs
@@ -0,0 +1,242 @@
+use crate::{bn254::{fp254impl::Fp254Impl, fq::Fq}, hash::blake3_u4_compact::blake3_u4_compact, treepp::*};
+use bitcoin_script_stack::stack::StackTracker;
+use hash_utils::{hash_fp2, hash_fp6, hash_g2acc, hash_g2acc_with_hash_t, hash_g2acc_with_hashed_le};
+
+use super::{elements::ElementType};
+
+pub const BLAKE3_HASH_LENGTH: usize = 20;
+
+/// truncate 32 byte output hash to {BLAKE3_HASH_LENGTH} hash output and pad with zeros
+fn wrap_scr(scr: Script) -> Script {
+    script! {
+        { scr }
+        for _ in 0..(32*2-BLAKE3_HASH_LENGTH*2)/2 { OP_2DROP }
+        for _ in 0..BLAKE3_HASH_LENGTH*2 { OP_TOALTSTACK }
+        for _ in 0..(32*2-BLAKE3_HASH_LENGTH*2) { 0 }
+        for _ in 0..BLAKE3_HASH_LENGTH*2 { OP_FROMALTSTACK  }
+    }
+}
+
+// create Script instance from stack-tracker and pad output with zeros to appropriate hash size
+pub(crate) fn hash_n_bytes<const N: u32>() -> Script {
+    let mut stack = StackTracker::new();
+    blake3_u4_compact(&mut stack, N, true, true);
+    wrap_scr(stack.get_script())
+}
+
+// helpers to directly hash data structures that we work with
+// example: extension field elements, point accumulators
+pub(crate) mod hash_utils {
+    use bitcoin_script::script;
+    use crate::{bn254::{fp254impl::Fp254Impl, fq::Fq, fq2::Fq2}, chunk::{helpers::{pack_nibbles_to_limbs}, wrap_hasher::hash_n_bytes}, treepp::Script};
+
+    /// Compute hash of top two field elements on stack: [a00, a01]
+    /// Output is {BLAKE3_HASH_LENGTH} byte output represented in limb-form
+    pub(crate) fn hash_fp2() -> Script {
+        script! {
+            // [a00, a01]
+            { hash_n_bytes::<64>() }
+            // Hash(a00|a01)
+            { pack_nibbles_to_limbs() }
+        }
+    }
+
+    /// Compute hash of top four field elements on stack: [a00, a01, a10, a11]
+    /// Output is {BLAKE3_HASH_LENGTH} byte output represented in limb-form
+    pub(crate) fn hash_fp4() -> Script {
+        script! {
+            // [a00, a01, a10, a11]
+            {Fq2::roll(2)}
+            // [a10, a11, a00, a01] 
+            // Requires first msg-block at the top of stack
+            { hash_n_bytes::<128>() }
+            // Hash(a00|a01|a10|a11)
+            { pack_nibbles_to_limbs() }
+        }
+    }
+
+    /// Compute hash of top six field elements on stack: [a00, a01, a10, a11, a20, a21]
+    /// Output is {BLAKE3_HASH_LENGTH} byte output represented in limb-form
+    pub(crate) fn hash_fp6() -> Script {
+        script! {
+            // [a00, a01, a10, a11, a20, a21]
+            {Fq2::roll(2)} {Fq2::roll(4)}
+            // [a20, a21, a10, a11, a00, a01]
+            // Requires first msg-block at the top of stack
+            {hash_n_bytes::<192>()}
+            // Hash(a00|a01|a10|a11|a20|a21)
+            {pack_nibbles_to_limbs()}
+        }
+    }
+    
+    /// Compute hash of top six field elements on stack: [a00, a01,.., a60, a61]
+    /// Output is {BLAKE3_HASH_LENGTH} byte output represented in limb-form
+    pub(crate) fn hash_fp14() -> Script {
+        script! {
+            // [a00, a01,... ,a60, a61]
+            {Fq2::roll(2)} {Fq2::roll(4)} {Fq2::roll(6)} 
+            {Fq2::roll(8)} {Fq2::roll(10)} {Fq2::roll(12)}
+            // [a60, a61,... ,a00, a01]
+            {hash_n_bytes::<448>()}
+            // Hash(a00|a01|..|a60|a61)
+            {pack_nibbles_to_limbs()}
+        }
+    }
+    
+    /// Compute hash of G2 Point Accumulator (i.e. [t(4), partial_product(14)]) where Hash(partial_product) has been passed as auxiliary input on stack.
+    /// Stack: [t(4), Hash_partial_product(1)]
+    pub(crate) fn hash_g2acc_with_hashed_le() -> Script {
+        script! {
+            // [t, Hash_partial_product]
+            {Fq::toaltstack()} 
+            {hash_fp4()}
+            {Fq::fromaltstack()}
+            // [Hash_t, Hash_partial_product]
+            {hash_fp2()}
+            // [ Hash(Hash_t|Hash_partial_product) ]
+            // [ Hash(G2Acc) ]
+        }
+    }
+    
+    /// Compute hash of G2 Point Accumulator (i.e. [t(4), partial_product(14)]) where all elements are passed as raw value on stack
+    /// Stack: [t(4), partial_product(14)]
+    pub(crate) fn hash_g2acc() -> Script {
+        script!{
+            // [t, partial_product]
+            for _ in 0..14 {
+                {Fq::toaltstack()}
+            }
+            // [t] [partial_product]
+            {hash_fp4()}
+            // [Hash_t] [partial_product]
+            for _ in 0..14 {
+                {Fq::fromaltstack()}
+            }
+            // [Hash_t partial_product]
+            {Fq::roll(14)} {Fq::toaltstack()}
+            // [partial_product] [Hash_t]
+            {hash_fp14()}
+            // [Hash_partial_product] [Hash_t]
+            {Fq::fromaltstack()}
+            {Fq::roll(1)}
+            // [ Hash_t, Hash_partial_product ]
+            {hash_fp2()}
+            // [ Hash(Hash_t|Hash_partial_priduct) ]
+            // [ Hash(G2Acc) ]
+        }
+    }
+    
+    /// Compute hash of G2 Point Accumulator (i.e. [t(4), partial_product(14)]) where Hash(t) has been passed as auxiliary input on stack.
+    /// Stack: [Hash_partial_priduct(14), Hash_t(1)]
+    pub(crate) fn hash_g2acc_with_hash_t() -> Script {
+        script!{
+            // [partial_product, Hash_t]
+            {Fq::toaltstack()}
+            {hash_fp14()}
+            {Fq::fromaltstack()}
+            {Fq::roll(1)}
+            // [ Hash_t, Hash_partial_product ]
+            {hash_fp2()}
+            // [ Hash(Hash_t|Hash_partial_priduct) ]
+            // [ Hash(G2Acc) ]
+        }
+    }
+}
+
+/// This function is used to add hashing layer to the disprove script.
+/// The additional logic here is due to a constraint in blake3_u4 
+/// which requires the entire stack to only hold the message to be hashed.
+/// Given an array of Elements of different ElementType, the function assumes the order [Input_A_Preimage, Input_B_Preimage, Output_Preimage, should_do_output_validity_check_bit] for main stack
+/// and [Output_Hash, Input_B_Hash, Input_A_Hash] for altstack
+// should_do_output_validity_check_bit: we have a bit at the top of stack that determines whether the final equality check between calculated and claimed output
+// should be done. This is used in the context where tapscript is disproven based on input invalidity indifferent to output.
+// i.e. if the claimed input is invalid, user can disprove indifferent to output computation
+pub fn hash_messages(elem_types: Vec<ElementType>) -> Script {
+    // Altstack: [Hc, Hb, Ha]
+    // Stack: [a, b, c, should_do_output_validity_check_bit]
+    let elem_types: Vec<ElementType> = elem_types.into_iter().filter(|et| et.number_of_limbs_of_hashing_preimage() > 0).collect();
+    let mut loop_script = script! {};
+
+    for msg_index in 0..elem_types.len() {
+        let mut remaining = elem_types[msg_index+1..].to_vec(); // "remaining" refers to elements other than the msg to hash
+        let mut from_altstack = script! {};  // script to bring "remaining" elements back from altstack
+        for elem_type in &remaining {
+            from_altstack = script! {
+                {from_altstack}
+                // bring "size" number of elements from altstack; where "size" is the number of limbs of elem_type
+                for _ in 0..elem_type.number_of_limbs_of_hashing_preimage() {
+                    {Fq::fromaltstack()}
+                }
+            };
+        }
+        remaining.reverse();
+        let mut to_altstack = script! {}; // script to send "remaining" elements to altstack
+        for elem_type in &remaining {
+            to_altstack = script! {
+                {to_altstack}
+                for _ in 0..elem_type.number_of_limbs_of_hashing_preimage() {
+                    {Fq::toaltstack()}
+                }
+            };
+        }
+
+        // hash remaining element
+        let elem_type = elem_types[msg_index];
+        let hash_scr = script! {
+            if elem_type == ElementType::Fp6 {
+                {hash_fp6()}
+            } else if elem_type == ElementType::G1 {
+                {hash_fp2()}
+            } else if elem_type == ElementType::G2EvalPoint {
+                {hash_g2acc_with_hashed_le()}
+            } else if elem_type == ElementType::G2EvalMul {
+                {hash_g2acc_with_hash_t()}
+            } else if elem_type == ElementType::G2Eval {
+                {hash_g2acc()}
+            }
+        };
+
+        let verify_scr = script! {
+            // bottom of the stack contains the calculated hash, bring it to the top
+            for _ in 0..Fq::N_LIMBS { 
+                OP_DEPTH OP_1SUB OP_ROLL 
+            }
+            // top of altstack contains the claimed hash for corresponding message
+            {Fq::fromaltstack()}
+            // compare hashes
+            {Fq::equal(1, 0)}
+            if msg_index == elem_types.len()-1 { // if last message
+                // [should_do_output_validity_check_bit, output_is_equal] []
+                OP_TOALTSTACK // [should_do_output_validity_check_bit] [output_is_equal]
+                OP_IF
+                    // input was valid, so disprove if output hashes (claimed vs calculated) don't match
+                    OP_FROMALTSTACK
+                    OP_NOT  
+                OP_ELSE     
+                    // should_do_output_validity_check_bit = 0 means the tapscript reached a disprove condition not dependent upon value of output 
+                    // i.e. input/intermediate value was invalid
+                    OP_FROMALTSTACK
+                    OP_DROP // indifferent to equality check, therefore drop "output_is_equal" 
+                    {1}     // successfully disprove
+                OP_ENDIF
+            }
+            OP_VERIFY
+        };
+        loop_script = script! {
+            {loop_script}
+            // send output_validity bit to altstack
+            OP_TOALTSTACK
+            // send "remaining" elements to altstack
+            {to_altstack}
+            // hash the message
+            {hash_scr}
+            // bring "remaining" elements from altstack
+            {from_altstack}
+            // bring output_validity bit from altstack
+            OP_FROMALTSTACK
+            // verify that the calculated hash is equal to claimed hash
+            {verify_scr}
+        };
+    }
+    loop_script
+}
\ No newline at end of file
diff --git a/bitvm/src/chunk/wrap_wots.rs b/bitvm/src/chunk/wrap_wots.rs
new file mode 100644
index 000000000..395a85011
--- /dev/null
+++ b/bitvm/src/chunk/wrap_wots.rs
@@ -0,0 +1,160 @@
+use bitcoin_script::script;
+
+use crate::chunk::helpers::pack_bytes_to_limbs;
+use crate::chunk::wrap_hasher::BLAKE3_HASH_LENGTH;
+use crate::pseudo::NMUL;
+use crate::treepp::Script;
+use crate::signatures::wots_api::{wots160, wots256};
+
+
+
+pub(crate) fn checksig_verify_to_limbs(pub_key: &WOTSPubKey) -> Script {
+    match pub_key {
+        WOTSPubKey::P160(pb) => {
+            let sc_nib = wots160::compact::checksig_verify(*pb);
+            const N0: usize = BLAKE3_HASH_LENGTH*2;
+            script!{
+                {sc_nib}
+                for _ in 0..(64-N0) { // padding
+                    {0}
+                }
+                for i in 1..64 { // sig order reversal
+                    {i} OP_ROLL
+                }
+                // w-window to byte array
+                for _ in 0..32 { OP_SWAP { NMUL(1 << 4) } OP_ADD OP_TOALTSTACK }
+                for _ in 0..32 { OP_FROMALTSTACK }
+                // byte array to limbs
+                {pack_bytes_to_limbs()} // equivalent to CompressedStateObject::deserialize_from_byte_array
+            }
+        },
+        WOTSPubKey::P256(pb) => {
+            let sc_nib = wots256::compact::checksig_verify(*pb);
+            script!{
+                {sc_nib}
+                for i in 1..64 {
+                    {i} OP_ROLL
+                }
+                for _ in 0..32 { OP_SWAP { NMUL(1 << 4) } OP_ADD OP_TOALTSTACK }
+                for _ in 0..32 { OP_FROMALTSTACK }
+                {pack_bytes_to_limbs()}
+            }
+        },
+    }
+}
+
+pub(crate) fn byte_array_to_wots160_sig(secret: &str, msg_bytes: &[u8]) -> wots160::Signature {
+    wots160::get_signature(secret, msg_bytes)
+} 
+
+pub(crate) fn byte_array_to_wots256_sig(secret: &str, msg_bytes: &[u8]) -> wots256::Signature {
+    wots256::get_signature(secret, msg_bytes)
+} 
+
+pub(crate) fn wots256_sig_to_byte_array(sig: wots256::Signature) -> Vec<u8> {
+    let nibs = sig.map(|(_, digit)| digit);
+    // [MSB, LSB, MSB, LSB, ..., checksum]
+    let mut nibs = nibs[0..64].to_vec(); // remove checksum
+    // [MSB, LSB, MSB, LSB]
+    nibs.reverse(); // sigs are obtained in reverse order so undo
+    // [LSB, MSB, LSB, MSB,.., LSB]
+    let nibs = nibs
+        .chunks(2)
+        .map(|bn| (bn[1] << 4) + bn[0]) // endian assumed by wots
+        .collect::<Vec<u8>>();
+    nibs
+}
+
+pub(crate) fn wots160_sig_to_byte_array(sig: wots160::Signature) -> Vec<u8> {
+    let nibs = sig.map(|(_, digit)| digit);
+    // [MSB, LSB, MSB, LSB, ..., checksum]
+    let mut nibs = nibs[0..BLAKE3_HASH_LENGTH*2].to_vec(); // remove checksum
+    // [MSB, LSB, MSB, LSB]
+    nibs.reverse(); // sigs are obtained in reverse order so undo
+    // [LSB, MSB, LSB, MSB,.., LSB]
+    let nibs = nibs
+        .chunks(2)
+        .map(|bn| (bn[1] << 4) + bn[0]) // endian assumed by wots
+        .collect::<Vec<u8>>();
+    nibs
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum WOTSPubKey {
+    P160(wots160::PublicKey),
+    P256(wots256::PublicKey)
+}
+
+
+#[cfg(test)]
+mod test {
+    use ark_ff::{Field, UniformRand};
+    use rand::SeedableRng;
+    use rand_chacha::ChaCha20Rng;
+    use bitcoin_script::script;
+    use crate::{bn254::{fp254impl::Fp254Impl, fq::Fq}, chunk::{elements::CompressedStateObject, helpers::extern_hash_fps, wrap_wots::{byte_array_to_wots160_sig, byte_array_to_wots256_sig, checksig_verify_to_limbs, wots160_sig_to_byte_array, wots256_sig_to_byte_array, WOTSPubKey}}, execute_script, signatures::wots_api::{wots160, wots256, SignatureImpl}};
+
+    #[test]
+    fn test_wots256_sig_to_byte_array() {
+        // wots sig to limbs
+        let mut prng = ChaCha20Rng::seed_from_u64(97);
+        let f = ark_bn254::Fq::rand(&mut prng);
+        let a: ark_ff::BigInt<4> = f.into();
+        let a = CompressedStateObject::U256(a);
+        let a_bytes = a.clone().serialize_to_byte_array();
+
+        let secret: &str = "a138982ce17ac813d505a5b40b665d404e9528e7";
+        let signature = byte_array_to_wots256_sig(secret, &a_bytes);
+
+        let msg_bytes = wots256_sig_to_byte_array(signature);
+        assert_eq!(msg_bytes, a_bytes);
+        let msg = CompressedStateObject::deserialize_from_byte_array(msg_bytes);
+        assert_eq!(a, msg);
+
+        let sig_witness = signature.to_compact_script();
+        let pub_key = WOTSPubKey::P256(wots256::generate_public_key(secret));
+        let scr = script! {
+            {sig_witness}
+            {checksig_verify_to_limbs(&pub_key)}
+            {a.as_hint_type().push()}
+            {Fq::equalverify(1, 0)}
+            OP_TRUE
+        };
+        let tap_len = scr.len();
+        let res = execute_script(scr);
+        assert!(res.success && res.final_stack.len() == 1);
+        println!("script {} stack {}", tap_len, res.stats.max_nb_stack_items);
+    }
+
+    #[test]
+    fn test_wots160_sig_to_byte_array() {
+        // wots sig to limbs
+        let mut prng = ChaCha20Rng::seed_from_u64(97);
+        let a = ark_bn254::Fq6::rand(&mut prng);
+        let a = extern_hash_fps(a.to_base_prime_field_elements().collect::<Vec<ark_bn254::Fq>>());
+        let a = CompressedStateObject::Hash(a);
+        let a_bytes = a.clone().serialize_to_byte_array();
+
+        let secret: &str = "a138982ce17ac813d505a5b40b665d404e9528e7";
+
+        let signature = byte_array_to_wots160_sig(secret, &a_bytes);
+        let msg_bytes = wots160_sig_to_byte_array(signature);
+        assert_eq!(msg_bytes, a_bytes);
+        let msg = CompressedStateObject::deserialize_from_byte_array(msg_bytes);
+        assert_eq!(a, msg);
+
+        let sig_witness = signature.to_compact_script();
+        let pub_key = WOTSPubKey::P160(wots160::generate_public_key(secret));
+        let scr = script! {
+            {sig_witness}
+            {checksig_verify_to_limbs(&pub_key)}
+            {a.as_hint_type().push()}
+            {Fq::equalverify(1, 0)}
+            OP_TRUE
+        };
+        let tap_len = scr.len();
+        let res = execute_script(scr);
+        assert!(res.success && res.final_stack.len() == 1);
+        println!("script {} stack {}", tap_len, res.stats.max_nb_stack_items);
+    }
+}
\ No newline at end of file
diff --git a/bitvm/src/groth16/constants.rs b/bitvm/src/groth16/constants.rs
new file mode 100644
index 000000000..1dfe95744
--- /dev/null
+++ b/bitvm/src/groth16/constants.rs
@@ -0,0 +1,50 @@
+use std::str::FromStr;
+use std::sync::LazyLock;
+use ark_ff::{Field, UniformRand};
+use num_bigint::BigUint;
+use num_traits::Num;
+use rand::SeedableRng;
+use rand_chacha::ChaCha20Rng;
+
+use crate::{bn254::{fp254impl::Fp254Impl, fq::Fq}, log_assert_eq, log_assert_ne};
+
+pub static LAMBDA: LazyLock<BigUint> = LazyLock::new(|| {
+    BigUint::from_str(
+        "10486551571378427818905133077457505975146652579011797175399169355881771981095211883813744499745558409789005132135496770941292989421431235276221147148858384772096778432243207188878598198850276842458913349817007302752534892127325269"
+    ).unwrap()
+});
+
+pub static P: LazyLock<BigUint> = LazyLock::new(|| { BigUint::from_str_radix(Fq::MODULUS, 16).unwrap() });
+pub static R: LazyLock<BigUint> = LazyLock::new(|| { BigUint::from_str("21888242871839275222246405745257275088548364400416034343698204186575808495617").unwrap() });
+pub const S: u32 = 3;
+pub static EXP: LazyLock<BigUint> = LazyLock::new(|| { P.pow(12_u32) - 1_u32 });
+pub static H: LazyLock<BigUint> = LazyLock::new(|| { &*EXP / &*R });
+pub static T: LazyLock<BigUint> = LazyLock::new(|| { &*EXP / 3_u32.pow(S) });
+pub static K: LazyLock<BigUint> = LazyLock::new(|| { (&*T + 1_u32) / 3_u32 });
+pub static M: LazyLock<BigUint> = LazyLock::new(|| { &*LAMBDA / &*R });
+pub const D: u32 = 3;
+pub static MM: LazyLock<BigUint> = LazyLock::new(|| { &*M / D });
+pub static COFACTOR_CUBIC: LazyLock<BigUint> = LazyLock::new(|| { 3_u32.pow(S - 1) * &*T });
+
+pub static W: LazyLock<ark_bn254::Fq12> = LazyLock::new(|| {
+    let mut prng = ChaCha20Rng::seed_from_u64(0);
+    // sample a proper scalar w which is cubic non-residue
+    let w = {
+        let (mut w, mut z) = (ark_bn254::Fq12::ONE, ark_bn254::Fq12::ONE);
+        while w == ark_bn254::Fq12::ONE {
+            // choose z which is 3-th non-residue
+            let mut legendre = ark_bn254::Fq12::ONE;
+            while legendre == ark_bn254::Fq12::ONE {
+                z = ark_bn254::Fq12::rand(&mut prng);
+                legendre = z.pow(&*COFACTOR_CUBIC.to_u64_digits());
+            }
+            // obtain w which is t-th power of z
+            w = z.pow(&*T.to_u64_digits());
+        }
+        w
+    };
+    // make sure 27-th root w, is 3-th non-residue and r-th residue
+    log_assert_ne!(w.pow(&*COFACTOR_CUBIC.to_u64_digits()), ark_bn254::Fq12::ONE);
+    log_assert_eq!(w.pow(&*H.to_u64_digits()), ark_bn254::Fq12::ONE);
+    w
+});
diff --git a/src/groth16/mod.rs b/bitvm/src/groth16/mod.rs
similarity index 79%
rename from src/groth16/mod.rs
rename to bitvm/src/groth16/mod.rs
index 6544cd563..8aa917312 100644
--- a/src/groth16/mod.rs
+++ b/bitvm/src/groth16/mod.rs
@@ -4,4 +4,4 @@ pub mod offchain_checker;
 
 #[cfg(test)]
 mod test;
-pub mod verifier;
+pub mod verifier;
\ No newline at end of file
diff --git a/bitvm/src/groth16/offchain_checker.rs b/bitvm/src/groth16/offchain_checker.rs
new file mode 100644
index 000000000..aea9c7147
--- /dev/null
+++ b/bitvm/src/groth16/offchain_checker.rs
@@ -0,0 +1,136 @@
+#![allow(non_snake_case)]
+use crate::groth16::constants::{COFACTOR_CUBIC, H, K, LAMBDA, MM, R, S, T, W};
+use ark_ff::{Field, One};
+use num_bigint::BigUint;
+use num_traits::ToPrimitive;
+
+#[macro_export]
+macro_rules! log_assert_eq {
+    ($left:expr, $right:expr) => {
+        if $left != $right {
+            // log error
+            println! {"fail assert"}
+        }
+    };
+    ($left:expr, $right:expr, $message: expr) => {
+        if $left != $right {
+            // log error
+            println! {"fail assert: {}", $message}
+        }
+    };
+    ($left:expr, $right:expr, $text: expr, $message: expr) => {
+        if $left != $right {
+            // log error
+            println! {$text, $message}
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! log_assert_ne {
+    ($left:expr, $right:expr) => {
+        if $left == $right {
+            println! {"fail assert"}
+        }
+    };
+    ($left:expr, $right:expr, $message: expr) => {
+        if $left == $right {
+            // log error
+            println! {"fail assert: {}", $message}
+        }
+    };
+}
+
+// refer table 3 of https://eprint.iacr.org/2009/457.pdf
+// a: Fp12 which is cubic residue
+// c: random Fp12 which is cubic non-residue
+// s: satisfying p^12 - 1 = 3^s * t
+// t: satisfying p^12 - 1 = 3^s * t
+// k: k = (t + 1) // 3
+fn tonelli_shanks_cubic(
+    a: ark_bn254::Fq12,
+    c: ark_bn254::Fq12,
+    s: u32,
+    t: BigUint,
+    k: BigUint,
+) -> ark_bn254::Fq12 {
+    let mut r = a.pow(t.to_u64_digits());
+    let e = 3_u32.pow(s - 1);
+    let exp = 3_u32.pow(s) * &t;
+
+    // compute cubic root of (a^t)^-1, say h
+    let (mut h, cc, mut c) = (
+        ark_bn254::Fq12::ONE,
+        c.pow([e as u64]),
+        c.inverse().unwrap(),
+    );
+    for i in 1..(s as i32) {
+        let delta = (s as i32) - i - 1;
+        let d = if delta < 0 {
+            r.pow((&exp / 3_u32.pow((-delta) as u32)).to_u64_digits())
+        } else {
+            r.pow([3_u32.pow(delta as u32).to_u64().unwrap()])
+        };
+        if d == cc {
+            (h, r) = (h * c, r * c.pow([3_u64]));
+        } else if d == cc.pow([2_u64]) {
+            (h, r) = (h * c.pow([2_u64]), r * c.pow([3_u64]).pow([2_u64]));
+        }
+        c = c.pow([3_u64])
+    }
+
+    // recover cubic root of a
+    r = a.pow(k.to_u64_digits()) * h;
+    if t == 3_u32 * k + 1_u32 {
+        r = r.inverse().unwrap();
+    }
+
+    log_assert_eq!(r.pow([3_u64]), a);
+    r
+}
+
+// Finding C
+// refer from Algorithm 5 of "On Proving Pairings"(https://eprint.iacr.org/2024/640.pdf)
+pub fn compute_c_wi(f: ark_bn254::Fq12) -> (ark_bn254::Fq12, ark_bn254::Fq12) {
+    // make sure f is r-th residue
+    log_assert_eq!(f.pow(&*H.to_u64_digits()), ark_bn254::Fq12::ONE);
+
+    let w = *W;
+
+    // options for wi are 1, w, w^2
+    let mut wi = ark_bn254::Fq12::ONE;
+    if (f * wi).pow(&*COFACTOR_CUBIC.to_u64_digits()) != ark_bn254::Fq12::ONE {
+        wi *= w;
+        if (f * wi).pow(&*COFACTOR_CUBIC.to_u64_digits()) != ark_bn254::Fq12::ONE {
+            wi *= w;
+            log_assert_eq!(
+                (f * wi).pow(&*COFACTOR_CUBIC.to_u64_digits()),
+                ark_bn254::Fq12::ONE
+            );
+        }
+    }
+    log_assert_eq!(wi.pow(&*H.to_u64_digits()), ark_bn254::Fq12::ONE);
+
+    // f1 is scaled f
+    let f1 = f * wi;
+
+    // r-th root of f1, say f2
+    let r_inv = R.modinv(&H).unwrap();
+    log_assert_ne!(r_inv, BigUint::one());
+    let f2 = f1.pow(r_inv.to_u64_digits());
+    log_assert_ne!(f2, ark_bn254::Fq12::ONE);
+
+    // m'-th root of f, say f3
+    let mm_inv = MM.modinv(&(&*R * &*H)).unwrap();
+    log_assert_ne!(mm_inv, BigUint::one());
+    let f3 = f2.pow(mm_inv.to_u64_digits());
+    log_assert_eq!(f3.pow(&*COFACTOR_CUBIC.to_u64_digits()), ark_bn254::Fq12::ONE);
+    log_assert_ne!(f3, ark_bn254::Fq12::ONE);
+
+    // d-th (cubic) root, say c
+    let c = tonelli_shanks_cubic(f3, w, S, T.clone(), K.clone());
+    log_assert_ne!(c, ark_bn254::Fq12::ONE);
+    log_assert_eq!(c.pow(LAMBDA.to_u64_digits()), f * wi);
+
+    (c, wi)
+}
diff --git a/src/groth16/test.rs b/bitvm/src/groth16/test.rs
similarity index 71%
rename from src/groth16/test.rs
rename to bitvm/src/groth16/test.rs
index 2644ce067..86d25df8f 100644
--- a/src/groth16/test.rs
+++ b/bitvm/src/groth16/test.rs
@@ -1,13 +1,14 @@
-use crate::{execute_script_as_chunks, execute_script_without_stack_limit};
 use crate::groth16::verifier::Verifier;
+use crate::execute_script_without_stack_limit;
 use ark_bn254::Bn254;
 use ark_crypto_primitives::snark::{CircuitSpecificSetupSNARK, SNARK};
 use ark_ec::pairing::Pairing;
-use ark_ff::PrimeField;
+use ark_ff::{BigInt, PrimeField};
 use ark_groth16::Groth16;
 use ark_relations::lc;
 use ark_relations::r1cs::{ConstraintSynthesizer, ConstraintSystemRef, SynthesisError};
 use ark_std::{end_timer, start_timer, test_rng, UniformRand};
+use bitcoin_script::script;
 use rand::{RngCore, SeedableRng};
 
 #[derive(Copy)]
@@ -55,7 +56,7 @@ impl<F: PrimeField> ConstraintSynthesizer<F> for DummyCircuit<F> {
 }
 
 #[test]
-fn test_groth16_verifier() {
+fn test_hinted_groth16_verifier() {
     type E = Bn254;
     let k = 6;
     let mut rng = ark_std::rand::rngs::StdRng::seed_from_u64(test_rng().next_u64());
@@ -71,11 +72,23 @@ fn test_groth16_verifier() {
 
     let proof = Groth16::<E>::prove(&pk, circuit, &mut rng).unwrap();
 
+    let (hinted_groth16_verifier, hints) = Verifier::hinted_verify(&[c], &proof, &vk);
+
+    println!(
+        "hinted_groth16_verifier: {:?} bytes",
+        hinted_groth16_verifier.len()
+    );
+
     let start = start_timer!(|| "collect_script");
-    let script = Verifier::verify_proof(&vec![c], &proof, &vk);
+    let script = script! {
+        for hint in hints {
+            { hint.push() }
+        }
+        { hinted_groth16_verifier }
+    };
     end_timer!(start);
 
-    println!("groth16::test_verify_proof = {} bytes", script.len());
+    println!("groth16::test_hinted_verify_proof = {} bytes", script.len());
 
     let start = start_timer!(|| "execute_script");
     let exec_result = execute_script_without_stack_limit(script);
@@ -85,13 +98,13 @@ fn test_groth16_verifier() {
 }
 
 #[test]
-fn test_groth16_verifier_as_chunks() {
+fn test_hinted_groth16_verifier_small_public() {
     type E = Bn254;
     let k = 6;
     let mut rng = ark_std::rand::rngs::StdRng::seed_from_u64(test_rng().next_u64());
     let circuit = DummyCircuit::<<E as Pairing>::ScalarField> {
-        a: Some(<E as Pairing>::ScalarField::rand(&mut rng)),
-        b: Some(<E as Pairing>::ScalarField::rand(&mut rng)),
+        a: Some(<E as Pairing>::ScalarField::from_bigint(BigInt::from(u32::rand(&mut rng))).unwrap()),
+        b: Some(<E as Pairing>::ScalarField::from_bigint(BigInt::from(u32::rand(&mut rng))).unwrap()),
         num_variables: 10,
         num_constraints: 1 << k,
     };
@@ -101,16 +114,26 @@ fn test_groth16_verifier_as_chunks() {
 
     let proof = Groth16::<E>::prove(&pk, circuit, &mut rng).unwrap();
 
+    let (hinted_groth16_verifier, hints) = Verifier::hinted_verify(&[c], &proof, &vk);
+
+    println!(
+        "hinted_groth16_verifier: {:?} bytes",
+        hinted_groth16_verifier.len()
+    );
+
     let start = start_timer!(|| "collect_script");
-    let script = Verifier::verify_proof(&vec![c], &proof, &vk);
+    let script = script! {
+        for hint in hints {
+            { hint.push() }
+        }
+        { hinted_groth16_verifier }
+    };
     end_timer!(start);
 
-    println!("groth16::test_verify_proof = {} bytes", script.len());
+    println!("groth16::test_hinted_verify_proof = {} bytes", script.len());
 
-    let interval = script.max_op_if_interval();
-    println!("Max if interval: {:?} difference: {}, debug info: {}, {}", interval, interval.1 - interval.0, script.debug_info(interval.0), script.debug_info(interval.1));
     let start = start_timer!(|| "execute_script");
-    let exec_result = execute_script_as_chunks(script, 3_000_000, 3_000_000);
+    let exec_result = execute_script_without_stack_limit(script);
     end_timer!(start);
 
     assert!(exec_result.success);
diff --git a/bitvm/src/groth16/verifier.rs b/bitvm/src/groth16/verifier.rs
new file mode 100644
index 000000000..af359581e
--- /dev/null
+++ b/bitvm/src/groth16/verifier.rs
@@ -0,0 +1,158 @@
+use crate::bn254::ell_coeffs::{BnAffinePairing, AffinePairing, G2Prepared};
+use crate::bn254::fp254impl::Fp254Impl;
+use crate::bn254::fq::Fq;
+use crate::bn254::fq12::Fq12;
+use crate::bn254::fq2::Fq2;
+use crate::bn254::msm::hinted_msm_with_constant_bases_affine;
+use crate::bn254::pairing::Pairing;
+use crate::bn254::utils::Hint;
+use crate::bn254::g1::hinted_from_eval_point;
+use crate::groth16::offchain_checker::compute_c_wi;
+use crate::treepp::{script, Script};
+use ark_bn254::{Bn254, G1Projective};
+use ark_ec::pairing::Pairing as ark_Pairing;
+use ark_ec::{AffineRepr, CurveGroup, VariableBaseMSM};
+use ark_ff::Field;
+use ark_groth16::{Proof, VerifyingKey};
+use core::ops::Neg;
+
+use super::constants::LAMBDA;
+
+#[derive(Clone, Copy, Debug)]
+pub struct Verifier;
+
+impl Verifier {
+    pub fn hinted_verify(
+        public_inputs: &[<Bn254 as ark_Pairing>::ScalarField],
+        proof: &Proof<Bn254>,
+        vk: &VerifyingKey<Bn254>,
+    ) -> (Script, Vec<Hint>) {
+        let mut hints = Vec::new();
+
+        let scalars = [
+            vec![<Bn254 as ark_Pairing>::ScalarField::ONE],
+            public_inputs.to_owned(),
+        ]
+        .concat();
+        let msm_g1 =
+            G1Projective::msm(&vk.gamma_abc_g1, &scalars).expect("failed to calculate msm");
+        //let (hinted_msm, hint_msm) = hinted_msm_with_constant_bases(&vk.gamma_abc_g1, &scalars);
+        let (hinted_msm, hint_msm) =
+            hinted_msm_with_constant_bases_affine(&vk.gamma_abc_g1, &scalars);
+        hints.extend(hint_msm);
+
+        // G1/G2 points for pairings
+        let (p1, p2, p3, p4) = (msm_g1.into_affine(), proof.c, vk.alpha_g1, proof.a);
+        let (q1, q2, q3, q4) = (
+            vk.gamma_g2.into_group().neg().into_affine(),
+            vk.delta_g2.into_group().neg().into_affine(),
+            -vk.beta_g2,
+            proof.b,
+        );
+        let t4 = q4;
+
+        // hint from arkworks
+        let pairing = BnAffinePairing;
+        let f = pairing.multi_miller_loop_affine([p1, p2, p3, p4], [q1, q2, q3, q4]).0;
+        let f_without_3 = pairing.multi_miller_loop_affine([p1, p2, p4], [q1, q2, q4]).0;
+        let (c, wi) = compute_c_wi(f_without_3);
+        let c_inv = c.inverse().unwrap();
+        let result = f_without_3 * wi * (c_inv.pow(LAMBDA.to_u64_digits()));
+        println!("f_without_3: {:?}", f_without_3);
+        println!("result: {:?}", result);
+
+        let q_prepared = [G2Prepared::from_affine(q1),
+            G2Prepared::from_affine(q2),
+            G2Prepared::from_affine(q3),
+            G2Prepared::from_affine(q4)];
+
+        let p_lst = vec![p1, p2, p3, p4];
+
+        let (hinted_script1, hint1) = Fq::hinted_inv(p1.y);
+        let (hinted_script2, hint2) = Fq::hinted_mul(1, p1.y.inverse().unwrap(), 0, p1.x.neg());
+        let (hinted_script3, hint3) = hinted_from_eval_point(p2);
+        let (hinted_script4, hint4) = hinted_from_eval_point(p3);
+        let (hinted_script5, hint5) = hinted_from_eval_point(p4);
+        let (hinted_script6, hint6) = Pairing::hinted_quad_miller_loop_with_c_wi(
+            q_prepared.to_vec(),
+            c,
+            c_inv,
+            wi,
+            p_lst,
+            q4,
+        );
+
+        let script = script! {
+            // constants
+            { constants() }
+            // variant of p1, say -p1.x / p1.y, 1 / p1.y
+            { hinted_msm }
+            { hinted_script1 } // Fq::inv(),
+            { Fq::copy(0) }
+            { Fq::roll(2) }
+            { Fq::neg(0) }
+            { hinted_script2 } // Fq::mul()
+            { Fq::roll(1) }
+            // variants of G1 points
+            { Fq::push(p2.y.inverse().unwrap()) }
+            { Fq::push(p2.x) }
+            { Fq::push(p2.y) }
+            { hinted_script3 } // utils::from_eval_point(p2),
+            { Fq::push(p3.y.inverse().unwrap()) }
+            { Fq::push(p3.x) }
+            { Fq::push(p3.y) }
+            { hinted_script4 } // utils::from_eval_point(p3),
+            { Fq::push(p4.y.inverse().unwrap()) }
+            { Fq::push(p4.x) }
+            { Fq::push(p4.y) }
+            { hinted_script5 } // utils::from_eval_point(p4),
+            // the only non-fixed G2 point, say q4
+            { Fq2::push(q4.x) }
+            { Fq2::push(q4.y) }
+            // proofs for verifying final exp
+            { Fq12::push(c) }
+            { Fq12::push(c_inv) }
+            { Fq12::push(wi) }
+            // accumulator of q4, say t4
+            { Fq2::push(t4.x) }
+            { Fq2::push(t4.y) }
+            // stack: [beta_12, beta_13, beta_22, P1, P2, P3, P4, Q4, c, c_inv, wi, T4]
+
+            // 3. verify pairing
+            // Input stack: [beta_12, beta_13, beta_22, P1, P2, P3, P4, Q4, c, c_inv, wi, T4]
+            // Output stack: [final_f]
+            { hinted_script6 } // Pairing::quad_miller_loop_with_c_wi(q_prepared.to_vec()),
+            // check final_f == hint
+            { Fq12::push(result) }
+            { Fq12::equalverify() }
+            OP_TRUE
+        };
+
+        hints.extend(hint1);
+        hints.extend(hint2);
+        hints.extend(hint3);
+        hints.extend(hint4);
+        hints.extend(hint5);
+        hints.extend(hint6);
+
+        (script, hints)
+    }
+}
+
+// Push constants to stack
+// Return Stack: [beta_12, beta_13, beta_22, 1/2, B]
+fn constants() -> Script {
+    script! {
+        // beta_12
+        { Fq::push_dec("21575463638280843010398324269430826099269044274347216827212613867836435027261") }
+        { Fq::push_dec("10307601595873709700152284273816112264069230130616436755625194854815875713954") }
+
+         // beta_13
+        { Fq::push_dec("2821565182194536844548159561693502659359617185244120367078079554186484126554") }
+        { Fq::push_dec("3505843767911556378687030309984248845540243509899259641013678093033130930403") }
+
+        // beta_22
+        { Fq::push_dec("21888242871839275220042445260109153167277707414472061641714758635765020556616") }
+        { Fq::push_zero() }
+    }
+}
diff --git a/src/hash/blake3.rs b/bitvm/src/hash/blake3.rs
similarity index 86%
rename from src/hash/blake3.rs
rename to bitvm/src/hash/blake3.rs
index c4fedf2af..340a1363f 100644
--- a/src/hash/blake3.rs
+++ b/bitvm/src/hash/blake3.rs
@@ -1,8 +1,6 @@
 #![allow(non_snake_case)]
 use std::collections::HashMap;
 
-use bitcoin::script;
-
 use crate::pseudo::push_to_stack;
 use crate::treepp::{script, Script};
 use crate::u32::u32_std::{u32_equalverify, u32_roll};
@@ -118,6 +116,7 @@ pub fn initial_state(block_len: u32) -> Vec<Script> {
     state.iter().map(|x| u32_push(*x)).collect::<Vec<_>>()
 }
 
+#[allow(clippy::too_many_arguments)]
 fn G(env: &mut Env, ap: u32, a: Ptr, b: Ptr, c: Ptr, d: Ptr, m0: Ptr, m1: Ptr) -> Script {
     let script = script! {
         // z = a+b+m0
@@ -266,12 +265,12 @@ pub fn blake3() -> Script {
 }
 
 pub fn blake3_var_length(num_bytes: usize) -> Script {
-    assert!(num_bytes <= 512,
-            "This blake3 implementation does not support input larger than 512 bytes due to stack limit. \
-            Please modify the hashing routine to avoid calling blake3 in this way.");
+    //assert!(num_bytes <= 512,
+    //"This blake3 implementation does not support input larger than 512 bytes due to stack limit. \
+    //Please modify the hashing routine to avoid calling blake3 in this way.");
 
     // Compute how many padding elements are needed
-    let num_blocks = (num_bytes + 64 - 1) / 64;
+    let num_blocks = num_bytes.div_ceil(64);
     let num_padding_bytes = num_blocks * 64 - num_bytes;
 
     // Calculate the initial state
@@ -327,7 +326,7 @@ pub fn blake3_var_length(num_bytes: usize) -> Script {
         }
     };
 
-    let script = script! {
+    script! {
         // Add the padding
         { push_to_stack(0, num_padding_bytes) }
 
@@ -397,9 +396,7 @@ pub fn blake3_var_length(num_bytes: usize) -> Script {
         for _ in 0..8 {
             u32_fromaltstack
         }
-    };
-
-    script
+    }
 }
 
 /// Blake3 taking a 40-byte message and returning a 20-byte digest
@@ -443,11 +440,11 @@ pub fn blake3_160() -> Script {
 }
 
 pub fn blake3_160_var_length(num_bytes: usize) -> Script {
-    script!{
+    script! {
         { blake3_var_length( num_bytes ) }
         // Reduce the digest's length to 20 bytes
-        for i in 0..12 {
-            OP_DROP
+        for _ in 0..6 {
+            OP_2DROP
         }
     }
 }
@@ -498,7 +495,11 @@ pub fn blake3_160_hash_equalverify() -> Script {
 
 #[cfg(test)]
 mod tests {
+    use blake3::Hasher;
+    use hex::encode;
+
     use crate::hash::blake3::*;
+    use crate::run;
 
     use crate::treepp::{execute_script, script};
 
@@ -548,28 +549,26 @@ mod tests {
             {blake3_hash_equalverify()}
             OP_TRUE
         };
-        let res = execute_script(script);
-        assert!(res.success);
+        run(script);
     }
 
-
     #[test]
     fn test_blake3_var_length() {
-        let hex_out = "11b4167bd0184b9fc8b3474a4c29d08e801cbc1596b63a5ab380ce0fc83a15cd";
+        // let hex_out = "11b4167bd0184b9fc8b3474a4c29d08e801cbc1596b63a5ab380ce0fc83a15cd";
+        let hex_out = "cfe4e91ae2dd3223f02e8c33d4ee464734d1620b64ed1f08cac7e21f204851b7";
 
         let script = script! {
-            for _ in 0..15 {
+            for _ in 0..32 {
                 {u32_push(1)}
             }
-            { blake3_var_length(60) }
+            { blake3_var_length(32*4) }
             {push_bytes_hex(hex_out)}
             {blake3_hash_equalverify()}
             OP_TRUE
         };
         println!("Blake3_var_length_60 size: {:?} \n", script.len());
 
-        let res = execute_script(script);
-        assert!(res.success);
+        run(script);
     }
 
     #[test]
@@ -586,12 +585,9 @@ mod tests {
             OP_TRUE
         };
         println!("Blake3 size: {:?} \n", script.len());
-        let res = execute_script(script);
-
-        assert!(res.success);
+        run(script);
     }
 
-
     #[test]
     fn test_blake3_160_var_length() {
         let hex_out = "11b4167bd0184b9fc8b3474a4c29d08e801cbc15";
@@ -607,7 +603,64 @@ mod tests {
         };
         println!("Blake3_160_var_length_60 size: {:?} \n", script.len());
 
-        let res = execute_script(script);
+        run(script);
+    }
+    
+    #[test]
+    fn test_blake3_var_length_max() {
+        let mut input_data = Vec::new();
+        let num_bytes = 384;
+        for _ in 0..num_bytes {
+            input_data.push(1);
+        }
+
+        let mut hasher = Hasher::new();
+        hasher.update(&input_data);
+        let hash = hasher.finalize();
+        let hex_out = encode(hash.as_bytes());
+
+        let script = script! {
+            for _ in 0..num_bytes {
+                OP_PUSHNUM_1
+            }
+            { blake3_var_length(num_bytes) }
+            { push_bytes_hex(&hex_out) }
+            { blake3_hash_equalverify() }
+            OP_TRUE
+        };
+
+        let res = execute_script(script.clone());
+        println!("Blake3_var_length_{} size: {:?}, stack: {} \n", num_bytes, script.len(), res.stats.max_nb_stack_items);
+        assert!(res.success);
+    }
+
+    #[test]
+    fn test_blake3_160_var_length_max() {
+        let mut input_data = Vec::new();
+        let num_bytes = 384;
+        for _ in 0..num_bytes {
+            input_data.push(1);
+        }
+
+        let mut hasher = Hasher::new();
+        hasher.update(&input_data);
+        let hash = hasher.finalize();
+
+        let truncated_hash = &hash.as_bytes()[..20];
+        let hex_out = encode(truncated_hash);
+
+        let script = script! {
+            for _ in 0..num_bytes {
+                OP_PUSHNUM_1
+            }
+            { blake3_160_var_length(num_bytes) }
+            { push_bytes_hex(&hex_out) }
+            { blake3_160_hash_equalverify() }
+            OP_TRUE
+        };
+
+        let res = execute_script(script.clone());
+        println!("Blake3_160_var_length_{} size: {:?}, stack: {} \n", num_bytes, script.len(), res.stats.max_nb_stack_items);
         assert!(res.success);
     }
 }
diff --git a/bitvm/src/hash/blake3_official_test_vectors.json b/bitvm/src/hash/blake3_official_test_vectors.json
new file mode 100644
index 000000000..f6da91792
--- /dev/null
+++ b/bitvm/src/hash/blake3_official_test_vectors.json
@@ -0,0 +1,217 @@
+{
+  "_comment": "Each test is an input length and three outputs, one for each of the hash, keyed_hash, and derive_key modes. The input in each case is filled with a repeating sequence of 251 bytes: 0, 1, 2, ..., 249, 250, 0, 1, ..., and so on. The key used with keyed_hash is the 32-byte ASCII string \"whats the Elvish word for friend\", also given in the `key` field below. The context string used with derive_key is the ASCII string \"BLAKE3 2019-12-27 16:29:52 test vectors context\", also given in the `context_string` field below. Outputs are encoded as hexadecimal. Each case is an extended output, and implementations should also check that the first 32 bytes match their default-length output.",
+  "key": "whats the Elvish word for friend",
+  "context_string": "BLAKE3 2019-12-27 16:29:52 test vectors context",
+  "cases": [
+    {
+      "input_len": 0,
+      "hash": "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262e00f03e7b69af26b7faaf09fcd333050338ddfe085b8cc869ca98b206c08243a26f5487789e8f660afe6c99ef9e0c52b92e7393024a80459cf91f476f9ffdbda7001c22e159b402631f277ca96f2defdf1078282314e763699a31c5363165421cce14d",
+      "keyed_hash": "92b2b75604ed3c761f9d6f62392c8a9227ad0ea3f09573e783f1498a4ed60d26b18171a2f22a4b94822c701f107153dba24918c4bae4d2945c20ece13387627d3b73cbf97b797d5e59948c7ef788f54372df45e45e4293c7dc18c1d41144a9758be58960856be1eabbe22c2653190de560ca3b2ac4aa692a9210694254c371e851bc8f",
+      "derive_key": "2cc39783c223154fea8dfb7c1b1660f2ac2dcbd1c1de8277b0b0dd39b7e50d7d905630c8be290dfcf3e6842f13bddd573c098c3f17361f1f206b8cad9d088aa4a3f746752c6b0ce6a83b0da81d59649257cdf8eb3e9f7d4998e41021fac119deefb896224ac99f860011f73609e6e0e4540f93b273e56547dfd3aa1a035ba6689d89a0"
+    },
+    {
+      "input_len": 1,
+      "hash": "2d3adedff11b61f14c886e35afa036736dcd87a74d27b5c1510225d0f592e213c3a6cb8bf623e20cdb535f8d1a5ffb86342d9c0b64aca3bce1d31f60adfa137b358ad4d79f97b47c3d5e79f179df87a3b9776ef8325f8329886ba42f07fb138bb502f4081cbcec3195c5871e6c23e2cc97d3c69a613eba131e5f1351f3f1da786545e5",
+      "keyed_hash": "6d7878dfff2f485635d39013278ae14f1454b8c0a3a2d34bc1ab38228a80c95b6568c0490609413006fbd428eb3fd14e7756d90f73a4725fad147f7bf70fd61c4e0cf7074885e92b0e3f125978b4154986d4fb202a3f331a3fb6cf349a3a70e49990f98fe4289761c8602c4e6ab1138d31d3b62218078b2f3ba9a88e1d08d0dd4cea11",
+      "derive_key": "b3e2e340a117a499c6cf2398a19ee0d29cca2bb7404c73063382693bf66cb06c5827b91bf889b6b97c5477f535361caefca0b5d8c4746441c57617111933158950670f9aa8a05d791daae10ac683cbef8faf897c84e6114a59d2173c3f417023a35d6983f2c7dfa57e7fc559ad751dbfb9ffab39c2ef8c4aafebc9ae973a64f0c76551"
+    },
+    {
+      "input_len": 2,
+      "hash": "7b7015bb92cf0b318037702a6cdd81dee41224f734684c2c122cd6359cb1ee63d8386b22e2ddc05836b7c1bb693d92af006deb5ffbc4c70fb44d0195d0c6f252faac61659ef86523aa16517f87cb5f1340e723756ab65efb2f91964e14391de2a432263a6faf1d146937b35a33621c12d00be8223a7f1919cec0acd12097ff3ab00ab1",
+      "keyed_hash": "5392ddae0e0a69d5f40160462cbd9bd889375082ff224ac9c758802b7a6fd20a9ffbf7efd13e989a6c246f96d3a96b9d279f2c4e63fb0bdff633957acf50ee1a5f658be144bab0f6f16500dee4aa5967fc2c586d85a04caddec90fffb7633f46a60786024353b9e5cebe277fcd9514217fee2267dcda8f7b31697b7c54fab6a939bf8f",
+      "derive_key": "1f166565a7df0098ee65922d7fea425fb18b9943f19d6161e2d17939356168e6daa59cae19892b2d54f6fc9f475d26031fd1c22ae0a3e8ef7bdb23f452a15e0027629d2e867b1bb1e6ab21c71297377750826c404dfccc2406bd57a83775f89e0b075e59a7732326715ef912078e213944f490ad68037557518b79c0086de6d6f6cdd2"
+    },
+    {
+      "input_len": 3,
+      "hash": "e1be4d7a8ab5560aa4199eea339849ba8e293d55ca0a81006726d184519e647f5b49b82f805a538c68915c1ae8035c900fd1d4b13902920fd05e1450822f36de9454b7e9996de4900c8e723512883f93f4345f8a58bfe64ee38d3ad71ab027765d25cdd0e448328a8e7a683b9a6af8b0af94fa09010d9186890b096a08471e4230a134",
+      "keyed_hash": "39e67b76b5a007d4921969779fe666da67b5213b096084ab674742f0d5ec62b9b9142d0fab08e1b161efdbb28d18afc64d8f72160c958e53a950cdecf91c1a1bbab1a9c0f01def762a77e2e8545d4dec241e98a89b6db2e9a5b070fc110caae2622690bd7b76c02ab60750a3ea75426a6bb8803c370ffe465f07fb57def95df772c39f",
+      "derive_key": "440aba35cb006b61fc17c0529255de438efc06a8c9ebf3f2ddac3b5a86705797f27e2e914574f4d87ec04c379e12789eccbfbc15892626042707802dbe4e97c3ff59dca80c1e54246b6d055154f7348a39b7d098b2b4824ebe90e104e763b2a447512132cede16243484a55a4e40a85790038bb0dcf762e8c053cabae41bbe22a5bff7"
+    },
+    {
+      "input_len": 4,
+      "hash": "f30f5ab28fe047904037f77b6da4fea1e27241c5d132638d8bedce9d40494f328f603ba4564453e06cdcee6cbe728a4519bbe6f0d41e8a14b5b225174a566dbfa61b56afb1e452dc08c804f8c3143c9e2cc4a31bb738bf8c1917b55830c6e65797211701dc0b98daa1faeaa6ee9e56ab606ce03a1a881e8f14e87a4acf4646272cfd12",
+      "keyed_hash": "7671dde590c95d5ac9616651ff5aa0a27bee5913a348e053b8aa9108917fe070116c0acff3f0d1fa97ab38d813fd46506089118147d83393019b068a55d646251ecf81105f798d76a10ae413f3d925787d6216a7eb444e510fd56916f1d753a5544ecf0072134a146b2615b42f50c179f56b8fae0788008e3e27c67482349e249cb86a",
+      "derive_key": "f46085c8190d69022369ce1a18880e9b369c135eb93f3c63550d3e7630e91060fbd7d8f4258bec9da4e05044f88b91944f7cab317a2f0c18279629a3867fad0662c9ad4d42c6f27e5b124da17c8c4f3a94a025ba5d1b623686c6099d202a7317a82e3d95dae46a87de0555d727a5df55de44dab799a20dffe239594d6e99ed17950910"
+    },
+    {
+      "input_len": 5,
+      "hash": "b40b44dfd97e7a84a996a91af8b85188c66c126940ba7aad2e7ae6b385402aa2ebcfdac6c5d32c31209e1f81a454751280db64942ce395104e1e4eaca62607de1c2ca748251754ea5bbe8c20150e7f47efd57012c63b3c6a6632dc1c7cd15f3e1c999904037d60fac2eb9397f2adbe458d7f264e64f1e73aa927b30988e2aed2f03620",
+      "keyed_hash": "73ac69eecf286894d8102018a6fc729f4b1f4247d3703f69bdc6a5fe3e0c84616ab199d1f2f3e53bffb17f0a2209fe8b4f7d4c7bae59c2bc7d01f1ff94c67588cc6b38fa6024886f2c078bfe09b5d9e6584cd6c521c3bb52f4de7687b37117a2dbbec0d59e92fa9a8cc3240d4432f91757aabcae03e87431dac003e7d73574bfdd8218",
+      "derive_key": "1f24eda69dbcb752847ec3ebb5dd42836d86e58500c7c98d906ecd82ed9ae47f6f48a3f67e4e43329c9a89b1ca526b9b35cbf7d25c1e353baffb590fd79be58ddb6c711f1a6b60e98620b851c688670412fcb0435657ba6b638d21f0f2a04f2f6b0bd8834837b10e438d5f4c7c2c71299cf7586ea9144ed09253d51f8f54dd6bff719d"
+    },
+    {
+      "input_len": 6,
+      "hash": "06c4e8ffb6872fad96f9aaca5eee1553eb62aed0ad7198cef42e87f6a616c844611a30c4e4f37fe2fe23c0883cde5cf7059d88b657c7ed2087e3d210925ede716435d6d5d82597a1e52b9553919e804f5656278bd739880692c94bff2824d8e0b48cac1d24682699e4883389dc4f2faa2eb3b4db6e39debd5061ff3609916f3e07529a",
+      "keyed_hash": "82d3199d0013035682cc7f2a399d4c212544376a839aa863a0f4c91220ca7a6dc2ffb3aa05f2631f0fa9ac19b6e97eb7e6669e5ec254799350c8b8d189e8807800842a5383c4d907c932f34490aaf00064de8cdb157357bde37c1504d2960034930887603abc5ccb9f5247f79224baff6120a3c622a46d7b1bcaee02c5025460941256",
+      "derive_key": "be96b30b37919fe4379dfbe752ae77b4f7e2ab92f7ff27435f76f2f065f6a5f435ae01a1d14bd5a6b3b69d8cbd35f0b01ef2173ff6f9b640ca0bd4748efa398bf9a9c0acd6a66d9332fdc9b47ffe28ba7ab6090c26747b85f4fab22f936b71eb3f64613d8bd9dfabe9bb68da19de78321b481e5297df9e40ec8a3d662f3e1479c65de0"
+    },
+    {
+      "input_len": 7,
+      "hash": "3f8770f387faad08faa9d8414e9f449ac68e6ff0417f673f602a646a891419fe66036ef6e6d1a8f54baa9fed1fc11c77cfb9cff65bae915045027046ebe0c01bf5a941f3bb0f73791d3fc0b84370f9f30af0cd5b0fc334dd61f70feb60dad785f070fef1f343ed933b49a5ca0d16a503f599a365a4296739248b28d1a20b0e2cc8975c",
+      "keyed_hash": "af0a7ec382aedc0cfd626e49e7628bc7a353a4cb108855541a5651bf64fbb28a7c5035ba0f48a9c73dabb2be0533d02e8fd5d0d5639a18b2803ba6bf527e1d145d5fd6406c437b79bcaad6c7bdf1cf4bd56a893c3eb9510335a7a798548c6753f74617bede88bef924ba4b334f8852476d90b26c5dc4c3668a2519266a562c6c8034a6",
+      "derive_key": "dc3b6485f9d94935329442916b0d059685ba815a1fa2a14107217453a7fc9f0e66266db2ea7c96843f9d8208e600a73f7f45b2f55b9e6d6a7ccf05daae63a3fdd10b25ac0bd2e224ce8291f88c05976d575df998477db86fb2cfbbf91725d62cb57acfeb3c2d973b89b503c2b60dde85a7802b69dc1ac2007d5623cbea8cbfb6b181f5"
+    },
+    {
+      "input_len": 8,
+      "hash": "2351207d04fc16ade43ccab08600939c7c1fa70a5c0aaca76063d04c3228eaeb725d6d46ceed8f785ab9f2f9b06acfe398c6699c6129da084cb531177445a682894f9685eaf836999221d17c9a64a3a057000524cd2823986db378b074290a1a9b93a22e135ed2c14c7e20c6d045cd00b903400374126676ea78874d79f2dd7883cf5c",
+      "keyed_hash": "be2f5495c61cba1bb348a34948c004045e3bd4dae8f0fe82bf44d0da245a060048eb5e68ce6dea1eb0229e144f578b3aa7e9f4f85febd135df8525e6fe40c6f0340d13dd09b255ccd5112a94238f2be3c0b5b7ecde06580426a93e0708555a265305abf86d874e34b4995b788e37a823491f25127a502fe0704baa6bfdf04e76c13276",
+      "derive_key": "2b166978cef14d9d438046c720519d8b1cad707e199746f1562d0c87fbd32940f0e2545a96693a66654225ebbaac76d093bfa9cd8f525a53acb92a861a98c42e7d1c4ae82e68ab691d510012edd2a728f98cd4794ef757e94d6546961b4f280a51aac339cc95b64a92b83cc3f26d8af8dfb4c091c240acdb4d47728d23e7148720ef04"
+    },
+    {
+      "input_len": 63,
+      "hash": "e9bc37a594daad83be9470df7f7b3798297c3d834ce80ba85d6e207627b7db7b1197012b1e7d9af4d7cb7bdd1f3bb49a90a9b5dec3ea2bbc6eaebce77f4e470cbf4687093b5352f04e4a4570fba233164e6acc36900e35d185886a827f7ea9bdc1e5c3ce88b095a200e62c10c043b3e9bc6cb9b6ac4dfa51794b02ace9f98779040755",
+      "keyed_hash": "bb1eb5d4afa793c1ebdd9fb08def6c36d10096986ae0cfe148cd101170ce37aea05a63d74a840aecd514f654f080e51ac50fd617d22610d91780fe6b07a26b0847abb38291058c97474ef6ddd190d30fc318185c09ca1589d2024f0a6f16d45f11678377483fa5c005b2a107cb9943e5da634e7046855eaa888663de55d6471371d55d",
+      "derive_key": "b6451e30b953c206e34644c6803724e9d2725e0893039cfc49584f991f451af3b89e8ff572d3da4f4022199b9563b9d70ebb616efff0763e9abec71b550f1371e233319c4c4e74da936ba8e5bbb29a598e007a0bbfa929c99738ca2cc098d59134d11ff300c39f82e2fce9f7f0fa266459503f64ab9913befc65fddc474f6dc1c67669"
+    },
+    {
+      "input_len": 64,
+      "hash": "4eed7141ea4a5cd4b788606bd23f46e212af9cacebacdc7d1f4c6dc7f2511b98fc9cc56cb831ffe33ea8e7e1d1df09b26efd2767670066aa82d023b1dfe8ab1b2b7fbb5b97592d46ffe3e05a6a9b592e2949c74160e4674301bc3f97e04903f8c6cf95b863174c33228924cdef7ae47559b10b294acd660666c4538833582b43f82d74",
+      "keyed_hash": "ba8ced36f327700d213f120b1a207a3b8c04330528586f414d09f2f7d9ccb7e68244c26010afc3f762615bbac552a1ca909e67c83e2fd5478cf46b9e811efccc93f77a21b17a152ebaca1695733fdb086e23cd0eb48c41c034d52523fc21236e5d8c9255306e48d52ba40b4dac24256460d56573d1312319afcf3ed39d72d0bfc69acb",
+      "derive_key": "a5c4a7053fa86b64746d4bb688d06ad1f02a18fce9afd3e818fefaa7126bf73e9b9493a9befebe0bf0c9509fb3105cfa0e262cde141aa8e3f2c2f77890bb64a4cca96922a21ead111f6338ad5244f2c15c44cb595443ac2ac294231e31be4a4307d0a91e874d36fc9852aeb1265c09b6e0cda7c37ef686fbbcab97e8ff66718be048bb"
+    },
+    {
+      "input_len": 65,
+      "hash": "de1e5fa0be70df6d2be8fffd0e99ceaa8eb6e8c93a63f2d8d1c30ecb6b263dee0e16e0a4749d6811dd1d6d1265c29729b1b75a9ac346cf93f0e1d7296dfcfd4313b3a227faaaaf7757cc95b4e87a49be3b8a270a12020233509b1c3632b3485eef309d0abc4a4a696c9decc6e90454b53b000f456a3f10079072baaf7a981653221f2c",
+      "keyed_hash": "c0a4edefa2d2accb9277c371ac12fcdbb52988a86edc54f0716e1591b4326e72d5e795f46a596b02d3d4bfb43abad1e5d19211152722ec1f20fef2cd413e3c22f2fc5da3d73041275be6ede3517b3b9f0fc67ade5956a672b8b75d96cb43294b9041497de92637ed3f2439225e683910cb3ae923374449ca788fb0f9bea92731bc26ad",
+      "derive_key": "51fd05c3c1cfbc8ed67d139ad76f5cf8236cd2acd26627a30c104dfd9d3ff8a82b02e8bd36d8498a75ad8c8e9b15eb386970283d6dd42c8ae7911cc592887fdbe26a0a5f0bf821cd92986c60b2502c9be3f98a9c133a7e8045ea867e0828c7252e739321f7c2d65daee4468eb4429efae469a42763f1f94977435d10dccae3e3dce88d"
+    },
+    {
+      "input_len": 127,
+      "hash": "d81293fda863f008c09e92fc382a81f5a0b4a1251cba1634016a0f86a6bd640de3137d477156d1fde56b0cf36f8ef18b44b2d79897bece12227539ac9ae0a5119da47644d934d26e74dc316145dcb8bb69ac3f2e05c242dd6ee06484fcb0e956dc44355b452c5e2bbb5e2b66e99f5dd443d0cbcaaafd4beebaed24ae2f8bb672bcef78",
+      "keyed_hash": "c64200ae7dfaf35577ac5a9521c47863fb71514a3bcad18819218b818de85818ee7a317aaccc1458f78d6f65f3427ec97d9c0adb0d6dacd4471374b621b7b5f35cd54663c64dbe0b9e2d95632f84c611313ea5bd90b71ce97b3cf645776f3adc11e27d135cbadb9875c2bf8d3ae6b02f8a0206aba0c35bfe42574011931c9a255ce6dc",
+      "derive_key": "c91c090ceee3a3ac81902da31838012625bbcd73fcb92e7d7e56f78deba4f0c3feeb3974306966ccb3e3c69c337ef8a45660ad02526306fd685c88542ad00f759af6dd1adc2e50c2b8aac9f0c5221ff481565cf6455b772515a69463223202e5c371743e35210bbbbabd89651684107fd9fe493c937be16e39cfa7084a36207c99bea3"
+    },
+    {
+      "input_len": 128,
+      "hash": "f17e570564b26578c33bb7f44643f539624b05df1a76c81f30acd548c44b45efa69faba091427f9c5c4caa873aa07828651f19c55bad85c47d1368b11c6fd99e47ecba5820a0325984d74fe3e4058494ca12e3f1d3293d0010a9722f7dee64f71246f75e9361f44cc8e214a100650db1313ff76a9f93ec6e84edb7add1cb4a95019b0c",
+      "keyed_hash": "b04fe15577457267ff3b6f3c947d93be581e7e3a4b018679125eaf86f6a628ecd86bbe0001f10bda47e6077b735016fca8119da11348d93ca302bbd125bde0db2b50edbe728a620bb9d3e6f706286aedea973425c0b9eedf8a38873544cf91badf49ad92a635a93f71ddfcee1eae536c25d1b270956be16588ef1cfef2f1d15f650bd5",
+      "derive_key": "81720f34452f58a0120a58b6b4608384b5c51d11f39ce97161a0c0e442ca022550e7cd651e312f0b4c6afb3c348ae5dd17d2b29fab3b894d9a0034c7b04fd9190cbd90043ff65d1657bbc05bfdecf2897dd894c7a1b54656d59a50b51190a9da44db426266ad6ce7c173a8c0bbe091b75e734b4dadb59b2861cd2518b4e7591e4b83c9"
+    },
+    {
+      "input_len": 129,
+      "hash": "683aaae9f3c5ba37eaaf072aed0f9e30bac0865137bae68b1fde4ca2aebdcb12f96ffa7b36dd78ba321be7e842d364a62a42e3746681c8bace18a4a8a79649285c7127bf8febf125be9de39586d251f0d41da20980b70d35e3dac0eee59e468a894fa7e6a07129aaad09855f6ad4801512a116ba2b7841e6cfc99ad77594a8f2d181a7",
+      "keyed_hash": "d4a64dae6cdccbac1e5287f54f17c5f985105457c1a2ec1878ebd4b57e20d38f1c9db018541eec241b748f87725665b7b1ace3e0065b29c3bcb232c90e37897fa5aaee7e1e8a2ecfcd9b51463e42238cfdd7fee1aecb3267fa7f2128079176132a412cd8aaf0791276f6b98ff67359bd8652ef3a203976d5ff1cd41885573487bcd683",
+      "derive_key": "938d2d4435be30eafdbb2b7031f7857c98b04881227391dc40db3c7b21f41fc18d72d0f9c1de5760e1941aebf3100b51d64644cb459eb5d20258e233892805eb98b07570ef2a1787cd48e117c8d6a63a68fd8fc8e59e79dbe63129e88352865721c8d5f0cf183f85e0609860472b0d6087cefdd186d984b21542c1c780684ed6832d8d"
+    },
+    {
+      "input_len": 1023,
+      "hash": "10108970eeda3eb932baac1428c7a2163b0e924c9a9e25b35bba72b28f70bd11a182d27a591b05592b15607500e1e8dd56bc6c7fc063715b7a1d737df5bad3339c56778957d870eb9717b57ea3d9fb68d1b55127bba6a906a4a24bbd5acb2d123a37b28f9e9a81bbaae360d58f85e5fc9d75f7c370a0cc09b6522d9c8d822f2f28f485",
+      "keyed_hash": "c951ecdf03288d0fcc96ee3413563d8a6d3589547f2c2fb36d9786470f1b9d6e890316d2e6d8b8c25b0a5b2180f94fb1a158ef508c3cde45e2966bd796a696d3e13efd86259d756387d9becf5c8bf1ce2192b87025152907b6d8cc33d17826d8b7b9bc97e38c3c85108ef09f013e01c229c20a83d9e8efac5b37470da28575fd755a10",
+      "derive_key": "74a16c1c3d44368a86e1ca6df64be6a2f64cce8f09220787450722d85725dea59c413264404661e9e4d955409dfe4ad3aa487871bcd454ed12abfe2c2b1eb7757588cf6cb18d2eccad49e018c0d0fec323bec82bf1644c6325717d13ea712e6840d3e6e730d35553f59eff5377a9c350bcc1556694b924b858f329c44ee64b884ef00d"
+    },
+    {
+      "input_len": 1024,
+      "hash": "42214739f095a406f3fc83deb889744ac00df831c10daa55189b5d121c855af71cf8107265ecdaf8505b95d8fcec83a98a6a96ea5109d2c179c47a387ffbb404756f6eeae7883b446b70ebb144527c2075ab8ab204c0086bb22b7c93d465efc57f8d917f0b385c6df265e77003b85102967486ed57db5c5ca170ba441427ed9afa684e",
+      "keyed_hash": "75c46f6f3d9eb4f55ecaaee480db732e6c2105546f1e675003687c31719c7ba4a78bc838c72852d4f49c864acb7adafe2478e824afe51c8919d06168414c265f298a8094b1ad813a9b8614acabac321f24ce61c5a5346eb519520d38ecc43e89b5000236df0597243e4d2493fd626730e2ba17ac4d8824d09d1a4a8f57b8227778e2de",
+      "derive_key": "7356cd7720d5b66b6d0697eb3177d9f8d73a4a5c5e968896eb6a6896843027066c23b601d3ddfb391e90d5c8eccdef4ae2a264bce9e612ba15e2bc9d654af1481b2e75dbabe615974f1070bba84d56853265a34330b4766f8e75edd1f4a1650476c10802f22b64bd3919d246ba20a17558bc51c199efdec67e80a227251808d8ce5bad"
+    },
+    {
+      "input_len": 1025,
+      "hash": "d00278ae47eb27b34faecf67b4fe263f82d5412916c1ffd97c8cb7fb814b8444f4c4a22b4b399155358a994e52bf255de60035742ec71bd08ac275a1b51cc6bfe332b0ef84b409108cda080e6269ed4b3e2c3f7d722aa4cdc98d16deb554e5627be8f955c98e1d5f9565a9194cad0c4285f93700062d9595adb992ae68ff12800ab67a",
+      "keyed_hash": "357dc55de0c7e382c900fd6e320acc04146be01db6a8ce7210b7189bd664ea69362396b77fdc0d2634a552970843722066c3c15902ae5097e00ff53f1e116f1cd5352720113a837ab2452cafbde4d54085d9cf5d21ca613071551b25d52e69d6c81123872b6f19cd3bc1333edf0c52b94de23ba772cf82636cff4542540a7738d5b930",
+      "derive_key": "effaa245f065fbf82ac186839a249707c3bddf6d3fdda22d1b95a3c970379bcb5d31013a167509e9066273ab6e2123bc835b408b067d88f96addb550d96b6852dad38e320b9d940f86db74d398c770f462118b35d2724efa13da97194491d96dd37c3c09cbef665953f2ee85ec83d88b88d11547a6f911c8217cca46defa2751e7f3ad"
+    },
+    {
+      "input_len": 2048,
+      "hash": "e776b6028c7cd22a4d0ba182a8bf62205d2ef576467e838ed6f2529b85fba24a9a60bf80001410ec9eea6698cd537939fad4749edd484cb541aced55cd9bf54764d063f23f6f1e32e12958ba5cfeb1bf618ad094266d4fc3c968c2088f677454c288c67ba0dba337b9d91c7e1ba586dc9a5bc2d5e90c14f53a8863ac75655461cea8f9",
+      "keyed_hash": "879cf1fa2ea0e79126cb1063617a05b6ad9d0b696d0d757cf053439f60a99dd10173b961cd574288194b23ece278c330fbb8585485e74967f31352a8183aa782b2b22f26cdcadb61eed1a5bc144b8198fbb0c13abbf8e3192c145d0a5c21633b0ef86054f42809df823389ee40811a5910dcbd1018af31c3b43aa55201ed4edaac74fe",
+      "derive_key": "7b2945cb4fef70885cc5d78a87bf6f6207dd901ff239201351ffac04e1088a23e2c11a1ebffcea4d80447867b61badb1383d842d4e79645d48dd82ccba290769caa7af8eaa1bd78a2a5e6e94fbdab78d9c7b74e894879f6a515257ccf6f95056f4e25390f24f6b35ffbb74b766202569b1d797f2d4bd9d17524c720107f985f4ddc583"
+    },
+    {
+      "input_len": 2049,
+      "hash": "5f4d72f40d7a5f82b15ca2b2e44b1de3c2ef86c426c95c1af0b687952256303096de31d71d74103403822a2e0bc1eb193e7aecc9643a76b7bbc0c9f9c52e8783aae98764ca468962b5c2ec92f0c74eb5448d519713e09413719431c802f948dd5d90425a4ecdadece9eb178d80f26efccae630734dff63340285adec2aed3b51073ad3",
+      "keyed_hash": "9f29700902f7c86e514ddc4df1e3049f258b2472b6dd5267f61bf13983b78dd5f9a88abfefdfa1e00b418971f2b39c64ca621e8eb37fceac57fd0c8fc8e117d43b81447be22d5d8186f8f5919ba6bcc6846bd7d50726c06d245672c2ad4f61702c646499ee1173daa061ffe15bf45a631e2946d616a4c345822f1151284712f76b2b0e",
+      "derive_key": "2ea477c5515cc3dd606512ee72bb3e0e758cfae7232826f35fb98ca1bcbdf27316d8e9e79081a80b046b60f6a263616f33ca464bd78d79fa18200d06c7fc9bffd808cc4755277a7d5e09da0f29ed150f6537ea9bed946227ff184cc66a72a5f8c1e4bd8b04e81cf40fe6dc4427ad5678311a61f4ffc39d195589bdbc670f63ae70f4b6"
+    },
+    {
+      "input_len": 3072,
+      "hash": "b98cb0ff3623be03326b373de6b9095218513e64f1ee2edd2525c7ad1e5cffd29a3f6b0b978d6608335c09dc94ccf682f9951cdfc501bfe47b9c9189a6fc7b404d120258506341a6d802857322fbd20d3e5dae05b95c88793fa83db1cb08e7d8008d1599b6209d78336e24839724c191b2a52a80448306e0daa84a3fdb566661a37e11",
+      "keyed_hash": "044a0e7b172a312dc02a4c9a818c036ffa2776368d7f528268d2e6b5df19177022f302d0529e4174cc507c463671217975e81dab02b8fdeb0d7ccc7568dd22574c783a76be215441b32e91b9a904be8ea81f7a0afd14bad8ee7c8efc305ace5d3dd61b996febe8da4f56ca0919359a7533216e2999fc87ff7d8f176fbecb3d6f34278b",
+      "derive_key": "050df97f8c2ead654d9bb3ab8c9178edcd902a32f8495949feadcc1e0480c46b3604131bbd6e3ba573b6dd682fa0a63e5b165d39fc43a625d00207607a2bfeb65ff1d29292152e26b298868e3b87be95d6458f6f2ce6118437b632415abe6ad522874bcd79e4030a5e7bad2efa90a7a7c67e93f0a18fb28369d0a9329ab5c24134ccb0"
+    },
+    {
+      "input_len": 3073,
+      "hash": "7124b49501012f81cc7f11ca069ec9226cecb8a2c850cfe644e327d22d3e1cd39a27ae3b79d68d89da9bf25bc27139ae65a324918a5f9b7828181e52cf373c84f35b639b7fccbb985b6f2fa56aea0c18f531203497b8bbd3a07ceb5926f1cab74d14bd66486d9a91eba99059a98bd1cd25876b2af5a76c3e9eed554ed72ea952b603bf",
+      "keyed_hash": "68dede9bef00ba89e43f31a6825f4cf433389fedae75c04ee9f0cf16a427c95a96d6da3fe985054d3478865be9a092250839a697bbda74e279e8a9e69f0025e4cfddd6cfb434b1cd9543aaf97c635d1b451a4386041e4bb100f5e45407cbbc24fa53ea2de3536ccb329e4eb9466ec37093a42cf62b82903c696a93a50b702c80f3c3c5",
+      "derive_key": "72613c9ec9ff7e40f8f5c173784c532ad852e827dba2bf85b2ab4b76f7079081576288e552647a9d86481c2cae75c2dd4e7c5195fb9ada1ef50e9c5098c249d743929191441301c69e1f48505a4305ec1778450ee48b8e69dc23a25960fe33070ea549119599760a8a2d28aeca06b8c5e9ba58bc19e11fe57b6ee98aa44b2a8e6b14a5"
+    },
+    {
+      "input_len": 4096,
+      "hash": "015094013f57a5277b59d8475c0501042c0b642e531b0a1c8f58d2163229e9690289e9409ddb1b99768eafe1623da896faf7e1114bebeadc1be30829b6f8af707d85c298f4f0ff4d9438aef948335612ae921e76d411c3a9111df62d27eaf871959ae0062b5492a0feb98ef3ed4af277f5395172dbe5c311918ea0074ce0036454f620",
+      "keyed_hash": "befc660aea2f1718884cd8deb9902811d332f4fc4a38cf7c7300d597a081bfc0bbb64a36edb564e01e4b4aaf3b060092a6b838bea44afebd2deb8298fa562b7b597c757b9df4c911c3ca462e2ac89e9a787357aaf74c3b56d5c07bc93ce899568a3eb17d9250c20f6c5f6c1e792ec9a2dcb715398d5a6ec6d5c54f586a00403a1af1de",
+      "derive_key": "1e0d7f3db8c414c97c6307cbda6cd27ac3b030949da8e23be1a1a924ad2f25b9d78038f7b198596c6cc4a9ccf93223c08722d684f240ff6569075ed81591fd93f9fff1110b3a75bc67e426012e5588959cc5a4c192173a03c00731cf84544f65a2fb9378989f72e9694a6a394a8a30997c2e67f95a504e631cd2c5f55246024761b245"
+    },
+    {
+      "input_len": 4097,
+      "hash": "9b4052b38f1c5fc8b1f9ff7ac7b27cd242487b3d890d15c96a1c25b8aa0fb99505f91b0b5600a11251652eacfa9497b31cd3c409ce2e45cfe6c0a016967316c426bd26f619eab5d70af9a418b845c608840390f361630bd497b1ab44019316357c61dbe091ce72fc16dc340ac3d6e009e050b3adac4b5b2c92e722cffdc46501531956",
+      "keyed_hash": "00df940cd36bb9fa7cbbc3556744e0dbc8191401afe70520ba292ee3ca80abbc606db4976cfdd266ae0abf667d9481831ff12e0caa268e7d3e57260c0824115a54ce595ccc897786d9dcbf495599cfd90157186a46ec800a6763f1c59e36197e9939e900809f7077c102f888caaf864b253bc41eea812656d46742e4ea42769f89b83f",
+      "derive_key": "aca51029626b55fda7117b42a7c211f8c6e9ba4fe5b7a8ca922f34299500ead8a897f66a400fed9198fd61dd2d58d382458e64e100128075fc54b860934e8de2e84170734b06e1d212a117100820dbc48292d148afa50567b8b84b1ec336ae10d40c8c975a624996e12de31abbe135d9d159375739c333798a80c64ae895e51e22f3ad"
+    },
+    {
+      "input_len": 5120,
+      "hash": "9cadc15fed8b5d854562b26a9536d9707cadeda9b143978f319ab34230535833acc61c8fdc114a2010ce8038c853e121e1544985133fccdd0a2d507e8e615e611e9a0ba4f47915f49e53d721816a9198e8b30f12d20ec3689989175f1bf7a300eee0d9321fad8da232ece6efb8e9fd81b42ad161f6b9550a069e66b11b40487a5f5059",
+      "keyed_hash": "2c493e48e9b9bf31e0553a22b23503c0a3388f035cece68eb438d22fa1943e209b4dc9209cd80ce7c1f7c9a744658e7e288465717ae6e56d5463d4f80cdb2ef56495f6a4f5487f69749af0c34c2cdfa857f3056bf8d807336a14d7b89bf62bef2fb54f9af6a546f818dc1e98b9e07f8a5834da50fa28fb5874af91bf06020d1bf0120e",
+      "derive_key": "7a7acac8a02adcf3038d74cdd1d34527de8a0fcc0ee3399d1262397ce5817f6055d0cefd84d9d57fe792d65a278fd20384ac6c30fdb340092f1a74a92ace99c482b28f0fc0ef3b923e56ade20c6dba47e49227166251337d80a037e987ad3a7f728b5ab6dfafd6e2ab1bd583a95d9c895ba9c2422c24ea0f62961f0dca45cad47bfa0d"
+    },
+    {
+      "input_len": 5121,
+      "hash": "628bd2cb2004694adaab7bbd778a25df25c47b9d4155a55f8fbd79f2fe154cff96adaab0613a6146cdaabe498c3a94e529d3fc1da2bd08edf54ed64d40dcd6777647eac51d8277d70219a9694334a68bc8f0f23e20b0ff70ada6f844542dfa32cd4204ca1846ef76d811cdb296f65e260227f477aa7aa008bac878f72257484f2b6c95",
+      "keyed_hash": "6ccf1c34753e7a044db80798ecd0782a8f76f33563accaddbfbb2e0ea4b2d0240d07e63f13667a8d1490e5e04f13eb617aea16a8c8a5aaed1ef6fbde1b0515e3c81050b361af6ead126032998290b563e3caddeaebfab592e155f2e161fb7cba939092133f23f9e65245e58ec23457b78a2e8a125588aad6e07d7f11a85b88d375b72d",
+      "derive_key": "b07f01e518e702f7ccb44a267e9e112d403a7b3f4883a47ffbed4b48339b3c341a0add0ac032ab5aaea1e4e5b004707ec5681ae0fcbe3796974c0b1cf31a194740c14519273eedaabec832e8a784b6e7cfc2c5952677e6c3f2c3914454082d7eb1ce1766ac7d75a4d3001fc89544dd46b5147382240d689bbbaefc359fb6ae30263165"
+    },
+    {
+      "input_len": 6144,
+      "hash": "3e2e5b74e048f3add6d21faab3f83aa44d3b2278afb83b80b3c35164ebeca2054d742022da6fdda444ebc384b04a54c3ac5839b49da7d39f6d8a9db03deab32aade156c1c0311e9b3435cde0ddba0dce7b26a376cad121294b689193508dd63151603c6ddb866ad16c2ee41585d1633a2cea093bea714f4c5d6b903522045b20395c83",
+      "keyed_hash": "3d6b6d21281d0ade5b2b016ae4034c5dec10ca7e475f90f76eac7138e9bc8f1dc35754060091dc5caf3efabe0603c60f45e415bb3407db67e6beb3d11cf8e4f7907561f05dace0c15807f4b5f389c841eb114d81a82c02a00b57206b1d11fa6e803486b048a5ce87105a686dee041207e095323dfe172df73deb8c9532066d88f9da7e",
+      "derive_key": "2a95beae63ddce523762355cf4b9c1d8f131465780a391286a5d01abb5683a1597099e3c6488aab6c48f3c15dbe1942d21dbcdc12115d19a8b8465fb54e9053323a9178e4275647f1a9927f6439e52b7031a0b465c861a3fc531527f7758b2b888cf2f20582e9e2c593709c0a44f9c6e0f8b963994882ea4168827823eef1f64169fef"
+    },
+    {
+      "input_len": 6145,
+      "hash": "f1323a8631446cc50536a9f705ee5cb619424d46887f3c376c695b70e0f0507f18a2cfdd73c6e39dd75ce7c1c6e3ef238fd54465f053b25d21044ccb2093beb015015532b108313b5829c3621ce324b8e14229091b7c93f32db2e4e63126a377d2a63a3597997d4f1cba59309cb4af240ba70cebff9a23d5e3ff0cdae2cfd54e070022",
+      "keyed_hash": "9ac301e9e39e45e3250a7e3b3df701aa0fb6889fbd80eeecf28dbc6300fbc539f3c184ca2f59780e27a576c1d1fb9772e99fd17881d02ac7dfd39675aca918453283ed8c3169085ef4a466b91c1649cc341dfdee60e32231fc34c9c4e0b9a2ba87ca8f372589c744c15fd6f985eec15e98136f25beeb4b13c4e43dc84abcc79cd4646c",
+      "derive_key": "379bcc61d0051dd489f686c13de00d5b14c505245103dc040d9e4dd1facab8e5114493d029bdbd295aaa744a59e31f35c7f52dba9c3642f773dd0b4262a9980a2aef811697e1305d37ba9d8b6d850ef07fe41108993180cf779aeece363704c76483458603bbeeb693cffbbe5588d1f3535dcad888893e53d977424bb707201569a8d2"
+    },
+    {
+      "input_len": 7168,
+      "hash": "61da957ec2499a95d6b8023e2b0e604ec7f6b50e80a9678b89d2628e99ada77a5707c321c83361793b9af62a40f43b523df1c8633cecb4cd14d00bdc79c78fca5165b863893f6d38b02ff7236c5a9a8ad2dba87d24c547cab046c29fc5bc1ed142e1de4763613bb162a5a538e6ef05ed05199d751f9eb58d332791b8d73fb74e4fce95",
+      "keyed_hash": "b42835e40e9d4a7f42ad8cc04f85a963a76e18198377ed84adddeaecacc6f3fca2f01d5277d69bb681c70fa8d36094f73ec06e452c80d2ff2257ed82e7ba348400989a65ee8daa7094ae0933e3d2210ac6395c4af24f91c2b590ef87d7788d7066ea3eaebca4c08a4f14b9a27644f99084c3543711b64a070b94f2c9d1d8a90d035d52",
+      "derive_key": "11c37a112765370c94a51415d0d651190c288566e295d505defdad895dae223730d5a5175a38841693020669c7638f40b9bc1f9f39cf98bda7a5b54ae24218a800a2116b34665aa95d846d97ea988bfcb53dd9c055d588fa21ba78996776ea6c40bc428b53c62b5f3ccf200f647a5aae8067f0ea1976391fcc72af1945100e2a6dcb88"
+    },
+    {
+      "input_len": 7169,
+      "hash": "a003fc7a51754a9b3c7fae0367ab3d782dccf28855a03d435f8cfe74605e781798a8b20534be1ca9eb2ae2df3fae2ea60e48c6fb0b850b1385b5de0fe460dbe9d9f9b0d8db4435da75c601156df9d047f4ede008732eb17adc05d96180f8a73548522840779e6062d643b79478a6e8dbce68927f36ebf676ffa7d72d5f68f050b119c8",
+      "keyed_hash": "ed9b1a922c046fdb3d423ae34e143b05ca1bf28b710432857bf738bcedbfa5113c9e28d72fcbfc020814ce3f5d4fc867f01c8f5b6caf305b3ea8a8ba2da3ab69fabcb438f19ff11f5378ad4484d75c478de425fb8e6ee809b54eec9bdb184315dc856617c09f5340451bf42fd3270a7b0b6566169f242e533777604c118a6358250f54",
+      "derive_key": "554b0a5efea9ef183f2f9b931b7497995d9eb26f5c5c6dad2b97d62fc5ac31d99b20652c016d88ba2a611bbd761668d5eda3e568e940faae24b0d9991c3bd25a65f770b89fdcadabcb3d1a9c1cb63e69721cacf1ae69fefdcef1e3ef41bc5312ccc17222199e47a26552c6adc460cf47a72319cb5039369d0060eaea59d6c65130f1dd"
+    },
+    {
+      "input_len": 8192,
+      "hash": "aae792484c8efe4f19e2ca7d371d8c467ffb10748d8a5a1ae579948f718a2a635fe51a27db045a567c1ad51be5aa34c01c6651c4d9b5b5ac5d0fd58cf18dd61a47778566b797a8c67df7b1d60b97b19288d2d877bb2df417ace009dcb0241ca1257d62712b6a4043b4ff33f690d849da91ea3bf711ed583cb7b7a7da2839ba71309bbf",
+      "keyed_hash": "dc9637c8845a770b4cbf76b8daec0eebf7dc2eac11498517f08d44c8fc00d58a4834464159dcbc12a0ba0c6d6eb41bac0ed6585cabfe0aca36a375e6c5480c22afdc40785c170f5a6b8a1107dbee282318d00d915ac9ed1143ad40765ec120042ee121cd2baa36250c618adaf9e27260fda2f94dea8fb6f08c04f8f10c78292aa46102",
+      "derive_key": "ad01d7ae4ad059b0d33baa3c01319dcf8088094d0359e5fd45d6aeaa8b2d0c3d4c9e58958553513b67f84f8eac653aeeb02ae1d5672dcecf91cd9985a0e67f4501910ecba25555395427ccc7241d70dc21c190e2aadee875e5aae6bf1912837e53411dabf7a56cbf8e4fb780432b0d7fe6cec45024a0788cf5874616407757e9e6bef7"
+    },
+    {
+      "input_len": 8193,
+      "hash": "bab6c09cb8ce8cf459261398d2e7aef35700bf488116ceb94a36d0f5f1b7bc3bb2282aa69be089359ea1154b9a9286c4a56af4de975a9aa4a5c497654914d279bea60bb6d2cf7225a2fa0ff5ef56bbe4b149f3ed15860f78b4e2ad04e158e375c1e0c0b551cd7dfc82f1b155c11b6b3ed51ec9edb30d133653bb5709d1dbd55f4e1ff6",
+      "keyed_hash": "954a2a75420c8d6547e3ba5b98d963e6fa6491addc8c023189cc519821b4a1f5f03228648fd983aef045c2fa8290934b0866b615f585149587dda2299039965328835a2b18f1d63b7e300fc76ff260b571839fe44876a4eae66cbac8c67694411ed7e09df51068a22c6e67d6d3dd2cca8ff12e3275384006c80f4db68023f24eebba57",
+      "derive_key": "af1e0346e389b17c23200270a64aa4e1ead98c61695d917de7d5b00491c9b0f12f20a01d6d622edf3de026a4db4e4526225debb93c1237934d71c7340bb5916158cbdafe9ac3225476b6ab57a12357db3abbad7a26c6e66290e44034fb08a20a8d0ec264f309994d2810c49cfba6989d7abb095897459f5425adb48aba07c5fb3c83c0"
+    },
+    {
+      "input_len": 16384,
+      "hash": "f875d6646de28985646f34ee13be9a576fd515f76b5b0a26bb324735041ddde49d764c270176e53e97bdffa58d549073f2c660be0e81293767ed4e4929f9ad34bbb39a529334c57c4a381ffd2a6d4bfdbf1482651b172aa883cc13408fa67758a3e47503f93f87720a3177325f7823251b85275f64636a8f1d599c2e49722f42e93893",
+      "keyed_hash": "9e9fc4eb7cf081ea7c47d1807790ed211bfec56aa25bb7037784c13c4b707b0df9e601b101e4cf63a404dfe50f2e1865bb12edc8fca166579ce0c70dba5a5c0fc960ad6f3772183416a00bd29d4c6e651ea7620bb100c9449858bf14e1ddc9ecd35725581ca5b9160de04060045993d972571c3e8f71e9d0496bfa744656861b169d65",
+      "derive_key": "160e18b5878cd0df1c3af85eb25a0db5344d43a6fbd7a8ef4ed98d0714c3f7e160dc0b1f09caa35f2f417b9ef309dfe5ebd67f4c9507995a531374d099cf8ae317542e885ec6f589378864d3ea98716b3bbb65ef4ab5e0ab5bb298a501f19a41ec19af84a5e6b428ecd813b1a47ed91c9657c3fba11c406bc316768b58f6802c9e9b57"
+    },
+    {
+      "input_len": 31744,
+      "hash": "62b6960e1a44bcc1eb1a611a8d6235b6b4b78f32e7abc4fb4c6cdcce94895c47860cc51f2b0c28a7b77304bd55fe73af663c02d3f52ea053ba43431ca5bab7bfea2f5e9d7121770d88f70ae9649ea713087d1914f7f312147e247f87eb2d4ffef0ac978bf7b6579d57d533355aa20b8b77b13fd09748728a5cc327a8ec470f4013226f",
+      "keyed_hash": "efa53b389ab67c593dba624d898d0f7353ab99e4ac9d42302ee64cbf9939a4193a7258db2d9cd32a7a3ecfce46144114b15c2fcb68a618a976bd74515d47be08b628be420b5e830fade7c080e351a076fbc38641ad80c736c8a18fe3c66ce12f95c61c2462a9770d60d0f77115bbcd3782b593016a4e728d4c06cee4505cb0c08a42ec",
+      "derive_key": "39772aef80e0ebe60596361e45b061e8f417429d529171b6764468c22928e28e9759adeb797a3fbf771b1bcea30150a020e317982bf0d6e7d14dd9f064bc11025c25f31e81bd78a921db0174f03dd481d30e93fd8e90f8b2fee209f849f2d2a52f31719a490fb0ba7aea1e09814ee912eba111a9fde9d5c274185f7bae8ba85d300a2b"
+    },
+    {
+      "input_len": 102400,
+      "hash": "bc3e3d41a1146b069abffad3c0d44860cf664390afce4d9661f7902e7943e085e01c59dab908c04c3342b816941a26d69c2605ebee5ec5291cc55e15b76146e6745f0601156c3596cb75065a9c57f35585a52e1ac70f69131c23d611ce11ee4ab1ec2c009012d236648e77be9295dd0426f29b764d65de58eb7d01dd42248204f45f8e",
+      "keyed_hash": "1c35d1a5811083fd7119f5d5d1ba027b4d01c0c6c49fb6ff2cf75393ea5db4a7f9dbdd3e1d81dcbca3ba241bb18760f207710b751846faaeb9dff8262710999a59b2aa1aca298a032d94eacfadf1aa192418eb54808db23b56e34213266aa08499a16b354f018fc4967d05f8b9d2ad87a7278337be9693fc638a3bfdbe314574ee6fc4",
+      "derive_key": "4652cff7a3f385a6103b5c260fc1593e13c778dbe608efb092fe7ee69df6e9c6d83a3e041bc3a48df2879f4a0a3ed40e7c961c73eff740f3117a0504c2dff4786d44fb17f1549eb0ba585e40ec29bf7732f0b7e286ff8acddc4cb1e23b87ff5d824a986458dcc6a04ac83969b80637562953df51ed1a7e90a7926924d2763778be8560"
+    }
+  ]
+}
diff --git a/bitvm/src/hash/blake3_u32.rs b/bitvm/src/hash/blake3_u32.rs
new file mode 100644
index 000000000..4707ce928
--- /dev/null
+++ b/bitvm/src/hash/blake3_u32.rs
@@ -0,0 +1,810 @@
+#![allow(non_snake_case)]
+use std::collections::HashMap;
+
+
+use crate::pseudo::push_to_stack;
+use crate::treepp::{script, Script};
+use crate::u32::u32_std::{u32_equalverify, u32_roll, u32_uncompress};
+use crate::u32::{
+    u32_add::u32_add,
+    u32_rrot::u32_rrot,
+    u32_std::{u32_drop, u32_fromaltstack, u32_push, u32_toaltstack},
+    u32_xor::{u32_xor, u8_drop_xor_table, u8_push_xor_table},
+    // unroll,
+};
+
+//
+// Environment
+//
+
+// A pointer to address elements on the stack
+#[derive(Eq, Hash, PartialEq, Debug, Clone, Copy)]
+pub enum Ptr {
+    State(u32),
+    Message(u32),
+}
+
+pub fn S(i: u32) -> Ptr { Ptr::State(i) }
+
+pub fn M(i: u32) -> Ptr { Ptr::Message(i) }
+
+// An environment to track elements on the stack
+type Env = HashMap<Ptr, u32>;
+
+pub fn ptr_init(n_limbs: Option<u32>) -> Env {
+    // Initial positions for state and message
+    let mut env: Env = Env::new();
+    for i in 0..16 {
+        env.insert(S(i), i);
+        // The message's offset is the size of the state
+        // plus the u32 size of our XOR table
+        env.insert(M(i), 16 + 256 / 4 + match n_limbs {
+            Some(n) => (i+16-n*2)%16,
+            None => i
+        });
+    }
+    env
+}
+
+pub trait EnvTrait {
+    // Get the position of `ptr`
+    fn ptr(&mut self, ptr: Ptr) -> u32;
+
+    /// Get the position of `ptr`, then delete it
+    fn ptr_extract(&mut self, ptr: Ptr) -> u32;
+
+    /// Set the position of `ptr` to the top stack ptr
+    fn ptr_insert(&mut self, ptr: Ptr);
+}
+
+impl EnvTrait for Env {
+    fn ptr_insert(&mut self, ptr: Ptr) {
+        for (_, value) in self.iter_mut() {
+            *value += 1;
+        }
+        self.insert(ptr, 0);
+    }
+
+    fn ptr_extract(&mut self, ptr: Ptr) -> u32 {
+        match self.remove(&ptr) {
+            Some(index) => {
+                for (_, value) in self.iter_mut() {
+                    if index < *value {
+                        *value -= 1;
+                    }
+                }
+                index
+            }
+            None => panic!("{:?}", ptr),
+        }
+    }
+
+    fn ptr(&mut self, ptr: Ptr) -> u32 { *self.get(&ptr).unwrap() }
+}
+
+//
+// Blake 3 Algorithm
+//
+
+const IV: [u32; 8] = [
+    0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19,
+];
+
+const MSG_PERMUTATION: [u32; 16] = [2, 6, 3, 10, 7, 0, 4, 13, 1, 11, 12, 5, 9, 14, 15, 8];
+
+pub fn initial_state(block_len: u32) -> Vec<Script> {
+    let mut state = [
+        IV[0], IV[1], IV[2], IV[3], IV[4], IV[5], IV[6], IV[7], IV[0], IV[1], IV[2], IV[3], 0, 0,
+        block_len, 0b00001011,
+    ];
+    state.reverse();
+    state.iter().map(|x| u32_push(*x)).collect::<Vec<_>>()
+}
+
+#[allow(clippy::too_many_arguments)]
+fn G(env: &mut Env, ap: u32, a: Ptr, b: Ptr, c: Ptr, d: Ptr, m0: Ptr, m1: Ptr) -> Script {
+    let script = script! {
+        // z = a+b+m0
+        {u32_add(env.ptr(b), env.ptr_extract(a))}
+        {u32_add(env.ptr(m0) + 1, 0)}
+        // Stack:  m1 m0 d c b  |  z
+
+        // y = (d^z) >>> 16
+        {u32_xor(0, env.ptr_extract(d) + 1, ap + 1)}
+        {u32_rrot(16)}
+        // Stack:  m1 m0 c b  |  z y
+
+
+        // x = y+c
+        {u32_add(0, env.ptr_extract(c) + 2)}
+        // Stack:  m1 m0 b  |  z y x
+
+        // w = (b^x) >>> 12
+        {u32_xor(0, env.ptr_extract(b) + 3, ap + 1)}
+        {u32_rrot(12)}
+        // Stack:  m1 m0 |  z y x w
+
+
+        // v = z+w+m1
+        {u32_add(0, 3)}
+        {u32_add(env.ptr(m1) + 4, 0)}
+        // Stack: m1 m0 |  y x w v
+
+        // u = (y^v) >>> 8
+        {u32_xor(0, 3, ap + 1)}
+        {u32_rrot(8)}
+        // Stack: m1 m0 |  x w v u
+
+        // t = x+u
+        {u32_add(0, 3)}
+        // Stack: m1 m0 |  w v u t
+
+        // s = (w^t) >>> 7
+        {u32_xor(0, 3, ap + 1)}
+        {u32_rrot(7)}
+        // Stack: m1 m0 |  v u t s
+    };
+
+    env.ptr_insert(a);
+    env.ptr_insert(d);
+    env.ptr_insert(c);
+    env.ptr_insert(b);
+    script
+}
+
+pub fn round(env: &mut Env, ap: u32) -> Script {
+    script! {
+        { G(env, ap, S(0), S(4), S(8),  S(12), M(0),  M(1)) }
+        { G(env, ap, S(1), S(5), S(9),  S(13), M(2),  M(3)) }
+        { G(env, ap, S(2), S(6), S(10), S(14), M(4),  M(5)) }
+        { G(env, ap, S(3), S(7), S(11), S(15), M(6),  M(7)) }
+
+        { G(env, ap, S(0), S(5), S(10), S(15), M(8),  M(9)) }
+        { G(env, ap, S(1), S(6), S(11), S(12), M(10), M(11)) }
+        { G(env, ap, S(2), S(7), S(8),  S(13), M(12), M(13)) }
+        { G(env, ap, S(3), S(4), S(9),  S(14), M(14), M(15)) }
+    }
+}
+
+//Script added cause we are getting Non pushable error otherwise, not sure how to...
+pub fn permute(env: &mut Env) -> Script {
+    let mut prev_env = Vec::new();
+    for i in 0..16 {
+        prev_env.push(env.ptr(M(i)));
+    }
+
+    for i in 0..16 {
+        env.insert(M(i as u32), prev_env[MSG_PERMUTATION[i] as usize]);
+    }
+
+    script! {}
+}
+
+fn compress(env: &mut Env, ap: u32, n_limbs: Option<u32>) -> Script {
+    script! {
+        // Perform 7 rounds and permute after each round,
+        // except for the last round
+        {round(env, ap)}
+        for _ in 0..6 {
+            {permute(env)}
+            {round(env, ap)}
+        }
+
+        // XOR states [0..4] with states [8..12]
+        // XOR states [0..7] with states [8..15]
+        for i in 0..n_limbs.unwrap_or(8) {
+            {u32_xor(env.ptr(S(i)) + i, env.ptr_extract(S(i + 8)) + i, ap + 1)}
+        }
+    }
+}
+
+// const N_DIGEST_U32_LIMBS: u32 = 8; // 256-bit
+pub(crate) const N_DIGEST_U32_LIMBS: u32 = 5; // 160-bit
+
+/// Blake3 taking a N_DIGEST_U32_LIMBS*8-byte message and returning a N_DIGEST_U32_LIMBS*4-byte digest
+pub fn blake3() -> Script {
+    let mut env = ptr_init(Some(N_DIGEST_U32_LIMBS));
+    script! {
+        // Message zero-padding to 64-byte block
+        // for _ in 0..6{
+        //     {u32_push(0)}
+        // }
+        { push_to_stack(0, 64-8*N_DIGEST_U32_LIMBS as usize) }
+
+        // Initialize our lookup table
+        // We have to do that only once per program
+        u8_push_xor_table
+
+        // Push the initial Blake state onto the stack
+        {initial_state(8*N_DIGEST_U32_LIMBS)}
+
+        // Perform a round of Blake3
+        {compress(&mut env, 16, Some(N_DIGEST_U32_LIMBS))}
+
+        // Save the hash
+        for _ in 0..N_DIGEST_U32_LIMBS {
+            u32_toaltstack
+        }
+        
+        // Clean up the input data and the other half of the state
+        for _ in N_DIGEST_U32_LIMBS..32 {
+            u32_drop
+        }
+
+        // Drop the lookup table
+        u8_drop_xor_table
+
+        // Load the hash
+        for _ in 0..N_DIGEST_U32_LIMBS {
+            u32_fromaltstack
+        }
+    }
+}
+
+pub fn blake3_var_length(num_u32: usize) -> Script {
+    assert!(num_u32 <= 512,
+            "This blake3 implementation does not support input larger than 512 bytes due to stack limit. \
+            Please modify the hashing routine to avoid calling blake3 in this way.");
+
+    // Compute how many padding elements are needed
+    let num_bytes = num_u32 * 4;
+    let num_blocks = num_bytes.div_ceil(64);
+    let _num_padding_bytes = num_blocks * 64 - num_bytes;
+    let num_padding_u32 = num_blocks * 16 - num_u32;
+
+    // Calculate the initial state
+    let first_block_flag = if num_bytes <= 64 {
+        0b00001011
+    } else {
+        0b00000001
+    };
+    let init_state = {
+        let mut state = [
+            IV[0],
+            IV[1],
+            IV[2],
+            IV[3],
+            IV[4],
+            IV[5],
+            IV[6],
+            IV[7],
+            IV[0],
+            IV[1],
+            IV[2],
+            IV[3],
+            0,
+            0,
+            core::cmp::min(num_bytes as u32, 64),
+            first_block_flag,
+        ];
+        state.reverse();
+        state.iter().map(|x| u32_push(*x)).collect::<Vec<_>>()
+    };
+
+    let mut env = ptr_init(Some(N_DIGEST_U32_LIMBS));
+
+    // store the compression script for reuse
+    let compression_script = script! {
+
+
+
+        {compress(&mut env, 16, None)}
+
+        { 321 }
+        // Clean up the input data
+        for _ in 0..63 {
+            OP_DUP OP_ROLL OP_DROP
+        }
+        OP_1SUB OP_ROLL OP_DROP
+
+        // Save the hash
+        for _ in 0..8{
+            {u32_toaltstack()}
+        }
+
+        // Clean up the other half of the state
+        for _ in 0..8 {
+            {u32_drop()}
+        }
+
+        u8_drop_xor_table
+    };
+
+    let script = script! {
+
+        // Add the padding
+        for _ in 0..num_padding_u32 {
+            {0}
+        }
+        //{ push_to_stack(0, num_padding_bytes) }
+
+        // If padded, move all the bytes down
+        if num_padding_u32 != 0 {
+            for _ in 0..num_u32 {
+                { num_u32 + num_padding_u32 - 1 } OP_ROLL
+            }
+        }
+
+        // the 1st block
+        for _ in 0..15{
+            OP_TOALTSTACK
+        }
+        { u32_uncompress() }
+
+        for _ in 0..15 {
+            OP_FROMALTSTACK
+            { u32_uncompress() }
+        }
+
+        // Initialize the lookup table
+        u8_push_xor_table
+
+        // Push the initial Blake3 state onto the stack
+        { init_state }
+
+        // Call compression function initially
+        { compression_script.clone() }
+
+        // Variable script for the rest of the blocks
+        // TODO: This is very ugly and can likely be improved by creating an iterator of num_bytes
+        // beforehand and getting the next value (num_bytes - 64) from it.
+        // By doing so we can get rid of the closure.
+        { (| num_bytes | {
+            let mut sub_script = script! {};
+            let mut num_bytes = num_bytes;
+            for i in 1..num_blocks {
+                num_bytes -= 64;
+
+                let block_flag = if i == num_blocks - 1 { 0b00001010 } else { 0 };
+
+                let state_add = {
+                    let mut state = [
+                        IV[0],
+                        IV[1],
+                        IV[2],
+                        IV[3],
+                        0,
+                        0,
+                        core::cmp::min(num_bytes as u32, 64),
+                        block_flag,
+                    ];
+                    state.reverse();
+                    state.iter().map(|x| u32_push(*x)).collect::<Vec<_>>()
+                };
+
+                sub_script = script! {
+                    { sub_script }
+                    { script! {
+
+                            // the rest of blocks
+                            for _ in 0..15{
+                                OP_TOALTSTACK
+                            }
+                            { u32_uncompress() }
+
+                            for _ in 0..15 {
+                                OP_FROMALTSTACK
+                                { u32_uncompress() }
+                            }
+                            u8_push_xor_table
+                            { state_add }
+                            for _ in 0..8 {
+                                {u32_fromaltstack()}
+                            }
+                            for i in 1..8 {
+                                {u32_roll(i)}
+                            }
+                            {compression_script.clone()}
+                        }
+                    }
+                }
+            }
+            sub_script
+            })(num_bytes)
+        }
+
+        //u8_drop_xor_table
+        for _ in 0..8 {
+            u32_fromaltstack
+        }
+
+        // Reduce the digest's length to 20 bytes
+        for _ in N_DIGEST_U32_LIMBS..8 {
+            u32_drop
+        }
+    };
+    
+    script
+}
+
+pub fn blake3_var_length_copy(num_u32: usize) -> Script {
+    assert!(num_u32 <= 512,
+            "This blake3 implementation does not support input larger than 512 bytes due to stack limit. \
+            Please modify the hashing routine to avoid calling blake3 in this way.");
+
+    // Compute how many padding elements are needed
+    let num_bytes = num_u32 * 4;
+    let num_blocks = num_bytes.div_ceil(64);
+    let _num_padding_bytes = num_blocks * 64 - num_bytes;
+    let num_padding_u32 = num_blocks * 16 - num_u32;
+
+    // Calculate the initial state
+    let first_block_flag = if num_bytes <= 64 {
+        0b00001011
+    } else {
+        0b00000001
+    };
+    let init_state = {
+        let mut state = [
+            IV[0],
+            IV[1],
+            IV[2],
+            IV[3],
+            IV[4],
+            IV[5],
+            IV[6],
+            IV[7],
+            IV[0],
+            IV[1],
+            IV[2],
+            IV[3],
+            0,
+            0,
+            core::cmp::min(num_bytes as u32, 64),
+            first_block_flag,
+        ];
+        state.reverse();
+        state.iter().map(|x| u32_push(*x)).collect::<Vec<_>>()
+    };
+
+    let mut env = ptr_init(None);
+
+    // store the compression script for reuse
+    let compression_script = script! {
+
+
+
+        {compress(&mut env, 16, None)}
+
+        { 321 }
+        // Clean up the input data
+        for _ in 0..63 {
+            OP_DUP OP_ROLL OP_DROP
+        }
+        OP_1SUB OP_ROLL OP_DROP
+
+        // Save the hash
+        for _ in 0..8{
+            {u32_toaltstack()}
+        }
+
+        // Clean up the other half of the state
+        for _ in 0..8 {
+            {u32_drop()}
+        }
+
+        u8_drop_xor_table
+    };
+
+    let script = script! {
+
+        // Add the padding
+        for _ in 0..num_padding_u32 {
+            {0}
+        }
+        //{ push_to_stack(0, num_padding_bytes) }
+
+        // Copy all the bytes down
+        for _ in 0..num_u32 {
+            { num_u32 + num_padding_u32 - 1 } OP_PICK
+        }
+
+        // the 1st block
+        for _ in 0..15{
+            OP_TOALTSTACK
+        }
+        { u32_uncompress() }
+
+        for _ in 0..15 {
+            OP_FROMALTSTACK
+            { u32_uncompress() }
+        }
+
+        // Initialize the lookup table
+        u8_push_xor_table
+
+        // Push the initial Blake3 state onto the stack
+        { init_state }
+
+        // Call compression function initially
+        { compression_script.clone() }
+
+        // Variable script for the rest of the blocks
+        // TODO: This is very ugly and can likely be improved by creating an iterator of num_bytes
+        // beforehand and getting the next value (num_bytes - 64) from it.
+        // By doing so we can get rid of the closure.
+        { (| num_bytes | {
+            let mut sub_script = script! {};
+            let mut num_bytes = num_bytes;
+            for i in 1..num_blocks {
+                num_bytes -= 64;
+
+                let block_flag = if i == num_blocks - 1 { 0b00001010 } else { 0 };
+
+                let state_add = {
+                    let mut state = [
+                        IV[0],
+                        IV[1],
+                        IV[2],
+                        IV[3],
+                        0,
+                        0,
+                        core::cmp::min(num_bytes as u32, 64),
+                        block_flag,
+                    ];
+                    state.reverse();
+                    state.iter().map(|x| u32_push(*x)).collect::<Vec<_>>()
+                };
+
+                sub_script = script! {
+                    { sub_script }
+                    { script! {
+
+                            // the rest of blocks
+                            for _ in 0..15{
+                                OP_TOALTSTACK
+                            }
+                            { u32_uncompress() }
+
+                            for _ in 0..15 {
+                                OP_FROMALTSTACK
+                                { u32_uncompress() }
+                            }
+                            u8_push_xor_table
+                            { state_add }
+                            for _ in 0..8 {
+                                {u32_fromaltstack()}
+                            }
+                            for i in 1..8 {
+                                {u32_roll(i)}
+                            }
+                            {compression_script.clone()}
+                        }
+                    }
+                }
+            }
+            sub_script
+            })(num_bytes)
+        }
+
+        //u8_drop_xor_table
+        for _ in 0..8 {
+            u32_fromaltstack
+        }
+
+        // Reduce the digest's length to 20 bytes
+        for _ in N_DIGEST_U32_LIMBS..8 {
+            u32_drop
+        }
+    };
+
+    script
+}
+
+pub fn push_bytes_hex(hex: &str) -> Script {
+    let hex: String = hex
+        .chars()
+        .filter(|c| c.is_ascii_digit() || c.is_ascii_alphabetic())
+        .collect();
+
+    let bytes: Vec<u8> = (0..hex.len())
+        .step_by(2)
+        .map(|i| u8::from_str_radix(&hex[i..i + 2], 16).unwrap())
+        .collect::<Vec<u8>>();
+
+    script! {
+        for byte in bytes.iter().rev() {
+            { *byte }
+        }
+    }
+}
+
+pub fn blake3_hash_equalverify() -> Script {
+    script! {
+        for _ in 0..N_DIGEST_U32_LIMBS-1 {
+            u32_toaltstack
+        }
+        u32_equalverify
+        for _ in 0..N_DIGEST_U32_LIMBS-1 {
+            u32_fromaltstack
+            u32_equalverify
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::hash::blake3_u32::*;
+    
+    use crate::treepp::{execute_script, script};
+    use crate::u32::u32_std::{u32_equalverify, u32_push, u32_uncompress};
+
+    #[test]
+    fn test_permute() {
+        let mut env = ptr_init(None);
+        // println!("Start env: {}", round(&mut env, 16).to_hex_string());
+        permute(&mut env);
+        // println!("Permuted env: {:?}", env);
+        assert!(env.ptr(M(0)) == 82);
+        assert!(env.ptr(M(1)) == 86);
+        assert!(env.ptr(M(2)) == 83);
+        assert!(env.ptr(M(3)) == 90);
+        assert!(env.ptr(M(4)) == 87);
+        assert!(env.ptr(M(5)) == 80);
+        assert!(env.ptr(M(6)) == 84);
+        assert!(env.ptr(M(7)) == 93);
+        assert!(env.ptr(M(8)) == 81);
+        assert!(env.ptr(M(9)) == 91);
+        assert!(env.ptr(M(10)) == 92);
+        assert!(env.ptr(M(11)) == 85);
+        assert!(env.ptr(M(12)) == 89);
+        assert!(env.ptr(M(13)) == 94);
+        assert!(env.ptr(M(14)) == 95);
+        assert!(env.ptr(M(15)) == 88);
+    }
+
+    #[test]
+    fn test_initial_state() {
+        let script = script! {
+            {initial_state(64)}
+        };
+        let res = execute_script(script);
+        assert!(res.final_stack.get(17)[0] == 79);
+    }
+
+    #[test]
+    fn test_blake3() {
+        let hex_out = match N_DIGEST_U32_LIMBS {
+            8 => "86ca95aefdee3d969af9bcc78b48a5c1115be5d66cafc2fc106bbd982d820e70",
+            5 => "290eef2c4633e64835e2ea6395e9fc3e8bf459a7",
+            _ => panic!("N_DIGEST_U32_LIMBS")
+        };
+
+        let script = script! {
+            for _ in 0..N_DIGEST_U32_LIMBS*2 {
+                {u32_push(1)}
+            }
+            blake3
+            {push_bytes_hex(hex_out)}
+            blake3_hash_equalverify
+            OP_TRUE
+        };
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+
+        let mut max_nb_stack_items = 0;
+
+        if exec_result.stats.max_nb_stack_items > max_nb_stack_items {
+            max_nb_stack_items = exec_result.stats.max_nb_stack_items;
+        }
+        println!("max_nb_stack_items = {max_nb_stack_items}");
+    }
+
+    #[test]
+    fn test_blake3_var_length() {
+        let hex_out = match N_DIGEST_U32_LIMBS {
+            8 => "cfe4e91ae2dd3223f02e8c33d4ee464734d1620b64ed1f08cac7e21f204851b7",
+            5 => "618f2b8aadb3339fa500848042f67323504128db",
+            _ => panic!("N_DIGEST_U32_LIMBS")
+        };
+
+        let script = script! {
+            for _ in 0..(if N_DIGEST_U32_LIMBS == 8 { 32 } else { 256 }) {
+                //{u32_push(1)}
+                { 1 }
+            }
+            { blake3_var_length(if N_DIGEST_U32_LIMBS == 8 { 32 } else { 256 }) }
+            {push_bytes_hex(hex_out)}
+            blake3_hash_equalverify
+            OP_TRUE
+        };
+        println!("Blake3_var_length_60 size: {:?} \n", script.len());
+
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+
+        let mut max_nb_stack_items = 0;
+
+        if exec_result.stats.max_nb_stack_items > max_nb_stack_items {
+            max_nb_stack_items = exec_result.stats.max_nb_stack_items;
+        }
+        println!("max_nb_stack_items = {max_nb_stack_items}");
+    }
+
+    #[test]
+    fn test_blake3_var_length_copy() {
+        let hex_out = match N_DIGEST_U32_LIMBS {
+            8 => "cfe4e91ae2dd3223f02e8c33d4ee464734d1620b64ed1f08cac7e21f204851b7",
+            5 => "cfe4e91ae2dd3223f02e8c33d4ee464734d1620b",
+            _ => panic!("N_DIGEST_U32_LIMBS")
+        };
+
+        let script = script! {
+            for _ in 0..32 {
+                //{u32_push(1)}
+                { 1 }
+            }
+            { blake3_var_length_copy(32) }
+            {push_bytes_hex(hex_out)}
+            blake3_hash_equalverify
+            for _ in 0..32 {
+                //{u32_push(1)}
+                { 1 }
+                OP_EQUALVERIFY
+            }
+            OP_TRUE
+        };
+        println!("Blake3_var_length_copy_60 size: {:?} \n", script.len());
+
+        let exec_result = execute_script(script);
+        assert!(exec_result.success);
+
+        let mut max_nb_stack_items = 0;
+
+        if exec_result.stats.max_nb_stack_items > max_nb_stack_items {
+            max_nb_stack_items = exec_result.stats.max_nb_stack_items;
+        }
+        println!("max_nb_stack_items = {max_nb_stack_items}");
+    }
+
+    #[test]
+    fn test_u32_uncompress() {
+        let script = script! {
+
+            { u32_push(1) }
+            { 1 }
+            { u32_uncompress() }
+            { u32_equalverify() }
+
+            OP_TRUE
+        };
+        println!("test_u32_uncompress size: {:?} \n", script.len());
+
+        let res = execute_script(script);
+        assert!(res.success);
+    }
+
+    #[test]
+    fn test_generate_blake3_exptect_output(){
+
+        let mut input = vec![];
+
+        for _ in 0..32 {
+            input.push(1);
+            input.push(0);
+            input.push(0);
+            input.push(0);
+        }
+
+        let output = blake3::hash(&input);
+
+        let expect_str = output.to_string();
+
+        println!("output_str: {:?} \n", expect_str);
+
+
+        let inputs = (0..32_u32).flat_map(|_| 1_u32.to_le_bytes()).collect::<Vec<_>>();
+        let output = blake3::hash(&inputs);
+
+        let actual_str = output.to_string();
+        // cfe4e91ae2dd3223f02e8c33d4ee464734d1620b64ed1f08cac7e21f204851b7
+        println!("output_str: {:?} \n", actual_str);
+
+        assert_eq!(expect_str,actual_str);
+
+    }
+
+
+
+
+}
diff --git a/bitvm/src/hash/blake3_u4.rs b/bitvm/src/hash/blake3_u4.rs
new file mode 100644
index 000000000..19cf47a1a
--- /dev/null
+++ b/bitvm/src/hash/blake3_u4.rs
@@ -0,0 +1,642 @@
+use std::collections::HashMap;
+use bitcoin_script_stack::stack::{StackTracker, StackVariable};
+pub use bitcoin_script::builder::StructuredScript as Script;
+use crate::u4::{u4_add_stack::*, u4_logic_stack::*, u4_shift_stack::*};
+
+// Blake3 paper: https://github.com/BLAKE3-team/BLAKE3-specs/blob/master/blake3.pdf
+// Referance Implementation: https://github.com/BLAKE3-team/BLAKE3/blob/master/reference_impl/reference_impl.rs
+// Each u32 is represented as 8 u4's, function and variable names generally follow the referance implementation
+
+/// Starting constants, same notation as the papers (last four values are not used)
+const IV: [u32; 8] = [
+    0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19,
+];
+
+/// Permutation order for the after of each blake3 round, from the Table 2 in the paper
+const MSG_PERMUTATION: [u8; 16] = [2, 6, 3, 10, 7, 0, 4, 13, 1, 11, 12, 5, 9, 14, 15, 8];
+
+/// For the blake3, a modulo, quotient, shift and xor table is used. Also xor table has 2 variants due to the large size of the operation space (16 * 16). For more details, you can refer to the code in the src/u4 folder. 
+#[derive(Clone, Debug, Copy)]
+pub struct TablesVars {
+    modulo: StackVariable,
+    quotient: StackVariable,
+    shift_tables: StackVariable,
+    xor_table: StackVariable,
+    depth_lookup: StackVariable,
+    use_full_tables: bool,
+}
+
+impl TablesVars {
+    pub fn new(stack: &mut StackTracker, use_full_tables: bool) -> Self {
+        let depth_lookup = if !use_full_tables { u4_push_from_depth_half_lookup(stack, -18) } else { u4_push_from_depth_full_lookup(stack, -17) };
+        let xor_table = if !use_full_tables { u4_push_half_xor_table_stack(stack) } else { u4_push_full_xor_table_stack(stack) };
+        let shift_tables = u4_push_shift_for_blake(stack);
+        let modulo = u4_push_modulo_for_blake(stack);
+        let quotient = u4_push_quotient_for_blake(stack);
+        TablesVars {
+            modulo,
+            quotient,
+            shift_tables,
+            xor_table,
+            depth_lookup,
+            use_full_tables,
+        }
+    }
+
+    pub fn drop(&self, stack: &mut StackTracker) {
+        stack.drop(self.quotient);
+        stack.drop(self.modulo);
+        stack.drop(self.shift_tables);
+        stack.drop(self.xor_table);
+        stack.drop(self.depth_lookup);
+    }
+}
+
+/// Calculates the bitwise XOR of two u32 numbers (x, y) and cyclically shifts them to right by the given value, which should be a multiple of 4. Consumes x and leaves y on the stack.
+pub fn xor_and_rotate_right_by_multiple_of_4(stack: &mut StackTracker, var_map: &mut HashMap<u8, StackVariable>, x: u8, y: u8, rotation: u8, use_full_tables: bool) -> StackVariable {
+    let pos_shift = 8 - rotation / 4;
+    let y = var_map[&y];
+    let x = var_map.get_mut(&x).unwrap();
+    for i in pos_shift..(pos_shift + 8) {
+        let n = i % 8;
+        let mut z = 0;
+        if i < 8 {
+            z = pos_shift;
+        }
+        xor_2_nibbles(stack, x, y, z, n, use_full_tables);
+    }
+    stack.join_count(&mut stack.get_var_from_stack(7), 7)
+}    
+
+/// Calculates bitwise XOR of two nibbles (x_{nibble_x} and y_{nibble_y}), each given by their u32 variable and the index of their nibble, consumes the nibble of x (which shifts the remaining nibbles of x)
+pub fn xor_2_nibbles(stack: &mut StackTracker, x: &mut StackVariable, y: StackVariable, nibble_x: u8, nibble_y: u8, use_full_tables: bool)  -> StackVariable {
+    if !use_full_tables {
+        stack.op_depth();
+
+        stack.op_dup();
+
+        stack.copy_var_sub_n(y, nibble_y as u32);
+        stack.move_var_sub_n(x, nibble_x as u32);
+        stack.op_2dup();
+        stack.op_min();
+        stack.to_altstack();
+
+        stack.op_max();
+
+        stack.op_sub();
+        stack.op_1sub();
+
+        stack.op_pick();
+
+
+        stack.op_add();
+        
+        stack.from_altstack();
+
+        stack.op_sub();
+        
+        stack.op_pick()
+
+    } else {
+        stack.op_depth();
+        stack.op_dup();
+
+        stack.copy_var_sub_n(y, nibble_y as u32);
+
+        stack.op_sub();
+        stack.op_pick();
+
+        stack.op_add();
+
+        stack.move_var_sub_n(x, nibble_x as u32);
+
+        stack.op_add();
+        stack.op_pick()
+    }
+}
+
+/// Calculates the bitwise XOR of two u32 numbers (x, y) and cyclically shifts them to right by 7. Consumes x and leaves y on the stack.
+pub fn xor_and_rotate_right_by_7(
+    stack: &mut StackTracker,
+    var_map: &mut HashMap<u8, StackVariable>,
+    x: u8,
+    y: u8,
+    tables: &TablesVars,
+) -> StackVariable {
+    // x    = x0 x1 x2 x3 x4 x5 x6 x7
+    // y    = y0 y1 y2 y3 y4 y5 y6 y7
+    // x^y = z
+    // z             = z0 z1 z2 z3 z4 z5 z6 z7
+    // rrot4( z )    = z7 z0 z1 z2 z3 z4 z5 z6
+    // w = rrot7( z ) = (z6) z7 z0 z1 z2 z3 z4 z5 z6  >> 3
+    let y = var_map[&y];
+    let x = var_map.get_mut(&x).unwrap();
+
+    // nib 6 xored
+    let z6 = xor_2_nibbles(stack, x, y, 6, 6, tables.use_full_tables);
+    stack.rename(z6, "z6");
+
+    // nib 6 copy saved
+    stack.copy_var(z6);
+    stack.to_altstack();
+    
+    //nib 7 xored
+    let z7 = xor_2_nibbles(stack, x, y, 6, 7, tables.use_full_tables);
+    stack.rename(z7, "z7");
+    stack.copy_var(z7);
+    stack.to_altstack();
+
+
+    // z6 z7 >> 3
+    let mut w0 = u4_2_nib_shift_blake(stack, tables.shift_tables);
+    stack.rename(w0, "w0");
+
+    for i in 0..6 {
+        stack.from_altstack();
+
+        let r0 = xor_2_nibbles(stack, x, y, 0, i, tables.use_full_tables);
+    
+        stack.rename(r0, &format!("z{}", i));
+        stack.copy_var(r0);
+    
+        stack.to_altstack();
+    
+        // r7 r0 >> 3
+        let w1 = u4_2_nib_shift_blake(stack, tables.shift_tables);
+        stack.rename(w1, &format!("w{}", i + 1));
+    }
+
+    stack.from_altstack();
+    stack.from_altstack();
+
+    let w7 = u4_2_nib_shift_blake(stack, tables.shift_tables);
+    stack.rename(w7, "w7");
+    
+    stack.join_count(&mut w0, 7)
+}
+
+
+/// Adds the given constant numbers and u32 variables. to_copy and to_move specify which of these variables are to be consumed and left
+pub fn u4_add_direct( stack: &mut StackTracker, nibble_count: u32, 
+            to_copy: Vec<StackVariable>, 
+            mut to_move: Vec<&mut StackVariable>, 
+            mut constants: Vec<u32>, tables: &TablesVars) 
+{
+
+    // add all the constants together
+    if constants.len() > 1 {
+        let mut sum : u32 = 0;
+        for c in constants.iter() {
+            sum = sum.wrapping_add(*c);
+        }
+        constants = vec![sum];
+    }
+
+    //split the parts of the constant (still one element)
+    let mut constant_parts : Vec<Vec<u32>> = Vec::new();
+    for n in constants {
+        let parts = (0..8).rev().map(|i| (n >> (i * 4)) & 0xF).collect();
+        constant_parts.push(parts);
+    }
+
+    let number_count = to_copy.len() + to_move.len() + constant_parts.len();
+
+    for i in (0..nibble_count).rev() {
+
+        for x in to_copy.iter() {
+            stack.copy_var_sub_n(*x, i);
+        }
+
+        for x in to_move.iter_mut() {
+            stack.move_var_sub_n(x, i);
+        }
+
+        for parts in constant_parts.iter() {
+            stack.number(parts[i as usize]);
+        }
+
+        //add the numbers
+        for _ in 0..number_count - 1 {
+            stack.op_add();
+        }
+
+        //add the carry of the previous addition
+        if i < nibble_count - 1 {
+            stack.op_add();
+        }
+
+        if i > 0 {
+            //dup the result to be used to get the carry except for the last nibble
+            stack.op_dup();
+        }
+
+        //save value
+        let modulo = stack.get_value_from_table(tables.modulo, None);
+        stack.rename(modulo, &format!("modulo[{}]", i).to_string());
+        stack.to_altstack();
+
+        if i > 0 {
+            let carry = stack.get_value_from_table(tables.quotient, None);
+            stack.rename(carry, "carry");
+        }
+    }
+
+}
+
+/// Applies the G function (same notation as the paper) with the given parameters to the variables
+#[allow(clippy::too_many_arguments)]
+pub fn g(
+    stack: &mut StackTracker,
+    var_map: &mut HashMap<u8, StackVariable>,
+    a: u8,
+    b: u8,
+    c: u8,
+    d: u8,
+    mut m_two_i: StackVariable,
+    mut m_two_i_plus_one: StackVariable,
+    tables: &TablesVars,
+    last_round: bool,
+) {
+    //adds a + b + mx
+    //consumes a and mx and copies b
+    let vb = var_map[&b];
+    let mut va = var_map.get_mut(&a).unwrap();
+
+    if last_round {
+        u4_add_direct(stack, 8, vec![vb], vec![&mut va, &mut m_two_i], vec![], tables);
+    } else {
+        u4_add_direct(stack, 8, vec![vb, m_two_i], vec![&mut va], vec![], tables);
+    }
+    
+    //stores the results in a
+    *va = stack.from_altstack_joined(8, &format!("state_{}", a));
+
+    // right rotate d xor a ( consumes d and copies a)
+    let ret = xor_and_rotate_right_by_multiple_of_4(stack, var_map, d, a, 16, tables.use_full_tables);
+    // saves in d
+    var_map.insert(d, ret);
+
+    let vd = var_map[&d];
+    let mut vc = var_map.get_mut(&c).unwrap();
+    u4_add_direct(
+        stack,
+        8,
+        vec![vd],
+        vec![&mut vc],
+        vec![],
+        tables,
+    );
+    *vc = stack.from_altstack_joined(8, &format!("state_{}", c));
+
+    let ret = xor_and_rotate_right_by_multiple_of_4(stack, var_map, b, c, 12, tables.use_full_tables);
+    var_map.insert(b, ret);
+
+    let vb = var_map[&b];
+    let mut va = var_map.get_mut(&a).unwrap();
+    if last_round {
+        u4_add_direct(stack, 8, vec![vb], vec![&mut va, &mut m_two_i_plus_one], vec![], tables);
+    } else {
+        u4_add_direct(stack, 8, vec![vb, m_two_i_plus_one], vec![&mut va], vec![], tables);
+    }
+
+    *va = stack.from_altstack_joined(8, &format!("state_{}", a));
+
+    let ret = xor_and_rotate_right_by_multiple_of_4(stack, var_map, d, a, 8, tables.use_full_tables);
+    var_map.insert(d, ret);
+    stack.rename(ret, &format!("state_{}", d));
+
+    let vd = var_map[&d];
+    let mut vc = var_map.get_mut(&c).unwrap();
+    u4_add_direct(
+        stack,
+        8,
+        vec![vd],
+        vec![&mut vc],
+        vec![],
+        tables,
+    );
+    *vc = stack.from_altstack_joined(8, &format!("state_{}", c));
+
+    let ret = xor_and_rotate_right_by_7(stack, var_map, b, c, tables);
+    var_map.insert(b, ret);
+    stack.rename(ret, &format!("state_{}", b));
+}
+
+/// Applies G functions for the round
+pub fn round(
+    stack: &mut StackTracker,
+    state_var_map: &mut HashMap<u8, StackVariable>,
+    message_var_map: &HashMap<u8, StackVariable>,
+    tables: &TablesVars,
+    last_round: bool
+) {
+    g(
+        stack,
+        state_var_map,
+        0,
+        4,
+        8,
+        12,
+        message_var_map[&0],
+        message_var_map[&1],
+        tables,
+        last_round,
+    );
+    g(
+        stack,
+        state_var_map,
+        1,
+        5,
+        9,
+        13,
+        message_var_map[&2],
+        message_var_map[&3],
+        tables,
+        last_round,
+    );
+    g(
+        stack,
+        state_var_map,
+        2,
+        6,
+        10,
+        14,
+        message_var_map[&4],
+        message_var_map[&5],
+        tables,
+        last_round,
+    );
+    g(
+        stack,
+        state_var_map,
+        3,
+        7,
+        11,
+        15,
+        message_var_map[&6],
+        message_var_map[&7],
+        tables,
+        last_round,
+    );
+
+    g(
+        stack,
+        state_var_map,
+        0,
+        5,
+        10,
+        15,
+        message_var_map[&8],
+        message_var_map[&9],
+        tables,
+        last_round,
+    );
+    g(
+        stack,
+        state_var_map,
+        1,
+        6,
+        11,
+        12,
+        message_var_map[&10],
+        message_var_map[&11],
+        tables,
+        last_round,
+    );
+    g(
+        stack,
+        state_var_map,
+        2,
+        7,
+        8,
+        13,
+        message_var_map[&12],
+        message_var_map[&13],
+        tables,
+        last_round,
+    );
+    g(
+        stack,
+        state_var_map,
+        3,
+        4,
+        9,
+        14,
+        message_var_map[&14],
+        message_var_map[&15],
+        tables,
+        last_round,
+    );
+}
+
+/// Permutates the internal state, used after each round
+pub fn permutate(message_var_map: &HashMap<u8, StackVariable>) -> HashMap<u8, StackVariable> {
+    let mut ret = HashMap::new();
+    for i in 0..16_u8 {
+        ret.insert(i, message_var_map[&MSG_PERMUTATION[i as usize]]);
+    }
+    ret
+}
+
+/// Initializes the internal state, uses the same variable names as the paper
+pub fn init_state(
+    stack: &mut StackTracker,
+    chaining: bool,
+    counter: u32,
+    block_len: u32,
+    flags: u32,
+) -> HashMap<u8, StackVariable> {
+    let mut state = Vec::new();
+
+    if chaining {
+        for i in 0..8 {
+            state.push(stack.from_altstack_joined(8, &format!("prev-hash[{}]", i)));
+        }
+    } else {
+        for u32 in IV {
+            state.push(stack.number_u32(u32));
+        }
+    }
+    for u32 in &IV[0..4] {
+        state.push(stack.number_u32(*u32));
+    }
+    state.push(stack.number_u32(0));
+    state.push(stack.number_u32(counter));
+    state.push(stack.number_u32(block_len));
+    state.push(stack.number_u32(flags));
+
+    let mut state_map = HashMap::new();
+    for (i, s) in state.iter().enumerate() {
+        state_map.insert(i as u8, *s);
+        stack.rename(*s, &format!("state_{}", i));
+    }
+    state_map
+}
+
+/// Applies the blake3 compression function to the given 512 bit message, consumes everything and leaves only the final value
+#[allow(clippy::too_many_arguments)]
+pub fn compress(
+    stack: &mut StackTracker,
+    chaining: bool,
+    counter: u32,
+    block_len: u32,
+    flags: u32,
+    mut message: HashMap<u8, StackVariable>,
+    tables: &TablesVars,
+    final_rounds: u8,
+    last_round: bool,
+) {
+    //chaining value needs to be copied for multiple blocks
+    //every time that is provided
+
+    let mut state = init_state(stack, chaining, counter, block_len, flags);
+
+    for _ in 0..6 {
+        round(stack, &mut state, &message, tables, false);
+        message = permutate(&message);
+    }
+    round(stack, &mut state, &message, tables, true); //Last iteration, consumes the message
+
+    for i in (0..final_rounds).rev() {
+        let mut tmp = Vec::new();
+
+        //iterate nibbles
+        for n in 0..8 {
+            let v2 = *state.get(&(i + 8)).unwrap();
+            let v1 = state.get_mut(&i).unwrap();
+            tmp.push(xor_2_nibbles(stack, v1, v2, 0, n, tables.use_full_tables));
+
+            if last_round && n % 2 == 1 {
+                stack.to_altstack();
+                stack.to_altstack();
+            }
+        }
+        if !last_round {
+            for _ in 0..8 {
+                stack.to_altstack();
+            }
+        }
+    }
+}
+
+pub fn get_flags_for_block(i: u32, num_blocks: u32) -> u32 {
+    if num_blocks == 1 {
+        return 0b00001011;
+    }
+    if i == 0 {
+        return 0b00000001;
+    }
+    if i == num_blocks - 1 {
+        return 0b00001010;
+    }
+    0
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::collections::HashMap;
+    pub use bitcoin_script::script;
+    use bitcoin_script_stack::{script_util::verify_n, stack::StackTracker};
+
+    #[test]
+    fn test_rrot7() {
+        let mut stack = StackTracker::new();
+        let tables = TablesVars::new(&mut stack, true);
+
+        let mut ret = Vec::new();
+        ret.push(stack.number_u32(0xdeadbeaf));
+        ret.push(stack.number_u32(0x01020304));
+
+        let mut var_map: HashMap<u8, StackVariable> = HashMap::new();
+        var_map.insert(0, ret[0]);
+        var_map.insert(1, ret[1]);
+
+        xor_and_rotate_right_by_7(&mut stack, &mut var_map, 0, 1, &tables);
+
+        stack.number_u32(0x57bf5f7b);
+
+        stack.custom(script! { {verify_n(8)}}, 2, false, 0, "verify");
+
+        stack.drop(ret[1]);
+
+        tables.drop(&mut stack);
+
+        stack.op_true();
+
+        assert!(stack.run().success);
+    }
+
+    #[test]
+    fn test_g() {
+        let mut stack = StackTracker::new();
+
+        let tables = TablesVars::new(&mut stack, true);
+
+        let mut ret = Vec::new();
+        for i in 0..6 {
+            ret.push(stack.number_u32(i));
+        }
+
+        let mut var_map: HashMap<u8, StackVariable> = HashMap::new();
+        var_map.insert(0, ret[0]);
+        var_map.insert(1, ret[1]);
+        var_map.insert(2, ret[2]);
+        var_map.insert(3, ret[3]);
+
+        let start = stack.get_script().len();
+        g(
+            &mut stack,
+            &mut var_map,
+            0,
+            1,
+            2,
+            3,
+            ret[4],
+            ret[5],
+            &tables,
+            false,
+        );
+        let end = stack.get_script().len();
+        println!("G size: {}", end - start);
+
+        stack.number_u32(0xc4d46c6c); //b
+        stack.custom(script! { {verify_n(8)}}, 2, false, 0, "verify");
+
+        stack.number_u32(0x6a063602); //c
+        stack.custom(script! { {verify_n(8)}}, 2, false, 0, "verify");
+
+        stack.number_u32(0x6a003600); //d
+        stack.custom(script! { {verify_n(8)}}, 2, false, 0, "verify");
+
+        stack.number_u32(0x0030006a); //a
+        stack.custom(script! { {verify_n(8)}}, 2, false, 0, "verify");
+
+        stack.drop(ret[5]);
+        stack.drop(ret[4]);
+        tables.drop(&mut stack);
+
+        stack.op_true();
+
+        assert!(stack.run().success);
+    }
+
+    #[test]
+    fn test_round() {
+        let mut stack = StackTracker::new();
+
+        let tables = TablesVars::new(&mut stack, true);
+
+        let mut var_map: HashMap<u8, StackVariable> = HashMap::new();
+        let mut msg_map: HashMap<u8, StackVariable> = HashMap::new();
+        for i in 0..16 {
+            var_map.insert(i, stack.number_u32(i as u32));
+            msg_map.insert(i, stack.number_u32(i as u32));
+        }
+
+        let start = stack.get_script().len();
+        round(&mut stack, &mut var_map, &msg_map, &tables, false);
+        let end = stack.get_script().len();
+        println!("Round size: {}", end - start);
+    }
+}
diff --git a/bitvm/src/hash/blake3_u4_compact.rs b/bitvm/src/hash/blake3_u4_compact.rs
new file mode 100644
index 000000000..bbad9003b
--- /dev/null
+++ b/bitvm/src/hash/blake3_u4_compact.rs
@@ -0,0 +1,650 @@
+use std::collections::HashMap;
+
+use bitcoin_script_stack::stack::StackTracker;
+
+pub use bitcoin_script::builder::StructuredScript as Script;
+pub use bitcoin_script::script;
+
+use hex::FromHex;
+use crate::bigint::U256;
+
+use crate::hash::blake3_u4::{compress, get_flags_for_block, TablesVars};
+
+// This implementation assumes you have the input is in compact form on the stack.
+// The message must be packed into U256 (which uses 9 limbs 29 bits each) such that it expands a multiple of 128 nibbles
+// The padding added by user is removed and 0 is added as padding to prevent maliciously or mistaken wrong padding
+
+/// Compact BLAKE3 hash implementation
+///
+/// This function computes a BLAKE3 hash where the input is given as U256 such that each msgblock of 64 byte is comprised of 2 U256
+/// only expanding each msg block into its nibble form when needed to achieve higher stack efficiency and support for
+/// larger message size
+/// 
+/// ## Parameters:
+/// - msg_len: Length of the message. (excluding the padding)
+/// - define_var: Set to false if the input on stack is already defined as StackTracker varibles.
+/// - use_full_tables: toggle if you want to use full precomputation table or only half tables. Full table is script efficient but uses more stack.
+///
+/// ## Assumptions:
+/// - The stack contains only message. Anything other has to be moved to alt stack. If hashing the empty message of length 0, the stack is empty.
+/// - The input message is in compact form as U256 where each message block is comprised of two U256 totalling 18 limbs of 29 bits each. 
+/// - The input message must unpack to a multiple of 128 nibbles.
+/// - The start of the message is at the top of the stack in the following form:
+///        
+///  > msgblockn_part0 :U256
+///  > msgblockn_part1 :U256
+///  > ...
+///  > ...
+///  > msgblock0_part0 :U256
+///  > msgblock0_part1 :U256 (Top of Stack)
+///         
+/// - The user must ensure padding for the message to align to multiple of (2 * 9) limbs,
+///   resulting in a size that expands to a multiple of 128 nibbles. Any incorrectly added
+///   padding will be corrected to comply with padding requirement of blake3.
+///
+/// ## Behavior:
+/// 1. Defines stack variables for compact message blocks if `define_var` is enabled.
+/// 2. Moves the compact message to an alternate stack for processing.
+/// 3. Initializes hash computation tables.
+/// 4. Processes each message block:
+///     - Unpacks compact message forms.
+///     - Corrects any user-provided padding if it is the last block.
+///     - Computes the hash for the block using `compress` while maintaining intermediate states.
+/// 5. Drops intermediate states and finalizes the hash result on the stack.
+///
+/// ## Stack Effects:
+/// - Temporarily uses the alternate stack for intermediate results and hash computation tables.
+/// - Final result is left on the main stack as a BLAKE3 hash value.
+///
+/// ## Panics:
+/// - If `msg_len` is greater than 1024 bytes, the function panics with an assertion error.
+/// - If the input is not a multiple of 18 limbs, or doesn't unpack to a multiple of 128 nibbles.
+/// - If the stack contains elements other than the message.
+
+pub fn blake3_u4_compact(
+    stack: &mut StackTracker,
+    mut msg_len: u32,
+    define_var: bool,
+    use_full_tables: bool,
+) {
+
+    // this assumes that the stack is empty
+    if msg_len == 0{
+        // af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262
+        //hardcoded hash of empty msg
+        let empty_msg_hash = "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262";
+        let empty_msg_hash_bytearray =  <[u8;32]>::from_hex(empty_msg_hash).unwrap();
+
+        stack.custom(script!(
+            // push the hash value
+            for byte in empty_msg_hash_bytearray{
+                {byte}
+            }
+            //convert bytes to nibbles
+            {U256::transform_limbsize(8,4)}
+        ), 
+        0,
+        false,
+        0,
+        "push empty string hash in nibble form"
+        );
+        stack.define(8 as u32 * 8, "blake3-hash");
+        return;
+    }
+
+
+    // We require message take atmost a chunk. i.e, 1024 bytes.
+    assert!(
+        msg_len <= 1024,
+        "msg length must be less than or equal to 1024 bytes"
+    );
+
+    //number of msg blocks
+    let num_blocks = f64::ceil(msg_len as f64 / 64 as f64) as u32;
+
+    // If the compact form of message is on stack but not associated with variable, convert it to StackVariable
+    if define_var {
+        for i in (0..num_blocks).rev() {
+            stack.define(9, &format!("msg{}p0", i));
+            stack.define(9, &format!("msg{}p1", i));
+        }
+    }
+
+    // Push msg to alt stack to get the table on top
+    for _ in 0..num_blocks {
+        stack.to_altstack();
+        stack.to_altstack();
+    }
+
+    //initialize the tables
+    let tables = TablesVars::new(stack, use_full_tables);
+
+    // pop the message from the alt stack
+    for _ in 0..num_blocks {
+        stack.from_altstack();
+        stack.from_altstack();
+    }
+
+    //process each msg_block
+    for i in 0..num_blocks {
+        // unpack the compact form of message
+        stack.custom(
+            script!(
+                {U256::transform_limbsize(29, 4)}
+                for _ in 0..64{
+                    OP_TOALTSTACK
+                }
+            ),
+            1,
+            false,
+            0,
+            &format!("unpack msg{}p1", i),
+        );
+
+        stack.custom(
+            script!(
+                {U256::transform_limbsize(29,4)}
+                for _ in 0..64{
+                    OP_FROMALTSTACK
+                }
+            ),
+            1,
+            false,
+            0,
+            &format!("unpack msg{}p0", i),
+        );
+
+        // handle padding if it is the last block
+        if i == (num_blocks - 1) && msg_len != 64 {
+            // due to LE representation, msg portion can be on top of padding.
+            let j = msg_len % 4;
+            let pad_bytes = 64 + j - msg_len - 4;
+
+            stack.custom(
+                script!(
+                    //Drop whatever padding has been added for packing to limbs and pad with zeros
+                    for _ in 0..(pad_bytes*2){
+                        OP_DROP
+                    }
+
+                    for _ in 0..(j*2){
+                        OP_TOALTSTACK
+                    }
+
+                    for _ in 0..(4-j) * 2{
+                        OP_DROP
+                    }
+
+                    for _ in 0..(4-j) * 2{
+                        OP_0
+                    }
+
+                    for _ in 0..(j*2){
+                        OP_FROMALTSTACK
+                    }
+
+                    for _ in 0..(pad_bytes*2){
+                        OP_0
+                    }
+                ),
+                0,
+                false,
+                0,
+                "padding",
+            );
+        }
+
+        //make a hashmap of msgs
+        let mut original_message = Vec::new();
+        for i in 0..16 {
+            let m = stack.define(8, &format!("msg_{}", i));
+            original_message.push(m);
+        }
+
+        // create the current block message map
+        let mut message = HashMap::new();
+        for m in 0..16 {
+            message.insert(m as u8, original_message[m as usize]);
+        }
+
+        compress(
+            stack,
+            i != 0,
+            0,
+            msg_len.min(64),
+            get_flags_for_block(i, num_blocks),
+            message,
+            &tables,
+            8,
+            i == num_blocks - 1,
+        );
+
+        //delete the intermediate states
+        for _ in 0..8 {
+            stack.drop(stack.get_var_from_stack(0));
+        }
+
+        if msg_len > 64 {
+            msg_len -= 64;
+        }
+    }
+    // drop tables
+    tables.drop(stack);
+
+    // get the result hash
+    stack.from_altstack_joined(8 as u32 * 8, "blake3-hash");
+}
+
+#[cfg(any(feature = "fuzzing", test))]
+//verifies that the hash of the input byte slice matches with official implementation.
+pub fn test_blake3_compact_givenbyteslice(input_bytes: &[u8], use_full_tables: bool) -> String{
+
+    use crate::execute_script;
+
+    let mut stack = StackTracker::new();
+    let msg_len = input_bytes.len();
+    
+    //compute the official hash
+    let expected_hash = blake3::hash(input_bytes);
+
+    //determine amount of padding needed to get the compact working
+    let padding_bytes_needed = if msg_len % 64 == 0 {0} else {64 - (msg_len % 64)};
+    let mut padded_msg = input_bytes.to_vec();
+    padded_msg.extend(std::iter::repeat(0u8).take(padding_bytes_needed));
+
+    assert!(padded_msg.len() % 64 == 0, "padding failed");
+
+       // reverse the 4 byte chunks
+    for chunk in padded_msg.chunks_mut(4) {
+        chunk.reverse();
+    }
+ 
+    // push the msg into the stack and compact it
+    stack.custom(script!(
+        for chunk in padded_msg.chunks(64).rev(){
+            for (i,byte) in chunk.iter().enumerate(){
+                {*byte}
+                if i == 31 || i == 63{
+                    {U256::transform_limbsize(8,29)}
+                }
+            }
+        } 
+    ),
+    0,
+    false,
+    0,
+    "push_msgs"
+    );
+
+    blake3_u4_compact(&mut stack, msg_len as u32, true, use_full_tables);
+
+    //change the hash representation from nibbles to bytes and compare with expected hash value
+    stack.custom(script!(
+        for (i, byte) in expected_hash.as_bytes().iter().enumerate(){
+            {*byte}
+            if i % 32 == 31{
+                {U256::transform_limbsize(8,4)}
+            }
+        }
+        
+        for i in (2..65).rev(){
+            {i}
+            OP_ROLL
+            OP_EQUALVERIFY
+        }
+        OP_EQUAL
+    ),
+    0,
+    false,
+    0,
+    "verify");
+
+    assert!(execute_script(stack.get_script()).success);
+
+    expected_hash.to_string()
+}
+#[cfg(test)]
+mod tests {
+    pub use bitcoin_script::script;
+    use bitcoin_script_stack::{debugger::debug_script, optimizer::optimize, stack::StackTracker};
+    use rand::{Rng, SeedableRng};
+    use rand_chacha::ChaCha20Rng;
+    use super::*;
+    use crate::{execute_script, u4::u4_std::u4_hex_to_nibbles};
+
+    fn add_padding(input: String) -> String {
+        let len_bytes = input.len() / 2;
+        let mut res = String::from(input);
+
+        if len_bytes % 64 != 0 {
+            res.push_str(&"1".repeat((64 - (len_bytes % 64)) * 2)); //zero should be added as padding but this is done intentionally to test if blake3_u4_compact can handle wrong padding
+        }
+        res
+    }
+
+    fn gen_random_hex_strs(len_bytes: u32) -> String {
+        let mut rng = rand::thread_rng();
+        (0..(len_bytes * 2))
+            .map(|_| format!("{:x}", rng.gen_range(0..16))) // Generate a random hex digit
+            .collect()
+    }
+
+    // verifies that the hash of the input hex matches with the official implementation.
+    fn test_blake3_compact_giveninputhex(input_hex_str: String, msg_len: u32, use_full_tables: bool) -> String {
+        let mut stack = StackTracker::new();
+
+        // convert the input into byte array (LE notation)
+        let bytes = hex::decode(input_hex_str.clone()).unwrap();
+        let mut input_byte_arr = Vec::with_capacity(bytes.len());
+        for chunk in bytes.chunks_exact(4) {
+            // Convert chunk to [u8; 4]
+            let mut array: [u8; 4] = chunk.try_into().unwrap();
+            // Reverse the bytes so they represent a little-endian u32
+            array.reverse();
+            // Append these reversed bytes to our output
+            input_byte_arr.extend_from_slice(&array);
+        }
+
+        //processing the string to correct for endianess when pushing into stack
+        let input_str_processed = hex::encode(input_byte_arr.clone());
+
+        // compute the hash using the official implementation
+        let expected_hex_out = blake3::hash(&bytes[0..msg_len as usize]).to_string();
+
+        // toggle to print debug info
+        let show_debug_info = false;
+
+        if show_debug_info {
+            println!("Input Hex String :: {}", input_hex_str);
+            println!("Expected Hash :: {}", expected_hex_out);
+        }
+
+        // push the input string as nibbles and pack them
+        let num_blocks = input_hex_str.len() / 128;
+
+        for i in (0..num_blocks).rev() {
+            let pos_start = 64 * (2 * i) as usize;
+            let pos_mid = 64 * (2 * i + 1) as usize;
+            let pos_end = 64 * (2 * i + 2) as usize;
+
+            stack.var(
+                9,
+                script! {
+                    {u4_hex_to_nibbles(&input_str_processed[pos_start..pos_mid])}
+                    {U256::transform_limbsize(4, 29)}
+                },
+                &format!("msg{}p0", i),
+            );
+
+            stack.var(
+                9,
+                script! {
+                    {u4_hex_to_nibbles(&input_str_processed[pos_mid..pos_end])}
+                    {U256::transform_limbsize(4, 29)}
+                },
+                &format!("msg{}p1", i),
+            );
+        }
+
+        let start = stack.get_script().len();
+        let optimized_start = optimize(stack.get_script().compile()).len();
+
+        blake3_u4_compact(&mut stack, msg_len, false, use_full_tables);
+
+        let end = stack.get_script().len();
+        let optimized_end = optimize(stack.get_script().compile()).len();
+
+        //push the expected hash and verify
+        stack.var(
+            64,
+            script! {
+                {u4_hex_to_nibbles(&expected_hex_out.chars().rev().collect::<String>())}
+            },
+            "expected-hash-rev",
+        );
+
+        stack.to_altstack();
+
+        stack.custom(
+            script! {
+                for _ in 0..64{
+                    OP_FROMALTSTACK
+                    OP_EQUALVERIFY
+                }
+            },
+            1,
+            false,
+            0,
+            "verify",
+        );
+
+        stack.op_true();
+
+        assert!(stack.run().success);
+
+        let optimized = optimize(stack.get_script().compile());
+        let scr = { script!().push_script(optimized.clone()) };
+        let exec_result = execute_script(scr);
+
+        // toggle to print benchmarks
+        let show_benchmarks = false;
+        if show_benchmarks {
+            println!(
+                "Blake3 Script Size for {} bytes : {} ",
+                msg_len,
+                end - start
+            );
+            println!(
+                "Blake3 Max Stack Use for {} bytes : {}",
+                msg_len,
+                stack.get_max_stack_size()
+            );
+
+            println!(
+                "Blake3 Optimized Script Size for {} bytes : {}",
+                msg_len,
+                optimized_end - optimized_start
+            );
+            println!(
+                "Blake3 Optimized Max Stack use for {} bytes :: {}\n",
+                msg_len, exec_result.stats.max_nb_stack_items
+            );
+        }
+        
+        // assert optimized version too
+        assert!(debug_script(optimized).0.result().unwrap().success);
+
+        expected_hex_out
+    }
+
+    // test on all ones
+    #[test]
+    fn test_blake3_compact_allones() {
+
+        // test with full tables
+        test_blake3_compact_giveninputhex("f".repeat(128), 64,true);
+        test_blake3_compact_givenbyteslice(&[0b11111111;64], true);
+
+        //test with half tables
+        test_blake3_compact_giveninputhex("f".repeat(128), 64, false);
+        test_blake3_compact_givenbyteslice(&[0b11111111;64], false); 
+    }
+
+    // test on all zeros
+    #[test]
+    fn test_blake3_compact_allzeros() {
+
+        // test with full tables
+        test_blake3_compact_giveninputhex("0".repeat(128), 64, true);
+        test_blake3_compact_givenbyteslice(&[0u8;64],true);
+
+        // test with half tables
+        test_blake3_compact_giveninputhex("0".repeat(128), 64, false);
+        test_blake3_compact_givenbyteslice(&[0u8;64],false);
+    }
+
+    // test on random inputs of length that are multiple of 64 bytes
+    #[test]
+    fn test_blake3_compact_randominputs_multipleof64bytes() {
+        for i in 1..=16{
+            //test with full table
+            test_blake3_compact_giveninputhex(gen_random_hex_strs(64 * i), 64 * i, true);
+
+            //test with half table
+            test_blake3_compact_giveninputhex(gen_random_hex_strs(64 * i), 64 * i, false);
+        }
+    }
+
+    // test on random inputs of random lengths
+    #[test]
+    fn test_blake3_compact_randominputs() {
+        let mut rng = ChaCha20Rng::seed_from_u64(0);
+
+        for _ in 0..10{
+            let random_size = rng.gen_range(0..=1024);
+            let mut random_byte_slice: Vec<u8> = Vec::with_capacity(random_size);
+            
+            // Fill the vector with random bytes
+            for _ in 0..random_size {
+                random_byte_slice.push(rng.gen());
+            }
+
+            // test with full tables
+            test_blake3_compact_giveninputhex(add_padding(gen_random_hex_strs(random_size as u32)), random_size as u32, true);
+            test_blake3_compact_givenbyteslice(&random_byte_slice, true);
+        
+            // test with half tables
+            test_blake3_compact_giveninputhex(add_padding(gen_random_hex_strs(random_size as u32)), random_size as u32, false);
+            test_blake3_compact_givenbyteslice(&random_byte_slice, false);
+        }
+    }
+
+    // test against official test vectors
+    #[test]
+    fn test_blake3_compact_official_testvectors() {
+        use serde::Deserialize;
+        use std::error::Error;
+        use std::fs::File;
+        use std::io::BufReader;
+
+        #[derive(Debug, Deserialize)]
+        struct TestVectors {
+            cases: Vec<TestCase>,
+        }
+
+        #[derive(Debug, Deserialize)]
+        struct TestCase {
+            input_len: usize,
+            hash: String,
+        }
+
+        fn read_test_vectors(path: &str) -> Result<TestVectors, Box<dyn Error>> {
+            // Open the JSON file
+            let file = File::open(path)?;
+            let reader = BufReader::new(file);
+
+            // Deserialize the JSON into TestVectors struct
+            let test_vectors = serde_json::from_reader(reader)?;
+
+            Ok(test_vectors)
+        }
+
+        fn gen_inputs_with_padding(len: usize) -> String {
+            // Generate the byte sequence with a repeating pattern of 251 bytes
+            let mut bytes: Vec<u8> = (0..251u8).cycle().take(len).collect();
+            // Add padding to ensure length is a multiple of 64
+            if len % 64 != 0 {
+                for _ in 0..(64 - (len % 64)) {
+                    bytes.push(1); //zero should be added as padding but this is done intentionally to test if blake3_u4_compact can handle incorrect padding
+                }
+            }
+            // Convert each byte to its two-digit hexadecimal representation and concatenate
+            bytes.iter().map(|byte| format!("{:02x}", byte)).collect()
+        }
+
+        // The official test vectors for blake3 given at https://github.com/BLAKE3-team/BLAKE3/blob/master/test_vectors/test_vectors.json
+        let path = "src/hash/blake3_official_test_vectors.json";
+
+        let test_vectors = read_test_vectors(path).unwrap();
+
+        for (_, case) in test_vectors.cases.iter().enumerate() {
+            if case.input_len > 64 && case.input_len <= 65 {
+                // testing with the hex form
+                assert_eq!(
+                    case.hash[0..64],
+                    test_blake3_compact_giveninputhex(
+                        gen_inputs_with_padding(case.input_len),
+                        case.input_len as u32,
+                        true //use full tables
+                    )
+                );
+                assert_eq!(
+                    case.hash[0..64],
+                    test_blake3_compact_giveninputhex(
+                        gen_inputs_with_padding(case.input_len),
+                        case.input_len as u32,
+                        false //use half tables
+                    )
+                );
+
+                //testing with the byte slice with both full and half table
+                let bytes: Vec<u8> = (0..251u8).cycle().take(case.input_len).collect();
+                assert_eq!(case.hash[0..64],test_blake3_compact_givenbyteslice(&bytes, true));
+                assert_eq!(case.hash[0..64],test_blake3_compact_givenbyteslice(&bytes, false));
+            }
+        }
+    }
+
+    // test zero length input
+    #[test]
+    fn test_blake3_compact_zerolength_input() {
+        // test with full tables
+        test_blake3_compact_giveninputhex(String::from(""), 0, true);
+        test_blake3_compact_givenbyteslice(&[], true);
+
+        // test with half tables
+        test_blake3_compact_giveninputhex(String::from(""), 0, false);
+        test_blake3_compact_givenbyteslice(&[], false);
+    }
+    
+    // should panic when msg len is larger than 1024 (using hexstring and full table)
+    #[test]
+    #[should_panic(expected = "msg length must be less than or equal to 1024 bytes")]
+    fn test_blake3_compact_large_length_hexstring_fulltable() {
+        test_blake3_compact_giveninputhex(String::from("0".repeat(1025 * 2)), 1025, true);
+    }
+
+    // should panic when msg len is larger than 1024 (using bytearray and full table)
+    #[test]
+    #[should_panic(expected = "msg length must be less than or equal to 1024 bytes")]
+    fn test_blake3_compact_large_length_bytearray_fulltable() {
+        test_blake3_compact_givenbyteslice(&[0u8; 1025], true);
+    }    
+
+
+    // should panic when msg len is larger than 1024 (using hexstring and half table)
+    #[test]
+    #[should_panic(expected = "msg length must be less than or equal to 1024 bytes")]
+    fn test_blake3_compact_large_length_hexstring_halftable() {
+        test_blake3_compact_giveninputhex(String::from("0".repeat(1025 * 2)), 1025, false);
+    }
+
+    // should panic when msg len is larger than 1024 (using bytearray and half table)
+    #[test]
+    #[should_panic(expected = "msg length must be less than or equal to 1024 bytes")]
+    fn test_blake3_compact_large_length_bytearray_halftable() {
+        test_blake3_compact_givenbyteslice(&[0u8; 1025], false);
+    }
+
+    // test on single byte 
+    #[test]
+    fn test_blake3_compact_byte(){
+        // test with full tables
+        test_blake3_compact_giveninputhex(add_padding(String::from("0a")), 1, true);
+        test_blake3_compact_givenbyteslice(&[0b00001010;1], true);
+
+        // test with half tables
+        test_blake3_compact_giveninputhex(add_padding(String::from("0a")), 1, false);
+        test_blake3_compact_givenbyteslice(&[0b00001010;1], false);
+    }
+}
diff --git a/bitvm/src/hash/mod.rs b/bitvm/src/hash/mod.rs
new file mode 100644
index 000000000..dd341aa53
--- /dev/null
+++ b/bitvm/src/hash/mod.rs
@@ -0,0 +1,7 @@
+pub mod blake3;
+pub mod blake3_u32;
+pub mod blake3_u4;
+pub mod blake3_u4_compact;
+pub mod sha256;
+pub mod sha256_u4;
+pub mod sha256_u4_stack;
diff --git a/src/hash/sha256.rs b/bitvm/src/hash/sha256.rs
similarity index 99%
rename from src/hash/sha256.rs
rename to bitvm/src/hash/sha256.rs
index 3d400ec6f..ce12fd612 100644
--- a/src/hash/sha256.rs
+++ b/bitvm/src/hash/sha256.rs
@@ -130,12 +130,11 @@ pub fn sha256_80bytes() -> Script {
 /// reorder bytes for u32
 pub fn padding_add_roll(num_bytes: usize) -> Script {
     assert!(num_bytes < 512);
-    let padding_num;
-    if (num_bytes % 64) < 56 {
-        padding_num = 55 - (num_bytes % 64);
+    let padding_num = if (num_bytes % 64) < 56 {
+        55 - (num_bytes % 64)
     } else {
-        padding_num = 64 + 55 - (num_bytes % 64);
-    }
+        64 + 55 - (num_bytes % 64)
+    };
 
     let u32_num = (num_bytes + padding_num + 9) / 4;
     script! {
@@ -183,7 +182,7 @@ pub fn sha256_k() -> Vec<Script> {
 }
 
 /// sha256 transform
-/// intput: [m[15], m[14], ..., m[0], state[7], state[6], ..., state[0]]
+/// input: [m[15], m[14], ..., m[0], state[7], state[6], ..., state[0]]
 /// output: [state[7], state[6], ..., state[0]]
 pub fn sha256_transform(xor_depth: u32, k_depth: u32) -> Script {
     script! {
diff --git a/src/hash/sha256_u4.rs b/bitvm/src/hash/sha256_u4.rs
similarity index 96%
rename from src/hash/sha256_u4.rs
rename to bitvm/src/hash/sha256_u4.rs
index fe3cf8c70..2efd5d36c 100644
--- a/src/hash/sha256_u4.rs
+++ b/bitvm/src/hash/sha256_u4.rs
@@ -189,15 +189,15 @@ pub fn ch_calculation(e: u32, f: u32, g: u32, offset_and: u32) -> Script {
             { g + 7  + 2}                      // e  ~e  g_nib_pos (account for e and ~e)
             OP_PICK                                 // e  ~e  g
 
-            { u4_and_half_table(nib + offset_and + 3) }   // e  ( ~e & g )
+            { u4_half_table_operation(nib + offset_and + 3) }   // e  ( ~e & g )
             OP_SWAP                                 // ( ~e & g ) e
 
 
             { f + 7  + 2}                      // ( ~e & g ) e f_nib_pos
             OP_PICK                                 // ( ~e & g ) e f
 
-            { u4_and_half_table(nib + offset_and + 3) }   // ( ~e & g ) (e & f)
-            { u4_xor_with_and_table(nib + offset_and + 2) }   // ( ~e & g ) ^ (e & f)
+            { u4_half_table_operation(nib + offset_and + 3) }   // ( ~e & g ) (e & f)
+            { u4_xor_with_half_and_table(nib + offset_and + 2) }   // ( ~e & g ) ^ (e & f)
 
             //OP_TOALTSTACK
         }
@@ -215,18 +215,18 @@ pub fn maj_calculation(a: u32, b: u32, c: u32, offset_and: u32) -> Script {
             OP_PICK                                       // a b
             OP_2DUP                                       // a b a b
 
-            { u4_xor_with_and_table(nib + offset_and + 4) }   // a b (a^b)
+            { u4_xor_with_half_and_table(nib + offset_and + 4) }   // a b (a^b)
 
             { c + 7 + 3 }                                 // a b (a^b) c_nib_pos
             OP_PICK                                       // a b (a^b) c
 
-            { u4_and_half_table(nib + offset_and + 4) }   // a b ((a^b) & c)
+            { u4_half_table_operation(nib + offset_and + 4) }   // a b ((a^b) & c)
             OP_ROT
             OP_ROT                                        // ((a^b) & c) a b
 
-            { u4_and_half_table(nib + offset_and + 3) }   // ((a^b) & c) (a & b)
+            { u4_half_table_operation(nib + offset_and + 3) }   // ((a^b) & c) (a & b)
 
-            { u4_xor_with_and_table(nib + offset_and + 2) }   // ((a^b) & c) ^ (a & b)
+            { u4_xor_with_half_and_table(nib + offset_and + 2) }   // ((a^b) & c) ^ (a & b)
 
         }
     }
@@ -278,7 +278,7 @@ pub fn sha256(num_bytes: u32) -> Script {
 
     let add_size = 130;
     let sched_size = 128;
-    let rrot_size = 96;
+    let rrot_size = 16 * 5;
     let half_logic_size = 136 + 16;
     let mut tables_size = rrot_size + half_logic_size;
     let use_add_table = chunks == 1;
@@ -315,7 +315,7 @@ pub fn sha256(num_bytes: u32) -> Script {
                 //TODO: if lookup table is pushed first and substracted
                 // then we could avoid changing it  ~(32 * chunk)
                 { u4_drop_half_lookup() }
-                { u4_drop_half_and() }
+                { u4_drop_half_table() }
                 { u4_push_half_xor_table() }
                 { u4_push_half_lookup() }
             }
@@ -336,7 +336,7 @@ pub fn sha256(num_bytes: u32) -> Script {
             //change xor with and table
             { u4_toaltstack(full_sched_size) }
             { u4_drop_half_lookup() }
-            { u4_drop_half_and() }
+            { u4_drop_half_table() }
             { u4_push_half_and_table() }
             { u4_push_half_lookup() }
             { u4_fromaltstack(full_sched_size) }
@@ -452,7 +452,7 @@ pub fn sha256(num_bytes: u32) -> Script {
         }
 
         { u4_drop_half_lookup() }
-        { u4_drop_half_and() }
+        { u4_drop_half_table() }
         { u4_drop_rrot_tables() }
         if use_add_table {
             { u4_drop_add_tables() }
@@ -512,10 +512,10 @@ mod tests {
 
         let script = script! {
             { u4_hex_to_nibbles(hex_in) }
-            { sha256(hex_in.len() as u32 /2)}
+            { sha256(hex_in.len() as u32 / 2)}
 
 
-            { u4_hex_to_nibbles(res.as_str())}
+            { u4_hex_to_nibbles(res.as_str()) }
             for _ in 0..64 {
                 OP_TOALTSTACK
             }
diff --git a/bitvm/src/hash/sha256_u4_stack.rs b/bitvm/src/hash/sha256_u4_stack.rs
new file mode 100644
index 000000000..f12d91ddb
--- /dev/null
+++ b/bitvm/src/hash/sha256_u4_stack.rs
@@ -0,0 +1,987 @@
+use crate::u4::{
+    u4_add::{u4_add_carry_nested, u4_add_nested},
+    u4_add_stack::*,
+    u4_logic_stack::*,
+    u4_shift_stack::*,
+};
+use bitcoin_script_stack::stack::{script, Script, StackTracker, StackVariable};
+use std::{collections::HashMap, vec};
+
+const K: [u32; 64] = [
+    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+    0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+    0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+    0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+    0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+    0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+    0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+    0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2,
+];
+
+const INITSTATE_MAPPING: [char; 8] = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'];
+
+const INITSTATE: [u32; 8] = [
+    0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19,
+];
+
+fn scheduling_64_padding() -> [u32; 64] {
+    const PADDING_64_BYTES: [u32; 16] = [
+        0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000200,
+    ];
+    let mut result = [0; 64];
+    result[..16].clone_from_slice(PADDING_64_BYTES.as_ref());
+
+    for i in 16..64 {
+        let s0 = result[i - 15].rotate_right(7)
+            ^ result[i - 15].rotate_right(18)
+            ^ (result[i - 15] >> 3);
+        let s1 =
+            result[i - 2].rotate_right(17) ^ result[i - 2].rotate_right(19) ^ (result[i - 2] >> 10);
+        result[i] = result[i - 16]
+            .wrapping_add(s0)
+            .wrapping_add(result[i - 7])
+            .wrapping_add(s1);
+    }
+    result
+}
+
+pub fn u4_number_to_nibble(n: u32) -> Script {
+    //constant number used during "compile" time
+    script! {
+       for i in (0..8).rev() {
+            { (n >> (i * 4)) & 0xF }
+        }
+    }
+}
+
+pub fn double_padding(num_bytes: u32) -> (Vec<Script>, u32) {
+    //55 bytes fits in one block
+    //56 to 64 requires two block padding
+
+    let mut chunks = num_bytes / 64;
+    chunks += 1;
+
+    if num_bytes % 64 > 55 {
+        let mut bytes_left_first_padding = 64 - (num_bytes % 64);
+        bytes_left_first_padding -= 1; // remove the 0x80 that will be added always
+        let script1 = script! {
+            8
+            0
+            for _ in 0..bytes_left_first_padding { //can optimize with a couple of dups
+                0
+                0
+            }
+        };
+
+        let script2 = script! {
+            0
+            OP_DUP
+            for _ in 0..59 {
+                OP_2DUP
+            }
+            { u4_number_to_nibble( num_bytes * 8 ) }
+        };
+
+        chunks += 1;
+
+        let mut results = Vec::new();
+        for _ in 0..(chunks - 2) {
+            results.push(script! {});
+        }
+        results.push(script1);
+        results.push(script2);
+
+        (results, chunks)
+    } else {
+        let (script1, _) = padding(num_bytes);
+        let mut results = Vec::new();
+        for _ in 0..(chunks - 1) {
+            results.push(script! {});
+        }
+        results.push(script1);
+        (results, chunks)
+    }
+}
+
+pub fn padding(num_bytes: u32) -> (Script, u32) {
+    let l = (num_bytes * 8) as i32;
+    let mut k = 512 - l - 8 - 32; // heres is usually minus 8, but as
+                                  // there will be never that many bytes to process
+                                  // one u32 will be enough
+    let mut chunks = 1;
+    while k < 0 {
+        k += 512;
+        chunks += 1;
+    }
+    let zeros = k / 16;
+    let extras = k % 16;
+
+    (
+        script! {
+          8
+          0
+          for i in 0..zeros {
+              if i == 0 {
+                  0
+                  OP_DUP
+                  OP_2DUP
+              } else {
+                  OP_2DUP
+                  OP_2DUP
+              }
+          }
+          if extras > 0 {
+              0
+              0
+          }
+          { u4_number_to_nibble( l as u32 ) }
+        },
+        chunks,
+    )
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn calculate_s_nib(
+    stack: &mut StackTracker,
+    number: [StackVariable; 8],
+    nib: u32,
+    shift_table: StackVariable,
+    shift_values: Vec<u32>,
+    last_is_shift: bool,
+    lookup_table: StackVariable,
+    logic_table: StackVariable,
+) -> StackVariable {
+    let i = 7 - nib;
+    let mut res = StackVariable::null();
+    for (j, shift_value) in shift_values.iter().enumerate() {
+        let pos_shift = shift_value / 4;
+        let bit_shift = shift_value % 4;
+
+        let do_first = !last_is_shift || j < shift_values.len() - 1 || (i + pos_shift) < 8;
+        let do_second = !last_is_shift || j < shift_values.len() - 1 || (i + pos_shift + 1) < 8;
+
+        let first_nibble = (i + pos_shift) % 8;
+        let second_nibble = (i + pos_shift + 1) % 8;
+        if do_first {
+            let v = stack.copy_var(number[7 - first_nibble as usize]);
+            stack.rename(v, format!("to_be_r_shifted_{}_{nib}", shift_value).as_str());
+            let rshift = u4_rshift_stack(stack, shift_table, bit_shift);
+            stack.rename(rshift, format!("r_shifted_{}_{nib}", shift_value).as_str());
+        }
+        if do_second {
+            let v = stack.copy_var(number[7 - second_nibble as usize]);
+            stack.rename(v, format!("to_be_l_shifted_{}_{nib}", shift_value).as_str());
+            let lshift = u4_lshift_stack(stack, shift_table, 4 - bit_shift);
+            stack.rename(lshift, format!("l_shifted_{}_{nib}", shift_value).as_str());
+            let shifted = stack.op_add();
+            stack.rename(shifted, format!("shifted_{}_{nib}", shift_value).as_str());
+        }
+        if j != 0 && do_first {
+            res = u4_logic_with_table_stack(stack, lookup_table, logic_table);
+        }
+    }
+    stack.rename(res, format!(r"s_{nib}").as_str());
+    res
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn ch1_calculation_nib_stack(
+    stack: &mut StackTracker,
+    e: StackVariable,
+    f: StackVariable,
+    g: StackVariable,
+    nib: u32,
+    lookup: StackVariable,
+    xortable: StackVariable,
+    shift_table: StackVariable,
+) -> StackVariable {
+    stack.copy_var(g); // g[nib]
+    stack.op_dup(); // g g
+
+    stack.copy_var(f); // g g f[nib]
+
+    u4_logic_with_table_stack(stack, lookup, xortable); // g (g^f)
+
+    stack.copy_var(e); // // g (g^f) e
+
+    u4_and_with_xor_stack(stack, lookup, xortable, shift_table); // g (g^f & e)
+
+    let var = u4_logic_with_table_stack(stack, lookup, xortable); // g ^ ((f ^ g) & e)
+
+    stack.rename(var, format!("ch_i_{}", nib).as_str());
+    var
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn maj1_calculation_nib_stack(
+    stack: &mut StackTracker,
+    a: StackVariable,
+    b: StackVariable,
+    c: StackVariable,
+    nib: u32,
+    lookup: StackVariable,
+    xortable: StackVariable,
+    shift_table: StackVariable,
+) -> StackVariable {
+    stack.copy_var(a); // a[nib]
+
+    stack.copy_var(b); // a b[nib]
+
+    stack.copy_var(c); // a b c[nib]
+
+    stack.op_3dup(); // a b c a b c
+
+    u4_logic_with_table_stack(stack, lookup, xortable); // a b c a (b^c)
+
+    u4_logic_with_table_stack(stack, lookup, xortable); // a b c (a^b^c)
+
+    stack.op_sub(); // a b (c-a^b^c)
+    stack.op_add(); // a (b+c-a^b^c)
+    stack.op_add(); // a+b+c-a^b^c
+
+    let var = u4_rshift_stack(stack, shift_table, 1);
+
+    stack.rename(var, format!("maj_{nib}").as_str());
+    var
+}
+
+pub fn u4_add_nibble_stack(
+    stack: &mut StackTracker,
+    carry: &mut StackVariable,
+    number_count: u32,
+    is_last: bool,
+    quotient_table: StackVariable,
+    modulo_table: StackVariable,
+) -> StackVariable {
+    if !carry.is_null() {
+        stack.move_var(*carry);
+        stack.op_add();
+    }
+
+    if modulo_table.is_null() || quotient_table.is_null() {
+        if !is_last {
+            let output_vars = vec![(1, "add_no_table".into()), (1, "carry_no_table".into())];
+            let out = stack.custom_ex(
+                u4_add_carry_nested(0, number_count),
+                1,
+                output_vars,
+                0,
+            );
+            *carry = out[1];
+            out[0]
+        } else {
+            {
+                let output_vars = vec![(1, "add_no_table".into())];
+                stack.custom_ex(u4_add_nested(0, number_count), 1, output_vars, 0)[0]
+            }
+        }
+    } else {
+        if !is_last {
+            stack.op_dup();
+        }
+        let var = stack.get_value_from_table(modulo_table, None);
+
+        //we don't care about the last carry
+        if !is_last {
+            stack.op_swap();
+            //obtain the quotinent to be used as carry for the next addition
+            *carry = stack.get_value_from_table(quotient_table, None);
+        }
+        var
+    }
+}
+
+pub fn sha256_stack(
+    stack: &mut StackTracker,
+    num_bytes: u32,
+    use_add_table: bool,
+    use_full_xor: bool,
+) -> Script {
+    // up to 55 is one block and always supports add table
+    // probably up to 68 bytes I can afford to load the add tables for the first chunk (but have I would have to unload it)
+
+    let (mut padding_scripts, chunks) = double_padding(num_bytes);
+    let mut bytes_per_chunk: Vec<u32> = Vec::new();
+    let mut bytes_remaining = num_bytes;
+    while bytes_remaining > 0 {
+        if bytes_remaining > 64 {
+            bytes_per_chunk.push(64);
+            bytes_remaining -= 64;
+        } else {
+            bytes_per_chunk.push(bytes_remaining);
+            bytes_remaining = 0;
+        }
+    }
+    if bytes_per_chunk.len() < chunks as usize {
+        bytes_per_chunk.push(0);
+    }
+    //println!("{:?}", bytes_per_chunk);
+    //println!("{:?}", padding_scripts);
+
+    let scheduling_64 = scheduling_64_padding();
+
+    let mut message = (0..num_bytes * 2)
+        .map(|i| stack.define(1, &format!("message[{}]", i)))
+        .collect::<Vec<StackVariable>>();
+
+    let (modulo, quotient) = match use_add_table {
+        true => (
+            u4_push_modulo_table_stack(stack),
+            u4_push_quotient_table_stack(stack),
+        ),
+        false => (StackVariable::null(), StackVariable::null()),
+    };
+
+    stack.set_breakpoint("init");
+
+    let shift_tables = u4_push_shift_tables_stack(stack);
+
+    let (lookup, xor_table) = if use_full_xor {
+        (
+            u4_push_full_lookup_table_stack(stack),
+            u4_push_full_xor_table_stack(stack),
+        )
+    } else {
+        (
+            u4_push_half_lookup_table_0_based_stack(stack),
+            u4_push_half_xor_table_stack(stack),
+        )
+    };
+
+    let mut varmap: HashMap<char, [StackVariable; 8]> = HashMap::new();
+    let mut initstate: HashMap<char, [StackVariable; 8]> = HashMap::new();
+
+    stack.set_breakpoint("load tables");
+    for c in 0..chunks {
+        //move the message to the top of the stack
+        //this can be optimized only moving the las nibbles that would form an u32 with the first part of the padding
+        let mut moved_message = (0..bytes_per_chunk[c as usize] * 2)
+            .map(|i| stack.move_var(message[i as usize]))
+            .collect::<Vec<StackVariable>>();
+        message.drain(0..moved_message.len());
+
+        stack.set_breakpoint("moved message");
+        let is_64bytes_padding = num_bytes == 64 && c == 1;
+
+        //complete message with padding
+        if !is_64bytes_padding {
+            stack.custom(padding_scripts.remove(0), 0, false, 0, "padding");
+            let len = moved_message.len();
+            if len < 128 {
+                for i in 0..(128 - len) {
+                    moved_message.push(stack.define(1, &format!("padding[{}]", i)));
+                }
+            }
+            stack.set_breakpoint("padding");
+
+            //redefine from nibbles to u32
+            assert!(moved_message.len() == 128);
+        }
+
+        let mut schedule = Vec::new();
+        for i in 0..16 {
+            if is_64bytes_padding {
+                break;
+            }
+
+            let mut sched = [StackVariable::null(); 8];
+            for nib in 0..8 {
+                sched[nib] = moved_message[nib];
+                stack.rename(
+                    sched[nib],
+                    format!("schedule[{}][{}]", i, nib).as_str(),
+                );
+            }
+
+            schedule.push(sched);
+            moved_message.drain(0..8);
+        }
+        stack.set_breakpoint("schedule");
+        for jj in 0..4 {
+            if jj != 0 {
+                //schedule loop
+                for i in 16 * jj..16 * (jj + 1) {
+                    if is_64bytes_padding {
+                        break;
+                    }
+                    let mut sched: [StackVariable; 8] = [StackVariable::null(); 8];
+                    let mut sched_carry = StackVariable::null();
+                    for nib in (0..8).rev() {
+                        calculate_s_nib(
+                            stack,
+                            schedule[i - 15],
+                            nib,
+                            shift_tables,
+                            vec![7, 18, 3],
+                            true,
+                            lookup,
+                            xor_table,
+                        );
+                        calculate_s_nib(
+                            stack,
+                            schedule[i - 2],
+                            nib,
+                            shift_tables,
+                            vec![17, 19, 10],
+                            true,
+                            lookup,
+                            xor_table,
+                        );
+                        stack.op_add();
+                        stack.copy_var(schedule[i - 7][nib as usize]);
+                        stack.op_add();
+                        stack.move_var(schedule[i - 16][nib as usize]);
+                        stack.op_add();
+                        sched[nib as usize] = u4_add_nibble_stack(
+                            stack,
+                            &mut sched_carry,
+                            4,
+                            nib == 0,
+                            quotient,
+                            modulo,
+                        );
+                        stack.rename(sched[nib as usize], format!("sched_{}_{}", i, nib).as_str());
+                    }
+                    schedule.push(sched);
+
+                    stack.set_breakpoint(&format!("schedule[{}]", i));
+                }
+            } else if c == 0 {
+                for i in 0..INITSTATE.len() {
+                    varmap.insert(INITSTATE_MAPPING[i], [StackVariable::null(); 8]);
+                    for nib in 0..8 {
+                        let var = stack.number(INITSTATE[i] << (nib * 4) >> 28);
+                        stack.rename(var, format!("{}_{}", INITSTATE_MAPPING[i], nib).as_str());
+                        varmap.get_mut(&INITSTATE_MAPPING[i]).unwrap()[nib as usize] = var;
+                    }
+                }
+            } else {
+                for i in 0..INITSTATE_MAPPING.len() {
+                    for nib in 0..8 {
+                        varmap.get_mut(&INITSTATE_MAPPING[i]).unwrap()[nib as usize] =
+                            stack.copy_var(initstate[&INITSTATE_MAPPING[i]][nib as usize]);
+                    }
+                }
+            }
+            for i in 16 * jj..16 * (jj + 1) {
+                let mut temp1_carry = StackVariable::null();
+                let mut a_carry = StackVariable::null();
+                let mut e_carry = StackVariable::null();
+                let mut new_e = [StackVariable::null(); 8];
+                let mut new_a = [StackVariable::null(); 8];
+                for nib in (0..8).rev() {
+                    let s1 = calculate_s_nib(
+                        stack,
+                        varmap[&'e'],
+                        nib,
+                        shift_tables,
+                        vec![6, 11, 25],
+                        false,
+                        lookup,
+                        xor_table,
+                    );
+                    stack.rename(s1, format!("s1_{}_{}", i, nib).as_str());
+                    //calculate ch
+                    ch1_calculation_nib_stack(
+                        stack,
+                        varmap[&'e'][nib as usize],
+                        varmap[&'f'][nib as usize],
+                        varmap[&'g'][nib as usize],
+                        nib,
+                        lookup,
+                        xor_table,
+                        shift_tables,
+                    );
+
+                    //calculate temp1
+                    let h = varmap[&'h'][nib as usize];
+
+                    stack.op_add();
+                    stack.move_var(h);
+                    stack.op_add();
+
+                    if is_64bytes_padding {
+                        let constant = K[i].wrapping_add(scheduling_64[i]);
+                        stack.number((constant << (nib * 4)) >> 28);
+                        stack.op_add();
+                    }
+
+                    let temp1 = if use_add_table && quotient.size() < 80 {
+                        let mut temp1 = u4_add_nibble_stack(
+                            stack,
+                            &mut temp1_carry,
+                            4,
+                            nib == 0,
+                            quotient,
+                            modulo,
+                        );
+
+                        if nib != 0 {
+                            stack.op_swap();
+                        }
+
+                        if !is_64bytes_padding {
+                            stack.number((K[i] << (nib * 4)) >> 28);
+                            stack.op_add();
+                            if jj == 3 {
+                                stack.move_var(schedule[i][nib as usize]);
+                            } else {
+                                stack.copy_var(schedule[i][nib as usize]);
+                            }
+                            stack.op_add();
+
+                            temp1 = u4_add_nibble_stack(
+                                stack,
+                                &mut StackVariable::null(),
+                                3,
+                                nib == 0,
+                                quotient,
+                                modulo,
+                            );
+
+                            if nib != 0 {
+                                //obtain the quotinent to be used as carry for the next addition
+                                stack.op_rot();
+                                temp1_carry = stack.op_add();
+                                stack.rename(temp1_carry, "temp1_carry");
+                                stack.op_swap();
+                            }
+                        }
+                        temp1
+                    } else {
+                        let mut number_count = 4;
+                        if !is_64bytes_padding {
+                            number_count = 5;
+                            stack.number((K[i] << (nib * 4)) >> 28);
+                            stack.op_add();
+                            if jj == 3 {
+                                stack.move_var(schedule[i][nib as usize]);
+                            } else {
+                                stack.copy_var(schedule[i][nib as usize]);
+                            }
+                            stack.op_add();
+                        }
+                        let temp1 = u4_add_nibble_stack(
+                            stack,
+                            &mut temp1_carry,
+                            number_count,
+                            nib == 0,
+                            quotient,
+                            modulo,
+                        );
+                        if nib != 0 {
+                            stack.op_swap();
+                        }
+                        temp1
+                    };
+                    stack.rename(temp1, format!("temp1_{}", nib).as_str());
+
+                    stack.op_dup();
+                    //Calculate S0
+                    let s0 = calculate_s_nib(
+                        stack,
+                        varmap[&'a'],
+                        nib,
+                        shift_tables,
+                        vec![2, 13, 22],
+                        false,
+                        lookup,
+                        xor_table,
+                    );
+                    stack.rename(s0, format!("s0_{}_{}", i, nib).as_str());
+                    stack.op_add();
+                    //Calculate maj
+                    let maj = maj1_calculation_nib_stack(
+                        stack,
+                        varmap[&'a'][nib as usize],
+                        varmap[&'b'][nib as usize],
+                        varmap[&'c'][nib as usize],
+                        nib,
+                        lookup,
+                        xor_table,
+                        shift_tables,
+                    );
+                    stack.rename(maj, "maj");
+                    stack.op_add();
+                    new_a[nib as usize] =
+                        u4_add_nibble_stack(stack, &mut a_carry, 3, nib == 0, quotient, modulo);
+
+                    stack.rename(a_carry, "a_carry");
+                    stack.rename(new_a[nib as usize], format!("a_{}", nib).as_str());
+
+                    if nib != 0 {
+                        stack.op_rot();
+                    } else {
+                        stack.op_swap();
+                    }
+                    //e = d + temp1 (consumes d)
+                    let d = varmap[&'d'][nib as usize];
+                    stack.move_var(d);
+                    stack.op_add();
+
+                    new_e[nib as usize] =
+                        u4_add_nibble_stack(stack, &mut e_carry, 2, nib == 0, quotient, modulo);
+                    stack.rename(e_carry, "e_carry");
+                }
+                //reorder variables
+                for nib in 0..8 {
+                    varmap.get_mut(&'h').unwrap()[nib as usize] = varmap[&'g'][nib as usize];
+                    varmap.get_mut(&'g').unwrap()[nib as usize] = varmap[&'f'][nib as usize];
+                    varmap.get_mut(&'f').unwrap()[nib as usize] = varmap[&'e'][nib as usize];
+                    varmap.get_mut(&'e').unwrap()[nib as usize] = new_e[nib as usize];
+                    varmap.get_mut(&'d').unwrap()[nib as usize] = varmap[&'c'][nib as usize];
+                    varmap.get_mut(&'c').unwrap()[nib as usize] = varmap[&'b'][nib as usize];
+                    varmap.get_mut(&'b').unwrap()[nib as usize] = varmap[&'a'][nib as usize];
+                    varmap.get_mut(&'a').unwrap()[nib as usize] = new_a[nib as usize];
+                    for c in INITSTATE_MAPPING.iter() {
+                        stack.rename(varmap[c][nib as usize], &format!("{}_{}_{}", c, i, nib));
+                    }
+                }
+
+                stack.set_breakpoint(&format!("loop[{}]", i));
+            }
+        }
+
+        if c == 0 {
+            //first chunk adds with init state
+            for i in (0..INITSTATE_MAPPING.len()).rev() {
+                initstate.insert(INITSTATE_MAPPING[i], [StackVariable::null(); 8]);
+                for nib in (0..8).rev() {
+                    let x = (*varmap.get(&INITSTATE_MAPPING[i]).unwrap())[nib as usize];
+                    stack.move_var(x);
+                    if nib != 7 {
+                        stack.op_add();
+                    }
+
+                    stack.number(INITSTATE[i] << (nib * 4) >> 28);
+                    stack.op_add();
+                    initstate.get_mut(&INITSTATE_MAPPING[i]).unwrap()[nib as usize] =
+                        u4_add_nibble_stack(
+                            stack,
+                            &mut StackVariable::null(),
+                            2,
+                            nib == 0,
+                            quotient,
+                            modulo,
+                        );
+                    stack.rename(
+                        initstate.get(&INITSTATE_MAPPING[i]).unwrap()[nib as usize],
+                        &format!("h{}_{}", i, nib),
+                    );
+                }
+            }
+        } else {
+            //first chunk adds with init state
+            for i in (0..INITSTATE_MAPPING.len()).rev() {
+                for nib in (0..8).rev() {
+                    let x = (*varmap.get(&INITSTATE_MAPPING[i]).unwrap())[nib as usize];
+                    stack.move_var(x);
+                    if nib != 7 {
+                        stack.op_add();
+                    }
+
+                    stack.move_var(initstate[&INITSTATE_MAPPING[i]][nib as usize]);
+                    stack.op_add();
+                    initstate.get_mut(&INITSTATE_MAPPING[i]).unwrap()[nib as usize] =
+                        u4_add_nibble_stack(
+                            stack,
+                            &mut StackVariable::null(),
+                            2,
+                            nib == 0,
+                            quotient,
+                            modulo,
+                        );
+                    stack.rename(
+                        initstate.get(&INITSTATE_MAPPING[i]).unwrap()[nib as usize],
+                        &format!("h{}_{}", i, nib),
+                    );
+                }
+            }
+        }
+
+        stack.set_breakpoint("var addition");
+
+        // if last chunk drop the tables
+        if c == chunks - 1 {
+            // reverse the order of the variables
+            for a in &INITSTATE_MAPPING {
+                for nib in 0..8 {
+                    stack.move_var(initstate[a][nib as usize]);
+                }
+            }
+
+            stack.to_altstack_count(64);
+            stack.drop(xor_table);
+            stack.drop(lookup);
+            stack.drop(shift_tables);
+            if use_add_table {
+                stack.drop(quotient);
+                stack.drop(modulo);
+            }
+        }
+        stack.set_breakpoint("dropped");
+    }
+    for a in &INITSTATE_MAPPING {
+        *varmap.get_mut(a).unwrap() = stack.from_altstack_count(8).try_into().unwrap();
+    }
+
+    stack.set_breakpoint("final");
+
+    stack.get_script()
+}
+
+#[cfg(test)]
+mod tests {
+    use bitcoin_script::Script as StructuredScript;
+    use bitcoin_script_stack::stack::{script, Script, StackTracker};
+    use crate::u4::u4_std::u4_drop;
+    use super::*;
+    use crate::execute_script;
+    use sha2::{Digest, Sha256};
+
+    #[test]
+    fn test_sizes_tmp() {
+        let mut stack = StackTracker::new();
+        let x = sha256_stack(&mut stack, 32, true, true);
+        println!("sha 32 bytes: {}", x.len());
+        println!("max stack: {}", stack.get_max_stack_size());
+
+        let mut stack = StackTracker::new();
+        let x = sha256_stack(&mut stack, 80, true, true);
+        println!("sha 80 bytes: {}", x.len());
+        println!("max stack: {}", stack.get_max_stack_size());
+    }
+
+    #[test]
+    fn test_shatemp() {
+        let mut stack = StackTracker::new();
+        stack.custom(
+            script! {
+                {u4_number_to_nibble(0xdeadbeaf)}
+                {u4_number_to_nibble(0x01020304)}
+            },
+            0,
+            false,
+            0,
+            "message",
+        );
+
+        sha256_stack(&mut stack, 8, true, true);
+        stack.run();
+    }
+    pub fn u4_hex_to_nibbles(hex_str: &str) -> Script {
+        let nibbles: Result<Vec<u8>, std::num::ParseIntError> = hex_str
+            .chars()
+            .map(|c| u8::from_str_radix(&c.to_string(), 16))
+            .collect();
+        let nibbles = nibbles.unwrap();
+        script! {
+            for nibble in nibbles {
+                { nibble }
+            }
+        }
+    }
+    fn test_sha256(hex_in: &str, use_add_table: bool, use_full_xor: bool) {
+        let mut hasher = Sha256::new();
+        let data = hex::decode(hex_in).unwrap();
+        hasher.update(&data);
+        let result = hasher.finalize();
+        let res = hex::encode(result);
+        println!("Result: {}", res);
+
+        let mut stack = StackTracker::new();
+        stack.custom(
+            script! {
+                {u4_hex_to_nibbles(hex_in)}
+            },
+            0,
+            false,
+            0,
+            "message",
+        );
+        // stack.custom(y, 0, false, 0, "message");
+        let s = sha256_stack(
+            &mut stack,
+            hex_in.len() as u32 / 2,
+            use_add_table,
+            use_full_xor,
+        );
+        println!("script len{}", s.len());
+
+        stack.to_altstack_count(64);
+        let mut expected = stack.var(64, u4_hex_to_nibbles(res.as_str()), "expected");
+        let mut result = stack.from_altstack_joined(64, "res");
+        stack.debug();
+        stack.op_true();
+        stack.equals(&mut result, true, &mut expected, true);
+        let res = stack.run();
+        assert!(res.success);
+        let s = stack.get_script();
+        println!("{}", s.len());
+        let res = execute_script(StructuredScript::new("").push_script(s.compile()));
+        assert!(res.success);
+    }
+    #[test]
+    fn foostack80() {
+        test_sha256("b2222696d574e2c595e60b97b5fd30fe5efb9535de84214ad9dac92fb9a82f477cb5ffa4cefe9f749c4c5dd6190cfd197c30d1351a9db171a05883bf3f207a1045654654457567547547456775647654", true, true);
+        test_sha256("b2222696d574e2c595e60b97b5fd30fe5efb9535de84214ad9dac92fb9a82f477cb5ffa4cefe9f749c4c5dd6190cfd197c30d1351a9db171a05883bf3f207a1045654654457567547547456775647654", true, false);
+        test_sha256("b2222696d574e2c595e60b97b5fd30fe5efb9535de84214ad9dac92fb9a82f477cb5ffa4cefe9f749c4c5dd6190cfd197c30d1351a9db171a05883bf3f207a1045654654457567547547456775647654", false, true);
+        test_sha256("b2222696d574e2c595e60b97b5fd30fe5efb9535de84214ad9dac92fb9a82f477cb5ffa4cefe9f749c4c5dd6190cfd197c30d1351a9db171a05883bf3f207a1045654654457567547547456775647654", false, false);
+    }
+    #[test]
+    fn foostack64() {
+        test_sha256("b2222696d574e2c595e60b97b5fd30fe5efb9535de84214ad9dac92fb9a82f477cb5ffa4cefe9f749c4c5dd6190cfd197c30d1351a9db171a05883bf3f207a10", true, true);
+        test_sha256("b2222696d574e2c595e60b97b5fd30fe5efb9535de84214ad9dac92fb9a82f477cb5ffa4cefe9f749c4c5dd6190cfd197c30d1351a9db171a05883bf3f207a10", true, false);
+        test_sha256("b2222696d574e2c595e60b97b5fd30fe5efb9535de84214ad9dac92fb9a82f477cb5ffa4cefe9f749c4c5dd6190cfd197c30d1351a9db171a05883bf3f207a10", false, true);
+        test_sha256("b2222696d574e2c595e60b97b5fd30fe5efb9535de84214ad9dac92fb9a82f477cb5ffa4cefe9f749c4c5dd6190cfd197c30d1351a9db171a05883bf3f207a10", false, false);
+    }
+    #[test]
+    fn foostack32() {
+        test_sha256(
+            "b2222696d574e2c595e60b97b5fd30fe5efb9535de8421654543534534742475",
+            true,
+            true,
+        );
+        test_sha256(
+            "b2222696d574e2c595e60b97b5fd30fe5efb9535de8421654543534534742475",
+            true,
+            false,
+        );
+        test_sha256(
+            "b2222696d574e2c595e60b97b5fd30fe5efb9535de8421654543534534742475",
+            false,
+            true,
+        );
+        test_sha256(
+            "b2222696d574e2c595e60b97b5fd30fe5efb9535de8421654543534534742475",
+            false,
+            false,
+        );
+    }
+    #[test]
+    fn test_sha256_strs() {
+        let message = "Hello.";
+        let hex: String = message
+            .as_bytes()
+            .iter()
+            .map(|&b| format!("{:02x}", b))
+            .collect();
+        test_sha256(&hex, true, true);
+        let message = "This is a longer message that still fits in one block!";
+        let hex: String = message
+            .as_bytes()
+            .iter()
+            .map(|&b| format!("{:02x}", b))
+            .collect();
+        test_sha256(&hex, true, true)
+    }
+
+    #[test]
+    fn test_sha256_two_blocks() {
+        let hex = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaaaaaaa";
+        test_sha256(hex, true, true);
+        let hex = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001122334455667788";
+        test_sha256(hex, true, true);
+        let hex = "7788ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaaaaaaaaaaaaaaa001122334455667788";
+        test_sha256(hex, true, true);
+    }
+
+    #[test]
+    fn test_padding() {
+        let (script, _) = padding(1);
+        let script = script! {
+            { 0}
+            { 1 }
+            { script }
+            { u4_drop(128) }
+            OP_TRUE
+        };
+
+        let res = execute_script(StructuredScript::new("").push_script(script.compile()));
+        assert!(res.success);
+    }
+
+    #[test]
+    fn test_split_padding() {
+        for num_bytes in 0..150 {
+            let (padding_scripts, chunks) = double_padding(num_bytes);
+
+            let script = script! {
+                for _ in 0..num_bytes {
+                    { 1 }
+                    { 0 }
+                }
+                OP_DEPTH
+                OP_TOALTSTACK
+                for script in padding_scripts {
+                    { script }
+                    OP_DEPTH
+                    OP_TOALTSTACK
+                }
+                { u4_drop(chunks*128) }
+                OP_DEPTH
+                OP_TOALTSTACK
+                OP_TRUE
+            };
+
+            let res = execute_script(StructuredScript::new("").push_script(script.compile()));
+            assert!(res.success);
+        }
+    }
+
+    #[test]
+    fn test_genesis_block() {
+        // the genesis block header of bitcoin
+        // version previous-block merkle-root time bits nonce
+        // 01000000 0000000000000000000000000000000000000000000000000000000000000000 3ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a 29ab5f49 ffff001d 1dac2b7c
+        let block_header = "0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a29ab5f49ffff001d1dac2b7c";
+        let mut hasher = Sha256::new();
+        let data = hex::decode(block_header).unwrap();
+        hasher.update(&data);
+        let mut result = hasher.finalize();
+        hasher = Sha256::new();
+        hasher.update(result);
+        result = hasher.finalize();
+        let res = hex::encode(result);
+        let genesis_block_hash = "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000";
+        assert_eq!(res.as_str(), genesis_block_hash);
+
+        let mut stack = StackTracker::new();
+        stack.custom(
+            script! { {u4_hex_to_nibbles(block_header)}},
+            0,
+            false,
+            0,
+            "message",
+        );
+        sha256_stack(&mut stack, block_header.len() as u32 / 2, true, true);
+        let shascript = sha256_stack(&mut stack, 32, true, true);
+
+        let script = script! {
+
+            { shascript }
+
+            { u4_hex_to_nibbles(res.as_str())}
+            for _ in 0..64 {
+                OP_TOALTSTACK
+            }
+
+            for i in 1..64 {
+                {i}
+                OP_ROLL
+            }
+
+            for _ in 0..64 {
+                OP_FROMALTSTACK
+                OP_EQUALVERIFY
+            }
+            OP_TRUE
+
+
+        };
+        let res = execute_script(StructuredScript::new("").push_script(script.compile()));
+        assert!(res.success);
+    }
+}
diff --git a/bitvm/src/lib.rs b/bitvm/src/lib.rs
new file mode 100644
index 000000000..1313dbabc
--- /dev/null
+++ b/bitvm/src/lib.rs
@@ -0,0 +1,401 @@
+#[allow(dead_code)]
+// Re-export what is needed to write treepp scripts
+pub mod treepp {
+    pub use crate::execute_script_without_stack_limit;
+    pub use crate::execute_script;
+    pub use crate::run;
+    pub use bitcoin_script::{script, Script};
+}
+
+use core::fmt;
+
+use bitcoin::{
+    hashes::Hash,
+    hex::DisplayHex,
+    taproot::{LeafVersion, TAPROOT_ANNEX_PREFIX},
+    Opcode, Script, ScriptBuf, TapLeafHash, Transaction, TxOut,
+};
+use bitcoin_scriptexec::{Exec, ExecCtx, ExecError, ExecStats, Options, Stack, TxTemplate};
+
+pub mod bigint;
+pub mod bn254;
+pub mod chunk;
+pub mod groth16;
+pub mod hash;
+pub mod pseudo;
+pub mod signatures;
+pub mod u32;
+pub mod u4;
+
+/// A wrapper for the stack types to print them better.
+pub struct FmtStack(pub Stack);
+impl fmt::Display for FmtStack {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let mut iter = self.0.iter_str().enumerate().peekable();
+        write!(f, "\n0:\t\t ")?;
+        while let Some((index, mut item)) = iter.next() {
+            if item.is_empty() {
+                write!(f, "    []    ")?;
+            } else {
+                item.reverse();
+                write!(f, "0x{:8}", item.as_hex())?;
+            }
+            if iter.peek().is_some() {
+                if (index + 1) % f.width().unwrap_or(4) == 0 {
+                    write!(f, "\n{}:\t\t", index + 1)?;
+                }
+                write!(f, " ")?;
+            }
+        }
+        Ok(())
+    }
+}
+
+impl FmtStack {
+    pub fn len(&self) -> usize { self.0.len() }
+    pub fn is_empty(&self) -> bool { self.0.is_empty() }
+
+    pub fn get(&self, index: usize) -> Vec<u8> { self.0.get(index) }
+}
+
+impl fmt::Debug for FmtStack {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self)?;
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+pub struct ExecuteInfo {
+    pub success: bool,
+    pub error: Option<ExecError>,
+    pub final_stack: FmtStack,
+    pub remaining_script: String,
+    pub last_opcode: Option<Opcode>,
+    pub stats: ExecStats,
+}
+
+impl fmt::Display for ExecuteInfo {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if self.success {
+            writeln!(f, "Script execution successful.")?;
+        } else {
+            writeln!(f, "Script execution failed!")?;
+        }
+        if let Some(ref error) = self.error {
+            writeln!(f, "Error: {:?}", error)?;
+        }
+        if !self.remaining_script.is_empty() {
+            if self.remaining_script.len() < 500 {
+                writeln!(f, "Remaining Script: {}", self.remaining_script)?;
+            } else {
+                let mut string = self.remaining_script.clone();
+                string.truncate(500);
+                writeln!(f, "Remaining Script: {}...", string)?;
+            }
+        }
+        if !self.final_stack.is_empty() {
+            match f.width() {
+                None => writeln!(f, "Final Stack: {:4}", self.final_stack)?,
+                Some(width) => {
+                    writeln!(f, "Final Stack: {:width$}", self.final_stack, width = width)?
+                }
+            }
+        }
+        if let Some(ref opcode) = self.last_opcode {
+            writeln!(f, "Last Opcode: {:?}", opcode)?;
+        }
+        writeln!(f, "Stats: {:?}", self.stats)?;
+        Ok(())
+    }
+}
+
+pub fn execute_script(script: treepp::Script) -> ExecuteInfo {
+    let mut exec = Exec::new(
+        ExecCtx::Tapscript,
+        Options::default(),
+        TxTemplate {
+            tx: Transaction {
+                version: bitcoin::transaction::Version::TWO,
+                lock_time: bitcoin::locktime::absolute::LockTime::ZERO,
+                input: vec![],
+                output: vec![],
+            },
+            prevouts: vec![],
+            input_idx: 0,
+            taproot_annex_scriptleaf: Some((TapLeafHash::all_zeros(), None)),
+        },
+        script.compile(),
+        vec![],
+    )
+    .expect("error creating exec");
+
+    loop {
+        if exec.exec_next().is_err() {
+            break;
+        }
+    }
+    let res = exec.result().unwrap();
+    ExecuteInfo {
+        success: res.success,
+        error: res.error.clone(),
+        last_opcode: res.opcode,
+        final_stack: FmtStack(exec.stack().clone()),
+        remaining_script: exec.remaining_script().to_asm_string(),
+        stats: exec.stats().clone(),
+    }
+}
+
+/// Dry-runs a specific taproot input
+pub fn dry_run_taproot_input(
+    tx: &Transaction,
+    input_index: usize,
+    prevouts: &[TxOut],
+) -> ExecuteInfo {
+    let script = tx.input[input_index].witness.tapscript().unwrap();
+    let stack = {
+        let witness_items = tx.input[input_index].witness.to_vec();
+        let last = witness_items.last().unwrap();
+
+        // From BIP341:
+        // If there are at least two witness elements, and the first byte of
+        // the last element is 0x50, this last element is called annex a
+        // and is removed from the witness stack.
+        let script_index =
+            if witness_items.len() >= 3 && last.first() == Some(&TAPROOT_ANNEX_PREFIX) {
+                witness_items.len() - 3
+            } else {
+                witness_items.len() - 2
+            };
+
+        witness_items[0..script_index].to_vec()
+    };
+
+    let leaf_hash = TapLeafHash::from_script(
+        Script::from_bytes(script.as_bytes()),
+        LeafVersion::TapScript,
+    );
+
+    let mut exec = Exec::new(
+        ExecCtx::Tapscript,
+        Options::default(),
+        TxTemplate {
+            tx: tx.clone(),
+            prevouts: prevouts.into(),
+            input_idx: input_index,
+            taproot_annex_scriptleaf: Some((leaf_hash, None)),
+        },
+        ScriptBuf::from_bytes(script.to_bytes()),
+        stack,
+    )
+    .expect("error creating exec");
+
+    loop {
+        if exec.exec_next().is_err() {
+            break;
+        }
+    }
+    let res = exec.result().unwrap();
+    let info = ExecuteInfo {
+        success: res.success,
+        error: res.error.clone(),
+        last_opcode: res.opcode,
+        final_stack: FmtStack(exec.stack().clone()),
+        remaining_script: exec.remaining_script().to_asm_string(),
+        stats: exec.stats().clone(),
+    };
+
+    info
+}
+
+/// Dry-runs all taproot input scripts. Return Ok(()) if all scripts execute successfully,
+/// or Err((input_index, ExecuteInfo)) otherwise
+pub fn dry_run_taproots(tx: &Transaction, prevouts: &[TxOut]) -> Result<(), ExecuteInfo> {
+    let taproot_indices = prevouts
+        .iter()
+        .enumerate()
+        .filter(|(_, prevout)| prevout.script_pubkey.as_script().is_p2tr()) // only taproots
+        .filter(|(idx, _)| tx.input[*idx].witness.tapscript().is_some()) // only script path spends
+        .map(|(idx, _)| idx);
+
+    for taproot_index in taproot_indices {
+        let result = dry_run_taproot_input(tx, taproot_index, prevouts);
+        if !result.success {
+            return Err(result);
+        }
+    }
+
+    Ok(())
+}
+
+pub fn run(script: treepp::Script) {
+    // let stack = script.clone().analyze_stack();
+    // if !stack.is_valid_final_state_without_inputs() {
+    //     println!("Stack analysis does not end in valid state: {:?}", stack);
+    //     assert!(false);
+    // }
+    let exec_result = execute_script(script);
+    if !exec_result.success {
+        println!(
+            "ERROR: {:?} <--- \n STACK: {:4} ",
+            exec_result.last_opcode, exec_result.final_stack
+        );
+    }
+    //println!("Max_stack_items = {}", exec_result.stats.max_nb_stack_items);
+    assert!(exec_result.success);
+}
+
+// Execute a script on stack without `MAX_STACK_SIZE` limit.
+// This function is only used for script test, not for production.
+//
+// NOTE: Only for test purposes.
+pub fn execute_script_without_stack_limit(script: treepp::Script) -> ExecuteInfo {
+    // Get the default options for the script exec.
+    // Do not enforce the stack limit.
+    let opts = Options { enforce_stack_limit: false, ..Default::default() };
+
+    let mut exec = Exec::new(
+        ExecCtx::Tapscript,
+        opts,
+        TxTemplate {
+            tx: Transaction {
+                version: bitcoin::transaction::Version::TWO,
+                lock_time: bitcoin::locktime::absolute::LockTime::ZERO,
+                input: vec![],
+                output: vec![],
+            },
+            prevouts: vec![],
+            input_idx: 0,
+            taproot_annex_scriptleaf: Some((TapLeafHash::all_zeros(), None)),
+        },
+        script.compile(),
+        vec![],
+    )
+    .expect("error creating exec");
+
+    loop {
+        if exec.exec_next().is_err() {
+            break;
+        }
+    }
+    let res = exec.result().unwrap();
+    ExecuteInfo {
+        success: res.success,
+        error: res.error.clone(),
+        last_opcode: res.opcode,
+        final_stack: FmtStack(exec.stack().clone()),
+        remaining_script: exec.remaining_script().to_asm_string(),
+        stats: exec.stats().clone(),
+    }
+}
+
+pub fn execute_raw_script_with_inputs(script: Vec<u8>, witness: Vec<Vec<u8>>) -> ExecuteInfo {
+    // Get the default options for the script exec.
+    // Do not enforce the stack limit.
+    let opts = Options { enforce_stack_limit: false, ..Default::default() };
+
+    let mut exec = Exec::new(
+        ExecCtx::Tapscript,
+        opts,
+        TxTemplate {
+            tx: Transaction {
+                version: bitcoin::transaction::Version::TWO,
+                lock_time: bitcoin::locktime::absolute::LockTime::ZERO,
+                input: vec![],
+                output: vec![],
+            },
+            prevouts: vec![],
+            input_idx: 0,
+            taproot_annex_scriptleaf: Some((TapLeafHash::all_zeros(), None)),
+        },
+        ScriptBuf::from_bytes(script),
+        witness,
+    )
+    .expect("error creating exec");
+
+    loop {
+        let temp_res = exec.exec_next();
+        match temp_res {
+            Ok(()) => (),
+            Err(err) => {
+                if !err.success {
+                    // println!("temp_res: {:?}", temp_res);
+                }
+                break;
+            }
+        }
+    }
+
+    let res = exec.result().unwrap();
+    let execute_info = ExecuteInfo {
+        success: res.success,
+        error: res.error.clone(),
+        last_opcode: res.opcode,
+        final_stack: FmtStack(exec.stack().clone()),
+        // alt_stack: FmtStack(exec.altstack().clone()),
+        remaining_script: exec.remaining_script().to_owned().to_asm_string(),
+        stats: exec.stats().clone(),
+    };
+
+    execute_info
+}
+
+pub fn execute_script_with_inputs(script: treepp::Script, witness: Vec<Vec<u8>>) -> ExecuteInfo {
+    execute_raw_script_with_inputs(script.compile().to_bytes(), witness)
+}
+
+#[cfg(test)]
+mod test {
+    use crate::bn254;
+    use crate::bn254::fp254impl::Fp254Impl;
+
+    use super::execute_script_without_stack_limit;
+    use super::treepp::*;
+
+    #[test]
+    fn test_script_debug() {
+        let script = script! {
+            OP_TRUE
+            DEBUG
+            OP_TRUE
+            OP_VERIFY
+        };
+        let exec_result = execute_script(script);
+        assert!(!exec_result.success);
+    }
+
+    #[test]
+    fn test_script_execute() {
+        let script = script! {
+            for i in 0..36 {
+                { 0x0babe123 + i }
+            }
+        };
+        let exec_result = execute_script(script);
+        // The width decides how many stack elements are printed per row
+        println!(
+            "{:width$}",
+            exec_result,
+            width = bn254::fq::Fq::N_LIMBS as usize
+        );
+        println!("{:4}", exec_result);
+        println!("{}", exec_result);
+        assert!(!exec_result.success);
+        assert_eq!(exec_result.error, None);
+    }
+
+    #[test]
+    fn test_execute_script_without_stack_limit() {
+        let script = script! {
+            for _ in 0..1001 {
+                OP_1
+            }
+            for _ in 0..1001 {
+                OP_DROP
+            }
+            OP_1
+        };
+        let exec_result = execute_script_without_stack_limit(script);
+        assert!(exec_result.success);
+    }
+}
diff --git a/src/pseudo.rs b/bitvm/src/pseudo.rs
similarity index 100%
rename from src/pseudo.rs
rename to bitvm/src/pseudo.rs
diff --git a/bitvm/src/signatures/mod.rs b/bitvm/src/signatures/mod.rs
new file mode 100644
index 000000000..ede82775c
--- /dev/null
+++ b/bitvm/src/signatures/mod.rs
@@ -0,0 +1,5 @@
+pub mod winternitz;
+pub mod winternitz_hash;
+pub mod utils;
+pub mod signing_winternitz;
+pub mod wots_api;
\ No newline at end of file
diff --git a/bitvm/src/signatures/signing_winternitz.rs b/bitvm/src/signatures/signing_winternitz.rs
new file mode 100644
index 000000000..fbdfbfd84
--- /dev/null
+++ b/bitvm/src/signatures/signing_winternitz.rs
@@ -0,0 +1,291 @@
+use bitcoin::Witness;
+use serde::{Deserialize, Serialize};
+
+use crate::signatures::winternitz_hash::WINTERNITZ_VARIABLE_VERIFIER;
+use crate::treepp::{script, Script};
+use crate::{
+    signatures::{
+        winternitz::{generate_public_key, Parameters, PublicKey, SecretKey},
+        winternitz_hash::{sign_hash, WINTERNITZ_MESSAGE_VERIFIER},
+    },
+    u32::u32_std::u32_compress,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Hash, Clone)]
+pub struct WinternitzSecret {
+    pub secret_key: SecretKey,
+    parameters: Parameters,
+}
+
+// Bits per digit (block)
+pub const LOG_D: u32 = 4;
+
+impl WinternitzSecret {
+    /// Generate a random 160 bit number and return a hex encoded representation of it.
+    pub fn new(message_size: usize) -> Self {
+        let mut buffer = [0u8; 20];
+        let mut rng = rand::rngs::OsRng;
+        rand::RngCore::fill_bytes(&mut rng, &mut buffer);
+
+        // Best parameters depend on the stack depth, without that limitation best option is LOG_D = 4 and used Winternitz version here
+        //let parameters = WINTERNITZ_HASH_PARAMETERS;
+        let parameters = Parameters::new_by_bit_length(message_size as u32 * 8, LOG_D);
+        WinternitzSecret {
+            secret_key: hex::encode(buffer).into(),
+            parameters,
+        }
+    }
+
+    pub fn from_string(secret: &str, parameters: &Parameters) -> Self {
+        WinternitzSecret {
+            secret_key: hex::encode(secret.as_bytes()).into(),
+            parameters: parameters.clone(),
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Hash, Clone)]
+pub struct WinternitzPublicKey {
+    pub public_key: PublicKey,
+    pub parameters: Parameters,
+}
+
+impl From<&WinternitzSecret> for WinternitzPublicKey {
+    fn from(secret: &WinternitzSecret) -> Self {
+        WinternitzPublicKey {
+            public_key: generate_public_key(&secret.parameters, &secret.secret_key),
+            parameters: secret.parameters.clone(),
+        }
+    }
+}
+
+pub struct WinternitzSigningInputs<'a, 'b> {
+    pub message: &'a [u8],
+    pub signing_key: &'b WinternitzSecret,
+}
+
+pub fn generate_winternitz_checksig_leave_hash(
+    public_key: &WinternitzPublicKey,
+    message_size: usize,
+) -> Script {
+    script! {
+        {WINTERNITZ_VARIABLE_VERIFIER.checksig_verify(&public_key.parameters, &public_key.public_key)}
+        for i in 1..message_size {
+            {i} OP_ROLL
+        }
+    }
+}
+
+pub fn generate_winternitz_checksig_leave_variable(
+    public_key: &WinternitzPublicKey,
+    message_size: usize,
+) -> Script {
+    assert_eq!(message_size % 4, 0, "message should be u32s");
+    let u32s_size = message_size / 4;
+    script! {
+        {WINTERNITZ_VARIABLE_VERIFIER.checksig_verify(&public_key.parameters, &public_key.public_key)}
+        for _ in 0..u32s_size {
+            {u32_compress()}
+            OP_TOALTSTACK
+        }
+        for _ in 0..u32s_size {
+            OP_FROMALTSTACK
+        }
+        for i in 1..u32s_size {
+            {i} OP_ROLL
+        }
+    }
+}
+
+pub fn generate_winternitz_hash_witness(signing_inputs: &WinternitzSigningInputs) -> Witness {
+    sign_hash(
+        &signing_inputs.signing_key.secret_key,
+        signing_inputs.message,
+    )
+}
+
+pub fn generate_winternitz_witness(signing_inputs: &WinternitzSigningInputs) -> Witness {
+    WINTERNITZ_MESSAGE_VERIFIER.sign(
+        &signing_inputs.signing_key.parameters,
+        &signing_inputs.signing_key.secret_key,
+        &signing_inputs.message.to_vec(),
+    )
+}
+
+pub fn winternitz_message_checksig(public_key: &WinternitzPublicKey) -> Script {
+    WINTERNITZ_MESSAGE_VERIFIER.checksig_verify(&public_key.parameters, &public_key.public_key)
+}
+
+pub fn winternitz_message_checksig_verify(
+    public_key: &WinternitzPublicKey,
+    message_size: usize,
+) -> Script {
+    script! {
+        { WINTERNITZ_MESSAGE_VERIFIER.checksig_verify(&public_key.parameters, &public_key.public_key) }
+        // TODO(LucidLuckylee): Instead of using OP_DROP use a Winternitz Verifier that consumes
+        // the message
+        for _ in 0..message_size {
+            OP_DROP
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use super::{WinternitzPublicKey, WinternitzSecret};
+    use crate::{execute_script_with_inputs, ExecuteInfo};
+    use crate::{
+        bn254::g1::G1Affine,
+        execute_script,
+        signatures::{utils::digits_to_number, winternitz::generate_public_key},
+    };
+    use ark_ff::UniformRand as _;
+    use ark_std::test_rng;
+    use bitcoin::script::read_scriptint;
+    use bitcoin_script::script;
+    use rand::{RngCore as _, SeedableRng as _};
+
+    const BLAKE3_HASH_LENGTH: usize = crate::hash::blake3_u32::N_DIGEST_U32_LIMBS as usize * 4;
+
+    fn extract_witness_from_stack(res: ExecuteInfo) -> Vec<Vec<u8>> {
+        res.final_stack.0.iter_str().fold(vec![], |mut vector, x| {
+            vector.push(x);
+            vector
+        })
+    }
+
+    /// Compare two elements of n length.
+    /// If them are not equal, return script's failure directly.
+    pub fn equalverify(n: usize) -> Script {
+        script!(
+            for _ in 0..n {
+                OP_TOALTSTACK
+            }
+
+            for i in 1..n {
+                {i}
+                OP_ROLL
+            }
+
+            for _ in 0..n {
+                OP_FROMALTSTACK
+                OP_EQUALVERIFY
+            }
+        )
+    }
+
+    pub fn u32_witness_to_bytes(witness: Vec<Vec<u8>>) -> Vec<u8> {
+        let mut bytes = vec![];
+        for element in witness.iter() {
+            let limb = read_scriptint(element).unwrap() as u32;
+            bytes.append(&mut limb.to_le_bytes().to_vec());
+        }
+        bytes
+    }
+    
+
+    #[test]
+    fn test_signing_winternitz_with_message_success() {
+        let secret = WinternitzSecret::new(4);
+        let public_key = WinternitzPublicKey::from(&secret);
+        let start_time_block_number = 860033_u32;
+
+        let s = script! {
+          { generate_winternitz_witness(
+            &WinternitzSigningInputs {
+              message: &start_time_block_number.to_le_bytes(),
+              signing_key: &secret,
+          },
+          ).to_vec() }
+          { winternitz_message_checksig(&public_key) }
+          { digits_to_number::<{ 4 * 2}, { LOG_D as usize }>() }
+          { start_time_block_number }
+          OP_EQUAL
+        };
+
+        let result = execute_script(s);
+
+        assert!(result.success);
+    }
+
+    #[test]
+    fn test_generate_winternitz_secret_length() {
+        // Uses an arbitrary message size of 1
+        let secret = WinternitzSecret::new(1);
+        assert_eq!(
+            secret.secret_key.len(),
+            40,
+            "Secret: {0:?}",
+            secret.secret_key
+        );
+    }
+
+    #[test]
+    fn test_winternitz_public_key_from_secret() {
+        let secret = WinternitzSecret::new(BLAKE3_HASH_LENGTH);
+        let public_key = WinternitzPublicKey::from(&secret);
+        let reference_public_key = generate_public_key(&secret.parameters, &secret.secret_key);
+
+        for i in 0..secret.parameters.total_length() {
+            assert_eq!(
+                public_key.public_key[i as usize],
+                reference_public_key[i as usize]
+            );
+        }
+    }
+
+    #[test]
+    fn test_winternitz_public_key_from_secret_length() {
+        let secret = WinternitzSecret::new(BLAKE3_HASH_LENGTH);
+        let public_key = WinternitzPublicKey::from(&secret);
+
+        assert_eq!(
+            public_key.public_key.len(),
+            public_key.parameters.total_length() as usize
+        );
+        for i in 0..public_key.parameters.total_length() {
+            assert_eq!(
+                public_key.public_key[i as usize].len(),
+                20,
+                "public_key[{}]: {:?}",
+                i,
+                public_key.public_key[i as usize]
+            );
+        }
+    }
+
+    #[test]
+    fn test_recover_g1_point_on_stack() {
+        let g1_point_bytes_length = 9 * 4 * 2; // two fq element
+        let secret = WinternitzSecret::new(g1_point_bytes_length);
+        let public_key = WinternitzPublicKey::from(&secret);
+
+        // random g1 point
+        let mut rng = ark_std::rand::rngs::StdRng::seed_from_u64(test_rng().next_u64());
+        let random_g1_point = ark_bn254::G1Affine::rand(&mut rng);
+
+        let res = execute_script(script! {
+            {G1Affine::push(random_g1_point.clone())}
+        });
+        let g1_to_bytes = u32_witness_to_bytes(extract_witness_from_stack(res));
+        println!("g1_to_bytes: {:?}", g1_to_bytes);
+
+        let witness = generate_winternitz_witness(&WinternitzSigningInputs {
+            message: &g1_to_bytes,
+            signing_key: &secret,
+        });
+
+        let s = script! {
+            { generate_winternitz_checksig_leave_variable(&public_key, g1_point_bytes_length) }
+            {G1Affine::push(random_g1_point)}
+            {equalverify(g1_point_bytes_length / 4)}
+            OP_TRUE
+        };
+
+        let result = execute_script_with_inputs(s, witness.to_vec());
+
+        println!("result: {:?}", result);
+        assert!(result.success);
+    }
+}
diff --git a/bitvm/src/signatures/utils.rs b/bitvm/src/signatures/utils.rs
new file mode 100644
index 000000000..d8437a35e
--- /dev/null
+++ b/bitvm/src/signatures/utils.rs
@@ -0,0 +1,91 @@
+use crate::treepp::*;
+
+/// Calculates ceil(log_base(n))
+pub(super) const fn log_base_ceil(n: u32, base: u32) -> u32 { 
+    let mut res: u32 = 0;
+    let mut cur: u64 = 1;
+    while cur < (n as u64) {
+        cur *= base as u64;
+        res += 1;
+    }
+    res
+}
+
+/// Converts the number to given base, smallest digit being at the start (returns `digit_count` smallest digits of it, and standard base representation of it if `digit_count` = -1)
+pub(super) fn to_digits(mut number: u32, base: u32, digit_count: i32) -> Vec<u32> {
+    let mut digits = Vec::new();
+    if digit_count == -1 {
+        while number > 0 {
+            let digit = number % base;
+            number = (number - digit) / base;
+            digits.push(digit);
+        }   
+    } else {
+        digits.reserve(digit_count as usize);
+        for _ in 0..digit_count {
+            let digit = number % base;
+            number = (number - digit) / base;
+            digits.push(digit);
+        }
+    }
+    digits
+}
+
+/// Converts the given bytes to 'len' `u32`'s, each consisting of given number of bits
+pub(crate) fn bytes_to_u32s(len: u32, bits_per_item: u32, bytes: &Vec<u8>) -> Vec<u32> {
+    assert!(bytes.len() as u32 * 8 <= len * bits_per_item, "Message length is too large for the given length"); 
+    let mut res = vec![0u32; len as usize];
+    let mut cur_index: u32 = 0;
+    let mut cur_bit: u32 = 0;
+    for byte in bytes {
+        let mut x: u8 = *byte;
+        for _ in 0..8 {
+            if cur_bit == bits_per_item {
+                cur_bit = 0;
+                cur_index += 1;
+            }
+            res[cur_index as usize] |= ((x & 1) as u32) << cur_bit;
+            x >>= 1;
+            cur_bit += 1;
+        }
+    }
+    res
+}
+
+/// Merges (binary concatenates) the `DIGIT_COUNT` stack elements (each consisting of `LOG_D` bits), most significant one being at the top
+pub fn digits_to_number<const DIGIT_COUNT: usize, const LOG_D: usize>() -> Script {
+  script!(
+      for _ in 0..DIGIT_COUNT - 1 {
+        OP_TOALTSTACK
+      }
+      for _ in 0..DIGIT_COUNT - 1 {
+          for _ in 0..LOG_D {
+              OP_DUP OP_ADD
+          }
+          OP_FROMALTSTACK
+          OP_ADD
+      }
+  )
+}
+
+/// Converts number to vector of bytes and removes trailing zeroes
+pub fn u32_to_le_bytes_minimal(a: u32) -> Vec<u8> {
+    let mut a_bytes = a.to_le_bytes().to_vec();
+    while let Some(&0) = a_bytes.last() {
+        a_bytes.pop(); // Remove trailing zeros
+    }
+    a_bytes
+}
+
+#[cfg(test)]
+mod test {
+    use super::u32_to_le_bytes_minimal;
+
+    #[test]
+    fn test_u32_to_bytes_minimal() {
+        let a = 0xfe00u32;
+        let a_bytes = u32_to_le_bytes_minimal(a);
+
+        assert_eq!(a_bytes, vec![0x00u8, 0xfeu8]);
+    }
+}
diff --git a/bitvm/src/signatures/winternitz.rs b/bitvm/src/signatures/winternitz.rs
new file mode 100644
index 000000000..39465914e
--- /dev/null
+++ b/bitvm/src/signatures/winternitz.rs
@@ -0,0 +1,721 @@
+use super::utils::*;
+use crate::treepp::*;
+use bitcoin::{hashes::{hash160, Hash}, Witness};
+use serde::{Deserialize, Serialize};
+use std::marker::PhantomData;
+
+type HashOut = [u8; 20];
+pub type PublicKey = Vec<HashOut>;
+pub type SecretKey = Vec<u8>;
+
+/// Contains the parameters to use with `Winternitz` struct
+#[derive(Serialize, Deserialize, Eq, PartialEq, Hash, Clone)]
+pub struct Parameters {
+    /// Number of blocks of the actual message 
+    message_length: u32,
+    /// Number of bits in one block
+    block_length: u32,
+    /// Number of blocks of the checksum part 
+    checksum_length: u32
+}
+
+impl Parameters {
+    /// Creates parameters with given message length (number of blocks in the message) and block length (number of bits in one block, in the closed range 4, 8)
+    pub const fn new(message_block_count: u32, block_length: u32) -> Self {
+        assert!(
+            4 <= block_length && block_length <= 8,
+            "You can only choose block lengths in the range [4, 8]"
+        );
+        Parameters {
+            message_length: message_block_count,
+            block_length: block_length,
+            checksum_length: log_base_ceil(((1 << block_length) - 1) * message_block_count, 1 << block_length) + 1,
+        }
+    }
+
+    /// Creates parameters with given message_length (number of bits in the message) and block length (number of bits in one block, in the closed range 4, 8)
+    pub const fn new_by_bit_length(number_of_bits: u32, block_length: u32) -> Self {
+        assert!(
+            4 <= block_length && block_length <= 8,
+            "You can only choose block lengths in the range [4, 8]"
+        );
+        let message_block_count = (number_of_bits + block_length - 1) / block_length;
+        Parameters {
+            message_length: message_block_count,
+            block_length: block_length,
+            checksum_length: log_base_ceil(((1 << block_length) - 1) * message_block_count, 1 << block_length) + 1,
+        }
+    }
+
+    /// Maximum value of a digit
+    fn d(&self) -> u32 {
+        (1 << self.block_length) - 1
+    }
+
+    /// Number of bytes that can be represented at maximum with the parameters
+    fn byte_message_length(&self) -> u32 {
+        (self.message_length * self.block_length + 7) / 8
+    }
+
+    /// Total number of blocks, i.e. sum of the number of blocks in the actual message and the checksum
+    pub fn total_length(&self) -> u32 {
+        self.message_length + self.checksum_length
+    }
+}
+
+
+/// Returns the signature of a given digit (block), requires the digit index to modify the secret key for each digit 
+pub fn digit_signature(secret_key: &SecretKey, digit_index: u32, message_digit: u32) -> HashOut {
+    let mut secret_i = secret_key.clone();
+    secret_i.push(digit_index as u8);
+    let mut hash = hash160::Hash::hash(&secret_i);
+    for _ in 0..message_digit {
+        hash = hash160::Hash::hash(&hash[..]);
+    }
+    *hash.as_byte_array()
+}
+
+/// Returns the public key of a given digit (block), requires the digit index to modify the secret key for each digit 
+fn public_key_for_digit(ps: &Parameters, secret_key: &SecretKey, digit_index: u32) -> HashOut {
+    digit_signature(secret_key, digit_index, ps.d())
+}
+
+/// Returns the public key for the given secret key and the parameters
+pub fn generate_public_key(ps: &Parameters, secret_key: &SecretKey) -> PublicKey {
+    let mut public_key = PublicKey::with_capacity(ps.total_length() as usize);
+    for i in 0..ps.total_length() {
+        public_key.push(public_key_for_digit(ps, secret_key, i));
+    }
+    public_key
+}
+
+/// Checksum of the message (negated sum of the digits)
+fn checksum(ps: &Parameters, digits: Vec<u32>) -> u32 {
+    let mut sum = 0;
+    for digit in digits {
+        sum += digit;
+    }
+    ps.d() * ps.message_length - sum
+}
+
+/// Appends checksum to the given message (digits), and reverses the whole message (with checksum) for the ease of usage in the bitcoin script
+fn add_message_checksum(ps: &Parameters, mut digits: Vec<u32>) -> Vec<u32> {
+    let mut checksum_digits = to_digits(checksum(ps, digits.clone()), ps.d() + 1, ps.checksum_length as i32);
+    checksum_digits.append(&mut digits);
+    checksum_digits.reverse();
+    checksum_digits
+}
+
+/// This trait covers 3 verifiers for the signing and verifying phase of the signatures: `ListpickVerifier`, `BruteforceVerifier`, `BinarysearchVerifier`
+pub trait Verifier {
+    /// Default digit signatures for `ListpickVerifier` and `BinarysearchVerifier`, in the format: hash_{n - 1}, digit_{n - 1}, hash_{n - 2}, digit_{n - 2} ... hash_0, digit_0
+    fn sign_digits(ps: &Parameters, secret_key: &SecretKey, digits: Vec<u32>) -> Witness {
+        let digits = add_message_checksum(ps, digits);
+        let mut result = Witness::new();
+        for i in 0..ps.total_length() {
+            let sig = digit_signature(secret_key, i, digits[i as usize]);
+            result.push(sig.to_vec());
+            result.push(u32_to_le_bytes_minimal(digits[i as usize]));
+        }
+        result
+    }
+    fn verify_digits(ps: &Parameters, public_key: &PublicKey) -> Script;
+}
+
+/// This trait covers 2 converters for converting the final message (which is left in the form of blocks): `VoidConverter`, `ToBytesConverter`
+pub trait Converter {
+    /// Wrapper for converter functions 
+    fn get_script(ps: &Parameters) -> Script;
+    /// Length of the final message
+    fn length_of_final_message(ps: &Parameters) -> u32;
+}
+/// Winternitz struct to used for its operations \
+/// Sample Usage:
+/// - Pick the algorithms you want to use, i.e. `BinarysearchVerifier` and `ToBytesConverter`
+/// - Construct your struct: `let o = Winternitz::<BinarysearchVerifier, ToBytesConverter>::new()`
+/// - Identify your message parameters:` let p = Parameters::new(message_block_count, block_length)` or `let p = Parameters::new_by_bit_length(number_of_bits_of_the_message, block_length)`
+/// - Use the methods for the necessary operations, for example: `o.sign(&p, ...)`, `o.checksig_verify(&p, ...)`, `o.checksig_verify_remove_message(&p, ...)`
+pub struct Winternitz<VERIFIER: Verifier, CONVERTER: Converter> {
+    phantom0: PhantomData<VERIFIER>, 
+    phantom1: PhantomData<CONVERTER>,
+}
+
+impl<VERIFIER: Verifier, CONVERTER: Converter> Default for Winternitz<VERIFIER, CONVERTER> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+/// Implementation of the default functions regardless of the algorithms that are chosen
+impl<VERIFIER: Verifier, CONVERTER: Converter> Winternitz<VERIFIER, CONVERTER> {
+    pub const fn new() -> Self {
+        Winternitz {
+            phantom0: PhantomData,
+            phantom1: PhantomData,
+        }
+    }
+
+    /// Wrapper to sign the digits
+    pub fn sign_digits(&self, ps: &Parameters, secret_key: &SecretKey, digits: Vec<u32>) -> Witness {
+        VERIFIER::sign_digits(ps, secret_key, digits)
+    }
+
+    /// Wrapper to sign the message in bytes (converts to digits inside)
+    pub fn sign(&self, ps: &Parameters, secret_key: &SecretKey, message_bytes: &Vec<u8>) -> Witness {
+        VERIFIER::sign_digits(
+            ps,
+            secret_key,
+            bytes_to_u32s(ps.message_length, ps.block_length, message_bytes),
+        )
+    }
+
+    /// Expects the signature in the format of the used verification algorithm, start of the message being on the top and checksum being at the bottom, and verifies if the given signature is accurate leaving digits of the message on the stack start of it being on top
+    pub fn checksig_verify(&self, ps: &Parameters, public_key: &PublicKey) -> Script {
+        script! {
+            { VERIFIER::verify_digits(ps, public_key) }
+            { self.verify_checksum(ps) }
+            { CONVERTER::get_script(ps) }
+        }
+    }
+
+    /// Expects the signature in the format of the used verification algorithm, start of the message being on the top and checksum being at the bottom, and verifies if the given signature is accurate without leaving any trace on stack
+    pub fn checksig_verify_and_clear_stack(&self, ps: &Parameters, public_key: &PublicKey) -> Script {
+        script! {
+            { VERIFIER::verify_digits(ps, public_key) }
+            { self.verify_checksum(ps) }
+            { CONVERTER::get_script(ps) }
+            for _ in 0..(CONVERTER::length_of_final_message(ps) / 2) {
+                OP_2DROP
+            }
+            if CONVERTER::length_of_final_message(ps) % 2 == 1 {
+                OP_DROP
+            }
+        }
+    }
+
+    /// Verifies the checksum after the whole message is verified, expects the digits of the whole message at the alt stack, the first element of the message being at the bottom. \
+    /// Removes the checksum digits and leaves the actual message on stack
+    fn verify_checksum(&self, ps: &Parameters) -> Script {
+        script! {
+            OP_FROMALTSTACK OP_DUP OP_NEGATE 
+            for _ in 1..ps.message_length {
+                OP_FROMALTSTACK OP_TUCK OP_SUB // sum the digits and tuck them before the sum so they are stored for later
+            }
+            { ps.d() * ps.message_length }
+            OP_ADD
+            OP_FROMALTSTACK
+            for _ in 0..ps.checksum_length - 1 {
+                for _ in 0..ps.block_length {
+                    OP_DUP OP_ADD
+                }
+                OP_FROMALTSTACK
+                OP_ADD
+            }
+            OP_EQUALVERIFY
+        }
+    }
+}
+
+
+
+/// - Verification Algorithm: Generates hashes for each possible value and then uses `OP_PICK` to get the corresponding one from the created list. \
+///   As a small improvement, it also divides the length of the list by 2 in the start 
+/// - Signature format: hash_{n - 1}, digit_{n - 1}, hash_{n - 2}, digit_{n - 2} ... hash_0, digit_0 (With digits) 
+/// - Approximate Max Stack Depth Used During Verification: 2 * `total_length()` + (2 ^ `block_length`)/2   
+pub struct ListpickVerifier {}
+impl Verifier for ListpickVerifier {
+    /// Expects the signature in the verifier's format, checks and verifies if the given signature is accurate with the given public key, leaving the message (with checksum) on the stack in given order
+    fn verify_digits(ps: &Parameters, public_key: &PublicKey) -> Script {
+        script! {
+            for digit_index in 0..ps.total_length() {
+                // See https://github.com/BitVM/BitVM/issues/35
+                { ps.d() }
+                OP_MIN
+                OP_DUP
+                OP_TOALTSTACK
+                { (ps.d() + 1) / 2 }
+                OP_2DUP
+                OP_LESSTHAN
+                OP_IF
+                    OP_DROP
+                    OP_TOALTSTACK
+                    for _ in 0..(ps.d() + 1) / 2  {
+                        OP_HASH160
+                    }
+                OP_ELSE
+                    OP_SUB
+                    OP_TOALTSTACK
+                OP_ENDIF
+                for _ in 0..ps.d()/2 {
+                    OP_DUP OP_HASH160
+                }
+                OP_FROMALTSTACK
+                OP_PICK
+                { (public_key[ps.total_length() as usize - 1 - digit_index as usize]).to_vec() }
+                OP_EQUALVERIFY
+                for _ in 0..(ps.d() + 1) / 4 {
+                    OP_2DROP
+                }
+            }
+        }
+    }
+}
+/// - Verification Algorithm: Tries each possible digit value
+/// - Signature Format: hash_{n - 1}, hash_{n - 2} ... hash_0 (Without digits)
+/// - Approximate Max Stack Depth Used During Verification: `total_length()`
+pub struct BruteforceVerifier {}
+impl Verifier for BruteforceVerifier {
+    /// Signature in the verifier's format
+    fn sign_digits(ps: &Parameters, secret_key: &SecretKey, digits: Vec<u32>) -> Witness {
+        let digits = add_message_checksum(ps, digits);
+        let mut result = Witness::new();
+        for i in 0..ps.total_length() {
+            let sig = digit_signature(secret_key, i, digits[i as usize]);
+            result.push(sig.to_vec());
+        }
+        result
+    }
+    /// Expects the signature in the verifier's format, checks and verifies if the given signature is accurate with the given public key, leaving the message (with checksum) on the stack in given order
+    fn verify_digits(ps: &Parameters, public_key: &PublicKey) -> Script {
+        script! {
+            for digit_index in 0..ps.total_length() {
+                { public_key[(ps.total_length() - 1 - digit_index) as usize].to_vec() }
+                OP_SWAP
+                { -1 } OP_TOALTSTACK // To avoid illegal stack acces, same -1 is checked later 
+                OP_2DUP
+                OP_EQUAL
+                OP_IF
+                    {ps.d()}
+                    OP_TOALTSTACK
+                OP_ENDIF
+                for i in 0..ps.d() {
+                    OP_HASH160
+                    OP_2DUP
+                    OP_EQUAL
+                    OP_IF
+                        { ps.d() - i - 1 }
+                        OP_TOALTSTACK
+                    OP_ENDIF
+                }
+                OP_2DROP
+                OP_FROMALTSTACK
+                OP_DUP
+                { -1 }
+                OP_NUMNOTEQUAL OP_VERIFY
+                OP_FROMALTSTACK OP_DROP
+                OP_TOALTSTACK
+            }
+        }
+    }
+}
+
+
+/// - Verification Algorithm: Simulates a for loop of hashing using binary search on the digit
+/// - Signature Format: hash_{n - 1}, digit_{n - 1}, hash_{n - 2}, digit_{n - 2} ... hash_0, digit_0 (With digits)
+/// - Approximate Max Stack Depth Used During Verification: 2 * `total_length()`
+pub struct BinarysearchVerifier {}
+impl Verifier for BinarysearchVerifier {
+    /// Expects the signature in the verifier's format, checks and verifies if the given signature is accurate with the given public key, leaving the message (with checksum) on the stack in given order
+    fn verify_digits(ps: &Parameters, public_key: &PublicKey) -> Script {
+        script! {
+            for digit_index in 0..ps.total_length() {
+                //one can send digits out of the range, i.e. negative or bigger than D for it to act as in range, so inorder for checksum to not be decreased, a lower bound check is necessary and enough
+                OP_0
+                OP_MAX
+                OP_DUP
+                OP_TOALTSTACK
+                { ps.d() } OP_SWAP OP_SUB
+                for bit in (0..ps.block_length).rev() {
+                    if bit != 0 {
+                        {1 << bit}
+                        OP_2DUP
+                        OP_GREATERTHANOREQUAL
+                        OP_IF
+                            OP_SUB
+                            OP_SWAP
+                            for _ in 0..(1 << bit) {
+                                OP_HASH160
+                            }
+                            OP_SWAP
+                            OP_DUP
+                        OP_ENDIF
+                        OP_DROP
+                    } else {
+                        OP_IF
+                            OP_HASH160
+                        OP_ENDIF
+                    }
+                }
+                { (public_key[(ps.total_length() - 1 - digit_index) as usize]).to_vec() }
+                OP_EQUALVERIFY
+            }
+        }
+    }
+}
+
+/// Does nothing, leaving each stack each element as a block from Winternitz
+pub struct VoidConverter {}
+impl Converter for VoidConverter {
+    fn length_of_final_message(ps: &Parameters) -> u32 {
+        return ps.message_length;
+    }
+    fn get_script(ps: &Parameters) -> Script {
+        let _ = ps;
+        script! {}
+    }
+}
+
+/// Alters message (divides it into 8 bit pieces), leaving each stack each element as a byte
+pub struct ToBytesConverter {}
+impl Converter for ToBytesConverter {
+    fn length_of_final_message(ps: &Parameters) -> u32 {
+        return ps.byte_message_length();
+    }
+    fn get_script(ps: &Parameters) -> Script {
+        let mut turning_into_bytes = script! {};
+        if ps.block_length == 8 {
+            //already bytes
+            turning_into_bytes = script! {};
+        } else if ps.block_length == 4 {
+            turning_into_bytes = script! {
+                for i in 0..ps.message_length / 2 {
+                    OP_SWAP
+                    for _ in 0..ps.block_length {
+                        OP_DUP OP_ADD
+                    }
+                    OP_ADD
+                    if i != (ps.message_length/2) - 1 {
+                        OP_TOALTSTACK
+                    }
+                }
+                if ps.message_length > 1 {
+                    for _ in 0..ps.message_length / 2 - 1{
+                        OP_FROMALTSTACK
+                    }
+                }
+            };
+        } else {
+            let mut lens: Vec<u32> = vec![];
+            let mut script_lines: Vec<Script> = vec![];
+            for i in 0..ps.message_length {
+                let start = i * ps.block_length;
+                let next_stop = start + 8 - (start % 8);
+                let split = next_stop - start;
+                if split >= ps.block_length {
+                    lens.push(ps.block_length);
+                    script_lines.push(script! {
+                        OP_TOALTSTACK
+                    });
+                } else {
+                    lens.push(split);
+                    lens.push(ps.block_length - split);
+                    script_lines.push(script! {
+                        OP_0
+                        for j in (split..ps.block_length).rev() {
+                            if j != ps.block_length - 1 {
+                                OP_DUP OP_ADD
+                            }
+                            OP_SWAP
+                            {1 << j}
+                            OP_2DUP
+                            OP_GREATERTHANOREQUAL
+                            OP_IF
+                                OP_SUB
+                                OP_SWAP
+                                OP_1ADD
+                                OP_SWAP
+                                OP_DUP
+                            OP_ENDIF
+                            OP_DROP
+                            OP_SWAP
+                        }
+                        OP_SWAP
+                        OP_TOALTSTACK
+                        OP_TOALTSTACK
+                    });
+                }
+            }
+            lens.reverse();
+            let mut last_bytes = (8 - (ps.message_length * ps.block_length % 8)) % 8;
+            let mut is_last_zero = true;
+            script_lines.push(script! {
+                OP_0
+            });
+            for l in lens {
+                if last_bytes >= 8 {
+                    last_bytes = 0;
+                    script_lines.push(script! {
+                        OP_0
+                    });
+                    is_last_zero = true;
+                }
+                if !is_last_zero {
+                    script_lines.push(script! {
+                        for _ in 0..l {
+                            OP_DUP OP_ADD
+                        }
+                    });
+                }
+                is_last_zero = false;
+                script_lines.push(script! {
+                    OP_FROMALTSTACK
+                    OP_ADD
+                });
+                last_bytes += l;
+            }
+
+            for script_line in script_lines {
+                turning_into_bytes = turning_into_bytes.push_script(script_line.compile());
+            }
+        }
+        turning_into_bytes
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use rand::{Rng, SeedableRng};
+    use rand_chacha::ChaCha20Rng;
+    use std::sync::{LazyLock, Mutex};
+    static MALICIOUS_RNG: LazyLock<Mutex<ChaCha20Rng>> =
+        LazyLock::new(|| Mutex::new(ChaCha20Rng::seed_from_u64(337)));
+
+    const SAMPLE_SECRET_KEY: &str = "b138982ce17ac813d505b5b40b665d404e9528e7";
+    const TEST_COUNT: u32 = 20;
+
+    fn get_type_name<T>() -> String {
+        let full_type_name = std::any::type_name::<T>();
+        let res = full_type_name.split("::").last().unwrap_or(full_type_name);
+        res.to_string()
+    }
+
+    // This test is not extensive and definitely misses corner cases
+    fn try_malicious(ps: &Parameters, _message: &Vec<u8>, verifier: &str) -> Script {
+        let mut rng = MALICIOUS_RNG.lock().unwrap();
+        let ind = rng.gen_range(0..ps.total_length());
+        if verifier == get_type_name::<BruteforceVerifier>() {
+            script! {
+                for _ in 0..ind {
+                    OP_TOALTSTACK
+                }
+                for _ in 0..(rng.gen_range(1..20)) {
+                    OP_HASH160
+                }                for _ in 0..ind {
+                    OP_FROMALTSTACK
+                }
+            }
+        } else {
+            let type_of_action = rng.gen_range(0..2);
+            script! {
+                for _ in 0..ind {
+                    OP_TOALTSTACK OP_TOALTSTACK
+                }
+                if type_of_action == 0 {
+                    OP_DROP {-1}
+                } else {
+                    OP_TOALTSTACK
+                    for _ in 0..(rng.gen_range(1..20)) {
+                        OP_HASH160
+                    }
+                    OP_FROMALTSTACK
+                }
+                for _ in 0..ind {
+                    OP_FROMALTSTACK OP_FROMALTSTACK
+                }
+            }
+        }
+    }
+
+    macro_rules! test_script {
+        ($ps:expr, $s:expr, $message_checker:expr, $desired_outcome:expr) => {
+            println!(
+                "Winternitz signature size:\n \t{:?} bytes / {:?} bits \n\t{:?} bytes / bit\n",
+                $s.len(),
+                $ps.message_length * $ps.block_length,
+                $s.len() as f64 / ($ps.message_length * $ps.block_length) as f64
+            );
+            if $desired_outcome == true {
+                assert!(
+                    execute_script($s.push_script($message_checker.clone().compile())).success
+                        == true
+                );
+            } else {
+                assert!(
+                    execute_script($s.clone()).success == false
+                        || execute_script($s.push_script($message_checker.clone().compile()))
+                            .success
+                            == true
+                );
+            }
+        };
+    }
+    macro_rules! generate_winternitz_tests {
+        (
+            $ps:expr, $secret_key:expr, $public_key:expr, $message:expr, $message_checker:expr, $desired_outcome:expr;
+            $([$verifier:ty, $converter:ty]),*
+        ) => {
+            $(
+                {
+                    let o = Winternitz::<$verifier, $converter>::new();
+                    let standard_script = script! {
+                        { o.sign(&$ps, &$secret_key, &$message) }
+                        if $desired_outcome == false {
+                             { try_malicious(&$ps, &$message, &get_type_name::<$verifier>()) }
+                        }
+                        { o.checksig_verify(&$ps, &$public_key) }
+                    };
+
+                    println!("For message_length:{} and block_length:{}  {} with {} =>", $ps.message_length, $ps.block_length, get_type_name::<$verifier>(), get_type_name::<$converter>());
+                    test_script!($ps, standard_script, $message_checker, $desired_outcome);
+                    if $desired_outcome == true {
+                        let message_remove_script = script! {
+                            { o.sign(&$ps, &$secret_key, &$message) }
+                            { o.checksig_verify_and_clear_stack(&$ps, &$public_key) }
+                            OP_TRUE
+                        };
+                        assert!(execute_script(message_remove_script).success == true);                    
+                    }
+                }
+            )*
+        };
+    }
+
+    #[test]
+    fn test_winternitz_with_actual_message_success() {
+        let secret_key = match hex::decode(SAMPLE_SECRET_KEY) {
+            Ok(bytes) => bytes,
+            Err(_) => panic!("Invalid hex string"),
+        };
+        let ps = Parameters::new_by_bit_length(32, 4);
+        let public_key = generate_public_key(&ps, &secret_key);
+
+        let message = 860033 as u32;
+        let message_bytes = &message.to_le_bytes();
+
+        let winternitz_verifier = Winternitz::<ListpickVerifier, VoidConverter>::new();
+
+        let s = script! {
+            // sign
+            { winternitz_verifier.sign(&ps, &secret_key, &message_bytes.to_vec()) }
+
+            // check signature
+            { winternitz_verifier.checksig_verify(&ps, &public_key) }
+            
+            // convert to number
+            { digits_to_number::<8, 4>() }
+            
+             { message }
+            
+            OP_EQUAL
+            
+        };
+        run(s);
+    }
+
+    #[test]
+    fn test_winternitz_success() {
+        let secret_key = match hex::decode(SAMPLE_SECRET_KEY) {
+            Ok(bytes) => bytes,
+            Err(_) => panic!("Invalid hex string"),
+        };
+        let mut prng = ChaCha20Rng::seed_from_u64(37);
+        for _ in 0..TEST_COUNT {
+            let ps = Parameters::new(prng.gen_range(1..200), prng.gen_range(4..=8));
+            let message_byte_size = ps.message_length * ps.block_length / 8;
+            let mut message = vec![0u8; message_byte_size as usize];
+            let mut return_message = vec![0; ps.byte_message_length() as usize];
+            for i in 0..message_byte_size {
+                message[i as usize] = prng.gen_range(0u8..=255);
+                return_message[i as usize] = message[i as usize];
+            }
+            let public_key = generate_public_key(&ps, &secret_key);
+            let message_checker = script! {
+                for i in 0..ps.byte_message_length() {
+                    {return_message[i as usize]}
+                    if i == ps.byte_message_length() - 1 {
+                        OP_EQUAL
+                    } else {
+                        OP_EQUALVERIFY
+                    }
+                }
+            };
+            generate_winternitz_tests!(
+                ps, secret_key, public_key, message, message_checker, true;
+                [ListpickVerifier, ToBytesConverter],
+                [BruteforceVerifier, ToBytesConverter],
+                [BinarysearchVerifier, ToBytesConverter]
+            );
+            let message_digits = bytes_to_u32s(ps.message_length, ps.block_length, &message);
+            let void_message_checker = script! {
+                for i in 0..ps.message_length {
+                    { message_digits[i as usize] }
+                    if i == ps.message_length - 1 {
+                        OP_EQUAL
+                    } else {
+                        OP_EQUALVERIFY
+                    }
+                }
+            };
+            generate_winternitz_tests!(
+                ps, secret_key, public_key, message, void_message_checker, true;
+                [ListpickVerifier, VoidConverter],
+                [BruteforceVerifier, VoidConverter],
+                [BinarysearchVerifier, VoidConverter]
+            );
+        }
+    }
+
+    #[test]
+    fn test_winternitz_fail() {
+        let secret_key = match hex::decode(SAMPLE_SECRET_KEY) {
+            Ok(bytes) => bytes,
+            Err(_) => panic!("Invalid hex string"),
+        };
+        let mut prng = ChaCha20Rng::seed_from_u64(37);
+        for _ in 0..TEST_COUNT {
+            let ps = Parameters::new(prng.gen_range(1..200), prng.gen_range(4..=8));
+            let message_byte_size = ps.message_length * ps.block_length / 8;
+            let mut message = vec![0u8; message_byte_size as usize];
+            let mut return_message = vec![0; ps.byte_message_length() as usize];
+            for i in 0..message_byte_size {
+                message[i as usize] = prng.gen_range(0u8..=255);
+                return_message[i as usize] = message[i as usize];
+            }
+            let public_key = generate_public_key(&ps, &secret_key);
+            let message_checker = script! {
+                for i in 0..ps.byte_message_length() {
+                    {return_message[i as usize]}
+                    if i == ps.byte_message_length() - 1 {
+                        OP_EQUAL
+                    } else {
+                        OP_EQUALVERIFY
+                    }
+                }
+            };
+            generate_winternitz_tests!(
+                ps, secret_key, public_key, message, message_checker, false;
+                [ListpickVerifier, ToBytesConverter],
+                [BruteforceVerifier, ToBytesConverter],
+                [BinarysearchVerifier, ToBytesConverter]
+            );
+            let message_digits = bytes_to_u32s(ps.message_length, ps.block_length, &message);
+            let void_message_checker = script! {
+                for i in 0..ps.message_length {
+                    { message_digits[i as usize] }
+                    if i == ps.message_length - 1 {
+                        OP_EQUAL
+                    } else {
+                        OP_EQUALVERIFY
+                    }
+                }
+            };
+            generate_winternitz_tests!(
+                ps, secret_key, public_key, message, void_message_checker, false;
+                [ListpickVerifier, VoidConverter],
+                [BruteforceVerifier, VoidConverter],
+                [BinarysearchVerifier, VoidConverter]
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/bitvm/src/signatures/winternitz_hash.rs b/bitvm/src/signatures/winternitz_hash.rs
new file mode 100644
index 000000000..80aa7c97b
--- /dev/null
+++ b/bitvm/src/signatures/winternitz_hash.rs
@@ -0,0 +1,76 @@
+use crate::treepp::*;
+use super::winternitz::*;
+use crate::hash::blake3::blake3_160_var_length;
+use bitcoin::Witness;
+use blake3::hash;
+
+const MESSAGE_HASH_LEN: u32 = 20;
+/// Winternitz parameters for the 20 byte blake3 variant with the block length 4
+pub static WINTERNITZ_HASH_PARAMETERS: Parameters = Parameters::new_by_bit_length(MESSAGE_HASH_LEN * 8, 4);
+
+/// Winternitz verifier for the 20 byte blake3 variant (can be used with other parameters), returns the message in bytes 
+pub static WINTERNITZ_HASH_VERIFIER: Winternitz::<ListpickVerifier, ToBytesConverter> = Winternitz::new();
+
+/// Winternitz verifier, returns the message in blocks
+pub static WINTERNITZ_MESSAGE_VERIFIER: Winternitz::<ListpickVerifier, VoidConverter> = Winternitz::new();
+
+/// Winternitz verifier, returns the message in in bytes
+pub static WINTERNITZ_VARIABLE_VERIFIER: Winternitz::<ListpickVerifier, ToBytesConverter> = Winternitz::new();
+
+/// Winternitz verifier for compact signature representation, returns the message in in bytes
+pub static WINTERNITZ_MESSAGE_COMPACT_VERIFIER: Winternitz::<BruteforceVerifier, VoidConverter> = Winternitz::new();
+
+/// Verify a Winternitz signature for the hash of the top `input_len` many bytes on the stack
+/// The hash function is blake3 with a 20-byte digest size
+/// Fails if the signature is invalid
+pub fn check_hash_sig(public_key: &PublicKey, input_len: usize) -> Script {
+    script! {
+        { WINTERNITZ_HASH_VERIFIER.checksig_verify(&WINTERNITZ_HASH_PARAMETERS, public_key) }
+        for _ in 0..MESSAGE_HASH_LEN {
+            OP_TOALTSTACK
+        }
+        { blake3_160_var_length(input_len) }
+        for _ in 0..MESSAGE_HASH_LEN / 4 {
+            for j in 0..4 {
+                { 3 - j }
+                OP_ROLL
+                OP_FROMALTSTACK
+                OP_EQUALVERIFY
+            }
+        }
+    }
+}
+
+/// Create a Winternitz signature for the blake3 hash of a given message
+pub fn sign_hash(sec_key: &Vec<u8>, message: &[u8]) -> Witness {
+    let message_hash = hash(message);
+    let message_hash_bytes = &message_hash.as_bytes()[0..20];
+    WINTERNITZ_HASH_VERIFIER.sign(&WINTERNITZ_HASH_PARAMETERS, sec_key, &message_hash_bytes.to_vec())
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    const MY_SEC_KEY: &str = "b138982ce17ac813d505b5b40b665d404e9528e7";
+
+    #[test]
+    fn test_check_hash_sig() {
+        // My secret key 
+        let secret_key = match hex::decode(MY_SEC_KEY) {
+            Ok(bytes) => bytes,
+            Err(_) => panic!("Invalid hex string"),
+        };
+        let public_key = generate_public_key(&WINTERNITZ_HASH_PARAMETERS, &secret_key);
+        let message = *b"This is an arbitrary length input intended for testing purposes....";
+        let s = script! {
+            for byte in message.iter().rev() {
+                { *byte }
+            }
+            { sign_hash(&secret_key, &message) }
+            { check_hash_sig(&public_key, message.len()) }
+            OP_TRUE
+        };
+        run(s);
+    }
+
+}
diff --git a/bitvm/src/signatures/wots_api.rs b/bitvm/src/signatures/wots_api.rs
new file mode 100644
index 000000000..d1595f10a
--- /dev/null
+++ b/bitvm/src/signatures/wots_api.rs
@@ -0,0 +1,150 @@
+use paste::paste;
+use crate::treepp::Script;
+use crate::signatures::{
+    winternitz,
+    winternitz_hash::{WINTERNITZ_MESSAGE_VERIFIER, WINTERNITZ_MESSAGE_COMPACT_VERIFIER},
+};
+
+/// Trait for converting a signature into a Script.
+pub trait SignatureImpl {
+    fn to_script(self) -> Script;
+    fn to_compact_script(self) -> Script;
+}
+
+/// Macro that implements the WOTS module for a given message length (in bytes).
+/// For example:
+/// - For 160-bit WOTS, use 20 bytes.
+/// - For 256-bit WOTS, use 32 bytes.
+macro_rules! impl_wots {
+    ($mod_name:ident, $MSG_LEN:expr) => {
+        paste! {
+            pub mod $mod_name {
+                use super::*;
+                use bitcoin_script::script;
+
+                /// Message length in bytes.
+                pub const MSG_LEN: u32 = $MSG_LEN;
+                /// Total number of "digits" in the signature.
+                pub const N_DIGITS: u32 = 2 * MSG_LEN + 4; // remove 4 hardcoded value later
+
+                /// Public key is an array of 20-byte arrays.
+                pub type PublicKey = [[u8; 20]; N_DIGITS as usize];
+                /// Signature consists of pairs: (20-byte preimage, 1-byte digit).
+                pub type Signature = [([u8; 20], u8); N_DIGITS as usize];
+
+                impl SignatureImpl for Signature {
+                    fn to_script(self) -> Script {
+                        script! {
+                            for (preimage, digit) in self {
+                                { preimage.to_vec() }
+                                { digit }
+                            }
+                        }
+                    }
+
+                    fn to_compact_script(self) -> Script {
+                        script! {
+                            for (preimage, _) in self {
+                                { preimage.to_vec() }
+                            }
+                        }
+                    }
+                }
+
+                /// Create a verification script for a WOTS public key.
+                pub fn checksig_verify(public_key: PublicKey) -> Script {
+                    let params = winternitz::Parameters::new(MSG_LEN * 2, 4);
+                    WINTERNITZ_MESSAGE_VERIFIER.checksig_verify(&params, &public_key.to_vec())
+                }
+
+                /// Generate a signature for a message using the provided secret.
+                pub fn get_signature(secret: &str, msg_bytes: &[u8]) -> Signature {
+                    let secret_key = match hex::decode(secret) {
+                        Ok(bytes) => bytes,
+                        Err(_) => panic!("Invalid hex string for secret"),
+                    };
+
+                    let sigs = WINTERNITZ_MESSAGE_VERIFIER.sign(
+                        &winternitz::Parameters::new(MSG_LEN * 2, 4),
+                        &secret_key,
+                        &msg_bytes.to_vec(),
+                    );
+                    assert_eq!(sigs.len(), 2 * N_DIGITS as usize);
+
+                    // Iterate over the signature pieces two at a time.
+                    let mut sigs_vec: Vec<([u8; 20], u8)> = Vec::new();
+                    for i in (0..sigs.len()).step_by(2) {
+                        let preimage: [u8; 20] = if sigs[i].len() == 0 {
+                            [0; 20]
+                        } else {
+                            sigs[i].try_into().unwrap()
+                        };
+                        let digit_arr: [u8; 1] = if sigs[i + 1].len() == 0 {
+                            [0]
+                        } else {
+                            sigs[i + 1].try_into().unwrap()
+                        };
+                        sigs_vec.push((preimage, digit_arr[0]));
+                    }
+                    sigs_vec.try_into().unwrap()
+                }
+
+                /// Generate a WOTS public key using the provided secret.
+                pub fn generate_public_key(secret: &str) -> PublicKey {
+                    let secret_key = match hex::decode(secret) {
+                        Ok(bytes) => bytes,
+                        Err(_) => panic!("Invalid hex string for secret"),
+                    };
+                    let params = winternitz::Parameters::new(MSG_LEN * 2, 4);
+                    let pubkey_vec = winternitz::generate_public_key(&params, &secret_key);
+                    pubkey_vec.try_into().unwrap()
+                }
+
+                /// A sub-module for the compact signature variant.
+                pub mod compact {
+                    use super::*;
+
+                    /// The compact signature is just the 20-byte preimages.
+                    pub type Signature = [[u8; 20]; N_DIGITS as usize];
+
+                    /// Create a verification script for the compact WOTS public key.
+                    pub fn checksig_verify(public_key: PublicKey) -> Script {
+                        let params = winternitz::Parameters::new(MSG_LEN * 2, 4);
+                        WINTERNITZ_MESSAGE_COMPACT_VERIFIER.checksig_verify(&params, &public_key.to_vec())
+                    }
+
+                    /// Generate a compact signature for a message.
+                    pub fn get_signature(secret: &str, msg_bytes: &[u8]) -> Signature {
+                        let secret_key = match hex::decode(secret) {
+                            Ok(bytes) => bytes,
+                            Err(_) => panic!("Invalid hex string for secret"),
+                        };
+
+                        let sigs = WINTERNITZ_MESSAGE_COMPACT_VERIFIER.sign(
+                            &winternitz::Parameters::new(MSG_LEN * 2, 4),
+                            &secret_key,
+                            &msg_bytes.to_vec(),
+                        );
+                        assert_eq!(sigs.len(), N_DIGITS as usize);
+
+                        let mut sigs_vec: Vec<[u8; 20]> = Vec::new();
+                        // Iterate over the signature pieces using step_by.
+                        for i in 0..sigs.len() {
+                            let preimage: [u8; 20] = if sigs[i].len() == 0 {
+                                [0; 20]
+                            } else {
+                                sigs[i].try_into().unwrap()
+                            };
+                            sigs_vec.push(preimage);
+                        }
+                        sigs_vec.try_into().unwrap()
+                    }
+                }
+            }
+        }
+    };
+}
+
+// Expand the macro for the two variants.
+impl_wots!(wots160, 20);
+impl_wots!(wots256, 32);
\ No newline at end of file
diff --git a/src/u32/mod.rs b/bitvm/src/u32/mod.rs
similarity index 74%
rename from src/u32/mod.rs
rename to bitvm/src/u32/mod.rs
index dbebf02a9..e1ba7b6c3 100644
--- a/src/u32/mod.rs
+++ b/bitvm/src/u32/mod.rs
@@ -1,8 +1,6 @@
 pub mod u32_add;
 pub mod u32_and;
-pub mod u32_or;
 pub mod u32_rrot;
-pub mod u32_rshift;
 pub mod u32_std;
 pub mod u32_xor;
 pub mod u32_zip;
diff --git a/bitvm/src/u32/u32_add.rs b/bitvm/src/u32/u32_add.rs
new file mode 100644
index 000000000..93ebc06cf
--- /dev/null
+++ b/bitvm/src/u32/u32_add.rs
@@ -0,0 +1,167 @@
+use crate::treepp::*;
+use crate::u32::u32_zip::{u32_copy_zip, u32_zip};
+
+/// Addition of two u8 elements at the top of the stack, pushing the carry after the sum
+pub fn u8_add_carry() -> Script {
+    script! {
+        OP_ADD
+        256
+        OP_2DUP
+        OP_GREATERTHANOREQUAL
+        OP_IF
+            OP_SUB
+            1
+        OP_ELSE
+            OP_DROP
+            0
+        OP_ENDIF
+    }
+}
+
+/// Addition of two u8 elements at the top of the stack, without minding the carry
+pub fn u8_add() -> Script {
+    script! {
+        OP_ADD
+        256
+        OP_2DUP
+        OP_GREATERTHANOREQUAL
+        OP_IF
+            OP_SUB
+            OP_0
+        OP_ENDIF
+        OP_DROP
+    }
+}
+
+/// Modulo 2^32 addition of a-th and b-th u32 values, keeps the a-th element at stack
+pub fn u32_add(a: u32, b: u32) -> Script {
+    assert_ne!(a, b); 
+    script! {
+        {u32_copy_zip(a, b)}
+
+        // A0 + B0
+        u8_add_carry
+        OP_SWAP
+        OP_TOALTSTACK
+
+        // A1 + B1 + carry_0
+        OP_ADD
+        u8_add_carry
+        OP_SWAP
+        OP_TOALTSTACK
+
+        // A2 + B2 + carry_1
+        OP_ADD
+        u8_add_carry
+        OP_SWAP
+        OP_TOALTSTACK
+
+        // A3 + B3 + carry_2
+        OP_ADD
+        u8_add
+
+        OP_FROMALTSTACK
+        OP_FROMALTSTACK
+        OP_FROMALTSTACK
+
+        // Now there's the result C_3 C_2 C_1 C_0 on the stack
+    }
+}
+
+/// Modulo 2^32 addition of a-th and b-th u32 values
+pub fn u32_add_drop(a: u32, b: u32) -> Script {
+    assert_ne!(a, b);
+    script! {
+        {u32_zip(a, b)}
+
+        // A0 + B0
+        u8_add_carry
+        OP_SWAP
+        OP_TOALTSTACK
+
+        // A1 + B1 + carry_0
+        OP_ADD
+        u8_add_carry
+        OP_SWAP
+        OP_TOALTSTACK
+
+        // A2 + B2 + carry_1
+        OP_ADD
+        u8_add_carry
+        OP_SWAP
+        OP_TOALTSTACK
+
+        // A3 + B3 + carry_2
+        OP_ADD
+        u8_add
+
+        OP_FROMALTSTACK
+        OP_FROMALTSTACK
+        OP_FROMALTSTACK
+
+        // Now there's the result C_3 C_2 C_1 C_0 on the stack
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::u32::u32_std::{u32_equal, u32_equalverify, u32_push};
+    use rand::Rng;
+
+    #[test]
+    fn test_u32_add() {
+        println!("u32_len: {}", u32_add_drop(1,0).len());
+        let mut rng = rand::thread_rng();
+        for _ in 0..1000 {
+            let x = rng.gen();
+            let y = rng.gen_range(0..=u32::MAX - x);
+            let script_add_drop = script! {
+                { u32_push(x) }
+                { u32_push(y) }
+                { u32_add_drop(1, 0) }
+                { u32_push(x + y) }
+                { u32_equal() }
+            };
+            let script_add = script! {
+                { u32_push(x) }
+                { u32_push(y) }
+                { u32_add(1, 0) }
+                { u32_push(x + y) }
+                { u32_equalverify() }
+                { u32_push(x) }
+                { u32_equal() }
+            };
+            run(script_add_drop);
+            run(script_add);
+        }
+    }
+    #[test]
+    fn test_u8_adds_exhaustive() {
+        for a in 0..256 {
+            for b in 0..256 {
+                let script_without_carry = script! {
+                  { a }
+                  { b }
+                  { u8_add() }
+                  { (a + b) % 256 }
+                  OP_EQUAL
+                };
+                let script_with_carry = script! {
+                    { a }
+                    { b }
+                    { u8_add_carry() }
+                    { ((a + b) >= 256) as u32 } 
+                    OP_EQUAL 
+                    OP_TOALTSTACK
+                    { (a + b) % 256 }
+                    OP_EQUAL
+                    OP_FROMALTSTACK
+                    OP_BOOLAND
+                };
+                run(script_without_carry);
+                run(script_with_carry);
+            }
+        } 
+    }
+}
diff --git a/src/u32/u32_and.rs b/bitvm/src/u32/u32_and.rs
similarity index 66%
rename from src/u32/u32_and.rs
rename to bitvm/src/u32/u32_and.rs
index 92e4afef4..0a8b1ece5 100644
--- a/src/u32/u32_and.rs
+++ b/bitvm/src/u32/u32_and.rs
@@ -1,10 +1,8 @@
-#![allow(dead_code)]
-
-use crate::treepp::{script, Script};
+use crate::treepp::*;
 use crate::u32::u32_zip::u32_copy_zip;
 
-/// The bitwise AND of two u8 elements.
-/// Expects the u8_xor_table to be on the stack
+/// Bitwise AND of two u8 elements, i denoting how many values are there in the stack after the table (including the input numbers A and B)
+/// Expects the u8_xor_table on the stack and uses it to process even and odd bits separately
 pub fn u8_and(i: u32) -> Script {
     script! {
         // f_A = f(A)
@@ -67,9 +65,8 @@ pub fn u8_and(i: u32) -> Script {
     }
 }
 
-/// The bitwise AND of the u32 elements at address a and at address b. Drops a and b
-///
-/// Expects the u8_xor_table to be on the stack
+/// Bitwise AND of a-th and b-th u32 elements from the top, keeps a-th element in the stack
+/// Expects u8_xor_table on the stack to use u8_and, and stack_size as a parameter to locate the table (which should be equal to 1 + number of the u32 elements in the stack after the table)
 pub fn u32_and(a: u32, b: u32, stack_size: u32) -> Script {
     assert_ne!(a, b);
     script! {
@@ -97,15 +94,11 @@ pub fn u32_and(a: u32, b: u32, stack_size: u32) -> Script {
 
 #[cfg(test)]
 mod tests {
-
-    use crate::treepp::{execute_script, script};
-    use crate::u32::u32_and::*;
+    use super::*;
     use crate::u32::u32_std::*;
     use crate::u32::u32_xor::{u8_drop_xor_table, u8_push_xor_table};
     use rand::Rng;
 
-    fn and(x: u32, y: u32) -> u32 { x & y }
-
     #[test]
     fn test_and() {
         println!("u32 and: {} bytes", u32_and(0, 1, 3).len());
@@ -118,15 +111,33 @@ mod tests {
                 {u32_push(x)}
                 {u32_push(y)}
                 {u32_and(0, 1, 3)}
-                {u32_push(and(x, y))}
+                {u32_push(x & y)}
                 {u32_equal()}
                 OP_TOALTSTACK
                 {u32_drop()} // drop y
                 {u8_drop_xor_table()}
                 OP_FROMALTSTACK
             };
-            let res = execute_script(exec_script);
-            assert!(res.success);
+            run(exec_script);
+        }
+    }
+    #[test]
+    fn test_u8_and_exhaustive() {
+        for a in 0..256 {
+            for b in 0..256 {
+                let script = script! {
+                  { u8_push_xor_table() }
+                  { a }
+                  { b }
+                  { u8_and(2) }
+                  { a & b }
+                  OP_EQUAL
+                  OP_TOALTSTACK
+                  { u8_drop_xor_table() }
+                  OP_FROMALTSTACK
+                };
+                run(script);
+            }
         }
     }
 }
diff --git a/src/u32/u32_rrot.rs b/bitvm/src/u32/u32_rrot.rs
similarity index 71%
rename from src/u32/u32_rrot.rs
rename to bitvm/src/u32/u32_rrot.rs
index 443306754..edb1b2558 100644
--- a/src/u32/u32_rrot.rs
+++ b/bitvm/src/u32/u32_rrot.rs
@@ -1,7 +1,4 @@
-#![allow(dead_code)]
-
-use crate::treepp::{script, Script};
-use core::panic;
+use crate::treepp::*;
 
 /// Right rotation of an u32 element by 16 bits
 pub fn u32_rrot16() -> Script {
@@ -18,7 +15,7 @@ pub fn u32_rrot8() -> Script {
     }
 }
 
-/// Right rotation of an u8 element by 7 bits
+/// Right rotation of the i-th u8 element by 7 bits
 pub fn u8_rrot7(i: u32) -> Script {
     let roll_script = match i {
         0 => script! {},
@@ -86,6 +83,7 @@ pub fn u32_rrot7() -> Script {
     }
 }
 
+/// Extracts (puts it at the top of the stack) the most significant bit of the u8 number and multiplies it by 2 modulo 256
 pub fn u8_extract_1bit() -> Script {
     script! {
         OP_DUP
@@ -103,31 +101,31 @@ pub fn u8_extract_1bit() -> Script {
     }
 }
 
+/// Extracts (puts them at the top of the stack as the sum) the h most significant bits of the u8 number and multiplies it by 2^h modulo 256
 pub fn u8_extract_hbit(hbit: usize) -> Script {
-    assert!(hbit < 8 && hbit != 0);
+    assert!((1..8).contains(&hbit));
     if hbit == 1 {
         return u8_extract_1bit();
     }
-    let base: usize = 2;
-    let x: usize = base.pow((hbit - 1).try_into().unwrap());
+    let x: u32 = 1 << (hbit - 1);
     script! {
         0
         OP_TOALTSTACK
 
         for i in 0..hbit
         {
-            OP_DUP
-            127
-            OP_GREATERTHAN
+            128
+            OP_2DUP
+            OP_GREATERTHANOREQUAL
             OP_IF
-                128
                 OP_SUB
                 OP_FROMALTSTACK
                 { x >> i }
                 OP_ADD
                 OP_TOALTSTACK
+                OP_DUP
             OP_ENDIF
-
+            OP_DROP
             OP_DUP
             OP_ADD
         }
@@ -135,43 +133,44 @@ pub fn u8_extract_hbit(hbit: usize) -> Script {
         OP_FROMALTSTACK
     }
 }
-// 1 2 3 4
+/// Reorders (reverse and rotate) the bytes of an u32 number, assuming the starting order is 1 2 3 4 (4 being at the top): 
+/// if offset is 0, then reorder is 4 3 2 1
+/// if offset is 1, then reorder is 1 4 3 2
+/// if offset is 2, then reorder is 2 1 4 3
+/// if offset is 3, then reorder is 3 2 1 4 
 pub fn byte_reorder(offset: usize) -> Script {
-    assert!(offset < 4);
+    assert!((0..4).contains(&offset));
     if offset == 0 {
-        // 4 3 2 1
         script! {
             OP_SWAP
             OP_2SWAP
             OP_SWAP
         }
     } else if offset == 1 {
-        // 1 4 3 2
         return script! {
             OP_SWAP
             OP_ROT
         };
     } else if offset == 2 {
-        // 2 1 4 3
         return script! {
             OP_SWAP
             OP_2SWAP
             OP_SWAP
             OP_2SWAP
         };
-    } else if offset == 3 {
+    } else /* if offset == 3 */ {
         return script! {
             OP_SWAP
             OP_ROT
             OP_2SWAP
         };
-    } else {
-        panic!("offset out of range")
     }
 }
 
-pub fn specific_optimize(rot_num: usize) -> Option<Script> {
-    let res: Option<Script> = match rot_num {
+/// Rotates the bits of a u32 number by rot_num
+pub fn u32_rrot(rot_num: usize) -> Script {
+    assert!((0..32).contains(&rot_num));
+    let specific_optimize: Option<Script> = match rot_num {
         0 => script! {}.into(),            // 0
         7 => script! {u32_rrot7}.into(),   // 76
         8 => script! {u32_rrot8}.into(),   // 3
@@ -180,12 +179,11 @@ pub fn specific_optimize(rot_num: usize) -> Option<Script> {
         24 => script! {3 OP_ROLL}.into(), // 2
         _ => None,
     };
-    res
-}
 
-pub fn u32_rrot(rot_num: usize) -> Script {
-    assert!(rot_num < 32);
-    if let Some(res) = specific_optimize(rot_num) { return res }
+    if let Some(res) = specific_optimize {
+        return res;
+    }
+
     let remainder: usize = rot_num % 8;
 
     let hbit: usize = 8 - remainder;
@@ -220,9 +218,7 @@ pub fn u32_rrot(rot_num: usize) -> Script {
 
 #[cfg(test)]
 mod tests {
-
-    use crate::treepp::{execute_script, script};
-    use crate::u32::u32_rrot::*;
+    use super::*;
     use crate::u32::u32_std::*;
     use rand::Rng;
 
@@ -238,18 +234,33 @@ mod tests {
         for i in 0..32 {
             println!("u32_rrot({}): {} bytes", i, u32_rrot(i).len());
         }
-        for _ in 0..100 {
-            let mut rng = rand::thread_rng();
+        let mut rng = rand::thread_rng();
+        for _ in 0..1000 {
             let x: u32 = rng.gen();
             for i in 0..32 {
-                let exec_script = script! {
+                let script = script! {
                     {u32_push(x)}
                     {u32_rrot(i)}
                     {u32_push(rrot(x, i))}
                     {u32_equal()}
                 };
-                let res = execute_script(exec_script);
-                assert!(res.success);
+                run(script);
+            }
+        }
+    }
+    #[test]
+    fn test_extract_hbit() {
+        for x in 0..256 {
+            for h in 1..8 {
+                let script = script! {
+                    { x }
+                    { u8_extract_hbit(h) }
+                    { x >> (8 - h) }
+                    OP_EQUALVERIFY
+                    { (x << h) % 256 }
+                    OP_EQUAL
+                };
+                run(script);
             }
         }
     }
diff --git a/bitvm/src/u32/u32_std.rs b/bitvm/src/u32/u32_std.rs
new file mode 100644
index 000000000..8182c9aeb
--- /dev/null
+++ b/bitvm/src/u32/u32_std.rs
@@ -0,0 +1,293 @@
+use crate::treepp::*;
+use crate::pseudo::{push_to_stack, OP_256MUL, OP_4DUP};
+
+
+/// Pushes a value as u32 element onto the stack, least significant part being on top
+pub fn u32_push(value: u32) -> Script {
+    script! {
+        //optimization
+        if (value >> 24 & 0xff) == (value >> 16 & 0xff) &&
+            (value >> 24 & 0xff) == (value >> 8 & 0xff) &&
+            (value >> 24 & 0xff) == (value & 0xff) {
+
+                { push_to_stack((value >> 24 & 0xff) as usize, 4) }
+        }
+        else{
+
+                {value >> 24 & 0xff}
+                {value >> 16 & 0xff}
+                {value >>  8 & 0xff}
+                {value & 0xff}
+        }
+    }
+}
+
+/// Marks transaction as invalid if the top two stack value are not equal
+pub fn u32_equalverify() -> Script {
+    script! {
+        4
+        OP_ROLL
+        OP_EQUALVERIFY
+        3
+        OP_ROLL
+        OP_EQUALVERIFY
+        OP_ROT
+        OP_EQUALVERIFY
+        OP_EQUALVERIFY
+    }
+}
+
+/// Returns 1 if the top two u32 are equal, 0 otherwise
+pub fn u32_equal() -> Script {
+    script! {
+        4
+        OP_ROLL
+        OP_EQUAL OP_TOALTSTACK
+        3
+        OP_ROLL
+        OP_EQUAL OP_TOALTSTACK
+        OP_ROT
+        OP_EQUAL OP_TOALTSTACK
+        OP_EQUAL
+        OP_FROMALTSTACK OP_BOOLAND
+        OP_FROMALTSTACK OP_BOOLAND
+        OP_FROMALTSTACK OP_BOOLAND
+    }
+}
+
+/// Puts the top u32 element onto the top of the alt stack. Removes it from the main stack.
+pub fn u32_toaltstack() -> Script {
+    script! {
+        OP_TOALTSTACK
+        OP_TOALTSTACK
+        OP_TOALTSTACK
+        OP_TOALTSTACK
+    }
+}
+
+/// Puts the top u32 element of the alt stack onto the top of the main stack. Removes it from the alt stack.
+pub fn u32_fromaltstack() -> Script {
+    script! {
+        OP_FROMALTSTACK
+        OP_FROMALTSTACK
+        OP_FROMALTSTACK
+        OP_FROMALTSTACK
+    }
+}
+
+/// Duplicates the top u32 stack element
+pub fn u32_dup() -> Script {
+    script! { OP_4DUP }
+}
+
+/// Removes the top u32 element from the stack.
+pub fn u32_drop() -> Script {
+    script! {
+        OP_2DROP
+        OP_2DROP
+    }
+}
+
+/// Moves u32 element n back in the stack to the top.
+pub fn u32_roll(n: u32) -> Script {
+    let n = (n + 1) * 4 - 1;
+    script! {
+        {n} OP_ROLL
+        {n} OP_ROLL
+        {n} OP_ROLL
+        {n} OP_ROLL
+    }
+}
+
+/// Copies u32 element n back in the stack to the top.
+pub fn u32_pick(n: u32) -> Script {
+    let n = (n + 1) * 4 - 1;
+    script! {
+        {n} OP_PICK
+        {n} OP_PICK
+        {n} OP_PICK
+        {n} OP_PICK
+    }
+}
+
+/// Compresses the top u32 element into a single element, i.e. X₃₁…₂₄ X₂₃…₁₆ X₁₅…₉ X₈…₀ → X₃₁…₀
+pub fn u32_compress() -> Script {
+    script! {
+        // ⋯ X₃₁…₂₄ X₂₃…₁₆ X₁₅…₈ X₇…₀
+        OP_SWAP OP_2SWAP OP_SWAP
+        // ⋯ X₇…₀ X₁₅…₈ X₂₃…₁₆ X₃₁…₂₄
+        0x80
+        // ⋯ X₇…₀ X₁₅…₈ X₂₃…₁₆ X₃₁…₂₄ 2⁸
+        OP_2DUP OP_GREATERTHANOREQUAL
+        // ⋯ X₇…₀ X₁₅…₈ X₂₃…₁₆ X₃₁…₂₄ 2⁸ X₃₁
+        OP_DUP OP_TOALTSTACK
+        // ⋯ X₇…₀ X₁₅…₈ X₂₃…₁₆ X₃₁…₂₄ 2⁸ X₃₁ | X₃₁
+        OP_IF OP_SUB OP_ELSE OP_DROP OP_ENDIF
+        // ⋯ X₇…₀ X₁₅…₈ X₂₃…₁₆ X₃₀…₂₄
+        OP_256MUL OP_ADD
+        // ⋯ X₇…₀ X₁₅…₈ X₃₀…₁₆
+        OP_256MUL OP_ADD
+        // ⋯ X₇…₀ X₃₀…₈
+        OP_256MUL OP_ADD
+        // ⋯ X₃₀…₀ | X₃₁
+        OP_FROMALTSTACK
+        // ⋯ X₃₀…₀ X₃₁
+        OP_IF 0x7FFFFFFF OP_SUB OP_1SUB OP_ENDIF
+        // ⋯ X₃₁…₀
+    }
+}
+
+// Deompresses the top element into 4 bytes, X₃₁…₀ → X₃₁…₂₄ X₂₃…₁₆ X₁₅…₉ X₈…₀
+pub fn u32_uncompress() -> Script {
+    script! {
+        // ⋯ X₃₁…₀
+        OP_SIZE OP_5 OP_EQUAL
+        // ⋯ X₃₁…₀ X₃₁…₀=2³¹
+        OP_TUCK OP_IF // X₃₁…₀ = 2³¹
+            // ⋯ X₃₁…₀=2³¹ X₃₁…₀
+            OP_DROP OP_0
+            // ⋯ X₃₁ X₃₀…₀
+        OP_ELSE // X₃₁…₀ ≠ 2³¹
+            // ⋯ X₃₁…₀=2³¹ X₃₁…₀
+            OP_TUCK OP_GREATERTHAN
+            // ⋯ X₃₁…₀ X₃₁
+            OP_TUCK OP_IF 0x7FFFFFFF OP_ADD OP_1ADD OP_ENDIF
+            // ⋯ X₃₁ X₃₀…₀
+        OP_ENDIF
+        // ⋯ X₃₁ X₃₀…₀
+        OP_SWAP OP_TOALTSTACK
+        // ⋯ X₃₀…₀ | X₃₁
+        for i in 1..8 {
+            // ⋯ X₃₀…₀
+            { 1 << (31 - i) } OP_2DUP OP_GREATERTHANOREQUAL
+            // ⋯ X₃₀…₀ 2³⁰ X₃₀
+            OP_FROMALTSTACK OP_DUP OP_ADD OP_OVER OP_ADD OP_TOALTSTACK
+            // ⋯ X₃₀…₀ 2³⁰ X₃₀ | X₃₁…₃₀
+            OP_IF OP_SUB OP_ELSE OP_DROP OP_ENDIF
+            // ⋯ X₂₉…₀ | X₃₁…₃₀
+        }
+        // ⋯ X₂₉…₀ | X₃₁…₃₀
+        // ⋯ X₂₈…₀ | X₃₁…₂₉
+        // ⋯ X₂₇…₀ | X₃₁…₂₈
+        // ⋯ X₂₆…₀ | X₃₁…₂₇
+        // ⋯ X₂₅…₀ | X₃₁…₂₆
+        // ⋯ X₂₄…₀ | X₃₁…₂₅
+        // ⋯ X₂₃…₀ | X₃₁…₂₄
+        { 1 << 23 } OP_2DUP OP_GREATERTHANOREQUAL OP_DUP OP_TOALTSTACK
+        // ⋯ X₂₃…₀ 2²³ X₂₃ | X₂₃ ⋯
+        OP_IF OP_SUB OP_ELSE OP_DROP OP_ENDIF
+        // ⋯ X₂₂…₀ | X₂₃ ⋯
+        for i in 1..8 {
+            // ⋯ X₂₂…₀
+            { 1 << (23 - i) } OP_2DUP OP_GREATERTHANOREQUAL
+            // ⋯ X₂₂…₀ 2²² X₂₂
+            OP_FROMALTSTACK OP_DUP OP_ADD OP_OVER OP_ADD OP_TOALTSTACK
+            // ⋯ X₂₂…₀ 2²² X₂₂ | X₂₃…₂₂ ⋯
+            OP_IF OP_SUB OP_ELSE OP_DROP OP_ENDIF
+            // ⋯ X₂₁…₀ | X₂₃…₂₂ ⋯
+        }
+        // ⋯ X₂₁…₀ | X₂₃…₂₂ X₃₁…₂₄
+        // ⋯ X₂₀…₀ | X₂₃…₂₁ X₃₁…₂₄
+        // ⋯ X₁₉…₀ | X₂₃…₂₀ X₃₁…₂₄
+        // ⋯ X₁₈…₀ | X₂₃…₁₉ X₃₁…₂₄
+        // ⋯ X₁₇…₀ | X₂₃…₁₈ X₃₁…₂₄
+        // ⋯ X₁₆…₀ | X₂₃…₁₇ X₃₁…₂₄
+        // ⋯ X₁₅…₀ | X₂₃…₁₆ X₃₁…₂₄
+        { 1 << 15 } OP_2DUP OP_GREATERTHANOREQUAL OP_DUP OP_TOALTSTACK
+        // ⋯ X₁₅…₀ 2¹⁵ X₁₅ | X₁₅ ⋯
+        OP_IF OP_SUB OP_ELSE OP_DROP OP_ENDIF
+        // ⋯ X₁₄…₀ | X₁₅ ⋯
+        for i in 1..8 {
+            // ⋯ X₁₄…₀
+            { 1 << (15 - i) } OP_2DUP OP_GREATERTHANOREQUAL
+            // ⋯ X₁₄…₀ 2¹⁴ X₁₄
+            OP_FROMALTSTACK OP_DUP OP_ADD OP_OVER OP_ADD OP_TOALTSTACK
+            // ⋯ X₁₄…₀ 2¹⁴ X₁₄ | X₁₅…₁₄ ⋯
+            OP_IF OP_SUB OP_ELSE OP_DROP OP_ENDIF
+            // ⋯ X₁₃…₀ | X₁₅…₁₄ ⋯
+        }
+        // ⋯ X₁₃…₀ | X₁₅…₁₄ ⋯
+        // ⋯ X₁₂…₀ | X₁₅…₁₃ ⋯
+        // ⋯ X₁₁…₀ | X₁₅…₁₂ ⋯
+        // ⋯ X₁₀…₀ | X₁₅…₁₁ ⋯
+        // ⋯ X₉…₀ | X₁₅…₁₀ ⋯
+        // ⋯ X₈…₀ | X₁₅…₉ X₂₃…₁₆ X₃₁…₂₄
+        OP_FROMALTSTACK OP_FROMALTSTACK OP_FROMALTSTACK
+        // ⋯ X₈…₀ X₁₅…₉ X₂₃…₁₆ X₃₁…₂₄
+        OP_SWAP OP_2SWAP OP_SWAP
+        // ⋯ X₃₁…₂₄ X₂₃…₁₆ X₁₅…₉ X₈…₀
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use rand::Rng;
+
+    #[test]
+    fn test_u32_push() {
+        let script = script! {
+            { u32_push(0x01020304) }
+            0x04
+            OP_EQUALVERIFY
+            0x03
+            OP_EQUALVERIFY
+            0x02
+            OP_EQUALVERIFY
+            0x01
+            OP_EQUAL
+        };
+        run(script);
+    }
+
+    #[test]
+    fn test_with_u32_compress() {
+        let mut rng = rand::thread_rng();
+        for _ in 0..30 {
+            let mut origin_value0: u32 = rng.gen();
+            origin_value0 = (origin_value0 % 1) << 31;
+            let mut origin_value1: u32 = rng.gen();
+            origin_value1 = (origin_value1 % 1) << 31;
+
+            let v = origin_value0 + origin_value1;
+
+            let script = script! {
+                { u32_push(origin_value0)}
+                { u32_compress()}
+                { u32_push(origin_value1)}
+                { u32_compress()}
+                OP_ADD
+                { u32_push(v)}
+                { u32_compress()}
+                OP_EQUAL
+
+            };
+
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_uncompress() {
+        println!("u32_uncompress: {} bytes", u32_uncompress().len());
+        run(script! {
+            0x7FFFFFFF           u32_uncompress 0xFF OP_EQUALVERIFY 0xFF OP_EQUALVERIFY 0xFF OP_EQUALVERIFY 0x7F OP_EQUALVERIFY // 2³¹-1
+            0x7FFFFFFF OP_NEGATE u32_uncompress OP_1 OP_EQUALVERIFY OP_0 OP_EQUALVERIFY OP_0 OP_EQUALVERIFY 0x80 OP_EQUALVERIFY // 2³¹+1
+            0x00000001 OP_NEGATE u32_uncompress 0xFF OP_EQUALVERIFY 0xFF OP_EQUALVERIFY 0xFF OP_EQUALVERIFY 0xFF OP_EQUALVERIFY // 2³²-1
+            0x80000000           u32_uncompress OP_0 OP_EQUALVERIFY OP_0 OP_EQUALVERIFY OP_0 OP_EQUALVERIFY 0x80 OP_EQUALVERIFY // 2³¹
+            0x00000000           u32_uncompress OP_0 OP_EQUALVERIFY OP_0 OP_EQUALVERIFY OP_0 OP_EQUALVERIFY OP_0 OP_EQUAL // 0
+        })
+    }
+
+    #[test]
+    fn test_compress() {
+        println!("u32_compress: {} bytes", u32_compress().len());
+        run(script! {
+            0x7F 0xFF 0xFF 0xFF u32_compress 0x7FFFFFFF           OP_EQUALVERIFY // 2³¹-1
+            0x80 OP_0 OP_0 OP_1 u32_compress 0x7FFFFFFF OP_NEGATE OP_EQUALVERIFY // 2³¹+1
+            0xFF 0xFF 0xFF 0xFF u32_compress 0x00000001 OP_NEGATE OP_EQUALVERIFY // 2³²-1
+            0x80 OP_0 OP_0 OP_0 u32_compress 0x7FFFFFFF OP_NEGATE OP_1SUB OP_EQUALVERIFY // -2³¹
+            OP_0 OP_0 OP_0 OP_0 u32_compress 0x00000000           OP_EQUAL // -2³¹
+        })
+    }
+}
diff --git a/src/u32/u32_xor.rs b/bitvm/src/u32/u32_xor.rs
similarity index 73%
rename from src/u32/u32_xor.rs
rename to bitvm/src/u32/u32_xor.rs
index 5111e656f..be92dd037 100644
--- a/src/u32/u32_xor.rs
+++ b/bitvm/src/u32/u32_xor.rs
@@ -1,13 +1,8 @@
-#![allow(dead_code)]
-
-use crate::treepp::{script, Script};
+use crate::treepp::*;
 use crate::u32::u32_zip::u32_copy_zip;
 
-/// Bitwise XOR of two u8 elements
-///
-/// Expects the u8_xor_table on the stack
-///
-/// Explanation of the algorithm: https://github.com/BitVM/BitVM/blob/main/tapscripts/docs/u8_xor.md
+/// Bitwise XOR of two u8 elements, i denoting how many values are there in the stack after the table (including the input numbers A and B)
+/// Expects the u8_xor_table on the stack and uses it to process even and odd bits separately
 pub fn u8_xor(i: u32) -> Script {
     script! {
         // f_A = f(A)
@@ -79,9 +74,8 @@ pub fn u8_xor(i: u32) -> Script {
     }
 }
 
-/// Bitwise XOR of two u32 elements
-///
-/// Expects u8_xor_table on the stack
+/// Bitwise XOR of a-th and b-th u32 elements from the top, keeps a-th element in the stack
+/// Expects u8_xor_table on the stack to use u8_xor, and stack_size as a parameter to locate the table (which should be equal to 1 + number of the u32 elements in the stack after the table)
 pub fn u32_xor(a: u32, b: u32, stack_size: u32) -> Script {
     assert_ne!(a, b);
     script! {
@@ -112,9 +106,7 @@ pub fn u32_xor(a: u32, b: u32, stack_size: u32) -> Script {
     }
 }
 
-/// Push the u8 XOR table
-///
-/// It's a lookup table for the function f(x) = (x & 0b10101010) >> 1
+/// Pushes the u8 XOR table, for the function f(x) = (x & 0b10101010) >> 1
 pub fn u8_push_xor_table() -> Script {
     script! {
         85
@@ -327,7 +319,7 @@ pub fn u8_push_xor_table() -> Script {
     }
 }
 
-/// Drop the u8 XOR table
+/// Drops the u8 XOR table
 pub fn u8_drop_xor_table() -> Script {
     script! {
         for _ in 0..128{
@@ -338,35 +330,70 @@ pub fn u8_drop_xor_table() -> Script {
 
 #[cfg(test)]
 mod tests {
-
-    use crate::treepp::{execute_script, script};
+    use super::*;
     use crate::u32::u32_std::*;
-    use crate::u32::u32_xor::{u32_xor, u8_drop_xor_table, u8_push_xor_table};
     use rand::Rng;
 
-    fn xor(x: u32, y: u32) -> u32 { x ^ y }
+    #[test]
+    fn test_xor_table() {
+        let script = script! {
+            { u8_push_xor_table() }
+            { 1 } OP_TOALTSTACK
+            for x in 0..1<<8 {
+                { x }
+                OP_PICK
+                { (x & 0b10101010) >> 1 }
+                OP_EQUAL
+                OP_FROMALTSTACK
+                OP_BOOLAND
+                OP_TOALTSTACK
+            }
+            { u8_drop_xor_table() }
+            OP_FROMALTSTACK
+        };
+        run(script);
+    }
 
     #[test]
-    fn test_xor() {
+    fn test_u32_xor() {
         println!("u32 xor: {} bytes", u32_xor(0, 1, 3).len());
-        for _ in 0..100 {
-            let mut rng = rand::thread_rng();
+        let mut rng = rand::thread_rng();
+        for _ in 0..1000 {
             let x: u32 = rng.gen();
             let y: u32 = rng.gen();
-            let exec_script = script! {
+            let script = script! {
                 {u8_push_xor_table()}
                 {u32_push(x)}
                 {u32_push(y)}
                 {u32_xor(0, 1, 3)}
-                {u32_push(xor(x, y))}
+                { u32_push(x ^ y) }
                 {u32_equal()}
                 OP_TOALTSTACK
                 {u32_drop()} // drop y
                 {u8_drop_xor_table()}
                 OP_FROMALTSTACK
             };
-            let res = execute_script(exec_script);
-            assert!(res.success);
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_u8_xor_exhaustive() {
+        for a in 0..256 {
+            for b in 0..256 {
+                let script = script! {
+                  { u8_push_xor_table() }
+                  { a }
+                  { b }
+                  { u8_xor(2) }
+                  { a ^ b }
+                  OP_EQUAL
+                  OP_TOALTSTACK
+                  { u8_drop_xor_table() }
+                  OP_FROMALTSTACK
+                };
+                run(script);
+            }
         }
     }
 }
diff --git a/src/u32/u32_zip.rs b/bitvm/src/u32/u32_zip.rs
similarity index 54%
rename from src/u32/u32_zip.rs
rename to bitvm/src/u32/u32_zip.rs
index 1de3a45d4..c9d12a5a1 100644
--- a/src/u32/u32_zip.rs
+++ b/bitvm/src/u32/u32_zip.rs
@@ -1,10 +1,11 @@
-#![allow(dead_code)]
 use crate::treepp::{script, Script};
 
-/// Zip the top two u32 elements
-/// input:  a0 a1 a2 a3 b0 b1 b2 b3
-/// output: a0 b0 a1 b1 a2 b2 a3 b3
+/// Zips the a-th and b-th u32 elements from the top (without preserving order) 
+/// Assuming a is smaller than b and x_i denoting the i-th part of the x-th number: 
+/// Input:  ... (a u32 elements) a_0 a_1 a_2 a_3 ... (b - a - 1 u32 elements) b_0 b_1 b_2 b_3
+/// Output: b_0 a_0 b_1 a_1 b_2 a_2 b_3 a_3 ... (b - 1 u32 elements and rest of the stack)
 pub fn u32_zip(mut a: u32, mut b: u32) -> Script {
+    assert_ne!(a, b);
     if a > b {
         (a, b) = (b, a);
     }
@@ -20,9 +21,10 @@ pub fn u32_zip(mut a: u32, mut b: u32) -> Script {
     }
 }
 
-/// Copy and zip the top two u32 elements
-/// input:  a0 a1 a2 a3 b0 b1 b2 b3
-/// output: a0 b0 a1 b1 a2 b2 a3 b3 a0 a1 a2 a3
+/// Zips the a-th and b-th u32 elements from the top and keep the one chosen (given as the first parameter) in the stack (without preserving order)
+/// Assuming a is smaller than b and x_i denoting the i-th part of the x-th number: 
+/// Input:  ... (a u32 elements) a_0 a_1 a_2 a_3 ... (b - a - 1 u32 elements) b_0 b_1 b_2 b_3
+/// Output: b_0 a_0 b_1 a_1 b_2 a_2 b_3 a_3 ... (b u32 elements including the element that is chosen to stay and rest of the stack)
 pub fn u32_copy_zip(a: u32, b: u32) -> Script {
     if a < b {
         _u32_copy_zip(a, b)
@@ -31,9 +33,9 @@ pub fn u32_copy_zip(a: u32, b: u32) -> Script {
     }
 }
 
+/// Helper for u32_copy_zip
 pub fn _u32_copy_zip(mut a: u32, mut b: u32) -> Script {
     assert!(a < b);
-
     a = (a + 1) * 4 - 1;
     b = (b + 1) * 4 - 1;
 
@@ -45,6 +47,7 @@ pub fn _u32_copy_zip(mut a: u32, mut b: u32) -> Script {
     }
 }
 
+///Helper for u32_copy_zip
 pub fn _u32_zip_copy(mut a: u32, mut b: u32) -> Script {
     assert!(a < b);
 
diff --git a/bitvm/src/u4/mod.rs b/bitvm/src/u4/mod.rs
new file mode 100644
index 000000000..3d9c929f3
--- /dev/null
+++ b/bitvm/src/u4/mod.rs
@@ -0,0 +1,8 @@
+pub mod u4_add;
+pub mod u4_add_stack;
+pub mod u4_logic;
+pub mod u4_logic_stack;
+pub mod u4_rot;
+pub mod u4_shift;
+pub mod u4_shift_stack;
+pub mod u4_std;
diff --git a/bitvm/src/u4/u4_add.rs b/bitvm/src/u4/u4_add.rs
new file mode 100644
index 000000000..7365484ec
--- /dev/null
+++ b/bitvm/src/u4/u4_add.rs
@@ -0,0 +1,342 @@
+use crate::treepp::*;
+use bitcoin::opcodes::all::*;
+use super::u4_std::{u4_drop, CalculateOffset};
+
+/// Pushes the table for calculating the quotient, i.e. floor(x / 16) for x < 65. i.e. 15 (max u4) * 4 (max # numbers to sum) + 4 (max carry)
+pub fn u4_push_quotient_table() -> Script {
+    script! {
+        OP_4
+        for i in (0..=3).rev() {
+            { i }
+            OP_DUP
+            OP_2DUP
+            OP_3DUP
+            OP_3DUP
+            OP_3DUP
+            OP_3DUP
+        }
+    }
+}
+
+/// Pushes the table for calculating the quotient, i.e. floor(x / 16) for x < 80. i.e. 15 (max u4) * 5 (max # numbers to sum) + 4 (max carry)
+pub fn u4_push_quotient_table_5() -> Script {
+    script! {
+        for i in (0..=4).rev() {
+            { i }
+            OP_DUP
+            OP_2DUP
+            OP_3DUP
+            OP_3DUP
+            OP_3DUP
+            OP_3DUP
+        }
+    }
+}
+
+/// Drop quotient table
+pub fn u4_drop_quotient_table() -> Script { u4_drop(65) }
+
+/// Pushes the table for calculating the modulo, i.e. x % 16 for x < 65. i.e. 15 (max u4) * 4 (max # numbers to sum) + 4 (max carry)
+pub fn u4_push_modulo_table() -> Script {
+    script! {
+        for i in (0..65).rev() {
+            { i % 16 }
+        }
+    }
+}
+
+/// Pushes the table for calculating the modulo, i.e. x % 16 for x < 80. i.e. 15 (max u4) * 5 (max # numbers to sum) + 4 (max carry)
+pub fn u4_push_modulo_table_5() -> Script {
+    script! {
+        for i in (0..80).rev() {
+            { i % 16 }
+        }
+    }
+}
+
+/// Drops the modulo table
+pub fn u4_drop_modulo_table() -> Script { u4_drop(65) }
+
+/// Pushes both modulo and quotient tables for sums
+pub fn u4_push_add_tables() -> Script {
+    script! {
+        { u4_push_modulo_table() }
+        { u4_push_quotient_table() }
+    }
+}
+
+/// Drops both modulo and quotient tables
+pub fn u4_drop_add_tables() -> Script {
+    script! {
+        { u4_drop_quotient_table() }
+        { u4_drop_modulo_table() }
+    }
+}
+
+/// Arranges (zips) the given numbers (locations given by the parameters bases) each consisting of nibble_count u4's so each group of nibbles can be proccessed disceretly 
+/// Does not preserve order as it's used with commutative operations
+/// Assuming x_i denoting the i-th part of the x-th number and bases have two numbers a and b (a < b): 
+/// Input:  ... (a elements) a_0 a_1 a_2 a_3 ... (b - a - 1 elements) b_0 b_1 b_2 b_3
+/// Output: b_0 a_0 b_1 a_1 b_2 a_2 b_3 a_3 ... (b elements and the rest of stack)
+pub fn u4_arrange_nibbles(nibble_count: u32, mut bases: Vec<u32>) -> Script {
+    bases.sort();
+    bases.reverse();
+    for base_i in &mut bases {
+        *base_i += nibble_count - 1;
+    }
+    script! {
+        for i in 0..nibble_count {
+            for (n, base) in bases.iter().enumerate() {
+                {  (base - i)  +  ((n as u32 + 1) * (i + 1)) - 1 }
+                OP_ROLL
+            }
+        }
+    }
+}
+
+/// Calculates the modulo 16 of the u4 at the top of the stack also with the quotient, parameters being internal values
+pub fn u4_add_carry_nested(current: u32, limit: u32) -> Script {
+    script! {
+        OP_DUP
+        OP_16
+        OP_GREATERTHANOREQUAL
+        OP_IF
+            OP_16
+            OP_SUB
+            if current + 1 == limit {
+                { current }
+            } else {
+                { u4_add_carry_nested(current+1, limit)}
+            }
+        OP_ELSE
+            { current }
+        OP_ENDIF
+    }
+}
+
+/// Calculates the modulo 16 of the u4 at the top of the stack, parameters being internal values
+pub fn u4_add_nested(current: u32, limit: u32) -> Script {
+    script! {
+        OP_DUP
+        OP_16
+        OP_GREATERTHANOREQUAL
+        OP_IF
+            OP_16
+            OP_SUB
+            if current + 1 < limit {
+                { u4_add_nested(current + 1, limit)}
+            }
+        OP_ENDIF
+    }
+}
+
+/// Addition of zipped numbers consisting of nibble_count u4's, without the table
+pub fn u4_add_no_table_internal(nibble_count: u32, number_count: u32) -> Script {
+    script! {
+        for i in 0..nibble_count {
+            for _ in 0..number_count-1 {
+                OP_ADD
+            }
+            if i < nibble_count - 1 {
+                { u4_add_carry_nested(0, number_count) }
+                OP_SWAP
+                OP_TOALTSTACK
+                OP_ADD
+            } else {
+                { u4_add_nested(0, number_count) }
+                OP_TOALTSTACK
+            }
+
+        }
+    }
+}
+
+/// Addition of zipped numbers consisting of nibble_count u4's
+/// Requires the addition table and tables_offset to locate the table which should be equal to number of elements on top of the table including operating values
+pub fn u4_add_internal(nibble_count: u32, number_count: u32, tables_offset: u32) -> Script {
+    assert!(number_count < 5);
+    let quotient_table_size = 65;
+    //extra size on the stack
+    let mut offset_calc: i32 = 0;
+    script! {
+        for i in 0..nibble_count {
+            //extra add to add the carry from previous addition
+            if i > 0 {
+                { offset_calc.modify(OP_ADD) }
+            }
+
+            //add the column of nibbles (needs one less add than nibble count)
+            for _ in 0..number_count-1 {
+                { offset_calc.modify(OP_ADD) }
+            }
+
+            // duplicate the result to be used to get the carry except for the last nibble
+            if i < nibble_count -1 {
+                { offset_calc.modify( OP_DUP) }
+            }
+
+            //get the modulo of the addition
+            {  (offset_calc - 1)  + tables_offset as i32 + quotient_table_size }   // this adds 1 to the calc
+            OP_ADD                                                    // and this one consumes it
+            { offset_calc.modify(OP_PICK) }
+            { offset_calc.modify(OP_TOALTSTACK) }
+
+            //we don't care about the last carry
+            if i < nibble_count - 1 {
+                //obtain the quotinent to be used as carry for the next addition
+                { (offset_calc - 1) + tables_offset as i32 }
+                OP_ADD
+                { offset_calc.modify(OP_PICK) }
+            }
+        }
+    }
+}
+
+/// Addition of numbers consisting of nibble_count u4's in the parameter bases locations
+/// Requires the addition table and tables_offset to locate the table which should be equal to number of elements on top of the table including operating values
+pub fn u4_add_with_table(nibble_count: u32, bases: Vec<u32>, tables_offset: u32) -> Script {
+    let numbers = bases.len() as u32;
+    script! {
+        { u4_arrange_nibbles(nibble_count, bases)  }
+        { u4_add_internal(nibble_count, numbers, tables_offset) }
+    }
+}
+
+/// Addition of numbers consisting of nibble_count u4's in the parameter bases locations, without the table
+pub fn u4_add_no_table(nibble_count: u32, bases: Vec<u32>) -> Script {
+    let numbers = bases.len() as u32;
+    script! {
+        { u4_arrange_nibbles(nibble_count, bases)  }
+        { u4_add_no_table_internal(nibble_count, numbers) }
+    }
+}
+
+/// Addition of numbers consisting of nibble_count u4's in the parameter bases locations
+/// The overflowing bit (if exists) is omitted
+pub fn u4_add(nibble_count: u32, bases: Vec<u32>, tables_offset: u32, use_add_table: bool) -> Script {
+    if use_add_table {
+        u4_add_with_table(nibble_count, bases, tables_offset)
+    } else {
+        u4_add_no_table(nibble_count, bases)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::treepp::*;
+    use crate::u4::{u4_add::*, u4_std::u4_number_to_nibble};
+    use rand::Rng;
+
+    #[test]
+    fn test_calc() {
+        let x = u4_arrange_nibbles(8, vec![0, 1, 2, 4]);
+        println!("{}", x.len());
+        //let x = u4_add_with_table(8, vec![0, 8, 16, 24, 32], 100);
+        //println!("{}", x.len());
+        let x = u4_add_with_table(8, vec![0, 8, 16, 24], 100);
+        println!("{}", x.len());
+        let x = u4_add_no_table(8, vec![0, 8, 16, 24, 32]);
+        println!("{}", x.len());
+        let x = u4_add_no_table(8, vec![0, 8, 16, 24]);
+        println!("{}", x.len());
+        let x = u4_add_no_table(8, vec![0, 8, 16]);
+        println!("{}", x.len());
+        let x = u4_add_no_table(8, vec![0, 8]);
+        println!("{}", x.len());
+    }
+
+
+    #[test]
+    fn test_add_no_table() {
+        let calc = script! {
+            { u4_add_no_table(8, vec![0, 8, 16, 24]) }
+        };
+        let mut rng = rand::thread_rng();
+        for _ in 0..1000 {
+            for len in 2..5 {
+                let vars: Vec<u32> = (0..len).map(|_| { rng.gen()}).collect(); 
+                let result = vars.iter().fold(0 as u64, |sum, &x| sum + x as u64) % ((1 as u64) << 32); 
+                let script = script! {
+                    for x in vars {
+                        { u4_number_to_nibble(x) }
+                    }
+                    { u4_add_no_table(8,  (0..).step_by(8).take(len.try_into().unwrap()).collect()) }
+                    { u4_number_to_nibble(result.try_into().unwrap()) }
+                    for _ in 0..8 {
+                        OP_FROMALTSTACK
+                    }
+                    for i in 0..8 {
+                        { 8 - i }
+                        OP_ROLL
+                        OP_EQUALVERIFY
+                    }
+                    OP_TRUE
+                };
+                run(script);
+            }
+        }
+        println!("{}", calc.len());
+    }
+
+    #[test]
+    fn test_add_with_table() {
+        let mut rng = rand::thread_rng();
+        for _ in 0..1000 {
+            for len in 2..5 {
+                let vars: Vec<u32> = (0..len).map(|_| { rng.gen()}).collect(); 
+                let result = vars.iter().fold(0 as u64, |sum, &x| sum + x as u64) % ((1 as u64) << 32); 
+                let script = script! {
+                    { u4_push_add_tables() }
+                    for x in vars {
+                        { u4_number_to_nibble(x) }
+                    }
+                    { u4_add_with_table(8,  (0..).step_by(8).take(len.try_into().unwrap()).collect(), len * 8) }
+                    { u4_drop_add_tables() }
+                    { u4_number_to_nibble(result.try_into().unwrap()) }
+                    for _ in 0..8 {
+                        OP_FROMALTSTACK
+                    }
+                    for i in 0..8 {
+                        { 8 - i }
+                        OP_ROLL
+                        OP_EQUALVERIFY
+                    }
+                    OP_TRUE
+                };
+                run(script);
+            }
+        }
+    }
+
+    #[test]
+    fn test_quotient() {
+        for i in 0..65 {
+            let script = script! {
+                { u4_push_quotient_table() }
+                { i as u32 }
+                OP_PICK
+                { i / 16 }
+                OP_EQUALVERIFY
+                { u4_drop_quotient_table() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_modulo() {
+        for i in 0..65 {
+            let script = script! {
+                { u4_push_modulo_table() }
+                { i as u32 }
+                OP_PICK
+                { i % 16 }
+                OP_EQUALVERIFY
+                { u4_drop_modulo_table() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+}
diff --git a/src/u4/u4_add_stack.rs b/bitvm/src/u4/u4_add_stack.rs
similarity index 55%
rename from src/u4/u4_add_stack.rs
rename to bitvm/src/u4/u4_add_stack.rs
index ceb5afa74..1a8fa6ecb 100644
--- a/src/u4/u4_add_stack.rs
+++ b/bitvm/src/u4/u4_add_stack.rs
@@ -1,115 +1,62 @@
-use crate::treepp::{script, Script};
+use crate::treepp::*;
 use bitcoin_script_stack::stack::{StackTracker, StackVariable};
 
-use super::u4_add::{u4_add_no_table_internal, u4_push_modulo_table, u4_push_quotient_table};
+use super::u4_add::{u4_push_modulo_table_5, u4_push_quotient_table_5};
 
+/// Puts the table of the inner function to stack library
 pub fn u4_push_quotient_table_stack(stack: &mut StackTracker) -> StackVariable {
-    stack.var(65, u4_push_quotient_table(), "quotient_table")
+    stack.var(80, u4_push_quotient_table_5(), "quotient_table")
 }
 
+/// Puts the table of the inner function to stack library
 pub fn u4_push_modulo_table_stack(stack: &mut StackTracker) -> StackVariable {
-    stack.var(65, u4_push_modulo_table(), "modulo_table")
+    stack.var(80, u4_push_modulo_table_5(), "modulo_table")
 }
 
+/// Pushes the table for calculating the modulo, i.e. x % 16 for x < 48. i.e. 15 (max u4) * 3 (max # numbers to sum) + 2 (max carry)
 pub fn u4_push_modulo_for_blake(stack: &mut StackTracker) -> StackVariable {
     stack.custom(
         script! {
-            OP_14
-            OP_13
-            OP_12
-            OP_11
-            OP_10
-            OP_9
-            OP_8
-            OP_7
-            OP_6
-            OP_5
-            OP_4
-            OP_3
-            OP_2
-            OP_1
-            OP_0
-            OP_15
-            OP_14
-            OP_13
-            OP_12
-            OP_11
-            OP_10
-            OP_9
-            OP_8
-            OP_7
-            OP_6
-            OP_5
-            OP_4
-            OP_3
-            OP_2
-            OP_1
-            OP_0
-            OP_15
-            OP_14
-            OP_13
-            OP_12
-            OP_11
-            OP_10
-            OP_9
-            OP_8
-            OP_7
-            OP_6
-            OP_5
-            OP_4
-            OP_3
-            OP_2
-            OP_1
-            OP_0
+            for i in (0..48).rev() {
+                { i % 16 }
+            }
         },
         0,
         false,
         0,
         "",
     );
-    stack.define(47, "modulo")
+    stack.define(48, "modulo")
 }
 
+/// Pushes the table for calculating the quotient, i.e. floor(x / 16) for x < 48. i.e. 15 (max u4) * 3 (max # numbers to sum) + 2 (max carry)
 pub fn u4_push_quotient_for_blake(stack: &mut StackTracker) -> StackVariable {
     stack.custom(
         script! {
-            OP_2
-            OP_DUP
-            OP_2DUP
-            OP_2DUP
-            OP_3DUP
-            OP_3DUP
-            OP_3DUP
-            OP_1
-            OP_DUP
-            OP_2DUP
-            OP_3DUP
-            OP_3DUP
-            OP_3DUP
-            OP_3DUP
-            OP_0
-            OP_DUP
-            OP_2DUP
-            OP_3DUP
-            OP_3DUP
-            OP_3DUP
-            OP_3DUP
+            for i in (0..=2).rev() {
+                { i }
+                OP_DUP
+                OP_2DUP
+                OP_3DUP
+                OP_3DUP
+                OP_3DUP
+                OP_3DUP
+            }
         },
         0,
         false,
         0,
         "",
     );
-    stack.define(47, "quotient")
+    stack.define(48, "quotient")
 }
 
-pub fn u4_arrange_nibbles_stack(
-    nibble_count: u32,
-    stack: &mut StackTracker,
-    to_copy: Vec<StackVariable>,
-    mut to_move: Vec<&mut StackVariable>,
-    constants: Vec<u32>,
-) {
+/// Arranges (zips) the given numbers (locations given by the parameters bases) each consisting of nibble_count u4's so each group of nibbles can be proccessed disceretly 
+/// Does not preserve order as it's used with commutative operations
+/// Assuming x_i denoting the i-th part of the x-th number and bases have two numbers a and b (a < b): 
+/// Input:  ... (a elements) a_0 a_1 a_2 a_3 ... (b - a - 1 elements) b_0 b_1 b_2 b_3
+/// Output: b_0 a_0 b_1 a_1 b_2 a_2 b_3 a_3 ... (b elements and the rest of stack)
+pub fn u4_arrange_nibbles_stack(nibble_count: u32, stack: &mut StackTracker, to_copy: Vec<StackVariable>, mut to_move: Vec<&mut StackVariable>, constants: Vec<u32>) {
     let mut constant_parts: Vec<Vec<u32>> = Vec::new();
 
     for n in constants {
@@ -132,13 +79,9 @@ pub fn u4_arrange_nibbles_stack(
     }
 }
 
-pub fn u4_add_internal_stack(
-    stack: &mut StackTracker,
-    nibble_count: u32,
-    number_count: u32,
-    quotient_table: StackVariable,
-    modulo_table: StackVariable,
-) {
+/// Addition of numbers consisting of nibble_count u4's in the parameter bases locations
+/// The overflowing bit (if exists) is omitted
+pub fn u4_add_internal_stack(stack: &mut StackTracker, nibble_count: u32, number_count: u32, quotient_table: StackVariable, modulo_table: StackVariable) {
     for i in 0..nibble_count {
         //extra add to add the carry from previous addition
         if i > 0 {
@@ -167,44 +110,10 @@ pub fn u4_add_internal_stack(
     }
 }
 
-pub fn u4_add_no_table_stack(stack: &mut StackTracker, nibble_count: u32, number_count: u32) {
-    stack.custom(
-        u4_add_no_table_internal(nibble_count, number_count),
-        nibble_count * number_count,
-        false,
-        nibble_count,
-        "add_no_table",
-    );
-}
-
-pub fn u4_add_stack(
-    stack: &mut StackTracker,
-    nibble_count: u32,
-    number_count: u32,
-    to_copy: Vec<StackVariable>,
-    to_move: Vec<&mut StackVariable>,
-    constants: Vec<u32>,
-    quotient_table: StackVariable,
-    modulo_table: StackVariable,
-) {
-    u4_arrange_nibbles_stack(nibble_count, stack, to_copy, to_move, constants);
-    if !modulo_table.is_null() && !quotient_table.is_null() {
-        u4_add_internal_stack(
-            stack,
-            nibble_count,
-            number_count,
-            quotient_table,
-            modulo_table,
-        );
-    } else {
-        u4_add_no_table_stack(stack, nibble_count, number_count);
-    }
-}
-
 #[cfg(test)]
 mod tests {
-
-    use crate::u4::{u4_add_stack::*, u4_std::verify_n};
+    use super::*;
+    use crate::u4::u4_std::verify_n;
 
     #[test]
     fn test_arrange_stack() {
@@ -257,28 +166,6 @@ mod tests {
         assert!(res.success);
     }
 
-    #[test]
-    fn test_add_no_table_stack() {
-        let mut stack = StackTracker::new();
-
-        let mut x = stack.number_u32(0x00112233);
-        let y = stack.number_u32(0x99887766);
-        u4_arrange_nibbles_stack(8, &mut stack, vec![y], vec![&mut x], vec![0xaabbccdd]);
-
-        u4_add_no_table_stack(&mut stack, 8, 3);
-
-        let mut vars = stack.from_altstack_count(8);
-        stack.join_count(&mut vars[0], 7);
-
-        stack.number_u32(0x44556676);
-        stack.custom(verify_n(8), 2, false, 0, "verify");
-        stack.drop(y);
-        stack.op_true();
-
-        let res = stack.run();
-        assert!(res.success);
-    }
-
     #[test]
     fn test_add_for_blake() {
         let mut stack = StackTracker::new();
@@ -305,4 +192,37 @@ mod tests {
         let res = stack.run();
         assert!(res.success);
     }
+
+    #[test]
+    fn test_quotient_for_blake_table() {
+        for i in 0..48 {
+            let mut stack = StackTracker::new();
+            let quotient = u4_push_quotient_for_blake(&mut stack);
+            stack.number(i);
+            stack.op_pick();
+            stack.number(i / 16);
+            stack.op_equal();
+            stack.op_verify();
+            stack.drop(quotient);
+            stack.op_true();
+            let res = stack.run();
+            assert!(res.success);
+        }
+    }
+    #[test]
+    fn test_modulo_for_blake_table() {
+        for i in 0..48 {
+            let mut stack = StackTracker::new();
+            let modulo = u4_push_modulo_for_blake(&mut stack);
+            stack.number(i);
+            stack.op_pick();
+            stack.number(i % 16);
+            stack.op_equal();
+            stack.op_verify();
+            stack.drop(modulo);
+            stack.op_true();
+            let res = stack.run();
+            assert!(res.success);
+        }
+    }
 }
diff --git a/bitvm/src/u4/u4_logic.rs b/bitvm/src/u4/u4_logic.rs
new file mode 100644
index 000000000..aef40d737
--- /dev/null
+++ b/bitvm/src/u4/u4_logic.rs
@@ -0,0 +1,454 @@
+use crate::treepp::*;
+use crate::u4::u4_add::u4_arrange_nibbles;
+use super::u4_std::u4_drop;
+
+/*
+    Full tables for bitwise operations consist of 16x16 elements, operates using OP_PICK on 16 * A + B (A and B being the input numbers)
+    Half tables for bitwise operations consist of 16*17/2=136 elements to save space and to calculate, operates with a triangular shape and ordering the input values
+*/
+
+
+/// Pushes the bitwise XOR table
+pub fn u4_push_full_xor_table() -> Script {
+    script! {
+        for i in (0..16).rev() {
+            for j in (0..16).rev() {
+                {i ^ j}
+            }
+        }
+    }
+}
+
+/// Drops full logic table
+pub fn u4_drop_full_logic_table() -> Script { u4_drop(16 * 16) }
+
+/// Pushes table for the value x * 16 
+pub fn u4_push_full_lookup() -> Script {
+    script! {
+        for i in (0..=256).rev().step_by(16) {
+            { i }
+        }
+    }
+}
+
+/// Drops the table for x * 16
+pub fn u4_drop_full_lookup() -> Script { u4_drop(17) }
+
+/// Pushes the half bitwise XOR table
+pub fn u4_push_half_xor_table() -> Script {
+    script! {
+        for i in (0..16).rev() {
+            for j in (i..16).rev() {
+                {i ^ j}
+            }
+        }
+    }
+}
+
+/// Pushes the half bitwise AND table
+pub fn u4_push_half_and_table() -> Script {
+    script! {
+        OP_15
+        OP_14
+        OP_DUP
+        OP_13
+        OP_12
+        OP_2DUP
+        OP_DUP
+        OP_2DUP
+        OP_11
+        OP_10
+        OP_9
+        OP_8
+        OP_11
+        OP_10
+        OP_DUP
+        OP_8
+        OP_DUP
+        OP_10
+        OP_DUP
+        OP_9
+        OP_8
+        OP_2DUP
+        OP_2DUP
+        OP_2DUP
+        OP_DUP
+        OP_2DUP
+        OP_2DUP
+        OP_2DUP
+        OP_7
+        OP_6
+        OP_5
+        OP_4
+        OP_3
+        OP_2
+        OP_1
+        OP_0
+        OP_7
+        OP_6
+        OP_DUP
+        OP_4
+        OP_DUP
+        OP_2
+        OP_DUP
+        OP_0
+        OP_DUP
+        OP_6
+        OP_DUP
+        OP_5
+        OP_4
+        OP_2DUP
+        OP_1
+        OP_0
+        OP_2DUP
+        OP_5
+        OP_4
+        OP_2DUP
+        OP_DUP
+        OP_2DUP
+        OP_0
+        OP_DUP
+        OP_2DUP
+        OP_4
+        OP_DUP
+        OP_2DUP
+        OP_3
+        OP_2
+        OP_1
+        OP_0
+        OP_2OVER
+        OP_2OVER
+        OP_2OVER
+        OP_2OVER
+        OP_3
+        OP_2
+        OP_DUP
+        OP_0
+        OP_DUP
+        OP_2
+        OP_DUP
+        OP_0
+        OP_DUP
+        OP_2
+        OP_DUP
+        OP_0
+        OP_DUP
+        OP_2
+        OP_DUP
+        OP_1
+        OP_0
+        OP_2DUP
+        OP_2DUP
+        OP_2DUP
+        OP_2DUP
+        OP_2DUP
+        OP_2DUP
+        OP_2DUP
+        OP_DUP
+        OP_2DUP
+        OP_3DUP
+        OP_3DUP
+        OP_3DUP
+        OP_3DUP
+    }
+}
+
+/// Drops half logic table
+pub fn u4_drop_half_table() -> Script { u4_drop(136) }
+
+/// Pushes the table to calculate the order of ordered pairs (a, b) satisfying the conditions a <= b and 0 <= a, b < 16
+pub fn u4_push_half_lookup() -> Script {
+    script! {
+        136
+        135
+        133
+        130
+        126
+        121
+        115
+        108
+        100
+        91
+        81
+        70
+        58
+        45
+        31
+        16
+    }
+}
+
+/// Drops the table that calculates the order of ordered pairs (a, b) satisfying the condition a <= b
+pub fn u4_drop_half_lookup() -> Script { u4_drop(16) }
+
+/// Sorts the top 2 stack values
+pub fn u4_sort() -> Script {
+    script! {
+        OP_2DUP
+        OP_MIN
+        OP_TOALTSTACK
+        OP_MAX
+        OP_FROMALTSTACK
+    }
+}
+
+/// Calculates the logic operation with the given half table, lookup parameter denoting how many elements are there after the table including the two u4 elements
+pub fn u4_half_table_operation(lookup: u32) -> Script {
+    script! {
+        { u4_sort() }
+        { lookup - 1 }
+        OP_ADD
+        OP_PICK
+        { lookup - 2 }
+        OP_ADD
+        OP_ADD
+        OP_PICK
+    }
+}
+
+/// Calculates the logic operation with the given full table, lookup parameter denoting how many elements are there after the table including the two u4 elements
+pub fn u4_full_table_operation(lookup: u32, table: u32) -> Script {
+    script! {
+        { lookup }
+        OP_ADD
+        OP_PICK
+        { table }
+        OP_ADD
+        OP_ADD
+        OP_PICK
+    }
+}
+
+/// Calculates the bitwise XOR of top 2 u4 values using half AND table, lookup parameter denoting how many elements are there after the table including the two u4 elements
+/// Uses the formula a XOR b = (a + b) - 2 * (a AND b)
+pub fn u4_xor_with_half_and_table(lookup: u32) -> Script {
+    script! {
+        OP_2DUP
+        { u4_half_table_operation(lookup + 2) }
+        OP_DUP
+        OP_ADD
+        OP_SUB
+        OP_ADD
+    }
+}
+
+/// Does bitwise operation with bases.len() elements at the top of the stack, both consisting of nibble_count u4's and at the positions of the bases vector (note that existing operations are commutative)
+/// Expects a half logic operation table and offset parameter to locate it, which should be equal to the number of elements after the table including the inputs
+/// Keeps the result at the altstack
+pub fn u4_logic_nibs(nibble_count: u32, mut bases: Vec<u32>, offset: u32, do_xor_with_half_and_table: bool) -> Script {
+    let numbers = bases.len() as u32;
+    bases.sort();
+    script! {
+        { u4_arrange_nibbles(nibble_count, bases) }
+        for nib in 0..nibble_count {
+            for i in 0..numbers-1 {
+                if do_xor_with_half_and_table {
+                    { u4_xor_with_half_and_table( offset - i - nib * numbers ) }
+                } else {
+                    { u4_half_table_operation( offset - i - nib * numbers ) }
+                }
+            }
+            OP_TOALTSTACK
+        }
+    }
+}
+
+/// Calculates the u32 xor of two elements with half and table, given their positions with the bases parameter
+pub fn u4_xor_u32(bases: Vec<u32>, offset: u32, do_xor_with_and: bool) -> Script {
+    u4_logic_nibs(8, bases, offset, do_xor_with_and)
+}
+
+#[cfg(test)]
+mod tests {
+    use rand::Rng;
+    use super::*;
+    use crate::u4::u4_shift::{u4_drop_rshift_tables, u4_push_rshift_tables};
+    use crate::u4::u4_std::{u4_number_to_nibble, u4_u32_verify_from_altstack};
+    
+    #[test]
+    fn test_xor_u32() {
+        let mut rng = rand::thread_rng();
+        for _ in 0..1000 {
+            let len: u32 = rng.gen_range(2..10);
+            let vars: Vec<u32> = (0..len).map(|_| { rng.gen()}).collect();
+            let script = script! {
+                { u4_push_half_xor_table() }
+                { u4_push_half_lookup()}
+                for x in vars.clone() {
+                    { u4_number_to_nibble(x) }
+                }
+                { u4_logic_nibs(8, (0..).step_by(8).take(len.try_into().unwrap()).collect(), 8 * len, false) }
+                { u4_drop_half_lookup() }
+                { u4_drop_half_table() }
+                { u4_number_to_nibble(vars.iter().fold(0, |sum, &x| sum ^ x)) }
+                { u4_u32_verify_from_altstack() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+    #[test]
+    fn test_xor_u32_with_and() {
+        let mut rng = rand::thread_rng();
+        for _ in 0..1000 {
+            let len: u32 = rng.gen_range(2..10);
+            let vars: Vec<u32> = (0..len).map(|_| { rng.gen()}).collect();
+            let script = script! {
+                { u4_push_half_and_table() }
+                { u4_push_half_lookup()}
+                for x in vars.clone() {
+                    { u4_number_to_nibble(x) }
+                }
+                { u4_logic_nibs(8, (0..).step_by(8).take(len.try_into().unwrap()).collect(), 8 * len, true) }
+                { u4_drop_half_lookup() }
+                { u4_drop_half_table() }
+                { u4_number_to_nibble(vars.iter().fold(0, |sum, &x| sum ^ x)) }
+                { u4_u32_verify_from_altstack() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_logic_u32_size() {
+        let xor_x2 = u4_logic_nibs(8, vec![0, 8], 24, true);
+        println!("{}", xor_x2.len());
+        let xor_x3 = u4_logic_nibs(8, vec![0, 8, 16], 24, true);
+        println!("{}", xor_x3.len());
+        let xor_x2 = u4_logic_nibs(8, vec![0, 8], 24, false);
+        println!("{}", xor_x2.len());
+        let xor_x3 = u4_logic_nibs(8, vec![0, 8, 16], 24, false);
+        println!("{}", xor_x3.len());
+    }
+
+    #[test]
+    fn test_and_u32() {
+        let mut rng = rand::thread_rng();
+        for _ in 0..1000 {
+            let len: u32 = rng.gen_range(2..10);
+            let vars: Vec<u32> = (0..len).map(|_| { rng.gen()}).collect();
+            let script = script! {
+                { u4_push_half_and_table() }
+                { u4_push_half_lookup()}
+                for x in vars.clone() {
+                    { u4_number_to_nibble(x) }
+                }
+                { u4_logic_nibs(8, (0..).step_by(8).take(len.try_into().unwrap()).collect(), 8 * len, false) }
+                { u4_drop_half_lookup() }
+                { u4_drop_half_table() }
+                { u4_number_to_nibble(vars.iter().fold(u32::MAX, |sum, &x| sum & x)) }
+                { u4_u32_verify_from_altstack() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_xor_half() {
+        for x in 0..16 {
+            for y in 0..16 {
+                let script = script! {
+                    { u4_push_half_and_table() }
+                    { u4_push_half_lookup()}
+                    {x}    
+                    {y}      
+                    { u4_xor_with_half_and_table(2)}
+                    { x ^ y}
+                    OP_EQUALVERIFY
+                    { u4_drop_half_lookup() }
+                    { u4_drop_half_table() }
+                    OP_TRUE
+                };
+                run(script);
+            }
+        }
+    }
+    #[test]
+    fn test_and_half() {
+        for x in 0..16 {
+            for y in 0..16 {
+                let script = script! {
+                    { u4_push_half_and_table() }
+                    { u4_push_half_lookup()}
+                    {x}      
+                    {y}
+                    { u4_half_table_operation(2)}
+                    { x & y}
+                    OP_EQUALVERIFY
+                    { u4_drop_half_lookup() }
+                    { u4_drop_half_table() }
+                    OP_TRUE
+                };
+                run(script);
+            }
+        }
+    }
+
+    #[test]
+    fn test_xor() {
+        for a in 0..16 {
+            for b in 0..16 {
+                let script = script! {
+                    { u4_push_full_xor_table() }
+                    { u4_push_full_lookup()}
+                    { a }
+                    { b }
+                    { u4_full_table_operation(1, 17)}
+                    { a ^ b }
+                    OP_EQUALVERIFY
+                    { u4_drop_full_lookup() }
+                    { u4_drop_full_logic_table() }
+                    OP_TRUE
+                };
+                run(script);
+            }
+        }
+    }
+
+    #[test]
+    fn test_lookup() {
+        for i in 0..16 {
+            let script = script! {
+                { u4_push_full_lookup() }
+                { i }
+                OP_PICK
+                { 16 * i }
+                OP_EQUALVERIFY
+                { u4_drop_full_lookup() }
+                OP_TRUE
+            };
+            run(script);
+        }
+    }
+
+    #[test]
+    fn test_xor_random_fill() {
+        for a in 0..16 {
+            for b in 0..16 {
+                let script = script! {
+                    { u4_push_full_xor_table() }
+                    { u4_push_full_lookup()}
+                    { u4_push_rshift_tables() } //shift table is not used and added just as an example test
+                    { a }
+                    { b }
+                    { 1 + 1 + 32 }       // offset (X + rshift size is the offset)
+                    OP_ADD
+                    OP_PICK
+                    { 1 + 32 }      // size of rshift
+                    OP_ADD
+                    OP_ADD
+                    OP_PICK
+                    { a ^ b }
+                    OP_EQUALVERIFY
+                    { u4_drop_rshift_tables() }
+                    { u4_drop_full_lookup() }
+                    { u4_drop_full_logic_table() }
+                    OP_TRUE
+                };
+                run(script);
+            }
+        }
+    }
+}
diff --git a/bitvm/src/u4/u4_logic_stack.rs b/bitvm/src/u4/u4_logic_stack.rs
new file mode 100644
index 000000000..b19438eeb
--- /dev/null
+++ b/bitvm/src/u4/u4_logic_stack.rs
@@ -0,0 +1,210 @@
+use crate::treepp::*;
+use bitcoin_script_stack::stack::{StackTracker, StackVariable};
+
+use crate::u4::u4_logic::u4_sort;
+
+use super::{
+    u4_logic::{u4_push_half_and_table, u4_push_half_xor_table, u4_push_full_lookup, u4_push_full_xor_table},
+    u4_shift_stack::u4_rshift_stack,
+};
+
+/// Push half AND table
+pub fn u4_push_half_and_table_stack(stack: &mut StackTracker) -> StackVariable {
+    stack.var(136, u4_push_half_and_table(), "and_table")
+}
+
+/// Push half XOR table
+pub fn u4_push_half_xor_table_stack(stack: &mut StackTracker) -> StackVariable {
+    stack.var(136, u4_push_half_xor_table(), "xor_half_table")
+}
+
+/// Push full XOR table
+pub fn u4_push_full_xor_table_stack(stack: &mut StackTracker) -> StackVariable {
+    stack.var(256, u4_push_full_xor_table(), "xor_full_table")
+}
+
+/// Pushes the table to calculate the order of ordered pairs (a, b) satisfying the conditions a <= b and 0 <= a, b < 15
+pub fn u4_push_half_lookup_0_based() -> Script {
+    script! {
+        120
+        119
+        117
+        114
+        110
+        105
+        99
+        92
+        84
+        75
+        65
+        54
+        42
+        29
+        15
+        0
+    }
+}
+
+/// Pushes table for the value x * 16 
+pub fn u4_push_from_depth_full_lookup(stack: &mut StackTracker, delta: i32) -> StackVariable {
+    for i in (0..16).rev() {
+        stack.numberi((i + 1) * -16 + delta);
+    }
+    let lookup = stack.join_count(&mut stack.get_var_from_stack(15), 15);
+    stack.rename(lookup, "lookup");
+    lookup
+}
+
+/// Pushes the table to calculate the order of ordered pairs (a, b) satisfying the conditions a <= b and 0 <= a, b < 16
+pub fn u4_push_from_depth_half_lookup(stack: &mut StackTracker, delta: i32) -> StackVariable {
+    for i in (1..17).rev() {
+        let diff = ((16 - i) * (16 - i + 1)) / 2;
+        let value = -diff + delta;
+        stack.numberi(value);
+    }
+    let lookup = stack.join_count(&mut stack.get_var_from_stack(15), 15);
+    stack.rename(lookup, "lookup");
+    lookup
+}
+
+/// Pushes the table to calculate the order of ordered pairs (a, b) satisfying the conditions a <= b and 0 <= a, b < 15
+pub fn u4_push_half_lookup_table_0_based_stack(stack: &mut StackTracker) -> StackVariable {
+    stack.var(16, u4_push_half_lookup_0_based(), "lookup_table")
+}
+
+/// Pushes table for the value x * 16 
+pub fn u4_push_full_lookup_table_stack(stack: &mut StackTracker) -> StackVariable {
+    stack.var(17, u4_push_full_lookup(), "full_lookup_table")
+}
+
+/// Does the given logical operation with parameters
+pub fn u4_logic_with_table_stack(stack: &mut StackTracker, lookup_table: StackVariable, logic_table: StackVariable) -> StackVariable {
+    let use_full_table = logic_table.size() > 136;
+    if !use_full_table {
+        stack.custom(u4_sort(), 0, false, 0, "sort");
+    }
+    stack.get_value_from_table(lookup_table, None);
+    stack.op_add();
+    stack.get_value_from_table(logic_table, None)
+}
+
+/// Calculates the bitwise AND of top 2 u4 values using XOR tables
+/// Uses the formula (a and b) = ((a + b) - a XOR b) >> 1
+pub fn u4_and_with_xor_stack(stack: &mut StackTracker, lookup_table: StackVariable, logic_table: StackVariable, shift_table: StackVariable) -> StackVariable {
+    stack.op_2dup();
+    u4_logic_with_table_stack(stack, lookup_table, logic_table);
+    stack.op_sub();
+    stack.op_add();
+    u4_rshift_stack(stack, shift_table, 1)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::u4::u4_shift_stack::u4_push_shift_tables_stack;
+    use bitcoin_script_stack::stack::StackTracker;
+
+    #[test]
+    fn test_and_with_xor_full_table() {
+        for x in 0..16 {
+            for y in 0..16 {
+                let mut stack = StackTracker::new();
+                let xor = u4_push_full_xor_table_stack(&mut stack);
+                let lookup = u4_push_full_lookup_table_stack(&mut stack);
+                let shift = u4_push_shift_tables_stack(&mut stack);
+                stack.number(x);
+                stack.number(y);
+                u4_and_with_xor_stack(&mut stack, lookup, xor, shift);
+                stack.number(x & y);
+                stack.op_equalverify();
+                stack.drop(shift);
+                stack.drop(lookup);
+                stack.drop(xor);
+                stack.op_true();
+                assert!(stack.run().success);
+            }
+        }
+    }
+
+    #[test]
+    fn test_and_with_xor_half_table() {
+        for x in 0..16 {
+            for y in 0..16 {
+                let mut stack = StackTracker::new();
+                let xor = u4_push_half_xor_table_stack(&mut stack);
+                let lookup = u4_push_half_lookup_table_0_based_stack(&mut stack);
+                let shift = u4_push_shift_tables_stack(&mut stack);
+                stack.number(x);
+                stack.number(y);
+                u4_and_with_xor_stack(&mut stack, lookup, xor, shift);
+                stack.number(x & y);
+                stack.op_equalverify();
+                stack.drop(shift);
+                stack.drop(lookup);
+                stack.drop(xor);
+                stack.op_true();
+                assert!(stack.run().success);
+            }
+        }
+    }
+
+    #[test]
+    fn test_xor() {
+        for x in 0..16 {
+            for y in 0..16 {
+                let mut stack = StackTracker::new();
+                let xor = u4_push_full_xor_table_stack(&mut stack);
+                let lookup = u4_push_full_lookup_table_stack(&mut stack);
+                stack.number(x);
+                stack.number(y);
+                u4_logic_with_table_stack(&mut stack, lookup, xor);
+                stack.number(x ^ y);
+                stack.op_equalverify();
+                stack.drop(lookup);
+                stack.drop(xor);
+                stack.op_true();
+                assert!(stack.run().success);
+            }
+        }
+    }
+
+    #[test]
+    fn test_xor_half() {
+        for x in 0..16 {
+            for y in 0..16 {
+                let mut stack = StackTracker::new();
+                let xor = u4_push_half_xor_table_stack(&mut stack);
+                let lookup = u4_push_half_lookup_table_0_based_stack(&mut stack);
+                stack.number(x);
+                stack.number(y);
+                u4_logic_with_table_stack(&mut stack, lookup, xor);
+                stack.number(x ^ y);
+                stack.op_equalverify();
+                stack.drop(lookup);
+                stack.drop(xor);
+                stack.op_true();
+                assert!(stack.run().success);
+            }
+        }
+    }
+
+    #[test]
+    fn test_and_half() {
+        for x in 0..16 {
+            for y in 0..16 {
+                let mut stack = StackTracker::new();
+                let and = u4_push_half_and_table_stack(&mut stack);
+                let lookup = u4_push_half_lookup_table_0_based_stack(&mut stack);
+                stack.number(x);
+                stack.number(y);
+                u4_logic_with_table_stack(&mut stack, lookup, and);
+                stack.number(x & y);
+                stack.op_equalverify();
+                stack.drop(lookup);
+                stack.drop(and);
+                stack.op_true();
+                assert!(stack.run().success);
+            }
+        }
+    }
+}
diff --git a/bitvm/src/u4/u4_rot.rs b/bitvm/src/u4/u4_rot.rs
new file mode 100644
index 000000000..0c8696c44
--- /dev/null
+++ b/bitvm/src/u4/u4_rot.rs
@@ -0,0 +1,150 @@
+use crate::treepp::*;
+use crate::u4::u4_shift::*;
+
+/// Push 2 nib right shift tables, i.e. tables to calculate (16 * Y + X) >> n modulo 16 (which is equal to concatenating two nibbles and shifting them by n)
+pub fn u4_push_rrot_tables() -> Script {
+    script! {
+       {  u4_push_2_nib_rshift_tables() }
+    }
+}
+
+/// Drop 2 nib right shift tables
+pub fn u4_drop_rrot_tables() -> Script {
+    script! {
+        { u4_drop_2_nib_rshift_tables() }
+    }
+}
+
+/// This part changes the order of the nibbles, i.e. it makes the shift/4 part of the operation
+/// It also pushes 0's instead of picking if the operation is shifting, and pushes the extra starting element accordingly for the u4_rrot functions
+pub fn u4_prepare_number(shift: u32, number_pos: u32, is_shift: bool) -> Script {
+    let pos_shift = shift / 4;
+    let pos_shift_extra = pos_shift + 1;
+    script! {
+        for _ in (8 - pos_shift_extra)..8 {
+            if is_shift {
+                OP_0
+            } else {
+                { number_pos + 7 - (8 - pos_shift_extra) }
+                OP_PICK
+            }
+        }
+        for _ in 0..(8 - pos_shift) {
+            { number_pos + 7 + pos_shift_extra }
+            OP_PICK
+        }
+    }
+}
+
+/// This part changes the values of the nibbles, i.e. it makes the shift%4 part of the operation
+/// number_pos is equal to the number of elements after the number in stack
+pub fn u4_rrot(shift: u32, number_pos: u32, shift_tables: u32, is_shift: bool) -> Script {
+    let bit_shift = shift % 4;
+    script! {
+        { u4_prepare_number(shift, number_pos, is_shift) }
+        if bit_shift == 0 {
+            for _ in 0..8 {
+                OP_TOALTSTACK
+            }
+            OP_DROP
+        } else {
+            for i in 0..8 {
+                if i == 7 {
+                    OP_SWAP
+                    { u4_2_nib_rshift_n(bit_shift, shift_tables - 2 + (9 - i)) }
+                } else {
+                    OP_OVER
+                    { u4_2_nib_rshift_n(bit_shift, shift_tables - 2 + (10 - i)) }
+                }
+                OP_TOALTSTACK
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::u4::u4_std::{u4_drop, u4_number_to_nibble};
+    use rand::Rng;
+
+    fn rrot(x: u32, n: u32) -> u32 {
+        if n == 0 {
+            return x;
+        }
+        (x >> n) | (x << (32 - n))
+    }
+
+    fn rshift(x: u32, n: u32) -> u32 {
+        if n == 0 {
+            return x;
+        }
+        x >> n
+    }
+
+    #[test]
+    fn test_rrot() {
+        let mut rng = rand::thread_rng();
+        for _ in 0..1000 {
+            let x: u32 = rng.gen();
+            for n in 1..31 {
+                let script = script! {
+                    { u4_push_rrot_tables() }
+                    { u4_number_to_nibble(x) }
+
+                    { u4_rrot(n, 0, 8, false) }
+
+                    { u4_drop(8) }
+                    { u4_drop_rrot_tables() }
+
+                    { u4_number_to_nibble(rrot(x, n)) } //OP_FROMALTSTACK
+
+                    for _ in 0..8 {
+                        OP_FROMALTSTACK
+                    }
+                    for i in 0..8 {
+                        { 8 - i}
+                        OP_ROLL
+                        OP_EQUALVERIFY
+                    }
+
+                    OP_TRUE
+                };
+                run(script);
+            }
+        }
+    }
+
+    #[test]
+    fn test_rshift() {
+        let mut rng = rand::thread_rng();
+        for _ in 0..1000 {
+            let x: u32 = rng.gen();
+            for n in 1..31 {
+                let script = script! {
+                    { u4_push_rrot_tables() }
+                    { u4_number_to_nibble(x) }
+
+                    { u4_rrot(n, 0, 8, true ) }
+
+                    { u4_drop(8) }
+                    { u4_drop_rrot_tables() }
+
+                    { u4_number_to_nibble(rshift(x, n)) } //OP_FROMALTSTACK
+
+                    for _ in 0..8 {
+                        OP_FROMALTSTACK
+                    }
+                    for i in 0..8 {
+                        { 8 - i}
+                        OP_ROLL
+                        OP_EQUALVERIFY
+                    }
+
+                    OP_TRUE
+                };
+                run(script);
+            }
+        }
+    }
+}
diff --git a/bitvm/src/u4/u4_shift.rs b/bitvm/src/u4/u4_shift.rs
new file mode 100644
index 000000000..d48726837
--- /dev/null
+++ b/bitvm/src/u4/u4_shift.rs
@@ -0,0 +1,199 @@
+use crate::treepp::*;
+use super::u4_std::u4_drop;
+
+/// Pushes the u4 left shift table, which calculates (x << b) % 16 with OP_PICK'ing (x + 16 * (b - 1))
+pub fn u4_push_lshift_tables() -> Script {
+    script! {
+        OP_8
+        OP_0
+        OP_2DUP
+        OP_2DUP
+        OP_2DUP
+        OP_2DUP
+        OP_2DUP
+        OP_2DUP
+        OP_2DUP
+        OP_12
+        OP_8
+        OP_4
+        OP_0
+        OP_2OVER
+        OP_2OVER
+        OP_2OVER
+        OP_2OVER
+        OP_2OVER
+        OP_2OVER
+        OP_14
+        OP_12
+        OP_10
+        OP_8
+        OP_6
+        OP_4
+        OP_2
+        OP_0
+        OP_14
+        OP_12
+        OP_10
+        OP_8
+        OP_6
+        OP_4
+        OP_2
+        OP_0
+    }
+}
+
+/// Drop the u4 left shift table
+pub fn u4_drop_lshift_tables() -> Script { u4_drop(16 * 3) }
+
+/// Pushes the right shift table, which calculates (x >> b) for b < 3 with OP_PICK'ing (x + 16 * (b - 1))
+pub fn u4_push_rshift_tables() -> Script {
+    script! {
+        OP_3
+        OP_DUP
+        OP_2DUP
+        OP_2
+        OP_DUP
+        OP_2DUP
+        OP_1
+        OP_DUP
+        OP_2DUP
+        OP_0
+        OP_DUP
+        OP_2DUP
+
+        OP_7
+        OP_DUP
+        OP_6
+        OP_DUP
+        OP_5
+        OP_DUP
+        OP_4
+        OP_DUP
+        OP_3
+        OP_DUP
+        OP_2
+        OP_DUP
+        OP_1
+        OP_DUP
+        OP_0
+        OP_DUP
+    }
+}
+
+/// Drops the u4 right shift table
+pub fn u4_drop_rshift_tables() -> Script { u4_drop(16 * 2) }
+
+/// Pushes u4 left and right shift tables
+pub fn u4_push_2_nib_rshift_tables() -> Script {
+    script! {
+       { u4_push_lshift_tables() }
+       { u4_push_rshift_tables() }
+    }
+}
+
+/// Drops u4 left and right shift tables
+pub fn u4_drop_2_nib_rshift_tables() -> Script {
+    script! {
+       { u4_drop_rshift_tables() }
+       { u4_drop_lshift_tables() }
+    }
+}
+
+/// Calculates n'th left shift of the top u4 element with the u4_lshift_tables
+pub fn u4_lshift(n: u32, lshift_offset: u32) -> Script {
+    assert!((1..4).contains(&n));
+    script! {
+        { lshift_offset + (16 * (n - 1)) }
+        OP_ADD
+        OP_PICK
+    }
+}
+
+/// Calculates n'th right shift of the top u4 element with the u4_rshift_tables
+pub fn u4_rshift(n: u32, rshift_offset: u32) -> Script {
+    assert!((1..4).contains(&n));
+    script! {
+        if n == 3 {
+            8
+            OP_GREATERTHANOREQUAL
+        } else {
+            { rshift_offset + (16 * (n - 1)) }
+            OP_ADD
+            OP_PICK
+        }
+    }
+}
+
+/// Assuming the u4 numbers X and Y are on top of the stack, calculates (16 * Y + X) >> n modulo 16
+/// Expects 2_nib_shift_tables at the stack, and offset as a parameter to locate the table (which should be equal to number of elements after the tables not including X and Y)
+pub fn u4_2_nib_rshift_n(n: u32, tables_offset: u32) -> Script {
+    assert!((1..4).contains(&n));
+    script! {
+        { u4_lshift(4 - n, tables_offset + (16 * 2) + 1)  }
+        OP_SWAP
+        { u4_rshift(n, tables_offset + 1)  }
+        OP_ADD
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_lshift() {
+        for n in 1..4 {
+            for x in 0..16 {
+                let script = script! {
+                    { u4_push_lshift_tables() }
+                    { x }
+                    { u4_lshift(n, 0)}
+                    { (x << n) % 16 }
+                    OP_EQUALVERIFY
+                    { u4_drop_lshift_tables() }
+                    OP_TRUE
+                };
+                run(script);
+            }
+        }
+    }
+
+    #[test]
+    fn test_rshift() {
+        for n in 1..4 {
+            for x in 0..16 {
+                let script = script! {
+                    { u4_push_rshift_tables() }
+                    { x }
+                    { u4_rshift(n, 0) }
+                    { x >> n }
+                    OP_EQUALVERIFY
+                    { u4_drop_rshift_tables() }
+                    OP_TRUE
+                };
+                run(script);
+            }
+        }
+    }
+
+    #[test]
+    fn test_2_nib_rshift_function() {
+        for n in 1..4 {
+            for y in 0..16 {
+                for x in 0..16 {
+                    let script = script! {
+                        { u4_push_2_nib_rshift_tables() }
+                        { x }
+                        { y }         
+                        { u4_2_nib_rshift_n(n, 0) }
+                        { (((y << 4) + x) >> n) % 16 }
+                        OP_EQUALVERIFY
+                        { u4_drop_2_nib_rshift_tables() }
+                        OP_TRUE
+                    };
+                    run(script);
+                }
+            }
+        }
+    }
+}
diff --git a/src/u4/u4_shift_stack.rs b/bitvm/src/u4/u4_shift_stack.rs
similarity index 67%
rename from src/u4/u4_shift_stack.rs
rename to bitvm/src/u4/u4_shift_stack.rs
index a68863940..3b897d1c9 100644
--- a/src/u4/u4_shift_stack.rs
+++ b/bitvm/src/u4/u4_shift_stack.rs
@@ -1,7 +1,31 @@
-use super::u4_shift::{u4_push_lshift_tables, u4_push_rshift_tables};
-use crate::treepp::{script, Script};
-use bitcoin_script_stack::stack::{StackTracker, StackVariable};
+use bitcoin_script::Script;
+use bitcoin_script_stack::stack::{script, StackTracker, StackVariable};
+use super::u4_shift::u4_push_lshift_tables;
 
+/// Pushes the right shift table, which calculates (x >> b) for {b = 1, 0 <= x < 31 (sum of two numbers)} and {b = 2, 0 <= x < 16}
+pub fn u4_push_rshift_tables() -> Script {
+    script! {
+        OP_3
+        OP_DUP
+        OP_2DUP
+        OP_2
+        OP_DUP
+        OP_2DUP
+        OP_1
+        OP_DUP
+        OP_2DUP
+        OP_0
+        OP_DUP
+        OP_2DUP
+
+        for i in (0..16).rev() {
+            { i }
+            OP_DUP
+        }
+    }
+}
+
+/// Pushes left and right shift tables
 pub fn u4_push_shift_tables_stack(stack: &mut StackTracker) -> StackVariable {
     stack.var(
         16 * 6,
@@ -10,16 +34,23 @@ pub fn u4_push_shift_tables_stack(stack: &mut StackTracker) -> StackVariable {
     )
 }
 
+/// Calculates n'th right shift of the top u4 element with both tables
 pub fn u4_rshift_stack(stack: &mut StackTracker, tables: StackVariable, n: u32) -> StackVariable {
-    assert!(n > 0 && n <= 3);
-    stack.get_value_from_table(tables, Some(16 * (n - 1)))
+    assert!((1..4).contains(&n));
+    if n == 3 {
+        stack.number(8);
+        return stack.op_greaterthanorequal();
+    }
+    stack.get_value_from_table(tables, Some(32 * (n - 1)))
 }
 
+/// Calculates n'th left shift of the top u4 element with both tables
 pub fn u4_lshift_stack(stack: &mut StackTracker, tables: StackVariable, n: u32) -> StackVariable {
-    assert!(n > 0 && n <= 3);
-    stack.get_value_from_table(tables, Some((16 * 3) + 16 * (n - 1)))
+    assert!((1..4).contains(&n));
+    stack.get_value_from_table(tables, Some(16*3 + 16 * (n - 1)))
 }
 
+/// Table for multiplication by two
 pub fn u4_push_shift_for_blake(stack: &mut StackTracker) -> StackVariable {
     stack.custom(
         script! {
@@ -39,52 +70,36 @@ pub fn u4_push_shift_for_blake(stack: &mut StackTracker) -> StackVariable {
             OP_4
             OP_2
             OP_0
-
-            OP_1
-            OP_DUP
-            OP_2DUP
-            OP_2DUP
-            OP_2DUP
-            OP_0
-            OP_DUP
-            OP_2DUP
-            OP_2DUP
-            OP_2DUP
         },
         0,
         false,
         0,
         "",
     );
-    stack.define(32, "lshift1-rshift3")
+    stack.define(16, "lshift1")
 }
 
-// Assumes Y and X are on the stack and will produce YX >> n
-// It calculates the offset doing (Y << (4-n)) & 15 + (X >> n) & 15
-pub fn u4_2_nib_shift_stack(
-    stack: &mut StackTracker,
-    tables: StackVariable,
-    n: u32,
-) -> StackVariable {
-    assert!(n > 0 && n <= 3);
+/// Assuming the u4 numbers X and Y are on top of the stack, calculates (16 * Y + X) >> n modulo 16
+pub fn u4_2_nib_shift_stack(stack: &mut StackTracker, tables: StackVariable, n: u32) -> StackVariable {
+    assert!((1..4).contains(&n));
     u4_lshift_stack(stack, tables, 4 - n);
     stack.op_swap();
     u4_rshift_stack(stack, tables, n);
     stack.op_add()
 }
 
+/// Assuming the u4 numbers X and Y are on top of the stack, calculates (16 * Y + X) >> 3 modulo 16
 pub fn u4_2_nib_shift_blake(stack: &mut StackTracker, tables: StackVariable) -> StackVariable {
-    stack.get_value_from_table(tables, None);
+    stack.number(8);
+    stack.op_greaterthanorequal();
     stack.op_swap();
-    stack.get_value_from_table(tables, Some(16));
+    stack.get_value_from_table(tables, None);
     stack.op_add()
 }
 
 #[cfg(test)]
 mod tests {
-
     use super::*;
-    use bitcoin_script_stack::stack::StackTracker;
 
     #[test]
     fn test_lshift() {
@@ -104,14 +119,18 @@ mod tests {
     }
 
     #[test]
-    fn test_rshift_func() {
+    fn test_rshift() {
         for n in 1..4 {
-            for x in 0..16 {
+            let mut max_x = 15;
+            if n == 1 {
+                max_x = 30;
+            }
+            for x in 0..=max_x {
                 let mut stack = StackTracker::new();
                 let tables = u4_push_shift_tables_stack(&mut stack);
                 stack.number(x);
                 u4_rshift_stack(&mut stack, tables, n);
-                stack.number((x >> n) % 16);
+                stack.number(x >> n);
                 stack.op_equalverify();
                 stack.drop(tables);
                 stack.op_true();
diff --git a/src/u4/u4_std.rs b/bitvm/src/u4/u4_std.rs
similarity index 81%
rename from src/u4/u4_std.rs
rename to bitvm/src/u4/u4_std.rs
index c74ea07d8..3b6294892 100644
--- a/src/u4/u4_std.rs
+++ b/bitvm/src/u4/u4_std.rs
@@ -1,8 +1,7 @@
-use crate::treepp::{script, Script};
+use crate::treepp::*;
 use bitcoin::{opcodes::all::*, Opcode};
 
-// helper functions used on the rest of the u4 code
-
+/// u4 to altstack
 pub fn u4_toaltstack(n: u32) -> Script {
     script! {
         for _ in 0..n {
@@ -11,6 +10,7 @@ pub fn u4_toaltstack(n: u32) -> Script {
     }
 }
 
+/// u4 from altstack
 pub fn u4_fromaltstack(n: u32) -> Script {
     script! {
         for _ in 0..n {
@@ -19,6 +19,7 @@ pub fn u4_fromaltstack(n: u32) -> Script {
     }
 }
 
+/// Picks (or copies) an u32 number consisting of u4 elements from stack
 pub fn u4_copy_u32_from(address: u32) -> Script {
     script! {
         for _ in 0..8 {
@@ -28,6 +29,7 @@ pub fn u4_copy_u32_from(address: u32) -> Script {
     }
 }
 
+/// Rolls (or gets) an u32 number consisting of u4 elements from stack
 pub fn u4_move_u32_from(address: u32) -> Script {
     script! {
         for _ in 0..8 {
@@ -37,6 +39,7 @@ pub fn u4_move_u32_from(address: u32) -> Script {
     }
 }
 
+/// Checks if the top 2n elements have the period n, i.e. are in the form a, b, c ..., a, b, c ...
 pub fn verify_n(n: u32) -> Script {
     script! {
         for i in 0..n {
@@ -47,6 +50,7 @@ pub fn verify_n(n: u32) -> Script {
     }
 }
 
+/// Verifies if the u32 elements on the top of the altstack and the stack is the same
 pub fn u4_u32_verify_from_altstack() -> Script {
     script! {
         for _ in 0..8 {
@@ -61,6 +65,7 @@ pub fn u4_u32_verify_from_altstack() -> Script {
     }
 }
 
+/// Drops n u4 (1 element) elements of the stack
 pub fn u4_drop(n: u32) -> Script {
     script! {
         for _ in 0..n / 2 {
@@ -72,8 +77,8 @@ pub fn u4_drop(n: u32) -> Script {
     }
 }
 
+/// Divides the number onto u4 parts and push them to the stack, least significant part being on the top
 pub fn u4_number_to_nibble(n: u32) -> Script {
-    //constant number used during "compile" time
     script! {
        for i in (0..8).rev() {
             { (n >> (i * 4)) & 0xF }
@@ -81,6 +86,7 @@ pub fn u4_number_to_nibble(n: u32) -> Script {
     }
 }
 
+/// Divides the hex number onto u4 parts and push them to the stack, least significant part being on the top
 pub fn u4_hex_to_nibbles(hex_str: &str) -> Script {
     let nibbles: Result<Vec<u8>, std::num::ParseIntError> = hex_str
         .chars()
@@ -94,6 +100,7 @@ pub fn u4_hex_to_nibbles(hex_str: &str) -> Script {
     }
 }
 
+/// Pushes the number n count times
 pub fn u4_repeat_number(n: u32, count: u32) -> Script {
     match count {
         0 => script! {},
@@ -121,6 +128,7 @@ pub trait CalculateOffset {
 }
 
 impl CalculateOffset for i32 {
+    /// To calculate the place of the tables on the stack, opcodes are pushed with this function in certain parts
     fn modify(&mut self, element: Opcode) -> Script {
         match element {
             OP_TOALTSTACK | OP_ADD => *self -= 1,
@@ -136,22 +144,21 @@ impl CalculateOffset for i32 {
 }
 #[cfg(test)]
 mod tests {
-
-    use crate::treepp::{execute_script, script};
+    use super::*;
     use crate::u4::u4_std::u4_number_to_nibble;
     use super::{u4_hex_to_nibbles, u4_repeat_number};
 
     #[test]
     fn test_repeat() {
         for n in 0..30 {
-            let s = script! {
+            let script = script! {
                 { u4_repeat_number(1, n) }
                 for _ in 0..n {
                     OP_DROP
                 }
                 OP_TRUE
             };
-            assert!(execute_script(s).success);
+            run(script);
         }
     }
 
@@ -177,9 +184,7 @@ mod tests {
             OP_EQUALVERIFY
             OP_TRUE
         };
-
-        let res = execute_script(script);
-        assert!(res.success);
+        run(script);
     }
 
     #[test]
@@ -204,8 +209,6 @@ mod tests {
             OP_EQUALVERIFY
             OP_TRUE
         };
-
-        let res = execute_script(script);
-        assert!(res.success);
+        run(script);
     }
 }
diff --git a/bridge/Cargo.toml b/bridge/Cargo.toml
new file mode 100644
index 000000000..46f263730
--- /dev/null
+++ b/bridge/Cargo.toml
@@ -0,0 +1,64 @@
+[package]
+name = "bridge"
+version = "0.1.0"
+edition = "2021"
+exclude = ["tests"]
+
+[dependencies]
+bitvm = { path = "../bitvm" }
+bitcoin-script.workspace = true
+bitcoin.workspace = true
+strum.workspace = true
+strum_macros.workspace = true
+hex.workspace = true
+bitcoin-scriptexec.workspace = true
+serde.workspace = true
+num-traits.workspace = true
+sha2.workspace = true
+tokio.workspace = true
+esplora-client.workspace = true
+serde_json.workspace = true
+rand.workspace = true
+dotenv.workspace = true
+aws-sdk-s3.workspace = true
+regex.workspace = true
+musig2.workspace = true
+futures.workspace = true
+async-trait.workspace = true
+suppaftp.workspace = true
+openssh-sftp-client.workspace = true
+openssh.workspace = true
+alloy.workspace = true
+clap.workspace = true
+toml.workspace = true
+colored.workspace = true
+itertools.workspace = true
+serial_test.workspace = true
+ark-bn254.workspace = true
+ark-groth16.workspace = true
+ark-ff.workspace = true
+ark-std.workspace = true
+ark-ec.workspace = true
+ark-crypto-primitives.workspace = true
+ark-serialize.workspace = true
+ark-relations.workspace = true
+secp256k1.workspace = true
+zstd = "0.13.2"
+bitcode = "0.6.3"
+human_bytes = { version = "0.4", features = ["fast"] }
+
+[profile.dev]
+opt-level = 3
+
+[profile.release]
+lto = true
+
+[profile.profiling]
+inherits = "release"
+debug = true
+
+[[bin]]
+name = "bridge"
+
+[[bin]]
+name = "bridge-query"
diff --git a/bridge/src/bin/bridge-query/main.rs b/bridge/src/bin/bridge-query/main.rs
new file mode 100644
index 000000000..b68475036
--- /dev/null
+++ b/bridge/src/bin/bridge-query/main.rs
@@ -0,0 +1,50 @@
+use bitcoin::Network;
+use bridge::{client::cli::query_command::QueryCommand, constants::DestinationNetwork};
+use clap::{arg, command};
+use std::error::Error;
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn Error>> {
+    let command = command!() // requires `cargo` feature
+        .propagate_version(true)
+        .subcommand_required(true)
+        .arg_required_else_help(true)
+        .subcommand(QueryCommand::depositor_command())
+        .subcommand(QueryCommand::withdrawer_command())
+        .subcommand(QueryCommand::history_command())
+        .subcommand(QueryCommand::transactions_command())
+        .subcommand(QueryCommand::signatures_command())
+        .subcommand(QueryCommand::broadcast_command())
+        .subcommand(QueryCommand::peg_in_graphs_command())
+        .arg(arg!(-e --environment <ENVIRONMENT> "Specify the Bitcoin and L2 network environment (mainnet, testnet, local)").required(false)
+        .default_value("testnet"))
+        .arg(arg!(-p --prefix <PREFIX> "Prefix for local file cache path").required(false));
+
+    let matches = command.clone().get_matches();
+    let (source_network, destination_network) =
+        match matches.get_one::<String>("environment").unwrap().as_str() {
+            "mainnet" => (Network::Bitcoin, DestinationNetwork::Ethereum),
+            "testnet" => (Network::Testnet, DestinationNetwork::EthereumSepolia),
+            "local" => (Network::Regtest, DestinationNetwork::Local),
+            _ => {
+                eprintln!("Invalid environment. Use mainnet, testnet.");
+                std::process::exit(1)
+            }
+        };
+    let prefix = matches.get_one::<String>("prefix").map(|s| s.as_str());
+
+    let mut query = QueryCommand::new(source_network, destination_network, prefix).await;
+    let resp = match matches.subcommand() {
+        Some(("depositor", sub)) => query.handle_depositor(sub).await,
+        Some(("withdrawer", sub)) => query.handle_withdrawer(sub, destination_network).await,
+        Some(("history", sub)) => query.handle_history(sub, destination_network).await,
+        Some(("transactions", sub)) => query.handle_transactions(sub, destination_network).await,
+        Some(("signatures", sub)) => query.handle_signatures(sub, destination_network).await,
+        Some(("broadcast", sub)) => query.handle_broadcast(sub).await,
+        Some(("pegins", _)) => query.handle_peg_in_graphs().await,
+        _ => unreachable!(),
+    };
+
+    resp.flush();
+    Ok(())
+}
diff --git a/bridge/src/bin/bridge/main.rs b/bridge/src/bin/bridge/main.rs
new file mode 100644
index 000000000..e42ccfa07
--- /dev/null
+++ b/bridge/src/bin/bridge/main.rs
@@ -0,0 +1,111 @@
+use bitcoin::PublicKey;
+use bridge::client::cli::client_command::{ClientCommand, CommonArgs};
+use bridge::client::cli::key_command::KeysCommand;
+use clap::{arg, command};
+use std::error::Error;
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn Error>> {
+    // Load environment variables from .env file
+    dotenv::dotenv().ok();
+
+    let command = command!() // requires `cargo` feature
+        .propagate_version(true)
+        .subcommand_required(true)
+        .arg_required_else_help(true)
+        .arg(
+            arg!(--"key-dir" <DIRECTORY> "The directory containing the private keys").required(false).env("KEY_DIR"),
+        )
+        .arg(
+            arg!(-f --verifiers [VERIFIER_PUBKEYS] "Comma-separated list of verifier public keys")
+                .required(false)
+                .num_args(0..1000)
+                .value_delimiter(',')
+                .value_parser(clap::value_parser!(PublicKey))
+                .env("VERIFIERS"),
+        )
+        .arg(arg!(-e --environment <ENVIRONMENT> "Specify the Bitcoin network environment (mainnet, testnet, regtest)").required(false).default_value("testnet").env("ENVIRONMENT"))
+        .arg(arg!(-p --"user-profile" <USER_PROFILE> "Name of the protocol participant (e.g. 'operator_one', 'verifier_0'). Used as a namespace separator in the local file path for storing private and public client data").required(false).default_value("default_user").env("USER_PROFILE"))
+        .subcommand(KeysCommand::get_command())
+        .subcommand(ClientCommand::get_operator_address_command())
+        .subcommand(ClientCommand::get_operator_utxos_command())
+        .subcommand(ClientCommand::get_depositor_address_command())
+        .subcommand(ClientCommand::get_depositor_utxos_command())
+        .subcommand(ClientCommand::get_initiate_peg_in_command())
+        .subcommand(ClientCommand::get_create_peg_out_graph_command())
+        .subcommand(ClientCommand::get_push_nonces_command())
+        .subcommand(ClientCommand::get_push_signature_command())
+        .subcommand(ClientCommand::get_mock_l2_pegout_event_command())
+        .subcommand(ClientCommand::get_status_command())
+        .subcommand(ClientCommand::get_broadcast_command())
+        .subcommand(ClientCommand::get_automatic_command())
+        .subcommand(ClientCommand::get_interactive_command());
+
+    let matches = command.clone().get_matches();
+
+    let global_args = CommonArgs {
+        key_dir: matches.get_one::<String>("key-dir").cloned(),
+        verifiers: matches
+            .get_many::<PublicKey>("verifiers")
+            .map(|x| x.cloned().collect::<Vec<PublicKey>>()),
+        environment: matches.get_one::<String>("environment").cloned(),
+        path_prefix: matches.get_one::<String>("user-profile").cloned(),
+    };
+
+    if let Some(sub_matches) = matches.subcommand_matches("keys") {
+        let keys_command = KeysCommand::new(global_args.key_dir);
+        keys_command.handle_command(sub_matches)?;
+    } else if matches.subcommand_matches("get-operator-address").is_some() {
+        let mut client_command = ClientCommand::new(global_args).await;
+        let _ = client_command.handle_get_operator_address().await;
+    } else if matches.subcommand_matches("get-operator-utxos").is_some() {
+        let mut client_command = ClientCommand::new(global_args).await;
+        let _ = client_command.handle_get_operator_utxos().await;
+    } else if matches
+        .subcommand_matches("get-depositor-address")
+        .is_some()
+    {
+        let mut client_command = ClientCommand::new(global_args).await;
+        let _ = client_command.handle_get_depositor_address().await;
+    } else if matches.subcommand_matches("get-depositor-utxos").is_some() {
+        let mut client_command = ClientCommand::new(global_args).await;
+        let _ = client_command.handle_get_depositor_utxos().await;
+    } else if let Some(sub_matches) = matches.subcommand_matches("initiate-peg-in") {
+        let mut client_command = ClientCommand::new(global_args).await;
+        let _ = client_command
+            .handle_initiate_peg_in_command(sub_matches)
+            .await;
+    } else if let Some(sub_matches) = matches.subcommand_matches("create-peg-out") {
+        let mut client_command = ClientCommand::new(global_args).await;
+        let _ = client_command
+            .handle_create_peg_out_graph_command(sub_matches)
+            .await;
+    } else if let Some(sub_matches) = matches.subcommand_matches("push-nonces") {
+        let mut client_command = ClientCommand::new(global_args).await;
+        let _ = client_command.handle_push_nonces_command(sub_matches).await;
+    } else if let Some(sub_matches) = matches.subcommand_matches("push-signatures") {
+        let mut client_command = ClientCommand::new(global_args).await;
+        let _ = client_command
+            .handle_push_signature_command(sub_matches)
+            .await;
+    } else if let Some(sub_matches) = matches.subcommand_matches("mock-l2-pegout-event") {
+        let mut client_command = ClientCommand::new(global_args).await;
+        let _ = client_command
+            .handle_mock_l2_pegout_event_command(sub_matches)
+            .await;
+    } else if matches.subcommand_matches("status").is_some() {
+        let mut client_command = ClientCommand::new(global_args).await;
+        let _ = client_command.handle_status_command().await;
+    } else if let Some(sub_matches) = matches.subcommand_matches("broadcast") {
+        let mut client_command = ClientCommand::new(global_args).await;
+        let _ = client_command.handle_broadcast_command(sub_matches).await;
+    } else if matches.subcommand_matches("automatic").is_some() {
+        let mut client_command = ClientCommand::new(global_args).await;
+        let _ = client_command.handle_automatic_command().await;
+    } else if matches.subcommand_matches("interactive").is_some() {
+        let mut client_command = ClientCommand::new(global_args).await;
+        let _ = client_command.handle_interactive_command(&command).await;
+    }
+
+    Ok(())
+}
diff --git a/bridge/src/client/chain/chain.rs b/bridge/src/client/chain/chain.rs
new file mode 100644
index 000000000..207a85a24
--- /dev/null
+++ b/bridge/src/client/chain/chain.rs
@@ -0,0 +1,63 @@
+use bitcoin::{Amount, OutPoint, PubkeyHash, PublicKey};
+use serde::{Deserialize, Serialize};
+
+use super::{chain_adaptor::ChainAdaptor, mock_adaptor::MockAdaptor};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug)]
+pub struct PegOutEvent {
+    pub withdrawer_chain_address: String,
+    pub withdrawer_destination_address: String,
+    pub withdrawer_public_key_hash: PubkeyHash,
+    pub source_outpoint: OutPoint,
+    pub amount: Amount,
+    pub operator_public_key: PublicKey,
+    pub timestamp: u32,
+    pub tx_hash: Vec<u8>,
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug)]
+pub struct PegOutBurntEvent {
+    pub withdrawer_chain_address: String,
+    pub source_outpoint: OutPoint,
+    pub amount: Amount,
+    pub operator_public_key: PublicKey,
+    pub timestamp: u32,
+    pub tx_hash: Vec<u8>,
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug)]
+pub struct PegInEvent {
+    pub depositor: String,
+    pub amount: Amount,
+    pub depositor_pubkey: PublicKey,
+}
+
+pub struct Chain {
+    adaptor: Box<dyn ChainAdaptor>,
+}
+
+impl Default for Chain {
+    fn default() -> Self { Self::new(Box::new(MockAdaptor::new(None))) }
+}
+
+impl Chain {
+    pub fn new(adaptor: Box<dyn ChainAdaptor>) -> Self { Self { adaptor } }
+
+    pub async fn get_peg_out_init(&self) -> Result<Vec<PegOutEvent>, String> {
+        match self.adaptor.get_peg_out_init_event().await {
+            Ok(events) => Ok(events),
+            Err(err) => Err(err.to_string()),
+        }
+    }
+
+    pub async fn get_peg_out_burnt(&self) -> Result<Vec<PegOutBurntEvent>, String> {
+        match self.adaptor.get_peg_out_burnt_event().await {
+            Ok(events) => Ok(events),
+            Err(err) => Err(err.to_string()),
+        }
+    }
+
+    pub async fn get_peg_in_minted(&self) -> Result<Vec<PegInEvent>, String> {
+        self.adaptor.get_peg_in_minted_event().await
+    }
+}
diff --git a/bridge/src/client/chain/chain_adaptor.rs b/bridge/src/client/chain/chain_adaptor.rs
new file mode 100644
index 000000000..bc950a8e5
--- /dev/null
+++ b/bridge/src/client/chain/chain_adaptor.rs
@@ -0,0 +1,30 @@
+use async_trait::async_trait;
+
+use crate::constants::DestinationNetwork;
+
+use super::chain::PegInEvent;
+use super::chain::PegOutBurntEvent;
+use super::chain::PegOutEvent;
+use super::ethereum_adaptor::EthereumAdaptor;
+use super::ethereum_adaptor::EthereumInitConfig;
+use super::mock_adaptor::MockAdaptor;
+use super::mock_adaptor::MockAdaptorConfig;
+
+#[async_trait]
+pub trait ChainAdaptor {
+    async fn get_peg_out_init_event(&self) -> Result<Vec<PegOutEvent>, String>;
+    async fn get_peg_out_burnt_event(&self) -> Result<Vec<PegOutBurntEvent>, String>;
+    async fn get_peg_in_minted_event(&self) -> Result<Vec<PegInEvent>, String>;
+}
+
+pub fn get_chain_adaptor(
+    network: DestinationNetwork,
+    ethereum_config: Option<EthereumInitConfig>,
+    mock_adaptor_config: Option<MockAdaptorConfig>,
+) -> Box<dyn ChainAdaptor> {
+    match network {
+        DestinationNetwork::Ethereum => Box::new(EthereumAdaptor::new(ethereum_config)),
+        DestinationNetwork::EthereumSepolia => Box::new(EthereumAdaptor::new(ethereum_config)),
+        DestinationNetwork::Local => Box::new(MockAdaptor::new(mock_adaptor_config)),
+    }
+}
diff --git a/src/bridge/client/chain/ethereum.rs b/bridge/src/client/chain/ethereum_adaptor.rs
similarity index 53%
rename from src/bridge/client/chain/ethereum.rs
rename to bridge/src/client/chain/ethereum_adaptor.rs
index 5e45dcc01..e270d3a32 100644
--- a/src/bridge/client/chain/ethereum.rs
+++ b/bridge/src/client/chain/ethereum_adaptor.rs
@@ -2,7 +2,9 @@ use std::str::FromStr;
 
 use alloy::rpc::types::Log;
 
-use super::{base::ChainAdaptor, chain::PegInEvent, chain::PegOutBurntEvent, chain::PegOutEvent};
+use super::{
+    chain::PegInEvent, chain::PegOutBurntEvent, chain::PegOutEvent, chain_adaptor::ChainAdaptor,
+};
 use alloy::sol_types::SolEvent;
 use alloy::{
     eips::BlockNumberOrTag,
@@ -51,12 +53,14 @@ pub struct EthereumAdaptor {
     bridge_address: EvmAddress,
     bridge_creation_block: u64,
     provider: RootProvider<Http<Client>>,
+    to_block: Option<BlockNumberOrTag>,
 }
 
 pub struct EthereumInitConfig {
     pub rpc_url: Url,
     pub bridge_address: EvmAddress,
     pub bridge_creation_block: u64,
+    pub to_block: Option<BlockNumberOrTag>,
 }
 
 impl EthereumAdaptor {
@@ -64,21 +68,25 @@ impl EthereumAdaptor {
     where
         T: SolEvent,
     {
-        let filter = Filter::new()
+        let mut filter = Filter::new()
             .from_block(BlockNumberOrTag::Number(self.bridge_creation_block))
             .address(self.bridge_address)
             .event(T::SIGNATURE);
+        filter = match self.to_block.is_none() {
+            true => filter.to_block(BlockNumberOrTag::Finalized),
+            false => filter.to_block(self.to_block.unwrap()),
+        };
 
         let results = self.provider.get_logs(&filter).await;
-        if results.is_err() {
-            return Err(results.unwrap_err().to_string());
+        if let Err(rpc_error) = results {
+            return Err(rpc_error.to_string());
         }
         let logs = results.unwrap();
         let mut sol_events: Vec<Log<T>> = Vec::new();
         for log in logs {
             let decoded = log.log_decode::<T>();
-            if decoded.is_err() {
-                return Err(decoded.err().unwrap().to_string());
+            if let Err(error) = decoded {
+                return Err(error.to_string());
             }
             sol_events.push(decoded.unwrap());
         }
@@ -98,27 +106,39 @@ impl ChainAdaptor for EthereumAdaptor {
         let peg_out_init_events = sol_events
             .unwrap()
             .iter()
-            .map(|e| {
+            .filter_map(|e| {
                 let withdrawer_address = Address::from_str(&e.inner.data.destination_address)
                     .unwrap()
                     .assume_checked();
                 let operator_public_key =
-                    PublicKey::from_slice(&e.inner.data.operator_pubKey.to_vec()).unwrap();
-                PegOutEvent {
-                    withdrawer_chain_address: e.inner.data.withdrawer.to_string(),
-                    withdrawer_public_key_hash: withdrawer_address.pubkey_hash().unwrap(),
-                    source_outpoint: OutPoint {
-                        txid: Txid::from_slice(&e.inner.data.source_outpoint.txId.to_vec())
+                    PublicKey::from_slice(e.inner.data.operator_pubKey.as_ref()).unwrap();
+                match withdrawer_address.pubkey_hash() {
+                    Some(withdrawer_public_key_hash) => {
+                        let mut txid_vec = e.inner.data.source_outpoint.txId.to_vec();
+                        txid_vec.reverse();
+                        Some(PegOutEvent {
+                            withdrawer_chain_address: e.inner.data.withdrawer.to_string(),
+                            withdrawer_destination_address: e
+                                .inner
+                                .data
+                                .destination_address
+                                .to_string(),
+                            withdrawer_public_key_hash,
+                            source_outpoint: OutPoint {
+                                txid: Txid::from_slice(&txid_vec).unwrap(),
+                                vout: e.inner.data.source_outpoint.vOut.to::<u32>(),
+                            },
+                            amount: Amount::from_str_in(
+                                e.inner.data.amount.to_string().as_str(),
+                                Denomination::Satoshi,
+                            )
                             .unwrap(),
-                        vout: e.inner.data.source_outpoint.vOut.to::<u32>(),
-                    },
-                    amount: Amount::from_str_in(
-                        e.inner.data.amount.to_string().as_str(),
-                        Denomination::Satoshi,
-                    )
-                    .unwrap(),
-                    operator_public_key,
-                    timestamp: u32::try_from(e.block_timestamp.unwrap()).unwrap(),
+                            operator_public_key,
+                            timestamp: u32::try_from(e.block_timestamp.unwrap()).unwrap(),
+                            tx_hash: e.transaction_hash.unwrap().to_vec(),
+                        })
+                    }
+                    None => None,
                 }
             })
             .collect();
@@ -137,12 +157,11 @@ impl ChainAdaptor for EthereumAdaptor {
             .iter()
             .map(|e| {
                 let operator_public_key =
-                    PublicKey::from_slice(&e.inner.data.operator_pubKey.to_vec()).unwrap();
+                    PublicKey::from_slice(e.inner.data.operator_pubKey.as_ref()).unwrap();
                 PegOutBurntEvent {
                     withdrawer_chain_address: e.inner.data.withdrawer.to_string(),
                     source_outpoint: OutPoint {
-                        txid: Txid::from_slice(&e.inner.data.source_outpoint.txId.to_vec())
-                            .unwrap(),
+                        txid: Txid::from_slice(e.inner.data.source_outpoint.txId.as_ref()).unwrap(),
                         vout: e.inner.data.source_outpoint.vOut.to::<u32>(),
                     },
                     amount: Amount::from_str_in(
@@ -152,6 +171,7 @@ impl ChainAdaptor for EthereumAdaptor {
                     .unwrap(),
                     operator_public_key,
                     timestamp: u32::try_from(e.block_timestamp.unwrap()).unwrap(),
+                    tx_hash: e.transaction_hash.unwrap().to_vec(),
                 }
             })
             .collect();
@@ -175,7 +195,7 @@ impl ChainAdaptor for EthereumAdaptor {
                     Denomination::Satoshi,
                 )
                 .unwrap(),
-                depositor_pubkey: PublicKey::from_slice(&e.inner.data.depositorPubKey.to_vec())
+                depositor_pubkey: PublicKey::from_slice(e.inner.data.depositorPubKey.as_ref())
                     .unwrap(),
             })
             .collect();
@@ -185,32 +205,39 @@ impl ChainAdaptor for EthereumAdaptor {
 }
 
 impl EthereumAdaptor {
-    pub fn new() -> Option<Self> {
-        dotenv::dotenv().ok();
-        let rpc_url_str = dotenv::var("BRIDGE_CHAIN_ADAPTOR_ETHEREUM_RPC_URL");
-        let bridge_address_str = dotenv::var("BRIDGE_CHAIN_ADAPTOR_ETHEREUM_BRIDGE_ADDRESS");
-        let bridge_creation = dotenv::var("BRIDGE_CHAIN_ADAPTOR_ETHEREUM_BRIDGE_CREATION");
-        if bridge_address_str.is_err() || bridge_creation.is_err() {
-            return None;
-        }
-        if rpc_url_str.is_err() {
-            return None;
+    pub fn new(config: Option<EthereumInitConfig>) -> Self {
+        if let Some(_config) = config {
+            Self::from_config(_config)
+        } else {
+            dotenv::dotenv().ok();
+            let rpc_url_str = dotenv::var("BRIDGE_CHAIN_ADAPTOR_ETHEREUM_RPC_URL")
+                .expect("Failed to read BRIDGE_CHAIN_ADAPTOR_ETHEREUM_RPC_URL variable");
+            let bridge_address_str = dotenv::var("BRIDGE_CHAIN_ADAPTOR_ETHEREUM_BRIDGE_ADDRESS")
+                .expect("Failed to read BRIDGE_CHAIN_ADAPTOR_ETHEREUM_BRIDGE_ADDRESS variable");
+            let bridge_creation = dotenv::var("BRIDGE_CHAIN_ADAPTOR_ETHEREUM_BRIDGE_CREATION")
+                .expect("Failed to read BRIDGE_CHAIN_ADAPTOR_ETHEREUM_BRIDGE_CREATION variable");
+            let to_block = dotenv::var("BRIDGE_CHAIN_ADAPTOR_ETHEREUM_TO_BLOCK");
+
+            let rpc_url = rpc_url_str.parse::<Url>();
+            let bridge_address = bridge_address_str.parse::<EvmAddress>();
+            Self::from_config(EthereumInitConfig {
+                rpc_url: rpc_url.unwrap(),
+                bridge_address: bridge_address.unwrap(),
+                bridge_creation_block: bridge_creation.parse::<u64>().unwrap(),
+                to_block: match to_block {
+                    Ok(block) => Some(BlockNumberOrTag::from_str(block.as_str()).unwrap()),
+                    Err(_) => Some(BlockNumberOrTag::Finalized),
+                },
+            })
         }
-
-        let rpc_url = rpc_url_str.unwrap().parse::<Url>();
-        let bridge_address = bridge_address_str.unwrap().parse::<EvmAddress>();
-        Some(Self::from_config(EthereumInitConfig {
-            rpc_url: rpc_url.unwrap(),
-            bridge_address: bridge_address.unwrap(),
-            bridge_creation_block: bridge_creation.unwrap().parse::<u64>().unwrap(),
-        }))
     }
 
-    pub fn from_config(conf: EthereumInitConfig) -> Self {
+    fn from_config(config: EthereumInitConfig) -> Self {
         Self {
-            bridge_address: conf.bridge_address,
-            bridge_creation_block: conf.bridge_creation_block,
-            provider: ProviderBuilder::new().on_http(conf.rpc_url),
+            bridge_address: config.bridge_address,
+            bridge_creation_block: config.bridge_creation_block,
+            provider: ProviderBuilder::new().on_http(config.rpc_url),
+            to_block: config.to_block,
         }
     }
 }
diff --git a/bridge/src/client/chain/mock_adaptor.rs b/bridge/src/client/chain/mock_adaptor.rs
new file mode 100644
index 000000000..f3e4b9f72
--- /dev/null
+++ b/bridge/src/client/chain/mock_adaptor.rs
@@ -0,0 +1,52 @@
+use async_trait::async_trait;
+
+use super::{
+    chain::{PegInEvent, PegOutBurntEvent, PegOutEvent},
+    chain_adaptor::ChainAdaptor,
+};
+
+pub struct MockAdaptor {
+    config: Option<MockAdaptorConfig>,
+}
+
+pub struct MockAdaptorConfig {
+    pub peg_out_init_events: Option<Vec<PegOutEvent>>,
+    pub peg_out_burnt_events: Option<Vec<PegOutBurntEvent>>,
+    pub peg_out_minted_events: Option<Vec<PegInEvent>>,
+}
+
+impl MockAdaptor {
+    pub fn new(config: Option<MockAdaptorConfig>) -> Self { Self { config } }
+}
+
+#[async_trait]
+impl ChainAdaptor for MockAdaptor {
+    async fn get_peg_out_init_event(&self) -> Result<Vec<PegOutEvent>, String> {
+        if let Some(_config) = &self.config {
+            if let Some(_init_events) = &_config.peg_out_init_events {
+                return Ok(_init_events.clone());
+            }
+        }
+
+        Ok(vec![])
+    }
+
+    async fn get_peg_out_burnt_event(&self) -> Result<Vec<PegOutBurntEvent>, String> {
+        if let Some(_config) = &self.config {
+            if let Some(_burnt_events) = &_config.peg_out_burnt_events {
+                return Ok(_burnt_events.clone());
+            }
+        }
+
+        Ok(vec![])
+    }
+    async fn get_peg_in_minted_event(&self) -> Result<Vec<PegInEvent>, String> {
+        if let Some(_config) = &self.config {
+            if let Some(_minted_events) = &_config.peg_out_minted_events {
+                return Ok(_minted_events.clone());
+            }
+        }
+
+        Ok(vec![])
+    }
+}
diff --git a/bridge/src/client/chain/mod.rs b/bridge/src/client/chain/mod.rs
new file mode 100644
index 000000000..ce0af46ea
--- /dev/null
+++ b/bridge/src/client/chain/mod.rs
@@ -0,0 +1,4 @@
+pub mod chain;
+pub mod chain_adaptor;
+pub mod ethereum_adaptor;
+pub mod mock_adaptor;
diff --git a/bridge/src/client/cli/client_command.rs b/bridge/src/client/cli/client_command.rs
new file mode 100644
index 000000000..0d3aca869
--- /dev/null
+++ b/bridge/src/client/cli/client_command.rs
@@ -0,0 +1,578 @@
+use super::key_command::{Config, KeysCommand};
+use super::utils::get_mock_chain_service;
+use crate::client::chain::chain_adaptor::get_chain_adaptor;
+use crate::client::client::BitVMClient;
+use crate::client::esplora::get_esplora_url;
+use crate::commitments::CommitmentMessageId;
+use crate::common::ZkProofVerifyingKey;
+use crate::constants::DestinationNetwork;
+use crate::contexts::base::generate_keys_from_secret;
+use crate::proof::{get_proof, invalidate_proof};
+use crate::transactions::base::Input;
+use ark_serialize::CanonicalDeserialize;
+
+use bitcoin::{Address, PublicKey};
+use bitcoin::{Network, OutPoint};
+use clap::{arg, ArgMatches, Command};
+use colored::Colorize;
+use std::io::{self, Write};
+use std::str::FromStr;
+use std::time::Duration;
+use tokio::io::{AsyncBufReadExt, BufReader};
+use tokio::time::sleep;
+
+pub struct CommonArgs {
+    pub key_dir: Option<String>,
+    pub verifiers: Option<Vec<PublicKey>>,
+    pub environment: Option<String>,
+    pub path_prefix: Option<String>,
+}
+
+pub struct ClientCommand {
+    client: BitVMClient,
+    config: Config,
+}
+
+impl ClientCommand {
+    pub async fn new(common_args: CommonArgs) -> Self {
+        let (source_network, destination_network) = match common_args.environment.as_deref() {
+            Some("mainnet") => (Network::Bitcoin, DestinationNetwork::Ethereum),
+            Some("testnet") => (Network::Testnet, DestinationNetwork::EthereumSepolia),
+            Some("regtest") => (Network::Regtest, DestinationNetwork::Local),
+            _ => {
+                eprintln!("Invalid environment. Use mainnet, testnet or regtest.");
+                std::process::exit(1);
+            }
+        };
+
+        let keys_command = KeysCommand::new(common_args.key_dir);
+        let config = keys_command
+            .read_config()
+            .expect("Failed to read config file");
+
+        let n_of_n_public_keys = common_args.verifiers.expect("Error: Verifier public keys must be specified either in command line or environment variable.");
+
+        let mut verifying_key = None;
+        if let Some(vk) = config.keys.verifying_key.clone() {
+            let bytes = hex::decode(vk).unwrap();
+            verifying_key = Some(ZkProofVerifyingKey::deserialize_compressed(&*bytes).unwrap());
+        }
+
+        let bitvm_client = BitVMClient::new(
+            Some(get_esplora_url(source_network)),
+            source_network,
+            destination_network,
+            Some(get_chain_adaptor(DestinationNetwork::Local, None, None)), // TODO: Will be replaced with a destination network specific adaptor once Ethereum support is added.
+            &n_of_n_public_keys,
+            config.keys.depositor.as_deref(),
+            config.keys.operator.as_deref(),
+            config.keys.verifier.as_deref(),
+            config.keys.withdrawer.as_deref(),
+            common_args.path_prefix.as_deref(),
+            verifying_key,
+        )
+        .await;
+
+        Self {
+            client: bitvm_client,
+            config,
+        }
+    }
+
+    pub fn get_operator_address_command() -> Command {
+        Command::new("get-operator-address")
+            .short_flag('o')
+            .about("Get an address spendable by the configured operator private key")
+            .after_help("Get an address spendable by the configured operator private key")
+    }
+
+    pub async fn handle_get_operator_address(&mut self) -> io::Result<()> {
+        println!(
+            "Operator address: {}",
+            self.client.get_operator_address().to_string().green()
+        );
+        Ok(())
+    }
+
+    pub fn get_operator_utxos_command() -> Command {
+        Command::new("get-operator-utxos")
+            .short_flag('r')
+            .about("Get a list of the operator's utxos")
+            .after_help("Get a list of the operator's utxos")
+    }
+
+    pub async fn handle_get_operator_utxos(&mut self) -> io::Result<()> {
+        let utxos = self.client.get_operator_utxos().await;
+        match utxos.len() {
+            0 => println!("No operator UTXOs found."),
+            utxo_count => {
+                println!(
+                    "{} operator UTXO{} found (<TXID>:<VOUT> <AMOUNT> <CONFIRMED>):",
+                    utxo_count,
+                    if utxo_count == 1 { "" } else { "s" }
+                );
+                for utxo in utxos {
+                    println!(
+                        "{}:{} {} {}",
+                        utxo.txid, utxo.vout, utxo.value, utxo.status.confirmed
+                    );
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn get_depositor_address_command() -> Command {
+        Command::new("get-depositor-address")
+            .short_flag('d')
+            .about("Get an address spendable by the configured depositor private key")
+            .after_help("Get an address spendable by the configured depositor private key")
+    }
+
+    pub async fn handle_get_depositor_address(&mut self) -> io::Result<()> {
+        println!(
+            "Depositor address: {}",
+            self.client.get_depositor_address().to_string().green()
+        );
+        Ok(())
+    }
+
+    pub fn get_depositor_utxos_command() -> Command {
+        Command::new("get-depositor-utxos")
+            .short_flag('u')
+            .about("Get a list of the depositor's utxos")
+            .after_help("Get a list of the depositor's utxos")
+    }
+
+    pub async fn handle_get_depositor_utxos(&mut self) -> io::Result<()> {
+        let utxos = self.client.get_depositor_utxos().await;
+        match utxos.len() {
+            0 => println!("No depositor UTXOs found."),
+            utxo_count => {
+                println!(
+                    "{} operator UTXO{} found (<TXID>:<VOUT> <AMOUNT> <CONFIRMED>):",
+                    utxo_count,
+                    if utxo_count == 1 { "" } else { "s" }
+                );
+                for utxo in utxos {
+                    println!(
+                        "{}:{} {} {}",
+                        utxo.txid, utxo.vout, utxo.value, utxo.status.confirmed
+                    );
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn get_initiate_peg_in_command() -> Command {
+        Command::new("initiate-peg-in")
+        .short_flag('n')
+        .about("Initiate a peg-in")
+        .after_help("Initiate a peg-in by creating a peg-in graph")
+        .arg(arg!(-u --utxo <UTXO> "Specify the utxo to spend from. Format: <TXID>:<VOUT>")
+        .required(true))
+        .arg(arg!(-d --destination_address <EVM_ADDRESS> "The evm-address to send the wrapped bitcoin to")
+        .required(true))
+    }
+
+    pub async fn handle_initiate_peg_in_command(
+        &mut self,
+        sub_matches: &ArgMatches,
+    ) -> io::Result<()> {
+        self.client.sync().await;
+
+        let utxo = sub_matches.get_one::<String>("utxo").unwrap();
+        let evm_address = sub_matches
+            .get_one::<String>("destination_address")
+            .unwrap();
+        let outpoint = OutPoint::from_str(utxo).unwrap();
+
+        let tx = self.client.esplora.get_tx(&outpoint.txid).await.unwrap();
+        let tx = tx.expect(&format!(
+            "Error: {} did not return any tx for txid {}",
+            self.client.esplora.url(),
+            outpoint.txid
+        ));
+        let input = Input {
+            outpoint,
+            amount: tx.output[outpoint.vout as usize].value,
+        };
+        let peg_in_id = self.client.create_peg_in_graph(input, evm_address).await;
+
+        self.client.flush().await;
+
+        println!("Created peg-in graph with ID: {peg_in_id}");
+        println!("Broadcasting deposit...");
+
+        if let Err(e) = self.client.broadcast_peg_in_deposit(&peg_in_id).await {
+            eprintln!("Failed to broadcast peg-in deposit: {e}");
+        }
+
+        Ok(())
+    }
+
+    pub fn get_create_peg_out_graph_command() -> Command {
+        Command::new("create-peg-out")
+            .short_flag('t')
+            .about("Create peg-out graph for specified peg-in graph")
+            .after_help("")
+            .arg(
+                arg!(-u --utxo <UTXO> "Specify the utxo to spend from. Format: <TXID>:<VOUT>")
+                    .required(true),
+            )
+            .arg(
+                arg!(-i --peg_in_id <PEG_IN_GRAPH_ID> "Specify the peg-in graph ID").required(true),
+            )
+    }
+
+    pub async fn handle_create_peg_out_graph_command(
+        &mut self,
+        sub_matches: &ArgMatches,
+    ) -> io::Result<()> {
+        self.client.sync().await;
+
+        let utxo = sub_matches.get_one::<String>("utxo").unwrap();
+        let peg_in_id = sub_matches.get_one::<String>("peg_in_id").unwrap();
+        let outpoint = OutPoint::from_str(utxo).unwrap();
+
+        let tx = self.client.esplora.get_tx(&outpoint.txid).await.unwrap();
+        let tx = tx.unwrap();
+        let input = Input {
+            outpoint,
+            amount: tx.output[outpoint.vout as usize].value,
+        };
+
+        let peg_out_id = self.client.create_peg_out_graph(
+            peg_in_id,
+            input,
+            CommitmentMessageId::generate_commitment_secrets(),
+        );
+
+        self.client.flush().await;
+
+        println!("Created peg-out with ID: {peg_out_id}");
+        Ok(())
+    }
+
+    pub fn get_push_nonces_command() -> Command {
+        Command::new("push-nonces")
+            .short_flag('c')
+            .about("Push nonces for peg-out or peg-in graph")
+            .after_help("")
+            .arg(arg!(-i --id <GRAPH_ID> "Specify the peg-in or peg-out graph ID").required(true))
+    }
+
+    pub async fn handle_push_nonces_command(&mut self, sub_matches: &ArgMatches) -> io::Result<()> {
+        let graph_id = sub_matches.get_one::<String>("id").unwrap();
+
+        self.client.sync().await;
+        self.client.push_verifier_nonces(graph_id);
+        self.client.flush().await;
+
+        Ok(())
+    }
+
+    pub fn get_push_signature_command() -> Command {
+        Command::new("push-signatures")
+            .short_flag('g')
+            .about("Push signatures for peg-out or peg-in graph")
+            .after_help("")
+            .arg(arg!(-i --id <GRAPH_ID> "Specify the peg-in or peg-out graph ID").required(true))
+    }
+
+    pub async fn handle_push_signature_command(
+        &mut self,
+        sub_matches: &ArgMatches,
+    ) -> io::Result<()> {
+        let graph_id = sub_matches.get_one::<String>("id").unwrap();
+
+        self.client.sync().await;
+        self.client.push_verifier_signature(graph_id);
+        self.client.flush().await;
+
+        Ok(())
+    }
+
+    pub fn get_mock_l2_pegout_event_command() -> Command {
+        Command::new("mock-l2-pegout-event")
+            .short_flag('x')
+            .about("FOR TEST PURPOSES ONLY! Use mock L2 chain service with specified peg-in-confirm txid")
+            .after_help("")
+            .arg(
+                arg!(-u --utxo <UTXO> "Specify the peg-in confirm utxo. Format: <TXID>:<VOUT>")
+                    .required(true),
+            )
+    }
+
+    pub async fn handle_mock_l2_pegout_event_command(
+        &mut self,
+        sub_matches: &ArgMatches,
+    ) -> io::Result<()> {
+        let utxo = sub_matches.get_one::<String>("utxo").unwrap();
+        let outpoint = OutPoint::from_str(utxo).unwrap();
+
+        if let Some(operator_secret) = &self.config.keys.operator {
+            let (_, operator_public_key) =
+                generate_keys_from_secret(self.client.source_network, operator_secret);
+
+            self.client.sync().await;
+            let mock_chain_service = get_mock_chain_service(outpoint, operator_public_key);
+            self.client.set_chain_service(mock_chain_service);
+            self.client.sync_l2().await;
+            self.client.flush().await;
+        } else {
+            return Err(io::Error::new(
+                io::ErrorKind::Other,
+                "Failed to set chain service, missing operator configuration",
+            ));
+        }
+
+        Ok(())
+    }
+
+    pub fn get_automatic_command() -> Command {
+        Command::new("automatic")
+            .short_flag('a')
+            .about("Automatic mode: Poll for status updates and sign or broadcast transactions")
+    }
+
+    pub async fn handle_automatic_command(&mut self) -> io::Result<()> {
+        loop {
+            self.client.sync().await;
+
+            let old_data = self.client.data().clone();
+
+            self.client.process_peg_ins().await;
+            self.client.process_peg_outs().await;
+
+            // A bit inefficient, but fine for now: only flush if data changed
+            if self.client.data() != &old_data {
+                self.client.flush().await;
+            } else {
+                sleep(Duration::from_millis(250)).await;
+            }
+        }
+    }
+
+    // TODO: there are verifier's commands missing here
+    pub fn get_broadcast_command() -> Command {
+        Command::new("broadcast")
+            .short_flag('b')
+            .about("Broadcast transactions")
+            .after_help("Broadcast transactions.")
+            .subcommand(
+                Command::new("pegin")
+                    .about("Broadcast peg-in transactions")
+                    .arg(arg!(-g --graph_id <GRAPH_ID> "Peg-in graph ID").required(true))
+                    .subcommand(Command::new("deposit").about("Broadcast peg-in deposit"))
+                    .subcommand(Command::new("refund").about("Broadcast peg-in refund"))
+                    .subcommand(Command::new("confirm").about("Broadcast peg-in confirm"))
+                    .subcommand_required(true),
+            )
+            .subcommand(
+                Command::new("tx")
+                    .about("Broadcast transactions")
+                    .arg(arg!(-g --graph_id <GRAPH_ID> "Peg-out graph ID").required(true))
+                    .arg(arg!(-u --utxo <UTXO> "Specify the utxo to spend from. Format: <TXID>:<VOUT>").required(false))
+                    .arg(arg!(-a --address <ADDRESS> "Specify the reward address to receive BTC reward").required(false))
+                    .subcommand(Command::new("peg_out").about("Broadcast peg-out"))
+                    .subcommand(Command::new("peg_out_confirm").about("Broadcast peg-out confirm"))
+                    .subcommand(Command::new("kick_off_1").about("Broadcast kick off 1"))
+                    .subcommand(Command::new("kick_off_2").about("Broadcast kick off 2"))
+                    .subcommand(Command::new("start_time").about("Broadcast start time"))
+                    .subcommand(Command::new("assert_initial").about("Broadcast assert initial"))
+                    .subcommand(
+                        Command::new("assert_commit_1").about("Broadcast assert commit 1"),
+                    )
+                    .subcommand(
+                        Command::new("assert_commit_2").about("Broadcast assert commit 2"),
+                    )
+                    .subcommand(
+                      Command::new("assert_commit_1_invalid").about("FOR TEST PURPOSES ONLY! Broadcast assert commit 1 with invalid proof"),
+                    )
+                    .subcommand(
+                      Command::new("assert_commit_2_invalid").about("FOR TEST PURPOSES ONLY! Broadcast assert commit 2 with invalid proof"),
+                    )
+                    .subcommand(Command::new("assert_final").about("Broadcast assert final"))
+                    .subcommand(Command::new("take_1").about("Broadcast take 1"))
+                    .subcommand(Command::new("take_2").about("Broadcast take 2"))
+                    .subcommand(Command::new("disprove").about("Broadcast disprove"))
+                    .subcommand_required(true),
+            )
+            .subcommand_required(true)
+    }
+
+    pub async fn handle_broadcast_command(&mut self, sub_matches: &ArgMatches) -> io::Result<()> {
+        self.client.sync().await;
+
+        let subcommand = sub_matches.subcommand();
+        let graph_id = subcommand.unwrap().1.get_one::<String>("graph_id").unwrap();
+
+        let result = match subcommand.unwrap().1.subcommand() {
+            Some(("deposit", _)) => self.client.broadcast_peg_in_deposit(graph_id).await,
+            Some(("refund", _)) => self.client.broadcast_peg_in_refund(graph_id).await,
+            Some(("confirm", _)) => self.client.broadcast_peg_in_confirm(graph_id).await,
+            Some(("peg_out", _)) => {
+                let utxo = subcommand.unwrap().1.get_one::<String>("utxo").unwrap();
+                let outpoint = OutPoint::from_str(utxo).unwrap();
+                let tx = self.client.esplora.get_tx(&outpoint.txid).await.unwrap();
+                let tx = tx.unwrap();
+                let input = Input {
+                    outpoint,
+                    amount: tx.output[outpoint.vout as usize].value,
+                };
+                let result = self.client.broadcast_peg_out(graph_id, input).await;
+                self.client.flush().await;
+                result
+            }
+            Some(("peg_out_confirm", _)) => self.client.broadcast_peg_out_confirm(graph_id).await,
+            Some(("kick_off_1", _)) => self.client.broadcast_kick_off_1(graph_id).await,
+            Some(("kick_off_2", _)) => self.client.broadcast_kick_off_2(graph_id).await,
+            Some(("start_time", _)) => self.client.broadcast_start_time(graph_id).await,
+            Some(("assert_initial", _)) => self.client.broadcast_assert_initial(graph_id).await,
+            Some(("assert_commit_1", _)) => {
+                self.client
+                    .broadcast_assert_commit_1(graph_id, &get_proof())
+                    .await
+            }
+            Some(("assert_commit_2", _)) => {
+                self.client
+                    .broadcast_assert_commit_2(graph_id, &get_proof())
+                    .await
+            }
+            Some(("assert_commit_1_invalid", _)) => {
+                self.client
+                    .broadcast_assert_commit_1(graph_id, &invalidate_proof(&get_proof()))
+                    .await
+            }
+            Some(("assert_commit_2_invalid", _)) => {
+                self.client
+                    .broadcast_assert_commit_2(graph_id, &invalidate_proof(&get_proof()))
+                    .await
+            }
+            Some(("assert_final", _)) => self.client.broadcast_assert_final(graph_id).await,
+            Some(("take_1", _)) => self.client.broadcast_take_1(graph_id).await,
+            Some(("take_2", _)) => self.client.broadcast_take_2(graph_id).await,
+            Some(("disprove", _)) => {
+                let address = subcommand.unwrap().1.get_one::<String>("address").unwrap();
+                let reward_address = Address::from_str(address).unwrap();
+                let reward_script = reward_address.assume_checked().script_pubkey(); // TODO: verify checked/unchecked address
+
+                self.client
+                    .broadcast_disprove(graph_id, reward_script)
+                    .await
+            }
+            _ => unreachable!(),
+        };
+
+        if let Err(e) = result {
+            println!("Failed to broadcast transaction: {e}");
+        }
+
+        Ok(())
+    }
+
+    pub fn get_status_command() -> Command {
+        Command::new("status")
+            .short_flag('s')
+            .about("Show the status of the BitVM client")
+            .after_help("Get the status of the BitVM client.")
+    }
+
+    pub async fn handle_status_command(&mut self) -> io::Result<()> {
+        self.client.sync().await;
+        self.client.status().await;
+        Ok(())
+    }
+
+    pub fn get_interactive_command() -> Command {
+        Command::new("interactive")
+            .short_flag('i')
+            .about("Interactive mode for manually issuing commands")
+    }
+
+    pub async fn handle_interactive_command(&mut self, main_command: &Command) -> io::Result<()> {
+        println!(
+            "{}",
+            "Entering interactive mode. Type 'help' for a list of commands and 'exit' to quit."
+                .green()
+        );
+
+        let mut stdin_reader = BufReader::new(tokio::io::stdin());
+        loop {
+            print!("{}", "bitvm >> ".bold());
+            io::stdout().flush().unwrap(); // Ensure the prompt is printed out immediately
+
+            let mut line = String::new();
+            stdin_reader.read_line(&mut line).await.unwrap();
+            let input = line.trim();
+
+            if input == "exit" {
+                break;
+            }
+
+            let mut args = vec!["bitvm"];
+            args.extend(input.split_whitespace());
+
+            let matches = match main_command.clone().try_get_matches_from(args) {
+                Ok(matches) => matches,
+                Err(e) => {
+                    if !e.to_string().to_lowercase().contains("error") {
+                        println!("{}", format!("{}", e).green());
+                    } else {
+                        println!("{}", format!("{}", e).red());
+                    }
+                    continue;
+                }
+            };
+
+            if let Some(sub_matches) = matches.subcommand_matches("keys") {
+                let key_dir = matches.get_one::<String>("key-dir").cloned();
+                let keys_command = KeysCommand::new(key_dir);
+                keys_command.handle_command(sub_matches)?;
+            } else if matches.subcommand_matches("get-operator-address").is_some() {
+                self.handle_get_operator_address().await?;
+            } else if matches.subcommand_matches("get-operator-utxos").is_some() {
+                self.handle_get_operator_utxos().await?;
+            } else if matches
+                .subcommand_matches("get-depositor-address")
+                .is_some()
+            {
+                self.handle_get_depositor_address().await?;
+            } else if matches.subcommand_matches("get-depositor-utxos").is_some() {
+                self.handle_get_depositor_utxos().await?;
+            } else if let Some(sub_matches) = matches.subcommand_matches("initiate-peg-in") {
+                self.handle_initiate_peg_in_command(sub_matches).await?;
+            } else if let Some(sub_matches) = matches.subcommand_matches("create-peg-out") {
+                self.handle_create_peg_out_graph_command(sub_matches)
+                    .await?;
+            } else if let Some(sub_matches) = matches.subcommand_matches("push-nonces") {
+                self.handle_push_nonces_command(sub_matches).await?;
+            } else if let Some(sub_matches) = matches.subcommand_matches("push-signatures") {
+                self.handle_push_signature_command(sub_matches).await?;
+            } else if let Some(sub_matches) = matches.subcommand_matches("mock-l2-pegout-event") {
+                self.handle_mock_l2_pegout_event_command(sub_matches)
+                    .await?;
+            } else if matches.subcommand_matches("status").is_some() {
+                self.handle_status_command().await?;
+            } else if let Some(sub_matches) = matches.subcommand_matches("broadcast") {
+                self.handle_broadcast_command(sub_matches).await?;
+            } else if matches.subcommand_matches("automatic").is_some() {
+                self.handle_automatic_command().await?;
+            } else if matches.subcommand_matches("interactive").is_some() {
+                println!("{}", "Already in interactive mode.".yellow());
+            } else {
+                println!(
+                    "{}",
+                    "Unknown command. Type 'help' for a list of commands.".red()
+                );
+            }
+        }
+
+        println!("{}", "Exiting interactive mode.".green());
+        Ok(())
+    }
+}
diff --git a/bridge/src/client/cli/key_command.rs b/bridge/src/client/cli/key_command.rs
new file mode 100644
index 000000000..5566fdb3b
--- /dev/null
+++ b/bridge/src/client/cli/key_command.rs
@@ -0,0 +1,203 @@
+use bitcoin::{Network, PublicKey};
+use clap::{arg, ArgGroup, ArgMatches, Command};
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+use std::env;
+use std::fs::{self, OpenOptions};
+use std::io::{self, Read, Write};
+use std::path::PathBuf;
+use toml;
+
+use crate::contexts::base::generate_keys_from_secret;
+
+#[derive(Serialize, Deserialize, Default)]
+pub struct Config {
+    pub keys: Keys,
+}
+
+#[derive(Serialize, Deserialize, Default)]
+pub struct Keys {
+    pub depositor: Option<String>,
+    pub operator: Option<String>,
+    pub verifier: Option<String>,
+    pub withdrawer: Option<String>,
+    pub verifying_key: Option<String>,
+}
+
+const BRIDGE_KEY_DIR_NAME: &str = ".bitvm-bridge";
+const BRIDGE_TOML: &str = "bridge.toml";
+
+pub struct KeysCommand {
+    pub config_path: PathBuf,
+}
+
+impl KeysCommand {
+    pub fn new(key_dir: Option<String>) -> Self {
+        let key_dir = key_dir.map(PathBuf::from).unwrap_or_else(|| {
+            let home_dir = env::var("HOME").expect("Environment variable HOME not set.");
+            PathBuf::from(&home_dir).join(BRIDGE_KEY_DIR_NAME)
+        });
+
+        let config_path = key_dir.join(BRIDGE_TOML);
+
+        // Create key directory if it doesn't exist
+        if !key_dir.exists() {
+            fs::create_dir_all(&key_dir)
+                .expect(&format!("Failed to create {} directory", key_dir.display()));
+        }
+
+        KeysCommand { config_path }
+    }
+
+    pub fn get_command() -> Command {
+        Command::new("keys")
+            .short_flag('k')
+            .about("Manage secret keys for different contexts")
+            .after_help("The depositor, operator, verifier, and withdrawer contexts are optional and can be specified using the -d, -o, -v, and -w flags respectively. If a context is not specified, the current key configuration will be displayed. The verifying key for the zero-knowledge proof is optional and must be specified when running scenarios that involve proof verification.")
+            .arg(arg!(-d --depositor <SECRET_KEY> "Secret key for depositor").required(false))
+            .arg(arg!(-o --operator <SECRET_KEY> "Secret key for operator").required(false))
+            .arg(arg!(-v --verifier <SECRET_KEY> "Secret key for verifier").required(false))
+            .arg(arg!(-w --withdrawer <SECRET_KEY> "Secret key for withdrawer").required(false))
+            .arg(arg!(-k --vk <KEY> "Zero-knowledge proof verifying key").required(false))
+            .group(ArgGroup::new("context")
+                .args(["depositor", "operator", "verifier", "withdrawer"]))
+    }
+
+    pub fn handle_command(&self, sub_matches: &ArgMatches) -> io::Result<()> {
+        let mut config = self.read_config()?;
+
+        if !sub_matches.args_present() {
+            // If no arguments are specified, output the current key configuration.
+            let keys = HashMap::from([
+                ("DEPOSITOR", &config.keys.depositor),
+                ("OPERATOR", &config.keys.operator),
+                ("VERIFIER", &config.keys.verifier),
+                ("WITHDRAWER", &config.keys.withdrawer),
+                ("VERIFYING KEY", &config.keys.verifying_key),
+            ]);
+
+            if keys.values().any(|k| k.is_some()) {
+                println!("Key configuration:");
+                println!();
+
+                let print_user_key = |private_key: &Option<String>, name: &str| {
+                    if let Some(prvkey) = private_key {
+                        println!("[{name}]:");
+                        println!("  Private key: {}", prvkey);
+                        println!("   Public key: {}", pubkey_of(prvkey));
+                        println!();
+                    }
+                };
+
+                let print_verifying_key = |verifying_key: &Option<String>, name: &str| {
+                    if let Some(vk) = verifying_key {
+                        println!("[{name}]:");
+                        println!("          Key: {}", vk);
+                        println!();
+                    }
+                };
+
+                let mut name = "DEPOSITOR";
+                print_user_key(keys.get(name).unwrap(), name);
+                name = "OPERATOR";
+                print_user_key(keys.get(name).unwrap(), name);
+                name = "VERIFIER";
+                print_user_key(keys.get(name).unwrap(), name);
+                name = "WITHDRAWER";
+                print_user_key(keys.get(name).unwrap(), name);
+                name = "VERIFYING KEY";
+                print_verifying_key(keys.get(name).unwrap(), name);
+            } else {
+                println!("No keys are configured.");
+                println!();
+            }
+
+            Ok(())
+        } else {
+            if let Some(secret_key) = sub_matches.get_one::<String>("depositor") {
+                if self.validate_key(secret_key) {
+                    config.keys.depositor = Some(secret_key.clone());
+                    println!(
+                        "Secret key for depositor {} saved successfully!",
+                        pubkey_of(secret_key)
+                    );
+                } else {
+                    eprintln!("error: Invalid depositor secret key.");
+                }
+            } else if let Some(secret_key) = sub_matches.get_one::<String>("operator") {
+                if self.validate_key(secret_key) {
+                    config.keys.operator = Some(secret_key.clone());
+                    println!(
+                        "Secret key for operator {} saved successfully!",
+                        pubkey_of(secret_key)
+                    );
+                } else {
+                    eprintln!("error: Invalid operator secret key.");
+                }
+            } else if let Some(secret_key) = sub_matches.get_one::<String>("verifier") {
+                if self.validate_key(secret_key) {
+                    config.keys.verifier = Some(secret_key.clone());
+                    println!(
+                        "Secret key for verifier {} saved successfully!",
+                        pubkey_of(secret_key)
+                    );
+                } else {
+                    eprintln!("error: Invalid verifier secret key.");
+                }
+            } else if let Some(secret_key) = sub_matches.get_one::<String>("withdrawer") {
+                if self.validate_key(secret_key) {
+                    config.keys.withdrawer = Some(secret_key.clone());
+                    println!(
+                        "Secret key for withdrawer {} saved successfully!",
+                        pubkey_of(secret_key)
+                    );
+                } else {
+                    eprintln!("error: Invalid withdrawer secret key.");
+                }
+            } else if let Some(verifying_key) = sub_matches.get_one::<String>("vk") {
+                if self.validate_verifying_key(verifying_key) {
+                    config.keys.verifying_key = Some(verifying_key.clone());
+                    println!("ZK proof verifying key saved successfully!");
+                } else {
+                    eprintln!("error: Invalid ZK proof verifying key.");
+                }
+            }
+            self.write_config(&config)
+        }
+    }
+
+    pub fn read_config(&self) -> io::Result<Config> {
+        if self.config_path.exists() {
+            let mut file = OpenOptions::new().read(true).open(&self.config_path)?;
+            let mut content = String::new();
+            file.read_to_string(&mut content)?;
+            Ok(toml::from_str(&content).unwrap_or_default())
+        } else {
+            Ok(Config::default())
+        }
+    }
+
+    pub fn write_config(&self, config: &Config) -> io::Result<()> {
+        let toml_string = toml::to_string(config).expect("Failed to serialize config");
+        let mut file = OpenOptions::new()
+            .create(true)
+            .write(true)
+            .truncate(true)
+            .open(&self.config_path)?;
+        file.write_all(toml_string.as_bytes())
+    }
+
+    fn validate_key(&self, key: &str) -> bool {
+        key.len() == 64 && key.chars().all(|c| c.is_ascii_hexdigit())
+    }
+
+    // TODO: This is TBD. Verifying key validation is unclear at the moment.
+    // We'll add it once circuit design is finalized and we can run a Groth16 setup.
+    fn validate_verifying_key(&self, _key: &str) -> bool { true }
+}
+
+// TODO: Technically this should use the source network specified by the user. However, since this
+// is only used in console output as an ID, we can leave it for now.
+fn pubkey_of(private_key: &str) -> PublicKey {
+    generate_keys_from_secret(Network::Bitcoin, private_key).1
+}
diff --git a/bridge/src/client/cli/mod.rs b/bridge/src/client/cli/mod.rs
new file mode 100644
index 000000000..4bbf4be67
--- /dev/null
+++ b/bridge/src/client/cli/mod.rs
@@ -0,0 +1,6 @@
+pub mod client_command;
+pub mod key_command;
+pub mod query_command;
+pub mod query_response;
+pub mod utils;
+pub mod validation;
diff --git a/bridge/src/client/cli/query_command.rs b/bridge/src/client/cli/query_command.rs
new file mode 100644
index 000000000..dcec86f29
--- /dev/null
+++ b/bridge/src/client/cli/query_command.rs
@@ -0,0 +1,568 @@
+use alloy::primitives::Address;
+use bitcoin::{Amount, Network, OutPoint, PublicKey, XOnlyPublicKey};
+use clap::{arg, ArgMatches, Command};
+use core::str::FromStr;
+
+use super::{
+    query_response::{Response, ResponseStatus},
+    validation::{validate, ArgType},
+};
+use crate::{
+    client::{
+        chain::chain_adaptor::get_chain_adaptor,
+        client::BitVMClient,
+        esplora::get_esplora_url,
+        sdk::{query::ClientCliQuery, query_contexts::depositor_signatures::DepositorSignatures},
+    },
+    constants::DestinationNetwork,
+    contexts::base::generate_keys_from_secret,
+    scripts::generate_pay_to_pubkey_script_address,
+    transactions::base::Input,
+};
+
+pub struct QueryCommand {
+    client: BitVMClient,
+    network: Network,
+}
+
+const VERIFIER_0_SECRET: &str = "ee0817eac0c13aa8ee2dd3256304041f09f0499d1089b56495310ae8093583e2";
+const FAKE_SECRET: &str = "1000000000000000000000000000000000000000000000000000000000000000";
+
+const QUERY_COMMAND_PATH_PREFIX: &str = "query_command";
+
+impl QueryCommand {
+    pub async fn new(
+        source_network: Network,
+        destination_network: DestinationNetwork,
+        path_prefix: Option<&str>,
+    ) -> Self {
+        let (_, verifier_0_public_key) =
+            generate_keys_from_secret(source_network, VERIFIER_0_SECRET);
+
+        let n_of_n_public_keys: Vec<PublicKey> = vec![verifier_0_public_key];
+
+        let bitvm_client = BitVMClient::new(
+            Some(get_esplora_url(source_network)),
+            source_network,
+            destination_network,
+            Some(get_chain_adaptor(DestinationNetwork::Local, None, None)), // TODO: Update this according to the requirements for query command.
+            &n_of_n_public_keys,
+            Some(FAKE_SECRET),
+            Some(FAKE_SECRET),
+            Some(VERIFIER_0_SECRET),
+            Some(FAKE_SECRET),
+            path_prefix.or(Some(QUERY_COMMAND_PATH_PREFIX)),
+            None,
+        )
+        .await;
+
+        Self {
+            client: bitvm_client,
+            network: source_network,
+        }
+    }
+
+    async fn sync(&mut self) {
+        self.client.sync().await;
+        self.client.sync_l2().await;
+    }
+
+    pub fn pegin_deposit_tx_command() -> Command {
+        Command::new("pegin_deposit_tx")
+            .about("Subcommand for handling pegin deposit transactions")
+            .arg(arg!(<AMOUNT> "Amount of assets to peg-in").required(true))
+            .arg(
+                arg!(<RECIPIENT_ADDRESS> "Recipient L2 chain address for peg-in transaction")
+                    .required(true),
+            )
+    }
+
+    pub fn pegin_confirm_tx_command() -> Command {
+        Command::new("pegin_confirm_tx")
+            .about("Subcommand for handling pegin confirm transactions")
+            .arg(arg!(<AMOUNT> "Amount of assets to peg-in").required(true))
+            .arg(
+                arg!(<RECIPIENT_ADDRESS> "Recipient L2 chain address for peg-in transaction")
+                    .required(true),
+            )
+    }
+
+    pub fn pegin_refund_tx_command() -> Command {
+        Command::new("pegin_refund_tx")
+            .about("Subcommand for handling pegin refund transactions")
+            .arg(arg!(<AMOUNT> "Amount of assets to peg-in").required(true))
+            .arg(
+                arg!(<RECIPIENT_ADDRESS> "Recipient L2 chain address for peg-in transaction")
+                    .required(true),
+            )
+    }
+
+    pub async fn handle_pegin_refund_tx_command(
+        &self,
+        depositor_public_key: &PublicKey,
+        sub_matches: &ArgMatches,
+    ) -> Response {
+        let amount = sub_matches.get_one::<String>("AMOUNT").unwrap();
+        let recipient_address = sub_matches.get_one::<String>("RECIPIENT_ADDRESS").unwrap();
+        let depositor_taproot_key = XOnlyPublicKey::from(*depositor_public_key);
+        let amount: Amount = Amount::from_sat(amount.parse::<u64>().unwrap());
+        let taproot_address = self.client.generate_connector_z_taproot_address(
+            self.network,
+            recipient_address,
+            &depositor_taproot_key,
+        );
+        let outpoint = self
+            .generate_stub_outpoint(&self.client, &taproot_address, amount)
+            .await;
+        let result = self.client.generate_presign_pegin_refund_tx(
+            self.network,
+            amount,
+            recipient_address,
+            depositor_public_key,
+            outpoint,
+        );
+        Response::new(
+            ResponseStatus::OK,
+            Some(serde_json::to_value(result).unwrap()),
+        )
+    }
+
+    pub async fn handle_pegin_deposit_tx_command(
+        &self,
+        depositor_public_key: &PublicKey,
+        sub_matches: &ArgMatches,
+    ) -> Response {
+        let amount = sub_matches.get_one::<String>("AMOUNT").unwrap();
+        let recipient_address = sub_matches.get_one::<String>("RECIPIENT_ADDRESS").unwrap();
+        let amount: Amount = Amount::from_sat(amount.parse::<u64>().unwrap());
+        let outpoint = self
+            .generate_stub_outpoint(
+                &self.client,
+                &generate_pay_to_pubkey_script_address(self.network, depositor_public_key),
+                amount,
+            )
+            .await;
+        let result = self.client.generate_presign_pegin_deposit_tx(
+            self.network,
+            amount,
+            recipient_address,
+            depositor_public_key,
+            outpoint,
+        );
+        Response::new(
+            ResponseStatus::OK,
+            Some(serde_json::to_value(result).unwrap()),
+        )
+    }
+
+    pub fn depositor_command() -> Command {
+        Command::new("depositor")
+            .about("fetch peg-in graphs related to the specified depositor")
+            .arg(arg!(<DEPOSITOR_PUBLIC_KEY> "Depositor public key").required(true))
+            .subcommand(Self::pegin_deposit_tx_command())
+            .subcommand(Self::pegin_confirm_tx_command())
+            .subcommand(Self::pegin_refund_tx_command())
+    }
+
+    pub async fn handle_pegin_confirm_tx_command(
+        &self,
+        depositor_public_key: &PublicKey,
+        sub_matches: &ArgMatches,
+    ) -> Response {
+        let amount = sub_matches.get_one::<String>("AMOUNT").unwrap();
+        let recipient_address = sub_matches.get_one::<String>("RECIPIENT_ADDRESS").unwrap();
+        let depositor_taproot_key = XOnlyPublicKey::from(*depositor_public_key);
+        let amount: Amount = Amount::from_sat(amount.parse::<u64>().unwrap());
+        let taproot_address = self.client.generate_connector_z_taproot_address(
+            self.network,
+            recipient_address,
+            &depositor_taproot_key,
+        );
+        let outpoint = self
+            .generate_stub_outpoint(&self.client, &taproot_address, amount)
+            .await;
+        let result = self.client.generate_presign_pegin_confirm_tx(
+            self.network,
+            recipient_address,
+            amount,
+            &depositor_taproot_key,
+            outpoint,
+        );
+        Response::new(
+            ResponseStatus::OK,
+            Some(serde_json::to_value(result).unwrap()),
+        )
+    }
+
+    pub async fn handle_depositor(&mut self, matches: &ArgMatches) -> Response {
+        let pubkey =
+            PublicKey::from_str(matches.get_one::<String>("DEPOSITOR_PUBLIC_KEY").unwrap());
+        if pubkey.is_err() {
+            return Response::new(
+                ResponseStatus::NOK(
+                    "Invalid public key. Use bitcoin public key format.".to_string(),
+                ),
+                None,
+            );
+        }
+        if matches.subcommand_matches("pegin_deposit_tx").is_some() {
+            return self
+                .handle_pegin_deposit_tx_command(
+                    &pubkey.unwrap(),
+                    matches.subcommand_matches("pegin_deposit_tx").unwrap(),
+                )
+                .await;
+        }
+        if matches.subcommand_matches("pegin_confirm_tx").is_some() {
+            return self
+                .handle_pegin_confirm_tx_command(
+                    &pubkey.unwrap(),
+                    matches.subcommand_matches("pegin_confirm_tx").unwrap(),
+                )
+                .await;
+        }
+        if matches.subcommand_matches("pegin_refund_tx").is_some() {
+            return self
+                .handle_pegin_refund_tx_command(
+                    &pubkey.unwrap(),
+                    matches.subcommand_matches("pegin_refund_tx").unwrap(),
+                )
+                .await;
+        }
+
+        self.sync().await;
+        let result = self
+            .client
+            .get_depositor_status(&pubkey.clone().unwrap())
+            .await;
+
+        match result.len() {
+            len if len > 0 => {
+                let data =
+                    Some(serde_json::to_value(result).expect("Failed to merge value vector"));
+                Response::new(ResponseStatus::OK, data)
+            }
+            _ => Response::new(
+                ResponseStatus::NOK("Depositor not found.".to_string()),
+                None,
+            ),
+        }
+    }
+
+    pub fn withdrawer_command() -> Command {
+        Command::new("withdrawer")
+            .about("fetch peg-out graphs related to the specified withdrawer")
+            .arg(arg!(<WITHDRAWER_CHAIN_ADDRESS> "WITHDRAWER L2 Chain address").required(true))
+    }
+
+    pub async fn handle_withdrawer(
+        &mut self,
+        matches: &ArgMatches,
+        destination_network: DestinationNetwork,
+    ) -> Response {
+        let chain_address = Address::from_str(
+            matches
+                .get_one::<String>("WITHDRAWER_CHAIN_ADDRESS")
+                .unwrap(),
+        );
+        if chain_address.is_err() {
+            return Response::new(
+                ResponseStatus::NOK(format!(
+                    "Invalid chain address. Use {} address format.",
+                    destination_network
+                )),
+                None,
+            );
+        }
+
+        self.sync().await;
+        let result = self
+            .client
+            .get_withdrawer_status(chain_address.unwrap().to_string().as_str())
+            .await;
+
+        match result.len() {
+            len if len > 0 => {
+                let data =
+                    Some(serde_json::to_value(result).expect("Failed to merge value vector"));
+                Response::new(ResponseStatus::OK, data)
+            }
+            _ => Response::new(
+                ResponseStatus::NOK("Withdrawer not found.".to_string()),
+                None,
+            ),
+        }
+    }
+
+    pub fn history_command() -> Command {
+        Command::new("history")
+            .about("fetch peg-in / peg-out graphs with bitcoin public key and ethereum address at the same time")
+            .arg(arg!(<DEPOSITOR_PUBLIC_KEY> "Depositor public key").required(true))
+            .arg(arg!(<WITHDRAWER_CHAIN_ADDRESS> "WITHDRAWER L2 Chain address").required(true))
+    }
+
+    pub async fn handle_history(
+        &mut self,
+        matches: &ArgMatches,
+        destination_network: DestinationNetwork,
+    ) -> Response {
+        let args = vec![
+            "DEPOSITOR_PUBLIC_KEY".to_string(),
+            "WITHDRAWER_CHAIN_ADDRESS".into(),
+        ];
+        let validate_result = match validate(matches, args, destination_network) {
+            Ok(result) => result,
+            Err(err) => return err,
+        };
+        let (pubkey, chain_address) = match &validate_result[..] {
+            [arg1, arg2, ..] => match (arg1, arg2) {
+                (ArgType::DepositorPublicKey(pubkey), ArgType::ChainAddress(chain_address)) => {
+                    (pubkey, chain_address)
+                }
+                _ => unreachable!(),
+            },
+            _ => unreachable!(),
+        };
+
+        self.sync().await;
+        let mut result_depositor = self.client.get_depositor_status(pubkey).await;
+        let mut result_withdrawer = self
+            .client
+            .get_withdrawer_status(chain_address.to_string().as_str())
+            .await;
+
+        let result = match (result_depositor.len(), result_withdrawer.len()) {
+            (0, 0) => vec![],
+            (0, _) => result_withdrawer,
+            (_, 0) => result_depositor,
+            _ => {
+                result_depositor.append(&mut result_withdrawer);
+                result_depositor
+            }
+        };
+
+        match result.len() {
+            len if len > 0 => {
+                let data =
+                    Some(serde_json::to_value(result).expect("Failed to merge value vector"));
+                Response::new(ResponseStatus::OK, data)
+            }
+            _ => Response::new(
+                ResponseStatus::NOK("Depositor / Withdrawer not found.".to_string()),
+                None,
+            ),
+        }
+    }
+
+    pub fn transactions_command() -> Command {
+        Command::new("transactions")
+            .about("create transactions of peg-in graph for depositor to sign")
+            .arg(arg!(<DEPOSITOR_PUBLIC_KEY> "Depositor public key").required(true))
+            .arg(arg!(<DESTINATION_CHAIN_ADDRESS> "Depositor's destination address on L2 Chain").required(true))
+            .arg(arg!(<OUTPOINT> "Previous output for peg-in deposit transaction input, format: <txid>:<vout>").required(true))
+            .arg(arg!(<SATS> "Amount of satoshis to deposit, should be also the value of previous output").required(true))
+    }
+
+    pub async fn handle_transactions(
+        &self,
+        matches: &ArgMatches,
+        destination_network: DestinationNetwork,
+    ) -> Response {
+        let args = vec![
+            "DEPOSITOR_PUBLIC_KEY".to_string(),
+            "DESTINATION_CHAIN_ADDRESS".into(),
+            "OUTPOINT".into(),
+            "SATS".into(),
+        ];
+        let validate_result = match validate(matches, args, destination_network) {
+            Ok(result) => result,
+            Err(err) => return err,
+        };
+        let (pubkey, chain_address, outpoint, satoshis) = match &validate_result[..] {
+            [arg1, arg2, arg3, arg4, ..] => match (arg1, arg2, arg3, arg4) {
+                (
+                    ArgType::DepositorPublicKey(pubkey),
+                    ArgType::ChainAddress(chain_address),
+                    ArgType::OutPoint(outpoint),
+                    ArgType::Satoshis(satoshis),
+                ) => (pubkey, chain_address, outpoint, satoshis),
+                _ => unreachable!(),
+            },
+            _ => unreachable!(),
+        };
+        let x_only_pubkey = XOnlyPublicKey::from(*pubkey);
+
+        // do not need to sync
+        let result = self
+            .client
+            .get_depositor_transactions(
+                &pubkey.clone(),
+                &x_only_pubkey,
+                Input {
+                    outpoint: *outpoint,
+                    amount: *satoshis,
+                },
+                chain_address.to_string().as_str(),
+            )
+            .await;
+
+        match result {
+            Ok(result) => Response::new(ResponseStatus::OK, Some(result)),
+            Err(err) => Response::new(ResponseStatus::NOK(err), None),
+        }
+    }
+
+    pub fn signatures_command() -> Command {
+        Command::new("signatures")
+            .about("create peg-in graph and broadcast peg-in deposit with depositor signatures")
+            .arg(arg!(<DEPOSITOR_PUBLIC_KEY> "Depositor public key").required(true))
+            .arg(arg!(<DESTINATION_CHAIN_ADDRESS> "Depositor's destination address on L2 Chain").required(true))
+            .arg(arg!(<OUTPOINT> "Previous output for peg-in deposit transaction input, format: <txid>:<vout>").required(true))
+            .arg(arg!(<SATS> "Amount of satoshis to deposit, should be also the value of previous output").required(true))
+            .arg(arg!(<DEPOSIT> "Sinature hex for peg-in deposit").required(true))
+            .arg(arg!(<CONFIRM> "Sinature hex for peg-in confirm").required(true))
+            .arg(arg!(<REFUND> "Sinature hex for peg-in refund").required(true))
+    }
+
+    pub async fn handle_signatures(
+        &mut self,
+        matches: &ArgMatches,
+        destination_network: DestinationNetwork,
+    ) -> Response {
+        let args = vec![
+            "DEPOSITOR_PUBLIC_KEY".to_string(),
+            "DESTINATION_CHAIN_ADDRESS".into(),
+            "OUTPOINT".into(),
+            "SATS".into(),
+            "DEPOSIT".into(),
+            "CONFIRM".into(),
+            "REFUND".into(),
+        ];
+        let validate_result = match validate(matches, args, destination_network) {
+            Ok(result) => result,
+            Err(err) => return err,
+        };
+        let (pubkey, chain_address, outpoint, satoshis, deposit, confirm, refund) =
+            match &validate_result[..] {
+                [arg1, arg2, arg3, arg4, arg5, arg6, arg7, ..] => {
+                    match (arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
+                        (
+                            ArgType::DepositorPublicKey(pubkey),
+                            ArgType::ChainAddress(chain_address),
+                            ArgType::OutPoint(outpoint),
+                            ArgType::Satoshis(satoshis),
+                            ArgType::EcdsaSignature(deposit),
+                            ArgType::TaprootSignature(confirm),
+                            ArgType::TaprootSignature(refund),
+                        ) => (
+                            pubkey,
+                            chain_address,
+                            outpoint,
+                            satoshis,
+                            deposit,
+                            confirm,
+                            refund,
+                        ),
+                        _ => unreachable!(),
+                    }
+                }
+                _ => unreachable!(),
+            };
+        let x_only_pubkey = XOnlyPublicKey::from(*pubkey);
+
+        self.sync().await;
+        let result = self
+            .client
+            .create_peg_in_graph_with_depositor_signatures(
+                pubkey,
+                &x_only_pubkey,
+                Input {
+                    outpoint: *outpoint,
+                    amount: *satoshis,
+                },
+                chain_address.to_string().as_str(),
+                &DepositorSignatures {
+                    deposit: *deposit,
+                    refund: *refund,
+                    confirm: *confirm,
+                },
+            )
+            .await;
+
+        match result {
+            Ok(result) => Response::new(ResponseStatus::OK, Some(result)),
+            Err(err) => Response::new(ResponseStatus::NOK(err), None),
+        }
+    }
+
+    pub fn broadcast_command() -> Command {
+        Command::new("broadcast")
+            .about("broadcast peg-in deposit transaction in a peg-in graph separately")
+            .args([arg!(<GRAPH_ID> "peg-in graph id").required(true)])
+    }
+
+    pub async fn handle_broadcast(&mut self, matches: &ArgMatches) -> Response {
+        self.sync().await;
+        let arg = "GRAPH_ID";
+        let Some(peg_in_graph_id) = matches.get_one::<String>(arg) else {
+            return Response::new(
+                ResponseStatus::NOK(format!("Missing argument: {}", arg)),
+                None,
+            );
+        };
+        let result = self
+            .client
+            .retry_broadcast_peg_in_deposit(peg_in_graph_id)
+            .await;
+
+        match result {
+            Ok(result) => Response::new(ResponseStatus::OK, Some(result)),
+            Err(err) => Response::new(ResponseStatus::NOK(err), None),
+        }
+    }
+
+    pub fn peg_in_graphs_command() -> Command {
+        Command::new("pegins")
+            .about("fetch all yet available peg-in graphs for pegging out process")
+    }
+
+    pub async fn handle_peg_in_graphs(&mut self) -> Response {
+        self.sync().await;
+        let result = self.client.get_unused_peg_in_graphs().await;
+
+        match result.len() {
+            len if len > 0 => {
+                let data =
+                    Some(serde_json::to_value(result).expect("Failed to merge value vector"));
+                Response::new(ResponseStatus::OK, data)
+            }
+            _ => Response::new(
+                ResponseStatus::NOK("No available peg-in graphs found.".to_string()),
+                None,
+            ),
+        }
+    }
+
+    pub async fn generate_stub_outpoint(
+        &self,
+        client: &BitVMClient,
+        funding_utxo_address: &bitcoin::Address,
+        input_value: Amount,
+    ) -> OutPoint {
+        let funding_utxo = client
+            .get_initial_utxo(funding_utxo_address.clone(), input_value)
+            .await
+            .unwrap_or_else(|| {
+                panic!(
+                    "Fund {:?} with {} sats at {}",
+                    funding_utxo_address,
+                    input_value.to_sat(),
+                    client.esplora.url(),
+                );
+            });
+        OutPoint {
+            txid: funding_utxo.txid,
+            vout: funding_utxo.vout,
+        }
+    }
+}
diff --git a/bridge/src/client/cli/query_response.rs b/bridge/src/client/cli/query_response.rs
new file mode 100644
index 000000000..16b7700ca
--- /dev/null
+++ b/bridge/src/client/cli/query_response.rs
@@ -0,0 +1,55 @@
+use strum::Display;
+
+use serde_json::{json, Value};
+
+#[derive(Display, PartialEq, Eq)]
+pub enum ResponseStatus {
+    OK,
+    NOK(String),
+}
+pub struct Response {
+    pub status: ResponseStatus,
+    pub data: Option<Value>,
+}
+
+impl Response {
+    pub fn new(status: ResponseStatus, data: Option<Value>) -> Self { Self { status, data } }
+
+    #[allow(clippy::should_implement_trait)]
+    pub fn default() -> Self { Self::new(ResponseStatus::NOK("".to_string()), None) }
+
+    pub fn flush(&self) {
+        println!(">>>> BitVM Query Response <<<<");
+
+        match &self.status {
+            ResponseStatus::OK => {
+                println!(
+                    "{}",
+                    json!({
+                        "status": "OK",
+                        "data": match &self.data {
+                            Some(data) => data.clone(),
+                            None => json!({}),
+                        },
+                        "error": "",
+                    })
+                );
+            }
+            ResponseStatus::NOK(msg) => {
+                println!(
+                    "{}",
+                    json!({
+                        "status": "NOK",
+                        "data": "",
+                        "error": msg
+                    })
+                );
+            }
+        }
+
+        std::process::exit(match self.status {
+            ResponseStatus::OK => 0,
+            ResponseStatus::NOK(_) => 1,
+        });
+    }
+}
diff --git a/bridge/src/client/cli/utils.rs b/bridge/src/client/cli/utils.rs
new file mode 100644
index 000000000..f3f9ba87b
--- /dev/null
+++ b/bridge/src/client/cli/utils.rs
@@ -0,0 +1,30 @@
+use std::str::FromStr;
+
+use bitcoin::{hashes::hash160::Hash, Amount, OutPoint, PubkeyHash, PublicKey};
+
+use crate::client::chain::{
+    chain::{Chain, PegOutEvent},
+    mock_adaptor::{MockAdaptor, MockAdaptorConfig},
+};
+
+pub fn get_mock_chain_service(outpoint: OutPoint, operator_public_key: PublicKey) -> Chain {
+    let mock_adaptor_config = MockAdaptorConfig {
+        peg_out_init_events: Some(vec![PegOutEvent {
+            source_outpoint: outpoint,
+            amount: Amount::from_sat(0),
+            timestamp: 1722328130u32,
+            withdrawer_chain_address: "0x0000000000000000000000000000000000000000".to_string(),
+            withdrawer_destination_address: "0x0000000000000000000000000000000000000000"
+                .to_string(),
+            withdrawer_public_key_hash: PubkeyHash::from_raw_hash(
+                Hash::from_str("0e6719ac074b0e3cac76d057643506faa1c266b3").unwrap(),
+            ),
+            operator_public_key: operator_public_key,
+            tx_hash: [0u8; 32].into(),
+        }]),
+        peg_out_burnt_events: None,
+        peg_out_minted_events: None,
+    };
+    let mock_adaptor = MockAdaptor::new(Some(mock_adaptor_config));
+    Chain::new(Box::new(mock_adaptor))
+}
diff --git a/bridge/src/client/cli/validation.rs b/bridge/src/client/cli/validation.rs
new file mode 100644
index 000000000..34d7e9172
--- /dev/null
+++ b/bridge/src/client/cli/validation.rs
@@ -0,0 +1,92 @@
+use alloy::primitives::Address;
+use bitcoin::{ecdsa, taproot, Amount, Denomination, OutPoint, PublicKey};
+use clap::ArgMatches;
+use core::str::FromStr;
+
+use crate::constants::DestinationNetwork;
+
+use super::query_response::{Response, ResponseStatus};
+
+pub enum ArgType {
+    DepositorPublicKey(PublicKey),
+    ChainAddress(Address),
+    OutPoint(OutPoint),
+    Satoshis(Amount),
+    EcdsaSignature(ecdsa::Signature),
+    TaprootSignature(taproot::Signature),
+}
+
+pub fn validate(
+    matches: &ArgMatches,
+    args: Vec<String>,
+    destination_network: DestinationNetwork,
+) -> Result<Vec<ArgType>, Response> {
+    let mut result: Vec<ArgType> = vec![];
+    for arg in args.iter() {
+        match matches.get_one::<String>(arg) {
+            Some(value) => match arg.as_str() {
+                "DEPOSITOR_PUBLIC_KEY" => match PublicKey::from_str(value) {
+                    Ok(pubkey) => result.push(ArgType::DepositorPublicKey(pubkey)),
+                    Err(_) => {
+                        return Err(error_response(
+                            "Invalid public key. Use bitcoin public key format.".to_string(),
+                        ))
+                    }
+                },
+                "DESTINATION_CHAIN_ADDRESS" | "WITHDRAWER_CHAIN_ADDRESS" => {
+                    match Address::from_str(value) {
+                        Ok(address) => result.push(ArgType::ChainAddress(address)),
+                        Err(_) => {
+                            return Err(error_response(format!(
+                                "Invalid {}. Use {} address format.",
+                                arg.as_str(),
+                                destination_network
+                            )))
+                        }
+                    }
+                }
+                "OUTPOINT" => match OutPoint::from_str(value) {
+                    Ok(outpoint) => result.push(ArgType::OutPoint(outpoint)),
+                    Err(_) => {
+                        return Err(error_response(
+                            "Invalid OutPoint. Use <txid>:<vout> format.".to_string(),
+                        ))
+                    }
+                },
+                "SATS" => match Amount::from_str_in(value, Denomination::Satoshi) {
+                    Ok(amount) => result.push(ArgType::Satoshis(amount)),
+                    Err(_) => {
+                        return Err(error_response(
+                            "Invalid amount of satoshis. Use u64.".to_string(),
+                        ))
+                    }
+                },
+                "DEPOSIT" => match ecdsa::Signature::from_slice(value.as_bytes()) {
+                    Ok(sig) => result.push(ArgType::EcdsaSignature(sig)),
+                    Err(_) => {
+                        return Err(error_response(
+                            "Invalid format of ecdsa signature.".to_string(),
+                        ))
+                    }
+                },
+                "CONFIRM" | "REFUND" => match taproot::Signature::from_slice(value.as_bytes()) {
+                    Ok(sig) => result.push(ArgType::TaprootSignature(sig)),
+                    Err(_) => {
+                        return Err(error_response(format!(
+                            "Invalid format of taproot signature for {} transaction.",
+                            arg.as_str()
+                        )))
+                    }
+                },
+                _ => return Err(error_response(format!("Invalid argument: {}", arg))),
+            },
+            None => return Err(error_response(format!("Missing argument: {}", arg))),
+        }
+    }
+
+    Ok(result)
+}
+
+fn error_response(err: String) -> Response {
+    Response::new(ResponseStatus::NOK(err.to_string()), None)
+}
diff --git a/bridge/src/client/client.rs b/bridge/src/client/client.rs
new file mode 100644
index 000000000..9456b9a8e
--- /dev/null
+++ b/bridge/src/client/client.rs
@@ -0,0 +1,1922 @@
+use bitcoin::{
+    absolute::Height, consensus::encode::serialize_hex, Address, Amount, Network, OutPoint,
+    PublicKey, ScriptBuf, Transaction, Txid, XOnlyPublicKey,
+};
+use colored::Colorize;
+use esplora_client::{AsyncClient, Builder, TxStatus, Utxo};
+use futures::future::join_all;
+use human_bytes::human_bytes;
+use musig2::SecNonce;
+use serde::{Deserialize, Serialize};
+use serde_json::{json, Value};
+use std::{
+    collections::HashMap,
+    path::{Path, PathBuf},
+};
+
+use crate::{
+    client::{
+        chain::ethereum_adaptor::EthereumAdaptor, esplora::get_esplora_url,
+        files::DEFAULT_PATH_PREFIX,
+    },
+    commitments::CommitmentMessageId,
+    common::ZkProofVerifyingKey,
+    connectors::{base::TaprootConnector, connector_0::Connector0, connector_z::ConnectorZ},
+    constants::DestinationNetwork,
+    contexts::base::generate_n_of_n_public_key,
+    error::{ClientError, Error},
+    graphs::{
+        base::{
+            broadcast_and_verify, get_tx_statuses, GraphId, PEG_OUT_FEE, REWARD_MULTIPLIER,
+            REWARD_PRECISION,
+        },
+        peg_in::{PegInDepositorStatus, PegInVerifierStatus},
+        peg_out::PegOutOperatorStatus,
+    },
+    proof::get_proof,
+    scripts::generate_pay_to_pubkey_script_address,
+    serialization::{serialize, try_deserialize_slice},
+    transactions::{
+        peg_in_confirm::PegInConfirmTransaction, peg_in_deposit::PegInDepositTransaction,
+        peg_in_refund::PegInRefundTransaction, pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+
+use bitvm::{
+    // chunker::disprove_execution::RawProof, 
+    chunk::api::type_conversion_utils::RawProof, signatures::signing_winternitz::WinternitzSecret
+};
+
+use super::{
+    super::{
+        contexts::{
+            depositor::DepositorContext, operator::OperatorContext, verifier::VerifierContext,
+            withdrawer::WithdrawerContext,
+        },
+        graphs::{
+            base::BaseGraph,
+            peg_in::{generate_id as peg_in_generate_id, PegInGraph},
+            peg_out::{generate_id as peg_out_generate_id, PegOutGraph},
+        },
+        transactions::{
+            base::{Input, InputWithScript},
+            pre_signed::PreSignedTransaction,
+        },
+    },
+    chain::{chain::Chain, chain_adaptor::ChainAdaptor},
+    data_store::data_store::DataStore,
+    files::{
+        get_private_data_file_path, get_private_data_from_file, save_local_private_file,
+        save_local_public_file, BRIDGE_DATA_DIRECTORY_NAME,
+    },
+    sdk::{
+        query::{ClientCliQuery, GraphCliQuery},
+        query_contexts::depositor_signatures::DepositorSignatures,
+    },
+};
+
+const TEN_MINUTES: u64 = 10 * 60;
+
+pub type UtxoSet = HashMap<OutPoint, Height>;
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct BitVMClientPublicData {
+    pub version: u32,
+    pub peg_in_graphs: Vec<PegInGraph>,
+    pub peg_out_graphs: Vec<PegOutGraph>,
+}
+
+impl BitVMClientPublicData {
+    pub fn graph_mut(&mut self, graph_id: &GraphId) -> &mut dyn BaseGraph {
+        if let Some(peg_in) = self.peg_in_graphs.iter_mut().find(|x| x.id() == graph_id) {
+            return peg_in;
+        }
+        if let Some(peg_out) = self.peg_out_graphs.iter_mut().find(|x| x.id() == graph_id) {
+            return peg_out;
+        }
+        panic!("Graph ID not found");
+    }
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq)]
+pub struct BitVMClientPrivateData {
+    // Peg in and peg out nonces all go into the same file for now
+    // Verifier public key -> Graph ID -> Tx ID -> Input index -> Secret nonce
+    #[allow(clippy::type_complexity)]
+    pub secret_nonces: HashMap<PublicKey, HashMap<String, HashMap<Txid, HashMap<usize, SecNonce>>>>,
+    // Operator Winternitz secrets for all the graphs.
+    // Operator public key -> Graph ID -> Message ID -> Winternitz secret
+    pub commitment_secrets:
+        HashMap<PublicKey, HashMap<String, HashMap<CommitmentMessageId, WinternitzSecret>>>,
+}
+
+pub struct BitVMClient {
+    pub esplora: AsyncClient,
+    pub source_network: Network,
+
+    depositor_context: Option<DepositorContext>,
+    operator_context: Option<OperatorContext>,
+    verifier_context: Option<VerifierContext>,
+    withdrawer_context: Option<WithdrawerContext>,
+
+    data_store: DataStore,
+    data: BitVMClientPublicData,
+    latest_processed_file_name: Option<String>,
+    remote_file_path: String,
+    local_file_path: PathBuf,
+
+    private_data: BitVMClientPrivateData,
+
+    chain_service: Chain,
+
+    zkproof_verifying_key: Option<ZkProofVerifyingKey>,
+}
+
+impl BitVMClient {
+    #[allow(clippy::too_many_arguments)]
+    pub async fn new(
+        esplora_url: Option<&str>,
+        source_network: Network,
+        destination_network: DestinationNetwork,
+        chain_adaptor: Option<Box<dyn ChainAdaptor>>,
+        n_of_n_public_keys: &[PublicKey],
+        depositor_secret: Option<&str>,
+        operator_secret: Option<&str>,
+        verifier_secret: Option<&str>,
+        withdrawer_secret: Option<&str>,
+        file_path_prefix: Option<&str>,
+        zkproof_verifying_key: Option<ZkProofVerifyingKey>,
+    ) -> Self {
+        let mut depositor_context = None;
+        if depositor_secret.is_some() {
+            depositor_context = Some(DepositorContext::new(
+                source_network,
+                depositor_secret.unwrap(),
+                n_of_n_public_keys,
+            ));
+        }
+
+        let mut operator_context = None;
+        if operator_secret.is_some() {
+            operator_context = Some(OperatorContext::new(
+                source_network,
+                operator_secret.unwrap(),
+                n_of_n_public_keys,
+            ));
+        }
+
+        let mut verifier_context = None;
+        if verifier_secret.is_some() {
+            verifier_context = Some(VerifierContext::new(
+                source_network,
+                verifier_secret.unwrap(),
+                n_of_n_public_keys,
+            ));
+        }
+
+        let mut withdrawer_context = None;
+        if withdrawer_secret.is_some() {
+            withdrawer_context = Some(WithdrawerContext::new(
+                source_network,
+                withdrawer_secret.unwrap(),
+                n_of_n_public_keys,
+            ));
+        }
+
+        let (n_of_n_public_key, _) = generate_n_of_n_public_key(n_of_n_public_keys);
+
+        // NOTE: This path is used to save files in the remote data store (currently AWS S3).
+        // Although S3 implements a flat object storage model without true directories, it uses '/'
+        // as a delimiter to simulate a hierarchical directory structure. For this reason we use it
+        // explicitly in the format string below.
+        let remote_file_path = format! {"{BRIDGE_DATA_DIRECTORY_NAME}/{source_network}/{destination_network}/{n_of_n_public_key}"};
+        // The local file path, on the other hand, must use the platform specific path separator.
+        // Additionally, it includes the provided file path prefix to create a user namespace.
+        let local_file_path = Path::new(BRIDGE_DATA_DIRECTORY_NAME)
+            .join(file_path_prefix.unwrap_or(DEFAULT_PATH_PREFIX)) // TODO: Refactor to require a prefix and remove the const, as the client already has a default and will always pass it. Also rename to 'user_profile' to match the client implementation.
+            .join(source_network.to_string())
+            .join(destination_network.to_string())
+            .join(n_of_n_public_key.to_string());
+        println!("Using data file path: {}", local_file_path.display());
+
+        let data = BitVMClientPublicData {
+            version: 1,
+            peg_in_graphs: vec![],
+            peg_out_graphs: vec![],
+        };
+
+        let data_store = DataStore::new().await;
+
+        let private_data =
+            get_private_data_from_file(&get_private_data_file_path(&local_file_path));
+
+        Self {
+            esplora: Builder::new(esplora_url.unwrap_or(get_esplora_url(source_network)))
+                .build_async()
+                .expect("Could not build esplora client"),
+            source_network,
+
+            depositor_context,
+            operator_context,
+            verifier_context,
+            withdrawer_context,
+
+            data_store,
+            data,
+            latest_processed_file_name: None,
+            remote_file_path,
+            local_file_path,
+
+            private_data,
+
+            chain_service: Chain::new(
+                chain_adaptor.unwrap_or_else(|| Box::new(EthereumAdaptor::new(None))),
+            ),
+
+            zkproof_verifying_key,
+        }
+    }
+
+    pub fn data(&self) -> &BitVMClientPublicData { &self.data }
+
+    pub fn data_mut(&mut self) -> &mut BitVMClientPublicData { &mut self.data }
+
+    // TODO: This should be private. Currently used in the fees test. See if it can be refactored.
+    pub fn private_data(&self) -> &BitVMClientPrivateData { &self.private_data }
+
+    // TODO: This fn is only used in tests. Consider refactoring, so it can be removed.
+    pub fn set_chain_service(&mut self, chain_service: Chain) {
+        self.chain_service = chain_service;
+    }
+
+    fn save_private_data(&self) {
+        save_local_private_file(&self.local_file_path, &serialize(&self.private_data));
+    }
+
+    pub async fn sync(&mut self) { self.read_from_data_store().await; }
+
+    pub async fn sync_l2(&mut self) { self.read_from_l2().await; }
+
+    pub async fn flush(&mut self) { self.save_to_data_store().await; }
+
+    /*
+    Expected file syncing flow with data store:
+     1. Fetch the latest file                               ⎫
+     2. Fetch all files within 10 minutes (use timestamp)   ⎬ BitVMClient::sync()
+     3. Merge files                                         ⎭
+     4. Client modifies file and clicks save                } BitVMClient::<mutating operation>
+     5. Fetch files that were created after fetching 1-2.   ⎫
+     6. Merge with your file                                ⎬ BitVMClient::flush()
+     7. Push the file to the server                         ⎭
+    */
+
+    async fn read_from_data_store(&mut self) {
+        let latest_file_names_result = Self::get_latest_file_names(
+            &self.data_store,
+            Some(&self.remote_file_path),
+            self.latest_processed_file_name.clone(),
+        )
+        .await;
+
+        if latest_file_names_result.is_ok() {
+            let mut latest_file_names = latest_file_names_result.unwrap();
+            if !latest_file_names.is_empty() {
+                // fetch latest valid file
+                let (latest_file, latest_file_name) = Self::fetch_latest_valid_file(
+                    &self.data_store,
+                    &mut latest_file_names,
+                    Some(&self.remote_file_path),
+                )
+                .await;
+                if latest_file.is_some() && latest_file_name.is_some() {
+                    save_local_public_file(
+                        &self.local_file_path,
+                        latest_file_name.as_ref().unwrap(),
+                        &serialize(&latest_file.as_ref().unwrap()),
+                    );
+                    self.latest_processed_file_name = latest_file_name;
+
+                    // fetch and process all the previous files if latest valid file exists
+                    let result =
+                        Self::process_files_by_timestamp(self, latest_file_names, TEN_MINUTES)
+                            .await;
+                    match result {
+                        Ok(_) => (), // println!("Ok"),
+                        Err(err) => println!("Error: {}", err),
+                    }
+
+                    self.merge_data(latest_file.unwrap()); // merge the latest data at the end
+                }
+            }
+        } else {
+            println!("Error: {}", latest_file_names_result.unwrap_err());
+        }
+    }
+
+    async fn read_from_l2(&mut self) {
+        let peg_out_result = self.chain_service.get_peg_out_init().await;
+        if peg_out_result.is_ok() {
+            let mut events = peg_out_result.unwrap();
+            for peg_out_graph in self.data.peg_out_graphs.iter_mut() {
+                if !peg_out_graph.is_peg_out_initiated() {
+                    match peg_out_graph.match_and_set_peg_out_event(&mut events).await {
+                        Ok(_) => {
+                            if peg_out_graph.peg_out_chain_event.is_some() {
+                                println!(
+                                    "Peg-out graph ID: {} Event Matched, Event: {:?}",
+                                    peg_out_graph.id(),
+                                    peg_out_graph.peg_out_chain_event
+                                )
+                            }
+                        }
+                        Err(err) => println!("Error: {}", err),
+                    }
+                }
+            }
+        } else {
+            panic!("Get event failed from L2 chain: {:?}", peg_out_result.err());
+        }
+    }
+
+    async fn get_latest_file_names(
+        data_store: &DataStore,
+        file_path: Option<&str>,
+        fetched_file_name: Option<String>,
+    ) -> Result<Vec<String>, String> {
+        let all_file_names_result = data_store.get_file_names(file_path).await;
+        if all_file_names_result.is_ok() {
+            let mut all_file_names = all_file_names_result.unwrap();
+
+            if fetched_file_name.is_some() {
+                let fetched_file_position = all_file_names
+                    .iter()
+                    .position(|file_name| file_name.eq(fetched_file_name.as_ref().unwrap()));
+                if fetched_file_position.is_some() {
+                    let unfetched_file_position = fetched_file_position.unwrap() + 1;
+                    if all_file_names.len() > unfetched_file_position {
+                        all_file_names = all_file_names.split_off(unfetched_file_position);
+                    } else {
+                        all_file_names.clear(); // no files to process
+                    }
+                }
+            }
+
+            Ok(all_file_names)
+        } else {
+            Err(all_file_names_result.err().unwrap())
+        }
+    }
+
+    async fn filter_files_names_by_timestamp(
+        &self,
+        latest_file_names: Vec<String>,
+        period: u64,
+    ) -> Result<Vec<String>, String> {
+        if self.latest_processed_file_name.is_some() {
+            let latest_timestamp = self
+                .data_store
+                .get_file_timestamp(self.latest_processed_file_name.as_ref().unwrap())?;
+
+            let past_max_file_name = self
+                .data_store
+                .get_past_max_file_name_by_timestamp(latest_timestamp, period);
+
+            let mut previous_max_position = latest_file_names
+                .iter()
+                .position(|file_name| file_name >= &past_max_file_name);
+            if previous_max_position.is_none() {
+                previous_max_position = Some(latest_file_names.len());
+            }
+
+            let file_names_to_process = latest_file_names
+                .clone()
+                .split_off(previous_max_position.unwrap());
+
+            Ok(file_names_to_process)
+        } else {
+            Err(String::from(
+                "No latest file data. Must fetch the latest file first.",
+            ))
+        }
+    }
+
+    async fn process_files_by_timestamp(
+        &mut self,
+        latest_file_names: Vec<String>,
+        period: u64,
+    ) -> Result<String, String> {
+        let file_names_to_process = self
+            .filter_files_names_by_timestamp(latest_file_names, period)
+            .await?;
+
+        Self::process_files(self, file_names_to_process).await;
+
+        Ok(String::from("Files processed"))
+    }
+
+    async fn process_files(&mut self, file_names: Vec<String>) -> Option<String> {
+        let mut latest_valid_file_name: Option<String> = None;
+        if file_names.is_empty() {
+            // println!("No additional files to process")
+        } else {
+            // TODO: can be optimized to fetch all data at once?
+            for file_name in file_names.iter() {
+                let result = self
+                    .data_store
+                    .fetch_compressed_data_by_key(file_name, Some(&self.remote_file_path))
+                    .await; // TODO: use `fetch_by_key()` function
+                if result.is_ok() && result.as_ref().unwrap().0.is_some() {
+                    let data = try_deserialize_slice(&(result.unwrap()).0.unwrap());
+                    if data.is_ok() && Self::validate_data(data.as_ref().unwrap()) {
+                        // merge the file if the data is valid
+                        println!("Merging {} data...", { file_name });
+                        self.merge_data(data.unwrap());
+                        if latest_valid_file_name.is_none() {
+                            latest_valid_file_name = Some(file_name.clone());
+                        }
+                    } else {
+                        // skip the file if the data is invalid
+                        println!("Invalid file {}, Skipping...", file_name);
+                    }
+                }
+            }
+        }
+
+        latest_valid_file_name
+    }
+
+    async fn fetch_latest_valid_file(
+        data_store: &DataStore,
+        file_names: &mut Vec<String>,
+        file_path: Option<&str>,
+    ) -> (Option<BitVMClientPublicData>, Option<String>) {
+        let mut latest_valid_file: Option<BitVMClientPublicData> = None;
+        let mut latest_valid_file_name: Option<String> = None;
+
+        while !file_names.is_empty() {
+            let file_name_result = file_names.pop();
+            if file_name_result.is_some() {
+                let file_name = file_name_result.unwrap();
+                let (latest_data, latest_data_len, encoded_size) =
+                    Self::fetch_by_key(data_store, &file_name, file_path).await;
+                if latest_data.is_some() && Self::validate_data(latest_data.as_ref().unwrap()) {
+                    // data is valid
+                    println!(
+                        "Fetched valid file: {} (size: {}, compressed: {})",
+                        file_name,
+                        human_bytes(latest_data_len as f64),
+                        human_bytes(encoded_size as f64)
+                    );
+                    latest_valid_file = latest_data;
+                    latest_valid_file_name = Some(file_name);
+                    break;
+                } else {
+                    println!("Invalid file: {}", file_name); // TODO: can be removed
+                }
+                // for invalid data try another file
+            }
+        }
+
+        (latest_valid_file, latest_valid_file_name)
+    }
+
+    async fn fetch_by_key(
+        data_store: &DataStore,
+        key: &String,
+        file_path: Option<&str>,
+    ) -> (Option<BitVMClientPublicData>, usize, usize) {
+        let result = data_store
+            .fetch_compressed_data_by_key(key, file_path)
+            .await;
+        if result.is_ok() {
+            if let (Some(content), encoded_size) = result.unwrap() {
+                let data = try_deserialize_slice(&content);
+                if let Ok(data) = data {
+                    return (Some(data), content.len(), encoded_size);
+                } else {
+                    eprintln!("{}", data.err().unwrap());
+                }
+            }
+        }
+
+        (None, 0, 0)
+    }
+
+    async fn save_to_data_store(&mut self) {
+        // read newly created data before pushing
+        let latest_file_names_result = Self::get_latest_file_names(
+            &self.data_store,
+            Some(&self.remote_file_path),
+            self.latest_processed_file_name.clone(),
+        )
+        .await;
+
+        if latest_file_names_result.is_ok() {
+            let mut latest_file_names = latest_file_names_result.unwrap();
+            latest_file_names.reverse();
+            let latest_valid_file_name = Self::process_files(self, latest_file_names).await;
+            self.latest_processed_file_name = latest_valid_file_name;
+        }
+
+        // push data
+        self.data.version += 1;
+
+        let contents = serialize(&self.data);
+        let result = self
+            .data_store
+            .write_compressed_data(&contents.as_bytes().to_vec(), Some(&self.remote_file_path))
+            .await;
+        match result {
+            Ok((file_name, size)) => {
+                println!(
+                    "Pushed new file: {} (size: {}, compressed: {})",
+                    file_name,
+                    human_bytes(contents.len() as f64),
+                    human_bytes(size as f64)
+                );
+                save_local_public_file(&self.local_file_path, &file_name, &contents);
+                self.latest_processed_file_name = Some(file_name);
+            }
+            Err(err) => println!("Failed to push: {}", err),
+        }
+    }
+
+    pub fn validate_data(data: &BitVMClientPublicData) -> bool {
+        for peg_in_graph in data.peg_in_graphs.iter() {
+            if !peg_in_graph.validate() {
+                println!(
+                    "Encountered invalid peg-in graph (graph ID: {})",
+                    peg_in_graph.id()
+                );
+                return false;
+            }
+        }
+        for peg_out_graph in data.peg_out_graphs.iter() {
+            if !peg_out_graph.validate() {
+                println!(
+                    "Encountered invalid peg-out graph (graph ID: {})",
+                    peg_out_graph.id()
+                );
+                return false;
+            }
+        }
+
+        // println!("All graph data is valid");
+        true
+    }
+
+    /// Merges `data` into `self.data`.
+    ///
+    /// # Arguments
+    ///
+    /// * `data` - Must be valid data verified via `BitVMClient::validate_data()` function
+    pub fn merge_data(&mut self, data: BitVMClientPublicData) {
+        // peg-in graphs
+        let mut peg_in_graphs_by_id: HashMap<String, &mut PegInGraph> = HashMap::new();
+        for peg_in_graph in self.data.peg_in_graphs.iter_mut() {
+            peg_in_graphs_by_id.insert(peg_in_graph.id().clone(), peg_in_graph);
+        }
+
+        let mut peg_in_graphs_to_add: Vec<&PegInGraph> = Vec::new();
+        for peg_in_graph in data.peg_in_graphs.iter() {
+            let graph = peg_in_graphs_by_id.get_mut(peg_in_graph.id());
+            if let Some(graph) = graph {
+                graph.merge(peg_in_graph);
+            } else {
+                peg_in_graphs_to_add.push(peg_in_graph);
+            }
+        }
+
+        for graph in peg_in_graphs_to_add.into_iter() {
+            self.data.peg_in_graphs.push(graph.clone());
+        }
+
+        // peg-out graphs
+        let mut peg_out_graphs_by_id: HashMap<String, &mut PegOutGraph> = HashMap::new();
+        for peg_out_graph in self.data.peg_out_graphs.iter_mut() {
+            let id = peg_out_graph.id().clone();
+            peg_out_graphs_by_id.insert(id, peg_out_graph);
+        }
+
+        let mut peg_out_graphs_to_add: Vec<&PegOutGraph> = Vec::new();
+        for peg_out_graph in data.peg_out_graphs.iter() {
+            let graph = peg_out_graphs_by_id.get_mut(peg_out_graph.id());
+            if let Some(graph) = graph {
+                graph.merge(peg_out_graph);
+            } else {
+                peg_out_graphs_to_add.push(peg_out_graph);
+            }
+        }
+
+        for graph in peg_out_graphs_to_add.into_iter() {
+            self.data.peg_out_graphs.push(graph.clone());
+        }
+    }
+
+    // fn process(&self) {
+    //     for peg_in_graph in self.data.peg_in_graphs.iter() {
+    //         // match graph.get(outpoint) {
+    //         //     Some(subsequent_txs) => {
+    //         //         for bridge_transaction in subsequent_txs {
+    //         //             // TODO: Check whether the transaction is executable
+    //         //             let tx = bridge_transaction.finalize();
+    //         //             match self.esplora.broadcast(&tx).await {
+    //         //                 Ok(_) => {
+    //         //                     println!(
+    //         //                         "Succesfully broadcast next transaction with id: {}",
+    //         //                         tx.compute_txid()
+    //         //                     );
+    //         //                     remove_utxo = Some(*outpoint);
+    //         //                     break;
+    //         //                 }
+    //         //                 Err(err) => panic!("Tx Broadcast Error: {}", err),
+    //         //             }
+    //         //         }
+    //         //     }
+    //         //     None => continue,
+    //         // }
+    //     }
+    // }
+
+    pub async fn status(&self) {
+        if self.depositor_context.is_some() {
+            self.depositor_status().await;
+        }
+        if self.operator_context.is_some() {
+            self.operator_status().await;
+        }
+        if self.verifier_context.is_some() {
+            self.verifier_status().await;
+        }
+    }
+
+    async fn depositor_status(&self) {
+        if self.depositor_context.is_none() {
+            panic!("Depositor context must be initialized");
+        }
+
+        let depositor_public_key = &self
+            .depositor_context
+            .as_ref()
+            .unwrap()
+            .depositor_public_key;
+        for peg_in_graph in self.data.peg_in_graphs.iter() {
+            if peg_in_graph.depositor_public_key.eq(depositor_public_key) {
+                let status = peg_in_graph.depositor_status(&self.esplora).await;
+                println!(
+                    "[DEPOSITOR]: Peg-in graph ID: {} status: {}\n",
+                    peg_in_graph.id(),
+                    status
+                );
+            }
+        }
+    }
+
+    async fn operator_status(&self) {
+        if self.operator_context.is_none() {
+            panic!("Operator context must be initialized");
+        }
+
+        let mut peg_out_graphs_by_id: HashMap<&String, &PegOutGraph> = HashMap::new();
+        for peg_out_graph in self.data.peg_out_graphs.iter() {
+            peg_out_graphs_by_id.insert(peg_out_graph.id(), peg_out_graph);
+        }
+
+        let operator_public_key = &self.operator_context.as_ref().unwrap().operator_public_key;
+        for peg_in_graph in self.data.peg_in_graphs.iter() {
+            let peg_out_graph_id = peg_out_generate_id(peg_in_graph, operator_public_key);
+            if !peg_out_graphs_by_id.contains_key(&peg_out_graph_id) {
+                println!(
+                    "[OPERATOR]: Peg-in graph ID: {} status: Missing peg out graph.\n",
+                    peg_in_graph.id() // TODO update this to ask the operator to create a new peg out graph
+                );
+            } else {
+                let peg_out_graph = peg_out_graphs_by_id.get(&peg_out_graph_id).unwrap();
+                let status = peg_out_graph.operator_status(&self.esplora).await;
+                println!(
+                    "[OPERATOR]: Peg-out graph ID: {} status: {}\n",
+                    peg_out_graph.id(),
+                    status
+                );
+            }
+        }
+    }
+
+    // TODO: refactor, see note on self.process_peg_in_as_verifier
+    pub async fn process_peg_in_as_depositor(&mut self, peg_in_graph_id: &GraphId) {
+        if self.depositor_context.is_some() {
+            if let Ok(peg_in_graph) = self.get_peg_in_graph(peg_in_graph_id) {
+                let status = peg_in_graph.depositor_status(&self.esplora).await;
+                match status {
+                    PegInDepositorStatus::PegInDepositWait => {
+                        let _ = self.broadcast_peg_in_deposit(peg_in_graph_id).await;
+                    }
+                    PegInDepositorStatus::PegInConfirmWait => {
+                        let _ = self.broadcast_peg_in_confirm(peg_in_graph_id).await;
+                    }
+                    _ => {
+                        println!("Peg-in graph {} is in status: {}", peg_in_graph_id, status);
+                    }
+                }
+            }
+        }
+    }
+
+    // TODO: refactor series of method e.g. process_*_as_* to return Result in order to properly handle internal errors
+    pub async fn process_peg_in_as_verifier(&mut self, peg_in_graph_id: &GraphId) {
+        if let Some(ref context) = self.verifier_context {
+            if let Ok(peg_in_graph) = self.get_peg_in_graph(peg_in_graph_id) {
+                let peg_outs_for_this_peg_in = self
+                    .data
+                    .peg_out_graphs
+                    .iter()
+                    .filter(|peg_out| peg_in_graph.peg_out_graphs.contains(peg_out.id()))
+                    .collect::<Vec<_>>();
+                let status = peg_in_graph
+                    .verifier_status(&self.esplora, context, &peg_outs_for_this_peg_in)
+                    .await;
+                match status {
+                    PegInVerifierStatus::PendingOurNonces(graph_ids) => {
+                        println!("Pushing nonces for graphs {graph_ids:?}");
+                        for graph_id in graph_ids {
+                            self.push_verifier_nonces(&graph_id);
+                        }
+                    }
+                    PegInVerifierStatus::PendingOurSignature(graph_ids) => {
+                        println!("Pushing signature for graphs {graph_ids:?}");
+                        for graph_id in graph_ids {
+                            self.push_verifier_signature(&graph_id);
+                        }
+                    }
+                    PegInVerifierStatus::ReadyToSubmit => {
+                        println!("Broadcasting peg-in confirm");
+                        let _ = self.broadcast_peg_in_confirm(peg_in_graph_id).await;
+                    }
+                    _ => {
+                        // nothing to do
+                    }
+                }
+            }
+        }
+    }
+
+    // TODO: refactor, see note on self.process_peg_in_as_verifier
+    pub async fn process_peg_in_as_operator(&mut self, peg_in_graph_id: &GraphId) {
+        if let Some(ref context) = self.operator_context {
+            if let Ok(peg_in_graph) = self.get_peg_in_graph(peg_in_graph_id) {
+                let peg_out_graph_id =
+                    peg_out_generate_id(peg_in_graph, &context.operator_public_key);
+                if !peg_in_graph
+                    .peg_out_graphs
+                    .iter()
+                    .any(|x| x == &peg_out_graph_id)
+                {
+                    let deposit_amount =
+                        peg_in_graph.peg_in_deposit_transaction.tx().output[0].value;
+                    let reward_amount = deposit_amount * REWARD_MULTIPLIER / REWARD_PRECISION;
+                    let expected_peg_out_confirm_amount = reward_amount.to_sat() + PEG_OUT_FEE;
+                    let input = {
+                        // todo: don't use a random address
+                        let address = generate_pay_to_pubkey_script_address(
+                            context.network,
+                            &context.operator_public_key,
+                        );
+                        let utxos = self
+                            .esplora
+                            .get_address_utxo(address.clone())
+                            .await
+                            .unwrap();
+                        let utxo = utxos
+                            .into_iter()
+                            .find(|x| x.value.to_sat() != expected_peg_out_confirm_amount)
+                            .unwrap_or_else(|| {
+                                panic!("No utxo found with {expected_peg_out_confirm_amount} sats for address {address}")
+                            });
+                        Input {
+                            amount: utxo.value,
+                            outpoint: OutPoint {
+                                txid: utxo.txid,
+                                vout: utxo.vout,
+                            },
+                        }
+                    };
+                    self.create_peg_out_graph(
+                        peg_in_graph_id,
+                        input,
+                        CommitmentMessageId::generate_commitment_secrets(),
+                    );
+                }
+            }
+        }
+    }
+
+    pub async fn process_peg_ins(&mut self) {
+        for peg_in_graph in self.data.peg_in_graphs.clone() {
+            self.process_peg_in_as_depositor(peg_in_graph.id()).await;
+            self.process_peg_in_as_verifier(peg_in_graph.id()).await;
+            self.process_peg_in_as_operator(peg_in_graph.id()).await;
+        }
+    }
+
+    // TODO: handle internal errors
+    pub async fn process_peg_outs(&mut self) {
+        let peg_out_graphs = self.data().peg_out_graphs.clone();
+        for peg_out_graph in peg_out_graphs.iter() {
+            let status = peg_out_graph.operator_status(&self.esplora).await;
+            match status {
+                PegOutOperatorStatus::PegOutStartTimeAvailable => {
+                    let _ = self.broadcast_start_time(peg_out_graph.id()).await;
+                }
+                PegOutOperatorStatus::PegOutPegOutConfirmAvailable => {
+                    let _ = self.broadcast_peg_out_confirm(peg_out_graph.id()).await;
+                }
+                PegOutOperatorStatus::PegOutKickOff1Available => {
+                    let _ = self.broadcast_kick_off_1(peg_out_graph.id()).await;
+                }
+                PegOutOperatorStatus::PegOutKickOff2Available => {
+                    let _ = self.broadcast_kick_off_2(peg_out_graph.id()).await;
+                }
+                PegOutOperatorStatus::PegOutAssertInitialAvailable => {
+                    let _ = self.broadcast_assert_initial(peg_out_graph.id()).await;
+                }
+                PegOutOperatorStatus::PegOutAssertCommit1Available => {
+                    let _ = self
+                        .broadcast_assert_commit_1(peg_out_graph.id(), &get_proof())
+                        .await;
+                }
+                PegOutOperatorStatus::PegOutAssertCommit2Available => {
+                    let _ = self
+                        .broadcast_assert_commit_2(peg_out_graph.id(), &get_proof())
+                        .await;
+                }
+                PegOutOperatorStatus::PegOutAssertFinalAvailable => {
+                    let _ = self.broadcast_assert_final(peg_out_graph.id()).await;
+                }
+                PegOutOperatorStatus::PegOutTake1Available => {
+                    let _ = self.broadcast_take_1(peg_out_graph.id()).await;
+                }
+                PegOutOperatorStatus::PegOutTake2Available => {
+                    let _ = self.broadcast_take_2(peg_out_graph.id()).await;
+                }
+                _ => {}
+            }
+        }
+    }
+
+    async fn verifier_status(&self) {
+        if self.verifier_context.is_none() {
+            panic!("Verifier context must be initialized");
+        }
+
+        for peg_in_graph in self.data.peg_in_graphs.iter() {
+            let peg_outs = peg_in_graph
+                .peg_out_graphs
+                .iter()
+                .map(|peg_out_id| {
+                    self.data
+                        .peg_out_graphs
+                        .iter()
+                        .find(|x| x.id() == peg_out_id)
+                        .unwrap()
+                })
+                .collect::<Vec<_>>();
+            let peg_in_status = peg_in_graph
+                .verifier_status(
+                    &self.esplora,
+                    self.verifier_context.as_ref().unwrap(),
+                    &peg_outs,
+                )
+                .await;
+
+            if peg_in_status == PegInVerifierStatus::Complete {
+                for peg_out_graph in peg_outs {
+                    let peg_out_status = peg_out_graph
+                        .verifier_status(&self.esplora, self.verifier_context.as_ref().unwrap())
+                        .await;
+                    println!(
+                        "[VERIFIER]: Peg-out graph ID: {} status: {}\n",
+                        peg_out_graph.id(),
+                        peg_out_status
+                    );
+                }
+            }
+            println!(
+                "[VERIFIER]: Peg-in graph ID: {} status: {}\n",
+                peg_in_graph.id(),
+                peg_in_status
+            );
+        }
+    }
+
+    pub async fn create_peg_in_graph(&mut self, input: Input, evm_address: &str) -> String {
+        if self.depositor_context.is_none() {
+            panic!("Depositor context must be initialized");
+        }
+
+        let peg_in_graph =
+            PegInGraph::new(self.depositor_context.as_ref().unwrap(), input, evm_address);
+
+        let peg_in_graph_id = peg_in_generate_id(&peg_in_graph.peg_in_deposit_transaction);
+
+        let graph = self
+            .data
+            .peg_in_graphs
+            .iter()
+            .find(|&peg_out_graph| peg_out_graph.id().eq(&peg_in_graph_id));
+        if graph.is_some() {
+            panic!("Peg in graph already exists");
+        }
+
+        self.data.peg_in_graphs.push(peg_in_graph);
+
+        peg_in_graph_id
+    }
+
+    pub async fn broadcast_peg_in_deposit(
+        &mut self,
+        peg_in_graph_id: &String,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_in_or_fail(&mut self.data, peg_in_graph_id)?;
+        let tx = graph.deposit(&self.esplora).await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn broadcast_peg_in_refund(
+        &mut self,
+        peg_in_graph_id: &String,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_in_or_fail(&mut self.data, peg_in_graph_id)?;
+        let tx = graph.refund(&self.esplora).await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn broadcast_peg_in_confirm(
+        &mut self,
+        peg_in_graph_id: &String,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_in_or_fail(&mut self.data, peg_in_graph_id)?;
+        let tx = graph.confirm(&self.esplora).await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub fn create_peg_out_graph(
+        &mut self,
+        peg_in_graph_id: &str,
+        peg_out_confirm_input: Input,
+        commitment_secrets: HashMap<CommitmentMessageId, WinternitzSecret>,
+    ) -> String {
+        if self.operator_context.is_none() {
+            panic!("Operator context must be initialized");
+        }
+        let operator_public_key = &self.operator_context.as_ref().unwrap().operator_public_key;
+
+        let peg_in_graph = self
+            .data
+            .peg_in_graphs
+            .iter_mut()
+            .find(|peg_in_graph| peg_in_graph.id().eq(peg_in_graph_id))
+            .unwrap_or_else(|| panic!("Invalid graph ID"));
+
+        let peg_out_graph_id = peg_out_generate_id(peg_in_graph, operator_public_key);
+        let peg_out_graph = self
+            .data
+            .peg_out_graphs
+            .iter()
+            .find(|&peg_out_graph| peg_out_graph.id().eq(&peg_out_graph_id));
+        if peg_out_graph.is_some() {
+            panic!("Peg out graph already exists");
+        }
+
+        let peg_out_graph = PegOutGraph::new(
+            self.operator_context.as_ref().unwrap(),
+            peg_in_graph,
+            peg_out_confirm_input,
+            &commitment_secrets,
+        );
+
+        self.data.peg_out_graphs.push(peg_out_graph);
+        peg_in_graph.peg_out_graphs.push(peg_out_graph_id.clone());
+
+        self.private_data.commitment_secrets = HashMap::from([(
+            *operator_public_key,
+            HashMap::from([(peg_out_graph_id.to_string(), commitment_secrets)]),
+        )]);
+        self.save_private_data();
+
+        peg_out_graph_id
+    }
+
+    pub async fn broadcast_peg_out(
+        &mut self,
+        peg_out_graph_id: &String,
+        input: Input,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        if self.operator_context.is_some() {
+            let tx = graph
+                .peg_out(
+                    &self.esplora,
+                    self.operator_context.as_ref().unwrap(),
+                    input,
+                )
+                .await?;
+            self.broadcast_tx(&tx).await
+        } else {
+            Err(Error::Client(ClientError::OperatorContextNotDefined))
+        }
+    }
+
+    pub async fn broadcast_peg_out_confirm(
+        &mut self,
+        peg_out_graph_id: &String,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        let tx = graph.peg_out_confirm(&self.esplora).await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn broadcast_kick_off_1(&mut self, peg_out_graph_id: &String) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+
+        if self.operator_context.is_some() {
+            let tx = graph
+                .kick_off_1(
+                    &self.esplora,
+                    self.operator_context.as_ref().unwrap(),
+                    &self.private_data.commitment_secrets
+                        [&self.operator_context.as_ref().unwrap().operator_public_key]
+                        [peg_out_graph_id][&CommitmentMessageId::PegOutTxIdSourceNetwork],
+                    &self.private_data.commitment_secrets
+                        [&self.operator_context.as_ref().unwrap().operator_public_key]
+                        [peg_out_graph_id][&CommitmentMessageId::PegOutTxIdDestinationNetwork],
+                )
+                .await?;
+            self.broadcast_tx(&tx).await
+        } else {
+            Err(Error::Client(ClientError::OperatorContextNotDefined))
+        }
+    }
+
+    pub async fn broadcast_start_time(&mut self, peg_out_graph_id: &String) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+
+        if self.operator_context.is_some() {
+            let tx = graph
+                .start_time(
+                    &self.esplora,
+                    self.operator_context.as_ref().unwrap(),
+                    &self.private_data.commitment_secrets
+                        [&self.operator_context.as_ref().unwrap().operator_public_key]
+                        [peg_out_graph_id][&CommitmentMessageId::StartTime],
+                )
+                .await?;
+            self.broadcast_tx(&tx).await
+        } else {
+            Err(Error::Client(ClientError::OperatorContextNotDefined))
+        }
+    }
+
+    pub async fn broadcast_start_time_timeout(
+        &mut self,
+        peg_out_graph_id: &String,
+        output_script_pubkey: ScriptBuf,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        let tx = graph
+            .start_time_timeout(&self.esplora, output_script_pubkey)
+            .await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn broadcast_kick_off_2(&mut self, peg_out_graph_id: &String) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        let tx = graph
+            .kick_off_2(
+                &self.esplora,
+                self.operator_context.as_ref().unwrap(),
+                &self.private_data.commitment_secrets
+                    [&self.operator_context.as_ref().unwrap().operator_public_key]
+                    [peg_out_graph_id][&CommitmentMessageId::Superblock],
+                &self.private_data.commitment_secrets
+                    [&self.operator_context.as_ref().unwrap().operator_public_key]
+                    [peg_out_graph_id][&CommitmentMessageId::SuperblockHash],
+            )
+            .await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn broadcast_kick_off_timeout(
+        &mut self,
+        peg_out_graph_id: &String,
+        output_script_pubkey: ScriptBuf,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        let tx = graph
+            .kick_off_timeout(&self.esplora, output_script_pubkey)
+            .await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn broadcast_challenge(
+        &mut self,
+        peg_out_graph_id: &String,
+        crowdfundng_inputs: &Vec<InputWithScript<'_>>,
+        output_script_pubkey: ScriptBuf,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+
+        if self.depositor_context.is_some() {
+            let tx = graph
+                .challenge(
+                    &self.esplora,
+                    crowdfundng_inputs,
+                    &self.depositor_context.as_ref().unwrap().depositor_keypair,
+                    output_script_pubkey,
+                )
+                .await?;
+            self.broadcast_tx(&tx).await
+        } else if self.operator_context.is_some() {
+            let tx = graph
+                .challenge(
+                    &self.esplora,
+                    crowdfundng_inputs,
+                    &self.operator_context.as_ref().unwrap().operator_keypair,
+                    output_script_pubkey,
+                )
+                .await?;
+            self.broadcast_tx(&tx).await
+        } else if self.verifier_context.is_some() {
+            let tx = graph
+                .challenge(
+                    &self.esplora,
+                    crowdfundng_inputs,
+                    &self.verifier_context.as_ref().unwrap().verifier_keypair,
+                    output_script_pubkey,
+                )
+                .await?;
+            self.broadcast_tx(&tx).await
+        } else if self.withdrawer_context.is_some() {
+            let tx = graph
+                .challenge(
+                    &self.esplora,
+                    crowdfundng_inputs,
+                    &self.withdrawer_context.as_ref().unwrap().withdrawer_keypair,
+                    output_script_pubkey,
+                )
+                .await?;
+            self.broadcast_tx(&tx).await
+        } else {
+            Err(Error::Client(ClientError::NoUserContextDefined))
+        }
+    }
+
+    pub async fn broadcast_assert_initial(
+        &mut self,
+        peg_out_graph_id: &String,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        let tx = graph.assert_initial(&self.esplora).await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn broadcast_assert_commit_1(
+        &mut self,
+        peg_out_graph_id: &String,
+        proof: &RawProof,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        let tx = graph
+            .assert_commit_1(
+                &self.esplora,
+                &self.private_data.commitment_secrets
+                    [&self.operator_context.as_ref().unwrap().operator_public_key]
+                    [peg_out_graph_id],
+                proof,
+            )
+            .await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn broadcast_assert_commit_2(
+        &mut self,
+        peg_out_graph_id: &String,
+        proof: &RawProof,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        let tx = graph
+            .assert_commit_2(
+                &self.esplora,
+                &self.private_data.commitment_secrets
+                    [&self.operator_context.as_ref().unwrap().operator_public_key]
+                    [peg_out_graph_id],
+                proof,
+            )
+            .await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn broadcast_assert_final(
+        &mut self,
+        peg_out_graph_id: &String,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        let tx = graph.assert_final(&self.esplora).await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn broadcast_disprove(
+        &mut self,
+        peg_out_graph_id: &String,
+        output_script_pubkey: ScriptBuf,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        let tx = graph
+            .disprove(
+                &self.esplora,
+                output_script_pubkey,
+                self.zkproof_verifying_key
+                    .as_ref()
+                    .ok_or(Error::Client(ClientError::ZkProofVerifyingKeyNotDefined))?,
+            )
+            .await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn broadcast_disprove_chain(
+        &mut self,
+        peg_out_graph_id: &String,
+        output_script_pubkey: ScriptBuf,
+    ) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        let tx = graph
+            .disprove_chain(&self.esplora, output_script_pubkey)
+            .await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn broadcast_take_1(&mut self, peg_out_graph_id: &String) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        let tx = graph.take_1(&self.esplora).await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn broadcast_take_2(&mut self, peg_out_graph_id: &String) -> Result<Txid, Error> {
+        let graph = Self::find_peg_out_or_fail(&mut self.data, peg_out_graph_id)?;
+        let tx = graph
+            .take_2(&self.esplora, self.operator_context.as_ref().unwrap())
+            .await?;
+        self.broadcast_tx(&tx).await
+    }
+
+    pub async fn get_initial_utxo(&self, address: Address, amount: Amount) -> Option<Utxo> {
+        let utxos = self.esplora.get_address_utxo(address).await.unwrap();
+
+        let possible_utxos = utxos
+            .into_iter()
+            .filter(|utxo| utxo.value == amount)
+            .collect::<Vec<_>>();
+        if !possible_utxos.is_empty() {
+            Some(possible_utxos[0].clone())
+        } else {
+            None
+        }
+    }
+
+    pub async fn get_initial_utxos(&self, address: Address, amount: Amount) -> Option<Vec<Utxo>> {
+        let utxos: Vec<Utxo> = self.esplora.get_address_utxo(address).await.unwrap();
+        let possible_utxos = utxos
+            .into_iter()
+            .filter(|utxo| utxo.value == amount)
+            .collect::<Vec<_>>();
+        if !possible_utxos.is_empty() {
+            Some(possible_utxos)
+        } else {
+            None
+        }
+    }
+
+    pub fn get_operator_address(&self) -> Address {
+        if let Some(ref context) = self.operator_context {
+            generate_pay_to_pubkey_script_address(context.network, &context.operator_public_key)
+        } else {
+            panic!("Operator private key not provided in configuration.");
+        }
+    }
+
+    pub async fn get_operator_utxos(&self) -> Vec<Utxo> {
+        self.esplora
+            .get_address_utxo(self.get_operator_address())
+            .await
+            .unwrap()
+    }
+
+    pub fn get_depositor_address(&self) -> Address {
+        if let Some(ref context) = self.depositor_context {
+            generate_pay_to_pubkey_script_address(context.network, &context.depositor_public_key)
+        } else {
+            panic!("Depositor private key not provided in configuration.");
+        }
+    }
+
+    pub async fn get_depositor_utxos(&self) -> Vec<Utxo> {
+        self.esplora
+            .get_address_utxo(self.get_depositor_address())
+            .await
+            .unwrap()
+    }
+
+    pub fn push_verifier_nonces(&mut self, graph_id: &GraphId) {
+        if self.verifier_context.is_none() {
+            panic!("Can only be called by a verifier!");
+        }
+
+        let graph = self.data.graph_mut(graph_id);
+        let secret_nonces = graph.push_verifier_nonces(self.verifier_context.as_ref().unwrap());
+        self.merge_secret_nonces(graph_id, secret_nonces);
+        self.save_private_data();
+    }
+
+    fn get_peg_in_graph(&self, peg_in_graph_id: &String) -> Result<&PegInGraph, Error> {
+        self.data
+            .peg_in_graphs
+            .iter()
+            .find(|peg_in_graph| peg_in_graph.id().eq(peg_in_graph_id))
+            .ok_or(Error::Client(ClientError::PegInGraphNotFound(
+                peg_in_graph_id.clone(),
+            )))
+    }
+
+    // TODO: consider refactor client as static, and use it in graph struct directly
+    //       so we can have this method instead of find_peg_in_or_fail
+    // fn get_peg_in_graph_mut(&mut self, peg_in_graph_id: &String) -> Result<&mut PegInGraph, Error> {
+    //     self.data_mut_ref()
+    //         .peg_in_graphs
+    //         .iter_mut()
+    //         .find(|peg_in_graph| peg_in_graph.id().eq(peg_in_graph_id))
+    //         .ok_or(Error::Client(ClientError::PegInGraphNotFound(
+    //             peg_in_graph_id.clone(),
+    //         )))
+    // }
+
+    fn find_peg_in_or_fail<'a>(
+        data: &'a mut BitVMClientPublicData,
+        peg_in_graph_id: &'a String,
+    ) -> Result<&'a mut PegInGraph, Error> {
+        if let Some(graph) = data
+            .peg_in_graphs
+            .iter_mut()
+            .find(|peg_in_graph| peg_in_graph.id().eq(peg_in_graph_id))
+        {
+            Ok(graph)
+        } else {
+            Err(Error::Client(ClientError::PegInGraphNotFound(
+                peg_in_graph_id.clone(),
+            )))
+        }
+    }
+
+    fn find_peg_out_or_fail<'a>(
+        data: &'a mut BitVMClientPublicData,
+        peg_out_graph_id: &'a String,
+    ) -> Result<&'a mut PegOutGraph, Error> {
+        if let Some(graph) = data
+            .peg_out_graphs
+            .iter_mut()
+            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id))
+        {
+            Ok(graph)
+        } else {
+            Err(Error::Client(ClientError::PegOutGraphNotFound(
+                peg_out_graph_id.clone(),
+            )))
+        }
+    }
+
+    async fn broadcast_tx(&self, tx: &Transaction) -> Result<Txid, Error> {
+        let status_message = broadcast_and_verify(&self.esplora, tx).await?;
+
+        let txid = tx.compute_txid();
+        println!("{} Txid: {}", status_message, txid.to_string().green());
+
+        Ok(txid)
+    }
+
+    fn merge_secret_nonces(
+        &mut self,
+        graph_id: &str,
+        secret_nonces: HashMap<Txid, HashMap<usize, SecNonce>>,
+    ) {
+        self.private_data
+            .secret_nonces
+            .entry(self.verifier_context.as_ref().unwrap().verifier_public_key)
+            .or_default();
+
+        if !self.private_data.secret_nonces
+            [&self.verifier_context.as_ref().unwrap().verifier_public_key]
+            .contains_key(graph_id)
+        {
+            self.private_data
+                .secret_nonces
+                .get_mut(&self.verifier_context.as_ref().unwrap().verifier_public_key)
+                .unwrap()
+                .insert(graph_id.to_string(), HashMap::new());
+        }
+
+        self.private_data
+            .secret_nonces
+            .get_mut(&self.verifier_context.as_ref().unwrap().verifier_public_key)
+            .unwrap()
+            .get_mut(graph_id)
+            .unwrap()
+            .extend(secret_nonces);
+    }
+
+    pub fn generate_connector_z_taproot_address(
+        &self,
+        source_network: Network,
+        recipient_address: &str,
+        depositor_taproot_key: &XOnlyPublicKey,
+    ) -> Address {
+        let connector_z = ConnectorZ::new(
+            source_network,
+            recipient_address,
+            depositor_taproot_key,
+            &self
+                .operator_context
+                .as_ref()
+                .unwrap()
+                .n_of_n_taproot_public_key,
+        );
+        connector_z.generate_taproot_address()
+    }
+
+    pub fn generate_presign_pegin_confirm_tx(
+        &self,
+        source_network: Network,
+        recipient_address: &str,
+        amount: Amount,
+        depositor_taproot_key: &XOnlyPublicKey,
+        outpoint: OutPoint,
+    ) -> String {
+        let connector_z = ConnectorZ::new(
+            source_network,
+            recipient_address,
+            depositor_taproot_key,
+            &self
+                .operator_context
+                .as_ref()
+                .unwrap()
+                .n_of_n_taproot_public_key,
+        );
+        let connector_0 = Connector0::new(
+            source_network,
+            &self
+                .operator_context
+                .as_ref()
+                .unwrap()
+                .n_of_n_taproot_public_key,
+        );
+        let mut peg_in_confirm_tx = PegInConfirmTransaction::new_for_validation(
+            &connector_0,
+            &connector_z,
+            Input { outpoint, amount },
+            self.operator_context
+                .as_ref()
+                .unwrap()
+                .n_of_n_public_keys
+                .clone(),
+        );
+        let secret_nonces_0 =
+            peg_in_confirm_tx.push_nonces(self.verifier_context.as_ref().unwrap());
+
+        peg_in_confirm_tx.pre_sign(
+            self.verifier_context.as_ref().unwrap(),
+            &connector_z,
+            &secret_nonces_0,
+        );
+        serialize_hex(&(peg_in_confirm_tx.tx_mut()))
+    }
+
+    pub fn generate_presign_pegin_deposit_tx(
+        &self,
+        source_network: Network,
+        amount: Amount,
+        recipient_address: &str,
+        depositor_public_key: &PublicKey,
+        outpoint: OutPoint,
+    ) -> String {
+        let depositor_taproot_key = XOnlyPublicKey::from(*depositor_public_key);
+        let connector_z = ConnectorZ::new(
+            source_network,
+            recipient_address,
+            &depositor_taproot_key,
+            &self
+                .operator_context
+                .as_ref()
+                .unwrap()
+                .n_of_n_taproot_public_key,
+        );
+        let mut peg_in_deposit_tx = PegInDepositTransaction::new_for_validation(
+            source_network,
+            depositor_public_key,
+            &connector_z,
+            Input { outpoint, amount },
+        );
+        serialize_hex(&(peg_in_deposit_tx.tx_mut()))
+    }
+
+    pub fn generate_presign_pegin_refund_tx(
+        &self,
+        source_network: Network,
+        amount: Amount,
+        recipient_address: &str,
+        depositor_public_key: &PublicKey,
+        outpoint: OutPoint,
+    ) -> String {
+        let depositor_taproot_key: XOnlyPublicKey = XOnlyPublicKey::from(*depositor_public_key);
+        let connector_z = ConnectorZ::new(
+            source_network,
+            recipient_address,
+            &depositor_taproot_key,
+            &self
+                .operator_context
+                .as_ref()
+                .unwrap()
+                .n_of_n_taproot_public_key,
+        );
+        let mut peg_in_refund_tx = PegInRefundTransaction::new_for_validation(
+            source_network,
+            depositor_public_key,
+            &connector_z,
+            Input { outpoint, amount },
+        );
+        serialize_hex(&(peg_in_refund_tx.tx_mut()))
+    }
+
+    pub fn push_verifier_signature(&mut self, graph_id: &GraphId) {
+        let verifier = self
+            .verifier_context
+            .as_ref()
+            .expect("Can only be called by a verifier!");
+
+        let graph = self.data.graph_mut(graph_id);
+        graph.verifier_sign(
+            verifier,
+            &self.private_data.secret_nonces
+                [&self.verifier_context.as_ref().unwrap().verifier_public_key][graph_id],
+        );
+    }
+
+    // pub async fn execute_possible_txs(
+    //     &mut self,
+    //     context: &dyn BaseContext,
+    //     graph: &mut CompiledBitVMGraph,
+    // ) {
+    //     // Iterate through our UTXO set and execute an executable TX
+    //     // TODO: May have to respect an order here.
+    //     let mut remove_utxo = None;
+    //     for (outpoint, _) in self.utxo_set.iter() {
+    //         match graph.get(outpoint) {
+    //             Some(subsequent_txs) => {
+    //                 for bridge_transaction in subsequent_txs {
+    //                     // TODO: Check whether the transaction is executable
+    //                     let tx = bridge_transaction.finalize();
+    //                     match self.esplora.broadcast(&tx).await {
+    //                         Ok(_) => {
+    //                             println!(
+    //                                 "Succesfully broadcast next transaction with id: {}",
+    //                                 tx.compute_txid()
+    //                             );
+    //                             remove_utxo = Some(*outpoint);
+    //                             break;
+    //                         }
+    //                         Err(err) => panic!("Tx Broadcast Error: {}", err),
+    //                     }
+    //                 }
+    //             }
+    //             None => continue,
+    //         }
+    //     }
+
+    //     if let Some(remove_utxo) = remove_utxo {
+    //         self.utxo_set.remove(&remove_utxo);
+    //         graph.remove(&remove_utxo);
+    //     }
+    // }
+
+    // pub async fn listen(
+    //     &mut self,
+    //     context: &dyn BaseContext,
+    //     initial_outpoint: OutPoint,
+    //     graph: &mut CompiledBitVMGraph,
+    // ) {
+    //     let builder = Builder::new(ESPLORA_URL);
+    //     let esplora = builder.build_async().unwrap();
+    //     let mut latest_hash =
+    //         BlockHash::from_str("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f")
+    //             .unwrap();
+    //     self.utxo_set.insert(initial_outpoint, Height::ZERO);
+
+    //     while !graph.is_empty() {
+    //         if let Ok(block_hash) = esplora.get_tip_hash().await {
+    //             if block_hash == latest_hash {
+    //                 sleep(Duration::from_secs(10));
+    //                 continue;
+    //             }
+    //             latest_hash = block_hash;
+    //             // TODO: This assumes that the tip did not increase. There should be a
+    //             // better API endpoint like /block-height/{block_hash}
+    //             let block_height = esplora.get_height().await.unwrap();
+    //             let block = esplora
+    //                 .get_block_by_hash(&block_hash)
+    //                 .await
+    //                 .unwrap()
+    //                 .unwrap();
+
+    //             // Handle new block received logic
+    //             println!("Received block {}", block_hash);
+
+    //             for tx in block.txdata {
+    //                 for (vout, _) in tx.output.iter().enumerate() {
+    //                     let outpoint = OutPoint {
+    //                         txid: tx.compute_txid(),
+    //                         vout: vout as u32,
+    //                     };
+    //                     if graph.contains_key(&outpoint) {
+    //                         // Update our UTXO set
+    //                         self.utxo_set
+    //                             .insert(outpoint, Height::from_consensus(block_height).unwrap());
+    //                     }
+    //                 }
+    //             }
+    //             self.execute_possible_txs(context, graph).await;
+    //         }
+    //     }
+    // }
+}
+
+impl ClientCliQuery for BitVMClient {
+    async fn get_unused_peg_in_graphs(&self) -> Vec<Value> {
+        join_all(self.data.peg_in_graphs.iter().filter_map(|peg_in| {
+            Some(async move {
+                match peg_in.depositor_status(&self.esplora).await {
+                    PegInDepositorStatus::PegInConfirmComplete => match self.data.peg_out_graphs.iter().find(|peg_out| peg_out.peg_in_graph_id == *peg_in.id()) {
+                        Some(peg_out) => match peg_out.operator_status(&self.esplora).await {
+                            PegOutOperatorStatus::PegOutWait => Some(json!({
+                                "graph_id": peg_in.id(),
+                                "amount": peg_in.peg_in_confirm_transaction.prev_outs()[0].value.to_sat(),
+                                "source_outpoint": {
+                                    "txid": peg_in.peg_in_confirm_transaction.tx().compute_txid(),
+                                    "vout": 0
+                                },
+                            })),
+                            _ => None,
+                        },
+                        None => None,
+                    },
+                    _ => None,
+                }
+            })
+        }))
+        .await
+        .iter()
+        .filter_map(|v| {
+            v.clone()
+        })
+        .collect()
+    }
+
+    async fn get_depositor_status(&self, depositor_public_key: &PublicKey) -> Vec<Value> {
+        join_all(
+            self.data
+                .peg_in_graphs
+                .iter()
+                .filter(|&graph| graph.depositor_public_key.eq(depositor_public_key))
+                .map(|graph| async {
+                    let tx_ids = vec![
+                        graph.peg_in_deposit_transaction.tx().compute_txid(),
+                        graph.peg_in_confirm_transaction.tx().compute_txid(),
+                        graph.peg_in_refund_transaction.tx().compute_txid(),
+                    ];
+                    let tx_statuses_results = get_tx_statuses(&self.esplora, &tx_ids).await;
+                    let blockchain_height = self.esplora.get_height().await;
+                    let status = graph.interpret_depositor_status(
+                        &tx_statuses_results[0],
+                        &tx_statuses_results[1],
+                        &tx_statuses_results[2],
+                        blockchain_height,
+                    );
+
+                    let tx_statuses = tx_statuses_results
+                        .iter()
+                        .map(|tx_status| {
+                            tx_status.as_ref().unwrap_or(&TxStatus {
+                                confirmed: false,
+                                block_height: None,
+                                block_hash: None,
+                                block_time: None,
+                            })
+                        })
+                        .collect::<Vec<_>>();
+                    let tx_json_values = tx_statuses
+                        .iter()
+                        .enumerate()
+                        .map(|(i, tx_status)| {
+                            json!({
+                            "type": match i {
+                                0 => "peg_in_deposit",
+                                1 => "peg_in_confirm",
+                                2 => "peg_in_refund",
+                                _ => unreachable!(),
+                            },
+                            "txid": tx_ids[i],
+                            "status": {
+                                "confirmed": tx_status.confirmed,
+                                "block_height": tx_status.block_height.unwrap_or(0),
+                                "block_hash": tx_status.block_hash.or(None),
+                                "block_time": tx_status.block_time.unwrap_or(0),
+                            }})
+                        })
+                        .collect::<Vec<_>>();
+
+                    json!({
+                        "type": "peg_in",
+                        "graph_id": graph.id(),
+                        "status": status.to_string(),
+                        "amount": graph.peg_in_deposit_transaction.prev_outs()[0].value.to_sat(),
+                        "destination_address": graph.depositor_evm_address,
+                        "txs" : tx_json_values,
+                    })
+                }),
+        )
+        .await
+    }
+
+    async fn get_withdrawer_status(&self, withdrawer_chain_address: &str) -> Vec<Value> {
+        join_all(
+            self.data
+                .peg_out_graphs
+                .iter()
+                .filter(|&graph| {
+                    if graph.peg_out_chain_event.is_some() {
+                        return graph
+                            .peg_out_chain_event
+                            .as_ref()
+                            .unwrap()
+                            .withdrawer_chain_address
+                            .eq(withdrawer_chain_address);
+                    }
+                    false
+                })
+                .map(|graph| async {
+                    let (tx_json_value, tx_status_result) = match &graph.peg_out_transaction {
+                        Some(tx) => {
+                            let txid = tx.tx().compute_txid();
+                            let tx_status_result = self.esplora.get_tx_status(&txid).await;
+                            let tx_status = tx_status_result.as_ref().unwrap_or(&TxStatus {
+                                confirmed: false,
+                                block_height: None,
+                                block_hash: None,
+                                block_time: None,
+                            });
+                            let tx_json_value = json!({
+                                "type": "peg_out",
+                                "txid": txid,
+                                "status": {
+                                    "confirmed": tx_status.confirmed,
+                                    "block_height": tx_status.block_height.unwrap_or(0),
+                                    "block_hash": tx_status.block_hash.or(None),
+                                    "block_time": tx_status.block_time.unwrap_or(0),
+                                }
+                            });
+
+                            (Some(tx_json_value), Some(tx_status_result))
+                        }
+                        None => (Some(json!([])), None),
+                    };
+                    let (peg_out_amount, destination_address) = match &graph.peg_out_chain_event {
+                        Some(peg_out_chain_event) => (
+                            peg_out_chain_event.amount.to_sat(),
+                            peg_out_chain_event.withdrawer_destination_address.clone(),
+                        ),
+                        None => (0, "".to_string()),
+                    };
+
+                    let status = graph.interpret_withdrawer_status(tx_status_result.as_ref());
+                    json!({
+                        "type": "peg_out",
+                        "graph_id": graph.id(),
+                        "status": status.to_string(),
+                        "amount": peg_out_amount,
+                        "destination_address": destination_address,
+                        "txs": tx_json_value,
+                    })
+                }),
+        )
+        .await
+    }
+
+    async fn get_depositor_transactions(
+        &self,
+        depositor_public_key: &PublicKey,
+        depositor_taproot_public_key: &XOnlyPublicKey,
+        deposit_input: Input,
+        depositor_evm_address: &str,
+    ) -> Result<Value, String> {
+        // depositor context should contain pub key of n_of_n
+        if self.depositor_context.is_none() {
+            return Err("Depositor context must be initialized".into());
+        }
+
+        let n_of_n_public_key = &self.depositor_context.as_ref().unwrap().n_of_n_public_key;
+        let n_of_n_taproot_public_key = &self
+            .depositor_context
+            .as_ref()
+            .unwrap()
+            .n_of_n_taproot_public_key;
+        let n_of_n_public_keys = &self.depositor_context.as_ref().unwrap().n_of_n_public_keys;
+        let peg_in_graph = PegInGraph::new_for_query(
+            self.depositor_context.as_ref().unwrap().network,
+            depositor_public_key,
+            depositor_taproot_public_key,
+            n_of_n_public_key,
+            n_of_n_public_keys,
+            n_of_n_taproot_public_key,
+            depositor_evm_address,
+            deposit_input,
+        );
+
+        Ok(json!({
+            "deposit": serialize_hex(peg_in_graph.peg_in_deposit_transaction.tx()),
+            "confirm": serialize_hex(peg_in_graph.peg_in_confirm_transaction.tx()),
+            "refund": serialize_hex(peg_in_graph.peg_in_refund_transaction.tx()),
+        }))
+    }
+
+    async fn create_peg_in_graph_with_depositor_signatures(
+        &mut self,
+        depositor_public_key: &PublicKey,
+        depositor_taproot_public_key: &XOnlyPublicKey,
+        deposit_input: Input,
+        depositor_evm_address: &str,
+        signatures: &DepositorSignatures,
+    ) -> Result<Value, String> {
+        // depositor context should contain pub key of n_of_n
+        if self.depositor_context.is_none() {
+            return Err("Depositor context must be initialized".into());
+        }
+
+        let n_of_n_public_key = &self.depositor_context.as_ref().unwrap().n_of_n_public_key;
+        let n_of_n_public_keys = &self.depositor_context.as_ref().unwrap().n_of_n_public_keys;
+        let n_of_n_taproot_public_key = &self
+            .depositor_context
+            .as_ref()
+            .unwrap()
+            .n_of_n_taproot_public_key;
+        let peg_in_graph = PegInGraph::new_with_depositor_signatures(
+            self.depositor_context.as_ref().unwrap().network,
+            depositor_public_key,
+            depositor_taproot_public_key,
+            n_of_n_public_key,
+            n_of_n_public_keys,
+            n_of_n_taproot_public_key,
+            depositor_evm_address,
+            deposit_input,
+            signatures,
+        );
+
+        let peg_in_graph_id = peg_in_generate_id(&peg_in_graph.peg_in_deposit_transaction);
+
+        let graph = self
+            .data
+            .peg_in_graphs
+            .iter()
+            .find(|&peg_out_graph| peg_out_graph.id().eq(&peg_in_graph_id));
+        if graph.is_some() {
+            return Err("Peg in graph already exists".into());
+        }
+
+        self.data.peg_in_graphs.push(peg_in_graph.clone());
+
+        match peg_in_graph.broadcast_deposit(&self.esplora).await {
+            Ok(_) => Ok(json!({"graph_id": peg_in_graph_id})),
+            Err(e) => Err(e),
+        }
+    }
+
+    async fn retry_broadcast_peg_in_deposit(&self, peg_in_graph_id: &str) -> Result<Value, String> {
+        let Some(peg_in_graph) = self
+            .data
+            .peg_in_graphs
+            .iter()
+            .find(|&peg_in_graph| peg_in_graph.id().eq(peg_in_graph_id))
+        else {
+            return Err("Peg in graph not found".into());
+        };
+
+        match peg_in_graph.broadcast_deposit(&self.esplora).await {
+            Ok(_) => Ok(json!({"graph_id": peg_in_graph_id})),
+            Err(e) => Err(e),
+        }
+    }
+}
diff --git a/src/bridge/client/data_store/aws_s3.rs b/bridge/src/client/data_store/aws_s3.rs
similarity index 66%
rename from src/bridge/client/data_store/aws_s3.rs
rename to bridge/src/client/data_store/aws_s3.rs
index 56522eb0c..3fe278792 100644
--- a/src/bridge/client/data_store/aws_s3.rs
+++ b/bridge/src/client/data_store/aws_s3.rs
@@ -1,3 +1,8 @@
+use crate::{
+    error::err_to_string,
+    utils::{compress, decompress, DEFAULT_COMPRESSION_LEVEL},
+};
+
 use super::base::DataStoreDriver;
 use async_trait::async_trait;
 use aws_sdk_s3::{
@@ -52,28 +57,24 @@ impl AwsS3 {
         if let Some(path) = file_path {
             key_with_prefix = format! {"{path}/{key}"};
         } else {
-            key_with_prefix = format! {"{key}"};
+            key_with_prefix = key.to_string();
         }
 
-        let object = self
+        let mut data = self
             .client
             .get_object()
             .bucket(&self.bucket)
             .key(key_with_prefix)
             .send()
-            .await;
-
-        match object {
-            Ok(mut data) => {
-                let mut buffer: Vec<u8> = vec![];
-                while let Some(bytes) = data.body.try_next().await.unwrap() {
-                    buffer.append(&mut bytes.to_vec());
-                }
+            .await
+            .map_err(err_to_string)?;
 
-                Ok(buffer)
-            }
-            Err(err) => Err(err.to_string()),
+        let mut buffer: Vec<u8> = vec![];
+        while let Some(bytes) = data.body.try_next().await.map_err(err_to_string)? {
+            buffer.append(&mut bytes.to_vec());
         }
+
+        Ok(buffer)
     }
 
     async fn upload_object(
@@ -86,7 +87,7 @@ impl AwsS3 {
         if let Some(path) = file_path {
             key_with_prefix = format! {"{path}/{key}"};
         } else {
-            key_with_prefix = format! {"{key}"};
+            key_with_prefix = key.to_string();
         }
 
         self.client
@@ -134,33 +135,66 @@ impl DataStoreDriver for AwsS3 {
         Ok(keys)
     }
 
-    async fn fetch_json(&self, key: &str, file_path: Option<&str>) -> Result<String, String> {
-        let response = self.get_object(key, file_path).await;
+    async fn fetch_object(
+        &self,
+        file_name: &str,
+        file_path: Option<&str>,
+    ) -> Result<String, String> {
+        let response = self.get_object(file_name, file_path).await;
         match response {
             Ok(buffer) => {
                 let json = String::from_utf8(buffer);
                 match json {
                     Ok(json) => Ok(json),
-                    Err(err) => Err(format!("Failed to parse json: {}", err.to_string())),
+                    Err(err) => Err(format!("Failed to parse json: {}", err)),
                 }
             }
-            Err(err) => Err(format!("Failed to get json file: {}", err.to_string())),
+            Err(err) => Err(format!("Failed to get json file: {}", err)),
         }
     }
 
-    async fn upload_json(
+    async fn upload_object(
         &self,
-        key: &str,
-        json: String,
+        file_name: &str,
+        contents: &str,
         file_path: Option<&str>,
     ) -> Result<usize, String> {
-        let bytes = json.as_bytes().to_vec();
-        let size = bytes.len();
-        let byte_stream = ByteStream::from(bytes);
+        let size = contents.len();
+        let byte_stream = ByteStream::from(contents.as_bytes().to_vec());
 
-        // println!("Writing data file to {} (size: {})", key, size);
+        match self.upload_object(file_name, byte_stream, file_path).await {
+            Ok(_) => Ok(size),
+            Err(err) => Err(format!("Failed to save json file: {}", err)),
+        }
+    }
+
+    async fn fetch_compressed_object(
+        &self,
+        file_name: &str,
+        file_path: Option<&str>,
+    ) -> Result<(Vec<u8>, usize), String> {
+        let response = self.get_object(file_name, file_path).await;
+        match response {
+            Ok(buffer) => {
+                let size = buffer.len();
+                Ok((decompress(&buffer).map_err(err_to_string)?, size))
+            }
+            Err(err) => Err(format!("Failed to get json file: {}", err)),
+        }
+    }
+
+    async fn upload_compressed_object(
+        &self,
+        file_name: &str,
+        contents: &Vec<u8>,
+        file_path: Option<&str>,
+    ) -> Result<usize, String> {
+        let compressed_data =
+            compress(contents, DEFAULT_COMPRESSION_LEVEL).map_err(err_to_string)?;
+        let size = compressed_data.len();
+        let byte_stream = ByteStream::from(compressed_data);
 
-        match self.upload_object(&key, byte_stream, file_path).await {
+        match self.upload_object(file_name, byte_stream, file_path).await {
             Ok(_) => Ok(size),
             Err(err) => Err(format!("Failed to save json file: {}", err)),
         }
diff --git a/bridge/src/client/data_store/base.rs b/bridge/src/client/data_store/base.rs
new file mode 100644
index 000000000..82202598a
--- /dev/null
+++ b/bridge/src/client/data_store/base.rs
@@ -0,0 +1,28 @@
+use async_trait::async_trait;
+
+#[async_trait]
+pub trait DataStoreDriver {
+    async fn list_objects(&self, file_path: Option<&str>) -> Result<Vec<String>, String>;
+    async fn fetch_object(
+        &self,
+        file_name: &str,
+        file_path: Option<&str>,
+    ) -> Result<String, String>;
+    async fn upload_object(
+        &self,
+        file_name: &str,
+        contents: &str,
+        file_path: Option<&str>,
+    ) -> Result<usize, String>;
+    async fn fetch_compressed_object(
+        &self,
+        file_name: &str,
+        file_path: Option<&str>,
+    ) -> Result<(Vec<u8>, usize), String>;
+    async fn upload_compressed_object(
+        &self,
+        file_name: &str,
+        contents: &Vec<u8>,
+        file_path: Option<&str>,
+    ) -> Result<usize, String>;
+}
diff --git a/bridge/src/client/data_store/data_store.rs b/bridge/src/client/data_store/data_store.rs
new file mode 100644
index 000000000..165745c68
--- /dev/null
+++ b/bridge/src/client/data_store/data_store.rs
@@ -0,0 +1,201 @@
+use regex::Regex;
+use std::cmp::Ordering;
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
+use super::base::DataStoreDriver;
+use super::{
+    aws_s3::AwsS3,
+    ftp::{ftp::Ftp, ftps::Ftps},
+    sftp::Sftp,
+};
+
+static CLIENT_MISSING_CREDENTIALS_ERROR: &str =
+    "Bridge client is missing AWS S3, FTP, FTPS, or SFTP credentials";
+
+static DEFAULT_CLIENT_DATA_SUFFIX: &str = "-bridge-client-data.json";
+
+pub struct DataStore {
+    client_data_suffix: String,
+    client_data_regex: Regex,
+    aws_s3: Option<AwsS3>,
+    ftp: Option<Ftp>,
+    ftps: Option<Ftps>,
+    sftp: Option<Sftp>,
+}
+
+impl DataStore {
+    pub async fn new() -> Self {
+        dotenv::dotenv().ok();
+        let client_data_suffix = match dotenv::var("BRIDGE_DATA_STORE_CLIENT_DATA_SUFFIX") {
+            Ok(suffix) => suffix,
+            Err(_) => String::from(DEFAULT_CLIENT_DATA_SUFFIX),
+        };
+        Self {
+            client_data_suffix: client_data_suffix.clone(),
+            client_data_regex: Regex::new(&format!(r"(\d{{13}}){}", client_data_suffix)).unwrap(),
+            aws_s3: AwsS3::new(),
+            ftp: Ftp::new().await,
+            ftps: Ftps::new().await,
+            sftp: Sftp::new().await,
+        }
+    }
+
+    pub fn get_file_timestamp(&self, file_name: &str) -> Result<u64, String> {
+        if self.client_data_regex.is_match(file_name) {
+            let mut timestamp_string = file_name.to_owned();
+            timestamp_string.truncate(13);
+            let timestamp = timestamp_string.parse::<u64>();
+            return match timestamp {
+                Ok(_) => Ok(timestamp.unwrap()),
+                Err(_) => Err(String::from("Failed to parse file timestamp")),
+            };
+        }
+
+        Err(String::from("Incorrect file name"))
+    }
+
+    pub async fn get_file_names(&self, file_path: Option<&str>) -> Result<Vec<String>, String> {
+        match self.get_driver() {
+            Ok(driver) => match driver.list_objects(file_path).await {
+                Ok(keys) => {
+                    let mut data_keys: Vec<String> = keys
+                        .iter()
+                        .map(|key| key.rsplit("/").next().unwrap().to_string())
+                        .collect();
+
+                    data_keys = data_keys
+                        .iter()
+                        .filter(|key| self.client_data_regex.is_match(key))
+                        .cloned()
+                        .collect();
+                    data_keys.sort_by(|x, y| {
+                        if x < y {
+                            return Ordering::Less;
+                        }
+                        Ordering::Greater
+                    });
+
+                    Ok(data_keys)
+                }
+                Err(err) => Err(err.to_string()),
+            },
+            Err(err) => Err(err.to_string()),
+        }
+    }
+
+    pub async fn fetch_data_by_key(
+        &self,
+        key: &String,
+        file_path: Option<&str>,
+    ) -> Result<Option<String>, String> {
+        match self.get_driver() {
+            Ok(driver) => {
+                let json = driver.fetch_object(key, file_path).await;
+                if let Ok(data) = json {
+                    // println!("Fetched data file: {}", key);
+                    return Ok(Some(data));
+                }
+
+                println!("No data file {} found", key);
+                Ok(None)
+            }
+            Err(err) => Err(err.to_string()),
+        }
+    }
+
+    pub async fn write_data(
+        &self,
+        contents: &String,
+        file_path: Option<&str>,
+    ) -> Result<String, String> {
+        match self.get_driver() {
+            Ok(driver) => {
+                let time = SystemTime::now()
+                    .duration_since(UNIX_EPOCH)
+                    .unwrap()
+                    .as_millis();
+                let file_name = self.create_file_name(time);
+                let response = driver.upload_object(&file_name, contents, file_path).await;
+
+                match response {
+                    Ok(_) => Ok(file_name),
+                    Err(_) => Err(String::from("Failed to save data file")),
+                }
+            }
+            Err(err) => Err(err.to_string()),
+        }
+    }
+
+    pub async fn fetch_compressed_data_by_key(
+        &self,
+        key: &String,
+        file_path: Option<&str>,
+    ) -> Result<(Option<Vec<u8>>, usize), String> {
+        match self.get_driver() {
+            Ok(driver) => {
+                let json = driver.fetch_compressed_object(key, file_path).await;
+                if let Ok((data, size)) = json {
+                    // println!("Fetched data file: {}", key);
+                    return Ok((Some(data), size));
+                }
+
+                println!("No data file {} found", key);
+                Ok((None, 0))
+            }
+            Err(err) => Err(err.to_string()),
+        }
+    }
+
+    pub async fn write_compressed_data(
+        &self,
+        contents: &Vec<u8>,
+        file_path: Option<&str>,
+    ) -> Result<(String, usize), String> {
+        match self.get_driver() {
+            Ok(driver) => {
+                let time = SystemTime::now()
+                    .duration_since(UNIX_EPOCH)
+                    .unwrap()
+                    .as_millis();
+                let file_name = self.create_file_name(time);
+                let response = driver
+                    .upload_compressed_object(&file_name, contents, file_path)
+                    .await;
+
+                match response {
+                    Ok(size) => Ok((file_name, size)),
+                    Err(_) => Err(String::from("Failed to save data file")),
+                }
+            }
+            Err(err) => Err(err.to_string()),
+        }
+    }
+
+    pub fn get_past_max_file_name_by_timestamp(
+        &self,
+        latest_timestamp: u64,
+        period: u64,
+    ) -> String {
+        let past_max_timestamp =
+            (Duration::from_millis(latest_timestamp) - Duration::from_secs(period)).as_millis();
+        self.create_file_name(past_max_timestamp)
+    }
+
+    fn create_file_name(&self, timestamp: u128) -> String {
+        format!("{}{}", timestamp, self.client_data_suffix)
+    }
+
+    fn get_driver(&self) -> Result<&dyn DataStoreDriver, &str> {
+        if self.aws_s3.is_some() {
+            Ok(self.aws_s3.as_ref().unwrap())
+        } else if self.ftp.is_some() {
+            Ok(self.ftp.as_ref().unwrap())
+        } else if self.ftps.is_some() {
+            Ok(self.ftps.as_ref().unwrap())
+        } else if self.sftp.is_some() {
+            Ok(self.sftp.as_ref().unwrap())
+        } else {
+            Err(CLIENT_MISSING_CREDENTIALS_ERROR)
+        }
+    }
+}
diff --git a/src/bridge/client/data_store/ftp/ftp.rs b/bridge/src/client/data_store/ftp/ftp.rs
similarity index 63%
rename from src/bridge/client/data_store/ftp/ftp.rs
rename to bridge/src/client/data_store/ftp/ftp.rs
index f9fc2b51b..71897cc68 100644
--- a/src/bridge/client/data_store/ftp/ftp.rs
+++ b/bridge/src/client/data_store/ftp/ftp.rs
@@ -17,7 +17,7 @@ pub struct Ftp {
 }
 
 impl Ftp {
-    pub fn new() -> Option<Self> {
+    pub async fn new() -> Option<Self> {
         dotenv::dotenv().ok();
         let host = dotenv::var("BRIDGE_FTP_HOST");
         let port = dotenv::var("BRIDGE_FTP_PORT");
@@ -43,7 +43,7 @@ impl Ftp {
             base_path: base_path.unwrap(),
         };
 
-        match lib::test_connection(&credentials) {
+        match lib::test_connection(&credentials).await {
             Ok(_) => Some(Self { credentials }),
             Err(err) => {
                 eprintln!("{err:?}");
@@ -59,16 +59,37 @@ impl DataStoreDriver for Ftp {
         lib::list_objects(&self.credentials, file_path).await
     }
 
-    async fn fetch_json(&self, key: &str, file_path: Option<&str>) -> Result<String, String> {
-        lib::fetch_json(&self.credentials, key, file_path).await
+    async fn fetch_object(
+        &self,
+        file_name: &str,
+        file_path: Option<&str>,
+    ) -> Result<String, String> {
+        lib::fetch_object(&self.credentials, file_name, file_path).await
+    }
+
+    async fn upload_object(
+        &self,
+        file_name: &str,
+        contents: &str,
+        file_path: Option<&str>,
+    ) -> Result<usize, String> {
+        lib::upload_object(&self.credentials, file_name, contents, file_path).await
+    }
+
+    async fn fetch_compressed_object(
+        &self,
+        file_name: &str,
+        file_path: Option<&str>,
+    ) -> Result<(Vec<u8>, usize), String> {
+        lib::fetch_compressed_object(&self.credentials, file_name, file_path).await
     }
 
-    async fn upload_json(
+    async fn upload_compressed_object(
         &self,
-        key: &str,
-        json: String,
+        file_name: &str,
+        contents: &Vec<u8>,
         file_path: Option<&str>,
     ) -> Result<usize, String> {
-        lib::upload_json(&self.credentials, key, json, file_path).await
+        lib::upload_compressed_object(&self.credentials, file_name, contents, file_path).await
     }
 }
diff --git a/src/bridge/client/data_store/ftp/ftps.rs b/bridge/src/client/data_store/ftp/ftps.rs
similarity index 64%
rename from src/bridge/client/data_store/ftp/ftps.rs
rename to bridge/src/client/data_store/ftp/ftps.rs
index 612abe3bd..9225ea0d1 100644
--- a/src/bridge/client/data_store/ftp/ftps.rs
+++ b/bridge/src/client/data_store/ftp/ftps.rs
@@ -19,7 +19,7 @@ pub struct Ftps {
 }
 
 impl Ftps {
-    pub fn new() -> Option<Self> {
+    pub async fn new() -> Option<Self> {
         dotenv::dotenv().ok();
         let host = dotenv::var("BRIDGE_FTPS_HOST");
         let port = dotenv::var("BRIDGE_FTPS_PORT");
@@ -45,7 +45,7 @@ impl Ftps {
             base_path: base_path.unwrap(),
         };
 
-        match lib::test_connection(&credentials) {
+        match lib::test_connection(&credentials).await {
             Ok(_) => Some(Self { credentials }),
             Err(err) => {
                 eprintln!("{err:?}");
@@ -61,16 +61,37 @@ impl DataStoreDriver for Ftps {
         lib::list_objects(&self.credentials, file_path).await
     }
 
-    async fn fetch_json(&self, key: &str, file_path: Option<&str>) -> Result<String, String> {
-        lib::fetch_json(&self.credentials, key, file_path).await
+    async fn fetch_object(
+        &self,
+        file_name: &str,
+        file_path: Option<&str>,
+    ) -> Result<String, String> {
+        lib::fetch_object(&self.credentials, file_name, file_path).await
+    }
+
+    async fn upload_object(
+        &self,
+        file_name: &str,
+        contents: &str,
+        file_path: Option<&str>,
+    ) -> Result<usize, String> {
+        lib::upload_object(&self.credentials, file_name, contents, file_path).await
+    }
+
+    async fn fetch_compressed_object(
+        &self,
+        file_name: &str,
+        file_path: Option<&str>,
+    ) -> Result<(Vec<u8>, usize), String> {
+        lib::fetch_compressed_object(&self.credentials, file_name, file_path).await
     }
 
-    async fn upload_json(
+    async fn upload_compressed_object(
         &self,
-        key: &str,
-        json: String,
+        file_name: &str,
+        contents: &Vec<u8>,
         file_path: Option<&str>,
     ) -> Result<usize, String> {
-        lib::upload_json(&self.credentials, key, json, file_path).await
+        lib::upload_compressed_object(&self.credentials, file_name, contents, file_path).await
     }
 }
diff --git a/src/bridge/client/data_store/ftp/lib.rs b/bridge/src/client/data_store/ftp/lib.rs
similarity index 80%
rename from src/bridge/client/data_store/ftp/lib.rs
rename to bridge/src/client/data_store/ftp/lib.rs
index 22a53f559..8810799b5 100644
--- a/src/bridge/client/data_store/ftp/lib.rs
+++ b/bridge/src/client/data_store/ftp/lib.rs
@@ -1,9 +1,14 @@
-use futures::{executor, AsyncReadExt, AsyncWriteExt};
+use futures::{AsyncReadExt, AsyncWriteExt};
 use suppaftp::{
     async_native_tls::TlsConnector, AsyncFtpStream, AsyncNativeTlsConnector,
     AsyncNativeTlsFtpStream,
 };
 
+use crate::{
+    error::err_to_string,
+    utils::{compress, decompress, DEFAULT_COMPRESSION_LEVEL},
+};
+
 pub struct FtpCredentials {
     pub is_secure: bool,
     pub host: String,
@@ -13,22 +18,22 @@ pub struct FtpCredentials {
     pub base_path: String,
 }
 
-pub fn test_connection(credentials: &FtpCredentials) -> Result<(), String> {
+pub async fn test_connection(credentials: &FtpCredentials) -> Result<(), String> {
     if credentials.is_secure {
-        match executor::block_on(secure_connect(credentials)) {
+        match secure_connect(credentials).await {
             Ok(mut ftp_stream) => {
-                executor::block_on(disconnect(None, Some(&mut ftp_stream)));
+                disconnect(None, Some(&mut ftp_stream)).await;
                 Ok(())
             }
-            Err(err) => Err(format!("Failed to connect: {}", err.to_string())),
+            Err(err) => Err(format!("Failed to connect: {}", err)),
         }
     } else {
-        match executor::block_on(insecure_connect(credentials)) {
+        match insecure_connect(credentials).await {
             Ok(mut ftp_stream) => {
-                executor::block_on(disconnect(Some(&mut ftp_stream), None));
+                disconnect(Some(&mut ftp_stream), None).await;
                 Ok(())
             }
-            Err(err) => Err(format!("Failed to connect: {}", err.to_string())),
+            Err(err) => Err(format!("Failed to connect: {}", err)),
         }
     }
 }
@@ -46,10 +51,10 @@ pub async fn list_objects(
                 }
                 Err(err) => {
                     disconnect(None, Some(&mut ftp_stream)).await;
-                    Err(format!("Unable to list objects: {}", err.to_string()))
+                    Err(format!("Unable to list objects: {}", err))
                 }
             },
-            Err(err) => Err(format!("Unable to list objects: {}", err.to_string())),
+            Err(err) => Err(format!("Unable to list objects: {}", err)),
         }
     } else {
         match insecure_connect(credentials).await {
@@ -60,44 +65,82 @@ pub async fn list_objects(
                 }
                 Err(err) => {
                     disconnect(Some(&mut ftp_stream), None).await;
-                    Err(format!("Unable to list objects: {}", err.to_string()))
+                    Err(format!("Unable to list objects: {}", err))
                 }
             },
-            Err(err) => Err(format!("Unable to list objects: {}", err.to_string())),
+            Err(err) => Err(format!("Unable to list objects: {}", err)),
         }
     }
 }
 
-pub async fn fetch_json(
+pub async fn fetch_object(
     credentials: &FtpCredentials,
-    key: &str,
+    file_name: &str,
     file_path: Option<&str>,
 ) -> Result<String, String> {
-    let response = get_object(credentials, key, file_path).await;
+    let response = get_object(credentials, file_name, file_path).await;
     match response {
         Ok(buffer) => {
             let json = String::from_utf8(buffer);
             match json {
                 Ok(json) => Ok(json),
-                Err(err) => Err(format!("Failed to parse json: {}", err.to_string())),
+                Err(err) => Err(format!("Failed to parse json: {}", err)),
             }
         }
-        Err(err) => Err(format!("Failed to get json file: {}", err.to_string())),
+        Err(err) => Err(format!("Failed to get json file: {}", err)),
+    }
+}
+
+pub async fn upload_object(
+    credentials: &FtpCredentials,
+    file_name: &str,
+    contents: &str,
+    file_path: Option<&str>,
+) -> Result<usize, String> {
+    let size = contents.len();
+
+    println!("Writing data file to {} (size: {})", file_name, size);
+
+    match upload_file(credentials, file_name, contents.as_bytes(), file_path).await {
+        Ok(_) => Ok(size),
+        Err(err) => Err(format!("Failed to save json file: {}", err)),
+    }
+}
+
+pub async fn fetch_compressed_object(
+    credentials: &FtpCredentials,
+    file_name: &str,
+    file_path: Option<&str>,
+) -> Result<(Vec<u8>, usize), String> {
+    let response = get_object(credentials, file_name, file_path).await;
+    match response {
+        Ok(buffer) => {
+            let size = buffer.len();
+            Ok((decompress(&buffer).map_err(err_to_string)?, size))
+        }
+        Err(err) => Err(format!("Failed to get json file: {}", err)),
     }
 }
 
-pub async fn upload_json(
+pub async fn upload_compressed_object(
     credentials: &FtpCredentials,
-    key: &str,
-    json: String,
+    file_name: &str,
+    contents: &Vec<u8>,
     file_path: Option<&str>,
 ) -> Result<usize, String> {
-    let bytes = json.as_bytes().to_vec();
-    let size = bytes.len();
+    let compressed_data = compress(contents, DEFAULT_COMPRESSION_LEVEL).map_err(err_to_string)?;
+    let size = compressed_data.len();
 
-    println!("Writing data file to {} (size: {})", key, size);
+    println!("Writing data file to {} (size: {})", file_name, size);
 
-    match upload_object(credentials, &key, &bytes, file_path).await {
+    match upload_file(
+        credentials,
+        file_name,
+        compressed_data.as_slice(),
+        file_path,
+    )
+    .await
+    {
         Ok(_) => Ok(size),
         Err(err) => Err(format!("Failed to save json file: {}", err)),
     }
@@ -105,7 +148,7 @@ pub async fn upload_json(
 
 async fn get_object(
     credentials: &FtpCredentials,
-    key: &str,
+    file_name: &str,
     file_path: Option<&str>,
 ) -> Result<Vec<u8>, String> {
     let mut buffer: Vec<u8> = vec![];
@@ -114,7 +157,7 @@ async fn get_object(
         match secure_connect(credentials).await {
             Ok(mut ftp_stream) => {
                 match change_directory(None, Some(&mut ftp_stream), file_path).await {
-                    Ok(_) => match ftp_stream.retr_as_stream(key).await {
+                    Ok(_) => match ftp_stream.retr_as_stream(file_name).await {
                         Ok(mut reader) => match reader.read_to_end(&mut buffer).await {
                             Ok(_) => {
                                 let _ = ftp_stream.finalize_retr_stream(reader).await;
@@ -123,24 +166,24 @@ async fn get_object(
                             }
                             Err(err) => {
                                 disconnect(None, Some(&mut ftp_stream)).await;
-                                Err(format!("Unable to get {}: {}", key, err))
+                                Err(format!("Unable to get {}: {}", file_name, err))
                             }
                         },
                         Err(err) => {
                             disconnect(None, Some(&mut ftp_stream)).await;
-                            Err(format!("Unable to get {}: {}", key, err))
+                            Err(format!("Unable to get {}: {}", file_name, err))
                         }
                     },
-                    Err(err) => Err(format!("Unable to get {}: {}", key, err)),
+                    Err(err) => Err(format!("Unable to get {}: {}", file_name, err)),
                 }
             }
-            Err(err) => Err(format!("Unable to get {}: {}", key, err)),
+            Err(err) => Err(format!("Unable to get {}: {}", file_name, err)),
         }
     } else {
         match insecure_connect(credentials).await {
             Ok(mut ftp_stream) => {
                 match change_directory(Some(&mut ftp_stream), None, file_path).await {
-                    Ok(_) => match ftp_stream.retr_as_stream(key).await {
+                    Ok(_) => match ftp_stream.retr_as_stream(file_name).await {
                         Ok(mut reader) => match reader.read_to_end(&mut buffer).await {
                             Ok(_) => {
                                 let _ = ftp_stream.finalize_retr_stream(reader).await;
@@ -149,26 +192,26 @@ async fn get_object(
                             }
                             Err(err) => {
                                 disconnect(Some(&mut ftp_stream), None).await;
-                                Err(format!("Unable to get {}: {}", key, err))
+                                Err(format!("Unable to get {}: {}", file_name, err))
                             }
                         },
                         Err(err) => {
                             disconnect(Some(&mut ftp_stream), None).await;
-                            Err(format!("Unable to get {}: {}", key, err))
+                            Err(format!("Unable to get {}: {}", file_name, err))
                         }
                     },
-                    Err(err) => Err(format!("Unable to get {}: {}", key, err)),
+                    Err(err) => Err(format!("Unable to get {}: {}", file_name, err)),
                 }
             }
-            Err(err) => Err(format!("Unable to get {}: {}", key, err)),
+            Err(err) => Err(format!("Unable to get {}: {}", file_name, err)),
         }
     }
 }
 
-async fn upload_object(
+async fn upload_file(
     credentials: &FtpCredentials,
-    key: &str,
-    data: &Vec<u8>,
+    file_name: &str,
+    data: &[u8],
     file_path: Option<&str>,
 ) -> Result<(), String> {
     if credentials.is_secure {
@@ -177,7 +220,7 @@ async fn upload_object(
                 match create_directories_if_non_existent(None, Some(&mut ftp_stream), file_path)
                     .await
                 {
-                    Ok(_) => match ftp_stream.put_with_stream(key).await {
+                    Ok(_) => match ftp_stream.put_with_stream(file_name).await {
                         Ok(mut writer) => match writer.write(data).await {
                             Ok(_) => match writer.flush().await {
                                 Ok(_) => {
@@ -188,23 +231,23 @@ async fn upload_object(
                                 }
                                 Err(err) => {
                                     disconnect(None, Some(&mut ftp_stream)).await;
-                                    return Err(format!("Unable to write {}: {}", key, err));
+                                    Err(format!("Unable to write {}: {}", file_name, err))
                                 }
                             },
                             Err(err) => {
                                 disconnect(None, Some(&mut ftp_stream)).await;
-                                return Err(format!("Unable to write {}: {}", key, err));
+                                Err(format!("Unable to write {}: {}", file_name, err))
                             }
                         },
                         Err(err) => {
                             disconnect(None, Some(&mut ftp_stream)).await;
-                            return Err(format!("Unable to write {}: {}", key, err));
+                            Err(format!("Unable to write {}: {}", file_name, err))
                         }
                     },
-                    Err(err) => Err(format!("Unable to write {}: {}", key, err)),
+                    Err(err) => Err(format!("Unable to write {}: {}", file_name, err)),
                 }
             }
-            Err(err) => Err(format!("Unable to write {}: {}", key, err)),
+            Err(err) => Err(format!("Unable to write {}: {}", file_name, err)),
         }
     } else {
         match insecure_connect(credentials).await {
@@ -212,7 +255,7 @@ async fn upload_object(
                 match create_directories_if_non_existent(Some(&mut ftp_stream), None, file_path)
                     .await
                 {
-                    Ok(_) => match ftp_stream.put_with_stream(key).await {
+                    Ok(_) => match ftp_stream.put_with_stream(file_name).await {
                         Ok(mut writer) => match writer.write(data).await {
                             Ok(_) => match writer.flush().await {
                                 Ok(_) => {
@@ -223,23 +266,23 @@ async fn upload_object(
                                 }
                                 Err(err) => {
                                     disconnect(Some(&mut ftp_stream), None).await;
-                                    return Err(format!("Unable to write {}: {}", key, err));
+                                    Err(format!("Unable to write {}: {}", file_name, err))
                                 }
                             },
                             Err(err) => {
                                 disconnect(Some(&mut ftp_stream), None).await;
-                                return Err(format!("Unable to write {}: {}", key, err));
+                                Err(format!("Unable to write {}: {}", file_name, err))
                             }
                         },
                         Err(err) => {
                             disconnect(Some(&mut ftp_stream), None).await;
-                            return Err(format!("Unable to write {}: {}", key, err));
+                            Err(format!("Unable to write {}: {}", file_name, err))
                         }
                     },
-                    Err(err) => Err(format!("Unable to write {}: {}", key, err)),
+                    Err(err) => Err(format!("Unable to write {}: {}", file_name, err)),
                 }
             }
-            Err(err) => Err(format!("Unable to write {}: {}", key, err)),
+            Err(err) => Err(format!("Unable to write {}: {}", file_name, err)),
         }
     }
 }
@@ -383,7 +426,7 @@ async fn change_directory(
         }
     }
 
-    return Ok(());
+    Ok(())
 }
 
 async fn create_directories_if_non_existent(
@@ -431,5 +474,5 @@ async fn create_directories_if_non_existent(
         }
     }
 
-    return Ok(());
+    Ok(())
 }
diff --git a/src/bridge/client/data_store/ftp/mod.rs b/bridge/src/client/data_store/ftp/mod.rs
similarity index 100%
rename from src/bridge/client/data_store/ftp/mod.rs
rename to bridge/src/client/data_store/ftp/mod.rs
diff --git a/src/bridge/client/data_store/mod.rs b/bridge/src/client/data_store/mod.rs
similarity index 100%
rename from src/bridge/client/data_store/mod.rs
rename to bridge/src/client/data_store/mod.rs
diff --git a/bridge/src/client/data_store/sftp.rs b/bridge/src/client/data_store/sftp.rs
new file mode 100644
index 000000000..8e8dd091f
--- /dev/null
+++ b/bridge/src/client/data_store/sftp.rs
@@ -0,0 +1,384 @@
+use crate::{
+    error::err_to_string,
+    utils::{compress, decompress, DEFAULT_COMPRESSION_LEVEL},
+};
+
+use super::base::DataStoreDriver;
+use async_trait::async_trait;
+use dotenv;
+use futures::TryStreamExt;
+use openssh_sftp_client::{
+    file::TokioCompatFile,
+    openssh::{KnownHosts, Session as SshSession},
+    Sftp as _Sftp,
+};
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+
+// To use this data store, create a .env file in the base directory with the following values:
+// export BRIDGE_SFTP_HOST="..."
+// export BRIDGE_SFTP_PORT="..."
+// export BRIDGE_SFTP_USERNAME="..."
+// export BRIDGE_SFTP_KEYFILE_PATH="..."
+// export BRIDGE_SFTP_BASE_PATH="..."
+
+// NOTE: BRIDGE_SFTP_HOST should be an ip/domain that supports SSH
+
+struct SftpCredentials {
+    pub host: String,
+    pub port: String,
+    pub username: String,
+    // TODO: `keyfile_path` is currently never read, commenting out to reduce compiler warnings.
+    // pub keyfile_path: String,
+    pub base_path: String,
+}
+
+pub struct Sftp {
+    credentials: SftpCredentials,
+}
+
+impl Sftp {
+    pub async fn new() -> Option<Self> {
+        dotenv::dotenv().ok();
+        let host = dotenv::var("BRIDGE_SFTP_HOST");
+        let port = dotenv::var("BRIDGE_SFTP_PORT");
+        let username = dotenv::var("BRIDGE_SFTP_USERNAME");
+        // let keyfile_path = dotenv::var("BRIDGE_SFTP_KEYFILE_PATH");
+        let base_path = dotenv::var("BRIDGE_SFTP_BASE_PATH");
+
+        if host.is_err()
+            || port.is_err()
+            || username.is_err()
+            // || keyfile_path.is_err()
+            || base_path.is_err()
+        {
+            return None;
+        }
+
+        let credentials = SftpCredentials {
+            host: host.unwrap(),
+            port: port.unwrap(),
+            username: username.unwrap(),
+            // keyfile_path: keyfile_path.unwrap(),
+            base_path: base_path.unwrap(),
+        };
+
+        match test_connection(&credentials).await {
+            Ok(_) => Some(Self { credentials }),
+            Err(err) => {
+                eprintln!("{err:?}");
+                None
+            }
+        }
+    }
+
+    async fn get_object(&self, key: &str, file_path: Option<&str>) -> Result<Vec<u8>, String> {
+        let mut buffer: Vec<u8> = vec![];
+
+        match connect(&self.credentials).await {
+            Ok(sftp) => {
+                let mut full_filename = key.to_string();
+                if file_path.is_some() {
+                    full_filename = format!("{}/{}", file_path.unwrap(), key);
+                }
+                match sftp.open(full_filename).await.map(TokioCompatFile::from) {
+                    Ok(_file) => {
+                        let mut file = Box::pin(_file);
+                        let result = file.read_to_end(&mut buffer).await;
+                        drop(file);
+                        match result {
+                            Ok(_) => {
+                                disconnect(sftp).await;
+                                Ok(buffer)
+                            }
+                            Err(err) => {
+                                disconnect(sftp).await;
+                                Err(format!("Unable to get {}: {}", key, err))
+                            }
+                        }
+                    }
+                    Err(err) => {
+                        disconnect(sftp).await;
+                        Err(format!("Unable to get {}: {}", key, err))
+                    }
+                }
+            }
+            Err(err) => Err(format!("Unable to get {}: {}", key, err)),
+        }
+    }
+
+    async fn upload_object(
+        &self,
+        key: &str,
+        data: &[u8],
+        file_path: Option<&str>,
+    ) -> Result<(), String> {
+        match connect(&self.credentials).await {
+            Ok(sftp) => {
+                match create_directories_if_non_existent(&sftp, file_path).await {
+                    Ok(_) => {
+                        let mut full_filename = key.to_string();
+                        if file_path.is_some() {
+                            full_filename = format!("{}/{}", file_path.unwrap(), key);
+                        }
+                        let result = sftp
+                            .options()
+                            .write(true)
+                            .create_new(true)
+                            .open(full_filename)
+                            .await; // Use intermediate variable to prevent GC issue
+                        match result {
+                            Ok(_file) => {
+                                let mut file = Box::pin(TokioCompatFile::from(_file));
+                                match file.write(data).await {
+                                    Ok(_) => match file.flush().await {
+                                        Ok(_) => {
+                                            drop(file);
+                                            disconnect(sftp).await;
+                                            Ok(())
+                                        }
+                                        Err(err) => {
+                                            drop(file);
+                                            disconnect(sftp).await;
+                                            Err(format!("Unable to write {}: {}", key, err))
+                                        }
+                                    },
+                                    Err(err) => {
+                                        drop(file);
+                                        disconnect(sftp).await;
+                                        Err(format!("Unable to write {}: {}", key, err))
+                                    }
+                                }
+                            }
+                            Err(err) => {
+                                disconnect(sftp).await;
+                                Err(format!("Unable to write {}: {}", key, err))
+                            }
+                        }
+                    }
+                    Err(err) => Err(format!("Unable to write {}: {}", key, err)),
+                }
+            }
+            Err(err) => Err(format!("Unable to write {}: {}", key, err)),
+        }
+    }
+}
+
+#[async_trait]
+impl DataStoreDriver for Sftp {
+    async fn list_objects(&self, file_path: Option<&str>) -> Result<Vec<String>, String> {
+        match connect(&self.credentials).await {
+            Ok(sftp) => {
+                let mut fs = sftp.fs();
+                match fs.open_dir(file_path.unwrap_or(".")).await {
+                    Ok(dir) => {
+                        let mut read_dir = Box::pin(dir.read_dir());
+                        let mut buffer: Vec<String> = vec![];
+                        while let Some(entry) = read_dir.try_next().await.unwrap() {
+                            buffer.push(entry.filename().to_str().unwrap().to_string());
+                        }
+                        drop(read_dir);
+                        drop(fs);
+                        disconnect(sftp).await;
+                        Ok(buffer)
+                    }
+                    Err(err) => {
+                        drop(fs);
+                        disconnect(sftp).await;
+                        Err(format!("Unable to list objects: {}", err))
+                    }
+                }
+            }
+            Err(err) => Err(format!("Unable tolist objects: {}", err)),
+        }
+    }
+
+    async fn fetch_object(
+        &self,
+        file_name: &str,
+        file_path: Option<&str>,
+    ) -> Result<String, String> {
+        let response = self.get_object(file_name, file_path).await;
+        match response {
+            Ok(buffer) => {
+                let json = String::from_utf8(buffer);
+                match json {
+                    Ok(json) => Ok(json),
+                    Err(err) => Err(format!("Failed to parse json: {}", err)),
+                }
+            }
+            Err(err) => Err(format!("Failed to get json file: {}", err)),
+        }
+    }
+
+    async fn upload_object(
+        &self,
+        file_name: &str,
+        contents: &str,
+        file_path: Option<&str>,
+    ) -> Result<usize, String> {
+        let size = contents.len();
+
+        println!("Writing data file to {} (size: {})", file_name, size);
+
+        match self
+            .upload_object(file_name, contents.as_bytes(), file_path)
+            .await
+        {
+            Ok(_) => Ok(size),
+            Err(err) => Err(format!("Failed to save json file: {}", err)),
+        }
+    }
+
+    async fn fetch_compressed_object(
+        &self,
+        file_name: &str,
+        file_path: Option<&str>,
+    ) -> Result<(Vec<u8>, usize), String> {
+        let response = self.get_object(file_name, file_path).await;
+        match response {
+            Ok(buffer) => {
+                let size = buffer.len();
+                Ok((decompress(&buffer).map_err(err_to_string)?, size))
+            }
+            Err(err) => Err(format!("Failed to get json file: {}", err)),
+        }
+    }
+
+    async fn upload_compressed_object(
+        &self,
+        file_name: &str,
+        contents: &Vec<u8>,
+        file_path: Option<&str>,
+    ) -> Result<usize, String> {
+        let compressed_data =
+            compress(contents, DEFAULT_COMPRESSION_LEVEL).map_err(err_to_string)?;
+        let size = compressed_data.len();
+
+        println!("Writing data file to {} (size: {})", file_name, size);
+
+        match self
+            .upload_object(file_name, compressed_data.as_slice(), file_path)
+            .await
+        {
+            Ok(_) => Ok(size),
+            Err(err) => Err(format!("Failed to save json file: {}", err)),
+        }
+    }
+}
+
+async fn test_connection(credentials: &SftpCredentials) -> Result<(), String> {
+    match connect(credentials).await {
+        Ok(sftp) => {
+            disconnect(sftp).await;
+            Ok(())
+        }
+        Err(err) => Err(format!("Failed to connect: {}", err)),
+    }
+}
+
+async fn connect(credentials: &SftpCredentials) -> Result<_Sftp, String> {
+    let result = SshSession::connect_mux(
+        format!(
+            "ssh://{}@{}:{}",
+            &credentials.username, &credentials.host, &credentials.port
+        ),
+        KnownHosts::Add,
+    )
+    .await;
+    if result.is_err() {
+        return Err(format!(
+            "Unable to connect to SSH server at {}:{} (error: {})",
+            &credentials.host,
+            &credentials.port,
+            result.err().unwrap()
+        ));
+    }
+
+    let ssh_session = result.unwrap();
+
+    let result = _Sftp::from_session(ssh_session, Default::default()).await;
+    if result.is_err() {
+        return Err(format!(
+            "Unable to establish to SFTP session from SSH session at {}:{} (error: {})",
+            &credentials.host,
+            &credentials.port,
+            result.err().unwrap()
+        ));
+    }
+
+    let sftp = result.unwrap();
+    let result = change_directory(&sftp, Some(&credentials.base_path)).await;
+    if result.is_err() {
+        return Err(format!(
+            "Invalid base path: {} (error: {})",
+            &credentials.base_path,
+            result.err().unwrap()
+        ));
+    }
+
+    Ok(sftp)
+}
+
+async fn disconnect(sftp: _Sftp) {
+    let result = sftp.close().await;
+    if result.is_err() {
+        eprintln!("Unable to close connection: {}", result.err().unwrap());
+    }
+}
+
+async fn change_directory(sftp: &_Sftp, file_path: Option<&str>) -> Result<(), String> {
+    if let Some(path) = file_path {
+        let mut fs = sftp.fs();
+        fs.set_cwd(path);
+        let result = fs.open_dir(path).await;
+        drop(fs);
+        if result.is_err() {
+            return Err(format!(
+                "Failed to change directory to {}: {}",
+                path,
+                result.err().unwrap()
+            ));
+        }
+    }
+
+    Ok(())
+}
+
+async fn create_directories_if_non_existent(
+    sftp: &_Sftp,
+    file_path: Option<&str>,
+) -> Result<(), String> {
+    if file_path.is_some() {
+        let file_path = String::from(file_path.unwrap());
+        let folders: Vec<&str> = file_path.split("/").collect();
+        let mut fs = sftp.fs();
+        let mut processed_folders: Vec<String> = vec![];
+        for folder in folders {
+            match fs.open_dir(folder).await {
+                Ok(_) => {
+                    processed_folders.push(folder.to_string());
+                    fs.set_cwd(processed_folders.join("/"));
+                }
+                Err(_) => match fs.create_dir(folder).await {
+                    Ok(_) => match fs.open_dir(folder).await {
+                        Ok(_) => {
+                            processed_folders.push(folder.to_string());
+                            fs.set_cwd(processed_folders.join("/"));
+                        }
+                        Err(err) => {
+                            drop(fs);
+                            return Err(format!("Failed to open {} folder: {}", folder, err));
+                        }
+                    },
+                    Err(err) => {
+                        drop(fs);
+                        return Err(format!("Failed to create {} folder: {}", folder, err));
+                    }
+                },
+            }
+        }
+        drop(fs);
+    }
+
+    Ok(())
+}
diff --git a/bridge/src/client/esplora.rs b/bridge/src/client/esplora.rs
new file mode 100644
index 000000000..e4840ea3c
--- /dev/null
+++ b/bridge/src/client/esplora.rs
@@ -0,0 +1,14 @@
+use bitcoin::Network;
+
+const REGTEST_ESPLORA_URL: &str = "http://localhost:8094/regtest/api/";
+// This endpoint accepts non-standard transactions.
+const ALPEN_SIGNET_ESPLORA_URL: &str = "https://esplora-large.devnet-annapurna.stratabtc.org";
+const BITVM_SIGNET_ESPLORA_URL: &str = "https://esplora.bitvmnet.org";
+
+// TODO: Needs to be updated for production environment.
+pub fn get_esplora_url(network: Network) -> &'static str {
+    match network {
+        Network::Regtest => REGTEST_ESPLORA_URL,
+        _ => BITVM_SIGNET_ESPLORA_URL,
+    }
+}
diff --git a/bridge/src/client/files.rs b/bridge/src/client/files.rs
new file mode 100644
index 000000000..cc0451bf8
--- /dev/null
+++ b/bridge/src/client/files.rs
@@ -0,0 +1,85 @@
+use std::{
+    collections::HashMap,
+    fs,
+    path::{Path, PathBuf},
+};
+
+use crate::serialization::try_deserialize;
+
+use super::client::BitVMClientPrivateData;
+
+pub const BRIDGE_DATA_DIRECTORY_NAME: &str = "bridge_data";
+pub const DEFAULT_PATH_PREFIX: &str = "default_user";
+pub const PRIVATE_DATA_FILE_NAME: &str = "secret_data.json";
+const PRIVATE_DATA_DIRECTORY_NAME: &str = "private";
+const PUBLIC_DATA_DIRECTORY_NAME: &str = "public";
+
+fn get_private_data_directory_path(data_root_path: &Path) -> PathBuf {
+    data_root_path.join(PRIVATE_DATA_DIRECTORY_NAME)
+}
+
+pub fn get_private_data_file_path(data_root_path: &Path) -> PathBuf {
+    get_private_data_directory_path(data_root_path).join(PRIVATE_DATA_FILE_NAME)
+}
+
+fn get_public_data_directory_path(data_root_path: &Path) -> PathBuf {
+    data_root_path.join(PUBLIC_DATA_DIRECTORY_NAME)
+}
+
+pub fn create_directories_if_non_existent(data_root_path: &Path) {
+    if !data_root_path.exists() {
+        fs::create_dir_all(data_root_path).expect("Failed to create directories");
+    }
+
+    let public_data_folder = get_public_data_directory_path(data_root_path);
+    if !public_data_folder.exists() {
+        fs::create_dir(public_data_folder).expect("Failed to create 'public' directory");
+    }
+
+    let private_data_folder = get_private_data_directory_path(data_root_path);
+    if !private_data_folder.exists() {
+        fs::create_dir(private_data_folder).expect("Failed to create 'private' directory");
+    }
+}
+
+pub fn get_private_data_from_file(path: &Path) -> BitVMClientPrivateData {
+    match read_file(path) {
+        Some(data) => try_deserialize::<BitVMClientPrivateData>(&data)
+            .expect("Could not deserialize private data"),
+        None => BitVMClientPrivateData {
+            secret_nonces: HashMap::new(),
+            commitment_secrets: HashMap::new(),
+        },
+    }
+}
+
+fn read_file(path: &Path) -> Option<String> {
+    match fs::read_to_string(path) {
+        Ok(content) => Some(content),
+        Err(e) => match e.kind() {
+            std::io::ErrorKind::NotFound => return None,
+            _ => {
+                // If the file exists, but we cannot read it (e.g. due to invalid permissions, etc.),
+                // we want to fail and let the user fix the issue.
+                panic!("Could not read file {} due to error: {}", path.display(), e);
+            }
+        },
+    }
+}
+
+pub fn save_local_public_file(data_root_path: &Path, file_name: &String, contents: &String) {
+    create_directories_if_non_existent(data_root_path);
+    println!("Saving public data in local file: {}...", file_name);
+    fs::write(
+        get_public_data_directory_path(data_root_path).join(file_name),
+        contents,
+    )
+    .expect("Unable to write a file");
+}
+
+pub fn save_local_private_file(data_root_path: &Path, contents: &String) {
+    create_directories_if_non_existent(data_root_path);
+    println!("Saving private data in local file...");
+    fs::write(get_private_data_file_path(data_root_path), contents)
+        .expect("Unable to write a file");
+}
diff --git a/bridge/src/client/memory_cache.rs b/bridge/src/client/memory_cache.rs
new file mode 100644
index 000000000..fefb1f07d
--- /dev/null
+++ b/bridge/src/client/memory_cache.rs
@@ -0,0 +1,40 @@
+use std::{
+    borrow::Borrow,
+    collections::HashMap,
+    hash::Hash,
+    sync::{LazyLock, RwLock},
+};
+
+use crate::connectors::base::TaprootSpendInfoCache;
+
+const DEFAULT_CACHE_SIZE: usize = 200;
+pub(crate) static TAPROOT_SPEND_INFO_CACHE: LazyLock<RwLock<Cache<String, TaprootSpendInfoCache>>> =
+    LazyLock::new(|| RwLock::new(Cache::new(DEFAULT_CACHE_SIZE)));
+
+pub struct Cache<K: Eq + Hash, V>(HashMap<K, V>);
+
+impl<K, V> Cache<K, V>
+where
+    K: Eq + Hash,
+    V: Clone,
+{
+    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 get<Q: ?Sized>(&self, key: &Q) -> Option<&V>
+    where
+        K: Borrow<Q>,
+        Q: Hash + Eq,
+    {
+        self.0.get(key)
+    }
+
+    pub fn contains<Q: ?Sized>(&self, key: &Q) -> bool
+    where
+        K: Borrow<Q>,
+        Q: Hash + Eq,
+    {
+        self.0.contains_key(key)
+    }
+}
diff --git a/bridge/src/client/mod.rs b/bridge/src/client/mod.rs
new file mode 100644
index 000000000..25bc3e1ab
--- /dev/null
+++ b/bridge/src/client/mod.rs
@@ -0,0 +1,9 @@
+#![allow(clippy::module_inception)]
+pub mod chain;
+pub mod cli;
+pub mod client;
+pub mod data_store;
+pub mod esplora;
+pub mod files;
+pub mod memory_cache;
+pub mod sdk;
diff --git a/bridge/src/client/sdk/mod.rs b/bridge/src/client/sdk/mod.rs
new file mode 100644
index 000000000..16be2d738
--- /dev/null
+++ b/bridge/src/client/sdk/mod.rs
@@ -0,0 +1,2 @@
+pub mod query;
+pub mod query_contexts;
diff --git a/bridge/src/client/sdk/query.rs b/bridge/src/client/sdk/query.rs
new file mode 100644
index 000000000..ebf71e383
--- /dev/null
+++ b/bridge/src/client/sdk/query.rs
@@ -0,0 +1,44 @@
+use std::future::Future;
+
+use bitcoin::{PublicKey, XOnlyPublicKey};
+use esplora_client::AsyncClient;
+use serde_json::Value;
+
+use crate::transactions::base::Input;
+
+use super::query_contexts::depositor_signatures::DepositorSignatures;
+
+pub trait ClientCliQuery {
+    fn get_unused_peg_in_graphs(&self) -> impl Future<Output = Vec<Value>>;
+    fn get_depositor_status(
+        &self,
+        depositor_public_key: &PublicKey,
+    ) -> impl Future<Output = Vec<Value>>;
+    fn get_withdrawer_status(
+        &self,
+        withdrawer_chain_address: &str,
+    ) -> impl Future<Output = Vec<Value>>;
+    fn get_depositor_transactions(
+        &self,
+        depositor_public_key: &PublicKey,
+        depositor_taproot_public_key: &XOnlyPublicKey,
+        deposit_input: Input,
+        depositor_evm_address: &str,
+    ) -> impl Future<Output = Result<Value, String>>;
+    fn create_peg_in_graph_with_depositor_signatures(
+        &mut self,
+        depositor_public_key: &PublicKey,
+        depositor_taproot_public_key: &XOnlyPublicKey,
+        deposit_input: Input,
+        depositor_evm_address: &str,
+        signatures: &DepositorSignatures,
+    ) -> impl Future<Output = Result<Value, String>>;
+    fn retry_broadcast_peg_in_deposit(
+        &self,
+        peg_in_graph_id: &str,
+    ) -> impl Future<Output = Result<Value, String>>;
+}
+
+pub trait GraphCliQuery {
+    fn broadcast_deposit(&self, client: &AsyncClient) -> impl Future<Output = Result<(), String>>;
+}
diff --git a/bridge/src/client/sdk/query_contexts/depositor_signatures.rs b/bridge/src/client/sdk/query_contexts/depositor_signatures.rs
new file mode 100644
index 000000000..53e6ad936
--- /dev/null
+++ b/bridge/src/client/sdk/query_contexts/depositor_signatures.rs
@@ -0,0 +1,24 @@
+use bitcoin::{ecdsa, taproot};
+
+pub struct DepositorSignatures {
+    pub deposit: ecdsa::Signature,
+    pub refund: taproot::Signature,
+    pub confirm: taproot::Signature,
+}
+
+impl DepositorSignatures {
+    pub fn from_slices(
+        deposit_signature: &[u8],
+        refund_signature: &[u8],
+        confirm_signature: &[u8],
+    ) -> Self {
+        Self {
+            deposit: ecdsa::Signature::from_slice(deposit_signature)
+                .expect("Invalid deposit signature"),
+            refund: taproot::Signature::from_slice(refund_signature)
+                .expect("Invalid refund signature"),
+            confirm: taproot::Signature::from_slice(confirm_signature)
+                .expect("Invalid confirm signature"),
+        }
+    }
+}
diff --git a/bridge/src/client/sdk/query_contexts/mod.rs b/bridge/src/client/sdk/query_contexts/mod.rs
new file mode 100644
index 000000000..7629065c9
--- /dev/null
+++ b/bridge/src/client/sdk/query_contexts/mod.rs
@@ -0,0 +1 @@
+pub mod depositor_signatures;
diff --git a/bridge/src/commitments.rs b/bridge/src/commitments.rs
new file mode 100644
index 000000000..42dbcae8c
--- /dev/null
+++ b/bridge/src/commitments.rs
@@ -0,0 +1,156 @@
+use std::collections::HashMap;
+
+use serde::{Deserialize, Serialize};
+use strum::{Display, EnumIter, IntoEnumIterator};
+
+use bitvm::{chunk::api::{NUM_PUBS, NUM_U160, NUM_U256}, signatures::signing_winternitz::WinternitzSecret};
+
+use super::{
+    constants::{
+        DESTINATION_NETWORK_TXID_LENGTH, SOURCE_NETWORK_TXID_LENGTH, START_TIME_MESSAGE_LENGTH,
+    },
+    superblock::{SUPERBLOCK_HASH_MESSAGE_LENGTH, SUPERBLOCK_MESSAGE_LENGTH},
+};
+
+#[derive(
+    Serialize, Deserialize, Eq, PartialEq, Hash, Clone, PartialOrd, Ord, Display, Debug, EnumIter,
+)]
+#[serde(into = "String", try_from = "String")]
+pub enum CommitmentMessageId {
+    PegOutTxIdSourceNetwork,
+    PegOutTxIdDestinationNetwork,
+    StartTime,
+    Superblock,
+    SuperblockHash,
+    // name of intermediate value and length of message
+    Groth16IntermediateValues((String, usize)),
+}
+
+const VAL_SEPARATOR: char = '|';
+
+impl From<CommitmentMessageId> for String {
+    fn from(id: CommitmentMessageId) -> String {
+        match id {
+            CommitmentMessageId::Groth16IntermediateValues((variable_name, size)) => {
+                format!(
+                    "Groth16IntermediateValues{}{}{}{}",
+                    VAL_SEPARATOR, variable_name, VAL_SEPARATOR, size
+                )
+            }
+            _ => id.to_string(),
+        }
+    }
+}
+
+impl TryFrom<String> for CommitmentMessageId {
+    type Error = String;
+
+    fn try_from(s: String) -> Result<Self, Self::Error> {
+        for variant in CommitmentMessageId::iter() {
+            if s == variant.to_string() {
+                return Ok(variant);
+            } else if s.starts_with(&format!("Groth16IntermediateValues{}", VAL_SEPARATOR)) {
+                let parts: Vec<_> = s.split(VAL_SEPARATOR).collect();
+                if parts.len() != 3 {
+                    return Err(format!("Invalid Groth16IntermediateValues format: {}", s));
+                }
+                let variable_name = parts[1].to_string();
+                let size = parts[2]
+                    .parse::<usize>()
+                    .map_err(|e| format!("Invalid size in Groth16IntermediateValues: {}", e))?;
+
+                return Ok(CommitmentMessageId::Groth16IntermediateValues((
+                    variable_name,
+                    size,
+                )));
+            }
+        }
+
+        Err(format!("Unknown CommitmentMessageId: {}", s))
+    }
+}
+
+impl CommitmentMessageId {
+    // 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::PegOutTxIdSourceNetwork,
+                WinternitzSecret::new(SOURCE_NETWORK_TXID_LENGTH),
+            ),
+            (
+                CommitmentMessageId::PegOutTxIdDestinationNetwork,
+                WinternitzSecret::new(DESTINATION_NETWORK_TXID_LENGTH),
+            ),
+            (
+                CommitmentMessageId::StartTime,
+                WinternitzSecret::new(START_TIME_MESSAGE_LENGTH),
+            ),
+            (
+                CommitmentMessageId::Superblock,
+                WinternitzSecret::new(SUPERBLOCK_MESSAGE_LENGTH),
+            ),
+            (
+                CommitmentMessageId::SuperblockHash,
+                WinternitzSecret::new(SUPERBLOCK_HASH_MESSAGE_LENGTH),
+            ),
+        ]);
+
+        for i in 0..NUM_PUBS {
+            commitment_map.insert(
+                CommitmentMessageId::Groth16IntermediateValues((format!("{}", i), 32)),
+                WinternitzSecret::new(32),
+            );
+        }
+        for i in 0..NUM_U256 {
+            commitment_map.insert(
+                CommitmentMessageId::Groth16IntermediateValues((format!("{}", i + NUM_PUBS), 32)),
+                WinternitzSecret::new(32),
+            );
+        }
+        for i in 0..NUM_U160 {
+            commitment_map.insert(
+                CommitmentMessageId::Groth16IntermediateValues((format!("{}", i + NUM_PUBS + NUM_U256), 20)),
+                WinternitzSecret::new(20),
+            );
+        }
+
+        commitment_map
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::collections::HashMap;
+
+    use crate::serialization::{deserialize, serialize};
+
+    use super::CommitmentMessageId;
+
+    #[test]
+    fn test_commitment_message_id_serialization() {
+        let messages = HashMap::from([
+            (CommitmentMessageId::PegOutTxIdSourceNetwork, "test"),
+            (CommitmentMessageId::PegOutTxIdDestinationNetwork, "test"),
+            (CommitmentMessageId::StartTime, "test"),
+            (CommitmentMessageId::Superblock, "test"),
+            (CommitmentMessageId::SuperblockHash, "test"),
+            (
+                CommitmentMessageId::Groth16IntermediateValues(("F_10_mul_c_1p0c".to_string(), 31)),
+                "test",
+            ),
+            (
+                CommitmentMessageId::Groth16IntermediateValues((
+                    "F_18_mul_ca0_a1 * b0_b1".to_string(),
+                    29,
+                )),
+                "test",
+            ),
+        ]);
+
+        let json = serialize(&messages);
+        let deserialized_messages = deserialize::<HashMap<CommitmentMessageId, &str>>(&json);
+        assert_eq!(messages, deserialized_messages);
+    }
+}
diff --git a/bridge/src/common.rs b/bridge/src/common.rs
new file mode 100644
index 000000000..b4bcbda1a
--- /dev/null
+++ b/bridge/src/common.rs
@@ -0,0 +1 @@
+pub type ZkProofVerifyingKey = ark_groth16::VerifyingKey<ark_bn254::Bn254>;
diff --git a/bridge/src/connectors/base.rs b/bridge/src/connectors/base.rs
new file mode 100644
index 000000000..8b4a67509
--- /dev/null
+++ b/bridge/src/connectors/base.rs
@@ -0,0 +1,65 @@
+use bitcoin::{
+    key::TweakedPublicKey, taproot::TaprootSpendInfo, Address, ScriptBuf, Sequence, TapNodeHash,
+    TxIn, Witness,
+};
+use serde::{Deserialize, Serialize};
+
+use super::super::transactions::base::Input;
+
+pub fn generate_default_tx_in(input: &Input) -> TxIn {
+    TxIn {
+        previous_output: input.outpoint,
+        script_sig: ScriptBuf::new(),
+        sequence: Sequence::MAX,
+        witness: Witness::default(),
+    }
+}
+
+pub fn generate_timelock_tx_in(input: &Input, num_blocks: u32) -> TxIn {
+    let mut tx_in = generate_default_tx_in(input);
+    tx_in.sequence = Sequence(num_blocks);
+    tx_in
+}
+
+/*
+// TODO figure out if we need to handle CLTV differently than other timelock txs
+https://github.com/BlockchainCommons/Learning-Bitcoin-from-the-Command-Line/blob/master/11_2_Using_CLTV_in_Scripts.md
+A locking script will only allow a transaction to respend a UTXO locked with a CLTV if OP_CHECKLOCKTIMEVERIFY verifies all of the following:
+
+The nSequence field must be set to less than 0xffffffff, usually 0xffffffff-1 to avoid conflicts with relative timelocks.
+CLTV must pop an operand off the stack and it must be 0 or greater.
+Both the stack operand and nLockTime must either be above or below 500 million, to depict the same sort of absolute timelock.
+The nLockTime value must be greater than or equal to the stack operand.
+So the first thing to note here is that nLockTime is still used with CLTV. To be precise, it's required in the transaction that tries to respend a CLTV-timelocked UTXO. That means that it's not a part of the script's requirements. It's just the timer that's used to release the funds, as defined in the script.
+
+This is managed through a clever understanding of how nLockTime works: a value for nLockTime must always be chosen that is less than or equal to the present time (or blockheight), so that the respending transaction can be put on the blockchain. However, due to CLTV's requirements, a value must also be chosen that is greater than or equal to CLTV's operand. The union of these two sets is NULL until the present time matches the CLTV operand. Afterward, any value can be chosen between CLTV's operand and the present time. Usually, you'd just set it to the present time (or block).
+*/
+pub fn generate_check_lock_time_tx_in(input: &Input, num_blocks: u32) -> TxIn {
+    let mut tx_in = generate_default_tx_in(input);
+    tx_in.sequence = Sequence(num_blocks);
+    tx_in
+}
+
+pub trait P2wshConnector {
+    fn generate_script(&self) -> ScriptBuf;
+
+    fn generate_address(&self) -> Address;
+
+    fn generate_tx_in(&self, input: &Input) -> TxIn;
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct TaprootSpendInfoCache {
+    pub merkle_root: Option<TapNodeHash>,
+    pub output_key: TweakedPublicKey,
+}
+
+pub trait TaprootConnector {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf;
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn;
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo;
+
+    fn generate_taproot_address(&self) -> Address;
+}
diff --git a/src/bridge/connectors/connector_0.rs b/bridge/src/connectors/connector_0.rs
similarity index 92%
rename from src/bridge/connectors/connector_0.rs
rename to bridge/src/connectors/connector_0.rs
index 1d2ecdf86..374388a86 100644
--- a/src/bridge/connectors/connector_0.rs
+++ b/bridge/src/connectors/connector_0.rs
@@ -1,13 +1,13 @@
 use bitcoin::{
-    key::Secp256k1,
     taproot::{TaprootBuilder, TaprootSpendInfo},
     Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
 };
+use secp256k1::SECP256K1;
 use serde::{Deserialize, Serialize};
 
 use super::{
     super::{scripts::*, transactions::base::Input},
-    connector::*,
+    base::*,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -20,7 +20,7 @@ impl Connector0 {
     pub fn new(network: Network, n_of_n_taproot_public_key: &XOnlyPublicKey) -> Self {
         Connector0 {
             network,
-            n_of_n_taproot_public_key: n_of_n_taproot_public_key.clone(),
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
         }
     }
 
@@ -60,7 +60,7 @@ impl TaprootConnector for Connector0 {
             .expect("Unable to add leaf 0")
             .add_leaf(1, self.generate_taproot_leaf_1_script())
             .expect("Unable to add leaf 1")
-            .finalize(&Secp256k1::new(), self.n_of_n_taproot_public_key)
+            .finalize(SECP256K1, self.n_of_n_taproot_public_key)
             .expect("Unable to finalize taproot")
     }
 
diff --git a/src/bridge/connectors/connector_1.rs b/bridge/src/connectors/connector_1.rs
similarity index 62%
rename from src/bridge/connectors/connector_1.rs
rename to bridge/src/connectors/connector_1.rs
index 68fa99450..5a936f4af 100644
--- a/src/bridge/connectors/connector_1.rs
+++ b/bridge/src/connectors/connector_1.rs
@@ -1,10 +1,22 @@
+use std::collections::HashMap;
+
 use bitcoin::{
-    key::Secp256k1,
     taproot::{TaprootBuilder, TaprootSpendInfo},
     Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
 };
+use bitcoin_script::script;
+use secp256k1::SECP256K1;
 use serde::{Deserialize, Serialize};
 
+use crate::{
+    commitments::CommitmentMessageId,
+    superblock::{SUPERBLOCK_HASH_MESSAGE_LENGTH, SUPERBLOCK_MESSAGE_LENGTH},
+};
+
+use bitvm::signatures::signing_winternitz::{
+    winternitz_message_checksig_verify, WinternitzPublicKey,
+};
+
 use super::{
     super::{
         constants::{NUM_BLOCKS_PER_2_WEEKS, NUM_BLOCKS_PER_6_HOURS, NUM_BLOCKS_PER_DAY},
@@ -12,7 +24,7 @@ use super::{
         transactions::base::Input,
         utils::num_blocks_per_network,
     },
-    connector::*,
+    base::*,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -20,9 +32,10 @@ pub struct Connector1 {
     pub network: Network,
     pub operator_taproot_public_key: XOnlyPublicKey,
     pub n_of_n_taproot_public_key: XOnlyPublicKey,
-    pub num_blocks_timelock_0: u32,
-    pub num_blocks_timelock_1: u32,
-    pub num_blocks_timelock_2: u32,
+    pub commitment_public_keys: HashMap<CommitmentMessageId, WinternitzPublicKey>,
+    pub num_blocks_timelock_leaf_0: u32,
+    pub num_blocks_timelock_leaf_1: u32,
+    pub num_blocks_timelock_leaf_2: u32,
 }
 
 impl Connector1 {
@@ -30,51 +43,63 @@ impl Connector1 {
         network: Network,
         operator_taproot_public_key: &XOnlyPublicKey,
         n_of_n_taproot_public_key: &XOnlyPublicKey,
+        commitment_public_keys: &HashMap<CommitmentMessageId, WinternitzPublicKey>,
     ) -> Self {
         Connector1 {
             network,
-            operator_taproot_public_key: operator_taproot_public_key.clone(),
-            n_of_n_taproot_public_key: n_of_n_taproot_public_key.clone(),
-            num_blocks_timelock_0: num_blocks_per_network(network, NUM_BLOCKS_PER_2_WEEKS),
-            num_blocks_timelock_1: num_blocks_per_network(
+            operator_taproot_public_key: *operator_taproot_public_key,
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
+            commitment_public_keys: commitment_public_keys.clone(),
+            num_blocks_timelock_leaf_0: num_blocks_per_network(network, NUM_BLOCKS_PER_2_WEEKS),
+            num_blocks_timelock_leaf_1: num_blocks_per_network(
                 network,
                 NUM_BLOCKS_PER_2_WEEKS + NUM_BLOCKS_PER_DAY,
             ),
-            num_blocks_timelock_2: num_blocks_per_network(network, NUM_BLOCKS_PER_6_HOURS),
+            num_blocks_timelock_leaf_2: num_blocks_per_network(network, NUM_BLOCKS_PER_6_HOURS),
         }
     }
 
     fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
-        generate_timelock_taproot_script(
-            &self.operator_taproot_public_key,
-            self.num_blocks_timelock_0,
-        )
+        let superblock_public_key = &self.commitment_public_keys[&CommitmentMessageId::Superblock];
+        let superblock_hash_public_key =
+            &self.commitment_public_keys[&CommitmentMessageId::SuperblockHash];
+
+        script! {
+            { winternitz_message_checksig_verify(superblock_hash_public_key, SUPERBLOCK_HASH_MESSAGE_LENGTH * 2) }
+            { winternitz_message_checksig_verify(superblock_public_key, SUPERBLOCK_MESSAGE_LENGTH * 2) }
+            { self.num_blocks_timelock_leaf_0 }
+            OP_CSV
+            OP_DROP
+            { self.operator_taproot_public_key }
+            OP_CHECKSIG
+        }
+        .compile()
     }
 
     fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn {
-        generate_timelock_tx_in(input, self.num_blocks_timelock_0)
+        generate_timelock_tx_in(input, self.num_blocks_timelock_leaf_0)
     }
 
     fn generate_taproot_leaf_1_script(&self) -> ScriptBuf {
         generate_timelock_taproot_script(
             &self.n_of_n_taproot_public_key,
-            self.num_blocks_timelock_1,
+            self.num_blocks_timelock_leaf_1,
         )
     }
 
     fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn {
-        generate_timelock_tx_in(input, self.num_blocks_timelock_1)
+        generate_timelock_tx_in(input, self.num_blocks_timelock_leaf_1)
     }
 
     fn generate_taproot_leaf_2_script(&self) -> ScriptBuf {
         generate_timelock_taproot_script(
             &self.n_of_n_taproot_public_key,
-            self.num_blocks_timelock_2,
+            self.num_blocks_timelock_leaf_2,
         )
     }
 
     fn generate_taproot_leaf_2_tx_in(&self, input: &Input) -> TxIn {
-        generate_timelock_tx_in(input, self.num_blocks_timelock_2)
+        generate_timelock_tx_in(input, self.num_blocks_timelock_leaf_2)
     }
 }
 
@@ -105,7 +130,7 @@ impl TaprootConnector for Connector1 {
             .expect("Unable to add leaf 1")
             .add_leaf(1, self.generate_taproot_leaf_2_script())
             .expect("Unable to add leaf 2")
-            .finalize(&Secp256k1::new(), self.n_of_n_taproot_public_key)
+            .finalize(SECP256K1, self.n_of_n_taproot_public_key)
             .expect("Unable to finalize taproot")
     }
 
diff --git a/bridge/src/connectors/connector_2.rs b/bridge/src/connectors/connector_2.rs
new file mode 100644
index 000000000..6ba9b5dcb
--- /dev/null
+++ b/bridge/src/connectors/connector_2.rs
@@ -0,0 +1,113 @@
+use std::collections::HashMap;
+
+use crate::{
+    commitments::CommitmentMessageId,
+    constants::{N_SEQUENCE_FOR_LOCK_TIME, START_TIME_MESSAGE_LENGTH},
+};
+use bitcoin::{
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
+};
+use bitvm::{
+    signatures::{
+        signing_winternitz::{winternitz_message_checksig, WinternitzPublicKey, LOG_D},
+        utils::digits_to_number,
+    },
+    treepp::script,
+};
+use secp256k1::SECP256K1;
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{scripts::*, transactions::base::Input},
+    base::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct Connector2 {
+    pub network: Network,
+    pub operator_taproot_public_key: XOnlyPublicKey,
+    pub n_of_n_taproot_public_key: XOnlyPublicKey,
+    pub commitment_public_keys: HashMap<CommitmentMessageId, WinternitzPublicKey>,
+}
+
+impl Connector2 {
+    pub fn new(
+        network: Network,
+        operator_taproot_public_key: &XOnlyPublicKey,
+        n_of_n_taproot_public_key: &XOnlyPublicKey,
+        commitment_public_keys: &HashMap<CommitmentMessageId, WinternitzPublicKey>,
+    ) -> Self {
+        Connector2 {
+            network,
+            operator_taproot_public_key: *operator_taproot_public_key,
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
+            commitment_public_keys: commitment_public_keys.clone(),
+        }
+    }
+
+    fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
+        let start_time_public_key = &self.commitment_public_keys[&CommitmentMessageId::StartTime];
+
+        script! {
+            // pre-image (pushed to stack from witness)
+            // BITVM1 opcodes
+            // block peg out was mined in (left on stack)
+
+            // TODO(LucidLuckylee): If there is a Winternitz Converter to generate the 32byte number implemented use it here and
+            // get rid of the extra conversion with bytes_to_number.
+            { winternitz_message_checksig(start_time_public_key) }
+            { digits_to_number::<{ START_TIME_MESSAGE_LENGTH * 2}, { LOG_D as usize }>() }
+            OP_CLTV
+            OP_DROP
+            { self.operator_taproot_public_key }
+            OP_CHECKSIG
+        }
+        .compile()
+    }
+
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn {
+        generate_timelock_tx_in(input, N_SEQUENCE_FOR_LOCK_TIME)
+    }
+
+    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) }
+}
+
+impl TaprootConnector for Connector2 {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_script(),
+            1 => self.generate_taproot_leaf_1_script(),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_tx_in(input),
+            1 => self.generate_taproot_leaf_1_tx_in(input),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        TaprootBuilder::new()
+            .add_leaf(1, self.generate_taproot_leaf_0_script())
+            .expect("Unable to add leaf 0")
+            .add_leaf(1, self.generate_taproot_leaf_1_script())
+            .expect("Unable to add leaf 1")
+            .finalize(SECP256K1, self.n_of_n_taproot_public_key)
+            .expect("Unable to finalize taproot")
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(
+            self.generate_taproot_spend_info().output_key(),
+            self.network,
+        )
+    }
+}
diff --git a/src/bridge/connectors/connector_3.rs b/bridge/src/connectors/connector_3.rs
similarity index 86%
rename from src/bridge/connectors/connector_3.rs
rename to bridge/src/connectors/connector_3.rs
index 4b523adf0..58850739d 100644
--- a/src/bridge/connectors/connector_3.rs
+++ b/bridge/src/connectors/connector_3.rs
@@ -3,11 +3,11 @@ use serde::{Deserialize, Serialize};
 
 use super::{
     super::{
-        super::bridge::{constants::NUM_BLOCKS_PER_3_DAYS, utils::num_blocks_per_network},
         scripts::*,
         transactions::base::Input,
+        {constants::NUM_BLOCKS_PER_3_DAYS, utils::num_blocks_per_network},
     },
-    connector::*,
+    base::*,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -21,7 +21,7 @@ impl Connector3 {
     pub fn new(network: Network, operator_public_key: &PublicKey) -> Self {
         Connector3 {
             network,
-            operator_public_key: operator_public_key.clone(),
+            operator_public_key: *operator_public_key,
             num_blocks_timelock: num_blocks_per_network(network, NUM_BLOCKS_PER_3_DAYS),
         }
     }
diff --git a/src/bridge/connectors/connector_4.rs b/bridge/src/connectors/connector_4.rs
similarity index 86%
rename from src/bridge/connectors/connector_4.rs
rename to bridge/src/connectors/connector_4.rs
index 15df86fe8..18d1ac911 100644
--- a/src/bridge/connectors/connector_4.rs
+++ b/bridge/src/connectors/connector_4.rs
@@ -3,11 +3,11 @@ use serde::{Deserialize, Serialize};
 
 use super::{
     super::{
-        super::bridge::{constants::NUM_BLOCKS_PER_2_WEEKS, utils::num_blocks_per_network},
         scripts::*,
         transactions::base::Input,
+        {constants::NUM_BLOCKS_PER_2_WEEKS, utils::num_blocks_per_network},
     },
-    connector::*,
+    base::*,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -21,7 +21,7 @@ impl Connector4 {
     pub fn new(network: Network, operator_public_key: &PublicKey) -> Self {
         Connector4 {
             network,
-            operator_public_key: operator_public_key.clone(),
+            operator_public_key: *operator_public_key,
             num_blocks_timelock: num_blocks_per_network(network, NUM_BLOCKS_PER_2_WEEKS),
         }
     }
diff --git a/src/bridge/connectors/connector_5.rs b/bridge/src/connectors/connector_5.rs
similarity index 92%
rename from src/bridge/connectors/connector_5.rs
rename to bridge/src/connectors/connector_5.rs
index 999e8a428..20433cca5 100644
--- a/src/bridge/connectors/connector_5.rs
+++ b/bridge/src/connectors/connector_5.rs
@@ -1,13 +1,13 @@
 use bitcoin::{
-    key::Secp256k1,
     taproot::{TaprootBuilder, TaprootSpendInfo},
     Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
 };
+use secp256k1::SECP256K1;
 use serde::{Deserialize, Serialize};
 
 use super::{
     super::{scripts::*, transactions::base::Input},
-    connector::*,
+    base::*,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -20,7 +20,7 @@ impl Connector5 {
     pub fn new(network: Network, n_of_n_taproot_public_key: &XOnlyPublicKey) -> Self {
         Connector5 {
             network,
-            n_of_n_taproot_public_key: n_of_n_taproot_public_key.clone(),
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
         }
     }
 
@@ -60,7 +60,7 @@ impl TaprootConnector for Connector5 {
             .expect("Unable to add leaf 0")
             .add_leaf(1, self.generate_taproot_leaf_1_script())
             .expect("Unable to add leaf 1")
-            .finalize(&Secp256k1::new(), self.n_of_n_taproot_public_key)
+            .finalize(SECP256K1, self.n_of_n_taproot_public_key)
             .expect("Unable to finalize taproot")
     }
 
diff --git a/bridge/src/connectors/connector_6.rs b/bridge/src/connectors/connector_6.rs
new file mode 100644
index 000000000..1cdfbda4b
--- /dev/null
+++ b/bridge/src/connectors/connector_6.rs
@@ -0,0 +1,89 @@
+use std::collections::HashMap;
+
+use crate::{
+    commitments::CommitmentMessageId,
+    constants::{DESTINATION_NETWORK_TXID_LENGTH, SOURCE_NETWORK_TXID_LENGTH},
+    transactions::base::Input,
+};
+
+use bitvm::{
+    signatures::signing_winternitz::{winternitz_message_checksig_verify, WinternitzPublicKey},
+    treepp::script,
+};
+
+use bitcoin::{
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
+};
+
+use secp256k1::SECP256K1;
+use serde::{Deserialize, Serialize};
+
+use super::base::{generate_default_tx_in, TaprootConnector};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct Connector6 {
+    pub network: Network,
+    pub operator_taproot_public_key: XOnlyPublicKey,
+    pub commitment_public_keys: HashMap<CommitmentMessageId, WinternitzPublicKey>,
+}
+
+impl Connector6 {
+    pub fn new(
+        network: Network,
+        operator_taproot_public_key: &XOnlyPublicKey,
+        commitment_public_keys: &HashMap<CommitmentMessageId, WinternitzPublicKey>,
+    ) -> Self {
+        Connector6 {
+            network,
+            operator_taproot_public_key: *operator_taproot_public_key,
+            commitment_public_keys: commitment_public_keys.clone(),
+        }
+    }
+
+    fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
+        let destination_network_txid_public_key =
+            &self.commitment_public_keys[&CommitmentMessageId::PegOutTxIdDestinationNetwork];
+        let source_network_txid_public_key =
+            &self.commitment_public_keys[&CommitmentMessageId::PegOutTxIdSourceNetwork];
+        script! {
+            { winternitz_message_checksig_verify(destination_network_txid_public_key, DESTINATION_NETWORK_TXID_LENGTH * 2) }
+            { winternitz_message_checksig_verify(source_network_txid_public_key, SOURCE_NETWORK_TXID_LENGTH * 2) }
+            { self.operator_taproot_public_key }
+            OP_CHECKSIG
+        }.compile()
+    }
+
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+}
+
+impl TaprootConnector for Connector6 {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_script(),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_tx_in(input),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        TaprootBuilder::new()
+            .add_leaf(0, self.generate_taproot_leaf_0_script())
+            .expect("Unable to add leaf 0")
+            .finalize(SECP256K1, self.operator_taproot_public_key) // TODO: should be operator key?
+            .expect("Unable to finalize taproot")
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(
+            self.generate_taproot_spend_info().output_key(),
+            self.network,
+        )
+    }
+}
diff --git a/src/bridge/connectors/connector_a.rs b/bridge/src/connectors/connector_a.rs
similarity index 89%
rename from src/bridge/connectors/connector_a.rs
rename to bridge/src/connectors/connector_a.rs
index 3935c5408..114e03bd3 100644
--- a/src/bridge/connectors/connector_a.rs
+++ b/bridge/src/connectors/connector_a.rs
@@ -1,13 +1,13 @@
 use bitcoin::{
-    key::Secp256k1,
     taproot::{TaprootBuilder, TaprootSpendInfo},
     Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
 };
+use secp256k1::SECP256K1;
 use serde::{Deserialize, Serialize};
 
 use super::{
     super::{scripts::*, transactions::base::Input},
-    connector::*,
+    base::*,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -25,8 +25,8 @@ impl ConnectorA {
     ) -> Self {
         ConnectorA {
             network,
-            operator_taproot_public_key: operator_taproot_public_key.clone(),
-            n_of_n_taproot_public_key: n_of_n_taproot_public_key.clone(),
+            operator_taproot_public_key: *operator_taproot_public_key,
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
         }
     }
 
@@ -66,7 +66,7 @@ impl TaprootConnector for ConnectorA {
             .expect("Unable to add leaf 0")
             .add_leaf(1, self.generate_taproot_leaf_1_script())
             .expect("Unable to add leaf 1")
-            .finalize(&Secp256k1::new(), self.n_of_n_taproot_public_key)
+            .finalize(SECP256K1, self.n_of_n_taproot_public_key)
             .expect("Unable to finalize taproot")
     }
 
diff --git a/bridge/src/connectors/connector_b.rs b/bridge/src/connectors/connector_b.rs
new file mode 100644
index 000000000..dd7ec8144
--- /dev/null
+++ b/bridge/src/connectors/connector_b.rs
@@ -0,0 +1,302 @@
+use std::collections::HashMap;
+
+use bitcoin::{
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
+};
+use bitcoin_script::script;
+use bitvm::{
+    hash::sha256::{sha256, sha256_32bytes},
+    signatures::{
+        signing_winternitz::{winternitz_message_checksig, WinternitzPublicKey, LOG_D},
+        utils::digits_to_number,
+    },
+};
+use secp256k1::SECP256K1;
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    commitments::CommitmentMessageId,
+    constants::START_TIME_MESSAGE_LENGTH,
+    superblock::{extract_superblock_ts_from_header, SUPERBLOCK_MESSAGE_LENGTH},
+    utils::{sb_hash_from_bytes, sb_hash_from_nibbles, H256},
+};
+
+use super::{
+    super::{
+        constants::NUM_BLOCKS_PER_3_DAYS, scripts::*, transactions::base::Input,
+        utils::num_blocks_per_network,
+    },
+    base::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct ConnectorB {
+    pub network: Network,
+    pub n_of_n_taproot_public_key: XOnlyPublicKey,
+    pub commitment_public_keys: HashMap<CommitmentMessageId, WinternitzPublicKey>,
+    pub num_blocks_timelock_1: u32,
+}
+
+impl ConnectorB {
+    pub fn new(
+        network: Network,
+        n_of_n_taproot_public_key: &XOnlyPublicKey,
+        commitment_public_keys: &HashMap<CommitmentMessageId, WinternitzPublicKey>,
+    ) -> Self {
+        ConnectorB {
+            network,
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
+            commitment_public_keys: commitment_public_keys.clone(),
+            num_blocks_timelock_1: num_blocks_per_network(network, NUM_BLOCKS_PER_3_DAYS),
+        }
+    }
+
+    fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
+        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_1_script(&self) -> ScriptBuf {
+        generate_timelock_taproot_script(
+            &self.n_of_n_taproot_public_key,
+            self.num_blocks_timelock_1,
+        )
+    }
+
+    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn {
+        generate_timelock_tx_in(input, self.num_blocks_timelock_1)
+    }
+
+    fn generate_taproot_leaf_2_script(&self) -> ScriptBuf {
+        const TWO_WEEKS_IN_SECONDS: u32 = 60 * 60 * 24 * 14;
+        let superblock_hash_public_key =
+            &self.commitment_public_keys[&CommitmentMessageId::SuperblockHash];
+        let start_time_public_key = &self.commitment_public_keys[&CommitmentMessageId::StartTime];
+
+        // Expected witness:
+        // n-of-n Schnorr signature
+        // SB' (byte stream)
+        // Committed start time (Winternitz sig)
+        // Committed SB hash (Winternitz sig)
+
+        script! {
+            // Verify superblock hash commitment sig
+            { winternitz_message_checksig(superblock_hash_public_key) }
+            // Convert committed SB hash to number and push it to altstack
+            { sb_hash_from_nibbles() }
+            { H256::toaltstack() }          // Stack: SB' sig(start_time) | Altstack: SB.hash
+
+            // Verify start time commitment sig
+            { winternitz_message_checksig(start_time_public_key) }
+            // Convert committed start time to number and push it to altstack
+            { digits_to_number::<{ START_TIME_MESSAGE_LENGTH * 2 }, { LOG_D as usize }>() }
+            OP_TOALTSTACK                   // Stack: SB' | Altstack: SB.hash start_time
+
+            extract_superblock_ts_from_header
+                                            // Stack: SB' SB'.time | Altstack: SB.hash start_time
+
+            // SB'.time > start_time
+            OP_FROMALTSTACK                 // Stack: SB' SB'.time start_time | Altstack: SB.hash
+            OP_2DUP                         // Stack: SB' SB'.time start_time SB'.time start_time | Altstack: SB.hash
+            OP_GREATERTHAN OP_VERIFY        // Stack: SB' SB'.time start_time | Altstack: SB.hash
+
+            // SB'.time < start_time + 2 weeks
+            { TWO_WEEKS_IN_SECONDS } OP_ADD // Stack: SB' SB'.time (start_time + 2 weeks) | Altstack: SB.hash
+            OP_LESSTHAN OP_VERIFY           // Stack: SB' | Altstack: SB.hash
+
+            // Calculate SB' hash
+            { sha256(SUPERBLOCK_MESSAGE_LENGTH) }
+            { sha256_32bytes() }
+            { sb_hash_from_bytes() }        // Stack: SB'.hash | Altstack: SB.hash
+
+            // SB'.weight > SB.weight
+            // We're comparing hashes as numbers (smaller number = bigger weight),
+            // so we need to evaluate (SB'.hash < SB.hash).
+            { H256::fromaltstack() }        // Stack: SB'.hash SB.hash
+            { H256::lessthan(1, 0) } OP_VERIFY
+
+            { self.n_of_n_taproot_public_key }
+            OP_CHECKSIG
+        }
+        .compile()
+    }
+
+    fn generate_taproot_leaf_2_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+}
+
+impl TaprootConnector for ConnectorB {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_script(),
+            1 => self.generate_taproot_leaf_1_script(),
+            2 => self.generate_taproot_leaf_2_script(),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_tx_in(input),
+            1 => self.generate_taproot_leaf_1_tx_in(input),
+            2 => self.generate_taproot_leaf_2_tx_in(input),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        TaprootBuilder::new()
+            .add_leaf(2, self.generate_taproot_leaf_0_script())
+            .expect("Unable to add leaf 0")
+            .add_leaf(2, self.generate_taproot_leaf_1_script())
+            .expect("Unable to add leaf 1")
+            .add_leaf(1, self.generate_taproot_leaf_2_script())
+            .expect("Unable to add leaf 2")
+            .finalize(SECP256K1, self.n_of_n_taproot_public_key)
+            .expect("Unable to finalize taproot")
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(
+            self.generate_taproot_spend_info().output_key(),
+            self.network,
+        )
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::str::FromStr;
+
+    use bitcoin::{
+        block::{Header, Version},
+        BlockHash, CompactTarget,
+        Network::Regtest,
+        TxMerkleNode,
+    };
+    use bitcoin_script::script;
+    use bitvm::{
+        execute_script,
+        hash::sha256::{sha256, sha256_32bytes},
+        signatures::{
+            signing_winternitz::{
+                generate_winternitz_witness, winternitz_message_checksig, WinternitzPublicKey,
+                WinternitzSecret, WinternitzSigningInputs, LOG_D,
+            },
+            utils::digits_to_number,
+        },
+    };
+
+    use crate::{
+        constants::START_TIME_MESSAGE_LENGTH,
+        superblock::{
+            extract_superblock_ts_from_header, get_start_time_block_number,
+            get_superblock_hash_message, SUPERBLOCK_HASH_MESSAGE_LENGTH, SUPERBLOCK_MESSAGE_LENGTH,
+        },
+        utils::{sb_hash_from_bytes, sb_hash_from_nibbles, H256},
+    };
+
+    // Copied from tests/bridge/helper.rs
+    fn get_superblock_header() -> Header {
+        Header {
+            version: Version::from_consensus(0x200d2000),
+            prev_blockhash: BlockHash::from_str(
+                "000000000000000000027c9f5b07f21e39ba31aa4d900d519478bdac32f4a15d",
+            )
+            .unwrap(),
+            merkle_root: TxMerkleNode::from_str(
+                "0064b0d54f20412756ba7ce07b0594f3548b06f2dad5cfeaac2aca508634ed19",
+            )
+            .unwrap(),
+            time: 1729251961,
+            bits: CompactTarget::from_hex("0x17030ecd").unwrap(),
+            nonce: 0x400e345c,
+        }
+    }
+
+    #[test]
+    #[ignore]
+    fn test_connector_b_leaf_2_script() {
+        const TWO_WEEKS_IN_SECONDS: u32 = 60 * 60 * 24 * 14;
+
+        // TODO: setup the test headers appropriately for the verification in the script to pass
+        let committed_sb = get_superblock_header();
+        let mut disprove_sb = get_superblock_header();
+        disprove_sb.time = get_start_time_block_number(Regtest) + 1;
+        let mut disprove_sb_message = crate::superblock::get_superblock_message(&disprove_sb);
+        disprove_sb_message.reverse();
+
+        let committed_sb_hash_secret = WinternitzSecret::new(SUPERBLOCK_HASH_MESSAGE_LENGTH);
+        let committed_sb_hash_public_key = WinternitzPublicKey::from(&committed_sb_hash_secret);
+        let committed_sb_hash_signing_inputs = WinternitzSigningInputs {
+            message: &get_superblock_hash_message(&committed_sb),
+            signing_key: &committed_sb_hash_secret,
+        };
+
+        let start_time_message = get_start_time_block_number(Regtest).to_le_bytes();
+        assert!(start_time_message.len() == START_TIME_MESSAGE_LENGTH);
+        let start_time_secret = WinternitzSecret::new(START_TIME_MESSAGE_LENGTH);
+        let start_time_public_key = WinternitzPublicKey::from(&start_time_secret);
+        let start_time_signing_inputs = WinternitzSigningInputs {
+            message: &start_time_message,
+            signing_key: &start_time_secret,
+        };
+
+        let s = script! {
+            // Witness data
+
+            for byte in disprove_sb_message { {byte} }
+            { generate_winternitz_witness(&start_time_signing_inputs).to_vec() }
+            { generate_winternitz_witness(&committed_sb_hash_signing_inputs).to_vec() }
+                                            // Terms used in stack notation below:
+                                            //   SB = commited SB (challenged SB)
+                                            //   SB' = disprove SB (challenger SB)
+                                            //
+                                            // Stack: SB' sig(start_time) sig(SB.hash)
+
+            // Start unlock script
+
+            // Verify superblock hash commitment sig
+            { winternitz_message_checksig(&committed_sb_hash_public_key) }
+            // Convert committed SB hash to number and push it to altstack
+            { sb_hash_from_nibbles() }
+            { H256::toaltstack() }          // Stack: SB' sig(start_time) | Altstack: SB.hash
+
+            // Verify start time commitment sig
+            { winternitz_message_checksig(&start_time_public_key) }
+            // Convert committed start time to number and push it to altstack
+            { digits_to_number::<{ START_TIME_MESSAGE_LENGTH * 2 }, { LOG_D as usize }>() }
+            OP_TOALTSTACK                   // Stack: SB' | Altstack: SB.hash start_time
+
+            extract_superblock_ts_from_header
+                                            // Stack: SB' SB'.time | Altstack: SB.hash start_time
+
+            // SB'.time > start_time
+            OP_FROMALTSTACK                 // Stack: SB' SB'.time start_time | Altstack: SB.hash
+            OP_2DUP                         // Stack: SB' SB'.time start_time SB'.time start_time | Altstack: SB.hash
+            OP_GREATERTHAN OP_VERIFY        // Stack: SB' SB'.time start_time | Altstack: SB.hash
+
+            // SB'.time < start_time + 2 weeks
+            { TWO_WEEKS_IN_SECONDS } OP_ADD // Stack: SB' SB'.time (start_time + 2 weeks) | Altstack: SB.hash
+            OP_LESSTHAN OP_VERIFY           // Stack: SB' | Altstack: SB.hash
+
+            // Calculate SB' hash
+            { sha256(SUPERBLOCK_MESSAGE_LENGTH) }
+            { sha256_32bytes() }
+            { sb_hash_from_bytes() }        // Stack: SB'.hash | Altstack: SB.hash
+
+            // SB'.weight > SB.weight
+            // We're comparing hashes as numbers (smaller number = bigger weight),
+            // so we need to evaluate (SB'.hash < SB.hash).
+            { H256::fromaltstack() }        // Stack: SB'.hash SB.hash
+            { H256::lessthan(1, 0) } OP_VERIFY
+
+            OP_TRUE
+        };
+
+        let result = execute_script(s);
+
+        assert!(result.success);
+    }
+}
diff --git a/bridge/src/connectors/connector_c.rs b/bridge/src/connectors/connector_c.rs
new file mode 100644
index 000000000..1bc9868b2
--- /dev/null
+++ b/bridge/src/connectors/connector_c.rs
@@ -0,0 +1,375 @@
+use std::{
+    collections::BTreeMap,
+    fmt::{Formatter, Result as FmtResult},
+    path::{Path, PathBuf},
+};
+
+use crate::{
+    client::{files::BRIDGE_DATA_DIRECTORY_NAME, memory_cache::TAPROOT_SPEND_INFO_CACHE},
+    commitments::CommitmentMessageId,
+    common::ZkProofVerifyingKey,
+    connectors::base::*,
+    error::{ChunkerError, ConnectorError, Error},
+    transactions::base::Input,
+    utils::{
+        cleanup_cache_files, read_disk_cache, remove_script_and_control_block_from_witness,
+        write_disk_cache,
+    },
+};
+use bitcoin::{
+    hashes::{hash160, Hash},
+    key::TweakedPublicKey,
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TapNodeHash, Transaction, TxIn, XOnlyPublicKey,
+};
+use num_traits::ToPrimitive;
+use secp256k1::SECP256K1;
+use serde::{
+    de,
+    ser::{Error as SerError, SerializeStruct},
+    Deserialize, Deserializer, Serialize, Serializer,
+};
+
+use bitvm::{
+    chunk::api::{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}, validate_assertions, PublicKeys}, 
+    // chunker::{
+    //     assigner::BridgeAssigner,
+    //     chunk_groth16_verifier::groth16_verify_to_segments,
+    //     common::RawWitness,
+    //     disprove_execution::{disprove_exec, RawProof},
+    // }, 
+    signatures::signing_winternitz::WinternitzPublicKey
+};
+
+// Specialized for assert leaves currently.
+pub type LockScript = fn(index: u32) -> ScriptBuf;
+pub type UnlockWitnessData = Vec<u8>;
+pub type UnlockWitness = fn(index: u32) -> UnlockWitnessData;
+
+pub struct DisproveLeaf {
+    pub lock: LockScript,
+    pub unlock: UnlockWitness,
+}
+
+const CACHE_DIRECTORY_NAME: &str = "cache";
+const LOCK_SCRIPTS_FILE_PREFIX: &str = "lock_scripts_";
+const MAX_CACHE_FILES: u32 = 90; //~1GB in total, based on lock scripts cache being 11MB each
+
+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(BRIDGE_DATA_DIRECTORY_NAME)
+        .join(CACHE_DIRECTORY_NAME)
+        .join(lock_scripts_file_name)
+}
+
+#[derive(Eq, PartialEq, Clone)]
+pub struct ConnectorC {
+    pub network: Network,
+    pub operator_taproot_public_key: XOnlyPublicKey,
+    pub lock_scripts_bytes: Vec<Vec<u8>>, // using primitive type for binary serialization, convert to ScriptBuf when using it
+    commitment_public_keys: BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+}
+
+impl Serialize for ConnectorC {
+    fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut c = s.serialize_struct("ConnectorC", 4)?;
+        c.serialize_field("network", &self.network)?;
+        c.serialize_field(
+            "operator_taproot_public_key",
+            &self.operator_taproot_public_key,
+        )?;
+        c.serialize_field("commitment_public_keys", &self.commitment_public_keys)?;
+
+        let cache_id = Self::cache_id(&self.commitment_public_keys).map_err(SerError::custom)?;
+        c.serialize_field("lock_scripts", &cache_id)?;
+
+        let lock_scripts_cache_path = get_lock_scripts_cache_path(&cache_id);
+        if !lock_scripts_cache_path.exists() {
+            write_disk_cache(&lock_scripts_cache_path, &self.lock_scripts_bytes)
+                .map_err(SerError::custom)?;
+        }
+
+        cleanup_cache_files(
+            LOCK_SCRIPTS_FILE_PREFIX,
+            get_lock_scripts_cache_path(&cache_id).parent().unwrap(),
+            MAX_CACHE_FILES,
+        );
+
+        c.end()
+    }
+}
+
+impl<'de> Deserialize<'de> for ConnectorC {
+    fn deserialize<D>(d: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        struct JsonConnectorCVisitor;
+        impl<'de> de::Visitor<'de> for JsonConnectorCVisitor {
+            type Value = ConnectorC;
+
+            fn expecting(&self, formatter: &mut Formatter) -> FmtResult {
+                formatter.write_str("a string containing ConnectorC data")
+            }
+
+            fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
+            where
+                A: de::MapAccess<'de>,
+            {
+                let mut operator_taproot_public_key = None;
+                let mut commitment_public_keys = None;
+                let mut network = None;
+                let mut lock_scripts_cache_id = None;
+
+                while let Some(key) = map.next_key()? {
+                    match key {
+                        "network" => network = Some(map.next_value()?),
+                        "operator_taproot_public_key" => {
+                            operator_taproot_public_key = Some(map.next_value()?)
+                        }
+                        "commitment_public_keys" => {
+                            commitment_public_keys = Some(map.next_value()?)
+                        }
+                        "lock_scripts" => lock_scripts_cache_id = Some(map.next_value()?),
+                        _ => (),
+                    }
+                }
+
+                match (network, operator_taproot_public_key, commitment_public_keys) {
+                    (
+                        Some(network),
+                        Some(operator_taproot_public_key),
+                        Some(commitment_public_keys),
+                    ) => Ok(ConnectorC::new(
+                        network,
+                        &operator_taproot_public_key,
+                        &commitment_public_keys,
+                        lock_scripts_cache_id,
+                    )),
+                    _ => Err(de::Error::custom("Invalid ConnectorC data")),
+                }
+            }
+        }
+
+        d.deserialize_struct(
+            "ConnectorC",
+            &[
+                "network",
+                "operator_taproot_public_key",
+                "commitment_public_keys",
+                "lock_scripts",
+            ],
+            JsonConnectorCVisitor,
+        )
+    }
+}
+
+impl ConnectorC {
+    pub fn new(
+        network: Network,
+        operator_taproot_public_key: &XOnlyPublicKey,
+        commitment_public_keys: &BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+        lock_scripts_cache_id: Option<String>,
+    ) -> Self {
+        let lock_scripts_cache = lock_scripts_cache_id.and_then(|cache_id| {
+            let file_path = get_lock_scripts_cache_path(&cache_id);
+            read_disk_cache(&file_path)
+                .inspect_err(|e| {
+                    eprintln!(
+                        "Failed to read lock scripts cache from expected location: {}",
+                        e
+                    );
+                })
+                .ok()
+        });
+
+        ConnectorC {
+            network,
+            operator_taproot_public_key: *operator_taproot_public_key,
+            lock_scripts_bytes: lock_scripts_cache
+                .unwrap_or_else(|| generate_assert_leaves(commitment_public_keys)),
+            commitment_public_keys: commitment_public_keys.clone(),
+        }
+    }
+
+    pub fn generate_disprove_witness(
+        &self,
+        commit_1_witness: Vec<RawWitness>,
+        commit_2_witness: Vec<RawWitness>,
+        vk: &ZkProofVerifyingKey,
+    ) -> Result<(usize, RawWitness), Error> {
+
+        let mut sorted_pks: Vec<(u32, WinternitzPublicKey)> = vec![];
+        self.commitment_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 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 = 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);
+            return Ok((exec_res.0, wit));
+        }
+        return Err(Error::Chunker(ChunkerError::ValidProof));
+    }
+
+    pub fn taproot_merkle_root(&self) -> Option<TapNodeHash> {
+        self.taproot_spend_info_cache()
+            .map(|cache| cache.merkle_root)
+            .unwrap_or_else(|| self.generate_taproot_spend_info().merkle_root())
+    }
+
+    pub fn taproot_output_key(&self) -> TweakedPublicKey {
+        self.taproot_spend_info_cache()
+            .map(|cache| cache.output_key)
+            .unwrap_or_else(|| self.generate_taproot_spend_info().output_key())
+    }
+
+    // read from cache or generate from [`TaprootConnector`]
+    fn taproot_spend_info_cache(&self) -> Option<TaprootSpendInfoCache> {
+        let spend_info_cache = match Self::cache_id(&self.commitment_public_keys).map(|cache_id| {
+            TAPROOT_SPEND_INFO_CACHE
+                .read()
+                .unwrap()
+                .get(&cache_id)
+                .cloned()
+        }) {
+            Ok(Some(spend_info_cache)) => Some(spend_info_cache),
+            Ok(None) => {
+                let spend_info = self.generate_taproot_spend_info();
+                let output_key = spend_info.output_key();
+                let spend_info_cache = TaprootSpendInfoCache {
+                    merkle_root: spend_info.merkle_root(),
+                    output_key,
+                };
+                Some(spend_info_cache)
+            }
+            _ => None,
+        };
+
+        spend_info_cache
+    }
+
+    pub fn cache_id(
+        commitment_public_keys: &BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+    ) -> Result<String, ConnectorError> {
+        let first_winternitz_public_key = commitment_public_keys.iter().next();
+
+        match first_winternitz_public_key {
+            None => Err(ConnectorError::ConnectorCCommitsPublicKeyEmpty),
+            Some((_, winternitz_public_key)) => {
+                let hash = hash160::Hash::hash(winternitz_public_key.public_key.as_flattened());
+                Ok(hex::encode(hash))
+            }
+        }
+    }
+}
+
+impl TaprootConnector for ConnectorC {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        let index = leaf_index.to_usize().unwrap();
+        if index >= self.lock_scripts_bytes.len() {
+            panic!("Invalid leaf index.")
+        }
+        ScriptBuf::from_bytes(self.lock_scripts_bytes[index].clone())
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        let index = leaf_index.to_usize().unwrap();
+        if index >= self.lock_scripts_bytes.len() {
+            panic!("Invalid leaf index.")
+        }
+        generate_default_tx_in(input)
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        println!("Generating new taproot spend info for connector C...");
+        let script_weights = self
+            .lock_scripts_bytes
+            .iter()
+            .map(|b| (1, ScriptBuf::from_bytes(b.clone())));
+
+        let spend_info = TaprootBuilder::with_huffman_tree(script_weights)
+            .expect("Unable to add assert leaves")
+            .finalize(SECP256K1, self.operator_taproot_public_key)
+            .expect("Unable to finalize assert transaction connector c taproot");
+
+        // write to cache
+        if let Ok(cache_id) = Self::cache_id(&self.commitment_public_keys) {
+            let output_key = spend_info.output_key();
+            let spend_info_cache = TaprootSpendInfoCache {
+                merkle_root: spend_info.merkle_root(),
+                output_key,
+            };
+            if !TAPROOT_SPEND_INFO_CACHE.read().unwrap().contains(&cache_id) {
+                TAPROOT_SPEND_INFO_CACHE
+                    .write()
+                    .unwrap()
+                    .push(cache_id, spend_info_cache);
+            }
+        }
+
+        spend_info
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(self.taproot_output_key(), self.network)
+    }
+}
+
+pub fn generate_assert_leaves(
+    commits_public_keys: &BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+) -> Vec<Vec<u8>> {
+    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));
+            }
+        });
+    
+    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 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();
+    locks
+}
+
+pub fn get_commit_from_assert_commit_tx(assert_commit_tx: &Transaction) -> Vec<RawWitness> {
+    let mut assert_commit_witness = Vec::new();
+    for input in assert_commit_tx.input.iter() {
+        // remove script and control block from witness
+        let witness = remove_script_and_control_block_from_witness(input.witness.to_vec());
+        assert_commit_witness.push(witness);
+    }
+
+    assert_commit_witness
+}
diff --git a/bridge/src/connectors/connector_d.rs b/bridge/src/connectors/connector_d.rs
new file mode 100644
index 000000000..f263c4ee7
--- /dev/null
+++ b/bridge/src/connectors/connector_d.rs
@@ -0,0 +1,63 @@
+use bitcoin::{
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
+};
+use secp256k1::SECP256K1;
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{scripts::*, transactions::base::Input},
+    base::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct ConnectorD {
+    pub network: Network,
+    pub n_of_n_taproot_public_key: XOnlyPublicKey,
+}
+
+impl ConnectorD {
+    pub fn new(network: Network, n_of_n_taproot_public_key: &XOnlyPublicKey) -> Self {
+        ConnectorD {
+            network,
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
+        }
+    }
+
+    fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
+        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) }
+}
+
+impl TaprootConnector for ConnectorD {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_script(),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_tx_in(input),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        TaprootBuilder::new()
+            .add_leaf(0, self.generate_taproot_leaf_0_script())
+            .expect("Unable to add leaf 0")
+            .finalize(SECP256K1, self.n_of_n_taproot_public_key)
+            .expect("Unable to finalize taproot")
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(
+            self.generate_taproot_spend_info().output_key(),
+            self.network,
+        )
+    }
+}
diff --git a/bridge/src/connectors/connector_e.rs b/bridge/src/connectors/connector_e.rs
new file mode 100644
index 000000000..aef87e03d
--- /dev/null
+++ b/bridge/src/connectors/connector_e.rs
@@ -0,0 +1,82 @@
+use super::{super::transactions::base::Input, base::*};
+use crate::commitments::CommitmentMessageId;
+use bitcoin::{
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, PublicKey, ScriptBuf, TxIn,
+};
+use bitcoin_script::script;
+use bitvm::signatures::signing_winternitz::{
+    winternitz_message_checksig_verify, WinternitzPublicKey,
+};
+use secp256k1::SECP256K1;
+use serde::{Deserialize, Serialize};
+use std::collections::BTreeMap;
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct ConnectorE {
+    pub network: Network,
+    pub operator_public_key: PublicKey,
+    pub commitment_public_keys: BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+}
+
+impl ConnectorE {
+    pub fn new(
+        network: Network,
+        operator_public_key: &PublicKey,
+        commitment_public_keys: &BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+    ) -> Self {
+        ConnectorE {
+            network,
+            operator_public_key: *operator_public_key,
+            commitment_public_keys: commitment_public_keys.clone(),
+        }
+    }
+}
+
+impl TaprootConnector for ConnectorE {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        assert_eq!(leaf_index, 0, "Invalid leaf index");
+        let mut script = script! {};
+        for (message, pk) in self.commitment_public_keys.iter().rev() {
+            match message {
+                CommitmentMessageId::Groth16IntermediateValues((_, size)) => {
+                    script = script.push_script(
+                        script! {
+                            {winternitz_message_checksig_verify(pk, *size)}
+                            for _ in 0..*size {
+                                OP_DROP
+                            }
+                            // it's must be exactly one on stack after execution
+                            OP_TRUE
+                        }
+                        .compile(),
+                    );
+                }
+                _ => {
+                    panic!("connector e only reveal intermediate value of groth16")
+                }
+            }
+        }
+        script.compile()
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        assert_eq!(leaf_index, 0, "Invalid leaf index");
+        generate_default_tx_in(input)
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        TaprootBuilder::new()
+            .add_leaf(0, self.generate_taproot_leaf_script(0))
+            .expect("Unable to add leaf 0")
+            .finalize(SECP256K1, self.operator_public_key.into())
+            .expect("Unable to finalize taproot")
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(
+            self.generate_taproot_spend_info().output_key(),
+            self.network,
+        )
+    }
+}
diff --git a/bridge/src/connectors/connector_f_1.rs b/bridge/src/connectors/connector_f_1.rs
new file mode 100644
index 000000000..948608732
--- /dev/null
+++ b/bridge/src/connectors/connector_f_1.rs
@@ -0,0 +1,37 @@
+use bitcoin::{Address, Network, PublicKey, ScriptBuf, TxIn};
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{scripts::*, transactions::base::Input},
+    base::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct ConnectorF1 {
+    pub network: Network,
+    pub operator_public_key: PublicKey,
+}
+
+impl ConnectorF1 {
+    pub fn new(network: Network, operator_public_key: &PublicKey) -> Self {
+        ConnectorF1 {
+            network,
+            operator_public_key: *operator_public_key,
+        }
+    }
+}
+
+impl P2wshConnector for ConnectorF1 {
+    fn generate_script(&self) -> ScriptBuf {
+        generate_pay_to_pubkey_script(&self.operator_public_key)
+    }
+
+    fn generate_address(&self) -> Address {
+        Address::p2wsh(
+            &generate_pay_to_pubkey_script(&self.operator_public_key),
+            self.network,
+        )
+    }
+
+    fn generate_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+}
diff --git a/bridge/src/connectors/connector_f_2.rs b/bridge/src/connectors/connector_f_2.rs
new file mode 100644
index 000000000..5e9209ba8
--- /dev/null
+++ b/bridge/src/connectors/connector_f_2.rs
@@ -0,0 +1,37 @@
+use bitcoin::{Address, Network, PublicKey, ScriptBuf, TxIn};
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{scripts::*, transactions::base::Input},
+    base::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct ConnectorF2 {
+    pub network: Network,
+    pub operator_public_key: PublicKey,
+}
+
+impl ConnectorF2 {
+    pub fn new(network: Network, operator_public_key: &PublicKey) -> Self {
+        ConnectorF2 {
+            network,
+            operator_public_key: *operator_public_key,
+        }
+    }
+}
+
+impl P2wshConnector for ConnectorF2 {
+    fn generate_script(&self) -> ScriptBuf {
+        generate_pay_to_pubkey_script(&self.operator_public_key)
+    }
+
+    fn generate_address(&self) -> Address {
+        Address::p2wsh(
+            &generate_pay_to_pubkey_script(&self.operator_public_key),
+            self.network,
+        )
+    }
+
+    fn generate_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+}
diff --git a/src/bridge/connectors/connector_z.rs b/bridge/src/connectors/connector_z.rs
similarity index 87%
rename from src/bridge/connectors/connector_z.rs
rename to bridge/src/connectors/connector_z.rs
index c1cd795e6..64412d7fc 100644
--- a/src/bridge/connectors/connector_z.rs
+++ b/bridge/src/connectors/connector_z.rs
@@ -1,17 +1,15 @@
-use crate::{
-    bridge::{constants::NUM_BLOCKS_PER_2_WEEKS, utils::num_blocks_per_network},
-    treepp::*,
-};
+use crate::{constants::NUM_BLOCKS_PER_2_WEEKS, utils::num_blocks_per_network};
 use bitcoin::{
-    key::Secp256k1,
     taproot::{TaprootBuilder, TaprootSpendInfo},
     Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
 };
+use bitvm::treepp::script;
+use secp256k1::SECP256K1;
 use serde::{Deserialize, Serialize};
 
 use super::{
     super::{scripts::*, transactions::base::Input},
-    connector::*,
+    base::*,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -32,8 +30,8 @@ impl ConnectorZ {
     ) -> Self {
         ConnectorZ {
             network,
-            depositor_taproot_public_key: depositor_taproot_public_key.clone(),
-            n_of_n_taproot_public_key: n_of_n_taproot_public_key.clone(),
+            depositor_taproot_public_key: *depositor_taproot_public_key,
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
             evm_address: evm_address.to_string(),
             num_blocks_timelock_0: num_blocks_per_network(network, NUM_BLOCKS_PER_2_WEEKS),
         }
@@ -92,7 +90,7 @@ impl TaprootConnector for ConnectorZ {
             .expect("Unable to add leaf 0")
             .add_leaf(1, self.generate_taproot_leaf_1_script())
             .expect("Unable to add leaf 1")
-            .finalize(&Secp256k1::new(), self.depositor_taproot_public_key) // TODO: should this be depositor or n-of-n
+            .finalize(SECP256K1, self.depositor_taproot_public_key) // TODO: should this be depositor or n-of-n
             .expect("Unable to finalize ttaproot")
     }
 
diff --git a/src/bridge/connectors/mod.rs b/bridge/src/connectors/mod.rs
similarity index 63%
rename from src/bridge/connectors/mod.rs
rename to bridge/src/connectors/mod.rs
index 0dafa4ab1..85043981f 100644
--- a/src/bridge/connectors/mod.rs
+++ b/bridge/src/connectors/mod.rs
@@ -1,11 +1,16 @@
-pub mod connector;
+pub mod base;
 pub mod connector_0;
 pub mod connector_1;
 pub mod connector_2;
 pub mod connector_3;
 pub mod connector_4;
 pub mod connector_5;
+pub mod connector_6;
 pub mod connector_a;
 pub mod connector_b;
 pub mod connector_c;
+pub mod connector_d;
+pub mod connector_e;
+pub mod connector_f_1;
+pub mod connector_f_2;
 pub mod connector_z;
diff --git a/bridge/src/constants.rs b/bridge/src/constants.rs
new file mode 100644
index 000000000..e5769d09d
--- /dev/null
+++ b/bridge/src/constants.rs
@@ -0,0 +1,49 @@
+use core::fmt;
+
+pub const NUM_BLOCKS_PER_HOUR: u32 = 6;
+pub const NUM_BLOCKS_PER_6_HOURS: u32 = NUM_BLOCKS_PER_HOUR * 6;
+
+pub const NUM_BLOCKS_PER_DAY: u32 = NUM_BLOCKS_PER_HOUR * 24;
+pub const NUM_BLOCKS_PER_3_DAYS: u32 = NUM_BLOCKS_PER_DAY * 3;
+
+pub const NUM_BLOCKS_PER_WEEK: u32 = NUM_BLOCKS_PER_DAY * 7;
+pub const NUM_BLOCKS_PER_2_WEEKS: u32 = NUM_BLOCKS_PER_WEEK * 2;
+pub const NUM_BLOCKS_PER_4_WEEKS: u32 = NUM_BLOCKS_PER_WEEK * 4;
+
+pub const N_SEQUENCE_FOR_LOCK_TIME: u32 = 0xFFFFFFFE; // The nSequence field must be set to less than 0xffffffff, usually 0xffffffff-1 to avoid conflicts with relative timelocks.
+
+// /// Commitment message parameters. Hardcoded for 4-bit digits.
+// const ETHEREUM_TXID_LENGTH_IN_DIGITS: usize = 64;
+// const BITCOIN_TXID_LENGTH_IN_DIGITS: usize = 64;
+// pub const SOURCE_NETWORK_TXID_LENGTH_IN_DIGITS: usize = BITCOIN_TXID_LENGTH_IN_DIGITS;
+// pub const DESTINATION_NETWORK_TXID_LENGTH_IN_DIGITS: usize = ETHEREUM_TXID_LENGTH_IN_DIGITS;
+
+// Commitment message parameters. Hardcoded number of bytes per message.
+pub const START_TIME_MESSAGE_LENGTH: usize = 4;
+const ETHEREUM_TXID_LENGTH: usize = 64;
+const BITCOIN_TXID_LENGTH: usize = 64;
+pub const SOURCE_NETWORK_TXID_LENGTH: usize = BITCOIN_TXID_LENGTH;
+pub const DESTINATION_NETWORK_TXID_LENGTH: usize = ETHEREUM_TXID_LENGTH;
+
+#[derive(Eq, PartialEq, Clone, Copy)]
+pub enum DestinationNetwork {
+    /// Mainnet Ethereum.
+    Ethereum,
+    /// Ethereum's testnet network.
+    EthereumSepolia,
+    /// Locally hosted network.
+    Local,
+}
+
+impl fmt::Display for DestinationNetwork {
+    fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
+        use DestinationNetwork::*;
+
+        let s = match *self {
+            Ethereum => "ethereum",
+            EthereumSepolia => "ethereum_sepolia",
+            Local => "anvil_831337",
+        };
+        write!(f, "{}", s)
+    }
+}
diff --git a/src/bridge/contexts/base.rs b/bridge/src/contexts/base.rs
similarity index 58%
rename from src/bridge/contexts/base.rs
rename to bridge/src/contexts/base.rs
index c25c2bb82..de9c7bd7c 100644
--- a/src/bridge/contexts/base.rs
+++ b/bridge/src/contexts/base.rs
@@ -1,33 +1,26 @@
 use bitcoin::{
-    key::{Keypair, Secp256k1},
-    secp256k1::{All, PublicKey as Secp256k1PublicKey},
-    Network, PrivateKey, PublicKey, XOnlyPublicKey,
+    key::Keypair, secp256k1::PublicKey as Secp256k1PublicKey, Network, PrivateKey, PublicKey,
+    XOnlyPublicKey,
 };
 use musig2::{secp::Point, KeyAggContext};
+use secp256k1::SECP256K1;
 
 pub trait BaseContext {
     fn network(&self) -> Network;
-    fn secp(&self) -> &Secp256k1<All>;
     fn n_of_n_public_keys(&self) -> &Vec<PublicKey>;
     fn n_of_n_public_key(&self) -> &PublicKey;
     fn n_of_n_taproot_public_key(&self) -> &XOnlyPublicKey;
 }
 
-pub fn generate_keys_from_secret(
-    network: Network,
-    secret: &str,
-) -> (Secp256k1<All>, Keypair, PublicKey) {
-    let secp = Secp256k1::new();
-    let keypair = Keypair::from_seckey_str(&secp, secret).unwrap();
+pub fn generate_keys_from_secret(network: Network, secret: &str) -> (Keypair, PublicKey) {
+    let keypair = Keypair::from_seckey_str_global(secret).unwrap();
     let private_key = PrivateKey::new(keypair.secret_key(), network);
-    let public_key = PublicKey::from_private_key(&secp, &private_key);
+    let public_key = PublicKey::from_private_key(SECP256K1, &private_key);
 
-    (secp, keypair, public_key)
+    (keypair, public_key)
 }
 
-pub fn generate_n_of_n_public_key(
-    n_of_n_public_keys: &Vec<PublicKey>,
-) -> (PublicKey, XOnlyPublicKey) {
+pub fn generate_n_of_n_public_key(n_of_n_public_keys: &[PublicKey]) -> (PublicKey, XOnlyPublicKey) {
     let public_keys: Vec<Point> = n_of_n_public_keys
         .iter()
         .map(|&public_key| public_key.inner.into())
diff --git a/src/bridge/contexts/depositor.rs b/bridge/src/contexts/depositor.rs
similarity index 70%
rename from src/bridge/contexts/depositor.rs
rename to bridge/src/contexts/depositor.rs
index a2d2c41c6..5a8910559 100644
--- a/src/bridge/contexts/depositor.rs
+++ b/bridge/src/contexts/depositor.rs
@@ -1,14 +1,9 @@
-use bitcoin::{
-    key::{Keypair, Secp256k1},
-    secp256k1::All,
-    Network, PublicKey, XOnlyPublicKey,
-};
+use bitcoin::{key::Keypair, Network, PublicKey, XOnlyPublicKey};
 
 use super::base::{generate_keys_from_secret, generate_n_of_n_public_key, BaseContext};
 
 pub struct DepositorContext {
     pub network: Network,
-    pub secp: Secp256k1<All>,
 
     pub depositor_keypair: Keypair,
     pub depositor_public_key: PublicKey,
@@ -21,31 +16,25 @@ pub struct DepositorContext {
 
 impl BaseContext for DepositorContext {
     fn network(&self) -> Network { self.network }
-    fn secp(&self) -> &Secp256k1<All> { &self.secp }
     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 {
-    pub fn new(
-        network: Network,
-        depositor_secret: &str,
-        n_of_n_public_keys: &Vec<PublicKey>,
-    ) -> Self {
-        let (secp, keypair, public_key) = generate_keys_from_secret(network, depositor_secret);
+    pub fn new(network: Network, depositor_secret: &str, n_of_n_public_keys: &[PublicKey]) -> Self {
+        let (keypair, public_key) = generate_keys_from_secret(network, depositor_secret);
         let (n_of_n_public_key, n_of_n_taproot_public_key) =
             generate_n_of_n_public_key(n_of_n_public_keys);
 
         DepositorContext {
             network,
-            secp,
 
             depositor_keypair: keypair,
             depositor_public_key: public_key,
             depositor_taproot_public_key: XOnlyPublicKey::from(public_key),
 
-            n_of_n_public_keys: n_of_n_public_keys.clone(),
+            n_of_n_public_keys: n_of_n_public_keys.to_owned(),
             n_of_n_public_key,
             n_of_n_taproot_public_key,
         }
diff --git a/src/bridge/contexts/mod.rs b/bridge/src/contexts/mod.rs
similarity index 100%
rename from src/bridge/contexts/mod.rs
rename to bridge/src/contexts/mod.rs
diff --git a/src/bridge/contexts/operator.rs b/bridge/src/contexts/operator.rs
similarity index 70%
rename from src/bridge/contexts/operator.rs
rename to bridge/src/contexts/operator.rs
index c0e8dd4e0..d26bb44aa 100644
--- a/src/bridge/contexts/operator.rs
+++ b/bridge/src/contexts/operator.rs
@@ -1,14 +1,9 @@
-use bitcoin::{
-    key::{Keypair, Secp256k1},
-    secp256k1::All,
-    Network, PublicKey, XOnlyPublicKey,
-};
+use bitcoin::{key::Keypair, Network, PublicKey, XOnlyPublicKey};
 
 use super::base::{generate_keys_from_secret, generate_n_of_n_public_key, BaseContext};
 
 pub struct OperatorContext {
     pub network: Network,
-    pub secp: Secp256k1<All>,
 
     pub operator_keypair: Keypair,
     pub operator_public_key: PublicKey,
@@ -21,31 +16,25 @@ pub struct OperatorContext {
 
 impl BaseContext for OperatorContext {
     fn network(&self) -> Network { self.network }
-    fn secp(&self) -> &Secp256k1<All> { &self.secp }
     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 {
-    pub fn new(
-        network: Network,
-        operator_secret: &str,
-        n_of_n_public_keys: &Vec<PublicKey>,
-    ) -> Self {
-        let (secp, keypair, public_key) = generate_keys_from_secret(network, operator_secret);
+    pub fn new(network: Network, operator_secret: &str, n_of_n_public_keys: &[PublicKey]) -> Self {
+        let (keypair, public_key) = generate_keys_from_secret(network, operator_secret);
         let (n_of_n_public_key, n_of_n_taproot_public_key) =
             generate_n_of_n_public_key(n_of_n_public_keys);
 
         OperatorContext {
             network,
-            secp,
 
             operator_keypair: keypair,
             operator_public_key: public_key,
             operator_taproot_public_key: XOnlyPublicKey::from(public_key),
 
-            n_of_n_public_keys: n_of_n_public_keys.clone(),
+            n_of_n_public_keys: n_of_n_public_keys.to_owned(),
             n_of_n_public_key,
             n_of_n_taproot_public_key,
         }
diff --git a/src/bridge/contexts/verifier.rs b/bridge/src/contexts/verifier.rs
similarity index 68%
rename from src/bridge/contexts/verifier.rs
rename to bridge/src/contexts/verifier.rs
index 46bcc297c..77f9bc706 100644
--- a/src/bridge/contexts/verifier.rs
+++ b/bridge/src/contexts/verifier.rs
@@ -1,14 +1,9 @@
-use bitcoin::{
-    key::{Keypair, Secp256k1},
-    secp256k1::All,
-    Network, PublicKey, XOnlyPublicKey,
-};
+use bitcoin::{key::Keypair, Network, PublicKey, XOnlyPublicKey};
 
 use super::base::{generate_keys_from_secret, generate_n_of_n_public_key, BaseContext};
 
 pub struct VerifierContext {
     pub network: Network,
-    pub secp: Secp256k1<All>,
 
     pub verifier_keypair: Keypair,
     pub verifier_public_key: PublicKey,
@@ -20,30 +15,24 @@ pub struct VerifierContext {
 
 impl BaseContext for VerifierContext {
     fn network(&self) -> Network { self.network }
-    fn secp(&self) -> &Secp256k1<All> { &self.secp }
     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 {
-    pub fn new(
-        network: Network,
-        verifier_secret: &str,
-        n_of_n_public_keys: &Vec<PublicKey>,
-    ) -> Self {
-        let (secp, keypair, public_key) = generate_keys_from_secret(network, verifier_secret);
+    pub fn new(network: Network, verifier_secret: &str, n_of_n_public_keys: &[PublicKey]) -> Self {
+        let (keypair, public_key) = generate_keys_from_secret(network, verifier_secret);
         let (n_of_n_public_key, n_of_n_taproot_public_key) =
             generate_n_of_n_public_key(n_of_n_public_keys);
 
         VerifierContext {
             network,
-            secp,
 
             verifier_keypair: keypair,
             verifier_public_key: public_key,
 
-            n_of_n_public_keys: n_of_n_public_keys.clone(),
+            n_of_n_public_keys: n_of_n_public_keys.to_owned(),
             n_of_n_public_key,
             n_of_n_taproot_public_key,
         }
diff --git a/src/bridge/contexts/withdrawer.rs b/bridge/src/contexts/withdrawer.rs
similarity index 75%
rename from src/bridge/contexts/withdrawer.rs
rename to bridge/src/contexts/withdrawer.rs
index dd38abba3..34a7125f4 100644
--- a/src/bridge/contexts/withdrawer.rs
+++ b/bridge/src/contexts/withdrawer.rs
@@ -1,14 +1,9 @@
-use bitcoin::{
-    key::{Keypair, Secp256k1},
-    secp256k1::All,
-    Network, PublicKey, XOnlyPublicKey,
-};
+use bitcoin::{key::Keypair, Network, PublicKey, XOnlyPublicKey};
 
 use super::base::{generate_keys_from_secret, generate_n_of_n_public_key, BaseContext};
 
 pub struct WithdrawerContext {
     pub network: Network,
-    pub secp: Secp256k1<All>,
 
     pub withdrawer_keypair: Keypair,
     pub withdrawer_public_key: PublicKey,
@@ -21,7 +16,6 @@ pub struct WithdrawerContext {
 
 impl BaseContext for WithdrawerContext {
     fn network(&self) -> Network { self.network }
-    fn secp(&self) -> &Secp256k1<All> { &self.secp }
     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 }
@@ -31,21 +25,20 @@ impl WithdrawerContext {
     pub fn new(
         network: Network,
         withdrawer_secret: &str,
-        n_of_n_public_keys: &Vec<PublicKey>,
+        n_of_n_public_keys: &[PublicKey],
     ) -> Self {
-        let (secp, keypair, public_key) = generate_keys_from_secret(network, withdrawer_secret);
+        let (keypair, public_key) = generate_keys_from_secret(network, withdrawer_secret);
         let (n_of_n_public_key, n_of_n_taproot_public_key) =
             generate_n_of_n_public_key(n_of_n_public_keys);
 
         WithdrawerContext {
             network,
-            secp,
 
             withdrawer_keypair: keypair,
             withdrawer_public_key: public_key,
             withdrawer_taproot_public_key: XOnlyPublicKey::from(public_key),
 
-            n_of_n_public_keys: n_of_n_public_keys.clone(),
+            n_of_n_public_keys: n_of_n_public_keys.to_owned(),
             n_of_n_public_key,
             n_of_n_taproot_public_key,
         }
diff --git a/bridge/src/error.rs b/bridge/src/error.rs
new file mode 100644
index 000000000..933d507ca
--- /dev/null
+++ b/bridge/src/error.rs
@@ -0,0 +1,77 @@
+use super::commitments::CommitmentMessageId;
+use super::graphs::base::GraphId;
+use super::transactions::{base::BaseTransaction, pre_signed::PreSignedTransaction};
+use bitcoin::Txid;
+use std::fmt::{self, Display};
+use strum::Display;
+
+#[derive(Debug)]
+pub enum ClientError {
+    NoUserContextDefined,
+    OperatorContextNotDefined,
+    ZkProofVerifyingKeyNotDefined,
+    PegInGraphNotFound(GraphId),
+    PegOutGraphNotFound(GraphId),
+}
+
+#[derive(Debug)]
+pub struct NamedTx {
+    pub txid: Txid,
+    pub name: &'static str,
+    pub confirmed: bool,
+}
+
+impl NamedTx {
+    pub fn for_tx(tx: &(impl BaseTransaction + PreSignedTransaction), confirmed: bool) -> Self {
+        Self {
+            txid: tx.tx().compute_txid(),
+            name: tx.name(),
+            confirmed,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum GraphError {
+    PrecedingTxNotCreated(&'static str),
+    PrecedingTxNotConfirmed(Vec<NamedTx>),
+    PrecedingTxTimelockNotMet(NamedTx),
+    WitnessNotGenerated(CommitmentMessageId),
+}
+
+#[derive(Debug, Display)]
+pub enum ConnectorError {
+    ConnectorCCommitsPublicKeyEmpty,
+}
+
+#[derive(Debug)]
+pub enum TransactionError {
+    AlreadyMined(Txid),
+}
+
+#[derive(Debug)]
+pub enum L2Error {
+    PegOutNotInitiated,
+}
+
+#[derive(Debug)]
+pub enum ChunkerError {
+    ValidProof,
+}
+
+#[derive(Debug)]
+pub enum Error {
+    Esplora(esplora_client::Error),
+    Client(ClientError),
+    Graph(GraphError),
+    Transaction(TransactionError),
+    L2(L2Error),
+    Chunker(ChunkerError),
+    Other(&'static str),
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{:?}", self) }
+}
+
+pub fn err_to_string(err: impl Display) -> String { err.to_string() }
diff --git a/bridge/src/graphs/base.rs b/bridge/src/graphs/base.rs
new file mode 100644
index 000000000..c7d02429a
--- /dev/null
+++ b/bridge/src/graphs/base.rs
@@ -0,0 +1,117 @@
+use std::collections::HashMap;
+
+use bitcoin::{
+    policy::{DEFAULT_MIN_RELAY_TX_FEE, DUST_RELAY_TX_FEE},
+    Network, Transaction, Txid,
+};
+use esplora_client::{AsyncClient, TxStatus};
+use futures::future::join_all;
+use musig2::SecNonce;
+
+use crate::{
+    contexts::verifier::VerifierContext,
+    error::{Error, TransactionError},
+    transactions::base::{
+        MIN_RELAY_FEE_ASSERT_COMMIT1, MIN_RELAY_FEE_ASSERT_COMMIT2, MIN_RELAY_FEE_ASSERT_FINAL,
+        MIN_RELAY_FEE_ASSERT_INITIAL, MIN_RELAY_FEE_DISPROVE, MIN_RELAY_FEE_KICK_OFF_1,
+        MIN_RELAY_FEE_KICK_OFF_2, MIN_RELAY_FEE_PEG_IN_CONFIRM, MIN_RELAY_FEE_PEG_IN_DEPOSIT,
+        MIN_RELAY_FEE_PEG_IN_REFUND, MIN_RELAY_FEE_PEG_OUT_CONFIRM, MIN_RELAY_FEE_START_TIME,
+    },
+};
+
+pub const NUM_REQUIRED_OPERATORS: usize = 1;
+
+pub const GRAPH_VERSION: &str = "0.1";
+
+//1 btc
+pub const CROWDFUNDING_AMOUNT: f64 = 1.0;
+// 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;
+
+// set reward percentage as 2% of peg in deposit
+pub const REWARD_PRECISION: u64 = 1000;
+pub const REWARD_MULTIPLIER: u64 = 20;
+
+pub const MIN_RELAY_FEE_ASSERT_SET: u64 = MIN_RELAY_FEE_ASSERT_INITIAL
+    + MIN_RELAY_FEE_ASSERT_COMMIT1
+    + MIN_RELAY_FEE_ASSERT_COMMIT2
+    + MIN_RELAY_FEE_ASSERT_FINAL;
+// use largest fee from each depth
+// assert fee is big enough to cover disprove chain or take 1
+// disprove fee is big enough to cover take 2
+pub const PEG_OUT_FEE: u64 = MIN_RELAY_FEE_PEG_OUT_CONFIRM // depth 0
+    + MIN_RELAY_FEE_KICK_OFF_1 // depth 1
+    + MIN_RELAY_FEE_START_TIME // include START_TIME tx, spent in kickoff 1
+    + MIN_RELAY_FEE_KICK_OFF_2 // depth 2
+    + MIN_RELAY_FEE_ASSERT_SET // depth 3
+    + MIN_RELAY_FEE_DISPROVE; // depth 4
+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 type GraphId = String;
+
+pub trait BaseGraph {
+    fn network(&self) -> Network;
+    fn id(&self) -> &String;
+    fn push_verifier_nonces(
+        &mut self,
+        verifier_context: &VerifierContext,
+    ) -> HashMap<Txid, HashMap<usize, SecNonce>>;
+    fn verifier_sign(
+        &mut self,
+        verifier_context: &VerifierContext,
+        secret_nonces: &HashMap<Txid, HashMap<usize, SecNonce>>,
+    );
+}
+
+pub const fn max(a: u64, b: u64) -> u64 { [a, b][(a < b) as usize] }
+
+pub async fn get_block_height(client: &AsyncClient) -> Result<u32, Error> {
+    match client.get_height().await {
+        Ok(height) => Ok(height),
+        Err(e) => Err(Error::Esplora(e)),
+    }
+}
+
+pub async fn verify_if_not_mined(client: &AsyncClient, txid: Txid) -> Result<(), Error> {
+    match is_confirmed(client, txid).await {
+        Ok(false) => Ok(()),
+        Ok(true) => Err(Error::Transaction(TransactionError::AlreadyMined(txid))),
+        Err(e) => Err(Error::Esplora(e)),
+    }
+}
+
+pub async fn is_confirmed(client: &AsyncClient, txid: Txid) -> Result<bool, esplora_client::Error> {
+    let tx_status = client.get_tx_status(&txid).await;
+    tx_status.map(|x| x.confirmed)
+}
+
+pub async fn broadcast_and_verify(
+    client: &AsyncClient,
+    transaction: &Transaction,
+) -> Result<&'static str, Error> {
+    let txid = transaction.compute_txid();
+
+    if let Ok(Some(_)) = client.get_tx(&txid).await {
+        return Ok("Tx already broadcasted.");
+    }
+
+    let tx_result = client.broadcast(transaction).await;
+
+    match (tx_result, is_confirmed(client, txid).await) {
+        (Ok(_), Ok(false)) | (Ok(_), Err(_)) => Ok("Tx broadcasted successfully."),
+        (Ok(_), Ok(true)) | (Err(_), Ok(true)) => Ok("Tx mined successfully."),
+        (Err(e), _) => Err(Error::Esplora(e)),
+    }
+}
+
+pub async fn get_tx_statuses(
+    client: &AsyncClient,
+    txids: &[Txid],
+) -> Vec<Result<TxStatus, esplora_client::Error>> {
+    join_all(txids.iter().map(|txid| client.get_tx_status(txid))).await
+}
diff --git a/src/bridge/graphs/mod.rs b/bridge/src/graphs/mod.rs
similarity index 100%
rename from src/bridge/graphs/mod.rs
rename to bridge/src/graphs/mod.rs
diff --git a/bridge/src/graphs/peg_in.rs b/bridge/src/graphs/peg_in.rs
new file mode 100644
index 000000000..f71ab4ebe
--- /dev/null
+++ b/bridge/src/graphs/peg_in.rs
@@ -0,0 +1,732 @@
+use bitcoin::{
+    hex::{Case::Upper, DisplayHex},
+    Network, OutPoint, PublicKey, Transaction, Txid, XOnlyPublicKey,
+};
+use esplora_client::{AsyncClient, TxStatus};
+use itertools::Itertools;
+use musig2::SecNonce;
+use num_traits::ToPrimitive;
+use serde::{Deserialize, Serialize};
+use sha2::{Digest, Sha256};
+use std::{
+    collections::HashMap,
+    fmt::{Display, Formatter, Result as FmtResult},
+};
+
+use crate::{
+    client::sdk::{
+        query::GraphCliQuery, query_contexts::depositor_signatures::DepositorSignatures,
+    },
+    error::{Error, GraphError, NamedTx},
+    transactions::pre_signed_musig2::PreSignedMusig2Transaction,
+};
+
+use super::{
+    super::{
+        connectors::{connector_0::Connector0, connector_z::ConnectorZ},
+        contexts::{depositor::DepositorContext, verifier::VerifierContext},
+        transactions::{
+            base::{validate_transaction, verify_public_nonces_for_tx, BaseTransaction, Input},
+            peg_in_confirm::PegInConfirmTransaction,
+            peg_in_deposit::PegInDepositTransaction,
+            peg_in_refund::PegInRefundTransaction,
+            pre_signed::PreSignedTransaction,
+        },
+    },
+    base::{
+        get_tx_statuses, verify_if_not_mined, BaseGraph, GraphId, GRAPH_VERSION,
+        NUM_REQUIRED_OPERATORS,
+    },
+    peg_out::{PegOutGraph, PegOutId},
+};
+
+pub enum PegInDepositorStatus {
+    PegInDepositWait,     // peg-in deposit not yet confirmed
+    PegInConfirmWait, // peg-in confirm not yet confirmed, wait for operator to complete peg-in, refund not available yet
+    PegInConfirmComplete, // peg-in complete
+    PegInRefundAvailable, // peg-in refund available
+    PegInRefundComplete, // peg-in failed, refund complete
+}
+
+impl Display for PegInDepositorStatus {
+    fn fmt(&self, f: &mut Formatter) -> FmtResult {
+        match self {
+            PegInDepositorStatus::PegInDepositWait => {
+                write!(f, "Peg-in deposit transaction not confirmed yet. Wait...")
+            }
+            PegInDepositorStatus::PegInConfirmWait => {
+                write!(f, "Peg-in confirm transaction not confirmed yet. Wait...")
+            }
+            PegInDepositorStatus::PegInConfirmComplete => {
+                write!(f, "Peg-in complete. Done.")
+            }
+            PegInDepositorStatus::PegInRefundAvailable => {
+                write!(f, "Peg-in timed out. Broadcast refund transaction?")
+            }
+            PegInDepositorStatus::PegInRefundComplete => {
+                write!(f, "Peg-in refund complete, funds reclaimed. Done.")
+            }
+        }
+    }
+}
+
+#[derive(Debug, PartialEq)]
+pub enum PegInVerifierStatus {
+    AwaitingDeposit,                   // no action required, wait
+    AwaitingPegOutCreation,            // need operator(s) to come online to create peg-out grah
+    PendingOurNonces(Vec<GraphId>),    // the given verifier needs to submit nonces
+    AwaitingNonces, // the given verifier submitted nonces, awaiting other verifier's nonces
+    PendingOurSignature(Vec<GraphId>), // the given verifier needs to submit signature
+    AwaitingSignatures, // the given verifier submitted signatures, awaiting other verifier's signatures
+    ReadyToSubmit,      // all signatures collected, can now submit
+    Complete,           // peg-in complete
+}
+
+impl Display for PegInVerifierStatus {
+    fn fmt(&self, f: &mut Formatter) -> FmtResult {
+        match self {
+            PegInVerifierStatus::AwaitingDeposit => {
+                write!(f, "Peg-in deposit transaction not confirmed yet. Wait...")
+            }
+            PegInVerifierStatus::AwaitingPegOutCreation => {
+                write!(f, "No peg-out graph available yet. Wait...")
+            }
+            PegInVerifierStatus::ReadyToSubmit => {
+                write!(
+                    f,
+                    "Peg-in confirm transaction pre-signed. Broadcast confirm transaction?"
+                )
+            }
+            PegInVerifierStatus::PendingOurNonces(_) => {
+                write!(f, "Nonce required. Share nonce?")
+            }
+            PegInVerifierStatus::AwaitingNonces => {
+                write!(f, "Awaiting nonces. Wait...")
+            }
+            PegInVerifierStatus::PendingOurSignature(_) => {
+                write!(f, "Signature required. Pre-sign transactions?")
+            }
+            PegInVerifierStatus::AwaitingSignatures => {
+                write!(f, "Awaiting peg-in confirm signatures. Wait...")
+            }
+            PegInVerifierStatus::Complete => write!(f, "Peg-in done."),
+        }
+    }
+}
+
+pub enum PegInOperatorStatus {
+    PegInWait,             // peg-in not yet complete, no action required yet, wait
+    PegInConfirmAvailable, // should execute peg-in confirm
+    PegInComplete,         // peg-in complete
+}
+
+impl Display for PegInOperatorStatus {
+    fn fmt(&self, f: &mut Formatter) -> FmtResult {
+        match self {
+            PegInOperatorStatus::PegInWait => {
+                write!(f, "No action available. Wait...")
+            }
+            PegInOperatorStatus::PegInConfirmAvailable => {
+                write!(
+                    f,
+                    "Peg-in confirm transaction ready. Broadcast peg-in confirm transaction?"
+                )
+            }
+            PegInOperatorStatus::PegInComplete => write!(f, "Peg-in complete. Done."),
+        }
+    }
+}
+
+struct PegInConnectors {
+    connector_0: Connector0,
+    connector_z: ConnectorZ,
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct PegInGraph {
+    version: String,
+    network: Network,
+    id: String,
+
+    pub peg_in_deposit_transaction: PegInDepositTransaction,
+    pub peg_in_refund_transaction: PegInRefundTransaction,
+    pub peg_in_confirm_transaction: PegInConfirmTransaction,
+
+    n_of_n_public_key: PublicKey,
+    n_of_n_public_keys: Vec<PublicKey>,
+    n_of_n_taproot_public_key: XOnlyPublicKey,
+
+    pub depositor_public_key: PublicKey,
+    depositor_taproot_public_key: XOnlyPublicKey,
+    pub depositor_evm_address: String,
+
+    connector_0: Connector0,
+    connector_z: ConnectorZ,
+
+    pub peg_out_graphs: Vec<PegOutId>,
+}
+
+impl BaseGraph for PegInGraph {
+    fn network(&self) -> Network { self.network }
+
+    fn id(&self) -> &String { &self.id }
+
+    fn verifier_sign(
+        &mut self,
+        verifier_context: &VerifierContext,
+        secret_nonces: &HashMap<Txid, HashMap<usize, SecNonce>>,
+    ) {
+        self.peg_in_confirm_transaction.pre_sign(
+            verifier_context,
+            &self.connector_z,
+            &secret_nonces[&self.peg_in_confirm_transaction.tx().compute_txid()],
+        );
+    }
+
+    fn push_verifier_nonces(
+        &mut self,
+        verifier_context: &VerifierContext,
+    ) -> HashMap<Txid, HashMap<usize, SecNonce>> {
+        [(
+            self.peg_in_confirm_transaction.tx().compute_txid(),
+            self.peg_in_confirm_transaction
+                .push_nonces(verifier_context),
+        )]
+        .into()
+    }
+}
+
+impl PegInGraph {
+    pub fn new(context: &DepositorContext, deposit_input: Input, evm_address: &str) -> Self {
+        let connectors = create_new_connectors(
+            context.network,
+            &context.n_of_n_taproot_public_key,
+            &context.depositor_taproot_public_key,
+            evm_address,
+        );
+
+        let peg_in_deposit_transaction =
+            PegInDepositTransaction::new(context, &connectors.connector_z, deposit_input);
+
+        let peg_in_refund_vout_0: usize = 0;
+        let peg_in_refund_transaction = PegInRefundTransaction::new(
+            context,
+            &connectors.connector_z,
+            generate_input(peg_in_deposit_transaction.tx(), peg_in_refund_vout_0),
+        );
+
+        let peg_in_confirm_vout_0: usize = 0;
+        let peg_in_confirm_transaction = PegInConfirmTransaction::new(
+            context,
+            &connectors.connector_0,
+            &connectors.connector_z,
+            generate_input(peg_in_deposit_transaction.tx(), peg_in_confirm_vout_0),
+        );
+
+        PegInGraph {
+            version: GRAPH_VERSION.to_string(),
+            network: context.network,
+            id: generate_id(&peg_in_deposit_transaction),
+            peg_in_deposit_transaction,
+            peg_in_refund_transaction,
+            peg_in_confirm_transaction,
+            n_of_n_public_key: context.n_of_n_public_key,
+            n_of_n_public_keys: context.n_of_n_public_keys.clone(),
+            n_of_n_taproot_public_key: context.n_of_n_taproot_public_key,
+            depositor_public_key: context.depositor_public_key,
+            depositor_taproot_public_key: context.depositor_taproot_public_key,
+            depositor_evm_address: evm_address.to_string(),
+            connector_0: connectors.connector_0,
+            connector_z: connectors.connector_z,
+            peg_out_graphs: Vec::new(),
+        }
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn new_for_query(
+        network: Network,
+        depositor_public_key: &PublicKey,
+        depositor_taproot_public_key: &XOnlyPublicKey,
+        n_of_n_public_key: &PublicKey,
+        n_of_n_public_keys: &[PublicKey],
+        n_of_n_taproot_public_key: &XOnlyPublicKey,
+        depositor_evm_address: &str,
+        deposit_input: Input,
+    ) -> Self {
+        create_graph_without_signing(
+            network,
+            depositor_public_key,
+            depositor_taproot_public_key,
+            n_of_n_public_key,
+            n_of_n_public_keys,
+            n_of_n_taproot_public_key,
+            depositor_evm_address,
+            deposit_input,
+        )
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn new_with_depositor_signatures(
+        network: Network,
+        depositor_public_key: &PublicKey,
+        depositor_taproot_public_key: &XOnlyPublicKey,
+        n_of_n_public_key: &PublicKey,
+        n_of_n_public_keys: &[PublicKey],
+        n_of_n_taproot_public_key: &XOnlyPublicKey,
+        depositor_evm_address: &str,
+        deposit_input: Input,
+        signatures: &DepositorSignatures,
+    ) -> Self {
+        let connectors = create_new_connectors(
+            network,
+            n_of_n_taproot_public_key,
+            depositor_taproot_public_key,
+            depositor_evm_address,
+        );
+
+        let peg_in_deposit_transaction = PegInDepositTransaction::new_with_signature(
+            network,
+            depositor_public_key,
+            &connectors.connector_z,
+            deposit_input,
+            signatures.deposit,
+        );
+
+        let peg_in_refund_vout_0: usize = 0;
+        let peg_in_refund_transaction = PegInRefundTransaction::new_with_signature(
+            network,
+            depositor_public_key,
+            &connectors.connector_z,
+            generate_input(peg_in_deposit_transaction.tx(), peg_in_refund_vout_0),
+            signatures.refund,
+        );
+
+        let peg_in_confirm_vout_0: usize = 0;
+        let peg_in_confirm_transaction = PegInConfirmTransaction::new_with_depositor_signature(
+            &connectors.connector_0,
+            &connectors.connector_z,
+            generate_input(peg_in_deposit_transaction.tx(), peg_in_confirm_vout_0),
+            n_of_n_public_keys,
+            signatures.confirm,
+        );
+
+        PegInGraph {
+            version: GRAPH_VERSION.to_string(),
+            network,
+            id: generate_id(&peg_in_deposit_transaction),
+            peg_in_deposit_transaction,
+            peg_in_refund_transaction,
+            peg_in_confirm_transaction,
+            n_of_n_public_key: *n_of_n_public_key,
+            n_of_n_public_keys: n_of_n_public_keys.to_owned(),
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
+            depositor_public_key: *depositor_public_key,
+            depositor_taproot_public_key: *depositor_taproot_public_key,
+            depositor_evm_address: depositor_evm_address.to_string(),
+            connector_0: connectors.connector_0,
+            connector_z: connectors.connector_z,
+            peg_out_graphs: Vec::new(),
+        }
+    }
+
+    pub fn new_for_validation(&self) -> Self {
+        create_graph_without_signing(
+            self.network,
+            &self.depositor_public_key,
+            &self.depositor_taproot_public_key,
+            &self.n_of_n_public_key,
+            &self.n_of_n_public_keys,
+            &self.n_of_n_taproot_public_key,
+            &self.depositor_evm_address,
+            Input {
+                outpoint: self.peg_in_deposit_transaction.tx().input[0].previous_output, // Self-referencing
+                amount: self.peg_in_deposit_transaction.prev_outs()[0].value, // Self-referencing
+            },
+        )
+    }
+
+    pub fn peg_in_confirm_transaction_ref(&self) -> &PegInConfirmTransaction {
+        &self.peg_in_confirm_transaction
+    }
+
+    pub async fn verifier_status(
+        &self,
+        client: &AsyncClient,
+        verifier_context: &VerifierContext,
+        peg_outs: &[&PegOutGraph],
+    ) -> PegInVerifierStatus {
+        // check that the supplied peg out graphs match our expectation
+        let supplied_peg_out_ids = peg_outs.iter().map(|x| x.id()).sorted().collect::<Vec<_>>();
+        let expected_peg_out_ids = self.peg_out_graphs.iter().sorted().collect::<Vec<_>>();
+        if supplied_peg_out_ids != expected_peg_out_ids {
+            panic!("Invalid peg outs supplied as argument");
+        }
+
+        let (peg_in_deposit_status, peg_in_confirm_status, _) =
+            Self::get_peg_in_statuses(self, client).await;
+
+        if !peg_in_deposit_status.is_ok_and(|status| status.confirmed) {
+            // peg-in deposit not confirmed yet, wait
+            return PegInVerifierStatus::AwaitingDeposit;
+        }
+
+        if peg_outs.len() < NUM_REQUIRED_OPERATORS {
+            return PegInVerifierStatus::AwaitingPegOutCreation;
+        }
+
+        if peg_in_confirm_status.is_ok_and(|status| status.confirmed) {
+            // peg in complete
+            return PegInVerifierStatus::Complete;
+        }
+
+        if !self
+            .peg_in_confirm_transaction
+            .has_nonce_of(verifier_context)
+        {
+            return PegInVerifierStatus::PendingOurNonces(vec![self.id.clone()]);
+        }
+
+        let has_all_pegin_nonces = self.peg_in_confirm_transaction.has_all_nonces();
+        if !has_all_pegin_nonces {
+            return PegInVerifierStatus::AwaitingNonces;
+        }
+
+        if !self
+            .peg_in_confirm_transaction
+            .has_signatures_for(verifier_context.verifier_public_key)
+        {
+            return PegInVerifierStatus::PendingOurSignature(vec![self.id.clone()]);
+        }
+
+        let has_all_pegin_signatures = self.peg_in_confirm_transaction.has_all_signatures();
+        if !has_all_pegin_signatures {
+            return PegInVerifierStatus::AwaitingSignatures;
+        }
+
+        // we have all signature, but confirm wasn't included in a block yet
+        PegInVerifierStatus::ReadyToSubmit
+    }
+
+    pub async fn operator_status(&self, client: &AsyncClient) -> PegInOperatorStatus {
+        let (peg_in_deposit_status, peg_in_confirm_status, _) =
+            Self::get_peg_in_statuses(self, client).await;
+
+        if peg_in_deposit_status.is_ok_and(|status| status.confirmed) {
+            if peg_in_confirm_status.is_ok_and(|status| status.confirmed) {
+                // peg in complete
+                PegInOperatorStatus::PegInComplete
+            } else if self.peg_in_confirm_transaction.has_all_signatures() {
+                // should execute peg-in confirm
+                PegInOperatorStatus::PegInConfirmAvailable
+            } else {
+                // peg-in confirm not yet presigned, wait
+                PegInOperatorStatus::PegInWait
+            }
+        } else {
+            // peg-in deposit not confirmed yet, wait
+            PegInOperatorStatus::PegInWait
+        }
+    }
+
+    pub fn interpret_depositor_status(
+        &self,
+        peg_in_deposit_status: &Result<TxStatus, esplora_client::Error>,
+        peg_in_confirm_status: &Result<TxStatus, esplora_client::Error>,
+        peg_in_refund_status: &Result<TxStatus, esplora_client::Error>,
+        blockchain_height: Result<u32, esplora_client::Error>,
+    ) -> PegInDepositorStatus {
+        if peg_in_deposit_status
+            .as_ref()
+            .is_ok_and(|status| status.confirmed)
+        {
+            if peg_in_confirm_status
+                .as_ref()
+                .is_ok_and(|status| status.confirmed)
+            {
+                // peg-in complete
+                PegInDepositorStatus::PegInConfirmComplete
+            } else if peg_in_deposit_status
+                .as_ref()
+                .unwrap()
+                .block_height
+                .is_some_and(|block_height| {
+                    blockchain_height.is_ok_and(|height| {
+                        block_height + self.connector_z.num_blocks_timelock_0 <= height
+                    })
+                })
+            {
+                if peg_in_refund_status
+                    .as_ref()
+                    .is_ok_and(|status| status.confirmed)
+                {
+                    // peg-in refund complete
+                    PegInDepositorStatus::PegInRefundComplete
+                } else {
+                    // peg-in refund available
+                    PegInDepositorStatus::PegInRefundAvailable
+                }
+            } else {
+                // peg-in confirm not confirmed yet, refund not available yet, wait
+                PegInDepositorStatus::PegInConfirmWait
+            }
+        } else {
+            // peg-in deposit not confirmed yet, wait
+            PegInDepositorStatus::PegInDepositWait
+        }
+    }
+
+    pub async fn depositor_status(&self, client: &AsyncClient) -> PegInDepositorStatus {
+        let tx_statuses = get_tx_statuses(
+            client,
+            &[
+                self.peg_in_deposit_transaction.tx().compute_txid(),
+                self.peg_in_confirm_transaction.tx().compute_txid(),
+                self.peg_in_refund_transaction.tx().compute_txid(),
+            ],
+        )
+        .await;
+        let (peg_in_deposit_status, peg_in_confirm_status, peg_in_refund_status) =
+            match &tx_statuses[..] {
+                [stat1, stat2, stat3, ..] => (stat1, stat2, stat3),
+                // make sure vectors size are the same or will panic
+                _ => unreachable!(),
+            };
+
+        self.interpret_depositor_status(
+            peg_in_deposit_status,
+            peg_in_confirm_status,
+            peg_in_refund_status,
+            client.get_height().await,
+        )
+    }
+
+    pub async fn deposit(&mut self, client: &AsyncClient) -> Result<Transaction, Error> {
+        let txid = self.peg_in_deposit_transaction.tx().compute_txid();
+        verify_if_not_mined(client, txid).await?;
+        Ok(self.peg_in_deposit_transaction.finalize())
+    }
+
+    pub async fn confirm(&mut self, client: &AsyncClient) -> Result<Transaction, Error> {
+        let txid = self.peg_in_confirm_transaction.tx().compute_txid();
+        verify_if_not_mined(client, txid).await?;
+
+        let deposit_txid = self.peg_in_deposit_transaction.tx().compute_txid();
+        let deposit_status = client.get_tx_status(&deposit_txid).await;
+
+        match deposit_status {
+            Ok(status) => match status.confirmed {
+                true => Ok(self.peg_in_confirm_transaction.finalize()),
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.peg_in_deposit_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn refund(&mut self, client: &AsyncClient) -> Result<Transaction, Error> {
+        let txid = self.peg_in_refund_transaction.tx().compute_txid();
+        verify_if_not_mined(client, txid).await?;
+
+        let deposit_txid = self.peg_in_deposit_transaction.tx().compute_txid();
+        let deposit_status = client.get_tx_status(&deposit_txid).await;
+
+        match deposit_status {
+            Ok(status) => match status.confirmed {
+                true => Ok(self.peg_in_refund_transaction.finalize()),
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.peg_in_deposit_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    async fn get_peg_in_statuses(
+        &self,
+        client: &AsyncClient,
+    ) -> (
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+    ) {
+        let peg_in_deposit_status = client
+            .get_tx_status(&self.peg_in_deposit_transaction.tx().compute_txid())
+            .await;
+
+        let peg_in_confirm_status = client
+            .get_tx_status(&self.peg_in_confirm_transaction.tx().compute_txid())
+            .await;
+
+        let peg_in_refund_status = client
+            .get_tx_status(&self.peg_in_refund_transaction.tx().compute_txid())
+            .await;
+
+        (
+            peg_in_deposit_status,
+            peg_in_confirm_status,
+            peg_in_refund_status,
+        )
+    }
+
+    pub fn validate(&self) -> bool {
+        let mut ret_val = true;
+        let peg_in_graph = self.new_for_validation();
+        if !validate_transaction(
+            self.peg_in_deposit_transaction.tx(),
+            peg_in_graph.peg_in_deposit_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.peg_in_refund_transaction.tx(),
+            peg_in_graph.peg_in_refund_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.peg_in_confirm_transaction.tx(),
+            peg_in_graph.peg_in_confirm_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+
+        if !verify_public_nonces_for_tx(&self.peg_in_confirm_transaction) {
+            ret_val = false;
+        }
+
+        ret_val
+    }
+
+    pub fn merge(&mut self, source_peg_in_graph: &PegInGraph) {
+        self.peg_in_confirm_transaction
+            .merge(&source_peg_in_graph.peg_in_confirm_transaction);
+
+        self.peg_out_graphs
+            .extend(source_peg_in_graph.peg_out_graphs.clone());
+        self.peg_out_graphs.sort();
+        self.peg_out_graphs.dedup();
+    }
+}
+
+impl GraphCliQuery for PegInGraph {
+    async fn broadcast_deposit(&self, client: &AsyncClient) -> Result<(), String> {
+        let txid = self.peg_in_deposit_transaction.tx().compute_txid();
+        let tx_status = client.get_tx_status(&txid).await;
+        match tx_status {
+            Ok(status) => {
+                match status.confirmed {
+                    true => Err("Transaction already mined!".into()),
+                    false => {
+                        // complete deposit tx
+                        let deposit_tx = self.peg_in_deposit_transaction.finalize();
+                        // broadcast deposit tx
+                        let deposit_result = client.broadcast(&deposit_tx).await;
+                        match deposit_result {
+                            Ok(_) => Ok(()),
+                            Err(e) => Err(e.to_string()),
+                        }
+                    }
+                }
+            }
+            Err(e) => Err(e.to_string()),
+        }
+    }
+}
+
+pub fn generate_id(peg_in_deposit_transaction: &PegInDepositTransaction) -> String {
+    let mut hasher = Sha256::new();
+
+    hasher.update(peg_in_deposit_transaction.tx().compute_txid().to_string());
+
+    hasher.finalize().to_hex_string(Upper)
+}
+
+fn create_new_connectors(
+    network: Network,
+    n_of_n_taproot_public_key: &XOnlyPublicKey,
+    depositor_taproot_public_key: &XOnlyPublicKey,
+    evm_address: &str,
+) -> PegInConnectors {
+    let connector_0 = Connector0::new(network, n_of_n_taproot_public_key);
+    let connector_z = ConnectorZ::new(
+        network,
+        evm_address,
+        depositor_taproot_public_key,
+        n_of_n_taproot_public_key,
+    );
+
+    PegInConnectors {
+        connector_0,
+        connector_z,
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
+fn create_graph_without_signing(
+    network: Network,
+    depositor_public_key: &PublicKey,
+    depositor_taproot_public_key: &XOnlyPublicKey,
+    n_of_n_public_key: &PublicKey,
+    n_of_n_public_keys: &[PublicKey],
+    n_of_n_taproot_public_key: &XOnlyPublicKey,
+    depositor_evm_address: &str,
+    deposit_input: Input,
+) -> PegInGraph {
+    let connectors = create_new_connectors(
+        network,
+        n_of_n_taproot_public_key,
+        depositor_taproot_public_key,
+        depositor_evm_address,
+    );
+    let peg_in_deposit_transaction = PegInDepositTransaction::new_for_validation(
+        network,
+        depositor_public_key,
+        &connectors.connector_z,
+        deposit_input,
+    );
+
+    let peg_in_refund_vout_0: usize = 0;
+    let peg_in_refund_transaction = PegInRefundTransaction::new_for_validation(
+        network,
+        depositor_public_key,
+        &connectors.connector_z,
+        generate_input(peg_in_deposit_transaction.tx(), peg_in_refund_vout_0),
+    );
+
+    let peg_in_confirm_vout_0: usize = 0;
+    let peg_in_confirm_transaction = PegInConfirmTransaction::new_for_validation(
+        &connectors.connector_0,
+        &connectors.connector_z,
+        generate_input(peg_in_deposit_transaction.tx(), peg_in_confirm_vout_0),
+        n_of_n_public_keys.to_owned(),
+    );
+
+    PegInGraph {
+        version: GRAPH_VERSION.to_string(),
+        network,
+        id: generate_id(&peg_in_deposit_transaction),
+        peg_in_deposit_transaction,
+        peg_in_refund_transaction,
+        peg_in_confirm_transaction,
+        n_of_n_public_key: *n_of_n_public_key,
+        n_of_n_public_keys: n_of_n_public_keys.to_owned(),
+        n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
+        depositor_public_key: *depositor_public_key,
+        depositor_taproot_public_key: *depositor_taproot_public_key,
+        depositor_evm_address: depositor_evm_address.to_string(),
+        connector_0: connectors.connector_0,
+        connector_z: connectors.connector_z,
+        peg_out_graphs: Vec::new(),
+    }
+}
+
+fn generate_input(tx: &Transaction, vout: usize) -> Input {
+    Input {
+        outpoint: OutPoint {
+            txid: tx.compute_txid(),
+            vout: vout.to_u32().unwrap(),
+        },
+        amount: tx.output[vout].value,
+    }
+}
diff --git a/bridge/src/graphs/peg_out.rs b/bridge/src/graphs/peg_out.rs
new file mode 100644
index 000000000..9bb644289
--- /dev/null
+++ b/bridge/src/graphs/peg_out.rs
@@ -0,0 +1,2539 @@
+use bitcoin::{
+    hashes::Hash,
+    hex::{Case::Upper, DisplayHex},
+    key::Keypair,
+    Amount, Network, OutPoint, PublicKey, ScriptBuf, Transaction, Txid, XOnlyPublicKey,
+};
+use esplora_client::{AsyncClient, TxStatus};
+use musig2::SecNonce;
+use num_traits::ToPrimitive;
+use serde::{Deserialize, Serialize};
+use sha2::{Digest, Sha256};
+use std::{
+    collections::{BTreeMap, HashMap},
+    fmt::{Display, Formatter, Result as FmtResult},
+};
+
+use crate::{
+    commitments::CommitmentMessageId,
+    common::ZkProofVerifyingKey,
+    connectors::{
+        connector_c::get_commit_from_assert_commit_tx, connector_d::ConnectorD,
+        connector_e::ConnectorE, connector_f_1::ConnectorF1, connector_f_2::ConnectorF2,
+    },
+    error::{Error, GraphError, L2Error, NamedTx},
+    superblock::{
+        find_superblock, get_start_time_block_number, get_superblock_hash_message,
+        get_superblock_message,
+    },
+    transactions::{
+        assert_transactions::{
+            assert_commit_1::AssertCommit1Transaction,
+            assert_commit_2::AssertCommit2Transaction,
+            assert_final::AssertFinalTransaction,
+            assert_initial::AssertInitialTransaction,
+            utils::{
+                groth16_commitment_secrets_to_public_keys, merge_to_connector_c_commits_public_key,
+                sign_assert_tx_with_groth16_proof, AssertCommit1ConnectorsE,
+                AssertCommit2ConnectorsE, AssertCommitConnectorsF,
+            },
+        },
+        peg_in_confirm::PEG_IN_CONFIRM_TX_NAME,
+        pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+
+use bitvm::{chunk::api::type_conversion_utils::RawProof, signatures::signing_winternitz::{
+    WinternitzPublicKey, WinternitzSecret, WinternitzSigningInputs,
+}};
+
+use super::{
+    super::{
+        client::chain::chain::PegOutEvent,
+        connectors::{
+            connector_0::Connector0, connector_1::Connector1, connector_2::Connector2,
+            connector_3::Connector3, connector_4::Connector4, connector_5::Connector5,
+            connector_6::Connector6, connector_a::ConnectorA, connector_b::ConnectorB,
+            connector_c::ConnectorC,
+        },
+        contexts::{operator::OperatorContext, verifier::VerifierContext},
+        transactions::{
+            base::{
+                validate_transaction, verify_public_nonces_for_tx, BaseTransaction, Input,
+                InputWithScript,
+            },
+            challenge::ChallengeTransaction,
+            disprove::DisproveTransaction,
+            disprove_chain::DisproveChainTransaction,
+            kick_off_1::KickOff1Transaction,
+            kick_off_2::KickOff2Transaction,
+            kick_off_timeout::KickOffTimeoutTransaction,
+            peg_out::PegOutTransaction,
+            peg_out_confirm::PegOutConfirmTransaction,
+            pre_signed::PreSignedTransaction,
+            start_time::StartTimeTransaction,
+            start_time_timeout::StartTimeTimeoutTransaction,
+            take_1::Take1Transaction,
+            take_2::Take2Transaction,
+        },
+    },
+    base::{verify_if_not_mined, BaseGraph, GraphId, CROWDFUNDING_AMOUNT, GRAPH_VERSION},
+    peg_in::PegInGraph,
+};
+
+pub type PegOutId = GraphId;
+
+pub enum PegOutWithdrawerStatus {
+    PegOutNotStarted, // peg-out transaction not created yet
+    PegOutWait,       // peg-out not confirmed yet, wait
+    PegOutComplete,   // peg-out complete
+}
+
+impl Display for PegOutWithdrawerStatus {
+    fn fmt(&self, f: &mut Formatter) -> FmtResult {
+        match self {
+            PegOutWithdrawerStatus::PegOutNotStarted => {
+                write!(f, "Peg-out available. Request peg-out?")
+            }
+            PegOutWithdrawerStatus::PegOutWait => write!(f, "No action available. Wait..."),
+            PegOutWithdrawerStatus::PegOutComplete => write!(f, "Peg-out complete. Done."),
+        }
+    }
+}
+
+pub enum PegOutVerifierStatus {
+    PegOutPendingNonces,      // should push nonces
+    PegOutAwaitingNonces,     // should wait for nonces from other verifiers
+    PegOutPendingSignatures,  // should push signatures
+    PegOutAwaitingSignatures, // should wait for signatures from other verifiers
+    PegOutComplete,           // peg-out complete
+    PegOutWait,               // no action required, wait
+    PegOutChallengeAvailable, // can call challenge
+    PegOutStartTimeTimeoutAvailable,
+    PegOutKickOffTimeoutAvailable,
+    PegOutDisproveChainAvailable,
+    PegOutDisproveAvailable,
+    PegOutFailed, // timeouts or disproves executed
+}
+
+impl Display for PegOutVerifierStatus {
+    fn fmt(&self, f: &mut Formatter) -> FmtResult {
+        match self {
+            PegOutVerifierStatus::PegOutPendingNonces => {
+                write!(f, "Nonces required. Push nonces for peg-out transactions?")
+            }
+            PegOutVerifierStatus::PegOutAwaitingNonces => {
+                write!(f, "Awaiting nonces for peg-out transactions. Wait...")
+            }
+            PegOutVerifierStatus::PegOutPendingSignatures => {
+                write!(
+                    f,
+                    "Signatures required. Push signatures for peg-out transactions?"
+                )
+            }
+            PegOutVerifierStatus::PegOutAwaitingSignatures => {
+                write!(f, "Awaiting signatures for peg-out transactions. Wait...")
+            }
+            PegOutVerifierStatus::PegOutComplete => {
+                write!(f, "Peg-out complete, reimbursement succeded. Done.")
+            }
+            PegOutVerifierStatus::PegOutWait => write!(f, "No action available. Wait..."),
+            PegOutVerifierStatus::PegOutChallengeAvailable => {
+                write!(
+                  f,
+                  "Kick-off 1 transaction confirmed, dispute available. Broadcast challenge transaction?"
+              )
+            }
+            PegOutVerifierStatus::PegOutStartTimeTimeoutAvailable => {
+                write!(f, "Start time timed out. Broadcast timeout transaction?")
+            }
+            PegOutVerifierStatus::PegOutKickOffTimeoutAvailable => {
+                write!(f, "Kick-off 1 timed out. Broadcast timeout transaction?")
+            }
+            PegOutVerifierStatus::PegOutDisproveChainAvailable => {
+                write!(
+                    f,
+                    "Kick-off 2 transaction confirmed. Broadcast disprove chain transaction?"
+                )
+            }
+            PegOutVerifierStatus::PegOutDisproveAvailable => {
+                write!(
+                    f,
+                    "Assert transaction confirmed. Broadcast disprove transaction?"
+                )
+            }
+            PegOutVerifierStatus::PegOutFailed => {
+                write!(f, "Peg-out complete, reimbursement failed. Done.")
+            }
+        }
+    }
+}
+
+pub enum PegOutOperatorStatus {
+    // TODO: add assert initial and assert final
+    PegOutWait,
+    PegOutComplete,    // peg-out complete
+    PegOutFailed,      // timeouts or disproves executed
+    PegOutStartPegOut, // should execute peg-out tx
+    PegOutPegOutConfirmAvailable,
+    PegOutKickOff1Available,
+    PegOutStartTimeAvailable,
+    PegOutKickOff2Available,
+    PegOutAssertInitialAvailable,
+    PegOutAssertCommit1Available,
+    PegOutAssertCommit2Available,
+    PegOutAssertFinalAvailable,
+    PegOutTake1Available,
+    PegOutTake2Available,
+}
+
+impl Display for PegOutOperatorStatus {
+    fn fmt(&self, f: &mut Formatter) -> FmtResult {
+        match self {
+            PegOutOperatorStatus::PegOutWait => write!(f, "No action available. Wait..."),
+            PegOutOperatorStatus::PegOutComplete => {
+                write!(f, "Peg-out complete, reimbursement succeded. Done.")
+            }
+            PegOutOperatorStatus::PegOutFailed => {
+                write!(f, "Peg-out complete, reimbursement failed. Done.")
+            }
+            PegOutOperatorStatus::PegOutStartPegOut => {
+                write!(
+                    f,
+                    "Peg-out requested. Create and broadcast peg-out transaction?"
+                )
+            }
+            PegOutOperatorStatus::PegOutPegOutConfirmAvailable => {
+                write!(
+                    f,
+                    "Peg-out confirmed. Broadcast peg-out-confirm transaction?"
+                )
+            }
+            PegOutOperatorStatus::PegOutKickOff1Available => {
+                write!(
+                    f,
+                    "Peg-out-confirm confirmed. Broadcast kick-off 1 transaction?"
+                )
+            }
+            PegOutOperatorStatus::PegOutStartTimeAvailable => {
+                write!(f, "Kick-off confirmed. Broadcast start time transaction?")
+            }
+            PegOutOperatorStatus::PegOutKickOff2Available => {
+                write!(f, "Start time confirmed. Broadcast kick-off 2 transaction?")
+            }
+            PegOutOperatorStatus::PegOutAssertInitialAvailable => {
+                write!(f, "Dispute raised. Broadcast initial assert transaction?")
+            }
+            PegOutOperatorStatus::PegOutAssertCommit1Available => {
+                write!(f, "Dispute raised. Broadcast commit 1 assert transaction?")
+            }
+            PegOutOperatorStatus::PegOutAssertCommit2Available => {
+                write!(f, "Dispute raised. Broadcast commit 2 assert transaction?")
+            }
+            PegOutOperatorStatus::PegOutAssertFinalAvailable => {
+                write!(f, "Dispute raised. Broadcast final assert transaction?")
+            }
+            PegOutOperatorStatus::PegOutTake1Available => write!(
+                f,
+                "Dispute timed out, reimbursement available. Broadcast take 1 transaction?"
+            ),
+            PegOutOperatorStatus::PegOutTake2Available => write!(
+                f,
+                "Dispute timed out, reimbursement available. Broadcast take 2 transaction?"
+            ),
+        }
+    }
+}
+
+struct PegOutConnectors {
+    connector_0: Connector0,
+    connector_1: Connector1,
+    connector_2: Connector2,
+    connector_3: Connector3,
+    connector_4: Connector4,
+    connector_5: Connector5,
+    connector_6: Connector6,
+    connector_a: ConnectorA,
+    connector_b: ConnectorB,
+    connector_c: ConnectorC,
+    connector_d: ConnectorD,
+    assert_commit_connectors_e_1: AssertCommit1ConnectorsE,
+    assert_commit_connectors_e_2: AssertCommit2ConnectorsE,
+    assert_commit_connectors_f: AssertCommitConnectorsF,
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct PegOutGraph {
+    version: String,
+    network: Network,
+    id: String,
+
+    // state: State,
+    // n_of_n_pre_signing_state: PreSigningState,
+    n_of_n_presigned: bool,
+    n_of_n_public_key: PublicKey,
+    n_of_n_taproot_public_key: XOnlyPublicKey,
+
+    pub peg_in_graph_id: String,
+    peg_in_confirm_txid: Txid,
+
+    // Note that only the connectors that are used with message commitments are
+    // required to be here. They carry the Winternitz public keys, which need
+    // to be pushed to remote data store. The remaining connectors can be
+    // constructed dynamically.
+    connector_0: Connector0,
+    connector_1: Connector1,
+    connector_2: Connector2,
+    connector_3: Connector3,
+    connector_4: Connector4,
+    connector_5: Connector5,
+    connector_6: Connector6,
+    connector_a: ConnectorA,
+    connector_b: ConnectorB,
+    connector_c: ConnectorC,
+    connector_d: ConnectorD,
+    connector_e_1: AssertCommit1ConnectorsE,
+    connector_e_2: AssertCommit2ConnectorsE,
+    connector_f_1: ConnectorF1,
+    connector_f_2: ConnectorF2,
+
+    peg_out_confirm_transaction: PegOutConfirmTransaction,
+    assert_initial_transaction: AssertInitialTransaction,
+    assert_commit_1_transaction: AssertCommit1Transaction,
+    assert_commit_2_transaction: AssertCommit2Transaction,
+    assert_final_transaction: AssertFinalTransaction,
+    challenge_transaction: ChallengeTransaction,
+    disprove_chain_transaction: DisproveChainTransaction,
+    disprove_transaction: DisproveTransaction,
+    kick_off_1_transaction: KickOff1Transaction,
+    kick_off_2_transaction: KickOff2Transaction,
+    kick_off_timeout_transaction: KickOffTimeoutTransaction,
+    start_time_transaction: StartTimeTransaction,
+    start_time_timeout_transaction: StartTimeTimeoutTransaction,
+    take_1_transaction: Take1Transaction,
+    take_2_transaction: Take2Transaction,
+
+    operator_public_key: PublicKey,
+    operator_taproot_public_key: XOnlyPublicKey,
+
+    pub peg_out_chain_event: Option<PegOutEvent>,
+    pub peg_out_transaction: Option<PegOutTransaction>,
+}
+
+impl BaseGraph for PegOutGraph {
+    fn network(&self) -> Network { self.network }
+
+    fn id(&self) -> &String { &self.id }
+
+    fn verifier_sign(
+        &mut self,
+        verifier_context: &VerifierContext,
+        secret_nonces: &HashMap<Txid, HashMap<usize, SecNonce>>,
+    ) {
+        self.assert_initial_transaction.pre_sign(
+            verifier_context,
+            &self.connector_b,
+            &secret_nonces[&self.assert_initial_transaction.tx().compute_txid()],
+        );
+        self.assert_final_transaction.pre_sign(
+            verifier_context,
+            &self.connector_d,
+            &secret_nonces[&self.assert_final_transaction.tx().compute_txid()],
+        );
+        self.disprove_chain_transaction.pre_sign(
+            verifier_context,
+            &self.connector_b,
+            &secret_nonces[&self.disprove_chain_transaction.tx().compute_txid()],
+        );
+        self.disprove_transaction.pre_sign(
+            verifier_context,
+            &self.connector_5,
+            &secret_nonces[&self.disprove_transaction.tx().compute_txid()],
+        );
+        self.kick_off_timeout_transaction.pre_sign(
+            verifier_context,
+            &self.connector_1,
+            &secret_nonces[&self.kick_off_timeout_transaction.tx().compute_txid()],
+        );
+        self.start_time_timeout_transaction.pre_sign(
+            verifier_context,
+            &self.connector_1,
+            &self.connector_2,
+            &secret_nonces[&self.start_time_timeout_transaction.tx().compute_txid()],
+        );
+        self.take_1_transaction.pre_sign(
+            verifier_context,
+            &self.connector_0,
+            &self.connector_b,
+            &secret_nonces[&self.take_1_transaction.tx().compute_txid()],
+        );
+        self.take_2_transaction.pre_sign(
+            verifier_context,
+            &self.connector_0,
+            &self.connector_5,
+            &secret_nonces[&self.take_2_transaction.tx().compute_txid()],
+        );
+
+        self.n_of_n_presigned = true; // TODO: set to true after collecting all n of n signatures
+    }
+
+    fn push_verifier_nonces(
+        &mut self,
+        verifier_context: &VerifierContext,
+    ) -> HashMap<Txid, HashMap<usize, SecNonce>> {
+        self.all_presigned_txs_mut()
+            .map(|tx_wrapper| {
+                (
+                    tx_wrapper.tx().compute_txid(),
+                    tx_wrapper.push_nonces(verifier_context),
+                )
+            })
+            .collect()
+    }
+}
+
+impl PegOutGraph {
+    pub fn new(
+        context: &OperatorContext,
+        peg_in_graph: &PegInGraph,
+        peg_out_confirm_input: Input,
+        commitment_secrets: &HashMap<CommitmentMessageId, WinternitzSecret>,
+    ) -> Self {
+        let peg_in_confirm_transaction = peg_in_graph.peg_in_confirm_transaction_ref();
+        let peg_in_confirm_txid = peg_in_confirm_transaction.tx().compute_txid();
+
+        let connector_1_commitment_public_keys = HashMap::from([
+            (
+                CommitmentMessageId::Superblock,
+                WinternitzPublicKey::from(&commitment_secrets[&CommitmentMessageId::Superblock]),
+            ),
+            (
+                CommitmentMessageId::SuperblockHash,
+                WinternitzPublicKey::from(
+                    &commitment_secrets[&CommitmentMessageId::SuperblockHash],
+                ),
+            ),
+        ]);
+        let connector_2_commitment_public_keys = HashMap::from([(
+            CommitmentMessageId::StartTime,
+            WinternitzPublicKey::from(&commitment_secrets[&CommitmentMessageId::StartTime]),
+        )]);
+        let connector_6_commitment_public_keys = HashMap::from([
+            (
+                CommitmentMessageId::PegOutTxIdSourceNetwork,
+                WinternitzPublicKey::from(
+                    &commitment_secrets[&CommitmentMessageId::PegOutTxIdSourceNetwork],
+                ),
+            ),
+            (
+                CommitmentMessageId::PegOutTxIdDestinationNetwork,
+                WinternitzPublicKey::from(
+                    &commitment_secrets[&CommitmentMessageId::PegOutTxIdDestinationNetwork],
+                ),
+            ),
+        ]);
+        let connector_b_commitment_public_keys = HashMap::from([
+            (
+                CommitmentMessageId::StartTime,
+                WinternitzPublicKey::from(&commitment_secrets[&CommitmentMessageId::StartTime]),
+            ),
+            (
+                CommitmentMessageId::SuperblockHash,
+                WinternitzPublicKey::from(
+                    &commitment_secrets[&CommitmentMessageId::SuperblockHash],
+                ),
+            ),
+        ]);
+
+        let (connector_e1_commitment_public_keys, connector_e2_commitment_public_keys) =
+            groth16_commitment_secrets_to_public_keys(commitment_secrets);
+
+        let connectors = Self::create_new_connectors(
+            context.network,
+            &context.n_of_n_taproot_public_key,
+            &context.operator_taproot_public_key,
+            &context.operator_public_key,
+            &connector_1_commitment_public_keys,
+            &connector_2_commitment_public_keys,
+            &connector_6_commitment_public_keys,
+            &connector_b_commitment_public_keys,
+            &connector_e1_commitment_public_keys,
+            &connector_e2_commitment_public_keys,
+        );
+
+        let peg_out_confirm_transaction =
+            PegOutConfirmTransaction::new(context, &connectors.connector_6, peg_out_confirm_input);
+        let peg_out_confirm_txid = peg_out_confirm_transaction.tx().compute_txid();
+
+        let kick_off_1_vout_0 = 0;
+        let kick_off_1_transaction = KickOff1Transaction::new(
+            context,
+            &connectors.connector_1,
+            &connectors.connector_2,
+            &connectors.connector_6,
+            Input {
+                outpoint: OutPoint {
+                    txid: peg_out_confirm_txid,
+                    vout: kick_off_1_vout_0.to_u32().unwrap(),
+                },
+                amount: peg_out_confirm_transaction.tx().output[kick_off_1_vout_0].value,
+            },
+        );
+        let kick_off_1_txid = kick_off_1_transaction.tx().compute_txid();
+
+        let start_time_vout_0 = 2;
+        let start_time_transaction = StartTimeTransaction::new(
+            context,
+            &connectors.connector_2,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: start_time_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[start_time_vout_0].value,
+            },
+        );
+
+        let start_time_timeout_vout_0 = 2;
+        let start_time_timeout_vout_1 = 1;
+        let start_time_timeout_transaction = StartTimeTimeoutTransaction::new(
+            context,
+            &connectors.connector_1,
+            &connectors.connector_2,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: start_time_timeout_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[start_time_timeout_vout_0].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: start_time_timeout_vout_1.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[start_time_timeout_vout_1].value,
+            },
+        );
+
+        let kick_off_2_vout_0 = 1;
+        let kick_off_2_transaction = KickOff2Transaction::new(
+            context,
+            &connectors.connector_1,
+            &connectors.connector_b,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: kick_off_2_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[kick_off_2_vout_0].value,
+            },
+        );
+        let kick_off_2_txid = kick_off_2_transaction.tx().compute_txid();
+
+        let kick_off_timeout_vout_0 = 1;
+        let kick_off_timeout_transaction = KickOffTimeoutTransaction::new(
+            context,
+            &connectors.connector_1,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: kick_off_timeout_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[kick_off_timeout_vout_0].value,
+            },
+        );
+
+        let input_amount_crowdfunding = Amount::from_btc(CROWDFUNDING_AMOUNT).unwrap();
+        let challenge_vout_0 = 0;
+        let challenge_transaction = ChallengeTransaction::new(
+            context,
+            &connectors.connector_a,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: challenge_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[challenge_vout_0].value,
+            },
+            input_amount_crowdfunding,
+        );
+
+        let take_1_vout_0 = 0;
+        let take_1_vout_1 = 0;
+        let take_1_vout_2 = 0;
+        let take_1_vout_3 = 1;
+        let take_1_transaction = Take1Transaction::new(
+            context,
+            &connectors.connector_0,
+            &connectors.connector_3,
+            &connectors.connector_a,
+            &connectors.connector_b,
+            Input {
+                outpoint: OutPoint {
+                    txid: peg_in_confirm_txid,
+                    vout: take_1_vout_0.to_u32().unwrap(),
+                },
+                amount: peg_in_confirm_transaction.tx().output[take_1_vout_0].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: take_1_vout_1.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[take_1_vout_1].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_2_txid,
+                    vout: take_1_vout_2.to_u32().unwrap(),
+                },
+                amount: kick_off_2_transaction.tx().output[take_1_vout_2].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_2_txid,
+                    vout: take_1_vout_3.to_u32().unwrap(),
+                },
+                amount: kick_off_2_transaction.tx().output[take_1_vout_3].value,
+            },
+        );
+
+        // assert initial
+        let assert_initial_vout_0 = 1;
+        let assert_initial_transaction = AssertInitialTransaction::new(
+            &connectors.connector_b,
+            &connectors.connector_d,
+            &connectors.assert_commit_connectors_e_1,
+            &connectors.assert_commit_connectors_e_2,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_2_txid,
+                    vout: assert_initial_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_2_transaction.tx().output[assert_initial_vout_0].value,
+            },
+        );
+        let assert_initial_txid = assert_initial_transaction.tx().compute_txid();
+
+        // assert commit txs
+        let mut vout_base = 1;
+        let assert_commit_1_transaction = AssertCommit1Transaction::new(
+            &connectors.assert_commit_connectors_e_1,
+            &connectors.assert_commit_connectors_f.connector_f_1,
+            (0..connectors.assert_commit_connectors_e_1.connectors_num())
+                .map(|idx| Input {
+                    outpoint: OutPoint {
+                        txid: assert_initial_transaction.tx().compute_txid(),
+                        vout: (idx + vout_base).to_u32().unwrap(),
+                    },
+                    amount: assert_initial_transaction.tx().output[idx + vout_base].value,
+                })
+                .collect(),
+        );
+
+        vout_base += connectors.assert_commit_connectors_e_1.connectors_num();
+
+        let assert_commit_2_transaction = AssertCommit2Transaction::new(
+            &connectors.assert_commit_connectors_e_2,
+            &connectors.assert_commit_connectors_f.connector_f_2,
+            (0..connectors.assert_commit_connectors_e_2.connectors_num())
+                .map(|idx| Input {
+                    outpoint: OutPoint {
+                        txid: assert_initial_transaction.tx().compute_txid(),
+                        vout: (idx + vout_base).to_u32().unwrap(),
+                    },
+                    amount: assert_initial_transaction.tx().output[idx + vout_base].value,
+                })
+                .collect(),
+        );
+
+        // assert final
+        let assert_final_vout_0 = 0;
+        let assert_final_vout_1 = 0;
+        let assert_final_vout_2 = 0;
+        let assert_final_transaction = AssertFinalTransaction::new(
+            context,
+            &connectors.connector_4,
+            &connectors.connector_5,
+            &connectors.connector_c,
+            &connectors.connector_d,
+            &connectors.assert_commit_connectors_f,
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_initial_txid,
+                    vout: assert_final_vout_0.to_u32().unwrap(),
+                },
+                amount: assert_initial_transaction.tx().output[assert_final_vout_0].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_commit_1_transaction.tx().compute_txid(),
+                    vout: assert_final_vout_1.to_u32().unwrap(),
+                },
+                amount: assert_commit_1_transaction.tx().output[assert_final_vout_1].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_commit_2_transaction.tx().compute_txid(),
+                    vout: assert_final_vout_2.to_u32().unwrap(),
+                },
+                amount: assert_commit_2_transaction.tx().output[assert_final_vout_2].value,
+            },
+        );
+        let assert_final_txid = assert_final_transaction.tx().compute_txid();
+
+        let take_2_vout_0 = 0;
+        let take_2_vout_1 = 0;
+        let take_2_vout_2 = 1;
+        let take_2_vout_3 = 2;
+        let take_2_transaction = Take2Transaction::new(
+            context,
+            &connectors.connector_0,
+            &connectors.connector_4,
+            &connectors.connector_5,
+            &connectors.connector_c,
+            Input {
+                outpoint: OutPoint {
+                    txid: peg_in_confirm_txid,
+                    vout: take_2_vout_0.to_u32().unwrap(),
+                },
+                amount: peg_in_confirm_transaction.tx().output[take_2_vout_0].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_final_txid,
+                    vout: take_2_vout_1.to_u32().unwrap(),
+                },
+                amount: assert_final_transaction.tx().output[take_2_vout_1].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_final_txid,
+                    vout: take_2_vout_2.to_u32().unwrap(),
+                },
+                amount: assert_final_transaction.tx().output[take_2_vout_2].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_final_txid,
+                    vout: take_2_vout_3.to_u32().unwrap(),
+                },
+                amount: assert_final_transaction.tx().output[take_2_vout_3].value,
+            },
+        );
+
+        let disprove_vout_0 = 1;
+        let disprove_vout_1 = 2;
+        let disprove_transaction = DisproveTransaction::new(
+            context,
+            &connectors.connector_5,
+            &connectors.connector_c,
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_final_txid,
+                    vout: disprove_vout_0.to_u32().unwrap(),
+                },
+                amount: assert_final_transaction.tx().output[disprove_vout_0].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_final_txid,
+                    vout: disprove_vout_1.to_u32().unwrap(),
+                },
+                amount: assert_final_transaction.tx().output[disprove_vout_1].value,
+            },
+        );
+
+        let disprove_chain_vout_0 = 1;
+        let disprove_chain_transaction = DisproveChainTransaction::new(
+            context,
+            &connectors.connector_b,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_2_txid,
+                    vout: disprove_chain_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_2_transaction.tx().output[disprove_chain_vout_0].value,
+            },
+        );
+
+        PegOutGraph {
+            version: GRAPH_VERSION.to_string(),
+            network: context.network,
+            id: generate_id(peg_in_graph, &context.operator_public_key),
+            n_of_n_presigned: false,
+            n_of_n_public_key: context.n_of_n_public_key,
+            n_of_n_taproot_public_key: context.n_of_n_taproot_public_key,
+            peg_in_graph_id: peg_in_graph.id().clone(),
+            peg_in_confirm_txid,
+            connector_0: connectors.connector_0,
+            connector_1: connectors.connector_1,
+            connector_2: connectors.connector_2,
+            connector_3: connectors.connector_3,
+            connector_4: connectors.connector_4,
+            connector_5: connectors.connector_5,
+            connector_6: connectors.connector_6,
+            connector_a: connectors.connector_a,
+            connector_b: connectors.connector_b,
+            connector_c: connectors.connector_c,
+            connector_d: connectors.connector_d,
+            connector_e_1: connectors.assert_commit_connectors_e_1,
+            connector_e_2: connectors.assert_commit_connectors_e_2,
+            connector_f_1: connectors.assert_commit_connectors_f.connector_f_1,
+            connector_f_2: connectors.assert_commit_connectors_f.connector_f_2,
+            peg_out_confirm_transaction,
+            assert_initial_transaction,
+            assert_commit_1_transaction,
+            assert_commit_2_transaction,
+            assert_final_transaction,
+            challenge_transaction,
+            disprove_chain_transaction,
+            disprove_transaction,
+            kick_off_1_transaction,
+            kick_off_2_transaction,
+            kick_off_timeout_transaction,
+            start_time_transaction,
+            start_time_timeout_transaction,
+            take_1_transaction,
+            take_2_transaction,
+            operator_public_key: context.operator_public_key,
+            operator_taproot_public_key: context.operator_taproot_public_key,
+            peg_out_chain_event: None,
+            peg_out_transaction: None,
+        }
+    }
+
+    pub fn new_for_validation(&self) -> Self {
+        let peg_in_confirm_txid = self.take_1_transaction.tx().input[0].previous_output.txid; // Self-referencing
+
+        let connectors = Self::create_new_connectors(
+            self.network,
+            &self.n_of_n_taproot_public_key,
+            &self.operator_taproot_public_key,
+            &self.operator_public_key,
+            &self.connector_1.commitment_public_keys,
+            &self.connector_2.commitment_public_keys,
+            &self.connector_6.commitment_public_keys,
+            &self.connector_b.commitment_public_keys,
+            &self.connector_e_1.commitment_public_keys(),
+            &self.connector_e_2.commitment_public_keys(),
+        );
+
+        let peg_out_confirm_vout_0 = 0;
+        let peg_out_confirm_transaction = PegOutConfirmTransaction::new_for_validation(
+            self.network,
+            &self.operator_public_key,
+            &connectors.connector_6,
+            Input {
+                outpoint: self.peg_out_confirm_transaction.tx().input[peg_out_confirm_vout_0]
+                    .previous_output, // Self-referencing
+                amount: self.peg_out_confirm_transaction.prev_outs()[peg_out_confirm_vout_0].value, // Self-referencing
+            },
+        );
+
+        let kick_off_1_vout_0 = 0;
+        let kick_off_1_transaction = KickOff1Transaction::new_for_validation(
+            self.network,
+            &self.operator_taproot_public_key,
+            &self.n_of_n_taproot_public_key,
+            &connectors.connector_1,
+            &connectors.connector_2,
+            &connectors.connector_6,
+            Input {
+                outpoint: self.kick_off_1_transaction.tx().input[kick_off_1_vout_0].previous_output, // Self-referencing
+                amount: self.kick_off_1_transaction.prev_outs()[kick_off_1_vout_0].value, // Self-referencing
+            },
+        );
+        let kick_off_1_txid = kick_off_1_transaction.tx().compute_txid();
+
+        let start_time_vout_0 = 2;
+        let start_time_transaction = StartTimeTransaction::new_for_validation(
+            self.network,
+            &self.operator_public_key,
+            &connectors.connector_2,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: start_time_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[start_time_vout_0].value,
+            },
+        );
+
+        let start_time_timeout_vout_0 = 2;
+        let start_time_timeout_vout_1 = 1;
+        let start_time_timeout_transaction = StartTimeTimeoutTransaction::new_for_validation(
+            self.network,
+            &connectors.connector_1,
+            &connectors.connector_2,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: start_time_timeout_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[start_time_timeout_vout_0].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: start_time_timeout_vout_1.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[start_time_timeout_vout_1].value,
+            },
+        );
+
+        let kick_off_2_vout_0 = 1;
+        let kick_off_2_transaction = KickOff2Transaction::new_for_validation(
+            self.network,
+            &self.operator_public_key,
+            &connectors.connector_1,
+            &connectors.connector_b,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: kick_off_2_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[kick_off_2_vout_0].value,
+            },
+        );
+        let kick_off_2_txid = kick_off_2_transaction.tx().compute_txid();
+
+        let kick_off_timeout_vout_0 = 1;
+        let kick_off_timeout_transaction = KickOffTimeoutTransaction::new_for_validation(
+            self.network,
+            &connectors.connector_1,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: kick_off_timeout_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[kick_off_timeout_vout_0].value,
+            },
+        );
+
+        let input_amount_crowdfunding = Amount::from_btc(CROWDFUNDING_AMOUNT).unwrap();
+        let challenge_vout_0 = 0;
+        let challenge_transaction = ChallengeTransaction::new_for_validation(
+            self.network,
+            &self.operator_public_key,
+            &self.connector_a,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: challenge_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[challenge_vout_0].value,
+            },
+            input_amount_crowdfunding,
+        );
+
+        let take_1_vout_0 = 0;
+        let take_1_vout_1 = 0;
+        let take_1_vout_2 = 0;
+        let take_1_vout_3 = 1;
+        let take_1_transaction = Take1Transaction::new_for_validation(
+            self.network,
+            &self.operator_public_key,
+            &connectors.connector_0,
+            &connectors.connector_3,
+            &connectors.connector_a,
+            &connectors.connector_b,
+            Input {
+                outpoint: OutPoint {
+                    txid: peg_in_confirm_txid,
+                    vout: take_1_vout_0.to_u32().unwrap(),
+                },
+                amount: self.take_1_transaction.prev_outs()[take_1_vout_0].value, // Self-referencing
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_1_txid,
+                    vout: take_1_vout_1.to_u32().unwrap(),
+                },
+                amount: kick_off_1_transaction.tx().output[take_1_vout_1].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_2_txid,
+                    vout: take_1_vout_2.to_u32().unwrap(),
+                },
+                amount: kick_off_2_transaction.tx().output[take_1_vout_2].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_2_txid,
+                    vout: take_1_vout_3.to_u32().unwrap(),
+                },
+                amount: kick_off_2_transaction.tx().output[take_1_vout_3].value,
+            },
+        );
+
+        // assert initial
+        let assert_initial_vout_0 = 1;
+        let assert_initial_transaction = AssertInitialTransaction::new_for_validation(
+            &connectors.connector_b,
+            &connectors.connector_d,
+            &connectors.assert_commit_connectors_e_1,
+            &connectors.assert_commit_connectors_e_2,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_2_txid,
+                    vout: assert_initial_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_2_transaction.tx().output[assert_initial_vout_0].value,
+            },
+        );
+        let assert_initial_txid = assert_initial_transaction.tx().compute_txid();
+
+        // assert commit txs
+        let mut vout_base = 1;
+        let assert_commit_1_transaction = AssertCommit1Transaction::new_for_validation(
+            &connectors.assert_commit_connectors_e_1,
+            &connectors.assert_commit_connectors_f.connector_f_1,
+            (0..connectors.assert_commit_connectors_e_1.connectors_num())
+                .map(|idx| Input {
+                    outpoint: OutPoint {
+                        txid: assert_initial_transaction.tx().compute_txid(),
+                        vout: (idx + vout_base).to_u32().unwrap(),
+                    },
+                    amount: assert_initial_transaction.tx().output[idx + vout_base].value,
+                })
+                .collect(),
+        );
+
+        vout_base += connectors.assert_commit_connectors_e_1.connectors_num();
+
+        let assert_commit_2_transaction = AssertCommit2Transaction::new_for_validation(
+            &connectors.assert_commit_connectors_e_2,
+            &connectors.assert_commit_connectors_f.connector_f_2,
+            (0..connectors.assert_commit_connectors_e_2.connectors_num())
+                .map(|idx| Input {
+                    outpoint: OutPoint {
+                        txid: assert_initial_transaction.tx().compute_txid(),
+                        vout: (idx + vout_base).to_u32().unwrap(),
+                    },
+                    amount: assert_initial_transaction.tx().output[idx + vout_base].value,
+                })
+                .collect(),
+        );
+
+        // assert final
+        let assert_final_vout_0 = 0;
+        let assert_final_vout_1 = 0;
+        let assert_final_vout_2 = 0;
+        let assert_final_transaction = AssertFinalTransaction::new_for_validation(
+            &connectors.connector_4,
+            &connectors.connector_5,
+            &connectors.connector_c,
+            &connectors.connector_d,
+            &connectors.assert_commit_connectors_f,
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_initial_txid,
+                    vout: assert_final_vout_0.to_u32().unwrap(),
+                },
+                amount: assert_initial_transaction.tx().output[assert_final_vout_0].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_commit_1_transaction.tx().compute_txid(),
+                    vout: assert_final_vout_1.to_u32().unwrap(),
+                },
+                amount: assert_commit_1_transaction.tx().output[assert_final_vout_1].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_commit_2_transaction.tx().compute_txid(),
+                    vout: assert_final_vout_2.to_u32().unwrap(),
+                },
+                amount: assert_commit_2_transaction.tx().output[assert_final_vout_2].value,
+            },
+        );
+        let assert_final_txid = assert_final_transaction.tx().compute_txid();
+
+        let take_2_vout_0 = 0;
+        let take_2_vout_1 = 0;
+        let take_2_vout_2 = 1;
+        let take_2_vout_3 = 2;
+        let take_2_transaction = Take2Transaction::new_for_validation(
+            self.network,
+            &self.operator_public_key,
+            &connectors.connector_0,
+            &connectors.connector_4,
+            &connectors.connector_5,
+            &connectors.connector_c,
+            Input {
+                outpoint: OutPoint {
+                    txid: peg_in_confirm_txid,
+                    vout: take_2_vout_0.to_u32().unwrap(),
+                },
+                amount: self.take_2_transaction.prev_outs()[take_2_vout_0].value, // Self-referencing
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_final_txid,
+                    vout: take_2_vout_1.to_u32().unwrap(),
+                },
+                amount: assert_final_transaction.tx().output[take_2_vout_1].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_final_txid,
+                    vout: take_2_vout_2.to_u32().unwrap(),
+                },
+                amount: assert_final_transaction.tx().output[take_2_vout_2].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_final_txid,
+                    vout: take_2_vout_3.to_u32().unwrap(),
+                },
+                amount: assert_final_transaction.tx().output[take_2_vout_3].value,
+            },
+        );
+
+        let disprove_vout_0 = 1;
+        let disprove_vout_1 = 2;
+        let disprove_transaction = DisproveTransaction::new_for_validation(
+            self.network,
+            &self.connector_5,
+            &self.connector_c,
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_final_txid,
+                    vout: disprove_vout_0.to_u32().unwrap(),
+                },
+                amount: assert_final_transaction.tx().output[disprove_vout_0].value,
+            },
+            Input {
+                outpoint: OutPoint {
+                    txid: assert_final_txid,
+                    vout: disprove_vout_1.to_u32().unwrap(),
+                },
+                amount: assert_final_transaction.tx().output[disprove_vout_1].value,
+            },
+        );
+
+        let disprove_chain_vout_0 = 1;
+        let disprove_chain_transaction = DisproveChainTransaction::new_for_validation(
+            self.network,
+            &self.connector_b,
+            Input {
+                outpoint: OutPoint {
+                    txid: kick_off_2_txid,
+                    vout: disprove_chain_vout_0.to_u32().unwrap(),
+                },
+                amount: kick_off_2_transaction.tx().output[disprove_chain_vout_0].value,
+            },
+        );
+
+        PegOutGraph {
+            version: GRAPH_VERSION.to_string(),
+            network: self.network,
+            id: self.id.clone(),
+            n_of_n_presigned: false,
+            n_of_n_public_key: self.n_of_n_public_key,
+            n_of_n_taproot_public_key: self.n_of_n_taproot_public_key,
+            peg_in_graph_id: self.peg_in_graph_id.clone(),
+            peg_in_confirm_txid,
+            connector_0: connectors.connector_0,
+            connector_1: connectors.connector_1,
+            connector_2: connectors.connector_2,
+            connector_3: connectors.connector_3,
+            connector_4: connectors.connector_4,
+            connector_5: connectors.connector_5,
+            connector_6: connectors.connector_6,
+            connector_a: connectors.connector_a,
+            connector_b: connectors.connector_b,
+            connector_c: connectors.connector_c,
+            connector_d: connectors.connector_d,
+            connector_e_1: connectors.assert_commit_connectors_e_1,
+            connector_e_2: connectors.assert_commit_connectors_e_2,
+            connector_f_1: connectors.assert_commit_connectors_f.connector_f_1,
+            connector_f_2: connectors.assert_commit_connectors_f.connector_f_2,
+            peg_out_confirm_transaction,
+            assert_initial_transaction,
+            assert_commit_1_transaction,
+            assert_commit_2_transaction,
+            assert_final_transaction,
+            challenge_transaction,
+            disprove_chain_transaction,
+            disprove_transaction,
+            kick_off_1_transaction,
+            kick_off_2_transaction,
+            kick_off_timeout_transaction,
+            start_time_transaction,
+            start_time_timeout_transaction,
+            take_1_transaction,
+            take_2_transaction,
+            operator_public_key: self.operator_public_key,
+            operator_taproot_public_key: self.operator_taproot_public_key,
+            peg_out_chain_event: None,
+            peg_out_transaction: None,
+        }
+    }
+
+    pub async fn verifier_status(
+        &self,
+        client: &AsyncClient,
+        verifier_context: &VerifierContext,
+    ) -> PegOutVerifierStatus {
+        if self.n_of_n_presigned {
+            let (
+                _,
+                _,
+                _,
+                assert_final_status,
+                challenge_status,
+                disprove_chain_status,
+                disprove_status,
+                _,
+                kick_off_1_status,
+                kick_off_2_status,
+                kick_off_timeout_status,
+                _,
+                start_time_timeout_status,
+                start_time_status,
+                take_1_status,
+                take_2_status,
+            ) = Self::get_peg_out_statuses(self, client).await;
+            let blockchain_height = client.get_height().await;
+
+            if kick_off_2_status
+                .as_ref()
+                .is_ok_and(|status| status.confirmed)
+            {
+                if take_1_status.as_ref().is_ok_and(|status| status.confirmed)
+                    || take_2_status.as_ref().is_ok_and(|status| status.confirmed)
+                {
+                    PegOutVerifierStatus::PegOutComplete
+                } else if disprove_status
+                    .as_ref()
+                    .is_ok_and(|status| status.confirmed)
+                    || disprove_chain_status
+                        .as_ref()
+                        .is_ok_and(|status| status.confirmed)
+                {
+                    return PegOutVerifierStatus::PegOutFailed; // TODO: can be also `PegOutVerifierStatus::PegOutComplete`
+                } else if assert_final_status
+                    .as_ref()
+                    .is_ok_and(|status| status.confirmed)
+                {
+                    return PegOutVerifierStatus::PegOutDisproveAvailable;
+                } else {
+                    return PegOutVerifierStatus::PegOutDisproveChainAvailable;
+                }
+            } else if kick_off_1_status
+                .as_ref()
+                .is_ok_and(|status| status.confirmed)
+            {
+                if start_time_timeout_status
+                    .as_ref()
+                    .is_ok_and(|status| status.confirmed)
+                    || kick_off_timeout_status
+                        .as_ref()
+                        .is_ok_and(|status| status.confirmed)
+                {
+                    return PegOutVerifierStatus::PegOutFailed; // TODO: can be also `PegOutVerifierStatus::PegOutComplete`
+                } else if start_time_status
+                    .as_ref()
+                    .is_ok_and(|status| !status.confirmed)
+                {
+                    if kick_off_1_status
+                        .as_ref()
+                        .unwrap()
+                        .block_height
+                        .is_some_and(|block_height| {
+                            blockchain_height.is_ok_and(|blockchain_height| {
+                                block_height + self.connector_1.num_blocks_timelock_leaf_2
+                                    <= blockchain_height
+                            })
+                        })
+                    {
+                        return PegOutVerifierStatus::PegOutStartTimeTimeoutAvailable;
+                    } else {
+                        return PegOutVerifierStatus::PegOutWait;
+                    }
+                } else if kick_off_1_status
+                    .as_ref()
+                    .unwrap()
+                    .block_height
+                    .is_some_and(|block_height| {
+                        blockchain_height.is_ok_and(|blockchain_height| {
+                            block_height + self.connector_1.num_blocks_timelock_leaf_1
+                                <= blockchain_height
+                        })
+                    })
+                {
+                    return PegOutVerifierStatus::PegOutKickOffTimeoutAvailable;
+                } else if challenge_status
+                    .as_ref()
+                    .is_ok_and(|status| !status.confirmed)
+                {
+                    return PegOutVerifierStatus::PegOutChallengeAvailable;
+                } else {
+                    return PegOutVerifierStatus::PegOutWait;
+                }
+            } else {
+                return PegOutVerifierStatus::PegOutWait;
+            }
+        } else {
+            if !self.has_all_nonces_of(verifier_context) {
+                return PegOutVerifierStatus::PegOutPendingNonces;
+            } else if !self.has_all_nonces(&verifier_context.n_of_n_public_keys) {
+                return PegOutVerifierStatus::PegOutAwaitingNonces;
+            } else if !self.has_all_signatures_of(verifier_context) {
+                return PegOutVerifierStatus::PegOutPendingSignatures;
+            } else if !self.has_all_signatures(&verifier_context.n_of_n_public_keys) {
+                return PegOutVerifierStatus::PegOutAwaitingSignatures;
+            } else {
+                return PegOutVerifierStatus::PegOutWait;
+            }
+        }
+    }
+
+    pub async fn operator_status(&self, client: &AsyncClient) -> PegOutOperatorStatus {
+        if self.n_of_n_presigned && self.is_peg_out_initiated() {
+            let (
+                assert_initial_status,
+                assert_commit_1_status,
+                assert_commit_2_status,
+                assert_final_status,
+                challenge_status,
+                disprove_chain_status,
+                disprove_status,
+                peg_out_confirm_status,
+                kick_off_1_status,
+                kick_off_2_status,
+                kick_off_timeout_status,
+                peg_out_status,
+                start_time_timeout_status,
+                start_time_status,
+                take_1_status,
+                take_2_status,
+            ) = Self::get_peg_out_statuses(self, client).await;
+            let blockchain_height = client.get_height().await;
+
+            if peg_out_status.is_some_and(|status| status.unwrap().confirmed) {
+                if kick_off_2_status
+                    .as_ref()
+                    .is_ok_and(|status| status.confirmed)
+                {
+                    if take_1_status.as_ref().is_ok_and(|status| status.confirmed)
+                        || take_2_status.as_ref().is_ok_and(|status| status.confirmed)
+                    {
+                        return PegOutOperatorStatus::PegOutComplete;
+                    } else if disprove_chain_status
+                        .as_ref()
+                        .is_ok_and(|status| status.confirmed)
+                        || disprove_status
+                            .as_ref()
+                            .is_ok_and(|status| status.confirmed)
+                    {
+                        return PegOutOperatorStatus::PegOutFailed; // TODO: can be also `PegOutOperatorStatus::PegOutComplete`
+                    } else if challenge_status.is_ok_and(|status| status.confirmed) {
+                        if assert_final_status
+                            .as_ref()
+                            .is_ok_and(|status| status.confirmed)
+                        {
+                            if assert_final_status
+                                .as_ref()
+                                .unwrap()
+                                .block_height
+                                .is_some_and(|block_height| {
+                                    blockchain_height.is_ok_and(|blockchain_height| {
+                                        block_height + self.connector_4.num_blocks_timelock
+                                            <= blockchain_height
+                                    })
+                                })
+                            {
+                                return PegOutOperatorStatus::PegOutTake2Available;
+                            } else {
+                                return PegOutOperatorStatus::PegOutWait;
+                            }
+                        } else if kick_off_2_status
+                            .as_ref()
+                            .unwrap()
+                            .block_height
+                            .is_some_and(|block_height| {
+                                blockchain_height.is_ok_and(|blockchain_height| {
+                                    block_height + self.connector_b.num_blocks_timelock_1
+                                        <= blockchain_height
+                                })
+                            })
+                        {
+                            if assert_initial_status
+                                .as_ref()
+                                .is_ok_and(|status| status.confirmed)
+                            {
+                                if assert_commit_1_status
+                                    .as_ref()
+                                    .is_ok_and(|status| status.confirmed)
+                                    && assert_commit_2_status
+                                        .as_ref()
+                                        .is_ok_and(|status| status.confirmed)
+                                {
+                                    return PegOutOperatorStatus::PegOutAssertFinalAvailable;
+                                } else if assert_commit_1_status
+                                    .as_ref()
+                                    .is_ok_and(|status| status.confirmed)
+                                {
+                                    return PegOutOperatorStatus::PegOutAssertCommit2Available;
+                                } else {
+                                    return PegOutOperatorStatus::PegOutAssertCommit1Available;
+                                }
+                            } else {
+                                return PegOutOperatorStatus::PegOutAssertInitialAvailable;
+                            }
+                        } else {
+                            return PegOutOperatorStatus::PegOutWait;
+                        }
+                    } else if kick_off_2_status
+                        .as_ref()
+                        .unwrap()
+                        .block_height
+                        .is_some_and(|block_height| {
+                            blockchain_height.is_ok_and(|blockchain_height| {
+                                block_height + self.connector_3.num_blocks_timelock
+                                    <= blockchain_height
+                            })
+                        })
+                    {
+                        return PegOutOperatorStatus::PegOutTake1Available;
+                    } else {
+                        return PegOutOperatorStatus::PegOutWait;
+                    }
+                } else if kick_off_1_status
+                    .as_ref()
+                    .is_ok_and(|status| status.confirmed)
+                {
+                    if start_time_timeout_status
+                        .as_ref()
+                        .is_ok_and(|status| status.confirmed)
+                        || kick_off_timeout_status
+                            .as_ref()
+                            .is_ok_and(|status| status.confirmed)
+                    {
+                        return PegOutOperatorStatus::PegOutFailed; // TODO: can be also `PegOutOperatorStatus::PegOutComplete`
+                    } else if start_time_status
+                        .as_ref()
+                        .is_ok_and(|status| status.confirmed)
+                    {
+                        if kick_off_1_status
+                            .as_ref()
+                            .unwrap()
+                            .block_height
+                            .is_some_and(|block_height| {
+                                blockchain_height.is_ok_and(|blockchain_height| {
+                                    block_height + self.connector_1.num_blocks_timelock_leaf_0
+                                        <= blockchain_height
+                                })
+                            })
+                        {
+                            return PegOutOperatorStatus::PegOutKickOff2Available;
+                        } else {
+                            return PegOutOperatorStatus::PegOutWait;
+                        }
+                    } else {
+                        return PegOutOperatorStatus::PegOutStartTimeAvailable;
+                    }
+                } else if peg_out_confirm_status
+                    .as_ref()
+                    .is_ok_and(|status| status.confirmed)
+                {
+                    return PegOutOperatorStatus::PegOutKickOff1Available;
+                } else {
+                    return PegOutOperatorStatus::PegOutPegOutConfirmAvailable;
+                }
+            } else {
+                return PegOutOperatorStatus::PegOutStartPegOut;
+            }
+        }
+
+        PegOutOperatorStatus::PegOutWait
+    }
+
+    pub fn interpret_withdrawer_status(
+        &self,
+        peg_out_status: Option<&Result<TxStatus, esplora_client::Error>>,
+    ) -> PegOutWithdrawerStatus {
+        if let Some(peg_out_status) = peg_out_status {
+            if peg_out_status.as_ref().is_ok_and(|status| status.confirmed) {
+                PegOutWithdrawerStatus::PegOutComplete
+            } else {
+                PegOutWithdrawerStatus::PegOutWait
+            }
+        } else {
+            PegOutWithdrawerStatus::PegOutNotStarted
+        }
+    }
+
+    pub async fn withdrawer_status(&self, client: &AsyncClient) -> PegOutWithdrawerStatus {
+        let peg_out_status = match self.peg_out_transaction {
+            Some(_) => {
+                let peg_out_txid = self
+                    .peg_out_transaction
+                    .as_ref()
+                    .unwrap()
+                    .tx()
+                    .compute_txid();
+                let peg_out_status = client.get_tx_status(&peg_out_txid).await;
+                Some(peg_out_status)
+            }
+            None => None,
+        };
+        self.interpret_withdrawer_status(peg_out_status.as_ref())
+    }
+
+    pub async fn peg_out(
+        &mut self,
+        client: &AsyncClient,
+        context: &OperatorContext,
+        input: Input,
+    ) -> Result<Transaction, Error> {
+        if !self.is_peg_out_initiated() {
+            return Err(Error::L2(L2Error::PegOutNotInitiated));
+        }
+
+        if self.peg_out_transaction.is_some() {
+            let txid = self
+                .peg_out_transaction
+                .as_ref()
+                .unwrap()
+                .tx()
+                .compute_txid();
+            verify_if_not_mined(client, txid).await?;
+        } else {
+            let event = self.peg_out_chain_event.as_ref().unwrap();
+            let tx = PegOutTransaction::new(context, event, input);
+            self.peg_out_transaction = Some(tx);
+        }
+
+        Ok(self.peg_out_transaction.as_mut().unwrap().finalize())
+    }
+
+    pub async fn peg_out_confirm(&mut self, client: &AsyncClient) -> Result<Transaction, Error> {
+        verify_if_not_mined(client, self.peg_out_confirm_transaction.tx().compute_txid()).await?;
+
+        if self.peg_out_transaction.as_ref().is_some() {
+            let peg_out_txid = self
+                .peg_out_transaction
+                .as_ref()
+                .unwrap()
+                .tx()
+                .compute_txid();
+            let peg_out_status = client.get_tx_status(&peg_out_txid).await;
+
+            match peg_out_status {
+                Ok(status) => match status.confirmed {
+                    true => Ok(self.peg_out_confirm_transaction.finalize()),
+                    false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                        NamedTx::for_tx(
+                            self.peg_out_transaction.as_ref().unwrap(),
+                            status.confirmed,
+                        ),
+                    ]))),
+                },
+                Err(e) => Err(Error::Esplora(e)),
+            }
+        } else {
+            Err(Error::Graph(GraphError::PrecedingTxNotCreated("peg-out")))
+        }
+    }
+
+    pub async fn kick_off_1(
+        &mut self,
+        client: &AsyncClient,
+        context: &OperatorContext,
+        source_network_txid_commitment_secret: &WinternitzSecret,
+        destination_network_txid_commitment_secret: &WinternitzSecret,
+    ) -> Result<Transaction, Error> {
+        verify_if_not_mined(client, self.kick_off_1_transaction.tx().compute_txid()).await?;
+
+        let peg_out_confirm_txid = self.peg_out_confirm_transaction.tx().compute_txid();
+        let peg_out_confirm_status = client.get_tx_status(&peg_out_confirm_txid).await;
+
+        match peg_out_confirm_status {
+            Ok(status) => match status.confirmed {
+                true => {
+                    let pegout_txid = self
+                        .peg_out_transaction
+                        .as_ref()
+                        .unwrap()
+                        .tx()
+                        .compute_txid()
+                        .as_byte_array()
+                        .to_owned();
+                    let source_network_txid_inputs = WinternitzSigningInputs {
+                        message: &pegout_txid,
+                        signing_key: source_network_txid_commitment_secret,
+                    };
+                    let destination_network_txid_inputs = WinternitzSigningInputs {
+                        message: self
+                            .peg_out_chain_event
+                            .as_ref()
+                            .unwrap()
+                            .tx_hash
+                            .as_slice(),
+                        signing_key: destination_network_txid_commitment_secret,
+                    };
+                    self.kick_off_1_transaction.sign(
+                        context,
+                        &self.connector_6,
+                        &source_network_txid_inputs,
+                        &destination_network_txid_inputs,
+                    );
+                    Ok(self.kick_off_1_transaction.finalize())
+                }
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.peg_out_confirm_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn challenge(
+        &mut self,
+        client: &AsyncClient,
+        crowdfundng_inputs: &Vec<InputWithScript<'_>>,
+        keypair: &Keypair,
+        output_script_pubkey: ScriptBuf,
+    ) -> Result<Transaction, Error> {
+        verify_if_not_mined(client, self.challenge_transaction.tx().compute_txid()).await?;
+
+        let kick_off_1_txid = self.kick_off_1_transaction.tx().compute_txid();
+        let kick_off_1_status = client.get_tx_status(&kick_off_1_txid).await;
+
+        match kick_off_1_status {
+            Ok(status) => match status.confirmed {
+                true => {
+                    self.challenge_transaction.add_inputs_and_output(
+                        crowdfundng_inputs,
+                        keypair,
+                        output_script_pubkey,
+                    );
+                    Ok(self.challenge_transaction.finalize())
+                }
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.kick_off_1_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn start_time(
+        &mut self,
+        client: &AsyncClient,
+        context: &OperatorContext,
+        start_time_commitment_secret: &WinternitzSecret,
+    ) -> Result<Transaction, Error> {
+        verify_if_not_mined(client, self.start_time_transaction.tx().compute_txid()).await?;
+
+        let kick_off_1_txid = self.kick_off_1_transaction.tx().compute_txid();
+        let kick_off_1_status = client.get_tx_status(&kick_off_1_txid).await;
+
+        match kick_off_1_status {
+            Ok(status) => match status.confirmed {
+                true => {
+                    self.start_time_transaction.sign(
+                        context,
+                        &self.connector_2,
+                        get_start_time_block_number(context.network),
+                        start_time_commitment_secret,
+                    );
+                    Ok(self.start_time_transaction.finalize())
+                }
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.kick_off_1_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn start_time_timeout(
+        &mut self,
+        client: &AsyncClient,
+        output_script_pubkey: ScriptBuf,
+    ) -> Result<Transaction, Error> {
+        verify_if_not_mined(
+            client,
+            self.start_time_timeout_transaction.tx().compute_txid(),
+        )
+        .await?;
+
+        let kick_off_1_txid = self.kick_off_1_transaction.tx().compute_txid();
+        let kick_off_1_status = client.get_tx_status(&kick_off_1_txid).await;
+
+        let blockchain_height = client.get_height().await;
+
+        match kick_off_1_status {
+            Ok(status) => match status.confirmed {
+                true => match status.block_height {
+                    Some(block_height)
+                        if blockchain_height.is_ok_and(|height| {
+                            block_height + self.connector_1.num_blocks_timelock_leaf_2 <= height
+                        }) =>
+                    {
+                        self.start_time_timeout_transaction
+                            .add_output(output_script_pubkey);
+                        Ok(self.start_time_timeout_transaction.finalize())
+                    }
+                    _ => Err(Error::Graph(GraphError::PrecedingTxTimelockNotMet(
+                        NamedTx::for_tx(&self.kick_off_1_transaction, status.confirmed),
+                    ))),
+                },
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.kick_off_1_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn kick_off_2(
+        &mut self,
+        client: &AsyncClient,
+        context: &OperatorContext,
+        superblock_commitment_secret: &WinternitzSecret,
+        superblock_hash_commitment_secret: &WinternitzSecret,
+    ) -> Result<Transaction, Error> {
+        verify_if_not_mined(client, self.kick_off_2_transaction.tx().compute_txid()).await?;
+
+        let kick_off_1_txid = self.kick_off_1_transaction.tx().compute_txid();
+        let kick_off_1_status = client.get_tx_status(&kick_off_1_txid).await;
+
+        let blockchain_height = client.get_height().await;
+
+        match kick_off_1_status {
+            Ok(status) => match status.confirmed {
+                true => match status.block_height {
+                    Some(block_height)
+                        if blockchain_height.is_ok_and(|height| {
+                            block_height + self.connector_1.num_blocks_timelock_leaf_0 <= height
+                        }) =>
+                    {
+                        let superblock_header = find_superblock();
+                        self.kick_off_2_transaction.sign(
+                            context,
+                            &self.connector_1,
+                            &WinternitzSigningInputs {
+                                message: &get_superblock_message(&superblock_header),
+                                signing_key: superblock_commitment_secret,
+                            },
+                            &WinternitzSigningInputs {
+                                message: &get_superblock_hash_message(&superblock_header),
+                                signing_key: superblock_hash_commitment_secret,
+                            },
+                        );
+                        Ok(self.kick_off_2_transaction.finalize())
+                    }
+                    _ => Err(Error::Graph(GraphError::PrecedingTxTimelockNotMet(
+                        NamedTx::for_tx(&self.kick_off_1_transaction, status.confirmed),
+                    ))),
+                },
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.kick_off_1_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn kick_off_timeout(
+        &mut self,
+        client: &AsyncClient,
+        output_script_pubkey: ScriptBuf,
+    ) -> Result<Transaction, Error> {
+        verify_if_not_mined(
+            client,
+            self.kick_off_timeout_transaction.tx().compute_txid(),
+        )
+        .await?;
+
+        let kick_off_1_txid = self.kick_off_1_transaction.tx().compute_txid();
+        let kick_off_1_status = client.get_tx_status(&kick_off_1_txid).await;
+
+        let blockchain_height = client.get_height().await;
+
+        match kick_off_1_status {
+            Ok(status) => match status.confirmed {
+                true => match status.block_height {
+                    Some(block_height)
+                        if blockchain_height.is_ok_and(|height| {
+                            block_height + self.connector_1.num_blocks_timelock_leaf_1 <= height
+                        }) =>
+                    {
+                        self.kick_off_timeout_transaction
+                            .add_output(output_script_pubkey);
+                        Ok(self.kick_off_timeout_transaction.finalize())
+                    }
+                    _ => Err(Error::Graph(GraphError::PrecedingTxTimelockNotMet(
+                        NamedTx::for_tx(&self.kick_off_1_transaction, status.confirmed),
+                    ))),
+                },
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.kick_off_1_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn assert_initial(&mut self, client: &AsyncClient) -> Result<Transaction, Error> {
+        verify_if_not_mined(client, self.assert_initial_transaction.tx().compute_txid()).await?;
+
+        let kick_off_2_txid = self.kick_off_2_transaction.tx().compute_txid();
+        let kick_off_2_status = client.get_tx_status(&kick_off_2_txid).await;
+
+        let blockchain_height = client.get_height().await;
+
+        match kick_off_2_status {
+            Ok(status) => match status.confirmed {
+                true => match status.block_height {
+                    Some(block_height)
+                        if blockchain_height.is_ok_and(|height| {
+                            block_height + self.connector_b.num_blocks_timelock_1 <= height
+                        }) =>
+                    {
+                        Ok(self.assert_initial_transaction.finalize())
+                    }
+                    _ => Err(Error::Graph(GraphError::PrecedingTxTimelockNotMet(
+                        NamedTx::for_tx(&self.kick_off_2_transaction, status.confirmed),
+                    ))),
+                },
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.kick_off_2_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn assert_commit_1(
+        &mut self,
+        client: &AsyncClient,
+        commitment_secrets: &HashMap<CommitmentMessageId, WinternitzSecret>,
+        proof: &RawProof,
+    ) -> Result<Transaction, Error> {
+        verify_if_not_mined(client, self.assert_commit_1_transaction.tx().compute_txid()).await?;
+
+        let assert_initial_txid = self.assert_initial_transaction.tx().compute_txid();
+        let assert_initial_status = client.get_tx_status(&assert_initial_txid).await;
+
+        match assert_initial_status {
+            Ok(status) => match status.confirmed {
+                true => {
+                    let (witness_for_commit1, _) =
+                        sign_assert_tx_with_groth16_proof(commitment_secrets, proof);
+                    self.assert_commit_1_transaction
+                        .sign(&self.connector_e_1, witness_for_commit1.clone());
+                    Ok(self.assert_commit_1_transaction.finalize())
+                }
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.assert_initial_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn assert_commit_2(
+        &mut self,
+        client: &AsyncClient,
+        commitment_secrets: &HashMap<CommitmentMessageId, WinternitzSecret>,
+        proof: &RawProof,
+    ) -> Result<Transaction, Error> {
+        verify_if_not_mined(client, self.assert_commit_2_transaction.tx().compute_txid()).await?;
+
+        let assert_initial_txid = self.assert_initial_transaction.tx().compute_txid();
+        let assert_initial_status = client.get_tx_status(&assert_initial_txid).await;
+
+        match assert_initial_status {
+            Ok(status) => match status.confirmed {
+                true => {
+                    let (_, witness_for_commit2) =
+                        sign_assert_tx_with_groth16_proof(commitment_secrets, proof);
+                    self.assert_commit_2_transaction
+                        .sign(&self.connector_e_2, witness_for_commit2.clone());
+                    Ok(self.assert_commit_2_transaction.finalize())
+                }
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.assert_initial_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn assert_final(&mut self, client: &AsyncClient) -> Result<Transaction, Error> {
+        verify_if_not_mined(client, self.assert_final_transaction.tx().compute_txid()).await?;
+
+        let assert_initial_txid = self.assert_initial_transaction.tx().compute_txid();
+        let assert_initial_status = client.get_tx_status(&assert_initial_txid).await;
+
+        match assert_initial_status {
+            Ok(status) => match status.confirmed {
+                true => Ok(self.assert_final_transaction.finalize()),
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.assert_initial_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn disprove(
+        &mut self,
+        client: &AsyncClient,
+        output_script_pubkey: ScriptBuf,
+        verifying_key: &ZkProofVerifyingKey,
+    ) -> Result<Transaction, Error> {
+        verify_if_not_mined(client, self.disprove_transaction.tx().compute_txid()).await?;
+
+        let assert_final_txid = self.assert_final_transaction.tx().compute_txid();
+        let assert_final_status = client.get_tx_status(&assert_final_txid).await;
+
+        match assert_final_status {
+            Ok(status) => match status.confirmed {
+                true => {
+                    // get commit from assert_commit txs
+                    let assert_commit_1_witness =
+                        get_commit_from_assert_commit_tx(self.assert_commit_1_transaction.tx());
+                    let assert_commit_2_witness =
+                        get_commit_from_assert_commit_tx(self.assert_commit_2_transaction.tx());
+
+                    let (input_script_index, disprove_witness) =
+                        self.connector_c.generate_disprove_witness(
+                            assert_commit_1_witness,
+                            assert_commit_2_witness,
+                            verifying_key,
+                        )?;
+                    self.disprove_transaction.add_input_output(
+                        &self.connector_c,
+                        input_script_index as u32,
+                        disprove_witness,
+                        output_script_pubkey,
+                    );
+                    Ok(self.disprove_transaction.finalize())
+                }
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.assert_final_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn disprove_chain(
+        &mut self,
+        client: &AsyncClient,
+        output_script_pubkey: ScriptBuf,
+    ) -> Result<Transaction, Error> {
+        verify_if_not_mined(client, self.disprove_chain_transaction.tx().compute_txid()).await?;
+
+        let kick_off_2_txid = self.kick_off_2_transaction.tx().compute_txid();
+        let kick_off_2_status = client.get_tx_status(&kick_off_2_txid).await;
+
+        match kick_off_2_status {
+            Ok(status) => match status.confirmed {
+                true => {
+                    self.disprove_chain_transaction
+                        .add_output(output_script_pubkey);
+
+                    // TODO: This must be a heavier superblock than the one the Operator committed in the KickOff2 tx.
+                    let disprove_sb = find_superblock();
+
+                    self.disprove_chain_transaction.sign(
+                        &disprove_sb,
+                        self.start_time_transaction
+                            .start_time_witness
+                            .as_ref()
+                            .ok_or(Error::Graph(GraphError::WitnessNotGenerated(
+                                CommitmentMessageId::StartTime,
+                            )))?,
+                        self.kick_off_2_transaction
+                            .superblock_hash_witness
+                            .as_ref()
+                            .ok_or(Error::Graph(GraphError::WitnessNotGenerated(
+                                CommitmentMessageId::SuperblockHash,
+                            )))?,
+                    );
+
+                    Ok(self.disprove_chain_transaction.finalize())
+                }
+                false => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx::for_tx(&self.kick_off_2_transaction, status.confirmed),
+                ]))),
+            },
+            Err(e) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn take_1(&mut self, client: &AsyncClient) -> Result<Transaction, Error> {
+        verify_if_not_mined(client, self.take_1_transaction.tx().compute_txid()).await?;
+        verify_if_not_mined(client, self.challenge_transaction.tx().compute_txid()).await?;
+        verify_if_not_mined(client, self.assert_initial_transaction.tx().compute_txid()).await?;
+        verify_if_not_mined(client, self.disprove_chain_transaction.tx().compute_txid()).await?;
+
+        let peg_in_confirm_status = client.get_tx_status(&self.peg_in_confirm_txid).await;
+
+        let kick_off_1_txid = self.kick_off_1_transaction.tx().compute_txid();
+        let kick_off_1_status = client.get_tx_status(&kick_off_1_txid).await;
+
+        let kick_off_2_txid = self.kick_off_2_transaction.tx().compute_txid();
+        let kick_off_2_status = client.get_tx_status(&kick_off_2_txid).await;
+
+        let blockchain_height = client.get_height().await;
+
+        match (peg_in_confirm_status, kick_off_1_status, kick_off_2_status) {
+            (Ok(pic_stat), Ok(ko1_stat), Ok(ko2_stat)) => {
+                match (pic_stat.confirmed, ko1_stat.confirmed, ko2_stat.confirmed) {
+                    (true, true, true) => match ko2_stat.block_height {
+                        Some(block_height)
+                            if blockchain_height.is_ok_and(|height| {
+                                block_height + self.connector_3.num_blocks_timelock <= height
+                            }) =>
+                        {
+                            Ok(self.take_1_transaction.finalize())
+                        }
+                        _ => Err(Error::Graph(GraphError::PrecedingTxTimelockNotMet(
+                            NamedTx::for_tx(&self.kick_off_2_transaction, ko2_stat.confirmed),
+                        ))),
+                    },
+                    _ => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                        NamedTx {
+                            txid: self.peg_in_confirm_txid,
+                            name: PEG_IN_CONFIRM_TX_NAME,
+                            confirmed: pic_stat.confirmed,
+                        },
+                        NamedTx::for_tx(&self.kick_off_1_transaction, ko1_stat.confirmed),
+                        NamedTx::for_tx(&self.kick_off_2_transaction, ko2_stat.confirmed),
+                    ]))),
+                }
+            }
+            (Err(e), _, _) | (_, Err(e), _) | (_, _, Err(e)) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub async fn take_2(
+        &mut self,
+        client: &AsyncClient,
+        context: &OperatorContext,
+    ) -> Result<Transaction, Error> {
+        verify_if_not_mined(client, self.take_2_transaction.tx().compute_txid()).await?;
+        verify_if_not_mined(client, self.take_1_transaction.tx().compute_txid()).await?;
+        verify_if_not_mined(client, self.disprove_transaction.tx().compute_txid()).await?;
+
+        let peg_in_confirm_status = client.get_tx_status(&self.peg_in_confirm_txid).await;
+
+        let assert_final_txid = self.assert_final_transaction.tx().compute_txid();
+        let assert_final_status = client.get_tx_status(&assert_final_txid).await;
+
+        let blockchain_height = client.get_height().await;
+
+        match (peg_in_confirm_status, assert_final_status) {
+            (Ok(pic_stat), Ok(assert_stat)) => match (pic_stat.confirmed, assert_stat.confirmed) {
+                (true, true) => match assert_stat.block_height {
+                    Some(block_height)
+                        if blockchain_height.is_ok_and(|height| {
+                            block_height + self.connector_4.num_blocks_timelock <= height
+                        }) =>
+                    {
+                        self.take_2_transaction.sign(context, &self.connector_c);
+                        Ok(self.take_2_transaction.finalize())
+                    }
+                    _ => Err(Error::Graph(GraphError::PrecedingTxTimelockNotMet(
+                        NamedTx::for_tx(&self.assert_final_transaction, assert_stat.confirmed),
+                    ))),
+                },
+                _ => Err(Error::Graph(GraphError::PrecedingTxNotConfirmed(vec![
+                    NamedTx {
+                        txid: self.peg_in_confirm_txid,
+                        name: PEG_IN_CONFIRM_TX_NAME,
+                        confirmed: pic_stat.confirmed,
+                    },
+                    NamedTx::for_tx(&self.assert_final_transaction, assert_stat.confirmed),
+                ]))),
+            },
+            (Err(e), _) | (_, Err(e)) => Err(Error::Esplora(e)),
+        }
+    }
+
+    pub fn is_peg_out_initiated(&self) -> bool { self.peg_out_chain_event.is_some() }
+
+    pub fn min_crowdfunding_amount(&self) -> u64 {
+        self.challenge_transaction.min_crowdfunding_amount()
+    }
+
+    pub async fn match_and_set_peg_out_event(
+        &mut self,
+        all_events: &mut Vec<PegOutEvent>,
+    ) -> Result<Option<PegOutEvent>, String> {
+        let mut events: Vec<PegOutEvent> = Vec::new();
+        let mut ids: Vec<usize> = Vec::new();
+        for (i, event) in all_events.iter().enumerate() {
+            if self.peg_in_confirm_txid.eq(&event.source_outpoint.txid)
+                && self.operator_public_key.eq(&event.operator_public_key)
+            {
+                events.push(event.clone());
+                ids.push(i);
+            }
+        }
+        ids.iter().for_each(|x| {
+            all_events.swap_remove(*x);
+        });
+
+        match events.len() {
+            0 => Ok(None),
+            1 => {
+                self.peg_out_chain_event = Some(events[0].clone());
+                Ok(Some(events[0].clone()))
+            }
+            _ => Err(String::from("Event from L2 chain is not unique")),
+        }
+    }
+
+    async fn get_peg_out_statuses(
+        &self,
+        client: &AsyncClient,
+    ) -> (
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+        Option<Result<TxStatus, esplora_client::Error>>,
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+        Result<TxStatus, esplora_client::Error>,
+    ) {
+        let assert_initial_status = client
+            .get_tx_status(&self.assert_initial_transaction.tx().compute_txid())
+            .await;
+
+        let assert_commit_1_status = client
+            .get_tx_status(&self.assert_commit_1_transaction.tx().compute_txid())
+            .await;
+
+        let assert_commit_2_status = client
+            .get_tx_status(&self.assert_commit_2_transaction.tx().compute_txid())
+            .await;
+
+        let assert_final_status = client
+            .get_tx_status(&self.assert_final_transaction.tx().compute_txid())
+            .await;
+
+        let challenge_status = client
+            .get_tx_status(&self.challenge_transaction.tx().compute_txid())
+            .await;
+
+        let disprove_chain_status = client
+            .get_tx_status(&self.disprove_chain_transaction.tx().compute_txid())
+            .await;
+
+        let disprove_status = client
+            .get_tx_status(&self.disprove_transaction.tx().compute_txid())
+            .await;
+
+        let peg_out_confirm_status = client
+            .get_tx_status(&self.peg_out_confirm_transaction.tx().compute_txid())
+            .await;
+
+        let kick_off_1_status = client
+            .get_tx_status(&self.kick_off_1_transaction.tx().compute_txid())
+            .await;
+
+        let kick_off_2_status = client
+            .get_tx_status(&self.kick_off_2_transaction.tx().compute_txid())
+            .await;
+
+        let kick_off_timeout_status = client
+            .get_tx_status(&self.kick_off_timeout_transaction.tx().compute_txid())
+            .await;
+
+        let mut peg_out_status: Option<Result<TxStatus, esplora_client::Error>> = None;
+        if self.peg_out_transaction.is_some() {
+            peg_out_status = Some(
+                client
+                    .get_tx_status(
+                        &self
+                            .peg_out_transaction
+                            .as_ref()
+                            .unwrap()
+                            .tx()
+                            .compute_txid(),
+                    )
+                    .await,
+            );
+        }
+
+        let start_time_timeout_status = client
+            .get_tx_status(&self.start_time_timeout_transaction.tx().compute_txid())
+            .await;
+
+        let start_time_status = client
+            .get_tx_status(&self.start_time_transaction.tx().compute_txid())
+            .await;
+
+        let take_1_status = client
+            .get_tx_status(&self.take_1_transaction.tx().compute_txid())
+            .await;
+
+        let take_2_status = client
+            .get_tx_status(&self.take_2_transaction.tx().compute_txid())
+            .await;
+
+        (
+            assert_initial_status,
+            assert_commit_1_status,
+            assert_commit_2_status,
+            assert_final_status,
+            challenge_status,
+            disprove_chain_status,
+            disprove_status,
+            peg_out_confirm_status,
+            kick_off_1_status,
+            kick_off_2_status,
+            kick_off_timeout_status,
+            peg_out_status,
+            start_time_timeout_status,
+            start_time_status,
+            take_1_status,
+            take_2_status,
+        )
+    }
+
+    pub fn validate(&self) -> bool {
+        let mut ret_val = true;
+        let peg_out_graph = self.new_for_validation();
+        if !validate_transaction(
+            self.assert_initial_transaction.tx(),
+            peg_out_graph.assert_initial_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.assert_commit_1_transaction.tx(),
+            peg_out_graph.assert_commit_1_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.assert_commit_2_transaction.tx(),
+            peg_out_graph.assert_commit_2_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.assert_final_transaction.tx(),
+            peg_out_graph.assert_final_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.challenge_transaction.tx(),
+            peg_out_graph.challenge_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.disprove_chain_transaction.tx(),
+            peg_out_graph.disprove_chain_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.disprove_transaction.tx(),
+            peg_out_graph.disprove_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.peg_out_confirm_transaction.tx(),
+            peg_out_graph.peg_out_confirm_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.kick_off_1_transaction.tx(),
+            peg_out_graph.kick_off_1_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.kick_off_2_transaction.tx(),
+            peg_out_graph.kick_off_2_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.kick_off_timeout_transaction.tx(),
+            peg_out_graph.kick_off_timeout_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.start_time_transaction.tx(),
+            peg_out_graph.start_time_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.start_time_timeout_transaction.tx(),
+            peg_out_graph.start_time_timeout_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.take_1_transaction.tx(),
+            peg_out_graph.take_1_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+        if !validate_transaction(
+            self.take_2_transaction.tx(),
+            peg_out_graph.take_2_transaction.tx(),
+        ) {
+            ret_val = false;
+        }
+
+        if !verify_public_nonces_for_tx(&self.assert_initial_transaction) {
+            ret_val = false;
+        }
+        if !verify_public_nonces_for_tx(&self.assert_final_transaction) {
+            ret_val = false;
+        }
+        if !verify_public_nonces_for_tx(&self.disprove_chain_transaction) {
+            ret_val = false;
+        }
+        if !verify_public_nonces_for_tx(&self.disprove_transaction) {
+            ret_val = false;
+        }
+        if !verify_public_nonces_for_tx(&self.kick_off_timeout_transaction) {
+            ret_val = false;
+        }
+        if !verify_public_nonces_for_tx(&self.start_time_transaction) {
+            ret_val = false;
+        }
+        if !verify_public_nonces_for_tx(&self.start_time_timeout_transaction) {
+            ret_val = false;
+        }
+        if !verify_public_nonces_for_tx(&self.take_1_transaction) {
+            ret_val = false;
+        }
+        if !verify_public_nonces_for_tx(&self.take_2_transaction) {
+            ret_val = false;
+        }
+
+        ret_val
+    }
+
+    pub fn merge(&mut self, source_peg_out_graph: &PegOutGraph) {
+        self.assert_initial_transaction
+            .merge(&source_peg_out_graph.assert_initial_transaction);
+
+        self.assert_commit_1_transaction
+            .merge(&source_peg_out_graph.assert_commit_1_transaction);
+
+        self.assert_commit_2_transaction
+            .merge(&source_peg_out_graph.assert_commit_2_transaction);
+
+        self.assert_final_transaction
+            .merge(&source_peg_out_graph.assert_final_transaction);
+
+        self.challenge_transaction
+            .merge(&source_peg_out_graph.challenge_transaction);
+
+        self.disprove_chain_transaction
+            .merge(&source_peg_out_graph.disprove_chain_transaction);
+
+        self.disprove_transaction
+            .merge(&source_peg_out_graph.disprove_transaction);
+
+        self.kick_off_timeout_transaction
+            .merge(&source_peg_out_graph.kick_off_timeout_transaction);
+
+        self.start_time_transaction
+            .merge(&source_peg_out_graph.start_time_transaction);
+
+        self.start_time_timeout_transaction
+            .merge(&source_peg_out_graph.start_time_timeout_transaction);
+
+        self.take_1_transaction
+            .merge(&source_peg_out_graph.take_1_transaction);
+
+        self.take_2_transaction
+            .merge(&source_peg_out_graph.take_2_transaction);
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn create_new_connectors(
+        network: Network,
+        n_of_n_taproot_public_key: &XOnlyPublicKey,
+        operator_taproot_public_key: &XOnlyPublicKey,
+        operator_public_key: &PublicKey,
+        connector_1_commitment_public_keys: &HashMap<CommitmentMessageId, WinternitzPublicKey>,
+        connector_2_commitment_public_keys: &HashMap<CommitmentMessageId, WinternitzPublicKey>,
+        connector_6_commitment_public_keys: &HashMap<CommitmentMessageId, WinternitzPublicKey>,
+        connector_b_commitment_public_keys: &HashMap<CommitmentMessageId, WinternitzPublicKey>,
+        connector_e1_commitment_public_keys: &[BTreeMap<
+            CommitmentMessageId,
+            WinternitzPublicKey,
+        >],
+        connector_e2_commitment_public_keys: &[BTreeMap<
+            CommitmentMessageId,
+            WinternitzPublicKey,
+        >],
+    ) -> PegOutConnectors {
+        let connector_0 = Connector0::new(network, n_of_n_taproot_public_key);
+        let connector_1 = Connector1::new(
+            network,
+            operator_taproot_public_key,
+            n_of_n_taproot_public_key,
+            connector_1_commitment_public_keys,
+        );
+        let connector_2 = Connector2::new(
+            network,
+            operator_taproot_public_key,
+            n_of_n_taproot_public_key,
+            connector_2_commitment_public_keys,
+        );
+        let connector_3 = Connector3::new(network, operator_public_key);
+        let connector_4 = Connector4::new(network, operator_public_key);
+        let connector_5 = Connector5::new(network, n_of_n_taproot_public_key);
+        let connector_6 = Connector6::new(
+            network,
+            operator_taproot_public_key,
+            connector_6_commitment_public_keys,
+        );
+        let connector_a = ConnectorA::new(
+            network,
+            operator_taproot_public_key,
+            n_of_n_taproot_public_key,
+        );
+        let connector_b = ConnectorB::new(
+            network,
+            n_of_n_taproot_public_key,
+            connector_b_commitment_public_keys,
+        );
+
+        // connector c pks = connector e1 pks + connector e2 pks
+        let commitment_public_keys = &merge_to_connector_c_commits_public_key(
+            connector_e1_commitment_public_keys,
+            connector_e2_commitment_public_keys,
+        );
+        let connector_c = ConnectorC::new(
+            network,
+            operator_taproot_public_key,
+            commitment_public_keys,
+            ConnectorC::cache_id(commitment_public_keys)
+                .inspect_err(|e| {
+                    eprintln!("Failed to generate cache id: {}", e);
+                })
+                .ok(),
+        );
+        let connector_d = ConnectorD::new(network, n_of_n_taproot_public_key);
+
+        let assert_commit_connectors_e_1 = AssertCommit1ConnectorsE {
+            connectors_e: connector_e1_commitment_public_keys
+                .iter()
+                .map(|x| ConnectorE::new(network, operator_public_key, x))
+                .collect(),
+        };
+        let assert_commit_connectors_e_2 = AssertCommit2ConnectorsE {
+            connectors_e: connector_e2_commitment_public_keys
+                .iter()
+                .map(|x| ConnectorE::new(network, operator_public_key, x))
+                .collect(),
+        };
+
+        let connector_f_1 = ConnectorF1::new(network, operator_public_key);
+        let connector_f_2 = ConnectorF2::new(network, operator_public_key);
+
+        PegOutConnectors {
+            connector_0,
+            connector_1,
+            connector_2,
+            connector_3,
+            connector_4,
+            connector_5,
+            connector_6,
+            connector_a,
+            connector_b,
+            connector_c,
+            connector_d,
+            assert_commit_connectors_e_1,
+            assert_commit_connectors_e_2,
+            assert_commit_connectors_f: AssertCommitConnectorsF {
+                connector_f_1,
+                connector_f_2,
+            },
+        }
+    }
+
+    fn all_presigned_txs(&self) -> impl Iterator<Item = &dyn PreSignedMusig2Transaction> {
+        let all_txs: Vec<&dyn PreSignedMusig2Transaction> = vec![
+            &self.assert_initial_transaction,
+            &self.assert_final_transaction,
+            &self.disprove_chain_transaction,
+            &self.disprove_transaction,
+            &self.kick_off_timeout_transaction,
+            &self.start_time_timeout_transaction,
+            &self.take_1_transaction,
+            &self.take_2_transaction,
+        ];
+        all_txs.into_iter()
+    }
+
+    fn all_presigned_txs_mut(
+        &mut self,
+    ) -> impl Iterator<Item = &mut dyn PreSignedMusig2Transaction> {
+        let all_txs: Vec<&mut dyn PreSignedMusig2Transaction> = vec![
+            &mut self.assert_initial_transaction,
+            &mut self.assert_final_transaction,
+            &mut self.disprove_chain_transaction,
+            &mut self.disprove_transaction,
+            &mut self.kick_off_timeout_transaction,
+            &mut self.start_time_timeout_transaction,
+            &mut self.take_1_transaction,
+            &mut self.take_2_transaction,
+        ];
+        all_txs.into_iter()
+    }
+
+    pub fn has_all_nonces_of(&self, context: &VerifierContext) -> bool {
+        self.all_presigned_txs()
+            .all(|x| x.has_nonces_for(context.verifier_public_key))
+    }
+    pub fn has_all_nonces(&self, verifier_pubkeys: &[PublicKey]) -> bool {
+        self.all_presigned_txs()
+            .all(|x| x.has_all_nonces(verifier_pubkeys))
+    }
+    pub fn has_all_signatures_of(&self, context: &VerifierContext) -> bool {
+        self.all_presigned_txs()
+            .all(|x| x.has_signatures_for(context.verifier_public_key))
+    }
+    pub fn has_all_signatures(&self, verifier_pubkeys: &[PublicKey]) -> bool {
+        self.all_presigned_txs()
+            .all(|x| x.has_all_signatures(verifier_pubkeys))
+    }
+}
+
+pub fn generate_id(peg_in_graph: &PegInGraph, operator_public_key: &PublicKey) -> String {
+    let mut hasher = Sha256::new();
+
+    hasher.update(peg_in_graph.id().to_string() + &operator_public_key.to_string());
+
+    hasher.finalize().to_hex_string(Upper)
+}
diff --git a/bridge/src/lib.rs b/bridge/src/lib.rs
new file mode 100644
index 000000000..ad3e9c648
--- /dev/null
+++ b/bridge/src/lib.rs
@@ -0,0 +1,14 @@
+pub mod client;
+pub mod commitments;
+pub mod common;
+pub mod connectors;
+pub mod constants;
+pub mod contexts;
+pub mod error;
+pub mod graphs;
+pub mod proof;
+pub mod scripts;
+pub mod serialization;
+pub mod superblock;
+pub mod transactions;
+pub mod utils;
diff --git a/src/bridge/mod.rs b/bridge/src/mod.rs
similarity index 89%
rename from src/bridge/mod.rs
rename to bridge/src/mod.rs
index de0aedb5a..573da3db7 100644
--- a/src/bridge/mod.rs
+++ b/bridge/src/mod.rs
@@ -5,5 +5,6 @@ pub mod contexts;
 pub mod graphs;
 pub mod scripts;
 pub mod serialization;
+pub mod superblock;
 pub mod transactions;
 pub mod utils;
diff --git a/bridge/src/proof.rs b/bridge/src/proof.rs
new file mode 100644
index 000000000..18fa2a324
--- /dev/null
+++ b/bridge/src/proof.rs
@@ -0,0 +1,91 @@
+use ark_bn254::{g1::G1Affine, Bn254};
+use ark_crypto_primitives::snark::{CircuitSpecificSetupSNARK, SNARK};
+use ark_ec::pairing::Pairing;
+use ark_ff::PrimeField;
+use ark_groth16::Groth16;
+use ark_relations::lc;
+use ark_relations::r1cs::{ConstraintSynthesizer, ConstraintSystemRef, SynthesisError};
+use ark_std::{test_rng, UniformRand};
+
+use bitvm::chunk::api::type_conversion_utils::RawProof;
+use rand::{RngCore, SeedableRng};
+
+// TODO: replace with actual implementation
+pub fn get_proof() -> RawProof {
+    type E = Bn254;
+    let k = 6;
+    let mut rng = ark_std::rand::rngs::StdRng::seed_from_u64(test_rng().next_u64());
+    let circuit = DummyCircuit::<<E as Pairing>::ScalarField> {
+        a: Some(<E as Pairing>::ScalarField::rand(&mut rng)),
+        b: Some(<E as Pairing>::ScalarField::rand(&mut rng)),
+        num_variables: 10,
+        num_constraints: 1 << k,
+    };
+    let (pk, vk) = Groth16::<E>::setup(circuit, &mut rng).unwrap();
+
+    let c = circuit.a.unwrap() * circuit.b.unwrap();
+
+    let proof = Groth16::<E>::prove(&pk, circuit, &mut rng).unwrap();
+
+    RawProof {
+        proof,
+        public: vec![c],
+        vk,
+    }
+}
+
+// DO NOT USE IN PRODUCTION! This is a test function.
+pub fn invalidate_proof(valid_proof: &RawProof) -> RawProof {
+    let mut invalid_proof = valid_proof.clone();
+    let mut rng = ark_std::rand::rngs::StdRng::seed_from_u64(test_rng().next_u64());
+    invalid_proof.proof.a = G1Affine::rand(&mut rng);
+
+    invalid_proof
+}
+
+// TODO: Consider importing `gen_correct_proof` fn from bitvm/src/chunker/disprove_execution.rs
+// It requires refactoring bitvm crate
+// Copied from bitvm/src/chunker/disprove_execution.rs
+#[derive(Copy)]
+pub struct DummyCircuit<F: PrimeField> {
+    pub a: Option<F>,
+    pub b: Option<F>,
+    pub num_variables: usize,
+    pub num_constraints: usize,
+}
+
+impl<F: PrimeField> Clone for DummyCircuit<F> {
+    fn clone(&self) -> Self {
+        DummyCircuit {
+            a: self.a,
+            b: self.b,
+            num_variables: self.num_variables,
+            num_constraints: self.num_constraints,
+        }
+    }
+}
+
+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))?;
+        let b = cs.new_witness_variable(|| self.b.ok_or(SynthesisError::AssignmentMissing))?;
+        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))?;
+        }
+
+        for _ in 0..self.num_constraints - 1 {
+            cs.enforce_constraint(lc!() + a, lc!() + b, lc!() + c)?;
+        }
+
+        cs.enforce_constraint(lc!(), lc!(), lc!())?;
+
+        Ok(())
+    }
+}
diff --git a/src/bridge/scripts.rs b/bridge/src/scripts.rs
similarity index 78%
rename from src/bridge/scripts.rs
rename to bridge/src/scripts.rs
index 017ededb6..8d4881aeb 100644
--- a/src/bridge/scripts.rs
+++ b/bridge/src/scripts.rs
@@ -1,22 +1,21 @@
-use crate::treepp::script;
 use bitcoin::{
     hashes::{ripemd160::Hash as Ripemd160, sha256::Hash as Sha256, Hash},
-    Address, CompressedPublicKey, Network, PublicKey, ScriptBuf, XOnlyPublicKey,
+    Address, CompressedPublicKey, Network, PubkeyHash, PublicKey, ScriptBuf, XOnlyPublicKey,
 };
-use lazy_static::lazy_static;
-use std::str::FromStr;
+use bitvm::treepp::script;
+use std::{str::FromStr, sync::LazyLock};
 
-lazy_static! {
-    // TODO replace these public keys
-    pub static ref UNSPENDABLE_PUBLIC_KEY: PublicKey = PublicKey::from_str(
+// TODO replace these public keys
+pub static UNSPENDABLE_PUBLIC_KEY: LazyLock<PublicKey> = LazyLock::new(|| {
+    PublicKey::from_str(
         "0405f818748aecbc8c67a4e61a03cee506888f49480cf343363b04908ed51e25b9615f244c38311983fb0f5b99e3fd52f255c5cc47a03ee2d85e78eaf6fa76bb9d"
     )
-    .unwrap();
-    pub static ref UNSPENDABLE_TAPROOT_PUBLIC_KEY: XOnlyPublicKey = XOnlyPublicKey::from_str(
-        "50929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0"
-    )
-    .unwrap();
-}
+    .unwrap()
+});
+pub static UNSPENDABLE_TAPROOT_PUBLIC_KEY: LazyLock<XOnlyPublicKey> = LazyLock::new(|| {
+    XOnlyPublicKey::from_str("50929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0")
+        .unwrap()
+});
 
 pub fn generate_burn_script() -> ScriptBuf {
     generate_pay_to_pubkey_script(&UNSPENDABLE_PUBLIC_KEY)
@@ -39,12 +38,12 @@ pub fn generate_pay_to_pubkey_script(public_key: &PublicKey) -> ScriptBuf {
 }
 
 pub fn generate_pay_to_pubkey_hash_with_inscription_script(
-    public_key: &PublicKey,
+    public_key_hash: &PubkeyHash,
     timestamp: u32,
     evm_address: &str,
 ) -> ScriptBuf {
     let inscription = [
-        public_key.pubkey_hash().as_byte_array().to_vec(),
+        public_key_hash.as_byte_array().to_vec(),
         timestamp.to_be_bytes().to_vec(),
         evm_address.as_bytes().to_vec(),
     ]
@@ -57,7 +56,7 @@ pub fn generate_pay_to_pubkey_hash_with_inscription_script(
         OP_ENDIF
         OP_DUP
         OP_HASH160
-        { public_key.pubkey_hash().as_byte_array().to_vec() }
+        { public_key_hash.as_byte_array().to_vec() }
         OP_EQUALVERIFY
         OP_CHECKSIG
     }
@@ -66,7 +65,7 @@ pub fn generate_pay_to_pubkey_hash_with_inscription_script(
 
 pub fn generate_p2pkh_address(network: Network, public_key: &PublicKey) -> Address {
     Address::p2pkh(
-        &CompressedPublicKey::try_from(*public_key).expect("Could not compress public key"),
+        CompressedPublicKey::try_from(*public_key).expect("Could not compress public key"),
         network,
     )
 }
@@ -84,12 +83,16 @@ pub fn generate_pay_to_pubkey_script_address(network: Network, public_key: &Publ
 
 pub fn generate_pay_to_pubkey_hash_with_inscription_script_address(
     network: Network,
-    public_key: &PublicKey,
+    public_key_hash: &PubkeyHash,
     timestamp: u32,
     evm_address: &str,
 ) -> Address {
     Address::p2wsh(
-        &generate_pay_to_pubkey_hash_with_inscription_script(public_key, timestamp, evm_address),
+        &generate_pay_to_pubkey_hash_with_inscription_script(
+            public_key_hash,
+            timestamp,
+            evm_address,
+        ),
         network,
     )
 }
diff --git a/bridge/src/serialization.rs b/bridge/src/serialization.rs
new file mode 100644
index 000000000..e1ad9950d
--- /dev/null
+++ b/bridge/src/serialization.rs
@@ -0,0 +1,34 @@
+use serde::{Deserialize, Serialize};
+
+pub fn serialize(object: &impl Serialize) -> String {
+    serde_json::to_string(object)
+        .map_err(|e| format!("Failed to serialize an object to JSON: {}", e))
+        .unwrap()
+}
+
+pub fn deserialize<'a, T>(data: &'a str) -> T
+where
+    T: Deserialize<'a>,
+{
+    serde_json::from_str::<T>(data).unwrap()
+}
+
+pub fn try_deserialize<'a, T>(data: &'a str) -> Result<T, String>
+where
+    T: Deserialize<'a>,
+{
+    match serde_json::from_str::<T>(data) {
+        Ok(x) => Ok(x),
+        Err(err) => Err(format!("Failed to parse JSON string to object: {}", err)),
+    }
+}
+
+pub fn try_deserialize_slice<'a, T>(data: &'a [u8]) -> Result<T, String>
+where
+    T: Deserialize<'a>,
+{
+    match serde_json::from_slice::<T>(data) {
+        Ok(x) => Ok(x),
+        Err(err) => Err(format!("Failed to decode JSON data to object: {}", err)),
+    }
+}
diff --git a/bridge/src/superblock.rs b/bridge/src/superblock.rs
new file mode 100644
index 000000000..92deb95f3
--- /dev/null
+++ b/bridge/src/superblock.rs
@@ -0,0 +1,59 @@
+use std::{mem::size_of, str::FromStr};
+
+use bitcoin::{
+    block::{Header, Version},
+    consensus::encode::serialize,
+    hashes::Hash,
+    BlockHash, CompactTarget, Network, TxMerkleNode,
+};
+use bitcoin_script::{script, Script};
+
+use bitvm::pseudo::NMUL;
+
+/*
+  TODO: Implement selecting a block that marks the start of a superblock measurement period
+  that lasts for the period ∆C (e.g. 2000 blocks), during which the operator must observe
+  all blocks on the main chain and identify the heaviest superblock SB.
+*/
+pub fn get_start_time_block_number(network: Network) -> u32 {
+    match network {
+        Network::Bitcoin => 161249,
+        Network::Regtest => 100,
+        _ => 161249,
+    }
+}
+
+// TODO: Replace with a real superblock
+pub fn find_superblock() -> Header {
+    Header {
+        version: Version::from_consensus(0x200d2000),
+        prev_blockhash: BlockHash::from_str(
+            "000000000000000000027c9f5b07f21e39ba31aa4d900d519478bdac32f4a15d",
+        )
+        .unwrap(),
+        merkle_root: TxMerkleNode::from_str(
+            "0064b0d54f20412756ba7ce07b0594f3548b06f2dad5cfeaac2aca508634ed19",
+        )
+        .unwrap(),
+        time: 1729251961,
+        bits: CompactTarget::from_hex("0x17030ecd").unwrap(),
+        nonce: 0x400e345c,
+    }
+}
+
+pub fn get_superblock_message(sb: &Header) -> Vec<u8> { serialize(sb) }
+
+pub const SUPERBLOCK_MESSAGE_LENGTH: usize = size_of::<Header>();
+
+pub fn get_superblock_hash_message(sb: &Header) -> Vec<u8> {
+    sb.block_hash().as_byte_array().into()
+}
+
+pub const SUPERBLOCK_HASH_MESSAGE_LENGTH: usize = size_of::<BlockHash>();
+
+pub fn extract_superblock_ts_from_header() -> Script {
+    script! {
+        for i in 0..4 { { 80 - 12 + 2 * i } OP_PICK }
+        for _ in 1..4 {  { NMUL(1 << 8) } OP_ADD }
+    }
+}
diff --git a/src/bridge/transactions/assert.rs b/bridge/src/transactions/assert.rs
similarity index 68%
rename from src/bridge/transactions/assert.rs
rename to bridge/src/transactions/assert.rs
index 80b8c76db..c2a0f8ce2 100644
--- a/src/bridge/transactions/assert.rs
+++ b/bridge/src/transactions/assert.rs
@@ -1,6 +1,5 @@
 use bitcoin::{
-    absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
-    XOnlyPublicKey,
+    absolute, consensus, Amount, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
 };
 use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
 use serde::{Deserialize, Serialize};
@@ -9,11 +8,11 @@ use std::collections::HashMap;
 use super::{
     super::{
         connectors::{
-            connector::*, connector_4::Connector4, connector_5::Connector5,
-            connector_b::ConnectorB, connector_c::ConnectorC,
+            base::*, connector_4::Connector4, connector_5::Connector5, connector_b::ConnectorB,
+            connector_c::ConnectorC,
         },
-        contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
-        graphs::base::{DUST_AMOUNT, FEE_AMOUNT},
+        contexts::{base::BaseContext, verifier::VerifierContext},
+        graphs::base::DUST_AMOUNT,
     },
     base::*,
     pre_signed::*,
@@ -27,7 +26,6 @@ pub struct AssertTransaction {
     #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
     prev_outs: Vec<TxOut>,
     prev_scripts: Vec<ScriptBuf>,
-    connector_b: ConnectorB,
 
     musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
     musig2_nonce_signatures: HashMap<usize, HashMap<PublicKey, Signature>>,
@@ -65,51 +63,47 @@ impl PreSignedMusig2Transaction for AssertTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0] }
 }
 
 impl AssertTransaction {
-    pub fn new(context: &OperatorContext, input_0: Input) -> Self {
-        Self::new_for_validation(
-            context.network,
-            &context.operator_public_key,
-            &context.operator_taproot_public_key,
-            &context.n_of_n_taproot_public_key,
-            input_0,
-        )
+    pub fn new(
+        connector_4: &Connector4,
+        connector_5: &Connector5,
+        connector_b: &ConnectorB,
+        connector_c: &ConnectorC,
+        input_0: Input,
+    ) -> Self {
+        Self::new_for_validation(connector_4, connector_5, connector_b, connector_c, input_0)
     }
 
     pub fn new_for_validation(
-        network: Network,
-        operator_public_key: &PublicKey,
-        operator_taproot_public_key: &XOnlyPublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
+        connector_4: &Connector4,
+        connector_5: &Connector5,
+        connector_b: &ConnectorB,
+        connector_c: &ConnectorC,
         input_0: Input,
     ) -> Self {
-        let connector_4 = Connector4::new(network, operator_public_key);
-        let connector_5 = Connector5::new(network, n_of_n_taproot_public_key);
-        let connector_b = ConnectorB::new(network, n_of_n_taproot_public_key);
-        let connector_c = ConnectorC::new(network, operator_taproot_public_key);
-
         let input_0_leaf = 1;
         let _input_0 = connector_b.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
 
-        let total_output_amount = input_0.amount - Amount::from_sat(FEE_AMOUNT);
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_ASSERT);
 
         let _output_0 = TxOut {
             value: Amount::from_sat(DUST_AMOUNT),
             script_pubkey: connector_4.generate_address().script_pubkey(),
         };
 
-        let _output_1 = TxOut {
-            value: total_output_amount - Amount::from_sat(DUST_AMOUNT) * 2,
-            script_pubkey: connector_5.generate_taproot_address().script_pubkey(),
-        };
-
         let _output_2 = TxOut {
             value: Amount::from_sat(DUST_AMOUNT),
             script_pubkey: connector_c.generate_taproot_address().script_pubkey(),
         };
 
+        let _output_1 = TxOut {
+            value: total_output_amount - _output_0.value - _output_2.value,
+            script_pubkey: connector_5.generate_taproot_address().script_pubkey(),
+        };
+
         AssertTransaction {
             tx: Transaction {
                 version: bitcoin::transaction::Version(2),
@@ -122,16 +116,18 @@ impl AssertTransaction {
                 script_pubkey: connector_b.generate_taproot_address().script_pubkey(),
             }],
             prev_scripts: vec![connector_b.generate_taproot_leaf_script(input_0_leaf)],
-            connector_b,
             musig2_nonces: HashMap::new(),
             musig2_nonce_signatures: HashMap::new(),
             musig2_signatures: HashMap::new(),
         }
     }
 
-    pub fn num_blocks_timelock_0(&self) -> u32 { self.connector_b.num_blocks_timelock_1 }
-
-    fn sign_input_0(&mut self, context: &VerifierContext, secret_nonce: &SecNonce) {
+    fn sign_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_b: &ConnectorB,
+        secret_nonce: &SecNonce,
+    ) {
         let input_index = 0;
         pre_sign_musig2_taproot_input(
             self,
@@ -143,38 +139,29 @@ impl AssertTransaction {
 
         // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
         if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
-            self.finalize_input_0(context);
+            self.finalize_input_0(context, connector_b);
         }
     }
 
-    fn finalize_input_0(&mut self, context: &dyn BaseContext) {
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_b: &ConnectorB) {
         let input_index = 0;
         finalize_musig2_taproot_input(
             self,
             context,
             input_index,
             TapSighashType::All,
-            self.connector_b.generate_taproot_spend_info(),
+            connector_b.generate_taproot_spend_info(),
         );
     }
 
-    pub fn push_nonces(&mut self, context: &VerifierContext) -> HashMap<usize, SecNonce> {
-        let mut secret_nonces = HashMap::new();
-
-        let input_index = 0;
-        let secret_nonce = push_nonce(self, context, input_index);
-        secret_nonces.insert(input_index, secret_nonce);
-
-        secret_nonces
-    }
-
     pub fn pre_sign(
         &mut self,
         context: &VerifierContext,
+        connector_b: &ConnectorB,
         secret_nonces: &HashMap<usize, SecNonce>,
     ) {
         let input_index = 0;
-        self.sign_input_0(context, &secret_nonces[&input_index]);
+        self.sign_input_0(context, connector_b, &secret_nonces[&input_index]);
     }
 
     pub fn merge(&mut self, assert: &AssertTransaction) {
@@ -185,4 +172,5 @@ impl AssertTransaction {
 
 impl BaseTransaction for AssertTransaction {
     fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "Assert" }
 }
diff --git a/bridge/src/transactions/assert_transactions/assert_commit_1.rs b/bridge/src/transactions/assert_transactions/assert_commit_1.rs
new file mode 100644
index 000000000..f6bb29630
--- /dev/null
+++ b/bridge/src/transactions/assert_transactions/assert_commit_1.rs
@@ -0,0 +1,128 @@
+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::signing::populate_taproot_input_witness;
+
+use super::{
+    super::{
+        super::connectors::{base::*, connector_f_1::ConnectorF1},
+        base::*,
+        pre_signed::*,
+    },
+    utils::AssertCommit1ConnectorsE,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertCommit1Transaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+}
+
+impl PreSignedTransaction for AssertCommit1Transaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl AssertCommit1Transaction {
+    pub fn new(
+        connectors_e: &AssertCommit1ConnectorsE,
+        connector_f_1: &ConnectorF1,
+        tx_inputs: Vec<Input>,
+    ) -> Self {
+        assert_eq!(
+            tx_inputs.len(),
+            connectors_e.connectors_num(),
+            "inputs and connectors e don't match"
+        );
+
+        Self::new_for_validation(connectors_e, connector_f_1, tx_inputs)
+    }
+
+    pub fn new_for_validation(
+        connectors_e: &AssertCommit1ConnectorsE,
+        connector_f_1: &ConnectorF1,
+        tx_inputs: Vec<Input>,
+    ) -> Self {
+        let mut inputs = vec![];
+        let mut prev_outs = vec![];
+        let mut prev_scripts = vec![];
+        let mut total_output_amount = Amount::from_sat(0);
+
+        for (connector_e, input) in (0..connectors_e.connectors_num())
+            .map(|idx| connectors_e.get_connector_e(idx))
+            .zip(tx_inputs)
+        {
+            inputs.push(connector_e.generate_taproot_leaf_tx_in(0, &input));
+            prev_outs.push(TxOut {
+                value: input.amount,
+                script_pubkey: connector_e.generate_taproot_address().script_pubkey(),
+            });
+            prev_scripts.push(connector_e.generate_taproot_leaf_script(0));
+            total_output_amount += input.amount;
+        }
+        total_output_amount -= Amount::from_sat(MIN_RELAY_FEE_ASSERT_COMMIT1);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: connector_f_1.generate_address().script_pubkey(),
+        };
+
+        AssertCommit1Transaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: inputs,
+                output: vec![_output_0],
+            },
+            prev_outs,
+            prev_scripts,
+        }
+    }
+
+    pub fn sign(&mut self, connectors_e: &AssertCommit1ConnectorsE, witnesses: Vec<RawWitness>) {
+        assert_eq!(witnesses.len(), connectors_e.connectors_num());
+        for (input_index, witness) in (0..connectors_e.connectors_num()).zip(witnesses) {
+            let taproot_spend_info = connectors_e
+                .get_connector_e(input_index)
+                .generate_taproot_spend_info();
+            let script = &self.prev_scripts()[input_index].clone();
+            let res = execute_raw_script_with_inputs(script.clone().to_bytes(), witness.clone());
+            assert!(
+                res.success,
+                "script: {:?}, res: {:?}: stack: {:?}, variable name: {:?}",
+                script,
+                res,
+                res.final_stack,
+                connectors_e
+                    .get_connector_e(input_index)
+                    .commitment_public_keys
+                    .keys()
+            );
+            populate_taproot_input_witness(
+                self.tx_mut(),
+                input_index,
+                &taproot_spend_info,
+                script,
+                witness,
+            );
+        }
+    }
+
+    pub fn merge(&mut self, assert_commit_1: &AssertCommit1Transaction) {
+        merge_transactions(&mut self.tx, &assert_commit_1.tx);
+    }
+}
+
+impl BaseTransaction for AssertCommit1Transaction {
+    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "AssertCommit1" }
+}
diff --git a/bridge/src/transactions/assert_transactions/assert_commit_2.rs b/bridge/src/transactions/assert_transactions/assert_commit_2.rs
new file mode 100644
index 000000000..2987d5849
--- /dev/null
+++ b/bridge/src/transactions/assert_transactions/assert_commit_2.rs
@@ -0,0 +1,131 @@
+use bitcoin::{absolute, consensus, Amount, ScriptBuf, Transaction, TxOut};
+use serde::{Deserialize, Serialize};
+
+use bitvm::{ 
+    chunk::api::type_conversion_utils::RawWitness, execute_raw_script_with_inputs
+};
+
+use crate::transactions::signing::populate_taproot_input_witness;
+
+use super::{
+    super::{
+        super::connectors::{base::*, connector_f_2::ConnectorF2},
+        base::*,
+        pre_signed::*,
+    },
+    utils::AssertCommit2ConnectorsE,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertCommit2Transaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+}
+
+impl PreSignedTransaction for AssertCommit2Transaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl AssertCommit2Transaction {
+    pub fn new(
+        connectors_e: &AssertCommit2ConnectorsE,
+        connector_f_2: &ConnectorF2,
+        tx_inputs: Vec<Input>,
+    ) -> Self {
+        assert_eq!(
+            tx_inputs.len(),
+            connectors_e.connectors_num(),
+            "inputs and connectors e don't match"
+        );
+
+        Self::new_for_validation(connectors_e, connector_f_2, tx_inputs)
+    }
+
+    pub fn new_for_validation(
+        connectors_e: &AssertCommit2ConnectorsE,
+        connector_f_2: &ConnectorF2,
+        tx_inputs: Vec<Input>,
+    ) -> Self {
+        let mut inputs = vec![];
+        let mut prev_outs = vec![];
+        let mut prev_scripts = vec![];
+        let mut total_output_amount = Amount::from_sat(0);
+
+        for (connector_e, input) in (0..connectors_e.connectors_num())
+            .map(|idx| connectors_e.get_connector_e(idx))
+            .zip(tx_inputs)
+        {
+            inputs.push(connector_e.generate_taproot_leaf_tx_in(0, &input));
+            prev_outs.push(TxOut {
+                value: input.amount,
+                script_pubkey: connector_e.generate_taproot_address().script_pubkey(),
+            });
+            prev_scripts.push(connector_e.generate_taproot_leaf_script(0));
+            total_output_amount += input.amount;
+        }
+        total_output_amount -= Amount::from_sat(MIN_RELAY_FEE_ASSERT_COMMIT2);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: connector_f_2.generate_address().script_pubkey(),
+        };
+
+        AssertCommit2Transaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: inputs,
+                output: vec![_output_0],
+            },
+            prev_outs,
+            prev_scripts,
+        }
+    }
+
+    pub fn sign(&mut self, connectors_e: &AssertCommit2ConnectorsE, witnesses: Vec<RawWitness>) {
+        assert_eq!(witnesses.len(), connectors_e.connectors_num());
+        for (input_index, witness) in (0..connectors_e.connectors_num()).zip(witnesses) {
+            let taproot_spend_info = connectors_e
+                .get_connector_e(input_index)
+                .generate_taproot_spend_info();
+            let script = &self.prev_scripts()[input_index].clone();
+            let res = execute_raw_script_with_inputs(script.clone().to_bytes(), witness.clone());
+            assert!(
+                res.success,
+                "script: {:?}, res: {:?}: stack: {:?}, variable name: {:?}",
+                script,
+                res,
+                res.final_stack,
+                connectors_e
+                    .get_connector_e(input_index)
+                    .commitment_public_keys
+                    .keys()
+            );
+            populate_taproot_input_witness(
+                self.tx_mut(),
+                input_index,
+                &taproot_spend_info,
+                script,
+                witness,
+            );
+        }
+    }
+
+    pub fn merge(&mut self, assert_commit_2: &AssertCommit2Transaction) {
+        merge_transactions(&mut self.tx, &assert_commit_2.tx);
+    }
+}
+
+impl BaseTransaction for AssertCommit2Transaction {
+    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "AssertCommit2" }
+}
diff --git a/bridge/src/transactions/assert_transactions/assert_final.rs b/bridge/src/transactions/assert_transactions/assert_final.rs
new file mode 100644
index 000000000..9fa18a96d
--- /dev/null
+++ b/bridge/src/transactions/assert_transactions/assert_final.rs
@@ -0,0 +1,247 @@
+use bitcoin::{
+    absolute, consensus, Amount, EcdsaSighashType, PublicKey, ScriptBuf, TapSighashType,
+    Transaction, TxOut,
+};
+use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+use crate::{connectors::connector_d::ConnectorD, contexts::operator::OperatorContext};
+
+use super::{
+    super::{
+        super::{
+            connectors::{
+                base::*, connector_4::Connector4, connector_5::Connector5, connector_c::ConnectorC,
+            },
+            contexts::{base::BaseContext, verifier::VerifierContext},
+            graphs::base::DUST_AMOUNT,
+        },
+        base::*,
+        pre_signed::*,
+        pre_signed_musig2::*,
+    },
+    utils::AssertCommitConnectorsF,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertFinalTransaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+
+    musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
+    musig2_nonce_signatures: HashMap<usize, HashMap<PublicKey, Signature>>,
+    musig2_signatures: HashMap<usize, HashMap<PublicKey, PartialSignature>>,
+}
+
+impl PreSignedTransaction for AssertFinalTransaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    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_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &mut self.musig2_nonces
+    }
+    fn musig2_nonce_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, Signature>> {
+        &self.musig2_nonce_signatures
+    }
+    fn musig2_nonce_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, Signature>> {
+        &mut self.musig2_nonce_signatures
+    }
+    fn musig2_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &self.musig2_signatures
+    }
+    fn musig2_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &mut self.musig2_signatures
+    }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0] }
+}
+
+impl AssertFinalTransaction {
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        context: &OperatorContext,
+        connector_4: &Connector4,
+        connector_5: &Connector5,
+        connector_c: &ConnectorC,
+        connector_d: &ConnectorD,
+        assert_commit_connectors_f: &AssertCommitConnectorsF,
+        input_0: Input,
+        input_1: Input,
+        input_2: Input,
+    ) -> Self {
+        let mut this = Self::new_for_validation(
+            connector_4,
+            connector_5,
+            connector_c,
+            connector_d,
+            assert_commit_connectors_f,
+            input_0,
+            input_1,
+            input_2,
+        );
+
+        this.sign_commit_inputs(context);
+
+        this
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn new_for_validation(
+        connector_4: &Connector4,
+        connector_5: &Connector5,
+        connector_c: &ConnectorC,
+        connector_d: &ConnectorD,
+        assert_commit_connectors_f: &AssertCommitConnectorsF,
+        input_0: Input,
+        input_1: Input,
+        input_2: Input,
+    ) -> Self {
+        let input_0_leaf = 0;
+        let _input_0 = connector_d.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
+
+        // simple inputs from assert_commit txs
+        let _input_1 = assert_commit_connectors_f
+            .connector_f_1
+            .generate_tx_in(&input_1);
+        let _input_2 = assert_commit_connectors_f
+            .connector_f_2
+            .generate_tx_in(&input_2);
+
+        let total_output_amount = input_1.amount + input_2.amount + input_0.amount
+            - Amount::from_sat(MIN_RELAY_FEE_ASSERT_FINAL);
+
+        // goes to take_2 tx
+        let _output_0 = TxOut {
+            value: Amount::from_sat(DUST_AMOUNT),
+            script_pubkey: connector_4.generate_address().script_pubkey(),
+        };
+
+        // goes to take_2 tx or disprove tx
+        let _output_1 = TxOut {
+            value: total_output_amount - Amount::from_sat(DUST_AMOUNT) * 2,
+            script_pubkey: connector_5.generate_taproot_address().script_pubkey(),
+        };
+
+        // goes to take_2 tx or disprove tx
+        let _output_2 = TxOut {
+            value: Amount::from_sat(DUST_AMOUNT),
+            script_pubkey: connector_c.generate_taproot_address().script_pubkey(),
+        };
+
+        AssertFinalTransaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0, _input_1, _input_2],
+                output: vec![_output_0, _output_1, _output_2],
+            },
+            prev_outs: vec![
+                TxOut {
+                    value: input_0.amount,
+                    script_pubkey: connector_d.generate_taproot_address().script_pubkey(),
+                },
+                TxOut {
+                    value: input_1.amount,
+                    script_pubkey: assert_commit_connectors_f
+                        .connector_f_1
+                        .generate_address()
+                        .script_pubkey(),
+                },
+                TxOut {
+                    value: input_2.amount,
+                    script_pubkey: assert_commit_connectors_f
+                        .connector_f_2
+                        .generate_address()
+                        .script_pubkey(),
+                },
+            ],
+            prev_scripts: vec![
+                connector_d.generate_taproot_leaf_script(input_0_leaf),
+                assert_commit_connectors_f.connector_f_1.generate_script(),
+                assert_commit_connectors_f.connector_f_2.generate_script(),
+            ],
+            musig2_nonces: HashMap::new(),
+            musig2_nonce_signatures: HashMap::new(),
+            musig2_signatures: HashMap::new(),
+        }
+    }
+
+    fn sign_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_d: &ConnectorD,
+        secret_nonce: &SecNonce,
+    ) {
+        let input_index = 0;
+        pre_sign_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            secret_nonce,
+        );
+
+        // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
+        if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
+            self.finalize_input_0(context, connector_d);
+        }
+    }
+
+    fn sign_commit_inputs(&mut self, context: &OperatorContext) {
+        let input_indexes = [1, 2];
+        for input_index in input_indexes {
+            pre_sign_p2wsh_input(
+                self,
+                input_index,
+                EcdsaSighashType::All,
+                &vec![&context.operator_keypair],
+            );
+        }
+    }
+
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_d: &ConnectorD) {
+        let input_index = 0;
+        finalize_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            connector_d.generate_taproot_spend_info(),
+        );
+    }
+
+    pub fn pre_sign(
+        &mut self,
+        context: &VerifierContext,
+        connector_d: &ConnectorD,
+        secret_nonces: &HashMap<usize, SecNonce>,
+    ) {
+        let input_index = 0;
+        self.sign_input_0(context, connector_d, &secret_nonces[&input_index]);
+    }
+
+    pub fn merge(&mut self, assert: &AssertFinalTransaction) {
+        merge_transactions(&mut self.tx, &assert.tx);
+        merge_musig2_nonces_and_signatures(self, assert);
+    }
+}
+
+impl BaseTransaction for AssertFinalTransaction {
+    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "AssertFinal" }
+}
diff --git a/bridge/src/transactions/assert_transactions/assert_initial.rs b/bridge/src/transactions/assert_transactions/assert_initial.rs
new file mode 100644
index 000000000..11908ee9d
--- /dev/null
+++ b/bridge/src/transactions/assert_transactions/assert_initial.rs
@@ -0,0 +1,215 @@
+use bitcoin::{
+    absolute, consensus, Amount, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
+};
+use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+use super::{
+    super::{
+        super::{
+            connectors::{base::*, connector_b::ConnectorB, connector_d::ConnectorD},
+            contexts::{base::BaseContext, verifier::VerifierContext},
+            graphs::base::DUST_AMOUNT,
+        },
+        base::*,
+        pre_signed::*,
+        pre_signed_musig2::*,
+    },
+    utils::{AssertCommit1ConnectorsE, AssertCommit2ConnectorsE},
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertInitialTransaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+
+    musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
+    musig2_nonce_signatures: HashMap<usize, HashMap<PublicKey, Signature>>,
+    musig2_signatures: HashMap<usize, HashMap<PublicKey, PartialSignature>>,
+}
+
+impl PreSignedTransaction for AssertInitialTransaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl PreSignedMusig2Transaction for AssertInitialTransaction {
+    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
+    }
+    fn musig2_nonce_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, Signature>> {
+        &self.musig2_nonce_signatures
+    }
+    fn musig2_nonce_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, Signature>> {
+        &mut self.musig2_nonce_signatures
+    }
+    fn musig2_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &self.musig2_signatures
+    }
+    fn musig2_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &mut self.musig2_signatures
+    }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0] }
+}
+
+impl AssertInitialTransaction {
+    pub fn new(
+        connector_b: &ConnectorB,
+        connector_d: &ConnectorD,
+        assert_commit1_connectors_e: &AssertCommit1ConnectorsE,
+        assert_commit2_connectors_e: &AssertCommit2ConnectorsE,
+        input_0: Input,
+    ) -> Self {
+        Self::new_for_validation(
+            connector_b,
+            connector_d,
+            assert_commit1_connectors_e,
+            assert_commit2_connectors_e,
+            input_0,
+        )
+    }
+
+    pub fn new_for_validation(
+        connector_b: &ConnectorB,
+        connector_d: &ConnectorD,
+        assert_commit1_connectors_e: &AssertCommit1ConnectorsE,
+        assert_commit2_connectors_e: &AssertCommit2ConnectorsE,
+        input_0: Input,
+    ) -> Self {
+        let input_0_leaf = 1;
+        let _input_0 = connector_b.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
+
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_ASSERT_INITIAL);
+
+        let assert_commit1_expense = Amount::from_sat(
+            MIN_RELAY_FEE_ASSERT_COMMIT1
+                + assert_commit1_connectors_e.connectors_num() as u64 * DUST_AMOUNT,
+        );
+        let assert_commit2_expense = Amount::from_sat(
+            MIN_RELAY_FEE_ASSERT_COMMIT2
+                + assert_commit2_connectors_e.connectors_num() as u64 * DUST_AMOUNT,
+        );
+        // goes to assert_final
+        let _output_0 = TxOut {
+            value: total_output_amount - assert_commit1_expense - assert_commit2_expense,
+            script_pubkey: connector_d.generate_taproot_address().script_pubkey(),
+        };
+
+        let mut output = vec![_output_0];
+
+        // simple outputs for assert_x txs
+        for i in 0..assert_commit1_connectors_e.connectors_num() {
+            let amount = if i == 0 {
+                MIN_RELAY_FEE_ASSERT_COMMIT1 + DUST_AMOUNT
+            } else {
+                DUST_AMOUNT
+            };
+            output.push(TxOut {
+                value: Amount::from_sat(amount),
+                script_pubkey: assert_commit1_connectors_e
+                    .get_connector_e(i)
+                    .generate_taproot_address()
+                    .script_pubkey(),
+            });
+        }
+
+        // simple outputs for assert_x txs
+        for i in 0..assert_commit2_connectors_e.connectors_num() {
+            let amount = if i == 0 {
+                MIN_RELAY_FEE_ASSERT_COMMIT2 + DUST_AMOUNT
+            } else {
+                DUST_AMOUNT
+            };
+            output.push(TxOut {
+                value: Amount::from_sat(amount),
+                script_pubkey: assert_commit2_connectors_e
+                    .get_connector_e(i)
+                    .generate_taproot_address()
+                    .script_pubkey(),
+            });
+        }
+
+        AssertInitialTransaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0],
+                output,
+            },
+            prev_outs: vec![TxOut {
+                value: input_0.amount,
+                script_pubkey: connector_b.generate_taproot_address().script_pubkey(),
+            }],
+            prev_scripts: vec![connector_b.generate_taproot_leaf_script(input_0_leaf)],
+            musig2_nonces: HashMap::new(),
+            musig2_nonce_signatures: HashMap::new(),
+            musig2_signatures: HashMap::new(),
+        }
+    }
+
+    fn sign_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_b: &ConnectorB,
+        secret_nonce: &SecNonce,
+    ) {
+        let input_index = 0;
+        pre_sign_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            secret_nonce,
+        );
+
+        // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
+        if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
+            self.finalize_input_0(context, connector_b);
+        }
+    }
+
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_b: &ConnectorB) {
+        let input_index = 0;
+        finalize_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            connector_b.generate_taproot_spend_info(),
+        );
+    }
+
+    pub fn pre_sign(
+        &mut self,
+        context: &VerifierContext,
+        connector_b: &ConnectorB,
+        secret_nonces: &HashMap<usize, SecNonce>,
+    ) {
+        let input_index = 0;
+        self.sign_input_0(context, connector_b, &secret_nonces[&input_index]);
+    }
+
+    pub fn merge(&mut self, assert: &AssertInitialTransaction) {
+        merge_transactions(&mut self.tx, &assert.tx);
+        merge_musig2_nonces_and_signatures(self, assert);
+    }
+}
+
+impl BaseTransaction for AssertInitialTransaction {
+    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "AssertInitial" }
+}
diff --git a/bridge/src/transactions/assert_transactions/mod.rs b/bridge/src/transactions/assert_transactions/mod.rs
new file mode 100644
index 000000000..cb8fd2170
--- /dev/null
+++ b/bridge/src/transactions/assert_transactions/mod.rs
@@ -0,0 +1,5 @@
+pub mod assert_commit_1;
+pub mod assert_commit_2;
+pub mod assert_final;
+pub mod assert_initial;
+pub mod utils;
diff --git a/bridge/src/transactions/assert_transactions/utils.rs b/bridge/src/transactions/assert_transactions/utils.rs
new file mode 100644
index 000000000..0f3e5884f
--- /dev/null
+++ b/bridge/src/transactions/assert_transactions/utils.rs
@@ -0,0 +1,153 @@
+use serde::{Deserialize, Serialize};
+use std::collections::{BTreeMap, HashMap};
+
+use crate::{
+    commitments::CommitmentMessageId,
+    connectors::{connector_e::ConnectorE, connector_f_1::ConnectorF1, connector_f_2::ConnectorF2},
+};
+
+use bitvm::{
+    chunk::api::{generate_signatures, generate_signatures_for_any_proof, type_conversion_utils::{utils_raw_witnesses_from_signatures, RawProof, RawWitness}}, 
+    signatures::signing_winternitz::{WinternitzPublicKey, WinternitzSecret}
+};
+
+/// The number of connector e is related to the number of intermediate values.
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertCommit1ConnectorsE {
+    pub connectors_e: Vec<ConnectorE>,
+}
+
+impl AssertCommit1ConnectorsE {
+    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 commitment_public_keys(
+        &self,
+    ) -> Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>> {
+        self.connectors_e
+            .iter()
+            .map(|connector| connector.commitment_public_keys.clone())
+            .collect()
+    }
+}
+
+/// The number of connector e is related to the number of intermediate values.
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertCommit2ConnectorsE {
+    pub connectors_e: Vec<ConnectorE>,
+}
+
+impl AssertCommit2ConnectorsE {
+    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 commitment_public_keys(
+        &self,
+    ) -> Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>> {
+        self.connectors_e
+            .iter()
+            .map(|connector| connector.commitment_public_keys.clone())
+            .collect()
+    }
+}
+
+pub fn sign_assert_tx_with_groth16_proof(
+    commitment_secrets: &HashMap<CommitmentMessageId, WinternitzSecret>,
+    proof: &RawProof,
+) -> (Vec<RawWitness>, 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)));
+            }
+        });
+    
+    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 raw = utils_raw_witnesses_from_signatures(&sigs);
+
+    let raw1 = raw[0..300].to_vec();
+    let raw2 = raw[300..].to_vec();
+
+    (raw1, raw2)
+}
+
+pub fn groth16_commitment_secrets_to_public_keys(
+    commitment_secrets: &HashMap<CommitmentMessageId, WinternitzSecret>,
+) -> (
+    Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>,
+    Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>,
+) {
+    // hash map to btree map
+    let commitment_secrets: BTreeMap<CommitmentMessageId, WinternitzSecret> =
+        commitment_secrets.clone().into_iter().collect();
+
+    // see the unit test: assigner.rs/test_commitment_size
+    let connectors_e_of_transaction = 300;
+    let mut connector_e1_commitment_public_keys = vec![];
+    let mut connector_e2_commitment_public_keys = vec![];
+
+    let mut secrets_vec = vec![];
+    for (message_id, secret) in commitment_secrets.iter() {
+        if let CommitmentMessageId::Groth16IntermediateValues((name, _)) = message_id {
+            let index = u32::from_str_radix(name, 10).unwrap();
+            secrets_vec.push((index, (message_id, secret)));
+        }
+    }
+
+    secrets_vec.sort_by(|a, b| a.0.cmp(&b.0));
+    for (_, (message_id, secret)) in secrets_vec {
+        let pushing_keys =
+        if connector_e1_commitment_public_keys.len() < connectors_e_of_transaction {
+            &mut connector_e1_commitment_public_keys
+        } else {
+            &mut connector_e2_commitment_public_keys
+        };
+
+        pushing_keys.push(BTreeMap::from([(
+            message_id.clone(),
+            WinternitzPublicKey::from(secret),
+        )]));
+    }
+
+
+
+    assert!(connector_e1_commitment_public_keys.len() <= connectors_e_of_transaction);
+    assert!(connector_e2_commitment_public_keys.len() <= connectors_e_of_transaction);
+    (
+        connector_e1_commitment_public_keys,
+        connector_e2_commitment_public_keys,
+    )
+}
+
+pub fn merge_to_connector_c_commits_public_key(
+    connector_e1_commitment_public_keys: &[BTreeMap<CommitmentMessageId, WinternitzPublicKey>],
+    connector_e2_commitment_public_keys: &[BTreeMap<CommitmentMessageId, WinternitzPublicKey>],
+) -> BTreeMap<CommitmentMessageId, WinternitzPublicKey> {
+    let mut connector_c_commitment_public_keys = BTreeMap::new();
+    for tree in connector_e1_commitment_public_keys {
+        for (message, pk) in tree {
+            connector_c_commitment_public_keys.insert(message.clone(), pk.clone());
+        }
+    }
+    for tree in connector_e2_commitment_public_keys {
+        for (message, pk) in tree {
+            connector_c_commitment_public_keys.insert(message.clone(), pk.clone());
+        }
+    }
+    connector_c_commitment_public_keys
+}
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertCommitConnectorsF {
+    pub connector_f_1: ConnectorF1,
+    pub connector_f_2: ConnectorF2,
+}
diff --git a/src/bridge/transactions/base.rs b/bridge/src/transactions/base.rs
similarity index 70%
rename from src/bridge/transactions/base.rs
rename to bridge/src/transactions/base.rs
index fc21e14ca..d9fc06436 100644
--- a/src/bridge/transactions/base.rs
+++ b/bridge/src/transactions/base.rs
@@ -1,12 +1,33 @@
+use super::pre_signed_musig2::{verify_public_nonce, PreSignedMusig2Transaction};
+use crate::graphs::base::MIN_RELAY_FEE_RATE;
 use bitcoin::{Amount, OutPoint, PublicKey, Script, Transaction, Txid, XOnlyPublicKey};
 use core::cmp;
+use itertools::Itertools;
 use musig2::{secp256k1::schnorr::Signature, PubNonce};
 use std::collections::HashMap;
 
-use super::{
-    pre_signed::PreSignedTransaction,
-    pre_signed_musig2::{verify_public_nonce, PreSignedMusig2Transaction},
-};
+// TODO: set to larger value to be compatible with future tx modifications
+pub const RELAY_FEE_BUFFER_MULTIPLIER: f32 = 1.0;
+pub const MIN_RELAY_FEE_KICK_OFF_1: u64 = relay_fee(6231);
+pub const MIN_RELAY_FEE_START_TIME: u64 = relay_fee(407);
+pub const MIN_RELAY_FEE_START_TIME_TIMEOUT: u64 = relay_fee(265);
+pub const MIN_RELAY_FEE_KICK_OFF_2: u64 = relay_fee(5461);
+pub const MIN_RELAY_FEE_KICK_OFF_TIMEOUT: u64 = relay_fee(182);
+pub const MIN_RELAY_FEE_TAKE_1: u64 = relay_fee(380);
+pub const MIN_RELAY_FEE_TAKE_2: u64 = relay_fee(347);
+pub const MIN_RELAY_FEE_PEG_IN_DEPOSIT: u64 = relay_fee(122);
+pub const MIN_RELAY_FEE_PEG_IN_CONFIRM: u64 = relay_fee(173);
+pub const MIN_RELAY_FEE_PEG_IN_REFUND: u64 = relay_fee(138);
+pub const MIN_RELAY_FEE_PEG_OUT: u64 = relay_fee(122);
+pub const MIN_RELAY_FEE_PEG_OUT_CONFIRM: u64 = relay_fee(122);
+pub const MIN_RELAY_FEE_ASSERT: u64 = relay_fee(232);
+pub const MIN_RELAY_FEE_ASSERT_INITIAL: u64 = relay_fee(48953);
+pub const MIN_RELAY_FEE_ASSERT_COMMIT1: u64 = relay_fee(739137);
+pub const MIN_RELAY_FEE_ASSERT_COMMIT2: u64 = relay_fee(470440);
+pub const MIN_RELAY_FEE_ASSERT_FINAL: u64 = relay_fee(352);
+pub const MIN_RELAY_FEE_CHALLENGE: u64 = relay_fee(317);
+pub const MIN_RELAY_FEE_DISPROVE: u64 = relay_fee(1000000);
+pub const MIN_RELAY_FEE_DISPROVE_CHAIN: u64 = relay_fee(389370);
 
 pub struct Input {
     pub outpoint: OutPoint,
@@ -20,6 +41,7 @@ pub struct InputWithScript<'a> {
 }
 
 pub trait BaseTransaction {
+    fn name(&self) -> &'static str;
     // fn initialize(&mut self, context: &dyn BaseContext);
 
     // TODO: Use musig2 to aggregate signatures
@@ -30,6 +52,10 @@ pub trait BaseTransaction {
     fn finalize(&self) -> Transaction;
 }
 
+pub const fn relay_fee(vsize: usize) -> u64 {
+    (vsize as f32 * RELAY_FEE_BUFFER_MULTIPLIER) as u64 * MIN_RELAY_FEE_RATE
+}
+
 pub fn merge_transactions(
     destination_transaction: &mut Transaction,
     source_transaction: &Transaction,
@@ -66,13 +92,35 @@ pub fn merge_musig2_nonces_and_signatures(
     source_transaction: &dyn PreSignedMusig2Transaction,
 ) {
     let nonces = destination_transaction.musig2_nonces_mut();
-    nonces.extend(source_transaction.musig2_nonces().clone());
+    merge_hash_maps(nonces, source_transaction.musig2_nonces().clone());
 
     let nonce_signatures = destination_transaction.musig2_nonce_signatures_mut();
-    nonce_signatures.extend(source_transaction.musig2_nonce_signatures().clone());
+    merge_hash_maps(
+        nonce_signatures,
+        source_transaction.musig2_nonce_signatures().clone(),
+    );
 
     let signatures = destination_transaction.musig2_signatures_mut();
-    signatures.extend(source_transaction.musig2_signatures().clone());
+    merge_hash_maps(signatures, source_transaction.musig2_signatures().clone());
+}
+
+// merge the nonce/signature hashmaps. We can't just do a.extend(b) since that would just overwrite the inner
+// hashmap rather than merging it
+fn merge_hash_maps<T: Clone>(
+    a: &mut HashMap<usize, HashMap<PublicKey, T>>,
+    b: HashMap<usize, HashMap<PublicKey, T>>,
+) {
+    let all_keys = a
+        .keys()
+        .chain(b.keys())
+        .unique()
+        .cloned()
+        .collect::<Vec<_>>();
+    for key in all_keys {
+        let q = a.entry(key).or_default();
+        let w = b.get(&key).cloned().unwrap_or(HashMap::new());
+        q.extend(w.clone());
+    }
 }
 
 pub fn validate_transaction(
@@ -130,9 +178,7 @@ fn verify_public_nonces(
     ret_val
 }
 
-pub fn verify_public_nonces_for_tx(
-    tx: &(impl PreSignedTransaction + PreSignedMusig2Transaction),
-) -> bool {
+pub fn verify_public_nonces_for_tx(tx: &impl PreSignedMusig2Transaction) -> bool {
     verify_public_nonces(
         tx.musig2_nonces(),
         tx.musig2_nonce_signatures(),
@@ -147,13 +193,13 @@ mod tests {
     use bitcoin::{
         key::{
             constants::{SCHNORR_SIGNATURE_SIZE, SECRET_KEY_SIZE},
-            Keypair, Secp256k1,
+            Keypair,
         },
         PublicKey, Txid,
     };
     use musig2::{secp256k1::schnorr::Signature, PubNonce};
 
-    use crate::bridge::{
+    use crate::{
         contexts::base::generate_keys_from_secret,
         transactions::{pre_signed_musig2::get_nonce_message, signing_musig2::generate_nonce},
     };
@@ -173,7 +219,7 @@ mod tests {
         let mut keypairs: Vec<Keypair> = Vec::new();
         let mut pubkeys: Vec<PublicKey> = Vec::new();
         for signer in 0..SIGNERS {
-            let (_, keypair, pubkey) = generate_keys_from_secret(
+            let (keypair, pubkey) = generate_keys_from_secret(
                 bitcoin::Network::Bitcoin,
                 &hex::encode([(signer + 1) as u8; SECRET_KEY_SIZE]),
             );
@@ -192,10 +238,8 @@ mod tests {
 
                 nonces.insert(pubkeys[signer], secret_nonce.public_nonce());
 
-                let nonce_signature = Secp256k1::new().sign_schnorr(
-                    &get_nonce_message(&secret_nonce.public_nonce()),
-                    &keypairs[signer],
-                );
+                let nonce_signature =
+                    keypairs[signer].sign_schnorr(get_nonce_message(&secret_nonce.public_nonce()));
                 sigs.insert(pubkeys[signer], nonce_signature);
             }
             all_nonces.insert(input, nonces);
@@ -219,7 +263,7 @@ mod tests {
         let (all_nonces, mut all_sigs) = get_test_nonces();
 
         let input_index = all_sigs.len() / 2;
-        let pubkey = all_sigs[&input_index].keys().next().unwrap().clone();
+        let pubkey = *all_sigs[&input_index].keys().next().unwrap();
         let mut bad_sig = all_sigs[&input_index][&pubkey].serialize();
         bad_sig[SCHNORR_SIGNATURE_SIZE - 1] += 1;
         all_sigs
diff --git a/src/bridge/transactions/challenge.rs b/bridge/src/transactions/challenge.rs
similarity index 74%
rename from src/bridge/transactions/challenge.rs
rename to bridge/src/transactions/challenge.rs
index fe473322c..cc46daa9f 100644
--- a/src/bridge/transactions/challenge.rs
+++ b/bridge/src/transactions/challenge.rs
@@ -1,16 +1,14 @@
 use bitcoin::{
     absolute, consensus, key::Keypair, Amount, Network, PublicKey, ScriptBuf, Sequence,
-    TapSighashType, Transaction, TxIn, TxOut, Witness, XOnlyPublicKey,
+    TapSighashType, Transaction, TxIn, TxOut, Witness,
 };
 use serde::{Deserialize, Serialize};
+use std::cmp::Ordering;
+
+use crate::{connectors::base::TaprootConnector, graphs::base::DUST_AMOUNT};
 
 use super::{
-    super::{
-        connectors::{connector::*, connector_a::ConnectorA},
-        contexts::{base::BaseContext, operator::OperatorContext},
-        graphs::base::FEE_AMOUNT,
-        scripts::*,
-    },
+    super::{connectors::connector_a::ConnectorA, contexts::operator::OperatorContext, scripts::*},
     base::*,
     pre_signed::*,
     signing::populate_p2wsh_witness,
@@ -24,7 +22,6 @@ pub struct ChallengeTransaction {
     prev_outs: Vec<TxOut>,
     prev_scripts: Vec<ScriptBuf>,
     input_amount_crowdfunding: Amount,
-    connector_a: ConnectorA,
 }
 
 impl PreSignedTransaction for ChallengeTransaction {
@@ -40,19 +37,19 @@ impl PreSignedTransaction for ChallengeTransaction {
 impl ChallengeTransaction {
     pub fn new(
         context: &OperatorContext,
+        connector_a: &ConnectorA,
         input_0: Input,
         input_amount_crowdfunding: Amount,
     ) -> Self {
         let mut this = Self::new_for_validation(
             context.network,
             &context.operator_public_key,
-            &context.operator_taproot_public_key,
-            &context.n_of_n_taproot_public_key,
+            connector_a,
             input_0,
             input_amount_crowdfunding,
         );
 
-        this.sign_input_0(context);
+        this.sign_input_0(context, connector_a);
 
         this
     }
@@ -60,26 +57,19 @@ impl ChallengeTransaction {
     pub fn new_for_validation(
         network: Network,
         operator_public_key: &PublicKey,
-        operator_taproot_public_key: &XOnlyPublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
+        connector_a: &ConnectorA,
         input_0: Input,
         input_amount_crowdfunding: Amount,
     ) -> Self {
-        let connector_a = ConnectorA::new(
-            network,
-            operator_taproot_public_key,
-            n_of_n_taproot_public_key,
-        );
-
         let input_0_leaf = 1;
         let _input_0 = connector_a.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
 
         let total_output_amount =
-            input_0.amount + input_amount_crowdfunding - Amount::from_sat(FEE_AMOUNT);
+            input_0.amount + input_amount_crowdfunding - Amount::from_sat(MIN_RELAY_FEE_CHALLENGE);
 
         let _output_0 = TxOut {
             value: total_output_amount,
-            script_pubkey: generate_pay_to_pubkey_script_address(network, &operator_public_key)
+            script_pubkey: generate_pay_to_pubkey_script_address(network, operator_public_key)
                 .script_pubkey(),
         };
 
@@ -102,17 +92,15 @@ impl ChallengeTransaction {
                 // input 1's script will be added later
             ],
             input_amount_crowdfunding,
-            connector_a,
         }
     }
 
-    fn sign_input_0(&mut self, context: &OperatorContext) {
-        pre_sign_taproot_input(
+    fn sign_input_0(&mut self, context: &OperatorContext, connector_a: &ConnectorA) {
+        pre_sign_taproot_input_default(
             self,
-            context,
             0,
             TapSighashType::SinglePlusAnyoneCanPay,
-            self.connector_a.generate_taproot_spend_info(),
+            connector_a.generate_taproot_spend_info(),
             &vec![&context.operator_keypair],
         );
     }
@@ -120,7 +108,6 @@ impl ChallengeTransaction {
     // allows for aggregating multiple inputs and one refund output
     pub fn add_inputs_and_output(
         &mut self,
-        context: &dyn BaseContext,
         inputs: &Vec<InputWithScript>,
         keypair: &Keypair,
         output_script_pubkey: ScriptBuf,
@@ -134,15 +121,21 @@ impl ChallengeTransaction {
         for input in inputs {
             total_input_amount += input.amount;
         }
-        if total_input_amount < self.input_amount_crowdfunding {
-            panic!("Total input amount too low. Add additional input.");
-        } else if total_input_amount > self.input_amount_crowdfunding {
-            // add refund output
-            let _output = TxOut {
-                value: total_input_amount - self.input_amount_crowdfunding,
-                script_pubkey: output_script_pubkey,
-            };
-            self.tx.output.push(_output);
+        match total_input_amount.cmp(&self.input_amount_crowdfunding) {
+            Ordering::Less => panic!("Total input amount too low. Add additional input."),
+            Ordering::Greater => {
+                let discrepancy = total_input_amount - self.input_amount_crowdfunding;
+                if discrepancy.to_sat() >= DUST_AMOUNT {
+                    // add refund output
+                    let _output = TxOut {
+                        value: discrepancy,
+                        script_pubkey: output_script_pubkey,
+                    };
+                    self.tx.output.push(_output);
+                }
+                // discrepancy less than dust will be lost as relay fee
+            }
+            Ordering::Equal => {}
         }
 
         // add crowdfunding inputs
@@ -159,7 +152,6 @@ impl ChallengeTransaction {
 
             // add witness
             populate_p2wsh_witness(
-                context,
                 &mut self.tx,
                 input_index,
                 sighash_type,
@@ -175,6 +167,8 @@ impl ChallengeTransaction {
     pub fn merge(&mut self, challenge: &ChallengeTransaction) {
         merge_transactions(&mut self.tx, &challenge.tx);
     }
+
+    pub fn min_crowdfunding_amount(&self) -> u64 { self.input_amount_crowdfunding.to_sat() }
 }
 
 impl BaseTransaction for ChallengeTransaction {
@@ -185,4 +179,5 @@ impl BaseTransaction for ChallengeTransaction {
 
         self.tx.clone()
     }
+    fn name(&self) -> &'static str { "Challenge" }
 }
diff --git a/src/bridge/transactions/disprove.rs b/bridge/src/transactions/disprove.rs
similarity index 70%
rename from src/bridge/transactions/disprove.rs
rename to bridge/src/transactions/disprove.rs
index c386a33e3..885a9d6f6 100644
--- a/src/bridge/transactions/disprove.rs
+++ b/bridge/src/transactions/disprove.rs
@@ -1,16 +1,16 @@
 use bitcoin::{
     absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
-    XOnlyPublicKey,
 };
+use bitvm::chunk::api::type_conversion_utils::RawWitness;
 use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
+
 use super::{
     super::{
-        connectors::{connector::*, connector_5::Connector5, connector_c::ConnectorC},
+        connectors::{base::*, connector_5::Connector5, connector_c::ConnectorC},
         contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
@@ -26,8 +26,6 @@ pub struct DisproveTransaction {
     #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
     prev_outs: Vec<TxOut>,
     prev_scripts: Vec<ScriptBuf>,
-    connector_5: Connector5,
-    connector_c: ConnectorC,
     reward_output_amount: Amount,
 
     musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
@@ -66,50 +64,42 @@ impl PreSignedMusig2Transaction for DisproveTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0] }
 }
 
 impl DisproveTransaction {
     pub fn new(
         context: &OperatorContext,
+        connector_5: &Connector5,
+        connector_c: &ConnectorC,
         input_0: Input,
         input_1: Input,
-        script_index: u32,
     ) -> Self {
-        Self::new_for_validation(
-            context.network,
-            &context.operator_taproot_public_key,
-            &context.n_of_n_taproot_public_key,
-            input_0,
-            input_1,
-            script_index,
-        )
+        Self::new_for_validation(context.network, connector_5, connector_c, input_0, input_1)
     }
 
     pub fn new_for_validation(
         network: Network,
-        operator_taproot_public_key: &XOnlyPublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
+        connector_5: &Connector5,
+        connector_c: &ConnectorC,
         input_0: Input,
         input_1: Input,
-        script_index: u32,
     ) -> Self {
-        let connector_5 = Connector5::new(network, &n_of_n_taproot_public_key);
-        let connector_c = ConnectorC::new(network, &operator_taproot_public_key);
-
         let input_0_leaf = 1;
         let _input_0 = connector_5.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
 
-        let input_1_leaf = script_index;
-        let _input_1 = connector_c.generate_taproot_leaf_tx_in(input_1_leaf, &input_1);
+        let _input_1 = generate_default_tx_in(&input_1);
 
-        let total_output_amount = input_0.amount + input_1.amount - Amount::from_sat(FEE_AMOUNT);
+        let total_output_amount =
+            input_0.amount + input_1.amount - Amount::from_sat(MIN_RELAY_FEE_DISPROVE);
 
+        let output_0_amount = total_output_amount / 2;
         let _output_0 = TxOut {
-            value: total_output_amount / 2,
+            value: output_0_amount,
             script_pubkey: generate_burn_script_address(network).script_pubkey(),
         };
 
-        let reward_output_amount = total_output_amount - (total_output_amount / 2);
+        let reward_output_amount = total_output_amount - output_0_amount;
         let _output_1 = TxOut {
             value: reward_output_amount,
             script_pubkey: ScriptBuf::default(),
@@ -134,10 +124,8 @@ impl DisproveTransaction {
             ],
             prev_scripts: vec![
                 connector_5.generate_taproot_leaf_script(input_0_leaf),
-                connector_c.generate_taproot_leaf_script(input_1_leaf),
+                // `input_1` prev_script is not known at this point
             ],
-            connector_5,
-            connector_c,
             reward_output_amount,
             musig2_nonces: HashMap::new(),
             musig2_nonce_signatures: HashMap::new(),
@@ -145,7 +133,12 @@ impl DisproveTransaction {
         }
     }
 
-    fn sign_input_0(&mut self, context: &VerifierContext, secret_nonce: &SecNonce) {
+    fn sign_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_5: &Connector5,
+        secret_nonce: &SecNonce,
+    ) {
         let input_index = 0;
         pre_sign_musig2_taproot_input(
             self,
@@ -157,41 +150,38 @@ impl DisproveTransaction {
 
         // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
         if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
-            self.finalize_input_0(context);
+            self.finalize_input_0(context, connector_5);
         }
     }
 
-    fn finalize_input_0(&mut self, context: &dyn BaseContext) {
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_5: &Connector5) {
         let input_index = 0;
         finalize_musig2_taproot_input(
             self,
             context,
             input_index,
             TapSighashType::Single,
-            self.connector_5.generate_taproot_spend_info(),
+            connector_5.generate_taproot_spend_info(),
         );
     }
 
-    pub fn push_nonces(&mut self, context: &VerifierContext) -> HashMap<usize, SecNonce> {
-        let mut secret_nonces = HashMap::new();
-
-        let input_index = 0;
-        let secret_nonce = push_nonce(self, context, input_index);
-        secret_nonces.insert(input_index, secret_nonce);
-
-        secret_nonces
-    }
-
     pub fn pre_sign(
         &mut self,
         context: &VerifierContext,
+        connector_5: &Connector5,
         secret_nonces: &HashMap<usize, SecNonce>,
     ) {
         let input_index = 0;
-        self.sign_input_0(context, &secret_nonces[&input_index]);
+        self.sign_input_0(context, connector_5, &secret_nonces[&input_index]);
     }
 
-    pub fn add_input_output(&mut self, input_script_index: u32, output_script_pubkey: ScriptBuf) {
+    pub fn add_input_output(
+        &mut self,
+        connector_c: &ConnectorC,
+        input_script_index: u32,
+        input_script_witness: RawWitness,
+        output_script_pubkey: ScriptBuf,
+    ) {
         // Add output
         let output_index = 1;
         self.tx.output[output_index].script_pubkey = output_script_pubkey;
@@ -199,16 +189,13 @@ impl DisproveTransaction {
         let input_index = 1;
 
         // Push the unlocking witness
-        let unlock_witness = self
-            .connector_c
-            .generate_taproot_leaf_script_witness(input_script_index);
-        self.tx.input[input_index].witness.push(unlock_witness);
+        input_script_witness
+            .into_iter()
+            .for_each(|x| self.tx.input[input_index].witness.push(x));
 
         // Push script + control block
-        let script = self
-            .connector_c
-            .generate_taproot_leaf_script(input_script_index);
-        let taproot_spend_info = self.connector_c.generate_taproot_spend_info();
+        let script = connector_c.generate_taproot_leaf_script(input_script_index);
+        let taproot_spend_info = connector_c.generate_taproot_spend_info();
         push_taproot_leaf_script_and_control_block_to_witness(
             &mut self.tx,
             input_index,
@@ -231,4 +218,5 @@ impl BaseTransaction for DisproveTransaction {
 
         self.tx.clone()
     }
+    fn name(&self) -> &'static str { "Disprove" }
 }
diff --git a/src/bridge/transactions/disprove_chain.rs b/bridge/src/transactions/disprove_chain.rs
similarity index 66%
rename from src/bridge/transactions/disprove_chain.rs
rename to bridge/src/transactions/disprove_chain.rs
index a3cd65189..f17a2d40e 100644
--- a/src/bridge/transactions/disprove_chain.rs
+++ b/bridge/src/transactions/disprove_chain.rs
@@ -1,21 +1,23 @@
 use bitcoin::{
-    absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
-    XOnlyPublicKey,
+    absolute, block::Header, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType,
+    Transaction, TxOut, Witness,
 };
 use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
+use crate::{connectors::base::TaprootConnector, superblock::get_superblock_message};
+
 use super::{
     super::{
-        connectors::{connector::*, connector_b::ConnectorB},
+        connectors::connector_b::ConnectorB,
         contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
     pre_signed::*,
     pre_signed_musig2::*,
+    signing::push_taproot_leaf_unlock_data_to_witness,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -25,7 +27,6 @@ pub struct DisproveChainTransaction {
     #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
     prev_outs: Vec<TxOut>,
     prev_scripts: Vec<ScriptBuf>,
-    connector_b: ConnectorB,
     reward_output_amount: Amount,
 
     musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
@@ -64,31 +65,27 @@ impl PreSignedMusig2Transaction for DisproveChainTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0] }
 }
 
 impl DisproveChainTransaction {
-    pub fn new(context: &OperatorContext, input_0: Input) -> Self {
-        Self::new_for_validation(context.network, &context.n_of_n_taproot_public_key, input_0)
+    pub fn new(context: &OperatorContext, connector_b: &ConnectorB, input_0: Input) -> Self {
+        Self::new_for_validation(context.network, connector_b, input_0)
     }
 
-    pub fn new_for_validation(
-        network: Network,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
-        input_0: Input,
-    ) -> Self {
-        let connector_b = ConnectorB::new(network, &n_of_n_taproot_public_key);
-
+    pub fn new_for_validation(network: Network, connector_b: &ConnectorB, input_0: Input) -> Self {
         let input_0_leaf = 2;
         let _input_0 = connector_b.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
 
-        let total_output_amount = input_0.amount - Amount::from_sat(FEE_AMOUNT);
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_DISPROVE_CHAIN);
 
+        let burn_amount = total_output_amount / 2;
         let _output_0 = TxOut {
-            value: total_output_amount / 2,
+            value: burn_amount,
             script_pubkey: generate_burn_script_address(network).script_pubkey(),
         };
 
-        let reward_output_amount = total_output_amount - (total_output_amount / 2);
+        let reward_output_amount = total_output_amount - burn_amount;
         let _output_1 = TxOut {
             value: reward_output_amount,
             script_pubkey: ScriptBuf::default(),
@@ -106,7 +103,6 @@ impl DisproveChainTransaction {
                 script_pubkey: connector_b.generate_taproot_address().script_pubkey(),
             }],
             prev_scripts: vec![connector_b.generate_taproot_leaf_script(input_0_leaf)],
-            connector_b,
             reward_output_amount,
             musig2_nonces: HashMap::new(),
             musig2_nonce_signatures: HashMap::new(),
@@ -114,7 +110,12 @@ impl DisproveChainTransaction {
         }
     }
 
-    fn sign_input_0(&mut self, context: &VerifierContext, secret_nonce: &SecNonce) {
+    fn sign_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_b: &ConnectorB,
+        secret_nonce: &SecNonce,
+    ) {
         let input_index = 0;
         pre_sign_musig2_taproot_input(
             self,
@@ -126,38 +127,55 @@ impl DisproveChainTransaction {
 
         // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
         if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
-            self.finalize_input_0(context);
+            self.finalize_input_0(context, connector_b);
         }
     }
 
-    fn finalize_input_0(&mut self, context: &dyn BaseContext) {
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_b: &ConnectorB) {
         let input_index = 0;
         finalize_musig2_taproot_input(
             self,
             context,
             input_index,
             TapSighashType::Single,
-            self.connector_b.generate_taproot_spend_info(),
+            connector_b.generate_taproot_spend_info(),
         );
     }
 
-    pub fn push_nonces(&mut self, context: &VerifierContext) -> HashMap<usize, SecNonce> {
-        let mut secret_nonces = HashMap::new();
-
-        let input_index = 0;
-        let secret_nonce = push_nonce(self, context, input_index);
-        secret_nonces.insert(input_index, secret_nonce);
-
-        secret_nonces
-    }
-
     pub fn pre_sign(
         &mut self,
         context: &VerifierContext,
+        connector_b: &ConnectorB,
         secret_nonces: &HashMap<usize, SecNonce>,
     ) {
         let input_index = 0;
-        self.sign_input_0(context, &secret_nonces[&input_index]);
+        self.sign_input_0(context, connector_b, &secret_nonces[&input_index]);
+        // TODO: We probably shouldn't finalize the witness when pre-signing (sign_input_0 calls finalize_input_0,
+        // which adds a control block to the witness). Please double-check that the control block should be only added
+        // after the tx is signed (see `sign()`) and ready to be broadcast.
+    }
+
+    pub fn sign(
+        &mut self,
+        disprove_sb: &Header,
+        start_time_witness: &Witness,
+        superblock_hash_witness: &Witness,
+    ) {
+        let input_index = 0;
+        let mut unlock_data: Vec<Vec<u8>> = Vec::new();
+
+        // Constructing the witness as follows:
+        // SB'
+        // Committed start time
+        // Committed SB hash
+
+        let mut disprove_sb_message = get_superblock_message(disprove_sb);
+        disprove_sb_message.reverse();
+        unlock_data.extend(disprove_sb_message.into_iter().map(|byte| vec![byte]));
+        unlock_data.extend(start_time_witness.to_vec());
+        unlock_data.extend(superblock_hash_witness.to_vec());
+
+        push_taproot_leaf_unlock_data_to_witness(self.tx_mut(), input_index, unlock_data);
     }
 
     pub fn add_output(&mut self, output_script_pubkey: ScriptBuf) {
@@ -179,4 +197,5 @@ impl BaseTransaction for DisproveChainTransaction {
 
         self.tx.clone()
     }
+    fn name(&self) -> &'static str { "DisproveChain" }
 }
diff --git a/bridge/src/transactions/kick_off_1.rs b/bridge/src/transactions/kick_off_1.rs
new file mode 100644
index 000000000..fd26a740d
--- /dev/null
+++ b/bridge/src/transactions/kick_off_1.rs
@@ -0,0 +1,169 @@
+use bitcoin::{
+    absolute, consensus, Amount, Network, ScriptBuf, TapSighashType, Transaction, TxOut,
+    XOnlyPublicKey,
+};
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{
+        connectors::{
+            base::*, connector_1::Connector1, connector_2::Connector2, connector_6::Connector6,
+            connector_a::ConnectorA,
+        },
+        contexts::operator::OperatorContext,
+        graphs::base::DUST_AMOUNT,
+    },
+    base::*,
+    pre_signed::*,
+    signing::{generate_taproot_leaf_schnorr_signature, populate_taproot_input_witness},
+};
+use bitvm::signatures::signing_winternitz::{generate_winternitz_witness, WinternitzSigningInputs};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct KickOff1Transaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+}
+
+impl PreSignedTransaction for KickOff1Transaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl KickOff1Transaction {
+    pub fn new(
+        context: &OperatorContext,
+        connector_1: &Connector1,
+        connector_2: &Connector2,
+        connector_6: &Connector6,
+        input_0: Input,
+    ) -> Self {
+        Self::new_for_validation(
+            context.network,
+            &context.operator_taproot_public_key,
+            &context.n_of_n_taproot_public_key,
+            connector_1,
+            connector_2,
+            connector_6,
+            input_0,
+        )
+    }
+
+    pub fn new_for_validation(
+        network: Network,
+        operator_taproot_public_key: &XOnlyPublicKey,
+        n_of_n_taproot_public_key: &XOnlyPublicKey,
+        connector_1: &Connector1,
+        connector_2: &Connector2,
+        connector_6: &Connector6,
+        input_0: Input,
+    ) -> Self {
+        let connector_a = ConnectorA::new(
+            network,
+            operator_taproot_public_key,
+            n_of_n_taproot_public_key,
+        );
+
+        let input_0_leaf = 0;
+        let _input_0 = connector_6.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
+
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_KICK_OFF_1);
+
+        let _output_0 = TxOut {
+            value: Amount::from_sat(DUST_AMOUNT),
+            script_pubkey: connector_a.generate_taproot_address().script_pubkey(),
+        };
+
+        // fund start time relay fee here since it has no other inputs
+        let _output_2 = TxOut {
+            value: Amount::from_sat(DUST_AMOUNT + MIN_RELAY_FEE_START_TIME),
+            script_pubkey: connector_2.generate_taproot_address().script_pubkey(),
+        };
+
+        let _output_1 = TxOut {
+            value: total_output_amount - _output_0.value - _output_2.value,
+            script_pubkey: connector_1.generate_taproot_address().script_pubkey(),
+        };
+
+        KickOff1Transaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0],
+                output: vec![_output_0, _output_1, _output_2],
+            },
+            prev_outs: vec![TxOut {
+                value: input_0.amount,
+                script_pubkey: connector_6.generate_taproot_address().script_pubkey(), // TODO: Add address of Commit y
+            }],
+            prev_scripts: vec![connector_6.generate_taproot_leaf_script(input_0_leaf)],
+        }
+    }
+
+    fn sign_input_0(
+        &mut self,
+        context: &OperatorContext,
+        connector_6: &Connector6,
+        source_network_txid_inputs: &WinternitzSigningInputs,
+        destination_network_txid_inputs: &WinternitzSigningInputs,
+    ) {
+        let input_index = 0;
+        let script = &self.prev_scripts()[input_index].clone();
+        let prev_outs = &self.prev_outs().clone();
+        let taproot_spend_info = connector_6.generate_taproot_spend_info();
+        let mut unlock_data: Vec<Vec<u8>> = Vec::new();
+
+        // get schnorr signature
+        let schnorr_signature = generate_taproot_leaf_schnorr_signature(
+            self.tx_mut(),
+            prev_outs,
+            input_index,
+            TapSighashType::All,
+            script,
+            &context.operator_keypair,
+        );
+        unlock_data.push(schnorr_signature.to_vec());
+
+        // get winternitz signature for source network txid
+        unlock_data.extend(generate_winternitz_witness(source_network_txid_inputs).to_vec());
+
+        // get winternitz signature for destination network txid
+        unlock_data.extend(generate_winternitz_witness(destination_network_txid_inputs).to_vec());
+
+        populate_taproot_input_witness(
+            self.tx_mut(),
+            input_index,
+            &taproot_spend_info,
+            script,
+            unlock_data,
+        );
+    }
+
+    pub fn sign(
+        &mut self,
+        context: &OperatorContext,
+        connector_6: &Connector6,
+        source_network_txid_inputs: &WinternitzSigningInputs,
+        destination_network_txid_inputs: &WinternitzSigningInputs,
+    ) {
+        self.sign_input_0(
+            context,
+            connector_6,
+            source_network_txid_inputs,
+            destination_network_txid_inputs,
+        );
+    }
+}
+
+impl BaseTransaction for KickOff1Transaction {
+    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "KickOff1" }
+}
diff --git a/bridge/src/transactions/kick_off_2.rs b/bridge/src/transactions/kick_off_2.rs
new file mode 100644
index 000000000..14125f208
--- /dev/null
+++ b/bridge/src/transactions/kick_off_2.rs
@@ -0,0 +1,158 @@
+use bitcoin::{
+    absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
+    Witness,
+};
+use serde::{Deserialize, Serialize};
+
+use crate::connectors::base::{P2wshConnector, TaprootConnector};
+
+use super::{
+    super::{
+        connectors::{connector_1::Connector1, connector_3::Connector3, connector_b::ConnectorB},
+        contexts::operator::OperatorContext,
+        graphs::base::DUST_AMOUNT,
+    },
+    base::*,
+    pre_signed::*,
+    signing::{generate_taproot_leaf_schnorr_signature, populate_taproot_input_witness},
+};
+
+use bitvm::signatures::signing_winternitz::{generate_winternitz_witness, WinternitzSigningInputs};
+
+pub const MIN_RELAY_FEE_AMOUNT: u64 = 105_771;
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct KickOff2Transaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+
+    pub superblock_hash_witness: Option<Witness>,
+}
+
+impl PreSignedTransaction for KickOff2Transaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl KickOff2Transaction {
+    pub fn new(
+        context: &OperatorContext,
+        connector_1: &Connector1,
+        connector_b: &ConnectorB,
+        input_0: Input,
+    ) -> Self {
+        Self::new_for_validation(
+            context.network,
+            &context.operator_public_key,
+            connector_1,
+            connector_b,
+            input_0,
+        )
+    }
+
+    pub fn new_for_validation(
+        network: Network,
+        operator_public_key: &PublicKey,
+        connector_1: &Connector1,
+        connector_b: &ConnectorB,
+        input_0: Input,
+    ) -> Self {
+        let connector_3 = Connector3::new(network, operator_public_key);
+
+        let input_0_leaf = 0;
+        let _input_0 = connector_1.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
+
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_KICK_OFF_2);
+
+        let _output_0 = TxOut {
+            value: Amount::from_sat(DUST_AMOUNT),
+            script_pubkey: connector_3.generate_address().script_pubkey(),
+        };
+
+        let _output_1 = TxOut {
+            value: total_output_amount - _output_0.value,
+            script_pubkey: connector_b.generate_taproot_address().script_pubkey(),
+        };
+
+        KickOff2Transaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0],
+                output: vec![_output_0, _output_1],
+            },
+            prev_outs: vec![TxOut {
+                value: input_0.amount,
+                script_pubkey: connector_1.generate_taproot_address().script_pubkey(),
+            }],
+            prev_scripts: vec![connector_1.generate_taproot_leaf_script(input_0_leaf)],
+            superblock_hash_witness: None,
+        }
+    }
+
+    fn sign_input_0(
+        &mut self,
+        context: &OperatorContext,
+        connector_1: &Connector1,
+        superblock_signing_inputs: &WinternitzSigningInputs,
+        superblock_hash_signing_inputs: &WinternitzSigningInputs,
+    ) {
+        let input_index = 0;
+        let prev_outs = &self.prev_outs().clone();
+        let script = &self.prev_scripts()[input_index].clone();
+        let taproot_spend_info = connector_1.generate_taproot_spend_info();
+        let mut unlock_data: Vec<Vec<u8>> = Vec::new();
+
+        let schnorr_signature = generate_taproot_leaf_schnorr_signature(
+            self.tx_mut(),
+            prev_outs,
+            input_index,
+            TapSighashType::All,
+            script,
+            &context.operator_keypair,
+        );
+        unlock_data.push(schnorr_signature.to_vec());
+
+        unlock_data.extend(generate_winternitz_witness(superblock_signing_inputs).to_vec());
+
+        self.superblock_hash_witness =
+            Some(generate_winternitz_witness(superblock_hash_signing_inputs));
+        unlock_data.extend(self.superblock_hash_witness.as_ref().unwrap().to_vec());
+
+        populate_taproot_input_witness(
+            self.tx_mut(),
+            input_index,
+            &taproot_spend_info,
+            script,
+            unlock_data,
+        );
+    }
+
+    pub fn sign(
+        &mut self,
+        context: &OperatorContext,
+        connector_1: &Connector1,
+        superblock_signing_inputs: &WinternitzSigningInputs,
+        superblock_hash_signing_inputs: &WinternitzSigningInputs,
+    ) {
+        self.sign_input_0(
+            context,
+            connector_1,
+            superblock_signing_inputs,
+            superblock_hash_signing_inputs,
+        );
+    }
+}
+
+impl BaseTransaction for KickOff2Transaction {
+    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "KickOff2" }
+}
diff --git a/src/bridge/transactions/kick_off_timeout.rs b/bridge/src/transactions/kick_off_timeout.rs
similarity index 76%
rename from src/bridge/transactions/kick_off_timeout.rs
rename to bridge/src/transactions/kick_off_timeout.rs
index f372cecb6..21903fa8d 100644
--- a/src/bridge/transactions/kick_off_timeout.rs
+++ b/bridge/src/transactions/kick_off_timeout.rs
@@ -1,6 +1,5 @@
 use bitcoin::{
     absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
-    XOnlyPublicKey,
 };
 use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
 use serde::{Deserialize, Serialize};
@@ -8,9 +7,8 @@ use std::collections::HashMap;
 
 use super::{
     super::{
-        connectors::{connector::*, connector_1::Connector1},
+        connectors::{base::*, connector_1::Connector1},
         contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
@@ -25,7 +23,6 @@ pub struct KickOffTimeoutTransaction {
     #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
     prev_outs: Vec<TxOut>,
     prev_scripts: Vec<ScriptBuf>,
-    connector_1: Connector1,
     reward_output_amount: Amount,
 
     musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
@@ -64,34 +61,19 @@ impl PreSignedMusig2Transaction for KickOffTimeoutTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0] }
 }
 
 impl KickOffTimeoutTransaction {
-    pub fn new(context: &OperatorContext, input_0: Input) -> Self {
-        Self::new_for_validation(
-            context.network,
-            &context.operator_taproot_public_key,
-            &context.n_of_n_taproot_public_key,
-            input_0,
-        )
+    pub fn new(context: &OperatorContext, connector_1: &Connector1, input_0: Input) -> Self {
+        Self::new_for_validation(context.network, connector_1, input_0)
     }
 
-    pub fn new_for_validation(
-        network: Network,
-        operator_taproot_public_key: &XOnlyPublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
-        input_0: Input,
-    ) -> Self {
-        let connector_1 = Connector1::new(
-            network,
-            &operator_taproot_public_key,
-            &n_of_n_taproot_public_key,
-        );
-
+    pub fn new_for_validation(network: Network, connector_1: &Connector1, input_0: Input) -> Self {
         let input_0_leaf = 1;
         let _input_0 = connector_1.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
 
-        let total_output_amount = input_0.amount - Amount::from_sat(FEE_AMOUNT);
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_KICK_OFF_TIMEOUT);
 
         let _output_0 = TxOut {
             value: total_output_amount * 95 / 100,
@@ -116,7 +98,6 @@ impl KickOffTimeoutTransaction {
                 script_pubkey: connector_1.generate_taproot_address().script_pubkey(),
             }],
             prev_scripts: vec![connector_1.generate_taproot_leaf_script(input_0_leaf)],
-            connector_1,
             reward_output_amount,
             musig2_nonces: HashMap::new(),
             musig2_nonce_signatures: HashMap::new(),
@@ -124,9 +105,12 @@ impl KickOffTimeoutTransaction {
         }
     }
 
-    pub fn num_blocks_timelock_0(&self) -> u32 { self.connector_1.num_blocks_timelock_1 }
-
-    fn sign_input_0(&mut self, context: &VerifierContext, secret_nonce: &SecNonce) {
+    fn sign_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_1: &Connector1,
+        secret_nonce: &SecNonce,
+    ) {
         let input_index = 0;
         pre_sign_musig2_taproot_input(
             self,
@@ -138,38 +122,29 @@ impl KickOffTimeoutTransaction {
 
         // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
         if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
-            self.finalize_input_0(context);
+            self.finalize_input_0(context, connector_1);
         }
     }
 
-    fn finalize_input_0(&mut self, context: &dyn BaseContext) {
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_1: &Connector1) {
         let input_index = 0;
         finalize_musig2_taproot_input(
             self,
             context,
             input_index,
             TapSighashType::Single,
-            self.connector_1.generate_taproot_spend_info(),
+            connector_1.generate_taproot_spend_info(),
         );
     }
 
-    pub fn push_nonces(&mut self, context: &VerifierContext) -> HashMap<usize, SecNonce> {
-        let mut secret_nonces = HashMap::new();
-
-        let input_index = 0;
-        let secret_nonce = push_nonce(self, context, input_index);
-        secret_nonces.insert(input_index, secret_nonce);
-
-        secret_nonces
-    }
-
     pub fn pre_sign(
         &mut self,
         context: &VerifierContext,
+        connector_1: &Connector1,
         secret_nonces: &HashMap<usize, SecNonce>,
     ) {
         let input_index = 0;
-        self.sign_input_0(context, &secret_nonces[&input_index]);
+        self.sign_input_0(context, connector_1, &secret_nonces[&input_index]);
     }
 
     pub fn add_output(&mut self, output_script_pubkey: ScriptBuf) {
@@ -191,4 +166,5 @@ impl BaseTransaction for KickOffTimeoutTransaction {
 
         self.tx.clone()
     }
+    fn name(&self) -> &'static str { "KickOffTimeout" }
 }
diff --git a/src/bridge/transactions/mod.rs b/bridge/src/transactions/mod.rs
similarity index 88%
rename from src/bridge/transactions/mod.rs
rename to bridge/src/transactions/mod.rs
index cae7fd9a5..feaddfed4 100644
--- a/src/bridge/transactions/mod.rs
+++ b/bridge/src/transactions/mod.rs
@@ -1,4 +1,5 @@
 pub mod assert;
+pub mod assert_transactions;
 pub mod base;
 pub mod challenge;
 pub mod disprove;
@@ -10,6 +11,7 @@ pub mod peg_in_confirm;
 pub mod peg_in_deposit;
 pub mod peg_in_refund;
 pub mod peg_out;
+pub mod peg_out_confirm;
 pub mod pre_signed;
 pub mod pre_signed_musig2;
 pub mod signing;
diff --git a/src/bridge/transactions/peg_in_confirm.rs b/bridge/src/transactions/peg_in_confirm.rs
similarity index 59%
rename from src/bridge/transactions/peg_in_confirm.rs
rename to bridge/src/transactions/peg_in_confirm.rs
index 7e890dc6f..b6524bd4b 100644
--- a/src/bridge/transactions/peg_in_confirm.rs
+++ b/bridge/src/transactions/peg_in_confirm.rs
@@ -1,6 +1,5 @@
 use bitcoin::{
-    absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
-    XOnlyPublicKey,
+    absolute, consensus, Amount, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
 };
 use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
 use serde::{Deserialize, Serialize};
@@ -8,9 +7,8 @@ use std::collections::HashMap;
 
 use super::{
     super::{
-        connectors::{connector::*, connector_0::Connector0, connector_z::ConnectorZ},
+        connectors::{base::*, connector_0::Connector0, connector_z::ConnectorZ},
         contexts::{base::BaseContext, depositor::DepositorContext, verifier::VerifierContext},
-        graphs::base::FEE_AMOUNT,
     },
     base::*,
     pre_signed::*,
@@ -18,6 +16,8 @@ use super::{
     signing::*,
 };
 
+pub const PEG_IN_CONFIRM_TX_NAME: &str = "PegInConfirm";
+
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
 pub struct PegInConfirmTransaction {
     #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
@@ -25,7 +25,8 @@ pub struct PegInConfirmTransaction {
     #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
     prev_outs: Vec<TxOut>,
     prev_scripts: Vec<ScriptBuf>,
-    connector_z: ConnectorZ,
+
+    n_of_n_public_keys: Vec<PublicKey>,
 
     musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
     musig2_nonce_signatures: HashMap<usize, HashMap<PublicKey, Signature>>,
@@ -63,42 +64,57 @@ impl PreSignedMusig2Transaction for PegInConfirmTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0] }
 }
 
 impl PegInConfirmTransaction {
-    pub fn new(context: &DepositorContext, evm_address: &str, input_0: Input) -> Self {
+    pub fn new(
+        context: &DepositorContext,
+        connector_0: &Connector0,
+        connector_z: &ConnectorZ,
+        input_0: Input,
+    ) -> Self {
         let mut this = Self::new_for_validation(
-            context.network,
-            &context.depositor_taproot_public_key,
-            &context.n_of_n_taproot_public_key,
-            evm_address,
+            connector_0,
+            connector_z,
             input_0,
+            context.n_of_n_public_keys.clone(),
         );
 
-        this.push_depositor_signature_input_0(context);
+        this.generate_and_push_depositor_signature_input_0(context);
 
         this
     }
 
-    pub fn new_for_validation(
-        network: Network,
-        depositor_taproot_public_key: &XOnlyPublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
-        evm_address: &str,
+    pub fn new_with_depositor_signature(
+        connector_0: &Connector0,
+        connector_z: &ConnectorZ,
         input_0: Input,
+        n_of_n_public_keys: &[PublicKey],
+        depositor_signature: bitcoin::taproot::Signature,
     ) -> Self {
-        let connector_0 = Connector0::new(network, n_of_n_taproot_public_key);
-        let connector_z = ConnectorZ::new(
-            network,
-            evm_address,
-            depositor_taproot_public_key,
-            n_of_n_taproot_public_key,
+        let mut this = Self::new_for_validation(
+            connector_0,
+            connector_z,
+            input_0,
+            n_of_n_public_keys.to_owned(),
         );
 
+        this.push_depositor_signature_input(0, depositor_signature);
+
+        this
+    }
+
+    pub fn new_for_validation(
+        connector_0: &Connector0,
+        connector_z: &ConnectorZ,
+        input_0: Input,
+        n_of_n_public_keys: Vec<PublicKey>,
+    ) -> Self {
         let input_0_leaf = 1;
         let _input_0 = connector_z.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
 
-        let total_output_amount = input_0.amount - Amount::from_sat(FEE_AMOUNT);
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_PEG_IN_CONFIRM);
 
         let _output_0 = TxOut {
             value: total_output_amount,
@@ -117,17 +133,16 @@ impl PegInConfirmTransaction {
                 script_pubkey: connector_z.generate_taproot_address().script_pubkey(),
             }],
             prev_scripts: vec![connector_z.generate_taproot_leaf_script(input_0_leaf)],
-            connector_z,
+            n_of_n_public_keys,
             musig2_nonces: HashMap::new(),
             musig2_nonce_signatures: HashMap::new(),
             musig2_signatures: HashMap::new(),
         }
     }
 
-    fn push_depositor_signature_input_0(&mut self, context: &DepositorContext) {
+    fn generate_and_push_depositor_signature_input_0(&mut self, context: &DepositorContext) {
         let input_index = 0;
-        push_taproot_leaf_signature_to_witness(
-            context,
+        let schnorr_signature = generate_taproot_leaf_schnorr_signature(
             &mut self.tx,
             &self.prev_outs,
             input_index,
@@ -135,11 +150,24 @@ impl PegInConfirmTransaction {
             &self.prev_scripts[input_index],
             &context.depositor_keypair,
         );
+
+        self.push_depositor_signature_input(input_index, schnorr_signature);
+    }
+
+    fn push_depositor_signature_input(
+        &mut self,
+        input_index: usize,
+        signature: bitcoin::taproot::Signature,
+    ) {
+        let unlock_data: Vec<Vec<u8>> = vec![signature.to_vec()];
+
+        push_taproot_leaf_unlock_data_to_witness(&mut self.tx, input_index, unlock_data);
     }
 
     fn push_verifier_signature_input_0(
         &mut self,
         context: &VerifierContext,
+        connector_z: &ConnectorZ,
         secret_nonce: &SecNonce,
     ) {
         let input_index = 0;
@@ -153,46 +181,67 @@ impl PegInConfirmTransaction {
 
         // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
         if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
-            self.finalize_input_0(context);
+            self.finalize_input_0(context, connector_z);
         }
     }
 
-    fn finalize_input_0(&mut self, context: &dyn BaseContext) {
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_z: &ConnectorZ) {
         let input_index = 0;
         finalize_musig2_taproot_input(
             self,
             context,
             input_index,
             TapSighashType::All,
-            self.connector_z.generate_taproot_spend_info(),
+            connector_z.generate_taproot_spend_info(),
         );
     }
 
-    pub fn push_nonces(&mut self, context: &VerifierContext) -> HashMap<usize, SecNonce> {
-        let mut secret_nonces = HashMap::new();
-
-        let input_index = 0;
-        let secret_nonce = push_nonce(self, context, input_index);
-        secret_nonces.insert(input_index, secret_nonce);
-
-        secret_nonces
-    }
-
     pub fn pre_sign(
         &mut self,
         context: &VerifierContext,
+        connector_z: &ConnectorZ,
         secret_nonces: &HashMap<usize, SecNonce>,
     ) {
         let input_index = 0;
-        self.push_verifier_signature_input_0(context, &secret_nonces[&input_index]);
+        self.push_verifier_signature_input_0(context, connector_z, &secret_nonces[&input_index]);
     }
 
     pub fn merge(&mut self, peg_in_confirm: &PegInConfirmTransaction) {
         merge_transactions(&mut self.tx, &peg_in_confirm.tx);
         merge_musig2_nonces_and_signatures(self, peg_in_confirm);
     }
+
+    pub fn has_nonce_of(&self, context: &VerifierContext) -> bool {
+        let input_index = 0;
+
+        self.musig2_nonces.contains_key(&input_index)
+            && self.musig2_nonces[&input_index].contains_key(&context.verifier_public_key)
+    }
+    pub fn has_all_nonces(&self) -> bool {
+        let input_index = 0;
+
+        self.n_of_n_public_keys.iter().all(|verifier_key| {
+            self.musig2_nonces.contains_key(&input_index)
+                && self.musig2_nonces[&input_index].contains_key(verifier_key)
+        })
+    }
+    pub fn has_signature_of(&self, context: &VerifierContext) -> bool {
+        let input_index = 0;
+
+        self.musig2_signatures.contains_key(&input_index)
+            && self.musig2_signatures[&input_index].contains_key(&context.verifier_public_key)
+    }
+    pub fn has_all_signatures(&self) -> bool {
+        let input_index = 0;
+
+        self.n_of_n_public_keys.iter().all(|verifier_key| {
+            self.musig2_signatures.contains_key(&input_index)
+                && self.musig2_signatures[&input_index].contains_key(verifier_key)
+        })
+    }
 }
 
 impl BaseTransaction for PegInConfirmTransaction {
     fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { PEG_IN_CONFIRM_TX_NAME }
 }
diff --git a/src/bridge/transactions/peg_in_deposit.rs b/bridge/src/transactions/peg_in_deposit.rs
similarity index 67%
rename from src/bridge/transactions/peg_in_deposit.rs
rename to bridge/src/transactions/peg_in_deposit.rs
index 9e9b0f355..e33aa9aac 100644
--- a/src/bridge/transactions/peg_in_deposit.rs
+++ b/bridge/src/transactions/peg_in_deposit.rs
@@ -1,18 +1,19 @@
 use bitcoin::{
-    absolute, consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, Transaction,
-    TxOut, XOnlyPublicKey,
+    absolute,
+    consensus::{self},
+    Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, Transaction, TxOut,
 };
 use serde::{Deserialize, Serialize};
 
 use super::{
     super::{
-        connectors::{connector::*, connector_z::ConnectorZ},
+        connectors::{base::*, connector_z::ConnectorZ},
         contexts::depositor::DepositorContext,
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
     pre_signed::*,
+    signing::populate_p2wsh_witness_with_signatures,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -35,13 +36,11 @@ impl PreSignedTransaction for PegInDepositTransaction {
 }
 
 impl PegInDepositTransaction {
-    pub fn new(context: &DepositorContext, evm_address: &str, input_0: Input) -> Self {
+    pub fn new(context: &DepositorContext, connector_z: &ConnectorZ, input_0: Input) -> Self {
         let mut this = Self::new_for_validation(
             context.network,
             &context.depositor_public_key,
-            &context.depositor_taproot_public_key,
-            &context.n_of_n_taproot_public_key,
-            evm_address,
+            connector_z,
             input_0,
         );
 
@@ -50,24 +49,30 @@ impl PegInDepositTransaction {
         this
     }
 
-    pub fn new_for_validation(
+    pub fn new_with_signature(
         network: Network,
         depositor_public_key: &PublicKey,
-        depositor_taproot_public_key: &XOnlyPublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
-        evm_address: &str,
+        connector_z: &ConnectorZ,
         input_0: Input,
+        signature: bitcoin::ecdsa::Signature,
     ) -> Self {
-        let connector_z = ConnectorZ::new(
-            network,
-            evm_address,
-            depositor_taproot_public_key,
-            n_of_n_taproot_public_key,
-        );
+        let mut this =
+            Self::new_for_validation(network, depositor_public_key, connector_z, input_0);
+
+        this.sign_input_0_with_signature(signature);
+
+        this
+    }
 
+    pub fn new_for_validation(
+        network: Network,
+        depositor_public_key: &PublicKey,
+        connector_z: &ConnectorZ,
+        input_0: Input,
+    ) -> Self {
         let _input_0 = generate_default_tx_in(&input_0);
 
-        let total_output_amount = input_0.amount - Amount::from_sat(FEE_AMOUNT);
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_PEG_IN_DEPOSIT);
 
         let _output_0 = TxOut {
             value: total_output_amount,
@@ -94,14 +99,25 @@ impl PegInDepositTransaction {
         let input_index = 0;
         pre_sign_p2wsh_input(
             self,
-            context,
             input_index,
             EcdsaSighashType::All,
             &vec![&context.depositor_keypair],
         );
     }
+
+    fn sign_input_0_with_signature(&mut self, signature: bitcoin::ecdsa::Signature) {
+        let input_index = 0;
+        let script = &self.prev_scripts()[input_index].clone();
+        populate_p2wsh_witness_with_signatures(
+            self.tx_mut(),
+            input_index,
+            script,
+            &vec![signature],
+        );
+    }
 }
 
 impl BaseTransaction for PegInDepositTransaction {
     fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "PegInDeposit" }
 }
diff --git a/src/bridge/transactions/peg_in_refund.rs b/bridge/src/transactions/peg_in_refund.rs
similarity index 62%
rename from src/bridge/transactions/peg_in_refund.rs
rename to bridge/src/transactions/peg_in_refund.rs
index aaf69161c..43dd55da4 100644
--- a/src/bridge/transactions/peg_in_refund.rs
+++ b/bridge/src/transactions/peg_in_refund.rs
@@ -1,18 +1,17 @@
 use bitcoin::{
     absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
-    XOnlyPublicKey,
 };
 use serde::{Deserialize, Serialize};
 
 use super::{
     super::{
-        connectors::{connector::*, connector_z::ConnectorZ},
+        connectors::{base::*, connector_z::ConnectorZ},
         contexts::depositor::DepositorContext,
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
     pre_signed::*,
+    signing::populate_taproot_input_witness_with_signature,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -22,7 +21,6 @@ pub struct PegInRefundTransaction {
     #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
     prev_outs: Vec<TxOut>,
     prev_scripts: Vec<ScriptBuf>,
-    connector_z: ConnectorZ,
 }
 
 impl PreSignedTransaction for PegInRefundTransaction {
@@ -36,40 +34,44 @@ impl PreSignedTransaction for PegInRefundTransaction {
 }
 
 impl PegInRefundTransaction {
-    pub fn new(context: &DepositorContext, evm_address: &str, input_0: Input) -> Self {
+    pub fn new(context: &DepositorContext, connector_z: &ConnectorZ, input_0: Input) -> Self {
         let mut this = Self::new_for_validation(
             context.network,
             &context.depositor_public_key,
-            &context.depositor_taproot_public_key,
-            &context.n_of_n_taproot_public_key,
-            evm_address,
+            connector_z,
             input_0,
         );
 
-        this.sign_input_0(context);
+        this.sign_input_0(context, connector_z);
 
         this
     }
 
-    pub fn new_for_validation(
+    pub fn new_with_signature(
         network: Network,
         depositor_public_key: &PublicKey,
-        depositor_taproot_public_key: &XOnlyPublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
-        evm_address: &str,
+        connector_z: &ConnectorZ,
         input_0: Input,
+        signature: bitcoin::taproot::Signature,
     ) -> Self {
-        let connector_z = ConnectorZ::new(
-            network,
-            evm_address,
-            depositor_taproot_public_key,
-            n_of_n_taproot_public_key,
-        );
+        let mut this =
+            Self::new_for_validation(network, depositor_public_key, connector_z, input_0);
 
+        this.sign_input_0_with_signature(connector_z, signature);
+
+        this
+    }
+
+    pub fn new_for_validation(
+        network: Network,
+        depositor_public_key: &PublicKey,
+        connector_z: &ConnectorZ,
+        input_0: Input,
+    ) -> Self {
         let input_0_leaf = 0;
         let _input_0 = connector_z.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
 
-        let total_output_amount = input_0.amount - Amount::from_sat(FEE_AMOUNT);
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_PEG_IN_REFUND);
 
         let _output_0 = TxOut {
             value: total_output_amount,
@@ -89,24 +91,39 @@ impl PegInRefundTransaction {
                 script_pubkey: connector_z.generate_taproot_address().script_pubkey(),
             }],
             prev_scripts: vec![connector_z.generate_taproot_leaf_script(input_0_leaf)],
-            connector_z,
         }
     }
 
-    pub fn num_blocks_timelock_0(&self) -> u32 { self.connector_z.num_blocks_timelock_0 }
-
-    fn sign_input_0(&mut self, context: &DepositorContext) {
-        pre_sign_taproot_input(
+    fn sign_input_0(&mut self, context: &DepositorContext, connector_z: &ConnectorZ) {
+        pre_sign_taproot_input_default(
             self,
-            context,
             0,
             TapSighashType::All,
-            self.connector_z.generate_taproot_spend_info(),
+            connector_z.generate_taproot_spend_info(),
             &vec![&context.depositor_keypair],
         );
     }
+
+    fn sign_input_0_with_signature(
+        &mut self,
+        connector_z: &ConnectorZ,
+        signature: bitcoin::taproot::Signature,
+    ) {
+        let input_index = 0;
+        let script = &self.prev_scripts()[input_index].clone();
+        let taproot_spend_info = connector_z.generate_taproot_spend_info();
+
+        populate_taproot_input_witness_with_signature(
+            self.tx_mut(),
+            input_index,
+            &taproot_spend_info,
+            script,
+            &[signature],
+        );
+    }
 }
 
 impl BaseTransaction for PegInRefundTransaction {
     fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "PegInRefund" }
 }
diff --git a/src/bridge/transactions/peg_out.rs b/bridge/src/transactions/peg_out.rs
similarity index 78%
rename from src/bridge/transactions/peg_out.rs
rename to bridge/src/transactions/peg_out.rs
index 99db415ce..3f406754e 100644
--- a/src/bridge/transactions/peg_out.rs
+++ b/bridge/src/transactions/peg_out.rs
@@ -4,8 +4,10 @@ use bitcoin::{
 };
 use serde::{Deserialize, Serialize};
 
+use crate::client::chain::chain::PegOutEvent;
+
 use super::{
-    super::{contexts::operator::OperatorContext, graphs::base::FEE_AMOUNT, scripts::*},
+    super::{contexts::operator::OperatorContext, scripts::*},
     base::*,
     pre_signed::*,
 };
@@ -30,19 +32,11 @@ impl PreSignedTransaction for PegOutTransaction {
 }
 
 impl PegOutTransaction {
-    pub fn new(
-        context: &OperatorContext,
-        withdrawer_public_key: &PublicKey,
-        evm_address: &str,
-        evm_peg_out_ts: u32,
-        input_0: Input,
-    ) -> Self {
+    pub fn new(context: &OperatorContext, peg_out_event: &PegOutEvent, input_0: Input) -> Self {
         let mut this = Self::new_for_validation(
             context.network,
             &context.operator_public_key,
-            withdrawer_public_key,
-            evm_address,
-            evm_peg_out_ts,
+            peg_out_event,
             input_0,
         );
 
@@ -54,9 +48,7 @@ impl PegOutTransaction {
     pub fn new_for_validation(
         network: Network,
         operator_public_key: &PublicKey,
-        withdrawer_public_key: &PublicKey,
-        evm_address: &str,
-        evm_peg_out_ts: u32,
+        peg_out_event: &PegOutEvent,
         input_0: Input,
     ) -> Self {
         let _input_0 = TxIn {
@@ -66,15 +58,15 @@ impl PegOutTransaction {
             witness: Witness::default(),
         };
 
-        let total_output_amount = input_0.amount - Amount::from_sat(FEE_AMOUNT);
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_PEG_OUT);
 
         let _output_0 = TxOut {
             value: total_output_amount,
             script_pubkey: generate_pay_to_pubkey_hash_with_inscription_script_address(
                 network,
-                withdrawer_public_key,
-                evm_peg_out_ts,
-                evm_address,
+                &peg_out_event.withdrawer_public_key_hash,
+                peg_out_event.timestamp,
+                &peg_out_event.withdrawer_chain_address,
             )
             .script_pubkey(),
         };
@@ -88,10 +80,10 @@ impl PegOutTransaction {
             },
             prev_outs: vec![TxOut {
                 value: input_0.amount,
-                script_pubkey: generate_pay_to_pubkey_script_address(network, &operator_public_key)
+                script_pubkey: generate_pay_to_pubkey_script_address(network, operator_public_key)
                     .script_pubkey(),
             }],
-            prev_scripts: vec![generate_pay_to_pubkey_script(&operator_public_key)],
+            prev_scripts: vec![generate_pay_to_pubkey_script(operator_public_key)],
         }
     }
 
@@ -99,7 +91,6 @@ impl PegOutTransaction {
         let input_index = 0;
         pre_sign_p2wsh_input(
             self,
-            context,
             input_index,
             EcdsaSighashType::All,
             &vec![&context.operator_keypair],
@@ -109,4 +100,5 @@ impl PegOutTransaction {
 
 impl BaseTransaction for PegOutTransaction {
     fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "PegOut" }
 }
diff --git a/bridge/src/transactions/peg_out_confirm.rs b/bridge/src/transactions/peg_out_confirm.rs
new file mode 100644
index 000000000..ae37068f5
--- /dev/null
+++ b/bridge/src/transactions/peg_out_confirm.rs
@@ -0,0 +1,95 @@
+use bitcoin::{
+    absolute, consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, Transaction,
+    TxOut,
+};
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{
+        connectors::{base::*, connector_6::Connector6},
+        contexts::operator::OperatorContext,
+        scripts::*,
+    },
+    base::*,
+    pre_signed::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct PegOutConfirmTransaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+}
+
+impl PreSignedTransaction for PegOutConfirmTransaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl PegOutConfirmTransaction {
+    pub fn new(context: &OperatorContext, connector_6: &Connector6, input_0: Input) -> Self {
+        let mut this = Self::new_for_validation(
+            context.network,
+            &context.operator_public_key,
+            connector_6,
+            input_0,
+        );
+
+        this.sign_input_0(context);
+
+        this
+    }
+
+    pub fn new_for_validation(
+        network: Network,
+        operator_public_key: &PublicKey,
+        connector_6: &Connector6,
+        input_0: Input,
+    ) -> Self {
+        let _input_0 = generate_default_tx_in(&input_0);
+
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_PEG_OUT_CONFIRM);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: connector_6.generate_taproot_address().script_pubkey(),
+        };
+
+        PegOutConfirmTransaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0],
+                output: vec![_output_0],
+            },
+            prev_outs: vec![TxOut {
+                value: input_0.amount,
+                script_pubkey: generate_pay_to_pubkey_script_address(network, operator_public_key)
+                    .script_pubkey(),
+            }],
+            prev_scripts: vec![generate_pay_to_pubkey_script(operator_public_key)],
+        }
+    }
+
+    fn sign_input_0(&mut self, context: &OperatorContext) {
+        let input_index = 0;
+        pre_sign_p2wsh_input(
+            self,
+            input_index,
+            EcdsaSighashType::All,
+            &vec![&context.operator_keypair],
+        );
+    }
+}
+
+impl BaseTransaction for PegOutConfirmTransaction {
+    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "PegOutConfirm" }
+}
diff --git a/src/bridge/transactions/pre_signed.rs b/bridge/src/transactions/pre_signed.rs
similarity index 85%
rename from src/bridge/transactions/pre_signed.rs
rename to bridge/src/transactions/pre_signed.rs
index 8519e2628..3a919f010 100644
--- a/src/bridge/transactions/pre_signed.rs
+++ b/bridge/src/transactions/pre_signed.rs
@@ -5,7 +5,9 @@ use bitcoin::{
 
 use super::{
     super::contexts::base::BaseContext,
-    signing::{populate_p2wpkh_witness, populate_p2wsh_witness, populate_taproot_input_witness},
+    signing::{
+        populate_p2wpkh_witness, populate_p2wsh_witness, populate_taproot_input_witness_default,
+    },
 };
 
 pub trait PreSignedTransaction {
@@ -17,7 +19,6 @@ pub trait PreSignedTransaction {
 
 pub fn pre_sign_p2wsh_input<T: PreSignedTransaction>(
     tx: &mut T,
-    context: &dyn BaseContext,
     input_index: usize,
     sighash_type: EcdsaSighashType,
     keypairs: &Vec<&Keypair>,
@@ -26,7 +27,6 @@ pub fn pre_sign_p2wsh_input<T: PreSignedTransaction>(
     let value = tx.prev_outs()[input_index].value;
 
     populate_p2wsh_witness(
-        context,
         tx.tx_mut(),
         input_index,
         sighash_type,
@@ -57,9 +57,8 @@ pub fn pre_sign_p2wpkh_input<T: PreSignedTransaction>(
     );
 }
 
-pub fn pre_sign_taproot_input<T: PreSignedTransaction>(
+pub fn pre_sign_taproot_input_default<T: PreSignedTransaction>(
     tx: &mut T,
-    context: &dyn BaseContext,
     input_index: usize,
     sighash_type: TapSighashType,
     taproot_spend_info: TaprootSpendInfo,
@@ -68,8 +67,7 @@ pub fn pre_sign_taproot_input<T: PreSignedTransaction>(
     let prev_outs = &tx.prev_outs().clone();
     let script = &tx.prev_scripts()[input_index].clone();
 
-    populate_taproot_input_witness(
-        context,
+    populate_taproot_input_witness_default(
         tx.tx_mut(),
         prev_outs,
         input_index,
diff --git a/src/bridge/transactions/pre_signed_musig2.rs b/bridge/src/transactions/pre_signed_musig2.rs
similarity index 59%
rename from src/bridge/transactions/pre_signed_musig2.rs
rename to bridge/src/transactions/pre_signed_musig2.rs
index c7b7dd196..1381503de 100644
--- a/src/bridge/transactions/pre_signed_musig2.rs
+++ b/bridge/src/transactions/pre_signed_musig2.rs
@@ -1,5 +1,7 @@
 use bitcoin::{
-    key::Secp256k1, taproot::TaprootSpendInfo, PublicKey, TapSighashType, XOnlyPublicKey,
+    hashes::{sha256, Hash},
+    taproot::TaprootSpendInfo,
+    PublicKey, TapSighashType, XOnlyPublicKey,
 };
 use musig2::{
     secp::MaybeScalar,
@@ -18,7 +20,7 @@ use super::{
     },
 };
 
-pub trait PreSignedMusig2Transaction {
+pub trait PreSignedMusig2Transaction: PreSignedTransaction {
     fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>>;
     fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>>;
     fn musig2_nonce_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, Signature>>;
@@ -28,50 +30,75 @@ pub trait PreSignedMusig2Transaction {
     fn musig2_signatures_mut(
         &mut self,
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>>;
-}
-
-pub fn push_nonce<T: PreSignedTransaction + PreSignedMusig2Transaction>(
-    tx: &mut T,
-    context: &VerifierContext,
-    input_index: usize,
-) -> SecNonce {
-    // Push nonce
-    let musig2_nonces = tx.musig2_nonces_mut();
-    if musig2_nonces.get(&input_index).is_none() {
-        musig2_nonces.insert(input_index, HashMap::new());
+    fn verifier_inputs(&self) -> Vec<usize>;
+    fn has_nonces_for(&self, verifier_pubkey: PublicKey) -> bool {
+        self.has_all_nonces(&[verifier_pubkey])
+    }
+    fn has_all_nonces(&self, verifier_pubkeys: &[PublicKey]) -> bool {
+        self.verifier_inputs().into_iter().all(|input_index| {
+            verifier_pubkeys.iter().all(|pubkey| {
+                self.musig2_nonces().contains_key(&input_index)
+                    && self.musig2_nonces()[&input_index].contains_key(pubkey)
+            })
+        })
+    }
+    fn has_signatures_for(&self, verifier_pubkey: PublicKey) -> bool {
+        self.has_all_signatures(&[verifier_pubkey])
+    }
+    fn has_all_signatures(&self, verifier_pubkeys: &[PublicKey]) -> bool {
+        self.verifier_inputs().into_iter().all(|input_index| {
+            verifier_pubkeys.iter().all(|pubkey| {
+                self.musig2_signatures().contains_key(&input_index)
+                    && self.musig2_signatures()[&input_index].contains_key(pubkey)
+            })
+        })
+    }
+    fn push_nonces(&mut self, context: &VerifierContext) -> HashMap<usize, SecNonce> {
+        self.verifier_inputs()
+            .iter()
+            .map(|input_index| (*input_index, self.push_nonce(context, *input_index)))
+            .collect()
     }
 
-    let secret_nonce = generate_nonce();
-    musig2_nonces
-        .get_mut(&input_index)
-        .unwrap()
-        .insert(context.verifier_public_key, secret_nonce.public_nonce());
+    fn push_nonce(&mut self, context: &VerifierContext, input_index: usize) -> SecNonce {
+        // Push nonce
+        let musig2_nonces = self.musig2_nonces_mut();
+        if musig2_nonces.get(&input_index).is_none() {
+            musig2_nonces.insert(input_index, HashMap::new());
+        }
 
-    // Sign the nonce and push the signature
-    let musig2_nonce_signatures = tx.musig2_nonce_signatures_mut();
-    if musig2_nonce_signatures.get(&input_index).is_none() {
-        musig2_nonce_signatures.insert(input_index, HashMap::new());
-    }
+        let secret_nonce = generate_nonce();
+        musig2_nonces
+            .get_mut(&input_index)
+            .unwrap()
+            .insert(context.verifier_public_key, secret_nonce.public_nonce());
 
-    let nonce_signature = context.secp.sign_schnorr(
-        &get_nonce_message(&secret_nonce.public_nonce()),
-        &context.verifier_keypair,
-    );
+        // Sign the nonce and push the signature
+        let musig2_nonce_signatures = self.musig2_nonce_signatures_mut();
+        if musig2_nonce_signatures.get(&input_index).is_none() {
+            musig2_nonce_signatures.insert(input_index, HashMap::new());
+        }
 
-    musig2_nonce_signatures
-        .get_mut(&input_index)
-        .unwrap()
-        .insert(context.verifier_public_key, nonce_signature);
+        let nonce_signature = context
+            .verifier_keypair
+            .sign_schnorr(get_nonce_message(&secret_nonce.public_nonce()));
+
+        musig2_nonce_signatures
+            .get_mut(&input_index)
+            .unwrap()
+            .insert(context.verifier_public_key, nonce_signature);
 
-    secret_nonce
+        secret_nonce
+    }
 }
 
 pub fn get_nonce_message(nonce: &PubNonce) -> Message {
-    Message::from_hashed_data::<bitcoin::hashes::sha256::Hash>(nonce.to_bytes().as_slice())
+    let nonce_hash = sha256::Hash::hash(nonce.to_bytes().as_slice());
+    Message::from_digest_slice(nonce_hash.as_ref()).expect("Failed to create nonce message")
 }
 
 fn verify_schnorr_signature(sig: &Signature, msg: &Message, pubkey: &XOnlyPublicKey) -> bool {
-    match Secp256k1::new().verify_schnorr(sig, msg, pubkey) {
+    match sig.verify(msg, pubkey) {
         Ok(()) => true,
         Err(e) => {
             eprintln!("verify_schnorr() failed with: {e}");
@@ -95,10 +122,7 @@ pub fn pre_sign_musig2_taproot_input<T: PreSignedTransaction + PreSignedMusig2Tr
 
     let prev_outs = &tx.prev_outs().clone();
     let script = &tx.prev_scripts()[input_index].clone();
-    let musig2_nonces = &tx.musig2_nonces()[&input_index]
-        .values()
-        .map(|public_nonce| public_nonce.clone())
-        .collect();
+    let musig2_nonces = &tx.musig2_nonces()[&input_index].values().cloned().collect();
 
     let partial_signature = generate_taproot_partial_signature(
         context,
@@ -135,10 +159,8 @@ pub fn finalize_musig2_taproot_input<T: PreSignedTransaction + PreSignedMusig2Tr
 
     let prev_outs = &tx.prev_outs().clone();
     let script = &tx.prev_scripts()[input_index].clone();
-    let musig2_nonces: &Vec<PubNonce> = &tx.musig2_nonces()[&input_index]
-        .values()
-        .map(|public_nonce| public_nonce.clone())
-        .collect();
+    let musig2_nonces: &Vec<PubNonce> =
+        &tx.musig2_nonces()[&input_index].values().cloned().collect();
     let musig2_signatures: Vec<MaybeScalar> = tx.musig2_signatures()[&input_index]
         .values()
         .map(|&partial_signature| PartialSignature::from(partial_signature))
diff --git a/bridge/src/transactions/signing.rs b/bridge/src/transactions/signing.rs
new file mode 100644
index 000000000..65d72572a
--- /dev/null
+++ b/bridge/src/transactions/signing.rs
@@ -0,0 +1,360 @@
+use bitcoin::{
+    key::{Keypair, TapTweak},
+    secp256k1::Message,
+    sighash::{Prevouts, SighashCache},
+    taproot::{LeafVersion, TaprootSpendInfo},
+    Amount, EcdsaSighashType, PublicKey, Script, ScriptBuf, TapLeafHash, TapNodeHash,
+    TapSighashType, Transaction, TxOut,
+};
+use secp256k1::SECP256K1;
+
+use super::super::{contexts::base::BaseContext, scripts::generate_p2wpkh_address};
+
+pub fn generate_p2wsh_schnorr_signature(
+    tx: &mut Transaction,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    script: &Script,
+    value: Amount,
+    keypair: &Keypair,
+) -> bitcoin::ecdsa::Signature {
+    let mut sighash_cache = SighashCache::new(tx);
+
+    let sighash = sighash_cache
+        .p2wsh_signature_hash(input_index, script, value, sighash_type)
+        .expect("Failed to construct sighash");
+
+    let signature = keypair.secret_key().sign_ecdsa(Message::from(sighash));
+
+    bitcoin::ecdsa::Signature {
+        signature,
+        sighash_type,
+    }
+}
+
+pub fn push_p2wsh_signature_to_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    script: &Script,
+    value: Amount,
+    keypair: &Keypair,
+) {
+    let signature =
+        generate_p2wsh_schnorr_signature(tx, input_index, sighash_type, script, value, keypair);
+
+    tx.input[input_index]
+        .witness
+        .push_ecdsa_signature(&signature);
+}
+
+pub fn push_p2wsh_script_to_witness(tx: &mut Transaction, input_index: usize, script: &Script) {
+    tx.input[input_index].witness.push(script); // TODO to_bytes() may be needed
+}
+
+pub fn populate_p2wsh_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    script: &Script,
+    value: Amount,
+    keypairs: &Vec<&Keypair>,
+) {
+    for keypair in keypairs {
+        push_p2wsh_signature_to_witness(tx, input_index, sighash_type, script, value, keypair);
+    }
+    push_p2wsh_script_to_witness(tx, input_index, script);
+}
+
+pub fn populate_p2wsh_witness_with_signatures(
+    tx: &mut Transaction,
+    input_index: usize,
+    script: &Script,
+    signatures: &Vec<bitcoin::ecdsa::Signature>,
+) {
+    for signature in signatures {
+        tx.input[input_index]
+            .witness
+            .push_ecdsa_signature(signature);
+    }
+    push_p2wsh_script_to_witness(tx, input_index, script);
+}
+
+pub fn generate_p2wpkh_schnorr_signature(
+    context: &dyn BaseContext,
+    tx: &mut Transaction,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    value: Amount,
+    public_key: &PublicKey,
+    keypair: &Keypair,
+) -> bitcoin::ecdsa::Signature {
+    let mut sighash_cache = SighashCache::new(tx);
+
+    let sighash = sighash_cache
+        .p2wpkh_signature_hash(
+            input_index,
+            &generate_p2wpkh_address(context.network(), public_key).script_pubkey(),
+            value,
+            sighash_type,
+        )
+        .expect("Failed to construct sighash");
+
+    let signature = keypair.secret_key().sign_ecdsa(Message::from(sighash));
+
+    bitcoin::ecdsa::Signature {
+        signature,
+        sighash_type,
+    }
+}
+
+pub fn push_p2wpkh_signature_to_witness(
+    context: &dyn BaseContext,
+    tx: &mut Transaction,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    value: Amount,
+    public_key: &PublicKey,
+    keypair: &Keypair,
+) {
+    let signature = generate_p2wpkh_schnorr_signature(
+        context,
+        tx,
+        input_index,
+        sighash_type,
+        value,
+        public_key,
+        keypair,
+    );
+
+    tx.input[input_index]
+        .witness
+        .push_ecdsa_signature(&signature);
+}
+
+pub fn push_p2wpkh_public_key_to_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    public_key: &PublicKey,
+) {
+    tx.input[input_index].witness.push(public_key.to_bytes());
+}
+
+pub fn populate_p2wpkh_witness(
+    context: &dyn BaseContext,
+    tx: &mut Transaction,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    value: Amount,
+    public_key: &PublicKey,
+    keypair: &Keypair,
+) {
+    push_p2wpkh_signature_to_witness(
+        context,
+        tx,
+        input_index,
+        sighash_type,
+        value,
+        public_key,
+        keypair,
+    );
+    push_p2wpkh_public_key_to_witness(tx, input_index, public_key);
+}
+
+pub fn generate_taproot_leaf_schnorr_signature(
+    tx: &mut Transaction,
+    prev_outs: &[TxOut],
+    input_index: usize,
+    sighash_type: TapSighashType,
+    script: &Script,
+    keypair: &Keypair,
+) -> bitcoin::taproot::Signature {
+    let leaf_hash = TapLeafHash::from_script(script, LeafVersion::TapScript);
+
+    let sighash = if sighash_type == TapSighashType::AllPlusAnyoneCanPay
+        || sighash_type == TapSighashType::SinglePlusAnyoneCanPay
+        || sighash_type == TapSighashType::NonePlusAnyoneCanPay
+    {
+        SighashCache::new(tx)
+            .taproot_script_spend_signature_hash(
+                input_index,
+                &Prevouts::One(input_index, &prev_outs[input_index]),
+                leaf_hash,
+                sighash_type,
+            )
+            .expect("Failed to construct sighash")
+    } else {
+        SighashCache::new(tx)
+            .taproot_script_spend_signature_hash(
+                input_index,
+                &Prevouts::All(prev_outs),
+                leaf_hash,
+                sighash_type,
+            )
+            .expect("Failed to construct sighash")
+    };
+
+    // If secp256k1 is updated to 0.30.0, the following line can be replaced with
+    // let signature = keypair.sign_schnorr_no_aux_rand(&Message::from(sighash));
+    let signature = SECP256K1.sign_schnorr_no_aux_rand(&Message::from(sighash), keypair);
+
+    bitcoin::taproot::Signature {
+        signature,
+        sighash_type,
+    }
+}
+
+pub fn push_taproot_leaf_unlock_data_to_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    unlock_data: Vec<Vec<u8>>,
+) {
+    for element in unlock_data.iter() {
+        if element.len() == 1 && element[0] == 0 {
+            tx.input[input_index].witness.push(vec![]); // minimal encoding of 0 is an empty vector
+        } else {
+            tx.input[input_index].witness.push(element);
+        }
+    }
+}
+
+pub fn push_taproot_leaf_script_and_control_block_to_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    taproot_spend_info: &TaprootSpendInfo,
+    script: &Script,
+) {
+    let prevout_leaf = (ScriptBuf::from(script), LeafVersion::TapScript);
+
+    let control_block = taproot_spend_info
+        .control_block(&prevout_leaf)
+        .expect("Unable to create Control block");
+
+    tx.input[input_index]
+        .witness
+        .push(prevout_leaf.0.to_bytes());
+
+    tx.input[input_index]
+        .witness
+        .push(control_block.serialize());
+}
+
+/// Use this function to populate taproot input witness for
+/// scripts containing any logic.
+pub fn populate_taproot_input_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    taproot_spend_info: &TaprootSpendInfo,
+    script: &Script,
+    unlock_data: Vec<Vec<u8>>,
+) {
+    push_taproot_leaf_unlock_data_to_witness(tx, input_index, unlock_data);
+    push_taproot_leaf_script_and_control_block_to_witness(
+        tx,
+        input_index,
+        taproot_spend_info,
+        script,
+    );
+}
+
+/// Use this function to populate taproot input witness for
+/// scripts containing only OP_CHECKSIG verification.
+#[allow(clippy::too_many_arguments)]
+pub fn populate_taproot_input_witness_default(
+    tx: &mut Transaction,
+    prevouts: &[TxOut],
+    input_index: usize,
+    sighash_type: TapSighashType,
+    taproot_spend_info: &TaprootSpendInfo,
+    script: &Script,
+    keypairs: &Vec<&Keypair>,
+) {
+    let mut unlock_data: Vec<Vec<u8>> = Vec::new();
+    for keypair in keypairs {
+        let schnorr_signature = generate_taproot_leaf_schnorr_signature(
+            tx,
+            prevouts,
+            input_index,
+            sighash_type,
+            script,
+            keypair,
+        );
+        unlock_data.push(schnorr_signature.to_vec());
+    }
+
+    push_taproot_leaf_unlock_data_to_witness(tx, input_index, unlock_data);
+    push_taproot_leaf_script_and_control_block_to_witness(
+        tx,
+        input_index,
+        taproot_spend_info,
+        script,
+    );
+}
+
+pub fn populate_taproot_input_witness_with_signature(
+    tx: &mut Transaction,
+    input_index: usize,
+    taproot_spend_info: &TaprootSpendInfo,
+    script: &Script,
+    signatures: &[bitcoin::taproot::Signature],
+) {
+    let unlock_data = signatures.iter().map(|sig| sig.to_vec()).collect();
+    populate_taproot_input_witness(tx, input_index, taproot_spend_info, script, unlock_data);
+}
+
+fn generate_p2tr_key_spend_schnorr_signature(
+    tx: &mut Transaction,
+    input_index: usize,
+    prev_outs: &[TxOut],
+    sighash_type: TapSighashType,
+    merkle_root: Option<TapNodeHash>,
+    keypair: &Keypair,
+) -> bitcoin::taproot::Signature {
+    let sighash = if sighash_type == TapSighashType::AllPlusAnyoneCanPay
+        || sighash_type == TapSighashType::SinglePlusAnyoneCanPay
+        || sighash_type == TapSighashType::NonePlusAnyoneCanPay
+    {
+        SighashCache::new(tx)
+            .taproot_key_spend_signature_hash(
+                input_index,
+                &Prevouts::One(input_index, &prev_outs[input_index]),
+                sighash_type,
+            )
+            .expect("Failed to construct sighash")
+    } else {
+        SighashCache::new(tx)
+            .taproot_key_spend_signature_hash(input_index, &Prevouts::All(prev_outs), sighash_type)
+            .expect("Failed to construct sighash")
+    };
+
+    let tweak_keypair = keypair.tap_tweak(SECP256K1, merkle_root);
+
+    // If secp256k1 is updated to 0.30.0, the following line can be replaced with
+    // let signature = keypair.sign_schnorr_no_aux_rand(&Message::from(sighash));
+    let signature =
+        SECP256K1.sign_schnorr_no_aux_rand(&Message::from(sighash), &tweak_keypair.to_inner());
+
+    bitcoin::taproot::Signature {
+        signature,
+        sighash_type,
+    }
+}
+
+pub fn populate_p2tr_key_spend_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    prev_outs: &[TxOut],
+    sighash_type: TapSighashType,
+    merkle_root: Option<TapNodeHash>,
+    keypair: &Keypair,
+) {
+    let signature = generate_p2tr_key_spend_schnorr_signature(
+        tx,
+        input_index,
+        prev_outs,
+        sighash_type,
+        merkle_root,
+        keypair,
+    );
+    tx.input[input_index].witness.push(signature.to_vec());
+}
diff --git a/src/bridge/transactions/signing_musig2.rs b/bridge/src/transactions/signing_musig2.rs
similarity index 92%
rename from src/bridge/transactions/signing_musig2.rs
rename to bridge/src/transactions/signing_musig2.rs
index 74b8dbb81..99536be0d 100644
--- a/src/bridge/transactions/signing_musig2.rs
+++ b/bridge/src/transactions/signing_musig2.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::too_many_arguments)]
 use bitcoin::{
     sighash::{Prevouts, SighashCache},
     taproot::LeafVersion,
@@ -22,7 +23,7 @@ pub fn generate_taproot_partial_signature(
     secret_nonce: &SecNonce,
     aggregated_nonce: &AggNonce,
     input_index: usize,
-    prevouts: &Vec<TxOut>,
+    prevouts: &[TxOut],
     script: &Script,
     sighash_type: TapSighashType,
 ) -> Result<MaybeScalar, SigningError> {
@@ -38,7 +39,7 @@ pub fn generate_taproot_partial_signature(
     let sighash = SighashCache::new(tx)
         .taproot_script_spend_signature_hash(
             input_index,
-            &Prevouts::All(&prevouts), // TODO: add Prevouts::One
+            &Prevouts::All(prevouts), // TODO: add Prevouts::One
             leaf_hash,
             sighash_type,
         )
@@ -48,7 +49,7 @@ pub fn generate_taproot_partial_signature(
         &key_agg_ctx,
         context.verifier_keypair.secret_key(),
         secret_nonce.clone(),
-        &aggregated_nonce,
+        aggregated_nonce,
         sighash,
     )
 }
@@ -58,7 +59,7 @@ pub fn generate_taproot_aggregated_signature(
     tx: &Transaction,
     aggregated_nonce: &AggNonce,
     input_index: usize,
-    prevouts: &Vec<TxOut>,
+    prevouts: &[TxOut],
     script: &Script,
     sighash_type: TapSighashType,
     partial_signatures: Vec<PartialSignature>,
@@ -75,7 +76,7 @@ pub fn generate_taproot_aggregated_signature(
     let sighash_cache = SighashCache::new(tx)
         .taproot_script_spend_signature_hash(
             input_index,
-            &Prevouts::All(&prevouts), // TODO: add Prevouts::One
+            &Prevouts::All(prevouts), // TODO: add Prevouts::One
             leaf_hash,
             sighash_type,
         )
diff --git a/src/bridge/transactions/start_time.rs b/bridge/src/transactions/start_time.rs
similarity index 60%
rename from src/bridge/transactions/start_time.rs
rename to bridge/src/transactions/start_time.rs
index b6fecc2f7..7bbb24b0b 100644
--- a/src/bridge/transactions/start_time.rs
+++ b/bridge/src/transactions/start_time.rs
@@ -1,21 +1,23 @@
 use bitcoin::{
     absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
-    XOnlyPublicKey,
+    Witness,
 };
 use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
+use crate::connectors::{base::TaprootConnector, connector_2::Connector2};
+
 use super::{
-    super::{
-        connectors::{connector::*, connector_2::Connector2},
-        contexts::operator::OperatorContext,
-        graphs::base::FEE_AMOUNT,
-        scripts::*,
-    },
+    super::{contexts::operator::OperatorContext, scripts::*},
     base::*,
     pre_signed::*,
     pre_signed_musig2::*,
+    signing::{generate_taproot_leaf_schnorr_signature, populate_taproot_input_witness},
+};
+
+use bitvm::signatures::signing_winternitz::{
+    generate_winternitz_witness, WinternitzSecret, WinternitzSigningInputs,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -25,7 +27,8 @@ pub struct StartTimeTransaction {
     #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
     prev_outs: Vec<TxOut>,
     prev_scripts: Vec<ScriptBuf>,
-    connector_2: Connector2,
+
+    pub start_time_witness: Option<Witness>,
 
     musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
     musig2_nonce_signatures: HashMap<usize, HashMap<PublicKey, Signature>>,
@@ -63,44 +66,33 @@ impl PreSignedMusig2Transaction for StartTimeTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![] }
 }
 
 impl StartTimeTransaction {
-    pub fn new(context: &OperatorContext, input_0: Input) -> Self {
-        let mut this = Self::new_for_validation(
+    pub fn new(context: &OperatorContext, connector_2: &Connector2, input_0: Input) -> Self {
+        Self::new_for_validation(
             context.network,
             &context.operator_public_key,
-            &context.operator_taproot_public_key,
-            &context.n_of_n_taproot_public_key,
+            connector_2,
             input_0,
-        );
-
-        this.sign_input_0(context);
-
-        this
+        )
     }
 
     pub fn new_for_validation(
         network: Network,
         operator_public_key: &PublicKey,
-        operator_taproot_public_key: &XOnlyPublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
+        connector_2: &Connector2,
         input_0: Input,
     ) -> Self {
-        let connector_2 = Connector2::new(
-            network,
-            operator_taproot_public_key,
-            n_of_n_taproot_public_key,
-        );
-
         let input_0_leaf = 0;
         let _input_0 = connector_2.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
 
-        let total_output_amount = input_0.amount - Amount::from_sat(FEE_AMOUNT);
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_START_TIME);
 
         let _output_0 = TxOut {
             value: total_output_amount,
-            script_pubkey: generate_pay_to_pubkey_script_address(network, &operator_public_key)
+            script_pubkey: generate_pay_to_pubkey_script_address(network, operator_public_key)
                 .script_pubkey(),
         };
 
@@ -116,22 +108,65 @@ impl StartTimeTransaction {
                 script_pubkey: connector_2.generate_taproot_address().script_pubkey(),
             }],
             prev_scripts: vec![connector_2.generate_taproot_leaf_script(input_0_leaf)],
-            connector_2,
+            start_time_witness: None,
             musig2_nonces: HashMap::new(),
             musig2_nonce_signatures: HashMap::new(),
             musig2_signatures: HashMap::new(),
         }
     }
 
-    fn sign_input_0(&mut self, context: &OperatorContext) {
+    fn sign_input_0(
+        &mut self,
+        context: &OperatorContext,
+        connector_2: &Connector2,
+        start_time_signing_inputs: &WinternitzSigningInputs,
+    ) {
         let input_index = 0;
-        pre_sign_taproot_input(
-            self,
-            context,
+        let script = &self.prev_scripts()[input_index].clone();
+        let prev_outs = &self.prev_outs().clone();
+        let taproot_spend_info = connector_2.generate_taproot_spend_info();
+        let mut unlock_data: Vec<Vec<u8>> = Vec::new();
+
+        // get schnorr signature
+        let schnorr_signature = generate_taproot_leaf_schnorr_signature(
+            self.tx_mut(),
+            prev_outs,
             input_index,
             TapSighashType::All,
-            self.connector_2.generate_taproot_spend_info(),
-            &vec![&context.operator_keypair],
+            script,
+            &context.operator_keypair,
+        );
+        unlock_data.push(schnorr_signature.to_vec());
+
+        // get winternitz signature
+        self.start_time_witness = Some(generate_winternitz_witness(start_time_signing_inputs));
+        unlock_data.extend(self.start_time_witness.as_ref().unwrap().to_vec());
+
+        populate_taproot_input_witness(
+            self.tx_mut(),
+            input_index,
+            &taproot_spend_info,
+            script,
+            unlock_data,
+        );
+    }
+
+    pub fn sign(
+        &mut self,
+        context: &OperatorContext,
+        connector_2: &Connector2,
+        start_time_block_number: u32,
+        start_time_commitment_secret: &WinternitzSecret,
+    ) {
+        self.tx_mut().lock_time = absolute::LockTime::from_height(start_time_block_number)
+            .expect("Failed to set lock time from block.");
+        self.sign_input_0(
+            context,
+            connector_2,
+            &WinternitzSigningInputs {
+                message: &start_time_block_number.to_le_bytes(),
+                signing_key: start_time_commitment_secret,
+            },
         );
     }
 
@@ -143,4 +178,5 @@ impl StartTimeTransaction {
 
 impl BaseTransaction for StartTimeTransaction {
     fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "StartTime" }
 }
diff --git a/src/bridge/transactions/start_time_timeout.rs b/bridge/src/transactions/start_time_timeout.rs
similarity index 73%
rename from src/bridge/transactions/start_time_timeout.rs
rename to bridge/src/transactions/start_time_timeout.rs
index 2d2ee0f4d..24fb0e18c 100644
--- a/src/bridge/transactions/start_time_timeout.rs
+++ b/bridge/src/transactions/start_time_timeout.rs
@@ -1,6 +1,5 @@
 use bitcoin::{
     absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
-    XOnlyPublicKey,
 };
 use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
 use serde::{Deserialize, Serialize};
@@ -8,9 +7,8 @@ use std::collections::HashMap;
 
 use super::{
     super::{
-        connectors::{connector::*, connector_1::Connector1, connector_2::Connector2},
+        connectors::{base::*, connector_1::Connector1, connector_2::Connector2},
         contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
@@ -25,8 +23,6 @@ pub struct StartTimeTimeoutTransaction {
     #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
     prev_outs: Vec<TxOut>,
     prev_scripts: Vec<ScriptBuf>,
-    connector_1: Connector1,
-    connector_2: Connector2,
     reward_output_amount: Amount,
 
     musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
@@ -65,44 +61,35 @@ impl PreSignedMusig2Transaction for StartTimeTimeoutTransaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0, 1] }
 }
 
 impl StartTimeTimeoutTransaction {
-    pub fn new(context: &OperatorContext, input_0: Input, input_1: Input) -> Self {
-        Self::new_for_validation(
-            context.network,
-            &context.operator_taproot_public_key,
-            &context.n_of_n_taproot_public_key,
-            input_0,
-            input_1,
-        )
+    pub fn new(
+        context: &OperatorContext,
+        connector_1: &Connector1,
+        connector_2: &Connector2,
+        input_0: Input,
+        input_1: Input,
+    ) -> Self {
+        Self::new_for_validation(context.network, connector_1, connector_2, input_0, input_1)
     }
 
     pub fn new_for_validation(
         network: Network,
-        operator_taproot_public_key: &XOnlyPublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
+        connector_1: &Connector1,
+        connector_2: &Connector2,
         input_0: Input,
         input_1: Input,
     ) -> Self {
-        let connector_1 = Connector1::new(
-            network,
-            operator_taproot_public_key,
-            n_of_n_taproot_public_key,
-        );
-        let connector_2 = Connector2::new(
-            network,
-            operator_taproot_public_key,
-            n_of_n_taproot_public_key,
-        );
-
         let input_0_leaf = 1;
         let _input_0 = connector_2.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
 
         let input_1_leaf = 2;
         let _input_1 = connector_1.generate_taproot_leaf_tx_in(input_1_leaf, &input_1);
 
-        let total_output_amount = input_0.amount + input_1.amount - Amount::from_sat(FEE_AMOUNT);
+        let total_output_amount =
+            input_0.amount + input_1.amount - Amount::from_sat(MIN_RELAY_FEE_START_TIME_TIMEOUT);
 
         // Output[0]: value=V*2%*95% to burn
         let _output_0 = TxOut {
@@ -137,8 +124,6 @@ impl StartTimeTimeoutTransaction {
                 connector_2.generate_taproot_leaf_script(input_0_leaf),
                 connector_1.generate_taproot_leaf_script(input_1_leaf),
             ],
-            connector_1,
-            connector_2,
             reward_output_amount,
             musig2_nonces: HashMap::new(),
             musig2_nonce_signatures: HashMap::new(),
@@ -146,9 +131,12 @@ impl StartTimeTimeoutTransaction {
         }
     }
 
-    pub fn num_blocks_timelock_1(&self) -> u32 { self.connector_1.num_blocks_timelock_2 }
-
-    fn sign_input_0(&mut self, context: &VerifierContext, secret_nonce: &SecNonce) {
+    fn sign_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_2: &Connector2,
+        secret_nonce: &SecNonce,
+    ) {
         let input_index = 0;
         pre_sign_musig2_taproot_input(
             self,
@@ -160,22 +148,27 @@ impl StartTimeTimeoutTransaction {
 
         // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
         if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
-            self.finalize_input_0(context);
+            self.finalize_input_0(context, connector_2);
         }
     }
 
-    fn finalize_input_0(&mut self, context: &dyn BaseContext) {
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_2: &Connector2) {
         let input_index = 0;
         finalize_musig2_taproot_input(
             self,
             context,
             input_index,
             TapSighashType::Single,
-            self.connector_2.generate_taproot_spend_info(),
+            connector_2.generate_taproot_spend_info(),
         );
     }
 
-    fn sign_input_1(&mut self, context: &VerifierContext, secret_nonce: &SecNonce) {
+    fn sign_input_1(
+        &mut self,
+        context: &VerifierContext,
+        connector_1: &Connector1,
+        secret_nonce: &SecNonce,
+    ) {
         let input_index = 1;
         pre_sign_musig2_taproot_input(
             self,
@@ -187,45 +180,33 @@ impl StartTimeTimeoutTransaction {
 
         // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
         if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
-            self.finalize_input_1(context);
+            self.finalize_input_1(context, connector_1);
         }
     }
 
-    fn finalize_input_1(&mut self, context: &dyn BaseContext) {
+    fn finalize_input_1(&mut self, context: &dyn BaseContext, connector_1: &Connector1) {
         let input_index = 1;
         finalize_musig2_taproot_input(
             self,
             context,
             input_index,
             TapSighashType::None,
-            self.connector_1.generate_taproot_spend_info(),
+            connector_1.generate_taproot_spend_info(),
         );
     }
 
-    pub fn push_nonces(&mut self, context: &VerifierContext) -> HashMap<usize, SecNonce> {
-        let mut secret_nonces = HashMap::new();
-
-        let input_index = 0;
-        let secret_nonce = push_nonce(self, context, input_index);
-        secret_nonces.insert(input_index, secret_nonce);
-
-        let input_index = 1;
-        let secret_nonce = push_nonce(self, context, input_index);
-        secret_nonces.insert(input_index, secret_nonce);
-
-        secret_nonces
-    }
-
     pub fn pre_sign(
         &mut self,
         context: &VerifierContext,
+        connector_1: &Connector1,
+        connector_2: &Connector2,
         secret_nonces: &HashMap<usize, SecNonce>,
     ) {
         let input_index = 0;
-        self.sign_input_0(context, &secret_nonces[&input_index]);
+        self.sign_input_0(context, connector_2, &secret_nonces[&input_index]);
 
         let input_index = 1;
-        self.sign_input_1(context, &secret_nonces[&input_index]);
+        self.sign_input_1(context, connector_1, &secret_nonces[&input_index]);
     }
 
     pub fn add_output(&mut self, output_script_pubkey: ScriptBuf) {
@@ -247,4 +228,5 @@ impl BaseTransaction for StartTimeTimeoutTransaction {
 
         self.tx.clone()
     }
+    fn name(&self) -> &'static str { "StartTimeTimeout" }
 }
diff --git a/src/bridge/transactions/take_1.rs b/bridge/src/transactions/take_1.rs
similarity index 75%
rename from src/bridge/transactions/take_1.rs
rename to bridge/src/transactions/take_1.rs
index 31f07f3d8..63b201edc 100644
--- a/src/bridge/transactions/take_1.rs
+++ b/bridge/src/transactions/take_1.rs
@@ -1,6 +1,6 @@
 use bitcoin::{
     absolute, consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, TapSighashType,
-    Transaction, TxOut, XOnlyPublicKey,
+    Transaction, TxOut,
 };
 use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
 use serde::{Deserialize, Serialize};
@@ -9,11 +9,10 @@ use std::collections::HashMap;
 use super::{
     super::{
         connectors::{
-            connector::*, connector_0::Connector0, connector_3::Connector3,
-            connector_a::ConnectorA, connector_b::ConnectorB,
+            base::*, connector_0::Connector0, connector_3::Connector3, connector_a::ConnectorA,
+            connector_b::ConnectorB,
         },
         contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
@@ -28,10 +27,6 @@ pub struct Take1Transaction {
     #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
     prev_outs: Vec<TxOut>,
     prev_scripts: Vec<ScriptBuf>,
-    connector_0: Connector0,
-    connector_3: Connector3,
-    connector_a: ConnectorA,
-    connector_b: ConnectorB,
 
     musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
     musig2_nonce_signatures: HashMap<usize, HashMap<PublicKey, Signature>>,
@@ -69,11 +64,17 @@ impl PreSignedMusig2Transaction for Take1Transaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0, 3] }
 }
 
 impl Take1Transaction {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         context: &OperatorContext,
+        connector_0: &Connector0,
+        connector_3: &Connector3,
+        connector_a: &ConnectorA,
+        connector_b: &ConnectorB,
         input_0: Input,
         input_1: Input,
         input_2: Input,
@@ -82,39 +83,35 @@ impl Take1Transaction {
         let mut this = Self::new_for_validation(
             context.network,
             &context.operator_public_key,
-            &context.operator_taproot_public_key,
-            &context.n_of_n_taproot_public_key,
+            connector_0,
+            connector_3,
+            connector_a,
+            connector_b,
             input_0,
             input_1,
             input_2,
             input_3,
         );
 
-        this.sign_input_1(context);
+        this.sign_input_1(context, connector_a);
         this.sign_input_2(context);
 
         this
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub fn new_for_validation(
         network: Network,
         operator_public_key: &PublicKey,
-        operator_taproot_public_key: &XOnlyPublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
+        connector_0: &Connector0,
+        connector_3: &Connector3,
+        connector_a: &ConnectorA,
+        connector_b: &ConnectorB,
         input_0: Input,
         input_1: Input,
         input_2: Input,
         input_3: Input,
     ) -> Self {
-        let connector_0 = Connector0::new(network, n_of_n_taproot_public_key);
-        let connector_3 = Connector3::new(network, operator_public_key);
-        let connector_a = ConnectorA::new(
-            network,
-            operator_taproot_public_key,
-            n_of_n_taproot_public_key,
-        );
-        let connector_b = ConnectorB::new(network, n_of_n_taproot_public_key);
-
         let input_0_leaf = 0;
         let _input_0 = connector_0.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
 
@@ -127,7 +124,7 @@ impl Take1Transaction {
         let _input_3 = connector_b.generate_taproot_leaf_tx_in(input_3_leaf, &input_3);
 
         let total_output_amount = input_0.amount + input_1.amount + input_2.amount + input_3.amount
-            - Amount::from_sat(FEE_AMOUNT);
+            - Amount::from_sat(MIN_RELAY_FEE_TAKE_1);
 
         let _output_0 = TxOut {
             value: total_output_amount,
@@ -166,19 +163,18 @@ impl Take1Transaction {
                 connector_3.generate_script(),
                 connector_b.generate_taproot_leaf_script(input_3_leaf),
             ],
-            connector_0,
-            connector_3,
-            connector_a,
-            connector_b,
             musig2_nonces: HashMap::new(),
             musig2_nonce_signatures: HashMap::new(),
             musig2_signatures: HashMap::new(),
         }
     }
 
-    pub fn num_blocks_timelock_2(&self) -> u32 { self.connector_3.num_blocks_timelock }
-
-    fn sign_input_0(&mut self, context: &VerifierContext, secret_nonce: &SecNonce) {
+    fn sign_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_0: &Connector0,
+        secret_nonce: &SecNonce,
+    ) {
         let input_index = 0;
         pre_sign_musig2_taproot_input(
             self,
@@ -190,29 +186,28 @@ impl Take1Transaction {
 
         // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
         if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
-            self.finalize_input_0(context);
+            self.finalize_input_0(context, connector_0);
         }
     }
 
-    fn finalize_input_0(&mut self, context: &dyn BaseContext) {
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_0: &Connector0) {
         let input_index = 0;
         finalize_musig2_taproot_input(
             self,
             context,
             input_index,
             TapSighashType::All,
-            self.connector_0.generate_taproot_spend_info(),
+            connector_0.generate_taproot_spend_info(),
         );
     }
 
-    fn sign_input_1(&mut self, context: &OperatorContext) {
+    fn sign_input_1(&mut self, context: &OperatorContext, connector_a: &ConnectorA) {
         let input_index = 1;
-        pre_sign_taproot_input(
+        pre_sign_taproot_input_default(
             self,
-            context,
             input_index,
             TapSighashType::All,
-            self.connector_a.generate_taproot_spend_info(),
+            connector_a.generate_taproot_spend_info(),
             &vec![&context.operator_keypair],
         );
     }
@@ -221,14 +216,18 @@ impl Take1Transaction {
         let input_index = 2;
         pre_sign_p2wsh_input(
             self,
-            context,
             input_index,
             EcdsaSighashType::All,
             &vec![&context.operator_keypair],
         );
     }
 
-    fn sign_input_3(&mut self, context: &VerifierContext, secret_nonce: &SecNonce) {
+    fn sign_input_3(
+        &mut self,
+        context: &VerifierContext,
+        connector_b: &ConnectorB,
+        secret_nonce: &SecNonce,
+    ) {
         let input_index = 3;
         pre_sign_musig2_taproot_input(
             self,
@@ -240,45 +239,33 @@ impl Take1Transaction {
 
         // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
         if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
-            self.finalize_input_3(context);
+            self.finalize_input_3(context, connector_b);
         }
     }
 
-    fn finalize_input_3(&mut self, context: &dyn BaseContext) {
+    fn finalize_input_3(&mut self, context: &dyn BaseContext, connector_b: &ConnectorB) {
         let input_index = 3;
         finalize_musig2_taproot_input(
             self,
             context,
             input_index,
             TapSighashType::All,
-            self.connector_b.generate_taproot_spend_info(),
+            connector_b.generate_taproot_spend_info(),
         );
     }
 
-    pub fn push_nonces(&mut self, context: &VerifierContext) -> HashMap<usize, SecNonce> {
-        let mut secret_nonces = HashMap::new();
-
-        let input_index = 0;
-        let secret_nonce = push_nonce(self, context, input_index);
-        secret_nonces.insert(input_index, secret_nonce);
-
-        let input_index = 3;
-        let secret_nonce = push_nonce(self, context, input_index);
-        secret_nonces.insert(input_index, secret_nonce);
-
-        secret_nonces
-    }
-
     pub fn pre_sign(
         &mut self,
         context: &VerifierContext,
+        connector_0: &Connector0,
+        connector_b: &ConnectorB,
         secret_nonces: &HashMap<usize, SecNonce>,
     ) {
         let input_index = 0;
-        self.sign_input_0(context, &secret_nonces[&input_index]);
+        self.sign_input_0(context, connector_0, &secret_nonces[&input_index]);
 
         let input_index = 3;
-        self.sign_input_3(context, &secret_nonces[&input_index]);
+        self.sign_input_3(context, connector_b, &secret_nonces[&input_index]);
     }
 
     pub fn merge(&mut self, take_1: &Take1Transaction) {
@@ -289,4 +276,5 @@ impl Take1Transaction {
 
 impl BaseTransaction for Take1Transaction {
     fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "Take1" }
 }
diff --git a/src/bridge/transactions/take_2.rs b/bridge/src/transactions/take_2.rs
similarity index 73%
rename from src/bridge/transactions/take_2.rs
rename to bridge/src/transactions/take_2.rs
index 4b03be037..0a14ddfa1 100644
--- a/src/bridge/transactions/take_2.rs
+++ b/bridge/src/transactions/take_2.rs
@@ -1,6 +1,6 @@
 use bitcoin::{
     absolute, consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, TapSighashType,
-    Transaction, TxOut, XOnlyPublicKey,
+    Transaction, TxOut,
 };
 use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
 use serde::{Deserialize, Serialize};
@@ -9,16 +9,16 @@ use std::collections::HashMap;
 use super::{
     super::{
         connectors::{
-            connector::*, connector_0::Connector0, connector_4::Connector4,
-            connector_5::Connector5, connector_c::ConnectorC,
+            base::*, connector_0::Connector0, connector_4::Connector4, connector_5::Connector5,
+            connector_c::ConnectorC,
         },
         contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
-        graphs::base::FEE_AMOUNT,
         scripts::*,
     },
     base::*,
     pre_signed::*,
     pre_signed_musig2::*,
+    signing::populate_p2tr_key_spend_witness,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
@@ -28,10 +28,6 @@ pub struct Take2Transaction {
     #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
     prev_outs: Vec<TxOut>,
     prev_scripts: Vec<ScriptBuf>,
-    connector_0: Connector0,
-    connector_4: Connector4,
-    connector_5: Connector5,
-    connector_c: ConnectorC,
 
     musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
     musig2_nonce_signatures: HashMap<usize, HashMap<PublicKey, Signature>>,
@@ -69,11 +65,17 @@ impl PreSignedMusig2Transaction for Take2Transaction {
     ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
         &mut self.musig2_signatures
     }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0, 2] }
 }
 
 impl Take2Transaction {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         context: &OperatorContext,
+        connector_0: &Connector0,
+        connector_4: &Connector4,
+        connector_5: &Connector5,
+        connector_c: &ConnectorC,
         input_0: Input,
         input_1: Input,
         input_2: Input,
@@ -82,8 +84,10 @@ impl Take2Transaction {
         let mut this = Self::new_for_validation(
             context.network,
             &context.operator_public_key,
-            &context.operator_taproot_public_key,
-            &context.n_of_n_taproot_public_key,
+            connector_0,
+            connector_4,
+            connector_5,
+            connector_c,
             input_0,
             input_1,
             input_2,
@@ -91,26 +95,23 @@ impl Take2Transaction {
         );
 
         this.sign_input_1(context);
-        this.sign_input_3(context);
 
         this
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub fn new_for_validation(
         network: Network,
         operator_public_key: &PublicKey,
-        operator_taproot_public_key: &XOnlyPublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
+        connector_0: &Connector0,
+        connector_4: &Connector4,
+        connector_5: &Connector5,
+        connector_c: &ConnectorC,
         input_0: Input,
         input_1: Input,
         input_2: Input,
         input_3: Input,
     ) -> Self {
-        let connector_0 = Connector0::new(network, n_of_n_taproot_public_key);
-        let connector_4 = Connector4::new(network, operator_public_key);
-        let connector_5 = Connector5::new(network, n_of_n_taproot_public_key);
-        let connector_c = ConnectorC::new(network, operator_taproot_public_key);
-
         let input_0_leaf = 1;
         let _input_0 = connector_0.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
 
@@ -119,11 +120,10 @@ impl Take2Transaction {
         let input_2_leaf = 0;
         let _input_2 = connector_5.generate_taproot_leaf_tx_in(input_2_leaf, &input_2);
 
-        let input_3_leaf = 0;
-        let _input_3 = connector_c.generate_taproot_leaf_tx_in(input_3_leaf, &input_3);
+        let _input_3 = generate_default_tx_in(&input_3);
 
         let total_output_amount = input_0.amount + input_1.amount + input_2.amount + input_3.amount
-            - Amount::from_sat(FEE_AMOUNT);
+            - Amount::from_sat(MIN_RELAY_FEE_TAKE_2);
 
         let _output_0 = TxOut {
             value: total_output_amount,
@@ -160,21 +160,20 @@ impl Take2Transaction {
                 connector_0.generate_taproot_leaf_script(input_0_leaf),
                 connector_4.generate_script(),
                 connector_5.generate_taproot_leaf_script(input_2_leaf),
-                connector_c.generate_taproot_leaf_script(input_3_leaf),
+                // No `input_3` script - key spend path is used
             ],
-            connector_0,
-            connector_4,
-            connector_5,
-            connector_c,
             musig2_nonces: HashMap::new(),
             musig2_nonce_signatures: HashMap::new(),
             musig2_signatures: HashMap::new(),
         }
     }
 
-    pub fn num_blocks_timelock_1(&self) -> u32 { self.connector_4.num_blocks_timelock }
-
-    fn sign_input_0(&mut self, context: &VerifierContext, secret_nonce: &SecNonce) {
+    fn sign_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_0: &Connector0,
+        secret_nonce: &SecNonce,
+    ) {
         let input_index = 0;
         pre_sign_musig2_taproot_input(
             self,
@@ -186,18 +185,18 @@ impl Take2Transaction {
 
         // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
         if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
-            self.finalize_input_0(context);
+            self.finalize_input_0(context, connector_0);
         }
     }
 
-    fn finalize_input_0(&mut self, context: &dyn BaseContext) {
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_0: &Connector0) {
         let input_index = 0;
         finalize_musig2_taproot_input(
             self,
             context,
             input_index,
             TapSighashType::All,
-            self.connector_0.generate_taproot_spend_info(),
+            connector_0.generate_taproot_spend_info(),
         );
     }
 
@@ -205,14 +204,18 @@ impl Take2Transaction {
         let input_index = 1;
         pre_sign_p2wsh_input(
             self,
-            context,
             input_index,
             EcdsaSighashType::All,
             &vec![&context.operator_keypair],
         );
     }
 
-    fn sign_input_2(&mut self, context: &VerifierContext, secret_nonce: &SecNonce) {
+    fn sign_input_2(
+        &mut self,
+        context: &VerifierContext,
+        connector_5: &Connector5,
+        secret_nonce: &SecNonce,
+    ) {
         let input_index = 2;
         pre_sign_musig2_taproot_input(
             self,
@@ -224,57 +227,52 @@ impl Take2Transaction {
 
         // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
         if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
-            self.finalize_input_2(context);
+            self.finalize_input_2(context, connector_5);
         }
     }
 
-    fn finalize_input_2(&mut self, context: &dyn BaseContext) {
+    fn finalize_input_2(&mut self, context: &dyn BaseContext, connector_5: &Connector5) {
         let input_index = 2;
         finalize_musig2_taproot_input(
             self,
             context,
             input_index,
             TapSighashType::All,
-            self.connector_5.generate_taproot_spend_info(),
+            connector_5.generate_taproot_spend_info(),
         );
     }
 
-    fn sign_input_3(&mut self, context: &OperatorContext) {
+    fn sign_input_3(&mut self, context: &OperatorContext, connector_c: &ConnectorC) {
         let input_index = 3;
-        pre_sign_taproot_input(
-            self,
-            context,
+        let prev_outs = &self.prev_outs().clone();
+        let merkle_root = connector_c.taproot_merkle_root();
+
+        populate_p2tr_key_spend_witness(
+            self.tx_mut(),
             input_index,
+            prev_outs,
             TapSighashType::All,
-            self.connector_c.generate_taproot_spend_info(),
-            &vec![&context.operator_keypair],
+            merkle_root,
+            &context.operator_keypair,
         );
     }
 
-    pub fn push_nonces(&mut self, context: &VerifierContext) -> HashMap<usize, SecNonce> {
-        let mut secret_nonces = HashMap::new();
-
-        let input_index = 0;
-        let secret_nonce = push_nonce(self, context, input_index);
-        secret_nonces.insert(input_index, secret_nonce);
-
-        let input_index = 2;
-        let secret_nonce = push_nonce(self, context, input_index);
-        secret_nonces.insert(input_index, secret_nonce);
-
-        secret_nonces
-    }
-
     pub fn pre_sign(
         &mut self,
         context: &VerifierContext,
+        connector_0: &Connector0,
+        connector_5: &Connector5,
         secret_nonces: &HashMap<usize, SecNonce>,
     ) {
         let input_index = 0;
-        self.sign_input_0(context, &secret_nonces[&input_index]);
+        self.sign_input_0(context, connector_0, &secret_nonces[&input_index]);
 
         let input_index = 2;
-        self.sign_input_2(context, &secret_nonces[&input_index]);
+        self.sign_input_2(context, connector_5, &secret_nonces[&input_index]);
+    }
+
+    pub fn sign(&mut self, context: &OperatorContext, connector_c: &ConnectorC) {
+        self.sign_input_3(context, connector_c);
     }
 
     pub fn merge(&mut self, take_2: &Take2Transaction) {
@@ -285,4 +283,5 @@ impl Take2Transaction {
 
 impl BaseTransaction for Take2Transaction {
     fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "Take2" }
 }
diff --git a/bridge/src/utils.rs b/bridge/src/utils.rs
new file mode 100644
index 000000000..84a62d9ec
--- /dev/null
+++ b/bridge/src/utils.rs
@@ -0,0 +1,160 @@
+use std::path::{Path, PathBuf};
+
+use bitcode::{Decode, Encode};
+use bitcoin::Network;
+use bitcoin_script::{script, Script};
+use bitvm::{bigint::BigIntImpl, pseudo::NMUL};
+
+const NUM_BLOCKS_REGTEST: u32 = 2;
+const NUM_BLOCKS_TESTNET: u32 = 2;
+
+pub fn num_blocks_per_network(network: Network, mainnet_num_blocks: u32) -> u32 {
+    match network {
+        Network::Bitcoin => mainnet_num_blocks,
+        Network::Regtest => NUM_BLOCKS_REGTEST,
+        _ => NUM_BLOCKS_TESTNET, // Testnet, Signet
+    }
+}
+
+pub fn remove_script_and_control_block_from_witness(mut witness: Vec<Vec<u8>>) -> Vec<Vec<u8>> {
+    witness.truncate(witness.len() - 2);
+
+    witness
+}
+
+// Source for below hash handling functions in script:
+// https://github.com/alpenlabs/strata-bridge-poc/tree/main/crates/primitives/src/scripts/transform.rs
+const LIMB_SIZE: u32 = 30;
+pub type H256 = BigIntImpl<256, LIMB_SIZE>;
+
+fn split_digit(window: u32, index: u32) -> Script {
+    script! {
+        // {v}
+        0                           // {v} {A}
+        OP_SWAP
+        for i in 0..index {
+            OP_TUCK                 // {v} {A} {v}
+            { 1 << (window - i - 1) }   // {v} {A} {v} {1000}
+            OP_GREATERTHANOREQUAL   // {v} {A} {1/0}
+            OP_TUCK                 // {v} {1/0} {A} {1/0}
+            OP_ADD                  // {v} {1/0} {A+1/0}
+            if i < index - 1 { { NMUL(2) } }
+            OP_ROT OP_ROT
+            OP_IF
+                { 1 << (window - i - 1) }
+                OP_SUB
+            OP_ENDIF
+        }
+        OP_SWAP
+    }
+}
+
+pub fn sb_hash_from_nibbles() -> Script {
+    const WINDOW: u32 = 4;
+    const N_DIGITS: u32 = (H256::N_BITS + WINDOW - 1) / WINDOW;
+
+    script! {
+        for i in 1..64 { { i } OP_ROLL }
+        for i in (1..=N_DIGITS).rev() {
+            if (i * WINDOW) % LIMB_SIZE == 0 {
+                OP_TOALTSTACK
+            } else if (i * WINDOW) % LIMB_SIZE > 0 &&
+                        (i * WINDOW) % LIMB_SIZE < WINDOW {
+                OP_SWAP
+                { split_digit(WINDOW, (i * WINDOW) % LIMB_SIZE) }
+                OP_ROT
+                { NMUL(1 << ((i * WINDOW) % LIMB_SIZE)) }
+                OP_ADD
+                OP_TOALTSTACK
+            } else if i != N_DIGITS {
+                { NMUL(1 << WINDOW) }
+                OP_ADD
+            }
+        }
+        for _ in 1..H256::N_LIMBS { OP_FROMALTSTACK }
+        for i in 1..H256::N_LIMBS { { i } OP_ROLL }
+    }
+}
+
+pub fn sb_hash_from_bytes() -> Script {
+    const WINDOW: u32 = 8;
+    const N_DIGITS: u32 = (H256::N_BITS + WINDOW - 1) / WINDOW;
+
+    script! {
+        for i in 1..32 { { i } OP_ROLL }
+        for i in (1..=N_DIGITS).rev() {
+            if (i * WINDOW) % LIMB_SIZE == 0 {
+                OP_TOALTSTACK
+            } else if (i * WINDOW) % LIMB_SIZE > 0 &&
+                        (i * WINDOW) % LIMB_SIZE < WINDOW {
+                OP_SWAP
+                { split_digit(WINDOW, (i * WINDOW) % LIMB_SIZE) }
+                OP_ROT
+                { NMUL(1 << ((i * WINDOW) % LIMB_SIZE)) }
+                OP_ADD
+                OP_TOALTSTACK
+            } else if i != N_DIGITS {
+                { NMUL(1 << WINDOW) }
+                OP_ADD
+            }
+        }
+        for _ in 1..H256::N_LIMBS { OP_FROMALTSTACK }
+        for i in 1..H256::N_LIMBS { { i } OP_ROLL }
+    }
+}
+
+pub fn write_disk_cache(file_path: &Path, data: &impl Encode) -> std::io::Result<()> {
+    println!("Writing cache to {}...", file_path.display());
+    if let Some(parent) = file_path.parent() {
+        if !parent.exists() {
+            std::fs::create_dir_all(parent)?;
+        }
+    }
+    let encoded_data = bitcode::encode(data);
+    let compressed_data = compress(&encoded_data, DEFAULT_COMPRESSION_LEVEL)?;
+    std::fs::write(file_path, compressed_data)
+}
+
+pub fn read_disk_cache<T>(file_path: &Path) -> std::io::Result<T>
+where
+    T: for<'de> Decode<'de>,
+{
+    println!("Reading cache from {}...", file_path.display());
+    let compressed_data = std::fs::read(file_path)?;
+    let encoded_data: Vec<u8> = decompress(&compressed_data)?;
+    let decoded = bitcode::decode(&encoded_data).map_err(std::io::Error::other)?;
+
+    Ok(decoded)
+}
+
+pub fn cleanup_cache_files(prefix: &str, cache_location: &Path, max_cache_files: u32) {
+    let mut paths: Vec<PathBuf> = std::fs::read_dir(cache_location)
+        .unwrap()
+        .filter_map(Result::ok)
+        .filter(|entry| entry.file_name().to_str().unwrap_or("").starts_with(prefix))
+        .map(|entry| entry.path())
+        .collect();
+
+    paths.sort_by_key(|path| {
+        std::fs::metadata(path)
+            .and_then(|m| m.modified())
+            .unwrap_or_else(|_| std::time::SystemTime::now())
+    });
+
+    if paths.len() >= max_cache_files as usize {
+        if let Some(oldest) = paths.first() {
+            std::fs::remove_file(oldest).expect("Failed to delete the old cache file");
+            println!("Old cache file deleted: {:?}", oldest);
+        }
+    }
+}
+
+pub const DEFAULT_COMPRESSION_LEVEL: i32 = 5;
+
+pub fn compress(data: &Vec<u8>, level: i32) -> std::io::Result<Vec<u8>> {
+    zstd::stream::encode_all(data.as_slice(), level)
+}
+
+pub fn decompress(data: &Vec<u8>) -> std::io::Result<Vec<u8>> {
+    zstd::stream::decode_all(data.as_slice())
+}
diff --git a/bridge/tests/bridge/assert/assert.rs b/bridge/tests/bridge/assert/assert.rs
new file mode 100644
index 000000000..c66ade15f
--- /dev/null
+++ b/bridge/tests/bridge/assert/assert.rs
@@ -0,0 +1,85 @@
+use bitcoin::Amount;
+
+use bridge::{
+    connectors::base::TaprootConnector,
+    transactions::{
+        assert::AssertTransaction,
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_ASSERT},
+        pre_signed::PreSignedTransaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, generate_stub_outpoint, wait_for_timelock_expiry},
+    setup::{setup_test_full, ONE_HUNDRED},
+};
+
+#[tokio::test]
+async fn test_assert_tx_success() {
+    let config = setup_test_full().await;
+
+    let amount = Amount::from_sat(ONE_HUNDRED + MIN_RELAY_FEE_ASSERT);
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    faucet
+        .fund_input(&config.connector_b.generate_taproot_address(), amount)
+        .await
+        .wait()
+        .await;
+
+    let outpoint = generate_stub_outpoint(
+        &config.client_0,
+        &config.connector_b.generate_taproot_address(),
+        amount,
+    )
+    .await;
+
+    let mut assert_tx = AssertTransaction::new(
+        &config.connector_4,
+        &config.connector_5,
+        &config.connector_b,
+        &config.connector_c,
+        Input { outpoint, amount },
+    );
+
+    let secret_nonces_0 = assert_tx.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = assert_tx.push_nonces(&config.verifier_1_context);
+
+    assert_tx.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_b,
+        &secret_nonces_0,
+    );
+    assert_tx.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_b,
+        &secret_nonces_1,
+    );
+
+    println!(
+        "tx output before finalize: {:?}",
+        assert_tx
+            .tx()
+            .output
+            .iter()
+            .map(|o| o.value.to_sat())
+            .collect::<Vec<u64>>()
+    );
+    let tx = assert_tx.finalize();
+    println!(
+        "tx output after finalize: {:?}",
+        assert_tx
+            .tx()
+            .output
+            .iter()
+            .map(|o| o.value.to_sat())
+            .collect::<Vec<u64>>()
+    );
+    check_tx_output_sum(ONE_HUNDRED, &tx);
+    wait_for_timelock_expiry(config.network, Some("kick off 2 connector b")).await;
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Assert tx result: {:?}\n", result);
+    assert!(result.is_ok());
+}
diff --git a/bridge/tests/bridge/assert/assert_commits.rs b/bridge/tests/bridge/assert/assert_commits.rs
new file mode 100644
index 000000000..3eeeb21fb
--- /dev/null
+++ b/bridge/tests/bridge/assert/assert_commits.rs
@@ -0,0 +1,146 @@
+use bitcoin::{Amount, OutPoint};
+
+use bridge::{
+    graphs::base::DUST_AMOUNT,
+    transactions::{
+        assert_transactions::{
+            assert_commit_1::AssertCommit1Transaction, assert_commit_2::AssertCommit2Transaction,
+            utils::sign_assert_tx_with_groth16_proof,
+        },
+        base::{
+            BaseTransaction, Input, MIN_RELAY_FEE_ASSERT_COMMIT1, MIN_RELAY_FEE_ASSERT_COMMIT2,
+            MIN_RELAY_FEE_ASSERT_FINAL, MIN_RELAY_FEE_ASSERT_INITIAL,
+        },
+    },
+};
+use num_traits::ToPrimitive;
+
+use crate::bridge::{
+    assert::helper::fund_create_and_mine_assert_initial_tx,
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, get_reward_amount, wait_for_timelock_expiry},
+    setup::{setup_test_full, ONE_HUNDRED},
+};
+
+#[tokio::test]
+async fn test_assert_commits_tx_success() {
+    let config = setup_test_full().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let reward_amount = get_reward_amount(ONE_HUNDRED);
+    let assert_commit1_dust_amount =
+        config.assert_commit_connectors_e_1.connectors_num() as u64 * DUST_AMOUNT;
+    let assert_commit2_dust_amount =
+        config.assert_commit_connectors_e_2.connectors_num() as u64 * DUST_AMOUNT;
+    let amount = Amount::from_sat(
+        reward_amount
+            + assert_commit1_dust_amount
+            + assert_commit2_dust_amount
+            + MIN_RELAY_FEE_ASSERT_INITIAL
+            + MIN_RELAY_FEE_ASSERT_COMMIT1
+            + MIN_RELAY_FEE_ASSERT_COMMIT2
+            + MIN_RELAY_FEE_ASSERT_FINAL,
+    );
+    let assert_inital_tx = fund_create_and_mine_assert_initial_tx(&config, &faucet, amount).await;
+
+    let mut vout_base = 1;
+    let mut assert_commit1 = AssertCommit1Transaction::new(
+        &config.assert_commit_connectors_e_1,
+        &config.assert_commit_connectors_f.connector_f_1,
+        (0..config.assert_commit_connectors_e_1.connectors_num())
+            .map(|idx| Input {
+                outpoint: OutPoint {
+                    txid: assert_inital_tx.compute_txid(),
+                    vout: (idx + vout_base).to_u32().unwrap(),
+                },
+                amount: assert_inital_tx.output[idx + vout_base].value,
+            })
+            .collect(),
+    );
+
+    vout_base += config.assert_commit_connectors_e_1.connectors_num();
+
+    let mut assert_commit2 = AssertCommit2Transaction::new(
+        &config.assert_commit_connectors_e_2,
+        &config.assert_commit_connectors_f.connector_f_2,
+        (0..config.assert_commit_connectors_e_2.connectors_num())
+            .map(|idx| Input {
+                outpoint: OutPoint {
+                    txid: assert_inital_tx.compute_txid(),
+                    vout: (idx + vout_base).to_u32().unwrap(),
+                },
+                amount: assert_inital_tx.output[idx + vout_base].value,
+            })
+            .collect(),
+    );
+
+    let (witness_for_commit1, witness_for_commit2) =
+        sign_assert_tx_with_groth16_proof(&config.commitment_secrets, &config.valid_proof);
+    assert_commit1.sign(
+        &config.assert_commit_connectors_e_1,
+        witness_for_commit1.clone(),
+    );
+    assert_commit2.sign(
+        &config.assert_commit_connectors_e_2,
+        witness_for_commit2.clone(),
+    );
+
+    let assert_commit1_tx = assert_commit1.finalize();
+    let assert_commit2_tx = assert_commit2.finalize();
+    check_tx_output_sum(assert_commit1_dust_amount, &assert_commit1_tx);
+    check_tx_output_sum(assert_commit2_dust_amount, &assert_commit2_tx);
+    // println!(
+    //     ">>>>>> MINE ASSERT COMMIT 1 input amount: {:?}, virtual size: {:?}, outputs: {:?}",
+    //     DUST_AMOUNT * config.assert_commit_connectors_e_1.connectors_num() as u64 + 10000000,
+    //     assert_commit1_tx.vsize(),
+    //     assert_commit1_tx
+    //         .output
+    //         .iter()
+    //         .map(|o| o.value.to_sat())
+    //         .collect::<Vec<u64>>(),
+    // );
+    // println!(
+    //     ">>>>>> ASSERT COMMIT 1 TX OUTPUTS SIZE: {:?}",
+    //     assert_commit1_tx
+    //         .output
+    //         .iter()
+    //         .map(|o| o.size())
+    //         .collect::<Vec<usize>>()
+    // );
+
+    // println!(
+    //     ">>>>>> MINE ASSERT COMMIT 2 input amount: {:?}, virtual size: {:?}, outputs: {:?}",
+    //     DUST_AMOUNT * config.assert_commit_connectors_e_2.connectors_num() as u64 + 10000000,
+    //     assert_commit2_tx.vsize(),
+    //     assert_commit2_tx
+    //         .output
+    //         .iter()
+    //         .map(|o| o.value.to_sat())
+    //         .collect::<Vec<u64>>(),
+    // );
+    // println!(
+    //     ">>>>>> ASSERT COMMIT 2 TX OUTPUTS SIZE: {:?}",
+    //     assert_commit2_tx
+    //         .output
+    //         .iter()
+    //         .map(|o| o.size())
+    //         .collect::<Vec<usize>>()
+    // );
+
+    // println!("Transaction hex: \n{}", serialize_hex(&assert_commit1_tx));
+    // println!("Transaction hex: \n{}", serialize_hex(&assert_commit2_tx));
+    // println!("Assert commit 1 total size: {}, virtual size: {}", assert_commit1_tx.total_size(), assert_commit1_tx.vsize());
+    // println!("Assert commit 2 total size: {}, virtual size: {}", assert_commit2_tx.total_size(), assert_commit2_tx.vsize());
+
+    wait_for_timelock_expiry(config.network, Some("assert initial connector 4")).await;
+
+    let commit1_result = config.client_0.esplora.broadcast(&assert_commit1_tx).await;
+    println!("Txid: {:?}", assert_commit1_tx.compute_txid());
+    println!("Assert commit 1 tx result: {:?}\n", commit1_result);
+    assert!(commit1_result.is_ok());
+
+    let commit2_result = config.client_0.esplora.broadcast(&assert_commit2_tx).await;
+    println!("Txid: {:?}", assert_commit2_tx.compute_txid());
+    println!("Assert commit 2 tx result: {:?}\n", commit2_result);
+    assert!(commit2_result.is_ok());
+}
diff --git a/bridge/tests/bridge/assert/assert_final.rs b/bridge/tests/bridge/assert/assert_final.rs
new file mode 100644
index 000000000..60eb93863
--- /dev/null
+++ b/bridge/tests/bridge/assert/assert_final.rs
@@ -0,0 +1,109 @@
+use bitcoin::{consensus::encode::serialize_hex, Address, Amount};
+
+use bridge::{
+    connectors::base::{P2wshConnector, TaprootConnector},
+    graphs::base::DUST_AMOUNT,
+    transactions::{
+        assert_transactions::assert_final::AssertFinalTransaction,
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_ASSERT_FINAL},
+        pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{
+        check_tx_output_sum, generate_stub_outpoint, get_reward_amount, verify_funding_inputs,
+    },
+    setup::{setup_test_full, ONE_HUNDRED},
+};
+
+#[tokio::test]
+async fn test_assert_final_tx_success() {
+    let config = setup_test_full().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+    let reward_amount = get_reward_amount(ONE_HUNDRED);
+    // not adding assert final relay fee since hundreds of dust will cover it
+    let input_value0 = Amount::from_sat(reward_amount);
+    let funding_utxo_address0 = config.connector_d.generate_taproot_address();
+    funding_inputs.push((&funding_utxo_address0, input_value0));
+    let assert_commit1_dust_amount =
+        config.assert_commit_connectors_e_1.connectors_num() as u64 * DUST_AMOUNT;
+    let input_value1 = Amount::from_sat(assert_commit1_dust_amount);
+    let funding_utxo_address1 = config
+        .assert_commit_connectors_f
+        .connector_f_1
+        .generate_address();
+    funding_inputs.push((&funding_utxo_address1, input_value1));
+    let assert_commit2_dust_amount =
+        config.assert_commit_connectors_e_2.connectors_num() as u64 * DUST_AMOUNT;
+    let input_value2 = Amount::from_sat(assert_commit2_dust_amount);
+    let funding_utxo_address2 = config
+        .assert_commit_connectors_f
+        .connector_f_2
+        .generate_address();
+    funding_inputs.push((&funding_utxo_address2, input_value2));
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    verify_funding_inputs(&config.client_0, &funding_inputs).await;
+
+    let funding_outpoint0 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address0, input_value0).await;
+    let funding_outpoint1 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address1, input_value1).await;
+    let funding_outpoint2 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address2, input_value2).await;
+
+    let mut assert_final_tx = AssertFinalTransaction::new(
+        &config.operator_context,
+        &config.connector_4,
+        &config.connector_5,
+        &config.connector_c,
+        &config.connector_d,
+        &config.assert_commit_connectors_f,
+        Input {
+            outpoint: funding_outpoint0,
+            amount: input_value0,
+        },
+        Input {
+            outpoint: funding_outpoint1,
+            amount: input_value1,
+        },
+        Input {
+            outpoint: funding_outpoint2,
+            amount: input_value2,
+        },
+    );
+
+    let secret_nonces_0 = assert_final_tx.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = assert_final_tx.push_nonces(&config.verifier_1_context);
+
+    assert_final_tx.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_d,
+        &secret_nonces_0,
+    );
+    assert_final_tx.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_d,
+        &secret_nonces_1,
+    );
+
+    let tx = assert_final_tx.finalize();
+    check_tx_output_sum(
+        reward_amount + assert_commit1_dust_amount + assert_commit2_dust_amount
+            - MIN_RELAY_FEE_ASSERT_FINAL,
+        &tx,
+    );
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Assert final tx result: {:?}\n", result);
+    println!("Transaction hex: \n{}", serialize_hex(&tx));
+    assert!(result.is_ok());
+}
diff --git a/bridge/tests/bridge/assert/assert_initial.rs b/bridge/tests/bridge/assert/assert_initial.rs
new file mode 100644
index 000000000..f480889bf
--- /dev/null
+++ b/bridge/tests/bridge/assert/assert_initial.rs
@@ -0,0 +1,44 @@
+use bitcoin::Amount;
+
+use bridge::{
+    graphs::base::DUST_AMOUNT,
+    transactions::base::{
+        MIN_RELAY_FEE_ASSERT_COMMIT1, MIN_RELAY_FEE_ASSERT_COMMIT2, MIN_RELAY_FEE_ASSERT_FINAL,
+        MIN_RELAY_FEE_ASSERT_INITIAL,
+    },
+};
+
+use crate::bridge::{
+    assert::helper::fund_create_and_mine_assert_initial_tx,
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, get_reward_amount},
+    setup::{setup_test_full, ONE_HUNDRED},
+};
+
+#[tokio::test]
+async fn test_assert_initial_tx_success() {
+    let config = setup_test_full().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let reward_amount = get_reward_amount(ONE_HUNDRED);
+    let total_dust_amount = (config.assert_commit_connectors_e_1.connectors_num()
+        + config.assert_commit_connectors_e_2.connectors_num()) as u64
+        * DUST_AMOUNT;
+    let amount = Amount::from_sat(
+        reward_amount
+            + total_dust_amount
+            + MIN_RELAY_FEE_ASSERT_INITIAL
+            + MIN_RELAY_FEE_ASSERT_COMMIT1
+            + MIN_RELAY_FEE_ASSERT_COMMIT2
+            + MIN_RELAY_FEE_ASSERT_FINAL,
+    );
+    let tx = fund_create_and_mine_assert_initial_tx(&config, &faucet, amount).await;
+    check_tx_output_sum(
+        reward_amount
+            + total_dust_amount
+            + MIN_RELAY_FEE_ASSERT_COMMIT1
+            + MIN_RELAY_FEE_ASSERT_COMMIT2
+            + MIN_RELAY_FEE_ASSERT_FINAL,
+        &tx,
+    );
+}
diff --git a/bridge/tests/bridge/assert/helper.rs b/bridge/tests/bridge/assert/helper.rs
new file mode 100644
index 000000000..7175aad12
--- /dev/null
+++ b/bridge/tests/bridge/assert/helper.rs
@@ -0,0 +1,93 @@
+use bitcoin::{Amount, Network, Transaction, Txid};
+use bridge::{
+    connectors::{base::TaprootConnector, connector_b::ConnectorB, connector_d::ConnectorD},
+    contexts::verifier::VerifierContext,
+    transactions::{
+        assert_transactions::{
+            assert_initial::AssertInitialTransaction,
+            utils::{AssertCommit1ConnectorsE, AssertCommit2ConnectorsE},
+        },
+        base::{BaseTransaction, Input},
+        pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+use esplora_client::AsyncClient;
+
+use crate::bridge::{
+    faucet::Faucet,
+    helper::{generate_stub_outpoint, wait_for_timelock_expiry},
+    setup::SetupConfigFull,
+};
+
+pub async fn fund_create_and_mine_assert_initial_tx(
+    config: &SetupConfigFull,
+    faucet: &Faucet,
+    input_amount: Amount,
+) -> Transaction {
+    faucet
+        .fund_input(&config.connector_b.generate_taproot_address(), input_amount)
+        .await
+        .wait()
+        .await;
+
+    let outpoint = generate_stub_outpoint(
+        &config.client_0,
+        &config.connector_b.generate_taproot_address(),
+        input_amount,
+    )
+    .await;
+
+    let (tx, _) = create_and_mine_assert_initial_tx(
+        &config.client_0.esplora,
+        config.network,
+        &config.verifier_0_context,
+        &config.verifier_1_context,
+        &config.connector_b,
+        &config.connector_d,
+        &config.assert_commit_connectors_e_1,
+        &config.assert_commit_connectors_e_2,
+        Input {
+            outpoint,
+            amount: input_amount,
+        },
+    )
+    .await;
+
+    tx
+}
+
+pub async fn create_and_mine_assert_initial_tx(
+    esplora: &AsyncClient,
+    network: Network,
+    verifier_0_context: &VerifierContext,
+    verifier_1_context: &VerifierContext,
+    connector_b: &ConnectorB,
+    connector_d: &ConnectorD,
+    assert_commit_connectors_e_1: &AssertCommit1ConnectorsE,
+    assert_commit_connectors_e_2: &AssertCommit2ConnectorsE,
+    input: Input,
+) -> (Transaction, Txid) {
+    let mut assert_initial_tx = AssertInitialTransaction::new(
+        connector_b,
+        connector_d,
+        assert_commit_connectors_e_1,
+        assert_commit_connectors_e_2,
+        input,
+    );
+
+    let secret_nonces_0 = assert_initial_tx.push_nonces(verifier_0_context);
+    let secret_nonces_1 = assert_initial_tx.push_nonces(verifier_1_context);
+
+    assert_initial_tx.pre_sign(verifier_0_context, connector_b, &secret_nonces_0);
+    assert_initial_tx.pre_sign(verifier_1_context, connector_b, &secret_nonces_1);
+
+    let tx = assert_initial_tx.finalize();
+    let tx_id = tx.compute_txid();
+    println!("Txid: {:?}", tx_id);
+    wait_for_timelock_expiry(network, Some("kick off 2 connector b")).await;
+    let result = esplora.broadcast(&tx).await;
+    println!("Assert initial tx result: {:?}\n", result);
+    assert!(result.is_ok());
+
+    (tx, tx_id)
+}
diff --git a/bridge/tests/bridge/assert/mod.rs b/bridge/tests/bridge/assert/mod.rs
new file mode 100644
index 000000000..9f8f3f7f7
--- /dev/null
+++ b/bridge/tests/bridge/assert/mod.rs
@@ -0,0 +1,5 @@
+pub mod assert;
+pub mod assert_commits;
+pub mod assert_final;
+pub mod assert_initial;
+pub mod helper;
diff --git a/tests/bridge/base/merge.rs b/bridge/tests/bridge/base/merge.rs
similarity index 74%
rename from tests/bridge/base/merge.rs
rename to bridge/tests/bridge/base/merge.rs
index 686a78bcb..4adc75701 100644
--- a/tests/bridge/base/merge.rs
+++ b/bridge/tests/bridge/base/merge.rs
@@ -1,26 +1,24 @@
 use std::str::FromStr;
 
 use bitcoin::{Amount, OutPoint, ScriptBuf, Sequence, TxIn, TxOut, Txid};
-use bitvm::bridge::{
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
+use bridge::{
     scripts::{generate_pay_to_pubkey_script, generate_pay_to_pubkey_script_address},
     transactions::{
-        base::{Input, InputWithScript},
+        base::{Input, InputWithScript, MIN_RELAY_FEE_CHALLENGE},
         challenge::ChallengeTransaction,
         pre_signed::PreSignedTransaction,
     },
 };
 
-use crate::bridge::setup::setup_test;
+use crate::bridge::setup::{setup_test, INITIAL_AMOUNT};
 
 #[tokio::test]
 // TODO: test merging signatures after Musig2 feature is ready
 async fn test_merge_add_new_input_and_output() {
     // Arrange
-    let (_, _, depositor_context, operator_context, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =
-        setup_test().await;
+    let config = setup_test().await;
 
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT + 1);
+    let amount = Amount::from_sat(INITIAL_AMOUNT + MIN_RELAY_FEE_CHALLENGE);
 
     let outpoint = OutPoint {
         txid: Txid::from_str("0e6719ac074b0e3cac76d057643506faa1c266b322aa9cf4c6f635fe63b14327")
@@ -28,29 +26,27 @@ async fn test_merge_add_new_input_and_output() {
         vout: 0,
     };
     let mut destination_challenge_tx = ChallengeTransaction::new(
-        &operator_context,
-        Input {
-            outpoint: outpoint,
-            amount: amount,
-        },
+        &config.operator_context,
+        &config.connector_a,
+        Input { outpoint, amount },
         amount,
     );
 
     let mut source_challenge_tx = destination_challenge_tx.clone();
     let refund_script = generate_pay_to_pubkey_script_address(
-        depositor_context.network,
-        &depositor_context.depositor_public_key,
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
     )
     .script_pubkey();
-    let input_script = generate_pay_to_pubkey_script(&depositor_context.depositor_public_key);
+    let input_script =
+        generate_pay_to_pubkey_script(&config.depositor_context.depositor_public_key);
     source_challenge_tx.add_inputs_and_output(
-        &operator_context,
         &vec![InputWithScript {
             outpoint,
             amount: amount * 2,
             script: &input_script,
         }],
-        &depositor_context.depositor_keypair,
+        &config.depositor_context.depositor_keypair,
         refund_script.clone(),
     );
 
diff --git a/tests/bridge/base/mod.rs b/bridge/tests/bridge/base/mod.rs
similarity index 100%
rename from tests/bridge/base/mod.rs
rename to bridge/tests/bridge/base/mod.rs
diff --git a/bridge/tests/bridge/challenge/challenge.rs b/bridge/tests/bridge/challenge/challenge.rs
new file mode 100644
index 000000000..cdcfa7c41
--- /dev/null
+++ b/bridge/tests/bridge/challenge/challenge.rs
@@ -0,0 +1,111 @@
+use bitcoin::{Address, Amount};
+
+use bridge::{
+    connectors::base::TaprootConnector,
+    graphs::base::DUST_AMOUNT,
+    scripts::{generate_pay_to_pubkey_script, generate_pay_to_pubkey_script_address},
+    transactions::{
+        base::{BaseTransaction, Input, InputWithScript, MIN_RELAY_FEE_CHALLENGE},
+        challenge::ChallengeTransaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, generate_stub_outpoint, generate_stub_outpoints},
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_challenge_tx() {
+    let config = setup_test().await;
+
+    // We re-use the depositor private key to imitate a third-party
+    let crowdfunding_keypair = &config.depositor_context.depositor_keypair;
+    let crowdfunding_public_key = &config.depositor_context.depositor_public_key;
+
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+
+    let amount_0 = Amount::from_sat(DUST_AMOUNT + MIN_RELAY_FEE_CHALLENGE);
+    let connector_a_address = config.connector_a.generate_taproot_address();
+    funding_inputs.push((&connector_a_address, amount_0));
+
+    // Create two inputs that exceed the crowdfunding total
+    let input_amount_crowdfunding_total = Amount::from_sat(INITIAL_AMOUNT);
+    let two_thirds_of_initial_amount = INITIAL_AMOUNT * 2 / 3;
+    let amount_1 = Amount::from_sat(two_thirds_of_initial_amount);
+    let crowdfunding_address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        crowdfunding_public_key,
+    );
+    funding_inputs.push((&crowdfunding_address, amount_1));
+    funding_inputs.push((&crowdfunding_address, amount_1));
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    let outpoint_0 = generate_stub_outpoint(&config.client_0, &connector_a_address, amount_0).await;
+
+    let crowdfunding_outpoints =
+        generate_stub_outpoints(&config.client_0, &crowdfunding_address, amount_1).await;
+
+    let refund_address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        crowdfunding_public_key,
+    );
+
+    let mut challenge_tx = ChallengeTransaction::new(
+        &config.operator_context,
+        &config.connector_a,
+        Input {
+            outpoint: outpoint_0,
+            amount: amount_0,
+        },
+        input_amount_crowdfunding_total,
+    );
+
+    challenge_tx.add_inputs_and_output(
+        &vec![
+            InputWithScript {
+                outpoint: crowdfunding_outpoints[0],
+                amount: amount_1,
+                script: &generate_pay_to_pubkey_script(crowdfunding_public_key),
+            },
+            InputWithScript {
+                outpoint: crowdfunding_outpoints[1],
+                amount: amount_1,
+                script: &generate_pay_to_pubkey_script(crowdfunding_public_key),
+            },
+        ],
+        crowdfunding_keypair,
+        refund_address.script_pubkey(),
+    );
+
+    let tx = challenge_tx.finalize();
+    check_tx_output_sum(two_thirds_of_initial_amount * 2 + DUST_AMOUNT, &tx);
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Challenge tx result: {:?}\n", result);
+    assert!(result.is_ok());
+
+    // assert refund balance
+    let challenge_txid = tx.compute_txid();
+    let refund_utxos = config
+        .client_0
+        .esplora
+        .get_address_utxo(refund_address)
+        .await
+        .unwrap();
+    let refund_utxo = refund_utxos
+        .clone()
+        .into_iter()
+        .find(|x| x.txid == challenge_txid);
+    assert!(refund_utxo.is_some());
+    assert_eq!(
+        refund_utxo.unwrap().value,
+        amount_1 * 2 - input_amount_crowdfunding_total
+    );
+}
diff --git a/tests/bridge/challenge/mod.rs b/bridge/tests/bridge/challenge/mod.rs
similarity index 100%
rename from tests/bridge/challenge/mod.rs
rename to bridge/tests/bridge/challenge/mod.rs
diff --git a/bridge/tests/bridge/client/fee.rs b/bridge/tests/bridge/client/fee.rs
new file mode 100644
index 000000000..ab1584408
--- /dev/null
+++ b/bridge/tests/bridge/client/fee.rs
@@ -0,0 +1,549 @@
+use bitcoin::{Address, Amount, OutPoint};
+use bridge::{
+    client::{
+        chain::{
+            chain::{Chain, PegOutEvent},
+            mock_adaptor::{MockAdaptor, MockAdaptorConfig},
+        },
+        client::BitVMClient,
+    },
+    commitments::CommitmentMessageId,
+    graphs::{
+        base::{max, BaseGraph, DUST_AMOUNT, MIN_RELAY_FEE_ASSERT_SET, PEG_IN_FEE, PEG_OUT_FEE},
+        peg_in::PegInGraph,
+        peg_out::PegOutGraph,
+    },
+    scripts::{
+        generate_p2pkh_address, generate_pay_to_pubkey_script,
+        generate_pay_to_pubkey_script_address,
+    },
+    transactions::{
+        base::{
+            Input, InputWithScript, MIN_RELAY_FEE_ASSERT_INITIAL, MIN_RELAY_FEE_CHALLENGE,
+            MIN_RELAY_FEE_DISPROVE, MIN_RELAY_FEE_DISPROVE_CHAIN, MIN_RELAY_FEE_KICK_OFF_1,
+            MIN_RELAY_FEE_KICK_OFF_2, MIN_RELAY_FEE_KICK_OFF_TIMEOUT, MIN_RELAY_FEE_PEG_IN_CONFIRM,
+            MIN_RELAY_FEE_PEG_IN_REFUND, MIN_RELAY_FEE_PEG_OUT, MIN_RELAY_FEE_PEG_OUT_CONFIRM,
+            MIN_RELAY_FEE_START_TIME, MIN_RELAY_FEE_START_TIME_TIMEOUT, MIN_RELAY_FEE_TAKE_1,
+            MIN_RELAY_FEE_TAKE_2,
+        },
+        pre_signed::PreSignedTransaction,
+    },
+};
+use num_traits::ToPrimitive;
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{
+        check_tx_output_sum, find_peg_in_graph_by_peg_out, generate_stub_outpoint,
+        get_reward_amount, wait_for_confirmation, wait_for_timelock_expiry,
+    },
+    setup::{setup_test, INITIAL_AMOUNT, ONE_HUNDRED},
+};
+
+#[tokio::test]
+async fn test_peg_in_fees() {
+    let mut config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let amount = Amount::from_sat(INITIAL_AMOUNT + PEG_IN_FEE);
+    let address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
+    );
+    faucet.fund_input(&address, amount).await.wait().await;
+    let peg_in_outpoint = generate_stub_outpoint(&config.client_0, &address, amount).await;
+
+    let peg_in_input = Input {
+        outpoint: peg_in_outpoint,
+        amount,
+    };
+    let peg_in_graph_id = config
+        .client_0
+        .create_peg_in_graph(peg_in_input, &config.depositor_evm_address)
+        .await;
+
+    let esplora_client = config.client_0.esplora.clone();
+
+    let peg_in_graph = get_peg_in_graph_mut(&mut config.client_0, peg_in_graph_id.clone());
+    let peg_in_deposit_tx = peg_in_graph.deposit(&esplora_client).await.unwrap();
+    check_tx_output_sum(
+        INITIAL_AMOUNT + max(MIN_RELAY_FEE_PEG_IN_CONFIRM, MIN_RELAY_FEE_PEG_IN_REFUND),
+        &peg_in_deposit_tx,
+    );
+    let deposit_result = esplora_client.broadcast(&peg_in_deposit_tx).await;
+    println!("Deposit result: {deposit_result:?}");
+    assert!(deposit_result.is_ok());
+    config
+        .client_0
+        .process_peg_in_as_verifier(&peg_in_graph_id)
+        .await;
+    config.client_0.flush().await;
+
+    config.client_1.sync().await;
+    config
+        .client_1
+        .process_peg_in_as_verifier(&peg_in_graph_id)
+        .await;
+
+    let peg_in_graph = get_peg_in_graph_mut(&mut config.client_0, peg_in_graph_id.clone());
+    wait_for_timelock_expiry(config.network, Some("peg-in deposit connector z")).await;
+    let peg_in_confirm_tx = peg_in_graph.confirm(&esplora_client).await.unwrap();
+    check_tx_output_sum(
+        INITIAL_AMOUNT + max(MIN_RELAY_FEE_PEG_IN_CONFIRM, MIN_RELAY_FEE_PEG_IN_REFUND)
+            - MIN_RELAY_FEE_PEG_IN_CONFIRM,
+        &peg_in_confirm_tx,
+    );
+
+    let peg_in_refund_tx = peg_in_graph.refund(&esplora_client).await.unwrap();
+    check_tx_output_sum(
+        INITIAL_AMOUNT + max(MIN_RELAY_FEE_PEG_IN_CONFIRM, MIN_RELAY_FEE_PEG_IN_REFUND)
+            - MIN_RELAY_FEE_PEG_IN_REFUND,
+        &peg_in_refund_tx,
+    );
+}
+
+#[tokio::test]
+async fn test_peg_out_fees() {
+    let mut config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let peg_in_amount = Amount::from_sat(INITIAL_AMOUNT + PEG_IN_FEE);
+    let peg_in_funding_address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
+    );
+
+    let peg_out_amount = Amount::from_sat(ONE_HUNDRED + MIN_RELAY_FEE_PEG_OUT);
+    let reward_amount = get_reward_amount(ONE_HUNDRED);
+    let peg_out_confirm_input_amount = Amount::from_sat(reward_amount + PEG_OUT_FEE);
+    let peg_out_funding_address = generate_pay_to_pubkey_script_address(
+        config.operator_context.network,
+        &config.operator_context.operator_public_key,
+    );
+
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+    funding_inputs.push((&peg_in_funding_address, peg_in_amount));
+    funding_inputs.push((&peg_out_funding_address, peg_out_amount));
+    funding_inputs.push((&peg_out_funding_address, peg_out_confirm_input_amount));
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    let peg_in_outpoint =
+        generate_stub_outpoint(&config.client_0, &peg_in_funding_address, peg_in_amount).await;
+    let peg_out_outpoint =
+        generate_stub_outpoint(&config.client_0, &peg_out_funding_address, peg_out_amount).await;
+    let peg_out_confirm_outpoint = generate_stub_outpoint(
+        &config.client_0,
+        &peg_out_funding_address,
+        peg_out_confirm_input_amount,
+    )
+    .await;
+
+    let peg_in_graph_id = config
+        .client_0
+        .create_peg_in_graph(
+            Input {
+                outpoint: peg_in_outpoint,
+                amount: peg_in_amount,
+            },
+            &config.depositor_evm_address,
+        )
+        .await;
+    let peg_out_graph_id = config.client_0.create_peg_out_graph(
+        &peg_in_graph_id,
+        Input {
+            outpoint: peg_out_confirm_outpoint,
+            amount: peg_out_confirm_input_amount,
+        },
+        config.commitment_secrets.clone(),
+    );
+
+    let esplora_client = config.client_0.esplora.clone();
+    config
+        .client_0
+        .broadcast_peg_in_deposit(&peg_in_graph_id)
+        .await
+        .expect("Failed to broadcast peg-in deposit");
+    wait_for_timelock_expiry(config.network, Some("peg-in deposit connector z")).await;
+
+    println!(
+        "musig2 signing for peg-in: {} and its related peg-out: {}",
+        peg_in_graph_id, peg_out_graph_id
+    );
+    config
+        .client_0
+        .process_peg_in_as_verifier(&peg_in_graph_id) // verifier 0 push nonces
+        .await;
+    config.client_0.flush().await;
+
+    config.client_1.sync().await;
+    config
+        .client_1
+        .process_peg_in_as_verifier(&peg_in_graph_id) // verifier 1 push nonces
+        .await;
+    config.client_1.flush().await;
+
+    config.client_0.sync().await;
+    config
+        .client_0
+        .process_peg_in_as_verifier(&peg_in_graph_id) // verifier 0 push signature
+        .await;
+    config.client_0.flush().await;
+
+    config.client_1.sync().await;
+    config
+        .client_1
+        .process_peg_in_as_verifier(&peg_in_graph_id) // verifier 1 push signature
+        .await;
+    config.client_1.flush().await;
+
+    config.client_0.sync().await;
+    config
+        .client_0
+        .process_peg_in_as_verifier(&peg_in_graph_id) // broadcast peg-in confirm
+        .await;
+
+    let peg_in_graph = find_peg_in_graph_by_peg_out(&config.client_0, &peg_out_graph_id).unwrap();
+    let peg_in_confirm_tx = peg_in_graph.peg_in_confirm_transaction_ref().tx();
+    let peg_in_confirm_vout: usize = 0;
+    let peg_in_confirm_amount = peg_in_confirm_tx.output[peg_in_confirm_vout].value;
+
+    let mock_adaptor_config = MockAdaptorConfig {
+        peg_out_init_events: Some(vec![PegOutEvent {
+            source_outpoint: OutPoint {
+                txid: peg_in_graph.peg_in_confirm_transaction.tx().compute_txid(),
+                vout: peg_in_confirm_vout.to_u32().unwrap(),
+            },
+            amount: peg_in_confirm_amount,
+            timestamp: 1722328130u32,
+            withdrawer_chain_address: config.withdrawer_evm_address,
+            withdrawer_destination_address: generate_p2pkh_address(
+                config.withdrawer_context.network,
+                &config.withdrawer_context.withdrawer_public_key,
+            )
+            .to_string(),
+            withdrawer_public_key_hash: config
+                .withdrawer_context
+                .withdrawer_public_key
+                .pubkey_hash(),
+            operator_public_key: config.operator_context.operator_public_key,
+            tx_hash: [0u8; 32].into(), // 32 bytes 0
+        }]),
+        peg_out_burnt_events: None,
+        peg_out_minted_events: None,
+    };
+    let adaptor = MockAdaptor::new(Some(mock_adaptor_config));
+    let chain_service = Chain::new(Box::new(adaptor));
+
+    config.client_0.set_chain_service(chain_service);
+    config.client_0.sync_l2().await;
+
+    let peg_out_graph = get_peg_out_graph_mut(&mut config.client_0, peg_out_graph_id.clone());
+    let peg_out_tx = peg_out_graph
+        .peg_out(
+            &esplora_client,
+            &config.operator_context,
+            Input {
+                outpoint: peg_out_outpoint,
+                amount: peg_out_amount,
+            },
+        )
+        .await
+        .unwrap();
+    check_tx_output_sum(ONE_HUNDRED, &peg_out_tx);
+    let peg_out_result = esplora_client.broadcast(&peg_out_tx).await;
+    wait_for_confirmation(config.network).await;
+    println!("peg out tx result: {:?}\n", peg_out_result);
+    assert!(peg_out_result.is_ok());
+
+    let peg_out_confirm_tx = peg_out_graph
+        .peg_out_confirm(&esplora_client)
+        .await
+        .unwrap();
+    check_tx_output_sum(
+        reward_amount + PEG_OUT_FEE - MIN_RELAY_FEE_PEG_OUT_CONFIRM,
+        &peg_out_confirm_tx,
+    );
+    let peg_out_confirm_result = esplora_client.broadcast(&peg_out_confirm_tx).await;
+    wait_for_confirmation(config.network).await;
+    println!("peg out confirm tx result: {:?}\n", peg_out_confirm_result);
+    assert!(peg_out_confirm_result.is_ok());
+
+    let private_data = config.client_0.private_data();
+    let secrets_map = private_data.commitment_secrets[&config.operator_context.operator_public_key]
+        [&peg_out_graph_id]
+        .clone();
+    let peg_out_graph = get_peg_out_graph_mut(&mut config.client_0, peg_out_graph_id.clone());
+    let kick_off_1_tx = peg_out_graph
+        .kick_off_1(
+            &esplora_client,
+            &config.operator_context,
+            &secrets_map[&CommitmentMessageId::PegOutTxIdSourceNetwork],
+            &secrets_map[&CommitmentMessageId::PegOutTxIdDestinationNetwork],
+        )
+        .await
+        .unwrap();
+    check_tx_output_sum(
+        reward_amount + PEG_OUT_FEE - MIN_RELAY_FEE_PEG_OUT_CONFIRM - MIN_RELAY_FEE_KICK_OFF_1,
+        &kick_off_1_tx,
+    );
+    let kick_off_1_result = esplora_client.broadcast(&kick_off_1_tx).await;
+    wait_for_confirmation(config.network).await;
+    println!(
+        "kick off 1 tx result: {:?}, {:?}\n",
+        kick_off_1_result,
+        kick_off_1_tx.compute_txid()
+    );
+    assert!(kick_off_1_result.is_ok());
+
+    let start_time_tx = peg_out_graph
+        .start_time(
+            &esplora_client,
+            &config.operator_context,
+            &secrets_map[&CommitmentMessageId::StartTime],
+        )
+        .await
+        .unwrap();
+    check_tx_output_sum(DUST_AMOUNT, &start_time_tx);
+
+    wait_for_timelock_expiry(config.network, Some("kick off 1 connector 1")).await;
+    let start_time_timeout_tx = peg_out_graph
+        .start_time_timeout(
+            &esplora_client,
+            generate_pay_to_pubkey_script(&config.depositor_context.depositor_public_key),
+        )
+        .await
+        .unwrap();
+    check_tx_output_sum(
+        reward_amount + PEG_OUT_FEE
+            - MIN_RELAY_FEE_PEG_OUT_CONFIRM
+            - MIN_RELAY_FEE_KICK_OFF_1
+            - MIN_RELAY_FEE_START_TIME_TIMEOUT
+            - DUST_AMOUNT,
+        &start_time_timeout_tx,
+    );
+
+    println!("Funding crowdfunding input ...");
+    let challenge_input_amount = Amount::from_sat(peg_out_graph.min_crowdfunding_amount() + 1);
+    let challenge_funding_utxo_address = generate_pay_to_pubkey_script_address(
+        config.network,
+        &config.depositor_context.depositor_public_key,
+    );
+    faucet
+        .fund_input(&challenge_funding_utxo_address, challenge_input_amount)
+        .await
+        .wait()
+        .await;
+
+    let challenge_funding_outpoint = generate_stub_outpoint(
+        &config.client_0,
+        &challenge_funding_utxo_address,
+        challenge_input_amount,
+    )
+    .await;
+    let depositor_pubkey_script =
+        generate_pay_to_pubkey_script(&config.depositor_context.depositor_public_key);
+    let challenge_crowdfunding_inputs = vec![InputWithScript {
+        outpoint: challenge_funding_outpoint,
+        amount: challenge_input_amount,
+        script: &depositor_pubkey_script,
+    }];
+
+    let peg_out_graph = get_peg_out_graph_mut(&mut config.client_0, peg_out_graph_id.clone());
+    let challenge_tx = peg_out_graph
+        .challenge(
+            &esplora_client,
+            &challenge_crowdfunding_inputs,
+            &config.depositor_context.depositor_keypair,
+            depositor_pubkey_script.clone(),
+        )
+        .await
+        .unwrap();
+    // crowdfunding discrepency less than dust will be lost as relay fee
+    check_tx_output_sum(
+        challenge_input_amount.to_sat() - 1 + DUST_AMOUNT - MIN_RELAY_FEE_CHALLENGE,
+        &challenge_tx,
+    );
+
+    let reward_address = generate_pay_to_pubkey_script_address(
+        config.withdrawer_context.network,
+        &config.withdrawer_context.withdrawer_public_key,
+    );
+    let kick_off_timeout_tx = peg_out_graph
+        .kick_off_timeout(&esplora_client, reward_address.script_pubkey())
+        .await
+        .unwrap();
+    check_tx_output_sum(
+        reward_amount + PEG_OUT_FEE
+            - MIN_RELAY_FEE_PEG_OUT_CONFIRM
+            - MIN_RELAY_FEE_KICK_OFF_1
+            - MIN_RELAY_FEE_KICK_OFF_TIMEOUT
+            - DUST_AMOUNT * 2
+            - MIN_RELAY_FEE_START_TIME,
+        &kick_off_timeout_tx,
+    );
+
+    let kick_off_2_tx = peg_out_graph
+        .kick_off_2(
+            &esplora_client,
+            &config.operator_context,
+            &config.commitment_secrets[&CommitmentMessageId::Superblock],
+            &config.commitment_secrets[&CommitmentMessageId::SuperblockHash],
+        )
+        .await
+        .unwrap();
+    check_tx_output_sum(
+        reward_amount + PEG_OUT_FEE
+            - MIN_RELAY_FEE_PEG_OUT_CONFIRM
+            - MIN_RELAY_FEE_KICK_OFF_1
+            - MIN_RELAY_FEE_KICK_OFF_2
+            - DUST_AMOUNT * 2
+            - MIN_RELAY_FEE_START_TIME,
+        &kick_off_2_tx,
+    );
+    let kick_off_2_result = esplora_client.broadcast(&kick_off_2_tx).await;
+    println!(
+        "kick off 2 tx result: {:?}, {:?}\n",
+        kick_off_2_result,
+        kick_off_2_tx.compute_txid()
+    );
+    wait_for_confirmation(config.network).await;
+    wait_for_timelock_expiry(config.network, Some("kick off 2 connector 3")).await;
+
+    let take_1_tx = peg_out_graph.take_1(&esplora_client).await.unwrap();
+    // minus 1 dust from kick off 1 connector 2
+    check_tx_output_sum(
+        INITIAL_AMOUNT + reward_amount + MIN_RELAY_FEE_ASSERT_SET - MIN_RELAY_FEE_TAKE_1
+            + MIN_RELAY_FEE_DISPROVE
+            - DUST_AMOUNT,
+        &take_1_tx,
+    );
+
+    let verifier_pubkey_script =
+        generate_pay_to_pubkey_script(&config.verifier_0_context.verifier_public_key);
+    let disprove_chain_tx = peg_out_graph
+        .disprove_chain(&esplora_client, verifier_pubkey_script.clone())
+        .await
+        .unwrap();
+    // minus 2 dust from kick off 1, 1 dust from kick off 2
+    check_tx_output_sum(
+        reward_amount + MIN_RELAY_FEE_ASSERT_SET - MIN_RELAY_FEE_DISPROVE_CHAIN
+            + MIN_RELAY_FEE_DISPROVE
+            - DUST_AMOUNT * 3,
+        &disprove_chain_tx,
+    );
+
+    let assert_initial_tx = peg_out_graph.assert_initial(&esplora_client).await.unwrap();
+    // minus 2 dust from kick off 1, 1 dust from kick off 2
+    check_tx_output_sum(
+        reward_amount + MIN_RELAY_FEE_ASSERT_SET - MIN_RELAY_FEE_ASSERT_INITIAL
+            + MIN_RELAY_FEE_DISPROVE
+            - DUST_AMOUNT * 3,
+        &assert_initial_tx,
+    );
+    let assert_initial_result = esplora_client.broadcast(&assert_initial_tx).await;
+    println!(
+        "assert initial tx result: {:?}, {:?}\n",
+        assert_initial_result,
+        assert_initial_tx.compute_txid()
+    );
+    wait_for_confirmation(config.network).await;
+
+    let assert_commit1_tx = peg_out_graph
+        .assert_commit_1(
+            &esplora_client,
+            &config.commitment_secrets,
+            &config.invalid_proof,
+        )
+        .await
+        .unwrap();
+    // checked in assert_commit_1 single tx test
+    // check_tx_output_sum(assert_commit1_dust_amount, &assert_commit1_tx);
+    let assert_commit1_result = esplora_client.broadcast(&assert_commit1_tx).await;
+    println!(
+        "assert commit 1 tx result: {:?}, {:?}\n",
+        assert_commit1_result,
+        assert_commit1_tx.compute_txid()
+    );
+    wait_for_confirmation(config.network).await;
+
+    let assert_commit2_tx = peg_out_graph
+        .assert_commit_2(
+            &esplora_client,
+            &config.commitment_secrets,
+            &config.invalid_proof,
+        )
+        .await
+        .unwrap();
+    // checked in assert_commit_2 single tx test
+    // check_tx_output_sum(assert_commit2_dust_amount, &assert_commit2_tx);
+    let assert_commit2_result = esplora_client.broadcast(&assert_commit2_tx).await;
+    println!(
+        "assert commit 2 tx result: {:?}, {:?}\n",
+        assert_commit2_result,
+        assert_commit2_tx.compute_txid()
+    );
+    wait_for_confirmation(config.network).await;
+
+    let assert_final_tx = peg_out_graph.assert_final(&esplora_client).await.unwrap();
+    // minus 2 dust from kick off 1, 1 dust from kick off 2
+    check_tx_output_sum(
+        reward_amount + MIN_RELAY_FEE_DISPROVE - DUST_AMOUNT * 3,
+        &assert_final_tx,
+    );
+    let assert_final_result = esplora_client.broadcast(&assert_final_tx).await;
+    println!(
+        "assert final tx result: {:?}, {:?}\n",
+        assert_final_result,
+        assert_final_tx.compute_txid()
+    );
+    wait_for_confirmation(config.network).await;
+    wait_for_timelock_expiry(config.network, Some("assert final connector 4")).await;
+
+    let take_2_tx = peg_out_graph
+        .take_2(&esplora_client, &config.operator_context)
+        .await
+        .unwrap();
+    // minus 2 dust from kick off 1, 1 dust from kick off 2
+    check_tx_output_sum(
+        INITIAL_AMOUNT + reward_amount + MIN_RELAY_FEE_DISPROVE
+            - MIN_RELAY_FEE_TAKE_2
+            - DUST_AMOUNT * 3,
+        &take_2_tx,
+    );
+
+    let zk_verifying_key = config.invalid_proof.vk;
+    let disprove_tx = peg_out_graph
+        .disprove(
+            &esplora_client,
+            verifier_pubkey_script.clone(),
+            &zk_verifying_key,
+        )
+        .await
+        .unwrap();
+    // minus 2 dust from kick off 1, 1 dust from kick off 2, 1 dust from assert final
+    check_tx_output_sum(reward_amount - DUST_AMOUNT * 4, &disprove_tx);
+}
+
+// TODO: consider making the graph getter in client public after refactor
+fn get_peg_in_graph_mut(client: &mut BitVMClient, id: String) -> &mut PegInGraph {
+    client
+        .data_mut()
+        .peg_in_graphs
+        .iter_mut()
+        .find(|graph| graph.id().eq(&id))
+        .unwrap()
+}
+
+// TODO: consider making the graph getter in client public after refactor
+fn get_peg_out_graph_mut(client: &mut BitVMClient, id: String) -> &mut PegOutGraph {
+    client
+        .data_mut()
+        .peg_out_graphs
+        .iter_mut()
+        .find(|graph| graph.id().eq(&id))
+        .unwrap()
+}
diff --git a/tests/bridge/client/merge.rs b/bridge/tests/bridge/client/merge.rs
similarity index 65%
rename from tests/bridge/client/merge.rs
rename to bridge/tests/bridge/client/merge.rs
index f5b786364..fe0c50255 100644
--- a/tests/bridge/client/merge.rs
+++ b/bridge/tests/bridge/client/merge.rs
@@ -1,24 +1,20 @@
 use std::str::FromStr;
 
 use bitcoin::{Amount, OutPoint, Txid};
-use bitvm::bridge::{
+use bridge::{
     client::client::{BitVMClient, BitVMClientPublicData},
-    graphs::{
-        base::{FEE_AMOUNT, INITIAL_AMOUNT},
-        peg_in::PegInGraph,
-        peg_out::PegOutGraph,
-    },
+    graphs::{base::PEG_OUT_FEE, peg_in::PegInGraph, peg_out::PegOutGraph},
     transactions::base::Input,
 };
 
-use crate::bridge::setup::setup_test;
+use crate::bridge::setup::{setup_test, INITIAL_AMOUNT};
 
 #[tokio::test]
 // TODO: test merging signatures after Musig2 feature is ready
 async fn test_merge_add_new_graph() {
     let (mut client, new_peg_in_graph, new_peg_out_graph) = setup_and_create_graphs().await;
 
-    let data = client.get_data();
+    let data = client.data();
     let new_data = BitVMClientPublicData {
         version: data.version + 1,
         peg_in_graphs: vec![new_peg_in_graph.clone()],
@@ -30,7 +26,7 @@ async fn test_merge_add_new_graph() {
 
     client.merge_data(new_data);
 
-    let merged_data = client.get_data();
+    let merged_data = client.data();
 
     let merged_data_peg_in_graph = merged_data
         .peg_in_graphs
@@ -48,29 +44,9 @@ async fn test_merge_add_new_graph() {
 }
 
 async fn setup_and_create_graphs() -> (BitVMClient, PegInGraph, PegOutGraph) {
-    let (
-        mut client,
-        _,
-        depositor_context,
-        operator_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT + 1);
+    let mut config = setup_test().await;
+
+    let amount = Amount::from_sat(INITIAL_AMOUNT + PEG_OUT_FEE);
     let peg_in_outpoint = OutPoint {
         txid: Txid::from_str("0e6719ac074b0e3cac76d057643506faa1c266b322aa9cf4c6f635fe63b14327")
             .unwrap(),
@@ -86,37 +62,38 @@ async fn setup_and_create_graphs() -> (BitVMClient, PegInGraph, PegOutGraph) {
         outpoint: peg_in_outpoint,
         amount,
     };
-    let peg_in_graph_id = client
-        .create_peg_in_graph(input, &depositor_evm_address)
+    let peg_in_graph_id = config
+        .client_0
+        .create_peg_in_graph(input, &config.depositor_evm_address)
         .await;
 
-    client
-        .create_peg_out_graph(
-            &peg_in_graph_id,
-            Input {
-                outpoint: peg_out_outpoint,
-                amount,
-            },
-        )
-        .await;
+    config.client_0.create_peg_out_graph(
+        &peg_in_graph_id,
+        Input {
+            outpoint: peg_out_outpoint,
+            amount,
+        },
+        config.commitment_secrets.clone(),
+    );
 
     let new_peg_in_graph = PegInGraph::new(
-        &depositor_context,
+        &config.depositor_context,
         Input {
             outpoint: peg_in_outpoint,
             amount: Amount::from_sat(INITIAL_AMOUNT),
         },
-        &depositor_evm_address,
+        &config.depositor_evm_address,
     );
 
     let new_peg_out_graph = PegOutGraph::new(
-        &operator_context,
+        &config.operator_context,
         &new_peg_in_graph,
         Input {
             outpoint: peg_out_outpoint,
             amount,
         },
+        &config.commitment_secrets,
     );
 
-    return (client, new_peg_in_graph, new_peg_out_graph);
+    (config.client_0, new_peg_in_graph, new_peg_out_graph)
 }
diff --git a/tests/bridge/client/mod.rs b/bridge/tests/bridge/client/mod.rs
similarity index 89%
rename from tests/bridge/client/mod.rs
rename to bridge/tests/bridge/client/mod.rs
index 5db99a0ed..7a75d4553 100644
--- a/tests/bridge/client/mod.rs
+++ b/bridge/tests/bridge/client/mod.rs
@@ -1,3 +1,4 @@
+pub mod fee;
 pub mod merge;
 pub mod musig2_keys;
 pub mod musig2_peg_in;
diff --git a/tests/bridge/client/musig2_keys.rs b/bridge/tests/bridge/client/musig2_keys.rs
similarity index 100%
rename from tests/bridge/client/musig2_keys.rs
rename to bridge/tests/bridge/client/musig2_keys.rs
diff --git a/tests/bridge/client/musig2_peg_in.rs b/bridge/tests/bridge/client/musig2_peg_in.rs
similarity index 60%
rename from tests/bridge/client/musig2_peg_in.rs
rename to bridge/tests/bridge/client/musig2_peg_in.rs
index 1c1fba122..6b4806ad5 100644
--- a/tests/bridge/client/musig2_peg_in.rs
+++ b/bridge/tests/bridge/client/musig2_peg_in.rs
@@ -1,62 +1,54 @@
-use std::time::Duration;
-
 use bitcoin::Amount;
 
-use bitvm::bridge::{
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
+use bridge::{
+    graphs::base::PEG_IN_FEE, scripts::generate_pay_to_pubkey_script_address,
     transactions::base::Input,
 };
 
-use tokio::time::sleep;
+use serial_test::serial;
 
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{generate_stub_outpoint, wait_for_confirmation_with_message},
+    setup::{setup_test, INITIAL_AMOUNT},
+};
 
 #[tokio::test]
+#[serial]
 async fn test_musig2_peg_in() {
-    let (
-        mut depositor_operator_verifier_0_client,
-        mut verifier_1_client,
-        depositor_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
+    let config = setup_test().await;
+    let mut depositor_operator_verifier_0_client = config.client_0;
+    let mut verifier_1_client = config.client_1;
 
     // Depositor: generate graph
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
+    let amount = Amount::from_sat(INITIAL_AMOUNT + PEG_IN_FEE);
+    let depositor_funding_utxo_address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
+    );
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    faucet
+        .fund_input(&depositor_funding_utxo_address, amount)
+        .await
+        .wait()
+        .await;
     let outpoint = generate_stub_outpoint(
         &depositor_operator_verifier_0_client,
-        &generate_pay_to_pubkey_script_address(
-            depositor_context.network,
-            &depositor_context.depositor_public_key,
-        ),
+        &depositor_funding_utxo_address,
         amount,
     )
     .await;
 
     let graph_id = depositor_operator_verifier_0_client
-        .create_peg_in_graph(Input { outpoint, amount }, &depositor_evm_address)
+        .create_peg_in_graph(Input { outpoint, amount }, &config.depositor_evm_address)
         .await;
     println!("Depositor: Created new graph {graph_id}");
 
     println!("Depositor: Mining peg in deposit...");
     depositor_operator_verifier_0_client
         .broadcast_peg_in_deposit(&graph_id)
-        .await;
+        .await
+        .expect("Failed to broadcast peg-in deposit");
 
     println!("Depositor: Saving state changes to remote...");
     depositor_operator_verifier_0_client.flush().await;
@@ -66,7 +58,7 @@ async fn test_musig2_peg_in() {
     depositor_operator_verifier_0_client.sync().await;
 
     println!("Verifier 0: Generating nonces...");
-    depositor_operator_verifier_0_client.push_peg_in_nonces(&graph_id);
+    depositor_operator_verifier_0_client.push_verifier_nonces(&graph_id);
 
     println!("Verifier 0: Saving state changes to remote...");
     depositor_operator_verifier_0_client.flush().await;
@@ -76,7 +68,7 @@ async fn test_musig2_peg_in() {
     verifier_1_client.sync().await;
 
     println!("Verifier 1: Generating nonces...");
-    verifier_1_client.push_peg_in_nonces(&graph_id);
+    verifier_1_client.push_verifier_nonces(&graph_id);
 
     println!("Verifier 1: Saving state changes to remote...");
     verifier_1_client.flush().await;
@@ -86,7 +78,7 @@ async fn test_musig2_peg_in() {
     depositor_operator_verifier_0_client.sync().await;
 
     println!("Verifier 0: Pre-signing...");
-    depositor_operator_verifier_0_client.pre_sign_peg_in(&graph_id);
+    depositor_operator_verifier_0_client.push_verifier_signature(&graph_id);
 
     println!("Verifier 0: Saving state changes to remote...");
     depositor_operator_verifier_0_client.flush().await;
@@ -96,7 +88,7 @@ async fn test_musig2_peg_in() {
     verifier_1_client.sync().await;
 
     println!("Verifier 1: Pre-signing...");
-    verifier_1_client.pre_sign_peg_in(&graph_id);
+    verifier_1_client.push_verifier_signature(&graph_id);
 
     println!("Verifier 1: Saving state changes to remote...");
     verifier_1_client.flush().await;
@@ -105,15 +97,13 @@ async fn test_musig2_peg_in() {
     println!("Operator: Reading state from remote...");
     depositor_operator_verifier_0_client.sync().await;
 
-    let wait_time = 45;
-    println!("Waiting {wait_time}s for peg-in deposit transaction to be mined...");
-    sleep(Duration::from_secs(wait_time)).await; // TODO: Replace this with a 'wait x amount of time till tx is mined' routine.
-                                                 // See the relevant TODO in PegInGraph::confirm().
+    wait_for_confirmation_with_message(config.network, Some("peg-in deposit tx")).await;
 
     println!("Depositor: Mining peg in confirm...");
     depositor_operator_verifier_0_client
         .broadcast_peg_in_confirm(&graph_id)
-        .await;
+        .await
+        .expect("Failed to broadcast peg-in confirm");
 
     println!("Operator: Saving state changes to remote...");
     depositor_operator_verifier_0_client.flush().await;
diff --git a/bridge/tests/bridge/client/musig2_peg_out.rs b/bridge/tests/bridge/client/musig2_peg_out.rs
new file mode 100644
index 000000000..bb02fee4b
--- /dev/null
+++ b/bridge/tests/bridge/client/musig2_peg_out.rs
@@ -0,0 +1,674 @@
+use bitcoin::{Address, Amount, OutPoint};
+use bitvm::chunk::api::type_conversion_utils::RawProof;
+use bridge::{
+    client::{
+        chain::{
+            chain::{Chain, PegOutEvent},
+            mock_adaptor::{MockAdaptor, MockAdaptorConfig},
+        },
+        client::BitVMClient,
+    },
+    contexts::{
+        depositor::DepositorContext, operator::OperatorContext, withdrawer::WithdrawerContext,
+    },
+    graphs::base::{PEG_IN_FEE, PEG_OUT_FEE},
+    scripts::{
+        generate_p2pkh_address, generate_pay_to_pubkey_script,
+        generate_pay_to_pubkey_script_address,
+    },
+    transactions::{
+        base::{Input, InputWithScript, MIN_RELAY_FEE_DISPROVE},
+        pre_signed::PreSignedTransaction,
+    },
+};
+use num_traits::ToPrimitive;
+use serial_test::serial;
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{
+        find_peg_in_graph_by_peg_out, generate_stub_outpoint, wait_for_confirmation_with_message,
+        wait_for_timelock_expiry,
+    },
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+#[serial]
+async fn test_musig2_peg_out_take_1() {
+    println!("Testing musig2 signing for take 1");
+    let (
+        mut depositor_operator_verifier_0_client,
+        _,
+        peg_out_graph_id,
+        depositor_context,
+        withdrawer_evm_address,
+        withdrawer_context,
+        operator_context,
+        _,
+    ) = create_peg_out_graph().await;
+    simulate_peg_out_from_l2(
+        &mut depositor_operator_verifier_0_client,
+        &peg_out_graph_id,
+        &operator_context,
+        &withdrawer_evm_address,
+        &withdrawer_context,
+    )
+    .await;
+
+    let with_kick_off_2_tx = true;
+    let with_challenge_tx = false;
+    let with_assert_tx = None;
+    broadcast_transactions_from_peg_out_graph(
+        &mut depositor_operator_verifier_0_client,
+        &peg_out_graph_id,
+        &depositor_context,
+        with_kick_off_2_tx,
+        with_challenge_tx,
+        with_assert_tx,
+    )
+    .await;
+
+    depositor_operator_verifier_0_client.sync().await;
+    depositor_operator_verifier_0_client
+        .broadcast_take_1(&peg_out_graph_id)
+        .await
+        .expect("Failed to broadcast take 1");
+}
+
+#[tokio::test]
+#[serial]
+async fn test_musig2_peg_out_take_2() {
+    println!("Testing musig2 signing for take 2");
+    let (
+        mut depositor_operator_verifier_0_client,
+        _,
+        peg_out_graph_id,
+        depositor_context,
+        withdrawer_evm_address,
+        withdrawer_context,
+        operator_context,
+        invalid_proof,
+    ) = create_peg_out_graph().await;
+    simulate_peg_out_from_l2(
+        &mut depositor_operator_verifier_0_client,
+        &peg_out_graph_id,
+        &operator_context,
+        &withdrawer_evm_address,
+        &withdrawer_context,
+    )
+    .await;
+
+    let with_kick_off_2_tx = true;
+    let with_challenge_tx = false;
+    let with_assert_tx = Some(invalid_proof);
+    broadcast_transactions_from_peg_out_graph(
+        &mut depositor_operator_verifier_0_client,
+        &peg_out_graph_id,
+        &depositor_context,
+        with_kick_off_2_tx,
+        with_challenge_tx,
+        with_assert_tx,
+    )
+    .await;
+
+    println!("Broadcasting take 2...");
+    depositor_operator_verifier_0_client.sync().await;
+    depositor_operator_verifier_0_client
+        .broadcast_take_2(&peg_out_graph_id)
+        .await
+        .expect("Failed to broadcast take 2");
+}
+
+#[tokio::test]
+#[serial]
+async fn test_musig2_start_time_timeout() {
+    println!("Testing musig2 signing for start time timeout");
+    let (
+        mut depositor_operator_verifier_0_client,
+        _,
+        peg_out_graph_id,
+        depositor_context,
+        withdrawer_evm_address,
+        withdrawer_context,
+        operator_context,
+        _,
+    ) = create_peg_out_graph().await;
+    simulate_peg_out_from_l2(
+        &mut depositor_operator_verifier_0_client,
+        &peg_out_graph_id,
+        &operator_context,
+        &withdrawer_evm_address,
+        &withdrawer_context,
+    )
+    .await;
+
+    let with_kick_off_2_tx = false;
+    let with_challenge_tx = false;
+    let with_assert_tx = None;
+    broadcast_transactions_from_peg_out_graph(
+        &mut depositor_operator_verifier_0_client,
+        &peg_out_graph_id,
+        &depositor_context,
+        with_kick_off_2_tx,
+        with_challenge_tx,
+        with_assert_tx,
+    )
+    .await;
+
+    depositor_operator_verifier_0_client.sync().await;
+    depositor_operator_verifier_0_client
+        .broadcast_start_time_timeout(
+            &peg_out_graph_id,
+            generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
+        )
+        .await
+        .expect("Failed to broadcast start time timeout");
+}
+
+#[tokio::test]
+#[serial]
+async fn test_musig2_kick_off_timeout() {
+    println!("Testing musig2 signing for kick off timeout");
+    let (
+        mut depositor_operator_verifier_0_client,
+        _,
+        peg_out_graph_id,
+        depositor_context,
+        withdrawer_evm_address,
+        withdrawer_context,
+        operator_context,
+        _,
+    ) = create_peg_out_graph().await;
+    simulate_peg_out_from_l2(
+        &mut depositor_operator_verifier_0_client,
+        &peg_out_graph_id,
+        &operator_context,
+        &withdrawer_evm_address,
+        &withdrawer_context,
+    )
+    .await;
+
+    let with_kick_off_2_tx = false;
+    let with_challenge_tx = false;
+    let with_assert_tx = None;
+    broadcast_transactions_from_peg_out_graph(
+        &mut depositor_operator_verifier_0_client,
+        &peg_out_graph_id,
+        &depositor_context,
+        with_kick_off_2_tx,
+        with_challenge_tx,
+        with_assert_tx,
+    )
+    .await;
+
+    depositor_operator_verifier_0_client.sync().await;
+    depositor_operator_verifier_0_client
+        .broadcast_kick_off_timeout(
+            &peg_out_graph_id,
+            generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
+        )
+        .await
+        .expect("Failed to broadcast kick off timeout");
+}
+
+#[tokio::test]
+#[serial]
+async fn test_musig2_peg_out_disprove_with_challenge() {
+    println!("Testing musig2 signing for disprove with challenge");
+    let (
+        mut depositor_operator_verifier_0_client,
+        _,
+        peg_out_graph_id,
+        depositor_context,
+        withdrawer_evm_address,
+        withdrawer_context,
+        operator_context,
+        invalid_proof,
+    ) = create_peg_out_graph().await;
+    simulate_peg_out_from_l2(
+        &mut depositor_operator_verifier_0_client,
+        &peg_out_graph_id,
+        &operator_context,
+        &withdrawer_evm_address,
+        &withdrawer_context,
+    )
+    .await;
+
+    let with_kick_off_2_tx = true;
+    let with_challenge_tx = true;
+    let with_assert_tx = Some(invalid_proof);
+    broadcast_transactions_from_peg_out_graph(
+        &mut depositor_operator_verifier_0_client,
+        &peg_out_graph_id,
+        &depositor_context,
+        with_kick_off_2_tx,
+        with_challenge_tx,
+        with_assert_tx,
+    )
+    .await;
+
+    depositor_operator_verifier_0_client.sync().await;
+    depositor_operator_verifier_0_client
+        .broadcast_disprove(
+            &peg_out_graph_id,
+            generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
+        )
+        .await
+        .expect("Failed to broadcast disprove");
+}
+
+#[ignore]
+#[tokio::test]
+#[serial]
+async fn test_musig2_peg_out_disprove_chain_with_challenge() {
+    println!("Testing musig2 signing for disprove chain with challenge");
+    let (
+        mut depositor_operator_verifier_0_client,
+        _,
+        peg_out_graph_id,
+        depositor_context,
+        withdrawer_evm_address,
+        withdrawer_context,
+        operator_context,
+        _,
+    ) = create_peg_out_graph().await;
+    simulate_peg_out_from_l2(
+        &mut depositor_operator_verifier_0_client,
+        &peg_out_graph_id,
+        &operator_context,
+        &withdrawer_evm_address,
+        &withdrawer_context,
+    )
+    .await;
+
+    let with_kick_off_2_tx = true;
+    let with_challenge_tx = true;
+    let with_assert_tx = None;
+    broadcast_transactions_from_peg_out_graph(
+        &mut depositor_operator_verifier_0_client,
+        &peg_out_graph_id,
+        &depositor_context,
+        with_kick_off_2_tx,
+        with_challenge_tx,
+        with_assert_tx,
+    )
+    .await;
+
+    depositor_operator_verifier_0_client.sync().await;
+    depositor_operator_verifier_0_client
+        .broadcast_disprove_chain(
+            &peg_out_graph_id,
+            generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
+        )
+        .await
+        .expect("Failed to broadcast disprove chain");
+}
+
+#[tokio::test]
+#[serial]
+async fn test_musig2_peg_out_peg_out() {
+    println!("Testing musig2 signing for peg out");
+    let (
+        mut depositor_operator_verifier_0_client,
+        _,
+        peg_out_graph_id,
+        _,
+        withdrawer_evm_address,
+        withdrawer_context,
+        operator_context,
+        _,
+    ) = create_peg_out_graph().await;
+    simulate_peg_out_from_l2(
+        &mut depositor_operator_verifier_0_client,
+        &peg_out_graph_id,
+        &operator_context,
+        &withdrawer_evm_address,
+        &withdrawer_context,
+    )
+    .await;
+}
+
+async fn broadcast_transactions_from_peg_out_graph(
+    client: &mut BitVMClient,
+    peg_out_graph_id: &String,
+    depositor_context: &DepositorContext,
+    with_kick_off_2_tx: bool,
+    with_challenge_tx: bool,
+    with_assert_proof: Option<RawProof>,
+) {
+    println!("Broadcasting kick-off 1...");
+    client.sync().await;
+    client
+        .broadcast_kick_off_1(peg_out_graph_id)
+        .await
+        .expect("Failed to broadcast kick-off 1");
+
+    wait_for_timelock_expiry(client.source_network, Some("kick-off 1 connector 1")).await;
+
+    if with_kick_off_2_tx {
+        println!("Broadcasting start time...");
+        client
+            .broadcast_start_time(peg_out_graph_id)
+            .await
+            .expect("Failed to broadcast start time");
+
+        wait_for_confirmation_with_message(client.source_network, Some("peg-out start time tx"))
+            .await;
+
+        println!("Broadcasting kick-off 2...");
+        client
+            .broadcast_kick_off_2(peg_out_graph_id)
+            .await
+            .expect("Failed to broadcast kick-off 2");
+
+        wait_for_timelock_expiry(client.source_network, Some("kick-off 2 connector b")).await;
+    }
+
+    if with_challenge_tx {
+        let challenge_input_amount = Amount::from_btc(1.0).unwrap();
+        let challenge_funding_utxo_address = generate_pay_to_pubkey_script_address(
+            depositor_context.network,
+            &depositor_context.depositor_public_key,
+        );
+        let faucet = Faucet::new(FaucetType::EsploraRegtest);
+        faucet
+            .fund_input(&challenge_funding_utxo_address, challenge_input_amount)
+            .await
+            .wait()
+            .await;
+
+        let challenge_funding_outpoint = generate_stub_outpoint(
+            client,
+            &challenge_funding_utxo_address,
+            challenge_input_amount,
+        )
+        .await;
+        let challenge_crowdfunding_input = InputWithScript {
+            outpoint: challenge_funding_outpoint,
+            amount: challenge_input_amount,
+            script: &generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
+        };
+        println!("Broadcasting challenge...");
+        client
+            .broadcast_challenge(
+                peg_out_graph_id,
+                &vec![challenge_crowdfunding_input],
+                generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
+            )
+            .await
+            .expect("Failed to broadcast challenge");
+
+        wait_for_confirmation_with_message(client.source_network, Some("peg-out challenge tx"))
+            .await;
+    }
+
+    if let Some(assert_proof) = with_assert_proof {
+        println!("Broadcasting assert initial...");
+        client
+            .broadcast_assert_initial(&peg_out_graph_id)
+            .await
+            .expect("Failed to broadcast assert initial");
+        wait_for_confirmation_with_message(
+            client.source_network,
+            Some("peg-out assert initial tx"),
+        )
+        .await;
+
+        println!("Broadcasting assert commit 1...");
+        client
+            .broadcast_assert_commit_1(&peg_out_graph_id, &assert_proof)
+            .await
+            .expect("Failed to broadcast assert commit 1");
+        wait_for_confirmation_with_message(
+            client.source_network,
+            Some("peg-out assert commit 1 tx"),
+        )
+        .await;
+
+        println!("Broadcasting assert commit 2...");
+        client
+            .broadcast_assert_commit_2(&peg_out_graph_id, &assert_proof)
+            .await
+            .expect("Failed to broadcast assert commit 2");
+        wait_for_confirmation_with_message(
+            client.source_network,
+            Some("peg-out assert commit 2 tx"),
+        )
+        .await;
+
+        println!("Broadcasting assert final...");
+        client
+            .broadcast_assert_final(&peg_out_graph_id)
+            .await
+            .expect("Failed to broadcast assert final");
+        wait_for_timelock_expiry(client.source_network, Some("assert final connector 4")).await;
+    }
+}
+
+async fn create_peg_out_graph() -> (
+    BitVMClient,
+    BitVMClient,
+    String,
+    DepositorContext,
+    String,
+    WithdrawerContext,
+    OperatorContext,
+    RawProof,
+) {
+    let config = setup_test().await;
+    let mut depositor_operator_verifier_0_client = config.client_0;
+    let mut verifier_1_client = config.client_1;
+
+    // verify funding inputs
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+
+    let deposit_input_amount = Amount::from_sat(INITIAL_AMOUNT + PEG_IN_FEE + MIN_RELAY_FEE_DISPROVE);
+    let deposit_funding_address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
+    );
+    funding_inputs.push((&deposit_funding_address, deposit_input_amount));
+
+    let kick_off_input_amount = Amount::from_sat(INITIAL_AMOUNT + PEG_OUT_FEE + MIN_RELAY_FEE_DISPROVE);
+    let kick_off_funding_utxo_address = generate_pay_to_pubkey_script_address(
+        config.operator_context.network,
+        &config.operator_context.operator_public_key,
+    );
+    funding_inputs.push((&kick_off_funding_utxo_address, kick_off_input_amount));
+
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    faucet
+        .fund_inputs(&depositor_operator_verifier_0_client, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    let kick_off_outpoint = generate_stub_outpoint(
+        &depositor_operator_verifier_0_client,
+        &kick_off_funding_utxo_address,
+        kick_off_input_amount,
+    )
+    .await;
+
+    println!("Creating peg-in graph...");
+    // create and complete peg-in graph
+    let peg_in_graph_id = create_peg_in_graph(
+        &mut depositor_operator_verifier_0_client,
+        deposit_funding_address,
+        deposit_input_amount,
+        &config.depositor_evm_address,
+    )
+    .await;
+
+    println!("Creating peg-out graph...");
+    let peg_out_graph_id = depositor_operator_verifier_0_client.create_peg_out_graph(
+        &peg_in_graph_id,
+        Input {
+            outpoint: kick_off_outpoint,
+            amount: kick_off_input_amount,
+        },
+        config.commitment_secrets,
+    );
+
+    println!("Verifier 0 push peg-out nonces");
+    depositor_operator_verifier_0_client
+        .process_peg_in_as_verifier(&peg_in_graph_id) // verifier 0 push nonces
+        .await;
+    depositor_operator_verifier_0_client.flush().await;
+
+    println!("Verifier 1 push peg-out nonces");
+    verifier_1_client.sync().await;
+    verifier_1_client
+        .process_peg_in_as_verifier(&peg_in_graph_id)
+        .await;
+    verifier_1_client.flush().await;
+
+    println!("Verifier 0 pre-sign peg-out");
+    depositor_operator_verifier_0_client.sync().await;
+    depositor_operator_verifier_0_client
+        .process_peg_in_as_verifier(&peg_in_graph_id)
+        .await;
+    depositor_operator_verifier_0_client.flush().await;
+
+    println!("Verifier 1 pre-sign peg-out");
+    verifier_1_client.sync().await;
+    verifier_1_client
+        .process_peg_in_as_verifier(&peg_in_graph_id)
+        .await;
+    verifier_1_client.flush().await;
+
+    println!("Verifier 0 broadcast peg-in confirm");
+    depositor_operator_verifier_0_client.sync().await;
+    depositor_operator_verifier_0_client
+        .process_peg_in_as_verifier(&peg_in_graph_id)
+        .await;
+
+    (
+        depositor_operator_verifier_0_client,
+        verifier_1_client,
+        peg_out_graph_id,
+        config.depositor_context,
+        config.withdrawer_evm_address,
+        config.withdrawer_context,
+        config.operator_context,
+        config.invalid_proof,
+    )
+}
+
+async fn create_peg_in_graph(
+    client_0: &mut BitVMClient,
+    deposit_funding_address: Address,
+    deposit_amount: Amount,
+    depositor_evm_address: &String,
+) -> String {
+    let deposit_outpoint =
+        generate_stub_outpoint(client_0, &deposit_funding_address, deposit_amount).await;
+    let graph_id = client_0
+        .create_peg_in_graph(
+            Input {
+                outpoint: deposit_outpoint,
+                amount: deposit_amount,
+            },
+            depositor_evm_address,
+        )
+        .await;
+    println!("Peg in graph created: {}", graph_id);
+
+    client_0
+        .broadcast_peg_in_deposit(&graph_id)
+        .await
+        .expect("Failed to broadcast peg-in deposit");
+    wait_for_confirmation_with_message(client_0.source_network, Some("peg-in deposit tx")).await;
+
+    graph_id
+}
+
+async fn simulate_peg_out_from_l2(
+    client: &mut BitVMClient,
+    peg_out_graph_id: &String,
+    operator_context: &OperatorContext,
+    withdrawer_evm_address: &String,
+    withdrawer_context: &WithdrawerContext,
+) {
+    let peg_in_graph = find_peg_in_graph_by_peg_out(client, peg_out_graph_id).unwrap();
+    let peg_in_confirm = peg_in_graph.peg_in_confirm_transaction_ref();
+    let peg_in_confirm_vout: usize = 0;
+    println!(
+        "peg_in_confirm_txid: {:?}",
+        peg_in_confirm.tx().compute_txid()
+    );
+    let peg_in_confirm_amount = peg_in_confirm.tx().output[peg_in_confirm_vout].value;
+
+    let mock_adaptor_config = MockAdaptorConfig {
+        peg_out_init_events: Some(vec![PegOutEvent {
+            source_outpoint: OutPoint {
+                txid: peg_in_confirm.tx().compute_txid(),
+                vout: peg_in_confirm_vout.to_u32().unwrap(),
+            },
+            amount: peg_in_confirm_amount,
+            timestamp: 1722328130u32,
+            withdrawer_chain_address: withdrawer_evm_address.clone(),
+            withdrawer_destination_address: generate_p2pkh_address(
+                withdrawer_context.network,
+                &withdrawer_context.withdrawer_public_key,
+            )
+            .to_string(),
+            withdrawer_public_key_hash: withdrawer_context.withdrawer_public_key.pubkey_hash(),
+            operator_public_key: operator_context.operator_public_key,
+            tx_hash: [0u8; 4].into(),
+        }]),
+        peg_out_burnt_events: None,
+        peg_out_minted_events: None,
+    };
+    let mock_adaptor = MockAdaptor::new(Some(mock_adaptor_config));
+    let chain_service = Chain::new(Box::new(mock_adaptor));
+
+    client.set_chain_service(chain_service);
+    client.sync_l2().await;
+
+    let operator_funding_utxo_address = generate_pay_to_pubkey_script_address(
+        operator_context.network,
+        &operator_context.operator_public_key,
+    );
+    println!(
+        "operator_funding_utxo_address: {:?}",
+        operator_funding_utxo_address
+    );
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    faucet
+        .fund_input(&operator_funding_utxo_address, peg_in_confirm_amount)
+        .await
+        .wait()
+        .await;
+    let operator_funding_outpoint = generate_stub_outpoint(
+        client,
+        &operator_funding_utxo_address,
+        peg_in_confirm_amount,
+    )
+    .await;
+    println!(
+        "operator_funding_utxo.txid: {:?}",
+        operator_funding_outpoint.txid
+    );
+    let input = Input {
+        outpoint: operator_funding_outpoint,
+        amount: peg_in_confirm_amount,
+    };
+
+    println!("Broadcasting peg out...");
+    client
+        .broadcast_peg_out(peg_out_graph_id, input)
+        .await
+        .expect("Failed to broadcast peg out");
+
+    wait_for_confirmation_with_message(client.source_network, Some("peg-out tx")).await;
+
+    println!("Broadcasting peg out confirm...");
+    client
+        .broadcast_peg_out_confirm(peg_out_graph_id)
+        .await
+        .expect("Failed to broadcast peg out confirm");
+
+    wait_for_confirmation_with_message(client.source_network, Some("peg-out confirm tx")).await;
+}
diff --git a/bridge/tests/bridge/client/sync.rs b/bridge/tests/bridge/client/sync.rs
new file mode 100644
index 000000000..93353ea5f
--- /dev/null
+++ b/bridge/tests/bridge/client/sync.rs
@@ -0,0 +1,58 @@
+use bitcoin::Amount;
+
+use bridge::{
+    graphs::base::PEG_OUT_FEE, scripts::generate_pay_to_pubkey_script_address,
+    transactions::base::{Input, MIN_RELAY_FEE_DISPROVE},
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::generate_stub_outpoint,
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_sync() {
+    let mut config = setup_test().await;
+
+    println!("Read from remote");
+    config.client_0.sync().await;
+
+    println!("Modify data and save");
+    let amount = Amount::from_sat(INITIAL_AMOUNT + PEG_OUT_FEE + 1 + MIN_RELAY_FEE_DISPROVE);
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    let address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
+    );
+    faucet.fund_input(&address, amount).await.wait().await;
+
+    let outpoint = generate_stub_outpoint(&config.client_0, &address, amount).await;
+
+    println!("Creating peg in graph ...");
+    let peg_in_graph_id = config
+        .client_0
+        .create_peg_in_graph(Input { outpoint, amount }, &config.depositor_evm_address)
+        .await;
+
+    println!("Creating peg out graph ...");
+    config.client_0.create_peg_out_graph(
+        &peg_in_graph_id,
+        Input {
+            outpoint: generate_stub_outpoint(
+                &config.client_0,
+                &generate_pay_to_pubkey_script_address(
+                    config.depositor_context.network,
+                    &config.depositor_context.depositor_public_key,
+                ),
+                amount,
+            )
+            .await,
+            amount,
+        },
+        config.commitment_secrets,
+    );
+
+    println!("Save to remote");
+    config.client_0.flush().await;
+}
diff --git a/tests/bridge/client/validate.rs b/bridge/tests/bridge/client/validate.rs
similarity index 76%
rename from tests/bridge/client/validate.rs
rename to bridge/tests/bridge/client/validate.rs
index c29e545cc..c67a50b1f 100644
--- a/tests/bridge/client/validate.rs
+++ b/bridge/tests/bridge/client/validate.rs
@@ -2,18 +2,14 @@ use std::str::FromStr;
 
 use bitcoin::{Amount, OutPoint, Txid};
 
-use bitvm::bridge::{
+use bridge::{
     client::client::{BitVMClient, BitVMClientPublicData},
-    graphs::{
-        base::{FEE_AMOUNT, INITIAL_AMOUNT},
-        peg_in::PegInGraph,
-        peg_out::PegOutGraph,
-    },
+    graphs::{base::PEG_OUT_FEE, peg_in::PegInGraph, peg_out::PegOutGraph},
     scripts::generate_burn_script,
     transactions::{base::Input, pre_signed::PreSignedTransaction},
 };
 
-use super::super::setup::setup_test;
+use crate::bridge::setup::{setup_test, INITIAL_AMOUNT};
 
 #[tokio::test]
 async fn test_validate_success() {
@@ -38,7 +34,7 @@ async fn test_validate_invalid_previous_output() {
 
     let is_data_valid = BitVMClient::validate_data(&data);
 
-    assert_eq!(is_data_valid, false);
+    assert!(!is_data_valid);
 }
 
 #[tokio::test]
@@ -50,7 +46,7 @@ async fn test_validate_invalid_script_sig() {
 
     let is_data_valid = BitVMClient::validate_data(&data);
 
-    assert_eq!(is_data_valid, false);
+    assert!(!is_data_valid);
 }
 
 #[tokio::test]
@@ -62,7 +58,7 @@ async fn test_validate_invalid_sequence() {
 
     let is_data_valid = BitVMClient::validate_data(&data);
 
-    assert_eq!(is_data_valid, false);
+    assert!(!is_data_valid);
 }
 
 #[tokio::test]
@@ -74,7 +70,7 @@ async fn test_validate_invalid_value() {
 
     let is_data_valid = BitVMClient::validate_data(&data);
 
-    assert_eq!(is_data_valid, false);
+    assert!(!is_data_valid);
 }
 
 #[tokio::test]
@@ -86,34 +82,14 @@ async fn test_validate_invalid_script_pubkey() {
 
     let is_data_valid = BitVMClient::validate_data(&data);
 
-    assert_eq!(is_data_valid, false);
+    assert!(!is_data_valid);
 }
 
 async fn setup_and_create_graphs() -> (BitVMClientPublicData, OutPoint) {
-    let (
-        _,
-        _,
-        depositor_context,
-        operator_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    let amount_0 = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT + 1);
-    let amount_1 = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT - 1);
+    let config = setup_test().await;
+
+    let amount_0 = Amount::from_sat(INITIAL_AMOUNT + PEG_OUT_FEE + 1);
+    let amount_1 = Amount::from_sat(INITIAL_AMOUNT + PEG_OUT_FEE - 1);
     let peg_in_outpoint = OutPoint {
         txid: Txid::from_str("0e6719ac074b0e3cac76d057643506faa1c266b322aa9cf4c6f635fe63b14327")
             .unwrap(),
@@ -126,30 +102,31 @@ async fn setup_and_create_graphs() -> (BitVMClientPublicData, OutPoint) {
     };
 
     let peg_in_graph_0 = PegInGraph::new(
-        &depositor_context,
+        &config.depositor_context,
         Input {
             outpoint: peg_in_outpoint,
             amount: amount_0,
         },
-        &depositor_evm_address,
+        &config.depositor_evm_address,
     );
 
     let peg_in_graph_1 = PegInGraph::new(
-        &depositor_context,
+        &config.depositor_context,
         Input {
             outpoint: peg_in_outpoint,
             amount: amount_1,
         },
-        &depositor_evm_address,
+        &config.depositor_evm_address,
     );
 
     let peg_out_graph = PegOutGraph::new(
-        &operator_context,
+        &config.operator_context,
         &peg_in_graph_0,
         Input {
             outpoint: peg_out_outpoint,
             amount: amount_0,
         },
+        &config.commitment_secrets,
     );
 
     let data = BitVMClientPublicData {
@@ -158,5 +135,5 @@ async fn setup_and_create_graphs() -> (BitVMClientPublicData, OutPoint) {
         peg_out_graphs: vec![peg_out_graph],
     };
 
-    return (data, peg_in_outpoint);
+    (data, peg_in_outpoint)
 }
diff --git a/tests/bridge/data_store/ftp.rs b/bridge/tests/bridge/data_store/ftp.rs
similarity index 62%
rename from tests/bridge/data_store/ftp.rs
rename to bridge/tests/bridge/data_store/ftp.rs
index 6066da412..f5e4b8361 100644
--- a/tests/bridge/data_store/ftp.rs
+++ b/bridge/tests/bridge/data_store/ftp.rs
@@ -1,25 +1,26 @@
-use bitvm::bridge::client::data_store::{base::DataStoreDriver, ftp::ftp::Ftp};
+use bridge::client::data_store::{base::DataStoreDriver, ftp::ftp::Ftp};
 
+#[ignore]
 #[tokio::test]
 async fn test_ftp() {
     println!("Start FTP connection");
-    let ftp = Ftp::new().unwrap();
+    let ftp = Ftp::new().await.unwrap();
 
     let path = "bridge_data/testnet/ethereum_sepolia/028b839569cde368894237913fe4fbd25d75eaf1ed019a39d479e693dac35be19e";
 
+    println!("Try to upload json");
+    let result = ftp
+        .upload_object("ftp_test.json", "{\"dog\":\"cat\"}", Some(path))
+        .await;
+    println!("Upload Result: {:?}", result);
+
     println!("Try to list objects");
     let objects = ftp.list_objects(Some(path)).await;
     println!("Objects: {:?}", objects);
 
     println!("Try to fetch json");
     let json = ftp
-        .fetch_json("1721392247764-bridge-client-data.json", Some(path))
+        .fetch_object("1721392247764-bridge-client-data.json", Some(path))
         .await;
     println!("Json: {:?}", json);
-
-    println!("Try to upload json");
-    let result = ftp
-        .upload_json("ftp_test.json", "{\"dog\":\"cat\"}".to_string(), Some(path))
-        .await;
-    println!("Result: {:?}", result);
 }
diff --git a/tests/bridge/data_store/ftps.rs b/bridge/tests/bridge/data_store/ftps.rs
similarity index 58%
rename from tests/bridge/data_store/ftps.rs
rename to bridge/tests/bridge/data_store/ftps.rs
index e1c47f94d..96de248e5 100644
--- a/tests/bridge/data_store/ftps.rs
+++ b/bridge/tests/bridge/data_store/ftps.rs
@@ -1,29 +1,26 @@
-use bitvm::bridge::client::data_store::{base::DataStoreDriver, ftp::ftps::Ftps};
+use bridge::client::data_store::{base::DataStoreDriver, ftp::ftps::Ftps};
 
+#[ignore]
 #[tokio::test]
 async fn test_ftps() {
     println!("Start FTPS connection");
-    let ftps = Ftps::new().unwrap();
+    let ftps = Ftps::new().await.unwrap();
 
     let path = "bridge_data/testnet/ethereum_sepolia/028b839569cde368894237913fe4fbd25d75eaf1ed019a39d479e693dac35be19e";
 
+    println!("Try to upload json");
+    let result = ftps
+        .upload_object("ftps_test.json", "{\"dog\":\"cat\"}", Some(path))
+        .await;
+    println!("Upload Result: {:?}", result);
+
     println!("Try to list objects");
     let objects = ftps.list_objects(Some(path)).await;
     println!("Objects: {:?}", objects);
 
     println!("Try to fetch json");
     let json = ftps
-        .fetch_json("1721392247764-bridge-client-data.json", Some(path))
+        .fetch_object("1721392247764-bridge-client-data.json", Some(path))
         .await;
     println!("Json: {:?}", json);
-
-    println!("Try to upload json");
-    let result = ftps
-        .upload_json(
-            "ftps_test.json",
-            "{\"dog\":\"cat\"}".to_string(),
-            Some(path),
-        )
-        .await;
-    println!("Result: {:?}", result);
 }
diff --git a/tests/bridge/data_store/mod.rs b/bridge/tests/bridge/data_store/mod.rs
similarity index 100%
rename from tests/bridge/data_store/mod.rs
rename to bridge/tests/bridge/data_store/mod.rs
diff --git a/tests/bridge/data_store/sftp.rs b/bridge/tests/bridge/data_store/sftp.rs
similarity index 55%
rename from tests/bridge/data_store/sftp.rs
rename to bridge/tests/bridge/data_store/sftp.rs
index fc45a5ac3..d930cfbc6 100644
--- a/tests/bridge/data_store/sftp.rs
+++ b/bridge/tests/bridge/data_store/sftp.rs
@@ -1,29 +1,24 @@
-use bitvm::bridge::client::data_store::{base::DataStoreDriver, sftp::Sftp};
+use bridge::client::data_store::{base::DataStoreDriver, sftp::Sftp};
 
+#[ignore]
 #[tokio::test]
 async fn test_sftp() {
     println!("Start SFTP connection");
-    let sftp = Sftp::new().unwrap();
+    let sftp = Sftp::new().await.unwrap();
 
     let path = "bridge_data/testnet/ethereum_sepolia/028b839569cde368894237913fe4fbd25d75eaf1ed019a39d479e693dac35be19e";
 
+    println!("Try to upload json");
+    let result = sftp
+        .upload_object("sftp_test.json", "{\"dog\":\"cat\"}", Some(path))
+        .await;
+    println!("Upload Result: {:?}", result);
+
     println!("Try to list objects");
     let objects = sftp.list_objects(Some(path)).await;
     println!("Objects: {:?}", objects);
 
     println!("Try to fetch json");
-    let json = sftp
-        .fetch_json("1721392247764-bridge-client-data.json", Some(path))
-        .await;
+    let json = sftp.fetch_object("sftp_test.json", Some(path)).await;
     println!("Json: {:?}", json);
-
-    println!("Try to upload json");
-    let result = sftp
-        .upload_json(
-            "sftp_test.json",
-            "{\"dog\":\"cat\"}".to_string(),
-            Some(path),
-        )
-        .await;
-    println!("Result: {:?}", result);
 }
diff --git a/bridge/tests/bridge/disprove/disprove.rs b/bridge/tests/bridge/disprove/disprove.rs
new file mode 100644
index 000000000..e2f92293f
--- /dev/null
+++ b/bridge/tests/bridge/disprove/disprove.rs
@@ -0,0 +1,167 @@
+use bitcoin::{key::Keypair, Amount, PrivateKey, PublicKey, TxOut};
+
+use bridge::{
+    connectors::base::TaprootConnector,
+    scripts::{generate_pay_to_pubkey_script, generate_pay_to_pubkey_script_address},
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_DISPROVE},
+        disprove::DisproveTransaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+use secp256k1::SECP256K1;
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, generate_stub_outpoint},
+    setup::{setup_test_full, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_disprove_tx_success() {
+    let config = setup_test_full().await;
+
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let amount_0 = Amount::from_sat(MIN_RELAY_FEE_DISPROVE);
+    let connector_5_address = config.connector_5.generate_taproot_address();
+    faucet.fund_input(&connector_5_address, amount_0).await;
+
+    let amount_1 = Amount::from_sat(INITIAL_AMOUNT);
+    let connector_c_address = config.connector_c.generate_taproot_address();
+    faucet
+        .fund_input(&connector_c_address, amount_1)
+        .await
+        .wait()
+        .await;
+
+    let outpoint_0 = generate_stub_outpoint(&config.client_0, &connector_5_address, amount_0).await;
+    let outpoint_1 = generate_stub_outpoint(&config.client_0, &connector_c_address, amount_1).await;
+
+    let mut disprove_tx = DisproveTransaction::new(
+        &config.operator_context,
+        &config.connector_5,
+        &config.connector_c,
+        Input {
+            outpoint: outpoint_0,
+            amount: amount_0,
+        },
+        Input {
+            outpoint: outpoint_1,
+            amount: amount_1,
+        },
+    );
+
+    let secret_nonces_0 = disprove_tx.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = disprove_tx.push_nonces(&config.verifier_1_context);
+
+    disprove_tx.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_5,
+        &secret_nonces_0,
+    );
+    disprove_tx.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_5,
+        &secret_nonces_1,
+    );
+
+    let reward_address = generate_pay_to_pubkey_script_address(
+        config.withdrawer_context.network,
+        &config.withdrawer_context.withdrawer_public_key,
+    );
+    let verifier_reward_script = reward_address.script_pubkey(); // send reward to withdrawer address
+    disprove_tx.add_input_output(&config.connector_c, 1, vec![], verifier_reward_script);
+
+    let tx = disprove_tx.finalize();
+    check_tx_output_sum(INITIAL_AMOUNT, &tx);
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Disprove tx result: {:?}\n", result);
+    assert!(result.is_ok());
+}
+
+#[tokio::test]
+async fn test_disprove_tx_with_verifier_added_to_output_success() {
+    let config = setup_test_full().await;
+
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let amount_0 = Amount::from_sat(MIN_RELAY_FEE_DISPROVE);
+    let connector_5_address = config.connector_5.generate_taproot_address();
+    faucet.fund_input(&connector_5_address, amount_0).await;
+
+    let amount_1 = Amount::from_sat(INITIAL_AMOUNT);
+    let connector_c_address = config.connector_c.generate_taproot_address();
+    faucet
+        .fund_input(&connector_c_address, amount_1)
+        .await
+        .wait()
+        .await;
+
+    let outpoint_0 = generate_stub_outpoint(&config.client_0, &connector_5_address, amount_0).await;
+    let outpoint_1 = generate_stub_outpoint(&config.client_0, &connector_c_address, amount_1).await;
+
+    let mut disprove_tx = DisproveTransaction::new(
+        &config.operator_context,
+        &config.connector_5,
+        &config.connector_c,
+        Input {
+            outpoint: outpoint_0,
+            amount: amount_0,
+        },
+        Input {
+            outpoint: outpoint_1,
+            amount: amount_1,
+        },
+    );
+
+    let secret_nonces_0 = disprove_tx.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = disprove_tx.push_nonces(&config.verifier_1_context);
+
+    disprove_tx.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_5,
+        &secret_nonces_0,
+    );
+    disprove_tx.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_5,
+        &secret_nonces_1,
+    );
+
+    let reward_address = generate_pay_to_pubkey_script_address(
+        config.withdrawer_context.network,
+        &config.withdrawer_context.withdrawer_public_key,
+    );
+    let verifier_reward_script = reward_address.script_pubkey(); // send reward to withdrawer address
+    disprove_tx.add_input_output(&config.connector_c, 1, vec![], verifier_reward_script);
+
+    let mut tx = disprove_tx.finalize();
+
+    let verifier_secret: &str = "aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffff1234";
+    let verifier_keypair = Keypair::from_seckey_str_global(verifier_secret).unwrap();
+    let verifier_private_key = PrivateKey::new(
+        verifier_keypair.secret_key(),
+        config.verifier_0_context.network,
+    );
+    let verifier_pubkey = PublicKey::from_private_key(SECP256K1, &verifier_private_key);
+    let verifier_pubkey_script = generate_pay_to_pubkey_script(&verifier_pubkey);
+    let verifier_output_dust = verifier_pubkey_script.minimal_non_dust().to_sat();
+
+    let verifier_output = TxOut {
+        value: Amount::from_sat(verifier_output_dust),
+        script_pubkey: verifier_pubkey_script,
+    };
+
+    // the output dust is taken from reward_output_amount
+    // output 1 is not part of pre-signing, it will not trigger "Invalid Schnorr signature" error
+    tx.output[1].value -= verifier_output.value;
+    tx.output.push(verifier_output);
+    check_tx_output_sum(INITIAL_AMOUNT, &tx);
+
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Disprove tx result: {:?}\n", result);
+    assert!(result.is_ok());
+}
diff --git a/tests/bridge/disprove/mod.rs b/bridge/tests/bridge/disprove/mod.rs
similarity index 100%
rename from tests/bridge/disprove/mod.rs
rename to bridge/tests/bridge/disprove/mod.rs
diff --git a/bridge/tests/bridge/disprove_chain/disprove_chain.rs b/bridge/tests/bridge/disprove_chain/disprove_chain.rs
new file mode 100644
index 000000000..8769e37c4
--- /dev/null
+++ b/bridge/tests/bridge/disprove_chain/disprove_chain.rs
@@ -0,0 +1,90 @@
+use bitcoin::{Amount, Network::Regtest};
+
+use bitvm::signatures::signing_winternitz::{generate_winternitz_witness, WinternitzSigningInputs};
+use bridge::{
+    commitments::CommitmentMessageId,
+    connectors::base::TaprootConnector,
+    scripts::generate_pay_to_pubkey_script_address,
+    superblock::{get_start_time_block_number, get_superblock_hash_message},
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_DISPROVE_CHAIN},
+        disprove_chain::DisproveChainTransaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, generate_stub_outpoint, get_superblock_header},
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[ignore]
+#[tokio::test]
+async fn test_disprove_chain_tx_success() {
+    let config = setup_test().await;
+
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    let amount = Amount::from_sat(INITIAL_AMOUNT + MIN_RELAY_FEE_DISPROVE_CHAIN);
+    faucet
+        .fund_input(&config.connector_b.generate_taproot_address(), amount)
+        .await
+        .wait()
+        .await;
+
+    let outpoint = generate_stub_outpoint(
+        &config.client_0,
+        &config.connector_b.generate_taproot_address(),
+        amount,
+    )
+    .await;
+
+    let mut disprove_chain_tx = DisproveChainTransaction::new(
+        &config.operator_context,
+        &config.connector_b,
+        Input { outpoint, amount },
+    );
+
+    let secret_nonces_0 = disprove_chain_tx.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = disprove_chain_tx.push_nonces(&config.verifier_1_context);
+
+    disprove_chain_tx.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_b,
+        &secret_nonces_0,
+    );
+    disprove_chain_tx.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_b,
+        &secret_nonces_1,
+    );
+
+    let reward_address = generate_pay_to_pubkey_script_address(
+        config.withdrawer_context.network,
+        &config.withdrawer_context.withdrawer_public_key,
+    );
+    disprove_chain_tx.add_output(reward_address.script_pubkey());
+
+    // TODO: setup the test headers appropriately for the verification in Disprove Chain to pass
+    let committed_sb = get_superblock_header();
+    let disprove_sb = get_superblock_header();
+
+    let start_time_witness = generate_winternitz_witness(&WinternitzSigningInputs {
+        message: &get_start_time_block_number(Regtest).to_le_bytes(),
+        signing_key: &config.commitment_secrets[&CommitmentMessageId::StartTime],
+    });
+
+    let superblock_hash_witness = generate_winternitz_witness(&WinternitzSigningInputs {
+        message: &get_superblock_hash_message(&committed_sb),
+        signing_key: &config.commitment_secrets[&CommitmentMessageId::SuperblockHash],
+    });
+
+    disprove_chain_tx.sign(&disprove_sb, &start_time_witness, &superblock_hash_witness);
+    let tx = disprove_chain_tx.finalize();
+    check_tx_output_sum(INITIAL_AMOUNT, &tx);
+
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Disprove Chain tx result: {:?}\n", result);
+    assert!(result.is_ok());
+}
diff --git a/tests/bridge/disprove_chain/mod.rs b/bridge/tests/bridge/disprove_chain/mod.rs
similarity index 100%
rename from tests/bridge/disprove_chain/mod.rs
rename to bridge/tests/bridge/disprove_chain/mod.rs
diff --git a/tests/bridge/chain/chain.rs b/bridge/tests/bridge/e2e/chain/chain.rs
similarity index 71%
rename from tests/bridge/chain/chain.rs
rename to bridge/tests/bridge/e2e/chain/chain.rs
index 7a0357bb0..056210c0a 100644
--- a/tests/bridge/chain/chain.rs
+++ b/bridge/tests/bridge/e2e/chain/chain.rs
@@ -1,8 +1,9 @@
-use bitvm::bridge::client::chain::chain::Chain;
+use bridge::client::chain::chain::Chain;
 
+#[ignore]
 #[tokio::test]
 async fn test_rpc() {
-    let adaptor = Chain::new();
+    let adaptor = Chain::default();
     let result = adaptor.get_peg_out_init().await;
     assert!(result.is_ok());
 
diff --git a/tests/bridge/chain/ethereum.rs b/bridge/tests/bridge/e2e/chain/ethereum.rs
similarity index 63%
rename from tests/bridge/chain/ethereum.rs
rename to bridge/tests/bridge/e2e/chain/ethereum.rs
index 8271a32c3..331554d3d 100644
--- a/tests/bridge/chain/ethereum.rs
+++ b/bridge/tests/bridge/e2e/chain/ethereum.rs
@@ -1,12 +1,15 @@
-use alloy::{primitives::Address as EvmAddress, transports::http::reqwest::Url};
-use bitvm::bridge::client::chain::{
-    base::ChainAdaptor,
-    ethereum::{EthereumAdaptor, EthereumInitConfig},
+use alloy::{
+    eips::BlockNumberOrTag, primitives::Address as EvmAddress, transports::http::reqwest::Url,
+};
+use bridge::client::chain::{
+    chain_adaptor::ChainAdaptor,
+    ethereum_adaptor::{EthereumAdaptor, EthereumInitConfig},
 };
 
+#[ignore]
 #[tokio::test]
 async fn test_ethereum_peg_out_init() {
-    let adaptor = EthereumAdaptor::new().unwrap();
+    let adaptor = EthereumAdaptor::new(None);
     let result = adaptor.get_peg_out_init_event().await;
     assert!(result.is_ok());
 
@@ -16,15 +19,17 @@ async fn test_ethereum_peg_out_init() {
     }
 }
 
+#[ignore]
 #[tokio::test]
 async fn test_ethereum_peg_out_burnt() {
-    let adaptor = EthereumAdaptor::from_config(EthereumInitConfig {
+    let adaptor = EthereumAdaptor::new(Some(EthereumInitConfig {
         rpc_url: "http://127.0.0.1:8545".parse::<Url>().unwrap(),
         bridge_address: "0x76d05F58D14c0838EC630C8140eDC5aB7CD159Dc"
             .parse::<EvmAddress>()
             .unwrap(),
         bridge_creation_block: 20588300,
-    });
+        to_block: Some(BlockNumberOrTag::Latest),
+    }));
     let result = adaptor.get_peg_out_burnt_event().await;
     assert!(result.is_ok());
 
diff --git a/tests/bridge/chain/mod.rs b/bridge/tests/bridge/e2e/chain/mod.rs
similarity index 66%
rename from tests/bridge/chain/mod.rs
rename to bridge/tests/bridge/e2e/chain/mod.rs
index 5e9546c5b..ec0d223b4 100644
--- a/tests/bridge/chain/mod.rs
+++ b/bridge/tests/bridge/e2e/chain/mod.rs
@@ -1,2 +1,3 @@
 pub mod chain;
 pub mod ethereum;
+pub mod peg_out;
diff --git a/bridge/tests/bridge/e2e/chain/peg_out.rs b/bridge/tests/bridge/e2e/chain/peg_out.rs
new file mode 100644
index 000000000..760b22f61
--- /dev/null
+++ b/bridge/tests/bridge/e2e/chain/peg_out.rs
@@ -0,0 +1,89 @@
+use alloy::{
+    eips::BlockNumberOrTag, primitives::Address as EvmAddress, transports::http::reqwest::Url,
+};
+use bitcoin::Amount;
+
+use bridge::{
+    client::chain::{
+        chain::Chain,
+        ethereum_adaptor::{EthereumAdaptor, EthereumInitConfig},
+    },
+    graphs::base::PEG_OUT_FEE,
+    scripts::generate_pay_to_pubkey_script_address,
+    transactions::{
+        base::{BaseTransaction, Input},
+        peg_out::PegOutTransaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::generate_stub_outpoint,
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[ignore]
+#[tokio::test]
+async fn test_peg_out_for_chain() {
+    let config = setup_test().await;
+    let adaptor = EthereumAdaptor::new(Some(EthereumInitConfig {
+        rpc_url: "http://127.0.0.1:8545".parse::<Url>().unwrap(),
+        bridge_address: "0x76d05F58D14c0838EC630C8140eDC5aB7CD159Dc"
+            .parse::<EvmAddress>()
+            .unwrap(),
+        bridge_creation_block: 20588300,
+        to_block: Some(BlockNumberOrTag::Latest),
+    }));
+    let chain_service = Chain::new(Box::new(adaptor));
+    let events_result = chain_service.get_peg_out_init().await;
+    assert!(events_result.as_ref().is_ok_and(|x| !x.is_empty()));
+
+    let mut peg_out_event = events_result.unwrap().pop().unwrap();
+
+    let input_amount_raw = INITIAL_AMOUNT + PEG_OUT_FEE;
+    let operator_input_amount = Amount::from_sat(input_amount_raw);
+
+    let operator_funding_utxo_address = generate_pay_to_pubkey_script_address(
+        config.operator_context.network,
+        &config.operator_context.operator_public_key,
+    );
+    println!(
+        "operator_funding_utxo_address: {:?}",
+        operator_funding_utxo_address
+    );
+
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    faucet
+        .fund_input(&operator_funding_utxo_address, operator_input_amount)
+        .await
+        .wait()
+        .await;
+
+    let operator_funding_outpoint = generate_stub_outpoint(
+        &config.client_0,
+        &operator_funding_utxo_address,
+        operator_input_amount,
+    )
+    .await;
+    println!(
+        "operator_funding_utxo.txid: {:?}",
+        operator_funding_outpoint.txid
+    );
+    peg_out_event.source_outpoint = operator_funding_outpoint;
+    peg_out_event.amount = operator_input_amount;
+
+    let input = Input {
+        outpoint: operator_funding_outpoint,
+        amount: operator_input_amount,
+    };
+    let peg_out = PegOutTransaction::new(&config.operator_context, &peg_out_event, input);
+
+    let peg_out_tx = peg_out.finalize();
+    let peg_out_tx_id = peg_out_tx.compute_txid();
+
+    // mine peg-out
+    let peg_out_result = config.client_0.esplora.broadcast(&peg_out_tx).await;
+    println!("Peg Out Tx result: {:?}", peg_out_result);
+    assert!(peg_out_result.is_ok());
+    println!("Peg Out Txid: {:?}", peg_out_tx_id);
+}
diff --git a/bridge/tests/bridge/e2e/e2e_l2_ui.rs b/bridge/tests/bridge/e2e/e2e_l2_ui.rs
new file mode 100644
index 000000000..e385bd9f0
--- /dev/null
+++ b/bridge/tests/bridge/e2e/e2e_l2_ui.rs
@@ -0,0 +1,371 @@
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{find_peg_out_graph, generate_stub_outpoint, wait_for_confirmation_with_message},
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+use bitcoin::{Address, Amount};
+use bridge::{
+    client::chain::chain::Chain,
+    graphs::base::{BaseGraph, PEG_IN_FEE, PEG_OUT_FEE},
+    transactions::pre_signed::PreSignedTransaction,
+};
+use bridge::{
+    client::client::BitVMClient,
+    contexts::{depositor::DepositorContext, operator::OperatorContext},
+    graphs::peg_out::PegOutOperatorStatus,
+    scripts::generate_pay_to_pubkey_script_address,
+    transactions::base::Input,
+};
+use esplora_client::Builder;
+use futures::StreamExt;
+use serial_test::serial;
+
+const REGTEST_ESPLORA_URL: &str = "http://localhost:8094/regtest/api/";
+
+#[ignore]
+#[tokio::test]
+#[serial]
+async fn test_e2e_0_simulate_complete_peg_in() {
+    println!("Simulate peg in ...");
+    let (mut operator_client, _, peg_out_graph_id, _, _) = create_graph().await;
+    operator_client.sync().await;
+    operator_client.sync_l2().await;
+
+    let esplora = Builder::new(REGTEST_ESPLORA_URL)
+        .build_async()
+        .expect("Could not build esplora client");
+    let peg_out_graph = find_peg_out_graph(&operator_client, peg_out_graph_id.as_str()).unwrap();
+    let status = peg_out_graph.operator_status(&esplora).await;
+    println!("Graph id: {} status: {}", peg_out_graph.id(), status);
+    println!("Peg in completed, please proceed to initate peg out in UI.");
+}
+
+#[ignore]
+#[tokio::test]
+#[serial]
+async fn test_e2e_1_simulate_peg_out() {
+    let config = setup_test().await;
+    let esplora = Builder::new(REGTEST_ESPLORA_URL)
+        .build_async()
+        .expect("Could not build esplora client");
+
+    let mut operator_client = config.client_0;
+    operator_client.sync().await;
+    operator_client.sync_l2().await;
+
+    println!("Using first found PegOutStartPegOut graph ...");
+    let peg_out_graphs = &operator_client.data().peg_out_graphs.clone();
+    let peg_out_graph_result = futures::stream::iter(peg_out_graphs)
+        .filter(|g| {
+            Box::pin(async {
+                let status = g.operator_status(&esplora).await;
+                println!("Graph id: {} status: {}", g.id(), status);
+                match status {
+                    PegOutOperatorStatus::PegOutStartPegOut => true,
+                    _ => false,
+                }
+            })
+        })
+        .next()
+        .await;
+
+    let peg_out_graph = match peg_out_graph_result {
+        Some(peg_out_graph) => peg_out_graph,
+        None => panic!("No PegOutStartPegOut graph found"),
+    };
+    let peg_out_chain_event = match &peg_out_graph.peg_out_chain_event {
+        Some(peg_out_chain_event) => peg_out_chain_event,
+        None => panic!("Fatal! No peg_out_chain_event found"),
+    };
+
+    let operator_funding_utxo_address = generate_pay_to_pubkey_script_address(
+        config.operator_context.network,
+        &config.operator_context.operator_public_key,
+    );
+    println!(
+        "operator_funding_utxo_address: {:?}",
+        operator_funding_utxo_address
+    );
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    faucet
+        .fund_input(&operator_funding_utxo_address, peg_out_chain_event.amount)
+        .await
+        .wait()
+        .await;
+    let operator_funding_outpoint = generate_stub_outpoint(
+        &operator_client,
+        &operator_funding_utxo_address,
+        peg_out_chain_event.amount,
+    )
+    .await;
+    println!(
+        "operator_funding_utxo.txid: {:?}",
+        operator_funding_outpoint.txid
+    );
+    let input = Input {
+        outpoint: operator_funding_outpoint,
+        amount: peg_out_chain_event.amount,
+    };
+    println!("Broadcasting peg out...");
+    operator_client
+        .broadcast_peg_out(peg_out_graph.id(), input)
+        .await
+        .expect("Failed to broadcast peg out");
+
+    // Wait for peg-out transaction to be mined
+    wait_for_confirmation_with_message(config.network, Some("peg-out tx")).await;
+
+    operator_client.flush().await;
+
+    let synced_peg_out_graph = find_peg_out_graph(&operator_client, peg_out_graph.id()).unwrap();
+    let peg_out_txid = synced_peg_out_graph
+        .peg_out_transaction
+        .as_ref()
+        .unwrap()
+        .tx()
+        .compute_txid();
+    println!(
+        "Peg out tx [{}] broadcasted, please proceed to burnEBTC in L2.",
+        peg_out_txid
+    );
+}
+
+#[ignore]
+#[tokio::test]
+#[serial]
+async fn test_e2e_2_verify_burn_event_and_simulate_peg_out_process() {
+    let chain_adaptor = Chain::default();
+    let burnt_events = chain_adaptor.get_peg_out_burnt().await;
+    assert!(burnt_events.is_ok());
+    let burnt_events = burnt_events.unwrap();
+    assert!(!burnt_events.is_empty());
+
+    let burnt_event = burnt_events.first().unwrap();
+    println!("First burnt event fetched: {:?}", burnt_event);
+
+    //TODO: broadcast_transactions_from_peg_out_graph
+}
+
+//TODO: refactor with test_musig2_peg_out
+async fn create_graph() -> (
+    BitVMClient,
+    BitVMClient,
+    String,
+    DepositorContext,
+    OperatorContext,
+) {
+    let config = setup_test().await;
+    let mut depositor_operator_verifier_0_client = config.client_0;
+    let mut verifier_1_client = config.client_1;
+
+    // verify funding inputs
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+
+    let deposit_input_amount = Amount::from_sat(INITIAL_AMOUNT + PEG_IN_FEE);
+    let deposit_funding_address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
+    );
+    funding_inputs.push((&deposit_funding_address, deposit_input_amount));
+
+    let kick_off_input_amount = Amount::from_sat(INITIAL_AMOUNT + PEG_OUT_FEE);
+    let kick_off_funding_utxo_address = generate_pay_to_pubkey_script_address(
+        config.operator_context.network,
+        &config.operator_context.operator_public_key,
+    );
+    funding_inputs.push((&kick_off_funding_utxo_address, kick_off_input_amount));
+
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    faucet
+        .fund_inputs(&depositor_operator_verifier_0_client, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    let kick_off_outpoint = generate_stub_outpoint(
+        &depositor_operator_verifier_0_client,
+        &kick_off_funding_utxo_address,
+        kick_off_input_amount,
+    )
+    .await;
+
+    dotenv::dotenv().ok();
+    let env_user0_evm_address = dotenv::var("BRIDGE_USER_0_EVM_ADDRESS");
+    let depositor_evm_address = match env_user0_evm_address {
+        Ok(depositor_evm_address) => depositor_evm_address,
+        Err(_) => config.depositor_evm_address,
+    };
+    println!("Creating peg-in graph...");
+    // create and complete peg-in graph
+    let peg_in_graph_id = create_peg_in_graph(
+        &mut depositor_operator_verifier_0_client,
+        &mut verifier_1_client,
+        deposit_funding_address,
+        deposit_input_amount,
+        &depositor_evm_address,
+    )
+    .await;
+
+    depositor_operator_verifier_0_client.sync().await;
+    println!("Creating peg-out graph...");
+    let peg_out_graph_id = depositor_operator_verifier_0_client.create_peg_out_graph(
+        &peg_in_graph_id,
+        Input {
+            outpoint: kick_off_outpoint,
+            amount: kick_off_input_amount,
+        },
+        config.commitment_secrets,
+    );
+
+    println!("Verifier 0 push peg-out nonces");
+    depositor_operator_verifier_0_client.push_verifier_nonces(&peg_out_graph_id);
+    depositor_operator_verifier_0_client.flush().await;
+
+    println!("Verifier 1 push peg-out nonces");
+    verifier_1_client.sync().await;
+    verifier_1_client.push_verifier_nonces(&peg_out_graph_id);
+    verifier_1_client.flush().await;
+
+    println!("Verifier 0 pre-sign peg-out");
+    depositor_operator_verifier_0_client.sync().await;
+    depositor_operator_verifier_0_client.push_verifier_signature(&peg_out_graph_id);
+    depositor_operator_verifier_0_client.flush().await;
+
+    println!("Verifier 1 pre-sign peg-out");
+    verifier_1_client.sync().await;
+    verifier_1_client.push_verifier_signature(&peg_out_graph_id);
+    verifier_1_client.flush().await;
+
+    (
+        depositor_operator_verifier_0_client,
+        verifier_1_client,
+        peg_out_graph_id,
+        config.depositor_context,
+        config.operator_context,
+    )
+}
+
+async fn create_peg_in_graph(
+    client_0: &mut BitVMClient,
+    client_1: &mut BitVMClient,
+    deposit_funding_address: Address,
+    deposit_amount: Amount,
+    depositor_evm_address: &String,
+) -> String {
+    let deposit_outpoint =
+        generate_stub_outpoint(client_0, &deposit_funding_address, deposit_amount).await;
+    let graph_id = client_0
+        .create_peg_in_graph(
+            Input {
+                outpoint: deposit_outpoint,
+                amount: deposit_amount,
+            },
+            depositor_evm_address,
+        )
+        .await;
+
+    client_0
+        .broadcast_peg_in_deposit(&graph_id)
+        .await
+        .expect("Failed to broadcast peg-in deposit");
+    client_0.push_verifier_nonces(&graph_id);
+    client_0.flush().await;
+
+    client_1.sync().await;
+    client_1.push_verifier_nonces(&graph_id);
+    client_1.flush().await;
+
+    client_0.sync().await;
+    client_0.push_verifier_signature(&graph_id);
+    client_0.flush().await;
+
+    client_1.sync().await;
+    client_1.push_verifier_signature(&graph_id);
+    client_1.flush().await;
+
+    // Wait for peg-in deposit transaction to be mined
+    wait_for_confirmation_with_message(client_0.source_network, Some("peg-in deposit tx")).await;
+
+    client_0.sync().await;
+    client_0
+        .broadcast_peg_in_confirm(&graph_id)
+        .await
+        .expect("Failed to broadcast peg-in confirm");
+    client_0.flush().await;
+
+    graph_id
+}
+
+// async fn broadcast_transactions_from_peg_out_graph(
+//     client: &mut BitVMClient,
+//     peg_out_graph_id: &String,
+//     depositor_context: &DepositorContext,
+//     with_kick_off_2_tx: bool,
+//     with_challenge_tx: bool,
+//     with_assert_tx: bool,
+// ) {
+//     println!("Broadcasting kick-off 1...");
+//     client.sync().await;
+//     client.broadcast_kick_off_1(&peg_out_graph_id).await;
+
+//     // Wait for peg-in deposit transaction to be mined
+//     println!("Waiting for peg-out kick-off tx...");
+//     sleep(Duration::from_secs(TX_WAIT_TIME)).await;
+
+//     if with_kick_off_2_tx {
+//         println!("Broadcasting start time...");
+//         client.broadcast_start_time(&peg_out_graph_id).await;
+
+//         println!("Waiting for peg-out start time tx...");
+//         sleep(Duration::from_secs(TX_WAIT_TIME)).await;
+
+//         println!("Broadcasting kick-off 2...");
+//         client.broadcast_kick_off_2(&peg_out_graph_id).await;
+
+//         println!("Waiting for peg-out kick-off 2 tx...");
+//         sleep(Duration::from_secs(TX_WAIT_TIME)).await;
+//     }
+
+//     if with_challenge_tx {
+//         let challenge_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
+//         let challenge_funding_utxo_address = generate_pay_to_pubkey_script_address(
+//             depositor_context.network,
+//             &depositor_context.depositor_public_key,
+//         );
+//         let faucet = Faucet::new(FaucetType::EsploraRegtest);
+//         faucet
+//             .fund_input_and_wait(&challenge_funding_utxo_address, challenge_input_amount)
+//             .await;
+
+//         let challenge_funding_outpoint = generate_stub_outpoint(
+//             &client,
+//             &challenge_funding_utxo_address,
+//             challenge_input_amount,
+//         )
+//         .await;
+//         let challenge_crowdfunding_input = InputWithScript {
+//             outpoint: challenge_funding_outpoint,
+//             amount: challenge_input_amount,
+//             script: &generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
+//         };
+//         println!("Broadcasting challenge...");
+//         client
+//             .broadcast_challenge(
+//                 &peg_out_graph_id,
+//                 &vec![challenge_crowdfunding_input],
+//                 generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
+//             )
+//             .await;
+
+//         println!("Waiting for peg-out challenge tx...");
+//         sleep(Duration::from_secs(TX_WAIT_TIME)).await;
+//     }
+
+//     if with_assert_tx {
+//         println!("Broadcasting assert...");
+//         client.broadcast_assert(&peg_out_graph_id).await;
+
+//         println!("Waiting for peg-out assert tx...");
+//         sleep(Duration::from_secs(TX_WAIT_TIME)).await;
+//     }
+// }
diff --git a/bridge/tests/bridge/e2e/mod.rs b/bridge/tests/bridge/e2e/mod.rs
new file mode 100644
index 000000000..cd23d2484
--- /dev/null
+++ b/bridge/tests/bridge/e2e/mod.rs
@@ -0,0 +1,3 @@
+pub mod chain;
+pub mod e2e_l2_ui;
+pub mod peg_out;
diff --git a/bridge/tests/bridge/e2e/peg_out/disprove_reject.rs b/bridge/tests/bridge/e2e/peg_out/disprove_reject.rs
new file mode 100644
index 000000000..71c808623
--- /dev/null
+++ b/bridge/tests/bridge/e2e/peg_out/disprove_reject.rs
@@ -0,0 +1,52 @@
+use bridge::error::{ChunkerError, Error};
+
+use colored::Colorize;
+use serial_test::serial;
+
+use super::utils::{broadcast_txs_for_disprove_scenario, create_peg_out_graph};
+
+#[tokio::test]
+#[serial(client)]
+async fn test_e2e_disprove_reject() {
+    let (
+        mut verifier_0_operator_depositor,
+        mut verifier_1,
+        peg_out_graph_id,
+        reward_script,
+        peg_out_input,
+        valid_proof,
+        _,
+    ) = create_peg_out_graph().await;
+
+    broadcast_txs_for_disprove_scenario(
+        &mut verifier_0_operator_depositor,
+        &mut verifier_1,
+        &peg_out_graph_id,
+        peg_out_input,
+        &valid_proof,
+    )
+    .await;
+
+    let result = verifier_1
+        .broadcast_disprove(&peg_out_graph_id, reward_script)
+        .await;
+
+    assert!(
+        matches!(result, Err(Error::Chunker(ChunkerError::ValidProof))),
+        "{}",
+        &format!(
+            "Should have failed with {} but got {:?}",
+            Error::Chunker(ChunkerError::ValidProof),
+            result
+        )
+        .bold()
+        .red(),
+    );
+
+    println!(
+        "{}",
+        "Successfully rejected disproving correct ZK proof"
+            .bold()
+            .green()
+    );
+}
diff --git a/bridge/tests/bridge/e2e/peg_out/disprove_success.rs b/bridge/tests/bridge/e2e/peg_out/disprove_success.rs
new file mode 100644
index 000000000..e6e5409e4
--- /dev/null
+++ b/bridge/tests/bridge/e2e/peg_out/disprove_success.rs
@@ -0,0 +1,43 @@
+use colored::Colorize;
+use serial_test::serial;
+
+use super::utils::{broadcast_txs_for_disprove_scenario, create_peg_out_graph};
+
+#[tokio::test]
+#[serial(client)]
+async fn test_e2e_disprove_success() {
+    let (
+        mut verifier_0_operator_depositor,
+        mut verifier_1,
+        peg_out_graph_id,
+        reward_script,
+        peg_out_input,
+        _,
+        invalid_proof,
+    ) = create_peg_out_graph().await;
+
+    broadcast_txs_for_disprove_scenario(
+        &mut verifier_0_operator_depositor,
+        &mut verifier_1,
+        &peg_out_graph_id,
+        peg_out_input,
+        &invalid_proof,
+    )
+    .await;
+
+    let result = verifier_1
+        .broadcast_disprove(&peg_out_graph_id, reward_script)
+        .await;
+
+    assert!(
+        result.is_ok(),
+        "{}: {}",
+        "Failed to disprove incorrect ZK proof".bold().red(),
+        result.unwrap_err()
+    );
+
+    println!(
+        "{}",
+        "Succesfully disproved incorrect ZK proof".bold().green()
+    );
+}
diff --git a/bridge/tests/bridge/e2e/peg_out/mod.rs b/bridge/tests/bridge/e2e/peg_out/mod.rs
new file mode 100644
index 000000000..010b6d2fa
--- /dev/null
+++ b/bridge/tests/bridge/e2e/peg_out/mod.rs
@@ -0,0 +1,3 @@
+pub mod disprove_reject;
+pub mod disprove_success;
+pub mod utils;
diff --git a/bridge/tests/bridge/e2e/peg_out/utils.rs b/bridge/tests/bridge/e2e/peg_out/utils.rs
new file mode 100644
index 000000000..4f067f69a
--- /dev/null
+++ b/bridge/tests/bridge/e2e/peg_out/utils.rs
@@ -0,0 +1,310 @@
+use bitcoin::{Address, Amount, ScriptBuf};
+use bitvm::chunk::api::type_conversion_utils::RawProof;
+use bridge::{
+    client::client::BitVMClient,
+    graphs::base::{BaseGraph, PEG_IN_FEE, PEG_OUT_FEE},
+    scripts::generate_pay_to_pubkey_script_address,
+    transactions::base::{Input, MIN_RELAY_FEE_PEG_OUT},
+};
+use colored::Colorize;
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{
+        generate_stub_outpoint, get_default_peg_out_event, print_tx_broadcasted,
+        wait_for_confirmation_with_message, wait_for_timelock_expiry,
+    },
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+pub async fn create_peg_in_graph(
+    depositor_verifier_0: &mut BitVMClient,
+    verifier_1: &mut BitVMClient,
+    deposit_input: Input,
+    depositor_evm_address: &String,
+) -> String {
+    println!("{}", "Creating PEG-IN graph...".bold().yellow());
+    let graph_id = depositor_verifier_0
+        .create_peg_in_graph(deposit_input, depositor_evm_address)
+        .await;
+
+    let peg_in_deposit_txid = depositor_verifier_0
+        .broadcast_peg_in_deposit(&graph_id)
+        .await
+        .expect("Failed to broadcast peg-in deposit");
+    print_tx_broadcasted("peg-in deposit", peg_in_deposit_txid);
+    wait_for_confirmation_with_message(
+        depositor_verifier_0.source_network,
+        Some("peg-in deposit tx"),
+    )
+    .await;
+
+    println!("{}", "PEG-IN ceremony start".bold().yellow());
+    println!("{}", "Generate verifier 0 nonces".bold().magenta());
+    depositor_verifier_0.push_verifier_nonces(&graph_id);
+    println!("{}", "Flush verifier 0 nonces".bold().magenta());
+    depositor_verifier_0.flush().await;
+
+    println!("{}", "Sync verifier 1".bold().blue());
+    verifier_1.sync().await;
+    println!("{}", "Generate verifier 1 nonces".bold().blue());
+    verifier_1.push_verifier_nonces(&graph_id);
+    println!("{}", "Flush verifier 1 nonces".bold().blue());
+    verifier_1.flush().await;
+
+    println!("{}", "Sync verifier 0".bold().magenta());
+    depositor_verifier_0.sync().await;
+    println!("{}", "Generate verifier 0 signatures".bold().magenta());
+    depositor_verifier_0.push_verifier_signature(&graph_id);
+    println!("{}", "Flush verifier 0 signatures".bold().magenta());
+    depositor_verifier_0.flush().await;
+
+    println!("{}", "Sync verifier 1".bold().blue());
+    verifier_1.sync().await;
+    println!("{}", "Generate verifier 1 signatures".bold().blue());
+    verifier_1.push_verifier_signature(&graph_id);
+    println!("{}", "Flush verifier 1 signatures".bold().blue());
+    verifier_1.flush().await;
+    println!("{}", "PEG-IN ceremony finish".bold().yellow());
+
+    println!("{}", "Sync verifier 0".bold().magenta());
+    depositor_verifier_0.sync().await;
+
+    let peg_in_confirm_txid = depositor_verifier_0
+        .broadcast_peg_in_confirm(&graph_id)
+        .await
+        .expect("Failed to broadcast peg-in confirm");
+    print_tx_broadcasted("peg-in confirm", peg_in_confirm_txid);
+    wait_for_confirmation_with_message(
+        depositor_verifier_0.source_network,
+        Some("peg-in confirm tx"),
+    )
+    .await;
+
+    graph_id
+}
+
+pub async fn create_peg_out_graph() -> (
+    BitVMClient,
+    BitVMClient,
+    String,
+    ScriptBuf,
+    Input,
+    RawProof,
+    RawProof,
+) {
+    let config = setup_test().await;
+    let mut verifier_0_operator_depositor = config.client_0;
+    let mut verifier_1 = config.client_1;
+
+    // verify funding inputs
+    let mut funding_inputs: Vec<(&Address, Amount)> = Vec::new();
+
+    let deposit_input_amount = Amount::from_sat(INITIAL_AMOUNT + PEG_IN_FEE);
+    let deposit_funding_address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
+    );
+    funding_inputs.push((&deposit_funding_address, deposit_input_amount));
+
+    let peg_out_input_amount = Amount::from_sat(INITIAL_AMOUNT + MIN_RELAY_FEE_PEG_OUT);
+    let peg_out_funding_address = generate_pay_to_pubkey_script_address(
+        config.operator_context.network,
+        &config.operator_context.operator_public_key,
+    );
+    funding_inputs.push((&peg_out_funding_address, peg_out_input_amount));
+
+    let peg_out_confirm_input_amount = Amount::from_sat(INITIAL_AMOUNT + PEG_OUT_FEE);
+    let peg_out_confirm_funding_address = generate_pay_to_pubkey_script_address(
+        config.operator_context.network,
+        &config.operator_context.operator_public_key,
+    );
+    funding_inputs.push((
+        &peg_out_confirm_funding_address,
+        peg_out_confirm_input_amount,
+    ));
+
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    faucet
+        .fund_inputs(&verifier_0_operator_depositor, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    // create peg-in graph
+    let peg_in_deposit_outpoint = generate_stub_outpoint(
+        &verifier_0_operator_depositor,
+        &deposit_funding_address,
+        deposit_input_amount,
+    )
+    .await;
+
+    let peg_in_graph_id = create_peg_in_graph(
+        &mut verifier_0_operator_depositor,
+        &mut verifier_1,
+        Input {
+            outpoint: peg_in_deposit_outpoint,
+            amount: deposit_input_amount,
+        },
+        &config.depositor_evm_address,
+    )
+    .await;
+
+    // create peg-out graph
+    let peg_out_confirm_outpoint = generate_stub_outpoint(
+        &verifier_0_operator_depositor,
+        &peg_out_confirm_funding_address,
+        peg_out_confirm_input_amount,
+    )
+    .await;
+    verifier_0_operator_depositor.sync().await;
+
+    println!("{}", "Creating PEG-OUT graph...".bold().yellow());
+    let peg_out_graph_id = verifier_0_operator_depositor.create_peg_out_graph(
+        &peg_in_graph_id,
+        Input {
+            outpoint: peg_out_confirm_outpoint,
+            amount: peg_out_confirm_input_amount,
+        },
+        config.commitment_secrets,
+    );
+
+    println!("{}", "PEG-OUT ceremony start".bold().yellow());
+    println!("{}", "Generate verifier 0 nonces".bold().magenta());
+    verifier_0_operator_depositor.push_verifier_nonces(&peg_out_graph_id);
+    println!("{}", "Flush verifier 0 nonces".bold().magenta());
+    verifier_0_operator_depositor.flush().await;
+
+    println!("{}", "Sync verifier 1".bold().blue());
+    verifier_1.sync().await;
+    println!("{}", "Generate verifier 1 nonces".bold().blue());
+    verifier_1.push_verifier_nonces(&peg_out_graph_id);
+    println!("{}", "Flush verifier 1 nonces".bold().blue());
+    verifier_1.flush().await;
+
+    println!("{}", "Sync verifier 0".bold().magenta());
+    verifier_0_operator_depositor.sync().await;
+    println!("{}", "Generate verifier 0 signatures".bold().magenta());
+    verifier_0_operator_depositor.push_verifier_signature(&peg_out_graph_id);
+    println!("{}", "Flush verifier 0 signatures".bold().magenta());
+    verifier_0_operator_depositor.flush().await;
+
+    println!("{}", "Sync verifier 1".bold().blue());
+    verifier_1.sync().await;
+    println!("{}", "Generate verifier 1 signatures".bold().blue());
+    verifier_1.push_verifier_signature(&peg_out_graph_id);
+    println!("{}", "Flush verifier 1 signatures".bold().blue());
+    verifier_1.flush().await;
+    println!("{}", "PEG-OUT ceremony finish".bold().yellow());
+
+    let reward_address = generate_pay_to_pubkey_script_address(
+        config.verifier_1_context.network,
+        &config.verifier_1_context.verifier_public_key,
+    );
+    let reward_script = reward_address.script_pubkey();
+
+    let peg_out_outpoint = generate_stub_outpoint(
+        &verifier_0_operator_depositor,
+        &peg_out_funding_address,
+        peg_out_input_amount,
+    )
+    .await;
+
+    (
+        verifier_0_operator_depositor,
+        verifier_1,
+        peg_out_graph_id,
+        reward_script,
+        Input {
+            outpoint: peg_out_outpoint,
+            amount: peg_out_input_amount,
+        },
+        config.valid_proof,
+        config.invalid_proof,
+    )
+}
+
+pub async fn broadcast_txs_for_disprove_scenario(
+    operator: &mut BitVMClient,
+    verifier_1: &mut BitVMClient,
+    peg_out_graph_id: &String,
+    peg_out_input: Input,
+    proof: &RawProof,
+) {
+    let network = operator.source_network;
+    println!("{}", "Sync operator".bold().cyan());
+    operator.sync().await;
+
+    let peg_out_graph = operator
+        .data_mut()
+        .peg_out_graphs
+        .iter_mut()
+        .find(|x| x.id() == peg_out_graph_id)
+        .expect(&format!("Peg-out graph {peg_out_graph_id} not found"));
+
+    // set arbitrary peg_out_chain_event
+    peg_out_graph.peg_out_chain_event = Some(get_default_peg_out_event());
+
+    let peg_out_txid = operator
+        .broadcast_peg_out(peg_out_graph_id, peg_out_input)
+        .await
+        .expect("Failed to broadcast peg-out");
+    print_tx_broadcasted("peg-out", peg_out_txid);
+    wait_for_confirmation_with_message(network, Some("peg-out tx")).await;
+
+    let peg_out_confirm_txid = operator
+        .broadcast_peg_out_confirm(peg_out_graph_id)
+        .await
+        .expect("Failed to broadcast peg-out confirm");
+    print_tx_broadcasted("peg-out confirm", peg_out_confirm_txid);
+    wait_for_confirmation_with_message(network, Some("peg-out confirm tx")).await;
+
+    let kick_off_1_txid = operator
+        .broadcast_kick_off_1(peg_out_graph_id)
+        .await
+        .expect("Failed to broadcast kick-off 1");
+    print_tx_broadcasted("kick-off 1", kick_off_1_txid);
+    wait_for_timelock_expiry(network, Some("kick-off 1 connector 1")).await;
+
+    let kick_off_2_txid = operator
+        .broadcast_kick_off_2(peg_out_graph_id)
+        .await
+        .expect("Failed to broadcast kick-off 2");
+    print_tx_broadcasted("kick-off 2", kick_off_2_txid);
+    wait_for_timelock_expiry(network, Some("kick-off 2 connector B")).await;
+
+    let assert_initial_txid = operator
+        .broadcast_assert_initial(peg_out_graph_id)
+        .await
+        .expect("Failed to broadcast assert-initial");
+    print_tx_broadcasted("assert-initial", assert_initial_txid);
+    wait_for_confirmation_with_message(network, Some("assert-initial tx")).await;
+
+    let assert_commit_1_txid = operator
+        .broadcast_assert_commit_1(peg_out_graph_id, proof)
+        .await
+        .expect("Failed to broadcast assert-commit 1");
+    print_tx_broadcasted("assert-commit 1", assert_commit_1_txid);
+
+    let assert_commit_2_txid = operator
+        .broadcast_assert_commit_2(peg_out_graph_id, proof)
+        .await
+        .expect("Failed to broadcast assert-commit 2");
+    print_tx_broadcasted("assert-commit 2", assert_commit_2_txid);
+
+    wait_for_confirmation_with_message(network, Some("assert-commit 1 and assert-commit 2 txs"))
+        .await;
+
+    let assert_final_txid = operator
+        .broadcast_assert_final(peg_out_graph_id)
+        .await
+        .expect("Failed to broadcast assert-final");
+    print_tx_broadcasted("assert-final", assert_final_txid);
+    wait_for_confirmation_with_message(network, Some("assert-final tx")).await;
+
+    println!("{}", "Flush operator txs".bold().cyan());
+    operator.flush().await;
+
+    println!("{}", "Sync verifier 1".bold().blue());
+    verifier_1.sync().await;
+}
diff --git a/bridge/tests/bridge/faucet.rs b/bridge/tests/bridge/faucet.rs
new file mode 100644
index 000000000..0aef553b5
--- /dev/null
+++ b/bridge/tests/bridge/faucet.rs
@@ -0,0 +1,196 @@
+use alloy::transports::http::{
+    reqwest::{Error, Response, StatusCode},
+    Client,
+};
+use bitcoin::{Address, Amount, Network, Txid};
+use bridge::client::client::BitVMClient;
+use rand::Rng;
+use serde::{Deserialize, Serialize};
+use std::{collections::HashMap, process::Command, time::Duration};
+use tokio::time::sleep;
+
+use super::helper::wait_for_confirmation_with_message;
+
+const ALPEN_SIGNET_ESPLORA_URL: &str = "https://esploraapi53d3659b.devnet-annapurna.stratabtc.org/";
+
+const ESPLORA_RETRIES: usize = 5;
+const ESPLORA_RETRY_WAIT_TIME: u64 = 10;
+
+#[derive(Serialize, Deserialize)]
+struct FundResult {
+    txid: Txid,
+    address: String,
+}
+
+pub enum FaucetType {
+    Signet,
+    EsploraRegtest,
+}
+
+pub struct Faucet {
+    faucet_type: FaucetType,
+    client: Client,
+}
+
+impl Default for Faucet {
+    fn default() -> Self { Self::new(FaucetType::EsploraRegtest) }
+}
+
+impl Faucet {
+    pub fn new(faucet_type: FaucetType) -> Self {
+        let client = Client::builder()
+            .build()
+            .expect("Unable to build reqwest client");
+        Self {
+            client,
+            faucet_type,
+        }
+    }
+
+    fn get_network(&self) -> Network {
+        match self.faucet_type {
+            FaucetType::Signet => Network::Signet,
+            FaucetType::EsploraRegtest => Network::Regtest,
+        }
+    }
+
+    pub async fn wait(&self) {
+        wait_for_confirmation_with_message(self.get_network(), Some("funding inputs tx")).await;
+    }
+
+    pub async fn fund_input(&self, address: &Address, amount: Amount) -> &Self {
+        match self.faucet_type {
+            FaucetType::Signet => self.fund_input_with_retry(address, amount).await,
+            FaucetType::EsploraRegtest => self.fund_input_by_cli(address, amount),
+        };
+        self
+    }
+
+    pub async fn fund_inputs(
+        &self,
+        client: &BitVMClient,
+        funding_inputs: &Vec<(&Address, Amount)>,
+    ) -> &Self {
+        let addr_count =
+            funding_inputs
+                .iter()
+                .fold(HashMap::<&Address, usize>::new(), |mut map, input| {
+                    *map.entry(input.0).or_insert(0) += 1;
+                    map
+                });
+        for input in funding_inputs {
+            let utxos = client.get_initial_utxos(input.0.clone(), input.1).await;
+            let expected_count = *addr_count.get(input.0).unwrap_or(&0);
+            if utxos.is_none() || utxos.is_some_and(|x| x.len() < expected_count) {
+                match self.faucet_type {
+                    FaucetType::Signet => self.fund_input_with_retry(input.0, input.1).await,
+                    FaucetType::EsploraRegtest => self.fund_input_by_cli(input.0, input.1),
+                };
+            }
+        }
+        self
+    }
+
+    fn fund_input_by_cli(&self, address: &Address, amount: Amount) -> Txid {
+        let funding_command = format!("/srv/explorer/bitcoin/bin/bitcoin-cli -conf=/data/.bitcoin.conf -datadir=/data/bitcoin sendtoaddress {} {}", address, amount.to_btc());
+        let command = format!(
+            r#"docker exec $(docker ps | grep blockstream/esplora | awk '{}') /bin/bash -c "{}""#,
+            "{print $1}", funding_command
+        );
+        let output = Command::new("/bin/bash")
+            .args(["-c", command.as_str()])
+            .output()
+            .unwrap_or_else(|_| panic!("failed to execute command: {}", command));
+
+        let txid = String::from_utf8_lossy(&output.stdout);
+        txid.trim()
+            .parse()
+            .unwrap_or_else(|_| panic!("error: {:?}", output))
+    }
+
+    async fn fund_input_with_retry(&self, address: &Address, amount: Amount) -> Txid {
+        let client_err_handler = |e: Error| {
+            panic!("Could not fund {} due to {:?}", address, e);
+        };
+        let mut resp = self
+            ._fund_input(address, amount)
+            .await
+            .unwrap_or_else(client_err_handler);
+
+        let mut retry = 0;
+        while resp.status().eq(&StatusCode::SERVICE_UNAVAILABLE) && retry <= ESPLORA_RETRIES {
+            retry += 1;
+            eprintln!("Retrying({}/{}) {:?}...", retry, ESPLORA_RETRIES, address);
+            sleep(Duration::from_millis(Self::get_random_millis(
+                ESPLORA_RETRY_WAIT_TIME * 1000,
+                ESPLORA_RETRY_WAIT_TIME * 10000,
+            )))
+            .await;
+            // sleep(Duration::from_secs(ESPLORA_RETRY_WAIT_TIME)).await;
+            resp = self
+                ._fund_input(address, amount)
+                .await
+                .unwrap_or_else(client_err_handler);
+        }
+
+        if resp.status().is_client_error() || resp.status().is_server_error() {
+            panic!(
+                "Could not fund {} with respond code {:?}, response: {:?}",
+                address,
+                resp.status(),
+                resp.text().await,
+            );
+        }
+
+        let result = resp.json::<FundResult>().await.unwrap();
+        println!("Funded at: {}", result.txid);
+
+        result.txid
+    }
+
+    async fn _fund_input(&self, address: &Address, amount: Amount) -> Result<Response, Error> {
+        let payload = format!(
+            "{{\"sats\":{},\"address\":\"{}\"}}",
+            amount.to_sat(),
+            address
+        );
+
+        println!(
+            "Funding {:?} with {} sats at {}",
+            address,
+            amount.to_sat(),
+            ALPEN_SIGNET_ESPLORA_URL,
+        );
+
+        Self::http_post(
+            &self.client,
+            format!("{}api/onchain", ALPEN_SIGNET_ESPLORA_URL),
+            payload,
+        )
+        .await
+    }
+
+    pub async fn http_post(
+        client: &Client,
+        url: String,
+        payload: String,
+    ) -> Result<Response, Error> {
+        let resp = client
+            .post(url)
+            .body(payload)
+            .header("CONTENT-TYPE", "application/json")
+            .send()
+            .await;
+
+        // recreate Result due to Response/Error version mismatch
+        match resp {
+            Ok(resp) => Ok(resp),
+            Err(e) => Err(e),
+        }
+    }
+
+    pub fn get_random_millis(from: u64, to: u64) -> u64 {
+        let mut rng = rand::thread_rng();
+        rng.gen_range(from..to)
+    }
+}
diff --git a/bridge/tests/bridge/helper.rs b/bridge/tests/bridge/helper.rs
new file mode 100644
index 000000000..5b0e5dc46
--- /dev/null
+++ b/bridge/tests/bridge/helper.rs
@@ -0,0 +1,324 @@
+use std::{borrow::Cow, collections::BTreeMap, path::Path, str::FromStr, time::Duration};
+
+use ark_bn254::g1::G1Affine;
+use ark_std::{test_rng, UniformRand};
+
+use bitcoin::hashes::hash160::Hash;
+use bitcoin::{
+    block::{Header, Version},
+    hex::{Case::Lower, DisplayHex},
+    Address, Amount, BlockHash, CompactTarget, Network, OutPoint, Transaction, TxMerkleNode,
+};
+use bitcoin::{PubkeyHash, PublicKey, Txid};
+
+use bitvm::chunk::api::type_conversion_utils::RawProof;
+use bitvm::chunk::api::{NUM_PUBS, NUM_U160, NUM_U256};
+use bridge::client::chain::chain::PegOutEvent;
+use bridge::proof::get_proof;
+use bridge::{
+    client::client::BitVMClient,
+    graphs::{
+        base::{BaseGraph, REWARD_MULTIPLIER, REWARD_PRECISION},
+        peg_in::PegInGraph,
+        peg_out::PegOutGraph,
+    },
+    utils::{num_blocks_per_network, read_disk_cache, write_disk_cache},
+};
+
+use colored::Colorize;
+use rand::{RngCore, SeedableRng};
+use tokio::time::sleep;
+
+// Test environment config file and its variables
+const TEST_ENV_FILE: &str = ".env.test";
+const REGTEST_BLOCK_TIME: &str = "REGTEST_BLOCK_TIME";
+
+fn load_u32_env_var_from_file(var: &str, file_name: &str) -> u32 {
+    dotenv::from_filename(file_name)
+        .expect(format!("Please create a {file_name} file with the {var} variable").as_str());
+    dotenv::var(var)
+        .expect(format!("{var} variable missing in {file_name}").as_str())
+        .parse()
+        .expect(format!("Could not parse {var} specified in {file_name}").as_str())
+}
+
+/// Returns expected block time for the given network in seconds.
+fn network_block_time(network: Network) -> u32 {
+    match network {
+        Network::Regtest => load_u32_env_var_from_file(REGTEST_BLOCK_TIME, TEST_ENV_FILE),
+        _ => 35, // Testnet, signet. This value is for Alpen signet. See https://mempool0713bb23.devnet-annapurna.stratabtc.org/
+    }
+}
+
+/// Provides a safe waiting duration in seconds for transaction confirmation on the specified network.
+/// This duration must be at least as long as the expected block time for that network.
+/// Returns network block time + 1 second to avoid race conditions.
+fn tx_wait_time(network: Network) -> u64 { (network_block_time(network) + 1).into() }
+
+pub const TX_RELAY_FEE_CHECK_FAIL_MSG: &str =
+    "Output sum should be equal to initial amount, check MIN_RELAY_FEE_* definitions?";
+
+pub fn check_tx_output_sum(input_amount_without_relay_fee: u64, tx: &Transaction) {
+    assert_eq!(
+        input_amount_without_relay_fee,
+        tx.output.iter().map(|o| o.value.to_sat()).sum::<u64>(),
+        "{TX_RELAY_FEE_CHECK_FAIL_MSG}"
+    );
+}
+
+pub fn get_reward_amount(initial_amount: u64) -> u64 {
+    initial_amount * REWARD_MULTIPLIER / REWARD_PRECISION
+}
+
+const DURATION_COLOR: &str = "\x1b[30;46m"; // Black on cyan background
+const RESET_COLOR: &str = "\x1b[0m";
+
+async fn wait_with_message(timeout: Duration, message: &str) {
+    println!(
+        "Waiting {DURATION_COLOR}{:?}{RESET_COLOR}{}...",
+        timeout, message
+    );
+    sleep(timeout).await;
+}
+
+pub async fn wait_for_confirmation_with_message(network: Network, message: Option<&str>) {
+    let timeout = Duration::from_secs(tx_wait_time(network));
+    let message = format!(" for {}", message.unwrap_or("tx confirmation"));
+
+    wait_with_message(timeout, message.as_str()).await;
+}
+
+pub async fn wait_for_confirmation(network: Network) {
+    wait_for_confirmation_with_message(network, None).await;
+}
+
+pub async fn wait_for_timelock_expiry(network: Network, timelock_name: Option<&str>) {
+    // Note that the extra 1 second from tx_wait_time() compounds here. Normally this will not be an issue.
+    // You'll just wait a couple seconds longer than the required number of blocks. However, if you need to
+    // wait for an exact number of seconds, consider using a simple sleep (or adding a sister helper function).
+    let tx_wait_time = tx_wait_time(network);
+    let timeout = Duration::from_secs(
+        tx_wait_time * num_blocks_per_network(network, 0) as u64 + tx_wait_time,
+    );
+    let message = format!(
+        " for{} timelock to expire",
+        match timelock_name {
+            Some(timelock_name) => format!(" {}", timelock_name),
+            None => String::new(),
+        }
+    );
+
+    wait_with_message(timeout, message.as_str()).await;
+}
+
+pub async fn generate_stub_outpoint(
+    client: &BitVMClient,
+    funding_utxo_address: &Address,
+    input_value: Amount,
+) -> OutPoint {
+    let funding_utxo = client
+        .get_initial_utxo(funding_utxo_address.clone(), input_value)
+        .await
+        .unwrap_or_else(|| {
+            panic!(
+                "Fund {:?} with {} sats at {}",
+                funding_utxo_address,
+                input_value.to_sat(),
+                client.esplora.url(),
+            );
+        });
+    OutPoint {
+        txid: funding_utxo.txid,
+        vout: funding_utxo.vout,
+    }
+}
+
+pub async fn generate_stub_outpoints(
+    client: &BitVMClient,
+    funding_utxo_address: &Address,
+    input_value: Amount,
+) -> Vec<OutPoint> {
+    let funding_utxos = client
+        .get_initial_utxos(funding_utxo_address.clone(), input_value)
+        .await
+        .unwrap_or_else(|| {
+            panic!(
+                "Fund {:?} with {} sats at {}",
+                funding_utxo_address,
+                input_value.to_sat(),
+                client.esplora.url(),
+            );
+        });
+    funding_utxos
+        .iter()
+        .map(|utxo| OutPoint {
+            txid: utxo.txid,
+            vout: utxo.vout,
+        })
+        .collect()
+}
+
+pub async fn verify_funding_inputs(client: &BitVMClient, funding_inputs: &Vec<(&Address, Amount)>) {
+    let mut inputs_to_fund: Vec<(&Address, Amount)> = vec![];
+
+    for funding_input in funding_inputs {
+        if client
+            .get_initial_utxo(funding_input.0.clone(), funding_input.1)
+            .await
+            .is_none()
+        {
+            inputs_to_fund.push((funding_input.0, funding_input.1));
+        }
+    }
+
+    for input_to_fund in inputs_to_fund.clone() {
+        println!(
+            "Fund {:?} with {} sats at {}",
+            input_to_fund.0,
+            input_to_fund.1.to_sat(),
+            client.esplora.url(),
+        );
+    }
+    if !inputs_to_fund.is_empty() {
+        panic!("You need to fund {} addresses first.", inputs_to_fund.len());
+    }
+}
+
+pub fn find_peg_in_graph(client: &BitVMClient, peg_in_graph_id: &str) -> Option<PegInGraph> {
+    let peg_in_graph = client
+        .data()
+        .peg_in_graphs
+        .iter()
+        .find(|&graph| graph.id().eq(peg_in_graph_id));
+
+    peg_in_graph.cloned()
+}
+
+pub fn find_peg_out_graph(client: &BitVMClient, peg_out_graph_id: &str) -> Option<PegOutGraph> {
+    let peg_out_graph = client
+        .data()
+        .peg_out_graphs
+        .iter()
+        .find(|&graph| graph.id().eq(&peg_out_graph_id));
+
+    peg_out_graph.cloned()
+}
+
+pub fn find_peg_in_graph_by_peg_out(
+    client: &BitVMClient,
+    peg_out_graph_id: &str,
+) -> Option<PegInGraph> {
+    let peg_out_graph = find_peg_out_graph(client, peg_out_graph_id);
+    match peg_out_graph {
+        Some(peg_out_graph) => find_peg_in_graph(client, &peg_out_graph.peg_in_graph_id),
+        None => None,
+    }
+}
+
+pub fn get_superblock_header() -> Header {
+    Header {
+        version: Version::from_consensus(0x200d2000),
+        prev_blockhash: BlockHash::from_str(
+            "000000000000000000027c9f5b07f21e39ba31aa4d900d519478bdac32f4a15d",
+        )
+        .unwrap(),
+        merkle_root: TxMerkleNode::from_str(
+            "0064b0d54f20412756ba7ce07b0594f3548b06f2dad5cfeaac2aca508634ed19",
+        )
+        .unwrap(),
+        time: 1729251961,
+        bits: CompactTarget::from_hex("0x17030ecd").unwrap(),
+        nonce: 0x400e345c,
+    }
+}
+
+pub fn get_default_peg_out_event() -> PegOutEvent {
+    PegOutEvent {
+        withdrawer_chain_address: "".to_string(),
+        withdrawer_destination_address: "".to_string(),
+        withdrawer_public_key_hash: PubkeyHash::from_raw_hash(
+            Hash::from_str("0e6719ac074b0e3cac76d057643506faa1c266b3").unwrap(),
+        ),
+        source_outpoint: OutPoint {
+            txid: Txid::from_str(
+                "0e6719ac074b0e3cac76d057643506faa1c266b322aa9cf4c6f635fe63b14327",
+            )
+            .unwrap(),
+            vout: 0,
+        },
+        amount: Amount::from_sat(0),
+        operator_public_key: PublicKey::from_str(
+            "03484db4a2950d63da8455a1b705b39715e4075dd33511d0c7e3ce308c93449deb",
+        )
+        .unwrap(),
+        timestamp: 0,
+        tx_hash: vec![],
+    }
+}
+
+pub fn random_hex<'a>(size: usize) -> Cow<'a, str> {
+    let mut buffer = vec![0u8; size];
+    let mut rng = rand::rngs::OsRng;
+    rand::RngCore::fill_bytes(&mut rng, &mut buffer);
+    Cow::Owned(buffer.to_hex_string(Lower))
+}
+
+const TEST_CACHE_DIRECTORY_NAME: &str = "test_cache";
+const INTERMEDIATE_VARIABLES_FILE_NAME: &str = "intermediates.bin";
+
+pub fn get_intermediate_variables_cached() -> BTreeMap<String, usize> {
+    let intermediate_variables_cache_path =
+        Path::new(TEST_CACHE_DIRECTORY_NAME).join(INTERMEDIATE_VARIABLES_FILE_NAME);
+    let intermediate_variables = if intermediate_variables_cache_path.exists() {
+        read_disk_cache(&intermediate_variables_cache_path)
+            .inspect_err(|e| {
+                eprintln!(
+                    "Failed to read intermediate variables cache after validates its existence: {}",
+                    e
+                );
+            })
+            .ok()
+    } else {
+        None
+    };
+
+    intermediate_variables.unwrap_or_else(|| {
+        println!("Generating new intermediate variables...");
+        let mut intermediate_variables: BTreeMap<String, usize> = BTreeMap::new();
+        for i in 0..NUM_PUBS {
+            intermediate_variables.insert(
+                format!("{}", i),
+                32,
+            );
+        }
+        for i in 0..NUM_U256 {
+            intermediate_variables.insert(
+                format!("{}", i+NUM_PUBS),
+                32,
+            );
+        }
+        for i in 0..NUM_U160 {
+            intermediate_variables.insert(
+                format!("{}", i+NUM_PUBS+NUM_U256),
+                20,
+            );
+        }
+        
+        write_disk_cache(&intermediate_variables_cache_path, &intermediate_variables).unwrap();
+        intermediate_variables
+    })
+}
+
+pub fn get_valid_proof() -> RawProof { get_proof() }
+
+pub fn invalidate_proof(valid_proof: &RawProof) -> RawProof {
+    let mut invalid_proof = valid_proof.clone();
+    let mut rng = ark_std::rand::rngs::StdRng::seed_from_u64(test_rng().next_u64());
+    invalid_proof.proof.a = G1Affine::rand(&mut rng);
+
+    invalid_proof
+}
+
+pub fn print_tx_broadcasted(tx_name: &str, txid: Txid) {
+    println!("Broadcasted {} with txid: {txid}", tx_name.bold().green(),);
+}
diff --git a/tests/bridge/integration/mod.rs b/bridge/tests/bridge/integration/mod.rs
similarity index 68%
rename from tests/bridge/integration/mod.rs
rename to bridge/tests/bridge/integration/mod.rs
index 126e5f9e4..9ac520648 100644
--- a/tests/bridge/integration/mod.rs
+++ b/bridge/tests/bridge/integration/mod.rs
@@ -1,3 +1,2 @@
-pub mod chain;
 pub mod peg_in;
 pub mod peg_out;
diff --git a/tests/bridge/integration/peg_in/mod.rs b/bridge/tests/bridge/integration/peg_in/mod.rs
similarity index 100%
rename from tests/bridge/integration/peg_in/mod.rs
rename to bridge/tests/bridge/integration/peg_in/mod.rs
diff --git a/bridge/tests/bridge/integration/peg_in/peg_in.rs b/bridge/tests/bridge/integration/peg_in/peg_in.rs
new file mode 100644
index 000000000..e68681c10
--- /dev/null
+++ b/bridge/tests/bridge/integration/peg_in/peg_in.rs
@@ -0,0 +1,474 @@
+use std::time::Duration;
+
+use bitcoin::{Amount, OutPoint};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{generate_stub_outpoint, get_reward_amount, wait_for_timelock_expiry},
+    setup::{setup_test, SetupConfig, INITIAL_AMOUNT, ONE_HUNDRED},
+};
+use bridge::{
+    client::client::BitVMClient,
+    connectors::{base::TaprootConnector, connector_0::Connector0},
+    graphs::{
+        base::{BaseGraph, PEG_OUT_FEE},
+        peg_in::PegInVerifierStatus,
+    },
+    scripts::generate_pay_to_pubkey_script_address,
+    transactions::{
+        base::{
+            BaseTransaction, Input, MIN_RELAY_FEE_PEG_IN_CONFIRM, MIN_RELAY_FEE_PEG_IN_DEPOSIT,
+            MIN_RELAY_FEE_PEG_IN_REFUND,
+        },
+        peg_in_confirm::PegInConfirmTransaction,
+        peg_in_deposit::PegInDepositTransaction,
+        peg_in_refund::PegInRefundTransaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+use esplora_client::Error;
+use tokio::time::sleep;
+
+#[tokio::test]
+async fn test_peg_in_success() {
+    let config = setup_test().await;
+    let amount = INITIAL_AMOUNT + MIN_RELAY_FEE_PEG_IN_DEPOSIT + MIN_RELAY_FEE_PEG_IN_CONFIRM;
+    let deposit_input = get_pegin_input(&config, amount).await;
+
+    let peg_in_deposit = PegInDepositTransaction::new(
+        &config.depositor_context,
+        &config.connector_z,
+        deposit_input,
+    );
+
+    let peg_in_deposit_tx = peg_in_deposit.finalize();
+    let deposit_txid = peg_in_deposit_tx.compute_txid();
+
+    // mine peg-in deposit
+    let deposit_result = config.client_0.esplora.broadcast(&peg_in_deposit_tx).await;
+    println!("Peg-in Deposit tx result: {:?}\n", deposit_result);
+    assert!(deposit_result.is_ok());
+    println!("Deposit Txid: {:?}", deposit_txid);
+
+    // peg-in confirm
+    let output_index = 0;
+    let confirm_funding_outpoint = OutPoint {
+        txid: deposit_txid,
+        vout: output_index,
+    };
+    let confirm_input = Input {
+        outpoint: confirm_funding_outpoint,
+        amount: peg_in_deposit_tx.output[output_index as usize].value,
+    };
+    let mut peg_in_confirm = PegInConfirmTransaction::new(
+        &config.depositor_context,
+        &config.connector_0,
+        &config.connector_z,
+        confirm_input,
+    );
+
+    let secret_nonces_0 = peg_in_confirm.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = peg_in_confirm.push_nonces(&config.verifier_1_context);
+
+    peg_in_confirm.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_z,
+        &secret_nonces_0,
+    );
+    peg_in_confirm.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_z,
+        &secret_nonces_1,
+    );
+
+    let peg_in_confirm_tx = peg_in_confirm.finalize();
+    let confirm_txid = peg_in_confirm_tx.compute_txid();
+
+    // mine peg-in confirm
+    let confirm_result = config.client_0.esplora.broadcast(&peg_in_confirm_tx).await;
+    println!("Peg-in Confirm tx result: {:?}\n", confirm_result);
+    assert!(confirm_result.is_ok());
+    println!("Confirm Txid: {:?}", confirm_txid);
+
+    // multi-sig balance
+    let connector_0 = Connector0::new(
+        config.depositor_context.network,
+        &config.depositor_context.n_of_n_taproot_public_key,
+    );
+    let multi_sig_address = connector_0.generate_taproot_address();
+    let multi_sig_utxos = config
+        .client_0
+        .esplora
+        .get_address_utxo(multi_sig_address.clone())
+        .await
+        .unwrap();
+    let multi_sig_utxo = multi_sig_utxos
+        .clone()
+        .into_iter()
+        .find(|x| x.txid == confirm_txid);
+
+    // assert
+    assert!(multi_sig_utxo.is_some());
+    assert_eq!(
+        multi_sig_utxo.unwrap().value,
+        peg_in_confirm_tx.output[0].value,
+    );
+    assert_eq!(
+        peg_in_confirm_tx.output[0].value,
+        Amount::from_sat(INITIAL_AMOUNT),
+    );
+}
+
+#[tokio::test]
+async fn test_peg_in_time_lock_not_surpassed() {
+    let config = setup_test().await;
+    let deposit_input = get_pegin_input(
+        &config,
+        INITIAL_AMOUNT + MIN_RELAY_FEE_PEG_IN_DEPOSIT + MIN_RELAY_FEE_PEG_IN_REFUND,
+    )
+    .await;
+
+    let peg_in_deposit = PegInDepositTransaction::new(
+        &config.depositor_context,
+        &config.connector_z,
+        deposit_input,
+    );
+    let peg_in_deposit_tx = peg_in_deposit.finalize();
+    let deposit_txid = peg_in_deposit_tx.compute_txid();
+
+    // mine peg-in deposit
+    let deposit_result = config.client_0.esplora.broadcast(&peg_in_deposit_tx).await;
+    println!("Peg-in Deposit tx result: {:?}\n", deposit_result);
+    assert!(deposit_result.is_ok());
+
+    // peg-in refund
+    let output_index = 0;
+    let refund_funding_outpoint = OutPoint {
+        txid: deposit_txid,
+        vout: output_index,
+    };
+    let refund_input = Input {
+        outpoint: refund_funding_outpoint,
+        amount: peg_in_deposit_tx.output[output_index as usize].value,
+    };
+    let peg_in_refund =
+        PegInRefundTransaction::new(&config.depositor_context, &config.connector_z, refund_input);
+    let peg_in_refund_tx = peg_in_refund.finalize();
+
+    // mine peg-in refund
+    let refund_result = config.client_0.esplora.broadcast(&peg_in_refund_tx).await;
+    println!("Peg-in Refund tx result: {:?}\n", refund_result);
+    assert!(refund_result.is_err());
+    let error = refund_result.unwrap_err();
+    let expected_error = Error::HttpResponse {
+        status: 400,
+        message: String::from(
+            "sendrawtransaction RPC error: {\"code\":-26,\"message\":\"non-BIP68-final\"}",
+        ), // indicates that relative timelock based on sequence numbers has not elapsed
+    };
+    assert_eq!(error.to_string(), expected_error.to_string());
+}
+
+#[tokio::test]
+async fn test_peg_in_time_lock_surpassed() {
+    let config = setup_test().await;
+    let deposit_input = get_pegin_input(
+        &config,
+        INITIAL_AMOUNT + MIN_RELAY_FEE_PEG_IN_DEPOSIT + MIN_RELAY_FEE_PEG_IN_REFUND,
+    )
+    .await;
+
+    let peg_in_deposit = PegInDepositTransaction::new(
+        &config.depositor_context,
+        &config.connector_z,
+        deposit_input,
+    );
+    let peg_in_deposit_tx = peg_in_deposit.finalize();
+    let deposit_txid = peg_in_deposit_tx.compute_txid();
+
+    // mine peg-in deposit
+    let deposit_result = config.client_0.esplora.broadcast(&peg_in_deposit_tx).await;
+    println!("Peg-in Deposit tx result: {:?}\n", deposit_result);
+    assert!(deposit_result.is_ok());
+
+    // peg-in refund
+    let output_index = 0;
+    let refund_funding_outpoint = OutPoint {
+        txid: deposit_txid,
+        vout: output_index,
+    };
+    let refund_input = Input {
+        outpoint: refund_funding_outpoint,
+        amount: peg_in_deposit_tx.output[output_index as usize].value,
+    };
+    let peg_in_refund =
+        PegInRefundTransaction::new(&config.depositor_context, &config.connector_z, refund_input);
+    let peg_in_refund_tx = peg_in_refund.finalize();
+    let refund_txid = peg_in_refund_tx.compute_txid();
+
+    // mine peg-in refund
+    wait_for_timelock_expiry(config.network, Some("peg-in deposit connector_z")).await;
+    let refund_result = config.client_0.esplora.broadcast(&peg_in_refund_tx).await;
+    println!("Peg-in Refund tx result: {:?}\n", refund_result);
+    assert!(refund_result.is_ok());
+
+    // depositor balance
+    let depositor_address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
+    );
+    let depositor_utxos = config
+        .client_0
+        .esplora
+        .get_address_utxo(depositor_address.clone())
+        .await
+        .unwrap();
+    let depositor_utxo = depositor_utxos
+        .clone()
+        .into_iter()
+        .find(|x| x.txid == refund_txid);
+
+    // assert
+    assert!(depositor_utxo.is_some());
+    assert_eq!(
+        depositor_utxo.unwrap().value,
+        peg_in_refund_tx.output[0].value
+    );
+    assert_eq!(
+        peg_in_refund_tx.output[0].value,
+        Amount::from_sat(INITIAL_AMOUNT),
+    );
+}
+
+async fn get_pegin_input(config: &SetupConfig, sats: u64) -> Input {
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let deposit_input_amount = Amount::from_sat(sats);
+    // peg-in deposit
+    let deposit_funding_utxo_address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
+    );
+    println!(
+        "deposit_funding_utxo_address: {:?}",
+        deposit_funding_utxo_address
+    );
+    faucet
+        .fund_input(&deposit_funding_utxo_address, deposit_input_amount)
+        .await
+        .wait()
+        .await;
+
+    let deposit_funding_outpoint = generate_stub_outpoint(
+        &config.client_0,
+        &deposit_funding_utxo_address,
+        deposit_input_amount,
+    )
+    .await;
+    println!(
+        "deposit_funding_outpoint.txid: {:?}",
+        deposit_funding_outpoint.txid
+    );
+    Input {
+        outpoint: deposit_funding_outpoint,
+        amount: deposit_input_amount,
+    }
+}
+
+#[tokio::test]
+async fn test_peg_in_graph_automatic_verifier() {
+    // helper functions
+    let sync = |a: &mut BitVMClient, b: &mut BitVMClient| {
+        a.merge_data(b.data().clone());
+        b.merge_data(a.data().clone());
+    };
+    let graph = |client: &BitVMClient| client.data().peg_in_graphs[0].clone();
+    let pegouts_of = |client: &BitVMClient| {
+        let pegin = graph(client);
+        pegin
+            .peg_out_graphs
+            .iter()
+            .map(|id| {
+                client
+                    .data()
+                    .peg_out_graphs
+                    .iter()
+                    .find(|peg_out| peg_out.id() == id)
+                    .unwrap()
+                    .clone()
+            })
+            .collect::<Vec<_>>()
+    };
+    // set up data
+    let mut config = setup_test().await;
+    let deposit_input = get_pegin_input(
+        &config,
+        ONE_HUNDRED + MIN_RELAY_FEE_PEG_IN_DEPOSIT + MIN_RELAY_FEE_PEG_IN_CONFIRM,
+    )
+    .await;
+    let client_0 = &mut config.client_0;
+    let client_1 = &mut config.client_1;
+    let esplora = client_0.esplora.clone();
+
+    // create the actual graph & check that status changes to PegInWait
+    client_0
+        .create_peg_in_graph(deposit_input, "0000000000000000000000000000000000000000")
+        .await;
+    assert_eq!(
+        graph(client_0)
+            .verifier_status(&esplora, &config.verifier_0_context, &[])
+            .await,
+        PegInVerifierStatus::AwaitingDeposit
+    );
+
+    // wait peg-in deposit and wait for the tx to be confirmed (which will set status to PegInPendingOurNonces)
+    client_0
+        .process_peg_in_as_depositor(&graph(client_0).id())
+        .await;
+    loop {
+        if !matches!(
+            graph(client_0)
+                .verifier_status(&esplora, &config.verifier_0_context, &[])
+                .await,
+            PegInVerifierStatus::AwaitingDeposit
+        ) {
+            break;
+        }
+        println!("Awaiting confirmation...");
+        sleep(Duration::from_secs(1)).await;
+    }
+
+    assert_eq!(
+        graph(client_0)
+            .verifier_status(&esplora, &config.verifier_0_context, &[])
+            .await,
+        PegInVerifierStatus::AwaitingPegOutCreation
+    );
+
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    let peg_out_confirm_input_amount =
+        Amount::from_sat(get_reward_amount(ONE_HUNDRED) + PEG_OUT_FEE);
+    // fund peg-out confirm
+    let operator_funding_utxo_address = generate_pay_to_pubkey_script_address(
+        config.operator_context.network,
+        &config.operator_context.operator_public_key,
+    );
+    println!(
+        "operator_funding_utxo_address: {:?}",
+        operator_funding_utxo_address
+    );
+    faucet
+        .fund_input(&operator_funding_utxo_address, peg_out_confirm_input_amount)
+        .await
+        .wait()
+        .await;
+
+    // make operator submit a pegout graph & check that status changes to PegInWait
+    client_0
+        .process_peg_in_as_operator(&graph(client_0).id())
+        .await;
+    let peg_out_graph = client_0
+        .data()
+        .peg_out_graphs
+        .first()
+        .expect("peg out should have been created above")
+        .clone();
+    let peg_out_graph_id = peg_out_graph.id();
+    assert_eq!(
+        graph(client_0)
+            .verifier_status(
+                &esplora,
+                &config.verifier_0_context,
+                &pegouts_of(client_0).iter().collect::<Vec<_>>()
+            )
+            .await,
+        PegInVerifierStatus::PendingOurNonces(vec![
+            peg_out_graph_id.clone(),
+            graph(client_0).id().clone()
+        ])
+    );
+
+    // submit client_0 nonce & check that status changes to PegInAwaitingNonces
+    client_0
+        .process_peg_in_as_verifier(&graph(client_0).id())
+        .await;
+    sync(client_0, client_1);
+    assert_eq!(
+        graph(client_0)
+            .verifier_status(
+                &esplora,
+                &config.verifier_0_context,
+                &pegouts_of(client_0).iter().collect::<Vec<_>>()
+            )
+            .await,
+        PegInVerifierStatus::AwaitingNonces
+    );
+
+    // submit client_1 nonce & check that status changes to PegInPendingOurSignature
+    client_1
+        .process_peg_in_as_verifier(&graph(client_0).id())
+        .await;
+    sync(client_0, client_1);
+    assert!(matches!(
+        graph(client_0)
+            .verifier_status(
+                &esplora,
+                &config.verifier_0_context,
+                &pegouts_of(client_0).iter().collect::<Vec<_>>()
+            )
+            .await,
+        PegInVerifierStatus::PendingOurSignature(_)
+    ));
+
+    // submit client_0 signature & check that status changes to PegInAwaitingSignatures
+    client_0
+        .process_peg_in_as_verifier(&graph(client_0).id())
+        .await;
+    sync(client_0, client_1);
+    assert_eq!(
+        graph(client_0)
+            .verifier_status(
+                &esplora,
+                &config.verifier_0_context,
+                &pegouts_of(client_0).iter().collect::<Vec<_>>()
+            )
+            .await,
+        PegInVerifierStatus::AwaitingSignatures
+    );
+
+    // submit client_1 signature & check that status changes to PegInPresign
+    client_1
+        .process_peg_in_as_verifier(&graph(client_0).id())
+        .await;
+    sync(client_0, client_1);
+    assert_eq!(
+        graph(client_0)
+            .verifier_status(
+                &esplora,
+                &config.verifier_0_context,
+                &pegouts_of(client_0).iter().collect::<Vec<_>>()
+            )
+            .await,
+        PegInVerifierStatus::ReadyToSubmit
+    );
+
+    // submit confirm tx & check that status changes to PegInComplete
+    client_0
+        .process_peg_in_as_verifier(&graph(client_0).id())
+        .await;
+    loop {
+        if graph(client_0)
+            .verifier_status(
+                &esplora,
+                &config.verifier_0_context,
+                &pegouts_of(client_0).iter().collect::<Vec<_>>(),
+            )
+            .await
+            == PegInVerifierStatus::Complete
+        {
+            break;
+        }
+        println!("Awaiting confirmation...");
+        sleep(Duration::from_secs(1)).await;
+    }
+}
diff --git a/tests/bridge/integration/peg_out/challenge.rs b/bridge/tests/bridge/integration/peg_out/challenge.rs
similarity index 54%
rename from tests/bridge/integration/peg_out/challenge.rs
rename to bridge/tests/bridge/integration/peg_out/challenge.rs
index 139ec8bfe..3f49bbdea 100644
--- a/tests/bridge/integration/peg_out/challenge.rs
+++ b/bridge/tests/bridge/integration/peg_out/challenge.rs
@@ -1,75 +1,70 @@
 use bitcoin::{Address, Amount, OutPoint};
 
-use bitvm::bridge::{
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
+use bridge::{
+    connectors::base::TaprootConnector,
+    graphs::base::DUST_AMOUNT,
     scripts::{generate_pay_to_pubkey_script, generate_pay_to_pubkey_script_address},
     transactions::{
-        base::{BaseTransaction, Input, InputWithScript},
+        base::{
+            BaseTransaction, Input, InputWithScript, MIN_RELAY_FEE_CHALLENGE,
+            MIN_RELAY_FEE_KICK_OFF_1, MIN_RELAY_FEE_START_TIME,
+        },
         challenge::ChallengeTransaction,
     },
 };
 
 use crate::bridge::{
-    helper::{generate_stub_outpoint, verify_funding_inputs},
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, generate_stub_outpoint, verify_funding_inputs},
     integration::peg_out::utils::create_and_mine_kick_off_1_tx,
-    setup::setup_test,
+    setup::{setup_test, INITIAL_AMOUNT},
 };
 
 #[tokio::test]
 async fn test_challenge_success() {
-    let (
-        client,
-        _,
-        depositor_context,
-        operator_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-    ) = setup_test().await;
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
 
-    // verify funding inputs
     let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
-
-    let kick_off_1_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let kick_off_1_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
+    // testing challenge through connector a, fund only dust to output 1 for testing
+    let kick_off_1_input_amount = Amount::from_sat(
+        MIN_RELAY_FEE_KICK_OFF_1 + DUST_AMOUNT * 2 + MIN_RELAY_FEE_START_TIME + DUST_AMOUNT,
     );
+    let kick_off_1_funding_utxo_address = config.connector_6.generate_taproot_address();
     funding_inputs.push((&kick_off_1_funding_utxo_address, kick_off_1_input_amount));
 
-    let challenge_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
+    // crowd funding utxo
+    let challenge_input_amount = Amount::from_sat(INITIAL_AMOUNT + MIN_RELAY_FEE_CHALLENGE);
     let challenge_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        depositor_context.network,
-        &depositor_context.depositor_public_key,
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
     );
     funding_inputs.push((&challenge_funding_utxo_address, challenge_input_amount));
 
-    verify_funding_inputs(&client, &funding_inputs).await;
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    verify_funding_inputs(&config.client_0, &funding_inputs).await;
 
     // kick-off 1
     let (kick_off_1_tx, kick_off_1_txid) = create_and_mine_kick_off_1_tx(
-        &client,
-        &operator_context,
+        &config.client_0,
+        &config.operator_context,
         &kick_off_1_funding_utxo_address,
+        &config.connector_1,
+        &config.connector_2,
+        &config.connector_6,
         kick_off_1_input_amount,
+        &config.commitment_secrets,
     )
     .await;
 
     // challenge
     let challenge_funding_outpoint = generate_stub_outpoint(
-        &client,
+        &config.client_0,
         &challenge_funding_utxo_address,
         challenge_input_amount,
     )
@@ -77,7 +72,7 @@ async fn test_challenge_success() {
     let challenge_crowdfunding_input = InputWithScript {
         outpoint: challenge_funding_outpoint,
         amount: challenge_input_amount,
-        script: &generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
+        script: &generate_pay_to_pubkey_script(&config.depositor_context.depositor_public_key),
     };
 
     let vout = 0; // connector A
@@ -90,29 +85,31 @@ async fn test_challenge_success() {
     };
 
     let mut challenge = ChallengeTransaction::new(
-        &operator_context,
+        &config.operator_context,
+        &config.connector_a,
         challenge_kick_off_input,
         challenge_input_amount,
     );
     challenge.add_inputs_and_output(
-        &depositor_context,
         &vec![challenge_crowdfunding_input],
-        &depositor_context.depositor_keypair,
-        generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
+        &config.depositor_context.depositor_keypair,
+        generate_pay_to_pubkey_script(&config.depositor_context.depositor_public_key),
     ); // add crowdfunding input
     let challenge_tx = challenge.finalize();
     let challenge_txid = challenge_tx.compute_txid();
 
     // mine challenge tx
-    let challenge_result = client.esplora.broadcast(&challenge_tx).await;
+    check_tx_output_sum(INITIAL_AMOUNT + DUST_AMOUNT, &challenge_tx);
+    let challenge_result = config.client_0.esplora.broadcast(&challenge_tx).await;
     assert!(challenge_result.is_ok());
 
     // operator balance
     let operator_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
+        config.operator_context.network,
+        &config.operator_context.operator_public_key,
     );
-    let operator_utxos = client
+    let operator_utxos = config
+        .client_0
         .esplora
         .get_address_utxo(operator_address)
         .await
diff --git a/bridge/tests/bridge/integration/peg_out/disprove.rs b/bridge/tests/bridge/integration/peg_out/disprove.rs
new file mode 100644
index 000000000..3650f8f55
--- /dev/null
+++ b/bridge/tests/bridge/integration/peg_out/disprove.rs
@@ -0,0 +1,324 @@
+use bitcoin::{Address, Amount, OutPoint};
+use bridge::{
+    connectors::{base::TaprootConnector, connector_c::get_commit_from_assert_commit_tx},
+    graphs::base::DUST_AMOUNT,
+    scripts::generate_pay_to_pubkey_script_address,
+    transactions::{
+        assert_transactions::{
+            assert_commit_1::AssertCommit1Transaction, assert_commit_2::AssertCommit2Transaction,
+            assert_final::AssertFinalTransaction, utils::sign_assert_tx_with_groth16_proof,
+        },
+        base::{
+            BaseTransaction, Input, MIN_RELAY_FEE_ASSERT_COMMIT1, MIN_RELAY_FEE_ASSERT_COMMIT2,
+            MIN_RELAY_FEE_ASSERT_FINAL, MIN_RELAY_FEE_ASSERT_INITIAL, MIN_RELAY_FEE_DISPROVE,
+            MIN_RELAY_FEE_KICK_OFF_2,
+        },
+        disprove::DisproveTransaction,
+        pre_signed::PreSignedTransaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+use num_traits::ToPrimitive;
+
+use crate::bridge::{
+    assert::helper::create_and_mine_assert_initial_tx,
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, verify_funding_inputs, wait_for_timelock_expiry},
+    integration::peg_out::utils::create_and_mine_kick_off_2_tx,
+    setup::{setup_test_full, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_disprove_success() {
+    // TODO: remove lock script cache
+    //       OR refactor setup_test to generate lock scripts for connector c
+    //       to prevent mandatory-script-verify-flag-failed (Script failed an OP_EQUALVERIFY operation) error
+    //       OR verify if making the wrong proof deterministic addresses the issue.
+    let config = setup_test_full().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    // verify funding inputs
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+    let kick_off_2_input_amount = Amount::from_sat(
+        INITIAL_AMOUNT
+            + MIN_RELAY_FEE_KICK_OFF_2
+            + DUST_AMOUNT // connector 3 to take 1
+            + MIN_RELAY_FEE_ASSERT_INITIAL
+            + MIN_RELAY_FEE_ASSERT_COMMIT1
+            + MIN_RELAY_FEE_ASSERT_COMMIT2
+            + MIN_RELAY_FEE_ASSERT_FINAL
+            + DUST_AMOUNT // connector 4 to take 2
+            + MIN_RELAY_FEE_DISPROVE,
+    );
+    let kick_off_2_funding_utxo_address = config.connector_1.generate_taproot_address();
+    funding_inputs.push((&kick_off_2_funding_utxo_address, kick_off_2_input_amount));
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    verify_funding_inputs(&config.client_0, &funding_inputs).await;
+
+    // kick-off 2
+    let (kick_off_2_tx, kick_off_2_txid) = create_and_mine_kick_off_2_tx(
+        &config.client_0,
+        &config.operator_context,
+        &config.connector_1,
+        &config.connector_b,
+        &kick_off_2_funding_utxo_address,
+        kick_off_2_input_amount,
+        &config.commitment_secrets,
+    )
+    .await;
+
+    // assert initial
+    let vout = 1; // connector B
+    let assert_initial_input_0 = Input {
+        outpoint: OutPoint {
+            txid: kick_off_2_txid,
+            vout,
+        },
+        amount: kick_off_2_tx.output[vout as usize].value,
+    };
+
+    let (assert_initial_tx, assert_initial_txid) = create_and_mine_assert_initial_tx(
+        &config.client_0.esplora,
+        config.network,
+        &config.verifier_0_context,
+        &config.verifier_1_context,
+        &config.connector_b,
+        &config.connector_d,
+        &config.assert_commit_connectors_e_1,
+        &config.assert_commit_connectors_e_2,
+        assert_initial_input_0,
+    )
+    .await;
+
+    // gen incorrect proof and witness
+    let (witness_for_commit1, witness_for_commit2) =
+        sign_assert_tx_with_groth16_proof(&config.commitment_secrets, &config.invalid_proof);
+
+    // assert commit 1
+    let mut vout_base = 1; // connector E
+    let mut assert_commit_1 = AssertCommit1Transaction::new(
+        &config.assert_commit_connectors_e_1,
+        &config.assert_commit_connectors_f.connector_f_1,
+        (0..config.assert_commit_connectors_e_1.connectors_num())
+            .map(|idx| Input {
+                outpoint: OutPoint {
+                    txid: assert_initial_txid,
+                    vout: (idx + vout_base).to_u32().unwrap(),
+                },
+                amount: assert_initial_tx.output[idx + vout_base].value,
+            })
+            .collect(),
+    );
+    assert_commit_1.sign(
+        &config.assert_commit_connectors_e_1,
+        witness_for_commit1.clone(),
+    );
+    let assert_commit_1_tx = assert_commit_1.finalize();
+    let assert_commit_1_txid = assert_commit_1_tx.compute_txid();
+    println!(
+        "txid: {}, assert_commit_1_tx inputs {}, outputs {}",
+        assert_commit_1_txid,
+        assert_commit_1.tx().input.len(),
+        assert_commit_1.tx().output.len()
+    );
+    let assert_commit_1_result = config.client_0.esplora.broadcast(&assert_commit_1_tx).await;
+    assert!(
+        assert_commit_1_result.is_ok(),
+        "error: {:?}",
+        assert_commit_1_result.err()
+    );
+
+    // assert commit 2
+    vout_base += config.assert_commit_connectors_e_1.connectors_num(); // connector E
+
+    let mut assert_commit_2 = AssertCommit2Transaction::new(
+        &config.assert_commit_connectors_e_2,
+        &config.assert_commit_connectors_f.connector_f_2,
+        (0..config.assert_commit_connectors_e_2.connectors_num())
+            .map(|idx| Input {
+                outpoint: OutPoint {
+                    txid: assert_initial_txid,
+                    vout: (idx + vout_base).to_u32().unwrap(),
+                },
+                amount: assert_initial_tx.output[idx + vout_base].value,
+            })
+            .collect(),
+    );
+    assert_commit_2.sign(
+        &config.assert_commit_connectors_e_2,
+        witness_for_commit2.clone(),
+    );
+    let assert_commit_2_tx = assert_commit_2.finalize();
+    let assert_commit_2_txid = assert_commit_2_tx.compute_txid();
+    println!(
+        "txid: {}, assert_commit_2_tx inputs {}, outputs {}",
+        assert_commit_2_txid,
+        assert_commit_2.tx().input.len(),
+        assert_commit_2.tx().output.len()
+    );
+    let assert_commit_2_result = config.client_0.esplora.broadcast(&assert_commit_2_tx).await;
+    assert!(
+        assert_commit_2_result.is_ok(),
+        "error: {:?}",
+        assert_commit_2_result.err()
+    );
+
+    // assert final
+    let vout_0 = 0; // connector D
+    let vout_1 = 0; // connector F
+    let vout_2 = 0; // connector F
+    let assert_final_input_0 = Input {
+        outpoint: OutPoint {
+            txid: assert_initial_txid,
+            vout: vout_0,
+        },
+        amount: assert_initial_tx.output[vout_0 as usize].value,
+    };
+    let assert_final_input_1 = Input {
+        outpoint: OutPoint {
+            txid: assert_commit_1_txid,
+            vout: vout_1,
+        },
+        amount: assert_commit_1_tx.output[vout_1 as usize].value,
+    };
+    let assert_final_input_2 = Input {
+        outpoint: OutPoint {
+            txid: assert_commit_2_txid,
+            vout: vout_2,
+        },
+        amount: assert_commit_2_tx.output[vout_2 as usize].value,
+    };
+    let mut assert_final = AssertFinalTransaction::new(
+        &config.operator_context,
+        &config.connector_4,
+        &config.connector_5,
+        &config.connector_c,
+        &config.connector_d,
+        &config.assert_commit_connectors_f,
+        assert_final_input_0,
+        assert_final_input_1,
+        assert_final_input_2,
+    );
+
+    let secret_nonces_0 = assert_final.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = assert_final.push_nonces(&config.verifier_1_context);
+
+    assert_final.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_d,
+        &secret_nonces_0,
+    );
+    assert_final.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_d,
+        &secret_nonces_1,
+    );
+
+    let assert_final_tx = assert_final.finalize();
+    let assert_final_txid = assert_final_tx.compute_txid();
+    let assert_final_result = config.client_0.esplora.broadcast(&assert_final_tx).await;
+    assert!(
+        assert_final_result.is_ok(),
+        "error: {:?}",
+        assert_final_result.err()
+    );
+
+    // disprove
+    let vout = 1;
+
+    // get witness from assert_commit txs
+    let assert_commit_1_witness = get_commit_from_assert_commit_tx(&assert_commit_1_tx);
+    let assert_commit_2_witness = get_commit_from_assert_commit_tx(&assert_commit_2_tx);
+
+    let (script_index, disprove_witness) = config
+        .connector_c
+        .generate_disprove_witness(
+            assert_commit_1_witness,
+            assert_commit_2_witness,
+            &config.invalid_proof.vk,
+        )
+        .unwrap();
+    // let script_index = 1;
+
+    let disprove_input_0 = Input {
+        outpoint: OutPoint {
+            txid: assert_final_txid,
+            vout,
+        },
+        amount: assert_final_tx.output[vout as usize].value,
+    };
+
+    let vout = 2;
+    let disprove_input_1 = Input {
+        outpoint: OutPoint {
+            txid: assert_final_txid,
+            vout,
+        },
+        amount: assert_final_tx.output[vout as usize].value,
+    };
+
+    let mut disprove = DisproveTransaction::new(
+        &config.operator_context,
+        &config.connector_5,
+        &config.connector_c,
+        disprove_input_0,
+        disprove_input_1,
+    );
+
+    let secret_nonces_0 = disprove.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = disprove.push_nonces(&config.verifier_1_context);
+
+    disprove.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_5,
+        &secret_nonces_0,
+    );
+    disprove.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_5,
+        &secret_nonces_1,
+    );
+
+    let reward_address = generate_pay_to_pubkey_script_address(
+        config.withdrawer_context.network,
+        &config.withdrawer_context.withdrawer_public_key,
+    );
+    let verifier_reward_script = reward_address.script_pubkey(); // send reward to withdrawer address
+    disprove.add_input_output(
+        &config.connector_c,
+        script_index as u32,
+        disprove_witness,
+        verifier_reward_script,
+    );
+
+    let disprove_tx = disprove.finalize();
+    let disprove_txid = disprove_tx.compute_txid();
+
+    // mine disprove
+    check_tx_output_sum(INITIAL_AMOUNT, &disprove_tx);
+    wait_for_timelock_expiry(config.network, Some("Assert connector 4")).await;
+    let disprove_result = config.client_0.esplora.broadcast(&disprove_tx).await;
+    println!("Disprove tx result: {disprove_result:?}");
+    assert!(disprove_result.is_ok());
+
+    // reward balance
+    let reward_utxos = config
+        .client_0
+        .esplora
+        .get_address_utxo(reward_address)
+        .await
+        .unwrap();
+    let reward_utxo = reward_utxos
+        .clone()
+        .into_iter()
+        .find(|x| x.txid == disprove_txid);
+
+    // assert
+    assert!(reward_utxo.is_some());
+    assert_eq!(reward_utxo.unwrap().value, disprove_tx.output[1].value);
+}
diff --git a/bridge/tests/bridge/integration/peg_out/disprove_chain.rs b/bridge/tests/bridge/integration/peg_out/disprove_chain.rs
new file mode 100644
index 000000000..a71a5a163
--- /dev/null
+++ b/bridge/tests/bridge/integration/peg_out/disprove_chain.rs
@@ -0,0 +1,116 @@
+use bitcoin::{Address, Amount, OutPoint};
+use bridge::{
+    connectors::base::TaprootConnector,
+    graphs::base::DUST_AMOUNT,
+    scripts::generate_pay_to_pubkey_script_address,
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_DISPROVE_CHAIN, MIN_RELAY_FEE_KICK_OFF_2},
+        disprove_chain::DisproveChainTransaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, verify_funding_inputs, wait_for_timelock_expiry},
+    integration::peg_out::utils::create_and_mine_kick_off_2_tx,
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_disprove_chain_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    // verify funding inputs
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+    let kick_off_2_input_amount = Amount::from_sat(
+        INITIAL_AMOUNT + MIN_RELAY_FEE_KICK_OFF_2 + DUST_AMOUNT + MIN_RELAY_FEE_DISPROVE_CHAIN,
+    );
+    let kick_off_2_funding_utxo_address = config.connector_1.generate_taproot_address();
+    funding_inputs.push((&kick_off_2_funding_utxo_address, kick_off_2_input_amount));
+
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+    verify_funding_inputs(&config.client_0, &funding_inputs).await;
+
+    // kick-off 2
+    let (kick_off_2_tx, kick_off_2_txid) = create_and_mine_kick_off_2_tx(
+        &config.client_0,
+        &config.operator_context,
+        &config.connector_1,
+        &config.connector_b,
+        &kick_off_2_funding_utxo_address,
+        kick_off_2_input_amount,
+        &config.commitment_secrets,
+    )
+    .await;
+
+    // disprove chain
+    let vout = 1; // connector B
+    let disprove_chain_input_0 = Input {
+        outpoint: OutPoint {
+            txid: kick_off_2_txid,
+            vout,
+        },
+        amount: kick_off_2_tx.output[vout as usize].value,
+    };
+
+    let mut disprove_chain = DisproveChainTransaction::new(
+        &config.operator_context,
+        &config.connector_b,
+        disprove_chain_input_0,
+    );
+
+    let secret_nonces_0 = disprove_chain.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = disprove_chain.push_nonces(&config.verifier_1_context);
+
+    disprove_chain.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_b,
+        &secret_nonces_0,
+    );
+    disprove_chain.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_b,
+        &secret_nonces_1,
+    );
+
+    let reward_address = generate_pay_to_pubkey_script_address(
+        config.withdrawer_context.network,
+        &config.withdrawer_context.withdrawer_public_key,
+    );
+    disprove_chain.add_output(reward_address.script_pubkey());
+
+    let disprove_chain_tx = disprove_chain.finalize();
+    let disprove_chain_txid = disprove_chain_tx.compute_txid();
+
+    check_tx_output_sum(INITIAL_AMOUNT, &disprove_chain_tx);
+    // mine disprove chain
+    wait_for_timelock_expiry(config.network, Some("kick off 2 connector 3")).await;
+    let disprove_chain_result = config.client_0.esplora.broadcast(&disprove_chain_tx).await;
+    println!("disprove chain result: {:?}", disprove_chain_result);
+    assert!(disprove_chain_result.is_ok());
+
+    // reward balance
+    let reward_utxos = config
+        .client_0
+        .esplora
+        .get_address_utxo(reward_address)
+        .await
+        .unwrap();
+    let reward_utxo = reward_utxos
+        .clone()
+        .into_iter()
+        .find(|x| x.txid == disprove_chain_txid);
+
+    // assert
+    assert!(reward_utxo.is_some());
+    assert_eq!(
+        reward_utxo.unwrap().value,
+        disprove_chain_tx.output[1].value
+    );
+}
diff --git a/bridge/tests/bridge/integration/peg_out/kick_off_timeout.rs b/bridge/tests/bridge/integration/peg_out/kick_off_timeout.rs
new file mode 100644
index 000000000..1430ccbba
--- /dev/null
+++ b/bridge/tests/bridge/integration/peg_out/kick_off_timeout.rs
@@ -0,0 +1,135 @@
+use bitcoin::{Amount, OutPoint};
+use bridge::{
+    connectors::{base::TaprootConnector, connector_1::Connector1},
+    graphs::base::DUST_AMOUNT,
+    scripts::generate_pay_to_pubkey_script_address,
+    transactions::{
+        base::{
+            BaseTransaction, Input, MIN_RELAY_FEE_KICK_OFF_1, MIN_RELAY_FEE_KICK_OFF_TIMEOUT,
+            MIN_RELAY_FEE_START_TIME,
+        },
+        kick_off_timeout::KickOffTimeoutTransaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, wait_for_timelock_expiry},
+    integration::peg_out::utils::create_and_mine_kick_off_1_tx,
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_kick_off_timeout_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let kick_off_1_input_amount = Amount::from_sat(
+        INITIAL_AMOUNT
+            + MIN_RELAY_FEE_KICK_OFF_1
+            + MIN_RELAY_FEE_START_TIME // kick off 1 carries relay fee for start time
+            + DUST_AMOUNT * 2
+            + MIN_RELAY_FEE_KICK_OFF_TIMEOUT,
+    );
+    let kick_off_1_funding_utxo_address = config.connector_6.generate_taproot_address();
+    faucet
+        .fund_input(&kick_off_1_funding_utxo_address, kick_off_1_input_amount)
+        .await
+        .wait()
+        .await;
+
+    // kick-off 1
+    let (kick_off_1_tx, kick_off_1_txid) = create_and_mine_kick_off_1_tx(
+        &config.client_0,
+        &config.operator_context,
+        &kick_off_1_funding_utxo_address,
+        &config.connector_1,
+        &config.connector_2,
+        &config.connector_6,
+        kick_off_1_input_amount,
+        &config.commitment_secrets,
+    )
+    .await;
+
+    // kick-off timeout
+    let vout = 1; // connector 1
+    let kick_off_timeout_input_0 = Input {
+        outpoint: OutPoint {
+            txid: kick_off_1_txid,
+            vout,
+        },
+        amount: kick_off_1_tx.output[vout as usize].value,
+    };
+
+    let mut kick_off_timeout = KickOffTimeoutTransaction::new(
+        &config.operator_context,
+        &config.connector_1,
+        kick_off_timeout_input_0,
+    );
+
+    let secret_nonces_0 = kick_off_timeout.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = kick_off_timeout.push_nonces(&config.verifier_1_context);
+
+    let verifier_0_connector_1 = Connector1::new(
+        config.verifier_0_context.network,
+        &config.operator_context.operator_taproot_public_key, // Verifiers get this via remote storage.
+        &config.verifier_0_context.n_of_n_taproot_public_key,
+        &config.connector_1.commitment_public_keys, // Verifiers get this via remote storage.
+    );
+    kick_off_timeout.pre_sign(
+        &config.verifier_0_context,
+        &verifier_0_connector_1,
+        &secret_nonces_0,
+    );
+    let verifier_1_connector_1 = Connector1::new(
+        config.verifier_0_context.network,
+        &config.operator_context.operator_taproot_public_key,
+        &config.verifier_0_context.n_of_n_taproot_public_key,
+        &config.connector_1.commitment_public_keys,
+    );
+    kick_off_timeout.pre_sign(
+        &config.verifier_1_context,
+        &verifier_1_connector_1,
+        &secret_nonces_1,
+    );
+
+    let reward_address = generate_pay_to_pubkey_script_address(
+        config.withdrawer_context.network,
+        &config.withdrawer_context.withdrawer_public_key,
+    );
+    kick_off_timeout.add_output(reward_address.script_pubkey());
+
+    let kick_off_timeout_tx = kick_off_timeout.finalize();
+    let kick_off_timeout_txid = kick_off_timeout_tx.compute_txid();
+
+    // mine kick-off timeout
+    check_tx_output_sum(INITIAL_AMOUNT, &kick_off_timeout_tx);
+    wait_for_timelock_expiry(config.network, Some("kick off 1 connector 1")).await;
+    let kick_off_timeout_result = config
+        .client_0
+        .esplora
+        .broadcast(&kick_off_timeout_tx)
+        .await;
+    println!("Kick-off timeout result: {kick_off_timeout_result:?}");
+    assert!(kick_off_timeout_result.is_ok());
+
+    // reward balance
+    let reward_utxos = config
+        .client_0
+        .esplora
+        .get_address_utxo(reward_address)
+        .await
+        .unwrap();
+    let reward_utxo = reward_utxos
+        .clone()
+        .into_iter()
+        .find(|x| x.txid == kick_off_timeout_txid);
+
+    // assert
+    assert!(reward_utxo.is_some());
+    assert_eq!(
+        reward_utxo.unwrap().value,
+        kick_off_timeout_tx.output[1].value
+    );
+}
diff --git a/tests/bridge/integration/peg_out/mod.rs b/bridge/tests/bridge/integration/peg_out/mod.rs
similarity index 100%
rename from tests/bridge/integration/peg_out/mod.rs
rename to bridge/tests/bridge/integration/peg_out/mod.rs
diff --git a/bridge/tests/bridge/integration/peg_out/peg_out.rs b/bridge/tests/bridge/integration/peg_out/peg_out.rs
new file mode 100644
index 000000000..50044c75f
--- /dev/null
+++ b/bridge/tests/bridge/integration/peg_out/peg_out.rs
@@ -0,0 +1,85 @@
+use bitcoin::{Address, Amount};
+
+use bridge::{
+    client::chain::chain::PegOutEvent,
+    scripts::{generate_p2pkh_address, generate_pay_to_pubkey_script_address},
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_PEG_OUT},
+        peg_out::PegOutTransaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, generate_stub_outpoint, verify_funding_inputs},
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_peg_out_success() {
+    let config = setup_test().await;
+    let timestamp = 1722328130u32;
+
+    // verify funding inputs
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+
+    let operator_input_amount = Amount::from_sat(INITIAL_AMOUNT + MIN_RELAY_FEE_PEG_OUT);
+    let operator_funding_utxo_address = generate_pay_to_pubkey_script_address(
+        config.operator_context.network,
+        &config.operator_context.operator_public_key,
+    );
+    funding_inputs.push((&operator_funding_utxo_address, operator_input_amount));
+
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    faucet
+        .fund_input(&operator_funding_utxo_address, operator_input_amount)
+        .await
+        .wait()
+        .await;
+
+    verify_funding_inputs(&config.client_0, &funding_inputs).await;
+
+    let operator_funding_outpoint = generate_stub_outpoint(
+        &config.client_0,
+        &operator_funding_utxo_address,
+        operator_input_amount,
+    )
+    .await;
+    println!(
+        "operator_funding_utxo.txid: {:?}",
+        operator_funding_outpoint.txid
+    );
+    let stub_event = PegOutEvent {
+        source_outpoint: operator_funding_outpoint,
+        amount: operator_input_amount,
+        timestamp,
+        withdrawer_chain_address: config.withdrawer_evm_address,
+        withdrawer_destination_address: generate_p2pkh_address(
+            config.withdrawer_context.network,
+            &config.withdrawer_context.withdrawer_public_key,
+        )
+        .to_string(),
+        withdrawer_public_key_hash: config
+            .withdrawer_context
+            .withdrawer_public_key
+            .pubkey_hash(),
+        operator_public_key: config.operator_context.operator_public_key,
+        tx_hash: [0u8; 4].into(),
+    };
+    let input = Input {
+        outpoint: operator_funding_outpoint,
+        amount: operator_input_amount,
+    };
+
+    let peg_out = PegOutTransaction::new(&config.operator_context, &stub_event, input);
+
+    let peg_out_tx = peg_out.finalize();
+    let peg_out_txid = peg_out_tx.compute_txid();
+
+    check_tx_output_sum(INITIAL_AMOUNT, &peg_out_tx);
+    // mine peg-out
+    let peg_out_result = config.client_0.esplora.broadcast(&peg_out_tx).await;
+    println!("Peg Out Tx result: {:?}", peg_out_result);
+    assert!(peg_out_result.is_ok());
+    println!("Peg Out Txid: {:?}", peg_out_txid);
+}
diff --git a/bridge/tests/bridge/integration/peg_out/start_time.rs b/bridge/tests/bridge/integration/peg_out/start_time.rs
new file mode 100644
index 000000000..7eb0c1ec4
--- /dev/null
+++ b/bridge/tests/bridge/integration/peg_out/start_time.rs
@@ -0,0 +1,84 @@
+use bitcoin::{Address, Amount, OutPoint};
+use bridge::{
+    commitments::CommitmentMessageId,
+    connectors::base::TaprootConnector,
+    graphs::base::DUST_AMOUNT,
+    superblock::get_start_time_block_number,
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_KICK_OFF_1, MIN_RELAY_FEE_START_TIME},
+        start_time::StartTimeTransaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, verify_funding_inputs, wait_for_timelock_expiry},
+    integration::peg_out::utils::create_and_mine_kick_off_1_tx,
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_start_time_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    // verify funding inputs
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+    let kick_off_1_input_amount = Amount::from_sat(
+        INITIAL_AMOUNT + MIN_RELAY_FEE_KICK_OFF_1 + MIN_RELAY_FEE_START_TIME + DUST_AMOUNT * 2,
+    );
+    let kick_off_1_funding_utxo_address = config.connector_6.generate_taproot_address();
+    funding_inputs.push((&kick_off_1_funding_utxo_address, kick_off_1_input_amount));
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    verify_funding_inputs(&config.client_0, &funding_inputs).await;
+
+    // kick-off 1
+    let (kick_off_1_tx, kick_off_1_txid) = create_and_mine_kick_off_1_tx(
+        &config.client_0,
+        &config.operator_context,
+        &kick_off_1_funding_utxo_address,
+        &config.connector_1,
+        &config.connector_2,
+        &config.connector_6,
+        kick_off_1_input_amount,
+        &config.commitment_secrets,
+    )
+    .await;
+
+    // start time
+    let vout = 2;
+    let start_time_input_0 = Input {
+        outpoint: OutPoint {
+            // connector 2
+            txid: kick_off_1_txid,
+            vout,
+        },
+        amount: kick_off_1_tx.output[vout as usize].value,
+    };
+    let mut start_time = StartTimeTransaction::new(
+        &config.operator_context,
+        &config.connector_2,
+        start_time_input_0,
+    );
+
+    start_time.sign(
+        &config.operator_context,
+        &config.connector_2,
+        get_start_time_block_number(config.network),
+        &config.commitment_secrets[&CommitmentMessageId::StartTime],
+    );
+
+    let start_time_tx = start_time.finalize();
+    // start time output should only have dust left
+    check_tx_output_sum(DUST_AMOUNT, &start_time_tx);
+    // mine start time timeout
+    wait_for_timelock_expiry(config.network, Some("kick off 1 connector 1")).await;
+    let start_time_result = config.client_0.esplora.broadcast(&start_time_tx).await;
+    println!("Start time tx result: {:?}\n", start_time_result);
+    assert!(start_time_result.is_ok());
+}
diff --git a/bridge/tests/bridge/integration/peg_out/start_time_timeout.rs b/bridge/tests/bridge/integration/peg_out/start_time_timeout.rs
new file mode 100644
index 000000000..e0948b248
--- /dev/null
+++ b/bridge/tests/bridge/integration/peg_out/start_time_timeout.rs
@@ -0,0 +1,142 @@
+use bitcoin::{Address, Amount, OutPoint};
+use bridge::{
+    connectors::base::TaprootConnector,
+    graphs::base::DUST_AMOUNT,
+    scripts::generate_pay_to_pubkey_script_address,
+    transactions::{
+        base::{
+            BaseTransaction, Input, MIN_RELAY_FEE_KICK_OFF_1, MIN_RELAY_FEE_START_TIME,
+            MIN_RELAY_FEE_START_TIME_TIMEOUT,
+        },
+        pre_signed_musig2::PreSignedMusig2Transaction,
+        start_time_timeout::StartTimeTimeoutTransaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, verify_funding_inputs, wait_for_timelock_expiry},
+    integration::peg_out::utils::create_and_mine_kick_off_1_tx,
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_start_time_timeout_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    // verify funding inputs
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+    let kick_off_1_input_amount = Amount::from_sat(
+        INITIAL_AMOUNT
+            + MIN_RELAY_FEE_KICK_OFF_1
+            + MIN_RELAY_FEE_START_TIME // kick off 1 carries relay fee for start time, which also covers start time timeout
+            + DUST_AMOUNT * 2,
+    );
+    let kick_off_1_funding_utxo_address = config.connector_6.generate_taproot_address();
+    funding_inputs.push((&kick_off_1_funding_utxo_address, kick_off_1_input_amount));
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    verify_funding_inputs(&config.client_0, &funding_inputs).await;
+
+    // kick-off 1
+    let (kick_off_1_tx, kick_off_1_txid) = create_and_mine_kick_off_1_tx(
+        &config.client_0,
+        &config.operator_context,
+        &kick_off_1_funding_utxo_address,
+        &config.connector_1,
+        &config.connector_2,
+        &config.connector_6,
+        kick_off_1_input_amount,
+        &config.commitment_secrets,
+    )
+    .await;
+
+    // start time timeout
+    let vout = 2; // connector 2
+    let start_time_timeout_input_0 = Input {
+        outpoint: OutPoint {
+            txid: kick_off_1_txid,
+            vout,
+        },
+        amount: kick_off_1_tx.output[vout as usize].value,
+    };
+    let vout = 1; // connector 1
+    let start_time_timeout_input_1 = Input {
+        outpoint: OutPoint {
+            txid: kick_off_1_txid,
+            vout,
+        },
+        amount: kick_off_1_tx.output[vout as usize].value,
+    };
+    let mut start_time_timeout = StartTimeTimeoutTransaction::new(
+        &config.operator_context,
+        &config.connector_1,
+        &config.connector_2,
+        start_time_timeout_input_0,
+        start_time_timeout_input_1,
+    );
+
+    let secret_nonces_0 = start_time_timeout.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = start_time_timeout.push_nonces(&config.verifier_1_context);
+
+    start_time_timeout.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_1,
+        &config.connector_2,
+        &secret_nonces_0,
+    );
+    start_time_timeout.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_1,
+        &config.connector_2,
+        &secret_nonces_1,
+    );
+
+    let reward_address = generate_pay_to_pubkey_script_address(
+        config.withdrawer_context.network,
+        &config.withdrawer_context.withdrawer_public_key,
+    );
+    start_time_timeout.add_output(reward_address.script_pubkey());
+
+    let start_time_timeout_tx = start_time_timeout.finalize();
+    let start_time_timeout_txid = start_time_timeout_tx.compute_txid();
+
+    // input also includes the discrepancy between start time tx and start time timeout tx
+    check_tx_output_sum(
+        INITIAL_AMOUNT + DUST_AMOUNT + MIN_RELAY_FEE_START_TIME - MIN_RELAY_FEE_START_TIME_TIMEOUT,
+        &start_time_timeout_tx,
+    );
+    // mine start time timeout
+    wait_for_timelock_expiry(config.network, Some("kick off 1 connector 1")).await;
+    let start_time_timeout_result = config
+        .client_0
+        .esplora
+        .broadcast(&start_time_timeout_tx)
+        .await;
+    println!("Start time timeout result: {:?}", start_time_timeout_result);
+    assert!(start_time_timeout_result.is_ok());
+
+    // reward balance
+    let reward_utxos = config
+        .client_0
+        .esplora
+        .get_address_utxo(reward_address)
+        .await
+        .unwrap();
+    let reward_utxo = reward_utxos
+        .clone()
+        .into_iter()
+        .find(|x| x.txid == start_time_timeout_txid);
+
+    // assert
+    assert!(reward_utxo.is_some());
+    assert_eq!(
+        reward_utxo.unwrap().value,
+        start_time_timeout_tx.output[1].value
+    );
+}
diff --git a/bridge/tests/bridge/integration/peg_out/take_1.rs b/bridge/tests/bridge/integration/peg_out/take_1.rs
new file mode 100644
index 000000000..9a3c359d2
--- /dev/null
+++ b/bridge/tests/bridge/integration/peg_out/take_1.rs
@@ -0,0 +1,207 @@
+use bitcoin::{Address, Amount, OutPoint};
+use bitvm::signatures::signing_winternitz::WinternitzSigningInputs;
+use bridge::{
+    commitments::CommitmentMessageId,
+    connectors::base::TaprootConnector,
+    graphs::base::{DUST_AMOUNT, PEG_OUT_FEE},
+    scripts::generate_pay_to_pubkey_script_address,
+    superblock::{get_superblock_hash_message, get_superblock_message},
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_PEG_IN_CONFIRM},
+        kick_off_2::KickOff2Transaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
+        take_1::Take1Transaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{
+        check_tx_output_sum, get_reward_amount, get_superblock_header, verify_funding_inputs,
+        wait_for_timelock_expiry,
+    },
+    integration::peg_out::utils::{
+        create_and_mine_kick_off_1_tx, create_and_mine_peg_in_confirm_tx,
+    },
+    setup::{setup_test, ONE_HUNDRED},
+};
+
+#[tokio::test]
+async fn test_take_1_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    // verify funding inputs
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+
+    let deposit_input_amount = Amount::from_sat(ONE_HUNDRED + MIN_RELAY_FEE_PEG_IN_CONFIRM);
+    let peg_in_confirm_funding_address = config.connector_z.generate_taproot_address();
+    funding_inputs.push((&peg_in_confirm_funding_address, deposit_input_amount));
+
+    let reward_amount = get_reward_amount(ONE_HUNDRED);
+    let kick_off_1_input_amount = Amount::from_sat(reward_amount + PEG_OUT_FEE);
+    let kick_off_1_funding_utxo_address = config.connector_6.generate_taproot_address();
+    funding_inputs.push((&kick_off_1_funding_utxo_address, kick_off_1_input_amount));
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    verify_funding_inputs(&config.client_0, &funding_inputs).await;
+
+    // peg-in confirm
+    let (peg_in_confirm_tx, peg_in_confirm_txid) = create_and_mine_peg_in_confirm_tx(
+        &config.client_0,
+        &config.depositor_context,
+        &config.verifier_0_context,
+        &config.verifier_1_context,
+        &config.connector_0,
+        &config.connector_z,
+        &peg_in_confirm_funding_address,
+        deposit_input_amount,
+    )
+    .await;
+
+    // kick-off 1
+    let (kick_off_1_tx, kick_off_1_txid) = create_and_mine_kick_off_1_tx(
+        &config.client_0,
+        &config.operator_context,
+        &kick_off_1_funding_utxo_address,
+        &config.connector_1,
+        &config.connector_2,
+        &config.connector_6,
+        kick_off_1_input_amount,
+        &config.commitment_secrets,
+    )
+    .await;
+
+    // kick-off 2
+    let vout = 1; // connector 1
+    let kick_off_2_input_0 = Input {
+        outpoint: OutPoint {
+            txid: kick_off_1_txid,
+            vout,
+        },
+        amount: kick_off_1_tx.output[vout as usize].value,
+    };
+    let mut kick_off_2 = KickOff2Transaction::new(
+        &config.operator_context,
+        &config.connector_1,
+        &config.connector_b,
+        kick_off_2_input_0,
+    );
+    let superblock_header = get_superblock_header();
+    kick_off_2.sign(
+        &config.operator_context,
+        &config.connector_1,
+        &WinternitzSigningInputs {
+            message: &get_superblock_message(&superblock_header),
+            signing_key: &config.commitment_secrets[&CommitmentMessageId::Superblock],
+        },
+        &WinternitzSigningInputs {
+            message: &get_superblock_hash_message(&superblock_header),
+            signing_key: &config.commitment_secrets[&CommitmentMessageId::SuperblockHash],
+        },
+    );
+    let kick_off_2_tx = kick_off_2.finalize();
+    let kick_off_2_txid = kick_off_2_tx.compute_txid();
+
+    // mine kick-off 2
+    wait_for_timelock_expiry(config.network, Some("kick off 1 connector 1")).await;
+    let kick_off_2_result = config.client_0.esplora.broadcast(&kick_off_2_tx).await;
+    println!("Kick-off 2 result: {:?}\n", kick_off_2_result);
+    assert!(kick_off_2_result.is_ok());
+
+    // take 1
+    let vout = 0; // connector 0
+    let take_1_input_0 = Input {
+        outpoint: OutPoint {
+            txid: peg_in_confirm_txid,
+            vout,
+        },
+        amount: peg_in_confirm_tx.output[vout as usize].value,
+    };
+    let vout = 0; // connector a
+    let take_1_input_1 = Input {
+        outpoint: OutPoint {
+            txid: kick_off_1_txid,
+            vout,
+        },
+        amount: kick_off_1_tx.output[vout as usize].value,
+    };
+    let vout = 0; // connector 3
+    let take_1_input_2 = Input {
+        outpoint: OutPoint {
+            txid: kick_off_2_txid,
+            vout,
+        },
+        amount: kick_off_2_tx.output[vout as usize].value,
+    };
+    let vout = 1; // connector b
+    let take_1_input_3 = Input {
+        outpoint: OutPoint {
+            txid: kick_off_2_txid,
+            vout,
+        },
+        amount: kick_off_2_tx.output[vout as usize].value,
+    };
+
+    let mut take_1 = Take1Transaction::new(
+        &config.operator_context,
+        &config.connector_0,
+        &config.connector_3,
+        &config.connector_a,
+        &config.connector_b,
+        take_1_input_0,
+        take_1_input_1,
+        take_1_input_2,
+        take_1_input_3,
+    );
+
+    let secret_nonces_0 = take_1.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = take_1.push_nonces(&config.verifier_1_context);
+
+    take_1.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_0,
+        &config.connector_b,
+        &secret_nonces_0,
+    );
+    take_1.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_0,
+        &config.connector_b,
+        &secret_nonces_1,
+    );
+
+    let take_1_tx = take_1.finalize();
+    let take_1_txid = take_1_tx.compute_txid();
+
+    // additional dust is from kick off 1 connector a
+    check_tx_output_sum(ONE_HUNDRED + reward_amount + DUST_AMOUNT, &take_1_tx);
+    // mine take 1
+    wait_for_timelock_expiry(config.network, Some("kick off 2 connector 3")).await;
+    let take_1_result = config.client_0.esplora.broadcast(&take_1_tx).await;
+    println!("TAKE 1 result: {:?}\n", take_1_result);
+    assert!(take_1_result.is_ok());
+
+    // operator balance
+    let operator_address = generate_pay_to_pubkey_script_address(
+        config.operator_context.network,
+        &config.operator_context.operator_public_key,
+    );
+    let operator_utxos = config
+        .client_0
+        .esplora
+        .get_address_utxo(operator_address.clone())
+        .await
+        .unwrap();
+    let operator_utxo = operator_utxos
+        .clone()
+        .into_iter()
+        .find(|x| x.txid == take_1_txid);
+
+    // assert
+    assert!(operator_utxo.is_some());
+}
diff --git a/bridge/tests/bridge/integration/peg_out/take_2.rs b/bridge/tests/bridge/integration/peg_out/take_2.rs
new file mode 100644
index 000000000..5a0862ad2
--- /dev/null
+++ b/bridge/tests/bridge/integration/peg_out/take_2.rs
@@ -0,0 +1,170 @@
+use bitcoin::{Address, Amount, OutPoint};
+use bridge::{
+    connectors::base::TaprootConnector,
+    graphs::base::DUST_AMOUNT,
+    scripts::generate_pay_to_pubkey_script_address,
+    transactions::{
+        base::{
+            BaseTransaction, Input, MIN_RELAY_FEE_ASSERT, MIN_RELAY_FEE_PEG_IN_CONFIRM,
+            MIN_RELAY_FEE_TAKE_2,
+        },
+        pre_signed_musig2::PreSignedMusig2Transaction,
+        take_2::Take2Transaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{
+        check_tx_output_sum, get_reward_amount, verify_funding_inputs, wait_for_timelock_expiry,
+    },
+    integration::peg_out::utils::{create_and_mine_assert_tx, create_and_mine_peg_in_confirm_tx},
+    setup::{setup_test_full, INITIAL_AMOUNT, ONE_HUNDRED},
+};
+
+#[tokio::test]
+async fn test_take_2_success() {
+    let config = setup_test_full().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    // verify funding inputs
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+
+    let deposit_input_amount = Amount::from_sat(INITIAL_AMOUNT + MIN_RELAY_FEE_PEG_IN_CONFIRM);
+    let peg_in_confirm_funding_address = config.connector_z.generate_taproot_address();
+    funding_inputs.push((&peg_in_confirm_funding_address, deposit_input_amount));
+
+    let reward_amount = get_reward_amount(ONE_HUNDRED);
+    let assert_input_amount = Amount::from_sat(
+        reward_amount + MIN_RELAY_FEE_ASSERT + DUST_AMOUNT * 2 + MIN_RELAY_FEE_TAKE_2,
+    );
+    let assert_funding_address = config.connector_b.generate_taproot_address();
+    funding_inputs.push((&assert_funding_address, assert_input_amount));
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    verify_funding_inputs(&config.client_0, &funding_inputs).await;
+
+    // peg-in confirm
+    let (peg_in_confirm_tx, peg_in_confirm_txid) = create_and_mine_peg_in_confirm_tx(
+        &config.client_0,
+        &config.depositor_context,
+        &config.verifier_0_context,
+        &config.verifier_1_context,
+        &config.connector_0,
+        &config.connector_z,
+        &peg_in_confirm_funding_address,
+        deposit_input_amount,
+    )
+    .await;
+
+    // assert
+    let (assert_tx, assert_txid) = create_and_mine_assert_tx(
+        &config.client_0,
+        &config.verifier_0_context,
+        &config.verifier_1_context,
+        &assert_funding_address,
+        &config.connector_4,
+        &config.connector_5,
+        &config.connector_b,
+        &config.connector_c,
+        assert_input_amount,
+    )
+    .await;
+
+    // take 2
+    let vout = 0; // connector 0
+    let take_2_input_0 = Input {
+        outpoint: OutPoint {
+            txid: peg_in_confirm_txid,
+            vout,
+        },
+        amount: peg_in_confirm_tx.output[vout as usize].value,
+    };
+    let vout = 0; // connector 4
+    let take_2_input_1 = Input {
+        outpoint: OutPoint {
+            txid: assert_txid,
+            vout,
+        },
+        amount: assert_tx.output[vout as usize].value,
+    };
+    let vout = 1; // connector 5
+    let take_2_input_2 = Input {
+        outpoint: OutPoint {
+            txid: assert_txid,
+            vout,
+        },
+        amount: assert_tx.output[vout as usize].value,
+    };
+    let vout = 2; // connector c
+    let take_2_input_3 = Input {
+        outpoint: OutPoint {
+            txid: assert_txid,
+            vout,
+        },
+        amount: assert_tx.output[vout as usize].value,
+    };
+
+    let mut take_2 = Take2Transaction::new(
+        &config.operator_context,
+        &config.connector_0,
+        &config.connector_4,
+        &config.connector_5,
+        &config.connector_c,
+        take_2_input_0,
+        take_2_input_1,
+        take_2_input_2,
+        take_2_input_3,
+    );
+
+    let secret_nonces_0 = take_2.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = take_2.push_nonces(&config.verifier_1_context);
+
+    take_2.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_0,
+        &config.connector_5,
+        &secret_nonces_0,
+    );
+    take_2.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_0,
+        &config.connector_5,
+        &secret_nonces_1,
+    );
+
+    take_2.sign(&config.operator_context, &config.connector_c);
+
+    let take_2_tx = take_2.finalize();
+    let take_2_txid = take_2_tx.compute_txid();
+
+    // mine take 2
+    check_tx_output_sum(INITIAL_AMOUNT + reward_amount + DUST_AMOUNT * 2, &take_2_tx);
+    wait_for_timelock_expiry(config.network, Some("assert connector 4")).await;
+    let take_2_result = config.client_0.esplora.broadcast(&take_2_tx).await;
+    println!("Take 2 result: {:?}\n", take_2_result);
+    assert!(take_2_result.is_ok());
+
+    // operator balance
+    let operator_address = generate_pay_to_pubkey_script_address(
+        config.operator_context.network,
+        &config.operator_context.operator_public_key,
+    );
+    let operator_utxos = config
+        .client_0
+        .esplora
+        .get_address_utxo(operator_address.clone())
+        .await
+        .unwrap();
+    let operator_utxo = operator_utxos
+        .clone()
+        .into_iter()
+        .find(|x| x.txid == take_2_txid);
+
+    // assert
+    assert!(operator_utxo.is_some());
+}
diff --git a/bridge/tests/bridge/integration/peg_out/utils.rs b/bridge/tests/bridge/integration/peg_out/utils.rs
new file mode 100644
index 000000000..59f1cc1a2
--- /dev/null
+++ b/bridge/tests/bridge/integration/peg_out/utils.rs
@@ -0,0 +1,204 @@
+use std::collections::HashMap;
+
+use bitcoin::{Address, Amount, Transaction, Txid};
+use bitvm::signatures::signing_winternitz::{WinternitzSecret, WinternitzSigningInputs};
+use bridge::{
+    client::client::BitVMClient,
+    commitments::CommitmentMessageId,
+    connectors::{
+        connector_0::Connector0, connector_1::Connector1, connector_2::Connector2,
+        connector_4::Connector4, connector_5::Connector5, connector_6::Connector6,
+        connector_b::ConnectorB, connector_c::ConnectorC, connector_z::ConnectorZ,
+    },
+    contexts::{depositor::DepositorContext, operator::OperatorContext, verifier::VerifierContext},
+    superblock::{get_superblock_hash_message, get_superblock_message},
+    transactions::{
+        assert::AssertTransaction,
+        base::{BaseTransaction, Input},
+        kick_off_1::KickOff1Transaction,
+        kick_off_2::KickOff2Transaction,
+        peg_in_confirm::PegInConfirmTransaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+
+use crate::bridge::helper::{
+    generate_stub_outpoint, get_superblock_header, wait_for_timelock_expiry,
+};
+
+pub async fn create_and_mine_kick_off_1_tx(
+    client: &BitVMClient,
+    operator_context: &OperatorContext,
+    kick_off_1_funding_utxo_address: &Address,
+    connector_1: &Connector1,
+    connector_2: &Connector2,
+    connector_6: &Connector6,
+    input_amount: Amount,
+    commitment_secrets: &HashMap<CommitmentMessageId, WinternitzSecret>,
+) -> (Transaction, Txid) {
+    let kick_off_1_funding_outpoint =
+        generate_stub_outpoint(client, kick_off_1_funding_utxo_address, input_amount).await;
+    let kick_off_1_input = Input {
+        outpoint: kick_off_1_funding_outpoint,
+        amount: input_amount,
+    };
+    let mut kick_off_1 = KickOff1Transaction::new(
+        operator_context,
+        connector_1,
+        connector_2,
+        connector_6,
+        kick_off_1_input,
+    );
+
+    let ethereum_txid = "8b274fbb76c72f66c467c976c61d5ac212620e036818b5986a33f7b557cb2de8";
+    let bitcoin_txid = "8b4cce4a1a9522392c095df6416533d89e1e6ac7bdf8ab3c1685426b321ed182";
+    let source_network_txid_digits = WinternitzSigningInputs {
+        message: bitcoin_txid.as_bytes(),
+        signing_key: &commitment_secrets[&CommitmentMessageId::PegOutTxIdSourceNetwork],
+    };
+    let destination_network_txid_digits = WinternitzSigningInputs {
+        message: ethereum_txid.as_bytes(),
+        signing_key: &commitment_secrets[&CommitmentMessageId::PegOutTxIdDestinationNetwork],
+    };
+    kick_off_1.sign(
+        operator_context,
+        connector_6,
+        &source_network_txid_digits,
+        &destination_network_txid_digits,
+    );
+
+    let kick_off_1_tx = kick_off_1.finalize();
+    let kick_off_1_txid = kick_off_1_tx.compute_txid();
+
+    // mine kick-off 1 tx
+    let kick_off_1_result = client.esplora.broadcast(&kick_off_1_tx).await;
+    println!("Kick-off 1 result: {kick_off_1_result:?}");
+    assert!(kick_off_1_result.is_ok());
+
+    (kick_off_1_tx, kick_off_1_txid)
+}
+
+pub async fn create_and_mine_kick_off_2_tx(
+    client: &BitVMClient,
+    operator_context: &OperatorContext,
+    connector_1: &Connector1,
+    connector_b: &ConnectorB,
+    kick_off_2_funding_utxo_address: &Address,
+    input_amount: Amount,
+    commitment_secrets: &HashMap<CommitmentMessageId, WinternitzSecret>,
+) -> (Transaction, Txid) {
+    let kick_off_2_funding_outpoint =
+        generate_stub_outpoint(client, kick_off_2_funding_utxo_address, input_amount).await;
+    let kick_off_2_input = Input {
+        outpoint: kick_off_2_funding_outpoint,
+        amount: input_amount,
+    };
+    let mut kick_off_2 = KickOff2Transaction::new(
+        &operator_context,
+        &connector_1,
+        &connector_b,
+        kick_off_2_input,
+    );
+    let superblock_header = get_superblock_header();
+    kick_off_2.sign(
+        operator_context,
+        connector_1,
+        &WinternitzSigningInputs {
+            message: &get_superblock_message(&superblock_header),
+            signing_key: &commitment_secrets[&CommitmentMessageId::Superblock],
+        },
+        &WinternitzSigningInputs {
+            message: &get_superblock_hash_message(&superblock_header),
+            signing_key: &commitment_secrets[&CommitmentMessageId::SuperblockHash],
+        },
+    );
+    let kick_off_2_tx = kick_off_2.finalize();
+    let kick_off_2_txid = kick_off_2_tx.compute_txid();
+
+    // mine kick-off 2 tx
+    wait_for_timelock_expiry(operator_context.network, Some("kick off 1 connector 1")).await;
+    let kick_off_2_result = client.esplora.broadcast(&kick_off_2_tx).await;
+    println!("Kick off 2 tx result: {kick_off_2_result:?}");
+    assert!(kick_off_2_result.is_ok());
+
+    (kick_off_2_tx, kick_off_2_txid)
+}
+
+pub async fn create_and_mine_assert_tx(
+    client: &BitVMClient,
+    verifier_0_context: &VerifierContext,
+    verifier_1_context: &VerifierContext,
+    assert_funding_utxo_address: &Address,
+    connector_4: &Connector4,
+    connector_5: &Connector5,
+    connector_b: &ConnectorB,
+    connector_c: &ConnectorC,
+    input_amount: Amount,
+) -> (Transaction, Txid) {
+    // create assert tx
+    let assert_funding_outpoint =
+        generate_stub_outpoint(client, assert_funding_utxo_address, input_amount).await;
+    let assert_input = Input {
+        outpoint: assert_funding_outpoint,
+        amount: input_amount,
+    };
+    let mut assert = AssertTransaction::new(
+        connector_4,
+        connector_5,
+        connector_b,
+        connector_c,
+        assert_input,
+    );
+
+    let secret_nonces_0 = assert.push_nonces(verifier_0_context);
+    let secret_nonces_1 = assert.push_nonces(verifier_1_context);
+
+    assert.pre_sign(verifier_0_context, connector_b, &secret_nonces_0);
+    assert.pre_sign(verifier_1_context, connector_b, &secret_nonces_1);
+
+    let assert_tx = assert.finalize();
+    let assert_txid = assert_tx.compute_txid();
+
+    // mine assert tx
+    wait_for_timelock_expiry(verifier_0_context.network, Some("kick off 2 connector b")).await;
+    let assert_result = client.esplora.broadcast(&assert_tx).await;
+    assert!(assert_result.is_ok());
+
+    (assert_tx, assert_txid)
+}
+
+pub async fn create_and_mine_peg_in_confirm_tx(
+    client: &BitVMClient,
+    depositor_context: &DepositorContext,
+    verifier_0_context: &VerifierContext,
+    verifier_1_context: &VerifierContext,
+    connector_0: &Connector0,
+    connector_z: &ConnectorZ,
+    funding_address: &Address,
+    input_amount: Amount,
+) -> (Transaction, Txid) {
+    let peg_in_confirm_funding_outpoint =
+        generate_stub_outpoint(client, funding_address, input_amount).await;
+
+    let confirm_input = Input {
+        outpoint: peg_in_confirm_funding_outpoint,
+        amount: input_amount,
+    };
+    let mut peg_in_confirm =
+        PegInConfirmTransaction::new(depositor_context, connector_0, connector_z, confirm_input);
+
+    let secret_nonces_0 = peg_in_confirm.push_nonces(verifier_0_context);
+    let secret_nonces_1 = peg_in_confirm.push_nonces(verifier_1_context);
+
+    peg_in_confirm.pre_sign(verifier_0_context, connector_z, &secret_nonces_0);
+    peg_in_confirm.pre_sign(verifier_1_context, connector_z, &secret_nonces_1);
+
+    let peg_in_confirm_tx = peg_in_confirm.finalize();
+    let peg_in_confirm_txid = peg_in_confirm_tx.compute_txid();
+
+    // mine peg-in confirm
+    let confirm_result = client.esplora.broadcast(&peg_in_confirm_tx).await;
+    assert!(confirm_result.is_ok());
+
+    (peg_in_confirm_tx, peg_in_confirm_txid)
+}
diff --git a/bridge/tests/bridge/kick_off_1/kick_off_1.rs b/bridge/tests/bridge/kick_off_1/kick_off_1.rs
new file mode 100644
index 000000000..ca9964bd4
--- /dev/null
+++ b/bridge/tests/bridge/kick_off_1/kick_off_1.rs
@@ -0,0 +1,73 @@
+use bitcoin::Amount;
+
+use bridge::{
+    commitments::CommitmentMessageId,
+    connectors::base::TaprootConnector,
+    graphs::base::DUST_AMOUNT,
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_KICK_OFF_1, MIN_RELAY_FEE_START_TIME},
+        kick_off_1::KickOff1Transaction,
+    },
+};
+
+use bitvm::signatures::signing_winternitz::WinternitzSigningInputs;
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, generate_stub_outpoint},
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_kick_off_1_tx_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let subsequent_tx_fee = MIN_RELAY_FEE_START_TIME + DUST_AMOUNT * 2;
+    let input_amount =
+        Amount::from_sat(INITIAL_AMOUNT + MIN_RELAY_FEE_KICK_OFF_1 + subsequent_tx_fee);
+    let funding_address = config.connector_6.generate_taproot_address();
+    faucet
+        .fund_input(&funding_address, input_amount)
+        .await
+        .wait()
+        .await;
+    let funding_outpoint_0 =
+        generate_stub_outpoint(&config.client_0, &funding_address, input_amount).await;
+
+    let input = Input {
+        outpoint: funding_outpoint_0,
+        amount: input_amount,
+    };
+
+    let mut kick_off_1_tx = KickOff1Transaction::new(
+        &config.operator_context,
+        &config.connector_1,
+        &config.connector_2,
+        &config.connector_6,
+        input,
+    );
+    let ethereum_txid = "8b274fbb76c72f66c467c976c61d5ac212620e036818b5986a33f7b557cb2de8";
+    let bitcoin_txid = "8b4cce4a1a9522392c095df6416533d89e1e6ac7bdf8ab3c1685426b321ed182";
+    let source_network_txid_digits = WinternitzSigningInputs {
+        message: bitcoin_txid.as_bytes(),
+        signing_key: &config.commitment_secrets[&CommitmentMessageId::PegOutTxIdSourceNetwork],
+    };
+    let destination_network_txid_digits = WinternitzSigningInputs {
+        message: ethereum_txid.as_bytes(),
+        signing_key: &config.commitment_secrets[&CommitmentMessageId::PegOutTxIdDestinationNetwork],
+    };
+    kick_off_1_tx.sign(
+        &config.operator_context,
+        &config.connector_6,
+        &source_network_txid_digits,
+        &destination_network_txid_digits,
+    );
+
+    let tx = kick_off_1_tx.finalize();
+    check_tx_output_sum(INITIAL_AMOUNT + subsequent_tx_fee, &tx);
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Kick Off 1 tx result: {:?}\n", result);
+    assert!(result.is_ok());
+}
diff --git a/tests/bridge/kick_off_1/mod.rs b/bridge/tests/bridge/kick_off_1/mod.rs
similarity index 100%
rename from tests/bridge/kick_off_1/mod.rs
rename to bridge/tests/bridge/kick_off_1/mod.rs
diff --git a/bridge/tests/bridge/kick_off_2/kick_off_2.rs b/bridge/tests/bridge/kick_off_2/kick_off_2.rs
new file mode 100644
index 000000000..932af3a19
--- /dev/null
+++ b/bridge/tests/bridge/kick_off_2/kick_off_2.rs
@@ -0,0 +1,75 @@
+use bitcoin::Amount;
+
+use bridge::{
+    commitments::CommitmentMessageId,
+    connectors::base::TaprootConnector,
+    graphs::base::DUST_AMOUNT,
+    superblock::{get_superblock_hash_message, get_superblock_message},
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_KICK_OFF_2},
+        kick_off_2::KickOff2Transaction,
+    },
+};
+
+use crate::{
+    bridge::faucet::{Faucet, FaucetType},
+    bridge::helper::generate_stub_outpoint,
+    bridge::setup::setup_test,
+};
+use crate::{
+    bridge::helper::{
+        check_tx_output_sum, get_reward_amount, get_superblock_header, wait_for_timelock_expiry,
+    },
+    bridge::setup::ONE_HUNDRED,
+};
+use bitvm::signatures::signing_winternitz::WinternitzSigningInputs;
+
+#[tokio::test]
+async fn test_kick_off_2_tx_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let reward_amount = get_reward_amount(ONE_HUNDRED);
+    let input_value0 = Amount::from_sat(reward_amount + MIN_RELAY_FEE_KICK_OFF_2 + DUST_AMOUNT);
+    let funding_utxo_address0: bitcoin::Address = config.connector_1.generate_taproot_address();
+    faucet
+        .fund_input(&funding_utxo_address0, input_value0)
+        .await
+        .wait()
+        .await;
+
+    let funding_outpoint0 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address0, input_value0).await;
+
+    let mut kick_off_2_tx = KickOff2Transaction::new(
+        &config.operator_context,
+        &config.connector_1,
+        &config.connector_b,
+        Input {
+            outpoint: funding_outpoint0,
+            amount: input_value0,
+        },
+    );
+
+    let superblock_header = get_superblock_header();
+    kick_off_2_tx.sign(
+        &config.operator_context,
+        &config.connector_1,
+        &WinternitzSigningInputs {
+            message: &get_superblock_message(&superblock_header),
+            signing_key: &config.commitment_secrets[&CommitmentMessageId::Superblock],
+        },
+        &WinternitzSigningInputs {
+            message: &get_superblock_hash_message(&superblock_header),
+            signing_key: &config.commitment_secrets[&CommitmentMessageId::SuperblockHash],
+        },
+    );
+
+    let tx = kick_off_2_tx.finalize();
+    check_tx_output_sum(reward_amount + DUST_AMOUNT, &tx);
+    wait_for_timelock_expiry(config.network, Some("kick off 2 connector 3")).await;
+    let result: Result<(), esplora_client::Error> = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Kick Off 2 tx result: {:?}\n", result);
+    assert!(result.is_ok());
+}
diff --git a/tests/bridge/kick_off_2/mod.rs b/bridge/tests/bridge/kick_off_2/mod.rs
similarity index 100%
rename from tests/bridge/kick_off_2/mod.rs
rename to bridge/tests/bridge/kick_off_2/mod.rs
diff --git a/bridge/tests/bridge/kick_off_timeout/kick_off_timeout.rs b/bridge/tests/bridge/kick_off_timeout/kick_off_timeout.rs
new file mode 100644
index 000000000..6ccf0288f
--- /dev/null
+++ b/bridge/tests/bridge/kick_off_timeout/kick_off_timeout.rs
@@ -0,0 +1,76 @@
+use bitcoin::Amount;
+
+use bridge::{
+    connectors::base::TaprootConnector,
+    scripts::generate_pay_to_pubkey_script_address,
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_KICK_OFF_TIMEOUT},
+        kick_off_timeout::KickOffTimeoutTransaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{
+        check_tx_output_sum, generate_stub_outpoint, get_reward_amount, wait_for_timelock_expiry,
+    },
+    setup::{setup_test, ONE_HUNDRED},
+};
+
+#[tokio::test]
+async fn test_kick_off_timeout_tx_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let reward_amount = get_reward_amount(ONE_HUNDRED);
+    let input_value0 = Amount::from_sat(reward_amount + MIN_RELAY_FEE_KICK_OFF_TIMEOUT);
+    faucet
+        .fund_input(&config.connector_1.generate_taproot_address(), input_value0)
+        .await
+        .wait()
+        .await;
+    let outpoint_0 = generate_stub_outpoint(
+        &config.client_0,
+        &config.connector_1.generate_taproot_address(),
+        input_value0,
+    )
+    .await;
+
+    let mut kick_off_timeout_tx = KickOffTimeoutTransaction::new(
+        &config.operator_context,
+        &config.connector_1,
+        Input {
+            outpoint: outpoint_0,
+            amount: input_value0,
+        },
+    );
+
+    let secret_nonces_0 = kick_off_timeout_tx.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = kick_off_timeout_tx.push_nonces(&config.verifier_1_context);
+
+    kick_off_timeout_tx.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_1,
+        &secret_nonces_0,
+    );
+    kick_off_timeout_tx.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_1,
+        &secret_nonces_1,
+    );
+
+    let reward_address = generate_pay_to_pubkey_script_address(
+        config.withdrawer_context.network,
+        &config.withdrawer_context.withdrawer_public_key,
+    );
+    kick_off_timeout_tx.add_output(reward_address.script_pubkey());
+
+    let tx = kick_off_timeout_tx.finalize();
+    check_tx_output_sum(reward_amount, &tx);
+    wait_for_timelock_expiry(config.network, Some("kick off 1 connector 1")).await;
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Kick off timeout result: {:?}\n", result);
+    assert!(result.is_ok());
+}
diff --git a/tests/bridge/kick_off_timeout/mod.rs b/bridge/tests/bridge/kick_off_timeout/mod.rs
similarity index 100%
rename from tests/bridge/kick_off_timeout/mod.rs
rename to bridge/tests/bridge/kick_off_timeout/mod.rs
diff --git a/tests/bridge/mod.rs b/bridge/tests/bridge/mod.rs
similarity index 92%
rename from tests/bridge/mod.rs
rename to bridge/tests/bridge/mod.rs
index 15e9bf9ee..a1686264b 100644
--- a/tests/bridge/mod.rs
+++ b/bridge/tests/bridge/mod.rs
@@ -1,11 +1,12 @@
 pub mod assert;
 pub mod base;
-pub mod chain;
 pub mod challenge;
 pub mod client;
 pub mod data_store;
 pub mod disprove;
 pub mod disprove_chain;
+pub mod e2e;
+pub mod faucet;
 pub mod helper;
 pub mod integration;
 pub mod kick_off_1;
diff --git a/tests/bridge/peg_in/mod.rs b/bridge/tests/bridge/peg_in/mod.rs
similarity index 100%
rename from tests/bridge/peg_in/mod.rs
rename to bridge/tests/bridge/peg_in/mod.rs
diff --git a/bridge/tests/bridge/peg_in/peg_in_confirm.rs b/bridge/tests/bridge/peg_in/peg_in_confirm.rs
new file mode 100644
index 000000000..b65c106e8
--- /dev/null
+++ b/bridge/tests/bridge/peg_in/peg_in_confirm.rs
@@ -0,0 +1,64 @@
+use bitcoin::{consensus::encode::serialize_hex, Amount};
+
+use bridge::{
+    connectors::base::TaprootConnector,
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_PEG_IN_CONFIRM},
+        peg_in_confirm::PegInConfirmTransaction,
+        pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, generate_stub_outpoint},
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_peg_in_confirm_tx_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let amount = Amount::from_sat(INITIAL_AMOUNT + MIN_RELAY_FEE_PEG_IN_CONFIRM);
+    faucet
+        .fund_input(&config.connector_z.generate_taproot_address(), amount)
+        .await
+        .wait()
+        .await;
+    let outpoint = generate_stub_outpoint(
+        &config.client_0,
+        &config.connector_z.generate_taproot_address(),
+        amount,
+    )
+    .await;
+
+    let mut peg_in_confirm_tx = PegInConfirmTransaction::new(
+        &config.depositor_context,
+        &config.connector_0,
+        &config.connector_z,
+        Input { outpoint, amount },
+    );
+
+    let secret_nonces_0 = peg_in_confirm_tx.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = peg_in_confirm_tx.push_nonces(&config.verifier_1_context);
+
+    peg_in_confirm_tx.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_z,
+        &secret_nonces_0,
+    );
+    peg_in_confirm_tx.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_z,
+        &secret_nonces_1,
+    );
+
+    let tx = peg_in_confirm_tx.finalize();
+    check_tx_output_sum(INITIAL_AMOUNT, &tx);
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Peg in confirm tx result: {:?}\n", result);
+    println!("Transaction hex: \n{}", serialize_hex(&tx));
+    assert!(result.is_ok());
+}
diff --git a/bridge/tests/bridge/peg_in/peg_in_deposit.rs b/bridge/tests/bridge/peg_in/peg_in_deposit.rs
new file mode 100644
index 000000000..461c361ac
--- /dev/null
+++ b/bridge/tests/bridge/peg_in/peg_in_deposit.rs
@@ -0,0 +1,47 @@
+use bitcoin::Amount;
+
+use bridge::{
+    scripts::generate_pay_to_pubkey_script_address,
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_PEG_IN_DEPOSIT},
+        peg_in_deposit::PegInDepositTransaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, generate_stub_outpoint},
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_peg_in_deposit_tx_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let amount = Amount::from_sat(INITIAL_AMOUNT + MIN_RELAY_FEE_PEG_IN_DEPOSIT);
+    let address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
+    );
+    faucet.fund_input(&address, amount).await.wait().await;
+    let outpoint = generate_stub_outpoint(&config.client_0, &address, amount).await;
+
+    let peg_in_deposit_tx = PegInDepositTransaction::new(
+        &config.depositor_context,
+        &config.connector_z,
+        Input { outpoint, amount },
+    );
+
+    println!(
+        "Depositor public key: {:?}\n",
+        &config.depositor_context.depositor_public_key
+    );
+
+    let tx = peg_in_deposit_tx.finalize();
+    check_tx_output_sum(INITIAL_AMOUNT, &tx);
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Peg in deposit tx result: {:?}\n", result);
+    assert!(result.is_ok());
+}
diff --git a/bridge/tests/bridge/peg_in/peg_in_refund.rs b/bridge/tests/bridge/peg_in/peg_in_refund.rs
new file mode 100644
index 000000000..2e0b33057
--- /dev/null
+++ b/bridge/tests/bridge/peg_in/peg_in_refund.rs
@@ -0,0 +1,48 @@
+use bitcoin::Amount;
+
+use bridge::{
+    connectors::base::TaprootConnector,
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_PEG_IN_REFUND},
+        peg_in_refund::PegInRefundTransaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{check_tx_output_sum, generate_stub_outpoint, wait_for_timelock_expiry},
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_peg_in_refund_tx_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let amount = Amount::from_sat(INITIAL_AMOUNT + MIN_RELAY_FEE_PEG_IN_REFUND);
+    faucet
+        .fund_input(&config.connector_z.generate_taproot_address(), amount)
+        .await
+        .wait()
+        .await;
+    let outpoint = generate_stub_outpoint(
+        &config.client_0,
+        &config.connector_z.generate_taproot_address(),
+        amount,
+    )
+    .await;
+
+    let peg_in_refund_tx = PegInRefundTransaction::new(
+        &config.depositor_context,
+        &config.connector_z,
+        Input { outpoint, amount },
+    );
+
+    let tx = peg_in_refund_tx.finalize();
+    check_tx_output_sum(INITIAL_AMOUNT, &tx);
+    wait_for_timelock_expiry(config.network, Some("peg in deposit connector z")).await;
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Peg in refund tx result: {:?}\n", result);
+    assert!(result.is_ok());
+}
diff --git a/bridge/tests/bridge/serialization/assert_transaction.rs b/bridge/tests/bridge/serialization/assert_transaction.rs
new file mode 100644
index 000000000..8a75f068b
--- /dev/null
+++ b/bridge/tests/bridge/serialization/assert_transaction.rs
@@ -0,0 +1,61 @@
+use bitcoin::Amount;
+
+use bridge::{
+    connectors::base::TaprootConnector,
+    serialization::{deserialize, serialize},
+    transactions::{
+        assert::AssertTransaction, base::Input, pre_signed_musig2::PreSignedMusig2Transaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{generate_stub_outpoint, get_reward_amount},
+    setup::{setup_test_full, ONE_HUNDRED},
+};
+
+#[tokio::test]
+async fn test_assert_tx_serialization() {
+    let config = setup_test_full().await;
+
+    let amount = Amount::from_sat(get_reward_amount(ONE_HUNDRED));
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+    faucet
+        .fund_input(&config.connector_b.generate_taproot_address(), amount)
+        .await
+        .wait()
+        .await;
+    let outpoint = generate_stub_outpoint(
+        &config.client_0,
+        &config.connector_b.generate_taproot_address(),
+        amount,
+    )
+    .await;
+
+    let mut assert_tx = AssertTransaction::new(
+        &config.connector_4,
+        &config.connector_5,
+        &config.connector_b,
+        &config.connector_c,
+        Input { outpoint, amount },
+    );
+
+    let secret_nonces_0 = assert_tx.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = assert_tx.push_nonces(&config.verifier_1_context);
+
+    assert_tx.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_b,
+        &secret_nonces_0,
+    );
+    assert_tx.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_b,
+        &secret_nonces_1,
+    );
+
+    let json = serialize(&assert_tx);
+    assert!(!json.is_empty());
+    let deserialized_assert_tx = deserialize::<AssertTransaction>(&json);
+    assert!(assert_tx == deserialized_assert_tx);
+}
diff --git a/tests/bridge/serialization/mod.rs b/bridge/tests/bridge/serialization/mod.rs
similarity index 100%
rename from tests/bridge/serialization/mod.rs
rename to bridge/tests/bridge/serialization/mod.rs
diff --git a/bridge/tests/bridge/serialization/peg_in_graph.rs b/bridge/tests/bridge/serialization/peg_in_graph.rs
new file mode 100644
index 000000000..c950d1dfb
--- /dev/null
+++ b/bridge/tests/bridge/serialization/peg_in_graph.rs
@@ -0,0 +1,42 @@
+use bitcoin::Amount;
+
+use bridge::{
+    graphs::peg_in::PegInGraph,
+    scripts::generate_pay_to_pubkey_script_address,
+    serialization::{deserialize, serialize},
+    transactions::base::{Input, MIN_RELAY_FEE_PEG_IN_CONFIRM, MIN_RELAY_FEE_PEG_IN_DEPOSIT},
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::generate_stub_outpoint,
+    setup::{setup_test, INITIAL_AMOUNT},
+};
+
+#[tokio::test]
+async fn test_peg_in_graph_serialization() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let amount = Amount::from_sat(
+        INITIAL_AMOUNT + MIN_RELAY_FEE_PEG_IN_DEPOSIT + MIN_RELAY_FEE_PEG_IN_CONFIRM,
+    );
+    let address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
+    );
+    faucet.fund_input(&address, amount).await.wait().await;
+
+    let outpoint = generate_stub_outpoint(&config.client_0, &address, amount).await;
+
+    let peg_in_graph = PegInGraph::new(
+        &config.depositor_context,
+        Input { outpoint, amount },
+        &config.depositor_evm_address,
+    );
+
+    let json = serialize(&peg_in_graph);
+    assert!(!json.is_empty());
+    let deserialized_peg_in_graph = deserialize::<PegInGraph>(&json);
+    assert!(peg_in_graph == deserialized_peg_in_graph);
+}
diff --git a/bridge/tests/bridge/serialization/peg_out_graph.rs b/bridge/tests/bridge/serialization/peg_out_graph.rs
new file mode 100644
index 000000000..b27f250db
--- /dev/null
+++ b/bridge/tests/bridge/serialization/peg_out_graph.rs
@@ -0,0 +1,66 @@
+use bitcoin::{Address, Amount};
+
+use bridge::{
+    graphs::{base::PEG_OUT_FEE, peg_in::PegInGraph, peg_out::PegOutGraph},
+    scripts::generate_pay_to_pubkey_script_address,
+    serialization::{deserialize, serialize},
+    transactions::base::{Input, MIN_RELAY_FEE_PEG_IN_CONFIRM},
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{generate_stub_outpoint, get_reward_amount},
+    setup::{setup_test, ONE_HUNDRED},
+};
+
+#[tokio::test]
+async fn test_peg_out_graph_serialization() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+    let amount = Amount::from_sat(ONE_HUNDRED + MIN_RELAY_FEE_PEG_IN_CONFIRM);
+    let address = generate_pay_to_pubkey_script_address(
+        config.depositor_context.network,
+        &config.depositor_context.depositor_public_key,
+    );
+    funding_inputs.push((&address, amount));
+
+    let kick_off_amount = Amount::from_sat(get_reward_amount(ONE_HUNDRED) + PEG_OUT_FEE);
+    let kick_off_address = generate_pay_to_pubkey_script_address(
+        config.operator_context.network,
+        &config.operator_context.operator_public_key,
+    );
+    funding_inputs.push((&kick_off_address, kick_off_amount));
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    let outpoint = generate_stub_outpoint(&config.client_0, &address, amount).await;
+
+    let peg_in_graph = PegInGraph::new(
+        &config.depositor_context,
+        Input { outpoint, amount },
+        &config.depositor_evm_address,
+    );
+
+    let kick_off_outpoint =
+        generate_stub_outpoint(&config.client_0, &kick_off_address, kick_off_amount).await;
+
+    let peg_out_graph = PegOutGraph::new(
+        &config.operator_context,
+        &peg_in_graph,
+        Input {
+            outpoint: kick_off_outpoint,
+            amount: kick_off_amount,
+        },
+        &config.commitment_secrets,
+    );
+
+    let json = serialize(&peg_out_graph);
+    assert!(!json.is_empty());
+    let deserialized_peg_out_graph = deserialize::<PegOutGraph>(&json);
+    assert!(peg_out_graph == deserialized_peg_out_graph);
+}
diff --git a/bridge/tests/bridge/setup.rs b/bridge/tests/bridge/setup.rs
new file mode 100644
index 000000000..569687c69
--- /dev/null
+++ b/bridge/tests/bridge/setup.rs
@@ -0,0 +1,403 @@
+use std::collections::HashMap;
+
+use bitcoin::{Network, PublicKey};
+
+use super::helper::{get_intermediate_variables_cached, get_valid_proof, invalidate_proof};
+use bridge::{
+    client::{
+        chain::chain_adaptor::get_chain_adaptor, client::BitVMClient, esplora::get_esplora_url,
+    },
+    commitments::CommitmentMessageId,
+    connectors::{
+        connector_0::Connector0, connector_1::Connector1, connector_2::Connector2,
+        connector_3::Connector3, connector_4::Connector4, connector_5::Connector5,
+        connector_6::Connector6, connector_a::ConnectorA, connector_b::ConnectorB,
+        connector_c::ConnectorC, connector_d::ConnectorD, connector_e::ConnectorE,
+        connector_f_1::ConnectorF1, connector_f_2::ConnectorF2, connector_z::ConnectorZ,
+    },
+    constants::{
+        DestinationNetwork, DESTINATION_NETWORK_TXID_LENGTH, SOURCE_NETWORK_TXID_LENGTH,
+        START_TIME_MESSAGE_LENGTH,
+    },
+    contexts::{
+        base::generate_keys_from_secret, depositor::DepositorContext, operator::OperatorContext,
+        verifier::VerifierContext, withdrawer::WithdrawerContext,
+    },
+    serialization::serialize,
+    superblock::{SUPERBLOCK_HASH_MESSAGE_LENGTH, SUPERBLOCK_MESSAGE_LENGTH},
+    transactions::assert_transactions::utils::{
+        groth16_commitment_secrets_to_public_keys, merge_to_connector_c_commits_public_key,
+        AssertCommit1ConnectorsE, AssertCommit2ConnectorsE, AssertCommitConnectorsF,
+    },
+};
+
+use bitvm::{
+    chunk::api::type_conversion_utils::RawProof, signatures::{
+        signing_winternitz::{WinternitzPublicKey, WinternitzSecret},
+        winternitz::Parameters,
+    }
+};
+
+const OPERATOR_SECRET: &str = "3076ca1dfc1e383be26d5dd3c0c427340f96139fa8c2520862cf551ec2d670ac";
+const VERIFIER_0_SECRET: &str = "ee0817eac0c13aa8ee2dd3256304041f09f0499d1089b56495310ae8093583e2";
+const VERIFIER_1_SECRET: &str = "fc294c70faf210d4d0807ea7a3dba8f7e41700d90c119e1ae82a0687d89d297f";
+const DEPOSITOR_SECRET: &str = "b8f17ea979be24199e7c3fec71ee88914d92fd4ca508443f765d56ce024ef1d7";
+const WITHDRAWER_SECRET: &str = "fffd54f6d8f8ad470cb507fd4b6e9b3ea26b4221a4900cc5ad5916ce67c02f1e";
+
+const DEPOSITOR_EVM_ADDRESS: &str = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"; // l2 local test network account 1
+const WITHDRAWER_EVM_ADDRESS: &str = "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC"; // l2 local test network account 2
+
+pub const INITIAL_AMOUNT: u64 = 2 << 20; // 2097152
+pub const ONE_HUNDRED: u64 = 2 << 26; // 134217728
+
+pub struct SetupConfig {
+    pub network: Network,
+    pub client_0: BitVMClient,
+    pub client_1: BitVMClient,
+    pub depositor_context: DepositorContext,
+    pub operator_context: OperatorContext,
+    pub verifier_0_context: VerifierContext,
+    pub verifier_1_context: VerifierContext,
+    pub withdrawer_context: WithdrawerContext,
+    pub connector_a: ConnectorA,
+    pub connector_b: ConnectorB,
+    pub connector_d: ConnectorD,
+    pub assert_commit_connectors_f: AssertCommitConnectorsF,
+    pub connector_z: ConnectorZ,
+    pub connector_0: Connector0,
+    pub connector_1: Connector1,
+    pub connector_2: Connector2,
+    pub connector_3: Connector3,
+    pub connector_4: Connector4,
+    pub connector_5: Connector5,
+    pub connector_6: Connector6,
+    pub depositor_evm_address: String,
+    pub withdrawer_evm_address: String,
+    pub commitment_secrets: HashMap<CommitmentMessageId, WinternitzSecret>,
+    pub valid_proof: RawProof,
+    pub invalid_proof: RawProof,
+}
+
+pub struct SetupConfigFull {
+    pub network: Network,
+    pub client_0: BitVMClient,
+    pub client_1: BitVMClient,
+    pub depositor_context: DepositorContext,
+    pub operator_context: OperatorContext,
+    pub verifier_0_context: VerifierContext,
+    pub verifier_1_context: VerifierContext,
+    pub withdrawer_context: WithdrawerContext,
+    pub connector_a: ConnectorA,
+    pub connector_b: ConnectorB,
+    pub connector_c: ConnectorC,
+    pub connector_d: ConnectorD,
+    pub assert_commit_connectors_e_1: AssertCommit1ConnectorsE,
+    pub assert_commit_connectors_e_2: AssertCommit2ConnectorsE,
+    pub assert_commit_connectors_f: AssertCommitConnectorsF,
+    pub connector_z: ConnectorZ,
+    pub connector_0: Connector0,
+    pub connector_1: Connector1,
+    pub connector_2: Connector2,
+    pub connector_3: Connector3,
+    pub connector_4: Connector4,
+    pub connector_5: Connector5,
+    pub connector_6: Connector6,
+    pub depositor_evm_address: String,
+    pub withdrawer_evm_address: String,
+    pub commitment_secrets: HashMap<CommitmentMessageId, WinternitzSecret>,
+    pub valid_proof: RawProof,
+    pub invalid_proof: RawProof,
+}
+
+pub async fn setup_test_full() -> SetupConfigFull {
+    let config = setup_test().await;
+
+    let (connector_e1_commitment_public_keys, connector_e2_commitment_public_keys) =
+        groth16_commitment_secrets_to_public_keys(&config.commitment_secrets);
+
+    let assert_commit_connectors_e_1 = AssertCommit1ConnectorsE {
+        connectors_e: connector_e1_commitment_public_keys
+            .iter()
+            .map(|x| {
+                ConnectorE::new(
+                    config.network,
+                    &config.operator_context.operator_public_key,
+                    x,
+                )
+            })
+            .collect(),
+    };
+    let assert_commit_connectors_e_2 = AssertCommit2ConnectorsE {
+        connectors_e: connector_e2_commitment_public_keys
+            .iter()
+            .map(|x| {
+                ConnectorE::new(
+                    config.network,
+                    &config.operator_context.operator_public_key,
+                    x,
+                )
+            })
+            .collect(),
+    };
+
+    let commitment_public_keys = merge_to_connector_c_commits_public_key(
+        &connector_e1_commitment_public_keys,
+        &connector_e2_commitment_public_keys,
+    );
+
+    let cache_id = ConnectorC::cache_id(&commitment_public_keys).unwrap();
+    let connector_c = ConnectorC::new(
+        config.network,
+        &config.operator_context.operator_taproot_public_key,
+        &commitment_public_keys,
+        Some(cache_id),
+    );
+    serialize(&connector_c); // Caches the lock scripts
+
+    SetupConfigFull {
+        network: config.network,
+        client_0: config.client_0,
+        client_1: config.client_1,
+        depositor_context: config.depositor_context,
+        operator_context: config.operator_context,
+        verifier_0_context: config.verifier_0_context,
+        verifier_1_context: config.verifier_1_context,
+        withdrawer_context: config.withdrawer_context,
+        connector_a: config.connector_a,
+        connector_b: config.connector_b,
+        connector_c: connector_c,
+        connector_d: config.connector_d,
+        assert_commit_connectors_e_1: assert_commit_connectors_e_1,
+        assert_commit_connectors_e_2: assert_commit_connectors_e_2,
+        assert_commit_connectors_f: config.assert_commit_connectors_f,
+        connector_z: config.connector_z,
+        connector_0: config.connector_0,
+        connector_1: config.connector_1,
+        connector_2: config.connector_2,
+        connector_3: config.connector_3,
+        connector_4: config.connector_4,
+        connector_5: config.connector_5,
+        connector_6: config.connector_6,
+        depositor_evm_address: config.depositor_evm_address,
+        withdrawer_evm_address: config.withdrawer_evm_address,
+        commitment_secrets: config.commitment_secrets,
+        valid_proof: config.valid_proof,
+        invalid_proof: config.invalid_proof,
+    }
+}
+
+pub async fn setup_test() -> SetupConfig {
+    let source_network = Network::Regtest;
+    let destination_network = DestinationNetwork::Local;
+
+    let commitment_secrets = get_test_commitment_secrets();
+
+    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);
+    let mut n_of_n_public_keys: Vec<PublicKey> = Vec::new();
+    n_of_n_public_keys.push(verifier_0_public_key);
+    n_of_n_public_keys.push(verifier_1_public_key);
+
+    let depositor_context =
+        DepositorContext::new(source_network, DEPOSITOR_SECRET, &n_of_n_public_keys);
+    let operator_context =
+        OperatorContext::new(source_network, OPERATOR_SECRET, &n_of_n_public_keys);
+    let verifier_0_context =
+        VerifierContext::new(source_network, VERIFIER_0_SECRET, &n_of_n_public_keys);
+    let verifier_1_context =
+        VerifierContext::new(source_network, VERIFIER_1_SECRET, &n_of_n_public_keys);
+    let withdrawer_context =
+        WithdrawerContext::new(source_network, WITHDRAWER_SECRET, &n_of_n_public_keys);
+
+    let valid_proof = get_valid_proof();
+    let invalid_proof = invalidate_proof(&valid_proof);
+
+    let client_0 = BitVMClient::new(
+        Some(get_esplora_url(source_network)),
+        source_network,
+        destination_network,
+        Some(get_chain_adaptor(destination_network, None, None)),
+        &n_of_n_public_keys,
+        Some(DEPOSITOR_SECRET),
+        Some(OPERATOR_SECRET),
+        Some(VERIFIER_0_SECRET),
+        Some(WITHDRAWER_SECRET),
+        Some("test_client_0"),
+        Some(valid_proof.vk.clone()),
+    )
+    .await;
+
+    let client_1 = BitVMClient::new(
+        Some(get_esplora_url(source_network)),
+        source_network,
+        destination_network,
+        Some(get_chain_adaptor(destination_network, None, None)),
+        &n_of_n_public_keys,
+        Some(DEPOSITOR_SECRET),
+        Some(OPERATOR_SECRET),
+        Some(VERIFIER_1_SECRET),
+        Some(WITHDRAWER_SECRET),
+        Some("test_client_1"),
+        Some(valid_proof.vk.clone()),
+    )
+    .await;
+
+    let connector_a = ConnectorA::new(
+        source_network,
+        &operator_context.operator_taproot_public_key,
+        &operator_context.n_of_n_taproot_public_key,
+    );
+    let connector_b = ConnectorB::new(
+        source_network,
+        &operator_context.n_of_n_taproot_public_key,
+        &HashMap::from([
+            (
+                CommitmentMessageId::StartTime,
+                WinternitzPublicKey::from(&commitment_secrets[&CommitmentMessageId::StartTime]),
+            ),
+            (
+                CommitmentMessageId::SuperblockHash,
+                WinternitzPublicKey::from(
+                    &commitment_secrets[&CommitmentMessageId::SuperblockHash],
+                ),
+            ),
+        ]),
+    );
+    let connector_d = ConnectorD::new(source_network, &operator_context.n_of_n_taproot_public_key);
+
+    let connector_f_1 = ConnectorF1::new(source_network, &operator_context.operator_public_key);
+    let connector_f_2 = ConnectorF2::new(source_network, &operator_context.operator_public_key);
+
+    let assert_commit_connectors_f = AssertCommitConnectorsF {
+        connector_f_1,
+        connector_f_2,
+    };
+
+    let connector_z = ConnectorZ::new(
+        source_network,
+        DEPOSITOR_EVM_ADDRESS,
+        &depositor_context.depositor_taproot_public_key,
+        &operator_context.n_of_n_taproot_public_key,
+    );
+    let connector_0 = Connector0::new(source_network, &operator_context.n_of_n_taproot_public_key);
+
+    let connector_1 = Connector1::new(
+        source_network,
+        &operator_context.operator_taproot_public_key,
+        &operator_context.n_of_n_taproot_public_key,
+        &HashMap::from([
+            (
+                CommitmentMessageId::Superblock,
+                WinternitzPublicKey::from(&commitment_secrets[&CommitmentMessageId::Superblock]),
+            ),
+            (
+                CommitmentMessageId::SuperblockHash,
+                WinternitzPublicKey::from(
+                    &commitment_secrets[&CommitmentMessageId::SuperblockHash],
+                ),
+            ),
+        ]),
+    );
+    let connector_2 = Connector2::new(
+        source_network,
+        &operator_context.operator_taproot_public_key,
+        &operator_context.n_of_n_taproot_public_key,
+        &HashMap::from([(
+            CommitmentMessageId::StartTime,
+            WinternitzPublicKey::from(&commitment_secrets[&CommitmentMessageId::StartTime]),
+        )]),
+    );
+    let connector_3 = Connector3::new(source_network, &operator_context.operator_public_key);
+    let connector_4 = Connector4::new(source_network, &operator_context.operator_public_key);
+    let connector_5 = Connector5::new(source_network, &operator_context.n_of_n_taproot_public_key);
+    let connector_6 = Connector6::new(
+        source_network,
+        &operator_context.operator_taproot_public_key,
+        &HashMap::from([
+            (
+                CommitmentMessageId::PegOutTxIdSourceNetwork,
+                WinternitzPublicKey::from(
+                    &commitment_secrets[&CommitmentMessageId::PegOutTxIdSourceNetwork],
+                ),
+            ),
+            (
+                CommitmentMessageId::PegOutTxIdDestinationNetwork,
+                WinternitzPublicKey::from(
+                    &commitment_secrets[&CommitmentMessageId::PegOutTxIdDestinationNetwork],
+                ),
+            ),
+        ]),
+    );
+
+    SetupConfig {
+        network: source_network,
+        client_0,
+        client_1,
+        depositor_context,
+        operator_context,
+        verifier_0_context,
+        verifier_1_context,
+        withdrawer_context,
+        connector_a,
+        connector_b,
+        connector_d,
+        assert_commit_connectors_f,
+        connector_z,
+        connector_0,
+        connector_1,
+        connector_2,
+        connector_3,
+        connector_4,
+        connector_5,
+        connector_6,
+        depositor_evm_address: DEPOSITOR_EVM_ADDRESS.to_string(),
+        withdrawer_evm_address: WITHDRAWER_EVM_ADDRESS.to_string(),
+        commitment_secrets,
+        valid_proof,
+        invalid_proof,
+    }
+}
+
+// Use fixed secrets for testing to ensure repeatable spending addresses.
+fn get_test_commitment_secrets() -> HashMap<CommitmentMessageId, WinternitzSecret> {
+    let mut commitment_map = HashMap::from([
+        (
+            CommitmentMessageId::PegOutTxIdSourceNetwork,
+            generate_test_winternitz_secret(0, SOURCE_NETWORK_TXID_LENGTH),
+        ),
+        (
+            CommitmentMessageId::PegOutTxIdDestinationNetwork,
+            generate_test_winternitz_secret(1, DESTINATION_NETWORK_TXID_LENGTH),
+        ),
+        (
+            CommitmentMessageId::StartTime,
+            generate_test_winternitz_secret(2, START_TIME_MESSAGE_LENGTH),
+        ),
+        (
+            CommitmentMessageId::Superblock,
+            generate_test_winternitz_secret(3, SUPERBLOCK_MESSAGE_LENGTH),
+        ),
+        (
+            CommitmentMessageId::SuperblockHash,
+            generate_test_winternitz_secret(4, SUPERBLOCK_HASH_MESSAGE_LENGTH),
+        ),
+    ]);
+
+    let all_variables = get_intermediate_variables_cached();
+    // split variable to different connectors
+    for (v, size) in all_variables {
+        commitment_map.insert(
+            CommitmentMessageId::Groth16IntermediateValues((v, size)),
+            generate_test_winternitz_secret(5, size),
+        );
+    }
+    commitment_map
+}
+
+fn generate_test_winternitz_secret(index: u8, message_size: usize) -> WinternitzSecret {
+    let parameters = Parameters::new((message_size * 2) as u32, 4);
+    WinternitzSecret::from_string(
+        &format!("b138982ce17ac813d505b5b40b665d404e9528{:02x}", index),
+        &parameters,
+    )
+}
diff --git a/tests/bridge/start_time/mod.rs b/bridge/tests/bridge/start_time/mod.rs
similarity index 100%
rename from tests/bridge/start_time/mod.rs
rename to bridge/tests/bridge/start_time/mod.rs
diff --git a/bridge/tests/bridge/start_time/start_time.rs b/bridge/tests/bridge/start_time/start_time.rs
new file mode 100644
index 000000000..2b3bcf5df
--- /dev/null
+++ b/bridge/tests/bridge/start_time/start_time.rs
@@ -0,0 +1,60 @@
+use bitcoin::Amount;
+
+use bridge::{
+    commitments::CommitmentMessageId,
+    connectors::base::TaprootConnector,
+    graphs::base::DUST_AMOUNT,
+    superblock::get_start_time_block_number,
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_START_TIME},
+        start_time::StartTimeTransaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::check_tx_output_sum,
+};
+
+use super::super::{helper::generate_stub_outpoint, setup::setup_test};
+
+#[tokio::test]
+async fn test_start_time_tx_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let input_value0 = Amount::from_sat(DUST_AMOUNT + MIN_RELAY_FEE_START_TIME);
+    let funding_utxo_address0 = config.connector_2.generate_taproot_address();
+    faucet
+        .fund_input(&funding_utxo_address0, input_value0)
+        .await
+        .wait()
+        .await;
+    let funding_outpoint0 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address0, input_value0).await;
+
+    let mut start_time_tx = StartTimeTransaction::new(
+        &config.operator_context,
+        &config.connector_2,
+        Input {
+            outpoint: funding_outpoint0,
+            amount: input_value0,
+        },
+    );
+
+    start_time_tx.sign(
+        &config.operator_context,
+        &config.connector_2,
+        get_start_time_block_number(config.network),
+        &config.commitment_secrets[&CommitmentMessageId::StartTime],
+    );
+
+    let tx = start_time_tx.finalize();
+    check_tx_output_sum(DUST_AMOUNT, &tx);
+    // TODO: revisit here after superblock time lock is implemented
+    // wait_timelock_expiry(config.network, Some("start time absolute lock time")).await;
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Start time tx result: {:?}\n", result);
+    assert!(result.is_ok());
+}
diff --git a/tests/bridge/start_time_timeout/mod.rs b/bridge/tests/bridge/start_time_timeout/mod.rs
similarity index 100%
rename from tests/bridge/start_time_timeout/mod.rs
rename to bridge/tests/bridge/start_time_timeout/mod.rs
diff --git a/bridge/tests/bridge/start_time_timeout/start_time_timeout.rs b/bridge/tests/bridge/start_time_timeout/start_time_timeout.rs
new file mode 100644
index 000000000..35bdf520d
--- /dev/null
+++ b/bridge/tests/bridge/start_time_timeout/start_time_timeout.rs
@@ -0,0 +1,94 @@
+use bitcoin::{Address, Amount};
+
+use bridge::{
+    connectors::base::TaprootConnector,
+    graphs::base::DUST_AMOUNT,
+    scripts::generate_pay_to_pubkey_script_address,
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_START_TIME_TIMEOUT},
+        pre_signed_musig2::PreSignedMusig2Transaction,
+        start_time_timeout::StartTimeTimeoutTransaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{
+        check_tx_output_sum, generate_stub_outpoint, get_reward_amount, verify_funding_inputs,
+        wait_for_timelock_expiry,
+    },
+    setup::{setup_test, ONE_HUNDRED},
+};
+
+#[tokio::test]
+async fn test_start_time_timeout_tx_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    // verify funding inputs
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+
+    let reward_amount = get_reward_amount(ONE_HUNDRED);
+    let input_value0 = Amount::from_sat(reward_amount + MIN_RELAY_FEE_START_TIME_TIMEOUT);
+    let funding_utxo_address0 = config.connector_2.generate_taproot_address();
+    funding_inputs.push((&funding_utxo_address0, input_value0));
+
+    let input_value1 = Amount::from_sat(DUST_AMOUNT);
+    let funding_utxo_address1 = config.connector_1.generate_taproot_address();
+    funding_inputs.push((&funding_utxo_address1, input_value1));
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    verify_funding_inputs(&config.client_0, &funding_inputs).await;
+
+    let funding_outpoint0 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address0, input_value0).await;
+    let funding_outpoint1 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address1, input_value1).await;
+
+    let mut start_time_timeout_tx = StartTimeTimeoutTransaction::new(
+        &config.operator_context,
+        &config.connector_1,
+        &config.connector_2,
+        Input {
+            outpoint: funding_outpoint0,
+            amount: input_value0,
+        },
+        Input {
+            outpoint: funding_outpoint1,
+            amount: input_value1,
+        },
+    );
+
+    let secret_nonces_0 = start_time_timeout_tx.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = start_time_timeout_tx.push_nonces(&config.verifier_1_context);
+
+    start_time_timeout_tx.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_1,
+        &config.connector_2,
+        &secret_nonces_0,
+    );
+    start_time_timeout_tx.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_1,
+        &config.connector_2,
+        &secret_nonces_1,
+    );
+    let reward_address = generate_pay_to_pubkey_script_address(
+        config.withdrawer_context.network,
+        &config.withdrawer_context.withdrawer_public_key,
+    );
+    start_time_timeout_tx.add_output(reward_address.script_pubkey());
+
+    let tx = start_time_timeout_tx.finalize();
+    check_tx_output_sum(reward_amount + DUST_AMOUNT, &tx);
+    wait_for_timelock_expiry(config.network, Some("kick off 1 connector 1")).await;
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Start time timeout tx result: {:?}\n", result);
+    assert!(result.is_ok());
+}
diff --git a/tests/bridge/take_1/mod.rs b/bridge/tests/bridge/take_1/mod.rs
similarity index 100%
rename from tests/bridge/take_1/mod.rs
rename to bridge/tests/bridge/take_1/mod.rs
diff --git a/bridge/tests/bridge/take_1/take_1.rs b/bridge/tests/bridge/take_1/take_1.rs
new file mode 100644
index 000000000..c6fd2b847
--- /dev/null
+++ b/bridge/tests/bridge/take_1/take_1.rs
@@ -0,0 +1,102 @@
+use bitcoin::{Address, Amount};
+
+use bridge::{
+    connectors::base::{P2wshConnector, TaprootConnector},
+    graphs::base::DUST_AMOUNT,
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_TAKE_1},
+        pre_signed_musig2::PreSignedMusig2Transaction,
+        take_1::Take1Transaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{
+        check_tx_output_sum, generate_stub_outpoint, get_reward_amount, wait_for_timelock_expiry,
+    },
+    setup::{setup_test, ONE_HUNDRED},
+};
+
+#[tokio::test]
+async fn test_take_1_tx_success() {
+    let config = setup_test().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+    let input_value0 = Amount::from_sat(ONE_HUNDRED + MIN_RELAY_FEE_TAKE_1);
+    let funding_utxo_address0 = config.connector_0.generate_taproot_address();
+    funding_inputs.push((&funding_utxo_address0, input_value0));
+    let input_value1 = Amount::from_sat(DUST_AMOUNT);
+    let funding_utxo_address1 = config.connector_a.generate_taproot_address();
+    funding_inputs.push((&funding_utxo_address1, input_value1));
+    let input_value2 = Amount::from_sat(DUST_AMOUNT);
+    let funding_utxo_address2 = config.connector_3.generate_address();
+    funding_inputs.push((&funding_utxo_address2, input_value2));
+    let reward_amount = get_reward_amount(ONE_HUNDRED);
+    let input_value3 = Amount::from_sat(reward_amount);
+    let funding_utxo_address3 = config.connector_b.generate_taproot_address();
+    funding_inputs.push((&funding_utxo_address3, input_value3));
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    let funding_outpoint0 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address0, input_value0).await;
+    let funding_outpoint1 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address1, input_value1).await;
+    let funding_outpoint2 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address2, input_value2).await;
+    let funding_outpoint3 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address3, input_value3).await;
+
+    let mut take_1_tx = Take1Transaction::new(
+        &config.operator_context,
+        &config.connector_0,
+        &config.connector_3,
+        &config.connector_a,
+        &config.connector_b,
+        Input {
+            outpoint: funding_outpoint0,
+            amount: input_value0,
+        },
+        Input {
+            outpoint: funding_outpoint1,
+            amount: input_value1,
+        },
+        Input {
+            outpoint: funding_outpoint2,
+            amount: input_value2,
+        },
+        Input {
+            outpoint: funding_outpoint3,
+            amount: input_value3,
+        },
+    );
+
+    let secret_nonces_0 = take_1_tx.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = take_1_tx.push_nonces(&config.verifier_1_context);
+
+    take_1_tx.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_0,
+        &config.connector_b,
+        &secret_nonces_0,
+    );
+    take_1_tx.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_0,
+        &config.connector_b,
+        &secret_nonces_1,
+    );
+
+    let tx = take_1_tx.finalize();
+    check_tx_output_sum(ONE_HUNDRED + reward_amount + DUST_AMOUNT * 2, &tx);
+    wait_for_timelock_expiry(config.network, Some("kick off 2 connector 3")).await;
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Take 1 tx result: {:?}\n", result);
+    assert!(result.is_ok());
+}
diff --git a/tests/bridge/take_2/mod.rs b/bridge/tests/bridge/take_2/mod.rs
similarity index 100%
rename from tests/bridge/take_2/mod.rs
rename to bridge/tests/bridge/take_2/mod.rs
diff --git a/bridge/tests/bridge/take_2/take_2.rs b/bridge/tests/bridge/take_2/take_2.rs
new file mode 100644
index 000000000..8461fa4b3
--- /dev/null
+++ b/bridge/tests/bridge/take_2/take_2.rs
@@ -0,0 +1,107 @@
+use bitcoin::{Address, Amount};
+
+use bridge::{
+    connectors::base::{P2wshConnector, TaprootConnector},
+    graphs::base::DUST_AMOUNT,
+    transactions::{
+        base::{BaseTransaction, Input, MIN_RELAY_FEE_TAKE_2},
+        pre_signed_musig2::PreSignedMusig2Transaction,
+        take_2::Take2Transaction,
+    },
+};
+
+use crate::bridge::{
+    faucet::{Faucet, FaucetType},
+    helper::{
+        check_tx_output_sum, generate_stub_outpoint, get_reward_amount, wait_for_timelock_expiry,
+    },
+    setup::{setup_test_full, ONE_HUNDRED},
+};
+
+#[tokio::test]
+async fn test_take_2_tx_success() {
+    let config = setup_test_full().await;
+    let faucet = Faucet::new(FaucetType::EsploraRegtest);
+
+    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
+    let input_value0 = Amount::from_sat(ONE_HUNDRED + MIN_RELAY_FEE_TAKE_2);
+    let funding_utxo_address0 = config.connector_0.generate_taproot_address();
+    funding_inputs.push((&funding_utxo_address0, input_value0));
+
+    let input_value1 = Amount::from_sat(DUST_AMOUNT);
+    let funding_utxo_address1 = config.connector_4.generate_address();
+    funding_inputs.push((&funding_utxo_address1, input_value1));
+
+    let reward_amount = get_reward_amount(ONE_HUNDRED);
+    let input_value2 = Amount::from_sat(reward_amount);
+    let funding_utxo_address2 = config.connector_5.generate_taproot_address();
+    funding_inputs.push((&funding_utxo_address2, input_value2));
+
+    let input_value3 = Amount::from_sat(DUST_AMOUNT);
+    let funding_utxo_address3 = config.connector_c.generate_taproot_address();
+    funding_inputs.push((&funding_utxo_address3, input_value3));
+    faucet
+        .fund_inputs(&config.client_0, &funding_inputs)
+        .await
+        .wait()
+        .await;
+
+    let funding_outpoint0 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address0, input_value0).await;
+    let funding_outpoint1 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address1, input_value1).await;
+    let funding_outpoint2 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address2, input_value2).await;
+    let funding_outpoint3 =
+        generate_stub_outpoint(&config.client_0, &funding_utxo_address3, input_value3).await;
+
+    let mut take_2_tx = Take2Transaction::new(
+        &config.operator_context,
+        &config.connector_0,
+        &config.connector_4,
+        &config.connector_5,
+        &config.connector_c,
+        Input {
+            outpoint: funding_outpoint0,
+            amount: input_value0,
+        },
+        Input {
+            outpoint: funding_outpoint1,
+            amount: input_value1,
+        },
+        Input {
+            outpoint: funding_outpoint2,
+            amount: input_value2,
+        },
+        Input {
+            outpoint: funding_outpoint3,
+            amount: input_value3,
+        },
+    );
+
+    let secret_nonces_0 = take_2_tx.push_nonces(&config.verifier_0_context);
+    let secret_nonces_1 = take_2_tx.push_nonces(&config.verifier_1_context);
+
+    take_2_tx.pre_sign(
+        &config.verifier_0_context,
+        &config.connector_0,
+        &config.connector_5,
+        &secret_nonces_0,
+    );
+    take_2_tx.pre_sign(
+        &config.verifier_1_context,
+        &config.connector_0,
+        &config.connector_5,
+        &secret_nonces_1,
+    );
+
+    take_2_tx.sign(&config.operator_context, &config.connector_c);
+
+    let tx = take_2_tx.finalize();
+    check_tx_output_sum(ONE_HUNDRED + reward_amount + DUST_AMOUNT * 2, &tx);
+    wait_for_timelock_expiry(config.network, Some("assert connector 4")).await;
+    let result = config.client_0.esplora.broadcast(&tx).await;
+    println!("Txid: {:?}", tx.compute_txid());
+    println!("Take 2 tx result: {:?}\n", result);
+    assert!(result.is_ok());
+}
diff --git a/tests/bridge/validate/mod.rs b/bridge/tests/bridge/validate/mod.rs
similarity index 100%
rename from tests/bridge/validate/mod.rs
rename to bridge/tests/bridge/validate/mod.rs
diff --git a/tests/bridge/validate/validate.rs b/bridge/tests/bridge/validate/validate.rs
similarity index 76%
rename from tests/bridge/validate/validate.rs
rename to bridge/tests/bridge/validate/validate.rs
index bcb9d968c..ffd3556e2 100644
--- a/tests/bridge/validate/validate.rs
+++ b/bridge/tests/bridge/validate/validate.rs
@@ -2,17 +2,13 @@ use std::str::FromStr;
 
 use bitcoin::{Amount, OutPoint, Txid};
 
-use bitvm::bridge::{
-    graphs::{
-        base::{FEE_AMOUNT, INITIAL_AMOUNT},
-        peg_in::PegInGraph,
-        peg_out::PegOutGraph,
-    },
+use bridge::{
+    graphs::{base::PEG_OUT_FEE, peg_in::PegInGraph, peg_out::PegOutGraph},
     scripts::generate_burn_script,
     transactions::{base::Input, pre_signed::PreSignedTransaction},
 };
 
-use super::super::setup::setup_test;
+use crate::bridge::setup::{setup_test, INITIAL_AMOUNT};
 
 #[tokio::test]
 async fn test_validate_success() {
@@ -39,7 +35,7 @@ async fn test_validate_invalid_previous_output() {
 
     let is_peg_in_data_valid = peg_in_graph.validate();
 
-    assert_eq!(is_peg_in_data_valid, false);
+    assert!(!is_peg_in_data_valid);
 }
 
 #[tokio::test]
@@ -51,7 +47,7 @@ async fn test_validate_invalid_script_sig() {
 
     let is_peg_in_data_valid = peg_in_graph.validate();
 
-    assert_eq!(is_peg_in_data_valid, false);
+    assert!(!is_peg_in_data_valid);
 }
 
 #[tokio::test]
@@ -63,7 +59,7 @@ async fn test_validate_invalid_sequence() {
 
     let is_peg_in_data_valid = peg_in_graph.validate();
 
-    assert_eq!(is_peg_in_data_valid, false);
+    assert!(!is_peg_in_data_valid);
 }
 
 #[tokio::test]
@@ -75,7 +71,7 @@ async fn test_validate_invalid_value() {
 
     let is_peg_in_data_valid = peg_in_graph.validate();
 
-    assert_eq!(is_peg_in_data_valid, false);
+    assert!(!is_peg_in_data_valid);
 }
 
 #[tokio::test]
@@ -87,33 +83,13 @@ async fn test_validate_invalid_script_pubkey() {
 
     let is_peg_in_data_valid = peg_in_graph.validate();
 
-    assert_eq!(is_peg_in_data_valid, false);
+    assert!(!is_peg_in_data_valid);
 }
 
 async fn setup_and_create_graphs() -> (PegInGraph, PegOutGraph, OutPoint) {
-    let (
-        _,
-        _,
-        depositor_context,
-        operator_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT + 1);
+    let config = setup_test().await;
+
+    let amount = Amount::from_sat(INITIAL_AMOUNT + PEG_OUT_FEE);
     let peg_in_outpoint = OutPoint {
         txid: Txid::from_str("0e6719ac074b0e3cac76d057643506faa1c266b322aa9cf4c6f635fe63b14327")
             .unwrap(),
@@ -126,22 +102,23 @@ async fn setup_and_create_graphs() -> (PegInGraph, PegOutGraph, OutPoint) {
     };
 
     let peg_in_graph = PegInGraph::new(
-        &depositor_context,
+        &config.depositor_context,
         Input {
             outpoint: peg_in_outpoint,
             amount,
         },
-        &depositor_evm_address,
+        &config.depositor_evm_address,
     );
 
     let peg_out_graph = PegOutGraph::new(
-        &operator_context,
+        &config.operator_context,
         &peg_in_graph,
         Input {
             outpoint: peg_out_outpoint,
             amount,
         },
+        &config.commitment_secrets,
     );
 
-    return (peg_in_graph, peg_out_graph, peg_in_outpoint);
+    (peg_in_graph, peg_out_graph, peg_in_outpoint)
 }
diff --git a/tests/mod.rs b/bridge/tests/mod.rs
similarity index 100%
rename from tests/mod.rs
rename to bridge/tests/mod.rs
diff --git a/docs/chunk_instructions.md b/docs/chunk_instructions.md
new file mode 100644
index 000000000..24bf84de6
--- /dev/null
+++ b/docs/chunk_instructions.md
@@ -0,0 +1,275 @@
+To test Full Execution:
+cargo test --package bitvm --lib -- chunk::api::test::full_e2e_execution --exact --nocapture
+
+The following show tests for step wise execution.
+
+1. Generate Partial Scripts
+
+RUST_BACKTRACE=full cargo test --package bitvm --lib -- chunk::api::test::test_fn_compile --exact --nocapture --ignored
+
+2. Generate Signed Assertions
+
+RUST_BACKTRACE=full cargo test --package bitvm --lib -- chunk::api::test::test_fn_generate_signatures --exact --nocapture --ignored
+
+3. Validate generated Assertions
+
+RUST_BACKTRACE=full cargo test --package bitvm --lib -- chunk::api::test::test_fn_validate_assertions --exact --nocapture --ignored
+
+4. Manually Corrupt each Assertion one at a time and Disprove invalid assertion
+
+RUST_BACKTRACE=full cargo test --package bitvm --lib -- chunk::api::test::test_fn_disprove_invalid_assertions --exact --nocapture --ignored
+
+-------
+Directory:
+
+`api` - interface between verifier and external module (like bridge)
+
+`api_compiletime_utils` - interfacing methods used during bitvm compile time i.e. presigning
+
+`api_runtime_utils` - interfacing methods used during bitvm runtime i.e. assertion and disprove
+
+`elements` - data structure to represent inputs and outputs of each chunk
+
+`g16_runner_core` - function to generate execute chunked groth16 verifier and collect necessary information
+
+`g16_runner_utils` - set of functions that wrap tapscripts and is required by g16_runner_core
+
+`helpers` - utility functions - around limb transformation
+
+`taps_ext_miller` - miscellaneous tapscripts external to Miller Loop
+
+`taps_msm` - tapscripts for MSM
+
+`taps_mul` - tapscripts for Fp12 multiplications
+
+`taps_point_ops` - tapscripts for point operations
+
+`wrap_hasher` - wrapper to blake3_u4 hasher
+
+`wrap_wots` - wrapper to winternitz methods
+
+------
+
+Info on tapscripts:
+
+chunk_dense_dense_mul
+
+When implementing multiplication between two elements in $F_{q^{12}}$, 
+
+say $f = 1 + c \cdot J$ and 
+
+$g = 1 + d \cdot J$, 
+
+we can compute 
+
+$f \times g \rightarrow (1+c \cdot J) \times (1+d \cdot J) \rightarrow 1 + c \cdot d \cdot J^2 + (c+d) \cdot J \rightarrow (1+c \cdot d \cdot V) + (c+d) \cdot J \rightarrow  1 + [(c+d)/ (1+c \cdot d \cdot V) \cdot J]$.
+$h = f \times g  = 1 + e.J $
+
+
+Instead of computing, you now verify whether $h == f \times g$ by verifying the following equation:
+
+
+$e == [(c+d)/ (1+c \cdot d \cdot V) \cdot J]$
+
+
+$e. (1+c \cdot d \cdot V) == (c+d).J$
+
+
+In the last equation, $c \cdot d$ requires 1 Fq6 mul, cost of $\cdot V$ is negligible, and $e. (1+c \cdot d \cdot V)$ requires 1 more Fq6 multiplication by c. Therefore 2 Fq6 muls, 1 negligible mul by Fp12Config::NON_RESIDUE (V), but you need to pass c as hint to the tapscript.
+
+------
+Multiplying three Fq12 elements in the form: $(1 + a J), (1 + b J), (1 + d J)$
+
+First Segment:
+
+$(1 + c J) = (1 + a J) \times (1 + b J)$
+
+$c = (a + b) / (1 + ab V)$
+
+Second Segment:
+
+$(1 + e J) = (1 + a J) \times (1 + b J) \times (1 + d J) = ( 1 + c J) \times (1 + d J)$
+
+$e = (c + d) / (1 + cd V)$
+
+$e = [(a + b) + d (1 + ab V)] / [(1 + ab V) + (a + b)dV]$
+
+
+Point Operation Inside Miller Loop:
+Given $T_4, Q_4, P_2, P_3, P_4$, calculate product of line evaluations and new T4 i.e.
+
+$T_4 \leftarrow T_4 + Q_4$
+
+$le \leftarrow l_2(P_2). l_3(P_3). l_4(P_4)$
+
+The above equation doesn't fit inside a single tapscript and has been broken into two fragments.
+tap_point_ops::chunk_point_ops_and_multiply_line_evals_step_1 & tap_point_ops::chunk_point_ops_and_multiply_line_evals_step_2
+
+-----
+chunk_point_ops_and_multiply_line_evals_step_1 does the following in order:
+
+- $T_4 \leftarrow T_4 + Q_4$
+
+- $le_4 \leftarrow l_4(P_4) $
+
+- $le_3 \leftarrow l_3(P_3) $
+
+- $le_2 \leftarrow l_2(P_2) $
+
+Based on the same set of equations in First Segment of Multiplying three Fq12 elements, where a is $le_4$ and b is $le_3$, this chunk outputs (a + b) and (1 + ab V) as outputs of partial multiplication of a and b.
+
+Alongside, updated $T_4$ and $le_2$, the total output becomes $T_4, a+b, ab, le_2 $
+
+---------
+chunk_point_ops_and_multiply_line_evals_step_2 does the following in order
+
+This chunk receives the output from previous step and completes the multiplication between line evaluations.
+
+The expected computation is $lev = le_2 \times le_3 \times le_4$.
+
+Based on the same set of equations in Second Segment of Multiplying three Fq12 elements, where d is $le_2$, e is $le$ and a and b are outputs of partial multiplication mentioned above between $le_4$ and $le_3$, we execute validity check in the form given below.
+
+$e \times [(1 + ab V) + (a + b) dV] =?= [(a + b) + d (1 + ab V)] $
+
+Output of this chunk is $lev$
+
+---------
+
+Optimization on product of Fp_12 accumulator $f$ and line evaluation $le$
+
+line evaluations are always in the form $le = (1, le.c1) $ where $le.c1 = (le.c1.c0, le.c1.c1, 0)$
+
+Because le.c1 has zero as the third coefficient, you get some necessary saving in terms of script and stack use (especially during initialization where a lot of tmul hints have to be loaded).
+
+Fp6-Sparse-Sparse Mul when we have to multiply two line evaluations. Output is a dense Fp6 element.
+Fp6-Sparse-Dense Mul when we have to multiply a line evaluation with $f$
+Fp6-Dense-Dense Mul when we have to multiply a $f$ and $g$ where neither of them is known in advance to have zero coefficient
+
+Fp6-Sparse-Sparse Mul requires 6 tmul hints and around 680K Script. Lesser number of tmul hints here because it internally uses LC4. utils_fq6_ss_mul
+Fp6-Sparse-Dense Mul requires 6 tmul hints and around 850K Script. Lesser number of tmul hints here because it internally uses LC4. utils_fq6_sd_mul
+Fp6-Dense-Dense Mul requires 20 tmul hints and around 950K Script. Large number of tmul hints here because it internally uses LC2. bn254::Fq6::hinted_mul
+
+Here LC4 is a term used to refer to linear combination of multiplicands and multipliers, with which we get prominent savings in terms of necessary tmul hints.
+
+---------
+
+Merkelize Bitcommitments:
+
+The output of chunk_point_ops_and_multiply_line_evals_step_1 is $A \leftarrow T_4$ and $B \leftarrow$ {$a+b, ab, le_2$ }.
+A and B are used separately in two different places for different purposes. 
+- It is used in "chunk_point_ops_and_multiply_line_evals_step_2" to complete line evaluation multiplication (i.e. to obtain $lev$ mentioned above).
+- It is used in "chunk_point_ops_and_multiply_line_evals_step_1" again in the next iteration to update $T_4$.
+We could bitcommit to hash of A and hash of B separately and use them as input where needed, but that would incur 2 bitcommitments per instance of chunk_point_ops_and_multiply_line_evals_step_1. If we bitcommit to hash of concat(A, B), we have larger (avoidable) hashing cost.
+
+What we resort to is akin to Merkle Tree Commitment. We treat A and B as separate merkle leaves and the root of the tree as the value to bitcommit. This way you only provide as input to a tapscript the merkle path i.e. preimage (A or B) in the relevant tapscript, alongside hash of the other value (HashB or HashA) respectively. This proves that the correct values were loaded as input to a tapscript.
+
+In implementation, this means the sibling hash also needs to be passed as a hint alongside the preimage itself to compute the merkle root.
+
+------------
+
+Disprove Logic
+``` rust
+// parameters are obtained after wots signature verification
+fn disprove_core(input, Option<output>, operator_claimed_input_hash, operator_claimed_output_hash) {
+
+    // Computation Layer
+    // Stack: [input, output] 
+    // Altstack: [operator_claimed_output_hash, operator_claimed_input_hash]
+
+    let input_is_valid = input.is_valid();
+    if input.is_valid() {
+        if output.is_none() {  // tapscripts output is not passed as hint
+            output = fn(input) // output is deterministically computed from input
+        } else {
+            fn_valid(input, output) // output is determinstically validated from input
+        }
+        Add_To_Stack(output, input_is_valid)
+    } else {
+        Add_To_Stack(mock_output, input_is_valid) // None or any value; doesn't matter as precondition (input validity) has failed
+    }
+
+    // Hashing Layer
+    // Stack: [input, output, input_is_valid] 
+    // Altstack: [operator_claimed_output_hash, operator_claimed_input_hash]
+    assert(Hash_fn(input), operator_claimed_input_hash); // invalid input was supplied by the operator
+    let can_disprove = false;
+    if input_is_valid() {
+        can_disprove = Hash_fn(output) != operator_claimed_output_hash
+    } else {
+        ignore(Hash_fn(output)) // doesn't matter what the output is, drop from stack
+        ignore(operator_claimed_output_hash)
+        can_disprove = true;
+    }
+
+    Add_To_Stack(can_disprove)
+}
+```
+
+------------
+
+Structure of Chunked Verifier
+
+Refer fn chunk::assert::verify_pairing_scripted()
+
+------------
+
+Data Structures
+Runtime Inputs and Outputs of chunks of a verifier are represented by the following type:
+
+``` rust
+pub enum DataType {
+    Fp6Data(ark_bn254::Fq6), 
+    G2EvalData(ElemG2Eval),
+    G1Data(ark_bn254::G1Affine),
+    U256Data(ark_ff::BigInt<4>),
+}
+```
+
+Fp6Data is used to represent the second coefficient in Fp12 i.e. a in (1 + a J)
+G2EvalData is used to represent output of chunk_point_ops_and_multiply_line_evals_step_1. It includes G2 accumulator, a line-evaluation and result of partial multiplication.
+G1Data is used to represent G1Affine elements (curve points).
+U256Data is used to represent 256-bit elements that the groth16 verifier receives as input (e.g field elements, curve points, etc). These are validated to be valid field elements or points on curve 
+before working on them any further.
+
+``` rust
+pub(crate) enum ElementType {
+    Fp6,
+    G2EvalPoint,
+    G2EvalMul,
+    G2Eval,
+    FieldElem,
+    ScalarElem,
+    G1,
+}
+```
+
+FieldElems and ScalarElems are both U256Data underneath but a distinction is needed because they are used differently (i.e. Fq and Fr).
+
+Additionally, as was mentioned in the section "Merkelize Bitcommitments:", we can represent the same underlying type (G2EvalData) differently on different tapscripts. To make this distinction we use ElementType.
+To be specific, G2EvalPoint is the exact type chunk_point_ops_and_multiply_line_evals_step_1 receives as Input because it only requires $T_4$ from previous calculation. The rest of the inputs needed for this step are received from different source. Similarly, G2EvalMul is the exact type chunk_point_ops_and_multiply_line_evals_step_2 receives as Input because it requires all but $T_4$. G2Eval is used to represent base form which is an output of these two tapscripts.
+
+
+------------
+
+Hashing
+
+We use blake3_u4 hasher which requires stack to only contain the message you want to hash. This introduces necessity to move elements back and forth between mainstack and altstack.
+
+The function blake3compiled::hash_messages() adds a hashing layer to the disprove Script for a given type of elements .
+It assumes preimages are loaded on stack and their hashes are on altstack.
+
+For example:
+Given 
+MainStack[Input: Fp6, Output::G1, Bit_InputIsValid] 
+Altstack [Fp6Hash, G1Hash]
+In simple terms: the function runs [Hash(Input) == Fp6Hash] and [Hash(Output) != G1Hash if Bit_InputIsValid]
+
+
+-------
+Security
+
+20-byte hashes for 160-bit second preimage resistance security. We aren't concerned with collision resistance in bitvm setup.
+
+-------
+
+
diff --git a/final-spv/Cargo.toml b/final-spv/Cargo.toml
new file mode 100644
index 000000000..31f03f149
--- /dev/null
+++ b/final-spv/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "final-spv"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+risc0-zkvm = {version = "1.2.5", default-features = false, features = ["std"]}
+borsh = {version = "1.5.3", features = ["derive"] }
+sha2 =  { version = "0.10.8", default-features = false }
+crypto-bigint = { version = "0.5.5", default-features = false }
+blake3 = { version = "1.5.0", default-features = false }
+bitcoin = "0.32.5"
+serde = { version = "1.0", default-features = false }
+header-chain = { path = "../header-chain" }
+
+[dev-dependencies]
+hex = "0.4.3"
+hex-literal = "0.4.1"
\ No newline at end of file
diff --git a/final-spv/README.md b/final-spv/README.md
new file mode 100644
index 000000000..4a8cdb04e
--- /dev/null
+++ b/final-spv/README.md
@@ -0,0 +1,13 @@
+# Final SPV
+This library contains the necessary functionalities for verifying the header chain of Bitcoin,
+proving the inclusion of a Bitcoin transaction in the given header chain, and then compressing
+the public values into 32 bytes using `Blake3`.
+You need to have `Risc0` toolchain installed to build the ELFs.
+
+## Building
+At the root of the repository,
+```bash
+REPR_GUEST_BUILD=1 BITCOIN_NETWORK=<NETWORK> cargo build -p final-spv-circuit --release
+```
+
+The ELF file will be at `prover/elfs/<NETWORK>-final-spv-guest`.
\ No newline at end of file
diff --git a/final-spv/build.dockerfile b/final-spv/build.dockerfile
new file mode 100644
index 000000000..dd6e9946c
--- /dev/null
+++ b/final-spv/build.dockerfile
@@ -0,0 +1,34 @@
+FROM risczero/risc0-guest-builder:r0.1.81.0 AS build
+
+WORKDIR /src
+
+# Copy the entire project structure
+COPY header-chain header-chain
+COPY final-spv final-spv
+
+# Set compile-time environment variables
+RUN ls -R /src
+ENV CARGO_MANIFEST_PATH="final-spv/final-spv-guest/guest/Cargo.toml"
+ENV RUSTFLAGS="-C passes=loweratomic -C link-arg=-Ttext=0x00200800 -C link-arg=--fatal-warnings"
+ENV CARGO_TARGET_DIR="final-spv/final-spv-guest/guest/target"
+ENV CC_riscv32im_risc0_zkvm_elf="/root/.local/share/cargo-risczero/cpp/bin/riscv32-unknown-elf-gcc"
+ENV CFLAGS_riscv32im_risc0_zkvm_elf="-march=rv32im -nostdlib"
+
+# Set network environment variable
+ARG BITCOIN_NETWORK=mainnet
+ENV BITCOIN_NETWORK=${BITCOIN_NETWORK}
+
+# Only run the build once with the environment variable set
+RUN echo "Building for network: ${BITCOIN_NETWORK}" && \
+    cd final-spv && \
+    cargo +risc0 update && \
+    cd .. && \
+    cargo +risc0 fetch --target riscv32im-risc0-zkvm-elf --manifest-path ${CARGO_MANIFEST_PATH} && \
+    cargo +risc0 build --release --target riscv32im-risc0-zkvm-elf --manifest-path ${CARGO_MANIFEST_PATH}
+
+RUN ls -R /src
+
+FROM scratch AS export
+ARG BITCOIN_NETWORK
+COPY --from=build /src/final-spv/final-spv-guest/guest/target/riscv32im-risc0-zkvm-elf/release ../target/riscv-guest/riscv32im-risc0-zkvm-elf/docker/final-spv-guest
+COPY --from=build /src/final-spv/final-spv-guest/guest/target/riscv32im-risc0-zkvm-elf/release/final-spv-guest prover/elfs/${BITCOIN_NETWORK}-final-spv-guest
\ No newline at end of file
diff --git a/final-spv/final-spv-guest/Cargo.toml b/final-spv/final-spv-guest/Cargo.toml
new file mode 100644
index 000000000..6ab98541d
--- /dev/null
+++ b/final-spv/final-spv-guest/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "final-spv-circuit"
+version = "0.1.0"
+edition = "2021"
+
+[build-dependencies]
+risc0-build = { version = "1.2.5" }
+
+[package.metadata.risc0]
+methods = ["guest"]
diff --git a/final-spv/final-spv-guest/build.rs b/final-spv/final-spv-guest/build.rs
new file mode 100644
index 000000000..0b87eb4a9
--- /dev/null
+++ b/final-spv/final-spv-guest/build.rs
@@ -0,0 +1,50 @@
+use std::env;
+use std::process::Command;
+
+fn main() {
+    println!("cargo:rerun-if-changed=../build.dockerfile");
+
+    if env::var("REPR_GUEST_BUILD").is_ok() {
+        // Get the absolute path to the project root
+        let current_dir = env::current_dir().expect("Failed to get current directory");
+        let project_root = current_dir.parent().unwrap().parent().unwrap();
+        let output_dir = project_root.join("target/riscv-guest/riscv32im-risc0-zkvm-elf/docker");
+
+        eprintln!("Current directory: {:?}", current_dir);
+        eprintln!("Project root: {:?}", project_root);
+        eprintln!("Output directory: {:?}", output_dir);
+
+        // Ensure the output directory exists
+        std::fs::create_dir_all(&output_dir).expect("Failed to create output directory");
+
+        let output = Command::new("docker")
+            .args([
+                "buildx",
+                "build",
+                "--platform",
+                "linux/amd64",
+                "-f",
+                "final-spv/build.dockerfile",
+                "--output",
+                &format!("type=local,dest=."),
+                ".", // Use current directory as context
+                "--build-arg",
+                &format!(
+                    "BITCOIN_NETWORK={}",
+                    std::env::var("BITCOIN_NETWORK").unwrap().as_str()
+                ),
+            ])
+            .current_dir(project_root) // Set working directory to project root
+            .output()
+            .expect("Failed to execute Docker command");
+
+        if !output.status.success() {
+            eprintln!("Docker build failed:");
+            eprintln!("stdout: {}", String::from_utf8_lossy(&output.stdout));
+            eprintln!("stderr: {}", String::from_utf8_lossy(&output.stderr));
+            panic!("Docker build failed");
+        }
+    }
+
+    risc0_build::embed_methods();
+}
diff --git a/final-spv/final-spv-guest/guest/Cargo.lock b/final-spv/final-spv-guest/guest/Cargo.lock
new file mode 100644
index 000000000..6706f1efa
--- /dev/null
+++ b/final-spv/final-spv-guest/guest/Cargo.lock
@@ -0,0 +1,1231 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
+
+[[package]]
+name = "ark-bn254"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-crypto-primitives"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3a13b34da09176a8baba701233fdffbaa7c1b1192ce031a3da4e55ce1f1a56"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-relations",
+ "ark-serialize",
+ "ark-snark",
+ "ark-std",
+ "blake2",
+ "derivative",
+ "digest",
+ "sha2",
+]
+
+[[package]]
+name = "ark-ec"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
+dependencies = [
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "hashbrown 0.13.2",
+ "itertools",
+ "num-traits",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba"
+dependencies = [
+ "ark-ff-asm",
+ "ark-ff-macros",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "digest",
+ "itertools",
+ "num-bigint",
+ "num-traits",
+ "paste",
+ "rustc_version",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff-asm"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-groth16"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20ceafa83848c3e390f1cbf124bc3193b3e639b3f02009e0e290809a501b95fc"
+dependencies = [
+ "ark-crypto-primitives",
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-poly"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
+dependencies = [
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "hashbrown 0.13.2",
+]
+
+[[package]]
+name = "ark-relations"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00796b6efc05a3f48225e59cb6a2cda78881e7c390872d5786aaf112f31fb4f0"
+dependencies = [
+ "ark-ff",
+ "ark-std",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "ark-serialize"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
+dependencies = [
+ "ark-serialize-derive",
+ "ark-std",
+ "digest",
+ "num-bigint",
+]
+
+[[package]]
+name = "ark-serialize-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-snark"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84d3cc6833a335bb8a600241889ead68ee89a3cf8448081fb7694c0fe503da63"
+dependencies = [
+ "ark-ff",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
+dependencies = [
+ "num-traits",
+ "rand",
+]
+
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "base58ck"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"
+dependencies = [
+ "bitcoin-internals",
+ "bitcoin_hashes",
+]
+
+[[package]]
+name = "bech32"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
+
+[[package]]
+name = "bitcoin"
+version = "0.32.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6bc65742dea50536e35ad42492b234c27904a27f0abdcbce605015cb4ea026"
+dependencies = [
+ "base58ck",
+ "bech32",
+ "bitcoin-internals",
+ "bitcoin-io",
+ "bitcoin-units",
+ "bitcoin_hashes",
+ "hex-conservative",
+ "hex_lit",
+ "secp256k1",
+]
+
+[[package]]
+name = "bitcoin-internals"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30bdbe14aa07b06e6cfeffc529a1f099e5fbe249524f8125358604df99a4bed2"
+
+[[package]]
+name = "bitcoin-io"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf"
+
+[[package]]
+name = "bitcoin-units"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2"
+dependencies = [
+ "bitcoin-internals",
+]
+
+[[package]]
+name = "bitcoin_hashes"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
+dependencies = [
+ "bitcoin-io",
+ "hex-conservative",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "blake2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "blake3"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+]
+
+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "borsh"
+version = "1.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03"
+dependencies = [
+ "borsh-derive",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "bytemuck"
+version = "1.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cc"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "constant_time_eq"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "libc",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "git+https://github.com/risc0/RustCrypto-crypto-bigint?tag=v0.5.5-risczero.0#3ab63a6f1048833f7047d5a50532e4a4cc789384"
+dependencies = [
+ "getrandom",
+ "subtle",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "elf"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "final-spv"
+version = "0.1.0"
+dependencies = [
+ "bitcoin",
+ "blake3",
+ "borsh",
+ "crypto-bigint",
+ "header-chain",
+ "risc0-zkvm",
+ "serde",
+ "sha2",
+]
+
+[[package]]
+name = "final-spv-guest"
+version = "0.1.0"
+dependencies = [
+ "final-spv",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
+[[package]]
+name = "header-chain"
+version = "0.1.0"
+dependencies = [
+ "bitcoin",
+ "borsh",
+ "crypto-bigint",
+ "risc0-zkvm",
+ "serde",
+ "sha2",
+]
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hex-conservative"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "hex-literal"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
+
+[[package]]
+name = "hex_lit"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
+
+[[package]]
+name = "indexmap"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.2",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.169"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+
+[[package]]
+name = "libm"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "metal"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
+dependencies = [
+ "bitflags 2.6.0",
+ "block",
+ "core-graphics-types",
+ "foreign-types",
+ "log",
+ "objc",
+ "paste",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+
+[[package]]
+name = "risc0-binfmt"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9d893807e609dd44942644aef5137ad87d178a032c5932b0c68cdec538c3370"
+dependencies = [
+ "anyhow",
+ "borsh",
+ "elf",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-keccak"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16d1d4f248ccf111a9d58a6cd9ae5bfb4c3830e100e75874c39622a2952ef5a9"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "paste",
+ "risc0-binfmt",
+ "risc0-circuit-recursion",
+ "risc0-core",
+ "risc0-zkp",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-recursion"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5ab005ed38c1119c0511b9260cd18d95adbb226ad849eccfdb650eebecd769c"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "hex",
+ "metal",
+ "risc0-core",
+ "risc0-zkp",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-rv32im"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d64420292f716e468cba1e17eb56146a525d612d967ee09566eda80b423a54a"
+dependencies = [
+ "anyhow",
+ "metal",
+ "risc0-binfmt",
+ "risc0-core",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-core"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2492abd92da4eb2a6e5e9e74757d00b1c29c03bb867266c85752cb22a03a920"
+dependencies = [
+ "bytemuck",
+ "rand_core",
+]
+
+[[package]]
+name = "risc0-groth16"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0017c18151e017a154f4b4bbeec2a0656a3a7822fab3cd0dc1a15e2654dde4fe"
+dependencies = [
+ "anyhow",
+ "ark-bn254",
+ "ark-ec",
+ "ark-groth16",
+ "ark-serialize",
+ "bytemuck",
+ "hex",
+ "num-bigint",
+ "num-traits",
+ "risc0-binfmt",
+ "risc0-zkp",
+ "serde",
+ "stability",
+]
+
+[[package]]
+name = "risc0-zkp"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a6e3c078d7a7d27eda9383db8d080f7200ac4e5e65c1971d454a0286c00cae"
+dependencies = [
+ "anyhow",
+ "blake2",
+ "borsh",
+ "bytemuck",
+ "cfg-if",
+ "digest",
+ "hex",
+ "hex-literal",
+ "metal",
+ "paste",
+ "rand_core",
+ "risc0-core",
+ "risc0-zkvm-platform",
+ "serde",
+ "sha2",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-zkvm"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fd97c60815994da62fa000dec9470c0d0e3045a554354e279695f2213b0182f"
+dependencies = [
+ "anyhow",
+ "borsh",
+ "bytemuck",
+ "getrandom",
+ "hex",
+ "risc0-binfmt",
+ "risc0-circuit-keccak",
+ "risc0-circuit-recursion",
+ "risc0-circuit-rv32im",
+ "risc0-core",
+ "risc0-groth16",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "rrs-lib",
+ "semver",
+ "serde",
+ "sha2",
+ "stability",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-zkvm-platform"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "778e0235c87d8e18f13da5c71bfe69b1beb7c08694c75d19eae9dbed09a59c57"
+dependencies = [
+ "bytemuck",
+ "cfg-if",
+ "getrandom",
+ "libm",
+ "stability",
+]
+
+[[package]]
+name = "rrs-lib"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4382d3af3a4ebdae7f64ba6edd9114fff92c89808004c4943b393377a25d001"
+dependencies = [
+ "downcast-rs",
+ "paste",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
+dependencies = [
+ "bitcoin_hashes",
+ "secp256k1-sys",
+]
+
+[[package]]
+name = "secp256k1-sys"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
+
+[[package]]
+name = "serde"
+version = "1.0.216"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.216"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "git+https://github.com/risc0/RustCrypto-hashes?tag=sha2-v0.10.8-risczero.0#244dc3b08788f7a4ccce14c66896ae3b4f24c166"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "stability"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac"
+dependencies = [
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+
+[[package]]
+name = "toml_edit"
+version = "0.22.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
+dependencies = [
+ "tracing-core",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "winnow"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
diff --git a/final-spv/final-spv-guest/guest/Cargo.toml b/final-spv/final-spv-guest/guest/Cargo.toml
new file mode 100644
index 000000000..eb66ad02e
--- /dev/null
+++ b/final-spv/final-spv-guest/guest/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "final-spv-guest"
+version = "0.1.0"
+edition = "2021"
+
+[workspace]
+
+[dependencies]
+final-spv = { path = "../..", default-features = false }
+
+[patch.crates-io]
+sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
+crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" }
\ No newline at end of file
diff --git a/final-spv/final-spv-guest/guest/src/main.rs b/final-spv/final-spv-guest/guest/src/main.rs
new file mode 100644
index 000000000..50e04de73
--- /dev/null
+++ b/final-spv/final-spv-guest/guest/src/main.rs
@@ -0,0 +1,6 @@
+#![no_main]
+final_spv::risc0_zkvm::guest::entry!(main);
+fn main() {
+    let zkvm_guest = final_spv::zkvm::Risc0Guest::new();
+    final_spv::final_circuit(&zkvm_guest);
+}
\ No newline at end of file
diff --git a/final-spv/final-spv-guest/src/lib.rs b/final-spv/final-spv-guest/src/lib.rs
new file mode 100644
index 000000000..1bdb3085f
--- /dev/null
+++ b/final-spv/final-spv-guest/src/lib.rs
@@ -0,0 +1 @@
+include!(concat!(env!("OUT_DIR"), "/methods.rs"));
diff --git a/final-spv/src/final_circuit.rs b/final-spv/src/final_circuit.rs
new file mode 100644
index 000000000..0bed906a6
--- /dev/null
+++ b/final-spv/src/final_circuit.rs
@@ -0,0 +1,11 @@
+use borsh::{BorshDeserialize, BorshSerialize};
+use header_chain::header_chain::BlockHeaderCircuitOutput;
+
+use crate::spv::SPV;
+
+#[derive(Eq, PartialEq, Clone, Debug, BorshDeserialize, BorshSerialize)]
+
+pub struct FinalCircuitInput {
+    pub block_header_circuit_output: BlockHeaderCircuitOutput,
+    pub spv: SPV,
+}
diff --git a/final-spv/src/lib.rs b/final-spv/src/lib.rs
new file mode 100644
index 000000000..8d51b264d
--- /dev/null
+++ b/final-spv/src/lib.rs
@@ -0,0 +1,65 @@
+use final_circuit::FinalCircuitInput;
+use risc0_zkvm::guest::env;
+use zkvm::ZkvmGuest;
+
+pub mod final_circuit;
+pub mod merkle_tree;
+pub mod spv;
+pub mod transaction;
+pub mod utils;
+pub mod zkvm;
+pub use risc0_zkvm;
+
+/// The method ID for the header chain circuit.
+const HEADER_CHAIN_GUEST_ID: [u32; 8] = {
+    match option_env!("BITCOIN_NETWORK") {
+        Some(network) if matches!(network.as_bytes(), b"mainnet") => [
+            4046644471, 903675258, 1380784752, 882266853, 3151729575, 835580507, 2476016657,
+            1610521255,
+        ],
+        Some(network) if matches!(network.as_bytes(), b"testnet4") => [
+            2421631365, 3264974484, 821027839, 1335612179, 1295879179, 713845602, 1229060261,
+            258954137,
+        ],
+        Some(network) if matches!(network.as_bytes(), b"signet") => [
+            3853738632, 3158955590, 3791151038, 2143196696, 56017613, 2356936109, 2685546689,
+            1284489822,
+        ],
+        Some(network) if matches!(network.as_bytes(), b"regtest") => [
+            1058249551, 988828560, 601998926, 732987198, 1919237144, 863935989, 2017405856,
+            3942537225,
+        ],
+        None => [
+            4046644471, 903675258, 1380784752, 882266853, 3151729575, 835580507, 2476016657,
+            1610521255,
+        ],
+        _ => panic!("Invalid network type"),
+    }
+};
+
+/// The final circuit that verifies the output of the header chain circuit.
+pub fn final_circuit(guest: &impl ZkvmGuest) {
+    let start = env::cycle_count();
+    let input: FinalCircuitInput = guest.read_from_host::<FinalCircuitInput>();
+    guest.verify(HEADER_CHAIN_GUEST_ID, &input.block_header_circuit_output);
+    input.spv.verify(
+        input
+            .block_header_circuit_output
+            .chain_state
+            .block_hashes_mmr,
+    );
+    let mut hasher = blake3::Hasher::new();
+
+    hasher.update(&input.spv.transaction.txid());
+    hasher.update(
+        &input
+            .block_header_circuit_output
+            .chain_state
+            .best_block_hash,
+    );
+    hasher.update(&input.block_header_circuit_output.chain_state.total_work);
+    let final_output = hasher.finalize();
+    guest.commit(final_output.as_bytes());
+    let end = env::cycle_count();
+    println!("Final circuit took {:?} cycles", end - start);
+}
diff --git a/final-spv/src/merkle_tree.rs b/final-spv/src/merkle_tree.rs
new file mode 100644
index 000000000..368c6a873
--- /dev/null
+++ b/final-spv/src/merkle_tree.rs
@@ -0,0 +1,191 @@
+use borsh::{BorshDeserialize, BorshSerialize};
+use serde::{Deserialize, Serialize};
+
+/// Code is taken from Clementine
+/// https://github.com/chainwayxyz/clementine/blob/b600ea18df72bdc60015ded01b78131b4c9121d7/operator/src/bitcoin_merkle.rs
+///
+use crate::utils::calculate_double_sha256;
+
+#[derive(Debug, Clone)]
+pub struct BitcoinMerkleTree {
+    nodes: Vec<Vec<[u8; 32]>>,
+}
+
+impl BitcoinMerkleTree {
+    pub fn new(transactions: Vec<[u8; 32]>) -> Self {
+        if transactions.len() == 1 {
+            // root is the coinbase txid
+            return BitcoinMerkleTree {
+                nodes: vec![transactions],
+            };
+        }
+
+        let mut tree = BitcoinMerkleTree {
+            nodes: vec![transactions],
+        };
+
+        // Construct the tree
+        let mut curr_level_offset: usize = 1;
+        let mut prev_level_size = tree.nodes[0].len();
+        let mut prev_level_index_offset = 0;
+        let mut preimage: [u8; 64] = [0; 64];
+        while prev_level_size > 1 {
+            tree.nodes.push(vec![]);
+            for i in 0..(prev_level_size / 2) {
+                preimage[..32].copy_from_slice(
+                    &tree.nodes[curr_level_offset - 1][prev_level_index_offset + i * 2],
+                );
+                preimage[32..].copy_from_slice(
+                    &tree.nodes[curr_level_offset - 1][prev_level_index_offset + i * 2 + 1],
+                );
+                let combined_hash = calculate_double_sha256(&preimage);
+                tree.nodes[curr_level_offset].push(combined_hash);
+            }
+            if prev_level_size % 2 == 1 {
+                let mut preimage: [u8; 64] = [0; 64];
+                preimage[..32].copy_from_slice(
+                    &tree.nodes[curr_level_offset - 1]
+                        [prev_level_index_offset + prev_level_size - 1],
+                );
+                preimage[32..].copy_from_slice(
+                    &tree.nodes[curr_level_offset - 1]
+                        [prev_level_index_offset + prev_level_size - 1],
+                );
+                let combined_hash = calculate_double_sha256(&preimage);
+                tree.nodes[curr_level_offset].push(combined_hash);
+            }
+            curr_level_offset += 1;
+            prev_level_size = (prev_level_size + 1) / 2;
+            prev_level_index_offset = 0;
+        }
+        tree
+    }
+
+    // Returns the Merkle root
+    pub fn root(&self) -> [u8; 32] { self.nodes[self.nodes.len() - 1][0] }
+
+    fn get_idx_path(&self, index: u32) -> Vec<[u8; 32]> {
+        assert!(index < self.nodes[0].len() as u32, "Index out of bounds");
+        let mut path = vec![];
+        let mut level = 0;
+        let mut i = index;
+        while level < self.nodes.len() as u32 - 1 {
+            if i % 2 == 1 {
+                path.push(self.nodes[level as usize][i as usize - 1]);
+            } else if (self.nodes[level as usize].len() - 1) as u32 == i {
+                path.push(self.nodes[level as usize][i as usize]);
+            } else {
+                path.push(self.nodes[level as usize][(i + 1) as usize]);
+            }
+            level += 1;
+            i /= 2;
+        }
+        path
+    }
+
+    pub fn generate_proof(&self, idx: u32) -> BlockInclusionProof {
+        let path = self.get_idx_path(idx);
+        BlockInclusionProof::new(idx, path)
+    }
+
+    pub fn calculate_root_with_merkle_proof(
+        txid: [u8; 32],
+        inclusion_proof: BlockInclusionProof,
+    ) -> [u8; 32] {
+        inclusion_proof.get_root(txid)
+    }
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug, BorshDeserialize, BorshSerialize)]
+pub struct BlockInclusionProof {
+    idx: u32,
+    merkle_proof: Vec<[u8; 32]>,
+}
+
+impl BlockInclusionProof {
+    pub fn new(idx: u32, merkle_proof: Vec<[u8; 32]>) -> Self {
+        BlockInclusionProof { idx, merkle_proof }
+    }
+
+    pub fn get_root(&self, txid: [u8; 32]) -> [u8; 32] {
+        let mut preimage: [u8; 64] = [0; 64];
+        let mut combined_hash: [u8; 32] = txid;
+        let mut index = self.idx;
+        let mut level: u32 = 0;
+        while level < self.merkle_proof.len() as u32 {
+            if index % 2 == 0 {
+                preimage[..32].copy_from_slice(&combined_hash);
+                preimage[32..].copy_from_slice(&self.merkle_proof[level as usize]);
+                combined_hash = calculate_double_sha256(&preimage);
+            } else {
+                preimage[..32].copy_from_slice(&self.merkle_proof[level as usize]);
+                preimage[32..].copy_from_slice(&combined_hash);
+                combined_hash = calculate_double_sha256(&preimage);
+            }
+            level += 1;
+            index /= 2;
+        }
+        combined_hash
+    }
+}
+
+pub fn verify_merkle_proof(
+    txid: [u8; 32],
+    inclusion_proof: &BlockInclusionProof,
+    root: [u8; 32],
+) -> bool {
+    let calculated_root = inclusion_proof.get_root(txid);
+    calculated_root == root
+}
+
+#[cfg(test)]
+mod tests {
+
+    use crate::transaction::CircuitTransaction;
+    use bitcoin::hashes::Hash;
+    use bitcoin::Block;
+
+    use super::*;
+
+    #[test]
+    fn test_merkle_tree_0() {
+        let block: Block = bitcoin::consensus::deserialize(&hex::decode("0100000000000000000000000000000000000000000000000000000000000000000000004e7b2b9128fe0291db0693af2ae418b767e657cd407e80cb1434221eaea7a07a046f3566ffff001dbb0c78170101000000010000000000000000000000000000000000000000000000000000000000000000ffffffff5504ffff001d01044c4c30332f4d61792f323032342030303030303030303030303030303030303030303165626435386332343439373062336161396437383362623030313031316662653865613865393865303065ffffffff0100f2052a010000002321000000000000000000000000000000000000000000000000000000000000000000ac00000000").unwrap()).unwrap();
+        let tx_vec: Vec<CircuitTransaction> = block
+            .txdata
+            .iter()
+            .map(|tx| CircuitTransaction(tx.clone()))
+            .collect();
+        let txid_vec: Vec<[u8; 32]> = tx_vec.iter().map(|tx| tx.txid()).collect();
+        let txid_0 = txid_vec[0];
+        let merkle_tree = BitcoinMerkleTree::new(txid_vec);
+        let merkle_root = merkle_tree.root();
+        assert_eq!(
+            merkle_root,
+            block.header.merkle_root.as_raw_hash().to_byte_array()
+        );
+        let merkle_proof_0 = merkle_tree.generate_proof(0);
+        assert!(verify_merkle_proof(txid_0, &merkle_proof_0, merkle_root));
+    }
+
+    #[test]
+    fn test_merkle_tree_1() {
+        let block: Block = bitcoin::consensus::deserialize(&hex::decode("00802926b62577e229ae0009b80da0d948a7c934b3abf34a05e67b7d227780000000000071ff9f8ea5a251fa28934d6920f4c87724ef9a552f0e00a5020b83dc11a13870c8152b67ffff001d5c024aac29010000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff270328d20000049af92a67044d1de50a0c71230c6743fc2800000000000a636b706f6f6c032f672fffffffff02249d0a2a01000000160014536182d440abe6e9895e75066fc9dfff1737497f0000000000000000266a24aa21a9ed6d91cee860b3cdbc07e095a9f552381313e65eb266bdee50aa19d0b2ecb7d0c2012000000000000000000000000000000000000000000000000000000000000000000000000001000000000101d0874b7a7f12e721aa7922a3d9e38db39374ecd3124f2575439429f5c9e2c1f40500000000ffffffff56400d030000000000225120e11877100296215d2455ba8ce1e8a5a0ef6959f2407db793b8d310d29e261c93400d030000000000225120012b07d47940bff758004e8c778581598029e9ab3daf65d2f55eb8b188423096400d030000000000225120d61e3e40410a41428e925c6b50ce66cf0674c6172554820796a7a87358483d35400d03000000000022512038c1d55dca433bb034ecf7bf77bf325388769042ce2383aeb74d6bd72fccb7f2400d030000000000225120fed292b6b5b0cd1532fba6c5a268a953e9be5c84ba2392e7083a1d6d965137ad400d0300000000002251205f5e01e0045180729e409a89249970b00354c96898ccc758243caf6f68d2552b400d030000000000225120de43a63c3e2f299dde78dfcb0e633a52831cfe0e50103a680251feaa6723d1c2400d030000000000225120e53a8d91996b0f4ba6d2fe7b5e5937bde509f90aa5f9513bf08b44874dc3c185400d030000000000225120590ca3a044c769a7b5f38a4b332740bc369fcba3acaa37717643c60eac8ea875400d0300000000002251204a2cf1c710d4c14f945e85c6e27d8997cb38848d0b1e4d288ab5085170d3c161400d0300000000002251201d6f2c25286eb2cc3012819f127a6aafdd0751b20ac29bb8f9c517f22c52cbb5400d0300000000002251206e95cc5cf31b3706747bf2973f26468e1a1df4f501e267169dea4f9bf930b489400d030000000000225120e3407288dee0350ed5b865f30d32136c4169e1515c2f9453a6db84c549da0dca400d030000000000225120da195ff8d13386fa3164b35f54452bfd261fc8dc850c826daa9d4ae9b86ffcd5400d030000000000225120a47df510748031845665f3a512d600f3c145a07ce203341e4901ac05393054b1400d030000000000225120e663fc488244551097a3ddc07cc9800925ced00d2d4bb535d7b60a30eb479fc5400d030000000000225120d9bf66a5eed503c925b2f960af19732c795cf1fe7e3ea73f8d7ab995ee875948400d030000000000225120c8bdd7c2e696fee1abe8b322ce9ee3b8bf7bff7546fe0ca9377da75376c1d92c400d0300000000002251203c00aaaf8af2197ecb3417669ca2c1dea09dc354b685af21c7194afec58107a0400d0300000000002251207296a76471c44f42e423c2e7c9dc64c3afa991feec488a135ac54f8a56a3b496400d030000000000225120fca30ebf5b1573b2f7dd7542f6e6796c4927d775f43edf274cc2a7fcf9f2ca66400d030000000000225120cd2a8532ddc4d8510ea9d1d5e7305b1328a53d4b0654d439643d11e33a4ccb5b400d03000000000022512093b5732855048193c1d921468cbf01288433fa6ca98397835cd2b50977a4bcf3400d0300000000002251204d9c4f81ff5788a6aaecf3065bbeec32e610e580852385e9ce1a3f761d065b93400d0300000000002251209955a72ea46122230c6fadeadb39f597841ecdd91ab0b2e832d337b9ed868624400d030000000000225120344c772b4987e8058b44cb09938875d6485283e370b03e6b7f4d651fa1494082400d030000000000225120d7a659d7199a5f54b7d1876b62ba0d6140adecf36b2a3b343f6b0000b395d63f400d03000000000022512071ecff91e39bc6df0f8b194d8df03b0952ecd869f73caecccaf39902651acbf2400d030000000000225120fcdcea1f03bffd488c9f12aafc4392e444b7873c489a05e97f433be7c02d806b400d030000000000225120ffff30e51593bbd7c73cef68bcffdecbc72475fe5664c4be5447ec59773c439e400d0300000000002251204a3ec17459bcbb130a2e5b8a346c3784a132656ae354079206043f737aafd007400d030000000000225120f58b369aa9c9c429f9fda9a5ad56141554ce89b404630ba63fa9d91553a73c60400d030000000000225120187c1036952ece7f6b7de3b008f98847f99984ab4f3e67daef3019f32248b9e2400d030000000000225120d9e5a5ebb0d2f973d80886d30c5e3f7ddb9b3b9414ee6e06fd9f6c36133b53f0400d03000000000022512037223e88dc8e3c653b50572d9ab752e37316e7a37f7b44a4fd83e396e9021c3b400d0300000000002251203954a18199ebddfaeb2b5082835357376cfbb4a4b38ac2fa0ba0261099e5a7b2400d03000000000022512019081384ac60ccd75e5084456d109b1e3007de26a622d9b710c935c2e10dbc1f400d03000000000022512072ec350bec46b2dcf114626d57c13c29bc926f46c12cbd576e4e61f5938366a3400d030000000000225120e8e3351e1a3efa0438587d6f5ad8ccfac3a0c665bc9c17a44ff9fd2e3e7697f4400d030000000000225120cccbc14141bc0091002a6beb74d8b99b1457d06483983ec613ebf003f2175f62400d03000000000022512019a116d71d7bf1bd5db46c917d5e880e965ce4651594e301e625ab2a41295c02400d0300000000002251204c4df805cac8a86e0fa6336df13c708095b26763c2de42154a12a3e16212dac5400d0300000000002251208191e1c629ccf3b79e6b384b775cb76458afbc5103839e4846165d530daf8f47400d0300000000002251201ca3ec0844c8c54a8078fe411fa76b07cfb3aacef40f71cf06765277bef9b8ea400d03000000000022512092b62ac803b726aea1b7f12cacedc19a1e8088c3df73dc5aacb52ee8c9581b1f400d0300000000002251200c0eaa84dc7e7348ba914fbc4a78dc13c8384d23472dd6fa84fca4e435fae4ca400d03000000000022512042ce2f661da192f7aace80066b4f321df3ebf4214afe5ff524d72b42e8bf61a4400d0300000000002251200d411c0396da6f8812ce94e75c9d60545bb1ed5483ae4ff28d9b14a0e97188f0400d0300000000002251200d7538352e5552450cece443a8058637fda3288304126257c7d5288ee790c690400d0300000000002251205393956f43d9470c6ed90f112b41b41140920a1cc67cc84113d3f973378e9302e0fd1c00000000002251200c820a4f62a95168918c3c0fd9b2f74ee6eda157ee83c097e10cf186615cf809400d03000000000022512054e84bf1916f3942dfba58dec5f4c66b0a3ee50f255b9108a6631221c0ce9dfd400d0300000000002251202c7dfd938b5f26a43b9d80fe737a35e120b0cf87b44187466ccc59acd444965e400d03000000000022512035dbbab23efd26df70a6651cdb31c5872e43fdc14e19b30af7ab630ee22e328a400d030000000000225120f16681177c6726e464bf5e345b086aedf2a47e3b89feb30e0e25747c3b851536400d0300000000002251207fb3c0cd398b631233b5672eaef7b47e320d1811967af76b344fde681a2ac457400d030000000000225120f106dfc0e33ea1f69fdc5665946d5542b6ea2445a80c34c49d94418ce11568aa400d030000000000225120d7382ae22ff42d2275f05f646d08e78430ad6605250f8298093021648329d08b400d03000000000022512096024546315188307eaa97e1f52499cec4b386ba69f55553644762ac2816d4e1400d0300000000002251209ce3090c4496d37205d644accd85f767220e40c19c9a94e2fa9b3c61e20a6bd8400d030000000000225120e03067b7a87746c56bd535976a92db840b0a6a46398e95f0e44e832f7ada01bd400d030000000000225120696b672a1a44611c48f3f3a19ec507319e74151df0d551735950276a2f94d0bb400d030000000000225120300d29d3ba0cf354433b8438c28fb0fe492baf28711f5e9668093e3c1fe73a65400d030000000000225120545f606e43b4579ccdb1b04f8a2ae1af32c20082590eaf77fe17a77dfb30a60f400d0300000000002251202ee4b3f2df4adb7b5384a831daf43fcbdb2ba6ead7a11393e990d9ae4001b9c1400d030000000000225120799f5969c69b76169ac8cc43f403baa0f2a7d91f33bee2f7e78a92b7bab44b47400d0300000000002251202f11c5651b4aa0d8d0cf85dfe79c4e29ed9c16c99a9a7cf469ee015886128cba400d0300000000002251203c561e507924f3b1fb587661ec47f6d26aa0eb7106f47242b964b20cb763ea79400d030000000000225120531b37a969e7152f1ff6ce9b4f6f127047d4e7d6cc4e8be91ed81e85d8048e80400d030000000000225120b54bc9b12593990f7eadfa8b2fa87b590a81f0d0d25aa9b048d2bacae177486d400d03000000000022512028b42afac36727c0cdce9b980220dc519721fdde80c6c19c0eaf0f4e86067ac7400d030000000000225120e09e614c027f50038b5f5b6770f52d92b612b58c9d58c53c9151a71a2f2cc014400d030000000000225120c6eb3b061dbfc876399fad6371ca00712d2ea8bf243f0c1bfae02e30076a1da0400d030000000000225120ee4ada4fd527ad86d9370433554436d6e24d615d95cf1d7819069fd348e0ba6140420f0000000000225120c04b15c90149df98fc4679081ff94131329bc23e4319502b2876d90228e3e37d400d03000000000022512050b618aa1953112c692efaff3ec0811edc9a20ccaa42153ea9e58613912a57b5400d030000000000225120d172584c827287cf4b99b17552f8e4d14588b2417d4be6f61afb78cfd1314b56400d0300000000002251202352f368849d1b3e7af24ad9e63e6d633ff5304d61fdbb87cc2900f6356204d9400d03000000000022512040e87325471610a96d70e1641f2ca00a20352a050624b5d6e35c3d138e59e7c7400d030000000000225120350f90cdc8dd7dba36a2445e1b067b43368cded6100f83d3819109dd964fd14c400d0300000000002251207f3a1309add12d2b6387e9375351c49be2d274697311443a8b0e10ceac087e40400d0300000000002251209db5233f2abcaf2780dc1955b6b8cd217a54622b3dac7b6510ba2714963030dd400d030000000000225120c4c95664724ce044ff77c77c24c24aa3c0b0ec289cb574bed6b00e5541ebb72e400d0300000000002251201acc8fde62205048f932c2c7a45b48c1456824516b8c604f78eb143e119c95c9400d03000000000022512067159985de51b57095ed4e20398c2b3d37c2093708751324d22e959852440d3e899c287c01000000160014dbd359f23e01f8752cc193fefc04aaa9e3a441400247304402206731bfecbd6c6e67c3212edbd71debb3e1d92197a953a21ffaacf2a6430e7bb20220575b4092e683e33e6a648447a815e5ddbc4b384edbbbe1a3a71c53f7fbdd0171012102836b1dbc3d40d023ec913ce3d04455a05873ea28e08c6b07536c0f08b3d3d17e00000000010000000001011ba7dcd9d08007bfdb31b27ab323b7958f17549b973a98b721d7108bb40534470100000000ffffffff56400d0300000000002251207022fbb7a6ae628fa593e35e402fbc19ab30cc2991e4eecd5f1ba9aeda50b65e400d030000000000225120903226eae1df825893ceeeaa21f9345a2de523be9325f992ea7fec92b94a5d1e400d03000000000022512017df484096cb1f3cf265653d1926be60b29e77213ae331cbf22d37f1c49934de400d030000000000225120d20bcc3265bf8f7da708df2e8d1964aa17139a39f9b58b7315edb04f6143d9c3400d0300000000002251205cfdf9c25bfa9b527a543234b927f083a020feb2967622e173458e59dcbd0003400d030000000000225120d403abbac8683e0455e1e5736daedc980753d8178991771f1b0d51a6ba82614f400d0300000000002251206e7bca480ddd4f22bbf246e972e8bfdaae1352127f7c303ec7e4f6a8c4b21ad160e3160000000000225120786d148fb2d85e10db8969dba73a7351786b4b7ddb9efcc67436f740598e548d400d03000000000022512049d9c2d0eb093398da626969e25362bbd9d50ee6d71481a6f86c706495fd5989400d0300000000002251206663a8a94c49f429ecaeb68c6be3e41d8636b2f6d088f58f3d591a492cf1d503400d0300000000002251201cafa0d92594feba9f0637f201e7568bf5d702af301f2c14b072b87c12388e5e400d0300000000002251200912ffbf4df4625c1a80142f49258a315e2488a2e33c61d044bf7820dc612b97400d03000000000022512022c066bd646fe5171b175c3bc2b25e189683facdf110b430a7cc3d6e0f510f73400d030000000000225120bd9396e4a61acb9444b1c18e32c252bfe7b835f099bf86bd96de5803c6d77aa1400d030000000000225120553dbce7f9ae57d55b7bf3d7c68aba36d2df67bc0d18b87de56d2601d9e8ab3fe0fd1c00000000002251203e73ce12f41c2d401f7e09e8f3707a593ea9c8081d66624dc556855013bd6ede400d0300000000002251207ec03c57a8075ec4bdc13083692961105b56ce0504b1c5bb09b9588eb523bce9400d0300000000002251205050433441e745276d208bf4f9f1a0137e7a91c7e80838a0f1a3c6a0b104a3d1400d030000000000225120184cacc7a13ea684c3597e7bcf109bee4e6d0aa5133ae8c57fba8ec7e336d3c1400d0300000000002251208816daf591eb7b4f145933093d493e3fea200d332628281b9f16dd46805436db400d030000000000225120e6fda9104c7c50bf0ba89fc5a4440b4fda7f1d1b76e37f3237d97dbdcb27e7d640771b000000000022512005d2303c9e9587fcf515b4afb0e6c2c252b0481f206f5515be05fb90c1fe422ec091210000000000225120a0955ba3445caccba50e66b087220f13050b76afdf954e0835bc107281da0cc9400d030000000000225120755247883535915e6fe04261c1db20f1a08495e60220d7c82b526c9027497847400d030000000000225120f427311e06daa16f076f701d3771b7743f15a22dd46cf932e61adbc6de9a2eac400d0300000000002251209a4b59f038ce312cc7098dd07c99beaadecf90de67e0c27e8a34950a04cad436400d0300000000002251203d02c8c86760c8dd13a75082ecacf3bbf70e2400dbe8626e28072b6216852856400d030000000000225120af8fc5a1cbd1b5ac02e34892bec4a50d9f815276a6be002521c63b557ee292ec400d030000000000225120c256c25d219c833d56bc2102863700f399ddb7793b6f4f0d2b35decb2a943c33400d030000000000225120af112e22c6a8f5181211e7403f5f9975319853da3c72702f5b8099e93c17c158400d03000000000022512093ca9bc3fd3b90978d4ae9d307725acadb1ff9afba72db1876de728e68da5c5d400d030000000000225120ccd8b5a2a3377b7e3e63e6266a41eb7bd9a834a907ca91858df54c485e909753400d03000000000022512096ba1089e3908cc36057a62e4107b566616a8ca67ddc0a66e18df1aedd50cd3a400d030000000000225120ec12ca07b363661532950fcc9b163b33462ed730a5e5a03605aba84914de56e7400d030000000000225120af9d8501ac444b7d958d96845193c485400855cdb8cdaee31b9798b14e9eac87400d030000000000225120a7a67f34d0bdfef934e2dadbd77da915072edd48560ed3602f33b8225256a2b7400d0300000000002251203338a42ead8ba65ae6e71cc2b781f039053a956cc03acd45c266787684122f93400d03000000000022512036287049ce89faae4087e356c6894b4f7efc102639011c2727744a89a4527850400d0300000000002251206e8207ed0b4fc44b417526b97685094b04318bafa32c03f8b9843e440c81879b801a0600000000002251206c9d33e2c4a8bd1054afe49bd88f0867b60b254ffb0e58239b5b31059b4255e3400d030000000000225120064f4ff1ebd592358ec04fa1de7050eb8caec7661bffe74f189c51cd708ff1ed400d030000000000225120733985c6b5bd84dd51d0973d3fca2740b328a71dd462ad1a53fdb8ec119607cd400d030000000000225120916be5e4a2a578a3bcc8b9965b8465777ae5ef796665221eadb8efb55d65b556400d030000000000225120c1bf7325d66a2e2dedc1599b11ba4df74bfdfada9d2b9cd738a9c68dcb32c418400d030000000000225120ce6f2bf1ccb6e96a94ed185ca1d604a62631842cdfba59ffcd4aad101e1b9265e0fd1c000000000022512007e5345ceee2afc72bab07c4a233df90e97c5cea7030591d6cca3063b50f5c70400d0300000000002251206251ae0562566be092857da794aef7a6858bc10c2d92e2df2b67b3e7f2151507400d030000000000225120b58fcb7954419017efbb0c17a04d8121fb921a8c5b1184dc8a2d15920d38d58e400d03000000000022512092c4f29a3dbb840ad3cbabdcfb527ff08fc21f454a2018e71776568d731e1ef3400d030000000000225120fa433de4ec37ba7d13ed94fa294e528d53c587a54d01a0f2dc53069fafd5806d400d0300000000002251208c3a2f8534dfda45ab37f6a8acb0a7119002b7ca2d519bcaaf9d4c24ecf45436400d0300000000002251205c0938706fc4d3a72b98f82a5a239bcc8bdd6b3a7d96a016a5ae67210ea82a3a400d030000000000225120667f7b015d4b113cc9c5d068cd56d5d301f4c04898a5dd4b9117a245082dec77400d030000000000225120d9708045075d338a7a7e0e2236a9cb4ce3e107226e370e55b79e37ee3bdf4e9c006a180000000000225120135da47172343a84f365a427965afe757293cff0ef962983457c116034ac90f9400d030000000000225120bdcfa69f9805759d5929ac2514eae0d53a5ab1d27cbb61a69337674217a85884400d030000000000225120dd54f910695c8e366927cd5d5ec8dd60c3945e620f593a551b3f558e3fd56d85400d0300000000002251207919a59fee2cb97245213c9b4da8f907153ad0ff096ff03d0eb999f93bddecbc400d03000000000022512096ad18837720b09663053e541206b3ef2accb0d4012815bb0e8b603410c69d41400d0300000000002251207273dc83d40445a87b0eae651cab7a08242ac4d972e43eafbdaeae15acdcaee2400d030000000000225120f9c45a63059d3250b2ad77a9fa0a037dacbfa10099dea50f2bda5190c38a0604400d030000000000225120fcb99825e04d6b864970fe4d1558182a5a5810c4674a687f43ee76b3d9738f86400d030000000000225120b4c7f5b5843bffff9166c9e2fb73719bc23019aff8365bd8ed77c1cd1e499f9b400d030000000000225120f5967b69cf197321174329fff226cc716bc36da5b5a5d562a2837c3462f6d594400d0300000000002251207ef2cc1f698411808d202040ca7289e82c95d389a2e8166a584431054b18b22e400d030000000000225120c960a50984fa31471671ce8141b952f34b4d6781b477355880e8c6623bff56dc400d0300000000002251205fadfebdba8ba6d21479aa3cdaf1e4084bcb2e9ad33c1402db35ef855b6e405a400d0300000000002251206ca2bd21fc40541ac9558e1c543215632eecc7c669436f1bdb10a8c2ea97f9a5400d030000000000225120d319e5ecf9b03f11ec30684fded5567b00b2585c271d62130945c02353f8bd51400d0300000000002251202e5f34c00973e3a6ccdeacc28c7994c0f345d773a382b09a331dea877deb4ab4400d03000000000022512002db565cc8f05949eedc666e5516e40233e3a8bb646ae9bb52a8378405b31c3d400d0300000000002251201ee15f85439086366d7822a16656880261cf6e76171d266ae109401f7e2db090400d030000000000225120a48aa4e2a241f11a88228a4d1c390c3076cdeacbd6e32dc850ccddbe9f4c8317400d030000000000225120b8e4dd32fc592c89d5c9cd34f9c724e02c5231b79ddaebce7e31178bc832c7a2400d030000000000225120d28865fb1e2de25889a61f81922dd3e612499262888125b28935096ecf151bdc400d030000000000225120b5b1da7738076ddc62ab5e5d432dd9b69c8b94bcbf69f2a7a2fbcb2e00c168e2400d0300000000002251200128adb161ca60cf2d792eebc01edeb507eef9a26b6291e086620f4d333f2f9c400d03000000000022512031a414653f51873c1bfdbeef40dc141eec43cfabeab7a670c18985d2463986e9400d0300000000002251207f282164ac8d6ef71cb3d15b4f4fca98d93c2a0b45290783fd06b68757101c0e400d0300000000002251208a1fb6cfe49b9a9d6189c1919fe26e29b8ebc3c856ea9d63b99df0b09f488724400d03000000000022512096289a10977378095b7b74e89c79b3911f83c3704caa18e0d356a736a499f41f400d030000000000225120934250d813563e9c4810fdf973a0f3091b900ba4c08337f4842800e046aae8f5400d030000000000225120e0cefb9755a28f5ae69bb103b45fe9dac9bee5d38d97d65293b721c3de95fcda400d0300000000002251201f9fb2d560663936c4c015f9ae69f80ae3de5a1c64eba7c35b16a3b875576458400d030000000000225120bec66229179615c91e0309b4ec9ffeb8a77f4fff5ce7c812b61c91252d3b2f30815cc07c01000000160014dbd359f23e01f8752cc193fefc04aaa9e3a4414002483045022100f5c71e82ee329df4a5ff97de36a2b2b79f86d949b7d9a3d11d32f4ab8be660b3022072f192dc45e43060bde81a4356f838e2e7110d66267e15b89afed98dab10cf4e012102836b1dbc3d40d023ec913ce3d04455a05873ea28e08c6b07536c0f08b3d3d17e00000000020000000001018c1624b7fd02ba5d018688c4d4b64b708c8a657cc7701db8ac02b970532b29ae0100000000fdffffff02af72000000000000160014e4fd3abbb644375588f09ef4899361dfe239b05fb8d1ab020000000016001498b3992769881aa136620eb1801f625b38f2c15b014072c7353f7e1ccc0916901671bded4ded93a984b1a1faf246acd794499094e9bca9a9cba56fec52dba9857573caeb4207b3b3fdfa494e0df586eb01c143667a5027d2000002000000000102caee0386f72276a521fc3364e47a162c563a5d783b07b1e6e158ec105d08fedc0300000000feffffff52c7b36f469023be085280625c16a7f541844c393d63132d9498d2407329d7b30200000000feffffff07d74d000000000000160014f6fa357adbc3efdfd88cf3dc4520a456c2e55099da4d00000000000016001449de8133adcdf7bb3681435ac08f1c61cf63bb6a45c6000000000000160014ccebf5490d07887998e364d20264ce26f4d8cc06da4d00000000000016001474b2e4c51a530f49e9fe0a153c15b2c5bb2db017da4d000000000000160014cacbbe4dfec42a4bca49102ee70cf7890437a107da4d000000000000160014f5ea3664efb45b99bbbe7a3fe71ef63269139812da4d0000000000001600143bb3a7c824ab1affaeced2997561d2e9c08c7318024730440220165bad5fe52454797aa27782bb209a650d8e275ed09bce5f399ab5f0a175e1c40220076b1a83be7ad29d3cec72cbc2486249d8a22da5f6a77c1b1b9e4225880278a301210351a58277f6cf9e1a7c48b770359a7be383a6309528674bf2a0de830ebd104d5c0247304402204bd6314bcd8926f05a6529dce35c3d9a75b7ba5a52c16dc348e998ce5f87dc5202203c404ff313b3498154f4318fa7246a94c00a197c496df4b6888c9c179b247e0a0121024547f79f1a6628d26723abfaa101accc4cfe369693b3d474771b18a245ed27b226d2000002000000000101cc3db261169c955242298e8dab61c706bc2aed52e745e4be29867cac81e77ab70400000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc1101408cd793eadf49fe2914d7728eddf0a8383a696d26b911487f9bb425e0e127082e6dc0a73cebd8d35230cd53b8c2a85e536d571788f990de4af0fa9767b9a26d23000000000200000000010a3b12d1df8ef6f6bf437a8cb1a5c44de442a5a24be872f4cc7685d30080f796750100000000feffffffc78bc4036394b2ada2cb10b2d39592069ce2aeb1b3b7b54fdca8b4275849140d0200000000feffffffa180251b2107744778735975322c9e777cf648d2c4eb29f57f1f6922922e3ef90100000000feffffff041cf6d6688987e00137566a0df6c5e579c2023927956806868a56c8908f77060100000000feffffffb60fdc173b95aa0c6557897a98ae189937ec1fb8c876ea1a15604d2ba8c758c80000000000feffffffd778a25494c755ea34f1fdffd4c4524d0e12718c9dab65e35ef1f7bd707f11430000000000feffffff1a6d87659c06107cc6550492761bef3d51cff46cbefd345268d7db8565f7d7cb0000000000feffffff5b91ca42c3191b1130c8796fced1895150f40abfbef937398a6e98afb556983e0300000000feffffffaf1e3bf8114dbf067133dc671eedb38445e6034faa140975efcc8e6166f9348a0100000000feffffffe12c7fb9f57d52b1c72d5d87e945f788d14f508e9b97d9fd7faafb2bff84aa4c0000000000feffffff0242fe3c0000000000160014e4fd3abbb644375588f09ef4899361dfe239b05fc973010000000000160014765028867a1b6b1195ad2d3fb6e2b065116bd1510247304402205e2bb9f8a92bd7932ef142833259840fa8c60660b6f96093e0b69bb5d47dea5e022012eb002d4bd053d96c449182a9a05cd3b3dce0f70196541e4aa69aa2a55ab6ea01210393239407efa6250ce0973f50cb829de921aee32db677817ef96ef8b56c369e8f0247304402202d4bc696752852f41213d3138f60288ec60dd0828bba0aebaa93ee2553e722c502206e43c5b3ff32f6f85f88f4e1d6c182ae4710ac81aefab6ffac984fd8e46b1e4e0121022f448382613678be144e5dcc252819333d16190cb5c3717a214e65a5a3e5672502473044022065820982ad95861e94806b981a439ee682b2cf74daaa2cc157a2bf800ac14b970220467a66443376b658eada1a3dee227ebbdc68e9e3dc824cd9874bccbe544740cd012103098239071fa5d61c8d046db4d823992efd7e9353346977314e81ea89a74a272c024730440220728a81de49e662baf3e437417a5f9979323de29e19abcf9d20bfbe72848ba23e02202b9e30ff85c517fd93f6f20c3f8f2cb8c2dafbd40aabc805e835e5bf92c143ef01210259316cde14df89e7259623b770fcc5d559bf44ab0aa94df1d22ef3eb03fa91640247304402203b74f263d7834293ec576b175a294ca8f3d2e3326f73f7e2295162c43961de930220055c52e70f32b68bf435431962ce1aa977b887fa56748f8289aec9d93d519572012103e73d95f6d4305f91910eeb22b616cb41b70ee1d2fe15f7be22f8c0f6f1e68b1d0247304402200c390f675cf6f598275745212f0dd19905f7996b0426bc1a54e679de858e59c102207f65baede91dbc069def5cc4dee53e86239e4a0d7de0fa1deb9834bbe80ec00c01210352c76e118039f87d7414b6f43ebea6b2751ec7be97bee5482207af8bbd2588eb0247304402200c1ccaeaf7a27910e35ab2cbd4097aa69a00287149740b635f5910269a252d3e02202daef72974401ae19473e95da17c823ed28d879205edc61ee7be729025fec4be012102d80c616c1fb9dba1b4ae73313d88f03a68ade3a4760ea12ca14a13a7ade2b97702473044022067bae6844b4139f88f7d8ee1182e6366048ccf495c0c59169a7fa3e0a9c7bb560220196ab2d2c740274b4eb68b0d1c7726d7e956206d0b2d41cfeb4ed8aa6dc8ec9e0121020b0318da2b655e849a5a4739a7b11146b1cc5e901f4e25e7febea0f26f83a65102473044022051e01b410b032dcc45d26817ea95acfbb9ff0bacc4cb21a8275af38181824c3b0220719cf12dab0a0a16483a5bb4047055fb1aecd3a822e5ef7e672d518037950f74012102a9f47ae23f06e0232e87183f7d0e779693271034a10042fc8a6d3217dfc9f7750247304402202c139393fc08c979764d9ecfd5634ca782736b389c8aa01042f61e3cf388f9ca022005b76058fd540e3ab659db3404b862c26182168c9299c63c592b8c2960d76e8401210397653767e64932ea2c83c0238926a74c711132cfbd3c4f03a35372fa7426d89ce6d1000002000000000102b381d86b5991500119f1bd95e3fcbcc4a9107c7ea21bda41ff298358f2d1fd180700000000ffffffff01f01c8efa965c8c2cf4f4b18cd297675d09cba71e1473b419963b4faf1d28b90100000000ffffffff0260e316000000000022512080eb3e9db450c51afa4daf8f1b57c770c556991d91f36887d436a3dde47c0a869215000000000000225120786d148fb2d85e10db8969dba73a7351786b4b7ddb9efcc67436f740598e548d0140be9962adedaf1a51f62a18f12e5b53c476bf9b946ced6b4f8445fb7fd32364a49e85a2fb2982a5f307a82f244234c16fb19a467f9a0da173359bae4d4b23ddde014050298fbcec95a0a96848efe3b4ec24b42ad1b08deb2d0c26057b1b0ef1da667c098122416c8b389e391cb365d1fdab4b1c33a975a2cc45ca8cb20315c9f0ac1f00000000020000000001010722303828d572d3fb1e3f646a052ce68451473a86cce02b726baaf7dae3ca570200000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc1101400dd9e3b6563c580940898e86aba16bc3925bf42bc4183c310d5334c7753fd21f69d65ccad54b8c902dbb0920c32119296a10f1d41e8629bedc6207f85551e5f6000000000200000000010122aee43b30cdd01765a316c5d6837a540af4a9c6690cb0e440ddfc5608eb064f0000000000fdffffff0225c2d1cc1e0000001600147b458433d0c04323426ef88365bd4cfef141ac758813000000000000225120d0f61eac8291b8689461aa5e08e2aaaa627199196c37b9bd2a9959182bcf6d0102473044022015ff9f5c1cb9b0874b54dce2aef396522d2ef20891cd0724a7409c43ce34de5b02203d2b9d5ab8bbec6e7cd5d5e3eb206375fb8b386e911c026114875760099a05ad0121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb3000000000200000000010108eac5eab9998b46ccdb0fca2aee70062cf48d2351ee9bff906296fb520e1c860000000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140091ab528a2910bc686b4dac9912da4a59df173e8be7befed11f85c487bb7b68815c3a4c4a457159ed5e1f7999045f8b6dcd5ae63643aefbd1eeb6a749e3ecb260000000002000000000101771928fe801bc5b368b7899491efba72c5a761bb09be761ce7f80f14851bf8cb0100000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140eef79c5d2ddab489e1fcfa3a82b554dfafa637017225592c97ece6df7e792bd4b8c74c3afc098203cc8578bcaf9bac77d29d3db13be7a8fd8c9d31d7685a80c4000000000200000001d0e9cfbcdcfbd1422632c90586365e85fb4d6a9f3a186c6459bc115ccc5db820010000006a47304402205227e61a70642da96194d94cde92927b242386e98d876667e7a87725b485d2da02200bc948407069f2ddc17cfefbe06ddfd290a6b5cc51a842b23917973d938ad71f012103816c333f0b3de4ccc0c19b0839d6fb9b05f17d6c84af91a48f93f328957d600bfdffffff024ef72506000000002251205ca3400e7f0a03ccb0d1d8591446edf094d2e2b34ad347cbcc7a0333819031cc92560000000000002251206c9d33e2c4a8bd1054afe49bd88f0867b60b254ffb0e58239b5b31059b4255e327d2000002000000000101771928fe801bc5b368b7899491efba72c5a761bb09be761ce7f80f14851bf8cb0600000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc1101403728e23db6509b7bf57763959ba151341d4012e206f159af878242360eab3a598a5c1272bb603dd580c0e7771602d0d0d334e227cf24e658e092e49947a86f440000000002000000000101771928fe801bc5b368b7899491efba72c5a761bb09be761ce7f80f14851bf8cb0c00000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc1101405383d27fa066921b4bfaf882088b68cc2001bceeb7455681f17db44fa4c1fb7cb58da79c1335fa116d7acd625bcfcc207fae7405bb3d967036b73cce0a3f87c60000000002000000000101805fd5f2b35a00fd4bd80b6a4e7eea9aef743b416d84d2e2659170fccba0c22a0100000000ffffffff02204e00000000000022512080eb3e9db450c51afa4daf8f1b57c770c556991d91f36887d436a3dde47c0a8682ad6c00000000002251208a482830e94b85d843e95c2448f6d160b056aea668dcdd9b8d7f218094411f180140e61574ffc8cc85dd0de1b0d8cc1b113ef6211b7e165d368a0fafaa578e8056dd35738bbcf047f01923bcc6a130385c600473a78ce3dc91df8460c9d2e340bf060000000002000000000101910f822c831c0a256bc01e50c590f91c554f46b008f0180c5e3131fedaca51630100000000ffffffff02803801000000000022512080eb3e9db450c51afa4daf8f1b57c770c556991d91f36887d436a3dde47c0a8668746b00000000002251208a482830e94b85d843e95c2448f6d160b056aea668dcdd9b8d7f218094411f18014032f909383a2ca58020a9180fdfe210158c7b7397cd168d928533e3be619098e77d8ce6be4688bc9bb14d937ee77c1d54944f0f3a20a1c2e2d9b9b85f4ea557ea0000000002000000000101771928fe801bc5b368b7899491efba72c5a761bb09be761ce7f80f14851bf8cb0200000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140cd136f7ec1f4beb9f063556f66a446037c8b8cf37f746c1b8748f688ede7eca5367f8cbaa6353681ea515f469275103dbc7e8175056a99094fe56a43b0c4ddbe000000000200000000010108eac5eab9998b46ccdb0fca2aee70062cf48d2351ee9bff906296fb520e1c860900000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140ad023b4f959806fff187247cdbc57fc7159bbdc45afe5492fe78314f3396f0ba1aaf686b8e3c53bb6182bd64cbab0380dfec36677c98891cc3fcdbea6227d3a40000000002000000000101570f9ab70e0ed40f234e0672443e45bab32577dffefb6db22f7c131699223eae0000000000feffffff02894d00000000000016001410488094091f5aa7d04a994ff937a1ffdb974bf718e8000000000000160014fecc9392d0da66d2f61ab86d90be2d339d38fc7302473044022076fb7191ce8102b636ae02d581b44618ade858e86f70e495c7826d4e8131de1802204ab87877d842de643417732ba272612c6a4699d1a00fa01f0382c5a7a6b4df02012102d8058c60963858e23ee0cc55c3cb5eca6216c0989060da353774c9bc7289297727d200000200000000010108eac5eab9998b46ccdb0fca2aee70062cf48d2351ee9bff906296fb520e1c860700000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140e289a5ece4b6d1bda4f28c46ce9707f6052924aa801649f469f8d28b906709c1b32dc09e0d86b8326d202dbacadfe5ed9f70c9a6bbd409a5b7072c8e132fb9e8000000000200000000010108eac5eab9998b46ccdb0fca2aee70062cf48d2351ee9bff906296fb520e1c860300000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc1101405c5adcb347f17b947abeebf4146ecf2723ed2257fba39e3ddf02e56ca4907afb5e6871e650eb287d2173abb9d4667f2b14904abde85e8f0e2f82759cee5decdd0000000002000000000101771928fe801bc5b368b7899491efba72c5a761bb09be761ce7f80f14851bf8cb0400000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140b1e168a3d2ff0723f9c32aeb3c1c2522829a58418db38cfd94422538fb172e81d4a8baeb2f0f4fe32cbd4f4b7983d982e4f9283098acb169e69f7d86f9cf60b800000000020000000001014049c949ab389bd8385b1b4dae60d3027646bca0f6bc0b56f341f43420f698210100000000ffffffff02905f01000000000022512080eb3e9db450c51afa4daf8f1b57c770c556991d91f36887d436a3dde47c0a863e146a00000000002251208a482830e94b85d843e95c2448f6d160b056aea668dcdd9b8d7f218094411f180140ee24fe241950f9ad1356d6817872d97e4a6bc2ebf99a14f83d7805440ec4532a80425d019cc1d65c2397c048709e64c0f53ac376db8a9285558b1f96565a6dea0000000002000000000101cc3db261169c955242298e8dab61c706bc2aed52e745e4be29867cac81e77ab70200000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140fc85ae0bc99d4f03162182e73f1114815c32808dbfb8f1f9604e8d13c3f08a88bc19e17999cbb26dcdace1ad2994da9747c1efac609178bcbab61c0d4f8c532c000000000200000000010108eac5eab9998b46ccdb0fca2aee70062cf48d2351ee9bff906296fb520e1c860400000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc11014010db562114bba933a0f869b7ca2ca1d1febfb2698e145686f11037fb8205f902ce4b1cd22ecd0815356f8203da5d08b1f07a81eb167196f004453f738af687d4000000000200000000010108eac5eab9998b46ccdb0fca2aee70062cf48d2351ee9bff906296fb520e1c860100000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc1101403158fc9a8ba466d3785ec8ff1f9950cad9b8a2da2a5fcdf54177219ecc5895c98b2ab394402924c4fe630c2c5de7fc3a5db1350a82654984ea586c8c53e463dc000000000200000000010108eac5eab9998b46ccdb0fca2aee70062cf48d2351ee9bff906296fb520e1c860500000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140caf8e0fbf94b44a00334e61b500f1837b3e7808548916cd8e8db14d153ac110d8770716e50d618f223e0d711111a47803b13312e825b47d281c0bfef369fd2980000000002000000000101771928fe801bc5b368b7899491efba72c5a761bb09be761ce7f80f14851bf8cb1100000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc1101404016086cd5b0895739606edeaefdf817b93eb09071e95ea23f8c47986997c8de0fbc5a1ce406793bac8458625fff2e51591e02ced594b2345b1c3277a3251bf20000000002000000000101771928fe801bc5b368b7899491efba72c5a761bb09be761ce7f80f14851bf8cb0a00000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140ab917683a9a9f39cedc8395f11b7bc2445c2402eecc2e8ad67c4fd804328d17b2e4b44e083f3874385a2a5c44aeaa382cc6f5178a72538c491e22bf82487462200000000020000000001010722303828d572d3fb1e3f646a052ce68451473a86cce02b726baaf7dae3ca570600000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140f10df53597f6ee50a44ccf6e643ccb723f224dc96c00e14c86aef5116b4c82142953b4db3503ee1d6cfed2ae0cb7acd94523516ef110b3042249602765c9bc6f0000000002000000000103c4b8ab4e4a2162195dca57d23a2f0be7115a16f7ee96eea843af779843fda6170500000000fffffffff353ae7c11bc07651d38a7d72cb50ae9375648a3497e505b16b4cd9f48613cca0100000000ffffffff2ec1cee2a9c91e040bc3632e6877a983d85e4c117b496077932ab09a8566d7880100000000ffffffff02c0c62d000000000022512080eb3e9db450c51afa4daf8f1b57c770c556991d91f36887d436a3dde47c0a86b73e0f000000000022512020cb02edeb4b69afcd08a6901514629b5531e2c6a30ce112eebe5a49eb94bf9c0140e444abb9bc1cbc406071d6318c3fb059e5ed6b538391f47ba5e5889a06f43156254d4ee107f2549b2a0627d19591c857d4376d8ff5801d0267ae31337ba8d8d60140031ed566b1f79ef05134474910635803fd050277a96c8f40f29614d7cf5fcfb5024ea7f799c3944ba9c4e29d36c6a4156818257c2bf7263382a0742b67139859014078e54fd05719f77b3123691b03bca895ab8d3d0038b0d1354a83dc16ad818f0d79ad2f7492a01fa8ed5d9d81360947c401cac4d75911068de3a19e49db1b9ad6000000000200000000010108eac5eab9998b46ccdb0fca2aee70062cf48d2351ee9bff906296fb520e1c860600000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140be76626a3f207e60628c09d2158510f27f030fe2a7c12617403ee1fe07efcff7bd77de49e47b04b709a4a721454524320b4f0b24f7ef675a3e34e43c017078ea0000000002000000000101771928fe801bc5b368b7899491efba72c5a761bb09be761ce7f80f14851bf8cb0500000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140de11962fa987dae8d84326bb9ea7c3593d59f6e736b1eafc752483172f9437a6b75fbc54c01dd2e2e49eb7016ec7ea9e51d0bedd54c4bb416fc198422cb525db0000000002000000000101771928fe801bc5b368b7899491efba72c5a761bb09be761ce7f80f14851bf8cb0f00000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc11014087013a16f5728d3d51ac12699d3000614dc0a8db5bf7b08485e0ab6b0d0d070cb4e27e8ddb5466f763eb66eec504281e749f3c5340af4121eb10ac2c3cfa915e00000000020000000001010e77b7bccc47c756b0e6327627940a650d411608e0cd0784176610d7b4c768250000000000ffffffff018a821e00000000002251209321b660eaf1d8487ecc799c9f3bbb74b7bb1793de9df41d04a479669b2617300140705be8f3732c372a836804334dfc6f16d511b18ad448123cd877c548e1b0d6ce0b43764376c19d401ca9cb98079c6432be682594ba29096a9698238cfc822294000000000200000000010180ce346d13519be8de8c9221e776b877694628c88dcb570850e628032e81b3520000000000fdffffff0217e7d7e6160000001600147b458433d0c04323426ef88365bd4cfef141ac758813000000000000225120d0f61eac8291b8689461aa5e08e2aaaa627199196c37b9bd2a9959182bcf6d010247304402202cd798c91fb2974277c969a920bf20797395ed0d1824321f57b9d5f83a59121602202a392615fede776c6348d608775fc6077914efc2b9b982c5bcdccf76cc1b35f40121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb30000000002000000000101d8773a94e31a4b5adcea618a6c8532f4141ac88a354fffd501958d6a6b7e98020000000000fdffffff020d5f73416f000000225120aac35fe91f20d48816b3c83011d117efa35acd2414d36c1e02b0f29fc3106d900ff200000000000016001400f56bc22372ce3648abc4af21baea9a72b3475e01400051d2c9b67cc536921a56bce9a6b50498f4e72137bdae6027e4e8d9adb7d9d9cf181129ed5fd2f4eac0bbc4cefcff468fba485c667b2ee93242fa185010721200000000020000000001010722303828d572d3fb1e3f646a052ce68451473a86cce02b726baaf7dae3ca570800000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140f94e3f51bb785ffdb773759b48048a00cec748c7cd880483c29ead5be682c632f08a24ae9961bfa3f084996ffd957c15a8e26b1cea6476822bdf6064c67040de0000000002000000000101771928fe801bc5b368b7899491efba72c5a761bb09be761ce7f80f14851bf8cb1000000000ffffffff01d10c0300000000002251206a0cc6c8cc7caae4bbb6aadf779ccbd5689cd18c3ed90a5229870fcf9e4bdc110140c9fe47399fc6cc2ed357a46967a006e8ac39241c200d4757cbf43501c5e9c015ff17c01c6a4ec8b99ea34ab2d813c8bcad02654543bc7d69bd2624b8aea84ec700000000020000000001012d71f720be469ccdd6dc41b6a7d09c82e895f6ed78fa7df7af350ac9e78933ee0000000000fdffffff02ea0f83c5000000001600147b458433d0c04323426ef88365bd4cfef141ac758813000000000000225120d0f61eac8291b8689461aa5e08e2aaaa627199196c37b9bd2a9959182bcf6d010247304402202e354e8f135603dd752b999dbeeced525d35b14a40e356ad7c91149dc99d496f022076bdb2bec3317f3889bb9fba5bc6e9b52064f99c4c223186fbfd32e7f54eb33f0121030db9616d96a7b7a8656191b340f77e905ee2885a09a7a1e80b9c8b64ec746fb300000000").unwrap()).unwrap();
+        let tx_vec: Vec<CircuitTransaction> = block
+            .txdata
+            .iter()
+            .map(|tx| CircuitTransaction(tx.clone()))
+            .collect();
+        let txid_vec: Vec<[u8; 32]> = tx_vec.iter().map(|tx| tx.txid()).collect();
+        let txid_vec_clone = txid_vec.clone();
+        let merkle_tree = BitcoinMerkleTree::new(txid_vec);
+        let merkle_root = merkle_tree.root();
+        assert_eq!(
+            merkle_root,
+            block.header.merkle_root.as_raw_hash().to_byte_array()
+        );
+        for (i, txid) in txid_vec_clone.into_iter().enumerate() {
+            let merkle_proof_i = merkle_tree.generate_proof(i as u32);
+            assert!(verify_merkle_proof(txid, &merkle_proof_i, merkle_root));
+        }
+    }
+}
diff --git a/final-spv/src/spv.rs b/final-spv/src/spv.rs
new file mode 100644
index 000000000..21908d512
--- /dev/null
+++ b/final-spv/src/spv.rs
@@ -0,0 +1,140 @@
+use crate::{merkle_tree::BlockInclusionProof, transaction::CircuitTransaction};
+use borsh::{BorshDeserialize, BorshSerialize};
+use header_chain::{
+    header_chain::CircuitBlockHeader, mmr_guest::MMRGuest, mmr_native::MMRInclusionProof,
+};
+
+#[derive(Eq, PartialEq, Clone, Debug, BorshDeserialize, BorshSerialize)]
+pub struct SPV {
+    pub transaction: CircuitTransaction,
+    pub block_inclusion_proof: BlockInclusionProof,
+    pub block_header: CircuitBlockHeader,
+    pub mmr_inclusion_proof: MMRInclusionProof,
+}
+
+impl SPV {
+    pub fn new(
+        transaction: CircuitTransaction,
+        block_inclusion_proof: BlockInclusionProof,
+        block_header: CircuitBlockHeader,
+        mmr_inclusion_proof: MMRInclusionProof,
+    ) -> Self {
+        SPV {
+            transaction,
+            block_inclusion_proof,
+            block_header,
+            mmr_inclusion_proof,
+        }
+    }
+
+    pub fn verify(&self, mmr_guest: MMRGuest) -> bool {
+        let txid: [u8; 32] = self.transaction.txid();
+        println!("txid: {:?}", txid);
+        let block_merkle_root = self.block_inclusion_proof.get_root(txid);
+        println!("block_merkle_root: {:?}", block_merkle_root);
+        assert_eq!(block_merkle_root, self.block_header.merkle_root);
+        let block_hash = self.block_header.compute_block_hash();
+        mmr_guest.verify_proof(block_hash, &self.mmr_inclusion_proof)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use borsh::BorshDeserialize;
+    use header_chain::{
+        header_chain::CircuitBlockHeader, mmr_guest::MMRGuest, mmr_native::MMRNative,
+    };
+    use hex_literal::hex;
+
+    use crate::{
+        merkle_tree::{verify_merkle_proof, BitcoinMerkleTree, BlockInclusionProof},
+        spv::SPV,
+        transaction::CircuitTransaction,
+    };
+
+    // Mainnet block headers from 0 to 16
+    const MAINNET_BLOCK_HEADERS: [[u8; 80]; 16] = [
+        hex!("0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a29ab5f49ffff001d1dac2b7c"),
+        hex!("010000006fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000982051fd1e4ba744bbbe680e1fee14677ba1a3c3540bf7b1cdb606e857233e0e61bc6649ffff001d01e36299"),
+        hex!("010000004860eb18bf1b1620e37e9490fc8a427514416fd75159ab86688e9a8300000000d5fdcc541e25de1c7a5addedf24858b8bb665c9f36ef744ee42c316022c90f9bb0bc6649ffff001d08d2bd61"),
+        hex!("01000000bddd99ccfda39da1b108ce1a5d70038d0a967bacb68b6b63065f626a0000000044f672226090d85db9a9f2fbfe5f0f9609b387af7be5b7fbb7a1767c831c9e995dbe6649ffff001d05e0ed6d"),
+        hex!("010000004944469562ae1c2c74d9a535e00b6f3e40ffbad4f2fda3895501b582000000007a06ea98cd40ba2e3288262b28638cec5337c1456aaf5eedc8e9e5a20f062bdf8cc16649ffff001d2bfee0a9"),
+        hex!("0100000085144a84488ea88d221c8bd6c059da090e88f8a2c99690ee55dbba4e00000000e11c48fecdd9e72510ca84f023370c9a38bf91ac5cae88019bee94d24528526344c36649ffff001d1d03e477"),
+        hex!("01000000fc33f596f822a0a1951ffdbf2a897b095636ad871707bf5d3162729b00000000379dfb96a5ea8c81700ea4ac6b97ae9a9312b2d4301a29580e924ee6761a2520adc46649ffff001d189c4c97"),
+        hex!("010000008d778fdc15a2d3fb76b7122a3b5582bea4f21f5a0c693537e7a03130000000003f674005103b42f984169c7d008370967e91920a6a5d64fd51282f75bc73a68af1c66649ffff001d39a59c86"),
+        hex!("010000004494c8cf4154bdcc0720cd4a59d9c9b285e4b146d45f061d2b6c967100000000e3855ed886605b6d4a99d5fa2ef2e9b0b164e63df3c4136bebf2d0dac0f1f7a667c86649ffff001d1c4b5666"),
+        hex!("01000000c60ddef1b7618ca2348a46e868afc26e3efc68226c78aa47f8488c4000000000c997a5e56e104102fa209c6a852dd90660a20b2d9c352423edce25857fcd37047fca6649ffff001d28404f53"),
+        hex!("010000000508085c47cc849eb80ea905cc7800a3be674ffc57263cf210c59d8d00000000112ba175a1e04b14ba9e7ea5f76ab640affeef5ec98173ac9799a852fa39add320cd6649ffff001d1e2de565"),
+        hex!("01000000e915d9a478e3adf3186c07c61a22228b10fd87df343c92782ecc052c000000006e06373c80de397406dc3d19c90d71d230058d28293614ea58d6a57f8f5d32f8b8ce6649ffff001d173807f8"),
+        hex!("010000007330d7adf261c69891e6ab08367d957e74d4044bc5d9cd06d656be9700000000b8c8754fabb0ffeb04ca263a1368c39c059ca0d4af3151b876f27e197ebb963bc8d06649ffff001d3f596a0c"),
+        hex!("010000005e2b8043bd9f8db558c284e00ea24f78879736f4acd110258e48c2270000000071b22998921efddf90c75ac3151cacee8f8084d3e9cb64332427ec04c7d562994cd16649ffff001d37d1ae86"),
+        hex!("0100000089304d4ba5542a22fb616d1ca019e94222ee45c1ad95a83120de515c00000000560164b8bad7675061aa0f43ced718884bdd8528cae07f24c58bb69592d8afe185d36649ffff001d29cbad24"),
+        hex!("01000000378a6f6593e2f0251132d96616e837eb6999bca963f6675a0c7af180000000000d080260d107d269ccba9247cfc64c952f1d13514b49e9f1230b3a197a8b7450fa276849ffff001d38d8fb98"),
+    ];
+
+    // Mainnet block transactions from 0 to 16, one for each block.
+    const MAINNET_BLOCK_TRANSACTIONS: [&[u8]; 16] = [
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff4d04ffff001d0104455468652054696d65732030332f4a616e2f32303039204368616e63656c6c6f72206f6e206272696e6b206f66207365636f6e64206261696c6f757420666f722062616e6b73ffffffff0100f2052a01000000434104678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5fac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d0104ffffffff0100f2052a0100000043410496b538e853519c726a2c91e61ec11600ae1390813a627c66fb8be7947be63c52da7589379515d4e0a604f8141781e62294721166bf621e73a82cbf2342c858eeac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d010bffffffff0100f2052a010000004341047211a824f55b505228e4c3d5194c1fcfaa15a456abdf37f9b9d97a4040afc073dee6c89064984f03385237d92167c13e236446b417ab79a0fcae412ae3316b77ac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d010effffffff0100f2052a0100000043410494b9d3e76c5b1629ecf97fff95d7a4bbdac87cc26099ada28066c6ff1eb9191223cd897194a08d0c2726c5747f1db49e8cf90e75dc3e3550ae9b30086f3cd5aaac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d011affffffff0100f2052a01000000434104184f32b212815c6e522e66686324030ff7e5bf08efb21f8b00614fb7690e19131dd31304c54f37baa40db231c918106bb9fd43373e37ae31a0befc6ecaefb867ac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d0120ffffffff0100f2052a0100000043410456579536d150fbce94ee62b47db2ca43af0a730a0467ba55c79e2a7ec9ce4ad297e35cdbb8e42a4643a60eef7c9abee2f5822f86b1da242d9c2301c431facfd8ac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d0123ffffffff0100f2052a0100000043410408ce279174b34c077c7b2043e3f3d45a588b85ef4ca466740f848ead7fb498f0a795c982552fdfa41616a7c0333a269d62108588e260fd5a48ac8e4dbf49e2bcac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d012bffffffff0100f2052a01000000434104a59e64c774923d003fae7491b2a7f75d6b7aa3f35606a8ff1cf06cd3317d16a41aa16928b1df1f631f31f28c7da35d4edad3603adb2338c4d4dd268f31530555ac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d012cffffffff0100f2052a01000000434104cc8d85f5e7933cb18f13b97d165e1189c1fb3e9c98b0dd5446b2a1989883ff9e740a8a75da99cc59a21016caf7a7afd3e4e9e7952983e18d1ff70529d62e0ba1ac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d0134ffffffff0100f2052a0100000043410411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a3ac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d0136ffffffff0100f2052a01000000434104fcc2888ca91cf0103d8c5797c256bf976e81f280205d002d85b9b622ed1a6f820866c7b5fe12285cfa78c035355d752fc94a398b67597dc4fbb5b386816425ddac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d013bffffffff0100f2052a010000004341046cc86ddcd0860b7cef16cbaad7fe31fda1bf073c25cb833fa9e409e7f51e296f39b653a9c8040a2f967319ff37cf14b0991b86173462a2d5907cb6c5648b5b76ac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d010cffffffff0100f2052a0100000043410478ebe2c28660cd2fa1ba17cc04e58d6312679005a7cad1fd56a7b7f4630bd700bcdb84a888a43fe1a2738ea1f3d2301d02faef357e8a5c35a706e4ae0352a6adac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d013cffffffff0100f2052a01000000434104c5a68f5fa2192b215016c5dfb384399a39474165eea22603cd39780e653baad9106e36947a1ba3ad5d3789c5cead18a38a538a7d834a8a2b9f0ea946fb4e6f68ac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d013effffffff0100f2052a010000004341043e8ac6b8ea64e85928b6469f17db0096de0bcae7d09a4497413d9bba49c00ffdf9cb0ce07c404784928b3976f0beea42fe2691a8f0430bcb2b0daaf5aa02b30eac00000000"),
+        &hex!("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d010affffffff0100f2052a01000000434104e0041b4b4d9b6feb7221803a35d997efada6e2b5d24f5fc7205f2ea6b62a1adc9983a7a7dab7e93ea791bed5928e7a32286fa4facadd16313b75b467aea77499ac00000000"),
+    ];
+
+    #[test]
+    fn test_spv() {
+        let mut mmr_native = MMRNative::new();
+        let mut mmr_guest = MMRGuest::new();
+        let block_headers = MAINNET_BLOCK_HEADERS
+            .iter()
+            .map(|header| CircuitBlockHeader::try_from_slice(header).unwrap())
+            .collect::<Vec<CircuitBlockHeader>>();
+        let txs = MAINNET_BLOCK_TRANSACTIONS
+            .iter()
+            .map(|tx| {
+                println!("{:?}", tx);
+                CircuitTransaction(bitcoin::consensus::deserialize(*tx).unwrap())
+            })
+            .collect::<Vec<CircuitTransaction>>();
+        let mut bitcoin_merkle_proofs: Vec<BlockInclusionProof> = vec![];
+        for tx in txs.iter() {
+            let txid = tx.txid();
+            println!("txid: {:?}", txid);
+            let bitcoin_merkle_tree = BitcoinMerkleTree::new(vec![txid]);
+            let bitcoin_merkle_proof = bitcoin_merkle_tree.generate_proof(0);
+            assert!(verify_merkle_proof(
+                txid,
+                &bitcoin_merkle_proof,
+                bitcoin_merkle_tree.root()
+            ));
+            bitcoin_merkle_proofs.push(bitcoin_merkle_proof);
+        }
+        for (i, header) in block_headers.iter().enumerate() {
+            mmr_native.append(header.compute_block_hash());
+            mmr_guest.append(header.compute_block_hash());
+            for j in 0..i {
+                let (mmr_leaf, mmr_proof) = mmr_native.generate_proof(j as u32);
+                assert!(mmr_native.verify_proof(mmr_leaf, &mmr_proof));
+                assert_eq!(mmr_leaf, block_headers[j].compute_block_hash());
+                let spv = SPV::new(
+                    txs[j].clone(),
+                    bitcoin_merkle_proofs[j].clone(),
+                    block_headers[j].clone(),
+                    mmr_proof,
+                );
+                assert!(spv.verify(mmr_guest.clone()));
+            }
+        }
+    }
+}
diff --git a/final-spv/src/transaction.rs b/final-spv/src/transaction.rs
new file mode 100644
index 000000000..c50399d8a
--- /dev/null
+++ b/final-spv/src/transaction.rs
@@ -0,0 +1,273 @@
+/// Code is taken from Citrea
+/// https://github.com/chainwayxyz/citrea/blob/0acb887b1a766fac1a482a68c6d51ecf9661f538/crates/bitcoin-da/src/spec/transaction.rs
+///
+use core::ops::{Deref, DerefMut};
+
+use bitcoin::absolute::LockTime;
+use bitcoin::consensus::Encodable;
+use bitcoin::hashes::Hash;
+use bitcoin::transaction::Version;
+use bitcoin::{Amount, OutPoint, ScriptBuf, Sequence, Transaction, TxIn, TxOut, Witness};
+use borsh::{BorshDeserialize, BorshSerialize};
+
+use crate::utils::calculate_double_sha256;
+
+#[derive(Clone, PartialEq, Eq, Debug, Hash)]
+pub struct CircuitTransaction(pub Transaction);
+
+impl CircuitTransaction {
+    pub fn from(transaction: Transaction) -> Self { Self(transaction) }
+
+    pub fn inner(&self) -> &Transaction { &self.0 }
+
+    /// Returns the transaction id, in big-endian byte order. One must be careful when dealing with
+    /// Bitcoin transaction ids, as they are little-endian in the Bitcoin protocol.
+    pub fn txid(&self) -> [u8; 32] {
+        let mut tx_bytes_vec = vec![];
+        self.inner()
+            .version
+            .consensus_encode(&mut tx_bytes_vec)
+            .unwrap();
+        self.inner()
+            .input
+            .consensus_encode(&mut tx_bytes_vec)
+            .unwrap();
+        self.inner()
+            .output
+            .consensus_encode(&mut tx_bytes_vec)
+            .unwrap();
+        self.inner()
+            .lock_time
+            .consensus_encode(&mut tx_bytes_vec)
+            .unwrap();
+        calculate_double_sha256(&tx_bytes_vec)
+    }
+}
+
+impl BorshSerialize for CircuitTransaction {
+    #[inline]
+    fn serialize<W: borsh::io::Write>(&self, writer: &mut W) -> borsh::io::Result<()> {
+        BorshSerialize::serialize(&self.0.version.0, writer)?;
+        BorshSerialize::serialize(&self.0.lock_time.to_consensus_u32(), writer)?;
+        BorshSerialize::serialize(&self.0.input.len(), writer)?;
+        for input in &self.0.input {
+            serialize_txin(input, writer)?;
+        }
+        BorshSerialize::serialize(&self.0.output.len(), writer)?;
+        for output in &self.0.output {
+            serialize_txout(output, writer)?;
+        }
+        Ok(())
+    }
+}
+
+impl BorshDeserialize for CircuitTransaction {
+    #[inline]
+    fn deserialize_reader<R: borsh::io::Read>(reader: &mut R) -> borsh::io::Result<Self> {
+        let version = Version(i32::deserialize_reader(reader)?);
+        let lock_time = LockTime::from_consensus(u32::deserialize_reader(reader)?);
+        let input_len = usize::deserialize_reader(reader)?;
+        let mut input = Vec::with_capacity(input_len);
+        for _ in 0..input_len {
+            input.push(deserialize_txin(reader)?);
+        }
+        let output_len = usize::deserialize_reader(reader)?;
+        let mut output = Vec::with_capacity(output_len);
+        for _ in 0..output_len {
+            output.push(deserialize_txout(reader)?);
+        }
+
+        let tx = Transaction {
+            version,
+            lock_time,
+            input,
+            output,
+        };
+
+        Ok(Self(tx))
+    }
+}
+
+fn serialize_txin<W: borsh::io::Write>(txin: &TxIn, writer: &mut W) -> borsh::io::Result<()> {
+    BorshSerialize::serialize(&txin.previous_output.txid.to_byte_array(), writer)?;
+    BorshSerialize::serialize(&txin.previous_output.vout, writer)?;
+    BorshSerialize::serialize(&txin.script_sig.as_bytes(), writer)?;
+    BorshSerialize::serialize(&txin.sequence.0, writer)?;
+    BorshSerialize::serialize(&txin.witness.to_vec(), writer)
+}
+
+fn deserialize_txin<R: borsh::io::Read>(reader: &mut R) -> borsh::io::Result<TxIn> {
+    let txid = bitcoin::Txid::from_byte_array(<[u8; 32]>::deserialize_reader(reader)?);
+    let vout = u32::deserialize_reader(reader)?;
+    let script_sig = ScriptBuf::from_bytes(Vec::<u8>::deserialize_reader(reader)?);
+    let sequence = Sequence(u32::deserialize_reader(reader)?);
+    let witness = Witness::from(Vec::<Vec<u8>>::deserialize_reader(reader)?);
+
+    Ok(TxIn {
+        previous_output: OutPoint { txid, vout },
+        script_sig,
+        sequence,
+        witness,
+    })
+}
+
+fn serialize_txout<W: borsh::io::Write>(txout: &TxOut, writer: &mut W) -> borsh::io::Result<()> {
+    BorshSerialize::serialize(&txout.value.to_sat(), writer)?;
+    BorshSerialize::serialize(&txout.script_pubkey.as_bytes(), writer)
+}
+
+fn deserialize_txout<R: borsh::io::Read>(reader: &mut R) -> borsh::io::Result<TxOut> {
+    let value = Amount::from_sat(u64::deserialize_reader(reader)?);
+    let script_pubkey = ScriptBuf::from_bytes(Vec::<u8>::deserialize_reader(reader)?);
+
+    Ok(TxOut {
+        value,
+        script_pubkey,
+    })
+}
+
+impl Deref for CircuitTransaction {
+    type Target = Transaction;
+    fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+impl DerefMut for CircuitTransaction {
+    fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 }
+}
+
+impl From<Transaction> for CircuitTransaction {
+    fn from(tx: Transaction) -> Self { Self(tx) }
+}
+
+impl Into<Transaction> for CircuitTransaction {
+    fn into(self) -> Transaction { self.0 }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_txid_legacy() {
+        let tx = CircuitTransaction(bitcoin::consensus::deserialize(&hex::decode("0100000001c997a5e56e104102fa209c6a852dd90660a20b2d9c352423edce25857fcd3704000000004847304402204e45e16932b8af514961a1d3a1a25fdf3f4f7732e9d624c6c61548ab5fb8cd410220181522ec8eca07de4860a4acdd12909d831cc56cbbac4622082221a8768d1d0901ffffffff0200ca9a3b00000000434104ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84cac00286bee0000000043410411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a3ac00000000").unwrap()).unwrap());
+        let mut txid = tx.txid();
+        txid.reverse();
+        assert_eq!(
+            hex::encode(txid),
+            "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16"
+        );
+    }
+
+    #[test]
+    fn test_txid_segwit() {
+        let tx = CircuitTransaction(bitcoin::consensus::deserialize(&hex::decode("0100000000010142ec43062180882d239799f134f7d8e9d104f37d87643e35fda84c47e4fc67a00000000000ffffffff026734000000000000225120e86c9c8c6777f28af40ef0c4cbd8308d27b60c7adf4f668d2433113616ddaa33cf660000000000001976a9149893ea81967d770f07f9bf0f659e3bce155be99a88ac01418a3d2a2182154dfd083cf48bfcd9f7dfb9d09eb46515e0043cdf39b688e9e711a2ce47f0f535191368be52fd706d77eb82eacd293a6a881491cdadf99b1df4400100000000").unwrap()).unwrap());
+        let mut txid = tx.txid();
+        txid.reverse();
+        assert_eq!(
+            hex::encode(txid),
+            "a6a150fcdbabaf26040f4dea78ff53d794da2807d8600ead4758b065c5339324"
+        );
+    }
+
+    #[test]
+    fn test_from_transaction() {
+        let original_tx = Transaction {
+            version: Version(1),
+            lock_time: LockTime::from_consensus(0),
+            input: vec![],
+            output: vec![],
+        };
+
+        let bridge_tx = CircuitTransaction::from(original_tx.clone());
+        assert_eq!(bridge_tx.inner(), &original_tx);
+
+        let bridge_tx2: CircuitTransaction = original_tx.clone().into();
+        assert_eq!(bridge_tx2.inner(), &original_tx);
+        assert_eq!(bridge_tx.txid(), bridge_tx2.txid());
+        assert_eq!(bridge_tx.txid(), bridge_tx2.txid());
+    }
+
+    #[test]
+    fn test_into_transaction() {
+        let bridge_tx = CircuitTransaction(Transaction {
+            version: Version(1),
+            lock_time: LockTime::from_consensus(0),
+            input: vec![],
+            output: vec![],
+        });
+
+        let original_tx: Transaction = bridge_tx.clone().into();
+        assert_eq!(&original_tx, bridge_tx.inner());
+        assert_eq!(original_tx.compute_txid().to_byte_array(), bridge_tx.txid());
+    }
+
+    #[test]
+    fn test_borsh_serialization() {
+        let original_tx = Transaction {
+            version: Version(1),
+            lock_time: LockTime::from_consensus(0),
+            input: vec![],
+            output: vec![],
+        };
+        let bridge_tx = CircuitTransaction(original_tx);
+
+        // Serialize
+        let serialized = borsh::to_vec(&bridge_tx).unwrap();
+
+        // Deserialize
+        let deserialized: CircuitTransaction = borsh::from_slice(&serialized).unwrap();
+
+        assert_eq!(bridge_tx, deserialized);
+        assert_eq!(bridge_tx.txid(), deserialized.txid());
+    }
+
+    #[test]
+    fn test_deref_traits() {
+        let mut bridge_tx = CircuitTransaction(Transaction {
+            version: Version(1),
+            lock_time: LockTime::from_consensus(0),
+            input: vec![],
+            output: vec![],
+        });
+
+        assert_eq!(bridge_tx.version, Version(1));
+
+        bridge_tx.version = Version(2);
+        assert_eq!(bridge_tx.version, Version(2));
+    }
+
+    #[test]
+    fn test_complex_transaction() {
+        let script_sig = ScriptBuf::from_bytes(vec![0x76, 0xa9, 0x14]);
+        let script_pubkey = ScriptBuf::from_bytes(vec![0x76, 0xa9, 0x14]);
+
+        let tx = Transaction {
+            version: Version(1),
+            lock_time: LockTime::from_consensus(0),
+            input: vec![TxIn {
+                previous_output: OutPoint {
+                    txid: bitcoin::Txid::from_byte_array([0; 32]),
+                    vout: 0,
+                },
+                script_sig: script_sig.clone(),
+                sequence: Sequence(0xffffffff),
+                witness: Witness::new(),
+            }],
+            output: vec![TxOut {
+                value: Amount::from_sat(50000),
+                script_pubkey: script_pubkey.clone(),
+            }],
+        };
+
+        let bridge_tx = CircuitTransaction(tx.clone());
+
+        assert_eq!(bridge_tx.version, tx.version);
+        assert_eq!(bridge_tx.lock_time, tx.lock_time);
+        assert_eq!(bridge_tx.input.len(), 1);
+        assert_eq!(bridge_tx.output.len(), 1);
+        assert_eq!(bridge_tx.input[0].script_sig, script_sig);
+        assert_eq!(bridge_tx.output[0].script_pubkey, script_pubkey);
+        assert_eq!(bridge_tx.output[0].value, Amount::from_sat(50000));
+        assert_eq!(bridge_tx.txid(), tx.compute_txid().to_byte_array());
+    }
+}
diff --git a/final-spv/src/utils.rs b/final-spv/src/utils.rs
new file mode 100644
index 000000000..8a0008dca
--- /dev/null
+++ b/final-spv/src/utils.rs
@@ -0,0 +1,23 @@
+use sha2::{Digest, Sha256};
+
+pub fn calculate_double_sha256(input: &[u8]) -> [u8; 32] {
+    let mut hasher = Sha256::default();
+    hasher.update(input);
+    let result = hasher.finalize_reset();
+    hasher.update(result);
+    hasher.finalize().into()
+}
+
+pub fn calculate_sha256(input: &[u8]) -> [u8; 32] {
+    let mut hasher = Sha256::default();
+    hasher.update(input);
+    hasher.finalize().into()
+}
+
+/// Utility function to hash two nodes together
+pub fn hash_pair(left: [u8; 32], right: [u8; 32]) -> [u8; 32] {
+    let mut hasher = Sha256::default();
+    hasher.update(left);
+    hasher.update(right);
+    hasher.finalize().into()
+}
diff --git a/final-spv/src/zkvm.rs b/final-spv/src/zkvm.rs
new file mode 100644
index 000000000..10c5b0e61
--- /dev/null
+++ b/final-spv/src/zkvm.rs
@@ -0,0 +1,52 @@
+use std::io::Write;
+
+use borsh::BorshDeserialize;
+use risc0_zkvm::guest::env::{self};
+
+pub trait ZkvmGuest {
+    fn read_from_host<T: borsh::BorshDeserialize>(&self) -> T;
+    fn commit<T: borsh::BorshSerialize>(&self, item: &T);
+    fn verify<T: borsh::BorshSerialize>(&self, method_id: [u32; 8], journal: &T);
+}
+
+#[derive(Debug, Clone)]
+pub struct Proof {
+    pub method_id: [u32; 8],
+    pub journal: Vec<u8>,
+}
+
+pub trait ZkvmHost {
+    // Adding data to the host
+    fn write<T: borsh::BorshSerialize>(&self, value: &T);
+
+    fn add_assumption(&self, proof: Proof);
+
+    // Proves with the given data
+    fn prove(&self, elf: &[u32]) -> Proof;
+}
+
+#[derive(Debug, Clone)]
+pub struct Risc0Guest;
+
+impl Risc0Guest {
+    pub fn new() -> Self { Self {} }
+}
+
+impl ZkvmGuest for Risc0Guest {
+    fn read_from_host<T: borsh::BorshDeserialize>(&self) -> T {
+        let mut reader = env::stdin();
+        BorshDeserialize::deserialize_reader(&mut reader)
+            .expect("Failed to deserialize input from host")
+    }
+
+    fn commit<T: borsh::BorshSerialize>(&self, item: &T) {
+        // use risc0_zkvm::guest::env::Write as _;
+        let buf = borsh::to_vec(item).expect("Serialization to vec is infallible");
+        let mut journal = env::journal();
+        journal.write_all(&buf).unwrap();
+    }
+
+    fn verify<T: borsh::BorshSerialize>(&self, method_id: [u32; 8], output: &T) {
+        env::verify(method_id, &borsh::to_vec(output).unwrap()).unwrap();
+    }
+}
diff --git a/fuzz/.gitignore b/fuzz/.gitignore
new file mode 100644
index 000000000..1a45eee77
--- /dev/null
+++ b/fuzz/.gitignore
@@ -0,0 +1,4 @@
+target
+corpus
+artifacts
+coverage
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
new file mode 100644
index 000000000..dbca6bb34
--- /dev/null
+++ b/fuzz/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "bitvm-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+arbitrary = "1.4.1"
+libfuzzer-sys = "0.4"
+bitvm = { path = "../bitvm", features = ["fuzzing"] }
+
+[[bin]]
+name = "blake3"
+path = "fuzz_targets/blake3.rs"
+test = false
+doc = false
+bench = false
diff --git a/fuzz/fuzz_targets/blake3.rs b/fuzz/fuzz_targets/blake3.rs
new file mode 100644
index 000000000..b1309fd98
--- /dev/null
+++ b/fuzz/fuzz_targets/blake3.rs
@@ -0,0 +1,28 @@
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use arbitrary::{Arbitrary, Unstructured, Result};
+
+use bitvm::hash::blake3_u4_compact::test_blake3_compact_givenbyteslice;
+
+/// This struct will hold up to 1024 bytes of fuzz data.
+#[derive(Debug)]
+struct LimitedBytes(Vec<u8>);
+
+impl<'a> Arbitrary<'a> for LimitedBytes {
+    fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
+        // we want to confine length of byte array to 1024
+        let size= u.int_in_range(0..=1024)?;
+        let mut bytes = vec![0u8;size];
+        u.fill_buffer(&mut bytes)?;
+        Ok(LimitedBytes(bytes.to_vec()))
+    }
+}
+
+fuzz_target!(|data: LimitedBytes| {
+    // use full tables
+    test_blake3_compact_givenbyteslice(&data.0, true);
+
+    // use half tables
+    test_blake3_compact_givenbyteslice(&data.0, false);
+});
\ No newline at end of file
diff --git a/goat/Cargo.toml b/goat/Cargo.toml
new file mode 100644
index 000000000..19f29ca71
--- /dev/null
+++ b/goat/Cargo.toml
@@ -0,0 +1,50 @@
+[package]
+name = "goat-bridge"
+version = "0.1.0"
+edition = "2021"
+exclude = ["tests"]
+
+[dependencies]
+bitvm = { path = "../bitvm" }
+bitcoin-script.workspace = true
+bitcoin.workspace = true
+strum.workspace = true
+strum_macros.workspace = true
+hex.workspace = true
+bitcoin-scriptexec.workspace = true
+serde.workspace = true
+num-traits.workspace = true
+sha2.workspace = true
+tokio.workspace = true
+serde_json.workspace = true
+rand.workspace = true
+regex.workspace = true
+musig2.workspace = true
+alloy.workspace = true
+clap.workspace = true
+toml.workspace = true
+colored.workspace = true
+itertools.workspace = true
+serial_test.workspace = true
+ark-bn254.workspace = true
+ark-groth16.workspace = true
+ark-ff.workspace = true
+ark-std.workspace = true
+ark-ec.workspace = true
+ark-crypto-primitives.workspace = true
+ark-serialize.workspace = true
+ark-relations.workspace = true
+secp256k1.workspace = true
+zstd = "0.13.2"
+bitcode = "0.6.3"
+bincode = "1.3.3"
+
+[profile.dev]
+opt-level = 3
+
+[profile.release]
+lto = true
+
+[profile.profiling]
+inherits = "release"
+debug = true
\ No newline at end of file
diff --git a/goat/src/bin/goat-bridge/commands.rs b/goat/src/bin/goat-bridge/commands.rs
new file mode 100644
index 000000000..75738a2b9
--- /dev/null
+++ b/goat/src/bin/goat-bridge/commands.rs
@@ -0,0 +1,89 @@
+use clap::Subcommand;
+
+#[derive(Subcommand)]
+pub(crate) enum Commands {
+    /// -GENERAL----: generate disprove scripts 
+    GenerateDisproveScripts{
+    },
+
+    /// -GENERAL----: generate all necessary bitvm2 transactions (unsigned)
+    GenerateBitvmInstanace {
+    },
+
+    /// -DEPOSITOR--: generate pegin-prepare, pegin-comfirm & pegin-refund txns
+    GeneratePeginTxns {
+        /// (hex String) txid of input utxo
+        // #[arg(long)]
+        fund_txid: String,
+
+        /// (u32) vout of input utxo
+        // #[arg(long)]
+        fund_vout: u32,
+
+        /// (hex String) sequence of input utxo
+        // #[arg(long)]
+        sequence: String, 
+
+        /// (sats)  amount of input utxo
+        // #[arg(long)]
+        amount: u64,
+    },
+
+    /// -FEDERATION-: federation members presign necessary txns, include: pegin_comfirm, take_1, take_2, assert_final, disprove
+    FederationPresign {
+    },
+
+    /// -FEDERATION-: merge n-n mugsig2 signatures
+    MergeSignatures {
+    },
+
+    /// -OPERATOR---: generate pre-kickoff(pegout-confirm) tx
+    GeneratePrekickoffTx {
+        /// (hex String) txid of input utxo
+        // #[arg(long)]
+        fund_txid: String,
+
+        /// (u32) vout of input utxo
+        // #[arg(long)]
+        fund_vout: u32,
+
+        /// (hex String) sequence of input utxo
+        // #[arg(long)]
+        sequence: String, 
+
+        /// (sats)  amount of input utxo
+        // #[arg(long)]
+        amount: u64,
+    },
+
+    /// -OPERATOR---: operator presign necessary txns, include: challenge
+    OperatorPresign {
+    },
+
+    /// -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 
+    SignProof {
+        /// skip verifying the correctness of generated sigs
+        #[arg(long)]
+        skip_validation: bool,
+    },
+
+    /// -CHALLENGER-: check if kickoff-tx is valid
+    ValidateKickoff {
+    },
+
+    /// -CHALLENGER-: check if the groth16-proof(bitcommitments) submitted by operator in assert-tx is valid 
+    ValidateAssert {
+    },
+
+    /// -CHALLENGER-: check if the groth16-proof(bitcommitments) is valid 
+    VerifyProof {
+    }
+}
\ No newline at end of file
diff --git a/goat/src/bin/goat-bridge/config.rs b/goat/src/bin/goat-bridge/config.rs
new file mode 100644
index 000000000..cc6d0b155
--- /dev/null
+++ b/goat/src/bin/goat-bridge/config.rs
@@ -0,0 +1,261 @@
+use serde::Deserialize;
+use bitcoin::Network;
+
+pub const DEFAULT_WOTS_SECRET_FILE: &str = "data/private/wots_sec.json";
+pub const DEFAULT_WOTS_PUBKEY_FILE: &str = "data/public/wots_pub.json";
+
+pub const DEFAULT_VKEY_FILE: &str = "data/public/groth16/vkey.bin";
+pub const DEFAULT_PROOF_FILE: &str = "data/public/groth16/proof.bin";
+pub const DEFAULT_PUBIN_FILE: &str = "data/public/groth16/pubin.bin";
+
+pub const DEFAULT_PARTIAL_SCRIPTS_FILE: &str = "data/public/partial_scripts.json";
+pub const DEFAULT_DISPROVE_SCRIPTS_FILE: &str = "data/public/disprove_scripts.json";
+pub const DEFAULT_SIGNED_ASSERTION_FILE: &str = "data/public/signed_assertions.json";
+
+pub const DFFAULT_DISPROVE_WITNESS_FILE: &str = "data/public/disprove_witness.json";
+
+pub const DEFAULT_TXNS_DIR: &str = "data/public/txns/";
+pub const PEGIN_DEPOSIT_FILE_NAME: &str = "pegin-deposit.json";
+pub const PEGIN_REFUND_FILE_NAME: &str = "pegin-refund.json";
+pub const PEGIN_CONFIRM_FILE_NAME: &str = "pegin-confirm.json";
+pub const PRE_KICKOFF_FILE_NAME: &str = "pre-kickoff.json";
+
+#[derive(Deserialize, Debug)]
+pub struct Config {
+    #[serde(default)] 
+    pub general: GeneralConfig,
+    #[serde(default)] 
+    pub depositor: DepositorConfig,
+    #[serde(default)] 
+    pub operator: OperatorConfig,
+    #[serde(default)] 
+    pub federation: FederationConfig,
+    #[serde(default)] 
+    pub challenger: ChallengerConfig,
+}
+
+#[derive(Deserialize, Debug)]
+pub struct GeneralConfig {    
+    #[serde(default = "default_network")]
+    pub network: String,
+
+    pub federation_pubkeys: Option<Vec<String>>,
+    pub federation_taproot_pubkeys: 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_operator_wots_pubkey_file")]
+    pub operator_wots_pubkey_file: String,
+
+    #[serde(default = "default_vkey_file")]
+    pub vkey_file: String,
+    #[serde(default = "default_proof_file")]
+    pub proof_file: String,
+    #[serde(default = "default_pubin_file")]
+    pub pubin_file: String,
+
+    #[serde(default = "default_partial_scripts_file")]
+    pub partial_scripts_file: String,
+    #[serde(default = "default_disprove_scripts_file")]
+    pub disprove_scripts_file: String,
+    #[serde(default = "default_signed_assertions_file")]
+    pub signed_assertions_file: String,
+}
+
+#[derive(Deserialize, Debug, Default)]
+pub struct DepositorConfig {    
+    pub depositor_evm_address: Option<String>,
+    pub depositor_taproot_public_key: Option<String>,
+    pub depositor_public_key: Option<String>,
+}
+
+#[derive(Deserialize, Debug)]
+pub struct OperatorConfig {   
+    #[serde(default = "default_operator_wots_secret_file")]
+    pub operator_wots_seckey_file: String,
+}
+
+#[derive(Deserialize, Debug, Default)]
+pub struct FederationConfig {    
+}
+
+#[derive(Deserialize, Debug)]
+pub struct ChallengerConfig {   
+    #[serde(default = "default_disprove_witness_file")]
+    pub disprove_witness_file: String, 
+}
+
+pub fn load_config(file: &str) -> Config {
+    let config_str = std::fs::read_to_string(file).expect("fail to read config file");
+    toml::from_str(&config_str).expect("fail to decode toml")
+}
+
+impl Default for GeneralConfig {
+    fn default() -> Self {
+        Self {
+            network: "mainnet".to_string(),
+            federation_pubkeys: None,
+            federation_taproot_pubkeys: None,
+            operator_pubkey: None,
+            operator_taproot_pubkey: None,
+            txns_dir: default_txns_dir(),
+            operator_wots_pubkey_file: default_operator_wots_pubkey_file(),
+            vkey_file: default_vkey_file(),
+            proof_file: default_proof_file(),
+            pubin_file: default_pubin_file(),
+            partial_scripts_file: default_partial_scripts_file(),
+            disprove_scripts_file: default_disprove_scripts_file(),
+            signed_assertions_file: default_signed_assertions_file(),
+        }
+    }
+}
+impl Default for OperatorConfig {
+    fn default() -> Self {
+        Self {
+            operator_wots_seckey_file: default_operator_wots_secret_file(),
+        }
+    }
+}
+impl Default for ChallengerConfig {
+    fn default() -> Self {
+        Self {
+            disprove_witness_file: default_disprove_witness_file(),
+        }
+    }
+}
+
+pub(crate) fn match_network(network: &str) -> Result<Network, String> {
+    match network {
+        "Mainnet" => Ok(Network::Bitcoin),
+        "Bitcoin" => Ok(Network::Bitcoin),
+        "Tesnet" => Ok(Network::Testnet),
+        "Tesnet4" => Ok(Network::Testnet4),
+        "Regtest" => Ok(Network::Regtest),
+        "Signet" => Ok(Network::Signet),
+
+        "mainnet" => Ok(Network::Bitcoin),
+        "bitcoin" => Ok(Network::Bitcoin),
+        "tesnet" => Ok(Network::Testnet),
+        "tesnet4" => Ok(Network::Testnet4),
+        "regtest" => Ok(Network::Regtest),
+        "signet" => Ok(Network::Signet),
+
+        _ => Err("unknow network: {network}, please choose from: Mainnet, Tesnet, Tesnet4, Regtest, Signet".to_string()),
+    }
+}
+fn default_network() -> String {
+    "Mainnet".to_string()
+}
+fn default_txns_dir() -> String {
+    DEFAULT_TXNS_DIR.to_string()
+}
+fn default_operator_wots_secret_file() -> String {
+    DEFAULT_WOTS_SECRET_FILE.to_string()
+}
+fn default_operator_wots_pubkey_file() -> String {
+    DEFAULT_WOTS_PUBKEY_FILE.to_string()
+}
+fn default_vkey_file() -> String {
+    DEFAULT_VKEY_FILE.to_string()
+}
+fn default_proof_file() -> String {
+    DEFAULT_PROOF_FILE.to_string()
+}
+fn default_pubin_file() -> String {
+    DEFAULT_PUBIN_FILE.to_string()
+}
+fn default_partial_scripts_file() -> String {
+    DEFAULT_PARTIAL_SCRIPTS_FILE.to_string()
+}
+fn default_disprove_scripts_file() -> String {
+    DEFAULT_DISPROVE_SCRIPTS_FILE.to_string()
+}
+fn default_signed_assertions_file() -> String {
+    DEFAULT_SIGNED_ASSERTION_FILE.to_string()
+}
+fn default_disprove_witness_file() -> String {
+    DFFAULT_DISPROVE_WITNESS_FILE.to_string()
+}
+
+#[test]
+fn test_load_config() {
+    use bitcoin::{PublicKey, XOnlyPublicKey};
+    use core::str::FromStr;
+    let conf = dbg!(load_config("src/bin/goat-bridge/example.config.toml"));
+
+    let federation_taproot_pubkeys = &conf.general.federation_taproot_pubkeys.expect("federation_taproot_pubkeys is not provided in the configuration file");
+    let federation_taproot_pubkeys = XOnlyPublicKey::from_str(federation_taproot_pubkeys).expect("invalid federation_taproot_pubkeys");
+    
+    let depositor_taproot_public_key = &conf.depositor.depositor_taproot_public_key.expect("depositor_taproot_public_key is not provided in the configuration file");
+    let depositor_taproot_public_key = XOnlyPublicKey::from_str(depositor_taproot_public_key).expect("invalid depositor_taproot_public_key");
+    
+    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 depositor_public_key {str}"))
+        .collect();
+
+    let depositor_public_key = &conf.depositor.depositor_public_key.expect("depositor_public_key is not provided in the configuration file");
+    let depositor_public_key = PublicKey::from_str(depositor_public_key).expect("invalid depositor_public_key");
+    
+    dbg!(federation_taproot_pubkeys);
+    dbg!(depositor_taproot_public_key);
+    dbg!(depositor_public_key);
+    dbg!(federation_pubkeys);
+}
+
+#[test]
+fn test_keys() {
+    use goat_bridge::contexts::{
+        base::generate_keys_from_secret,
+        depositor::DepositorContext,
+        operator::OperatorContext,
+        verifier::VerifierContext,
+    };
+    use bitcoin::PublicKey;
+
+    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 DEPOSITOR_EVM_ADDRESS: &str = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"; 
+
+    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);
+    let mut n_of_n_public_keys: Vec<PublicKey> = Vec::new();
+    n_of_n_public_keys.push(verifier_0_public_key);
+    n_of_n_public_keys.push(verifier_1_public_key);
+
+    let depositor_context =
+        DepositorContext::new(source_network, DEPOSITOR_SECRET, &n_of_n_public_keys);
+    let operator_context =
+        OperatorContext::new(source_network, OPERATOR_SECRET, &n_of_n_public_keys);
+    let verifier_0_context =
+        VerifierContext::new(source_network, VERIFIER_0_SECRET, &n_of_n_public_keys);
+    let verifier_1_context =
+        VerifierContext::new(source_network, VERIFIER_1_SECRET, &n_of_n_public_keys);
+
+    dbg!(depositor_context.depositor_taproot_public_key.to_string());
+    dbg!(depositor_context.depositor_public_key.to_string());
+
+    dbg!(operator_context.operator_taproot_public_key.to_string());
+    dbg!(operator_context.operator_public_key.to_string());
+
+    dbg!(verifier_0_context.n_of_n_taproot_public_key.to_string());
+    dbg!(verifier_0_context.n_of_n_public_key.to_string());
+
+    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!(depositor_context);
+    // dbg!(operator_context);
+    // dbg!(verifier_0_context);
+    // dbg!(verifier_1_context);
+
+}
+
+
diff --git a/goat/src/bin/goat-bridge/example.config.toml b/goat/src/bin/goat-bridge/example.config.toml
new file mode 100644
index 000000000..5f68ad8cb
--- /dev/null
+++ b/goat/src/bin/goat-bridge/example.config.toml
@@ -0,0 +1,24 @@
+[general]
+network = "Regtest"
+federation_pubkeys = [
+    "026cc14f56ad7e8fdb323378287895c6c0bcdbb37714c74fba175a0c5f0cd0d56f",
+    "02452556ed6dbac394cbb7441fbaf06c446d1321467fa5a138895c6c9e246793dd",
+]
+federation_taproot_pubkeys = "8b839569cde368894237913fe4fbd25d75eaf1ed019a39d479e693dac35be19e"
+operator_pubkey = "03484db4a2950d63da8455a1b705b39715e4075dd33511d0c7e3ce308c93449deb"
+operator_taproot_pubkey = "484db4a2950d63da8455a1b705b39715e4075dd33511d0c7e3ce308c93449deb"
+operator_wots_pubkey_file = "data/public/wots_pub.json"
+vkey_file = "data/public/groth16/vkey.bin"
+proof_file = "data/public/groth16/proof.bin"
+pubin_file = "data/public/groth16/pubin.bin"
+partial_scripts_file = "data/public/partial_scripts.json"
+disprove_scripts_file = "data/public/disprove_scripts.json"
+signed_assertions_file = "data/public/signed_assertions.json"
+
+[operator]
+operator_wots_seckey_file = "data/private/wots_sec.json"
+
+[depositor]
+depositor_evm_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
+depositor_taproot_public_key = "edf074e2780407ed6ff9e291b8617ee4b4b8d7623e85b58318666f33a422301b"
+depositor_public_key = "02edf074e2780407ed6ff9e291b8617ee4b4b8d7623e85b58318666f33a422301b"
diff --git a/goat/src/bin/goat-bridge/files.rs b/goat/src/bin/goat-bridge/files.rs
new file mode 100644
index 000000000..b74406c16
--- /dev/null
+++ b/goat/src/bin/goat-bridge/files.rs
@@ -0,0 +1,315 @@
+use bitvm::treepp::*;
+use bitvm::chunk::api::{Signatures as Groth16WotsSignatures, PublicKeys as Groth16WotsPublicKeys, NUM_PUBS, NUM_U160, NUM_U256};
+use bitvm::signatures::wots_api::{wots256, wots160};
+use bitvm::signatures::signing_winternitz::{WinternitzPublicKey, WinternitzSecret};
+use ark_bn254::Bn254;
+use bitcoin::ScriptBuf;
+use goat_bridge::proof::{deserialize_proof, deserialize_vk, deserialize_pubin};
+use goat_bridge::commitments::NUM_KICKOFF;
+use std::collections::HashMap;
+use std::io::{Write, BufReader};
+use std::fs::{File, self};
+use std::path::Path;
+
+const NUM_SIGS: usize = NUM_PUBS + NUM_U160 + NUM_U256;
+pub type KickoffWotsSecretKeys = [WinternitzSecret; NUM_KICKOFF];
+pub type Groth16WotsSecretKeys = [String; NUM_SIGS];
+pub type WotsSecretKeys = (
+    KickoffWotsSecretKeys,
+    Groth16WotsSecretKeys,
+);
+
+pub type KickoffWotsPublicKeys = [WinternitzPublicKey; NUM_KICKOFF];
+pub type WotsPublicKeys = (
+    KickoffWotsPublicKeys,
+    Groth16WotsPublicKeys,
+);
+
+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 {
+        let mut v: Vec<Vec<u8>> = Vec::new();
+        for (s, d) in ss {
+            v.push(s.to_vec());
+            v.push(vec![d]);
+        }
+        sigs_map.insert(index, v);
+        index += 1;
+    }
+    for ss in *sigs.1 {
+        let mut v: Vec<Vec<u8>> = Vec::new();
+        for (s, d) in ss {
+            v.push(s.to_vec());
+            v.push(vec![d]);
+        }
+        sigs_map.insert(index, v);
+        index += 1;
+    }
+    for ss in *sigs.2 {
+        let mut v: Vec<Vec<u8>> = Vec::new();
+        for (s, d) in ss {
+            v.push(s.to_vec());
+            v.push(vec![d]);
+        }
+        sigs_map.insert(index, v);
+        index += 1;
+    }
+    write_map_to_file(&sigs_map, file);
+}
+pub fn load_signed_assertions_from_file(file: &str) -> Groth16WotsSignatures {
+    let sigs_map = read_map_from_file(file).expect(&format!("fail to open {:?}", file));
+    const W256_LEN: u32 = wots256::N_DIGITS * 2;
+    const W160_LEN: u32 = wots160::N_DIGITS * 2;
+
+    let mut psig = vec![];
+    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");
+        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]));
+        }
+        let sig: wots256::Signature = res.try_into().unwrap();
+        psig.push(sig);
+    }
+    let psig: [wots256::Signature; NUM_PUBS] = psig.try_into().unwrap();
+
+    let mut fsig = vec![];
+    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");
+        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]));
+        }
+        let sig: wots256::Signature = res.try_into().unwrap();
+        fsig.push(sig);
+    }
+    let fsig: [wots256::Signature; NUM_U256] = fsig.try_into().unwrap();
+
+    let mut hsig = vec![];
+    let (min, max) = (max, max + NUM_U160);
+    for i in min..max {
+        let v = sigs_map.get(&(i as u32)).unwrap();
+        assert!(v.len() == W160_LEN as usize, "Invalid wots siganture length");
+        let mut res: Vec<([u8; 20], u8)> = Vec::new();
+        let sig_len = W160_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]));
+        }
+        let sig: wots160::Signature = res.try_into().unwrap();
+        hsig.push(sig);
+    }
+    let hsig: [wots160::Signature; NUM_U160] = hsig.try_into().unwrap();
+
+    let res = (Box::new(psig), Box::new(fsig), Box::new(hsig));
+    res
+}
+
+pub fn load_groth16_vk(file: &str) -> ark_groth16::VerifyingKey<Bn254> {
+    let vk_bin = fs::read(file).expect(&format!("fail to open {:?}", file));
+    deserialize_vk(vk_bin)
+}
+pub fn load_groth16_proof(file: &str) -> ark_groth16::Proof<Bn254> {
+    let proof_bin = fs::read(file).expect(&format!("fail to open {:?}", file));
+    deserialize_proof(proof_bin)
+}
+pub fn load_groth16_pubin(file: &str) -> Vec<ark_bn254::Fr> {
+    let pubin_bin = fs::read(file).expect(&format!("fail to open {:?}", file));
+    deserialize_pubin(pubin_bin)
+}
+
+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();  
+}
+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();
+    (
+        seckeys_vec.0.try_into().unwrap_or_else(|_e| panic!("kickoff bitcom keys number not match")),
+        seckeys_vec.1.try_into().unwrap(),
+    )
+}
+
+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 {
+        let mut v: Vec<Vec<u8>> = Vec::new();
+        for d in pk {
+            v.push(d.to_vec());
+        }
+        pubkeys_map.insert(index, v);
+        index += 1;
+    }
+    for pk in pubkeys.1.1 {
+        let mut v: Vec<Vec<u8>> = Vec::new();
+        for d in pk {
+            v.push(d.to_vec());
+        }
+        pubkeys_map.insert(index, v);
+        index += 1;
+    }
+    for pk in pubkeys.1.2 {
+        let mut v: Vec<Vec<u8>> = Vec::new();
+        for d in pk {
+            v.push(d.to_vec());
+        }
+        pubkeys_map.insert(index, v);
+        index += 1;
+    }
+
+    // wots pk for kickoff bitcommitment
+    let mut v_kickoff: Vec<Vec<u8>> = Vec::new();
+    for pk in pubkeys.0 {
+        let pk_vec = serde_json::to_vec(&pk).unwrap();
+        v_kickoff.push(pk_vec);
+    }
+    pubkeys_map.insert(index, v_kickoff);
+    // index += 1;
+
+    write_map_to_file(&pubkeys_map, file);
+}
+pub fn load_wots_pubkeys(file: &str) -> WotsPublicKeys {
+    let pubkeys_map = read_map_from_file(file).expect(&format!("fail to open {:?}", file));
+    const W256_LEN: u32 = wots256::N_DIGITS;
+    const W160_LEN: u32 = wots160::N_DIGITS;
+
+    let mut pk0 = vec![];
+    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");
+        let mut res: Vec<[u8; 20]> = Vec::new();
+        for i in 0..W256_LEN {
+            res.push(v[i as usize].clone().try_into().unwrap());
+        }
+        let sig: wots256::PublicKey = res.try_into().unwrap();
+        pk0.push(sig);
+    }
+    let pk0: [wots256::PublicKey; NUM_PUBS] = pk0.try_into().unwrap();
+
+    let mut pk1 = vec![];
+    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");
+        let mut res: Vec<[u8; 20]> = Vec::new();
+        for i in 0..W256_LEN {
+            res.push(v[i as usize].clone().try_into().unwrap());
+        }
+        let sig: wots256::PublicKey = res.try_into().unwrap();
+        pk1.push(sig);
+    }
+    let pk1: [wots256::PublicKey; NUM_U256] = pk1.try_into().unwrap();
+
+    let mut pk2 = vec![];
+    let (min, max) = (max, max + NUM_U160);
+    for i in min..max {
+        let v = pubkeys_map.get(&(i as u32)).unwrap();
+        assert!(v.len() == W160_LEN as usize, "Invalid wots public-key length");
+        let mut res: Vec<[u8; 20]> = Vec::new();
+        for i in 0..W160_LEN {
+            res.push(v[i as usize].clone().try_into().unwrap());
+        }
+        let sig: wots160::PublicKey = res.try_into().unwrap();
+        pk2.push(sig);
+    }
+    let pk2: [wots160::PublicKey; NUM_U160] = pk2.try_into().unwrap();
+
+    let mut pk_kickoff: Vec<WinternitzPublicKey> = vec![];
+    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");
+        for i in 0..NUM_KICKOFF {
+            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 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 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 file = File::open(file).expect(&format!("fail to open {:?}", file));
+    let reader = BufReader::new(file);
+    let scripts_bytes: Vec<Vec<u8>> = serde_json::from_reader(reader).unwrap();
+    scripts_bytes.into_iter()
+        .map(|x| {
+            let sc = script! {};
+            let bf = ScriptBuf::from_bytes(x);
+            let sc = sc.push_script(bf);
+            sc
+        }).collect()
+}
+
+pub fn write_disprove_witness(file: &str, index: usize, witness: Script) {
+    create_necessary_dir(file);
+    let witness_bytes = witness.compile().to_bytes();
+    let json = serde_json::to_vec_pretty(&(index, witness_bytes)).unwrap();
+    let mut file = File::create(file).unwrap();
+    file.write_all(&json).unwrap();
+}
+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 sc = script! {};
+    let bf = ScriptBuf::from_bytes(witness_bytes);
+    let sc = sc.push_script(bf);
+    (index, sc)
+}
+
+pub(crate) fn file_exists(file: &str) -> bool {
+    Path::new(file).exists()
+}
+
+pub(crate) fn create_necessary_dir(path: &str) {
+    if let Some(parent) = Path::new(path).parent() {
+        fs::create_dir_all(parent).unwrap(); 
+    };
+}
+
+fn write_map_to_file(map: &HashMap<u32, Vec<Vec<u8>>>, file: &str) {
+    create_necessary_dir(file);
+    let json = serde_json::to_vec_pretty(map).unwrap();
+    let mut file = File::create(file).unwrap();
+    file.write_all(&json).unwrap();
+}
+fn read_map_from_file(file: &str) -> Result<HashMap<u32, Vec<Vec<u8>>>, String> {
+    let file = File::open(file).expect(&format!("fail to open {:?}", file));
+    let reader = BufReader::new(file);
+    let map = serde_json::from_reader(reader).unwrap();
+    Ok(map)
+}
diff --git a/goat/src/bin/goat-bridge/handles.rs b/goat/src/bin/goat-bridge/handles.rs
new file mode 100644
index 000000000..47ed75215
--- /dev/null
+++ b/goat/src/bin/goat-bridge/handles.rs
@@ -0,0 +1,379 @@
+use crate::config::{
+    match_network, Config, PEGIN_DEPOSIT_FILE_NAME, 
+    PEGIN_REFUND_FILE_NAME, PEGIN_CONFIRM_FILE_NAME,
+    PRE_KICKOFF_FILE_NAME,
+};
+use crate::files::{
+    file_exists, load_groth16_proof, load_groth16_pubin, 
+    load_groth16_vk, load_scripts_from_file, load_signed_assertions_from_file, 
+    load_wots_pubkeys, load_wots_seckeys, write_disprove_witness, 
+    write_scripts_to_file, write_signed_assertions_to_file, 
+    write_wots_pubkeys, write_wots_seckeys, create_necessary_dir,
+};
+use crate::files::{WotsSecretKeys, WotsPublicKeys};
+use bitvm::chunk::api::{
+    api_generate_full_tapscripts, api_generate_partial_script, 
+    generate_signatures, generate_signatures_lit, validate_assertions, 
+    NUM_PUBS, NUM_U160, NUM_U256, PublicKeys as Groth16WotsPublicKeys,
+};
+use bitvm::signatures::{
+    wots_api::{wots256, wots160},
+    signing_winternitz::{WinternitzPublicKey, WinternitzSecret, LOG_D},
+    winternitz::Parameters,
+};
+use goat_bridge::commitments::{NUM_KICKOFF, KICKOFF_MSG_SIZE, CommitmentMessageId};
+use goat_bridge::transactions::{
+    base::{Input, BaseTransaction}, 
+    peg_in::{
+        peg_in_deposit::PegInDepositTransactionGeneral,
+        peg_in_refund::PegInRefundTransaction,
+        peg_in_confirm::PegInConfirmTransaction,
+    },
+    peg_out_confirm::PreKickoffTransaction,
+};
+use goat_bridge::connectors::{
+    connector_0::Connector0,
+    connector_6::Connector6,
+    connector_z::ConnectorZ,
+};
+use std::fs::File;
+use std::io::{Write, BufReader};
+use sha2::{Sha256, Digest};
+use bitcoin::{Amount, OutPoint, PublicKey, Sequence, XOnlyPublicKey};
+use core::str::FromStr;
+
+pub(crate) fn handle_generate_disprove_scripts(conf: Config) {
+    println!("\nloading vkey ...");
+    assert!(file_exists(&conf.general.vkey_file), "vkey is not provided");
+    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");
+    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);
+        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);
+        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);
+} 
+
+pub(crate) fn handle_generate_wots_keys(conf: Config, seed: &str) {
+    let secrets = seed_to_secrets(seed);
+    let pubkeys = secrets_to_pubkeys(&secrets);
+    write_wots_seckeys(&conf.operator.operator_wots_seckey_file, secrets);
+    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,
+    )
+}
+
+pub(crate) fn handle_sign_proof(conf: Config, skip_validation: bool) {
+    println!("\nloading vkey ...");
+    assert!(file_exists(&conf.general.vkey_file), "vkey not provided");
+    let ark_vkey = load_groth16_vk(&conf.general.vkey_file);
+
+    println!("\nloading groth16 proof ...");
+    assert!(file_exists(&conf.general.vkey_file), "proof not provided");
+    let ark_proof = load_groth16_proof(&conf.general.proof_file);
+
+    println!("\nloading public-inputs ...");
+    assert!(file_exists(&conf.general.vkey_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.general.vkey_file), "public-inputs not provided");
+    let wots_sec = load_wots_seckeys(&conf.operator.operator_wots_seckey_file);
+
+    let proof_sigs = if skip_validation {
+        generate_signatures_lit(ark_proof, ark_pubin, &ark_vkey, wots_sec.1.to_vec()).unwrap()
+    } else {
+        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);
+}   
+
+pub(crate) fn handle_verify_proof(conf: Config) {
+    println!("\nloading vkey ...");
+    assert!(file_exists(&conf.general.vkey_file), "vkey not provided");
+    let ark_vkey = load_groth16_vk(&conf.general.vkey_file);
+
+    println!("\nloading proof signatures ...");
+    assert!(file_exists(&conf.general.vkey_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");
+    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();
+
+    let res = validate_assertions(&ark_vkey, proof_sigs, pubkey.1, &disprove_scripts);
+    match res {
+        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 Ok.");
+        }
+    };
+}
+
+pub(crate) fn handle_generate_pegin_txns(conf: Config, input_oupoint: OutPoint, input_sequence: Sequence, amount: Amount) {
+    println!("\nloading config...");
+    let network = match_network(&conf.general.network).unwrap();
+
+    let federation_taproot_pubkeys = &conf.general.federation_taproot_pubkeys.expect("federation_taproot_pubkeys is not provided in the configuration file");
+    let federation_taproot_pubkeys = XOnlyPublicKey::from_str(federation_taproot_pubkeys).expect("invalid federation_taproot_pubkeys");
+    
+    let depositor_taproot_public_key = &conf.depositor.depositor_taproot_public_key.expect("depositor_taproot_public_key is not provided in the configuration file");
+    let depositor_taproot_public_key = XOnlyPublicKey::from_str(depositor_taproot_public_key).expect("invalid depositor_taproot_public_key");
+    
+    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 depositor_public_key {str}"))
+        .collect();
+
+    let depositor_public_key = &conf.depositor.depositor_public_key.expect("depositor_public_key is not provided in the configuration file");
+    let depositor_public_key = PublicKey::from_str(depositor_public_key).expect("invalid depositor_public_key");
+    
+    let connector_z = ConnectorZ::new(
+        network,
+        &conf.depositor.depositor_evm_address.expect("depositor_evm_address is not provided in the configuration file"),
+        &depositor_taproot_public_key,
+        &federation_taproot_pubkeys,
+    );
+    let connector_0 = Connector0::new(
+        network,
+        &federation_taproot_pubkeys,
+    );
+
+    // pegin deposit
+    let fund_input = Input {
+        outpoint: input_oupoint,
+        amount,
+    };
+    let pegin_deposit_tx = PegInDepositTransactionGeneral::new_unsigned(
+        &connector_z, 
+        fund_input,
+        input_sequence,
+    );
+    let pegin_deposit_txid = pegin_deposit_tx.finalize().compute_txid();
+
+    // pegin refund
+    let refund_output_index = 0;
+    let refund_input = Input {
+        outpoint: OutPoint {
+            txid: pegin_deposit_txid,
+            vout: refund_output_index,
+        },
+        amount: pegin_deposit_tx.finalize().output[refund_output_index as usize].value,
+    };
+    let pegin_refund_tx = PegInRefundTransaction::new_for_validation(
+        network, 
+        &depositor_public_key, 
+        &connector_z, 
+        refund_input,
+    );
+
+    // pegin confirm
+    let confirm_output_index = 0;
+    let confirm_input = Input {
+        outpoint: OutPoint {
+            txid: pegin_deposit_txid,
+            vout: confirm_output_index,
+        },
+        amount: pegin_deposit_tx.finalize().output[confirm_output_index as usize].value,
+    };
+    let pegin_confirm_tx = PegInConfirmTransaction::new_for_validation(
+        &connector_0, 
+        &connector_z, 
+        confirm_input, 
+        federation_pubkeys,
+    );
+
+    let pegin_deposit_tx_bytes = serde_json::to_vec_pretty(&pegin_deposit_tx).unwrap();
+    let pegin_deposit_tx_file = format!("{}{}", &conf.general.txns_dir, PEGIN_DEPOSIT_FILE_NAME);
+    create_necessary_dir(&pegin_deposit_tx_file);
+    let mut file = File::create(pegin_deposit_tx_file.clone()).unwrap();
+    file.write_all(&pegin_deposit_tx_bytes).unwrap();
+
+    let pegin_refund_tx_bytes = serde_json::to_vec_pretty(&pegin_refund_tx).unwrap();
+    let pegin_refund_tx_file = format!("{}{}", &conf.general.txns_dir, PEGIN_REFUND_FILE_NAME);
+    let mut file = File::create(pegin_refund_tx_file.clone()).unwrap();
+    file.write_all(&pegin_refund_tx_bytes).unwrap();
+
+    let pegin_confirm_tx_bytes = serde_json::to_vec_pretty(&pegin_confirm_tx).unwrap();
+    let pegin_confirm_tx_file = format!("{}{}", &conf.general.txns_dir, PEGIN_CONFIRM_FILE_NAME);
+    let mut file = File::create(pegin_confirm_tx_file.clone()).unwrap();
+    file.write_all(&pegin_confirm_tx_bytes).unwrap();
+
+    println!(
+        "pegin_deposit_tx was written to {}\npegin_refund_tx written to {}\npegin_confirm_tx written to {}",
+        pegin_deposit_tx_file, pegin_refund_tx_file, pegin_confirm_tx_file,
+    )
+}
+
+pub(crate) fn handle_generate_prekickoff_tx(conf: Config, input_oupoint: OutPoint, input_sequence: Sequence, amount: Amount) {
+    println!("\nloading config...");
+    let network = match_network(&conf.general.network).unwrap();
+
+    let operator_taproot_pubkey = &conf.general.operator_taproot_pubkey.expect("operator_taproot_pubkey is not provided in the configuration file");
+    let operator_taproot_pubkey = XOnlyPublicKey::from_str(operator_taproot_pubkey).expect("invalid operator_taproot_pubkey");
+
+    println!("\nloading operator wots public-key...");
+    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 connector_6 = Connector6::new(
+        network, 
+        &operator_taproot_pubkey, 
+        &kickoff_wots_commitment_keys
+    );
+
+    let fund_input = Input {
+        outpoint: input_oupoint,
+        amount,
+    };
+    let prekickoff_tx = PreKickoffTransaction::new_unsigned(
+        &connector_6, 
+        fund_input,
+        input_sequence,
+    );
+
+    let prekickoff_tx_bytes = serde_json::to_vec_pretty(&prekickoff_tx).unwrap();
+    let prekickoff_tx_file = format!("{}{}", &conf.general.txns_dir, PRE_KICKOFF_FILE_NAME);
+    create_necessary_dir(&prekickoff_tx_file);
+    let mut file = File::create(prekickoff_tx_file.clone()).unwrap();
+    file.write_all(&prekickoff_tx_bytes).unwrap();
+
+    println!("\npre_kickoff_tx was written to {}", prekickoff_tx_file)
+}
+
+pub(crate) fn handle_generate_bitvm_instance(conf: Config) {
+    println!("\nloading config...");
+    let network = match_network(&conf.general.network).unwrap();
+
+    let federation_taproot_pubkeys = &conf.general.federation_taproot_pubkeys.expect("federation_taproot_pubkeys is not provided in the configuration file");
+    let federation_taproot_pubkeys = XOnlyPublicKey::from_str(federation_taproot_pubkeys).expect("invalid federation_taproot_pubkeys");
+        
+    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 depositor_public_key {str}"))
+        .collect();
+
+    let operator_taproot_pubkey = &conf.general.operator_taproot_pubkey.expect("operator_taproot_pubkey is not provided in the configuration file");
+    let operator_taproot_pubkey = XOnlyPublicKey::from_str(operator_taproot_pubkey).expect("invalid operator_taproot_pubkey");
+
+    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");
+    
+    println!("\nloading pegin-confirm-tx...");
+    let pegin_confirm_file = format!("{}{}", &conf.general.txns_dir, PEGIN_CONFIRM_FILE_NAME);
+    assert!(file_exists(&pegin_confirm_file), "pegin-confirm tx not provided");
+    let file = File::open(pegin_confirm_file.clone()).expect(&format!("fail to open {:?}", pegin_confirm_file));
+    let reader = BufReader::new(file);
+    let pegin_confirm_tx: PegInConfirmTransaction = serde_json::from_reader(reader).unwrap();
+
+    println!("\nloading 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));
+    let reader = BufReader::new(file);
+    let pre_kickoff_tx: PreKickoffTransaction = serde_json::from_reader(reader).unwrap();
+
+    println!("\nloading operator wots public-keys...");
+    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);
+
+    println!("\nloading disprove scripts...");
+    assert!(file_exists(&conf.general.disprove_scripts_file), "disprove scripts not provided");
+    // let disprove_scripts = load_scripts_from_file(&conf.general.disprove_scripts_file).try_into().unwrap();
+
+    // kickoff
+    
+
+
+}
+
+pub(crate) fn secrets_to_pubkeys(secrets: &WotsSecretKeys) -> WotsPublicKeys {
+    let mut pubins = vec![];
+    for i in 0..NUM_PUBS {
+        pubins.push(wots256::generate_public_key(&secrets.1[i]));
+    }
+    let mut fq_arr = vec![];
+    for i in 0..NUM_U256 {
+        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_U160 {
+        let p160 = wots160::generate_public_key(&secrets.1[i+NUM_PUBS+NUM_U256]);
+        h_arr.push(p160);
+    }
+    let g16_wotspubkey: Groth16WotsPublicKeys = (
+        pubins.try_into().unwrap(),
+        fq_arr.try_into().unwrap(),
+        h_arr.try_into().unwrap(),
+    );
+
+    let mut kickoff_wotspubkey = vec![];
+    for i in 0..NUM_KICKOFF {
+        kickoff_wotspubkey.push(WinternitzPublicKey::from(&secrets.0[i]));
+    }
+
+    (
+        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_U160)
+        .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();
+    
+    let kickoff_wotsseckey = (0..NUM_KICKOFF)
+        .map(|idx| {
+            let sec_i = sha256_with_id(&seed_hash, 0);
+            let sec_i = sha256_with_id(&sec_i, idx);
+            let sec_str = format!("{sec_i}{:04x}{:04x}", 0, idx);
+            let parameters = Parameters::new_by_bit_length(KICKOFF_MSG_SIZE[idx] as u32 * 8, LOG_D);
+            WinternitzSecret::from_string(&sec_str, &parameters)
+        })
+        .collect::<Vec<WinternitzSecret>>()
+        .try_into().unwrap_or_else(|_e| panic!("kickoff bitcom key number not match"));
+    (kickoff_wotsseckey, g16_wotsseckey)
+}
+fn sha256(input: &str) -> String {
+    let mut hasher = Sha256::new();
+    hasher.update(input);
+    format!("{:x}", hasher.finalize())
+}
+fn sha256_with_id(input: &str, idx: usize) -> String {
+    let mut hasher = Sha256::new();
+    hasher.update(input);
+    sha256(&format!("{:x}{:04x}", hasher.finalize(), idx))
+}
+
diff --git a/goat/src/bin/goat-bridge/main.rs b/goat/src/bin/goat-bridge/main.rs
new file mode 100644
index 000000000..a1e00265a
--- /dev/null
+++ b/goat/src/bin/goat-bridge/main.rs
@@ -0,0 +1,88 @@
+pub mod commands;
+pub mod config;
+pub mod files;
+pub mod handles;
+
+use core::str::FromStr;
+use bitcoin::{OutPoint, Txid, Amount, Sequence};
+use clap::{arg, command, Parser};
+use commands::Commands;
+use config::load_config;
+use handles::{
+    handle_generate_disprove_scripts, handle_generate_wots_keys,
+    handle_sign_proof, handle_verify_proof, handle_generate_pegin_txns,
+    handle_generate_prekickoff_tx,
+};
+
+#[derive(Parser)]
+#[command(about = "goat bitvm cli-tools", long_about = None)]
+struct Cli {
+    /// config file path
+    #[arg(short = 'c', long = "conf")]
+    config_file: String,
+
+    #[command(subcommand)]
+    command: Commands,
+}
+
+#[tokio::main]
+async fn main() {
+    let cli = Cli::parse();
+
+    match &cli.command {
+        Commands::GenerateDisproveScripts{} => { 
+            let conf = load_config(&cli.config_file);
+            handle_generate_disprove_scripts(conf);
+        },
+        Commands::GenerateWotsKeys {secret_seed} => {
+            let conf = load_config(&cli.config_file);
+            handle_generate_wots_keys(conf, secret_seed);
+        },
+        Commands::SignProof {skip_validation} => {
+            let conf = load_config(&cli.config_file);
+            handle_sign_proof(conf, *skip_validation);
+        },
+        Commands::VerifyProof{} => {
+            let conf = load_config(&cli.config_file);
+            handle_verify_proof(conf);
+        },
+        Commands::GeneratePeginTxns {fund_txid, fund_vout, sequence, amount} => {
+            let conf = load_config(&cli.config_file);
+            let fund_outpoint = OutPoint {
+                txid: Txid::from_str(fund_txid).expect("fail to decode txid"),
+                vout: *fund_vout,
+            };
+            let sequence = Sequence::from_hex(sequence).unwrap();
+            let amount = Amount::from_sat(*amount);
+            handle_generate_pegin_txns(conf, fund_outpoint, sequence, amount);
+        },
+        Commands::GeneratePrekickoffTx {fund_txid, fund_vout, sequence, amount} => {
+            let conf = load_config(&cli.config_file);
+            let fund_outpoint = OutPoint {
+                txid: Txid::from_str(fund_txid).expect("fail to decode txid"),
+                vout: *fund_vout,
+            };
+            let sequence = Sequence::from_hex(sequence).unwrap();
+            let amount = Amount::from_sat(*amount);
+            handle_generate_prekickoff_tx(conf, fund_outpoint, sequence, amount);
+        },
+        Commands::GenerateBitvmInstanace {} => {
+            let conf = load_config(&cli.config_file);
+
+        },
+        _ => {}
+    }
+}
+
+#[test]
+fn generate_test_pegin_input_data() {
+    use bitcoin::{Network, PublicKey, Sequence};
+
+    let txid = Txid::from_str("180eb81bb6273fda422e4b3410341da2fde71c2a1b20fb8c8b6256a5064ff1ac").unwrap();
+    let vout: u32 = 0;
+    let network = Network::Regtest;
+    let sequence = Sequence(0xFFFFFFFF);
+    let amount = Amount::from_sat(1000000);
+}
+
+
diff --git a/goat/src/commitments.rs b/goat/src/commitments.rs
new file mode 100644
index 000000000..187bd8ec1
--- /dev/null
+++ b/goat/src/commitments.rs
@@ -0,0 +1,148 @@
+use std::collections::HashMap;
+
+use serde::{Deserialize, Serialize};
+use strum::{Display, EnumIter, IntoEnumIterator};
+
+use bitvm::{
+    chunk::api::{
+        PublicKeys as ApiPublicKeys, NUM_PUBS, NUM_U160, NUM_U256
+    }, 
+    signatures::{signing_winternitz::{WinternitzPublicKey, WinternitzSecret, LOG_D}, winternitz::Parameters}
+};
+
+use super::constants::EVM_TXID_LENGTH;
+
+pub const NUM_KICKOFF: usize = 1;
+pub const KICKOFF_MSG_SIZE: [usize; NUM_KICKOFF] = [EVM_TXID_LENGTH];
+
+#[derive(
+    Serialize, Deserialize, Eq, PartialEq, Hash, Clone, PartialOrd, Ord, Display, Debug, EnumIter,
+)]
+#[serde(into = "String", try_from = "String")]
+pub enum CommitmentMessageId {
+    EvmWithdrawTxid,
+    // name of intermediate value and length of message
+    Groth16IntermediateValues((String, usize)),
+}
+
+const VAL_SEPARATOR: char = '|';
+
+impl From<CommitmentMessageId> for String {
+    fn from(id: CommitmentMessageId) -> String {
+        match id {
+            CommitmentMessageId::Groth16IntermediateValues((variable_name, size)) => {
+                format!(
+                    "Groth16IntermediateValues{}{}{}{}",
+                    VAL_SEPARATOR, variable_name, VAL_SEPARATOR, size
+                )
+            }
+            _ => id.to_string(),
+        }
+    }
+}
+
+impl TryFrom<String> for CommitmentMessageId {
+    type Error = String;
+
+    fn try_from(s: String) -> Result<Self, Self::Error> {
+        for variant in CommitmentMessageId::iter() {
+            if s == variant.to_string() {
+                return Ok(variant);
+            } else if s.starts_with(&format!("Groth16IntermediateValues{}", VAL_SEPARATOR)) {
+                let parts: Vec<_> = s.split(VAL_SEPARATOR).collect();
+                if parts.len() != 3 {
+                    return Err(format!("Invalid Groth16IntermediateValues format: {}", s));
+                }
+                let variable_name = parts[1].to_string();
+                let size = parts[2]
+                    .parse::<usize>()
+                    .map_err(|e| format!("Invalid size in Groth16IntermediateValues: {}", e))?;
+
+                return Ok(CommitmentMessageId::Groth16IntermediateValues((
+                    variable_name,
+                    size,
+                )));
+            }
+        }
+
+        Err(format!("Unknown CommitmentMessageId: {}", s))
+    }
+}
+
+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_assert(raw_pubkeys: ApiPublicKeys) -> HashMap<CommitmentMessageId, WinternitzPublicKey> {
+        let mut commitment_map = HashMap::new();
+        for i in 0..NUM_PUBS {
+            commitment_map.insert(
+                CommitmentMessageId::Groth16IntermediateValues((format!("{}", i), 32)),
+                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 {
+            commitment_map.insert(
+                CommitmentMessageId::Groth16IntermediateValues((format!("{}", i + NUM_PUBS), 32)),
+                WinternitzPublicKey {
+                    public_key: raw_pubkeys.1[i].to_vec(),
+                    parameters: Parameters::new_by_bit_length(8 * 32, LOG_D),
+                }
+            );
+        }
+        for i in 0..NUM_U160 {
+            commitment_map.insert(
+                CommitmentMessageId::Groth16IntermediateValues((format!("{}", i + NUM_PUBS + NUM_U256), 20)),
+                WinternitzPublicKey {
+                    public_key: raw_pubkeys.2[i].to_vec(),
+                    parameters: Parameters::new_by_bit_length(8 * 20, 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),
+            ),
+        ]);
+
+        for i in 0..NUM_PUBS {
+            commitment_map.insert(
+                CommitmentMessageId::Groth16IntermediateValues((format!("{}", i), 32)),
+                WinternitzSecret::new(32),
+            );
+        }
+        for i in 0..NUM_U256 {
+            commitment_map.insert(
+                CommitmentMessageId::Groth16IntermediateValues((format!("{}", i + NUM_PUBS), 32)),
+                WinternitzSecret::new(32),
+            );
+        }
+        for i in 0..NUM_U160 {
+            commitment_map.insert(
+                CommitmentMessageId::Groth16IntermediateValues((format!("{}", i + NUM_PUBS + NUM_U256), 20)),
+                WinternitzSecret::new(20),
+            );
+        }
+
+        commitment_map
+    }
+}
+
diff --git a/goat/src/common.rs b/goat/src/common.rs
new file mode 100644
index 000000000..b4bcbda1a
--- /dev/null
+++ b/goat/src/common.rs
@@ -0,0 +1 @@
+pub type ZkProofVerifyingKey = ark_groth16::VerifyingKey<ark_bn254::Bn254>;
diff --git a/goat/src/connectors/base.rs b/goat/src/connectors/base.rs
new file mode 100644
index 000000000..ed126c11b
--- /dev/null
+++ b/goat/src/connectors/base.rs
@@ -0,0 +1,106 @@
+use bitcoin::{
+    key::TweakedPublicKey, taproot::TaprootSpendInfo, Address, ScriptBuf, Sequence, TapNodeHash,
+    TxIn, Witness,
+};
+use serde::{Deserialize, Serialize};
+
+use super::super::transactions::base::Input;
+
+pub fn generate_default_tx_in(input: &Input) -> TxIn {
+    TxIn {
+        previous_output: input.outpoint,
+        script_sig: ScriptBuf::new(),
+        sequence: Sequence::MAX,
+        witness: Witness::default(),
+    }
+}
+
+pub fn generate_timelock_tx_in(input: &Input, num_blocks: u32) -> TxIn {
+    let mut tx_in = generate_default_tx_in(input);
+    tx_in.sequence = Sequence(num_blocks);
+    tx_in
+}
+
+/*
+// TODO figure out if we need to handle CLTV differently than other timelock txs
+https://github.com/BlockchainCommons/Learning-Bitcoin-from-the-Command-Line/blob/master/11_2_Using_CLTV_in_Scripts.md
+A locking script will only allow a transaction to respend a UTXO locked with a CLTV if OP_CHECKLOCKTIMEVERIFY verifies all of the following:
+
+The nSequence field must be set to less than 0xffffffff, usually 0xffffffff-1 to avoid confilcts with relative timelocks.
+CLTV must pop an operand off the stack and it must be 0 or greater.
+Both the stack operand and nLockTime must either be above or below 500 million, to depict the same sort of absolute timelock.
+The nLockTime value must be greater than or equal to the stack operand.
+So the first thing to note here is that nLockTime is still used with CLTV. To be precise, it's required in the transaction that tries to respend a CLTV-timelocked UTXO. That means that it's not a part of the script's requirements. It's just the timer that's used to release the funds, as defined in the script.
+
+This is managed through a clever understanding of how nLockTime works: a value for nLockTime must always be chosen that is less than or equal to the present time (or blockheight), so that the respending transaction can be put on the blockchain. However, due to CLTV's requirements, a value must also be chosen that is greater than or equal to CLTV's operand. The union of these two sets is NULL until the present time matches the CLTV operand. Afterward, any value can be chosen between CLTV's operand and the present time. Usually, you'd just set it to the present time (or block).
+*/
+pub fn generate_check_lock_time_tx_in(input: &Input, num_blocks: u32) -> TxIn {
+    let mut tx_in = generate_default_tx_in(input);
+    tx_in.sequence = Sequence(num_blocks);
+    tx_in
+}
+
+pub trait P2wshConnector {
+    fn generate_script(&self) -> ScriptBuf;
+
+    fn generate_address(&self) -> Address;
+
+    fn generate_tx_in(&self, input: &Input) -> TxIn;
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct TaprootSpendInfoCache {
+    pub merkle_root: Option<TapNodeHash>,
+    pub output_key: TweakedPublicKey,
+}
+
+pub trait TaprootConnector {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf;
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn;
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo;
+
+    fn generate_taproot_address(&self) -> Address;
+}
+
+// memory_cache
+use std::{
+    borrow::Borrow,
+    collections::HashMap,
+    hash::Hash,
+    sync::{LazyLock, RwLock},
+};
+
+const DEFAULT_CACHE_SIZE: usize = 200;
+pub(crate) static TAPROOT_SPEND_INFO_CACHE: LazyLock<RwLock<Cache<String, TaprootSpendInfoCache>>> =
+    LazyLock::new(|| RwLock::new(Cache::new(DEFAULT_CACHE_SIZE)));
+
+pub struct Cache<K: Eq + Hash, V>(HashMap<K, V>);
+
+impl<K, V> Cache<K, V>
+where
+    K: Eq + Hash,
+    V: Clone,
+{
+    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 get<Q: ?Sized>(&self, key: &Q) -> Option<&V>
+    where
+        K: Borrow<Q>,
+        Q: Hash + Eq,
+    {
+        self.0.get(key)
+    }
+
+    pub fn contains<Q: ?Sized>(&self, key: &Q) -> bool
+    where
+        K: Borrow<Q>,
+        Q: Hash + Eq,
+    {
+        self.0.contains_key(key)
+    }
+}
+
diff --git a/goat/src/connectors/connector_0.rs b/goat/src/connectors/connector_0.rs
new file mode 100644
index 000000000..374388a86
--- /dev/null
+++ b/goat/src/connectors/connector_0.rs
@@ -0,0 +1,73 @@
+use bitcoin::{
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
+};
+use secp256k1::SECP256K1;
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{scripts::*, transactions::base::Input},
+    base::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct Connector0 {
+    pub network: Network,
+    pub n_of_n_taproot_public_key: XOnlyPublicKey,
+}
+
+impl Connector0 {
+    pub fn new(network: Network, n_of_n_taproot_public_key: &XOnlyPublicKey) -> Self {
+        Connector0 {
+            network,
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
+        }
+    }
+
+    fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
+        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_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) }
+}
+
+impl TaprootConnector for Connector0 {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_script(),
+            1 => self.generate_taproot_leaf_1_script(),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_tx_in(input),
+            1 => self.generate_taproot_leaf_1_tx_in(input),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        TaprootBuilder::new()
+            .add_leaf(1, self.generate_taproot_leaf_0_script())
+            .expect("Unable to add leaf 0")
+            .add_leaf(1, self.generate_taproot_leaf_1_script())
+            .expect("Unable to add leaf 1")
+            .finalize(SECP256K1, self.n_of_n_taproot_public_key)
+            .expect("Unable to finalize taproot")
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(
+            self.generate_taproot_spend_info().output_key(),
+            self.network,
+        )
+    }
+}
diff --git a/goat/src/connectors/connector_3.rs b/goat/src/connectors/connector_3.rs
new file mode 100644
index 000000000..f0a0de816
--- /dev/null
+++ b/goat/src/connectors/connector_3.rs
@@ -0,0 +1,46 @@
+use bitcoin::{Address, Network, PublicKey, ScriptBuf, TxIn};
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{
+        scripts::*,
+        transactions::base::Input,
+        {constants::CONNECTOR_3_TIMELOCK, utils::num_blocks_per_network},
+    },
+    base::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct Connector3 {
+    pub network: Network,
+    pub operator_public_key: PublicKey,
+    pub num_blocks_timelock: u32,
+}
+
+impl Connector3 {
+    pub fn new(network: Network, operator_public_key: &PublicKey) -> Self {
+        Connector3 {
+            network,
+            operator_public_key: *operator_public_key,
+            num_blocks_timelock: num_blocks_per_network(network, CONNECTOR_3_TIMELOCK),
+        }
+    }
+}
+
+impl P2wshConnector for Connector3 {
+    fn generate_script(&self) -> ScriptBuf {
+        generate_timelock_script(&self.operator_public_key, self.num_blocks_timelock)
+    }
+
+    fn generate_address(&self) -> Address {
+        generate_timelock_script_address(
+            self.network,
+            &self.operator_public_key,
+            self.num_blocks_timelock,
+        )
+    }
+
+    fn generate_tx_in(&self, input: &Input) -> TxIn {
+        generate_timelock_tx_in(input, self.num_blocks_timelock)
+    }
+}
diff --git a/goat/src/connectors/connector_4.rs b/goat/src/connectors/connector_4.rs
new file mode 100644
index 000000000..c8360776e
--- /dev/null
+++ b/goat/src/connectors/connector_4.rs
@@ -0,0 +1,46 @@
+use bitcoin::{Address, Network, PublicKey, ScriptBuf, TxIn};
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{
+        scripts::*,
+        transactions::base::Input,
+        {constants::CONNECTOR_4_TIMELOCK, utils::num_blocks_per_network},
+    },
+    base::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct Connector4 {
+    pub network: Network,
+    pub operator_public_key: PublicKey,
+    pub num_blocks_timelock: u32,
+}
+
+impl Connector4 {
+    pub fn new(network: Network, operator_public_key: &PublicKey) -> Self {
+        Connector4 {
+            network,
+            operator_public_key: *operator_public_key,
+            num_blocks_timelock: num_blocks_per_network(network, CONNECTOR_4_TIMELOCK),
+        }
+    }
+}
+
+impl P2wshConnector for Connector4 {
+    fn generate_script(&self) -> ScriptBuf {
+        generate_timelock_script(&self.operator_public_key, self.num_blocks_timelock)
+    }
+
+    fn generate_address(&self) -> Address {
+        generate_timelock_script_address(
+            self.network,
+            &self.operator_public_key,
+            self.num_blocks_timelock,
+        )
+    }
+
+    fn generate_tx_in(&self, input: &Input) -> TxIn {
+        generate_timelock_tx_in(input, self.num_blocks_timelock)
+    }
+}
diff --git a/goat/src/connectors/connector_5.rs b/goat/src/connectors/connector_5.rs
new file mode 100644
index 000000000..20433cca5
--- /dev/null
+++ b/goat/src/connectors/connector_5.rs
@@ -0,0 +1,73 @@
+use bitcoin::{
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
+};
+use secp256k1::SECP256K1;
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{scripts::*, transactions::base::Input},
+    base::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct Connector5 {
+    pub network: Network,
+    pub n_of_n_taproot_public_key: XOnlyPublicKey,
+}
+
+impl Connector5 {
+    pub fn new(network: Network, n_of_n_taproot_public_key: &XOnlyPublicKey) -> Self {
+        Connector5 {
+            network,
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
+        }
+    }
+
+    fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
+        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_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) }
+}
+
+impl TaprootConnector for Connector5 {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_script(),
+            1 => self.generate_taproot_leaf_1_script(),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_tx_in(input),
+            1 => self.generate_taproot_leaf_1_tx_in(input),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        TaprootBuilder::new()
+            .add_leaf(1, self.generate_taproot_leaf_0_script())
+            .expect("Unable to add leaf 0")
+            .add_leaf(1, self.generate_taproot_leaf_1_script())
+            .expect("Unable to add leaf 1")
+            .finalize(SECP256K1, self.n_of_n_taproot_public_key)
+            .expect("Unable to finalize taproot")
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(
+            self.generate_taproot_spend_info().output_key(),
+            self.network,
+        )
+    }
+}
diff --git a/goat/src/connectors/connector_6.rs b/goat/src/connectors/connector_6.rs
new file mode 100644
index 000000000..ec1fbcf3f
--- /dev/null
+++ b/goat/src/connectors/connector_6.rs
@@ -0,0 +1,86 @@
+use std::collections::HashMap;
+
+use crate::{
+    commitments::CommitmentMessageId,
+    constants::EVM_TXID_LENGTH,
+    transactions::base::Input,
+};
+
+use bitvm::{
+    signatures::signing_winternitz::{winternitz_message_checksig_verify, WinternitzPublicKey},
+    treepp::script,
+};
+
+use bitcoin::{
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
+};
+
+use secp256k1::SECP256K1;
+use serde::{Deserialize, Serialize};
+
+use super::base::{generate_default_tx_in, TaprootConnector};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct Connector6 {
+    pub network: Network,
+    pub operator_taproot_public_key: XOnlyPublicKey,
+    pub commitment_public_keys: HashMap<CommitmentMessageId, WinternitzPublicKey>,
+}
+
+impl Connector6 {
+    pub fn new(
+        network: Network,
+        operator_taproot_public_key: &XOnlyPublicKey,
+        commitment_public_keys: &HashMap<CommitmentMessageId, WinternitzPublicKey>,
+    ) -> Self {
+        Connector6 {
+            network,
+            operator_taproot_public_key: *operator_taproot_public_key,
+            commitment_public_keys: commitment_public_keys.clone(),
+        }
+    }
+
+    fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
+        let evm_withdraw_txid_pubkey =
+            &self.commitment_public_keys[&CommitmentMessageId::EvmWithdrawTxid];
+        script! {
+            { winternitz_message_checksig_verify(evm_withdraw_txid_pubkey, EVM_TXID_LENGTH * 2) }
+            { self.operator_taproot_public_key }
+            OP_CHECKSIG
+        }.compile()
+    }
+
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+}
+
+impl TaprootConnector for Connector6 {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_script(),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_tx_in(input),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        TaprootBuilder::new()
+            .add_leaf(0, self.generate_taproot_leaf_0_script())
+            .expect("Unable to add leaf 0")
+            .finalize(SECP256K1, self.operator_taproot_public_key) // TODO: should be operator key?
+            .expect("Unable to finalize taproot")
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(
+            self.generate_taproot_spend_info().output_key(),
+            self.network,
+        )
+    }
+}
diff --git a/src/bridge/connectors/connector_2.rs b/goat/src/connectors/connector_a.rs
similarity index 81%
rename from src/bridge/connectors/connector_2.rs
rename to goat/src/connectors/connector_a.rs
index 17dc9f2c4..114e03bd3 100644
--- a/src/bridge/connectors/connector_2.rs
+++ b/goat/src/connectors/connector_a.rs
@@ -1,50 +1,49 @@
 use bitcoin::{
-    key::Secp256k1,
     taproot::{TaprootBuilder, TaprootSpendInfo},
     Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
 };
+use secp256k1::SECP256K1;
 use serde::{Deserialize, Serialize};
 
 use super::{
     super::{scripts::*, transactions::base::Input},
-    connector::*,
+    base::*,
 };
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
-pub struct Connector2 {
+pub struct ConnectorA {
     pub network: Network,
     pub operator_taproot_public_key: XOnlyPublicKey,
     pub n_of_n_taproot_public_key: XOnlyPublicKey,
 }
 
-impl Connector2 {
+impl ConnectorA {
     pub fn new(
         network: Network,
         operator_taproot_public_key: &XOnlyPublicKey,
         n_of_n_taproot_public_key: &XOnlyPublicKey,
     ) -> Self {
-        Connector2 {
+        ConnectorA {
             network,
-            operator_taproot_public_key: operator_taproot_public_key.clone(),
-            n_of_n_taproot_public_key: n_of_n_taproot_public_key.clone(),
+            operator_taproot_public_key: *operator_taproot_public_key,
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
         }
     }
 
     fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
-        // TODO: Add commit later
         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_1_script(&self) -> ScriptBuf {
-        generate_pay_to_pubkey_taproot_script(&self.n_of_n_taproot_public_key)
+        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) }
 }
 
-impl TaprootConnector for Connector2 {
+impl TaprootConnector for ConnectorA {
     fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
         match leaf_index {
             0 => self.generate_taproot_leaf_0_script(),
@@ -67,7 +66,7 @@ impl TaprootConnector for Connector2 {
             .expect("Unable to add leaf 0")
             .add_leaf(1, self.generate_taproot_leaf_1_script())
             .expect("Unable to add leaf 1")
-            .finalize(&Secp256k1::new(), self.n_of_n_taproot_public_key)
+            .finalize(SECP256K1, self.n_of_n_taproot_public_key)
             .expect("Unable to finalize taproot")
     }
 
diff --git a/goat/src/connectors/connector_b.rs b/goat/src/connectors/connector_b.rs
new file mode 100644
index 000000000..21849dda7
--- /dev/null
+++ b/goat/src/connectors/connector_b.rs
@@ -0,0 +1,70 @@
+use std::collections::HashMap;
+
+use bitcoin::{
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
+};
+use bitvm::signatures::signing_winternitz::WinternitzPublicKey;
+use secp256k1::SECP256K1;
+use serde::{Deserialize, Serialize};
+
+use crate::{commitments::CommitmentMessageId ,scripts::*, transactions::base::Input, connectors::base::*};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct ConnectorB {
+    pub network: Network,
+    pub operator_taproot_public_key: XOnlyPublicKey,
+    pub commitment_public_keys: HashMap<CommitmentMessageId, WinternitzPublicKey>,
+}
+
+// TODO: timelock & n-n-pubkey OR just operator-pubkey?
+impl ConnectorB {
+    pub fn new(
+        network: Network,
+        operator_taproot_public_key: &XOnlyPublicKey,
+        commitment_public_keys: &HashMap<CommitmentMessageId, WinternitzPublicKey>,
+    ) -> Self {
+        ConnectorB {
+            network,
+            operator_taproot_public_key: *operator_taproot_public_key,
+            commitment_public_keys: commitment_public_keys.clone(),
+        }
+    }
+
+    fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
+        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) }
+}
+
+impl TaprootConnector for ConnectorB {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_script(),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_tx_in(input),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        TaprootBuilder::new()
+            .add_leaf(2, self.generate_taproot_leaf_0_script())
+            .expect("Unable to add leaf 0")
+            .finalize(SECP256K1, self.operator_taproot_public_key)
+            .expect("Unable to finalize taproot")
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(
+            self.generate_taproot_spend_info().output_key(),
+            self.network,
+        )
+    }
+}
diff --git a/goat/src/connectors/connector_c.rs b/goat/src/connectors/connector_c.rs
new file mode 100644
index 000000000..17a9b0421
--- /dev/null
+++ b/goat/src/connectors/connector_c.rs
@@ -0,0 +1,373 @@
+#![allow(non_snake_case)]
+use std::{
+    collections::BTreeMap,
+    fmt::{Formatter, Result as FmtResult},
+    path::{Path, PathBuf},
+};
+
+use crate::{
+    commitments::CommitmentMessageId,
+    common::ZkProofVerifyingKey,
+    connectors::base::*,
+    error::{ChunkerError, ConnectorError, Error},
+    transactions::base::Input,
+    utils::{
+        cleanup_cache_files, read_cache, remove_script_and_control_block_from_witness, write_cache,
+    },
+};
+use bitcoin::{
+    hashes::{hash160, Hash},
+    key::TweakedPublicKey,
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TapNodeHash, Transaction, TxIn, XOnlyPublicKey,
+};
+use num_traits::ToPrimitive;
+use secp256k1::SECP256K1;
+use serde::{
+    de,
+    ser::{Error as SerError, SerializeStruct},
+    Deserialize, Deserializer, Serialize, Serializer,
+};
+
+use bitvm::{
+    chunk::api::{
+        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
+        }, 
+        validate_assertions, PublicKeys,
+    }, 
+    signatures::signing_winternitz::WinternitzPublicKey,
+};
+
+// Specialized for assert leaves currently.
+pub type LockScript = fn(index: u32) -> ScriptBuf;
+pub type UnlockWitnessData = Vec<u8>;
+pub type UnlockWitness = fn(index: u32) -> UnlockWitnessData;
+
+pub struct DisproveLeaf {
+    pub lock: LockScript,
+    pub unlock: UnlockWitness,
+}
+
+const CACHE_DIRECTORY_NAME: &str = "cache";
+const LOCK_SCRIPTS_FILE_PREFIX: &str = "lock_scripts_";
+const MAX_CACHE_FILES: u32 = 90; //~1GB in total, based on lock scripts cache being 11MB each
+
+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)
+}
+
+#[derive(Eq, PartialEq, Clone)]
+pub struct ConnectorC {
+    pub network: Network,
+    pub operator_taproot_public_key: XOnlyPublicKey,
+    pub lock_scripts_bytes: Vec<Vec<u8>>, // using primitive type for binary serialization, convert to ScriptBuf when using it
+    commitment_public_keys: BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+}
+
+impl Serialize for ConnectorC {
+    fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut c = s.serialize_struct("ConnectorC", 4)?;
+        c.serialize_field("network", &self.network)?;
+        c.serialize_field(
+            "operator_taproot_public_key",
+            &self.operator_taproot_public_key,
+        )?;
+        c.serialize_field("commitment_public_keys", &self.commitment_public_keys)?;
+
+        let cache_id = Self::cache_id(&self.commitment_public_keys).map_err(SerError::custom)?;
+        c.serialize_field("lock_scripts", &cache_id)?;
+
+        let lock_scripts_cache_path = get_lock_scripts_cache_path(&cache_id);
+        if !lock_scripts_cache_path.exists() {
+            write_cache(&lock_scripts_cache_path, &self.lock_scripts_bytes)
+                .map_err(SerError::custom)?;
+        }
+
+        cleanup_cache_files(
+            LOCK_SCRIPTS_FILE_PREFIX,
+            get_lock_scripts_cache_path(&cache_id).parent().unwrap(),
+            MAX_CACHE_FILES,
+        );
+
+        c.end()
+    }
+}
+
+impl<'de> Deserialize<'de> for ConnectorC {
+    fn deserialize<D>(d: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        struct JsonConnectorCVisitor;
+        impl<'de> de::Visitor<'de> for JsonConnectorCVisitor {
+            type Value = ConnectorC;
+
+            fn expecting(&self, formatter: &mut Formatter) -> FmtResult {
+                formatter.write_str("a string containing ConnectorC data")
+            }
+
+            fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
+            where
+                A: de::MapAccess<'de>,
+            {
+                let mut operator_taproot_public_key = None;
+                let mut commitment_public_keys = None;
+                let mut network = None;
+                let mut lock_scripts_cache_id = None;
+
+                while let Some(key) = map.next_key()? {
+                    match key {
+                        "network" => network = Some(map.next_value()?),
+                        "operator_taproot_public_key" => {
+                            operator_taproot_public_key = Some(map.next_value()?)
+                        }
+                        "commitment_public_keys" => {
+                            commitment_public_keys = Some(map.next_value()?)
+                        }
+                        "lock_scripts" => lock_scripts_cache_id = Some(map.next_value()?),
+                        _ => (),
+                    }
+                }
+
+                match (network, operator_taproot_public_key, commitment_public_keys) {
+                    (
+                        Some(network),
+                        Some(operator_taproot_public_key),
+                        Some(commitment_public_keys),
+                    ) => Ok(ConnectorC::new(
+                        network,
+                        &operator_taproot_public_key,
+                        &commitment_public_keys,
+                        lock_scripts_cache_id,
+                    )),
+                    _ => Err(de::Error::custom("Invalid ConnectorC data")),
+                }
+            }
+        }
+
+        d.deserialize_struct(
+            "ConnectorC",
+            &[
+                "network",
+                "operator_taproot_public_key",
+                "commitment_public_keys",
+                "lock_scripts",
+            ],
+            JsonConnectorCVisitor,
+        )
+    }
+}
+
+impl ConnectorC {
+    pub fn new(
+        network: Network,
+        operator_taproot_public_key: &XOnlyPublicKey,
+        commitment_public_keys: &BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+        lock_scripts_cache_id: Option<String>,
+    ) -> Self {
+        let lock_scripts_cache = lock_scripts_cache_id.and_then(|cache_id| {
+            let file_path = get_lock_scripts_cache_path(&cache_id);
+            read_cache(&file_path)
+                .inspect_err(|e| {
+                    eprintln!(
+                        "Failed to read lock scripts cache from expected location: {}",
+                        e
+                    );
+                })
+                .ok()
+        });
+
+        ConnectorC {
+            network,
+            operator_taproot_public_key: *operator_taproot_public_key,
+            lock_scripts_bytes: lock_scripts_cache
+                .unwrap_or_else(|| generate_assert_leaves(commitment_public_keys)),
+            commitment_public_keys: commitment_public_keys.clone(),
+        }
+    }
+
+    pub fn generate_disprove_witness(
+        &self,
+        commit_1_witness: Vec<RawWitness>,
+        commit_2_witness: Vec<RawWitness>,
+        vk: &ZkProofVerifyingKey,
+    ) -> Result<(usize, RawWitness), Error> {
+
+        let mut sorted_pks: Vec<(u32, WinternitzPublicKey)> = vec![];
+        self.commitment_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 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 = 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);
+            return Ok((exec_res.0, wit));
+        }
+        return Err(Error::Chunker(ChunkerError::ValidProof));
+    }
+
+    pub fn taproot_merkle_root(&self) -> Option<TapNodeHash> {
+        self.taproot_spend_info_cache()
+            .map(|cache| cache.merkle_root)
+            .unwrap_or_else(|| self.generate_taproot_spend_info().merkle_root())
+    }
+
+    pub fn taproot_output_key(&self) -> TweakedPublicKey {
+        self.taproot_spend_info_cache()
+            .map(|cache| cache.output_key)
+            .unwrap_or_else(|| self.generate_taproot_spend_info().output_key())
+    }
+
+    // read from cache or generate from [`TaprootConnector`]
+    fn taproot_spend_info_cache(&self) -> Option<TaprootSpendInfoCache> {
+        let spend_info_cache = match Self::cache_id(&self.commitment_public_keys).map(|cache_id| {
+            TAPROOT_SPEND_INFO_CACHE
+                .read()
+                .unwrap()
+                .get(&cache_id)
+                .cloned()
+        }) {
+            Ok(Some(spend_info_cache)) => Some(spend_info_cache),
+            Ok(None) => {
+                let spend_info = self.generate_taproot_spend_info();
+                let output_key = spend_info.output_key();
+                let spend_info_cache = TaprootSpendInfoCache {
+                    merkle_root: spend_info.merkle_root(),
+                    output_key,
+                };
+                Some(spend_info_cache)
+            }
+            _ => None,
+        };
+
+        spend_info_cache
+    }
+
+    pub fn cache_id(
+        commitment_public_keys: &BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+    ) -> Result<String, ConnectorError> {
+        let first_winternitz_public_key = commitment_public_keys.iter().next();
+
+        match first_winternitz_public_key {
+            None => Err(ConnectorError::ConnectorCCommitsPublicKeyEmpty),
+            Some((_, winternitz_public_key)) => {
+                let hash = hash160::Hash::hash(winternitz_public_key.public_key.as_flattened());
+                Ok(hex::encode(hash))
+            }
+        }
+    }
+}
+
+impl TaprootConnector for ConnectorC {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        let index = leaf_index.to_usize().unwrap();
+        if index >= self.lock_scripts_bytes.len() {
+            panic!("Invalid leaf index.")
+        }
+        ScriptBuf::from_bytes(self.lock_scripts_bytes[index].clone())
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        let index = leaf_index.to_usize().unwrap();
+        if index >= self.lock_scripts_bytes.len() {
+            panic!("Invalid leaf index.")
+        }
+        generate_default_tx_in(input)
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        println!("Generating new taproot spend info for connector C...");
+        let script_weights = self
+            .lock_scripts_bytes
+            .iter()
+            .map(|b| (1, ScriptBuf::from_bytes(b.clone())));
+
+        let spend_info = TaprootBuilder::with_huffman_tree(script_weights)
+            .expect("Unable to add assert leaves")
+            .finalize(SECP256K1, self.operator_taproot_public_key)
+            .expect("Unable to finalize assert transaction connector c taproot");
+
+        // write to cache
+        if let Ok(cache_id) = Self::cache_id(&self.commitment_public_keys) {
+            let output_key = spend_info.output_key();
+            let spend_info_cache = TaprootSpendInfoCache {
+                merkle_root: spend_info.merkle_root(),
+                output_key,
+            };
+            if !TAPROOT_SPEND_INFO_CACHE.read().unwrap().contains(&cache_id) {
+                TAPROOT_SPEND_INFO_CACHE
+                    .write()
+                    .unwrap()
+                    .push(cache_id, spend_info_cache);
+            }
+        }
+
+        spend_info
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(self.taproot_output_key(), self.network)
+    }
+}
+
+pub fn generate_assert_leaves(
+    commits_public_keys: &BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+) -> Vec<Vec<u8>> {
+    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));
+            }
+        });
+    
+    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 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();
+    locks
+}
+
+pub fn get_commit_from_assert_commit_tx(assert_commit_tx: &Transaction) -> Vec<RawWitness> {
+    let mut assert_commit_witness = Vec::new();
+    for input in assert_commit_tx.input.iter() {
+        // remove script and control block from witness
+        let witness = remove_script_and_control_block_from_witness(input.witness.to_vec());
+        assert_commit_witness.push(witness);
+    }
+
+    assert_commit_witness
+}
diff --git a/goat/src/connectors/connector_d.rs b/goat/src/connectors/connector_d.rs
new file mode 100644
index 000000000..f263c4ee7
--- /dev/null
+++ b/goat/src/connectors/connector_d.rs
@@ -0,0 +1,63 @@
+use bitcoin::{
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
+};
+use secp256k1::SECP256K1;
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{scripts::*, transactions::base::Input},
+    base::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct ConnectorD {
+    pub network: Network,
+    pub n_of_n_taproot_public_key: XOnlyPublicKey,
+}
+
+impl ConnectorD {
+    pub fn new(network: Network, n_of_n_taproot_public_key: &XOnlyPublicKey) -> Self {
+        ConnectorD {
+            network,
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
+        }
+    }
+
+    fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
+        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) }
+}
+
+impl TaprootConnector for ConnectorD {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_script(),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_tx_in(input),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        TaprootBuilder::new()
+            .add_leaf(0, self.generate_taproot_leaf_0_script())
+            .expect("Unable to add leaf 0")
+            .finalize(SECP256K1, self.n_of_n_taproot_public_key)
+            .expect("Unable to finalize taproot")
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(
+            self.generate_taproot_spend_info().output_key(),
+            self.network,
+        )
+    }
+}
diff --git a/goat/src/connectors/connector_e.rs b/goat/src/connectors/connector_e.rs
new file mode 100644
index 000000000..aef87e03d
--- /dev/null
+++ b/goat/src/connectors/connector_e.rs
@@ -0,0 +1,82 @@
+use super::{super::transactions::base::Input, base::*};
+use crate::commitments::CommitmentMessageId;
+use bitcoin::{
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, PublicKey, ScriptBuf, TxIn,
+};
+use bitcoin_script::script;
+use bitvm::signatures::signing_winternitz::{
+    winternitz_message_checksig_verify, WinternitzPublicKey,
+};
+use secp256k1::SECP256K1;
+use serde::{Deserialize, Serialize};
+use std::collections::BTreeMap;
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct ConnectorE {
+    pub network: Network,
+    pub operator_public_key: PublicKey,
+    pub commitment_public_keys: BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+}
+
+impl ConnectorE {
+    pub fn new(
+        network: Network,
+        operator_public_key: &PublicKey,
+        commitment_public_keys: &BTreeMap<CommitmentMessageId, WinternitzPublicKey>,
+    ) -> Self {
+        ConnectorE {
+            network,
+            operator_public_key: *operator_public_key,
+            commitment_public_keys: commitment_public_keys.clone(),
+        }
+    }
+}
+
+impl TaprootConnector for ConnectorE {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        assert_eq!(leaf_index, 0, "Invalid leaf index");
+        let mut script = script! {};
+        for (message, pk) in self.commitment_public_keys.iter().rev() {
+            match message {
+                CommitmentMessageId::Groth16IntermediateValues((_, size)) => {
+                    script = script.push_script(
+                        script! {
+                            {winternitz_message_checksig_verify(pk, *size)}
+                            for _ in 0..*size {
+                                OP_DROP
+                            }
+                            // it's must be exactly one on stack after execution
+                            OP_TRUE
+                        }
+                        .compile(),
+                    );
+                }
+                _ => {
+                    panic!("connector e only reveal intermediate value of groth16")
+                }
+            }
+        }
+        script.compile()
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        assert_eq!(leaf_index, 0, "Invalid leaf index");
+        generate_default_tx_in(input)
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        TaprootBuilder::new()
+            .add_leaf(0, self.generate_taproot_leaf_script(0))
+            .expect("Unable to add leaf 0")
+            .finalize(SECP256K1, self.operator_public_key.into())
+            .expect("Unable to finalize taproot")
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(
+            self.generate_taproot_spend_info().output_key(),
+            self.network,
+        )
+    }
+}
diff --git a/goat/src/connectors/connector_f_1.rs b/goat/src/connectors/connector_f_1.rs
new file mode 100644
index 000000000..948608732
--- /dev/null
+++ b/goat/src/connectors/connector_f_1.rs
@@ -0,0 +1,37 @@
+use bitcoin::{Address, Network, PublicKey, ScriptBuf, TxIn};
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{scripts::*, transactions::base::Input},
+    base::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct ConnectorF1 {
+    pub network: Network,
+    pub operator_public_key: PublicKey,
+}
+
+impl ConnectorF1 {
+    pub fn new(network: Network, operator_public_key: &PublicKey) -> Self {
+        ConnectorF1 {
+            network,
+            operator_public_key: *operator_public_key,
+        }
+    }
+}
+
+impl P2wshConnector for ConnectorF1 {
+    fn generate_script(&self) -> ScriptBuf {
+        generate_pay_to_pubkey_script(&self.operator_public_key)
+    }
+
+    fn generate_address(&self) -> Address {
+        Address::p2wsh(
+            &generate_pay_to_pubkey_script(&self.operator_public_key),
+            self.network,
+        )
+    }
+
+    fn generate_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+}
diff --git a/goat/src/connectors/connector_f_2.rs b/goat/src/connectors/connector_f_2.rs
new file mode 100644
index 000000000..5e9209ba8
--- /dev/null
+++ b/goat/src/connectors/connector_f_2.rs
@@ -0,0 +1,37 @@
+use bitcoin::{Address, Network, PublicKey, ScriptBuf, TxIn};
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{scripts::*, transactions::base::Input},
+    base::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct ConnectorF2 {
+    pub network: Network,
+    pub operator_public_key: PublicKey,
+}
+
+impl ConnectorF2 {
+    pub fn new(network: Network, operator_public_key: &PublicKey) -> Self {
+        ConnectorF2 {
+            network,
+            operator_public_key: *operator_public_key,
+        }
+    }
+}
+
+impl P2wshConnector for ConnectorF2 {
+    fn generate_script(&self) -> ScriptBuf {
+        generate_pay_to_pubkey_script(&self.operator_public_key)
+    }
+
+    fn generate_address(&self) -> Address {
+        Address::p2wsh(
+            &generate_pay_to_pubkey_script(&self.operator_public_key),
+            self.network,
+        )
+    }
+
+    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
new file mode 100644
index 000000000..6e6df77a5
--- /dev/null
+++ b/goat/src/connectors/connector_z.rs
@@ -0,0 +1,103 @@
+use crate::{constants::CONNECTOR_Z_TIMELOCK, utils::num_blocks_per_network};
+use bitcoin::{
+    taproot::{TaprootBuilder, TaprootSpendInfo},
+    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
+};
+use bitvm::treepp::script;
+use secp256k1::SECP256K1;
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{scripts::*, transactions::base::Input},
+    base::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct ConnectorZ {
+    pub network: Network,
+    pub depositor_taproot_public_key: XOnlyPublicKey,
+    pub n_of_n_taproot_public_key: XOnlyPublicKey,
+    pub evm_address: String,
+    pub num_blocks_timelock_0: u32,
+}
+
+impl ConnectorZ {
+    pub fn new(
+        network: Network,
+        evm_address: &str,
+        depositor_taproot_public_key: &XOnlyPublicKey,
+        n_of_n_taproot_public_key: &XOnlyPublicKey,
+    ) -> Self {
+        ConnectorZ {
+            network,
+            depositor_taproot_public_key: *depositor_taproot_public_key,
+            n_of_n_taproot_public_key: *n_of_n_taproot_public_key,
+            evm_address: evm_address.to_string(),
+            num_blocks_timelock_0: num_blocks_per_network(network, CONNECTOR_Z_TIMELOCK),
+        }
+    }
+
+    fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
+        generate_timelock_taproot_script(
+            &self.depositor_taproot_public_key,
+            self.num_blocks_timelock_0,
+        )
+    }
+
+    fn generate_taproot_leaf_0_tx_in(&self, input: &Input) -> TxIn {
+        generate_timelock_tx_in(input, self.num_blocks_timelock_0)
+    }
+
+    // leaf[1] is spendable by a multisig of depositor and OPK and VPK[1…N]
+    // the transaction script contains an [evm_address] (inscription data)
+    fn generate_taproot_leaf_1_script(&self) -> ScriptBuf {
+        script! {
+        OP_FALSE
+        OP_IF
+        { self.evm_address.clone().into_bytes() }
+        OP_ENDIF
+        { self.n_of_n_taproot_public_key }
+        OP_CHECKSIGVERIFY
+        { self.depositor_taproot_public_key }
+        OP_CHECKSIG
+        }
+        .compile()
+    }
+
+    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
+}
+
+impl TaprootConnector for ConnectorZ {
+    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_script(),
+            1 => self.generate_taproot_leaf_1_script(),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
+        match leaf_index {
+            0 => self.generate_taproot_leaf_0_tx_in(input),
+            1 => self.generate_taproot_leaf_1_tx_in(input),
+            _ => panic!("Invalid leaf index."),
+        }
+    }
+
+    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
+        TaprootBuilder::new()
+            .add_leaf(1, self.generate_taproot_leaf_0_script())
+            .expect("Unable to add leaf 0")
+            .add_leaf(1, self.generate_taproot_leaf_1_script())
+            .expect("Unable to add leaf 1")
+            .finalize(SECP256K1, self.depositor_taproot_public_key) // TODO: should this be depositor or n-of-n
+            .expect("Unable to finalize ttaproot")
+    }
+
+    fn generate_taproot_address(&self) -> Address {
+        Address::p2tr_tweaked(
+            self.generate_taproot_spend_info().output_key(),
+            self.network,
+        )
+    }
+}
diff --git a/goat/src/connectors/mod.rs b/goat/src/connectors/mod.rs
new file mode 100644
index 000000000..97e19b22d
--- /dev/null
+++ b/goat/src/connectors/mod.rs
@@ -0,0 +1,14 @@
+pub mod base;
+pub mod connector_0;
+pub mod connector_3;
+pub mod connector_4;
+pub mod connector_5;
+pub mod connector_6;
+pub mod connector_a;
+pub mod connector_b;
+pub mod connector_c;
+pub mod connector_d;
+pub mod connector_e;
+pub mod connector_f_1;
+pub mod connector_f_2;
+pub mod connector_z;
\ No newline at end of file
diff --git a/goat/src/constants.rs b/goat/src/constants.rs
new file mode 100644
index 000000000..17c85c289
--- /dev/null
+++ b/goat/src/constants.rs
@@ -0,0 +1,21 @@
+pub const NUM_BLOCKS_PER_HOUR: u32 = 6;
+pub const NUM_BLOCKS_PER_6_HOURS: u32 = NUM_BLOCKS_PER_HOUR * 6;
+
+pub const NUM_BLOCKS_PER_DAY: u32 = NUM_BLOCKS_PER_HOUR * 24;
+pub const NUM_BLOCKS_PER_3_DAYS: u32 = NUM_BLOCKS_PER_DAY * 3;
+
+pub const NUM_BLOCKS_PER_WEEK: u32 = NUM_BLOCKS_PER_DAY * 7;
+pub const NUM_BLOCKS_PER_2_WEEKS: u32 = NUM_BLOCKS_PER_WEEK * 2;
+pub const NUM_BLOCKS_PER_4_WEEKS: u32 = NUM_BLOCKS_PER_WEEK * 4;
+
+pub const N_SEQUENCE_FOR_LOCK_TIME: u32 = 0xFFFFFFFE; // The nSequence field must be set to less than 0xffffffff, usually 0xffffffff-1 to avoid confilcts with relative timelocks.
+
+// connectors' locktime
+pub const CONNECTOR_3_TIMELOCK: u32 = NUM_BLOCKS_PER_2_WEEKS;
+pub const CONNECTOR_4_TIMELOCK: u32 = NUM_BLOCKS_PER_2_WEEKS;
+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/base.rs b/goat/src/contexts/base.rs
new file mode 100644
index 000000000..de9c7bd7c
--- /dev/null
+++ b/goat/src/contexts/base.rs
@@ -0,0 +1,36 @@
+use bitcoin::{
+    key::Keypair, secp256k1::PublicKey as Secp256k1PublicKey, Network, PrivateKey, PublicKey,
+    XOnlyPublicKey,
+};
+use musig2::{secp::Point, KeyAggContext};
+use secp256k1::SECP256K1;
+
+pub trait BaseContext {
+    fn network(&self) -> Network;
+    fn n_of_n_public_keys(&self) -> &Vec<PublicKey>;
+    fn n_of_n_public_key(&self) -> &PublicKey;
+    fn n_of_n_taproot_public_key(&self) -> &XOnlyPublicKey;
+}
+
+pub fn generate_keys_from_secret(network: Network, secret: &str) -> (Keypair, PublicKey) {
+    let keypair = Keypair::from_seckey_str_global(secret).unwrap();
+    let private_key = PrivateKey::new(keypair.secret_key(), network);
+    let public_key = PublicKey::from_private_key(SECP256K1, &private_key);
+
+    (keypair, public_key)
+}
+
+pub fn generate_n_of_n_public_key(n_of_n_public_keys: &[PublicKey]) -> (PublicKey, XOnlyPublicKey) {
+    let public_keys: Vec<Point> = n_of_n_public_keys
+        .iter()
+        .map(|&public_key| public_key.inner.into())
+        .collect();
+
+    let key_agg_context = KeyAggContext::new(public_keys).unwrap();
+    let aggregated_key: Secp256k1PublicKey = key_agg_context.aggregated_pubkey();
+
+    let n_of_n_public_key = PublicKey::from(aggregated_key);
+    let n_of_n_taproot_public_key = XOnlyPublicKey::from(n_of_n_public_key);
+
+    (n_of_n_public_key, n_of_n_taproot_public_key)
+}
diff --git a/goat/src/contexts/depositor.rs b/goat/src/contexts/depositor.rs
new file mode 100644
index 000000000..ca07e3b71
--- /dev/null
+++ b/goat/src/contexts/depositor.rs
@@ -0,0 +1,43 @@
+use bitcoin::{key::Keypair, Network, PublicKey, XOnlyPublicKey};
+
+use super::base::{generate_keys_from_secret, generate_n_of_n_public_key, BaseContext};
+
+#[derive(Debug)]
+pub struct DepositorContext {
+    pub network: Network,
+
+    pub depositor_keypair: Keypair,
+    pub depositor_public_key: PublicKey,
+    pub depositor_taproot_public_key: XOnlyPublicKey,
+
+    pub n_of_n_public_keys: Vec<PublicKey>,
+    pub n_of_n_public_key: PublicKey,
+    pub n_of_n_taproot_public_key: XOnlyPublicKey,
+}
+
+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 }
+}
+
+impl DepositorContext {
+    pub fn new(network: Network, depositor_secret: &str, n_of_n_public_keys: &[PublicKey]) -> Self {
+        let (keypair, public_key) = generate_keys_from_secret(network, depositor_secret);
+        let (n_of_n_public_key, n_of_n_taproot_public_key) =
+            generate_n_of_n_public_key(n_of_n_public_keys);
+
+        DepositorContext {
+            network,
+
+            depositor_keypair: keypair,
+            depositor_public_key: public_key,
+            depositor_taproot_public_key: XOnlyPublicKey::from(public_key),
+
+            n_of_n_public_keys: n_of_n_public_keys.to_owned(),
+            n_of_n_public_key,
+            n_of_n_taproot_public_key,
+        }
+    }
+}
diff --git a/goat/src/contexts/mod.rs b/goat/src/contexts/mod.rs
new file mode 100644
index 000000000..4529ddcf2
--- /dev/null
+++ b/goat/src/contexts/mod.rs
@@ -0,0 +1,4 @@
+pub mod base;
+pub mod depositor;
+pub mod operator;
+pub mod verifier;
diff --git a/goat/src/contexts/operator.rs b/goat/src/contexts/operator.rs
new file mode 100644
index 000000000..a0e57169b
--- /dev/null
+++ b/goat/src/contexts/operator.rs
@@ -0,0 +1,43 @@
+use bitcoin::{key::Keypair, Network, PublicKey, XOnlyPublicKey};
+
+use super::base::{generate_keys_from_secret, generate_n_of_n_public_key, BaseContext};
+
+#[derive(Debug)]
+pub struct OperatorContext {
+    pub network: Network,
+
+    pub operator_keypair: Keypair,
+    pub operator_public_key: PublicKey,
+    pub operator_taproot_public_key: XOnlyPublicKey,
+
+    pub n_of_n_public_keys: Vec<PublicKey>,
+    pub n_of_n_public_key: PublicKey,
+    pub n_of_n_taproot_public_key: XOnlyPublicKey,
+}
+
+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 }
+}
+
+impl OperatorContext {
+    pub fn new(network: Network, operator_secret: &str, n_of_n_public_keys: &[PublicKey]) -> Self {
+        let (keypair, public_key) = generate_keys_from_secret(network, operator_secret);
+        let (n_of_n_public_key, n_of_n_taproot_public_key) =
+            generate_n_of_n_public_key(n_of_n_public_keys);
+
+        OperatorContext {
+            network,
+
+            operator_keypair: keypair,
+            operator_public_key: public_key,
+            operator_taproot_public_key: XOnlyPublicKey::from(public_key),
+
+            n_of_n_public_keys: n_of_n_public_keys.to_owned(),
+            n_of_n_public_key,
+            n_of_n_taproot_public_key,
+        }
+    }
+}
diff --git a/goat/src/contexts/verifier.rs b/goat/src/contexts/verifier.rs
new file mode 100644
index 000000000..df9c6ca83
--- /dev/null
+++ b/goat/src/contexts/verifier.rs
@@ -0,0 +1,41 @@
+use bitcoin::{key::Keypair, Network, PublicKey, XOnlyPublicKey};
+
+use super::base::{generate_keys_from_secret, generate_n_of_n_public_key, BaseContext};
+
+#[derive(Debug)]
+pub struct VerifierContext {
+    pub network: Network,
+
+    pub verifier_keypair: Keypair,
+    pub verifier_public_key: PublicKey,
+
+    pub n_of_n_public_keys: Vec<PublicKey>,
+    pub n_of_n_public_key: PublicKey,
+    pub n_of_n_taproot_public_key: XOnlyPublicKey,
+}
+
+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 }
+}
+
+impl VerifierContext {
+    pub fn new(network: Network, verifier_secret: &str, n_of_n_public_keys: &[PublicKey]) -> Self {
+        let (keypair, public_key) = generate_keys_from_secret(network, verifier_secret);
+        let (n_of_n_public_key, n_of_n_taproot_public_key) =
+            generate_n_of_n_public_key(n_of_n_public_keys);
+
+        VerifierContext {
+            network,
+
+            verifier_keypair: keypair,
+            verifier_public_key: public_key,
+
+            n_of_n_public_keys: n_of_n_public_keys.to_owned(),
+            n_of_n_public_key,
+            n_of_n_taproot_public_key,
+        }
+    }
+}
diff --git a/goat/src/error.rs b/goat/src/error.rs
new file mode 100644
index 000000000..f8786a42a
--- /dev/null
+++ b/goat/src/error.rs
@@ -0,0 +1,48 @@
+use super::transactions::{base::BaseTransaction, pre_signed::PreSignedTransaction};
+use bitcoin::Txid;
+use std::fmt;
+use strum::Display;
+
+#[derive(Debug)]
+pub struct NamedTx {
+    pub txid: Txid,
+    pub name: &'static str,
+    pub confirmed: bool,
+}
+
+impl NamedTx {
+    pub fn for_tx(tx: &(impl BaseTransaction + PreSignedTransaction), confirmed: bool) -> Self {
+        Self {
+            txid: tx.tx().compute_txid(),
+            name: tx.name(),
+            confirmed,
+        }
+    }
+}
+
+#[derive(Debug, Display)]
+pub enum ConnectorError {
+    ConnectorCCommitsPublicKeyEmpty,
+}
+
+#[derive(Debug)]
+pub enum TransactionError {
+    AlreadyMined(Txid),
+}
+
+#[derive(Debug)]
+pub enum ChunkerError {
+    ValidProof,
+}
+
+#[derive(Debug)]
+pub enum Error {
+    Transaction(TransactionError),
+    Chunker(ChunkerError),
+    Connector(ConnectorError),
+    Other(&'static str),
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{:?}", self) }
+}
diff --git a/goat/src/lib.rs b/goat/src/lib.rs
new file mode 100644
index 000000000..a38983de5
--- /dev/null
+++ b/goat/src/lib.rs
@@ -0,0 +1,11 @@
+pub mod connectors;
+pub mod contexts;
+pub mod transactions;
+pub mod commitments;
+pub mod common;
+pub mod constants;
+pub mod error;
+pub mod proof;
+pub mod scripts;
+pub mod serialization;
+pub mod utils;
\ No newline at end of file
diff --git a/goat/src/proof.rs b/goat/src/proof.rs
new file mode 100644
index 000000000..88520ae3b
--- /dev/null
+++ b/goat/src/proof.rs
@@ -0,0 +1,238 @@
+use bitvm::chunk::api::type_conversion_utils::RawProof;
+use ark_bn254::Bn254;
+use ark_serialize::{CanonicalSerialize, CanonicalDeserialize, Compress, Validate};
+
+// TODO
+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_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_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 };
+        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 {
+        let f_sered = tmp_fr_serialization(f);
+        public_inputs_sered.push(f_sered);
+    }
+
+    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()
+}
+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()
+}
+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;
+    
+        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"));
+        }
+        ark_bn254::Fr::from_bigint(BigInt(arr)).unwrap()
+    }
+
+    let buffer: Vec<Vec<u8>> = bincode::deserialize(&buffer).unwrap();
+    let mut pubin= vec![];
+    for i in 0..buffer.len() {
+        let f = tmp_fr_deserialization(buffer[i].clone());
+        pubin.push(f);
+    }
+    pubin
+}
+
+#[test]
+fn verify_zkm2_proof() {
+    /// TODO: Update NUM_PUBS, NUM_256, NUM_160, mock_proof
+    /// NUM_PUBS = 2
+    /// NUM_256 = 14
+    /// 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_U160, PublicKeys,
+        api_generate_partial_script, api_generate_full_tapscripts,
+        generate_signatures, validate_assertions,
+    };
+    use bitvm::signatures::wots_api::{wots160, wots256};
+    fn get_pubkeys(secret_key: Vec<String>) -> PublicKeys {
+        let mut pubins = vec![];
+        for i in 0..NUM_PUBS {
+            pubins.push(wots256::generate_public_key(secret_key[i].as_str()));
+        }
+        let mut fq_arr = vec![];
+        for i in 0..NUM_U256 {
+            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_U160 {
+            let p160 = wots160::generate_public_key(secret_key[i+NUM_PUBS+NUM_U256].as_str());
+            h_arr.push(p160);
+        }
+        let wotspubkey: PublicKeys = (
+            pubins.try_into().unwrap(),
+            fq_arr.try_into().unwrap(),
+            h_arr.try_into().unwrap(),
+        );
+        wotspubkey
+    }
+
+    let proof_file = "ark-bin/proof.bin";
+    let vk_file = "ark-bin/vkey.bin";
+    let pubin_file = "ark-bin/pubin.bin";
+
+    let proof_bin = std::fs::read(proof_file).unwrap();
+    let vk_bin = std::fs::read(vk_file).unwrap();
+    let pubin_bin = std::fs::read(pubin_file).unwrap();
+
+    let ark_proof = deserialize_proof(proof_bin);
+    let ark_vkey = deserialize_vk(vk_bin);
+    let ark_public_inputs = deserialize_pubin(pubin_bin);
+
+    println!("STEP 1 GENERATE TAPSCRIPTS");
+    let secret_key: &str = "a138982ce17ac813d505a5b40b665d404e9528e7";
+    let secrets = (0..NUM_PUBS+NUM_U256+NUM_U160).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();
+    println!("num assertion; 256-bit numbers {}", NUM_PUBS + NUM_U256);
+    println!("num assertion; 160-bit numbers {}", NUM_U160);
+
+    println!("STEP 3 VALIDATE SIGNED ASSERTIONS");
+    let validate_res = validate_assertions(&ark_vkey, proof_sigs, pubkeys, &disprove_scripts.try_into().unwrap());
+    assert!(validate_res.is_none());
+}
+
+#[test]
+fn read_bin() {
+    use ark_groth16::{r1cs_to_qap::LibsnarkReduction, Groth16};
+
+    let proof_file = "ark-bin/proof.bin";
+    let vk_file = "ark-bin/vkey.bin";
+    let pubin_file = "ark-bin/pubin.bin";
+
+    let proof_bin = std::fs::read(proof_file).unwrap();
+    let vk_bin = std::fs::read(vk_file).unwrap();
+    let pubin_bin = std::fs::read(pubin_file).unwrap();
+
+    let ark_proof = deserialize_proof(proof_bin);
+    let ark_vkey = deserialize_vk(vk_bin);
+    let ark_public_inputs = deserialize_pubin(pubin_bin);
+
+    dbg!(&ark_proof);
+    dbg!(&ark_vkey);
+    dbg!(&ark_public_inputs);
+
+    let ok = Groth16::<Bn254, LibsnarkReduction>::verify_proof(&ark_vkey.into(), &ark_proof, &ark_public_inputs)
+    .unwrap();
+    assert!(ok);
+}
+
+#[test]
+fn genearte_test_proof() {
+    use ark_bn254::Bn254;
+    use ark_crypto_primitives::snark::{CircuitSpecificSetupSNARK, SNARK};
+    use ark_ec::pairing::Pairing;
+    use ark_ff::PrimeField;
+    use ark_groth16::Groth16;
+    use ark_relations::lc;
+    use ark_relations::r1cs::{ConstraintSynthesizer, ConstraintSystemRef, SynthesisError};
+    use ark_std::{test_rng, UniformRand};
+    use rand::{RngCore, SeedableRng};
+
+    #[derive(Copy)]
+    pub struct DummyCircuit<F: PrimeField> {
+        pub a: Option<F>,
+        pub b: Option<F>,
+        pub num_variables: usize,
+        pub num_constraints: usize,
+    }
+    
+    impl<F: PrimeField> Clone for DummyCircuit<F> {
+        fn clone(&self) -> Self {
+            DummyCircuit {
+                a: self.a,
+                b: self.b,
+                num_variables: self.num_variables,
+                num_constraints: self.num_constraints,
+            }
+        }
+    }
+    
+    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))?;
+            let b = cs.new_witness_variable(|| self.b.ok_or(SynthesisError::AssignmentMissing))?;
+            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))?;
+            }
+    
+            for _ in 0..self.num_constraints - 1 {
+                cs.enforce_constraint(lc!() + a, lc!() + b, lc!() + c)?;
+            }
+    
+            cs.enforce_constraint(lc!(), lc!(), lc!())?;
+    
+            Ok(())
+        }
+    }
+
+    type E = Bn254;
+    let k = 6;
+    let mut rng = ark_std::rand::rngs::StdRng::seed_from_u64(test_rng().next_u64());
+    let circuit = DummyCircuit::<<E as Pairing>::ScalarField> {
+        a: Some(<E as Pairing>::ScalarField::rand(&mut rng)),
+        b: Some(<E as Pairing>::ScalarField::rand(&mut rng)),
+        num_variables: 10,
+        num_constraints: 1 << k,
+    };
+    let (pk, vk) = Groth16::<E>::setup(circuit, &mut rng).unwrap();
+
+    let c = circuit.a.unwrap() * circuit.b.unwrap();
+
+    let proof = Groth16::<E>::prove(&pk, circuit, &mut rng).unwrap();
+
+    let proof_bin = serialize_proof(proof);
+    let vk_bin = serialize_vk(vk);
+    let pubin_bin = serialize_pubin(vec![c]);
+
+    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
new file mode 100644
index 000000000..8d4881aeb
--- /dev/null
+++ b/goat/src/scripts.rs
@@ -0,0 +1,160 @@
+use bitcoin::{
+    hashes::{ripemd160::Hash as Ripemd160, sha256::Hash as Sha256, Hash},
+    Address, CompressedPublicKey, Network, PubkeyHash, PublicKey, ScriptBuf, XOnlyPublicKey,
+};
+use bitvm::treepp::script;
+use std::{str::FromStr, sync::LazyLock};
+
+// TODO replace these public keys
+pub static UNSPENDABLE_PUBLIC_KEY: LazyLock<PublicKey> = LazyLock::new(|| {
+    PublicKey::from_str(
+        "0405f818748aecbc8c67a4e61a03cee506888f49480cf343363b04908ed51e25b9615f244c38311983fb0f5b99e3fd52f255c5cc47a03ee2d85e78eaf6fa76bb9d"
+    )
+    .unwrap()
+});
+pub static UNSPENDABLE_TAPROOT_PUBLIC_KEY: LazyLock<XOnlyPublicKey> = LazyLock::new(|| {
+    XOnlyPublicKey::from_str("50929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0")
+        .unwrap()
+});
+
+pub fn generate_burn_script() -> ScriptBuf {
+    generate_pay_to_pubkey_script(&UNSPENDABLE_PUBLIC_KEY)
+}
+
+pub fn generate_burn_script_address(network: Network) -> Address {
+    Address::p2wsh(&generate_burn_script(), network)
+}
+
+pub fn generate_burn_taproot_script() -> ScriptBuf {
+    generate_pay_to_pubkey_taproot_script(&UNSPENDABLE_TAPROOT_PUBLIC_KEY)
+}
+
+pub fn generate_pay_to_pubkey_script(public_key: &PublicKey) -> ScriptBuf {
+    script! {
+        { *public_key }
+        OP_CHECKSIG
+    }
+    .compile()
+}
+
+pub fn generate_pay_to_pubkey_hash_with_inscription_script(
+    public_key_hash: &PubkeyHash,
+    timestamp: u32,
+    evm_address: &str,
+) -> ScriptBuf {
+    let inscription = [
+        public_key_hash.as_byte_array().to_vec(),
+        timestamp.to_be_bytes().to_vec(),
+        evm_address.as_bytes().to_vec(),
+    ]
+    .concat();
+    let inscription_hash = Ripemd160::hash(&Sha256::hash(&inscription).to_byte_array());
+    script! {
+        OP_FALSE
+        OP_IF
+        { inscription_hash.to_byte_array().to_vec() }
+        OP_ENDIF
+        OP_DUP
+        OP_HASH160
+        { public_key_hash.as_byte_array().to_vec() }
+        OP_EQUALVERIFY
+        OP_CHECKSIG
+    }
+    .compile()
+}
+
+pub fn generate_p2pkh_address(network: Network, public_key: &PublicKey) -> Address {
+    Address::p2pkh(
+        CompressedPublicKey::try_from(*public_key).expect("Could not compress public key"),
+        network,
+    )
+}
+
+pub fn generate_p2wpkh_address(network: Network, public_key: &PublicKey) -> Address {
+    Address::p2wpkh(
+        &CompressedPublicKey::try_from(*public_key).expect("Could not compress public key"),
+        network,
+    )
+}
+
+pub fn generate_pay_to_pubkey_script_address(network: Network, public_key: &PublicKey) -> Address {
+    Address::p2wsh(&generate_pay_to_pubkey_script(public_key), network)
+}
+
+pub fn generate_pay_to_pubkey_hash_with_inscription_script_address(
+    network: Network,
+    public_key_hash: &PubkeyHash,
+    timestamp: u32,
+    evm_address: &str,
+) -> Address {
+    Address::p2wsh(
+        &generate_pay_to_pubkey_hash_with_inscription_script(
+            public_key_hash,
+            timestamp,
+            evm_address,
+        ),
+        network,
+    )
+}
+
+pub fn generate_pay_to_pubkey_taproot_script(public_key: &XOnlyPublicKey) -> ScriptBuf {
+    script! {
+        { *public_key }
+        OP_CHECKSIG
+    }
+    .compile()
+}
+
+pub fn generate_pay_to_pubkey_taproot_script_address(
+    network: Network,
+    public_key: &XOnlyPublicKey,
+) -> Address {
+    Address::p2wsh(&generate_pay_to_pubkey_taproot_script(public_key), network)
+}
+
+pub fn generate_timelock_script(public_key: &PublicKey, num_blocks_timelock: u32) -> ScriptBuf {
+    script! {
+      { num_blocks_timelock }
+      OP_CSV
+      OP_DROP
+      { *public_key }
+      OP_CHECKSIG
+    }
+    .compile()
+}
+
+pub fn generate_timelock_script_address(
+    network: Network,
+    public_key: &PublicKey,
+    num_blocks_timelock: u32,
+) -> Address {
+    Address::p2wsh(
+        &generate_timelock_script(public_key, num_blocks_timelock),
+        network,
+    )
+}
+
+pub fn generate_timelock_taproot_script(
+    public_key: &XOnlyPublicKey,
+    num_blocks_timelock: u32,
+) -> ScriptBuf {
+    script! {
+      { num_blocks_timelock }
+      OP_CSV
+      OP_DROP
+      { *public_key }
+      OP_CHECKSIG
+    }
+    .compile()
+}
+
+pub fn generate_timelock_taproot_script_address(
+    network: Network,
+    public_key: &XOnlyPublicKey,
+    num_blocks_timelock: u32,
+) -> Address {
+    Address::p2wsh(
+        &generate_timelock_taproot_script(public_key, num_blocks_timelock),
+        network,
+    )
+}
diff --git a/src/bridge/serialization.rs b/goat/src/serialization.rs
similarity index 84%
rename from src/bridge/serialization.rs
rename to goat/src/serialization.rs
index a14e178be..bed807c7c 100644
--- a/src/bridge/serialization.rs
+++ b/goat/src/serialization.rs
@@ -15,6 +15,6 @@ where
 {
     match serde_json::from_str::<T>(data) {
         Ok(x) => Ok(x),
-        Err(err) => Err(format!("Failed to parse json: {}", err.to_string())),
+        Err(err) => Err(format!("Failed to parse json: {}", err)),
     }
 }
diff --git a/goat/src/transactions/assert/assert_commit_1.rs b/goat/src/transactions/assert/assert_commit_1.rs
new file mode 100644
index 000000000..f6bb29630
--- /dev/null
+++ b/goat/src/transactions/assert/assert_commit_1.rs
@@ -0,0 +1,128 @@
+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::signing::populate_taproot_input_witness;
+
+use super::{
+    super::{
+        super::connectors::{base::*, connector_f_1::ConnectorF1},
+        base::*,
+        pre_signed::*,
+    },
+    utils::AssertCommit1ConnectorsE,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertCommit1Transaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+}
+
+impl PreSignedTransaction for AssertCommit1Transaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl AssertCommit1Transaction {
+    pub fn new(
+        connectors_e: &AssertCommit1ConnectorsE,
+        connector_f_1: &ConnectorF1,
+        tx_inputs: Vec<Input>,
+    ) -> Self {
+        assert_eq!(
+            tx_inputs.len(),
+            connectors_e.connectors_num(),
+            "inputs and connectors e don't match"
+        );
+
+        Self::new_for_validation(connectors_e, connector_f_1, tx_inputs)
+    }
+
+    pub fn new_for_validation(
+        connectors_e: &AssertCommit1ConnectorsE,
+        connector_f_1: &ConnectorF1,
+        tx_inputs: Vec<Input>,
+    ) -> Self {
+        let mut inputs = vec![];
+        let mut prev_outs = vec![];
+        let mut prev_scripts = vec![];
+        let mut total_output_amount = Amount::from_sat(0);
+
+        for (connector_e, input) in (0..connectors_e.connectors_num())
+            .map(|idx| connectors_e.get_connector_e(idx))
+            .zip(tx_inputs)
+        {
+            inputs.push(connector_e.generate_taproot_leaf_tx_in(0, &input));
+            prev_outs.push(TxOut {
+                value: input.amount,
+                script_pubkey: connector_e.generate_taproot_address().script_pubkey(),
+            });
+            prev_scripts.push(connector_e.generate_taproot_leaf_script(0));
+            total_output_amount += input.amount;
+        }
+        total_output_amount -= Amount::from_sat(MIN_RELAY_FEE_ASSERT_COMMIT1);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: connector_f_1.generate_address().script_pubkey(),
+        };
+
+        AssertCommit1Transaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: inputs,
+                output: vec![_output_0],
+            },
+            prev_outs,
+            prev_scripts,
+        }
+    }
+
+    pub fn sign(&mut self, connectors_e: &AssertCommit1ConnectorsE, witnesses: Vec<RawWitness>) {
+        assert_eq!(witnesses.len(), connectors_e.connectors_num());
+        for (input_index, witness) in (0..connectors_e.connectors_num()).zip(witnesses) {
+            let taproot_spend_info = connectors_e
+                .get_connector_e(input_index)
+                .generate_taproot_spend_info();
+            let script = &self.prev_scripts()[input_index].clone();
+            let res = execute_raw_script_with_inputs(script.clone().to_bytes(), witness.clone());
+            assert!(
+                res.success,
+                "script: {:?}, res: {:?}: stack: {:?}, variable name: {:?}",
+                script,
+                res,
+                res.final_stack,
+                connectors_e
+                    .get_connector_e(input_index)
+                    .commitment_public_keys
+                    .keys()
+            );
+            populate_taproot_input_witness(
+                self.tx_mut(),
+                input_index,
+                &taproot_spend_info,
+                script,
+                witness,
+            );
+        }
+    }
+
+    pub fn merge(&mut self, assert_commit_1: &AssertCommit1Transaction) {
+        merge_transactions(&mut self.tx, &assert_commit_1.tx);
+    }
+}
+
+impl BaseTransaction for AssertCommit1Transaction {
+    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "AssertCommit1" }
+}
diff --git a/goat/src/transactions/assert/assert_commit_2.rs b/goat/src/transactions/assert/assert_commit_2.rs
new file mode 100644
index 000000000..2987d5849
--- /dev/null
+++ b/goat/src/transactions/assert/assert_commit_2.rs
@@ -0,0 +1,131 @@
+use bitcoin::{absolute, consensus, Amount, ScriptBuf, Transaction, TxOut};
+use serde::{Deserialize, Serialize};
+
+use bitvm::{ 
+    chunk::api::type_conversion_utils::RawWitness, execute_raw_script_with_inputs
+};
+
+use crate::transactions::signing::populate_taproot_input_witness;
+
+use super::{
+    super::{
+        super::connectors::{base::*, connector_f_2::ConnectorF2},
+        base::*,
+        pre_signed::*,
+    },
+    utils::AssertCommit2ConnectorsE,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertCommit2Transaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+}
+
+impl PreSignedTransaction for AssertCommit2Transaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl AssertCommit2Transaction {
+    pub fn new(
+        connectors_e: &AssertCommit2ConnectorsE,
+        connector_f_2: &ConnectorF2,
+        tx_inputs: Vec<Input>,
+    ) -> Self {
+        assert_eq!(
+            tx_inputs.len(),
+            connectors_e.connectors_num(),
+            "inputs and connectors e don't match"
+        );
+
+        Self::new_for_validation(connectors_e, connector_f_2, tx_inputs)
+    }
+
+    pub fn new_for_validation(
+        connectors_e: &AssertCommit2ConnectorsE,
+        connector_f_2: &ConnectorF2,
+        tx_inputs: Vec<Input>,
+    ) -> Self {
+        let mut inputs = vec![];
+        let mut prev_outs = vec![];
+        let mut prev_scripts = vec![];
+        let mut total_output_amount = Amount::from_sat(0);
+
+        for (connector_e, input) in (0..connectors_e.connectors_num())
+            .map(|idx| connectors_e.get_connector_e(idx))
+            .zip(tx_inputs)
+        {
+            inputs.push(connector_e.generate_taproot_leaf_tx_in(0, &input));
+            prev_outs.push(TxOut {
+                value: input.amount,
+                script_pubkey: connector_e.generate_taproot_address().script_pubkey(),
+            });
+            prev_scripts.push(connector_e.generate_taproot_leaf_script(0));
+            total_output_amount += input.amount;
+        }
+        total_output_amount -= Amount::from_sat(MIN_RELAY_FEE_ASSERT_COMMIT2);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: connector_f_2.generate_address().script_pubkey(),
+        };
+
+        AssertCommit2Transaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: inputs,
+                output: vec![_output_0],
+            },
+            prev_outs,
+            prev_scripts,
+        }
+    }
+
+    pub fn sign(&mut self, connectors_e: &AssertCommit2ConnectorsE, witnesses: Vec<RawWitness>) {
+        assert_eq!(witnesses.len(), connectors_e.connectors_num());
+        for (input_index, witness) in (0..connectors_e.connectors_num()).zip(witnesses) {
+            let taproot_spend_info = connectors_e
+                .get_connector_e(input_index)
+                .generate_taproot_spend_info();
+            let script = &self.prev_scripts()[input_index].clone();
+            let res = execute_raw_script_with_inputs(script.clone().to_bytes(), witness.clone());
+            assert!(
+                res.success,
+                "script: {:?}, res: {:?}: stack: {:?}, variable name: {:?}",
+                script,
+                res,
+                res.final_stack,
+                connectors_e
+                    .get_connector_e(input_index)
+                    .commitment_public_keys
+                    .keys()
+            );
+            populate_taproot_input_witness(
+                self.tx_mut(),
+                input_index,
+                &taproot_spend_info,
+                script,
+                witness,
+            );
+        }
+    }
+
+    pub fn merge(&mut self, assert_commit_2: &AssertCommit2Transaction) {
+        merge_transactions(&mut self.tx, &assert_commit_2.tx);
+    }
+}
+
+impl BaseTransaction for AssertCommit2Transaction {
+    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "AssertCommit2" }
+}
diff --git a/goat/src/transactions/assert/assert_final.rs b/goat/src/transactions/assert/assert_final.rs
new file mode 100644
index 000000000..417bf76f6
--- /dev/null
+++ b/goat/src/transactions/assert/assert_final.rs
@@ -0,0 +1,245 @@
+use bitcoin::{
+    absolute, consensus, Amount, EcdsaSighashType, PublicKey, ScriptBuf, TapSighashType,
+    Transaction, TxOut,
+};
+use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+use super::{
+    super::{
+        super::{
+            connectors::{
+                base::*, connector_4::Connector4, connector_5::Connector5, connector_c::ConnectorC, connector_d::ConnectorD,
+            },
+            contexts::{base::BaseContext, verifier::VerifierContext, operator::OperatorContext},
+            transactions::base::DUST_AMOUNT,
+        },
+        base::*,
+        pre_signed::*,
+        pre_signed_musig2::*,
+    },
+    utils::AssertCommitConnectorsF,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertFinalTransaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+
+    musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
+    musig2_nonce_signatures: HashMap<usize, HashMap<PublicKey, Signature>>,
+    musig2_signatures: HashMap<usize, HashMap<PublicKey, PartialSignature>>,
+}
+
+impl PreSignedTransaction for AssertFinalTransaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    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_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &mut self.musig2_nonces
+    }
+    fn musig2_nonce_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, Signature>> {
+        &self.musig2_nonce_signatures
+    }
+    fn musig2_nonce_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, Signature>> {
+        &mut self.musig2_nonce_signatures
+    }
+    fn musig2_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &self.musig2_signatures
+    }
+    fn musig2_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &mut self.musig2_signatures
+    }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0] }
+}
+
+impl AssertFinalTransaction {
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        context: &OperatorContext,
+        connector_4: &Connector4,
+        connector_5: &Connector5,
+        connector_c: &ConnectorC,
+        connector_d: &ConnectorD,
+        assert_commit_connectors_f: &AssertCommitConnectorsF,
+        input_0: Input,
+        input_1: Input,
+        input_2: Input,
+    ) -> Self {
+        let mut this = Self::new_for_validation(
+            connector_4,
+            connector_5,
+            connector_c,
+            connector_d,
+            assert_commit_connectors_f,
+            input_0,
+            input_1,
+            input_2,
+        );
+
+        this.sign_commit_inputs(context);
+
+        this
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn new_for_validation(
+        connector_4: &Connector4,
+        connector_5: &Connector5,
+        connector_c: &ConnectorC,
+        connector_d: &ConnectorD,
+        assert_commit_connectors_f: &AssertCommitConnectorsF,
+        input_0: Input,
+        input_1: Input,
+        input_2: Input,
+    ) -> Self {
+        let input_0_leaf = 0;
+        let _input_0 = connector_d.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
+
+        // simple inputs from assert_commit txs
+        let _input_1 = assert_commit_connectors_f
+            .connector_f_1
+            .generate_tx_in(&input_1);
+        let _input_2 = assert_commit_connectors_f
+            .connector_f_2
+            .generate_tx_in(&input_2);
+
+        let total_output_amount = input_1.amount + input_2.amount + input_0.amount
+            - Amount::from_sat(MIN_RELAY_FEE_ASSERT_FINAL);
+
+        // goes to take_2 tx
+        let _output_0 = TxOut {
+            value: Amount::from_sat(DUST_AMOUNT),
+            script_pubkey: connector_4.generate_address().script_pubkey(),
+        };
+
+        // goes to take_2 tx or disprove tx
+        let _output_1 = TxOut {
+            value: total_output_amount - Amount::from_sat(DUST_AMOUNT) * 2,
+            script_pubkey: connector_5.generate_taproot_address().script_pubkey(),
+        };
+
+        // goes to take_2 tx or disprove tx
+        let _output_2 = TxOut {
+            value: Amount::from_sat(DUST_AMOUNT),
+            script_pubkey: connector_c.generate_taproot_address().script_pubkey(),
+        };
+
+        AssertFinalTransaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0, _input_1, _input_2],
+                output: vec![_output_0, _output_1, _output_2],
+            },
+            prev_outs: vec![
+                TxOut {
+                    value: input_0.amount,
+                    script_pubkey: connector_d.generate_taproot_address().script_pubkey(),
+                },
+                TxOut {
+                    value: input_1.amount,
+                    script_pubkey: assert_commit_connectors_f
+                        .connector_f_1
+                        .generate_address()
+                        .script_pubkey(),
+                },
+                TxOut {
+                    value: input_2.amount,
+                    script_pubkey: assert_commit_connectors_f
+                        .connector_f_2
+                        .generate_address()
+                        .script_pubkey(),
+                },
+            ],
+            prev_scripts: vec![
+                connector_d.generate_taproot_leaf_script(input_0_leaf),
+                assert_commit_connectors_f.connector_f_1.generate_script(),
+                assert_commit_connectors_f.connector_f_2.generate_script(),
+            ],
+            musig2_nonces: HashMap::new(),
+            musig2_nonce_signatures: HashMap::new(),
+            musig2_signatures: HashMap::new(),
+        }
+    }
+
+    fn sign_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_d: &ConnectorD,
+        secret_nonce: &SecNonce,
+    ) {
+        let input_index = 0;
+        pre_sign_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            secret_nonce,
+        );
+
+        // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
+        if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
+            self.finalize_input_0(context, connector_d);
+        }
+    }
+
+    fn sign_commit_inputs(&mut self, context: &OperatorContext) {
+        let input_indexes = [1, 2];
+        for input_index in input_indexes {
+            pre_sign_p2wsh_input(
+                self,
+                input_index,
+                EcdsaSighashType::All,
+                &vec![&context.operator_keypair],
+            );
+        }
+    }
+
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_d: &ConnectorD) {
+        let input_index = 0;
+        finalize_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            connector_d.generate_taproot_spend_info(),
+        );
+    }
+
+    pub fn pre_sign(
+        &mut self,
+        context: &VerifierContext,
+        connector_d: &ConnectorD,
+        secret_nonces: &HashMap<usize, SecNonce>,
+    ) {
+        let input_index = 0;
+        self.sign_input_0(context, connector_d, &secret_nonces[&input_index]);
+    }
+
+    pub fn merge(&mut self, assert: &AssertFinalTransaction) {
+        merge_transactions(&mut self.tx, &assert.tx);
+        merge_musig2_nonces_and_signatures(self, assert);
+    }
+}
+
+impl BaseTransaction for AssertFinalTransaction {
+    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
new file mode 100644
index 000000000..278ed1853
--- /dev/null
+++ b/goat/src/transactions/assert/assert_initial.rs
@@ -0,0 +1,150 @@
+use bitcoin::{
+    absolute, consensus, Amount, ScriptBuf, TapSighashType, Transaction, TxOut,
+};
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{
+        super::{
+            connectors::{base::*, connector_b::ConnectorB, connector_d::ConnectorD},
+            contexts::operator::OperatorContext,
+            transactions::base::DUST_AMOUNT,
+        },
+        base::*,
+        pre_signed::*,
+    },
+    utils::{AssertCommit1ConnectorsE, AssertCommit2ConnectorsE},
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertInitialTransaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+}
+
+impl PreSignedTransaction for AssertInitialTransaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl AssertInitialTransaction {
+    pub fn new(
+        context: &OperatorContext,
+        connector_b: &ConnectorB,
+        connector_d: &ConnectorD,
+        assert_commit1_connectors_e: &AssertCommit1ConnectorsE,
+        assert_commit2_connectors_e: &AssertCommit2ConnectorsE,
+        input_0: Input,
+    ) -> Self {
+        let mut this = Self::new_for_validation(
+            connector_b,
+            connector_d,
+            assert_commit1_connectors_e,
+            assert_commit2_connectors_e,
+            input_0,
+        );
+
+        this.sign_input_0(&context, &connector_b);
+
+        this
+    }
+
+    pub fn new_for_validation(
+        connector_b: &ConnectorB,
+        connector_d: &ConnectorD,
+        assert_commit1_connectors_e: &AssertCommit1ConnectorsE,
+        assert_commit2_connectors_e: &AssertCommit2ConnectorsE,
+        input_0: Input,
+    ) -> Self {
+        let input_0_leaf = 0;
+        let _input_0 = connector_b.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
+
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_ASSERT_INITIAL);
+
+        let assert_commit1_expense = Amount::from_sat(
+            MIN_RELAY_FEE_ASSERT_COMMIT1
+                + assert_commit1_connectors_e.connectors_num() as u64 * DUST_AMOUNT,
+        );
+        let assert_commit2_expense = Amount::from_sat(
+            MIN_RELAY_FEE_ASSERT_COMMIT2
+                + assert_commit2_connectors_e.connectors_num() as u64 * DUST_AMOUNT,
+        );
+        // goes to assert_final
+        let _output_0 = TxOut {
+            value: total_output_amount - assert_commit1_expense - assert_commit2_expense,
+            script_pubkey: connector_d.generate_taproot_address().script_pubkey(),
+        };
+
+        let mut output = vec![_output_0];
+
+        // simple outputs for assert_x txs
+        for i in 0..assert_commit1_connectors_e.connectors_num() {
+            let amount = if i == 0 {
+                MIN_RELAY_FEE_ASSERT_COMMIT1 + DUST_AMOUNT
+            } else {
+                DUST_AMOUNT
+            };
+            output.push(TxOut {
+                value: Amount::from_sat(amount),
+                script_pubkey: assert_commit1_connectors_e
+                    .get_connector_e(i)
+                    .generate_taproot_address()
+                    .script_pubkey(),
+            });
+        }
+
+        // simple outputs for assert_x txs
+        for i in 0..assert_commit2_connectors_e.connectors_num() {
+            let amount = if i == 0 {
+                MIN_RELAY_FEE_ASSERT_COMMIT2 + DUST_AMOUNT
+            } else {
+                DUST_AMOUNT
+            };
+            output.push(TxOut {
+                value: Amount::from_sat(amount),
+                script_pubkey: assert_commit2_connectors_e
+                    .get_connector_e(i)
+                    .generate_taproot_address()
+                    .script_pubkey(),
+            });
+        }
+
+        AssertInitialTransaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0],
+                output,
+            },
+            prev_outs: vec![TxOut {
+                value: input_0.amount,
+                script_pubkey: connector_b.generate_taproot_address().script_pubkey(),
+            }],
+            prev_scripts: vec![connector_b.generate_taproot_leaf_script(input_0_leaf)],
+        }
+    }
+
+    fn sign_input_0(&mut self, context: &OperatorContext, connector_b: &ConnectorB) {
+        let input_index = 0;
+        pre_sign_taproot_input_default(
+            self,
+            input_index,
+            TapSighashType::All,
+            connector_b.generate_taproot_spend_info(),
+            &vec![&context.operator_keypair],
+        );
+    }
+}
+
+impl BaseTransaction for AssertInitialTransaction {
+    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "AssertInitial" }
+}
diff --git a/goat/src/transactions/assert/mod.rs b/goat/src/transactions/assert/mod.rs
new file mode 100644
index 000000000..cb8fd2170
--- /dev/null
+++ b/goat/src/transactions/assert/mod.rs
@@ -0,0 +1,5 @@
+pub mod assert_commit_1;
+pub mod assert_commit_2;
+pub mod assert_final;
+pub mod assert_initial;
+pub mod utils;
diff --git a/goat/src/transactions/assert/utils.rs b/goat/src/transactions/assert/utils.rs
new file mode 100644
index 000000000..026b979de
--- /dev/null
+++ b/goat/src/transactions/assert/utils.rs
@@ -0,0 +1,153 @@
+use serde::{Deserialize, Serialize};
+use std::collections::{BTreeMap, HashMap};
+
+use crate::{
+    commitments::CommitmentMessageId,
+    connectors::{connector_e::ConnectorE, connector_f_1::ConnectorF1, connector_f_2::ConnectorF2},
+};
+
+use bitvm::{
+    chunk::api::{generate_signatures_for_any_proof, type_conversion_utils::{utils_raw_witnesses_from_signatures, RawProof, RawWitness}}, 
+    signatures::signing_winternitz::{WinternitzPublicKey, WinternitzSecret}
+};
+
+/// The number of connector e is related to the number of intermediate values.
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertCommit1ConnectorsE {
+    pub connectors_e: Vec<ConnectorE>,
+}
+
+impl AssertCommit1ConnectorsE {
+    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 commitment_public_keys(
+        &self,
+    ) -> Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>> {
+        self.connectors_e
+            .iter()
+            .map(|connector| connector.commitment_public_keys.clone())
+            .collect()
+    }
+}
+
+/// The number of connector e is related to the number of intermediate values.
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertCommit2ConnectorsE {
+    pub connectors_e: Vec<ConnectorE>,
+}
+
+impl AssertCommit2ConnectorsE {
+    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 commitment_public_keys(
+        &self,
+    ) -> Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>> {
+        self.connectors_e
+            .iter()
+            .map(|connector| connector.commitment_public_keys.clone())
+            .collect()
+    }
+}
+
+pub fn sign_assert_tx_with_groth16_proof(
+    commitment_secrets: &HashMap<CommitmentMessageId, WinternitzSecret>,
+    proof: &RawProof,
+) -> (Vec<RawWitness>, 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)));
+            }
+        });
+    
+    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 raw = utils_raw_witnesses_from_signatures(&sigs);
+
+    let raw1 = raw[0..300].to_vec();
+    let raw2 = raw[300..].to_vec();
+
+    (raw1, raw2)
+}
+
+pub fn groth16_commitment_secrets_to_public_keys(
+    commitment_secrets: &HashMap<CommitmentMessageId, WinternitzSecret>,
+) -> (
+    Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>,
+    Vec<BTreeMap<CommitmentMessageId, WinternitzPublicKey>>,
+) {
+    // hash map to btree map
+    let commitment_secrets: BTreeMap<CommitmentMessageId, WinternitzSecret> =
+        commitment_secrets.clone().into_iter().collect();
+
+    // see the unit test: assigner.rs/test_commitment_size
+    let connectors_e_of_transaction = 300;
+    let mut connector_e1_commitment_public_keys = vec![];
+    let mut connector_e2_commitment_public_keys = vec![];
+
+    let mut secrets_vec = vec![];
+    for (message_id, secret) in commitment_secrets.iter() {
+        if let CommitmentMessageId::Groth16IntermediateValues((name, _)) = message_id {
+            let index = u32::from_str_radix(name, 10).unwrap();
+            secrets_vec.push((index, (message_id, secret)));
+        }
+    }
+
+    secrets_vec.sort_by(|a, b| a.0.cmp(&b.0));
+    for (_, (message_id, secret)) in secrets_vec {
+        let pushing_keys =
+        if connector_e1_commitment_public_keys.len() < connectors_e_of_transaction {
+            &mut connector_e1_commitment_public_keys
+        } else {
+            &mut connector_e2_commitment_public_keys
+        };
+
+        pushing_keys.push(BTreeMap::from([(
+            message_id.clone(),
+            WinternitzPublicKey::from(secret),
+        )]));
+    }
+
+
+
+    assert!(connector_e1_commitment_public_keys.len() <= connectors_e_of_transaction);
+    assert!(connector_e2_commitment_public_keys.len() <= connectors_e_of_transaction);
+    (
+        connector_e1_commitment_public_keys,
+        connector_e2_commitment_public_keys,
+    )
+}
+
+pub fn merge_to_connector_c_commits_public_key(
+    connector_e1_commitment_public_keys: &[BTreeMap<CommitmentMessageId, WinternitzPublicKey>],
+    connector_e2_commitment_public_keys: &[BTreeMap<CommitmentMessageId, WinternitzPublicKey>],
+) -> BTreeMap<CommitmentMessageId, WinternitzPublicKey> {
+    let mut connector_c_commitment_public_keys = BTreeMap::new();
+    for tree in connector_e1_commitment_public_keys {
+        for (message, pk) in tree {
+            connector_c_commitment_public_keys.insert(message.clone(), pk.clone());
+        }
+    }
+    for tree in connector_e2_commitment_public_keys {
+        for (message, pk) in tree {
+            connector_c_commitment_public_keys.insert(message.clone(), pk.clone());
+        }
+    }
+    connector_c_commitment_public_keys
+}
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct AssertCommitConnectorsF {
+    pub connector_f_1: ConnectorF1,
+    pub connector_f_2: ConnectorF2,
+}
diff --git a/goat/src/transactions/base.rs b/goat/src/transactions/base.rs
new file mode 100644
index 000000000..cfb03444f
--- /dev/null
+++ b/goat/src/transactions/base.rs
@@ -0,0 +1,302 @@
+use super::pre_signed_musig2::{verify_public_nonce, PreSignedMusig2Transaction};
+use bitcoin::{Amount, OutPoint, PublicKey, Script, Transaction, Txid, XOnlyPublicKey};
+use bitcoin::policy::{DEFAULT_MIN_RELAY_TX_FEE, DUST_RELAY_TX_FEE};
+use core::cmp;
+use itertools::Itertools;
+use musig2::{secp256k1::schnorr::Signature, PubNonce};
+use std::collections::HashMap;
+
+pub const CROWDFUNDING_AMOUNT: f64 = 1.0; //1 btc
+pub const FEE_AMOUNT: u64 = 10_000;
+// 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;
+
+// set reward percentage as 2% of peg in deposit
+pub const REWARD_PRECISION: u64 = 1000;
+pub const REWARD_MULTIPLIER: u64 = 20;
+
+pub const MIN_RELAY_FEE_ASSERT_SET: u64 = MIN_RELAY_FEE_ASSERT_INITIAL
+    + MIN_RELAY_FEE_ASSERT_COMMIT1
+    + MIN_RELAY_FEE_ASSERT_COMMIT2
+    + MIN_RELAY_FEE_ASSERT_FINAL;
+// use largest fee from each depth
+// assert fee is big enough to cover disprove chain or take 1
+// disprove fee is big enough to cover take 2
+pub const PEG_OUT_FEE: u64 = MIN_RELAY_FEE_PEG_OUT_CONFIRM // depth 0
+    + MIN_RELAY_FEE_KICK_OFF // depth 1
+    + MIN_RELAY_FEE_ASSERT_SET // depth 2
+    + MIN_RELAY_FEE_DISPROVE; // depth 3
+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] }
+
+// TODO: set to larger value to be compatible with future tx modifications
+pub const RELAY_FEE_BUFFER_MULTIPLIER: f32 = 1.0;
+pub const MIN_RELAY_FEE_KICK_OFF: u64 = relay_fee(6231);
+pub const MIN_RELAY_FEE_TAKE_1: u64 = relay_fee(380);
+pub const MIN_RELAY_FEE_TAKE_2: u64 = relay_fee(347);
+pub const MIN_RELAY_FEE_PEG_IN_DEPOSIT: u64 = relay_fee(122);
+pub const MIN_RELAY_FEE_PEG_IN_CONFIRM: u64 = relay_fee(173);
+pub const MIN_RELAY_FEE_PEG_IN_REFUND: u64 = relay_fee(138);
+pub const MIN_RELAY_FEE_PEG_OUT_CONFIRM: u64 = relay_fee(122);
+pub const MIN_RELAY_FEE_ASSERT: u64 = relay_fee(232);
+pub const MIN_RELAY_FEE_ASSERT_INITIAL: u64 = relay_fee(48953);
+pub const MIN_RELAY_FEE_ASSERT_COMMIT1: u64 = relay_fee(739137);
+pub const MIN_RELAY_FEE_ASSERT_COMMIT2: u64 = relay_fee(470440);
+pub const MIN_RELAY_FEE_ASSERT_FINAL: u64 = relay_fee(352);
+pub const MIN_RELAY_FEE_CHALLENGE: u64 = relay_fee(317);
+pub const MIN_RELAY_FEE_DISPROVE: u64 = relay_fee(1000000);
+
+pub struct Input {
+    pub outpoint: OutPoint,
+    pub amount: Amount,
+}
+
+pub struct InputWithScript<'a> {
+    pub outpoint: OutPoint,
+    pub amount: Amount,
+    pub script: &'a Script,
+}
+
+pub trait BaseTransaction {
+    fn name(&self) -> &'static str;
+    // fn initialize(&mut self, context: &dyn BaseContext);
+
+    // TODO: Use musig2 to aggregate signatures
+    // fn pre_sign(&mut self, context: &dyn BaseContext);
+
+    // TODO: Implement default that goes through all leaves and checks if one of them is executable
+    // TODO: Return a Result with an Error in case the witness can't be created
+    fn finalize(&self) -> Transaction;
+}
+
+pub const fn relay_fee(vsize: usize) -> u64 {
+    (vsize as f32 * RELAY_FEE_BUFFER_MULTIPLIER) as u64 * MIN_RELAY_FEE_RATE
+}
+
+pub fn merge_transactions(
+    destination_transaction: &mut Transaction,
+    source_transaction: &Transaction,
+) {
+    for i in destination_transaction.input.len()..source_transaction.input.len() {
+        destination_transaction
+            .input
+            .push(source_transaction.input[i].clone());
+    }
+
+    for i in 0..cmp::min(
+        destination_transaction.input.len(),
+        source_transaction.input.len(),
+    ) {
+        // TODO: takes longer witness data but should combine both
+        // TODO: merge signatures after Musig2 feature is ready
+        if destination_transaction.input[i].witness.len()
+            < source_transaction.input[i].witness.len()
+        {
+            destination_transaction.input[i].witness = source_transaction.input[i].witness.clone();
+        }
+    }
+
+    for i in destination_transaction.output.len()..source_transaction.output.len() {
+        destination_transaction
+            .output
+            .push(source_transaction.output[i].clone());
+    }
+}
+
+// assumes source_transaction is the latest
+pub fn merge_musig2_nonces_and_signatures(
+    destination_transaction: &mut dyn PreSignedMusig2Transaction,
+    source_transaction: &dyn PreSignedMusig2Transaction,
+) {
+    let nonces = destination_transaction.musig2_nonces_mut();
+    merge_hash_maps(nonces, source_transaction.musig2_nonces().clone());
+
+    let nonce_signatures = destination_transaction.musig2_nonce_signatures_mut();
+    merge_hash_maps(
+        nonce_signatures,
+        source_transaction.musig2_nonce_signatures().clone(),
+    );
+
+    let signatures = destination_transaction.musig2_signatures_mut();
+    merge_hash_maps(signatures, source_transaction.musig2_signatures().clone());
+}
+
+// merge the nonce/signature hashmaps. We can't just do a.extend(b) since that would just overwrite the inner
+// hashmap rather than merging it
+fn merge_hash_maps<T: Clone>(
+    a: &mut HashMap<usize, HashMap<PublicKey, T>>,
+    b: HashMap<usize, HashMap<PublicKey, T>>,
+) {
+    let all_keys = a
+        .keys()
+        .chain(b.keys())
+        .unique()
+        .cloned()
+        .collect::<Vec<_>>();
+    for key in all_keys {
+        let q = a.entry(key).or_default();
+        let w = b.get(&key).cloned().unwrap_or(HashMap::new());
+        q.extend(w.clone());
+    }
+}
+
+pub fn validate_transaction(
+    transaction: &Transaction,
+    comparison_transaction: &Transaction,
+) -> bool {
+    for i in 0..comparison_transaction.input.len() {
+        if transaction.input[i].previous_output != comparison_transaction.input[i].previous_output
+            || transaction.input[i].script_sig != comparison_transaction.input[i].script_sig
+            || transaction.input[i].sequence != comparison_transaction.input[i].sequence
+        {
+            println!(
+                "Input mismatch on transaction: {} input index: {}",
+                transaction.compute_txid(),
+                i
+            );
+            return false;
+        }
+    }
+
+    for i in 0..comparison_transaction.output.len() {
+        if transaction.output[i].value != comparison_transaction.output[i].value
+            || transaction.output[i].script_pubkey != comparison_transaction.output[i].script_pubkey
+        {
+            println!(
+                "Output mismatch on transaction: {} output index: {}",
+                transaction.compute_txid(),
+                i
+            );
+            return false;
+        }
+    }
+
+    true
+}
+
+fn verify_public_nonces(
+    all_nonces: &HashMap<usize, HashMap<PublicKey, PubNonce>>,
+    all_sigs: &HashMap<usize, HashMap<PublicKey, Signature>>,
+    txid: Txid,
+) -> bool {
+    let mut ret_val = true;
+
+    for (i, nonces) in all_nonces {
+        for (pubkey, nonce) in nonces {
+            if !verify_public_nonce(&all_sigs[i][pubkey], nonce, &XOnlyPublicKey::from(*pubkey)) {
+                eprintln!(
+                    "Failed to verify public nonce for pubkey {pubkey} on tx:input {txid}:{i}."
+                );
+                ret_val = false;
+            }
+        }
+    }
+
+    ret_val
+}
+
+pub fn verify_public_nonces_for_tx(tx: &impl PreSignedMusig2Transaction) -> bool {
+    verify_public_nonces(
+        tx.musig2_nonces(),
+        tx.musig2_nonce_signatures(),
+        tx.tx().compute_txid(),
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use std::collections::HashMap;
+
+    use bitcoin::{
+        key::{
+            constants::{SCHNORR_SIGNATURE_SIZE, SECRET_KEY_SIZE},
+            Keypair,
+        },
+        PublicKey, Txid,
+    };
+    use musig2::{secp256k1::schnorr::Signature, PubNonce};
+
+    use crate::{
+        contexts::base::generate_keys_from_secret,
+        transactions::{pre_signed_musig2::get_nonce_message, signing_musig2::generate_nonce},
+    };
+
+    use super::verify_public_nonces;
+
+    const DUMMY_TXID: &str = "5df6e0e2761359d30a8275058e299fcc0381534545f55cf43e41983f5d4c9456";
+
+    fn get_test_nonces() -> (
+        HashMap<usize, HashMap<PublicKey, PubNonce>>,
+        HashMap<usize, HashMap<PublicKey, Signature>>,
+    ) {
+        const SIGNERS: usize = 3;
+        const INPUTS: usize = 4;
+
+        // Generate keys
+        let mut keypairs: Vec<Keypair> = Vec::new();
+        let mut pubkeys: Vec<PublicKey> = Vec::new();
+        for signer in 0..SIGNERS {
+            let (keypair, pubkey) = generate_keys_from_secret(
+                bitcoin::Network::Bitcoin,
+                &hex::encode([(signer + 1) as u8; SECRET_KEY_SIZE]),
+            );
+            keypairs.push(keypair);
+            pubkeys.push(pubkey);
+        }
+
+        // Generate and sign nonces
+        let mut all_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>> = HashMap::new();
+        let mut all_sigs: HashMap<usize, HashMap<PublicKey, Signature>> = HashMap::new();
+        for input in 0..INPUTS {
+            let mut nonces: HashMap<PublicKey, PubNonce> = HashMap::new();
+            let mut sigs: HashMap<PublicKey, Signature> = HashMap::new();
+            for signer in 0..SIGNERS {
+                let secret_nonce = generate_nonce();
+
+                nonces.insert(pubkeys[signer], secret_nonce.public_nonce());
+
+                let nonce_signature =
+                    keypairs[signer].sign_schnorr(get_nonce_message(&secret_nonce.public_nonce()));
+                sigs.insert(pubkeys[signer], nonce_signature);
+            }
+            all_nonces.insert(input, nonces);
+            all_sigs.insert(input, sigs);
+        }
+        (all_nonces, all_sigs)
+    }
+
+    #[test]
+    fn test_verify_public_nonces_all_valid_signatures() {
+        let (all_nonces, all_sigs) = get_test_nonces();
+
+        assert!(
+            verify_public_nonces(&all_nonces, &all_sigs, DUMMY_TXID.parse::<Txid>().unwrap()),
+            "verify_public_nonces() did not return true on success"
+        );
+    }
+
+    #[test]
+    fn test_verify_public_nonces_invalid_signature() {
+        let (all_nonces, mut all_sigs) = get_test_nonces();
+
+        let input_index = all_sigs.len() / 2;
+        let pubkey = *all_sigs[&input_index].keys().next().unwrap();
+        let mut bad_sig = all_sigs[&input_index][&pubkey].serialize();
+        bad_sig[SCHNORR_SIGNATURE_SIZE - 1] += 1;
+        all_sigs
+            .get_mut(&input_index)
+            .unwrap()
+            .insert(pubkey, Signature::from_slice(&bad_sig).unwrap());
+
+        assert!(
+            !verify_public_nonces(&all_nonces, &all_sigs, DUMMY_TXID.parse::<Txid>().unwrap()),
+            "verify_public_nonces() did not return false on invalid signature"
+        );
+    }
+}
diff --git a/goat/src/transactions/challenge.rs b/goat/src/transactions/challenge.rs
new file mode 100644
index 000000000..b0c7e7ed7
--- /dev/null
+++ b/goat/src/transactions/challenge.rs
@@ -0,0 +1,183 @@
+use bitcoin::{
+    absolute, consensus, key::Keypair, Amount, Network, PublicKey, ScriptBuf, Sequence,
+    TapSighashType, Transaction, TxIn, TxOut, Witness,
+};
+use serde::{Deserialize, Serialize};
+use std::cmp::Ordering;
+
+use crate::{connectors::base::TaprootConnector, transactions::base::DUST_AMOUNT};
+
+use super::{
+    super::{connectors::connector_a::ConnectorA, contexts::operator::OperatorContext, scripts::*},
+    base::*,
+    pre_signed::*,
+    signing::populate_p2wsh_witness,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct ChallengeTransaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+    input_amount_crowdfunding: Amount,
+}
+
+impl PreSignedTransaction for ChallengeTransaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl ChallengeTransaction {
+    pub fn new(
+        context: &OperatorContext,
+        connector_a: &ConnectorA,
+        input_0: Input,
+        input_amount_crowdfunding: Amount,
+    ) -> Self {
+        let mut this = Self::new_for_validation(
+            context.network,
+            &context.operator_public_key,
+            connector_a,
+            input_0,
+            input_amount_crowdfunding,
+        );
+
+        this.sign_input_0(context, connector_a);
+
+        this
+    }
+
+    pub fn new_for_validation(
+        network: Network,
+        operator_public_key: &PublicKey,
+        connector_a: &ConnectorA,
+        input_0: Input,
+        input_amount_crowdfunding: Amount,
+    ) -> Self {
+        let input_0_leaf = 1;
+        let _input_0 = connector_a.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
+
+        let total_output_amount =
+            input_0.amount + input_amount_crowdfunding - Amount::from_sat(MIN_RELAY_FEE_CHALLENGE);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: generate_pay_to_pubkey_script_address(network, operator_public_key)
+                .script_pubkey(),
+        };
+
+        ChallengeTransaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0],
+                output: vec![_output_0],
+            },
+            prev_outs: vec![
+                TxOut {
+                    value: input_0.amount,
+                    script_pubkey: connector_a.generate_taproot_address().script_pubkey(),
+                },
+                // input 1 will be added later
+            ],
+            prev_scripts: vec![
+                connector_a.generate_taproot_leaf_script(input_0_leaf),
+                // input 1's script will be added later
+            ],
+            input_amount_crowdfunding,
+        }
+    }
+
+    fn sign_input_0(&mut self, context: &OperatorContext, connector_a: &ConnectorA) {
+        pre_sign_taproot_input_default(
+            self,
+            0,
+            TapSighashType::SinglePlusAnyoneCanPay,
+            connector_a.generate_taproot_spend_info(),
+            &vec![&context.operator_keypair],
+        );
+    }
+
+    // allows for aggregating multiple inputs and one refund output
+    pub fn add_inputs_and_output(
+        &mut self,
+        inputs: &Vec<InputWithScript>,
+        keypair: &Keypair,
+        output_script_pubkey: ScriptBuf,
+    ) {
+        if self.tx.input.len() > 1 {
+            panic!("Cannot add any more inputs or outputs.");
+        }
+
+        // check total input amount
+        let mut total_input_amount = Amount::from_sat(0);
+        for input in inputs {
+            total_input_amount += input.amount;
+        }
+        match total_input_amount.cmp(&self.input_amount_crowdfunding) {
+            Ordering::Less => panic!("Total input amount too low. Add additional input."),
+            Ordering::Greater => {
+                let discrepency = total_input_amount - self.input_amount_crowdfunding;
+                if discrepency.to_sat() >= DUST_AMOUNT {
+                    // add refund output
+                    let _output = TxOut {
+                        value: discrepency,
+                        script_pubkey: output_script_pubkey,
+                    };
+                    self.tx.output.push(_output);
+                }
+                // discrepency less than dust will be lost as relay fee
+            }
+            Ordering::Equal => {}
+        }
+
+        // add crowdfunding inputs
+        let sighash_type = bitcoin::EcdsaSighashType::AllPlusAnyoneCanPay;
+        let mut input_index = self.tx.input.len();
+        for input in inputs {
+            let _input = TxIn {
+                previous_output: input.outpoint,
+                script_sig: ScriptBuf::new(),
+                sequence: Sequence::MAX,
+                witness: Witness::default(),
+            };
+            self.tx.input.push(_input);
+
+            // add witness
+            populate_p2wsh_witness(
+                &mut self.tx,
+                input_index,
+                sighash_type,
+                input.script,
+                input.amount,
+                &vec![&keypair],
+            );
+
+            input_index += 1;
+        }
+    }
+
+    pub fn merge(&mut self, challenge: &ChallengeTransaction) {
+        merge_transactions(&mut self.tx, &challenge.tx);
+    }
+
+    pub fn min_crowdfunding_amount(&self) -> u64 { self.input_amount_crowdfunding.to_sat() }
+}
+
+impl BaseTransaction for ChallengeTransaction {
+    fn finalize(&self) -> Transaction {
+        if self.tx.input.len() < 2 {
+            panic!("Missing input. Call add_inputs_and_output before finalizing");
+        }
+
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str { "Challenge" }
+}
diff --git a/goat/src/transactions/disprove.rs b/goat/src/transactions/disprove.rs
new file mode 100644
index 000000000..885a9d6f6
--- /dev/null
+++ b/goat/src/transactions/disprove.rs
@@ -0,0 +1,222 @@
+use bitcoin::{
+    absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
+};
+use bitvm::chunk::api::type_conversion_utils::RawWitness;
+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},
+        contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
+        scripts::*,
+    },
+    base::*,
+    pre_signed::*,
+    pre_signed_musig2::*,
+    signing::push_taproot_leaf_script_and_control_block_to_witness,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct DisproveTransaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+    reward_output_amount: Amount,
+
+    musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
+    musig2_nonce_signatures: HashMap<usize, HashMap<PublicKey, Signature>>,
+    musig2_signatures: HashMap<usize, HashMap<PublicKey, PartialSignature>>,
+}
+
+impl PreSignedTransaction for DisproveTransaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    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_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &mut self.musig2_nonces
+    }
+    fn musig2_nonce_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, Signature>> {
+        &self.musig2_nonce_signatures
+    }
+    fn musig2_nonce_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, Signature>> {
+        &mut self.musig2_nonce_signatures
+    }
+    fn musig2_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &self.musig2_signatures
+    }
+    fn musig2_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &mut self.musig2_signatures
+    }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0] }
+}
+
+impl DisproveTransaction {
+    pub fn new(
+        context: &OperatorContext,
+        connector_5: &Connector5,
+        connector_c: &ConnectorC,
+        input_0: Input,
+        input_1: Input,
+    ) -> Self {
+        Self::new_for_validation(context.network, connector_5, connector_c, input_0, input_1)
+    }
+
+    pub fn new_for_validation(
+        network: Network,
+        connector_5: &Connector5,
+        connector_c: &ConnectorC,
+        input_0: Input,
+        input_1: Input,
+    ) -> Self {
+        let input_0_leaf = 1;
+        let _input_0 = connector_5.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
+
+        let _input_1 = generate_default_tx_in(&input_1);
+
+        let total_output_amount =
+            input_0.amount + input_1.amount - Amount::from_sat(MIN_RELAY_FEE_DISPROVE);
+
+        let output_0_amount = total_output_amount / 2;
+        let _output_0 = TxOut {
+            value: output_0_amount,
+            script_pubkey: generate_burn_script_address(network).script_pubkey(),
+        };
+
+        let reward_output_amount = total_output_amount - output_0_amount;
+        let _output_1 = TxOut {
+            value: reward_output_amount,
+            script_pubkey: ScriptBuf::default(),
+        };
+
+        DisproveTransaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0, _input_1],
+                output: vec![_output_0, _output_1],
+            },
+            prev_outs: vec![
+                TxOut {
+                    value: input_0.amount,
+                    script_pubkey: connector_5.generate_taproot_address().script_pubkey(),
+                },
+                TxOut {
+                    value: input_1.amount,
+                    script_pubkey: connector_c.generate_taproot_address().script_pubkey(),
+                },
+            ],
+            prev_scripts: vec![
+                connector_5.generate_taproot_leaf_script(input_0_leaf),
+                // `input_1` prev_script is not known at this point
+            ],
+            reward_output_amount,
+            musig2_nonces: HashMap::new(),
+            musig2_nonce_signatures: HashMap::new(),
+            musig2_signatures: HashMap::new(),
+        }
+    }
+
+    fn sign_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_5: &Connector5,
+        secret_nonce: &SecNonce,
+    ) {
+        let input_index = 0;
+        pre_sign_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::Single,
+            secret_nonce,
+        );
+
+        // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
+        if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
+            self.finalize_input_0(context, connector_5);
+        }
+    }
+
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_5: &Connector5) {
+        let input_index = 0;
+        finalize_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::Single,
+            connector_5.generate_taproot_spend_info(),
+        );
+    }
+
+    pub fn pre_sign(
+        &mut self,
+        context: &VerifierContext,
+        connector_5: &Connector5,
+        secret_nonces: &HashMap<usize, SecNonce>,
+    ) {
+        let input_index = 0;
+        self.sign_input_0(context, connector_5, &secret_nonces[&input_index]);
+    }
+
+    pub fn add_input_output(
+        &mut self,
+        connector_c: &ConnectorC,
+        input_script_index: u32,
+        input_script_witness: RawWitness,
+        output_script_pubkey: ScriptBuf,
+    ) {
+        // Add output
+        let output_index = 1;
+        self.tx.output[output_index].script_pubkey = output_script_pubkey;
+
+        let input_index = 1;
+
+        // Push the unlocking witness
+        input_script_witness
+            .into_iter()
+            .for_each(|x| self.tx.input[input_index].witness.push(x));
+
+        // Push script + control block
+        let script = connector_c.generate_taproot_leaf_script(input_script_index);
+        let taproot_spend_info = connector_c.generate_taproot_spend_info();
+        push_taproot_leaf_script_and_control_block_to_witness(
+            &mut self.tx,
+            input_index,
+            &taproot_spend_info,
+            &script,
+        );
+    }
+
+    pub fn merge(&mut self, disprove: &DisproveTransaction) {
+        merge_transactions(&mut self.tx, &disprove.tx);
+        merge_musig2_nonces_and_signatures(self, disprove);
+    }
+}
+
+impl BaseTransaction for DisproveTransaction {
+    fn finalize(&self) -> Transaction {
+        if self.tx.input.len() < 2 || self.tx.output.len() < 2 {
+            panic!("Missing input or output. Call add_input_output before finalizing");
+        }
+
+        self.tx.clone()
+    }
+    fn name(&self) -> &'static str { "Disprove" }
+}
diff --git a/goat/src/transactions/kick_off.rs b/goat/src/transactions/kick_off.rs
new file mode 100644
index 000000000..ca9dce075
--- /dev/null
+++ b/goat/src/transactions/kick_off.rs
@@ -0,0 +1,151 @@
+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,
+        },
+        contexts::operator::OperatorContext,
+    },
+    base::{*, DUST_AMOUNT},
+    pre_signed::*,
+    signing::{generate_taproot_leaf_schnorr_signature, populate_taproot_input_witness},
+};
+use bitvm::signatures::signing_winternitz::{generate_winternitz_witness, WinternitzSigningInputs};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct KickOff1Transaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+}
+
+impl PreSignedTransaction for KickOff1Transaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl KickOff1Transaction {
+    pub fn new(
+        connector_3: &Connector3,
+        connector_6: &Connector6,
+        connector_a: &ConnectorA,
+        connector_b: &ConnectorB,
+        input_0: Input,
+    ) -> Self {
+        Self::new_for_validation(
+            connector_3,
+            connector_6,
+            connector_a,
+            connector_b,
+            input_0,
+        )
+    }
+
+    pub fn new_for_validation(
+        connector_3: &Connector3,
+        connector_6: &Connector6,
+        connector_a: &ConnectorA,
+        connector_b: &ConnectorB,
+        input_0: Input,
+    ) -> Self {
+        let input_0_leaf = 0;
+        let _input_0 = connector_6.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
+
+        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(),
+        };
+
+        let _output_1 = TxOut {
+            value: Amount::from_sat(DUST_AMOUNT),
+            script_pubkey: connector_a.generate_taproot_address().script_pubkey(),
+        };
+
+        let _output_2 = TxOut {
+            value: total_output_amount - _output_0.value - _output_1.value,
+            script_pubkey: connector_b.generate_taproot_address().script_pubkey(),
+        };
+
+        KickOff1Transaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0],
+                output: vec![_output_0, _output_1, _output_2],
+            },
+            prev_outs: vec![TxOut {
+                value: input_0.amount,
+                script_pubkey: connector_6.generate_taproot_address().script_pubkey(), 
+            }],
+            prev_scripts: vec![connector_6.generate_taproot_leaf_script(input_0_leaf)],
+        }
+    }
+
+    fn sign_input_0(
+        &mut self,
+        context: &OperatorContext,
+        connector_6: &Connector6,
+        evm_txid_inputs: &WinternitzSigningInputs,
+    ) {
+        let input_index = 0;
+        let script = &self.prev_scripts()[input_index].clone();
+        let prev_outs = &self.prev_outs().clone();
+        let taproot_spend_info = connector_6.generate_taproot_spend_info();
+        let mut unlock_data: Vec<Vec<u8>> = Vec::new();
+
+        // get schnorr signature
+        let schnorr_signature = generate_taproot_leaf_schnorr_signature(
+            self.tx_mut(),
+            prev_outs,
+            input_index,
+            TapSighashType::All,
+            script,
+            &context.operator_keypair,
+        );
+        unlock_data.push(schnorr_signature.to_vec());
+
+        // get winternitz signature for evm withdraw txid
+        unlock_data.extend(generate_winternitz_witness(evm_txid_inputs).to_vec());
+
+        populate_taproot_input_witness(
+            self.tx_mut(),
+            input_index,
+            &taproot_spend_info,
+            script,
+            unlock_data,
+        );
+    }
+
+    pub fn sign(
+        &mut self,
+        context: &OperatorContext,
+        connector_6: &Connector6,
+        evm_txid_inputs: &WinternitzSigningInputs,
+    ) {
+        self.sign_input_0(
+            context,
+            connector_6,
+            evm_txid_inputs,
+        );
+    }
+}
+
+impl BaseTransaction for KickOff1Transaction {
+    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
new file mode 100644
index 000000000..4e046ac1d
--- /dev/null
+++ b/goat/src/transactions/mod.rs
@@ -0,0 +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_out_confirm;
+pub mod pre_signed_musig2;
+pub mod pre_signed;
+pub mod signing_musig2;
+pub mod signing;
+pub mod take_1;
+pub mod take_2;
\ No newline at end of file
diff --git a/goat/src/transactions/peg_in/mod.rs b/goat/src/transactions/peg_in/mod.rs
new file mode 100644
index 000000000..2cc62f316
--- /dev/null
+++ b/goat/src/transactions/peg_in/mod.rs
@@ -0,0 +1,3 @@
+pub mod peg_in_confirm;
+pub mod peg_in_deposit;
+pub mod peg_in_refund;
\ No newline at end of file
diff --git a/goat/src/transactions/peg_in/peg_in_confirm.rs b/goat/src/transactions/peg_in/peg_in_confirm.rs
new file mode 100644
index 000000000..c9946ce5a
--- /dev/null
+++ b/goat/src/transactions/peg_in/peg_in_confirm.rs
@@ -0,0 +1,247 @@
+use bitcoin::{
+    absolute, consensus, Amount, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
+};
+use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+use super::super::{
+    super::{
+        connectors::{base::*, connector_0::Connector0, connector_z::ConnectorZ},
+        contexts::{base::BaseContext, depositor::DepositorContext, verifier::VerifierContext},
+    },
+    base::*,
+    pre_signed::*,
+    pre_signed_musig2::*,
+    signing::*,
+};
+
+pub const PEG_IN_CONFIRM_TX_NAME: &str = "PegInConfirm";
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct PegInConfirmTransaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+
+    n_of_n_public_keys: Vec<PublicKey>,
+
+    musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
+    musig2_nonce_signatures: HashMap<usize, HashMap<PublicKey, Signature>>,
+    musig2_signatures: HashMap<usize, HashMap<PublicKey, PartialSignature>>,
+}
+
+impl PreSignedTransaction for PegInConfirmTransaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    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_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &mut self.musig2_nonces
+    }
+    fn musig2_nonce_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, Signature>> {
+        &self.musig2_nonce_signatures
+    }
+    fn musig2_nonce_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, Signature>> {
+        &mut self.musig2_nonce_signatures
+    }
+    fn musig2_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &self.musig2_signatures
+    }
+    fn musig2_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &mut self.musig2_signatures
+    }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0] }
+}
+
+impl PegInConfirmTransaction {
+    pub fn new(
+        context: &DepositorContext,
+        connector_0: &Connector0,
+        connector_z: &ConnectorZ,
+        input_0: Input,
+    ) -> Self {
+        let mut this = Self::new_for_validation(
+            connector_0,
+            connector_z,
+            input_0,
+            context.n_of_n_public_keys.clone(),
+        );
+
+        this.generate_and_push_depositor_signature_input_0(context);
+
+        this
+    }
+
+    pub fn new_with_depositor_signature(
+        connector_0: &Connector0,
+        connector_z: &ConnectorZ,
+        input_0: Input,
+        n_of_n_public_keys: &[PublicKey],
+        depositor_signature: bitcoin::taproot::Signature,
+    ) -> Self {
+        let mut this = Self::new_for_validation(
+            connector_0,
+            connector_z,
+            input_0,
+            n_of_n_public_keys.to_owned(),
+        );
+
+        this.push_depositor_signature_input(0, depositor_signature);
+
+        this
+    }
+
+    pub fn new_for_validation(
+        connector_0: &Connector0,
+        connector_z: &ConnectorZ,
+        input_0: Input,
+        n_of_n_public_keys: Vec<PublicKey>,
+    ) -> Self {
+        let input_0_leaf = 1;
+        let _input_0 = connector_z.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
+
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_PEG_IN_CONFIRM);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: connector_0.generate_taproot_address().script_pubkey(),
+        };
+
+        PegInConfirmTransaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0],
+                output: vec![_output_0],
+            },
+            prev_outs: vec![TxOut {
+                value: input_0.amount,
+                script_pubkey: connector_z.generate_taproot_address().script_pubkey(),
+            }],
+            prev_scripts: vec![connector_z.generate_taproot_leaf_script(input_0_leaf)],
+            n_of_n_public_keys,
+            musig2_nonces: HashMap::new(),
+            musig2_nonce_signatures: HashMap::new(),
+            musig2_signatures: HashMap::new(),
+        }
+    }
+
+    fn generate_and_push_depositor_signature_input_0(&mut self, context: &DepositorContext) {
+        let input_index = 0;
+        let schnorr_signature = generate_taproot_leaf_schnorr_signature(
+            &mut self.tx,
+            &self.prev_outs,
+            input_index,
+            TapSighashType::All,
+            &self.prev_scripts[input_index],
+            &context.depositor_keypair,
+        );
+
+        self.push_depositor_signature_input(input_index, schnorr_signature);
+    }
+
+    fn push_depositor_signature_input(
+        &mut self,
+        input_index: usize,
+        signature: bitcoin::taproot::Signature,
+    ) {
+        let unlock_data: Vec<Vec<u8>> = vec![signature.to_vec()];
+
+        push_taproot_leaf_unlock_data_to_witness(&mut self.tx, input_index, unlock_data);
+    }
+
+    fn push_verifier_signature_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_z: &ConnectorZ,
+        secret_nonce: &SecNonce,
+    ) {
+        let input_index = 0;
+        pre_sign_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            secret_nonce,
+        );
+
+        // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
+        if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
+            self.finalize_input_0(context, connector_z);
+        }
+    }
+
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_z: &ConnectorZ) {
+        let input_index = 0;
+        finalize_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            connector_z.generate_taproot_spend_info(),
+        );
+    }
+
+    pub fn pre_sign(
+        &mut self,
+        context: &VerifierContext,
+        connector_z: &ConnectorZ,
+        secret_nonces: &HashMap<usize, SecNonce>,
+    ) {
+        let input_index = 0;
+        self.push_verifier_signature_input_0(context, connector_z, &secret_nonces[&input_index]);
+    }
+
+    pub fn merge(&mut self, peg_in_confirm: &PegInConfirmTransaction) {
+        merge_transactions(&mut self.tx, &peg_in_confirm.tx);
+        merge_musig2_nonces_and_signatures(self, peg_in_confirm);
+    }
+
+    pub fn has_nonce_of(&self, context: &VerifierContext) -> bool {
+        let input_index = 0;
+
+        self.musig2_nonces.contains_key(&input_index)
+            && self.musig2_nonces[&input_index].contains_key(&context.verifier_public_key)
+    }
+    pub fn has_all_nonces(&self) -> bool {
+        let input_index = 0;
+
+        self.n_of_n_public_keys.iter().all(|verifier_key| {
+            self.musig2_nonces.contains_key(&input_index)
+                && self.musig2_nonces[&input_index].contains_key(verifier_key)
+        })
+    }
+    pub fn has_signature_of(&self, context: &VerifierContext) -> bool {
+        let input_index = 0;
+
+        self.musig2_signatures.contains_key(&input_index)
+            && self.musig2_signatures[&input_index].contains_key(&context.verifier_public_key)
+    }
+    pub fn has_all_signatures(&self) -> bool {
+        let input_index = 0;
+
+        self.n_of_n_public_keys.iter().all(|verifier_key| {
+            self.musig2_signatures.contains_key(&input_index)
+                && self.musig2_signatures[&input_index].contains_key(verifier_key)
+        })
+    }
+}
+
+impl BaseTransaction for PegInConfirmTransaction {
+    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
new file mode 100644
index 000000000..f9155f2bc
--- /dev/null
+++ b/goat/src/transactions/peg_in/peg_in_deposit.rs
@@ -0,0 +1,171 @@
+use bitcoin::{
+    absolute, consensus::{self}, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, Sequence, Transaction, TxIn, TxOut, Witness
+};
+use serde::{Deserialize, Serialize};
+
+use super::super::{
+    super::{
+        connectors::{base::*, connector_z::ConnectorZ},
+        contexts::depositor::DepositorContext,
+        scripts::*,
+    },
+    base::*,
+    pre_signed::*,
+    signing::populate_p2wsh_witness_with_signatures,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct PegInDepositTransactionGeneral {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+}
+
+impl PegInDepositTransactionGeneral {
+    pub fn new_unsigned(
+        connector_z: &ConnectorZ,
+        input_0: Input,
+        input_0_sequence: Sequence,
+    ) -> Self {
+        let _input_0 = TxIn {
+            previous_output: input_0.outpoint,
+            script_sig: ScriptBuf::new(),
+            sequence: input_0_sequence,
+            witness: Witness::default(),
+        };
+
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_PEG_IN_DEPOSIT);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: connector_z.generate_taproot_address().script_pubkey(),
+        };
+
+        PegInDepositTransactionGeneral {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0],
+                output: vec![_output_0],
+            }
+        }
+    }
+
+    pub fn add_unlock_witness(&mut self, witness: Witness) {
+        self.tx.input[0].witness = witness
+    }
+
+    pub fn tx_mut(&mut self) -> &mut Transaction {
+        &mut self.tx
+    }
+}
+
+impl BaseTransaction for PegInDepositTransactionGeneral {
+    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "PegInDeposit" }
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct PegInDepositTransaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+}
+
+impl PreSignedTransaction for PegInDepositTransaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl PegInDepositTransaction {
+    pub fn new(context: &DepositorContext, connector_z: &ConnectorZ, input_0: Input) -> Self {
+        let mut this = Self::new_for_validation(
+            context.network,
+            &context.depositor_public_key,
+            connector_z,
+            input_0,
+        );
+
+        this.sign_input_0(context);
+
+        this
+    }
+
+    pub fn new_with_signature(
+        network: Network,
+        depositor_public_key: &PublicKey,
+        connector_z: &ConnectorZ,
+        input_0: Input,
+        signature: bitcoin::ecdsa::Signature,
+    ) -> Self {
+        let mut this =
+            Self::new_for_validation(network, depositor_public_key, connector_z, input_0);
+
+        this.sign_input_0_with_signature(signature);
+
+        this
+    }
+
+    pub fn new_for_validation(
+        network: Network,
+        depositor_public_key: &PublicKey,
+        connector_z: &ConnectorZ,
+        input_0: Input,
+    ) -> Self {
+        let _input_0 = generate_default_tx_in(&input_0);
+
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_PEG_IN_DEPOSIT);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: connector_z.generate_taproot_address().script_pubkey(),
+        };
+
+        PegInDepositTransaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0],
+                output: vec![_output_0],
+            },
+            prev_outs: vec![TxOut {
+                value: input_0.amount,
+                script_pubkey: generate_pay_to_pubkey_script_address(network, depositor_public_key)
+                    .script_pubkey(),
+            }],
+            prev_scripts: vec![generate_pay_to_pubkey_script(depositor_public_key)],
+        }
+    }
+
+    fn sign_input_0(&mut self, context: &DepositorContext) {
+        let input_index = 0;
+        pre_sign_p2wsh_input(
+            self,
+            input_index,
+            EcdsaSighashType::All,
+            &vec![&context.depositor_keypair],
+        );
+    }
+
+    fn sign_input_0_with_signature(&mut self, signature: bitcoin::ecdsa::Signature) {
+        let input_index = 0;
+        let script = &self.prev_scripts()[input_index].clone();
+        populate_p2wsh_witness_with_signatures(
+            self.tx_mut(),
+            input_index,
+            script,
+            &vec![signature],
+        );
+    }
+}
+
+impl BaseTransaction for PegInDepositTransaction {
+    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
new file mode 100644
index 000000000..ea6da3cc5
--- /dev/null
+++ b/goat/src/transactions/peg_in/peg_in_refund.rs
@@ -0,0 +1,129 @@
+use bitcoin::{
+    absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
+};
+use serde::{Deserialize, Serialize};
+
+use super::super::{
+    super::{
+        connectors::{base::*, connector_z::ConnectorZ},
+        contexts::depositor::DepositorContext,
+        scripts::*,
+    },
+    base::*,
+    pre_signed::*,
+    signing::populate_taproot_input_witness_with_signature,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct PegInRefundTransaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+}
+
+impl PreSignedTransaction for PegInRefundTransaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl PegInRefundTransaction {
+    pub fn new(context: &DepositorContext, connector_z: &ConnectorZ, input_0: Input) -> Self {
+        let mut this = Self::new_for_validation(
+            context.network,
+            &context.depositor_public_key,
+            connector_z,
+            input_0,
+        );
+
+        this.sign_input_0(context, connector_z);
+
+        this
+    }
+
+    pub fn new_with_signature(
+        network: Network,
+        depositor_public_key: &PublicKey,
+        connector_z: &ConnectorZ,
+        input_0: Input,
+        signature: bitcoin::taproot::Signature,
+    ) -> Self {
+        let mut this =
+            Self::new_for_validation(network, depositor_public_key, connector_z, input_0);
+
+        this.sign_input_0_with_signature(connector_z, signature);
+
+        this
+    }
+
+    pub fn new_for_validation(
+        network: Network,
+        depositor_public_key: &PublicKey,
+        connector_z: &ConnectorZ,
+        input_0: Input,
+    ) -> Self {
+        let input_0_leaf = 0;
+        let _input_0 = connector_z.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
+
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_PEG_IN_REFUND);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: generate_pay_to_pubkey_script_address(network, depositor_public_key)
+                .script_pubkey(),
+        };
+
+        PegInRefundTransaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0],
+                output: vec![_output_0],
+            },
+            prev_outs: vec![TxOut {
+                value: input_0.amount,
+                script_pubkey: connector_z.generate_taproot_address().script_pubkey(),
+            }],
+            prev_scripts: vec![connector_z.generate_taproot_leaf_script(input_0_leaf)],
+        }
+    }
+
+    fn sign_input_0(&mut self, context: &DepositorContext, connector_z: &ConnectorZ) {
+        pre_sign_taproot_input_default(
+            self,
+            0,
+            TapSighashType::All,
+            connector_z.generate_taproot_spend_info(),
+            &vec![&context.depositor_keypair],
+        );
+    }
+
+    fn sign_input_0_with_signature(
+        &mut self,
+        connector_z: &ConnectorZ,
+        signature: bitcoin::taproot::Signature,
+    ) {
+        let input_index = 0;
+        let script = &self.prev_scripts()[input_index].clone();
+        let taproot_spend_info = connector_z.generate_taproot_spend_info();
+
+        populate_taproot_input_witness_with_signature(
+            self.tx_mut(),
+            input_index,
+            &taproot_spend_info,
+            script,
+            &[signature],
+        );
+    }
+}
+
+impl BaseTransaction for PegInRefundTransaction {
+    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
new file mode 100644
index 000000000..4b3274a9b
--- /dev/null
+++ b/goat/src/transactions/peg_out_confirm.rs
@@ -0,0 +1,145 @@
+use bitcoin::{
+    absolute, consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, Transaction,
+    TxOut, Witness, Sequence, TxIn
+};
+use serde::{Deserialize, Serialize};
+
+use super::{
+    super::{
+        connectors::{base::*, connector_6::Connector6},
+        contexts::operator::OperatorContext,
+        scripts::*,
+    },
+    base::*,
+    pre_signed::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct PreKickoffTransaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+}
+
+impl PreKickoffTransaction {
+    pub fn new_unsigned(
+        connector_6: &Connector6,
+        input_0: Input,
+        input_0_sequence: Sequence,
+    ) -> Self {
+        let _input_0 = TxIn {
+            previous_output: input_0.outpoint,
+            script_sig: ScriptBuf::new(),
+            sequence: input_0_sequence,
+            witness: Witness::default(),
+        };
+
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_PEG_OUT_CONFIRM);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: connector_6.generate_taproot_address().script_pubkey(),
+        };
+
+        PreKickoffTransaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0],
+                output: vec![_output_0],
+            }
+        }
+    }
+
+    pub fn add_unlock_witness(&mut self, witness: Witness) {
+        self.tx.input[0].witness = witness
+    }
+
+    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" }
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct PegOutConfirmTransaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+}
+
+impl PreSignedTransaction for PegOutConfirmTransaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
+}
+
+impl PegOutConfirmTransaction {
+    pub fn new(context: &OperatorContext, connector_6: &Connector6, input_0: Input) -> Self {
+        let mut this = Self::new_for_validation(
+            context.network,
+            &context.operator_public_key,
+            connector_6,
+            input_0,
+        );
+
+        this.sign_input_0(context);
+
+        this
+    }
+
+    pub fn new_for_validation(
+        network: Network,
+        operator_public_key: &PublicKey,
+        connector_6: &Connector6,
+        input_0: Input,
+    ) -> Self {
+        let _input_0 = generate_default_tx_in(&input_0);
+
+        let total_output_amount = input_0.amount - Amount::from_sat(MIN_RELAY_FEE_PEG_OUT_CONFIRM);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: connector_6.generate_taproot_address().script_pubkey(),
+        };
+
+        PegOutConfirmTransaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0],
+                output: vec![_output_0],
+            },
+            prev_outs: vec![TxOut {
+                value: input_0.amount,
+                script_pubkey: generate_pay_to_pubkey_script_address(network, operator_public_key)
+                    .script_pubkey(),
+            }],
+            prev_scripts: vec![generate_pay_to_pubkey_script(operator_public_key)],
+        }
+    }
+
+    fn sign_input_0(&mut self, context: &OperatorContext) {
+        let input_index = 0;
+        pre_sign_p2wsh_input(
+            self,
+            input_index,
+            EcdsaSighashType::All,
+            &vec![&context.operator_keypair],
+        );
+    }
+}
+
+impl BaseTransaction for PegOutConfirmTransaction {
+    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "PegOutConfirm" }
+}
diff --git a/goat/src/transactions/pre_signed.rs b/goat/src/transactions/pre_signed.rs
new file mode 100644
index 000000000..3a919f010
--- /dev/null
+++ b/goat/src/transactions/pre_signed.rs
@@ -0,0 +1,79 @@
+use bitcoin::{
+    key::Keypair, taproot::TaprootSpendInfo, EcdsaSighashType, PublicKey, ScriptBuf,
+    TapSighashType, Transaction, TxOut,
+};
+
+use super::{
+    super::contexts::base::BaseContext,
+    signing::{
+        populate_p2wpkh_witness, populate_p2wsh_witness, populate_taproot_input_witness_default,
+    },
+};
+
+pub trait PreSignedTransaction {
+    fn tx(&self) -> &Transaction;
+    fn tx_mut(&mut self) -> &mut Transaction;
+    fn prev_outs(&self) -> &Vec<TxOut>;
+    fn prev_scripts(&self) -> &Vec<ScriptBuf>;
+}
+
+pub fn pre_sign_p2wsh_input<T: PreSignedTransaction>(
+    tx: &mut T,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    keypairs: &Vec<&Keypair>,
+) {
+    let script = &tx.prev_scripts()[input_index].clone();
+    let value = tx.prev_outs()[input_index].value;
+
+    populate_p2wsh_witness(
+        tx.tx_mut(),
+        input_index,
+        sighash_type,
+        script,
+        value,
+        keypairs,
+    );
+}
+
+pub fn pre_sign_p2wpkh_input<T: PreSignedTransaction>(
+    tx: &mut T,
+    context: &dyn BaseContext,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    public_key: &PublicKey,
+    keypair: &Keypair,
+) {
+    let value = tx.prev_outs()[input_index].value;
+
+    populate_p2wpkh_witness(
+        context,
+        tx.tx_mut(),
+        input_index,
+        sighash_type,
+        value,
+        public_key,
+        keypair,
+    );
+}
+
+pub fn pre_sign_taproot_input_default<T: PreSignedTransaction>(
+    tx: &mut T,
+    input_index: usize,
+    sighash_type: TapSighashType,
+    taproot_spend_info: TaprootSpendInfo,
+    keypairs: &Vec<&Keypair>,
+) {
+    let prev_outs = &tx.prev_outs().clone();
+    let script = &tx.prev_scripts()[input_index].clone();
+
+    populate_taproot_input_witness_default(
+        tx.tx_mut(),
+        prev_outs,
+        input_index,
+        sighash_type,
+        &taproot_spend_info,
+        script,
+        keypairs,
+    );
+}
diff --git a/goat/src/transactions/pre_signed_musig2.rs b/goat/src/transactions/pre_signed_musig2.rs
new file mode 100644
index 000000000..1381503de
--- /dev/null
+++ b/goat/src/transactions/pre_signed_musig2.rs
@@ -0,0 +1,200 @@
+use bitcoin::{
+    hashes::{sha256, Hash},
+    taproot::TaprootSpendInfo,
+    PublicKey, TapSighashType, XOnlyPublicKey,
+};
+use musig2::{
+    secp::MaybeScalar,
+    secp256k1::{schnorr::Signature, Message},
+    BinaryEncoding, PartialSignature, PubNonce, SecNonce,
+};
+use std::collections::HashMap;
+
+use super::{
+    super::contexts::{base::BaseContext, verifier::VerifierContext},
+    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,
+    },
+};
+
+pub trait PreSignedMusig2Transaction: PreSignedTransaction {
+    fn musig2_nonces(&self) -> &HashMap<usize, HashMap<PublicKey, PubNonce>>;
+    fn musig2_nonces_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>>;
+    fn musig2_nonce_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, Signature>>;
+    fn musig2_nonce_signatures_mut(&mut self)
+        -> &mut HashMap<usize, HashMap<PublicKey, Signature>>;
+    fn musig2_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, PartialSignature>>;
+    fn musig2_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>>;
+    fn verifier_inputs(&self) -> Vec<usize>;
+    fn has_nonces_for(&self, verifier_pubkey: PublicKey) -> bool {
+        self.has_all_nonces(&[verifier_pubkey])
+    }
+    fn has_all_nonces(&self, verifier_pubkeys: &[PublicKey]) -> bool {
+        self.verifier_inputs().into_iter().all(|input_index| {
+            verifier_pubkeys.iter().all(|pubkey| {
+                self.musig2_nonces().contains_key(&input_index)
+                    && self.musig2_nonces()[&input_index].contains_key(pubkey)
+            })
+        })
+    }
+    fn has_signatures_for(&self, verifier_pubkey: PublicKey) -> bool {
+        self.has_all_signatures(&[verifier_pubkey])
+    }
+    fn has_all_signatures(&self, verifier_pubkeys: &[PublicKey]) -> bool {
+        self.verifier_inputs().into_iter().all(|input_index| {
+            verifier_pubkeys.iter().all(|pubkey| {
+                self.musig2_signatures().contains_key(&input_index)
+                    && self.musig2_signatures()[&input_index].contains_key(pubkey)
+            })
+        })
+    }
+    fn push_nonces(&mut self, context: &VerifierContext) -> HashMap<usize, SecNonce> {
+        self.verifier_inputs()
+            .iter()
+            .map(|input_index| (*input_index, self.push_nonce(context, *input_index)))
+            .collect()
+    }
+
+    fn push_nonce(&mut self, context: &VerifierContext, input_index: usize) -> SecNonce {
+        // Push nonce
+        let musig2_nonces = self.musig2_nonces_mut();
+        if musig2_nonces.get(&input_index).is_none() {
+            musig2_nonces.insert(input_index, HashMap::new());
+        }
+
+        let secret_nonce = generate_nonce();
+        musig2_nonces
+            .get_mut(&input_index)
+            .unwrap()
+            .insert(context.verifier_public_key, secret_nonce.public_nonce());
+
+        // Sign the nonce and push the signature
+        let musig2_nonce_signatures = self.musig2_nonce_signatures_mut();
+        if musig2_nonce_signatures.get(&input_index).is_none() {
+            musig2_nonce_signatures.insert(input_index, HashMap::new());
+        }
+
+        let nonce_signature = context
+            .verifier_keypair
+            .sign_schnorr(get_nonce_message(&secret_nonce.public_nonce()));
+
+        musig2_nonce_signatures
+            .get_mut(&input_index)
+            .unwrap()
+            .insert(context.verifier_public_key, nonce_signature);
+
+        secret_nonce
+    }
+}
+
+pub fn get_nonce_message(nonce: &PubNonce) -> Message {
+    let nonce_hash = sha256::Hash::hash(nonce.to_bytes().as_slice());
+    Message::from_digest_slice(nonce_hash.as_ref()).expect("Failed to create nonce message")
+}
+
+fn verify_schnorr_signature(sig: &Signature, msg: &Message, pubkey: &XOnlyPublicKey) -> bool {
+    match sig.verify(msg, pubkey) {
+        Ok(()) => true,
+        Err(e) => {
+            eprintln!("verify_schnorr() failed with: {e}");
+            false
+        }
+    }
+}
+
+pub fn verify_public_nonce(sig: &Signature, nonce: &PubNonce, pubkey: &XOnlyPublicKey) -> bool {
+    verify_schnorr_signature(sig, &get_nonce_message(nonce), pubkey)
+}
+
+pub fn pre_sign_musig2_taproot_input<T: PreSignedTransaction + PreSignedMusig2Transaction>(
+    tx: &mut T,
+    context: &VerifierContext,
+    input_index: usize,
+    sighash_type: TapSighashType,
+    secret_nonce: &SecNonce,
+) {
+    // TODO validate nonces first
+
+    let prev_outs = &tx.prev_outs().clone();
+    let script = &tx.prev_scripts()[input_index].clone();
+    let musig2_nonces = &tx.musig2_nonces()[&input_index].values().cloned().collect();
+
+    let partial_signature = generate_taproot_partial_signature(
+        context,
+        tx.tx_mut(),
+        secret_nonce,
+        &generate_aggregated_nonce(musig2_nonces),
+        input_index,
+        prev_outs,
+        script,
+        sighash_type,
+    )
+    .unwrap(); // TODO: Add error handling.
+
+    let musig2_signatures = tx.musig2_signatures_mut();
+    if musig2_signatures.get(&input_index).is_none() {
+        musig2_signatures.insert(input_index, HashMap::new());
+    }
+    musig2_signatures
+        .get_mut(&input_index)
+        .unwrap()
+        .insert(context.verifier_public_key, partial_signature);
+}
+
+pub fn finalize_musig2_taproot_input<T: PreSignedTransaction + PreSignedMusig2Transaction>(
+    tx: &mut T,
+    context: &dyn BaseContext,
+    input_index: usize,
+    sighash_type: TapSighashType,
+    taproot_spend_info: TaprootSpendInfo,
+) {
+    // TODO: Verify we have partial signatures from all verifiers.
+    // TODO: Verify each signature against the signers public key.
+    // See example here: https://github.com/conduition/musig2/blob/c39bfce58098d337a3ec38b54d93def8306d9953/src/signing.rs#L358C1-L366C65
+
+    let prev_outs = &tx.prev_outs().clone();
+    let script = &tx.prev_scripts()[input_index].clone();
+    let musig2_nonces: &Vec<PubNonce> =
+        &tx.musig2_nonces()[&input_index].values().cloned().collect();
+    let musig2_signatures: Vec<MaybeScalar> = tx.musig2_signatures()[&input_index]
+        .values()
+        .map(|&partial_signature| PartialSignature::from(partial_signature))
+        .collect();
+    let tx_mut = tx.tx_mut();
+
+    // Aggregate signature
+    let signature = generate_taproot_aggregated_signature(
+        context,
+        tx_mut,
+        &generate_aggregated_nonce(musig2_nonces),
+        input_index,
+        prev_outs,
+        script,
+        sighash_type,
+        musig2_signatures, // TODO: Is there a more elegant way of doing this?
+    )
+    .unwrap(); // TODO: Add error handling.
+
+    let final_signature = bitcoin::taproot::Signature {
+        signature: signature.into(),
+        sighash_type,
+    };
+
+    // Push signature to witness
+    tx_mut.input[input_index]
+        .witness
+        .push(final_signature.serialize());
+
+    // Push script + control block
+    push_taproot_leaf_script_and_control_block_to_witness(
+        tx_mut,
+        input_index,
+        &taproot_spend_info,
+        script,
+    );
+}
diff --git a/goat/src/transactions/signing.rs b/goat/src/transactions/signing.rs
new file mode 100644
index 000000000..65d72572a
--- /dev/null
+++ b/goat/src/transactions/signing.rs
@@ -0,0 +1,360 @@
+use bitcoin::{
+    key::{Keypair, TapTweak},
+    secp256k1::Message,
+    sighash::{Prevouts, SighashCache},
+    taproot::{LeafVersion, TaprootSpendInfo},
+    Amount, EcdsaSighashType, PublicKey, Script, ScriptBuf, TapLeafHash, TapNodeHash,
+    TapSighashType, Transaction, TxOut,
+};
+use secp256k1::SECP256K1;
+
+use super::super::{contexts::base::BaseContext, scripts::generate_p2wpkh_address};
+
+pub fn generate_p2wsh_schnorr_signature(
+    tx: &mut Transaction,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    script: &Script,
+    value: Amount,
+    keypair: &Keypair,
+) -> bitcoin::ecdsa::Signature {
+    let mut sighash_cache = SighashCache::new(tx);
+
+    let sighash = sighash_cache
+        .p2wsh_signature_hash(input_index, script, value, sighash_type)
+        .expect("Failed to construct sighash");
+
+    let signature = keypair.secret_key().sign_ecdsa(Message::from(sighash));
+
+    bitcoin::ecdsa::Signature {
+        signature,
+        sighash_type,
+    }
+}
+
+pub fn push_p2wsh_signature_to_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    script: &Script,
+    value: Amount,
+    keypair: &Keypair,
+) {
+    let signature =
+        generate_p2wsh_schnorr_signature(tx, input_index, sighash_type, script, value, keypair);
+
+    tx.input[input_index]
+        .witness
+        .push_ecdsa_signature(&signature);
+}
+
+pub fn push_p2wsh_script_to_witness(tx: &mut Transaction, input_index: usize, script: &Script) {
+    tx.input[input_index].witness.push(script); // TODO to_bytes() may be needed
+}
+
+pub fn populate_p2wsh_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    script: &Script,
+    value: Amount,
+    keypairs: &Vec<&Keypair>,
+) {
+    for keypair in keypairs {
+        push_p2wsh_signature_to_witness(tx, input_index, sighash_type, script, value, keypair);
+    }
+    push_p2wsh_script_to_witness(tx, input_index, script);
+}
+
+pub fn populate_p2wsh_witness_with_signatures(
+    tx: &mut Transaction,
+    input_index: usize,
+    script: &Script,
+    signatures: &Vec<bitcoin::ecdsa::Signature>,
+) {
+    for signature in signatures {
+        tx.input[input_index]
+            .witness
+            .push_ecdsa_signature(signature);
+    }
+    push_p2wsh_script_to_witness(tx, input_index, script);
+}
+
+pub fn generate_p2wpkh_schnorr_signature(
+    context: &dyn BaseContext,
+    tx: &mut Transaction,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    value: Amount,
+    public_key: &PublicKey,
+    keypair: &Keypair,
+) -> bitcoin::ecdsa::Signature {
+    let mut sighash_cache = SighashCache::new(tx);
+
+    let sighash = sighash_cache
+        .p2wpkh_signature_hash(
+            input_index,
+            &generate_p2wpkh_address(context.network(), public_key).script_pubkey(),
+            value,
+            sighash_type,
+        )
+        .expect("Failed to construct sighash");
+
+    let signature = keypair.secret_key().sign_ecdsa(Message::from(sighash));
+
+    bitcoin::ecdsa::Signature {
+        signature,
+        sighash_type,
+    }
+}
+
+pub fn push_p2wpkh_signature_to_witness(
+    context: &dyn BaseContext,
+    tx: &mut Transaction,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    value: Amount,
+    public_key: &PublicKey,
+    keypair: &Keypair,
+) {
+    let signature = generate_p2wpkh_schnorr_signature(
+        context,
+        tx,
+        input_index,
+        sighash_type,
+        value,
+        public_key,
+        keypair,
+    );
+
+    tx.input[input_index]
+        .witness
+        .push_ecdsa_signature(&signature);
+}
+
+pub fn push_p2wpkh_public_key_to_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    public_key: &PublicKey,
+) {
+    tx.input[input_index].witness.push(public_key.to_bytes());
+}
+
+pub fn populate_p2wpkh_witness(
+    context: &dyn BaseContext,
+    tx: &mut Transaction,
+    input_index: usize,
+    sighash_type: EcdsaSighashType,
+    value: Amount,
+    public_key: &PublicKey,
+    keypair: &Keypair,
+) {
+    push_p2wpkh_signature_to_witness(
+        context,
+        tx,
+        input_index,
+        sighash_type,
+        value,
+        public_key,
+        keypair,
+    );
+    push_p2wpkh_public_key_to_witness(tx, input_index, public_key);
+}
+
+pub fn generate_taproot_leaf_schnorr_signature(
+    tx: &mut Transaction,
+    prev_outs: &[TxOut],
+    input_index: usize,
+    sighash_type: TapSighashType,
+    script: &Script,
+    keypair: &Keypair,
+) -> bitcoin::taproot::Signature {
+    let leaf_hash = TapLeafHash::from_script(script, LeafVersion::TapScript);
+
+    let sighash = if sighash_type == TapSighashType::AllPlusAnyoneCanPay
+        || sighash_type == TapSighashType::SinglePlusAnyoneCanPay
+        || sighash_type == TapSighashType::NonePlusAnyoneCanPay
+    {
+        SighashCache::new(tx)
+            .taproot_script_spend_signature_hash(
+                input_index,
+                &Prevouts::One(input_index, &prev_outs[input_index]),
+                leaf_hash,
+                sighash_type,
+            )
+            .expect("Failed to construct sighash")
+    } else {
+        SighashCache::new(tx)
+            .taproot_script_spend_signature_hash(
+                input_index,
+                &Prevouts::All(prev_outs),
+                leaf_hash,
+                sighash_type,
+            )
+            .expect("Failed to construct sighash")
+    };
+
+    // If secp256k1 is updated to 0.30.0, the following line can be replaced with
+    // let signature = keypair.sign_schnorr_no_aux_rand(&Message::from(sighash));
+    let signature = SECP256K1.sign_schnorr_no_aux_rand(&Message::from(sighash), keypair);
+
+    bitcoin::taproot::Signature {
+        signature,
+        sighash_type,
+    }
+}
+
+pub fn push_taproot_leaf_unlock_data_to_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    unlock_data: Vec<Vec<u8>>,
+) {
+    for element in unlock_data.iter() {
+        if element.len() == 1 && element[0] == 0 {
+            tx.input[input_index].witness.push(vec![]); // minimal encoding of 0 is an empty vector
+        } else {
+            tx.input[input_index].witness.push(element);
+        }
+    }
+}
+
+pub fn push_taproot_leaf_script_and_control_block_to_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    taproot_spend_info: &TaprootSpendInfo,
+    script: &Script,
+) {
+    let prevout_leaf = (ScriptBuf::from(script), LeafVersion::TapScript);
+
+    let control_block = taproot_spend_info
+        .control_block(&prevout_leaf)
+        .expect("Unable to create Control block");
+
+    tx.input[input_index]
+        .witness
+        .push(prevout_leaf.0.to_bytes());
+
+    tx.input[input_index]
+        .witness
+        .push(control_block.serialize());
+}
+
+/// Use this function to populate taproot input witness for
+/// scripts containing any logic.
+pub fn populate_taproot_input_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    taproot_spend_info: &TaprootSpendInfo,
+    script: &Script,
+    unlock_data: Vec<Vec<u8>>,
+) {
+    push_taproot_leaf_unlock_data_to_witness(tx, input_index, unlock_data);
+    push_taproot_leaf_script_and_control_block_to_witness(
+        tx,
+        input_index,
+        taproot_spend_info,
+        script,
+    );
+}
+
+/// Use this function to populate taproot input witness for
+/// scripts containing only OP_CHECKSIG verification.
+#[allow(clippy::too_many_arguments)]
+pub fn populate_taproot_input_witness_default(
+    tx: &mut Transaction,
+    prevouts: &[TxOut],
+    input_index: usize,
+    sighash_type: TapSighashType,
+    taproot_spend_info: &TaprootSpendInfo,
+    script: &Script,
+    keypairs: &Vec<&Keypair>,
+) {
+    let mut unlock_data: Vec<Vec<u8>> = Vec::new();
+    for keypair in keypairs {
+        let schnorr_signature = generate_taproot_leaf_schnorr_signature(
+            tx,
+            prevouts,
+            input_index,
+            sighash_type,
+            script,
+            keypair,
+        );
+        unlock_data.push(schnorr_signature.to_vec());
+    }
+
+    push_taproot_leaf_unlock_data_to_witness(tx, input_index, unlock_data);
+    push_taproot_leaf_script_and_control_block_to_witness(
+        tx,
+        input_index,
+        taproot_spend_info,
+        script,
+    );
+}
+
+pub fn populate_taproot_input_witness_with_signature(
+    tx: &mut Transaction,
+    input_index: usize,
+    taproot_spend_info: &TaprootSpendInfo,
+    script: &Script,
+    signatures: &[bitcoin::taproot::Signature],
+) {
+    let unlock_data = signatures.iter().map(|sig| sig.to_vec()).collect();
+    populate_taproot_input_witness(tx, input_index, taproot_spend_info, script, unlock_data);
+}
+
+fn generate_p2tr_key_spend_schnorr_signature(
+    tx: &mut Transaction,
+    input_index: usize,
+    prev_outs: &[TxOut],
+    sighash_type: TapSighashType,
+    merkle_root: Option<TapNodeHash>,
+    keypair: &Keypair,
+) -> bitcoin::taproot::Signature {
+    let sighash = if sighash_type == TapSighashType::AllPlusAnyoneCanPay
+        || sighash_type == TapSighashType::SinglePlusAnyoneCanPay
+        || sighash_type == TapSighashType::NonePlusAnyoneCanPay
+    {
+        SighashCache::new(tx)
+            .taproot_key_spend_signature_hash(
+                input_index,
+                &Prevouts::One(input_index, &prev_outs[input_index]),
+                sighash_type,
+            )
+            .expect("Failed to construct sighash")
+    } else {
+        SighashCache::new(tx)
+            .taproot_key_spend_signature_hash(input_index, &Prevouts::All(prev_outs), sighash_type)
+            .expect("Failed to construct sighash")
+    };
+
+    let tweak_keypair = keypair.tap_tweak(SECP256K1, merkle_root);
+
+    // If secp256k1 is updated to 0.30.0, the following line can be replaced with
+    // let signature = keypair.sign_schnorr_no_aux_rand(&Message::from(sighash));
+    let signature =
+        SECP256K1.sign_schnorr_no_aux_rand(&Message::from(sighash), &tweak_keypair.to_inner());
+
+    bitcoin::taproot::Signature {
+        signature,
+        sighash_type,
+    }
+}
+
+pub fn populate_p2tr_key_spend_witness(
+    tx: &mut Transaction,
+    input_index: usize,
+    prev_outs: &[TxOut],
+    sighash_type: TapSighashType,
+    merkle_root: Option<TapNodeHash>,
+    keypair: &Keypair,
+) {
+    let signature = generate_p2tr_key_spend_schnorr_signature(
+        tx,
+        input_index,
+        prev_outs,
+        sighash_type,
+        merkle_root,
+        keypair,
+    );
+    tx.input[input_index].witness.push(signature.to_vec());
+}
diff --git a/goat/src/transactions/signing_musig2.rs b/goat/src/transactions/signing_musig2.rs
new file mode 100644
index 000000000..99536be0d
--- /dev/null
+++ b/goat/src/transactions/signing_musig2.rs
@@ -0,0 +1,96 @@
+#![allow(clippy::too_many_arguments)]
+use bitcoin::{
+    sighash::{Prevouts, SighashCache},
+    taproot::LeafVersion,
+    Script, TapLeafHash, TapSighashType, Transaction, TxOut,
+};
+use musig2::{
+    aggregate_partial_signatures,
+    errors::{SigningError, VerifyError},
+    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_aggregated_nonce(nonces: &Vec<PubNonce>) -> AggNonce { AggNonce::sum(nonces) }
+
+pub fn generate_taproot_partial_signature(
+    context: &VerifierContext,
+    tx: &Transaction,
+    secret_nonce: &SecNonce,
+    aggregated_nonce: &AggNonce,
+    input_index: usize,
+    prevouts: &[TxOut],
+    script: &Script,
+    sighash_type: TapSighashType,
+) -> Result<MaybeScalar, SigningError> {
+    let pubkeys: Vec<Point> = Vec::from_iter(
+        context
+            .n_of_n_public_keys
+            .iter()
+            .map(|&public_key| public_key.inner.into()),
+    ); // TODO: The tests will reveal whether this conversion works as expected.
+    let key_agg_ctx = KeyAggContext::new(pubkeys).unwrap();
+
+    let leaf_hash = TapLeafHash::from_script(script, LeafVersion::TapScript);
+    let sighash = SighashCache::new(tx)
+        .taproot_script_spend_signature_hash(
+            input_index,
+            &Prevouts::All(prevouts), // TODO: add Prevouts::One
+            leaf_hash,
+            sighash_type,
+        )
+        .expect("Failed to construct sighash");
+
+    sign_partial(
+        &key_agg_ctx,
+        context.verifier_keypair.secret_key(),
+        secret_nonce.clone(),
+        aggregated_nonce,
+        sighash,
+    )
+}
+
+pub fn generate_taproot_aggregated_signature(
+    context: &dyn BaseContext,
+    tx: &Transaction,
+    aggregated_nonce: &AggNonce,
+    input_index: usize,
+    prevouts: &[TxOut],
+    script: &Script,
+    sighash_type: TapSighashType,
+    partial_signatures: Vec<PartialSignature>,
+) -> Result<LiftedSignature, VerifyError> {
+    let pubkeys: Vec<Point> = Vec::from_iter(
+        context
+            .n_of_n_public_keys()
+            .iter()
+            .map(|&public_key| public_key.inner.into()),
+    );
+    let key_agg_ctx = KeyAggContext::new(pubkeys).unwrap();
+
+    let leaf_hash = TapLeafHash::from_script(script, LeafVersion::TapScript);
+    let sighash_cache = SighashCache::new(tx)
+        .taproot_script_spend_signature_hash(
+            input_index,
+            &Prevouts::All(prevouts), // TODO: add Prevouts::One
+            leaf_hash,
+            sighash_type,
+        )
+        .expect("Failed to construct sighash");
+
+    aggregate_partial_signatures(
+        &key_agg_ctx,
+        aggregated_nonce,
+        partial_signatures,
+        sighash_cache,
+    )
+}
+
+// TODO: This is currently unused and can be removed. If the conversion at the start of the above functions is incorrect, try this approach.
+// pub fn to_point(public_key: PublicKey) -> Point {
+//     Point::from_slice(&public_key.to_bytes()).unwrap() // TODO: Add error handling. Also, verify this method is correct (otherwise see conversion via secp256k1::PublicKey).
+// }
diff --git a/goat/src/transactions/take_1.rs b/goat/src/transactions/take_1.rs
new file mode 100644
index 000000000..7418c4c70
--- /dev/null
+++ b/goat/src/transactions/take_1.rs
@@ -0,0 +1,229 @@
+use bitcoin::{
+    absolute, consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, TapSighashType,
+    Transaction, TxOut,
+};
+use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+use super::{
+    super::{
+        connectors::{
+            base::*, connector_0::Connector0, connector_3::Connector3, connector_a::ConnectorA,
+        },
+        contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
+        scripts::*,
+    },
+    base::*,
+    pre_signed::*,
+    pre_signed_musig2::*,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct Take1Transaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+
+    musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
+    musig2_nonce_signatures: HashMap<usize, HashMap<PublicKey, Signature>>,
+    musig2_signatures: HashMap<usize, HashMap<PublicKey, PartialSignature>>,
+}
+
+impl PreSignedTransaction for Take1Transaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    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_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &mut self.musig2_nonces
+    }
+    fn musig2_nonce_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, Signature>> {
+        &self.musig2_nonce_signatures
+    }
+    fn musig2_nonce_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, Signature>> {
+        &mut self.musig2_nonce_signatures
+    }
+    fn musig2_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &self.musig2_signatures
+    }
+    fn musig2_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &mut self.musig2_signatures
+    }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0, 3] }
+}
+
+impl Take1Transaction {
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        context: &OperatorContext,
+        connector_0: &Connector0,
+        connector_3: &Connector3,
+        connector_a: &ConnectorA,
+        input_0: Input,
+        input_1: Input,
+        input_2: Input,
+    ) -> Self {
+        let mut this = Self::new_for_validation(
+            context.network,
+            &context.operator_public_key,
+            connector_0,
+            connector_3,
+            connector_a,
+            input_0,
+            input_1,
+            input_2,
+        );
+
+        this.sign_input_1(context, connector_a);
+        this.sign_input_2(context);
+
+        this
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn new_for_validation(
+        network: Network,
+        operator_public_key: &PublicKey,
+        connector_0: &Connector0,
+        connector_3: &Connector3,
+        connector_a: &ConnectorA,
+        input_0: Input,
+        input_1: Input,
+        input_2: Input,
+    ) -> Self {
+        let input_0_leaf = 0;
+        let _input_0 = connector_0.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
+
+        let input_1_leaf = 0;
+        let _input_1 = connector_a.generate_taproot_leaf_tx_in(input_1_leaf, &input_1);
+
+        let _input_2 = connector_3.generate_tx_in(&input_2);
+
+        let total_output_amount = input_0.amount + input_1.amount + input_2.amount
+            - Amount::from_sat(MIN_RELAY_FEE_TAKE_1);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: generate_pay_to_pubkey_script_address(network, operator_public_key)
+                .script_pubkey(),
+        };
+
+        Take1Transaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0, _input_1, _input_2],
+                output: vec![_output_0],
+            },
+            prev_outs: vec![
+                TxOut {
+                    value: input_0.amount,
+                    script_pubkey: connector_0.generate_taproot_address().script_pubkey(),
+                },
+                TxOut {
+                    value: input_1.amount,
+                    script_pubkey: connector_a.generate_taproot_address().script_pubkey(),
+                },
+                TxOut {
+                    value: input_2.amount,
+                    script_pubkey: connector_3.generate_address().script_pubkey(),
+                },
+            ],
+            prev_scripts: vec![
+                connector_0.generate_taproot_leaf_script(input_0_leaf),
+                connector_a.generate_taproot_leaf_script(input_1_leaf),
+                connector_3.generate_script(),
+            ],
+            musig2_nonces: HashMap::new(),
+            musig2_nonce_signatures: HashMap::new(),
+            musig2_signatures: HashMap::new(),
+        }
+    }
+
+    fn sign_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_0: &Connector0,
+        secret_nonce: &SecNonce,
+    ) {
+        let input_index = 0;
+        pre_sign_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            secret_nonce,
+        );
+
+        // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
+        if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
+            self.finalize_input_0(context, connector_0);
+        }
+    }
+
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_0: &Connector0) {
+        let input_index = 0;
+        finalize_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            connector_0.generate_taproot_spend_info(),
+        );
+    }
+
+    fn sign_input_1(&mut self, context: &OperatorContext, connector_a: &ConnectorA) {
+        let input_index = 1;
+        pre_sign_taproot_input_default(
+            self,
+            input_index,
+            TapSighashType::All,
+            connector_a.generate_taproot_spend_info(),
+            &vec![&context.operator_keypair],
+        );
+    }
+
+    fn sign_input_2(&mut self, context: &OperatorContext) {
+        let input_index = 2;
+        pre_sign_p2wsh_input(
+            self,
+            input_index,
+            EcdsaSighashType::All,
+            &vec![&context.operator_keypair],
+        );
+    }
+
+    pub fn pre_sign(
+        &mut self,
+        context: &VerifierContext,
+        connector_0: &Connector0,
+        secret_nonces: &HashMap<usize, SecNonce>,
+    ) {
+        let input_index = 0;
+        self.sign_input_0(context, connector_0, &secret_nonces[&input_index]);
+    }
+
+    pub fn merge(&mut self, take_1: &Take1Transaction) {
+        merge_transactions(&mut self.tx, &take_1.tx);
+        merge_musig2_nonces_and_signatures(self, take_1);
+    }
+}
+
+impl BaseTransaction for Take1Transaction {
+    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
new file mode 100644
index 000000000..0a14ddfa1
--- /dev/null
+++ b/goat/src/transactions/take_2.rs
@@ -0,0 +1,287 @@
+use bitcoin::{
+    absolute, consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, TapSighashType,
+    Transaction, TxOut,
+};
+use musig2::{secp256k1::schnorr::Signature, PartialSignature, PubNonce, SecNonce};
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+use super::{
+    super::{
+        connectors::{
+            base::*, connector_0::Connector0, connector_4::Connector4, connector_5::Connector5,
+            connector_c::ConnectorC,
+        },
+        contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
+        scripts::*,
+    },
+    base::*,
+    pre_signed::*,
+    pre_signed_musig2::*,
+    signing::populate_p2tr_key_spend_witness,
+};
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
+pub struct Take2Transaction {
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    tx: Transaction,
+    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
+    prev_outs: Vec<TxOut>,
+    prev_scripts: Vec<ScriptBuf>,
+
+    musig2_nonces: HashMap<usize, HashMap<PublicKey, PubNonce>>,
+    musig2_nonce_signatures: HashMap<usize, HashMap<PublicKey, Signature>>,
+    musig2_signatures: HashMap<usize, HashMap<PublicKey, PartialSignature>>,
+}
+
+impl PreSignedTransaction for Take2Transaction {
+    fn tx(&self) -> &Transaction { &self.tx }
+
+    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
+
+    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
+
+    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_mut(&mut self) -> &mut HashMap<usize, HashMap<PublicKey, PubNonce>> {
+        &mut self.musig2_nonces
+    }
+    fn musig2_nonce_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, Signature>> {
+        &self.musig2_nonce_signatures
+    }
+    fn musig2_nonce_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, Signature>> {
+        &mut self.musig2_nonce_signatures
+    }
+    fn musig2_signatures(&self) -> &HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &self.musig2_signatures
+    }
+    fn musig2_signatures_mut(
+        &mut self,
+    ) -> &mut HashMap<usize, HashMap<PublicKey, PartialSignature>> {
+        &mut self.musig2_signatures
+    }
+    fn verifier_inputs(&self) -> Vec<usize> { vec![0, 2] }
+}
+
+impl Take2Transaction {
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        context: &OperatorContext,
+        connector_0: &Connector0,
+        connector_4: &Connector4,
+        connector_5: &Connector5,
+        connector_c: &ConnectorC,
+        input_0: Input,
+        input_1: Input,
+        input_2: Input,
+        input_3: Input,
+    ) -> Self {
+        let mut this = Self::new_for_validation(
+            context.network,
+            &context.operator_public_key,
+            connector_0,
+            connector_4,
+            connector_5,
+            connector_c,
+            input_0,
+            input_1,
+            input_2,
+            input_3,
+        );
+
+        this.sign_input_1(context);
+
+        this
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn new_for_validation(
+        network: Network,
+        operator_public_key: &PublicKey,
+        connector_0: &Connector0,
+        connector_4: &Connector4,
+        connector_5: &Connector5,
+        connector_c: &ConnectorC,
+        input_0: Input,
+        input_1: Input,
+        input_2: Input,
+        input_3: Input,
+    ) -> Self {
+        let input_0_leaf = 1;
+        let _input_0 = connector_0.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
+
+        let _input_1 = connector_4.generate_tx_in(&input_1);
+
+        let input_2_leaf = 0;
+        let _input_2 = connector_5.generate_taproot_leaf_tx_in(input_2_leaf, &input_2);
+
+        let _input_3 = generate_default_tx_in(&input_3);
+
+        let total_output_amount = input_0.amount + input_1.amount + input_2.amount + input_3.amount
+            - Amount::from_sat(MIN_RELAY_FEE_TAKE_2);
+
+        let _output_0 = TxOut {
+            value: total_output_amount,
+            script_pubkey: generate_pay_to_pubkey_script_address(network, operator_public_key)
+                .script_pubkey(),
+        };
+
+        Take2Transaction {
+            tx: Transaction {
+                version: bitcoin::transaction::Version(2),
+                lock_time: absolute::LockTime::ZERO,
+                input: vec![_input_0, _input_1, _input_2, _input_3],
+                output: vec![_output_0],
+            },
+            prev_outs: vec![
+                TxOut {
+                    value: input_0.amount,
+                    script_pubkey: connector_0.generate_taproot_address().script_pubkey(),
+                },
+                TxOut {
+                    value: input_1.amount,
+                    script_pubkey: connector_4.generate_address().script_pubkey(),
+                },
+                TxOut {
+                    value: input_2.amount,
+                    script_pubkey: connector_5.generate_taproot_address().script_pubkey(),
+                },
+                TxOut {
+                    value: input_3.amount,
+                    script_pubkey: connector_c.generate_taproot_address().script_pubkey(),
+                },
+            ],
+            prev_scripts: vec![
+                connector_0.generate_taproot_leaf_script(input_0_leaf),
+                connector_4.generate_script(),
+                connector_5.generate_taproot_leaf_script(input_2_leaf),
+                // No `input_3` script - key spend path is used
+            ],
+            musig2_nonces: HashMap::new(),
+            musig2_nonce_signatures: HashMap::new(),
+            musig2_signatures: HashMap::new(),
+        }
+    }
+
+    fn sign_input_0(
+        &mut self,
+        context: &VerifierContext,
+        connector_0: &Connector0,
+        secret_nonce: &SecNonce,
+    ) {
+        let input_index = 0;
+        pre_sign_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            secret_nonce,
+        );
+
+        // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
+        if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
+            self.finalize_input_0(context, connector_0);
+        }
+    }
+
+    fn finalize_input_0(&mut self, context: &dyn BaseContext, connector_0: &Connector0) {
+        let input_index = 0;
+        finalize_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            connector_0.generate_taproot_spend_info(),
+        );
+    }
+
+    fn sign_input_1(&mut self, context: &OperatorContext) {
+        let input_index = 1;
+        pre_sign_p2wsh_input(
+            self,
+            input_index,
+            EcdsaSighashType::All,
+            &vec![&context.operator_keypair],
+        );
+    }
+
+    fn sign_input_2(
+        &mut self,
+        context: &VerifierContext,
+        connector_5: &Connector5,
+        secret_nonce: &SecNonce,
+    ) {
+        let input_index = 2;
+        pre_sign_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            secret_nonce,
+        );
+
+        // TODO: Consider verifying the final signature against the n-of-n public key and the tx.
+        if self.musig2_signatures[&input_index].len() == context.n_of_n_public_keys.len() {
+            self.finalize_input_2(context, connector_5);
+        }
+    }
+
+    fn finalize_input_2(&mut self, context: &dyn BaseContext, connector_5: &Connector5) {
+        let input_index = 2;
+        finalize_musig2_taproot_input(
+            self,
+            context,
+            input_index,
+            TapSighashType::All,
+            connector_5.generate_taproot_spend_info(),
+        );
+    }
+
+    fn sign_input_3(&mut self, context: &OperatorContext, connector_c: &ConnectorC) {
+        let input_index = 3;
+        let prev_outs = &self.prev_outs().clone();
+        let merkle_root = connector_c.taproot_merkle_root();
+
+        populate_p2tr_key_spend_witness(
+            self.tx_mut(),
+            input_index,
+            prev_outs,
+            TapSighashType::All,
+            merkle_root,
+            &context.operator_keypair,
+        );
+    }
+
+    pub fn pre_sign(
+        &mut self,
+        context: &VerifierContext,
+        connector_0: &Connector0,
+        connector_5: &Connector5,
+        secret_nonces: &HashMap<usize, SecNonce>,
+    ) {
+        let input_index = 0;
+        self.sign_input_0(context, connector_0, &secret_nonces[&input_index]);
+
+        let input_index = 2;
+        self.sign_input_2(context, connector_5, &secret_nonces[&input_index]);
+    }
+
+    pub fn sign(&mut self, context: &OperatorContext, connector_c: &ConnectorC) {
+        self.sign_input_3(context, connector_c);
+    }
+
+    pub fn merge(&mut self, take_2: &Take2Transaction) {
+        merge_transactions(&mut self.tx, &take_2.tx);
+        merge_musig2_nonces_and_signatures(self, take_2);
+    }
+}
+
+impl BaseTransaction for Take2Transaction {
+    fn finalize(&self) -> Transaction { self.tx.clone() }
+    fn name(&self) -> &'static str { "Take2" }
+}
diff --git a/goat/src/utils.rs b/goat/src/utils.rs
new file mode 100644
index 000000000..c1f73cdc5
--- /dev/null
+++ b/goat/src/utils.rs
@@ -0,0 +1,78 @@
+use std::path::{Path, PathBuf};
+
+use bitcode::{Decode, Encode};
+use bitcoin::Network;
+
+const NUM_BLOCKS_REGTEST: u32 = 2;
+const NUM_BLOCKS_TESTNET: u32 = 2;
+
+pub fn num_blocks_per_network(network: Network, mainnet_num_blocks: u32) -> u32 {
+    match network {
+        Network::Bitcoin => mainnet_num_blocks,
+        Network::Regtest => NUM_BLOCKS_REGTEST,
+        _ => NUM_BLOCKS_TESTNET, // Testnet, Signet
+    }
+}
+
+pub fn remove_script_and_control_block_from_witness(mut witness: Vec<Vec<u8>>) -> Vec<Vec<u8>> {
+    witness.truncate(witness.len() - 2);
+
+    witness
+}
+
+pub fn write_cache(file_path: &Path, data: &impl Encode) -> std::io::Result<()> {
+    println!("Writing cache to {}...", file_path.display());
+    if let Some(parent) = file_path.parent() {
+        if !parent.exists() {
+            std::fs::create_dir_all(parent)?;
+        }
+    }
+    let now = std::time::Instant::now();
+    let encoded_data = bitcode::encode(data);
+    let compressed_data = zstd::stream::encode_all(encoded_data.as_slice(), 5)?;
+    let elapsed = now.elapsed();
+    println!("Encoded cache to in {} ms", elapsed.as_millis());
+    std::fs::write(file_path, compressed_data)
+}
+
+pub fn read_cache<T>(file_path: &Path) -> std::io::Result<T>
+where
+    T: for<'de> Decode<'de>,
+{
+    println!("Reading cache from {}...", file_path.display());
+    let compressed_data = std::fs::read(file_path)?;
+    let now = std::time::Instant::now();
+    let encoded_data: Vec<u8> = zstd::stream::decode_all(compressed_data.as_slice())?;
+    let decoded = bitcode::decode(&encoded_data).map_err(|e| {
+        std::io::Error::new(
+            std::io::ErrorKind::InvalidData,
+            format!("bitcode error: {}", e),
+        )
+    })?;
+    let elapsed = now.elapsed();
+    println!("Decoded cache in {} ms", elapsed.as_millis());
+
+    Ok(decoded)
+}
+
+pub fn cleanup_cache_files(prefix: &str, cache_location: &Path, max_cache_files: u32) {
+    let mut paths: Vec<PathBuf> = std::fs::read_dir(cache_location)
+        .unwrap()
+        .filter_map(Result::ok)
+        .filter(|entry| entry.file_name().to_str().unwrap_or("").starts_with(prefix))
+        .map(|entry| entry.path())
+        .collect();
+
+    paths.sort_by_key(|path| {
+        std::fs::metadata(path)
+            .and_then(|m| m.modified())
+            .unwrap_or_else(|_| std::time::SystemTime::now())
+    });
+
+    if paths.len() >= max_cache_files as usize {
+        if let Some(oldest) = paths.first() {
+            std::fs::remove_file(oldest).expect("Failed to delete the old cache file");
+            println!("Old cache file deleted: {:?}", oldest);
+        }
+    }
+}
diff --git a/header-chain/Cargo.toml b/header-chain/Cargo.toml
new file mode 100644
index 000000000..3c4410fd7
--- /dev/null
+++ b/header-chain/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "header-chain"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+risc0-zkvm = {version = "1.2.5", default-features = false, features = ["std"]}
+borsh = {version = "1.5.3", features = ["derive"] }
+sha2 =  { version = "0.10.8", default-features = false }
+crypto-bigint = { version = "0.5.5", default-features = false }
+bitcoin = "0.32.5"
+serde = { version = "1.0", default-features = false }
+
+[dev-dependencies]
+hex = "0.4.3"
+hex-literal = "0.4.1"
diff --git a/header-chain/README.md b/header-chain/README.md
new file mode 100644
index 000000000..8651c92dd
--- /dev/null
+++ b/header-chain/README.md
@@ -0,0 +1,11 @@
+# Header Chain Library
+This library contains the necessary functionalities for proving the header chain of Bitcoin.
+You need to have `Risc0` toolchain installed to build the ELFs.
+
+## Building
+At the root of the repository,
+```bash
+REPR_GUEST_BUILD=1 BITCOIN_NETWORK=<NETWORK> cargo build -p header-chain-circuit --release
+```
+
+The ELF file will be at `prover/elfs/<NETWORK>-header-chain-guest`.
diff --git a/header-chain/build.dockerfile b/header-chain/build.dockerfile
new file mode 100644
index 000000000..f43979126
--- /dev/null
+++ b/header-chain/build.dockerfile
@@ -0,0 +1,28 @@
+FROM risczero/risc0-guest-builder:r0.1.81.0 AS build
+
+WORKDIR /src
+
+# Copy the entire project structure
+COPY . .
+
+# Set compile-time environment variables
+ENV CARGO_MANIFEST_PATH="header-chain-guest/guest/Cargo.toml"
+ENV RUSTFLAGS="-C passes=loweratomic -C link-arg=-Ttext=0x00200800 -C link-arg=--fatal-warnings"
+ENV CARGO_TARGET_DIR="header-chain-guest/guest/target"
+ENV CC_riscv32im_risc0_zkvm_elf="/root/.local/share/cargo-risczero/cpp/bin/riscv32-unknown-elf-gcc"
+ENV CFLAGS_riscv32im_risc0_zkvm_elf="-march=rv32im -nostdlib"
+
+# Set network environment variable
+ARG BITCOIN_NETWORK=mainnet
+ENV BITCOIN_NETWORK=${BITCOIN_NETWORK}
+
+# Only run the build once with the environment variable set
+RUN echo "Building for network: ${BITCOIN_NETWORK}" && \
+    cargo +risc0 update && \
+    cargo +risc0 fetch --target riscv32im-risc0-zkvm-elf --manifest-path ${CARGO_MANIFEST_PATH} && \
+    cargo +risc0 build --release --target riscv32im-risc0-zkvm-elf --manifest-path ${CARGO_MANIFEST_PATH}
+
+FROM scratch AS export
+ARG BITCOIN_NETWORK
+COPY --from=build /src/header-chain-guest/guest/target/riscv32im-risc0-zkvm-elf/release ../target/riscv-guest/riscv32im-risc0-zkvm-elf/docker/header_chain_guest
+COPY --from=build /src/header-chain-guest/guest/target/riscv32im-risc0-zkvm-elf/release/header-chain-guest ../prover/elfs/${BITCOIN_NETWORK}-header-chain-guest
\ No newline at end of file
diff --git a/header-chain/header-chain-guest/Cargo.toml b/header-chain/header-chain-guest/Cargo.toml
new file mode 100644
index 000000000..788abdd3a
--- /dev/null
+++ b/header-chain/header-chain-guest/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "header-chain-circuit"
+version = "0.1.0"
+edition = "2021"
+
+[build-dependencies]
+risc0-build = { version = "1.2.5" }
+
+[package.metadata.risc0]
+methods = ["guest"]
diff --git a/header-chain/header-chain-guest/build.rs b/header-chain/header-chain-guest/build.rs
new file mode 100644
index 000000000..afc2fbb08
--- /dev/null
+++ b/header-chain/header-chain-guest/build.rs
@@ -0,0 +1,50 @@
+use std::env;
+use std::process::Command;
+
+fn main() {
+    println!("cargo:rerun-if-changed=../build.dockerfile");
+
+    if env::var("REPR_GUEST_BUILD").is_ok() {
+        // Get the absolute path to the project root
+        let current_dir = env::current_dir().expect("Failed to get current directory");
+        let project_root = current_dir.parent().unwrap().parent().unwrap();
+        let output_dir = project_root.join("target/riscv-guest/riscv32im-risc0-zkvm-elf/docker");
+
+        eprintln!("Current directory: {:?}", current_dir);
+        eprintln!("Project root: {:?}", project_root);
+        eprintln!("Output directory: {:?}", output_dir);
+
+        // Ensure the output directory exists
+        std::fs::create_dir_all(&output_dir).expect("Failed to create output directory");
+
+        let output = Command::new("docker")
+            .args([
+                "buildx",
+                "build",
+                "--platform",
+                "linux/amd64",
+                "-f",
+                "header-chain/build.dockerfile",
+                "--output",
+                &format!("type=local,dest=."),
+                "header-chain", // Use current directory as context
+                "--build-arg",
+                &format!(
+                    "BITCOIN_NETWORK={}",
+                    std::env::var("BITCOIN_NETWORK").unwrap().as_str()
+                ),
+            ])
+            .current_dir(project_root) // Set working directory to project root
+            .output()
+            .expect("Failed to execute Docker command");
+
+        if !output.status.success() {
+            eprintln!("Docker build failed:");
+            eprintln!("stdout: {}", String::from_utf8_lossy(&output.stdout));
+            eprintln!("stderr: {}", String::from_utf8_lossy(&output.stderr));
+            panic!("Docker build failed");
+        }
+    }
+
+    risc0_build::embed_methods();
+}
diff --git a/header-chain/header-chain-guest/guest/Cargo.lock b/header-chain/header-chain-guest/guest/Cargo.lock
new file mode 100644
index 000000000..fb30a9a5a
--- /dev/null
+++ b/header-chain/header-chain-guest/guest/Cargo.lock
@@ -0,0 +1,1192 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
+
+[[package]]
+name = "ark-bn254"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-crypto-primitives"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3a13b34da09176a8baba701233fdffbaa7c1b1192ce031a3da4e55ce1f1a56"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-relations",
+ "ark-serialize",
+ "ark-snark",
+ "ark-std",
+ "blake2",
+ "derivative",
+ "digest",
+ "sha2",
+]
+
+[[package]]
+name = "ark-ec"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
+dependencies = [
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "hashbrown 0.13.2",
+ "itertools",
+ "num-traits",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba"
+dependencies = [
+ "ark-ff-asm",
+ "ark-ff-macros",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "digest",
+ "itertools",
+ "num-bigint",
+ "num-traits",
+ "paste",
+ "rustc_version",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff-asm"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-groth16"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20ceafa83848c3e390f1cbf124bc3193b3e639b3f02009e0e290809a501b95fc"
+dependencies = [
+ "ark-crypto-primitives",
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-poly"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
+dependencies = [
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "hashbrown 0.13.2",
+]
+
+[[package]]
+name = "ark-relations"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00796b6efc05a3f48225e59cb6a2cda78881e7c390872d5786aaf112f31fb4f0"
+dependencies = [
+ "ark-ff",
+ "ark-std",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "ark-serialize"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
+dependencies = [
+ "ark-serialize-derive",
+ "ark-std",
+ "digest",
+ "num-bigint",
+]
+
+[[package]]
+name = "ark-serialize-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-snark"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84d3cc6833a335bb8a600241889ead68ee89a3cf8448081fb7694c0fe503da63"
+dependencies = [
+ "ark-ff",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
+dependencies = [
+ "num-traits",
+ "rand",
+]
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "base58ck"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"
+dependencies = [
+ "bitcoin-internals",
+ "bitcoin_hashes",
+]
+
+[[package]]
+name = "bech32"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
+
+[[package]]
+name = "bitcoin"
+version = "0.32.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6bc65742dea50536e35ad42492b234c27904a27f0abdcbce605015cb4ea026"
+dependencies = [
+ "base58ck",
+ "bech32",
+ "bitcoin-internals",
+ "bitcoin-io",
+ "bitcoin-units",
+ "bitcoin_hashes",
+ "hex-conservative",
+ "hex_lit",
+ "secp256k1",
+]
+
+[[package]]
+name = "bitcoin-internals"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30bdbe14aa07b06e6cfeffc529a1f099e5fbe249524f8125358604df99a4bed2"
+
+[[package]]
+name = "bitcoin-io"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf"
+
+[[package]]
+name = "bitcoin-units"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2"
+dependencies = [
+ "bitcoin-internals",
+]
+
+[[package]]
+name = "bitcoin_hashes"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
+dependencies = [
+ "bitcoin-io",
+ "hex-conservative",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "blake2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "borsh"
+version = "1.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03"
+dependencies = [
+ "borsh-derive",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "bytemuck"
+version = "1.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cc"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "libc",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "git+https://github.com/risc0/RustCrypto-crypto-bigint?tag=v0.5.5-risczero.0#3ab63a6f1048833f7047d5a50532e4a4cc789384"
+dependencies = [
+ "getrandom",
+ "subtle",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "elf"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
+[[package]]
+name = "header-chain"
+version = "0.1.0"
+dependencies = [
+ "bitcoin",
+ "borsh",
+ "crypto-bigint",
+ "risc0-zkvm",
+ "serde",
+ "sha2",
+]
+
+[[package]]
+name = "header-chain-guest"
+version = "0.1.0"
+dependencies = [
+ "header-chain",
+]
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hex-conservative"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "hex-literal"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
+
+[[package]]
+name = "hex_lit"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
+
+[[package]]
+name = "indexmap"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.2",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.169"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+
+[[package]]
+name = "libm"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "metal"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
+dependencies = [
+ "bitflags 2.6.0",
+ "block",
+ "core-graphics-types",
+ "foreign-types",
+ "log",
+ "objc",
+ "paste",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+
+[[package]]
+name = "risc0-binfmt"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9d893807e609dd44942644aef5137ad87d178a032c5932b0c68cdec538c3370"
+dependencies = [
+ "anyhow",
+ "borsh",
+ "elf",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-keccak"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16d1d4f248ccf111a9d58a6cd9ae5bfb4c3830e100e75874c39622a2952ef5a9"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "paste",
+ "risc0-binfmt",
+ "risc0-circuit-recursion",
+ "risc0-core",
+ "risc0-zkp",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-recursion"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5ab005ed38c1119c0511b9260cd18d95adbb226ad849eccfdb650eebecd769c"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "hex",
+ "metal",
+ "risc0-core",
+ "risc0-zkp",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-circuit-rv32im"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d64420292f716e468cba1e17eb56146a525d612d967ee09566eda80b423a54a"
+dependencies = [
+ "anyhow",
+ "metal",
+ "risc0-binfmt",
+ "risc0-core",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-core"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2492abd92da4eb2a6e5e9e74757d00b1c29c03bb867266c85752cb22a03a920"
+dependencies = [
+ "bytemuck",
+ "rand_core",
+]
+
+[[package]]
+name = "risc0-groth16"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0017c18151e017a154f4b4bbeec2a0656a3a7822fab3cd0dc1a15e2654dde4fe"
+dependencies = [
+ "anyhow",
+ "ark-bn254",
+ "ark-ec",
+ "ark-groth16",
+ "ark-serialize",
+ "bytemuck",
+ "hex",
+ "num-bigint",
+ "num-traits",
+ "risc0-binfmt",
+ "risc0-zkp",
+ "serde",
+ "stability",
+]
+
+[[package]]
+name = "risc0-zkp"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a6e3c078d7a7d27eda9383db8d080f7200ac4e5e65c1971d454a0286c00cae"
+dependencies = [
+ "anyhow",
+ "blake2",
+ "borsh",
+ "bytemuck",
+ "cfg-if",
+ "digest",
+ "hex",
+ "hex-literal",
+ "metal",
+ "paste",
+ "rand_core",
+ "risc0-core",
+ "risc0-zkvm-platform",
+ "serde",
+ "sha2",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-zkvm"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fd97c60815994da62fa000dec9470c0d0e3045a554354e279695f2213b0182f"
+dependencies = [
+ "anyhow",
+ "borsh",
+ "bytemuck",
+ "getrandom",
+ "hex",
+ "risc0-binfmt",
+ "risc0-circuit-keccak",
+ "risc0-circuit-recursion",
+ "risc0-circuit-rv32im",
+ "risc0-core",
+ "risc0-groth16",
+ "risc0-zkp",
+ "risc0-zkvm-platform",
+ "rrs-lib",
+ "semver",
+ "serde",
+ "sha2",
+ "stability",
+ "tracing",
+]
+
+[[package]]
+name = "risc0-zkvm-platform"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "778e0235c87d8e18f13da5c71bfe69b1beb7c08694c75d19eae9dbed09a59c57"
+dependencies = [
+ "bytemuck",
+ "cfg-if",
+ "getrandom",
+ "libm",
+ "stability",
+]
+
+[[package]]
+name = "rrs-lib"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4382d3af3a4ebdae7f64ba6edd9114fff92c89808004c4943b393377a25d001"
+dependencies = [
+ "downcast-rs",
+ "paste",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
+dependencies = [
+ "bitcoin_hashes",
+ "secp256k1-sys",
+]
+
+[[package]]
+name = "secp256k1-sys"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
+
+[[package]]
+name = "serde"
+version = "1.0.216"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.216"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "git+https://github.com/risc0/RustCrypto-hashes?tag=sha2-v0.10.8-risczero.0#244dc3b08788f7a4ccce14c66896ae3b4f24c166"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "stability"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac"
+dependencies = [
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+
+[[package]]
+name = "toml_edit"
+version = "0.22.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
+dependencies = [
+ "tracing-core",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "winnow"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
diff --git a/header-chain/header-chain-guest/guest/Cargo.toml b/header-chain/header-chain-guest/guest/Cargo.toml
new file mode 100644
index 000000000..cdb14a791
--- /dev/null
+++ b/header-chain/header-chain-guest/guest/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "header-chain-guest"
+version = "0.1.0"
+edition = "2021"
+
+[workspace]
+
+[dependencies]
+header-chain = { path = "../..", default-features = false }
+
+[patch.crates-io]
+sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
+crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" }
\ No newline at end of file
diff --git a/header-chain/header-chain-guest/guest/src/main.rs b/header-chain/header-chain-guest/guest/src/main.rs
new file mode 100644
index 000000000..c2aa9af1d
--- /dev/null
+++ b/header-chain/header-chain-guest/guest/src/main.rs
@@ -0,0 +1,6 @@
+#![no_main]
+header_chain::risc0_zkvm::guest::entry!(main);
+fn main() {
+    let zkvm_guest = header_chain::zkvm::Risc0Guest::new();
+    header_chain::header_chain_circuit(&zkvm_guest);
+}
\ No newline at end of file
diff --git a/header-chain/header-chain-guest/src/lib.rs b/header-chain/header-chain-guest/src/lib.rs
new file mode 100644
index 000000000..1bdb3085f
--- /dev/null
+++ b/header-chain/header-chain-guest/src/lib.rs
@@ -0,0 +1 @@
+include!(concat!(env!("OUT_DIR"), "/methods.rs"));
diff --git a/header-chain/src/header_chain.rs b/header-chain/src/header_chain.rs
new file mode 100644
index 000000000..eb5c08ca1
--- /dev/null
+++ b/header-chain/src/header_chain.rs
@@ -0,0 +1,1075 @@
+// Implementation of this module is inspired by the Bitcoin Core source code and from here:
+// https://github.com/ZeroSync/header_chain/tree/master/program/src/block_header.
+
+/// This module contains the implementation of the header chain circuit, which is basically
+/// the Bitcoin header chain verification logic.
+/// WARNING: This implementation is not a word-to-word translation of the Bitcoin Core source code.
+use crate::mmr_guest::MMRGuest;
+use bitcoin::{
+    block::{Header, Version},
+    hashes::Hash,
+    BlockHash, CompactTarget, TxMerkleNode,
+};
+use borsh::{BorshDeserialize, BorshSerialize};
+use crypto_bigint::{Encoding, U256};
+use serde::{Deserialize, Serialize};
+use sha2::{Digest, Sha256};
+
+/// Network configuration holder for Bitcoin-specific constants
+#[derive(Debug)]
+pub struct NetworkConstants {
+    pub max_bits: u32,
+    pub max_target: U256,
+    pub max_target_bytes: [u8; 32],
+}
+
+pub const NETWORK_TYPE: &str = {
+    match option_env!("BITCOIN_NETWORK") {
+        Some(network) if matches!(network.as_bytes(), b"mainnet") => "mainnet",
+        Some(network) if matches!(network.as_bytes(), b"testnet4") => "testnet4",
+        Some(network) if matches!(network.as_bytes(), b"signet") => "signet",
+        Some(network) if matches!(network.as_bytes(), b"regtest") => "regtest",
+        None => "mainnet",
+        _ => panic!("Invalid network type"),
+    }
+};
+
+// Const evaluation of network type from environment
+const IS_REGTEST: bool = matches!(NETWORK_TYPE.as_bytes(), b"regtest");
+const IS_TESTNET4: bool = matches!(NETWORK_TYPE.as_bytes(), b"testnet4");
+const MINIMUM_WORK_TESTNET: U256 =
+    U256::from_be_hex("0000000000000000000000000000000000000000000000000000000100010001");
+
+pub const NETWORK_CONSTANTS: NetworkConstants = {
+    match option_env!("BITCOIN_NETWORK") {
+        Some(n) if matches!(n.as_bytes(), b"signet") => NetworkConstants {
+            max_bits: 0x1E0377AE,
+            max_target: U256::from_be_hex(
+                "00000377AE000000000000000000000000000000000000000000000000000000",
+            ),
+            max_target_bytes: [
+                0, 0, 3, 119, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0,
+            ],
+        },
+        Some(n) if matches!(n.as_bytes(), b"regtest") => NetworkConstants {
+            max_bits: 0x207FFFFF,
+            max_target: U256::from_be_hex(
+                "7FFFFF0000000000000000000000000000000000000000000000000000000000",
+            ),
+            max_target_bytes: [
+                127, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0,
+            ],
+        },
+        Some(n) if matches!(n.as_bytes(), b"testnet4") => NetworkConstants {
+            max_bits: 0x1D00FFFF,
+            max_target: U256::from_be_hex(
+                "00000000FFFF0000000000000000000000000000000000000000000000000000",
+            ),
+            max_target_bytes: [
+                0, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0,
+            ],
+        },
+        Some(n) if matches!(n.as_bytes(), b"mainnet") => NetworkConstants {
+            max_bits: 0x1D00FFFF,
+            max_target: U256::from_be_hex(
+                "00000000FFFF0000000000000000000000000000000000000000000000000000",
+            ),
+            max_target_bytes: [
+                0, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0,
+            ],
+        },
+        // Default to mainnet for None
+        None => NetworkConstants {
+            max_bits: 0x1D00FFFF,
+            max_target: U256::from_be_hex(
+                "00000000FFFF0000000000000000000000000000000000000000000000000000",
+            ),
+            max_target_bytes: [
+                0, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0,
+            ],
+        },
+        _ => panic!("Unsupported network"),
+    }
+};
+
+/// An epoch should be two weeks (represented as number of seconds)
+/// seconds/minute * minutes/hour * hours/day * 14 days
+const EXPECTED_EPOCH_TIMESPAN: u32 = 60 * 60 * 24 * 14;
+
+/// Number of blocks per epoch
+const BLOCKS_PER_EPOCH: u32 = 2016;
+
+/// Bitcoin block header.
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug, BorshDeserialize, BorshSerialize)]
+pub struct CircuitBlockHeader {
+    pub version: i32,
+    pub prev_block_hash: [u8; 32],
+    pub merkle_root: [u8; 32],
+    pub time: u32,
+    pub bits: u32,
+    pub nonce: u32,
+}
+
+impl CircuitBlockHeader {
+    pub fn compute_block_hash(&self) -> [u8; 32] {
+        let mut hasher = Sha256::new();
+        hasher.update(&self.version.to_le_bytes());
+        hasher.update(&self.prev_block_hash);
+        hasher.update(&self.merkle_root);
+        hasher.update(&self.time.to_le_bytes());
+        hasher.update(&self.bits.to_le_bytes());
+        hasher.update(&self.nonce.to_le_bytes());
+        let first_hash_result = hasher.finalize_reset();
+
+        hasher.update(first_hash_result);
+        let result: [u8; 32] = hasher
+            .finalize()
+            .try_into()
+            .expect("SHA256 should produce a 32-byte output");
+        result
+    }
+}
+
+impl From<Header> for CircuitBlockHeader {
+    fn from(header: Header) -> Self {
+        CircuitBlockHeader {
+            version: header.version.to_consensus(),
+            prev_block_hash: header.prev_blockhash.to_byte_array(),
+            merkle_root: header.merkle_root.as_raw_hash().to_byte_array(),
+            time: header.time,
+            bits: header.bits.to_consensus(),
+            nonce: header.nonce,
+        }
+    }
+}
+
+impl Into<Header> for CircuitBlockHeader {
+    fn into(self) -> Header {
+        Header {
+            version: Version::from_consensus(self.version),
+            prev_blockhash: BlockHash::from_slice(&self.prev_block_hash)
+                .expect("Previous block hash is 32 bytes"),
+            merkle_root: TxMerkleNode::from_slice(&self.merkle_root)
+                .expect("Merkle root is 32 bytes"),
+            time: self.time,
+            bits: CompactTarget::from_consensus(self.bits),
+            nonce: self.nonce,
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug, BorshDeserialize, BorshSerialize)]
+pub struct ChainState {
+    pub block_height: u32,
+    pub total_work: [u8; 32],
+    pub best_block_hash: [u8; 32],
+    pub current_target_bits: u32,
+    pub epoch_start_time: u32,
+    pub prev_11_timestamps: [u32; 11],
+    pub block_hashes_mmr: MMRGuest,
+}
+
+impl ChainState {
+    pub fn new() -> Self {
+        ChainState {
+            block_height: u32::MAX,
+            total_work: [0u8; 32],
+            best_block_hash: [0u8; 32],
+            current_target_bits: NETWORK_CONSTANTS.max_bits,
+            epoch_start_time: 0,
+            prev_11_timestamps: [0u32; 11],
+            block_hashes_mmr: MMRGuest::new(),
+        }
+    }
+
+    pub fn apply_blocks(&mut self, block_headers: Vec<CircuitBlockHeader>) {
+        let mut current_target_bytes = if IS_REGTEST {
+            NETWORK_CONSTANTS.max_target.to_be_bytes()
+        } else {
+            bits_to_target(self.current_target_bits)
+        };
+        let mut current_work: U256 = U256::from_be_bytes(self.total_work);
+
+        let mut last_block_time = if IS_TESTNET4 {
+            if self.block_height == u32::MAX {
+                0
+            } else {
+                self.prev_11_timestamps[self.block_height as usize % 11]
+            }
+        } else {
+            0
+        };
+
+        for block_header in block_headers {
+            self.block_height = self.block_height.wrapping_add(1);
+
+            let (target_to_use, expected_bits, work_to_add) = if IS_TESTNET4 {
+                if block_header.time > last_block_time + 1200 {
+                    // If the block is an epoch block, then it still has to have the real target.
+                    if self.block_height % BLOCKS_PER_EPOCH == 0 {
+                        (
+                            current_target_bytes,
+                            self.current_target_bits,
+                            calculate_work(&current_target_bytes),
+                        )
+                    } else {
+                        (
+                            NETWORK_CONSTANTS.max_target_bytes,
+                            NETWORK_CONSTANTS.max_bits,
+                            MINIMUM_WORK_TESTNET,
+                        )
+                    }
+                } else {
+                    (
+                        current_target_bytes,
+                        self.current_target_bits,
+                        calculate_work(&current_target_bytes),
+                    )
+                }
+            } else {
+                (
+                    current_target_bytes,
+                    self.current_target_bits,
+                    calculate_work(&current_target_bytes),
+                )
+            };
+
+            let new_block_hash = block_header.compute_block_hash();
+
+            assert_eq!(block_header.prev_block_hash, self.best_block_hash);
+
+            if IS_REGTEST {
+                assert_eq!(block_header.bits, NETWORK_CONSTANTS.max_bits);
+            } else {
+                assert_eq!(block_header.bits, expected_bits);
+            }
+
+            check_hash_valid(&new_block_hash, &target_to_use);
+
+            if !validate_timestamp(block_header.time, self.prev_11_timestamps) {
+                panic!("Timestamp is not valid");
+            }
+
+            self.block_hashes_mmr.append(new_block_hash);
+            self.best_block_hash = new_block_hash;
+            current_work = current_work.wrapping_add(&work_to_add);
+
+            if !IS_REGTEST && self.block_height % BLOCKS_PER_EPOCH == 0 {
+                self.epoch_start_time = block_header.time;
+            }
+
+            self.prev_11_timestamps[self.block_height as usize % 11] = block_header.time;
+
+            if IS_TESTNET4 {
+                last_block_time = block_header.time;
+            }
+
+            if !IS_REGTEST && self.block_height % BLOCKS_PER_EPOCH == BLOCKS_PER_EPOCH - 1 {
+                current_target_bytes = calculate_new_difficulty(
+                    self.epoch_start_time,
+                    block_header.time,
+                    self.current_target_bits,
+                );
+                self.current_target_bits = target_to_bits(&current_target_bytes);
+            }
+        }
+
+        self.total_work = current_work.to_be_bytes();
+    }
+}
+
+fn median(arr: [u32; 11]) -> u32 {
+    let mut sorted_arr = arr;
+    sorted_arr.sort_unstable();
+    sorted_arr[5]
+}
+
+fn validate_timestamp(block_time: u32, prev_11_timestamps: [u32; 11]) -> bool {
+    let median_time = median(prev_11_timestamps);
+    block_time > median_time
+}
+
+pub fn bits_to_target(bits: u32) -> [u8; 32] {
+    let size = (bits >> 24) as usize;
+    let mantissa = bits & 0x00ffffff;
+
+    let target = if size <= 3 {
+        U256::from(mantissa >> (8 * (3 - size)))
+    } else {
+        U256::from(mantissa) << (8 * (size - 3))
+    };
+    // println!("Output: {:?}", target.to_be_bytes());
+    target.to_be_bytes()
+}
+
+fn target_to_bits(target: &[u8; 32]) -> u32 {
+    let target_u256 = U256::from_be_slice(target);
+    let target_bits = target_u256.bits();
+    let size = (263 - target_bits) / 8;
+    let mut compact_target = [0u8; 4];
+    compact_target[0] = 33 - size as u8;
+    compact_target[1] = target[size - 1 as usize];
+    compact_target[2] = target[size + 0 as usize];
+    compact_target[3] = target[size + 1 as usize];
+    u32::from_be_bytes(compact_target)
+}
+
+fn calculate_new_difficulty(
+    epoch_start_time: u32,
+    last_timestamp: u32,
+    current_target: u32,
+) -> [u8; 32] {
+    let mut actual_timespan = last_timestamp - epoch_start_time;
+    if actual_timespan < EXPECTED_EPOCH_TIMESPAN / 4 {
+        actual_timespan = EXPECTED_EPOCH_TIMESPAN / 4;
+    } else if actual_timespan > EXPECTED_EPOCH_TIMESPAN * 4 {
+        actual_timespan = EXPECTED_EPOCH_TIMESPAN * 4;
+    }
+
+    let new_target_bytes = bits_to_target(current_target);
+    let mut new_target = U256::from_be_bytes(new_target_bytes)
+        .wrapping_mul(&U256::from(actual_timespan))
+        .wrapping_div(&U256::from(EXPECTED_EPOCH_TIMESPAN));
+
+    if new_target > NETWORK_CONSTANTS.max_target {
+        new_target = NETWORK_CONSTANTS.max_target;
+    }
+    new_target.to_be_bytes()
+}
+
+fn check_hash_valid(hash: &[u8; 32], target_bytes: &[u8; 32]) {
+    for i in 0..32 {
+        if hash[31 - i] < target_bytes[i] {
+            return;
+        } else if hash[31 - i] > target_bytes[i] {
+            panic!("Hash is not valid");
+        }
+    }
+}
+
+fn calculate_work(target: &[u8; 32]) -> U256 {
+    let target = U256::from_be_slice(target);
+    let target_plus_one = target.saturating_add(&U256::ONE);
+    let work = U256::MAX.wrapping_div(&target_plus_one);
+    work
+}
+
+/// The output of the header chain circuit.
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug, BorshDeserialize, BorshSerialize)]
+pub struct BlockHeaderCircuitOutput {
+    pub method_id: [u32; 8],
+    pub chain_state: ChainState,
+}
+
+/// The input proof of the header chain circuit.
+/// The proof can be either None (implying the beginning) or a Succinct Risc0 proof.
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug, BorshDeserialize, BorshSerialize)]
+pub enum HeaderChainPrevProofType {
+    GenesisBlock,
+    PrevProof(BlockHeaderCircuitOutput),
+}
+
+/// The input of the header chain circuit.
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug, BorshDeserialize, BorshSerialize)]
+pub struct HeaderChainCircuitInput {
+    pub method_id: [u32; 8],
+    pub prev_proof: HeaderChainPrevProofType,
+    pub block_headers: Vec<CircuitBlockHeader>,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use bitcoin::Block;
+    use hex_literal::hex;
+
+    // From block 800000 to 800015
+    const BLOCK_HEADERS: [[u8; 80]; 15] = [
+        hex!("00601d3455bb9fbd966b3ea2dc42d0c22722e4c0c1729fad17210100000000000000000055087fab0c8f3f89f8bcfd4df26c504d81b0a88e04907161838c0c53001af09135edbd64943805175e955e06"),
+        hex!("00a0012054a02827d7a8b75601275a160279a3c5768de4c1c4a702000000000000000000394ddc6a5de035874cfa22167bfe923953187b5a19fbb84e186dea3c78fd871c9bedbd6494380517f5c93c8c"),
+        hex!("00a00127470972473293f6a3514d69d9ede5acc79ef19c236be20000000000000000000035aa0cba25ae1517a257d8c913e24ec0a152fd6a84b7f9ef303626c91cdcd6b287efbd649438051761ba50fb"),
+        hex!("00e0ff3fe80aaef89174e3668cde4cefecae739cd2f337251e12050000000000000000004ed17162f118bd27ae283be8dabe8afe7583bd353087e2eb712c48e3c3240c3ea3efbd64943805178e55bb2f"),
+        hex!("00006020f9dd40733234ec3084fa55ae955d2e95f63db75382b4030000000000000000006f440ea93df1e46fa47a6135ce1661cbdb80e703e4cfb6d2c0bcf49ea50f2a1530f5bd64943805175d3a7efb"),
+        hex!("0040f526ba869c2271583b645767c3bc4acee3f4a5a1ac727d07050000000000000000006ce5ff483f5e9fe028725bd30196a064a761b3ea831e5b81cf1473d5aa11810efbf6bd64943805174c75b45d"),
+        hex!("0000c0204d770ec7842342bcfebba4447545383c639294a6c10c0500000000000000000059f61d610ef6cbcc1d05dec4ebc5e744c62dc975c4256c5f95833d350303c05521fabd64943805172b8e799e"),
+        hex!("00400020d9ea5216f276b3f623834e8db837f8b41a8afbda6e8800000000000000000000d5dea9ae25f7f8e6d66064b21c7f5d1481d08d162658785fde59716b1bf98ff50505be6494380517a33ee2b0"),
+        hex!("0060262ebabd5319d7013811214809650a635c974444813935b203000000000000000000a0ab544e5055c443256debb20e85f8ded28f746436a57c00e914b9fd02ff058bcf07be64943805172436ed21"),
+        hex!("00000020455bd24740ceb627a3c41c3cecaf097b45779719b0d40400000000000000000043ad55fc5619dd8f2edd7d18212d176cdb6aa2152f12addf9d38c9c29be0da60030bbe649438051704743edc"),
+        hex!("00e0ff27d53e9a409bf8ce3054862f76d926437c1b1a84ce1ac0010000000000000000004fceebb8a6cee0eaba389e462ae6bb89a8e6dd5396eeba89dc5907ff51112e21760dbe64943805174bd6f6f6"),
+        hex!("00e0ff3ff9d1af6c7009b9974b4d838a2505bc882a6333f92500030000000000000000002dff4798432eb3beaf3e5b7c7ca318c1b451ba05c560473b6b974138ac73a82f2b0ebe6494380517d26b2853"),
+        hex!("00403a31ee9197174b65726fa7d78fe8b547c024519642009b4f0100000000000000000025f09dbf49cabe174066ebc2d5329211bd994a2b645e4086cadc5a2bbe7cac687e0ebe64943805171f930c95"),
+        hex!("0000eb2f06d50bd6ead9973ec74d9f5d77aa9cc6262a497b7ef5040000000000000000004918ae9062a90bfc4c2befca6eb0569c86b53f20bfae39c14d56052eef74f39e2110be64943805176269f908"),
+        hex!("00a0002049b01d8eea4b9d88fabd6a9633699c579145a8ddc91205000000000000000000368d0d166ae485674d0b794a8e2e2f4e94ac1e5b6d56612b3d725bc793f523514712be6494380517860d95e4")
+    ];
+
+    const DIFFICULTY_ADJUSTMENTS: [(u32, u32, u32, u32); 430] = [
+        (1231006505, 1233061996, 486604799, 486604799),
+        (1233063531, 1234465122, 486604799, 486604799),
+        (1234466190, 1235965467, 486604799, 486604799),
+        (1235966513, 1237507400, 486604799, 486604799),
+        (1237508786, 1239054978, 486604799, 486604799),
+        (1239055463, 1240599092, 486604799, 486604799),
+        (1240599098, 1242098000, 486604799, 486604799),
+        (1242098425, 1243735798, 486604799, 486604799),
+        (1243737085, 1246050840, 486604799, 486604799),
+        (1246051973, 1248481522, 486604799, 486604799),
+        (1248481816, 1252066931, 486604799, 486604799),
+        (1252069298, 1254454291, 486604799, 486604799),
+        (1254454028, 1257000207, 486604799, 486604799),
+        (1257002900, 1259358448, 486604799, 486604799),
+        (1259358667, 1261128623, 486604799, 486604799),
+        (1261130161, 1262152739, 486604799, 486594666),
+        (1262153464, 1263249842, 486594666, 486589480),
+        (1263250117, 1264424481, 486589480, 486588017),
+        (1264424879, 1265318937, 486588017, 486575299),
+        (1265319794, 1266190073, 486575299, 476399191),
+        (1266191579, 1267000203, 476399191, 474199013),
+        (1267000864, 1268010273, 474199013, 473464687),
+        (1268010873, 1269211443, 473464687, 473437045),
+        (1269212064, 1270119474, 473437045, 472518933),
+        (1270120042, 1271061370, 472518933, 471907495),
+        (1271061586, 1271886653, 471907495, 471225455),
+        (1271886772, 1272966003, 471225455, 471067731),
+        (1272966376, 1274278387, 471067731, 471178276),
+        (1274278435, 1275140649, 471178276, 470771548),
+        (1275141448, 1276297992, 470771548, 470727268),
+        (1276298786, 1277382263, 470727268, 470626626),
+        (1277382446, 1278381204, 470626626, 470475923),
+        (1278381464, 1279007808, 470475923, 470131700),
+        (1279008237, 1279297671, 470131700, 469854461),
+        (1279297779, 1280196974, 469854461, 469830746),
+        (1280198558, 1281037393, 469830746, 469809688),
+        (1281037595, 1281869965, 469809688, 469794830),
+        (1281870671, 1282863700, 469794830, 459874456),
+        (1282864403, 1283922146, 459874456, 459009510),
+        (1283922289, 1284861793, 459009510, 457664237),
+        (1284861847, 1285703762, 457664237, 456241827),
+        (1285703908, 1286861405, 456241827, 456101533),
+        (1286861705, 1287637343, 456101533, 454983370),
+        (1287637995, 1288478771, 454983370, 454373987),
+        (1288479527, 1289303926, 454373987, 453931606),
+        (1289305768, 1290104845, 453931606, 453610282),
+        (1290105874, 1291134100, 453610282, 453516498),
+        (1291135075, 1291932610, 453516498, 453335379),
+        (1291933202, 1292956393, 453335379, 453281356),
+        (1292956443, 1294030806, 453281356, 453248203),
+        (1294031411, 1295101259, 453248203, 453217774),
+        (1295101567, 1296114735, 453217774, 453179945),
+        (1296116171, 1297140342, 453179945, 453150034),
+        (1297140800, 1298003311, 453150034, 453102630),
+        (1298006152, 1298799509, 453102630, 453062093),
+        (1298800760, 1299683275, 453062093, 453041201),
+        (1299684355, 1301020485, 453041201, 453047097),
+        (1301020785, 1302034036, 453047097, 453036989),
+        (1302034197, 1303112797, 453036989, 453031340),
+        (1303112976, 1304131540, 453031340, 453023994),
+        (1304131980, 1304974694, 453023994, 443192243),
+        (1304975844, 1305755857, 443192243, 440711666),
+        (1305756287, 1306435280, 440711666, 438735905),
+        (1306435316, 1307362613, 438735905, 438145839),
+        (1307363105, 1308145551, 438145839, 437461381),
+        (1308145774, 1308914894, 437461381, 437004818),
+        (1308915923, 1309983257, 437004818, 436911055),
+        (1309984546, 1311102675, 436911055, 436857860),
+        (1311103389, 1312186259, 436857860, 436789733),
+        (1312186279, 1313451537, 436789733, 436816518),
+        (1313451894, 1314680496, 436816518, 436826083),
+        (1314681303, 1315906303, 436826083, 436833957),
+        (1315906316, 1317163240, 436833957, 436858461),
+        (1317163624, 1318555415, 436858461, 436956491),
+        (1318556675, 1320032359, 436956491, 437121226),
+        (1320032534, 1321253256, 437121226, 437129626),
+        (1321253770, 1322576247, 437129626, 437215665),
+        (1322576420, 1323718660, 437215665, 437159528),
+        (1323718955, 1324923455, 437159528, 437155514),
+        (1324925005, 1326046766, 437155514, 437086679),
+        (1326047176, 1327204081, 437086679, 437048383),
+        (1327204504, 1328351050, 437048383, 437004555),
+        (1328351561, 1329564101, 437004555, 437006492),
+        (1329564255, 1330676346, 437006492, 436942092),
+        (1330676736, 1331885274, 436942092, 436941447),
+        (1331885394, 1332999614, 436941447, 436883582),
+        (1332999707, 1334246594, 436883582, 436904419),
+        (1334246689, 1335511874, 436904419, 436936439),
+        (1335512370, 1336565211, 436936439, 436841986),
+        (1336565313, 1337882969, 436841986, 436898655),
+        (1337883029, 1339098664, 436898655, 436902102),
+        (1339099525, 1340208670, 436902102, 436844426),
+        (1340208964, 1341401376, 436844426, 436835377),
+        (1341401841, 1342536951, 436835377, 436796718),
+        (1342537166, 1343645636, 436796718, 436747465),
+        (1343647577, 1344772046, 436747465, 436709470),
+        (1344772855, 1345858666, 436709470, 436658110),
+        (1345859199, 1346955024, 436658110, 436615736),
+        (1346955037, 1348092805, 436615736, 436591499),
+        (1348092851, 1349227021, 436591499, 436567560),
+        (1349226660, 1350429295, 436567560, 436565487),
+        (1350428168, 1351552830, 436565487, 436540357),
+        (1351556195, 1352742671, 436540357, 436533995),
+        (1352743186, 1353928117, 436533995, 436527338),
+        (1353928229, 1355162497, 436527338, 436533858),
+        (1355162613, 1356530758, 436533858, 436576619),
+        (1356530740, 1357639870, 436576619, 436545969),
+        (1357641634, 1358965635, 436545969, 436577969),
+        (1358966487, 1360062830, 436577969, 436543292),
+        (1360063146, 1361148326, 436543292, 436508764),
+        (1361148470, 1362159549, 436508764, 436459339),
+        (1362159764, 1363249652, 436459339, 436434426),
+        (1363249946, 1364125673, 436434426, 436371822),
+        (1364126425, 1365181981, 436371822, 436350910),
+        (1365183643, 1366217849, 436350910, 436330132),
+        (1366218134, 1367295455, 436330132, 436316733),
+        (1367296471, 1368385955, 436316733, 436305897),
+        (1368386123, 1369499565, 436305897, 436298084),
+        (1369499746, 1370441773, 436298084, 436278071),
+        (1370442318, 1371418407, 436278071, 436264469),
+        (1371418654, 1372515090, 436264469, 436259150),
+        (1372515725, 1373502151, 436259150, 436249641),
+        (1373502163, 1374514657, 436249641, 436242792),
+        (1374515827, 1375526943, 436242792, 426957810),
+        (1375527115, 1376417294, 426957810, 424970034),
+        (1376417490, 1377352245, 424970034, 423711319),
+        (1377353319, 1378268176, 423711319, 422668188),
+        (1378268460, 1379202097, 422668188, 421929506),
+        (1379202248, 1380117691, 421929506, 421321760),
+        (1380118146, 1381069174, 421321760, 420917450),
+        (1381070552, 1381925718, 420917450, 420481718),
+        (1381925788, 1382754194, 420481718, 420150405),
+        (1382754272, 1383679776, 420150405, 419981299),
+        (1383681123, 1384695132, 419981299, 419892219),
+        (1384699499, 1385741656, 419892219, 419828290),
+        (1385742648, 1386684666, 419828290, 419740270),
+        (1386684686, 1387615098, 419740270, 419668748),
+        (1387617112, 1388624139, 419668748, 419628831),
+        (1388624318, 1389583107, 419628831, 419587686),
+        (1389583220, 1390569911, 419587686, 419558700),
+        (1390570126, 1391582444, 419558700, 419537774),
+        (1391584456, 1392597647, 419537774, 419520339),
+        (1392597839, 1393589930, 419520339, 419504166),
+        (1393590585, 1394676535, 419504166, 419496625),
+        (1394676764, 1395703577, 419496625, 419486617),
+        (1395703832, 1396693489, 419486617, 419476394),
+        (1396694478, 1397755194, 419476394, 419470732),
+        (1397755646, 1398810754, 419470732, 419465580),
+        (1398811175, 1399904296, 419465580, 410792019),
+        (1399904311, 1400928544, 410792019, 409544770),
+        (1400928750, 1402004511, 409544770, 408782234),
+        (1402004993, 1403061308, 408782234, 408005538),
+        (1403061280, 1404029522, 408005538, 406937553),
+        (1404029556, 1405203024, 406937553, 406809574),
+        (1405205894, 1406325104, 406809574, 406498978),
+        (1406325092, 1407473800, 406498978, 406305378),
+        (1407474112, 1408474964, 406305378, 405675096),
+        (1408475518, 1409527066, 405675096, 405280238),
+        (1409527152, 1410639387, 405280238, 405068777),
+        (1410638896, 1411679882, 405068777, 404732051),
+        (1411680080, 1412877894, 404732051, 404711795),
+        (1412877866, 1414054419, 404711795, 404655552),
+        (1414055393, 1415154489, 404655552, 404472624),
+        (1415154631, 1416343330, 404472624, 404441185),
+        (1416345124, 1417563570, 404441185, 404454260),
+        (1417563705, 1418790160, 404454260, 404479356),
+        (1418791024, 1419965406, 404479356, 404426186),
+        (1419965588, 1421083565, 404426186, 404291887),
+        (1421084073, 1422372768, 404291887, 404399040),
+        (1422372946, 1423495952, 404399040, 404274055),
+        (1423496415, 1424648263, 404274055, 404196666),
+        (1424648937, 1425839583, 404196666, 404172480),
+        (1425840165, 1427068149, 404172480, 404195570),
+        (1427068411, 1428211256, 404195570, 404110449),
+        (1428211345, 1429467587, 404110449, 404166640),
+        (1429467906, 1430676673, 404166640, 404165597),
+        (1430677341, 1431858092, 404165597, 404129525),
+        (1431858433, 1433098989, 404129525, 404167307),
+        (1433099185, 1434257600, 404167307, 404103235),
+        (1434257763, 1435474473, 404103235, 404111758),
+        (1435475246, 1436645194, 404111758, 404063944),
+        (1436646286, 1437828076, 404063944, 404031509),
+        (1437828285, 1439028210, 404031509, 404020484),
+        (1439028930, 1440203823, 404020484, 403981252),
+        (1440204583, 1441356822, 403981252, 403918273),
+        (1441357507, 1442518636, 403918273, 403867578),
+        (1442519404, 1443699609, 403867578, 403838066),
+        (1443700390, 1444908588, 403838066, 403836692),
+        (1444908751, 1446091729, 403836692, 403810644),
+        (1446092706, 1447236281, 403810644, 403747465),
+        (1447236692, 1448331948, 403747465, 403644022),
+        (1448332462, 1449444509, 403644022, 403564111),
+        (1449444652, 1450468554, 403564111, 403424265),
+        (1450469289, 1451557421, 403424265, 403346833),
+        (1451558562, 1452667067, 403346833, 403288859),
+        (1452667178, 1453809473, 403288859, 403253488),
+        (1453810745, 1454818212, 403253488, 403153172),
+        (1454818360, 1455884612, 403153172, 403093919),
+        (1455885256, 1457133524, 403093919, 403108008),
+        (1457133956, 1458291885, 403108008, 403088579),
+        (1458292068, 1459491849, 403088579, 403085044),
+        (1459492475, 1460622012, 403085044, 403056459),
+        (1460622341, 1461832072, 403056459, 403056502),
+        (1461832110, 1462944601, 403056502, 403024122),
+        (1462944866, 1464123775, 403024122, 403014710),
+        (1464123766, 1465353421, 403014710, 403020704),
+        (1465353718, 1466485981, 403020704, 402997206),
+        (1466486338, 1467673575, 402997206, 402990845),
+        (1467674161, 1468883232, 402990845, 402990697),
+        (1468884162, 1470163257, 402990697, 403010088),
+        (1470163842, 1471287293, 403010088, 402984668),
+        (1471287554, 1472478633, 402984668, 402979592),
+        (1472479861, 1473662270, 402979592, 402972254),
+        (1473662347, 1474794756, 402972254, 402951892),
+        (1474795015, 1475923695, 402951892, 402931908),
+        (1475924010, 1477157004, 402931908, 402937298),
+        (1477159378, 1478364220, 402937298, 402936180),
+        (1478364418, 1479457348, 402936180, 402908884),
+        (1479457815, 1480646474, 402908884, 402904457),
+        (1480646786, 1481765173, 402904457, 402885509),
+        (1481765313, 1482946227, 402885509, 402879999),
+        (1482946855, 1484087479, 402879999, 402867065),
+        (1484088052, 1485125083, 402867065, 402836551),
+        (1485125572, 1486251490, 402836551, 402823865),
+        (1486251529, 1487410067, 402823865, 402816659),
+        (1487410706, 1488567833, 402816659, 402809567),
+        (1488567886, 1489739512, 402809567, 402804657),
+        (1489739775, 1490891447, 402804657, 402797402),
+        (1490891948, 1492052381, 402797402, 402791539),
+        (1492052390, 1493259291, 402791539, 402791230),
+        (1493259601, 1494387130, 402791230, 402781863),
+        (1494387648, 1495524275, 402781863, 402774100),
+        (1495524592, 1496586576, 402774100, 402759343),
+        (1496586907, 1497740528, 402759343, 402754430),
+        (1497741533, 1498956326, 402754430, 402754864),
+        (1498956437, 1500021909, 402754864, 402742748),
+        (1500021942, 1501153235, 402742748, 402736949),
+        (1501153434, 1502280491, 402736949, 402731232),
+        (1502282210, 1503539571, 402731232, 402734313),
+        (1503539857, 1504704167, 402734313, 402731275),
+        (1504704195, 1505715737, 402731275, 402718488),
+        (1505716276, 1506903856, 402718488, 402717299),
+        (1506904066, 1508039962, 402717299, 402713392),
+        (1508040302, 1509036725, 402713392, 402702781),
+        (1509036762, 1510324761, 402702781, 402705995),
+        (1510326831, 1511552082, 402705995, 402706678),
+        (1511553196, 1512577362, 402706678, 402698477),
+        (1512577401, 1513604778, 402698477, 402691653),
+        (1513605320, 1514778580, 402691653, 402690497),
+        (1514778970, 1515827472, 402690497, 394155916),
+        (1515827554, 1516862792, 394155916, 392962374),
+        (1516862900, 1517958218, 392962374, 392292856),
+        (1517958487, 1519114710, 392292856, 392009692),
+        (1519114859, 1520220349, 392009692, 391481763),
+        (1520223678, 1521373214, 391481763, 391203401),
+        (1521373218, 1522566103, 391203401, 391129783),
+        (1522566357, 1523672538, 391129783, 390680589),
+        (1523672932, 1524827574, 390680589, 390462291),
+        (1524828253, 1526002294, 390462291, 390327465),
+        (1526003655, 1527167457, 390327465, 390158921),
+        (1527168053, 1528222495, 390158921, 389609537),
+        (1528222686, 1529399698, 389609537, 389508950),
+        (1529400045, 1530545107, 389508950, 389315112),
+        (1530545661, 1531798474, 389315112, 389437975),
+        (1531799449, 1532852342, 389437975, 388976507),
+        (1532852371, 1533978695, 388976507, 388763047),
+        (1533980459, 1535129301, 388763047, 388618029),
+        (1535129431, 1536288716, 388618029, 388503969),
+        (1536290079, 1537477114, 388503969, 388454943),
+        (1537478139, 1538638684, 388454943, 388350353),
+        (1538639362, 1539894787, 388350353, 388444093),
+        (1539895067, 1541104406, 388444093, 388443538),
+        (1541105656, 1542411813, 388443538, 388648495),
+        (1542412284, 1543837587, 388648495, 389142908),
+        (1543838368, 1545175878, 389142908, 389488372),
+        (1545175965, 1546275302, 389488372, 389159077),
+        (1546276809, 1547431851, 389159077, 389010995),
+        (1547432394, 1548656416, 389010995, 389048373),
+        (1548657313, 1549817652, 389048373, 388919176),
+        (1549817981, 1551025524, 388919176, 388914000),
+        (1551026038, 1552236227, 388914000, 388915479),
+        (1552236304, 1553387053, 388915479, 388767596),
+        (1553387093, 1554594090, 388767596, 388761373),
+        (1554594223, 1555811438, 388761373, 388779537),
+        (1555811668, 1556958256, 388779537, 388628280),
+        (1556958733, 1558167889, 388628280, 388627269),
+        (1558168296, 1559255464, 388627269, 388348790),
+        (1559256184, 1560473993, 388348790, 388365571),
+        (1560474230, 1561603749, 388365571, 388200748),
+        (1561604370, 1562663247, 388200748, 387911067),
+        (1562663868, 1563880228, 387911067, 387922440),
+        (1563880937, 1564972845, 387922440, 387723321),
+        (1564973528, 1566159593, 387723321, 387687377),
+        (1566161382, 1567304898, 387687377, 387588414),
+        (1567305301, 1568401109, 387588414, 387427317),
+        (1568401591, 1569528791, 387427317, 387321636),
+        (1569530001, 1570716515, 387321636, 387294044),
+        (1570716535, 1571865760, 387294044, 387223263),
+        (1571866973, 1573168955, 387223263, 387326161),
+        (1573169436, 1574355426, 387326161, 387297854),
+        (1574356132, 1575574787, 387297854, 387308498),
+        (1575576145, 1576779043, 387308498, 387300560),
+        (1576779421, 1577914494, 387300560, 387212786),
+        (1577915667, 1579045242, 387212786, 387124344),
+        (1579045357, 1580201014, 387124344, 387068671),
+        (1580201043, 1581404369, 387068671, 387062484),
+        (1581405024, 1582619298, 387062484, 387067068),
+        (1582619322, 1583751024, 387067068, 386990361),
+        (1583751917, 1585191082, 386990361, 387201857),
+        (1585191106, 1586334725, 387201857, 387129532),
+        (1586336046, 1587451399, 387129532, 387031859),
+        (1587452724, 1588651347, 387031859, 387021369),
+        (1588651521, 1589938370, 387021369, 387094518),
+        (1589940416, 1591273835, 387094518, 387219253),
+        (1591273852, 1592326176, 387219253, 387044594),
+        (1592326267, 1593535908, 387044594, 387044633),
+        (1593537529, 1594638224, 387044633, 386939413),
+        (1594641060, 1595886443, 386939413, 386970872),
+        (1595886756, 1597089202, 386970872, 386964396),
+        (1597089619, 1598257182, 386964396, 386926570),
+        (1598258059, 1599482443, 386926570, 386939410),
+        (1599482920, 1600569231, 386939410, 386831018),
+        (1600570533, 1601781172, 386831018, 386831838),
+        (1601781592, 1602948896, 386831838, 386798414),
+        (1602950620, 1604391477, 386798414, 386974771),
+        (1604392090, 1605546079, 386974771, 386924253),
+        (1605546119, 1606657197, 386924253, 386838870),
+        (1606657305, 1607898457, 386838870, 386863986),
+        (1607899483, 1609113673, 386863986, 386867735),
+        (1609113744, 1610205491, 386867735, 386771105),
+        (1610205877, 1611402924, 386771105, 386761815),
+        (1611403017, 1612578145, 386761815, 386736569),
+        (1612578303, 1613771771, 386736569, 386725091),
+        (1613772036, 1614997194, 386725091, 386736012),
+        (1614997708, 1616184225, 386736012, 386719599),
+        (1616184405, 1617327513, 386719599, 386673224),
+        (1617328801, 1618515600, 386673224, 386658195),
+        (1618515703, 1619899807, 386658195, 386771043),
+        (1619900822, 1620896111, 386771043, 386612457),
+        (1620896338, 1622335745, 386612457, 386752379),
+        (1622337521, 1623614781, 386752379, 386801401),
+        (1623614836, 1625293501, 386801401, 387160270),
+        (1625294046, 1626564728, 387160270, 387225124),
+        (1626564737, 1627705595, 387225124, 387148450),
+        (1627706126, 1628833331, 387148450, 387061771),
+        (1628834027, 1629902243, 387061771, 386923168),
+        (1629902476, 1631059521, 386923168, 386877668),
+        (1631061045, 1632233558, 386877668, 386846955),
+        (1632234876, 1633390031, 386846955, 386803250),
+        (1633390519, 1634588711, 386803250, 386794504),
+        (1634588757, 1635710294, 386794504, 386727631),
+        (1635710370, 1636865834, 386727631, 386689514),
+        (1636866927, 1638094859, 386689514, 386701843),
+        (1638095408, 1639212040, 386701843, 386638367),
+        (1639216857, 1640422619, 386638367, 386635947),
+        (1640422999, 1641627659, 386635947, 386632843),
+        (1641627937, 1642734420, 386632843, 386568320),
+        (1642734490, 1643941946, 386568320, 386567092),
+        (1643942057, 1645096442, 386567092, 386535544),
+        (1645096491, 1646324392, 386535544, 386545523),
+        (1646324511, 1647538413, 386545523, 386547904),
+        (1647538808, 1648700407, 386547904, 386521239),
+        (1648700729, 1649925810, 386521239, 386529497),
+        (1649925939, 1651071862, 386529497, 386495093),
+        (1651072835, 1652226053, 386495093, 386466234),
+        (1652226078, 1653490447, 386466234, 386492960),
+        (1653490985, 1654685173, 386492960, 386485098),
+        (1654686448, 1655925220, 386485098, 386499788),
+        (1655925489, 1657152407, 386499788, 386508719),
+        (1657153358, 1658426742, 386508719, 386542084),
+        (1658427282, 1659616186, 386542084, 386530686),
+        (1659617683, 1660819735, 386530686, 386526600),
+        (1660820877, 1661927959, 386526600, 386471456),
+        (1661928055, 1663097332, 386471456, 386451604),
+        (1663097346, 1664333361, 386451604, 386464174),
+        (1664333794, 1665399026, 386464174, 386393970),
+        (1665399506, 1666568884, 386393970, 386376745),
+        (1666569091, 1667781109, 386376745, 386377746),
+        (1667781163, 1668984601, 386377746, 386375189),
+        (1668986059, 1670291250, 386375189, 386414640),
+        (1670291429, 1671462730, 386414640, 386397584),
+        (1671463076, 1672717752, 386397584, 386417022),
+        (1672719770, 1673816848, 386417022, 386366690),
+        (1673817110, 1674972595, 386366690, 386344736),
+        (1674972641, 1676188253, 386344736, 386347065),
+        (1676188371, 1677288474, 386347065, 386304419),
+        (1677288852, 1678484625, 386304419, 386299521),
+        (1678484890, 1679609492, 386299521, 386269758),
+        (1679609802, 1680793023, 386269758, 386261170),
+        (1680795199, 1681984324, 386261170, 386254649),
+        (1681984653, 1683212066, 386254649, 386260225),
+        (1683214087, 1684385994, 386260225, 386248250),
+        (1684386462, 1685556292, 386248250, 386236009),
+        (1685557167, 1686740979, 386236009, 386228333),
+        (1686742062, 1687992366, 386228333, 386240190),
+        (1687992515, 1689128861, 386240190, 386218132),
+        (1689128979, 1690375168, 386218132, 386228482),
+        (1690375347, 1691583496, 386228482, 386228059),
+        (1691584068, 1692723421, 386228059, 386207611),
+        (1692724599, 1693967068, 386207611, 386216622),
+        (1693967242, 1695113955, 386216622, 386198911),
+        (1695114421, 1696319769, 386198911, 386197775),
+        (1696319920, 1697456008, 386197775, 386178217),
+        (1697455965, 1698637823, 386178217, 386171284),
+        (1698638003, 1699806178, 386171284, 386161170),
+        (1699806273, 1700957506, 386161170, 386147408),
+        (1700957763, 1702179081, 386147408, 386150037),
+        (1702180644, 1703311291, 386150037, 386132147),
+        (1703311464, 1704501378, 386132147, 386127977),
+        (1704501692, 1705760375, 386127977, 386138202),
+        (1705761155, 1706888111, 386138202, 386120285),
+        (1706888526, 1708006020, 386120285, 386101681),
+        (1708008110, 1709253900, 386101681, 386108434),
+        (1709253937, 1710397305, 386108434, 386095705),
+        (1710397689, 1711619239, 386095705, 386097875),
+        (1711619463, 1712783397, 386097875, 386089497),
+        (1712783853, 1713969900, 386089497, 386085339),
+        (1713970312, 1715252012, 386085339, 386097818),
+        (1715252414, 1716444342, 386097818, 386094576),
+        (1716445130, 1717664336, 386094576, 386096312),
+        (1717664663, 1718874866, 386096312, 386096421),
+        (1718875797, 1720149002, 386096421, 386108013),
+        (1720149673, 1721321644, 386108013, 386100794),
+        (1721322584, 1722417204, 386100794, 386079422),
+        (1722417212, 1723679655, 386079422, 386088310),
+        (1723679961, 1724854413, 386088310, 386082139),
+        (1724855515, 1726023352, 386082139, 386075020),
+        (1726025157, 1727293148, 386075020, 386084628),
+        (1727293228, 1728454931, 386084628, 386076365),
+        (1728456399, 1729620194, 386076365, 386068776),
+    ];
+
+    #[test]
+    fn test_block_hash_calculation() {
+        let merkle_root = hex!("3ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a");
+        let expected_block_hash =
+            hex!("6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000");
+
+        let block_header = CircuitBlockHeader {
+            version: 1,
+            prev_block_hash: [0u8; 32],
+            merkle_root: merkle_root,
+            time: 1231006505,
+            bits: 486604799,
+            nonce: 2083236893,
+        };
+
+        let block_hash = block_header.compute_block_hash();
+        assert_eq!(block_hash, expected_block_hash);
+    }
+
+    #[test]
+    fn test_15_block_hash_calculation() {
+        let block_headers = BLOCK_HEADERS
+            .iter()
+            .map(|header| CircuitBlockHeader::try_from_slice(header).unwrap())
+            .collect::<Vec<CircuitBlockHeader>>();
+
+        for i in 0..block_headers.len() - 1 {
+            let block_hash = block_headers[i].compute_block_hash();
+            let next_block = &block_headers[i + 1];
+            assert_eq!(block_hash, next_block.prev_block_hash);
+        }
+    }
+
+    #[test]
+    fn test_median() {
+        let arr = [3, 7, 2, 10, 1, 5, 9, 4, 8, 6, 11];
+        assert_eq!(median(arr), 6);
+    }
+
+    #[test]
+    fn test_timestamp_check_fail() {
+        let block_headers = BLOCK_HEADERS
+            .iter()
+            .map(|header| CircuitBlockHeader::try_from_slice(header).unwrap())
+            .collect::<Vec<CircuitBlockHeader>>();
+
+        let first_11_timestamps = block_headers[..11]
+            .iter()
+            .map(|header| header.time)
+            .collect::<Vec<u32>>();
+
+        // The validation is expected to return false
+        assert_eq!(
+            validate_timestamp(
+                block_headers[1].time,
+                first_11_timestamps.try_into().unwrap(),
+            ),
+            false
+        );
+    }
+
+    #[test]
+    fn test_timestamp_check_pass() {
+        let block_headers = BLOCK_HEADERS
+            .iter()
+            .map(|header| CircuitBlockHeader::try_from_slice(header).unwrap())
+            .collect::<Vec<CircuitBlockHeader>>();
+
+        let first_11_timestamps = block_headers[..11]
+            .iter()
+            .map(|header| header.time)
+            .collect::<Vec<u32>>();
+
+        assert_eq!(
+            validate_timestamp(
+                block_headers[11].time,
+                first_11_timestamps.clone().try_into().unwrap(),
+            ),
+            true
+        );
+    }
+
+    #[test]
+    #[should_panic(expected = "Hash is not valid")]
+    fn test_hash_check_fail() {
+        let block_headers = BLOCK_HEADERS
+            .iter()
+            .map(|header| CircuitBlockHeader::try_from_slice(header).unwrap())
+            .collect::<Vec<CircuitBlockHeader>>();
+
+        let first_15_hashes = block_headers[..15]
+            .iter()
+            .map(|header| header.compute_block_hash())
+            .collect::<Vec<[u8; 32]>>();
+
+        // The validation is expected to panic
+        check_hash_valid(
+            &first_15_hashes[0],
+            &U256::from_be_hex("00000000FFFF0000000000000000000000000000000000000000000000000000")
+                .wrapping_div(&(U256::ONE << 157))
+                .to_be_bytes(),
+        );
+    }
+
+    #[test]
+    fn test_hash_check_pass() {
+        let block_headers = BLOCK_HEADERS
+            .iter()
+            .map(|header| CircuitBlockHeader::try_from_slice(header).unwrap())
+            .collect::<Vec<CircuitBlockHeader>>();
+
+        let first_15_hashes = block_headers[..15]
+            .iter()
+            .map(|header| header.compute_block_hash())
+            .collect::<Vec<[u8; 32]>>();
+
+        for (i, hash) in first_15_hashes.into_iter().enumerate() {
+            check_hash_valid(&hash, &bits_to_target(block_headers[i].bits));
+        }
+    }
+
+    #[test]
+    fn test_target_conversion() {
+        for (_, _, bits, _) in DIFFICULTY_ADJUSTMENTS {
+            let compact_target = bits_to_target(bits);
+            let nbits = target_to_bits(&compact_target);
+            assert_eq!(nbits, bits);
+        }
+    }
+
+    #[test]
+    fn test_bits_to_target() {
+        // https://learnmeabitcoin.com/explorer/block/00000000000000000002ebe388cb8fa0683fc34984cfc2d7d3b3f99bc0d51bfd
+        let expected_target =
+            hex!("00000000000000000002f1280000000000000000000000000000000000000000");
+        let bits: u32 = 0x1702f128;
+        let target = bits_to_target(bits);
+        assert_eq!(target, expected_target);
+
+        let converted_bits = target_to_bits(&target);
+
+        assert_eq!(converted_bits, bits);
+    }
+
+    #[test]
+    fn test_difficulty_adjustments() {
+        for (start_time, end_time, start_target, end_target) in DIFFICULTY_ADJUSTMENTS {
+            let new_target_bytes = calculate_new_difficulty(start_time, end_time, start_target);
+            let bits = target_to_bits(&new_target_bytes);
+            assert_eq!(bits, end_target);
+        }
+    }
+
+    #[test]
+    fn test_bridge_block_header_from_header() {
+        let header = Header {
+            version: Version::from_consensus(1),
+            prev_blockhash: BlockHash::from_slice(&[0; 32]).unwrap(),
+            merkle_root: TxMerkleNode::from_slice(&[1; 32]).unwrap(),
+            time: 1231006505,
+            bits: CompactTarget::from_consensus(0x1d00ffff),
+            nonce: 2083236893,
+        };
+
+        let bridge_header: CircuitBlockHeader = header.clone().into();
+
+        assert_eq!(bridge_header.version, header.version.to_consensus());
+        assert_eq!(
+            bridge_header.prev_block_hash,
+            *header.prev_blockhash.as_byte_array()
+        );
+        assert_eq!(
+            bridge_header.merkle_root,
+            *header.merkle_root.as_byte_array()
+        );
+        assert_eq!(bridge_header.time, header.time);
+        assert_eq!(bridge_header.bits, header.bits.to_consensus());
+        assert_eq!(bridge_header.nonce, header.nonce);
+        assert_eq!(
+            bridge_header.compute_block_hash(),
+            header.block_hash().to_byte_array()
+        );
+    }
+
+    #[test]
+    fn test_bridge_block_header_into_header() {
+        let bridge_header = CircuitBlockHeader {
+            version: 1,
+            prev_block_hash: [0; 32],
+            merkle_root: [1; 32],
+            time: 1231006505,
+            bits: 0x1d00ffff,
+            nonce: 2083236893,
+        };
+
+        let header: Header = bridge_header.clone().into();
+
+        assert_eq!(header.version.to_consensus(), bridge_header.version);
+        assert_eq!(
+            *header.prev_blockhash.as_byte_array(),
+            bridge_header.prev_block_hash
+        );
+        assert_eq!(
+            *header.merkle_root.as_byte_array(),
+            bridge_header.merkle_root
+        );
+        assert_eq!(header.time, bridge_header.time);
+        assert_eq!(header.bits.to_consensus(), bridge_header.bits);
+        assert_eq!(header.nonce, bridge_header.nonce);
+        assert_eq!(
+            header.block_hash().to_byte_array(),
+            bridge_header.compute_block_hash()
+        );
+    }
+
+    #[test]
+    fn test_roundtrip_header_conversion() {
+        let original_header = Header {
+            version: Version::from_consensus(1),
+            prev_blockhash: BlockHash::from_slice(&[0; 32]).unwrap(),
+            merkle_root: TxMerkleNode::from_slice(&[1; 32]).unwrap(),
+            time: 1231006505,
+            bits: CompactTarget::from_consensus(0x1d00ffff),
+            nonce: 2083236893,
+        };
+
+        let bridge_header: CircuitBlockHeader = original_header.clone().into();
+        let converted_header: Header = bridge_header.into();
+
+        assert_eq!(original_header, converted_header);
+        assert_eq!(original_header.block_hash(), converted_header.block_hash());
+    }
+}
diff --git a/header-chain/src/lib.rs b/header-chain/src/lib.rs
new file mode 100644
index 000000000..cd10d9df1
--- /dev/null
+++ b/header-chain/src/lib.rs
@@ -0,0 +1,37 @@
+use header_chain::{
+    BlockHeaderCircuitOutput, ChainState, HeaderChainCircuitInput, HeaderChainPrevProofType,
+};
+use zkvm::ZkvmGuest;
+
+pub mod header_chain;
+pub mod mmr_guest;
+pub mod mmr_native;
+pub mod utils;
+pub mod zkvm;
+pub use risc0_zkvm;
+
+/// The main entry point of the header chain circuit.
+pub fn header_chain_circuit(guest: &impl ZkvmGuest) {
+    let start = risc0_zkvm::guest::env::cycle_count();
+
+    let input: HeaderChainCircuitInput = guest.read_from_host();
+    // println!("Detected network: {:?}", NETWORK_TYPE);
+    // println!("NETWORK_CONSTANTS: {:?}", NETWORK_CONSTANTS);
+    let mut chain_state = match input.prev_proof {
+        HeaderChainPrevProofType::GenesisBlock => ChainState::new(),
+        HeaderChainPrevProofType::PrevProof(prev_proof) => {
+            assert_eq!(prev_proof.method_id, input.method_id);
+            guest.verify(input.method_id, &prev_proof);
+            prev_proof.chain_state
+        }
+    };
+
+    chain_state.apply_blocks(input.block_headers);
+
+    guest.commit(&BlockHeaderCircuitOutput {
+        method_id: input.method_id,
+        chain_state,
+    });
+    let end = risc0_zkvm::guest::env::cycle_count();
+    println!("Header chain circuit took {:?} cycles", end - start);
+}
diff --git a/header-chain/src/mmr_guest.rs b/header-chain/src/mmr_guest.rs
new file mode 100644
index 000000000..80640a4a4
--- /dev/null
+++ b/header-chain/src/mmr_guest.rs
@@ -0,0 +1,52 @@
+use borsh::{BorshDeserialize, BorshSerialize};
+use serde::{Deserialize, Serialize};
+
+use crate::{mmr_native::MMRInclusionProof, utils::hash_pair};
+
+/// Represents the MMR for inside zkVM (guest)
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug, BorshDeserialize, BorshSerialize)]
+
+pub struct MMRGuest {
+    pub subroots: Vec<[u8; 32]>,
+    pub size: u32,
+}
+
+impl MMRGuest {
+    /// Creates a new MMR for inside zkVM
+    pub fn new() -> Self {
+        MMRGuest {
+            subroots: vec![],
+            size: 0,
+        }
+    }
+
+    pub fn append(&mut self, leaf: [u8; 32]) {
+        let mut current = leaf;
+        let mut size = self.size;
+        while size % 2 == 1 {
+            let sibling = self.subroots.pop().unwrap();
+            current = hash_pair(sibling, current);
+            size /= 2
+        }
+        self.subroots.push(current);
+        self.size += 1;
+    }
+
+    /// Verifies an inclusion proof against the current MMR root
+    pub fn verify_proof(&self, leaf: [u8; 32], mmr_proof: &MMRInclusionProof) -> bool {
+        println!("GUEST: mmr_proof: {:?}", mmr_proof);
+        println!("GUEST: leaf: {:?}", leaf);
+        let mut current_hash = leaf;
+        for i in 0..mmr_proof.inclusion_proof.len() {
+            let sibling = mmr_proof.inclusion_proof[i];
+            if mmr_proof.internal_idx & (1 << i) == 0 {
+                current_hash = hash_pair(current_hash, sibling);
+            } else {
+                current_hash = hash_pair(sibling, current_hash);
+            }
+        }
+        println!("GUEST: calculated subroot: {:?}", current_hash);
+        println!("GUEST: subroots: {:?}", self.subroots);
+        self.subroots[mmr_proof.subroot_idx] == current_hash
+    }
+}
diff --git a/header-chain/src/mmr_native.rs b/header-chain/src/mmr_native.rs
new file mode 100644
index 000000000..290c193e4
--- /dev/null
+++ b/header-chain/src/mmr_native.rs
@@ -0,0 +1,219 @@
+use borsh::{BorshDeserialize, BorshSerialize};
+use serde::{Deserialize, Serialize};
+
+use crate::utils::hash_pair;
+
+/// Represents the MMR for outside zkVM (native).
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug, BorshDeserialize, BorshSerialize)]
+pub struct MMRNative {
+    pub nodes: Vec<Vec<[u8; 32]>>,
+}
+
+impl MMRNative {
+    /// Creates a new MMR for native usage.
+    pub fn new() -> Self {
+        MMRNative {
+            nodes: vec![vec![]],
+        }
+    }
+
+    /// Appends a new leaf to the MMR.
+    pub fn append(&mut self, leaf: [u8; 32]) {
+        self.nodes[0].push(leaf);
+        self.recalculate_peaks();
+    }
+
+    /// Recalculates peaks based on the current leaves.
+    fn recalculate_peaks(&mut self) {
+        let depth = self.nodes.len();
+        for level in 0..depth - 1 {
+            if self.nodes[level].len() % 2 == 1 {
+                break;
+            } else {
+                let node = hash_pair(
+                    self.nodes[level][self.nodes[level].len() - 2],
+                    self.nodes[level][self.nodes[level].len() - 1],
+                );
+                self.nodes[level + 1].push(node);
+            }
+        }
+        if self.nodes[depth - 1].len() > 1 {
+            let node = hash_pair(self.nodes[depth - 1][0], self.nodes[depth - 1][1]);
+            self.nodes.push(vec![node]);
+        }
+    }
+
+    /// Returns the subroots of the MMR.
+    fn get_subroots(&self) -> Vec<[u8; 32]> {
+        let mut subroots: Vec<[u8; 32]> = vec![];
+        for level in &self.nodes {
+            if level.len() % 2 == 1 {
+                subroots.push(level[level.len() - 1]);
+            }
+        }
+        subroots.reverse();
+        subroots
+    }
+
+    /// Generates a proof for a given index. Returns the leaf as well.
+    pub fn generate_proof(&self, index: u32) -> ([u8; 32], MMRInclusionProof) {
+        if self.nodes[0].len() == 0 {
+            panic!("MMR is empty");
+        }
+        if self.nodes[0].len() <= index as usize {
+            panic!("Index out of bounds");
+        }
+        let mut proof: Vec<[u8; 32]> = vec![];
+        let mut current_index = index;
+        let mut current_level = 0;
+        // Returns the subtree proof for the subroot.
+        while !(current_index == self.nodes[current_level].len() as u32 - 1
+            && self.nodes[current_level].len() % 2 == 1)
+        {
+            let sibling_index = if current_index % 2 == 0 {
+                current_index + 1
+            } else {
+                current_index - 1
+            };
+            proof.push(self.nodes[current_level][sibling_index as usize]);
+            current_index = current_index / 2;
+            current_level += 1;
+        }
+        let (subroot_idx, internal_idx) = self.get_helpers_from_index(index);
+        let mmr_proof = MMRInclusionProof::new(subroot_idx, internal_idx, proof);
+        (self.nodes[0][index as usize], mmr_proof)
+    }
+
+    /// Given an index, returns the subroot index (which subtree the index is in), subtree size, and internal index (of the subtree that the index belongs to).
+    fn get_helpers_from_index(&self, index: u32) -> (usize, u32) {
+        let xor = (self.nodes[0].len() as u32) ^ index;
+        let xor_leading_digit = 31 - xor.leading_zeros() as usize;
+        let internal_idx = index & ((1 << xor_leading_digit) - 1);
+        let leading_zeros_size = 31 - (self.nodes[0].len() as u32).leading_zeros() as usize;
+        let mut subtree_idx = 0;
+        for i in xor_leading_digit + 1..=leading_zeros_size {
+            if self.nodes[0].len() & (1 << i) != 0 {
+                subtree_idx += 1;
+            }
+        }
+        (subtree_idx, internal_idx)
+    }
+
+    /// Verifies an inclusion proof against the current MMR root.
+    pub fn verify_proof(&self, leaf: [u8; 32], mmr_proof: &MMRInclusionProof) -> bool {
+        println!("NATIVE: inclusion_proof: {:?}", mmr_proof);
+        println!("NATIVE: leaf: {:?}", leaf);
+        let subroot = mmr_proof.get_subroot(leaf);
+        println!("NATIVE: calculated_subroot: {:?}", subroot);
+        let subroots = self.get_subroots();
+        println!("NATIVE: subroots: {:?}", subroots);
+        subroots[mmr_proof.subroot_idx] == subroot
+    }
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Clone, Debug, BorshDeserialize, BorshSerialize)]
+pub struct MMRInclusionProof {
+    pub subroot_idx: usize,
+    pub internal_idx: u32,
+    pub inclusion_proof: Vec<[u8; 32]>,
+}
+
+impl MMRInclusionProof {
+    pub fn new(subroot_idx: usize, internal_idx: u32, inclusion_proof: Vec<[u8; 32]>) -> Self {
+        MMRInclusionProof {
+            subroot_idx,
+            internal_idx,
+            inclusion_proof,
+        }
+    }
+
+    pub fn get_subroot(&self, leaf: [u8; 32]) -> [u8; 32] {
+        let mut current_hash = leaf;
+        for i in 0..self.inclusion_proof.len() {
+            let sibling = self.inclusion_proof[i];
+            if self.internal_idx & (1 << i) == 0 {
+                current_hash = hash_pair(current_hash, sibling);
+            } else {
+                current_hash = hash_pair(sibling, current_hash);
+            }
+        }
+        current_hash
+    }
+}
+
+mod tests {
+
+    use crate::mmr_guest::MMRGuest;
+
+    use super::*;
+
+    #[test]
+    #[should_panic(expected = "MMR is empty")]
+    fn test_mmr_native_fail_0() {
+        let mmr = MMRNative::new();
+        let (_leaf, _mmr_proof) = mmr.generate_proof(0);
+    }
+
+    #[test]
+    #[should_panic(expected = "Index out of bounds")]
+    fn test_mmr_native_fail_1() {
+        let mut mmr = MMRNative::new();
+        mmr.append([0; 32]);
+        let (_leaf, _mmr_proof) = mmr.generate_proof(1);
+    }
+
+    #[test]
+    fn test_mmr_native() {
+        let mut mmr = MMRNative::new();
+        let mut leaves = vec![];
+
+        for i in 0..42 {
+            let leaf = [i as u8; 32];
+            leaves.push(leaf);
+
+            mmr.append(leaf);
+
+            for j in 0..=i {
+                let (leaf, mmr_proof) = mmr.generate_proof(j);
+                assert!(mmr.verify_proof(leaf, &mmr_proof));
+            }
+        }
+    }
+
+    #[test]
+    fn test_mmr_crosscheck() {
+        let mut mmr_native = MMRNative::new();
+        let mut mmr_guest = MMRGuest::new();
+        let mut leaves = vec![];
+
+        for i in 0..42 {
+            let leaf = [i as u8; 32];
+            leaves.push(leaf);
+
+            mmr_native.append(leaf);
+            mmr_guest.append(leaf);
+
+            let subroots_native = mmr_native.get_subroots();
+            let subroots_guest = mmr_guest.subroots.clone();
+            assert_eq!(
+                subroots_native, subroots_guest,
+                "Subroots do not match after adding leaf {}",
+                i
+            );
+
+            for j in 0..=i {
+                let (leaf, mmr_proof) = mmr_native.generate_proof(j);
+                assert!(
+                    mmr_native.verify_proof(leaf, &mmr_proof),
+                    "Failed to verify proof for leaf {} in native MMR",
+                    j
+                );
+                assert!(
+                    mmr_guest.verify_proof(leaf, &mmr_proof),
+                    "Failed to verify proof for leaf {} in guest MMR",
+                    j
+                );
+            }
+        }
+    }
+}
diff --git a/header-chain/src/utils.rs b/header-chain/src/utils.rs
new file mode 100644
index 000000000..8a0008dca
--- /dev/null
+++ b/header-chain/src/utils.rs
@@ -0,0 +1,23 @@
+use sha2::{Digest, Sha256};
+
+pub fn calculate_double_sha256(input: &[u8]) -> [u8; 32] {
+    let mut hasher = Sha256::default();
+    hasher.update(input);
+    let result = hasher.finalize_reset();
+    hasher.update(result);
+    hasher.finalize().into()
+}
+
+pub fn calculate_sha256(input: &[u8]) -> [u8; 32] {
+    let mut hasher = Sha256::default();
+    hasher.update(input);
+    hasher.finalize().into()
+}
+
+/// Utility function to hash two nodes together
+pub fn hash_pair(left: [u8; 32], right: [u8; 32]) -> [u8; 32] {
+    let mut hasher = Sha256::default();
+    hasher.update(left);
+    hasher.update(right);
+    hasher.finalize().into()
+}
diff --git a/header-chain/src/zkvm.rs b/header-chain/src/zkvm.rs
new file mode 100644
index 000000000..10c5b0e61
--- /dev/null
+++ b/header-chain/src/zkvm.rs
@@ -0,0 +1,52 @@
+use std::io::Write;
+
+use borsh::BorshDeserialize;
+use risc0_zkvm::guest::env::{self};
+
+pub trait ZkvmGuest {
+    fn read_from_host<T: borsh::BorshDeserialize>(&self) -> T;
+    fn commit<T: borsh::BorshSerialize>(&self, item: &T);
+    fn verify<T: borsh::BorshSerialize>(&self, method_id: [u32; 8], journal: &T);
+}
+
+#[derive(Debug, Clone)]
+pub struct Proof {
+    pub method_id: [u32; 8],
+    pub journal: Vec<u8>,
+}
+
+pub trait ZkvmHost {
+    // Adding data to the host
+    fn write<T: borsh::BorshSerialize>(&self, value: &T);
+
+    fn add_assumption(&self, proof: Proof);
+
+    // Proves with the given data
+    fn prove(&self, elf: &[u32]) -> Proof;
+}
+
+#[derive(Debug, Clone)]
+pub struct Risc0Guest;
+
+impl Risc0Guest {
+    pub fn new() -> Self { Self {} }
+}
+
+impl ZkvmGuest for Risc0Guest {
+    fn read_from_host<T: borsh::BorshDeserialize>(&self) -> T {
+        let mut reader = env::stdin();
+        BorshDeserialize::deserialize_reader(&mut reader)
+            .expect("Failed to deserialize input from host")
+    }
+
+    fn commit<T: borsh::BorshSerialize>(&self, item: &T) {
+        // use risc0_zkvm::guest::env::Write as _;
+        let buf = borsh::to_vec(item).expect("Serialization to vec is infallible");
+        let mut journal = env::journal();
+        journal.write_all(&buf).unwrap();
+    }
+
+    fn verify<T: borsh::BorshSerialize>(&self, method_id: [u32; 8], output: &T) {
+        env::verify(method_id, &borsh::to_vec(output).unwrap()).unwrap();
+    }
+}
diff --git a/prover/.gitignore b/prover/.gitignore
new file mode 100644
index 000000000..adbb97d2d
--- /dev/null
+++ b/prover/.gitignore
@@ -0,0 +1 @@
+data/
\ No newline at end of file
diff --git a/prover/Cargo.toml b/prover/Cargo.toml
new file mode 100644
index 000000000..557026317
--- /dev/null
+++ b/prover/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "prover"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+header-chain = { path = "../header-chain" }
+final-spv = { path = "../final-spv" }
+borsh = {version = "1.5.3", features = ["derive"] }
+risc0-zkvm = {version = "1.2.5", default-features = false, features = ["prove"]}
+risc0-zkp = {version = "1.2.5", default-features = false, features = ["prove"]}
+risc0-binfmt = {version = "1.2.5"}
+risc0-circuit-recursion = {version = "1.2.5"}
+sha2 =  { version = "0.10.8", default-features = false }
+blake3 = { version = "1.5.0", default-features = false }
+tempfile = "3.10.1"
+risc0-groth16 = {version="1.2.5", features=["prove"]}
+hex.workspace = true
+crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.2-risczero.0", default-features = false }
+serde_json = "1.0.108"
+num-bigint = { version="0.4.5", features=["std"] }
+num-traits = "0.2.19"
+
+[dev-dependencies]
+hex-literal = "0.4.1"
+bitcoin = "0.32.5"
diff --git a/prover/README.md b/prover/README.md
new file mode 100644
index 000000000..c2f3f6cae
--- /dev/null
+++ b/prover/README.md
@@ -0,0 +1,30 @@
+# Header Chain Prover
+## Build and Use
+Download the Bitcoin headers and rename it to "mainnet-headers.bin":
+```sh
+cd prover/data
+wget https://zerosync.org/chaindata/headers.bin -O mainnet-headers.bin
+cd ../..
+```
+Install Risc0 toolchain, see [here](https://dev.risczero.com/api/zkvm/install).
+
+To build the prover,
+```sh
+BITCOIN_NETWORK=<NETWORK> cargo build -p prover --release
+```
+
+To prove,
+```bash
+./target/release/prover None prover/data/first_10.bin 10
+```
+
+- The first argument is the previous proof file path (`None` if starting from genesis).
+- The second argument is the output proof file path.
+- The third argument is the number of headers to prove.
+
+Example: To verify the previous proof and prove the next 90 Bitcoin headers, run the following command:
+
+```bash
+./target/release/prover prover/data/first_10.bin prover/data/first_100.bin 90
+```
+
diff --git a/prover/data/mainnet-headers.bin b/prover/data/mainnet-headers.bin
new file mode 100644
index 000000000..b609b0fb1
Binary files /dev/null and b/prover/data/mainnet-headers.bin differ
diff --git a/prover/data/mainnet_first_10.bin b/prover/data/mainnet_first_10.bin
new file mode 100644
index 000000000..828446efd
Binary files /dev/null and b/prover/data/mainnet_first_10.bin differ
diff --git a/prover/data/regtest-headers.bin b/prover/data/regtest-headers.bin
new file mode 100644
index 000000000..24a26ba57
Binary files /dev/null and b/prover/data/regtest-headers.bin differ
diff --git a/prover/data/regtest_first_10.bin b/prover/data/regtest_first_10.bin
new file mode 100644
index 000000000..b4c79c1ab
Binary files /dev/null and b/prover/data/regtest_first_10.bin differ
diff --git a/prover/data/signet-headers.bin b/prover/data/signet-headers.bin
new file mode 100644
index 000000000..3eca0b960
Binary files /dev/null and b/prover/data/signet-headers.bin differ
diff --git a/prover/data/signet_first_10.bin b/prover/data/signet_first_10.bin
new file mode 100644
index 000000000..e94b9a3d8
Binary files /dev/null and b/prover/data/signet_first_10.bin differ
diff --git a/prover/data/testnet4-headers.bin b/prover/data/testnet4-headers.bin
new file mode 100644
index 000000000..f578df340
Binary files /dev/null and b/prover/data/testnet4-headers.bin differ
diff --git a/prover/data/testnet4_first_10.bin b/prover/data/testnet4_first_10.bin
new file mode 100644
index 000000000..792971a2e
Binary files /dev/null and b/prover/data/testnet4_first_10.bin differ
diff --git a/prover/elfs/mainnet-final-spv-guest b/prover/elfs/mainnet-final-spv-guest
new file mode 100755
index 000000000..8cdecfa89
Binary files /dev/null and b/prover/elfs/mainnet-final-spv-guest differ
diff --git a/prover/elfs/mainnet-header-chain-guest b/prover/elfs/mainnet-header-chain-guest
new file mode 100755
index 000000000..944da285d
Binary files /dev/null and b/prover/elfs/mainnet-header-chain-guest differ
diff --git a/prover/elfs/regtest-final-spv-guest b/prover/elfs/regtest-final-spv-guest
new file mode 100755
index 000000000..d4c8eeaf3
Binary files /dev/null and b/prover/elfs/regtest-final-spv-guest differ
diff --git a/prover/elfs/regtest-header-chain-guest b/prover/elfs/regtest-header-chain-guest
new file mode 100755
index 000000000..1a77f419f
Binary files /dev/null and b/prover/elfs/regtest-header-chain-guest differ
diff --git a/prover/elfs/signet-final-spv-guest b/prover/elfs/signet-final-spv-guest
new file mode 100755
index 000000000..ce5a290be
Binary files /dev/null and b/prover/elfs/signet-final-spv-guest differ
diff --git a/prover/elfs/signet-header-chain-guest b/prover/elfs/signet-header-chain-guest
new file mode 100755
index 000000000..3f19928d2
Binary files /dev/null and b/prover/elfs/signet-header-chain-guest differ
diff --git a/prover/elfs/testnet4-final-spv-guest b/prover/elfs/testnet4-final-spv-guest
new file mode 100755
index 000000000..3ed104096
Binary files /dev/null and b/prover/elfs/testnet4-final-spv-guest differ
diff --git a/prover/elfs/testnet4-header-chain-guest b/prover/elfs/testnet4-header-chain-guest
new file mode 100755
index 000000000..061a8a9f9
Binary files /dev/null and b/prover/elfs/testnet4-header-chain-guest differ
diff --git a/prover/src/docker.rs b/prover/src/docker.rs
new file mode 100644
index 000000000..213895698
--- /dev/null
+++ b/prover/src/docker.rs
@@ -0,0 +1,171 @@
+use hex::ToHex;
+use num_bigint::BigUint;
+use num_traits::Num;
+use risc0_groth16::{to_json, ProofJson, Seal};
+use risc0_zkvm::sha::Digestible;
+use risc0_zkvm::{
+    sha::Digest, ReceiptClaim, SuccinctReceipt, SuccinctReceiptVerifierParameters, SystemState,
+};
+use serde_json::Value;
+use std::{
+    env::consts::ARCH,
+    fs,
+    path::Path,
+    process::{Command, Stdio},
+};
+
+use tempfile::tempdir;
+
+pub fn stark_to_succinct(
+    succinct_receipt: SuccinctReceipt<ReceiptClaim>,
+    journal: &[u8],
+) -> (Seal, [u8; 31]) {
+    let ident_receipt = risc0_zkvm::recursion::identity_p254(&succinct_receipt).unwrap();
+    let identity_p254_seal_bytes = ident_receipt.get_seal_bytes();
+    let receipt_claim = succinct_receipt.claim.value().unwrap();
+
+    // This part is from risc0-groth16
+    if !is_x86_architecture() {
+        panic!("stark_to_snark is only supported on x86 architecture.")
+    }
+    if !is_docker_installed() {
+        panic!("Please install docker first.")
+    }
+
+    let tmp_dir = tempdir().unwrap();
+    let work_dir = std::env::var("RISC0_WORK_DIR");
+    let work_dir = work_dir.as_ref().map(Path::new).unwrap_or(tmp_dir.path());
+    println!("work_dir: {:?}", work_dir);
+    std::fs::write(work_dir.join("seal.r0"), identity_p254_seal_bytes.clone()).unwrap();
+    let seal_path = work_dir.join("input.json");
+    let proof_path = work_dir.join("proof.json");
+    let output_path = work_dir.join("public.json");
+    let mut seal_json = Vec::new();
+    to_json(&*identity_p254_seal_bytes, &mut seal_json).unwrap();
+    std::fs::write(seal_path.clone(), seal_json).unwrap();
+
+    let pre_state: risc0_zkvm::MaybePruned<SystemState> = receipt_claim.clone().pre;
+    println!("pre_state: {:?}", pre_state);
+    let pre_state_digest: Digest = pre_state.clone().digest();
+    println!("pre_state_digest: {:?}", pre_state_digest);
+    let pre_state_digest_bits: Vec<String> = pre_state_digest
+        .as_bytes()
+        .iter()
+        .flat_map(|&byte| (0..8).rev().map(move |i| ((byte >> i) & 1).to_string()))
+        .collect();
+    println!("pre_state_digest_bits: {:?}", pre_state_digest_bits);
+    let post_state: risc0_zkvm::MaybePruned<SystemState> = receipt_claim.clone().post;
+    println!("post_state: {:?}", post_state);
+    let post_state_digest: Digest = post_state.clone().digest();
+    let post_state_digest_bits: Vec<String> = post_state_digest
+        .as_bytes()
+        .iter()
+        .flat_map(|&byte| (0..8).rev().map(move |i| ((byte >> i) & 1).to_string()))
+        .collect();
+    println!("post_state_digest_bits: {:?}", post_state_digest_bits);
+
+    let mut journal_bits = Vec::new();
+    for byte in journal {
+        for i in 0..8 {
+            journal_bits.push((byte >> (7 - i)) & 1);
+        }
+    }
+    println!("journal_bits len: {:?}", journal_bits.len());
+
+    let succinct_verifier_params = SuccinctReceiptVerifierParameters::default();
+    println!("Succinct verifier params: {:?}", succinct_verifier_params);
+    let succinct_control_root = succinct_verifier_params.control_root;
+    println!("Succinct control root: {:?}", succinct_control_root);
+    let mut succinct_control_root_bytes: [u8; 32] =
+        succinct_control_root.as_bytes().try_into().unwrap();
+    succinct_control_root_bytes.reverse();
+    let succinct_control_root_bytes: String = succinct_control_root_bytes.encode_hex();
+    let a1_str = succinct_control_root_bytes[0..32].to_string();
+    let a0_str = succinct_control_root_bytes[32..64].to_string();
+    println!("Succinct control root a0: {:?}", a0_str);
+    println!("Succinct control root a1: {:?}", a1_str);
+    let a0_dec = to_decimal(&a0_str).unwrap();
+    let a1_dec = to_decimal(&a1_str).unwrap();
+    println!("Succinct control root a0 dec: {:?}", a0_dec);
+    println!("Succinct control root a1 dec: {:?}", a1_dec);
+    println!("CONTROL_ID: {:?}", ident_receipt.control_id);
+    let id_bn254_fr_bits: Vec<String> = ident_receipt
+        .control_id
+        .as_bytes()
+        .iter()
+        .flat_map(|&byte| (0..8).rev().map(move |i| ((byte >> i) & 1).to_string()))
+        .collect();
+    println!("id_bn254_fr_bits: {:?}", id_bn254_fr_bits);
+
+    let mut seal_json: Value = {
+        let file_content = fs::read_to_string(&seal_path).unwrap();
+        serde_json::from_str(&file_content).unwrap()
+    };
+
+    seal_json["journal_digest_bits"] = journal_bits.into();
+    seal_json["pre_state_digest_bits"] = pre_state_digest_bits.into();
+    seal_json["post_state_digest_bits"] = post_state_digest_bits.into();
+    seal_json["id_bn254_fr_bits"] = id_bn254_fr_bits.into();
+    seal_json["control_root"] = vec![a0_dec, a1_dec].into();
+    std::fs::write(seal_path, serde_json::to_string_pretty(&seal_json).unwrap()).unwrap();
+
+    let output = Command::new("docker")
+        .arg("run")
+        .arg("--rm")
+        .arg("-v")
+        .arg(format!("{}:/mnt", work_dir.to_string_lossy()))
+        .arg("ozancw/risc0-to-bitvm2-groth16-prover:latest")
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .output()
+        .unwrap();
+    println!("Output: {:?}", output);
+
+    if !output.status.success() {
+        eprintln!(
+            "docker returned failure exit code: {:?}",
+            output.status.code()
+        );
+    }
+    println!("proof_path: {:?}", proof_path);
+    let proof_content = std::fs::read_to_string(proof_path).unwrap();
+    let output_content_dec = std::fs::read_to_string(output_path).unwrap();
+    let proof_json: ProofJson = serde_json::from_str(&proof_content).unwrap();
+    // let output_json: Value = serde_json::from_str(&output_content).unwrap();
+    // Convert output_content_dec from decimal to hex
+    let parsed_json: Value = serde_json::from_str(&output_content_dec).unwrap();
+    let output_str = parsed_json[0].as_str().unwrap(); // Extracts the string from the JSON array
+
+    // Step 2: Convert the decimal string to BigUint and then to hexadecimal
+    let output_content_hex = BigUint::from_str_radix(output_str, 10)
+        .unwrap()
+        .to_str_radix(16);
+
+    // If the length of the hexadecimal string is odd, add a leading zero
+    let output_content_hex = if output_content_hex.len() % 2 == 0 {
+        output_content_hex
+    } else {
+        format!("0{}", output_content_hex)
+    };
+
+    // Step 3: Decode the hexadecimal string to a byte vector
+    let output_byte_vec = hex::decode(&output_content_hex).unwrap();
+    // let output_byte_vec = hex::decode(output_hex).unwrap();
+    let output_bytes: [u8; 31] = output_byte_vec.as_slice().try_into().unwrap();
+    (proof_json.try_into().unwrap(), output_bytes)
+}
+
+fn is_docker_installed() -> bool {
+    Command::new("docker")
+        .arg("--version")
+        .output()
+        .map(|output| output.status.success())
+        .unwrap_or(false)
+}
+
+fn is_x86_architecture() -> bool { ARCH == "x86_64" || ARCH == "x86" }
+
+pub fn to_decimal(s: &str) -> Option<String> {
+    let int = BigUint::from_str_radix(s, 16).ok();
+    int.map(|n| n.to_str_radix(10))
+}
diff --git a/prover/src/lib.rs b/prover/src/lib.rs
new file mode 100644
index 000000000..576de8c84
--- /dev/null
+++ b/prover/src/lib.rs
@@ -0,0 +1,275 @@
+use borsh::BorshDeserialize;
+use header_chain::{
+    header_chain::{
+        BlockHeaderCircuitOutput, CircuitBlockHeader, HeaderChainCircuitInput,
+        HeaderChainPrevProofType,
+    },
+    risc0_zkvm::{default_prover, ExecutorEnv},
+};
+
+use risc0_circuit_recursion::control_id::BN254_IDENTITY_CONTROL_ID;
+use risc0_zkvm::{compute_image_id, sha::Digestible};
+use risc0_zkvm::{ProverOpts, Receipt, SuccinctReceiptVerifierParameters, SystemState};
+use sha2::Digest;
+use sha2::Sha256;
+use std::{env, fs};
+
+pub mod docker;
+
+const HEADER_CHAIN_GUEST_ELF: &[u8] = {
+    match option_env!("BITCOIN_NETWORK") {
+        Some(network) if matches!(network.as_bytes(), b"mainnet") => {
+            include_bytes!("../elfs/mainnet-header-chain-guest")
+        }
+        Some(network) if matches!(network.as_bytes(), b"testnet4") => {
+            include_bytes!("../elfs/testnet4-header-chain-guest")
+        }
+        Some(network) if matches!(network.as_bytes(), b"signet") => {
+            include_bytes!("../elfs/signet-header-chain-guest")
+        }
+        Some(network) if matches!(network.as_bytes(), b"regtest") => {
+            include_bytes!("../elfs/regtest-header-chain-guest")
+        }
+        None => include_bytes!("../elfs/mainnet-header-chain-guest"),
+        _ => panic!("Invalid path or ELF file"),
+    }
+};
+
+const HEADERS: &[u8] = {
+    match option_env!("BITCOIN_NETWORK") {
+        Some(network) if matches!(network.as_bytes(), b"mainnet") => {
+            include_bytes!("../data/mainnet-headers.bin")
+        }
+        Some(network) if matches!(network.as_bytes(), b"testnet4") => {
+            include_bytes!("../data/testnet4-headers.bin")
+        }
+        Some(network) if matches!(network.as_bytes(), b"signet") => {
+            include_bytes!("../data/signet-headers.bin")
+        }
+        Some(network) if matches!(network.as_bytes(), b"regtest") => {
+            include_bytes!("../data/regtest-headers.bin")
+        }
+        None => include_bytes!("../data/mainnet-headers.bin"),
+        _ => panic!("Invalid network type"),
+    }
+};
+
+pub fn prove() {
+    // Parse command-line arguments
+    let args: Vec<String> = env::args().collect();
+    if args.len() < 4 {
+        eprintln!("Usage: <program> <input_proof> <output_file_path> <batch_size>");
+        return;
+    }
+
+    let input_proof = &args[1];
+    let output_file_path = &args[2];
+    let batch_size: usize = args[3].parse().expect("Batch size should be a number");
+
+    let headers = HEADERS
+        .chunks(80)
+        .map(|header| CircuitBlockHeader::try_from_slice(header).unwrap())
+        .collect::<Vec<CircuitBlockHeader>>();
+
+    let HEADER_CHAIN_GUEST_ID: [u32; 8] = compute_image_id(HEADER_CHAIN_GUEST_ELF)
+        .unwrap()
+        .as_words()
+        .try_into()
+        .unwrap();
+
+    // Set the previous proof type based on input_proof argument
+    let prev_receipt = if input_proof.to_lowercase() == "none" {
+        None
+    } else {
+        let proof_bytes = fs::read(input_proof).expect("Failed to read input proof file");
+        let receipt: Receipt = Receipt::try_from_slice(&proof_bytes).unwrap();
+        Some(receipt)
+    };
+
+    let mut start = 0;
+    let prev_proof = match prev_receipt.clone() {
+        Some(receipt) => {
+            let output =
+                BlockHeaderCircuitOutput::try_from_slice(&receipt.journal.bytes.clone()).unwrap();
+            start = output.chain_state.block_height as usize + 1;
+            HeaderChainPrevProofType::PrevProof(output)
+        }
+        None => HeaderChainPrevProofType::GenesisBlock,
+    };
+
+    // Prepare the input for the circuit
+    let input = HeaderChainCircuitInput {
+        method_id: HEADER_CHAIN_GUEST_ID,
+        prev_proof,
+        block_headers: headers[start..start + batch_size].to_vec(),
+    };
+
+    // Build ENV
+    let mut binding = ExecutorEnv::builder();
+    let mut env = binding.write_slice(&borsh::to_vec(&input).unwrap());
+    if let Some(receipt) = prev_receipt {
+        env = env.add_assumption(receipt);
+    }
+    let env = env.build().unwrap();
+
+    // Obtain the default prover.
+    let prover = default_prover();
+
+    // Produce a receipt by proving the specified ELF binary.
+    let receipt = prover
+        .prove_with_opts(env, HEADER_CHAIN_GUEST_ELF, &ProverOpts::succinct())
+        .unwrap()
+        .receipt;
+
+    // Extract journal of receipt
+    let output = BlockHeaderCircuitOutput::try_from_slice(&receipt.journal.bytes).unwrap();
+
+    println!("Output: {:#?}", output.method_id);
+
+    // Save the receipt to the specified output file path
+    let receipt_bytes = borsh::to_vec(&receipt).unwrap();
+    fs::write(output_file_path, &receipt_bytes).expect("Failed to write receipt to output file");
+    println!("Receipt saved to {}", output_file_path);
+}
+
+/// Sha256(control_root, pre_state_digest, post_state_digest, id_bn254_fr)
+pub fn calculate_succinct_output_prefix(method_id: &[u8]) -> [u8; 32] {
+    let succinct_verifier_params = SuccinctReceiptVerifierParameters::default();
+    let succinct_control_root = succinct_verifier_params.control_root;
+    let mut succinct_control_root_bytes: [u8; 32] =
+        succinct_control_root.as_bytes().try_into().unwrap();
+    for byte in succinct_control_root_bytes.iter_mut() {
+        *byte = byte.reverse_bits();
+    }
+    let pre_state_bytes = method_id.to_vec();
+    let control_id_bytes: [u8; 32] = BN254_IDENTITY_CONTROL_ID.into();
+
+    // Expected post state for an execution that halted successfully
+    let post_state: SystemState = risc0_binfmt::SystemState {
+        pc: 0,
+        merkle_root: risc0_zkp::core::digest::Digest::default(),
+    };
+    let post_state_bytes: [u8; 32] = post_state.digest().into();
+
+    let mut hasher = Sha256::new();
+    hasher.update(&succinct_control_root_bytes);
+    hasher.update(&pre_state_bytes);
+    hasher.update(&post_state_bytes);
+    hasher.update(&control_id_bytes);
+    let result: [u8; 32] = hasher
+        .finalize()
+        .try_into()
+        .expect("SHA256 should produce a 32-byte output");
+
+    result
+}
+
+fn reverse_bits_and_copy(input: &[u8], output: &mut [u8]) {
+    for i in 0..8 {
+        let temp = u32::from_be_bytes(input[4 * i..4 * i + 4].try_into().unwrap()).reverse_bits();
+        output[4 * i..4 * i + 4].copy_from_slice(&temp.to_le_bytes());
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use docker::stark_to_succinct;
+    use final_spv::{
+        final_circuit::FinalCircuitInput, merkle_tree::BitcoinMerkleTree, spv::SPV,
+        transaction::CircuitTransaction,
+    };
+    use header_chain::mmr_native::MMRNative;
+    use hex_literal::hex;
+    use risc0_zkvm::compute_image_id;
+
+    const MAINNET_BLOCK_HASHES: [[u8; 32]; 11] = [
+        hex!("6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000"),
+        hex!("4860eb18bf1b1620e37e9490fc8a427514416fd75159ab86688e9a8300000000"),
+        hex!("bddd99ccfda39da1b108ce1a5d70038d0a967bacb68b6b63065f626a00000000"),
+        hex!("4944469562ae1c2c74d9a535e00b6f3e40ffbad4f2fda3895501b58200000000"),
+        hex!("85144a84488ea88d221c8bd6c059da090e88f8a2c99690ee55dbba4e00000000"),
+        hex!("fc33f596f822a0a1951ffdbf2a897b095636ad871707bf5d3162729b00000000"),
+        hex!("8d778fdc15a2d3fb76b7122a3b5582bea4f21f5a0c693537e7a0313000000000"),
+        hex!("4494c8cf4154bdcc0720cd4a59d9c9b285e4b146d45f061d2b6c967100000000"),
+        hex!("c60ddef1b7618ca2348a46e868afc26e3efc68226c78aa47f8488c4000000000"),
+        hex!("0508085c47cc849eb80ea905cc7800a3be674ffc57263cf210c59d8d00000000"),
+        hex!("e915d9a478e3adf3186c07c61a22228b10fd87df343c92782ecc052c00000000"),
+    ];
+
+    use super::*;
+    // #[ignore = "This is to only test final proof generation"]
+    /// Run this test only when build for the mainnet
+    #[test]
+    fn test_final_circuit() {
+        let final_circuit_elf = include_bytes!("../elfs/mainnet-final-spv-guest");
+        let header_chain_circuit_elf = include_bytes!("../elfs/mainnet-header-chain-guest");
+        println!(
+            "Header chain circuit id: {:#?}",
+            compute_image_id(header_chain_circuit_elf)
+                .unwrap()
+                .as_words()
+        );
+        let final_proof = include_bytes!("../data/mainnet_first_10.bin");
+        let final_circuit_id = compute_image_id(final_circuit_elf).unwrap();
+
+        let receipt: Receipt = Receipt::try_from_slice(final_proof).unwrap();
+
+        let mut mmr_native = MMRNative::new();
+        for block_hash in MAINNET_BLOCK_HASHES.iter() {
+            mmr_native.append(*block_hash);
+        }
+
+        let output = BlockHeaderCircuitOutput::try_from_slice(&receipt.journal.bytes).unwrap();
+        let tx: CircuitTransaction = CircuitTransaction(bitcoin::consensus::deserialize(&hex::decode("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff4d04ffff001d0104455468652054696d65732030332f4a616e2f32303039204368616e63656c6c6f72206f6e206272696e6b206f66207365636f6e64206261696c6f757420666f722062616e6b73ffffffff0100f2052a01000000434104678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5fac00000000").unwrap()).unwrap());
+        let block_header: CircuitBlockHeader = CircuitBlockHeader::try_from_slice(hex::decode("0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a29ab5f49ffff001d1dac2b7c").unwrap().as_slice()).unwrap();
+        let bitcoin_merkle_tree: BitcoinMerkleTree = BitcoinMerkleTree::new(vec![tx.txid()]);
+        let bitcoin_inclusion_proof = bitcoin_merkle_tree.generate_proof(0);
+        let (_, mmr_inclusion_proof) = mmr_native.generate_proof(0);
+        let spv: SPV = SPV::new(
+            tx,
+            bitcoin_inclusion_proof,
+            block_header,
+            mmr_inclusion_proof,
+        );
+        let final_circuit_input: FinalCircuitInput = FinalCircuitInput {
+            block_header_circuit_output: output,
+            spv: spv,
+        };
+        let env = ExecutorEnv::builder()
+            .write_slice(&borsh::to_vec(&final_circuit_input).unwrap())
+            .add_assumption(receipt)
+            .build()
+            .unwrap();
+
+        let prover = default_prover();
+
+        let receipt = prover
+            .prove_with_opts(env, final_circuit_elf, &ProverOpts::succinct())
+            .unwrap()
+            .receipt;
+
+        let succinct_receipt = receipt.inner.succinct().unwrap().clone();
+        let receipt_claim = succinct_receipt.clone().claim;
+        println!("Receipt claim: {:#?}", receipt_claim);
+        let journal: [u8; 32] = receipt.journal.bytes.clone().try_into().unwrap();
+        let (proof, output_json_bytes) =
+            stark_to_succinct(succinct_receipt, &receipt.journal.bytes);
+        print!("Proof: {:#?}", proof);
+        let constants_digest = calculate_succinct_output_prefix(final_circuit_id.as_bytes());
+        println!("Constants digest: {:#?}", constants_digest);
+        println!("Journal: {:#?}", receipt.journal);
+        let mut constants_blake3_input = [0u8; 32];
+        let mut journal_blake3_input = [0u8; 32];
+
+        reverse_bits_and_copy(&constants_digest, &mut constants_blake3_input);
+        reverse_bits_and_copy(&journal, &mut journal_blake3_input);
+        let mut hasher = blake3::Hasher::new();
+        hasher.update(&constants_blake3_input);
+        hasher.update(&journal_blake3_input);
+        let final_output = hasher.finalize();
+        let final_output_bytes: [u8; 32] = final_output.try_into().unwrap();
+        let final_output_trimmed: [u8; 31] = final_output_bytes[..31].try_into().unwrap();
+        assert_eq!(final_output_trimmed, output_json_bytes);
+    }
+}
diff --git a/prover/src/main.rs b/prover/src/main.rs
new file mode 100644
index 000000000..2b3444d96
--- /dev/null
+++ b/prover/src/main.rs
@@ -0,0 +1,3 @@
+use prover::prove;
+
+fn main() { prove(); }
diff --git a/regtest/README.md b/regtest/README.md
new file mode 100644
index 000000000..549dcdbf7
--- /dev/null
+++ b/regtest/README.md
@@ -0,0 +1,41 @@
+# Regtest Convenience Scripts
+
+These scripts are provided to easily run an esplora regtest client via docker for local testing.
+
+Ensure that docker is included in the system's PATH environment variable.
+
+## Usage
+
+### Installing
+
+To automatically download the esplora docker image and configure the data directory, run:
+
+```console
+# ./install.sh
+```
+
+### Starting
+
+To start the esplora client in regtest mode and automatically mine blocks, run:
+
+```console
+# ./start.sh
+```
+
+### Stopping
+
+To stop the esplora client and stop mining blocks, run:
+
+```console
+# ./stop.sh
+```
+
+### Uninstalling
+
+To uninstall everything, simply delete the data directory or run:
+
+```console
+# data_path=$(<data_path)
+# rm -rf $data_path
+# rm data_path
+```
\ No newline at end of file
diff --git a/regtest/block-generator.sh b/regtest/block-generator.sh
new file mode 100755
index 000000000..ebfe307b9
--- /dev/null
+++ b/regtest/block-generator.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+CONFIG_FILE=$(dirname $0)/../.env.test
+
+if [ -z "$1" ]; then
+        # If no interval is specified, use the value from the config file
+        if [ -f $CONFIG_FILE ]; then
+                source $CONFIG_FILE
+
+                if [ -z "$REGTEST_BLOCK_TIME" ]; then
+                        echo "REGTEST_BLOCK_TIME variable missing in $CONFIG_FILE"
+                        exit 1
+                fi
+        else
+                echo "Please create a $CONFIG_FILE file with the REGTEST_BLOCK_TIME variable"
+                exit 1
+        fi
+
+        interval=$REGTEST_BLOCK_TIME
+else
+        interval=$1
+fi
+
+pid=`docker ps | grep blockstream/esplora | awk '{print $1}'`
+echo "Targeting container $pid ..."
+
+echo "Loading default wallet ..."
+load_wallet_command="/srv/explorer/bitcoin/bin/bitcoin-cli -conf=/data/.bitcoin.conf -datadir=/data/bitcoin loadwallet default"
+docker exec $pid /bin/bash -c "$load_wallet_command"
+
+set -e
+
+echo "Generating a block every $interval seconds. Press [CTRL+C] to stop.."
+
+address_command="/srv/explorer/bitcoin/bin/bitcoin-cli -conf=/data/.bitcoin.conf -datadir=/data/bitcoin getnewaddress"
+address=`docker exec $pid /bin/bash -c "$address_command"`
+
+generate_command="/srv/explorer/bitcoin/bin/bitcoin-cli -conf=/data/.bitcoin.conf -datadir=/data/bitcoin generatetoaddress 1 $address"
+
+while :
+do
+        echo "Generating a new block `date '+%d/%m/%Y %H:%M:%S'` ..."
+        docker exec $pid /bin/bash -c "$generate_command"
+        sleep $interval
+done
\ No newline at end of file
diff --git a/regtest/install.sh b/regtest/install.sh
new file mode 100755
index 000000000..e11d0d921
--- /dev/null
+++ b/regtest/install.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo "Downloading esplora docker container ..."
+docker pull blockstream/esplora:latest
+
+printf "\n\n"
+
+read -p "Enter directory path for esplora data [.]: " data_path
+data_path=${data_path:-.}
+echo "$data_path" > "./data_path"
diff --git a/regtest/start.sh b/regtest/start.sh
new file mode 100755
index 000000000..ae72b1e50
--- /dev/null
+++ b/regtest/start.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+data_path=$(<data_path)
+if [ -n "$data_path" ]; then
+  echo "Start up esplora docker container with data path: $data_path ..."
+  pid=`docker ps | grep "[b]lockstream/esplora" | awk '{print $1}'`
+  if [ -n "$pid" ]; then
+    echo "esplora client already running"
+  else
+    docker run -d -p 50001:50001 -p 8094:80 \
+        --volume "$data_path/esplora-bitcoin-regtest-data:/data" \
+        --rm -i -t blockstream/esplora \
+        bash -c "sed -i '182i echo \"acceptnonstdtxn=1\" >> /data/.bitcoin.conf' /srv/explorer/run.sh && \
+                sed -i '/http {/a \    client_max_body_size 100M;' /etc/nginx/nginx.conf && \
+                /srv/explorer/run.sh bitcoin-regtest explorer"
+
+    echo "Waiting for esplora start up (10s) ..."
+    sleep 10
+  fi
+
+  pid=`docker ps | grep blockstream/esplora | awk '{print $1}'`
+  createwallet_command="/srv/explorer/bitcoin/bin/bitcoin-cli -conf=/data/.bitcoin.conf -datadir=/data/bitcoin createwallet default"
+  docker exec $pid /bin/bash -c "$createwallet_command"
+
+  pid=`ps | grep "[b]lock-generator" | awk '{print $1}'`
+  echo "Start up block miner ..."
+  if [ -n "$pid" ]; then
+    echo "block-generator.sh already running"
+  else
+    ./block-generator.sh
+  fi
+else
+  echo "Run install.sh first"
+fi
diff --git a/regtest/stop.sh b/regtest/stop.sh
new file mode 100755
index 000000000..569dc725e
--- /dev/null
+++ b/regtest/stop.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+pid=`ps | grep "[b]lock-generator" | awk '{print $1}'`
+echo "Killing block miner $pid ..."
+if [ -n "$pid" ]; then
+  kill $pid
+else
+  echo "block-generator.sh not running"
+fi
+
+pid=`docker ps | grep "[b]lockstream/esplora" | awk '{print $1}'`
+echo "Stopping esplora client $pid ..."
+if [ -n "$pid" ]; then
+  docker stop $pid
+else
+  echo "esplora client not running"
+fi
\ No newline at end of file
diff --git a/src/bigint/std.rs b/src/bigint/std.rs
deleted file mode 100644
index a6cbe8b04..000000000
--- a/src/bigint/std.rs
+++ /dev/null
@@ -1,558 +0,0 @@
-use num_bigint::BigUint;
-use num_traits::Num;
-use std::str::FromStr;
-
-use crate::bigint::BigIntImpl;
-use crate::pseudo::push_to_stack;
-use crate::treepp::*;
-
-impl<const N_BITS: u32, const LIMB_SIZE: u32> BigIntImpl<N_BITS, LIMB_SIZE> {
-    pub fn push_u32_le(v: &[u32]) -> Script {
-        let mut bits = vec![];
-        for elem in v.iter() {
-            for i in 0..32 {
-                bits.push((elem & (1 << i)) != 0);
-            }
-        }
-        bits.resize(N_BITS as usize, false);
-
-        let mut limbs = vec![];
-        for chunk in bits.chunks(LIMB_SIZE as usize) {
-            let mut chunk_vec = chunk.to_vec();
-            chunk_vec.resize(LIMB_SIZE as usize, false);
-
-            let mut elem = 0u32;
-            for i in 0..LIMB_SIZE as usize {
-                if chunk_vec[i] {
-                    elem += 1 << i;
-                }
-            }
-
-            limbs.push(elem);
-        }
-
-        limbs.reverse();
-
-        script! {
-            for limb in &limbs {
-                { *limb }
-            }
-            { push_to_stack(0,Self::N_LIMBS as usize - limbs.len()) }
-        }
-    }
-
-    pub fn push_u64_le(v: &[u64]) -> Script {
-        let v = v
-            .iter()
-            .flat_map(|v| {
-                [
-                    (v & 0xffffffffu64) as u32,
-                    ((v >> 32) & 0xffffffffu64) as u32,
-                ]
-            })
-            .collect::<Vec<u32>>();
-
-        Self::push_u32_le(&v)
-    }
-
-    /// Zip the top two u{16N} elements
-    /// input:  a0 ... a{N-1} b0 ... b{N-1}
-    /// output: a0 b0 ... ... a{N-1} b{N-1}
-    pub fn zip(mut a: u32, mut b: u32) -> Script {
-        a = (a + 1) * Self::N_LIMBS - 1;
-        b = (b + 1) * Self::N_LIMBS - 1;
-
-        assert_ne!(a, b);
-        if a < b {
-            script! {
-                for i in 0..Self::N_LIMBS {
-                    { a + i }
-                    OP_ROLL
-                    { b }
-                    OP_ROLL
-                }
-            }
-        } else {
-            script! {
-                for i in 0..Self::N_LIMBS {
-                    { a }
-                    OP_ROLL
-                    { b + i + 1 }
-                    OP_ROLL
-                }
-            }
-        }
-    }
-
-    pub fn copy_zip(mut a: u32, mut b: u32) -> Script {
-        a = (a + 1) * Self::N_LIMBS - 1;
-        b = (b + 1) * Self::N_LIMBS - 1;
-
-        script! {
-            for i in 0..Self::N_LIMBS {
-                { a + i } OP_PICK { b + 1 + i } OP_PICK
-            }
-        }
-    }
-
-    pub fn dup_zip(mut a: u32) -> Script {
-        a = (a + 1) * Self::N_LIMBS - 1;
-
-        script! {
-            for i in 0..Self::N_LIMBS {
-                { a + i } OP_ROLL OP_DUP
-            }
-        }
-    }
-
-    pub fn copy(mut a: u32) -> Script {
-        a = (a + 1) * Self::N_LIMBS - 1;
-
-        script! {
-            if a < 134 {
-                for _ in 0..Self::N_LIMBS {
-                    { a } OP_PICK
-                }
-            } else {
-                { a + 1 }
-                for _ in 0..Self::N_LIMBS - 1 {
-                    OP_DUP OP_PICK OP_SWAP
-                }
-                OP_1SUB OP_PICK
-            }
-        }
-    }
-
-    pub fn roll(mut a: u32) -> Script {
-        if a == 0 {
-            return script! {};
-        }
-        a = (a + 1) * Self::N_LIMBS - 1;
-
-        script! {
-            for _ in 0..Self::N_LIMBS {
-                { a } OP_ROLL
-            }
-        }
-    }
-
-    pub fn drop() -> Script {
-        script! {
-            for _ in 0..Self::N_LIMBS / 2 {
-                OP_2DROP
-            }
-            if Self::N_LIMBS & 1 == 1 {
-                OP_DROP
-            }
-        }
-    }
-
-    pub fn push_dec(dec_string: &str) -> Script {
-        Self::push_u32_le(&BigUint::from_str(dec_string).unwrap().to_u32_digits())
-    }
-
-    pub fn push_hex(hex_string: &str) -> Script {
-        Self::push_u32_le(
-            &BigUint::from_str_radix(hex_string, 16)
-                .unwrap()
-                .to_u32_digits(),
-        )
-    }
-
-    #[inline]
-    pub fn push_zero() -> Script { push_to_stack(0, Self::N_LIMBS as usize) }
-
-    #[inline]
-    pub fn push_one() -> Script {
-        script! {
-            { push_to_stack(0,(Self::N_LIMBS - 1) as usize) }
-            1
-        }
-    }
-
-    pub fn is_zero_keep_element(a: u32) -> Script {
-        let a = Self::N_LIMBS * a;
-        script! {
-            1
-            for i in 0..Self::N_LIMBS {
-                { a + i+1 } OP_PICK
-                OP_NOT
-                OP_BOOLAND
-            }
-        }
-    }
-
-    pub fn is_zero(a: u32) -> Script {
-        let a = Self::N_LIMBS * a;
-        script! {
-            1
-            for _ in 0..Self::N_LIMBS {
-                { a +1 } OP_ROLL
-                OP_NOT
-                OP_BOOLAND
-            }
-        }
-    }
-
-    pub fn is_one_keep_element(a: u32) -> Script {
-        let a = Self::N_LIMBS * a;
-        script! {
-            1
-            { a + 1 } OP_PICK
-            1 OP_EQUAL OP_BOOLAND
-            for i in 1..Self::N_LIMBS {
-                { a + i + 1 } OP_PICK
-                OP_NOT
-                OP_BOOLAND
-            }
-        }
-    }
-
-    pub fn is_one(a: u32) -> Script {
-        let a = Self::N_LIMBS * a;
-        script! {
-            1
-            { a + 1 } OP_ROLL
-            1 OP_EQUAL OP_BOOLAND
-            for _ in 1..Self::N_LIMBS {
-                { a + 1 } OP_ROLL
-                OP_NOT
-                OP_BOOLAND
-            }
-        }
-    }
-
-    pub fn toaltstack() -> Script {
-        script! {
-            for _ in 0..Self::N_LIMBS {
-                OP_TOALTSTACK
-            }
-        }
-    }
-
-    pub fn fromaltstack() -> Script {
-        script! {
-            for _ in 0..Self::N_LIMBS {
-                OP_FROMALTSTACK
-            }
-        }
-    }
-
-
-    pub fn is_negative(depth: u32) -> Script {
-        script! {
-            { (1 + depth) * Self::N_LIMBS - 1 } OP_PICK
-            { Self::HEAD_OFFSET >> 1 }
-            OP_GREATERTHANOREQUAL
-        }
-    }
-
-    pub fn is_positive(depth: u32) -> Script {
-        script! {
-            { (1 + depth) * Self::N_LIMBS - 1 } OP_PICK
-            { Self::HEAD_OFFSET >> 1 }
-            OP_LESSTHAN
-        }
-    }
-
-    /// Resize positive numbers
-    /// 
-    /// # Note
-    ///
-    /// Does not work for negative numbers
-    pub fn resize<const T_BITS: u32>() -> Script {
-        let n_limbs_self = (N_BITS + LIMB_SIZE - 1) / LIMB_SIZE;
-        let n_limbs_target = (T_BITS + LIMB_SIZE - 1) / LIMB_SIZE;
-
-        if n_limbs_target == n_limbs_self {
-            return script! {};
-        } else if n_limbs_target > n_limbs_self {
-            let n_limbs_to_add = n_limbs_target - n_limbs_self;
-            script! {
-                if n_limbs_to_add > 0 {
-                    {0} {crate::pseudo::OP_NDUP((n_limbs_to_add - 1) as usize)} // Pushing zeros to the stack
-                }
-                for _ in 0..n_limbs_self {
-                    { n_limbs_target - 1 } OP_ROLL
-                }
-            }
-        } else {
-            let n_limbs_to_remove = n_limbs_self - n_limbs_target;
-            script! {
-                for _ in 0..n_limbs_to_remove {
-                    { n_limbs_target } OP_ROLL OP_DROP
-                }
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::bigint::{BigIntImpl, U254};
-    use crate::treepp::execute_script;
-    use bitcoin_script::script;
-    use rand::{Rng, SeedableRng};
-    use rand_chacha::ChaCha20Rng;
-
-    #[test]
-    fn test_zip() {
-        const N_BITS: u32 = 1450;
-        const N_U30_LIMBS: u32 = 50;
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..50 {
-            let mut v = vec![];
-            for _ in 0..N_U30_LIMBS {
-                v.push(prng.gen::<i32>());
-            }
-            for _ in 0..N_U30_LIMBS {
-                v.push(prng.gen::<i32>());
-            }
-
-            let mut expected = vec![];
-            for i in 0..N_U30_LIMBS {
-                expected.push(v[i as usize]);
-                expected.push(v[(N_U30_LIMBS + i) as usize]);
-            }
-
-            let script = script! {
-                for i in 0..N_U30_LIMBS * 2 {
-                    { v[i as usize] }
-                }
-                { BigIntImpl::<N_BITS, 29>::zip(1, 0) }
-                for i in 0..N_U30_LIMBS * 2 {
-                    { expected[(N_U30_LIMBS * 2 - 1 - i) as usize] }
-                    OP_EQUALVERIFY
-                }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-
-        for _ in 0..50 {
-            let mut v = vec![];
-            for _ in 0..N_U30_LIMBS {
-                v.push(prng.gen::<i32>());
-            }
-            for _ in 0..N_U30_LIMBS {
-                v.push(prng.gen::<i32>());
-            }
-
-            let mut expected = vec![];
-            for i in 0..N_U30_LIMBS {
-                expected.push(v[(N_U30_LIMBS + i) as usize]);
-                expected.push(v[i as usize]);
-            }
-
-            let script = script! {
-                for i in 0..N_U30_LIMBS * 2 {
-                    { v[i as usize] }
-                }
-                { BigIntImpl::<N_BITS, 29>::zip(0, 1) }
-                for i in 0..N_U30_LIMBS * 2 {
-                    { expected[(N_U30_LIMBS * 2 - 1 - i) as usize] }
-                    OP_EQUALVERIFY
-                }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_copy() {
-        println!("U254.copy(0): {} bytes", U254::copy(0).len());
-        println!("U254.copy(13): {} bytes", U254::copy(13).len());
-        println!("U254.copy(14): {} bytes", U254::copy(14).len());
-        const N_U30_LIMBS: u32 = 9;
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..50 {
-            let mut v = vec![];
-            for _ in 0..N_U30_LIMBS {
-                v.push(prng.gen::<i32>());
-            }
-            for _ in 0..N_U30_LIMBS {
-                v.push(prng.gen::<i32>());
-            }
-
-            let mut expected = vec![];
-            for i in 0..N_U30_LIMBS {
-                expected.push(v[i as usize]);
-            }
-
-            let script = script! {
-                for i in 0..N_U30_LIMBS * 2 {
-                    { v[i as usize] }
-                }
-                { U254::copy(1) }
-                for i in 0..N_U30_LIMBS {
-                    { expected[(N_U30_LIMBS - 1 - i) as usize] }
-                    OP_EQUALVERIFY
-                }
-                { U254::drop() }
-                { U254::drop() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_roll() {
-        const N_U30_LIMBS: u32 = 9;
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..50 {
-            let mut v = vec![];
-            for _ in 0..N_U30_LIMBS {
-                v.push(prng.gen::<i32>());
-            }
-            for _ in 0..N_U30_LIMBS {
-                v.push(prng.gen::<i32>());
-            }
-
-            let mut expected = vec![];
-            for i in 0..N_U30_LIMBS {
-                expected.push(v[i as usize]);
-            }
-
-            let script = script! {
-                for i in 0..N_U30_LIMBS * 2 {
-                    { v[i as usize] }
-                }
-                { U254::roll(1) }
-                for i in 0..N_U30_LIMBS {
-                    { expected[(N_U30_LIMBS - 1 - i) as usize] }
-                    OP_EQUALVERIFY
-                }
-                { U254::drop() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_copy_zip() {
-        const N_U30_LIMBS: u32 = 9;
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..50 {
-            let mut v = vec![];
-            for _ in 0..N_U30_LIMBS {
-                v.push(prng.gen::<i32>());
-            }
-            for _ in 0..N_U30_LIMBS {
-                v.push(prng.gen::<i32>());
-            }
-
-            let mut expected = vec![];
-            for i in 0..N_U30_LIMBS {
-                expected.push(v[i as usize]);
-                expected.push(v[(N_U30_LIMBS + i) as usize]);
-            }
-
-            let script = script! {
-                for i in 0..N_U30_LIMBS * 2 {
-                    { v[i as usize] }
-                }
-                { U254::copy_zip(1, 0) }
-                for i in 0..N_U30_LIMBS * 2 {
-                    { expected[(N_U30_LIMBS * 2 - 1 - i) as usize] }
-                    OP_EQUALVERIFY
-                }
-                { U254::drop() }
-                { U254::drop() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-
-            let mut expected = vec![];
-            for i in 0..N_U30_LIMBS {
-                expected.push(v[(N_U30_LIMBS + i) as usize]);
-                expected.push(v[i as usize]);
-            }
-
-            let script = script! {
-                for i in 0..N_U30_LIMBS * 2 {
-                    { v[i as usize] }
-                }
-                { U254::copy_zip(0, 1) }
-                for i in 0..N_U30_LIMBS * 2 {
-                    { expected[(N_U30_LIMBS * 2 - 1 - i) as usize] }
-                    OP_EQUALVERIFY
-                }
-                { U254::drop() }
-                { U254::drop() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-
-            let mut expected = vec![];
-            for i in 0..N_U30_LIMBS {
-                expected.push(v[i as usize]);
-                expected.push(v[i as usize]);
-            }
-
-            let script = script! {
-                for i in 0..N_U30_LIMBS * 2 {
-                    { v[i as usize] }
-                }
-                { U254::copy_zip(1, 1) }
-                for i in 0..N_U30_LIMBS * 2 {
-                    { expected[(N_U30_LIMBS * 2 - 1 - i) as usize] }
-                    OP_EQUALVERIFY
-                }
-                { U254::drop() }
-                { U254::drop() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-
-            let script = script! {
-                for i in 0..N_U30_LIMBS * 2 {
-                    { v[i as usize] }
-                }
-                { U254::dup_zip(1) }
-                for i in 0..N_U30_LIMBS * 2 {
-                    { expected[(N_U30_LIMBS * 2 - 1 - i) as usize] }
-                    OP_EQUALVERIFY
-                }
-                { U254::drop() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn push_hex() {
-        let exec_result = execute_script(script! {
-            { U254::push_hex("30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47") }
-            { 0x187cfd47 } OP_EQUALVERIFY // 410844487
-            { 0x10460b6 } OP_EQUALVERIFY // 813838427
-            { 0x1c72a34f } OP_EQUALVERIFY // 119318739
-            { 0x2d522d0 } OP_EQUALVERIFY // 542811226
-            { 0x1585d978 } OP_EQUALVERIFY // 22568343
-            { 0x2db40c0 } OP_EQUALVERIFY // 18274822
-            { 0xa6e141 } OP_EQUALVERIFY // 436378501
-            { 0xe5c2634 } OP_EQUALVERIFY // 329037900
-            { 0x30644e } OP_EQUAL // 12388
-        });
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/bigint/u29x9.rs b/src/bigint/u29x9.rs
deleted file mode 100644
index bf21e8629..000000000
--- a/src/bigint/u29x9.rs
+++ /dev/null
@@ -1,2715 +0,0 @@
-
-use std::cmp::min;
-
-use crate::bigint::U254;
-use crate::treepp::*;
-
-const USE_STRICT: bool = false;
-
-// assert 0 ≤ a ≤ max
-// a
-fn assert_nn_le(max: u32) -> Script {
-    script! {
-        if USE_STRICT {
-            // a
-            OP_DUP 0
-            // a a 0
-            if max < 0x7FFFFFFF {
-                { max + 1 }
-                // a a 0 2³⁰
-                OP_WITHIN
-                // a 0≤a≤max
-            } else {
-                OP_GREATERTHANOREQUAL
-                // a 0≤a
-            }
-            OP_VERIFY
-            // a
-    }
-    }
-}
-
-// A₀ | A₁ A₂ A₃ ⋯ A₂₆ A₂₇ A₂₈
-// A₂₈…₀
-fn u29_bits_to_altstack() -> Script {
-    // NOTE: A₀ is left in the basket
-    script! {
-        // A₂₈…₀
-        { assert_nn_le(0x1FFFFFFF) } // 0≤A₂₈…₀<2²⁹
-        // A₂₈…₀
-        { 0x10000000 }
-        // A₂₈…₀ 2²⁸
-        OP_SWAP
-        // 2²⁸ A₂₈…₀
-        for _ in 0..27 {
-            OP_2DUP OP_LESSTHANOREQUAL
-            // 2²⁸ A₂₈…₀ A₂₈
-            OP_DUP OP_TOALTSTACK
-            // 2²⁸ A₂₈…₀ A₂₈ | A₂₈
-            OP_IF OP_OVER OP_SUB OP_ENDIF
-            // 2²⁸ A₂₇…₀
-            OP_DUP OP_ADD
-            // 2²⁸ 2¹⋅A₂₇…₀
-        }
-        // 2²⁸ 2²⁷⋅A₁…₀ | A₂ A₃ A₄ ⋯ A₂₆ A₂₇ A₂₈
-        OP_2DUP OP_LESSTHANOREQUAL
-        // 2²⁸ 2²⁷⋅A₁…₀ A₁
-        OP_DUP OP_TOALTSTACK
-        // 2²⁸ 2²⁷⋅A₁…₀ A₁ | A₁ A₂ A₃ ⋯ A₂₆ A₂₇ A₂₈
-        OP_IF OP_SWAP OP_SUB OP_ELSE OP_NIP OP_ENDIF
-        // 2²⁷⋅A₀
-        OP_0NOTEQUAL
-        // A₀ | A₁ A₂ A₃ ⋯ A₂₆ A₂₇ A₂₈
-    }
-}
-
-// (A₂₈…₀ ⋅ B₂₈…₀)₂₈…₀ (A₂₈…₀ ⋅ B₂₈…₀)₅₇…₂₉
-// A₂₈…₀ B₂₈…₀
-fn u29_mul_carry_29() -> Script {
-    script! {
-        // A₂₈…₀ B₂₈…₀
-        { assert_nn_le(0x1FFFFFFF) } // 0≤A₂₈…₀<2²⁹
-        // A₂₈…₀ B₂₈…₀
-        { u29_bits_to_altstack() }
-        // A₂₈…₀ B₀ | B₁ B₂ B₃ ⋯ B₂₆ B₂₇ B₂₈
-        OP_IF OP_DUP OP_ELSE 0 OP_SWAP OP_ENDIF
-        // A₂₈…₀⋅B₀ A₂₈…₀
-        OP_DUP OP_ADD
-        // A₂₈…₀⋅B₀ 2¹⋅A₂₈…₀
-        { 0x20000000 }
-        // A₂₈…₀⋅B₀ 2¹⋅A₂₈…₀ 2²⁹
-        OP_SWAP
-        // A₂₈…₀⋅B₀ 2²⁹ 2¹⋅A₂₈…₀
-        OP_2DUP OP_LESSTHANOREQUAL
-        // A₂₈…₀⋅B₀ 2²⁹ 2¹⋅A₂₈…₀ A₂₈
-        OP_TUCK
-        // A₂₈…₀⋅B₀ 2²⁹ A₂₈ 2¹⋅A₂₈…₀ A₂₈
-        OP_IF 2 OP_PICK OP_SUB OP_ENDIF
-        // A₂₈…₀⋅B₀ 2²⁹ A₂₈ 2¹⋅A₂₇…₀
-        OP_FROMALTSTACK
-        // A₂₈…₀⋅B₀ 2²⁹ A₂₈ 2¹⋅A₂₇…₀ B₁ | B₂ B₃ B₄ ⋯ B₂₆ B₂₇ B₂₈
-        OP_IF OP_2DUP OP_ELSE 0 0 OP_ENDIF
-        // A₂₈…₀⋅B₀ 2²⁹ A₂₈ 2¹⋅A₂₇…₀ A₂₈⋅B₁ 2¹⋅A₂₇…₀⋅B₁
-        5 OP_ROLL
-        // 2²⁹ A₂₈ 2¹⋅A₂₇…₀ A₂₈⋅B₁ 2¹⋅A₂₇…₀⋅B₁ A₂₈…₀⋅B₀
-        OP_ADD
-        // 2²⁹ A₂₈ 2¹⋅A₂₇…₀ A₂₈⋅B₁ A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁
-        4 OP_PICK
-        // 2²⁹ A₂₈ 2¹⋅A₂₇…₀ A₂₈⋅B₁ A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁ 2²⁹
-        OP_2DUP OP_GREATERTHANOREQUAL
-        // 2²⁹ A₂₈ 2¹⋅A₂₇…₀ A₂₈⋅B₁ A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁ 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉
-        OP_IF OP_SUB OP_SWAP OP_1ADD OP_ELSE OP_DROP OP_SWAP OP_ENDIF
-        // 2²⁹ A₂₈ 2¹⋅A₂₇…₀ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉
-        OP_2SWAP
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ A₂₈ 2¹⋅A₂₇…₀
-        OP_SWAP
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2¹⋅A₂₇…₀ A₂₈
-        OP_DUP OP_ADD
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2¹⋅A₂₇…₀ 2¹⋅A₂₈
-        OP_SWAP
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2¹⋅A₂₈ 2¹⋅A₂₇…₀
-        OP_DUP OP_ADD
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2¹⋅A₂₈ 2²⋅A₂₇…₀
-        4 OP_PICK
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2¹⋅A₂₈ 2²⋅A₂₇…₀ 2²⁹
-        OP_2DUP OP_GREATERTHANOREQUAL
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2¹⋅A₂₈ 2²⋅A₂₇…₀ 2²⁹ A₂₇
-        OP_IF OP_SUB OP_SWAP OP_1ADD OP_ELSE OP_DROP OP_SWAP OP_ENDIF
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2²⋅A₂₆…₀ A₂₈…₂₇
-        for _ in 0..26 {
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2²⋅A₂₆…₀ A₂₈…₂₇
-            OP_FROMALTSTACK
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2²⋅A₂₆…₀ A₂₈…₂₇ B₂ | B₃ B₄ B₅ ⋯ B₂₆ B₂₇ B₂₈
-            OP_IF OP_2DUP OP_ELSE 0 0 OP_ENDIF
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2²⋅A₂₆…₀ A₂₈…₂₇ 2²⋅A₂₆…₀⋅B₂ A₂₈…₂₇⋅B₂
-            OP_2ROT
-            // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ 2²⋅A₂₆…₀⋅B₂ A₂₈…₂₇⋅B₂ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉
-            OP_ROT
-            // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ 2²⋅A₂₆…₀⋅B₂ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ A₂₈…₂₇⋅B₂
-            OP_ADD
-            // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ 2²⋅A₂₆…₀⋅B₂ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉
-            OP_ROT
-            // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2²⋅A₂₆…₀⋅B₂
-            OP_ROT
-            // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2²⋅A₂₆…₀⋅B₂ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀
-            OP_ADD
-            // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀+2²⋅A₂₆…₀⋅B₂
-            4 OP_PICK
-            // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀+2²⋅A₂₆…₀⋅B₂ 2²⁹
-            OP_2DUP OP_GREATERTHANOREQUAL
-            // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀+2²⋅A₂₆…₀⋅B₂ 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀+2²⋅A₂₆…₀⋅B₂≥2²⁹
-            OP_IF OP_SUB OP_SWAP OP_1ADD OP_ELSE OP_DROP OP_SWAP OP_ENDIF
-            // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉
-            OP_2SWAP
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2²⋅A₂₆…₀ A₂₈…₂₇
-            OP_DUP OP_ADD
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2²⋅A₂₆…₀ 2¹⋅A₂₈…₂₇
-            OP_SWAP
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2¹⋅A₂₈…₂₇ 2²⋅A₂₆…₀
-            OP_DUP OP_ADD
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2¹⋅A₂₈…₂₇ 2³⋅A₂₆…₀
-            4 OP_PICK
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2¹⋅A₂₈…₂₇ 2³⋅A₂₆…₀ 2²⁹
-            OP_2DUP OP_GREATERTHANOREQUAL
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2¹⋅A₂₈…₂₇ 2³⋅A₂₆…₀ 2²⁹ A₂₆
-            OP_IF OP_SUB OP_SWAP OP_1ADD OP_ELSE OP_DROP OP_SWAP OP_ENDIF
-            // 2²⁹ (2⁰⋅A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(2⁰⋅A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2³⋅A₂₅…₀ A₂₈…₂₆
-        }
-        // 2²⁹ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₂⋅B₂₇+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ 2²⁸⋅A₀ A₂₈…₁ | B₂₈
-        OP_FROMALTSTACK
-        // 2²⁹ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₂⋅B₂₇+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ 2²⁸⋅A₀ A₂₈…₁ B₂₈
-        OP_NOTIF OP_2DROP 0 0 OP_ENDIF
-        // 2²⁹ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₂⋅B₂₇+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ 2²⁸⋅A₀⋅B₂₈ A₂₈…₁⋅B₂₈
-        OP_2SWAP
-        // 2²⁹ 2²⁸⋅A₀⋅B₂₈ A₂₈…₁⋅B₂₈ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₂⋅B₂₇+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉
-        OP_ROT
-        // 2²⁹ 2²⁸⋅A₀⋅B₂₈ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₂⋅B₂₇+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ A₂₈…₁⋅B₂₈
-        OP_ADD
-        // 2²⁹ 2²⁸⋅A₀⋅B₂₈ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉
-        OP_ROT
-        // 2²⁹ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ 2²⁸⋅A₀⋅B₂₈
-        OP_ROT
-        // 2²⁹ A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ 2²⁸⋅A₀⋅B₂₈ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀
-        OP_ADD
-        // 2²⁹ A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀+2²⁸⋅A₀⋅B₂₈
-        OP_ROT
-        // A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀+2²⁸⋅A₀⋅B₂₈ 2²⁹
-        OP_2DUP OP_GREATERTHANOREQUAL
-        // A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀+2²⁸⋅A₀⋅B₂₈ 2²⁹ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀+2²⁸⋅A₀⋅B₂₈≥2²⁹
-        OP_IF OP_SUB OP_SWAP OP_1ADD OP_ELSE OP_DROP OP_SWAP OP_ENDIF
-        // (2⁰⋅A₂₈…₀⋅B₀⋯2²⁸⋅A₀⋅B₂₈)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁸⋅A₀⋅B₂₈)₅₆…₂₉
-        // OP_SWAP
-        // A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁸⋅A₀⋅B₂₈)₅₆…₂₉ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁸⋅A₀⋅B₂₈)₂₈…₀
-        // A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁸⋅A₀⋅B₂₈)₅₆…₂₉ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁸⋅A₀⋅B₂₈)₂₈…₀
-        // (A₂₈…₀ ⋅ B₂₈…₀)₅₇…₂₉ (A₂₈…₀ ⋅ B₂₈…₀)₂₈…₀
-    }
-}
-
-// (A₂₉…₀ ⋅ B₂₉…₀)₂₈…₀ (A₂₉…₀ ⋅ B₂₉…₀)₅₉…₂₉
-// A₂₉…₀ B₂₉…₀
-fn u30_mul_to_u29_carry_31() -> Script {
-    script! {
-        // A₂₉…₀ B₂₉…₀
-        { assert_nn_le(0x3FFFFFFF) } // 0≤A₂₉…₀<2³⁰
-
-        // Rearrange A₂₉…₀⋅B₂₉…₀ to A₂₈…₀⋅B₂₈…₀:
-        //  (A₂₉⋅2²⁹+A₂₈…₀)₂₉…₀ ⋅ (B₂₉⋅2²⁹+B₂₈…₀)₂₉…₀ = A₂₈…₀⋅B₂₈…₀ + A₂₈…₀⋅B₂₉⋅2²⁹ + B₂₈…₀⋅A₂₉⋅2²⁹ + A₂₉⋅B₂₉⋅2⁵⁸
-
-        // A₂₉…₀ B₂₉…₀
-        { 0x20000000 }
-        // A₂₉…₀ B₂₉…₀ 2²⁹
-        OP_TUCK
-        // A₂₉…₀ 2²⁹ B₂₉…₀ 2²⁹
-        OP_2DUP OP_GREATERTHANOREQUAL
-        // A₂₉…₀ 2²⁹ B₂₉…₀ 2²⁹ B₂₉
-        OP_DUP OP_TOALTSTACK
-        // A₂₉…₀ 2²⁹ B₂₉…₀ 2²⁹ B₂₉ | B₂₉
-        OP_IF OP_SUB OP_ELSE OP_DROP OP_ENDIF
-        // A₂₉…₀ 2²⁹ B₂₈…₀
-        OP_TOALTSTACK
-        // A₂₉…₀ 2²⁹ | B₂₈…₀ B₂₉
-        OP_TUCK
-        // 2²⁹ A₂₉…₀ 2²⁹
-        OP_2DUP OP_GREATERTHANOREQUAL
-        // 2²⁹ A₂₉…₀ 2²⁹ A₂₉
-        OP_DUP OP_TOALTSTACK
-        // 2²⁹ A₂₉…₀ 2²⁹ A₂₉ | A₂₉ B₂₈…₀ B₂₉
-        OP_IF OP_SUB OP_ELSE OP_DROP OP_ENDIF
-        // 2²⁹ A₂₈…₀
-        OP_FROMALTSTACK
-        OP_FROMALTSTACK
-        OP_FROMALTSTACK
-        // 2²⁹ A₂₈…₀ A₂₉ B₂₈…₀ B₂₉
-        2 OP_PICK
-        OP_OVER
-        // 2²⁹ A₂₈…₀ A₂₉ B₂₈…₀ B₂₉ A₂₉ B₂₉
-        OP_BOOLAND
-        OP_TOALTSTACK
-        // 2²⁹ A₂₈…₀ A₂₉ B₂₈…₀ B₂₉ | A₂₉∧B₂₉
-        OP_IF
-            // 2²⁹ A₂₈…₀ A₂₉ B₂₈…₀
-            2 OP_PICK
-            // 2²⁹ A₂₈…₀ A₂₉ B₂₈…₀ A₂₈…₀
-        OP_ELSE
-            // 2²⁹ A₂₈…₀ A₂₉ B₂₈…₀
-            0
-            // 2²⁹ A₂₈…₀ A₂₉ B₂₈…₀ 0
-        OP_ENDIF
-        // 2²⁹ A₂₈…₀ A₂₉ B₂₈…₀ B₂₉⋅A₂₈…₀
-        OP_ROT
-        // 2²⁹ A₂₈…₀ B₂₈…₀ B₂₉⋅A₂₈…₀ A₂₉
-        OP_IF
-            // 2²⁹ A₂₈…₀ B₂₈…₀ B₂₉⋅A₂₈…₀
-            OP_OVER
-            // 2²⁹ A₂₈…₀ B₂₈…₀ B₂₉⋅A₂₈…₀ B₂₈…₀
-        OP_ELSE
-            // 2²⁹ A₂₈…₀ B₂₈…₀ B₂₉⋅A₂₈…₀
-            0
-            // 2²⁹ A₂₈…₀ B₂₈…₀ B₂₉⋅A₂₈…₀ 0
-        OP_ENDIF
-        // 2²⁹ A₂₈…₀ B₂₈…₀ B₂₉⋅A₂₈…₀ A₂₉⋅B₂₈…₀
-        OP_ADD OP_TOALTSTACK
-        // 2²⁹ A₂₈…₀ B₂₈…₀ | B₂₉⋅A₂₈…₀+A₂₉⋅B₂₈…₀
-
-        // Compute A₂₈…₀ ⋅ B₂₈…₀
-        u29_mul_carry_29
-        // (A₂₉…₀ ⋅ B₂₉…₀)₂₈…₀  = (A₂₈…₀ ⋅ B₂₈…₀)₂₈…₀
-        // (A₂₉…₀ ⋅ B₂₉…₀)₅₉…₂₉ = (A₂₈…₀ ⋅ B₂₈…₀)₅₇…₂₉ + A₂₉⋅B₂₈…₀ + B₂₉⋅A₂₈…₀ + A₂₉⋅B₂₉⋅2²⁹
-
-        // 2²⁹ (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₂₉…₅₈ | B₂₉⋅A₂₈…₀+A₂₉⋅B₂₈…₀ A₂₉∧B₂₉
-        OP_FROMALTSTACK
-        // 2²⁹ (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₂₉…₅₈ B₂₉⋅A₂₈…₀+A₂₉⋅B₂₈…₀
-        OP_ADD
-        // 2²⁹ (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₂₉…₅₈+B₂₉⋅A₂₈…₀+A₂₉⋅B₂₈…₀
-        OP_ROT
-        // (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₂₉…₅₈+B₂₉⋅A₂₈…₀+A₂₉⋅B₂₈…₀ 2²⁹
-        OP_FROMALTSTACK
-        // (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₂₉…₅₈+B₂₉⋅A₂₈…₀+A₂₉⋅B₂₈…₀ 2²⁹ A₂₉∧B₂₉
-        OP_IF
-            // (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₂₉…₅₈+B₂₉⋅A₂₈…₀+A₂₉⋅B₂₈…₀ 2²⁹
-            OP_ADD
-            // (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₂₉…₅₈+B₂₉⋅A₂₈…₀+A₂₉⋅B₂₈…₀+2²⁹
-        OP_ELSE
-            // (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₂₉…₅₈+B₂₉⋅A₂₈…₀+A₂₉⋅B₂₈…₀ 2²⁹
-            OP_DROP
-            // (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₂₉…₅₈+B₂₉⋅A₂₈…₀+A₂₉⋅B₂₈…₀
-        OP_ENDIF
-        // (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₂₉…₅₈+B₂₉⋅A₂₈…₀+A₂₉⋅B₂₈…₀+A₂₉⋅B₂₉⋅2²⁹
-
-        // (A₂₉…₀ ⋅ B₂₉…₀)₂₈…₀ (A₂₉…₀ ⋅ B₂₉…₀)₅₉…₂₉
-
-    }
-}
-
-fn u29x2_sub_noborrow() -> Script {
-    script! {
-        OP_2SWAP
-        // A₂₈…₀ A₅₇…₂₉ B₂₈…₀ B₅₉…₂₉
-        OP_TOALTSTACK
-        // A₂₈…₀ A₅₇…₂₉ B₂₈…₀ | B₅₉…₂₉
-        OP_ROT
-        // A₅₇…₂₉ B₂₈…₀ A₂₈…₀
-        OP_2DUP OP_LESSTHAN
-        // A₅₇…₂₉ B₂₈…₀ A₂₈…₀ B₂₈…₀<A₂₈…₀
-        OP_ROT
-        // A₅₇…₂₉ A₂₈…₀ B₂₈…₀<A₂₈…₀ B₂₈…₀
-        OP_OVER
-        // A₅₇…₂₉ A₂₈…₀ B₂₈…₀<A₂₈…₀ B₂₈…₀ B₂₈…₀<A₂₈…₀
-        OP_IF
-            // A₅₇…₂₉ A₂₈…₀ B₂₈…₀<A₂₈…₀ B₂₈…₀
-            { 1 << 29 }
-            // A₅₇…₂₉ A₂₈…₀ B₂₈…₀<A₂₈…₀ B₂₈…₀ 2²⁹
-            OP_ADD
-            // A₅₇…₂₉ A₂₈…₀ B₂₈…₀<A₂₈…₀ B₂₈…₀+2²⁹
-        OP_ENDIF
-        // A₅₇…₂₉ A₂₈…₀ B₂₈…₀<A₂₈…₀ B₂₈…₀[+2²⁹]
-        OP_ROT
-        // A₅₇…₂₉ B₂₈…₀<A₂₈…₀ B₂₈…₀[+2²⁹] A₂₈…₀
-        OP_SUB
-        // A₅₇…₂₉ B₂₈…₀<A₂₈…₀ (B₂₈…₀-A₂₈…₀)ᵐᵒᵈ2²⁹
-        OP_FROMALTSTACK
-        // A₅₇…₂₉ B₂₈…₀<A₂₈…₀ (B₂₈…₀-A₂₈…₀)ᵐᵒᵈ2²⁹ B₅₉…₂₉
-        OP_SWAP
-        // A₅₇…₂₉ B₂₈…₀<A₂₈…₀ B₅₉…₂₉ (B₂₈…₀-A₂₈…₀)ᵐᵒᵈ2²⁹
-        OP_TOALTSTACK
-        // A₅₇…₂₉ B₂₈…₀<A₂₈…₀ B₅₉…₂₉ | (B₂₈…₀-A₂₈…₀)ᵐᵒᵈ2²⁹
-        OP_ROT
-        // B₂₈…₀<A₂₈…₀ B₅₉…₂₉ A₅₇…₂₉
-        OP_SUB
-        // B₂₈…₀<A₂₈…₀ B₅₉…₂₉-A₅₇…₂₉
-        OP_SWAP
-        // B₅₉…₂₉-A₅₇…₂₉ B₂₈…₀<A₂₈…₀
-        OP_SUB
-        // B₅₉…₂₉-A₅₇…₂₉-(B₂₈…₀<A₂₈…₀)
-        OP_FROMALTSTACK
-        // B₅₉…₂₉-A₅₇…₂₉-(B₂₈…₀<A₂₈…₀) (B₂₈…₀-A₂₈…₀)ᵐᵒᵈ2²⁹
-        OP_SWAP
-        // (B₂₈…₀-A₂₈…₀)ᵐᵒᵈ2²⁹ B₅₉…₂₉-A₅₇…₂₉-(B₂₈…₀<A₂₈…₀)
-    }
-}
-
-fn u29x2_add_u29() -> Script {
-    script! {
-        // A₂₈…₀ A₅₇…₂₉ B₂₈…₀
-        OP_ROT
-        // A₅₇…₂₉ B₂₈…₀ A₂₈…₀
-        OP_ADD
-        // A₅₇…₂₉ (B₂₈…₀+A₂₈…₀)₂₉…₀
-        { 1 << 29 }
-        // A₅₇…₂₉ (B₂₈…₀+A₂₈…₀)₂₉…₀ 2²⁹
-        OP_2DUP OP_GREATERTHANOREQUAL
-        // A₅₇…₂₉ (B₂₈…₀+A₂₈…₀)₂₉…₀ 2²⁹ (B₂₈…₀+A₂₈…₀)₂₉
-        OP_TUCK
-        // A₅₇…₂₉ (B₂₈…₀+A₂₈…₀)₂₉…₀ (B₂₈…₀+A₂₈…₀)₂₉ 2²⁹ (B₂₈…₀+A₂₈…₀)₂₉
-        OP_IF
-            // A₅₇…₂₉ (B₂₈…₀+A₂₈…₀)₂₉…₀ (B₂₈…₀+A₂₈…₀)₂₉ 2²⁹
-            OP_ROT
-            // A₅₇…₂₉ (B₂₈…₀+A₂₈…₀)₂₉ 2²⁹ (B₂₈…₀+A₂₈…₀)₂₉…₀
-            OP_SWAP
-            // A₅₇…₂₉ (B₂₈…₀+A₂₈…₀)₂₉ (B₂₈…₀+A₂₈…₀)₂₉…₀ 2²⁹
-            OP_SUB
-            // A₅₇…₂₉ (B₂₈…₀+A₂₈…₀)₂₉ (B₂₈…₀+A₂₈…₀)₂₈…₀
-            OP_SWAP
-            // A₅₇…₂₉ (B₂₈…₀+A₂₈…₀)₂₈…₀ (B₂₈…₀+A₂₈…₀)₂₉
-        OP_ELSE
-            // A₅₇…₂₉ (B₂₈…₀+A₂₈…₀)₂₈…₀ (B₂₈…₀+A₂₈…₀)₂₉ 2²⁹
-            OP_DROP
-            // A₅₇…₂₉ (B₂₈…₀+A₂₈…₀)₂₈…₀ (B₂₈…₀+A₂₈…₀)₂₉
-        OP_ENDIF
-        // A₅₇…₂₉ (B₂₈…₀+A₂₈…₀)₂₈…₀ (B₂₈…₀+A₂₈…₀)₂₉
-        OP_ROT
-        // (B₂₈…₀+A₂₈…₀)₂₈…₀ (B₂₈…₀+A₂₈…₀)₂₉ A₅₇…₂₉
-        OP_ADD
-        // (B₂₈…₀+A₂₈…₀)₂₈…₀ A₅₇…₂₉+(B₂₈…₀+A₂₈…₀)₂₉
-    }
-}
-
-// A₀ A₁ A₂ B₀ B₁
-fn u29x3_add_u29x2_nocarry() -> Script {
-    script! {
-        // A₀ A₁ A₂ B₀ B₁
-        OP_ROT OP_TOALTSTACK OP_TOALTSTACK
-        // A₀ A₁ B₀ | B₁ A₂
-        { u29x2_add_u29() }
-        // (A+B₀)₀ (A+B₀)₁ | B₁ A₂
-        OP_FROMALTSTACK OP_FROMALTSTACK OP_SWAP
-        // (A+B₀)₀ (A+B₀)₁ A₂ B₁
-        { u29x2_add_u29() }
-        // (A+B)₀ (A+B)₁ (A+B)₂
-    }
-}
-
-fn u29x2_add_u29u30_carry() -> Script {
-    script! {
-        // ⋯ (A₀⋅B₀)₅₇…₂₉ (A₁⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉
-        { 1 << 29 } OP_2DUP OP_GREATERTHANOREQUAL
-        // ⋯ (A₀⋅B₀)₅₇…₂₉ (A₁⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ 2²⁹ (A₁⋅B₀+A₀⋅B₁)₅₈
-        OP_IF OP_SUB 1 OP_ELSE OP_DROP 0 OP_ENDIF
-        // ⋯ (A₀⋅B₀)₅₇…₂₉ (A₁⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₇…₂₉ (A₁⋅B₀+A₀⋅B₁)₅₈
-        4 OP_ROLL
-        // ⋯ (A₁⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₇…₂₉ (A₁⋅B₀+A₀⋅B₁)₅₈ (A₀⋅B₀)₅₇…₂₉
-        4 OP_ROLL
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₇…₂₉ (A₁⋅B₀+A₀⋅B₁)₅₈ (A₀⋅B₀)₅₇…₂₉ (A₁⋅B₁)₂₈…₀
-        { u29x3_add_u29x2_nocarry() }
-    }
-}
-
-fn op_pick(n: i32) -> Script {
-    if n == 0 {
-        return script!{
-            OP_DUP
-        };
-    }
-    if n == 1 {
-        return script!{
-            OP_OVER
-        };
-    }
-    script!{
-        { n }
-        OP_PICK
-    }
-}
-
-fn op_roll(n: i32) -> Script {
-    if n == 0 {
-        return script!{};
-    }
-    if n == 1 {
-        return script!{
-            OP_SWAP
-        };
-    }
-    if n == 2{
-        return script! {
-            OP_ROT
-        };
-    }
-    script!{
-        { n }
-        OP_ROLL
-    }
-}
-
-fn upd_val( a: &mut i32, b: i32) -> Script { 
-    *a += b;
-    script!{}
-}
-
-// (A₀⋅B₀)₂₈…₀
-
-// (A₀⋅B₀)₅₇…₂₉ +
-// (A₁⋅B₀+A₀⋅B₁)₂₈…₀
-
-// (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ +
-// (A₁⋅B₁)₂₈…₀ + (A₂⋅B₀+A₀⋅B₂)₂₈…₀
-
-// (A₁⋅B₁)₅₇…₂₉ + (A₂⋅B₀+A₀⋅B₂)₅₈…₂₉ +
-// (A₃⋅B₀+A₀⋅B₃)₂₈…₀ + (A₂⋅B₁+A₁⋅B₂)₂₈…₀
-
-// (A₃⋅B₀+A₀⋅B₃)₅₈…₂₉ + (A₂⋅B₁+A₁⋅B₂)₅₈…₂₉ +
-// (A₂⋅B₂)₂₈…₀ + (A₄⋅B₀+A₀⋅B₄)₂₈…₀ + (A₃⋅B₁+A₁⋅B₃)₂₈…₀
-
-// (A₂⋅B₂)₅₇…₂₉ + (A₄⋅B₀+A₀⋅B₄)₅₈…₂₉ + (A₃⋅B₁+A₁⋅B₃)₅₈…₂₉ +
-// (A₅⋅B₀+A₀⋅B₅)₂₈…₀ + (A₄⋅B₁+A₁⋅B₄)₂₈…₀ + (A₃⋅B₂+A₂⋅B₃)₂₈…₀
-
-// (A₅⋅B₀+A₀⋅B₅)₅₈…₂₉ + (A₄⋅B₁+A₁⋅B₄)₅₈…₂₉ + (A₃⋅B₂+A₂⋅B₃)₅₈…₂₉ +
-// (A₃⋅B₃)₂₈…₀ + (A₆⋅B₀+A₀⋅B₆)₂₈…₀ + (A₅⋅B₁+A₁⋅B₅)₂₈…₀ + (A₄⋅B₂+A₂⋅B₄)₂₈…₀
-
-// (A₃⋅B₃)₅₇…₂₉ + (A₆⋅B₀+A₀⋅B₆)₅₈…₂₉ + (A₅⋅B₁+A₁⋅B₅)₅₈…₂₉ + (A₄⋅B₂+A₂⋅B₄)₅₈…₂₉ +
-// (A₇⋅B₀+A₀⋅B₇)₂₈…₀ + (A₆⋅B₁+A₁⋅B₆)₂₈…₀ + (A₅⋅B₂+A₂⋅B₅)₂₈…₀ + (A₄⋅B₃+A₃⋅B₄)₂₈…₀
-
-// (A₇⋅B₀+A₀⋅B₇)₅₈…₂₉ + (A₆⋅B₁+A₁⋅B₆)₅₈…₂₉ + (A₅⋅B₂+A₂⋅B₅)₅₈…₂₉ + (A₄⋅B₃+A₃⋅B₄)₅₈…₂₉ +
-// (A₄⋅B₄)₂₈…₀ + (A₈⋅B₀+A₀⋅B₈)₂₈…₀ + (A₇⋅B₁+A₁⋅B₇)₂₈…₀ + (A₆⋅B₂+A₂⋅B₆)₂₈…₀ + (A₅⋅B₃+A₃⋅B₅)₂₈…₀
-
-// (A₄⋅B₄)₅₇…₂₉ + (A₈⋅B₀+A₀⋅B₈)₅₈…₂₉ + (A₇⋅B₁+A₁⋅B₇)₅₈…₂₉ + (A₆⋅B₂+A₂⋅B₆)₅₈…₂₉ + (A₅⋅B₃+A₃⋅B₅)₅₈…₂₉ +
-// (A₈⋅B₁+A₁⋅B₈)₂₈…₀ + (A₇⋅B₂+A₂⋅B₇)₂₈…₀ + (A₆⋅B₃+A₃⋅B₆)₂₈…₀ + (A₅⋅B₄+A₄⋅B₅)₂₈…₀
-
-// (A₈⋅B₁+A₁⋅B₈)₅₈…₂₉ + (A₇⋅B₂+A₂⋅B₇)₅₈…₂₉ + (A₆⋅B₃+A₃⋅B₆)₅₈…₂₉ + (A₅⋅B₄+A₄⋅B₅)₅₈…₂₉ +
-// (A₅⋅B₅)₂₈…₀ + (A₈⋅B₂+A₂⋅B₈)₂₈…₀ + (A₇⋅B₃+A₃⋅B₇)₂₈…₀ + (A₆⋅B₄+A₄⋅B₆)₂₈…₀
-
-// (A₅⋅B₅)₅₇…₂₉ + (A₈⋅B₂+A₂⋅B₈)₅₈…₂₉ + (A₇⋅B₃+A₃⋅B₇)₅₈…₂₉ + (A₆⋅B₄+A₄⋅B₆)₅₈…₂₉ +
-// (A₈⋅B₃+A₃⋅B₈)₂₈…₀ + (A₇⋅B₄+A₄⋅B₇)₂₈…₀ + (A₆⋅B₅+A₅⋅B₆)₂₈…₀
-
-// (A₈⋅B₃+A₃⋅B₈)₅₈…₂₉ + (A₇⋅B₄+A₄⋅B₇)₅₈…₂₉ + (A₆⋅B₅+A₅⋅B₆)₅₈…₂₉ +
-// (A₆⋅B₆)₂₈…₀ + (A₇⋅B₅+A₅⋅B₇)₂₈…₀ + (A₈⋅B₄+A₄⋅B₈)₂₈…₀
-
-// (A₆⋅B₆)₅₇…₂₉ + (A₇⋅B₅+A₅⋅B₇)₅₈…₂₉ + (A₈⋅B₄+A₄⋅B₈)₅₈…₂₉ +
-// (A₈⋅B₅+A₅⋅B₈)₂₈…₀ + (A₇⋅B₆+A₆⋅B₇)₂₈…₀
-
-// (A₈⋅B₅+A₅⋅B₈)₅₈…₂₉ + (A₇⋅B₆+A₆⋅B₇)₅₈…₂₉ +
-// (A₇⋅B₇)₂₈…₀ + (A₈⋅B₆+A₆⋅B₈)₂₈…₀
-
-// (A₇⋅B₇)₅₇…₂₉ + (A₈⋅B₆+A₆⋅B₈)₅₈…₂₉ +
-// (A₈⋅B₇+A₇⋅B₈)₂₈…₀
-
-// (A₈⋅B₇+A₇⋅B₈)₅₈…₂₉ +
-// (A₈⋅B₈)₂₈…₀
-
-// (A₈⋅B₈)₅₇…₂₉
-
-//                       A₈⋅B₈
-//                    A₈⋅B₇+A₇⋅B₈
-//                 A₈⋅B₆+A₇⋅B₇+A₆⋅B₈
-//              A₈⋅B₅+A₇⋅B₆+A₆⋅B₇+A₅⋅B₈
-//            A₈⋅B₄+A₇⋅B₅+A₆⋅B₆+A₅⋅B₇+A₄⋅B₈
-//         A₈⋅B₃+A₇⋅B₄+A₆⋅B₅+A₅⋅B₆+A₄⋅B₇+A₃⋅B₈
-//       A₈⋅B₂+A₇⋅B₃+A₆⋅B₄+A₅⋅B₅+A₄⋅B₆+A₃⋅B₇+A₂⋅B₈
-//    A₈⋅B₁+A₇⋅B₂+A₆⋅B₃+A₅⋅B₄+A₄⋅B₅+A₃⋅B₆+A₂⋅B₇+A₁⋅B₈
-// A₈⋅B₀+A₇⋅B₁+A₆⋅B₂+A₅⋅B₃+A₄⋅B₄+A₃⋅B₅+A₂⋅B₆+A₁⋅B₇+A₀⋅B₈
-//    A₇⋅B₀+A₆⋅B₁+A₅⋅B₂+A₄⋅B₃+A₃⋅B₄+A₂⋅B₅+A₁⋅B₆+A₀⋅B₇
-//       A₆⋅B₀+A₅⋅B₁+A₄⋅B₂+A₃⋅B₃+A₂⋅B₄+A₁⋅B₅+A₀⋅B₆
-//         A₅⋅B₀+A₄⋅B₁+A₃⋅B₂+A₂⋅B₃+A₁⋅B₄+A₀⋅B₅
-//            A₄⋅B₀+A₃⋅B₁+A₂⋅B₂+A₁⋅B₃+A₀⋅B₄
-//               A₃⋅B₀+A₂⋅B₁+A₁⋅B₂+A₀⋅B₃
-//                  A₂⋅B₀+A₁⋅B₁+A₀⋅B₂
-//                     A₁⋅B₀+A₀⋅B₁
-//                        A₀⋅B₀
-
-pub fn u29x9_mul_karazuba(a: u32, b: u32) -> Script {
-    let mut cnt = 0;
-    let mut cnt2 = 70;
-    script! {
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ ⋯ B₈ B₇ B₆ B₅ B₄ B₃ B₂ B₁ B₀ ⋯
-        { U254::zip(a, b) }
-        // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ A₀ B₀
-
-        for sum in 1..16 {
-            for i in (sum/2+1..min(sum + 1, 9)).rev() {
-                { op_pick(2 * i) } { op_pick(2 * (sum - i) + 1) } OP_ADD OP_TOALTSTACK
-                { op_pick(2 * i + 1) } { op_pick(2 * (sum - i) + 2) } OP_ADD OP_TOALTSTACK
-            }
-        }
-        // Stack: [A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ A₀ B₀] 
-        // Altstack: [A₁₊₀ B₁₊₀ A₂₊₀ B₂₊₀ A₃₊₀ B₃₊₀ A₂₊₁ B₂₊₁ A₄₊₀ B₄₊₀ A₃₊₁ B₃₊₁ A₅₊₀ B₅₊₀ A₄₊₁ B₄₊₁ A₃₊₂ B₃₊₂ A₆₊₀ B₆₊₀ A₅₊₁ B₅₊₁
-        //            A₄₊₂ B₄₊₂ A₇₊₀ B₇₊₀ A₆₊₁ B₆₊₁ A₅₊₂ B₅₊₂ A₄₊₃ B₄₊₃ A₈₊₀ B₈₊₀ A₇₊₁ B₇₊₁ A₆₊₂ B₆₊₂ A₅₊₃ B₅₊₃ A₈₊₁ B₈₊₁ A₇₊₂ B₇₊₂ 
-        //            A₆₊₃ B₆₊₃ A₅₊₄ B₅₊₄ A₈₊₂ B₈₊₂ A₇₊₃ B₇₊₃ A₆₊₄ B₆₊₄ A₈₊₃ B₈₊₃ A₇₊₄ B₇₊₄ A₆₊₅ B₆₊₅ A₈₊₄ B₈₊₄ A₇₊₅ B₇₊₅ A₈₊₅ B₈₊₅ 
-        //            A₇₊₆ B₇₊₆ A₈₊₆ B₈₊₆ A₈₊₇ B₈₊₇] Note: Aᵢ₊ⱼ and Bᵢ₊ⱼ are both 30-bit stack elements, also i > j.
-
-        for _ in 0..9 {
-            17 OP_ROLL
-            17 OP_ROLL
-            u29_mul_carry_29
-            OP_SWAP
-        }
-        // Stack: [A₀⋅B₀ A₁⋅B₁ A₂⋅B₂ A₃⋅B₃ A₄⋅B₄ A₅⋅B₅ A₆⋅B₆ A₇⋅B₇ A₈⋅B₈] Note: Aᵢ⋅Bᵢ is 2 29-bit stack elements
-        // Altstack: [A₁₊₀ B₁₊₀ A₂₊₀ B₂₊₀ A₃₊₀ B₃₊₀ A₂₊₁ B₂₊₁ A₄₊₀ B₄₊₀ A₃₊₁ B₃₊₁ A₅₊₀ B₅₊₀ A₄₊₁ B₄₊₁ A₃₊₂ B₃₊₂ A₆₊₀ B₆₊₀ A₅₊₁ B₅₊₁
-        //            A₄₊₂ B₄₊₂ A₇₊₀ B₇₊₀ A₆₊₁ B₆₊₁ A₅₊₂ B₅₊₂ A₄₊₃ B₄₊₃ A₈₊₀ B₈₊₀ A₇₊₁ B₇₊₁ A₆₊₂ B₆₊₂ A₅₊₃ B₅₊₃ A₈₊₁ B₈₊₁ A₇₊₂ B₇₊₂ 
-        //            A₆₊₃ B₆₊₃ A₅₊₄ B₅₊₄ A₈₊₂ B₈₊₂ A₇₊₃ B₇₊₃ A₆₊₄ B₆₊₄ A₈₊₃ B₈₊₃ A₇₊₄ B₇₊₄ A₆₊₅ B₆₊₅ A₈₊₄ B₈₊₄ A₇₊₅ B₇₊₅ A₈₊₅ B₈₊₅ 
-        //            A₇₊₆ B₇₊₆ A₈₊₆ B₈₊₆ A₈₊₇ B₈₊₇]
-
-
-        // This part calculates Aᵢ⋅Bⱼ+Aⱼ⋅Bᵢ by using the fact that Aᵢ⋅Bⱼ+Aⱼ⋅Bᵢ <=> Aᵢ₊ⱼ⋅Bᵢ₊ⱼ - Aᵢ⋅Bᵢ - Aⱼ⋅Bⱼ.
-        for sum in (1..16).rev() {
-            for i in sum/2+1..min(sum + 1, 9) {
-                { upd_val(&mut cnt, 2) }
-                OP_FROMALTSTACK OP_FROMALTSTACK u30_mul_to_u29_carry_31
-                { op_pick(2*i + cnt) } { op_pick(2*i + cnt + 2) } u29x2_sub_noborrow
-                { op_pick(2*(sum-i) + cnt) } { op_pick(2*(sum-i) + cnt + 2) } u29x2_sub_noborrow
-            }
-        }
-        // Stack: [A₀⋅B₀ A₁⋅B₁ A₂⋅B₂ A₃⋅B₃ A₄⋅B₄ A₅⋅B₅ A₆⋅B₆ A₇⋅B₇ A₈⋅B₈ A₈⋅B₇+A₇⋅B₈ A₈⋅B₆+A₆⋅B₈ A₇⋅B₆+A₆⋅B₇ A₈⋅B₅+A₅⋅B₈ A₇⋅B₅+A₅⋅B₇ A₈⋅B₄+A₄⋅B₈
-        //         A₆⋅B₅+A₅⋅B₆ A₇⋅B₄+A₄⋅B₇ A₈⋅B₃+A₃⋅B₈ A₆⋅B₄+A₄⋅B₆ A₇⋅B₃+A₃⋅B₇ A₈⋅B₂+A₂⋅B₈ A₅⋅B₄+A₄⋅B₅ A₆⋅B₃+A₃⋅B₆ A₇⋅B₂+A₂⋅B₇ A₈⋅B₁+A₁⋅B₈ A₅⋅B₃+A₃⋅B₅
-        //         A₆⋅B₂+A₂⋅B₆ A₇⋅B₁+A₁⋅B₇ A₈⋅B₀+A₀⋅B₈ A₄⋅B₃+A₃⋅B₄ A₅⋅B₂+A₂⋅B₅ A₆⋅B₁+A₁⋅B₆ A₇⋅B₀+A₀⋅B₇ A₄⋅B₂+A₂⋅B₄ A₅⋅B₁+A₁⋅B₅ A₆⋅B₀+A₀⋅B₆ A₃⋅B₂+A₂⋅B₃
-        //         A₄⋅B₁+A₁⋅B₄ A₅⋅B₀+A₀⋅B₅ A₃⋅B₁+A₁⋅B₃ A₄⋅B₀+A₀⋅B₄ A₂⋅B₁+A₁⋅B₂ A₃⋅B₀+A₀⋅B₃ A₂⋅B₀+A₀⋅B₂ A₁⋅B₀+A₀⋅B₁] 
-        //         Note: Aᵢ⋅Bⱼ+Aⱼ⋅Bᵢ is 1 29-bit and 1 30-bit stack elements, also i > j.
-        // Altstack: []
-
-
-        // Below part creates the final result (A⋅B).
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉
-        72 OP_ROLL OP_TOALTSTACK
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ | (A⋅B)₀
-        72 OP_ROLL
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ (A₀⋅B₀)₅₇…₂₉
-
-        // (2²⁹⋅(A₁⋅B₁)₂₈…₀+(A₀⋅B₀)₅₇…₂₉)₅₇…₀ + (A₁⋅B₀+A₀⋅B₁)₅₈…₀
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ (A₀⋅B₀)₅₇…₂₉
-        73 OP_ROLL
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ (A₀⋅B₀)₅₇…₂₉ (A₁⋅B₁)₂₈…₀
-        OP_2SWAP
-        // ⋯ (A₀⋅B₀)₅₇…₂₉ (A₁⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉
-        u29x2_add_u29u30_carry
-        // (2²⁹⋅(A₁⋅B₁)₂₈…₀+(A₀⋅B₀)₅₇…₂₉)₅₇…₀ + (A₁⋅B₀+A₀⋅B₁)₅₈…₀  <=>  TEMP₁
-        // ⋯ (A⋅B)₁ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈
-        OP_ROT OP_TOALTSTACK
-        // ⋯ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈ | (A⋅B)₁ (A⋅B)₀
-
-        // (2²⁹⋅(A₁⋅B₁)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₂⋅B₀+A₀⋅B₂)₅₈…₀
-        // ⋯ (A₂⋅B₀+A₀⋅B₂)₂₈…₀ (A₂⋅B₀+A₀⋅B₂)₅₈…₂₉ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈
-        OP_2SWAP
-        // ⋯ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈ (A₂⋅B₀+A₀⋅B₂)₂₈…₀ (A₂⋅B₀+A₀⋅B₂)₅₈…₂₉
-        u29x2_add_u29u30_carry
-        // ⋯ (TEMP₁)₂₈…₀ (TEMP₁)₅₇…₂₉ (TEMP₁)₅₉…₅₈
-        OP_ROT OP_TOALTSTACK
-
-        for sum in 3..16 {
-            { op_roll(cnt2) }
-            u29x2_add_u29
-            OP_2SWAP u29x2_add_u29u30_carry OP_TOALTSTACK
-            { upd_val(&mut cnt2, -2) } 
-            for _ in sum/2+2..min(sum + 1, 9) {
-                OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-                { upd_val(&mut cnt2, -2) }
-            }
-            OP_FROMALTSTACK
-            OP_ROT OP_TOALTSTACK
-        }
-
-        OP_ROT
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₈⋅B₈)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀
-        OP_SWAP OP_TOALTSTACK
-
-        // (⋯)₅₈…₂₉
-        OP_ADD
-        for _ in 1..18 {
-            OP_FROMALTSTACK
-        }
-        // Stack: [(A⋅B)₁₇ (A⋅B)₁₆ (A⋅B)₁₅ (A⋅B)₁₄ (A⋅B)₁₃ (A⋅B)₁₂ (A⋅B)₁₁ (A⋅B)₁₀ (A⋅B)₉ (A⋅B)₈ (A⋅B)₇ (A⋅B)₆ (A⋅B)₅ (A⋅B)₄ (A⋅B)₃ (A⋅B)₂ (A⋅B)₁ (A⋅B)₀]
-        // Altstack: []
-    }
-}
-
-fn u29x2_double_to_u29_carry_30() -> Script {
-    script! {
-        // A₂₈…₀ A₅₇…₂₉
-        OP_DUP OP_ADD
-        // A₂₈…₀ 2⋅A₅₇…₂₉
-        OP_SWAP
-        // 2⋅A₅₇…₂₉ A₂₈…₀
-        OP_DUP OP_ADD
-        // 2⋅A₅₇…₂₉ 2⋅A₂₈…₀
-        { 0x20000000 }
-        // 2⋅A₅₇…₂₉ 2⋅A₂₈…₀ 2²⁹
-        OP_2DUP OP_GREATERTHANOREQUAL
-        // 2⋅A₅₇…₂₉ 2⋅A₂₈…₀ 2²⁹ 2⋅A₂₈…₀≥2²⁹
-        OP_IF
-            // 2⋅A₅₇…₂₉ 2⋅A₂₈…₀ 2²⁹
-            OP_SUB
-            // 2⋅A₅₇…₂₉ 2⋅A₂₇…₀
-            OP_SWAP
-            // 2⋅A₂₇…₀ 2⋅A₅₇…₂₉
-            OP_1ADD
-            // 2⋅A₂₇…₀ 2⋅A₅₇…₂₉+A₂₈
-        OP_ELSE
-            // 2⋅A₅₇…₂₉ 2⋅A₂₇…₀ 2²⁹
-            OP_DROP
-            // 2⋅A₅₇…₂₉ 2⋅A₂₇…₀
-            OP_SWAP
-            // 2⋅A₂₇…₀ 2⋅A₅₇…₂₉
-        OP_ENDIF
-        // 2⋅A₂₈…₀ᵐᵒᵈ2²⁹ 2⋅A₅₇…₂₉+A₂₈
-    }
-}
-
-//                 A₈²
-//               2⋅A₈⋅A₇
-//             2⋅A₈⋅A₆+A₇²
-//           2⋅A₈⋅A₅+2⋅A₇⋅A₆
-//         2⋅A₈⋅A₄+2⋅A₇⋅A₅+A₆²
-//       2⋅A₈⋅A₃+2⋅A₇⋅A₄+2⋅A₆⋅A₅
-//     2⋅A₈⋅A₂+2⋅A₇⋅A₃+2⋅A₆⋅A₄+A₅²
-//   2⋅A₈⋅A₁+2⋅A₇⋅A₂+2⋅A₆⋅A₃+2⋅A₅⋅A₄
-// 2⋅A₈⋅A₀+2⋅A₇⋅A₁+2⋅A₆⋅A₂+2⋅A₅⋅A₃+A₄²
-//   2⋅A₇⋅A₀+2⋅A₆⋅A₁+2⋅A₅⋅A₂+2⋅A₄⋅A₃
-//     2⋅A₆⋅A₀+2⋅A₅⋅A₁+2⋅A₄⋅A₂+A₃²
-//       2⋅A₅⋅A₀+2⋅A₄⋅A₁+2⋅A₃⋅A₂
-//         2⋅A₄⋅A₀+2⋅A₃⋅A₁+A₂²
-//           2⋅A₃⋅A₀+2⋅A₂⋅A₁
-//             2⋅A₂⋅A₀+A₁²
-//               2⋅A₁⋅A₀
-//                 A₀²
-
-pub fn u29x9_square(a: u32) -> Script {
-    script! {
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ ⋯
-        { U254::roll(a) }
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀
-        // A₁ A₀
-        OP_2DUP OP_TOALTSTACK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₁ A₀ ⋯
-        // A₂ A₀
-        OP_DUP OP_TOALTSTACK 2 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₂ A₀ ⋯
-        // A₃ A₀
-        OP_DUP OP_TOALTSTACK 3 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₃ A₀ ⋯
-        // A₂ A₁
-        OP_OVER OP_TOALTSTACK 2 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₂ A₁ A₃ A₀ ⋯
-        // A₄ A₀
-        OP_DUP OP_TOALTSTACK 4 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₄ A₀ ⋯
-        // A₃ A₁
-        OP_OVER OP_TOALTSTACK 3 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₃ A₁ A₄ A₀ ⋯
-        // A₅ A₀
-        OP_DUP OP_TOALTSTACK 5 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₅ A₀ ⋯
-        // A₄ A₁
-        OP_OVER OP_TOALTSTACK 4 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₄ A₁ A₅ A₀ ⋯
-        // A₃ A₂
-        OP_2OVER OP_TOALTSTACK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₃ A₂ A₄ A₁ A₅ A₀ ⋯
-        // A₆ A₀
-        OP_DUP OP_TOALTSTACK 6 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₆ A₀ ⋯
-        // A₅ A₁
-        OP_OVER OP_TOALTSTACK 5 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₅ A₁ A₆ A₀ ⋯
-        // A₄ A₂
-        2 OP_PICK OP_TOALTSTACK 4 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₄ A₂ A₅ A₁ A₆ A₀ ⋯
-        // A₇ A₀
-        OP_DUP OP_TOALTSTACK 7 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₇ A₀ ⋯
-        // A₆ A₁
-        OP_OVER OP_TOALTSTACK 6 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₆ A₁ A₇ A₀ ⋯
-        // A₅ A₂
-        2 OP_PICK OP_TOALTSTACK 5 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₅ A₂ A₆ A₁ A₇ A₀ ⋯
-        // A₄ A₃
-        3 OP_PICK OP_TOALTSTACK 4 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₄ A₃ A₅ A₂ A₆ A₁ A₇ A₀ ⋯
-        // A₈ A₀
-        OP_DUP OP_TOALTSTACK 8 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₈ A₀ ⋯
-        // A₇ A₁
-        OP_OVER OP_TOALTSTACK 7 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₇ A₁ A₈ A₀ ⋯
-        // A₆ A₂
-        2 OP_PICK OP_TOALTSTACK 6 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₆ A₂ A₇ A₁ A₈ A₀ ⋯
-        // A₅ A₃
-        3 OP_PICK OP_TOALTSTACK 5 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₅ A₃ A₆ A₂ A₇ A₁ A₈ A₀ ⋯
-        // A₈ A₁
-        OP_OVER OP_TOALTSTACK 8 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₈ A₁ ⋯
-        // A₇ A₂
-        2 OP_PICK OP_TOALTSTACK 7 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₇ A₂ A₈ A₁ ⋯
-        // A₆ A₃
-        3 OP_PICK OP_TOALTSTACK 6 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₆ A₃ A₇ A₂ A₈ A₁ ⋯
-        // A₅ A₄
-        4 OP_PICK OP_TOALTSTACK 5 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₅ A₄ A₆ A₃ A₇ A₂ A₈ A₁ ⋯
-        // A₈ A₂
-        2 OP_PICK OP_TOALTSTACK 8 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₈ A₂ ⋯
-        // A₇ A₃
-        3 OP_PICK OP_TOALTSTACK 7 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₇ A₃ A₈ A₂ ⋯
-        // A₆ A₄
-        4 OP_PICK OP_TOALTSTACK 6 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₆A₄ A₇ A₃ A₈ A₂ ⋯
-        // A₈ A₃
-        3 OP_PICK OP_TOALTSTACK 8 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₈ A₃ ⋯
-        // A₇ A₄
-        4 OP_PICK OP_TOALTSTACK 7 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₇ A₄ A₈ A₃ ⋯
-        // A₆ A₅
-        5 OP_PICK OP_TOALTSTACK 6 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₆A₅ A₇ A₄ A₈ A₃ ⋯
-        // A₈ A₄
-        4 OP_PICK OP_TOALTSTACK 8 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₈ A₄ ⋯
-        // A₇ A₅
-        5 OP_PICK OP_TOALTSTACK 7 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₇A₅ A₈ A₄ ⋯
-        // A₈ A₅
-        5 OP_PICK OP_TOALTSTACK 8 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₈ A₅ ⋯
-        // A₇ A₆
-        6 OP_PICK OP_TOALTSTACK 7 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₇ A₆ A₈ A₅ ⋯
-        // A₈ A₆
-        6 OP_PICK OP_TOALTSTACK 8 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₈ A₆ ⋯
-        // A₈ A₇
-        7 OP_PICK OP_TOALTSTACK 8 OP_PICK OP_TOALTSTACK
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ | A₈ A₇ ⋯
-
-        for i in 0..9 {
-            { 8 + i } OP_ROLL
-            // ⋯ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ A₈
-            OP_DUP u29_mul_carry_29
-            // ⋯ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ A₈²
-            OP_SWAP
-            // ⋯ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ A₈²
-        }
-        // ⋯ A₈² A₇² A₆² A₅² A₄² A₃² A₂² A₁² A₀²
-        
-        // ⋯ | A₈ A₇ A₈ A₆ ⋯
-        // 2⋅A₈⋅A₇  <=>  A₈⋅A₇ + A₇⋅A₈
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₈⋅A₇ | A₈ A₆ ⋯
-
-        // ⋯ (A₈⋅A₇+A₇⋅A₈)₂₈…₀ (A₈⋅A₇+A₇⋅A₈)₅₈…₂₉ | A₈ A₆ ⋯
-        // 2⋅A₈⋅A₆  <=>  A₈⋅A₆ + A₆⋅A₈
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₈⋅A₆ | A₇ A₆ A₈ A₅ ⋯
-
-        // ⋯ (A₈⋅A₆+A₆⋅A₈)₂₈…₀ (A₈⋅A₆+A₆⋅A₈)₅₈…₂₉ | A₇ A₆ ⋯
-        // 2⋅A₇⋅A₆  <=>  A₇⋅A₆ + A₆⋅A₇
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₇⋅A₆ | A₈ A₅ ⋯
-
-        // ⋯ (A₇⋅A₆+A₆⋅A₇)₂₈…₀ (A₇⋅A₆+A₆⋅A₇)₅₈…₂₉ | A₈ A₅ ⋯
-        // 2⋅A₈⋅A₅  <=>  A₈⋅A₅ + A₅⋅A₈
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₇⋅A₆ 2⋅A₈⋅A₅ | A₇A₅ A₈ A₄ ⋯
-
-        // ⋯ (A₈⋅A₅+A₅⋅A₈)₂₈…₀ (A₈⋅A₅+A₅⋅A₈)₅₈…₂₉ | A₇ A₅ ⋯
-        // 2⋅A₇⋅A₅  <=>  A₇⋅A₅ + A₅⋅A₇
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₇⋅A₅ | A₈ A₄ ⋯
-
-        // ⋯ (A₇⋅A₅+A₅⋅A₇)₂₈…₀ (A₇⋅A₅+A₅⋅A₇)₅₈…₂₉ | A₈ A₄ ⋯
-        // 2⋅A₈⋅A₄  <=>  A₈⋅A₄ + A₄⋅A₈
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₇⋅A₅ 2⋅A₈⋅A₄ | A₆A₅ A₇ A₄ A₈ A₃ ⋯
-
-        // ⋯ (A₈⋅A₄+A₄⋅A₈)₂₈…₀ (A₈⋅A₄+A₄⋅A₈)₅₈…₂₉ | A₆ A₅ ⋯
-        // 2⋅A₆⋅A₅  <=>  A₆⋅A₅ + A₅⋅A₆
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₆⋅A₅ | A₇ A₄ A₈ A₃ ⋯
-
-        // ⋯ (A₆⋅A₅+A₅⋅A₆)₂₈…₀ (A₆⋅A₅+A₅⋅A₆)₅₈…₂₉ | A₇ A₄ ⋯
-        // 2⋅A₇⋅A₄  <=>  A₇⋅A₄ + A₄⋅A₇
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₆⋅A₅ 2⋅A₇⋅A₄ | A₈ A₃ ⋯
-
-        // ⋯ (A₇⋅A₄+A₄⋅A₇)₂₈…₀ (A₇⋅A₄+A₄⋅A₇)₅₈…₂₉ | A₈ A₃ ⋯
-        // 2⋅A₈⋅A₃  <=>  A₈⋅A₃ + A₃⋅A₈
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₆⋅A₅ 2⋅A₇⋅A₄ 2⋅A₈⋅A₃ | A₆A₄ A₇ A₃ A₈ A₂ ⋯
-
-        // ⋯ (A₈⋅A₃+A₃⋅A₈)₂₈…₀ (A₈⋅A₃+A₃⋅A₈)₅₈…₂₉ | A₆ A₄ ⋯
-        // 2⋅A₆⋅A₄  <=>  A₆⋅A₄ + A₄⋅A₆
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₆⋅A₄ | A₇ A₃ A₈ A₂ ⋯
-
-        // ⋯ (A₆⋅A₄+A₄⋅A₆)₂₈…₀ (A₆⋅A₄+A₄⋅A₆)₅₈…₂₉ | A₇ A₃ ⋯
-        // 2⋅A₇⋅A₃  <=>  A₇⋅A₃ + A₃⋅A₇
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₆⋅A₄ 2⋅A₇⋅A₃ | A₈ A₂ ⋯
-
-        // ⋯ (A₇⋅A₃+A₃⋅A₇)₂₈…₀ (A₇⋅A₃+A₃⋅A₇)₅₈…₂₉ | A₈ A₂ ⋯
-        // 2⋅A₈⋅A₂  <=>  A₈⋅A₂ + A₂⋅A₈
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₆⋅A₄ 2⋅A₇⋅A₃ 2⋅A₈A₂ | A₅ A₄ A₆ A₃ A₇ A₂ A₈ A₁ ⋯
-
-        // ⋯ (A₈⋅A₂+A₂⋅A₈)₂₈…₀ (A₈⋅A₂+A₂⋅A₈)₅₈…₂₉ | A₅ A₄ ⋯
-        // 2⋅A₅⋅A₄  <=>  A₅⋅A₄ + A₄⋅A₅
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₅⋅A₄ | A₆ A₃ A₇ A₂ A₈ A₁ ⋯
-
-        // ⋯ (A₅⋅A₄+A₄⋅A₅)₂₈…₀ (A₅⋅A₄+A₄⋅A₅)₅₈…₂₉ | A₆ A₃ ⋯
-        // 2⋅A₆⋅A₃  <=>  A₆⋅A₃ + A₃⋅A₆
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₅⋅A₄ 2⋅A₆⋅A₃ | A₇ A₂ A₈ A₁ ⋯
-
-        // ⋯ (A₆⋅A₃+A₃⋅A₆)₂₈…₀ (A₆⋅A₃+A₃⋅A₆)₅₈…₂₉ | A₇ A₂ ⋯
-        // 2⋅A₇⋅A₂  <=>  A₇⋅A₂ + A₂⋅A₇
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₅⋅A₄ 2⋅A₆⋅A₃ 2⋅A₇⋅A₂ | A₈ A₁ ⋯
-
-        // ⋯ (A₇⋅A₂+A₂⋅A₇)₂₈…₀ (A₇⋅A₂+A₂⋅A₇)₅₈…₂₉ | A₈ A₁ ⋯
-        // 2⋅A₈⋅A₁  <=>  A₈⋅A₁ + A₁⋅A₈
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₅⋅A₄ 2⋅A₆⋅A₃ 2⋅A₇⋅A₂ 2⋅A₈⋅A₁ | A₅ A₃ A₆ A₂ A₇ A₁ A₈ A₀ ⋯
-
-        // ⋯ (A₈⋅A₁+A₁⋅A₈)₂₈…₀ (A₈⋅A₁+A₁⋅A₈)₅₈…₂₉ | A₅ A₃ ⋯
-        // 2⋅A₅⋅A₃  <=>  A₅⋅A₃ + A₃⋅A₅
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₅⋅A₃ | A₆ A₂ A₇ A₁ A₈ A₀ ⋯
-
-        // ⋯ (A₅⋅A₃+A₃⋅A₅)₂₈…₀ (A₅⋅A₃+A₃⋅A₅)₅₈…₂₉ | A₆ A₂ ⋯
-        // 2⋅A₆⋅A₂  <=>  A₆⋅A₂ + A₂⋅A₆
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₅⋅A₃ 2⋅A₆⋅A₂ | A₇ A₁ A₈ A₀ ⋯
-
-        // ⋯ (A₆⋅A₂+A₂⋅A₆)₂₈…₀ (A₆⋅A₂+A₂⋅A₆)₅₈…₂₉ | A₇ A₁ ⋯
-        // 2⋅A₇⋅A₁  <=>  A₇⋅A₁ + A₁⋅A₇
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₅⋅A₃ 2⋅A₆⋅A₂ 2⋅A₇⋅A₁ | A₈ A₀ ⋯
-
-        // ⋯ (A₇⋅A₁+A₁⋅A₇)₂₈…₀ (A₇⋅A₁+A₁⋅A₇)₅₈…₂₉ | A₈ A₀ ⋯
-        // 2⋅A₈⋅A₀  <=>  A₈⋅A₀ + A₀⋅A₈
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₅⋅A₃ 2⋅A₆⋅A₂ 2⋅A₇⋅A₁ 2⋅A₈⋅A₀ | A₄ A₃ A₅ A₂ A₆ A₁ A₇ A₀ ⋯
-
-        // ⋯ (A₈⋅A₀+A₀⋅A₈)₂₈…₀ (A₈⋅A₀+A₀⋅A₈)₅₈…₂₉ | A₄ A₃ ⋯
-        // 2⋅A₄⋅A₃  <=>  A₄⋅A₃ + A₃⋅A₄
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₄⋅A₃ | A₅ A₂ A₆ A₁ A₇ A₀ ⋯
-
-        // ⋯ (A₄⋅A₃+A₃⋅A₄)₂₈…₀ (A₄⋅A₃+A₃⋅A₄)₅₈…₂₉ | A₅ A₂ ⋯
-        // 2⋅A₅⋅A₂  <=>  A₅⋅A₂ + A₂⋅A₅
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₄⋅A₃ 2⋅A₅⋅A₂ | A₆ A₁ A₇ A₀ ⋯
-
-        // ⋯ (A₅⋅A₂+A₂⋅A₅)₂₈…₀ (A₅⋅A₂+A₂⋅A₅)₅₈…₂₉ | A₆ A₁ ⋯
-        // 2⋅A₆⋅A₁  <=>  A₆⋅A₁ + A₁⋅A₆
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₄⋅A₃ 2⋅A₅⋅A₂ 2⋅A₆⋅A₁ | A₇ A₀ ⋯
-
-        // ⋯ (A₆⋅A₁+A₁⋅A₆)₂₈…₀ (A₆⋅A₁+A₁⋅A₆)₅₈…₂₉ | A₇ A₀ ⋯
-        // 2⋅A₇⋅A₀  <=>  A₇⋅A₀ + A₀⋅A₇
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₄⋅A₃ 2⋅A₅⋅A₂ 2⋅A₆⋅A₁ 2⋅A₇⋅A₀ | A₄ A₂ A₅ A₁ A₆ A₀ ⋯
-
-        // ⋯ (A₇⋅A₀+A₀⋅A₇)₂₈…₀ (A₇⋅A₀+A₀⋅A₇)₅₈…₂₉ | A₄ A₂ ⋯
-        // 2⋅A₄⋅A₂  <=>  A₄⋅A₂ + A₂⋅A₄
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₄⋅A₂ | A₅ A₁ A₆ A₀ ⋯
-
-        // ⋯ (A₄⋅A₂+A₂⋅A₄)₂₈…₀ (A₄⋅A₂+A₂⋅A₄)₅₈…₂₉ | A₅ A₁ ⋯
-        // 2⋅A₅⋅A₁  <=>  A₅⋅A₁ + A₁⋅A₅
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₄⋅A₂ 2⋅A₅A₁ | A₆ A₀ ⋯
-
-        // ⋯ (A₅⋅A₁+A₁⋅A₅)₂₈…₀ (A₅⋅A₁+A₁⋅A₅)₅₈…₂₉ | A₆ A₀ ⋯
-        // 2⋅A₆⋅A₀  <=>  A₆⋅A₀ + A₀⋅A₆
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₄⋅A₂ 2⋅A₅⋅A₁ 2⋅A₆⋅A₀ | A₃ A₂ A₄ A₁ A₅ A₀ ⋯
-
-        // ⋯ (A₆⋅A₀+A₀⋅A₆)₂₈…₀ (A₆⋅A₀+A₀⋅A₆)₅₈…₂₉ | A₃ A₂ ⋯
-        // 2⋅A₃⋅A₂  <=>  A₃⋅A₂ + A₂⋅A₃
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₃⋅A₂ | A₄ A₁ A₅ A₀ ⋯
-
-        // ⋯ (A₃⋅A₂+A₂⋅A₃)₂₈…₀ (A₃⋅A₂+A₂⋅A₃)₅₈…₂₉ | A₄ A₁ ⋯
-        // 2⋅A₄⋅A₁  <=>  A₄⋅A₁ + A₁⋅A₄
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₃⋅A₂ 2⋅A₄⋅A₁ | A₅ A₀ ⋯
-
-        // ⋯ (A₄⋅A₁+A₁⋅A₄)₂₈…₀ (A₄⋅A₁+A₁⋅A₄)₅₈…₂₉ | A₅ A₀ ⋯
-        // 2⋅A₅⋅A₀  <=>  A₅⋅A₀ + A₀⋅A₅
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₃⋅A₂ 2⋅A₄⋅A₁ 2⋅A₅⋅A₀ | A₃A₁ A₄ A₀  ⋯
-
-        // ⋯ (A₅⋅A₀+A₀⋅A₅)₂₈…₀ (A₅⋅A₀+A₀⋅A₅)₅₈…₂₉ | A₃ A₁ ⋯
-        // 2⋅A₃⋅A₁  <=>  A₃⋅A₁ + A₁⋅A₃
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₃⋅A₁ | A₄ A₀  ⋯
-
-        // ⋯ (A₃⋅A₁+A₁⋅A₃)₂₈…₀ (A₃⋅A₁+A₁⋅A₃)₅₈…₂₉ | A₄ A₀ ⋯
-        // 2⋅A₄⋅A₀  <=>  A₄⋅A₀ + A₀⋅A₄
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₃⋅A₁ 2⋅A₄⋅A₀ | A₂ A₁ A₃ A₀ ⋯
-
-        // ⋯ (A₄⋅A₀+A₀⋅A₄)₂₈…₀ (A₄⋅A₀+A₀⋅A₄)₅₈…₂₉ | A₂ A₁ ⋯
-        // 2⋅A₂⋅A₁  <=>  A₂⋅A₁ + A₁⋅A₂
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₂⋅A₁ | A₃ A₀ ⋯
-
-        // ⋯ (A₂⋅A₁+A₁⋅A₂)₂₈…₀ (A₂⋅A₁+A₁⋅A₂)₅₈…₂₉ | A₃ A₀ ⋯
-        // 2⋅A₃⋅A₀  <=>  A₃⋅A₀ + A₀⋅A₃
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₂⋅A₁ 2⋅A₃⋅A₀ | A₂ A₀ ⋯
-
-        // ⋯ (A₃⋅A₀+A₀⋅A₃)₂₈…₀ (A₃⋅A₀+A₀⋅A₃)₅₈…₂₉ | A₂ A₀ ⋯
-        // 2⋅A₂⋅A₀  <=>  A₂⋅A₀ + A₀⋅A₂
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₂⋅A₀ | A₁ A₀ ⋯
-
-        // ⋯ (A₂⋅A₀+A₀⋅A₂)₂₈…₀ (A₂⋅A₀+A₀⋅A₂)₅₈…₂₉ | A₁ A₀ ⋯
-        // 2⋅A₁⋅A₀  <=>  A₁⋅A₀ + A₀⋅A₁
-        OP_FROMALTSTACK OP_FROMALTSTACK u29_mul_carry_29
-        u29x2_double_to_u29_carry_30
-        // ⋯ 2⋅A₁⋅A₀ | ⋯
-
-        // ⋯ (A₁⋅A₀+A₀⋅A₁)₂₈…₀ (A₁⋅A₀+A₀⋅A₁)₅₈…₂₉
-
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉
-        72 OP_ROLL OP_TOALTSTACK
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ | (A⋅B)₀
-        72 OP_ROLL
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ (A₀⋅B₀)₅₇…₂₉
-
-        // (2²⁹⋅(A₁⋅B₁)₂₈…₀+(A₀⋅B₀)₅₇…₂₉)₅₇…₀ + (A₁⋅B₀+A₀⋅B₁)₅₈…₀
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ (A₀⋅B₀)₅₇…₂₉
-        73 OP_ROLL
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ (A₀⋅B₀)₅₇…₂₉ (A₁⋅B₁)₂₈…₀
-        OP_2SWAP
-        // ⋯ (A₀⋅B₀)₅₇…₂₉ (A₁⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉
-        u29x2_add_u29u30_carry
-        // (2²⁹⋅(A₁⋅B₁)₂₈…₀+(A₀⋅B₀)₅₇…₂₉)₅₇…₀ + (A₁⋅B₀+A₀⋅B₁)₅₈…₀  <=>  TEMP₁
-        // ⋯ (A⋅B)₁ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈
-        OP_ROT OP_TOALTSTACK
-        // ⋯ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈ | (A⋅B)₁ (A⋅B)₀
-
-        // (2²⁹⋅(A₁⋅B₁)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₂⋅B₀+A₀⋅B₂)₅₈…₀
-        // ⋯ (A₂⋅B₀+A₀⋅B₂)₂₈…₀ (A₂⋅B₀+A₀⋅B₂)₅₈…₂₉ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈
-        OP_2SWAP
-        // ⋯ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈ (A₂⋅B₀+A₀⋅B₂)₂₈…₀ (A₂⋅B₀+A₀⋅B₂)₅₈…₂₉
-        u29x2_add_u29u30_carry
-        // ⋯ (TEMP₁)₂₈…₀ (TEMP₁)₅₇…₂₉ (TEMP₁)₅₉…₅₈
-        OP_ROT OP_TOALTSTACK
-
-        // ⋯ (TEMP₁)₅₇…₂₉ (TEMP₁)₅₉…₅₈ | (TEMP₁)₂₈…₀
-        70 OP_ROLL
-        // ⋯ (TEMP₁)₅₇…₂₉ (TEMP₁)₅₉…₅₈ (A₁⋅B₁)₅₇…₂₉
-        u29x2_add_u29
-        // ⋯ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₂₈…₀ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₃₁…₂₉
-
-        // (2²⁹⋅(A₂⋅B₂)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₃⋅B₀+A₀⋅B₃)₅₈…₀ + (A₂⋅B₁+A₁⋅B₂)₅₈…₀
-        // ⋯ (A₃⋅B₀+A₀⋅B₃)₂₈…₀ (A₃⋅B₀+A₀⋅B₃)₅₈…₂₉ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₂₈…₀ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₃₁…₂₉
-        0 OP_TOALTSTACK
-        // ⋯ (A₃⋅B₀+A₀⋅B₃)₂₈…₀ (A₃⋅B₀+A₀⋅B₃)₅₈…₂₉ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₂₈…₀ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₃₁…₂₉ | 0
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        // ⋯ (A⋅B)₂ (TEMP₂)₂₈…₀ | (TEMP₂)₅₉…₅₈
-        
-        OP_FROMALTSTACK
-        // ⋯ (A⋅B)₂ (TEMP₂)₂₈…₀ (TEMP₂)₅₉…₅₈
-        OP_ROT OP_TOALTSTACK
-        // ⋯ (TEMP₂)₂₈…₀ (TEMP₂)₅₉…₅₈ | (A⋅B)₂ (A⋅B)₁ (A⋅B)₀
-        66 OP_ROLL
-        // ⋯ (TEMP₂)₂₈…₀ (TEMP₂)₅₉…₅₈ (A₂⋅B₂)₂₈…₀
-        u29x2_add_u29
-        // ⋯ (TEMP₂+(A₂⋅B₂)₂₈…₀)₂₈…₀ (TEMP₂+(A₂⋅B₂)₂₈…₀)₅₉…₅₈
-
-        // (2²⁹⋅(A₂⋅B₂)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₄⋅B₀+A₀⋅B₄)₅₈…₀ + (A₃⋅B₁+A₁⋅B₃)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        62 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₃⋅B₃)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₅⋅B₀+A₀⋅B₅)₅₈…₀ + (A₄⋅B₁+A₁⋅B₄)₅₈…₀ + (A₃⋅B₂+A₂⋅B₃)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        56 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₃⋅B₃)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₆⋅B₀+A₀⋅B₆)₅₈…₀ + (A₅⋅B₁+A₁⋅B₅)₅₈…₀ + (A₄⋅B₂+A₂⋅B₄)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        50 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₄⋅B₄)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₇⋅B₀+A₀⋅B₇)₅₈…₀ + (A₆⋅B₁+A₁⋅B₆)₅₈…₀ + (A₅⋅B₂+A₂⋅B₅)₅₈…₀ + (A₄⋅B₃+A₃⋅B₄)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        42 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₄⋅B₄)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₀+A₀⋅B₈)₅₈…₀ + (A₇⋅B₁+A₁⋅B₇)₅₈…₀ + (A₆⋅B₂+A₂⋅B₆)₅₈…₀ + (A₅⋅B₃+A₃⋅B₅)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        34 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₅⋅B₅)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₁+A₁⋅B₈)₅₈…₀ + (A₇⋅B₂+A₂⋅B₇)₅₈…₀ + (A₆⋅B₃+A₃⋅B₆)₅₈…₀ + (A₅⋅B₄+A₄⋅B₅)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        26 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₅⋅B₅)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₂+A₂⋅B₈)₅₈…₀ + (A₇⋅B₃+A₃⋅B₇)₅₈…₀ + (A₆⋅B₄+A₄⋅B₆)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        20 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₆⋅B₆)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₃+A₃⋅B₈)₅₈…₀ + (A₇⋅B₄+A₄⋅B₇)₅₈…₀ + (A₆⋅B₅+A₅⋅B₆)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        14 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₆⋅B₆)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₄+A₄⋅B₈)₅₈…₀ + (A₇⋅B₅+A₅⋅B₇)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        10 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₇⋅B₇)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₅+A₅⋅B₈)₅₈…₀ + (A₇⋅B₆+A₆⋅B₇)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        6 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₇⋅B₇)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₆+A₆⋅B₈)₅₈…₀
-        OP_2SWAP
-        u29x2_add_u29u30_carry
-        OP_ROT OP_TOALTSTACK
-        4 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₈⋅B₈)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₇+A₇⋅B₈)₅₈…₀
-        OP_2SWAP
-        u29x2_add_u29u30_carry
-        OP_ROT OP_TOALTSTACK
-        OP_ROT
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₈⋅B₈)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀
-        OP_SWAP OP_TOALTSTACK
-
-        // (⋯)₅₈…₂₉
-        OP_ADD
-        for _ in 1..18 {
-            OP_FROMALTSTACK
-        }
-    }
-}
-
-// (A₂₈…₀ ⋅ B₂₈…₀)₂₈…₀ (A₂₈…₀ ⋅ B₂₈…₀)₅₇…₂₉
-// A₂₈…₀
-fn u29_mul_carry_29_imm(u29_constant: u32) -> Script {
-    script! {
-        // A₂₈…₀
-        { assert_nn_le(0x1FFFFFFF) } // 0≤A₂₈…₀<2²⁹
-        // A₂₈…₀
-        if u29_constant & 1 == 1 { OP_DUP } else { 0 OP_SWAP }
-        // A₂₈…₀⋅B₀ A₂₈…₀
-        OP_DUP OP_ADD
-        // A₂₈…₀⋅B₀ 2¹⋅A₂₈…₀
-        { 0x20000000 }
-        // A₂₈…₀⋅B₀ 2¹⋅A₂₈…₀ 2²⁹
-        OP_SWAP
-        // A₂₈…₀⋅B₀ 2²⁹ 2¹⋅A₂₈…₀
-        OP_2DUP OP_LESSTHANOREQUAL
-        // A₂₈…₀⋅B₀ 2²⁹ 2¹⋅A₂₈…₀ A₂₈
-        OP_TUCK
-        // A₂₈…₀⋅B₀ 2²⁹ A₂₈ 2¹⋅A₂₈…₀ A₂₈
-        OP_IF 2 OP_PICK OP_SUB OP_ENDIF
-        // A₂₈…₀⋅B₀ 2²⁹ A₂₈ 2¹⋅A₂₇…₀
-        if u29_constant >> 1 & 1 == 1 {
-            OP_2DUP
-            // A₂₈…₀⋅B₀ 2²⁹ A₂₈ 2¹⋅A₂₇…₀ A₂₈⋅B₁ 2¹⋅A₂₇…₀⋅B₁
-            5 OP_ROLL
-            // 2²⁹ A₂₈ 2¹⋅A₂₇…₀ A₂₈⋅B₁ 2¹⋅A₂₇…₀⋅B₁ A₂₈…₀⋅B₀
-            OP_ADD
-            // 2²⁹ A₂₈ 2¹⋅A₂₇…₀ A₂₈⋅B₁ A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁
-            4 OP_PICK
-            // 2²⁹ A₂₈ 2¹⋅A₂₇…₀ A₂₈⋅B₁ A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁ 2²⁹
-            OP_2DUP OP_GREATERTHANOREQUAL
-            // 2²⁹ A₂₈ 2¹⋅A₂₇…₀ A₂₈⋅B₁ A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁ 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉
-            OP_IF OP_SUB OP_SWAP OP_1ADD OP_ELSE OP_DROP OP_SWAP OP_ENDIF
-            // 2²⁹ A₂₈ 2¹⋅A₂₇…₀ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉
-            OP_2SWAP
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ A₂₈ 2¹⋅A₂₇…₀
-        } else {
-            // A₂₈…₀⋅B₀ 2²⁹ A₂₈ 2¹⋅A₂₇…₀
-            OP_TOALTSTACK
-            OP_TOALTSTACK
-            // A₂₈…₀⋅B₀ 2²⁹ | A₂₈ 2¹⋅A₂₇…₀
-            OP_SWAP 0
-            // 2²⁹ A₂₈…₀⋅B₀ 0
-            OP_FROMALTSTACK
-            OP_FROMALTSTACK
-            // 2²⁹ A₂₈…₀⋅B₀ 0 A₂₈ 2¹⋅A₂₇…₀
-        }
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ A₂₈ 2¹⋅A₂₇…₀
-        OP_SWAP
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2¹⋅A₂₇…₀ A₂₈
-        OP_DUP OP_ADD
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2¹⋅A₂₇…₀ 2¹⋅A₂₈
-        OP_SWAP
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2¹⋅A₂₈ 2¹⋅A₂₇…₀
-        OP_DUP OP_ADD
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2¹⋅A₂₈ 2²⋅A₂₇…₀
-        4 OP_PICK
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2¹⋅A₂₈ 2²⋅A₂₇…₀ 2²⁹
-        OP_2DUP OP_GREATERTHANOREQUAL
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2¹⋅A₂₈ 2²⋅A₂₇…₀ 2²⁹ A₂₇
-        OP_IF OP_SUB OP_SWAP OP_1ADD OP_ELSE OP_DROP OP_SWAP OP_ENDIF
-        // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2²⋅A₂₆…₀ A₂₈…₂₇
-        for i in 2..28 {
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2²⋅A₂₆…₀ A₂₈…₂₇
-            if u29_constant >> i & 1 == 1 {
-                OP_2DUP
-                // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2²⋅A₂₆…₀ A₂₈…₂₇ 2²⋅A₂₆…₀⋅B₂ A₂₈…₂₇⋅B₂
-                OP_2ROT
-                // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ 2²⋅A₂₆…₀⋅B₂ A₂₈…₂₇⋅B₂ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉
-                OP_ROT
-                // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ 2²⋅A₂₆…₀⋅B₂ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ A₂₈…₂₇⋅B₂
-                OP_ADD
-                // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ 2²⋅A₂₆…₀⋅B₂ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉
-                OP_ROT
-                // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2²⋅A₂₆…₀⋅B₂
-                OP_ROT
-                // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ 2²⋅A₂₆…₀⋅B₂ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀
-                OP_ADD
-                // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀+2²⋅A₂₆…₀⋅B₂
-                4 OP_PICK
-                // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀+2²⋅A₂₆…₀⋅B₂ 2²⁹
-                OP_2DUP OP_GREATERTHANOREQUAL
-                // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₉ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀+2²⋅A₂₆…₀⋅B₂ 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁)₂₈…₀+2²⋅A₂₆…₀⋅B₂≥2²⁹
-                OP_IF OP_SUB OP_SWAP OP_1ADD OP_ELSE OP_DROP OP_SWAP OP_ENDIF
-                // 2²⁹ 2²⋅A₂₆…₀ A₂₈…₂₇ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉
-                OP_2SWAP
-                // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2²⋅A₂₆…₀ A₂₈…₂₇
-            }
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2²⋅A₂₆…₀ A₂₈…₂₇
-            OP_DUP OP_ADD
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2²⋅A₂₆…₀ 2¹⋅A₂₈…₂₇
-            OP_SWAP
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2¹⋅A₂₈…₂₇ 2²⋅A₂₆…₀
-            OP_DUP OP_ADD
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2¹⋅A₂₈…₂₇ 2³⋅A₂₆…₀
-            4 OP_PICK
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2¹⋅A₂₈…₂₇ 2³⋅A₂₆…₀ 2²⁹
-            OP_2DUP OP_GREATERTHANOREQUAL
-            // 2²⁹ (A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2¹⋅A₂₈…₂₇ 2³⋅A₂₆…₀ 2²⁹ A₂₆
-            OP_IF OP_SUB OP_SWAP OP_1ADD OP_ELSE OP_DROP OP_SWAP OP_ENDIF
-            // 2²⁹ (2⁰⋅A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₂₈…₀ A₂₈⋅B₁+A₂₈…₂₇⋅B₂+(2⁰⋅A₂₈…₀⋅B₀+2¹⋅A₂₇…₀⋅B₁+2²⋅A₂₆…₀⋅B₂)₃₀…₂₉ 2³⋅A₂₅…₀ A₂₈…₂₆
-        }
-        // 2²⁹ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₂⋅B₂₇+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ 2²⁸⋅A₀ A₂₈…₁
-        if u29_constant >> 28 & 1 == 1 {
-            // 2²⁹ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₂⋅B₂₇+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ 2²⁸⋅A₀⋅B₂₈ A₂₈…₁⋅B₂₈
-            OP_2SWAP
-            // 2²⁹ 2²⁸⋅A₀⋅B₂₈ A₂₈…₁⋅B₂₈ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₂⋅B₂₇+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉
-            OP_ROT
-            // 2²⁹ 2²⁸⋅A₀⋅B₂₈ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₂⋅B₂₇+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ A₂₈…₁⋅B₂₈
-            OP_ADD
-            // 2²⁹ 2²⁸⋅A₀⋅B₂₈ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉
-            OP_ROT
-            // 2²⁹ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ 2²⁸⋅A₀⋅B₂₈
-            OP_ROT
-            // 2²⁹ A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ 2²⁸⋅A₀⋅B₂₈ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀
-            OP_ADD
-            // 2²⁹ A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀+2²⁸⋅A₀⋅B₂₈
-            OP_ROT
-            // A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀+2²⁸⋅A₀⋅B₂₈ 2²⁹
-            OP_2DUP OP_GREATERTHANOREQUAL
-            // A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀+2²⁸⋅A₀⋅B₂₈ 2²⁹ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀+2²⁸⋅A₀⋅B₂₈≥2²⁹
-            OP_IF OP_SUB OP_SWAP OP_1ADD OP_ELSE OP_DROP OP_SWAP OP_ENDIF
-            // (2⁰⋅A₂₈…₀⋅B₀⋯2²⁸⋅A₀⋅B₂₈)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁸⋅A₀⋅B₂₈)₅₆…₂₉
-        } else {
-            OP_2DROP
-            // 2²⁹ (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₂⋅B₂₇+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉
-            OP_ROT OP_DROP
-            // (2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₂⋅B₂₇+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁷⋅A₁…₀⋅B₂₇)₅₅…₂₉
-        }
-        // (2⁰⋅A₂₈…₀⋅B₀⋯2²⁸⋅A₀⋅B₂₈)₂₈…₀ A₂₈⋅B₁⋯A₂₈…₁⋅B₂₈+(2⁰⋅A₂₈…₀⋅B₀⋯2²⁸⋅A₀⋅B₂₈)₅₆…₂₉
-        
-        // (A₂₈…₀ ⋅ B₂₈…₀)₂₈…₀ (A₂₈…₀ ⋅ B₂₈…₀)₅₇…₂₉
-    }
-}
-
-// (A₂₉…₀ ⋅ B₂₉…₀)₂₈…₀ (A₂₉…₀ ⋅ B₂₉…₀)₅₉…₂₉
-// A₂₉…₀
-fn u30_mul_to_u29_carry_31_imm(u30_constant: u32) -> Script {
-    script! {
-        // ⋯ A₂₉…₀
-        { assert_nn_le(0x3FFFFFFF) } // 0≤A₂₉…₀<2³⁰
-        // ⋯ A₂₉…₀
-
-        // Rearrange A₂₉…₀⋅B₂₉…₀ to A₂₈…₀⋅B₂₈…₀:
-        //  (A₂₉⋅2²⁹+A₂₈…₀)₂₉…₀ ⋅ (B₂₉⋅2²⁹+B₂₈…₀)₂₉…₀ = A₂₈…₀⋅B₂₈…₀ + A₂₈…₀⋅B₂₉⋅2²⁹ + B₂₈…₀⋅A₂₉⋅2²⁹ + A₂₉⋅B₂₉⋅2⁵⁸
-
-        // ⋯ A₂₉…₀
-        { 0x20000000 }
-        // ⋯ A₂₉…₀ 2²⁹
-        OP_2DUP OP_GREATERTHANOREQUAL
-        // ⋯ A₂₉…₀ 2²⁹ A₂₉
-        OP_DUP OP_TOALTSTACK
-        // ⋯ A₂₉…₀ 2²⁹ A₂₉ | A₂₉ ⋯
-        OP_IF OP_SUB OP_ELSE OP_DROP OP_ENDIF
-        // ⋯ A₂₈…₀
-        if (u30_constant & 0x20000000) != 0 {
-            // ⋯ A₂₈…₀
-            OP_DUP OP_TOALTSTACK
-            // ⋯ A₂₈…₀ | A₂₈…₀ A₂₉ ⋯
-        }
-        // ⋯ A₂₈…₀
-        { u29_mul_carry_29_imm(u30_constant & 0x1FFFFFFF) }
-        // ⋯ (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₅₇…₂₉
-        if (u30_constant & 0x20000000) != 0 {
-            // ⋯ (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₅₇…₂₉
-            OP_FROMALTSTACK OP_ADD
-            // ⋯ (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₅₇…₂₉+A₂₈…₀ | A₂₉ ⋯
-        }
-        OP_FROMALTSTACK
-        // ⋯ (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₅₇…₂₉+B₂₉⋅A₂₈…₀ A₂₉
-        OP_IF
-            // ⋯ (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₅₇…₂₉+B₂₉⋅A₂₈…₀
-            { u30_constant }
-            // ⋯ (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₅₇…₂₉+B₂₉⋅A₂₈…₀ B₂₉…₀
-            OP_ADD
-            // ⋯ (A₂₈…₀⋅B₂₈…₀)₂₈…₀ (A₂₈…₀⋅B₂₈…₀)₅₇…₂₉+B₂₉⋅A₂₈…₀+A₂₉⋅B₂₉…₀
-        OP_ENDIF
-        // (A₂₉…₀ ⋅ B₂₉…₀)₂₈…₀ (A₂₉…₀ ⋅ B₂₉…₀)₅₉…₂₉
-    }
-}
-
-pub fn u29x9_mul_karazuba_imm(u29x9_constant: [u32; 9]) -> Script {
-    script! {
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀
-
-        // A₁₊₀
-        OP_2DUP OP_ADD OP_TOALTSTACK
-        // A₂₊₀
-        2 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // A₃₊₀
-        3 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // A₂₊₁
-        2 OP_PICK 2 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₄₊₀
-        4 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // A₃₊₁
-        3 OP_PICK 2 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₅₊₀
-        5 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // A₄₊₁
-        4 OP_PICK 2 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₃₊₂
-        OP_2OVER OP_ADD OP_TOALTSTACK
-        // A₆₊₀
-        6 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // A₅₊₁
-        5 OP_PICK 2 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₄₊₂
-        4 OP_PICK 3 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₇₊₀
-        7 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // A₆₊₁
-        6 OP_PICK 2 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₅₊₂
-        5 OP_PICK 3 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₄₊₃
-        4 OP_PICK 4 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₈₊₀
-        8 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // A₇₊₁
-        7 OP_PICK 2 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₆₊₂
-        6 OP_PICK 3 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₅₊₃
-        5 OP_PICK 4 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₈₊₁
-        8 OP_PICK 2 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₇₊₂
-        7 OP_PICK 3 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₆₊₃
-        6 OP_PICK 4 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₅₊₄
-        5 OP_PICK 5 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₈₊₂
-        8 OP_PICK 3 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₇₊₃
-        7 OP_PICK 4 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₆₊₄
-        6 OP_PICK 5 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₈₊₃
-        8 OP_PICK 4 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₇₊₄ 
-        7 OP_PICK 5 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₆₊₅
-        6 OP_PICK 6 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₈₊₄
-        8 OP_PICK 5 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₇₊₅
-        7 OP_PICK 6 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₈₊₅
-        8 OP_PICK 6 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₇₊₆
-        7 OP_PICK 7 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₈₊₆
-        8 OP_PICK 7 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₈₊₇
-        8 OP_PICK 8 OP_PICK OP_ADD OP_TOALTSTACK
-
-        for i in 0..9 {
-            { 8 + i } OP_ROLL
-            { u29_mul_carry_29_imm(u29x9_constant[8-i]) }
-            OP_SWAP
-        }
-
-        // A₈₊₇⋅B₈₊₇ - A₈⋅B₈ - A₇⋅B₇  <=>  A₈⋅B₇ + A₇⋅B₈
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[8] + u29x9_constant[7]) } // B₈₊₇
-        18 OP_PICK 20 OP_PICK u29x2_sub_noborrow
-        16 OP_PICK 18 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₈⋅B₇+A₇⋅B₈)₂₈…₀ (A₈⋅B₇+A₇⋅B₈)₅₈…₂₉
-        // A₈₊₆⋅B₈₊₆ - A₈⋅B₈ - A₆⋅B₆  <=>  A₈⋅B₆ + A₆⋅B₈
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[8] + u29x9_constant[6]) } // B₈₊₆
-        20 OP_PICK 22 OP_PICK u29x2_sub_noborrow
-        16 OP_PICK 18 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₈⋅B₆+A₆⋅B₈)₂₈…₀ (A₈⋅B₆+A₆⋅B₈)₅₈…₂₉
-        // A₇₊₆⋅B₇₊₆ - A₇⋅B₇ - A₆⋅B₆  <=>  A₇⋅B₆ + A₆⋅B₇
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[7] + u29x9_constant[6]) } // B₇₊₆
-        20 OP_PICK 22 OP_PICK u29x2_sub_noborrow
-        18 OP_PICK 20 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₇⋅B₆+A₆⋅B₇)₂₈…₀ (A₇⋅B₆+A₆⋅B₇)₅₈…₂₉
-        // A₈₊₅⋅B₈₊₅ - A₈⋅B₈ - A₅⋅B₅  <=>  A₈⋅B₅ + A₅⋅B₈
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[8] + u29x9_constant[5]) } // B₈₊₅
-        24 OP_PICK 26 OP_PICK u29x2_sub_noborrow
-        18 OP_PICK 20 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₈⋅B₅+A₅⋅B₈)₂₈…₀ (A₈⋅B₅+A₅⋅B₈)₅₈…₂₉
-        // A₇₊₅⋅B₇₊₅ - A₇⋅B₇ - A₅⋅B₅  <=>  A₇⋅B₅ + A₅⋅B₇
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[7] + u29x9_constant[5]) } // B₇₊₅
-        24 OP_PICK 26 OP_PICK u29x2_sub_noborrow
-        20 OP_PICK 22 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₇⋅B₅+A₅⋅B₇)₂₈…₀ (A₇⋅B₅+A₅⋅B₇)₅₈…₂₉
-        // A₈₊₄⋅B₈₊₄ - A₈⋅B₈ - A₄⋅B₄  <=>  A₈⋅B₄ + A₄⋅B₈
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[8] + u29x9_constant[4]) } // B₈₊₄
-        28 OP_PICK 30 OP_PICK u29x2_sub_noborrow
-        20 OP_PICK 22 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₈⋅B₄+A₄⋅B₈)₂₈…₀ (A₈⋅B₄+A₄⋅B₈)₅₈…₂₉
-        // A₆₊₅⋅B₆₊₅ - A₆⋅B₆ - A₅⋅B₅  <=>  A₆⋅B₅ + A₅⋅B₆
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[6] + u29x9_constant[5]) } // B₆₊₅
-        26 OP_PICK 28 OP_PICK u29x2_sub_noborrow
-        24 OP_PICK 26 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₆⋅B₅+A₅⋅B₆)₂₈…₀ (A₆⋅B₅+A₅⋅B₆)₅₈…₂₉
-        // A₇₊₄⋅B₇₊₄ - A₇⋅B₇ - A₄⋅B₄  <=>  A₇⋅B₄ + A₄⋅B₇
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[7] + u29x9_constant[4]) } // B₇₊₄
-        30 OP_PICK 32 OP_PICK u29x2_sub_noborrow
-        24 OP_PICK 26 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₇⋅B₄+A₄⋅B₇)₂₈…₀ (A₇⋅B₄+A₄⋅B₇)₅₈…₂₉
-        // A₈₊₃⋅B₈₊₃ - A₈⋅B₈ - A₃⋅B₃  <=>  A₈⋅B₃ + A₃⋅B₈
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[8] + u29x9_constant[3]) } // B₈₊₃
-        34 OP_PICK 36 OP_PICK u29x2_sub_noborrow
-        24 OP_PICK 26 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₈⋅B₃+A₃⋅B₈)₂₈…₀ (A₈⋅B₃+A₃⋅B₈)₅₈…₂₉
-        // A₆₊₄⋅B₆₊₄ - A₆⋅B₆ - A₄⋅B₄  <=>  A₆⋅B₄ + A₄⋅B₆
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[6] + u29x9_constant[4]) } // B₆₊₄
-        32 OP_PICK 34 OP_PICK u29x2_sub_noborrow
-        28 OP_PICK 30 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₆⋅B₄+A₄⋅B₆)₂₈…₀ (A₆⋅B₄+A₄⋅B₆)₅₈…₂₉
-        // A₇₊₃⋅B₇₊₃ - A₇⋅B₇ - A₃⋅B₃  <=>  A₇⋅B₃ + A₃⋅B₇
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[7] + u29x9_constant[3]) } // B₇₊₃
-        36 OP_PICK 38 OP_PICK u29x2_sub_noborrow
-        28 OP_PICK 30 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₇⋅B₃+A₃⋅B₇)₂₈…₀ (A₇⋅B₃+A₃⋅B₇)₅₈…₂₉
-        // A₈₊₂⋅B₈₊₂ - A₈⋅B₈ - A₂⋅B₂  <=>  A₈⋅B₂ + A₂⋅B₈
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[8] + u29x9_constant[2]) } // B₈₊₂
-        40 OP_PICK 42 OP_PICK u29x2_sub_noborrow
-        28 OP_PICK 30 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₈⋅B₂+A₂⋅B₈)₂₈…₀ (A₈⋅B₂+A₂⋅B₈)₅₈…₂₉
-        // A₅₊₄⋅B₅₊₄ - A₅⋅B₅ - A₄⋅B₄  <=>  A₅⋅B₄ + A₄⋅B₅
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[5] + u29x9_constant[4]) } // B₅₊₄
-        36 OP_PICK 38 OP_PICK u29x2_sub_noborrow
-        34 OP_PICK 36 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₅⋅B₄+A₄⋅B₅)₂₈…₀ (A₅⋅B₄+A₄⋅B₅)₅₈…₂₉
-        // A₆₊₃⋅B₆₊₃ - A₆⋅B₆ - A₃⋅B₃  <=>  A₆⋅B₃ + A₃⋅B₆
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[6] + u29x9_constant[3]) } // B₆₊₃
-        40 OP_PICK 42 OP_PICK u29x2_sub_noborrow
-        34 OP_PICK 36 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₆⋅B₃+A₃⋅B₆)₂₈…₀ (A₆⋅B₃+A₃⋅B₆)₅₈…₂₉
-        // A₇₊₂⋅B₇₊₂ - A₇⋅B₇ - A₂⋅B₂  <=>  A₇⋅B₂ + A₂⋅B₇
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[7] + u29x9_constant[2]) } // B₇₊₂
-        44 OP_PICK 46 OP_PICK u29x2_sub_noborrow
-        34 OP_PICK 36 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₇⋅B₂+A₂⋅B₇)₂₈…₀ (A₇⋅B₂+A₂⋅B₇)₅₈…₂₉
-        // A₈₊₁⋅B₈₊₁ - A₈⋅B₈ - A₁⋅B₁  <=>  A₈⋅B₁ + A₁⋅B₈
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[8] + u29x9_constant[1]) } // B₈₊₁
-        48 OP_PICK 50 OP_PICK u29x2_sub_noborrow
-        34 OP_PICK 36 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₈⋅B₁+A₁⋅B₈)₂₈…₀ (A₈⋅B₁+A₁⋅B₈)₅₈…₂₉
-        // A₅₊₃⋅B₅₊₃ - A₅⋅B₅ - A₃⋅B₃  <=>  A₅⋅B₃ + A₃⋅B₅
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[5] + u29x9_constant[3]) } // B₅₊₃
-        44 OP_PICK 46 OP_PICK u29x2_sub_noborrow
-        40 OP_PICK 42 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₅⋅B₃+A₃⋅B₅)₂₈…₀ (A₅⋅B₃+A₃⋅B₅)₅₈…₂₉
-        // A₆₊₂⋅B₆₊₂ - A₆⋅B₆ - A₂⋅B₂  <=>  A₆⋅B₂ + A₂⋅B₆
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[6] + u29x9_constant[2]) } // B₆₊₂
-        48 OP_PICK 50 OP_PICK u29x2_sub_noborrow
-        40 OP_PICK 42 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₆⋅B₂+A₂⋅B₆)₂₈…₀ (A₆⋅B₂+A₂⋅B₆)₅₈…₂₉
-        // A₇₊₁⋅B₇₊₁ - A₇⋅B₇ - A₁⋅B₁  <=>  A₇⋅B₁ + A₁⋅B₇
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[7] + u29x9_constant[1]) } // B₇₊₁
-        52 OP_PICK 54 OP_PICK u29x2_sub_noborrow
-        40 OP_PICK 42 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₇⋅B₁+A₁⋅B₇)₂₈…₀ (A₇⋅B₁+A₁⋅B₇)₅₈…₂₉
-        // A₈₊₀⋅B₈₊₀ - A₈⋅B₈ - A₀⋅B₀  <=>  A₈⋅B₀ + A₀⋅B₈
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[8] + u29x9_constant[0]) } // B₈₊₀
-        56 OP_PICK 58 OP_PICK u29x2_sub_noborrow
-        40 OP_PICK 42 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₈⋅B₀+A₀⋅B₈)₂₈…₀ (A₈⋅B₀+A₀⋅B₈)₅₈…₂₉
-        // A₄₊₃⋅B₄₊₃ - A₄⋅B₄ - A₃⋅B₃  <=>  A₄⋅B₃ + A₃⋅B₄
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[4] + u29x9_constant[3]) } // B₄₊₃
-        50 OP_PICK 52 OP_PICK u29x2_sub_noborrow
-        48 OP_PICK 50 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₄⋅B₃+A₃⋅B₄)₂₈…₀ (A₄⋅B₃+A₃⋅B₄)₅₈…₂₉
-        // A₅₊₂⋅B₅₊₂ - A₅⋅B₅ - A₂⋅B₂  <=>  A₅⋅B₂ + A₂⋅B₅
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[5] + u29x9_constant[2]) } // B₅₊₂
-        54 OP_PICK 56 OP_PICK u29x2_sub_noborrow
-        48 OP_PICK 50 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₅⋅B₂+A₂⋅B₅)₂₈…₀ (A₅⋅B₂+A₂⋅B₅)₅₈…₂₉
-        // A₆₊₁⋅B₆₊₁ - A₆⋅B₆ - A₁⋅B₁  <=>  A₆⋅B₁ + A₁⋅B₆
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[6] + u29x9_constant[1]) } // B₆₊₁
-        58 OP_PICK 60 OP_PICK u29x2_sub_noborrow
-        48 OP_PICK 50 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₆⋅B₁+A₁⋅B₆)₂₈…₀ (A₆⋅B₁+A₁⋅B₆)₅₈…₂₉
-        // A₇₊₀⋅B₇₊₀ - A₇⋅B₇ - A₀⋅B₀  <=>  A₇⋅B₀ + A₀⋅B₇
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[7] + u29x9_constant[0]) } // B₇₊₀
-        62 OP_PICK 64 OP_PICK u29x2_sub_noborrow
-        48 OP_PICK 50 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₇⋅B₀+A₀⋅B₇)₂₈…₀ (A₇⋅B₀+A₀⋅B₇)₅₈…₂₉
-        // A₄₊₂⋅B₄₊₂ - A₄⋅B₄ - A₂⋅B₂  <=>  A₄⋅B₂ + A₂⋅B₄
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[4] + u29x9_constant[2]) } // B₄₊₂
-        58 OP_PICK 60 OP_PICK u29x2_sub_noborrow
-        54 OP_PICK 56 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₄⋅B₂+A₂⋅B₄)₂₈…₀ (A₄⋅B₂+A₂⋅B₄)₅₈…₂₉
-        // A₅₊₁⋅B₅₊₁ - A₅⋅B₅ - A₁⋅B₁  <=>  A₅⋅B₁ + A₁⋅B₅
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[5] + u29x9_constant[1]) } // B₅₊₁
-        62 OP_PICK 64 OP_PICK u29x2_sub_noborrow
-        54 OP_PICK 56 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₅⋅B₁+A₁⋅B₅)₂₈…₀ (A₅⋅B₁+A₁⋅B₅)₅₈…₂₉
-        // A₆₊₀⋅B₆₊₀ - A₆⋅B₆ - A₀⋅B₀  <=>  A₆⋅B₀ + A₀⋅B₆
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[6] + u29x9_constant[0]) } // B₆₊₀
-        66 OP_PICK 68 OP_PICK u29x2_sub_noborrow
-        54 OP_PICK 56 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₆⋅B₀+A₀⋅B₆)₂₈…₀ (A₆⋅B₀+A₀⋅B₆)₅₈…₂₉
-        // A₃₊₂⋅B₃₊₂ - A₃⋅B₃ - A₂⋅B₂  <=>  A₃⋅B₂ + A₂⋅B₃
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[3] + u29x9_constant[2]) } // B₃₊₂
-        62 OP_PICK 64 OP_PICK u29x2_sub_noborrow
-        60 OP_PICK 62 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₃⋅B₂+A₂⋅B₃)₂₈…₀ (A₃⋅B₂+A₂⋅B₃)₅₈…₂₉
-        // A₄₊₁⋅B₄₊₁ - A₄⋅B₄ - A₁⋅B₁  <=>  A₄⋅B₁ + A₁⋅B₄
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[4] + u29x9_constant[1]) } // B₄₊₁
-        66 OP_PICK 68 OP_PICK u29x2_sub_noborrow
-        60 OP_PICK 62 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₄⋅B₁+A₁⋅B₄)₂₈…₀ (A₄⋅B₁+A₁⋅B₄)₅₈…₂₉
-        // A₅₊₀⋅B₅₊₀ - A₅⋅B₅ - A₀⋅B₀  <=>  A₅⋅B₀ + A₀⋅B₅
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[5] + u29x9_constant[0]) } // B₅₊₀
-        70 OP_PICK 72 OP_PICK u29x2_sub_noborrow
-        60 OP_PICK 62 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₅⋅B₀+A₀⋅B₅)₂₈…₀ (A₅⋅B₀+A₀⋅B₅)₅₈…₂₉
-        // A₃₊₁⋅B₃₊₁ - A₃⋅B₃ - A₁⋅B₁  <=>  A₃⋅B₁ + A₁⋅B₃
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[3] + u29x9_constant[1]) } // B₃₊₁
-        68 OP_PICK 70 OP_PICK u29x2_sub_noborrow
-        64 OP_PICK 66 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₃⋅B₁+A₁⋅B₃)₂₈…₀ (A₃⋅B₁+A₁⋅B₃)₅₈…₂₉
-        // A₄₊₀⋅B₄₊₀ - A₄⋅B₄ - A₀⋅B₀  <=>  A₄⋅B₀ + A₀⋅B₄
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[4] + u29x9_constant[0]) } // B₄₊₀
-        72 OP_PICK 74 OP_PICK u29x2_sub_noborrow
-        64 OP_PICK 66 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₄⋅B₀+A₀⋅B₄)₂₈…₀ (A₄⋅B₀+A₀⋅B₄)₅₈…₂₉
-        // A₂₊₁⋅B₂₊₁ - A₂⋅B₂ - A₁⋅B₁  <=>  A₂⋅B₁ + A₁⋅B₂
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[2] + u29x9_constant[1]) } // B₂₊₁
-        70 OP_PICK 72 OP_PICK u29x2_sub_noborrow
-        68 OP_PICK 70 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₂⋅B₁+A₁⋅B₂)₂₈…₀ (A₂⋅B₁+A₁⋅B₂)₅₈…₂₉
-        // A₃₊₀⋅B₃₊₀ - A₃⋅B₃ - A₀⋅B₀  <=>  A₃⋅B₀ + A₀⋅B₃
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[3] + u29x9_constant[0]) } // B₃₊₀
-        74 OP_PICK 76 OP_PICK u29x2_sub_noborrow
-        68 OP_PICK 70 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₃⋅B₀+A₀⋅B₃)₂₈…₀ (A₃⋅B₀+A₀⋅B₃)₅₈…₂₉
-        // A₂₊₀⋅B₂₊₀ - A₂⋅B₂ - A₀⋅B₀  <=>  A₂⋅B₀ + A₀⋅B₂
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[2] + u29x9_constant[0]) } // B₂₊₀
-        74 OP_PICK 76 OP_PICK u29x2_sub_noborrow
-        70 OP_PICK 72 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₂⋅B₀+A₀⋅B₂)₂₈…₀ (A₂⋅B₀+A₀⋅B₂)₅₈…₂₉
-        // A₁₊₀⋅B₁₊₀ - A₁⋅B₁ - A₀⋅B₀  <=>  A₁⋅B₀ + A₀⋅B₁
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[1] + u29x9_constant[0]) } // B₁₊₀
-        74 OP_PICK 76 OP_PICK u29x2_sub_noborrow
-        72 OP_PICK 74 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉
-
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉
-        72 OP_ROLL OP_TOALTSTACK
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ | (A⋅B)₀
-        72 OP_ROLL
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ (A₀⋅B₀)₅₇…₂₉
-
-        // (2²⁹⋅(A₁⋅B₁)₂₈…₀+(A₀⋅B₀)₅₇…₂₉)₅₇…₀ + (A₁⋅B₀+A₀⋅B₁)₅₈…₀
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ (A₀⋅B₀)₅₇…₂₉
-        73 OP_ROLL
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ (A₀⋅B₀)₅₇…₂₉ (A₁⋅B₁)₂₈…₀
-        OP_2SWAP
-        // ⋯ (A₀⋅B₀)₅₇…₂₉ (A₁⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉
-        u29x2_add_u29u30_carry
-        // (2²⁹⋅(A₁⋅B₁)₂₈…₀+(A₀⋅B₀)₅₇…₂₉)₅₇…₀ + (A₁⋅B₀+A₀⋅B₁)₅₈…₀  <=>  TEMP₁
-        // ⋯ (A⋅B)₁ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈
-        OP_ROT OP_TOALTSTACK
-        // ⋯ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈ | (A⋅B)₁ (A⋅B)₀
-
-        // (2²⁹⋅(A₁⋅B₁)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₂⋅B₀+A₀⋅B₂)₅₈…₀
-        // ⋯ (A₂⋅B₀+A₀⋅B₂)₂₈…₀ (A₂⋅B₀+A₀⋅B₂)₅₈…₂₉ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈
-        OP_2SWAP
-        // ⋯ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈ (A₂⋅B₀+A₀⋅B₂)₂₈…₀ (A₂⋅B₀+A₀⋅B₂)₅₈…₂₉
-        u29x2_add_u29u30_carry
-        // ⋯ (TEMP₁)₂₈…₀ (TEMP₁)₅₇…₂₉ (TEMP₁)₅₉…₅₈
-        OP_ROT OP_TOALTSTACK
-
-        // ⋯ (TEMP₁)₅₇…₂₉ (TEMP₁)₅₉…₅₈ | (TEMP₁)₂₈…₀
-        70 OP_ROLL
-        // ⋯ (TEMP₁)₅₇…₂₉ (TEMP₁)₅₉…₅₈ (A₁⋅B₁)₅₇…₂₉
-        u29x2_add_u29
-        // ⋯ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₂₈…₀ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₃₁…₂₉
-
-        // (2²⁹⋅(A₂⋅B₂)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₃⋅B₀+A₀⋅B₃)₅₈…₀ + (A₂⋅B₁+A₁⋅B₂)₅₈…₀
-        // ⋯ (A₃⋅B₀+A₀⋅B₃)₂₈…₀ (A₃⋅B₀+A₀⋅B₃)₅₈…₂₉ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₂₈…₀ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₃₁…₂₉
-        0 OP_TOALTSTACK
-        // ⋯ (A₃⋅B₀+A₀⋅B₃)₂₈…₀ (A₃⋅B₀+A₀⋅B₃)₅₈…₂₉ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₂₈…₀ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₃₁…₂₉ | 0
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        // ⋯ (A⋅B)₂ (TEMP₂)₂₈…₀ | (TEMP₂)₅₉…₅₈
-        
-        OP_FROMALTSTACK
-        // ⋯ (A⋅B)₂ (TEMP₂)₂₈…₀ (TEMP₂)₅₉…₅₈
-        OP_ROT OP_TOALTSTACK
-        // ⋯ (TEMP₂)₂₈…₀ (TEMP₂)₅₉…₅₈ | (A⋅B)₂ (A⋅B)₁ (A⋅B)₀
-        66 OP_ROLL
-        // ⋯ (TEMP₂)₂₈…₀ (TEMP₂)₅₉…₅₈ (A₂⋅B₂)₂₈…₀
-        u29x2_add_u29
-        // ⋯ (TEMP₂+(A₂⋅B₂)₂₈…₀)₂₈…₀ (TEMP₂+(A₂⋅B₂)₂₈…₀)₅₉…₅₈
-
-        // (2²⁹⋅(A₂⋅B₂)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₄⋅B₀+A₀⋅B₄)₅₈…₀ + (A₃⋅B₁+A₁⋅B₃)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        62 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₃⋅B₃)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₅⋅B₀+A₀⋅B₅)₅₈…₀ + (A₄⋅B₁+A₁⋅B₄)₅₈…₀ + (A₃⋅B₂+A₂⋅B₃)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        56 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₃⋅B₃)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₆⋅B₀+A₀⋅B₆)₅₈…₀ + (A₅⋅B₁+A₁⋅B₅)₅₈…₀ + (A₄⋅B₂+A₂⋅B₄)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        50 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₄⋅B₄)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₇⋅B₀+A₀⋅B₇)₅₈…₀ + (A₆⋅B₁+A₁⋅B₆)₅₈…₀ + (A₅⋅B₂+A₂⋅B₅)₅₈…₀ + (A₄⋅B₃+A₃⋅B₄)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        42 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₄⋅B₄)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₀+A₀⋅B₈)₅₈…₀ + (A₇⋅B₁+A₁⋅B₇)₅₈…₀ + (A₆⋅B₂+A₂⋅B₆)₅₈…₀ + (A₅⋅B₃+A₃⋅B₅)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        34 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₅⋅B₅)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₁+A₁⋅B₈)₅₈…₀ + (A₇⋅B₂+A₂⋅B₇)₅₈…₀ + (A₆⋅B₃+A₃⋅B₆)₅₈…₀ + (A₅⋅B₄+A₄⋅B₅)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        26 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₅⋅B₅)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₂+A₂⋅B₈)₅₈…₀ + (A₇⋅B₃+A₃⋅B₇)₅₈…₀ + (A₆⋅B₄+A₄⋅B₆)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        20 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₆⋅B₆)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₃+A₃⋅B₈)₅₈…₀ + (A₇⋅B₄+A₄⋅B₇)₅₈…₀ + (A₆⋅B₅+A₅⋅B₆)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        14 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₆⋅B₆)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₄+A₄⋅B₈)₅₈…₀ + (A₇⋅B₅+A₅⋅B₇)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        10 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₇⋅B₇)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₅+A₅⋅B₈)₅₈…₀ + (A₇⋅B₆+A₆⋅B₇)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        6 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₇⋅B₇)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₆+A₆⋅B₈)₅₈…₀
-        OP_2SWAP
-        u29x2_add_u29u30_carry
-        OP_ROT OP_TOALTSTACK
-        4 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₈⋅B₈)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₇+A₇⋅B₈)₅₈…₀
-        OP_2SWAP
-        u29x2_add_u29u30_carry
-        OP_ROT OP_TOALTSTACK
-        OP_ROT
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₈⋅B₈)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀
-        OP_SWAP OP_TOALTSTACK
-
-        // (⋯)₅₈…₂₉
-        OP_ADD
-        for _ in 1..18 {
-            OP_FROMALTSTACK
-        }
-    }
-}
-
-//                       A₈⋅B₈
-//                    A₈⋅B₇+A₇⋅B₈
-//                 A₈⋅B₆+A₇⋅B₇+A₆⋅B₈
-//              A₈⋅B₅+A₇⋅B₆+A₆⋅B₇+A₅⋅B₈
-//            A₈⋅B₄+A₇⋅B₅+A₆⋅B₆+A₅⋅B₇+A₄⋅B₈
-//         A₈⋅B₃+A₇⋅B₄+A₆⋅B₅+A₅⋅B₆+A₄⋅B₇+A₃⋅B₈
-//       A₈⋅B₂+A₇⋅B₃+A₆⋅B₄+A₅⋅B₅+A₄⋅B₆+A₃⋅B₇+A₂⋅B₈
-//    A₈⋅B₁+A₇⋅B₂+A₆⋅B₃+A₅⋅B₄+A₄⋅B₅+A₃⋅B₆+A₂⋅B₇+A₁⋅B₈
-// A₈⋅B₀+A₇⋅B₁+A₆⋅B₂+A₅⋅B₃+A₄⋅B₄+A₃⋅B₅+A₂⋅B₆+A₁⋅B₇+A₀⋅B₈
-//                        ⋯
-
-// ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀
-
-pub fn u29x9_mulhi_karazuba_imm(u29x9_constant: [u32; 9]) -> Script {
-    script! {
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀
-        { u29x9_mul_karazuba_imm(u29x9_constant) }
-        // ⋯ A₁₇ A₁₆ A₁₅ A₁₄ A₁₃ A₁₂ A₁₁ A₁₀ A₉ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀
-        OP_2DROP OP_2DROP OP_2DROP OP_2DROP OP_DROP
-        // ⋯ A₁₇ A₁₆ A₁₅ A₁₄ A₁₃ A₁₂ A₁₁ A₁₀ A₉
-    }
-}
-
-// (A₀⋅B₀)₂₈…₀
-
-// (A₀⋅B₀)₅₇…₂₉ +
-// (A₁⋅B₀+A₀⋅B₁)₂₈…₀
-
-// (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ +
-// (A₁⋅B₁)₂₈…₀ + (A₂⋅B₀+A₀⋅B₂)₂₈…₀
-
-// (A₁⋅B₁)₅₇…₂₉ + (A₂⋅B₀+A₀⋅B₂)₅₈…₂₉ +
-// (A₃⋅B₀+A₀⋅B₃)₂₈…₀ + (A₂⋅B₁+A₁⋅B₂)₂₈…₀
-
-// (A₃⋅B₀+A₀⋅B₃)₅₈…₂₉ + (A₂⋅B₁+A₁⋅B₂)₅₈…₂₉ +
-// (A₂⋅B₂)₂₈…₀ + (A₄⋅B₀+A₀⋅B₄)₂₈…₀ + (A₃⋅B₁+A₁⋅B₃)₂₈…₀
-
-// (A₂⋅B₂)₅₇…₂₉ + (A₄⋅B₀+A₀⋅B₄)₅₈…₂₉ + (A₃⋅B₁+A₁⋅B₃)₅₈…₂₉ +
-// (A₅⋅B₀+A₀⋅B₅)₂₈…₀ + (A₄⋅B₁+A₁⋅B₄)₂₈…₀ + (A₃⋅B₂+A₂⋅B₃)₂₈…₀
-
-// (A₅⋅B₀+A₀⋅B₅)₅₈…₂₉ + (A₄⋅B₁+A₁⋅B₄)₅₈…₂₉ + (A₃⋅B₂+A₂⋅B₃)₅₈…₂₉ +
-// (A₃⋅B₃)₂₈…₀ + (A₆⋅B₀+A₀⋅B₆)₂₈…₀ + (A₅⋅B₁+A₁⋅B₅)₂₈…₀ + (A₄⋅B₂+A₂⋅B₄)₂₈…₀
-
-// (A₃⋅B₃)₅₇…₂₉ + (A₆⋅B₀+A₀⋅B₆)₅₈…₂₉ + (A₅⋅B₁+A₁⋅B₅)₅₈…₂₉ + (A₄⋅B₂+A₂⋅B₄)₅₈…₂₉ +
-// (A₇⋅B₀+A₀⋅B₇)₂₈…₀ + (A₆⋅B₁+A₁⋅B₆)₂₈…₀ + (A₅⋅B₂+A₂⋅B₅)₂₈…₀ + (A₄⋅B₃+A₃⋅B₄)₂₈…₀
-
-// (A₇⋅B₀+A₀⋅B₇)₅₈…₂₉ + (A₆⋅B₁+A₁⋅B₆)₅₈…₂₉ + (A₅⋅B₂+A₂⋅B₅)₅₈…₂₉ + (A₄⋅B₃+A₃⋅B₄)₅₈…₂₉ +
-// (A₄⋅B₄)₂₈…₀ + (A₈⋅B₀+A₀⋅B₈)₂₈…₀ + (A₇⋅B₁+A₁⋅B₇)₂₈…₀ + (A₆⋅B₂+A₂⋅B₆)₂₈…₀ + (A₅⋅B₃+A₃⋅B₅)₂₈…₀
-
-// (A₄⋅B₄)₅₇…₂₉ + (A₈⋅B₀+A₀⋅B₈)₅₈…₂₉ + (A₇⋅B₁+A₁⋅B₇)₅₈…₂₉ + (A₆⋅B₂+A₂⋅B₆)₅₈…₂₉ + (A₅⋅B₃+A₃⋅B₅)₅₈…₂₉ +
-
-// A₈⋅B₀+A₇⋅B₁+A₆⋅B₂+A₅⋅B₃+A₄⋅B₄+A₃⋅B₅+A₂⋅B₆+A₁⋅B₇+A₀⋅B₈
-//    A₇⋅B₀+A₆⋅B₁+A₅⋅B₂+A₄⋅B₃+A₃⋅B₄+A₂⋅B₅+A₁⋅B₆+A₀⋅B₇
-//       A₆⋅B₀+A₅⋅B₁+A₄⋅B₂+A₃⋅B₃+A₂⋅B₄+A₁⋅B₅+A₀⋅B₆
-//         A₅⋅B₀+A₄⋅B₁+A₃⋅B₂+A₂⋅B₃+A₁⋅B₄+A₀⋅B₅
-//            A₄⋅B₀+A₃⋅B₁+A₂⋅B₂+A₁⋅B₃+A₀⋅B₄
-//               A₃⋅B₀+A₂⋅B₁+A₁⋅B₂+A₀⋅B₃
-//                  A₂⋅B₀+A₁⋅B₁+A₀⋅B₂
-//                     A₁⋅B₀+A₀⋅B₁
-//                        A₀⋅B₀
-
-// ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀
-
-pub fn u29x9_mullo_karazuba_imm(u29x9_constant: [u32; 9]) -> Script {
-    script! {
-        // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀
-
-        // A₁₊₀
-        OP_2DUP OP_ADD OP_TOALTSTACK
-        // A₂₊₀
-        2 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // 3₃₊₀
-        3 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // A₂₊₁
-        2 OP_PICK 2 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₄₊₀
-        4 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // A₃₊₁
-        3 OP_PICK 2 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₅₊₀
-        5 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // A₄₊₁
-        4 OP_PICK 2 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₃₊₂
-        OP_2OVER OP_ADD OP_TOALTSTACK
-        // A₆₊₀
-        6 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // A₅₊₁
-        5 OP_PICK 2 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₄₊₂
-        4 OP_PICK 3 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₇₊₀
-        7 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // A₆₊₁
-        6 OP_PICK 2 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₅₊₂
-        5 OP_PICK 3 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₄₊₃
-        4 OP_PICK 4 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₈₊₀
-        8 OP_PICK OP_OVER OP_ADD OP_TOALTSTACK
-        // A₇₊₁
-        7 OP_PICK 2 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₆₊₂
-        6 OP_PICK 3 OP_PICK OP_ADD OP_TOALTSTACK
-        // A₅₊₃
-        5 OP_PICK 4 OP_PICK OP_ADD OP_TOALTSTACK
-
-        for i in 0..9 {
-            { 8 + i } OP_ROLL
-            { u29_mul_carry_29_imm(u29x9_constant[8-i]) }
-            OP_SWAP
-        }
-
-        // A₅₊₃⋅B₅₊₃ - A₅⋅B₅ - A₃⋅B₃  <=>  A₅⋅B₃ + A₃⋅B₅
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[5] + u29x9_constant[3]) } // B₅₊₃
-        12 OP_PICK 14 OP_PICK u29x2_sub_noborrow
-        8  OP_PICK 10 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₅⋅B₃+A₃⋅B₅)₂₈…₀ (A₅⋅B₃+A₃⋅B₅)₅₈…₂₉
-        // A₆₊₂⋅B₆₊₂ - A₆⋅B₆ - A₂⋅B₂  <=>  A₆⋅B₂ + A₂⋅B₆
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[6] + u29x9_constant[2]) } // B₆₊₂
-        16 OP_PICK 18 OP_PICK u29x2_sub_noborrow
-        8 OP_PICK 10 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₆⋅B₂+A₂⋅B₆)₂₈…₀ (A₆⋅B₂+A₂⋅B₆)₅₈…₂₉
-        // A₇₊₁⋅B₇₊₁ - A₇⋅B₇ - A₁⋅B₁  <=>  A₇⋅B₁ + A₁⋅B₇
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[7] + u29x9_constant[1]) } // B₇₊₁
-        20 OP_PICK 22 OP_PICK u29x2_sub_noborrow
-        8 OP_PICK 10 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₇⋅B₁+A₁⋅B₇)₂₈…₀ (A₇⋅B₁+A₁⋅B₇)₅₈…₂₉
-        // A₈₊₀⋅B₈₊₀ - A₈⋅B₈ - A₀⋅B₀  <=>  A₈⋅B₀ + A₀⋅B₈
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[8] + u29x9_constant[0]) } // B₈₊₀
-        24 OP_PICK 26 OP_PICK u29x2_sub_noborrow
-        8 OP_PICK 10 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₈⋅B₀+A₀⋅B₈)₂₈…₀ (A₈⋅B₀+A₀⋅B₈)₅₈…₂₉
-        // A₄₊₃⋅B₄₊₃ - A₄⋅B₄ - A₃⋅B₃  <=>  A₄⋅B₃ + A₃⋅B₄
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[4] + u29x9_constant[3]) } // B₄₊₃
-        18 OP_PICK 20 OP_PICK u29x2_sub_noborrow
-        16 OP_PICK 18 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₄⋅B₃+A₃⋅B₄)₂₈…₀ (A₄⋅B₃+A₃⋅B₄)₅₈…₂₉
-        // A₅₊₂⋅B₅₊₂ - A₅⋅B₅ - A₂⋅B₂  <=>  A₅⋅B₂ + A₂⋅B₅
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[5] + u29x9_constant[2]) } // B₅₊₂
-        22 OP_PICK 24 OP_PICK u29x2_sub_noborrow
-        16 OP_PICK 18 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₅⋅B₂+A₂⋅B₅)₂₈…₀ (A₅⋅B₂+A₂⋅B₅)₅₈…₂₉
-        // A₆₊₁⋅B₆₊₁ - A₆⋅B₆ - A₁⋅B₁  <=>  A₆⋅B₁ + A₁⋅B₆
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[6] + u29x9_constant[1]) } // B₆₊₁
-        26 OP_PICK 28 OP_PICK u29x2_sub_noborrow
-        16 OP_PICK 18 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₆⋅B₁+A₁⋅B₆)₂₈…₀ (A₆⋅B₁+A₁⋅B₆)₅₈…₂₉
-        // A₇₊₀⋅B₇₊₀ - A₇⋅B₇ - A₀⋅B₀  <=>  A₇⋅B₀ + A₀⋅B₇
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[7] + u29x9_constant[0]) } // B₇₊₀
-        30 OP_PICK 32 OP_PICK u29x2_sub_noborrow
-        16 OP_PICK 18 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₇⋅B₀+A₀⋅B₇)₂₈…₀ (A₇⋅B₀+A₀⋅B₇)₅₈…₂₉
-        // A₄₊₂⋅B₄₊₂ - A₄⋅B₄ - A₂⋅B₂  <=>  A₄⋅B₂ + A₂⋅B₄
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[4] + u29x9_constant[2]) } // B₄₊₂
-        26 OP_PICK 28 OP_PICK u29x2_sub_noborrow
-        22 OP_PICK 24 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₄⋅B₂+A₂⋅B₄)₂₈…₀ (A₄⋅B₂+A₂⋅B₄)₅₈…₂₉
-        // A₅₊₁⋅B₅₊₁ - A₅⋅B₅ - A₁⋅B₁  <=>  A₅⋅B₁ + A₁⋅B₅
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[5] + u29x9_constant[1]) } // B₅₊₁
-        30 OP_PICK 32 OP_PICK u29x2_sub_noborrow
-        22 OP_PICK 24 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₅⋅B₁+A₁⋅B₅)₂₈…₀ (A₅⋅B₁+A₁⋅B₅)₅₈…₂₉
-        // A₆₊₀⋅B₆₊₀ - A₆⋅B₆ - A₀⋅B₀  <=>  A₆⋅B₀ + A₀⋅B₆
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[6] + u29x9_constant[0]) } // B₆₊₀
-        34 OP_PICK 36 OP_PICK u29x2_sub_noborrow
-        22 OP_PICK 24 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₆⋅B₀+A₀⋅B₆)₂₈…₀ (A₆⋅B₀+A₀⋅B₆)₅₈…₂₉
-        // A₃₊₂⋅B₃₊₂ - A₃⋅B₃ - A₂⋅B₂  <=>  A₃⋅B₂ + A₂⋅B₃
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[3] + u29x9_constant[2]) } // B₃₊₂
-        30 OP_PICK 32 OP_PICK u29x2_sub_noborrow
-        28 OP_PICK 30 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₃⋅B₂+A₂⋅B₃)₂₈…₀ (A₃⋅B₂+A₂⋅B₃)₅₈…₂₉
-        // A₄₊₁⋅B₄₊₁ - A₄⋅B₄ - A₁⋅B₁  <=>  A₄⋅B₁ + A₁⋅B₄
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[4] + u29x9_constant[1]) } // B₄₊₁
-        34 OP_PICK 36 OP_PICK u29x2_sub_noborrow
-        28 OP_PICK 30 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₄⋅B₁+A₁⋅B₄)₂₈…₀ (A₄⋅B₁+A₁⋅B₄)₅₈…₂₉
-        // A₅₊₀⋅B₅₊₀ - A₅⋅B₅ - A₀⋅B₀  <=>  A₅⋅B₀ + A₀⋅B₅
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[5] + u29x9_constant[0]) } // B₅₊₀
-        38 OP_PICK 40 OP_PICK u29x2_sub_noborrow
-        28 OP_PICK 30 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₅⋅B₀+A₀⋅B₅)₂₈…₀ (A₅⋅B₀+A₀⋅B₅)₅₈…₂₉
-        // A₃₊₁⋅B₃₊₁ - A₃⋅B₃ - A₁⋅B₁  <=>  A₃⋅B₁ + A₁⋅B₃
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[3] + u29x9_constant[1]) } // B₃₊₁
-        36 OP_PICK 38 OP_PICK u29x2_sub_noborrow
-        32 OP_PICK 34 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₃⋅B₁+A₁⋅B₃)₂₈…₀ (A₃⋅B₁+A₁⋅B₃)₅₈…₂₉
-        // A₄₊₀⋅B₄₊₀ - A₄⋅B₄ - A₀⋅B₀  <=>  A₄⋅B₀ + A₀⋅B₄
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[4] + u29x9_constant[0]) } // B₄₊₀
-        40 OP_PICK 42 OP_PICK u29x2_sub_noborrow
-        32 OP_PICK 34 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₄⋅B₀+A₀⋅B₄)₂₈…₀ (A₄⋅B₀+A₀⋅B₄)₅₈…₂₉
-        // A₂₊₁⋅B₂₊₁ - A₂⋅B₂ - A₁⋅B₁  <=>  A₂⋅B₁ + A₁⋅B₂
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[2] + u29x9_constant[1]) } // B₂₊₁
-        38 OP_PICK 40 OP_PICK u29x2_sub_noborrow
-        36 OP_PICK 38 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₂⋅B₁+A₁⋅B₂)₂₈…₀ (A₂⋅B₁+A₁⋅B₂)₅₈…₂₉
-        // A₃₊₀⋅B₃₊₀ - A₃⋅B₃ - A₀⋅B₀  <=>  A₃⋅B₀ + A₀⋅B₃
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[3] + u29x9_constant[0]) } // B₃₊₀
-        42 OP_PICK 44 OP_PICK u29x2_sub_noborrow
-        36 OP_PICK 38 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₃⋅B₀+A₀⋅B₃)₂₈…₀ (A₃⋅B₀+A₀⋅B₃)₅₈…₂₉
-        // A₂₊₀⋅B₂₊₀ - A₂⋅B₂ - A₀⋅B₀  <=>  A₂⋅B₀ + A₀⋅B₂
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[2] + u29x9_constant[0]) } // B₂₊₀
-        42 OP_PICK 44 OP_PICK u29x2_sub_noborrow
-        38 OP_PICK 40 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₂⋅B₀+A₀⋅B₂)₂₈…₀ (A₂⋅B₀+A₀⋅B₂)₅₈…₂₉
-        // A₁₊₀⋅B₁₊₀ - A₁⋅B₁ - A₀⋅B₀  <=>  A₁⋅B₀ + A₀⋅B₁
-        OP_FROMALTSTACK { u30_mul_to_u29_carry_31_imm(u29x9_constant[1] + u29x9_constant[0]) } // B₁₊₀
-        42 OP_PICK 44 OP_PICK u29x2_sub_noborrow
-        40 OP_PICK 42 OP_PICK u29x2_sub_noborrow
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉
-
-        40 OP_ROLL OP_TOALTSTACK
-        40 OP_ROLL
-        // ⋯ (A₀⋅B₀)₅₇…₂₉
-
-        // (2²⁹⋅(A₁⋅B₁)₂₈…₀+(A₀⋅B₀)₅₇…₂₉)₅₇…₀ + (A₁⋅B₀+A₀⋅B₁)₅₈…₀
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ (A₀⋅B₀)₅₇…₂₉
-        41 OP_ROLL
-        // ⋯ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉ (A₀⋅B₀)₅₇…₂₉ (A₁⋅B₁)₂₈…₀ | (A⋅B)₀
-        OP_2SWAP
-        // ⋯ (A₀⋅B₀)₅₇…₂₉ (A₁⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₂₈…₀ (A₁⋅B₀+A₀⋅B₁)₅₈…₂₉
-        u29x2_add_u29u30_carry
-        // (2²⁹⋅(A₁⋅B₁)₂₈…₀+(A₀⋅B₀)₅₇…₂₉)₅₇…₀ + (A₁⋅B₀+A₀⋅B₁)₅₈…₀  <=>  TEMP₁
-        // ⋯ (A⋅B)₁ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈
-        OP_ROT OP_TOALTSTACK
-        // ⋯ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈ | (A⋅B)₁ (A⋅B)₀
-
-        // (2²⁹⋅(A₁⋅B₁)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₂⋅B₀+A₀⋅B₂)₅₈…₀
-        // ⋯ (A₂⋅B₀+A₀⋅B₂)₂₈…₀ (A₂⋅B₀+A₀⋅B₂)₅₈…₂₉ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈
-        OP_2SWAP
-        // ⋯ (TEMP₁)₂₈…₀ (TEMP₁)₅₉…₅₈ (A₂⋅B₀+A₀⋅B₂)₂₈…₀ (A₂⋅B₀+A₀⋅B₂)₅₈…₂₉
-        u29x2_add_u29u30_carry
-        // ⋯ (TEMP₁)₂₈…₀ (TEMP₁)₅₇…₂₉ (TEMP₁)₅₉…₅₈
-        OP_ROT OP_TOALTSTACK
-
-        // ⋯ (TEMP₁)₅₇…₂₉ (TEMP₁)₅₉…₅₈ | (TEMP₁)₂₈…₀
-        38 OP_ROLL
-        // ⋯ (TEMP₁)₅₇…₂₉ (TEMP₁)₅₉…₅₈ (A₁⋅B₁)₅₇…₂₉
-        u29x2_add_u29
-        // ⋯ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₂₈…₀ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₃₁…₂₉
-
-        // (2²⁹⋅(A₂⋅B₂)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₃⋅B₀+A₀⋅B₃)₅₈…₀ + (A₂⋅B₁+A₁⋅B₂)₅₈…₀
-        // ⋯ (A₃⋅B₀+A₀⋅B₃)₂₈…₀ (A₃⋅B₀+A₀⋅B₃)₅₈…₂₉ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₂₈…₀ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₃₁…₂₉
-        0 OP_TOALTSTACK
-        // ⋯ (A₃⋅B₀+A₀⋅B₃)₂₈…₀ (A₃⋅B₀+A₀⋅B₃)₅₈…₂₉ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₂₈…₀ (TEMP₁+(A₁⋅B₁)₅₇…₂₉)₃₁…₂₉ | 0
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        // ⋯ (A⋅B)₂ (TEMP₂)₂₈…₀ | (TEMP₂)₅₉…₅₈
-        
-        OP_FROMALTSTACK
-        // ⋯ (A⋅B)₂ (TEMP₂)₂₈…₀ (TEMP₂)₅₉…₅₈
-        OP_ROT OP_TOALTSTACK
-        // ⋯ (TEMP₂)₂₈…₀ (TEMP₂)₅₉…₅₈ | (A⋅B)₂ (A⋅B)₁ (A⋅B)₀
-        34 OP_ROLL
-        // ⋯ (TEMP₂)₂₈…₀ (TEMP₂)₅₉…₅₈ (A₂⋅B₂)₂₈…₀
-        u29x2_add_u29
-        // ⋯ (TEMP₂+(A₂⋅B₂)₂₈…₀)₂₈…₀ (TEMP₂+(A₂⋅B₂)₂₈…₀)₅₉…₅₈
-
-        // (2²⁹⋅(A₂⋅B₂)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₄⋅B₀+A₀⋅B₄)₅₈…₀ + (A₃⋅B₁+A₁⋅B₃)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        30 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₃⋅B₃)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₅⋅B₀+A₀⋅B₅)₅₈…₀ + (A₄⋅B₁+A₁⋅B₄)₅₈…₀ + (A₃⋅B₂+A₂⋅B₃)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        24 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₃⋅B₃)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₆⋅B₀+A₀⋅B₆)₅₈…₀ + (A₅⋅B₁+A₁⋅B₅)₅₈…₀ + (A₄⋅B₂+A₂⋅B₄)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        18 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₄⋅B₄)₂₈…₀+(⋯)₅₈…₂₉)₅₈…₀ + (A₇⋅B₀+A₀⋅B₇)₅₈…₀ + (A₆⋅B₁+A₁⋅B₆)₅₈…₀ + (A₅⋅B₂+A₂⋅B₅)₅₈…₀ + (A₄⋅B₃+A₃⋅B₄)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        
-        OP_FROMALTSTACK
-        OP_ROT OP_TOALTSTACK
-        10 OP_ROLL
-        u29x2_add_u29
-
-        // (2²⁹⋅(A₄⋅B₄)₅₇…₂₉+(⋯)₅₈…₂₉)₅₈…₀ + (A₈⋅B₀+A₀⋅B₈)₅₈…₀ + (A₇⋅B₁+A₁⋅B₇)₅₈…₀ + (A₆⋅B₂+A₂⋅B₆)₅₈…₀ + (A₅⋅B₃+A₃⋅B₅)₅₈…₀
-        0 OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD OP_TOALTSTACK
-        OP_2SWAP u29x2_add_u29u30_carry OP_FROMALTSTACK OP_ADD
-        
-        OP_ROT OP_NIP OP_TOALTSTACK
-        OP_2DROP OP_2DROP OP_2DROP OP_2DROP OP_2DROP
-
-        for _ in 0..9 {
-            OP_FROMALTSTACK
-        }
-
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    
-
-    #[test]
-    fn test_u29_bits_to_altstack() {
-        println!(
-            "u29_bits_to_altstack: {} bytes",
-            u29_bits_to_altstack().len()
-        );
-        let script = script! {
-            { 0x187cfd47 } // Fq
-            { u29_bits_to_altstack() }
-                            1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 0 OP_EQUALVERIFY
-            OP_FROMALTSTACK 0 OP_EQUALVERIFY
-            OP_FROMALTSTACK 0 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 0 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 0 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 0 OP_EQUALVERIFY
-            OP_FROMALTSTACK 0 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 0 OP_EQUALVERIFY
-            OP_FROMALTSTACK 0 OP_EQUALVERIFY
-            OP_FROMALTSTACK 0 OP_EQUALVERIFY
-            OP_FROMALTSTACK 0 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUALVERIFY
-            OP_FROMALTSTACK 1 OP_EQUAL
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_u29_mul_carry_29() {
-        println!("u29_mul_carry_29: {} bytes", u29_mul_carry_29().len());
-        let script = script! {
-            { 0x187cfd47 } // Fq₀
-            { 0x10000001 } // Fr₀
-            { u29_mul_carry_29() }
-            { 0xC3E7EA4 } OP_EQUALVERIFY
-            { 0x87CFD47 } OP_EQUALVERIFY
-
-            { 0x10460b6 } // Fq₁
-            { 0x1f0fac9f } // Fr₁
-            { u29_mul_carry_29() }
-            { 0xFCBD3A } OP_EQUALVERIFY
-            { 0x75C590A } OP_EQUALVERIFY
-
-            { 0x1c72a34f } // Fq₂
-            { 0xe5c2450 } // Fr₂
-            { u29_mul_carry_29() }
-            { 0xCC41150 } OP_EQUALVERIFY
-            { 0x52E24B0 } OP_EQUALVERIFY
-
-            { 0x2d522d0 } // Fq₃
-            { 0x7d090f3 } // Fr₃
-            { u29_mul_carry_29() }
-            { 0xB115D4 } OP_EQUALVERIFY
-            { 0xCE50B70 } OP_EQUALVERIFY
-
-            { 0x1585d978 } // Fq₄
-            { 0x1585d283 } // Fr₄
-            { u29_mul_carry_29() }
-            { 0xE79D89D } OP_EQUALVERIFY
-            { 0x33AB868 } OP_EQUALVERIFY
-
-            { 0x2db40c0 } // Fq₅
-            { 0x2db40c0 } // Fr₅
-            { u29_mul_carry_29() }
-            { 0x414656 } OP_EQUALVERIFY
-            { 0x18E09000 } OP_EQUALVERIFY
-
-            { 0xa6e141 } // Fq₆
-            { 0xa6e141 } // Fr₆
-            { u29_mul_carry_29() }
-            { 0x36647 } OP_EQUALVERIFY
-            { 0x67F5281 } OP_EQUALVERIFY
-
-            { 0xe5c2634 } // Fq₇
-            { 0xe5c2634 } // Fr₇
-            { u29_mul_carry_29() }
-            { 0x671AAC9 } OP_EQUALVERIFY
-            { 0xB137A90 } OP_EQUALVERIFY
-
-            { 0x30644e } // Fq₈
-            { 0x30644e } // Fr₈
-            { u29_mul_carry_29() }
-            { 0x492E } OP_EQUALVERIFY
-            { 0x48D07C4 } OP_EQUALVERIFY
-
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_u29_mul_carry_29_imm() {
-        println!("u29_mul_carry_29_imm: {} bytes", u29_mul_carry_29_imm(0xaaaaaaa).len());
-        let script = script! {
-            { 0x187cfd47 } // Fq₀
-            { u29_mul_carry_29_imm(0x10000001) } // Fr₀
-            { 0xC3E7EA4 } OP_EQUALVERIFY
-            { 0x87CFD47 } OP_EQUALVERIFY
-
-            { 0x10460b6 } // Fq₁
-            { u29_mul_carry_29_imm(0x1f0fac9f) } // Fr₁
-            { 0xFCBD3A } OP_EQUALVERIFY
-            { 0x75C590A } OP_EQUALVERIFY
-
-            { 0x1c72a34f } // Fq₂
-            { u29_mul_carry_29_imm(0xe5c2450) } // Fr₂
-            { 0xCC41150 } OP_EQUALVERIFY
-            { 0x52E24B0 } OP_EQUALVERIFY
-
-            { 0x2d522d0 } // Fq₃
-            { u29_mul_carry_29_imm(0x7d090f3) } // Fr₃
-            { 0xB115D4 } OP_EQUALVERIFY
-            { 0xCE50B70 } OP_EQUALVERIFY
-
-            { 0x1585d978 } // Fq₄
-            { u29_mul_carry_29_imm(0x1585d283) } // Fr₄
-            { 0xE79D89D } OP_EQUALVERIFY
-            { 0x33AB868 } OP_EQUALVERIFY
-
-            { 0x2db40c0 } // Fq₅
-            { u29_mul_carry_29_imm(0x2db40c0) } // Fr₅
-            { 0x414656 } OP_EQUALVERIFY
-            { 0x18E09000 } OP_EQUALVERIFY
-
-            { 0xa6e141 } // Fq₆
-            { u29_mul_carry_29_imm(0xa6e141) } // Fr₆
-            { 0x36647 } OP_EQUALVERIFY
-            { 0x67F5281 } OP_EQUALVERIFY
-
-            { 0xe5c2634 } // Fq₇
-            { u29_mul_carry_29_imm(0xe5c2634) } // Fr₇
-            { 0x671AAC9 } OP_EQUALVERIFY
-            { 0xB137A90 } OP_EQUALVERIFY
-
-            { 0x30644e } // Fq₈
-            { u29_mul_carry_29_imm(0x30644e) } // Fr₈
-            { 0x492E } OP_EQUALVERIFY
-            { 0x48D07C4 } OP_EQUALVERIFY
-
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_u30_mul_to_u29_carry_31() {
-        println!(
-            "u30_mul_to_u29_carry_31: {} bytes",
-            u30_mul_to_u29_carry_31().len()
-        );
-        let script = script! {
-            // Multiply (Fq₂₈…₀ + Fq₅₇…₂₉) ⋅ (Fr₂₈…₀ + Fr₅₇…₂₉)
-            { 0x10460b6 } // Fq₅₇…₂₉
-            { 0x187cfd47 } // Fq₂₈…₀
-            OP_ADD
-            { 0x1f0fac9f } // Fr₅₇…₂₉
-            { 0x10000001 } // Fr₂₈…₀
-            OP_ADD
-            { u30_mul_to_u29_carry_31() }
-            { 0x25828046 } OP_EQUALVERIFY
-            { 0x10D3BA20 } OP_EQUALVERIFY
-
-            // Multiply (2³⁰-2¹) ⋅ (2³⁰-2¹)
-            { 0x1FFFFFFF }
-            // 2⁰⋅(2²⁹-1)
-            OP_DUP OP_ADD
-            // 2¹⋅(2²⁹-1)
-            OP_DUP
-            // 2¹⋅(2²⁹-1) 2¹⋅(2²⁹-1)
-            { u30_mul_to_u29_carry_31() }
-            { 0x7FFFFFF8 } OP_EQUALVERIFY
-            { 0x4 } OP_EQUALVERIFY
-
-            // Multiply 0x1426971c ⋅ 0x12627bef
-            { 0x1426971c }
-            { 0x12627bef }
-            // 0x1426971c 0x12627bef
-            { u30_mul_to_u29_carry_31() }
-            // 0xB598724 0xB93B939
-            { 0xB93B939 } OP_EQUALVERIFY
-            { 0xB598724 } OP_EQUALVERIFY
-
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_u30_mul_to_u29_carry_31_imm() {
-        println!(
-            "u30_mul_to_u29_carry_31_imm: {} bytes",
-            u30_mul_to_u29_carry_31_imm(0xaaaaaaa).len()
-        );
-        let script = script! {
-            // Multiply (Fq₂₈…₀ + Fq₅₇…₂₉) ⋅ (Fr₂₈…₀ + Fr₅₇…₂₉)
-            { 0x10460b6 + 0x187cfd47 } // Fq₅₇…₂₉ + Fq₂₈…₀
-            { u30_mul_to_u29_carry_31_imm(0x1f0fac9f + 0x10000001) } // Fr₅₇…₂₉ + Fr₂₈…₀
-            { 0x25828046 } OP_EQUALVERIFY
-            { 0x10D3BA20 } OP_EQUALVERIFY
-
-            // Multiply (2³⁰-2¹) ⋅ (2³⁰-2¹)
-            { 0x1FFFFFFF }
-            // 2⁰⋅(2²⁹-1)
-            OP_DUP OP_ADD
-            // 2¹⋅(2²⁹-1)
-            { u30_mul_to_u29_carry_31_imm(0x3FFFFFFE) } // 2¹⋅(2²⁹-1)
-            { 0x7FFFFFF8 } OP_EQUALVERIFY
-            { 0x4 } OP_EQUALVERIFY
-
-            // Multiply 0x1426971c ⋅ 0x12627bef
-            { 0x1426971c }
-            { u30_mul_to_u29_carry_31_imm(0x12627bef) }
-            // 0xB598724 0xB93B939
-            { 0xB93B939 } OP_EQUALVERIFY
-            { 0xB598724 } OP_EQUALVERIFY
-
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_u29x2_sub_noborrow() {
-        println!("u29x2_sub_noborrow: {} bytes", u29x2_sub_noborrow().len());
-        let script = script! {
-            1 14
-            16 1
-            { u29x2_sub_noborrow() }
-            12 OP_EQUALVERIFY
-            { 0x1FFFFFF1 } OP_EQUALVERIFY
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_u29x2_add_u29() {
-        println!("u29x2_add_u29: {} bytes", u29x2_add_u29().len());
-        let script = script! {
-            { 0x1FFFFFFF } { 0x1FFFFFFE }
-            { 0x1FFFFFFF }
-            { u29x2_add_u29() }
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFE } OP_EQUALVERIFY
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_u29x3_add_u29x2_nocarry() {
-        println!(
-            "u29x3_add_u29x2_nocarry: {} bytes",
-            u29x3_add_u29x2_nocarry().len()
-        );
-        let script = script! {
-            { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFE }
-            { 0x1FFFFFFF } { 0x1FFFFFFF }
-            { u29x3_add_u29x2_nocarry() }
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFE } OP_EQUALVERIFY
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_u29x2_add_u29u30_carry() {
-        println!(
-            "u29x2_add_u29u30_carry: {} bytes",
-            u29x2_add_u29u30_carry().len()
-        );
-        let script = script! {
-            { 0x1FFFFFFF } { 0x1FFFFFFF }
-            { 0x1FFFFFFF } { 0x3FFFFFFF }
-            { u29x2_add_u29u30_carry() }
-            2 OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFE } OP_EQUALVERIFY
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_u29x9_mul_karazuba() {
-        println!(
-            "u29x9_mul_karazuba: {} bytes",
-            u29x9_mul_karazuba(1, 0).len()
-        );
-        let script = script! {
-            { 0xFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF }
-            { 0xFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF }
-            { u29x9_mul_karazuba(1, 0) }
-            { 0x00000001 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x1E000000 } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x0007FFFF } OP_EQUALVERIFY
-            { 0x30644e } { 0xe5c2634 } { 0xa6e141 } { 0x2db40c0 } { 0x1585d978 } { 0x2d522d0 } { 0x1c72a34f } { 0x10460b6 } { 0x187cfd47 } // Fq₈…₀
-            { 0x30644e } { 0xe5c2634 } { 0xa6e141 } { 0x2db40c0 } { 0x1585d283 } { 0x7d090f3 } { 0xe5c2450 } { 0x1f0fac9f } { 0x10000001 } // Fr₈…₀
-            { u29x9_mul_karazuba(1, 0) }
-            { 0x87cfd47 } OP_EQUALVERIFY
-            { 0xd38e273 } OP_EQUALVERIFY
-            { 0xe4762f1 } OP_EQUALVERIFY
-            { 0x1cc210fa } OP_EQUALVERIFY
-            { 0x22abd0d } OP_EQUALVERIFY
-            { 0x142be5a2 } OP_EQUALVERIFY
-            { 0xa08b5c } OP_EQUALVERIFY
-            { 0x19881028 } OP_EQUALVERIFY
-            { 0x1a3d6934 } OP_EQUALVERIFY
-            { 0x1df1f38d } OP_EQUALVERIFY
-            { 0xa6ca99a } OP_EQUALVERIFY
-            { 0x9b129e5 } OP_EQUALVERIFY
-            { 0x1016080f } OP_EQUALVERIFY
-            { 0x4690e4d } OP_EQUALVERIFY
-            { 0x9bdf00d } OP_EQUALVERIFY
-            { 0x17f38b33 } OP_EQUALVERIFY
-            { 0x4b8763c } OP_EQUALVERIFY
-            { 0x492e } OP_EQUALVERIFY
-            // a.c0 = 0x1eaea6410b7b58843c06c0d8fca3dc0a7d82b11dfd91b7cb0c0ad3ba0ff345d8
-            { 0x1eaea6 }
-            { 0x8216f6b }
-            { 0x210f01b }
-            { 0x6c7e51 }
-            { 0x1dc0a7d8 }
-            { 0x5623bfb }
-            { 0x46df2c3 }
-            { 0x569dd0 }
-            { 0xff345d8 }
-            // b = 0x2adca7063c3e4dd8c35651e75e9feb1d044425f7b9bea3692eb980797d8988a4
-            { 0x2adca7 }
-            { 0xc787c9 }
-            { 0x17630d59 }
-            { 0x8f3af4f }
-            { 0x1eb1d044 }
-            { 0x84bef73 }
-            { 0xfa8da4b }
-            { 0x15cc03cb }
-            { 0x1d8988a4 }
-            // a.c0 * b
-            { u29x9_mul_karazuba(1, 0) }
-            { 0xd8b7e60 } OP_EQUALVERIFY
-            { 0xe368872 } OP_EQUALVERIFY
-            { 0x19b76105 } OP_EQUALVERIFY
-            { 0x11b2d28a } OP_EQUALVERIFY
-            { 0x17e1b306 } OP_EQUALVERIFY
-            { 0x11217389 } OP_EQUALVERIFY
-            { 0x8e5ccd0 } OP_EQUALVERIFY
-            { 0x107923b2 } OP_EQUALVERIFY
-            { 0xb45035d } OP_EQUALVERIFY
-            { 0xf7d973c } OP_EQUALVERIFY
-            { 0x109f03ed } OP_EQUALVERIFY
-            { 0x2f58350 } OP_EQUALVERIFY
-            { 0x6fc1dc1 } OP_EQUALVERIFY
-            { 0x7ad1455 } OP_EQUALVERIFY
-            { 0x1fc31efb } OP_EQUALVERIFY
-            { 0x1aa4308a } OP_EQUALVERIFY
-            { 0x1962398c } OP_EQUALVERIFY
-            { 0x2918 } OP_EQUALVERIFY
-            OP_TRUE
-        };
-
-        let exec_result = execute_script(script);
-        if !exec_result.success {
-            println!("ERROR: {:?} <---", exec_result.last_opcode)
-        }
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_u29x9_mulhi_karazuba_imm() {
-        println!(
-            "u29x9_mulhi_karazuba_imm: {} bytes",
-            u29x9_mulhi_karazuba_imm([0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa]).len()
-        );
-        let script = script! {
-            { 0xFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF }
-            { u29x9_mulhi_karazuba_imm([0x1FFFFFFF, 0x1FFFFFFF, 0x1FFFFFFF, 0x1FFFFFFF, 0x1FFFFFFF, 0x1FFFFFFF, 0x1FFFFFFF, 0x1FFFFFFF, 0xFFFFFF]) }
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x0007FFFF } OP_EQUALVERIFY
-            { 0x30644e } { 0xe5c2634 } { 0xa6e141 } { 0x2db40c0 } { 0x1585d978 } { 0x2d522d0 } { 0x1c72a34f } { 0x10460b6 } { 0x187cfd47 } // Fq₈…₀
-            { u29x9_mulhi_karazuba_imm([0x10000001, 0x1f0fac9f, 0xe5c2450, 0x7d090f3, 0x1585d283, 0x2db40c0, 0xa6e141, 0xe5c2634, 0x30644e]) } // Fr₈…₀
-            { 0x1df1f38d } OP_EQUALVERIFY
-            { 0xa6ca99a } OP_EQUALVERIFY
-            { 0x9b129e5 } OP_EQUALVERIFY
-            { 0x1016080f } OP_EQUALVERIFY
-            { 0x4690e4d } OP_EQUALVERIFY
-            { 0x9bdf00d } OP_EQUALVERIFY
-            { 0x17f38b33 } OP_EQUALVERIFY
-            { 0x4b8763c } OP_EQUALVERIFY
-            { 0x492e } OP_EQUALVERIFY
-            // a.c0 = 0x1eaea6410b7b58843c06c0d8fca3dc0a7d82b11dfd91b7cb0c0ad3ba0ff345d8
-            { 0x1eaea6 }
-            { 0x8216f6b }
-            { 0x210f01b }
-            { 0x6c7e51 }
-            { 0x1dc0a7d8 }
-            { 0x5623bfb }
-            { 0x46df2c3 }
-            { 0x569dd0 }
-            { 0xff345d8 }
-            // b = 0x2adca7063c3e4dd8c35651e75e9feb1d044425f7b9bea3692eb980797d8988a4
-            // a.c0 * b
-            { u29x9_mulhi_karazuba_imm([0x1d8988a4, 0x15cc03cb, 0xfa8da4b, 0x84bef73, 0x1eb1d044, 0x8f3af4f, 0x17630d59, 0xc787c9, 0x2adca7]) }
-            { 0xf7d973c } OP_EQUALVERIFY
-            { 0x109f03ed } OP_EQUALVERIFY
-            { 0x2f58350 } OP_EQUALVERIFY
-            { 0x6fc1dc1 } OP_EQUALVERIFY
-            { 0x7ad1455 } OP_EQUALVERIFY
-            { 0x1fc31efb } OP_EQUALVERIFY
-            { 0x1aa4308a } OP_EQUALVERIFY
-            { 0x1962398c } OP_EQUALVERIFY
-            { 0x2918 } OP_EQUALVERIFY
-            OP_TRUE
-        };
-
-        let exec_result = execute_script(script);
-        if !exec_result.success {
-            println!("ERROR: {:?} <---", exec_result.last_opcode)
-        }
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_u29x9_mullo_karazuba_imm() {
-        println!(
-            "u29x9_mullo_karazuba_imm: {} bytes",
-            u29x9_mullo_karazuba_imm([0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa, 0xaaaaaaa]).len()
-        );
-        let script = script! {
-            { 0xFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF }
-            { u29x9_mullo_karazuba_imm([0x1FFFFFFF, 0x1FFFFFFF, 0x1FFFFFFF, 0x1FFFFFFF, 0x1FFFFFFF, 0x1FFFFFFF, 0x1FFFFFFF, 0x1FFFFFFF, 0xFFFFFF]) }
-            { 0x00000001 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x1E000000 } OP_EQUALVERIFY
-            // p = 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47
-            // Mont(x) = 0xdc83629563d44755301fa84819caa36fb90a6020ce148c34e8384eb157ccc21 * x % p
-            // a.c0 = 0x1eaea6410b7b58843c06c0d8fca3dc0a7d82b11dfd91b7cb0c0ad3ba0ff345d8
-            // Mont(a.c0) = 0x12a7170d13e68fac161e7bff57ed8bf3edbd028512ed2695148fc5aec2b5266a
-            { 0x12a717 }
-            { 0x1a27cd1 }
-            { 0x1eb05879 }
-            { 0x1dffabf6 }
-            { 0x18bf3edb }
-            { 0x1a050a25 }
-            { 0x1b49a545 }
-            { 0x47e2d76 }
-            { 0x2b5266a }
-            // b = 0x2adca7063c3e4dd8c35651e75e9feb1d044425f7b9bea3692eb980797d8988a4
-            // Mont(b) = 0x20e60f32a6045965768b2eb95567a9237200ba53b43e88904c79d6cb5b913b1d
-            // Mont(a.c0) * Mont(b)
-            { u29x9_mullo_karazuba_imm([0x1b913b1d, 0x3ceb65a, 0xfa22413, 0x174a768, 0x1a923720, 0x175caab3, 0x595da2c, 0x654c08b, 0x20e60f]) }
-            // hi lo inv261p
-            // 0x100a85dd486e7773942750342fe7cc257f6121829ae1359536782df87d1b799c77
-            // hi lo p⁻¹
-            { u29x9_mullo_karazuba_imm([0x1B799C77, 0x16FC3E8, 0xD654D9E, 0x30535C2, 0x257F612, 0x1A17F3E6, 0xE509D40, 0x90DCEEE, 0x100A85DD]) }
-            // hi lo*p⁻¹
-            // 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47
-            { u29x9_mulhi_karazuba_imm([0x187CFD47, 0x10460B6, 0x1C72A34F, 0x2D522D0, 0x1585D978, 0x2DB40C0, 0xA6E141, 0xE5C2634, 0x30644E]) }
-            // hi lo*p⁻¹*p
-            { 0x12bf1c02 } OP_EQUALVERIFY
-            { 0x17b777a } OP_EQUALVERIFY
-            { 0x14ac7b2b } OP_EQUALVERIFY
-            { 0x163c642 } OP_EQUALVERIFY
-            { 0x7b7b2a } OP_EQUALVERIFY
-            { 0x15db34f1 } OP_EQUALVERIFY
-            { 0xf4eb1d2 } OP_EQUALVERIFY
-            { 0x16e7321e } OP_EQUALVERIFY
-            { 0xe8746 } OP_EQUALVERIFY
-            OP_TRUE
-        };
-
-        let exec_result = execute_script(script);
-        if !exec_result.success {
-            println!("ERROR: {:?} <---", exec_result.last_opcode)
-        }
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_u29x9_square() {
-        println!(
-            "u29x9_square: {} bytes",
-            u29x9_square(0).len()
-        );
-        let script = script! {
-            { 0xFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF } { 0x1FFFFFFF }
-            { u29x9_square(0) }
-            { 0x00000001 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x00000000 } OP_EQUALVERIFY
-            { 0x1E000000 } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x1FFFFFFF } OP_EQUALVERIFY
-            { 0x0007FFFF } OP_EQUALVERIFY
-            OP_TRUE
-        };
-
-        let exec_result = execute_script(script);
-        if !exec_result.success {
-            println!("ERROR: {:?} <---", exec_result.last_opcode);
-        }
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/bn254/curves.rs b/src/bn254/curves.rs
deleted file mode 100644
index 89044ce68..000000000
--- a/src/bn254/curves.rs
+++ /dev/null
@@ -1,1353 +0,0 @@
-use num_bigint::BigUint;
-
-use crate::bigint::U254;
-use crate::bn254::fp254impl::Fp254Impl;
-use crate::bn254::fq::Fq;
-use crate::bn254::fr::Fr;
-use crate::treepp::{script, Script};
-use std::cmp::min;
-use std::sync::OnceLock;
-
-static G1_DOUBLE_PROJECTIVE: OnceLock<Script> = OnceLock::new();
-static G1_NONZERO_ADD_PROJECTIVE: OnceLock<Script> = OnceLock::new();
-
-pub struct G1Projective;
-
-impl G1Projective {
-    pub fn push_generator() -> Script {
-        script! {
-            { Fq::push_one() }
-            { Fq::push_hex("2") }
-            { Fq::push_one() }
-        }
-    }
-
-    pub fn push_zero() -> Script {
-        script! {
-            { Fq::push_zero() }
-            { Fq::push_zero() }
-            { Fq::push_zero() }
-        }
-    }
-
-    pub fn push(element: ark_bn254::G1Projective) -> Script {
-        script! {
-            { Fq::push_u32_le(&BigUint::from(element.x).to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from(element.y).to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from(element.z).to_u32_digits()) }
-        }
-    }
-
-    pub fn is_zero_keep_element(a: u32) -> Script {
-        script! {
-            // Check if the third coordinate(z) is zero
-            { Fq::is_zero_keep_element(a * 3) }
-        }
-    }
-
-    pub fn nonzero_double() -> Script {
-        G1_DOUBLE_PROJECTIVE
-            .get_or_init(|| {
-                script! {
-                    { Fq::copy(2) }
-                    { Fq::square() }
-                    { Fq::copy(2) }
-                    { Fq::square() }
-                    { Fq::copy(0) }
-                    { Fq::square() }
-                    { Fq::add(5, 1) }
-                    { Fq::square() }
-                    { Fq::copy(1) }
-                    { Fq::sub(1, 0) }
-                    { Fq::copy(2) }
-                    { Fq::sub(1, 0) }
-                    { Fq::double(0) }
-                    { Fq::copy(2) }
-                    { Fq::double(0) }
-                    { Fq::add(3, 0) }
-                    { Fq::copy(0) }
-                    { Fq::square() }
-                    { Fq::copy(2) }
-                    { Fq::double(0) }
-                    { Fq::sub(1, 0) }
-                    { Fq::copy(0) }
-                    { Fq::sub(3, 0) }
-                    { Fq::roll(2) }
-                    { Fq::mul() }
-                    { Fq::double(2) }
-                    { Fq::double(0) }
-                    { Fq::double(0) }
-                    { Fq::sub(1, 0) }
-                    { Fq::roll(2) }
-                    { Fq::roll(3) }
-                    { Fq::mul() }
-                    { Fq::double(0) }
-                }
-            })
-            .clone()
-    }
-
-    pub fn double() -> Script {
-        script! {
-            { G1Projective::copy(0) }
-            { G1Projective::toaltstack() }
-            // Check if the first point is zero
-            { G1Projective::is_zero_keep_element(0) }
-            OP_TOALTSTACK
-            // Perform a regular addition
-            { G1Projective::nonzero_double() }
-
-            // Select result
-            OP_FROMALTSTACK
-            OP_IF
-                // Return original point
-                { G1Projective::drop() }
-                { G1Projective::fromaltstack() }
-            OP_ELSE
-                // Return regular addition result
-                { G1Projective::fromaltstack() }
-                { G1Projective::drop() }
-            OP_ENDIF
-        }
-    }
-
-    pub fn nonzero_add() -> Script {
-        G1_NONZERO_ADD_PROJECTIVE
-            .get_or_init(|| {
-                script! {
-                    { Fq::copy(3) }
-                    { Fq::square() }
-                    { Fq::copy(1) }
-                    { Fq::square() }
-                    { Fq::roll(7) }
-                    { Fq::copy(1) }
-                    { Fq::mul() }
-                    { Fq::roll(5) }
-                    { Fq::copy(3) }
-                    { Fq::mul() }
-                    { Fq::copy(2) }
-                    { Fq::roll(8) }
-                    { Fq::mul() }
-                    { Fq::copy(5) }
-                    { Fq::mul() }
-                    { Fq::copy(4) }
-                    { Fq::roll(7) }
-                    { Fq::mul() }
-                    { Fq::copy(7) }
-                    { Fq::mul() }
-                    { Fq::add(7, 6)}
-                    { Fq::copy(4) }
-                    { Fq::sub(4, 0)}
-                    { Fq::copy(0) }
-                    { Fq::double(0) }
-                    { Fq::square() }
-                    { Fq::copy(1) }
-                    { Fq::copy(1) }
-                    { Fq::mul() }
-                    { Fq::copy(5) }
-                    { Fq::sub(5, 0) }
-                    { Fq::double(0) }
-                    { Fq::roll(6) }
-                    { Fq::roll(3) }
-                    { Fq::mul() }
-                    { Fq::copy(1) }
-                    { Fq::square() }
-                    { Fq::copy(3) }
-                    { Fq::sub(1, 0) }
-                    { Fq::copy(1) }
-                    { Fq::double(0) }
-                    { Fq::sub(1, 0) }
-                    { Fq::copy(0) }
-                    { Fq::sub(2, 0) }
-                    { Fq::roll(2) }
-                    { Fq::mul() }
-                    { Fq::roll(5) }
-                    { Fq::roll(3) }
-                    { Fq::mul() }
-                    { Fq::double(0) }
-                    { Fq::sub(1, 0) }
-                    { Fq::roll(3) }
-                    { Fq::square() }
-                    { Fq::sub(0, 5) }
-                    { Fq::sub(0, 4) }
-                    { Fq::roll(3) }
-                    { Fq::mul() }
-                }
-            })
-            .clone()
-    }
-
-    pub fn add() -> Script {
-        script! {
-            { G1Projective::copy(0) }
-            { G1Projective::toaltstack() }
-            { G1Projective::copy(1) }
-            { G1Projective::toaltstack() }
-
-            // Check if the first point is zero
-            { G1Projective::is_zero_keep_element(0) }
-            OP_TOALTSTACK
-            // Check if the second point is zero
-            { G1Projective::is_zero_keep_element(1) }
-            OP_TOALTSTACK
-
-            // Perform a regular addition
-            { G1Projective::nonzero_add() }
-
-            // Select result
-            OP_FROMALTSTACK
-            OP_FROMALTSTACK
-            OP_IF
-                // First point is zero
-                OP_DROP
-                { G1Projective::drop() }
-                { G1Projective::fromaltstack() }
-                { G1Projective::fromaltstack() }
-                { G1Projective::drop() }
-            OP_ELSE
-                OP_IF
-                    // Second point is zero
-                    { G1Projective::drop() }
-                    { G1Projective::fromaltstack() }
-                    { G1Projective::drop() }
-                    { G1Projective::fromaltstack() }
-
-                OP_ELSE
-                    // Both summands are non-zero
-                    { G1Projective::fromaltstack() }
-                    { G1Projective::fromaltstack() }
-                    { G1Projective::drop() }
-                    { G1Projective::drop() }
-                OP_ENDIF
-            OP_ENDIF
-        }
-    }
-
-    pub fn neg() -> Script {
-        script! {
-            { Fq::neg(1) }
-            { Fq::roll(1) }
-        }
-    }
-
-    pub fn copy(mut a: u32) -> Script {
-        a *= 3;
-        script! {
-            { Fq::copy(a + 2) }
-            { Fq::copy(a + 2) }
-            { Fq::copy(a + 2) }
-        }
-    }
-
-    pub fn roll(mut a: u32) -> Script {
-        a *= 3;
-        script! {
-            { Fq::roll(a + 2) }
-            { Fq::roll(a + 2) }
-            { Fq::roll(a + 2) }
-        }
-    }
-
-    pub fn equalverify() -> Script {
-        script! {
-            { Fq::copy(3) }
-            { Fq::square() }
-            { Fq::roll(4) }
-            { Fq::copy(1) }
-            { Fq::mul() }
-
-            { Fq::copy(2) }
-            { Fq::square() }
-            { Fq::roll(3) }
-            { Fq::copy(1) }
-            { Fq::mul() }
-
-            { Fq::roll(7) }
-            { Fq::roll(2) }
-            { Fq::mul() }
-            { Fq::roll(5) }
-            { Fq::roll(4) }
-            { Fq::mul() }
-            { Fq::equalverify(1, 0) }
-
-            { Fq::roll(3) }
-            { Fq::roll(1) }
-            { Fq::mul() }
-            { Fq::roll(2) }
-            { Fq::roll(2) }
-            { Fq::mul() }
-            { Fq::equalverify(1, 0) }
-        }
-    }
-
-    pub fn drop() -> Script {
-        script! {
-            { Fq::drop() }
-            { Fq::drop() }
-            { Fq::drop() }
-        }
-    }
-
-    pub fn toaltstack() -> Script {
-        script! {
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-        }
-    }
-
-    pub fn fromaltstack() -> Script {
-        script! {
-            { Fq::fromaltstack() }
-            { Fq::fromaltstack() }
-            { Fq::fromaltstack() }
-        }
-    }
-
-    // Input Stack: [x, y, z]
-    // Output Stack: [x/z^2, y/z^3]
-    pub fn into_affine() -> Script {
-        script!(
-            // Copy input x and y to altstack
-            { Fq::copy(1) }
-            { Fq::toaltstack() }
-            { Fq::copy(2) }
-            { Fq::toaltstack() }
-
-            // 1. Check if the first point is zero
-            { G1Projective::is_zero_keep_element(0) }
-            OP_TOALTSTACK
-
-            // 2. Otherwise, check if the point.z is one
-            { Fq::is_one_keep_element(0) }
-            OP_TOALTSTACK
-
-            // Run normal calculation anyway
-            // 2.2 Otherwise, Z is non-one, so it must have an inverse in a field.
-            // conpute Z^-1
-            { Fq::inv() }
-
-            // compute Z^-2
-            { Fq::copy(0) }
-            { Fq::square() }
-            // compute Z^-3 = Z^-2 * z^-1
-            { Fq::copy(0) }
-            { Fq::roll(2) }
-            { Fq::mul() }
-
-            // For now, stack: [x, y, z^-2, z^-3]
-
-            // compute Y/Z^3 = Y * Z^-3
-            { Fq::roll(2) }
-            { Fq::mul() }
-
-            // compute X/Z^2 = X * Z^-2
-            { Fq::roll(1) }
-            { Fq::roll(2) }
-            { Fq::mul() }
-
-            // Return (x,y)
-            { Fq::roll(1) }
-
-            // Select the result
-            OP_FROMALTSTACK
-            OP_FROMALTSTACK
-            OP_IF
-                // Z is zero so drop the calculated affine point and return the affine::identity
-                OP_DROP
-                { Fq::drop() }
-                { Fq::drop() }
-                { Fq::fromaltstack() }
-                { Fq::fromaltstack() }
-                { Fq::drop() }
-                { Fq::drop() }
-                { G1Affine::identity() }
-            OP_ELSE
-                OP_IF
-                    // Z was one so drop the the calculated result and return the original input
-                    // If Z is one, the point is already normalized, so that: projective.x = affine.x, projective.y = affine.y
-                    { Fq::drop() }
-                    { Fq::drop() }
-                    { Fq::fromaltstack() }
-                    { Fq::fromaltstack() }
-                OP_ELSE
-                    { Fq::fromaltstack() }
-                    { Fq::fromaltstack() }
-                    { Fq::drop() }
-                    { Fq::drop() }
-                OP_ENDIF
-            OP_ENDIF
-        )
-    }
-
-    /// Convert a number to digits
-    fn to_digits_helper<const DIGIT_COUNT: usize>(mut number: u32) -> [u8; DIGIT_COUNT] {
-        let mut digits: [u8; DIGIT_COUNT] = [0; DIGIT_COUNT];
-        for i in 0..DIGIT_COUNT {
-            let digit = number % 2;
-            number = (number - digit) / 2;
-            digits[i] = digit as u8;
-        }
-        digits
-    }
-
-    /// input stack: point_0, scalar_0, ..., point_{TERMS-1}, scalar_{TERMS-1}
-    /// output stack: sum of scalar_i * point_i for 0..TERMS
-    /// comments: pi -> point_i, si -> scalar_i
-    pub fn batched_scalar_mul<const TERMS: usize>() -> Script {
-        // comments for 2
-        // point_0 scalar_0 point_1 scalar_1
-        let s = script! {
-            // convert scalars to bit-style
-            for i in 0..1 {
-                { Fq::roll(4*(TERMS - i - 1) as u32) }
-
-                { Fr::decode_montgomery() }
-                { Fr::convert_to_le_bits_toaltstack() }
-            }
-
-            for term in 1..TERMS {
-                { Fq::roll(4*(TERMS - term - 1) as u32) }
-
-                { Fr::decode_montgomery() }
-                { Fr::convert_to_le_bits_toaltstack() }
-
-                for _ in 0..2*Fr::N_BITS {
-                    OP_FROMALTSTACK
-                }
-
-                // zip scalars
-                // [p0, p1, s1_0, s1_1, s1_2, ..., s0_0, s0_1, s0_2, ...]
-                for i in 0..Fr::N_BITS {
-                    { Fr::N_BITS - i } OP_ROLL
-                    for _ in 0..term {OP_DUP OP_ADD} OP_ADD //  s0_0 + s1_0*2
-                    OP_TOALTSTACK
-                }
-            }
-
-            // get some bases (2^TERMS bases) [p0, p1]
-            // ouptut: [p1+p0, p1, p0, 0]
-            { G1Projective::push_zero() }
-            { G1Projective::toaltstack() }
-
-            for i in 1..(u32::pow(2, TERMS as u32)) {
-                {G1Projective::push_zero()}
-                for (j, mark) in Self::to_digits_helper::<TERMS>(i).iter().enumerate() {
-                    if *mark == 1 {
-                        { G1Projective::copy(TERMS as u32 - j as u32) }
-                        { G1Projective::add() }
-                    }
-                }
-                { G1Projective::toaltstack() }
-            }
-
-            for _ in 0..TERMS {
-                { G1Projective::drop() }
-            }
-
-            for _ in 0..(u32::pow(2, TERMS as u32)) {
-                { G1Projective::fromaltstack() }
-            }
-
-            { G1Projective::push_zero() } // target
-            // [p1+p0, p1, p0, 0, target]
-            // for i in 0..Fr::N_BITS {
-            for i in 0..Fr::N_BITS {
-                OP_FROMALTSTACK // idx = s1_0*2 + s0_0
-                OP_1 OP_ADD // idx + 1
-
-                // simulate {G1Projective::pick()}
-                for _ in 0..26 { OP_DUP }
-                for _ in 0..26 { OP_ADD }
-                { 26 } OP_ADD // [p1+p0, p1, p0, 0, target, 27*(idx+1)+26]
-                for _ in 0..26 { OP_DUP }
-                for _ in 0..26 { OP_TOALTSTACK }
-                OP_PICK
-                for _ in 0..26 { OP_FROMALTSTACK OP_PICK }
-
-                { G1Projective::add() }
-                // jump the last one
-                if i != Fr::N_BITS-1 {
-                    { G1Projective::double() }
-                }
-            }
-
-            // clear stack
-            { G1Projective::toaltstack() }
-            for _ in 0..u32::pow(2, TERMS as u32) {
-                { G1Projective::drop() }
-            }
-
-            { G1Projective::fromaltstack() }
-        };
-        s
-    }
-
-    fn dfs(index: u32, depth: u32,  mask: u32, offset: u32) -> Script {
-        if depth == 0 {
-            return script!{
-                OP_IF
-                    { G1Projective::copy(offset - (mask + (1<<index))) }
-                OP_ELSE
-                    if mask == 0 {
-                        OP_FROMALTSTACK
-                        OP_NOT
-                        OP_TOALTSTACK
-                    } else {
-                        { G1Projective::copy(offset - mask) }
-                    }
-                OP_ENDIF
-            };
-        }
-        script!{
-            OP_IF 
-                { G1Projective::dfs(index+1, depth-1, mask + (1<<index), offset) }
-            OP_ELSE
-                { G1Projective::dfs(index+1, depth-1, mask, offset) }
-            OP_ENDIF
-        }
-    }
-
-    // [g1projective, scalar]
-    pub fn scalar_mul() -> Script {
-        let mut loop_scripts = Vec::new();
-        let mut i = 0;
-        // options: i_step = 2, 3, 4
-        let i_step = 4;
-
-        while i < Fr::N_BITS { 
-            let depth = min(Fr::N_BITS - i, i_step);
-
-            if i > 0 {
-                let double_loop = script! {
-                    for _ in 0..depth {
-                        { G1Projective::double() }
-                    }
-                };
-                loop_scripts.push(double_loop.clone());
-            }
-
-            loop_scripts.push(script!{
-                for _ in 0..depth {
-                    OP_FROMALTSTACK
-                }
-            });
-
-            let add_loop = script! {
-                OP_TRUE
-                OP_TOALTSTACK
-                { G1Projective::dfs(0, depth - 1, 0, 1<<i_step) }
-                OP_FROMALTSTACK
-
-                OP_IF
-                    { G1Projective::add() }
-                OP_ENDIF
-            };
-            loop_scripts.push(add_loop.clone());
-            i += i_step;
-        }
-
-        script! {
-            { Fr::decode_montgomery() }
-            { Fr::convert_to_le_bits_toaltstack() }
-
-            { G1Projective::copy(0) }
-            { G1Projective::double() }
-            for i in 3..(1<<i_step) { 
-                { G1Projective::copy(0) }
-                { G1Projective::copy(i - 1) }
-                { G1Projective::add() }
-            }
-
-            { G1Projective::push_zero() }
-
-            for script in loop_scripts {
-                { script }
-            }
-
-            { G1Projective::toaltstack() }
-            for _ in 1..(1<<i_step) {
-                { G1Projective::drop() }
-            }
-            { G1Projective::fromaltstack() }
-        }
-    }
-
-    fn dfs_with_constant_mul(index: u32, depth: u32,  mask: u32, p_mul: &Vec<ark_bn254::G1Projective>) -> Script {
-        if depth == 0 {
-            return script!{
-                OP_IF
-                    { G1Projective::push(p_mul[(mask + (1<<index) - 1) as usize]) }
-                OP_ELSE
-                    if mask == 0 {
-                        OP_FROMALTSTACK
-                        OP_NOT
-                        OP_TOALTSTACK
-                    } else {
-                        { G1Projective::push(p_mul[(mask - 1) as usize]) }
-                    }
-                OP_ENDIF
-            };
-        }
-
-        script!{
-            OP_IF 
-                { G1Projective::dfs_with_constant_mul(index+1, depth-1, mask + (1<<index), p_mul) }
-            OP_ELSE
-                { G1Projective::dfs_with_constant_mul(index+1, depth-1, mask, p_mul) }
-            OP_ENDIF
-        }
-    }
-
-    // [g1projective]
-    pub fn scalar_mul_by_constant_g1(p: ark_bn254::G1Projective) -> Script {
-        let mut loop_scripts = Vec::new();
-        let mut i = 0;
-        // options: i_step = 2-15
-        let i_step = 12;
-
-        let mut p_mul: Vec<ark_ec::short_weierstrass::Projective<ark_bn254::g1::Config>> = Vec::new();
-        p_mul.push(p);
-        for _ in 0..(1<<i_step) { 
-            p_mul.push(p_mul.last().unwrap() + p);
-        }
-
-        while i < Fr::N_BITS { 
-            let depth = min(Fr::N_BITS - i, i_step);
-
-            if i > 0 {
-                let double_loop = script! {
-                    for _ in 0..depth {
-                        { G1Projective::double() }
-                    }
-                };
-                loop_scripts.push(double_loop.clone());
-            }
-
-            loop_scripts.push(script!{
-                for _ in 0..depth {
-                    OP_FROMALTSTACK
-                }
-            });
-
-            let add_loop = script! {
-                OP_TRUE
-                OP_TOALTSTACK
-                { G1Projective::dfs_with_constant_mul(0, depth - 1, 0, &p_mul) }
-                OP_FROMALTSTACK
-
-                OP_IF
-                    { G1Projective::add() }
-                OP_ENDIF
-            };
-            loop_scripts.push(add_loop.clone());
-            i += i_step;
-        }
-
-        script! {
-            { Fr::decode_montgomery() }
-            { Fr::convert_to_le_bits_toaltstack() }
-
-            { G1Projective::push_zero() }
-
-            for script in loop_scripts {
-                { script }
-            }
-        }
-    }
-
-}
-
-pub struct G1Affine;
-
-impl G1Affine {
-    pub fn identity() -> Script {
-        script! {
-            { Fq::push_zero() }
-            { Fq::push_zero() }
-        }
-    }
-
-    pub fn is_on_curve() -> Script {
-        script! {
-            { Fq::copy(1) }
-            { Fq::square() }
-            { Fq::roll(2) }
-            { Fq::mul() }
-            { Fq::push_hex("3") }
-            { Fq::add(1, 0) }
-            { Fq::roll(1) }
-            { Fq::square() }
-            { Fq::equal(1, 0) }
-        }
-    }
-
-    pub fn convert_to_compressed() -> Script {
-        script! {
-            // move y to the altstack
-            { Fq::toaltstack() }
-            // convert x into bytes
-            { Fq::convert_to_be_bytes() }
-            // bring y to the main stack
-            { Fq::fromaltstack() }
-            { Fq::decode_montgomery() }
-            // push (q + 1) / 2
-            { U254::push_hex(Fq::P_PLUS_ONE_DIV2) }
-            // check if y >= (q + 1) / 2
-            { U254::greaterthanorequal(1, 0) }
-            // modify the most significant byte
-            OP_IF
-                { 0x80 } OP_ADD
-            OP_ENDIF
-        }
-    }
-    // Init stack: [x1,y1,x2,y2)
-    pub fn equalverify() -> Script {
-        script! {
-            { Fq::roll(2) }
-            { Fq::equalverify(1, 0) }
-            { Fq::equalverify(1, 0) }
-        }
-    }
-    // Input Stack: [x,y]
-    // Output Stack: [x,y,z] (z=1)
-    pub fn into_projective() -> Script { script!({ Fq::push_one() }) }
-}
-
-#[cfg(test)]
-mod test {
-
-    use crate::bn254::curves::{G1Affine, G1Projective};
-    use crate::bn254::fq::Fq;
-    use crate::treepp::{script, Script};
-    use crate::{execute_script, execute_script_as_chunks, run};
-
-    use crate::bn254::fp254impl::Fp254Impl;
-    use ark_bn254::Fr;
-    use ark_ec::{AffineRepr, CurveGroup};
-    use ark_ff::{BigInteger, Field, PrimeField};
-    use ark_std::{end_timer, start_timer, UniformRand};
-    use core::ops::{Add, Mul};
-    use num_bigint::BigUint;
-    use num_traits::{One, Zero};
-    // use std::ops::Mul;
-
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-    use std::ops::Neg;
-
-    fn g1_affine_push(point: ark_bn254::G1Affine) -> Script {
-        script! {
-            { Fq::push_u32_le(&BigUint::from(point.x).to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from(point.y).to_u32_digits()) }
-        }
-    }
-
-    fn fr_push(scalar: Fr) -> Script {
-        script! {
-            { crate::bn254::fr::Fr::push_u32_le(&BigUint::from(scalar).to_u32_digits()) }
-        }
-    }
-
-    #[test]
-    fn test_affine_identity() {
-        let equalverify = G1Affine::equalverify();
-        println!("G1Affine.equalverify: {} bytes", equalverify.len());
-
-        for _ in 0..1 {
-            let expect = ark_bn254::G1Affine::identity();
-
-            let script = script! {
-                { G1Affine::identity() }
-                { g1_affine_push(expect) }
-                { equalverify.clone() }
-                OP_TRUE
-            };
-            println!("curves::test_affine_identity = {} bytes", script.len());
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_copy() {
-        println!("G1.copy: {} bytes", G1Projective::copy(1).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::G1Projective::rand(&mut prng);
-            let b = ark_bn254::G1Projective::rand(&mut prng);
-
-            let script = script! {
-                { G1Projective::push(a) }
-                { G1Projective::push(b) }
-
-                // Copy a
-                { G1Projective::copy(1) }
-
-                // Push another `a` and then compare
-                { G1Projective::push(a) }
-                { G1Projective::equalverify() }
-
-                // Drop the original a and b
-                { G1Projective::drop() }
-                { G1Projective::drop() }
-                OP_TRUE
-            };
-            println!("curves::test_copy = {} bytes", script.len());
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_roll() {
-        println!("G1.roll: {} bytes", G1Projective::roll(1).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::G1Projective::rand(&mut prng);
-            let b = ark_bn254::G1Projective::rand(&mut prng);
-
-            let script = script! {
-                { G1Projective::push(a) }
-                { G1Projective::push(b) }
-
-                // Roll a
-                { G1Projective::roll(1) }
-
-                // Push another `a` and then compare
-                { G1Projective::push(a) }
-                { G1Projective::equalverify() }
-
-                // Drop the original a and b
-                { G1Projective::drop() }
-                OP_TRUE
-            };
-            println!("curves::test_roll = {} bytes", script.len());
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_double_projective() {
-        println!("G1.double: {} bytes", G1Projective::double().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::G1Projective::rand(&mut prng);
-            let c = a.add(&a);
-
-            let script = script! {
-                { G1Projective::push(a) }
-                { G1Projective::double() }
-                { G1Projective::push(c) }
-                { G1Projective::equalverify() }
-                OP_TRUE
-            };
-            println!("curves::test_double_projective = {} bytes", script.len());
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_nonzero_add_projective() {
-        println!(
-            "G1.nonzero_add: {} bytes",
-            G1Projective::nonzero_add().len()
-        );
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::G1Projective::rand(&mut prng);
-            let b = ark_bn254::G1Projective::rand(&mut prng);
-            let c = a.add(&b);
-
-            let script = script! {
-                { G1Projective::push(a) }
-                { G1Projective::push(b) }
-                { G1Projective::nonzero_add() }
-                { G1Projective::push(c) }
-                { G1Projective::equalverify() }
-                OP_TRUE
-            };
-            println!(
-                "curves::test_nonzero_add_projective = {} bytes",
-                script.len()
-            );
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_add_curves() {
-        println!("G1.nonzero_add: {} bytes", G1Projective::add().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::G1Projective::rand(&mut prng);
-            let b = ark_bn254::G1Projective::rand(&mut prng);
-            let c = a.add(&b);
-
-            let script = script! {
-                // Test random a + b = c
-                { G1Projective::push(a) }
-                { G1Projective::push(b) }
-                { G1Projective::add() }
-                { G1Projective::push(c) }
-                { G1Projective::equalverify() }
-
-                // Test random a + 0 = a
-                { G1Projective::push(a) }
-                { G1Projective::push_zero() }
-                { G1Projective::add() }
-                { G1Projective::push(a) }
-                { G1Projective::equalverify() }
-
-                // Test random 0 + a = a
-                { G1Projective::push_zero() }
-                { G1Projective::push(a) }
-                { G1Projective::add() }
-                { G1Projective::push(a) }
-                { G1Projective::equalverify() }
-
-                OP_TRUE
-            };
-            println!("curves::test_add = {} bytes", script.len());
-            run(script);
-        }
-    }
-
-    #[test]
-    fn test_scalar_mul() {
-        let scalar_mul = G1Projective::scalar_mul();
-        println!("G1.scalar_mul: {} bytes", scalar_mul.len());
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let scalar = Fr::rand(&mut prng);
-
-            let p = ark_bn254::G1Projective::rand(&mut prng);
-            let q = p.mul(scalar);
-
-            let script = script! {
-                { G1Projective::push(p) }
-                { fr_push(scalar) }
-                { scalar_mul.clone() }
-                { G1Projective::push(q) }
-                { G1Projective::equalverify() }
-                OP_TRUE
-            };
-            println!("curves::test_scalar_mul = {} bytes", script.len());
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_scalar_mul_by_constant_g1() {
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let scalar = Fr::rand(&mut prng);
-
-            let p = ark_bn254::G1Projective::rand(&mut prng);
-            let q = p.mul(scalar);
-
-            let scalar_mul = G1Projective::scalar_mul_by_constant_g1(p);
-            println!("G1.scalar_mul_by_constant_g1: {} bytes", scalar_mul.len());
-
-            let script = script! {
-                { fr_push(scalar) }
-                { scalar_mul.clone() }
-                { G1Projective::push(q) }
-                { G1Projective::equalverify() }
-                OP_TRUE
-            };
-            println!("curves::test_scalar_mul = {} bytes", script.len());
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    // #[ignore]
-    fn test_projective_into_affine() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let scalar = Fr::rand(&mut prng);
-
-            let p_zero = ark_bn254::G1Projective::zero();
-            let q_zero = p_zero.into_affine();
-
-            let q_z_one = ark_bn254::G1Affine::rand(&mut prng);
-            let p_z_one = ark_bn254::G1Projective::from(q_z_one);
-
-            let p = ark_bn254::G1Projective::rand(&mut prng).mul(scalar);
-            assert!(!p.z.is_one() && !p.z.is_zero());
-            let q = p.into_affine();
-            let z = p.z;
-            let z_inv = z.inverse().unwrap();
-            let z_inv_pow2 = z_inv.square();
-            let z_inv_pow3 = z_inv_pow2.mul(z_inv);
-
-            let start = start_timer!(|| "collect_script");
-
-            let script = script! {
-                // When point is zero.
-                { G1Projective::push(p_zero) }
-                { G1Projective::into_affine() }
-                { g1_affine_push(q_zero) }
-                { G1Affine::equalverify() }
-
-                // when  p.z = one
-                { G1Projective::push(p_z_one) }
-                { G1Projective::into_affine() }
-                { g1_affine_push(q_z_one) }
-                { G1Affine::equalverify() }
-
-                // Otherwise, (X,Y,Z)->(X/z^2, Y/z^3)
-                { G1Projective::push(p) }
-                { G1Projective::into_affine() }
-                { g1_affine_push(q) }
-                { G1Affine::equalverify() }
-                OP_TRUE
-            };
-            end_timer!(start);
-
-            println!(
-                "curves::test_projective_into_affine = {} bytes",
-                script.len()
-            );
-            let if_interval = script.max_op_if_interval();
-            println!(
-                "Max interval: {:?} debug info: {}, {}",
-                if_interval,
-                script.debug_info(if_interval.0),
-                script.debug_info(if_interval.1)
-            );
-
-            let start = start_timer!(|| "execute_script");
-            let exec_result = execute_script_as_chunks(script, 20_000, 20_000);
-            println!("Exec result: {}", exec_result);
-            end_timer!(start);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_batched_scalar_mul2() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        // println!(
-        // "script size is {}",
-        // G1Projective::batched_scalar_mul::<2>().len()
-        // );
-
-        for _ in 0..1 {
-            let scalar0 = Fr::rand(&mut prng);
-            println!("scalar0 => {}", scalar0);
-            let point0 = ark_bn254::G1Projective::rand(&mut prng);
-            let scalar1 = Fr::rand(&mut prng);
-            println!("scalar1 => {}", scalar1);
-            let point1 = ark_bn254::G1Projective::rand(&mut prng);
-
-            // batched_scalar_mul
-            let q0 = point0.mul(scalar0);
-            let q1 = point1.mul(scalar1);
-            let q0q1 = q0.add(q1);
-
-            let script = script! {
-                { G1Projective::push(point0) }
-                { fr_push(scalar0) }
-                { G1Projective::push(point1) }
-                { fr_push(scalar1) }
-                { G1Projective::batched_scalar_mul::<2>() }
-                { G1Projective::push(q0q1) }
-                { G1Projective::equalverify() }
-                OP_TRUE
-            };
-            let if_interval = script.max_op_if_interval();
-            println!(
-                "Max interval: {:?} debug info: {}, {}",
-                if_interval,
-                script.debug_info(if_interval.0),
-                script.debug_info(if_interval.1)
-            );
-
-            let exec_result = execute_script(script);
-            // println!("res: {:100}", exec_result);
-            // println!("res stack length: {}", exec_result.final_stack.len());
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_affine_into_projective() {
-        let equalverify = G1Projective::equalverify();
-        println!("G1.equalverify: {} bytes", equalverify.len());
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let scalar = Fr::rand(&mut prng);
-
-            let p = ark_bn254::G1Projective::rand(&mut prng).mul(scalar);
-            let q = p.into_affine();
-
-            let start = start_timer!(|| "collect_script");
-
-            let script = script! {
-                { g1_affine_push(q) }
-                { G1Affine::into_projective() }
-                { G1Projective::push(p) }
-                { equalverify.clone() }
-                OP_TRUE
-            };
-            end_timer!(start);
-
-            println!(
-                "curves::test_affine_into_projective = {} bytes",
-                script.len()
-            );
-            let start = start_timer!(|| "execute_script");
-            let exec_result = execute_script(script);
-            end_timer!(start);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_batched_scalar_mul3() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        // println!(
-        // "script size is {}",
-        // G1Projective::batched_scalar_mul::<2>().len()
-        // );
-
-        for _ in 0..1 {
-            let scalar0 = Fr::rand(&mut prng);
-            println!("scalar0 => {}", scalar0);
-            let point0 = ark_bn254::G1Projective::rand(&mut prng);
-
-            let scalar1 = Fr::rand(&mut prng);
-            println!("scalar1 => {}", scalar1);
-            let point1 = ark_bn254::G1Projective::rand(&mut prng);
-
-            let scalar2 = Fr::rand(&mut prng);
-            println!("scalar2 => {}", scalar2);
-            let point2 = ark_bn254::G1Projective::rand(&mut prng);
-
-            // let scalar3 = Fr::rand(&mut prng);
-            // println!("scalar3 => {}", scalar3);
-            // let point3 = ark_bn254::G1Projective::rand(&mut prng);
-
-            // let scalar4 = Fr::rand(&mut prng);
-            // println!("scalar4 => {}", scalar4);
-            // let point4 = ark_bn254::G1Projective::rand(&mut prng);
-
-            // batched_scalar_mul
-            let q0 = point0.mul(scalar0);
-            let q1 = point1.mul(scalar1);
-            let q2 = point2.mul(scalar2);
-            // let q3 = point3.mul(scalar3);
-            // let q4 = point4.mul(scalar4);
-            let sum = q0.add(q1).add(q2);
-
-            let script = script! {
-                { G1Projective::push(point0) }
-                { fr_push(scalar0) }
-                { G1Projective::push(point1) }
-                { fr_push(scalar1) }
-                { G1Projective::push(point2) }
-                { fr_push(scalar2) }
-                // { G1Projective::push(point3) }
-                // { fr_push(scalar3) }
-                // { G1Projective::push(point4) }
-                // { fr_push(scalar4) }
-
-                { G1Projective::batched_scalar_mul::<3>() }
-                { G1Projective::push(sum) }
-                { G1Projective::equalverify() }
-                OP_TRUE
-            };
-            // println!("script length: {}", script.len());
-            let exec_result = execute_script(script);
-            // println!("max stack items: {}", exec_result.stats.max_nb_stack_items);
-            // println!("res stack length: {}", exec_result.final_stack.len());
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_projective_equalverify() {
-        let equalverify = G1Projective::equalverify();
-        println!("G1.equalverify: {} bytes", equalverify.len());
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let scalar = Fr::rand(&mut prng);
-
-            let p = ark_bn254::G1Projective::rand(&mut prng).mul(scalar);
-            let q = p.into_affine();
-
-            let script = script! {
-                { G1Projective::push(p) }
-                { Fq::push_u32_le(&BigUint::from(q.x).to_u32_digits()) }
-                { Fq::push_u32_le(&BigUint::from(q.y).to_u32_digits()) }
-                { Fq::push_one() }
-                { equalverify.clone() }
-                OP_TRUE
-            };
-            println!("curves::test_equalverify = {} bytes", script.len());
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_affine_equalverify() {
-        let equalverify = G1Affine::equalverify();
-        println!("G1Affine.equalverify: {} bytes", equalverify.len());
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let scalar = Fr::rand(&mut prng);
-
-            let p = ark_bn254::G1Projective::rand(&mut prng).mul(scalar);
-            let q = p.into_affine();
-
-            let script = script! {
-                { g1_affine_push(p.into_affine()) }
-                { g1_affine_push(q) }
-                { equalverify.clone() }
-                OP_TRUE
-            };
-            println!("curves::test_equalverify = {} bytes", script.len());
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_affine_is_on_curve() {
-        let affine_is_on_curve = G1Affine::is_on_curve();
-        println!("G1.affine_is_on_curve: {} bytes", affine_is_on_curve.len());
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..3 {
-            let p = ark_bn254::G1Affine::rand(&mut prng);
-
-            let script = script! {
-                { g1_affine_push(p) }
-                { affine_is_on_curve.clone() }
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-
-            let script = script! {
-                { g1_affine_push(p) }
-                { Fq::double(0) }
-                { affine_is_on_curve.clone() }
-                OP_NOT
-            };
-            println!("curves::test_affine_is_on_curve = {} bytes", script.len());
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_convert_to_compressed() {
-        let convert_to_compressed_script = G1Affine::convert_to_compressed();
-        println!(
-            "G1.convert_to_compressed_script: {} bytes",
-            convert_to_compressed_script.len()
-        );
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..3 {
-            let mut p = ark_bn254::G1Affine::rand(&mut prng);
-            if p.y()
-                .unwrap()
-                .gt(&ark_bn254::Fq::from_bigint(ark_bn254::Fq::MODULUS_MINUS_ONE_DIV_TWO).unwrap())
-            {
-                p = p.neg();
-            }
-
-            let bytes = p.x().unwrap().into_bigint().to_bytes_be();
-
-            let script = script! {
-                { g1_affine_push(p) }
-                { convert_to_compressed_script.clone() }
-                for i in 0..32 {
-                    { bytes[i] } OP_EQUALVERIFY
-                }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-
-        for _ in 0..3 {
-            let mut p = ark_bn254::G1Affine::rand(&mut prng);
-            if p.y()
-                .unwrap()
-                .into_bigint()
-                .le(&ark_bn254::Fq::MODULUS_MINUS_ONE_DIV_TWO)
-            {
-                p = p.neg();
-            }
-            assert!(p
-                .y()
-                .unwrap()
-                .into_bigint()
-                .gt(&ark_bn254::Fq::MODULUS_MINUS_ONE_DIV_TWO));
-
-            let bytes = p.x().unwrap().into_bigint().to_bytes_be();
-
-            let script = script! {
-                { g1_affine_push(p) }
-                { convert_to_compressed_script.clone() }
-                { bytes[0] | 0x80 }
-                OP_EQUALVERIFY
-                for i in 1..32 {
-                    { bytes[i] } OP_EQUALVERIFY
-                }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-
-        for _ in 0..3 {
-            let p = ark_bn254::G1Affine::rand(&mut prng);
-            let bytes = p.x().unwrap().into_bigint().to_bytes_be();
-
-            let script = script! {
-                { Fq::push_u32_le(&BigUint::from(p.x).to_u32_digits()) }
-                { Fq::push_hex(Fq::P_PLUS_ONE_DIV2) }
-                { convert_to_compressed_script.clone() }
-                { bytes[0] | 0x80 }
-                OP_EQUALVERIFY
-                for i in 1..32 {
-                    { bytes[i] } OP_EQUALVERIFY
-                }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-}
diff --git a/src/bn254/fp254impl.rs b/src/bn254/fp254impl.rs
deleted file mode 100644
index 319687dd8..000000000
--- a/src/bn254/fp254impl.rs
+++ /dev/null
@@ -1,1487 +0,0 @@
-use crate::bigint::add::limb_add_carry;
-use crate::bigint::bits::limb_to_be_bits;
-use crate::bigint::sub::limb_sub_borrow;
-use crate::bigint::U254;
-use crate::bigint::u29x9::{u29x9_mul_karazuba, u29x9_mul_karazuba_imm, u29x9_mulhi_karazuba_imm, u29x9_mullo_karazuba_imm, u29x9_square};
-use crate::bn254::fq::Fq;
-use crate::bn254::utils::fq_to_bits;
-use crate::pseudo::OP_256MUL;
-use crate::treepp::*;
-use ark_ff::{BigInt, BigInteger, PrimeField};
-use bitcoin_script::script;
-use num_bigint::BigUint;
-use num_traits::{Num, One};
-use std::ops::{Add, Div, Mul, Rem, Shl};
-use std::str::FromStr;
-use std::sync::OnceLock;
-
-pub trait Fp254Impl {
-    const MODULUS: &'static str;
-    const MONTGOMERY_ONE: &'static str;
-    const N_LIMBS: u32 = U254::N_LIMBS;
-    const N_BITS: u32 = U254::N_BITS;
-
-    // Modulus as 30-bit limbs
-    const MODULUS_LIMBS: [u32; U254::N_LIMBS as usize];
-    const MODULUS_INV_261: [u32; U254::N_LIMBS as usize];
-
-    const P_PLUS_ONE_DIV2: &'static str;
-    const TWO_P_PLUS_ONE_DIV3: &'static str;
-    const P_PLUS_TWO_DIV3: &'static str;
-
-    const ADD_ONCELOCK: OnceLock<Script> = OnceLock::new();
-    const SUB_ONCELOCK: OnceLock<Script> = OnceLock::new();
-    const MUL_ONCELOCK: OnceLock<Script> = OnceLock::new();
-
-    type ConstantType: PrimeField;
-
-    #[inline]
-    fn copy(a: u32) -> Script { U254::copy(a) }
-
-    #[inline]
-    fn roll(a: u32) -> Script { U254::roll(a) }
-
-    #[inline]
-    fn drop() -> Script { U254::drop() }
-
-    #[inline]
-    fn zip(a: u32, b: u32) -> Script { U254::zip(a, b) }
-
-    #[inline]
-    fn push_u32_le(v: &[u32]) -> Script {
-        let r = BigUint::from_str_radix(Self::MONTGOMERY_ONE, 16).unwrap();
-        let p = BigUint::from_str_radix(Self::MODULUS, 16).unwrap();
-        script! {
-            { U254::push_u32_le(&BigUint::from_slice(v).mul(r).rem(p).to_u32_digits()) }
-        }
-    }
-
-    #[inline]
-    fn equal(a: u32, b: u32) -> Script { U254::equal(a, b) }
-
-    #[inline]
-    fn equalverify(a: u32, b: u32) -> Script { U254::equalverify(a, b) }
-
-    #[inline]
-    fn push_dec(dec_string: &str) -> Script {
-        let v = BigUint::from_str_radix(dec_string, 10).unwrap();
-        let r = BigUint::from_str_radix(Self::MONTGOMERY_ONE, 16).unwrap();
-        let p = BigUint::from_str_radix(Self::MODULUS, 16).unwrap();
-        script! {
-            { U254::push_u32_le(&v.mul(r).rem(p).to_u32_digits()) }
-        }
-    }
-
-    #[inline]
-    fn push_hex(hex_string: &str) -> Script {
-        let v = BigUint::from_str_radix(hex_string, 16).unwrap();
-        let r = BigUint::from_str_radix(Self::MONTGOMERY_ONE, 16).unwrap();
-        let p = BigUint::from_str_radix(Self::MODULUS, 16).unwrap();
-        script! {
-            { U254::push_u32_le(&v.mul(r).rem(p).to_u32_digits()) }
-        }
-    }
-
-    #[inline]
-    fn convert_to_be_bits() -> Script { U254::convert_to_be_bits() }
-
-    #[inline]
-    fn convert_to_be_bits_toaltstack() -> Script { U254::convert_to_be_bits_toaltstack() }
-
-    #[inline]
-    fn convert_to_le_bits() -> Script { U254::convert_to_le_bits() }
-
-    #[inline]
-    fn convert_to_le_bits_toaltstack() -> Script { U254::convert_to_le_bits_toaltstack() }
-
-    #[inline]
-    fn push_modulus() -> Script { U254::push_hex(Self::MODULUS) }
-
-    #[inline]
-    fn push_zero() -> Script { U254::push_zero() }
-
-    #[inline]
-    fn push_one() -> Script { U254::push_hex(Self::MONTGOMERY_ONE) }
-
-    fn decode_montgomery() -> Script {
-        script! {
-            // a ⋅ p⁻¹
-            { u29x9_mullo_karazuba_imm(Self::MODULUS_INV_261) }
-            // ⋯ ❨A₂₆₀…₀⋅P⁻¹₂₆₀…₀❩₂₆₀…₀
-            
-            // ❨a ⋅ p⁻¹❩ ⋅ p
-            { u29x9_mulhi_karazuba_imm(Self::MODULUS_LIMBS) }
-            // ⋯ ❨❨A₂₆₀…₀⋅P⁻¹₂₆₀…₀❩₂₆₀…₀⋅P₂₆₀…₀❩₅₂₁…₂₆₁
-
-            // - ❨a ⋅ p⁻¹❩ ⋅ p
-            { Self::neg(0) }
-            // ⋯ ❨A₂₆₀…₀⋅2⁻²⁶¹❩₂₆₀…₀
-        }
-    }
-
-    // A + B mod M
-    // Ci⁺ overflow carry bit (A+B)
-    // Ci⁻ overflow carry bit (A-B)
-    fn add(a: u32, b: u32) -> Script {
-        let binding = Self::ADD_ONCELOCK;
-        let add_script = binding.get_or_init(|| {
-            script! {
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ A₀ B₀
-                { 0x20000000 }
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ A₀ B₀ 2²⁹
-
-                // A₀ + B₀
-                limb_add_carry
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ 2²⁹ C₀⁺ A₀+B₀
-                OP_DUP
-                OP_TOALTSTACK
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ 2²⁹ C₀⁺ A₀+B₀ | A₀+B₀
-                OP_ROT
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁺ A₀+B₀ 2²⁹
-                { Self::MODULUS_LIMBS[0] }
-                OP_SWAP
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁺ A₀+B₀ M₀ 2²⁹
-                limb_sub_borrow
-                OP_TOALTSTACK
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁺ 2²⁹ C₀⁻ | (A₀+B₀)-M₀
-
-                // from     A₁      + B₁        + carry_0
-                //   to     A{N-2}  + B{N-2}    + carry_{N-3}
-                for i in 1..Self::N_LIMBS-1 {
-                    OP_2SWAP
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ 2²⁹ C₀⁻ B₁ C₀⁺
-                    OP_ADD
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ 2²⁹ C₀⁻ B₁+C₀⁺
-                    OP_2SWAP
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₀⁻ B₁+C₀⁺ A₁ 2²⁹
-                    limb_add_carry
-                    OP_DUP
-                    OP_TOALTSTACK
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₀⁻ 2²⁹ C₁⁺ (B₁+C₀)+A₁ | (B₁+C₀)+A₁
-                    OP_2SWAP
-                    OP_SWAP
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁺ (B₁+C₀)+A₁ 2²⁹ C₀⁻
-                    { Self::MODULUS_LIMBS[i as usize] }
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁺ (B₁+C₀)+A₁ 2²⁹ C₀⁻ M₁
-                    OP_ADD
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁺ (B₁+C₀)+A₁ 2²⁹ C₀⁻+M₁
-                    OP_ROT
-                    OP_SWAP
-                    OP_ROT
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁺ (B₁+C₀)+A₁ C₀⁻+M₁ 2²⁹
-                    limb_sub_borrow
-                    OP_TOALTSTACK
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁺ 2²⁹ C₁⁻ | ((B₁+C₀)+A₁)-(C₀⁻+M₁)
-                }
-                // ⋯ A₈ B₈ C₇⁺ 2²⁹ C₇⁻
-                OP_2SWAP
-                OP_ADD
-                // ⋯ A₈ 2²⁹ C₇⁻ B₈+C₇⁺
-                OP_2SWAP
-                OP_ROT
-                OP_ROT
-                // ⋯ C₇⁻ 2²⁹ B₈+C₇⁺ A₈
-                OP_ADD
-                // ⋯ C₇⁻ 2²⁹ (B₈+C₇⁺)+A₈
-                OP_DUP
-                OP_TOALTSTACK
-                OP_ROT
-                // ⋯ 2²⁹ (B₈+C₇⁺)+A₈ C₇⁻
-                { *Self::MODULUS_LIMBS.last().unwrap() }
-                // ⋯ 2²⁹ (B₈+C₇⁺)+A₈ C₇⁻ M₈
-                OP_ADD
-                OP_ROT
-                // ⋯ (B₈+C₇⁺)+A₈ C₇⁻+M₈ 2²⁹
-                limb_sub_borrow
-                OP_TOALTSTACK
-                // ⋯ 2²⁹ C₈⁻ | ((B₈+C₇⁺)+A₈)-(C₇⁻+M₈)
-                OP_NIP
-                OP_DUP
-                // ⋯ C₈⁻ C₈⁻
-                OP_IF
-                    OP_FROMALTSTACK
-                    OP_DROP
-                OP_ENDIF
-
-                OP_FROMALTSTACK
-                // ⋯ (B₈+C₇⁺)+A₈ C₈⁻ | ((B₇+C₆⁺)+A₇)-(C₆⁻+M₇)
-                // ⋯ ((B₈+C₇⁺)+A₈)-(C₇⁻+M₈) C₈⁻ | (B₈+C₇⁺)+A₈
-                for _ in 0..Self::N_LIMBS-1 {
-                    OP_FROMALTSTACK  OP_DROP
-                    OP_FROMALTSTACK
-                }
-                // ⋯ (B₈+C₇⁺)+A₈ (B₇+C₆⁺)+A₇ ... (B₂+C₁⁺)+A₂ (B₁+C₀⁺)+A₁ A₀+B₀ C₈⁻
-                // ⋯ ((B₈+C₇⁺)+A₈)-(C₇⁻+M₈) ... (A₀+B₀)-M₀ C₈⁻ | A₀+B₀
-                { Self::N_LIMBS }
-                OP_ROLL
-                OP_NOTIF
-                    OP_FROMALTSTACK
-                    OP_DROP
-                OP_ENDIF
-                // ⋯ (B₈+C₇⁺)+A₈ (B₇+C₆⁺)+A₇ ... (B₁+C₀⁺)+A₁ A₀+B₀
-                // ⋯ ((B₈+C₇⁺)+A₈)-(C₇⁻+M₈) ... (A₀+B₀)-M₀
-            }
-        });
-        script! {
-            { Self::zip(a, b) }
-            { add_script.clone() }
-        }
-    }
-
-    fn neg(a: u32) -> Script {
-        script! {
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ ⋯
-            { Self::roll(a) }
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀
-            { Self::MODULUS_LIMBS[0] } OP_SWAP { 0x20000000 }
-            limb_sub_borrow OP_TOALTSTACK
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ 2²⁹ C₀⁻ | M₀-A₀ ⋯
-            OP_ROT OP_ADD
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ 2²⁹ C₀⁻+A₁
-            { Self::MODULUS_LIMBS[1] } OP_SWAP OP_ROT
-            limb_sub_borrow OP_TOALTSTACK
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ 2²⁹ C₁⁻ | M₁-(C₀⁻+A₁) ⋯
-            OP_ROT OP_ADD
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ 2²⁹ C₁⁻+A₂
-            { Self::MODULUS_LIMBS[2] } OP_SWAP OP_ROT
-            limb_sub_borrow OP_TOALTSTACK
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ 2²⁹ C₂⁻ | M₂-(C₁⁻+A₂) ⋯
-            OP_ROT OP_ADD
-            // ⋯ A₈ A₇ A₆ A₅ A₄ 2²⁹ C₂⁻+A₃
-            { Self::MODULUS_LIMBS[3] } OP_SWAP OP_ROT
-            limb_sub_borrow OP_TOALTSTACK
-            // ⋯ A₈ A₇ A₆ A₅ A₄ 2²⁹ C₃⁻ | M₃-(C₂⁻+A₃) ⋯
-            OP_ROT OP_ADD
-            // ⋯ A₈ A₇ A₆ A₅ 2²⁹ C₃⁻+A₄
-            { Self::MODULUS_LIMBS[4] } OP_SWAP OP_ROT
-            limb_sub_borrow OP_TOALTSTACK
-            // ⋯ A₈ A₇ A₆ A₅ 2²⁹ C₄⁻ | M₄-(C₃⁻+A₄) ⋯
-            OP_ROT OP_ADD
-            // ⋯ A₈ A₇ A₆ 2²⁹ C₄⁻+A₅
-            { Self::MODULUS_LIMBS[5] } OP_SWAP OP_ROT
-            limb_sub_borrow OP_TOALTSTACK
-            // ⋯ A₈ A₇ A₆ 2²⁹ C₅⁻ | M₅-(C₄⁻+A₅) ⋯
-            OP_ROT OP_ADD
-            // ⋯ A₈ A₇ 2²⁹ C₅⁻+A₆
-            { Self::MODULUS_LIMBS[6] } OP_SWAP OP_ROT
-            limb_sub_borrow OP_TOALTSTACK
-            // ⋯ A₈ A₇ 2²⁹ C₆⁻ | M₆-(C₅⁻+A₆) ⋯
-            OP_ROT OP_ADD
-            // ⋯ A₈ 2²⁹ C₆⁻+A₇
-            { Self::MODULUS_LIMBS[7] } OP_SWAP OP_ROT
-            limb_sub_borrow OP_TOALTSTACK
-            // ⋯ A₈ 2²⁹ C₇⁻ | M₇-(C₆⁻+A₇) ⋯
-            OP_NIP OP_ADD
-            // ⋯ C₇⁻+A₈
-            { Self::MODULUS_LIMBS[8] } OP_SWAP OP_SUB
-            // ⋯ M₈-(C₇⁻+A₈)
-            OP_FROMALTSTACK OP_FROMALTSTACK OP_FROMALTSTACK OP_FROMALTSTACK
-            OP_FROMALTSTACK OP_FROMALTSTACK OP_FROMALTSTACK OP_FROMALTSTACK
-        }
-    }
-
-
-    // A - B mod M
-    // Ci⁻ overflow carry bit (A-B)
-    // Ci⁺ overflow carry bit (A+B)
-    fn sub(a: u32, b: u32) -> Script {
-        let binding = Self::SUB_ONCELOCK;
-        let sub_script = binding.get_or_init(|| {
-            script! {
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ A₀ B₀
-                { 0x20000000 }
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ A₀ B₀ 2²⁹
-
-                // A₀ - B₀
-                limb_sub_borrow
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ 2²⁹ C₀⁻ A₀-B₀
-                OP_DUP
-                OP_TOALTSTACK
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ 2²⁹ C₀⁻ A₀-B₀ | A₀-B₀
-                OP_ROT
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁻ A₀-B₀ 2²⁹
-                { Self::MODULUS_LIMBS[0] }
-                OP_SWAP
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁻ A₀-B₀ M₀ 2²⁹
-                limb_add_carry
-                OP_TOALTSTACK
-                // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁻ 2²⁹ C₀⁺ | (A₀-B₀)+M₀
-
-                // from     A₁      - B₁        - carry_0
-                //   to     A{N-2}  - B{N-2}    - carry_{N-3}
-                for i in 1..Self::N_LIMBS-1 {
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ B₁ C₀⁻ 2²⁹ C₀⁺
-                    OP_2SWAP
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ 2²⁹ C₀⁺ B₁ C₀⁻
-                    OP_ADD
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ A₁ 2²⁹ C₀⁺ B₁+C₀⁻
-                    OP_2SWAP
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₀⁺ B₁+C₀⁻ A₁ 2²⁹
-                    OP_TOALTSTACK OP_SWAP OP_FROMALTSTACK
-                    limb_sub_borrow
-                    OP_DUP
-                    OP_TOALTSTACK
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₀⁺ 2²⁹ C₁⁻ A₁-(B₁+C₀) | A₁-(B₁+C₀)
-                    OP_2SWAP
-                    OP_SWAP
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁻ A₁-(B₁+C₀) 2²⁹ C₀⁺
-                    { Self::MODULUS_LIMBS[i as usize] }
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁻ A₁-(B₁+C₀) 2²⁹ C₀⁺ M₁
-                    OP_ADD
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁻ A₁-(B₁+C₀) 2²⁹ C₀⁺+M₁
-                    OP_SWAP
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁻ A₁-(B₁+C₀) C₀⁺+M₁ 2²⁹
-                    limb_add_carry
-                    OP_TOALTSTACK
-                    // ⋯ A₈ B₈ A₇ B₇ A₆ B₆ A₅ B₅ A₄ B₄ A₃ B₃ A₂ B₂ C₁⁻ 2²⁹ C₁⁺ | (A₁-(B₁+C₀))+(C₀⁺+M₁)
-                }
-                // ⋯ A₈ B₈ C₇⁻ 2²⁹ C₇⁺
-                OP_2SWAP
-                OP_ADD
-                // ⋯ A₈ 2²⁹ C₇⁺ B₈+C₇⁻
-                OP_2SWAP
-                // ⋯ C₇⁺ B₈+C₇⁻ A₈ 2²⁹
-                OP_TOALTSTACK OP_SWAP OP_FROMALTSTACK
-                // ⋯ C₇⁺ A₈ B₈+C₇⁻ 2²⁹
-                limb_sub_borrow
-                // ⋯ C₇⁺ 2²⁹ C₈⁻ A₈-(B₈+C₇⁻)
-                OP_DUP
-                OP_TOALTSTACK
-                // ⋯ C₇⁺ 2²⁹ C₈⁻ A₈-(B₈+C₇⁻) | A₈-(B₈+C₇⁻)
-                OP_ROT OP_TOALTSTACK
-                // ⋯ C₇⁺ C₈⁻ A₈-(B₈+C₇⁻) | 2²⁹ A₈-(B₈+C₇⁻)
-                OP_ROT { *Self::MODULUS_LIMBS.last().unwrap() }
-                // ⋯ C₈⁻ (A₈-(B₈+C₇⁻)) C₇⁺ M₈
-                OP_ADD OP_ADD
-                // ⋯ C₈⁻ (A₈-(B₈+C₇⁻))+(C₇⁺+M₈)
-                OP_FROMALTSTACK OP_2DUP OP_GREATERTHANOREQUAL
-                OP_IF OP_SUB OP_ELSE OP_DROP OP_ENDIF
-                OP_TOALTSTACK
-                // ⋯ C₈⁻ | (A₈-(B₈+C₇⁻))+(C₇⁺+M)₈ A₈-(B₈+C₇⁻)
-                OP_DUP
-                // ⋯ C₈⁻ C₈⁻
-                OP_NOTIF
-                    OP_FROMALTSTACK
-                    OP_DROP
-                OP_ENDIF
-
-                OP_FROMALTSTACK
-                // ⋯ C₈⁻ A₈-(B₈+C₇⁻) | (A₇-(B₇+C₆⁻))+(C₆⁺+M₇)
-                // ⋯ C₈⁻ (A₈-(B₈+C₇⁻))+(C₇⁺+M₈) | (B₈+C₇⁻)+A₈
-                for _ in 0..Self::N_LIMBS-1 {
-                    OP_FROMALTSTACK  OP_DROP
-                    OP_FROMALTSTACK
-                }
-                // ⋯ C₈⁻ A₈-(B₈+C₇⁻) A₇-(B₇+C₆⁻) ... A₂-(B₂+C₁⁻) A₁-(B₁+C₀⁻) A₀+B₀
-                // ⋯ C₈⁻ (A₈-(B₈+C₇⁻))+(C₇⁺+M₈) ... (A₀+B₀)-M₀ | A₀+B₀
-                { Self::N_LIMBS }
-                OP_ROLL
-                OP_IF
-                    OP_FROMALTSTACK
-                    OP_DROP
-                OP_ENDIF
-                // ⋯ A₈-(B₈+C₇⁻) A₇-(B₇+C₆⁻) ... A₁-(B₁+C₀⁻) A₀+B₀
-                // ⋯ (A₈-(B₈+C₇⁻))+(C₇⁺+M₈) ... (A₀-B₀)+M₀
-            }
-        });
-        script! {
-            { Self::zip(a, b) }
-            { sub_script.clone() }
-        }
-    }
-
-    fn double(a: u32) -> Script {
-        script! {
-            { Self::roll(a) }
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀
-            OP_DUP
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ A₀
-            { 0x20000000 }
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀ A₀ 2²⁹
-
-            // A₀ + A₀
-            limb_add_carry
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ 2²⁹ C₀⁺ 2⋅A₀
-            OP_DUP
-            OP_TOALTSTACK
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ 2²⁹ C₀⁺ 2⋅A₀ | 2⋅A₀
-            OP_ROT
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ C₀⁺ 2⋅A₀ 2²⁹
-            { Self::MODULUS_LIMBS[0] }
-            OP_SWAP
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ C₀⁺ 2⋅A₀ M₀ 2²⁹
-            limb_sub_borrow
-            OP_TOALTSTACK
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ C₀⁺ 2²⁹ C₀⁻ | 2⋅A₀-M₀
-
-            // from     A₁      + A₁        + carry_0
-            //   to     A{N-2}  + A{N-2}    + carry_{N-3}
-            for i in 1..Self::N_LIMBS-1 {
-                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ C₀⁺ 2²⁹ C₀⁻
-                OP_SWAP OP_2SWAP
-                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₀⁻ 2²⁹ A₁ C₀⁺
-                OP_OVER OP_ADD
-                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₀⁻ 2²⁹ A₁ A₁+C₀⁺
-                OP_ROT
-                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₀⁻ A₁ A₁+C₀⁺ 2²⁹
-                limb_add_carry
-                OP_DUP
-                OP_TOALTSTACK
-                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₀⁻ 2²⁹ C₁⁺ 2⋅A₁+C₀⁺ | 2⋅A₁+C₀⁺
-                OP_ROT OP_TOALTSTACK OP_ROT
-                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₁⁺ 2⋅A₁+C₀⁺ C₀⁻ | 2²⁹
-                { Self::MODULUS_LIMBS[i as usize] }
-                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₁⁺ 2⋅A₁+C₀⁺ C₀⁻ M₁
-                OP_ADD
-                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₁⁺ 2⋅A₁+C₀⁺ C₀⁻+M₁
-                OP_FROMALTSTACK
-                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₁⁺ 2⋅A₁+C₀⁺ C₀⁻+M₁ 2²⁹
-                limb_sub_borrow
-                OP_TOALTSTACK
-                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ C₁⁺ 2²⁹ C₁⁻ | (2⋅A₁+C₀⁺)-(C₀⁻+M₁)
-            }
-            // ⋯ A₈ C₇⁺ 2²⁹ C₇⁻
-            OP_2SWAP
-            // ⋯ 2²⁹ C₇⁻ A₈ C₇⁺
-            OP_OVER OP_ADD
-            // ⋯ 2²⁹ C₇⁻ A₈ A₈+C₇⁺
-            OP_ADD
-            // ⋯ 2²⁹ C₇⁻ 2⋅A₈+C₇⁺
-            OP_DUP OP_TOALTSTACK
-            // ⋯ 2²⁹ C₇⁻ 2⋅A₈+C₇⁺ | 2⋅A₈+C₇⁺
-            OP_SWAP
-            // ⋯ 2²⁹ 2⋅A₈+C₇⁺ C₇⁻
-            { *Self::MODULUS_LIMBS.last().unwrap() }
-            // ⋯ 2²⁹ 2⋅A₈+C₇⁺ C₇⁻ M₈
-            OP_ADD
-            OP_ROT
-            // ⋯ 2⋅A₈+C₇⁺ C₇⁻+M₈ 2²⁹
-            limb_sub_borrow
-            OP_TOALTSTACK
-            // ⋯ 2²⁹ C₈⁻ | (2⋅A₈+C₇⁺)-(C₇⁻+M₈)
-            OP_NIP
-            OP_DUP
-            // ⋯ C₈⁻ C₈⁻
-            OP_IF
-                OP_FROMALTSTACK
-                OP_DROP
-            OP_ENDIF
-
-            OP_FROMALTSTACK
-            // ⋯ 2⋅A₈+C₇⁺ C₈⁻ | (2⋅A₇+C₆⁺)-(C₆⁻+M₇)
-            // ⋯ (2⋅A₈+C₇⁺)-(C₇⁻+M₈) C₈⁻ | 2⋅A₈+C₇⁺
-            for _ in 0..Self::N_LIMBS-1 {
-                OP_FROMALTSTACK  OP_DROP
-                OP_FROMALTSTACK
-            }
-            // ⋯ 2⋅A₈+C₇⁺ 2⋅A₇+C₆⁺ ... 2⋅A₂+C₁⁺ 2⋅A₁+C₀⁺ 2⋅A₀ C₈⁻
-            // ⋯ (2⋅A₈+C₇⁺)-(C₇⁻+M₈) ... 2⋅A₀-M₀ C₈⁻ | 2⋅A₀
-            { Self::N_LIMBS }
-            OP_ROLL
-            OP_NOTIF
-                OP_FROMALTSTACK
-                OP_DROP
-            OP_ENDIF
-            // ⋯ 2⋅A₈+C₇⁺ 2⋅A₇+C₆⁺ ... 2⋅A₁+C₀⁺ 2⋅A₀
-            // ⋯ (2⋅A₈+C₇⁺)-(C₇⁻+M₈) ... 2⋅A₀-M₀
-        }
-    }
-
-    fn mul() -> Script {
-        Self::MUL_ONCELOCK.get_or_init(|| {
-            script! {
-                // a ⋅ b  →  ❨a ⋅ b❩ᵐᵒᵈ2²⁶¹ ⌊2⁻²⁶¹⋅❨a ⋅ b❩⌋
-                // ⋯ A₂₆₀…₀ B₂₆₀…₀
-                { u29x9_mul_karazuba(1, 0) }
-                // ⋯ ❨A₂₆₀…₀⋅B₂₆₀…₀❩₅₂₁…₂₆₁ ❨A₂₆₀…₀⋅B₂₆₀…₀❩₂₆₀…₀
-
-                // lo ⋅ p⁻¹
-                // lo  <=>  ❨a ⋅ b❩ᵐᵒᵈ2²⁶¹
-                { u29x9_mullo_karazuba_imm(Self::MODULUS_INV_261) }
-                // ⋯ ❨A₂₆₀…₀⋅B₂₆₀…₀❩₅₂₁…₂₆₁ ❨❨A₂₆₀…₀⋅B₂₆₀…₀❩₂₆₀…₀⋅P⁻¹₂₆₀…₀❩₂₆₀…₀
-                
-                // ❨lo ⋅ p⁻¹❩ ⋅ p
-                { u29x9_mulhi_karazuba_imm(Self::MODULUS_LIMBS) }
-                // ⋯ ❨A₂₆₀…₀⋅B₂₆₀…₀❩₅₂₁…₂₆₁ ❨❨❨A₂₆₀…₀⋅B₂₆₀…₀❩₂₆₀…₀⋅P⁻¹₂₆₀…₀❩₂₆₀…₀⋅P₂₆₀…₀❩₅₂₁…₂₆₁
-                
-                // hi - ❨lo ⋅ p⁻¹❩ ⋅ p
-                // hi  <=>  ⌊2⁻²⁶¹⋅❨a ⋅ b❩⌋
-                { Self::sub(1, 0) }
-                // ⋯ ❨A₂₆₀…₀⋅B₂₆₀…₀⋅2⁻²⁶¹❩₂₆₀…₀
-            }
-        })
-        .clone()
-    }
-
-    // create table for top item on the stack
-    fn init_table(window: u32) -> Script {
-        assert!(
-            1 <= window && window <= 6,
-            "expected 1<=window<=6; got window={}",
-            window
-        );
-        script! {
-            for i in 2..=window {
-                for j in 1 << (i - 1)..1 << i {
-                    if j % 2 == 0 {
-                        { U254::copy(j/2 - 1) }
-                        { U254::double(0) }
-                    } else {
-                        { U254::copy(0) }
-                        { U254::copy(j - 1) }
-                        { U254::add(1, 0) }
-                    }
-                }
-            }
-        }
-    }
-
-    fn mul_bucket() -> Script {
-        let q_big = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap();
-        let q_limbs = fq_to_bits(BigInt::<4>::from_str(&q_big.to_str_radix(10)).unwrap(), 4);
-
-        script! {
-                // stack: {a} {b} {p}
-                { U254::roll(1) } // {a} {p} {b}
-                { U254::toaltstack() }
-                { U254::toaltstack() }
-                { U254::toaltstack() }
-
-                // keep the window size is 16 = 1 << 4
-                { U254::push_zero() }
-                { U254::fromaltstack() }
-                { Self::init_table(4) }
-                // keep the window size is 16 = 1 << 4
-                { U254::push_zero() }
-                { U254::fromaltstack() }
-                { Self::init_table(4) }
-
-                { U254::fromaltstack() }
-                { Fq::convert_to_be_u4().clone() }
-
-                // {a_table} {q_table} {b} {q}
-                for i in 0..64 {
-
-                    { 16 }
-                    { q_limbs[63 - i]}
-                    OP_SUB
-                    // cal offset: index * 9 + 64
-                    OP_DUP
-                    OP_DUP
-                    OP_ADD // 2 * index
-                    OP_DUP
-                    OP_ADD // 4 * index
-                    OP_DUP
-                    OP_ADD // 8 * index
-                    OP_ADD // 9 * index
-                    { 63 - i}
-                    OP_ADD
-
-                    // TO ALTSTACK
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-
-                    // get target bucket
-                    OP_PICK
-
-                    for _ in 0..8 {
-                        OP_FROMALTSTACK
-                        OP_PICK
-                    }
-
-                    // push bucket element to element
-                    // | y_0 * x
-                    { U254::toaltstack() }
-
-                    // 32 - stack
-                    { 16 }
-                    OP_SWAP
-                    OP_SUB
-                    // cal offset: index * 9 + 64
-                    OP_DUP
-                    OP_DUP
-                    OP_ADD // 2 * index
-                    OP_DUP
-                    OP_ADD // 4 * index
-                    OP_DUP
-                    OP_ADD // 8 * index
-                    OP_ADD // 9 * index
-                    { 63 - i + 144 - 1 } // 16 * 9 = 144
-                    OP_ADD
-
-                    // TO ALTSTACK
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-
-                    // get target bucket
-                    OP_PICK
-
-                    for _ in 0..8 {
-                        OP_FROMALTSTACK
-                        OP_PICK
-                    }
-
-                    { U254::fromaltstack() }
-
-                    { U254::sub(1, 0) }
-
-                    if i == 0 {
-                        { U254::toaltstack() }
-                    } else {
-                        { U254::fromaltstack() }
-                        { U254::double_allow_overflow() }
-                        { U254::double_allow_overflow() }
-                        { U254::double_allow_overflow() }
-                        { U254::double_allow_overflow() }
-                        { U254::add(1, 0)}
-                        { U254::toaltstack() }
-                    }
-                }
-                // {a_tablr} {q_table} | bi * a - p_i * q (i = 0~50)
-                // drop table
-                for _ in 0..16 {
-                    { U254::drop() }
-                }
-
-                for _ in 0..16 {
-                    { U254::drop() }
-                }
-                { U254::fromaltstack() }
-
-        }
-    }
-
-    fn mul_by_constant_bucket(constant: &Self::ConstantType) -> Script {
-        let q_big = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap();
-        let q_limbs = fq_to_bits(BigInt::<4>::from_str(&q_big.to_str_radix(10)).unwrap(), 4);
-
-        let b = constant.to_string();
-        let b_big = BigUint::from_str_radix(&b, 10).unwrap();
-        let b_limbs = fq_to_bits(BigInt::<4>::from_str(&b_big.to_str_radix(10)).unwrap(), 4);
-        script! {
-                // stack: {a} {p}
-                { U254::toaltstack() }
-                { U254::toaltstack() }
-
-                // keep the window size is 16 = 1 << 4
-                { U254::push_zero() }
-                { U254::fromaltstack() }
-                { Self::init_table(4) }
-                // keep the window size is 16 = 1 << 4
-                { U254::push_zero() }
-                { U254::fromaltstack() }
-                { Self::init_table(4) }
-
-                // {a_table} {q_table}
-                for i in 0..64 {
-
-                    { 16 }
-                    { q_limbs[63 - i] }
-                    //OP_SWAP
-                    OP_SUB
-                    // cal offset: index * 9 + 64
-                    OP_DUP
-                    OP_DUP
-                    OP_ADD // 2 * index
-                    OP_DUP
-                    OP_ADD // 4 * index
-                    OP_DUP
-                    OP_ADD // 8 * index
-                    OP_ADD // 9 * index
-                    //{ 63 - i + 64 - i - 1}
-                    OP_1SUB
-
-                    // TO ALTSTACK
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-
-                    // get target bucket
-                    OP_PICK
-
-                    for _ in 0..8 {
-                        OP_FROMALTSTACK
-                        OP_PICK
-                    }
-
-                    // push bucket element to element
-                    // | y_0 * x
-                    { U254::toaltstack() }
-
-                    // 32 - stack
-                    { 16 }
-                    { b_limbs[63 - i] }
-                    OP_SUB
-                    // cal offset: index * 9 + 64
-                    OP_DUP
-                    OP_DUP
-                    OP_ADD // 2 * index
-                    OP_DUP
-                    OP_ADD // 4 * index
-                    OP_DUP
-                    OP_ADD // 8 * index
-                    OP_ADD // 9 * index
-                    //{ 63 - i + 63 - i + 144 - 1 } // 16 * 9 = 144
-                    { 144 - 1 }
-                    OP_ADD
-
-                    // TO ALTSTACK
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_DUP
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-                    OP_TOALTSTACK
-
-                    // get target bucket
-                    OP_PICK
-
-                    for _ in 0..8 {
-                        OP_FROMALTSTACK
-                        OP_PICK
-                    }
-
-                    { U254::fromaltstack() }
-
-                    { U254::sub(1, 0) }
-
-                    if i == 0 {
-                        { U254::toaltstack() }
-                    } else {
-                        { U254::fromaltstack() }
-                        { U254::double_allow_overflow() }
-                        { U254::double_allow_overflow() }
-                        { U254::double_allow_overflow() }
-                        { U254::double_allow_overflow() }
-                        { U254::add(1, 0)}
-                        { U254::toaltstack() }
-                    }
-                }
-                // {a_tablr} {q_table} | bi * a - p_i * q (i = 0~50)
-                // drop table
-                for _ in 0..16 {
-                    { U254::drop() }
-                }
-
-                for _ in 0..16 {
-                    { U254::drop() }
-                }
-                { U254::fromaltstack() }
-
-        }
-    }
-
-    fn is_zero(a: u32) -> Script { U254::is_zero(a) }
-
-    fn is_zero_keep_element(a: u32) -> Script { U254::is_zero_keep_element(a) }
-
-    fn is_one_keep_element(a: u32) -> Script {
-        script! {
-            { Self::copy(a) }
-            { Self::is_one(0) }
-        }
-    }
-
-    fn is_one(a: u32) -> Script {
-        let mut u29x9_one = [0u32; 9];
-        let montgomery_one = BigUint::from_str_radix(Self::MONTGOMERY_ONE, 16).unwrap();
-        for i in 0..9 {
-            u29x9_one[i] = *montgomery_one.clone()
-                .div(BigUint::one().shl(29 * i) as BigUint)
-                .rem(BigUint::one().shl(29) as BigUint)
-                .to_u32_digits().first().unwrap_or(&0);
-        }
-        script! {
-            { Self::roll(a) }
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀
-            { *u29x9_one.first().unwrap() } OP_EQUAL OP_SWAP
-            // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₁ A₀=1₀ A₁
-            for i in 1..Self::N_LIMBS as usize - 1 {
-                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₀=1₀ A₁
-                { u29x9_one[i] } OP_EQUAL
-                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ A₂ A₀=1₀ A₁=1₁
-                OP_BOOLAND OP_SWAP
-                // ⋯ A₈ A₇ A₆ A₅ A₄ A₃ (A₀=1₀)∧(A₁=1₁) A₂
-            }
-            // ⋯ (A₀=1₀)∧⋯∧(A₇=1₇) A₈
-            { *u29x9_one.last().unwrap() } OP_EQUAL
-            // ⋯ (A₀=1₀)∧⋯∧(A₇=1₇) A₈=1₈
-            OP_BOOLAND
-            // ⋯ (A₀=1₀)∧⋯∧(A₈=1₈)
-        }
-    }
-
-    fn is_field() -> Script {
-        script! {
-            // Each limb must not be negative
-            for i in 0..Self::N_LIMBS - 1 {
-                { i } OP_PICK
-                0 OP_GREATERTHANOREQUAL OP_TOALTSTACK
-            }
-            { Self::N_LIMBS - 1 } OP_PICK
-            0 OP_GREATERTHANOREQUAL
-            for _ in 0..Self::N_LIMBS - 1 {
-                OP_FROMALTSTACK OP_BOOLAND
-            }
-            OP_TOALTSTACK
-
-            { Self::push_modulus() }
-            { U254::lessthan(1, 0) }
-
-            OP_FROMALTSTACK OP_BOOLAND
-        }
-    }
-
-    fn square() -> Script {
-        script! {
-            // a ⋅ a  →  ❨a ⋅ a❩ᵐᵒᵈ2²⁶¹ ⌊2⁻²⁶¹⋅❨a ⋅ a❩⌋
-            // ⋯ A₂₆₀…₀
-            { u29x9_square(0) }
-            // ⋯ ❨A₂₆₀…₀⋅A₂₆₀…₀❩₅₂₁…₂₆₁ ❨A₂₆₀…₀⋅A₂₆₀…₀❩₂₆₀…₀
-
-            // lo ⋅ p⁻¹
-            // lo  <=>  ❨a ⋅ a❩ᵐᵒᵈ2²⁶¹
-            { u29x9_mullo_karazuba_imm(Self::MODULUS_INV_261) }
-            // ⋯ ❨A₂₆₀…₀⋅A₂₆₀…₀❩₅₂₁…₂₆₁ ❨❨A₂₆₀…₀⋅A₂₆₀…₀❩₂₆₀…₀⋅P⁻¹₂₆₀…₀❩₂₆₀…₀
-            
-            // ❨lo ⋅ p⁻¹❩ ⋅ p
-            { u29x9_mulhi_karazuba_imm(Self::MODULUS_LIMBS) }
-            // ⋯ ❨A₂₆₀…₀⋅A₂₆₀…₀❩₅₂₁…₂₆₁ ❨❨❨A₂₆₀…₀⋅A₂₆₀…₀❩₂₆₀…₀⋅P⁻¹₂₆₀…₀❩₂₆₀…₀⋅P₂₆₀…₀❩₅₂₁…₂₆₁
-
-            // hi - ❨lo ⋅ p⁻¹❩ ⋅ p
-            // hi  <=>  ⌊2⁻²⁶¹⋅❨a ⋅ b❩⌋
-            { Self::sub(1, 0) }
-            // ⋯ ❨A₂₆₀…₀⋅A₂₆₀…₀⋅2⁻²⁶¹❩₂₆₀…₀
-        }
-    }
-
-    fn inv() -> Script {
-        let r = BigUint::from_str_radix(Self::MONTGOMERY_ONE, 16).unwrap();
-        let p = BigUint::from_str_radix(Self::MODULUS, 16).unwrap();
-        script! {
-            { Self::push_modulus() }
-            { Self::roll(1) }
-            { U254::inv_stage1() }
-            { U254::inv_stage2(Self::MODULUS) }
-            { Self::mul() }
-            { Self::mul_by_constant(&Self::ConstantType::from(r.pow(3).rem(p))) }
-        }
-    }
-
-    fn mul_by_constant(constant: &Self::ConstantType) -> Script {
-
-        // Convert `PrimeField` to `[u29; 9]` in Montgomery form:
-        let mut u29x9_montgomery = [0u32; 9];
-        {
-            let constant = BigUint::from_bytes_be(&constant.into_bigint().to_bytes_be())
-                .mul(BigUint::from_str_radix(Self::MONTGOMERY_ONE, 16).unwrap())
-                .rem(BigUint::from_str_radix(Self::MODULUS, 16).unwrap());
-
-            for i in 0..9 {
-                u29x9_montgomery[i] = *constant.clone()
-                    .div(BigUint::one().shl(29 * i) as BigUint)
-                    .rem(BigUint::one().shl(29) as BigUint)
-                    .to_u32_digits().first().unwrap_or(&0);
-            }
-        }
-
-        script! {
-            // a ⋅ b  →  ❨a ⋅ b❩ᵐᵒᵈ2²⁶¹ ⌊2⁻²⁶¹⋅❨a ⋅ b❩⌋
-            // ⋯ A₂₆₀…₀
-            { u29x9_mul_karazuba_imm(u29x9_montgomery) }
-            // ⋯ ❨A₂₆₀…₀⋅B₂₆₀…₀❩₅₂₁…₂₆₁ ❨A₂₆₀…₀⋅B₂₆₀…₀❩₂₆₀…₀
-
-            // lo ⋅ p⁻¹
-            // lo  <=>  ❨a ⋅ b❩ᵐᵒᵈ2²⁶¹
-            { u29x9_mullo_karazuba_imm(Self::MODULUS_INV_261) }
-            // ⋯ ❨A₂₆₀…₀⋅B₂₆₀…₀❩₅₂₁…₂₆₁ ❨❨A₂₆₀…₀⋅B₂₆₀…₀❩₂₆₀…₀⋅P⁻¹₂₆₀…₀❩₂₆₀…₀
-            
-            // ❨lo ⋅ p⁻¹❩ ⋅ p
-            { u29x9_mulhi_karazuba_imm(Self::MODULUS_LIMBS) }
-            // ⋯ ❨A₂₆₀…₀⋅B₂₆₀…₀❩₅₂₁…₂₆₁ ❨❨❨A₂₆₀…₀⋅B₂₆₀…₀❩₂₆₀…₀⋅P⁻¹₂₆₀…₀❩₂₆₀…₀⋅P₂₆₀…₀❩₅₂₁…₂₆₁
-
-            // hi - ❨lo ⋅ p⁻¹❩ ⋅ p
-            // hi  <=>  ⌊2⁻²⁶¹⋅❨a ⋅ b❩⌋
-            { Self::sub(1, 0) }
-            // ⋯ ❨A₂₆₀…₀⋅B₂₆₀…₀⋅2⁻²⁶¹❩₂₆₀…₀
-        }
-    }
-
-    fn div2() -> Script {
-        script! {
-            { U254::div2rem() }
-            OP_IF
-                { U254::push_hex(Self::P_PLUS_ONE_DIV2) }
-                { Self::add(1, 0) }
-            OP_ENDIF
-        }
-    }
-
-    fn div3() -> Script {
-        script! {
-            { U254::div3rem() }
-            OP_DUP
-            0 OP_GREATERTHAN
-            OP_IF
-                OP_1SUB
-                OP_IF
-                    { U254::push_hex(Self::P_PLUS_TWO_DIV3) }
-                    { Self::add(1, 0) }
-                OP_ELSE
-                    { U254::push_hex(Self::TWO_P_PLUS_ONE_DIV3) }
-                    { Self::add(1, 0) }
-                OP_ENDIF
-            OP_ELSE
-                OP_DROP
-            OP_ENDIF
-        }
-    }
-
-    //            2⁰⋅B₀  + 2⁸⋅B₁   + 2¹⁶⋅B₂ + 2²⁴⋅❨B₃ᵐᵒᵈ2⁵❩
-    //  ⌊2⁻⁵⋅B₃⌋ + 2³⋅B₄  + 2¹¹⋅B₅  + 2¹⁹⋅B₆ + 2²⁷⋅❨B₇ᵐᵒᵈ2²❩
-    //  ⌊2⁻²⋅B₇⌋ + 2⁶⋅B₈  + 2¹⁴⋅B₉  + 2²²⋅❨B₁₀ᵐᵒᵈ2⁷❩
-    // ⌊2⁻⁷⋅B₁₀⌋ + 2¹⋅B₁₁ + 2⁹⋅B₁₂  + 2¹⁷⋅B₁₃ + 2²⁵⋅❨B₁₄ᵐᵒᵈ2⁴❩
-    // ⌊2⁻⁴⋅B₁₄⌋ + 2⁴⋅B₁₅ + 2¹²⋅B₁₆ + 2²⁰⋅B₁₇ + 2²⁸⋅❨B₁₈ᵐᵒᵈ2¹❩
-    // ⌊2⁻¹⋅B₁₈⌋ + 2⁷⋅B₁₉ + 2¹⁵⋅B₂₀ + 2²³⋅❨B₂₁ᵐᵒᵈ2⁶❩
-    // ⌊2⁻⁶⋅B₂₁⌋ + 2²⋅B₂₂ + 2¹⁰⋅B₂₃ + 2¹⁸⋅B₂₄ + 2²⁶⋅❨B₂₅ᵐᵒᵈ2³❩
-    // ⌊2⁻³⋅B₂₅⌋ + 2⁵⋅B₂₆ + 2¹³⋅B₂₇ + 2²¹⋅B₂₈
-    //            2⁰⋅B₂₉ + 2⁸⋅B₃₀  + 2¹⁶⋅B₃₁
-
-    fn from_hash() -> Script {
-        let modulus = BigUint::from_str_radix(Self::MODULUS, 16).unwrap();
-        let a: BigUint = BigUint::one().shl(253);
-        let b: BigUint = BigUint::one().shl(254);
-        let c: BigUint = BigUint::one().shl(255);
-            
-        script! {
-
-            //  2⁰⋅B₀ + 2⁸⋅B₁ + 2¹⁶⋅B₂ + 2²⁴⋅❨B₃ᵐᵒᵈ2⁵❩
-            // ⋯ B₀ B₁ B₂ B₃
-            { 0x80 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_4 OP_ELSE OP_DROP OP_0 OP_ENDIF OP_TOALTSTACK
-            { 0x40 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_2 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            { 0x20 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_1 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            // ⋯ B₀ B₁ B₂ B₃ᵐᵒᵈ2⁵ | ⌊2⁻⁵⋅B₃⌋
-            OP_256MUL OP_ADD
-            // ⋯ B₀ B₁ B₂+2⁸⋅❨B₃ᵐᵒᵈ2⁵❩
-            OP_256MUL OP_ADD
-            // ⋯ B₀ B₁+2⁸⋅B₂+2¹⁶⋅❨B₃ᵐᵒᵈ2⁵❩
-            OP_256MUL OP_ADD
-            // ⋯ B₀+2⁸⋅B₁+2¹⁶⋅B₂+2²⁴⋅❨B₃ᵐᵒᵈ2⁵❩
-            OP_FROMALTSTACK OP_SWAP OP_TOALTSTACK
-            // ⋯ ⌊2⁻⁵⋅B₃⌋ | B₀+2⁸⋅B₁+2¹⁶⋅B₂+2²⁴⋅❨B₃ᵐᵒᵈ2⁵❩
-
-
-            //  ⌊2⁻⁵⋅B₃⌋ + 2³⋅B₄ + 2¹¹⋅B₅ + 2¹⁹⋅B₆ + 2²⁷⋅❨B₇ᵐᵒᵈ2²❩
-            // ⋯ B₄ B₅ B₆ B₇ ⌊2⁻⁵⋅B₃⌋
-            OP_TOALTSTACK
-            // ⋯ B₄ B₅ B₆ B₇ | ⌊2⁻⁵⋅B₃⌋ ⋯
-            { 0x80 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB { 32 } OP_ELSE OP_DROP OP_0 OP_ENDIF OP_TOALTSTACK
-            { 0x40 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_16 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            { 0x20 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_8 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            OP_16 OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_4 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            OP_8 OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_2 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            OP_4 OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_1 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            // ⋯ B₄ B₅ B₆ B₇ᵐᵒᵈ2² | ⌊2⁻²⋅B₇⌋ ⌊2⁻⁵⋅B₃⌋ ⋯
-            OP_FROMALTSTACK OP_FROMALTSTACK OP_SWAP OP_TOALTSTACK OP_TOALTSTACK
-            // ⋯ B₄ B₅ B₆ B₇ᵐᵒᵈ2² | ⌊2⁻⁵⋅B₃⌋ ⌊2⁻²⋅B₇⌋ ⋯
-            OP_256MUL OP_ADD
-            // ⋯ B₄ B₅ B₆+2⁸⋅❨B₇ᵐᵒᵈ2²❩
-            OP_256MUL OP_ADD
-            // ⋯ B₄ B₅+2⁸⋅B₆+2¹⁶⋅❨B₇ᵐᵒᵈ2²❩
-            OP_256MUL OP_ADD
-            // ⋯ B₄+2⁸⋅B₅+2¹⁶⋅B₆+2²⁴⋅❨B₇ᵐᵒᵈ2²❩
-            for _ in 5..8 { OP_DUP OP_ADD }
-            // ⋯ 2³⋅B₄+2¹¹⋅B₅+2¹⁹⋅B₆+2²⁷⋅❨B₇ᵐᵒᵈ2²❩
-            OP_FROMALTSTACK OP_ADD
-            // ⋯ ⌊2⁻⁵⋅B₃⌋+2³⋅B₄+2¹¹⋅B₅+2¹⁹⋅B₆+2²⁷⋅❨B₇ᵐᵒᵈ2²❩ | ⌊2⁻²⋅B₇⌋ ⋯
-            OP_FROMALTSTACK OP_SWAP OP_TOALTSTACK
-            // ⋯ ⌊2⁻²⋅B₇⌋ | ⌊2⁻⁵⋅B₃⌋+2³⋅B₄+2¹¹⋅B₅+2¹⁹⋅B₆+2²⁷⋅❨B₇ᵐᵒᵈ2²❩ ⋯
-            
-
-            //  ⌊2⁻²⋅B₇⌋ + 2⁶⋅B₈ + 2¹⁴⋅B₉ + 2²²⋅❨B₁₀ᵐᵒᵈ2⁷❩
-            // ⋯ B₈ B₉ B₁₀ B₁₁ ⌊2⁻²⋅B₇⌋
-            OP_TOALTSTACK
-            // ⋯ B₈ B₉ B₁₀ B₁₁ | ⌊2⁻²⋅B₇⌋ ⋯
-            OP_SWAP OP_2SWAP OP_ROT
-            // ⋯ B₁₁ B₈ B₉ B₁₀
-            { 0x80 } OP_2DUP OP_GREATERTHANOREQUAL OP_FROMALTSTACK OP_OVER OP_TOALTSTACK OP_TOALTSTACK OP_IF OP_SUB OP_ELSE OP_DROP OP_ENDIF
-            // ⋯ B₁₁ B₈ B₉ B₁₀ᵐᵒᵈ2⁷ | ⌊2⁻²⋅B₇⌋ ⌊2⁻⁷⋅B₁₀⌋ ⋯
-            OP_256MUL OP_ADD
-            // ⋯ B₁₁ B₈ B₉+2⁸⋅❨B₁₀ᵐᵒᵈ2⁷❩
-            OP_256MUL OP_ADD
-            // ⋯ B₁₁ B₈+2⁸⋅B₉+2¹⁶⋅❨B₁₀ᵐᵒᵈ2⁷❩
-            for _ in 2..8 { OP_DUP OP_ADD }
-            // ⋯ B₁₁ 2⁶⋅B₈+2¹⁴⋅B₉+2²²⋅❨B₁₀ᵐᵒᵈ2⁷❩
-            OP_FROMALTSTACK OP_ADD
-            // ⋯ B₁₁ ⌊2⁻²⋅B₇⌋+2⁶⋅B₈+2¹⁴⋅B₉+2²²⋅❨B₁₀ᵐᵒᵈ2⁷❩ | ⌊2⁻⁷⋅B₁₀⌋ ⋯
-            OP_FROMALTSTACK OP_SWAP OP_TOALTSTACK
-            // ⋯ B₁₁ ⌊2⁻⁷⋅B₁₀⌋ | ⌊2⁻²⋅B₇⌋+2⁶⋅B₈+2¹⁴⋅B₉+2²²⋅❨B₁₀ᵐᵒᵈ2⁷❩ ⋯
-
-            
-            //  ⌊2⁻⁷⋅B₁₀⌋ + 2¹⋅B₁₁ + 2⁹⋅B₁₂ + 2¹⁷⋅B₁₃ + 2²⁵⋅❨B₁₄ᵐᵒᵈ2⁴❩
-            // ⋯ B₁₂ B₁₃ B₁₄ B₁₅ B₁₁ ⌊2⁻⁷⋅B₁₀⌋
-            OP_TOALTSTACK
-            // ⋯ B₁₂ B₁₃ B₁₄ B₁₅ B₁₁ | ⌊2⁻⁷⋅B₁₀⌋ ⋯
-            OP_4 OP_ROLL
-            // ⋯ B₁₃ B₁₄ B₁₅ B₁₁ B₁₂
-            OP_4 OP_ROLL
-            // ⋯ B₁₄ B₁₅ B₁₁ B₁₂ B₁₃
-            OP_4 OP_ROLL
-            // ⋯ B₁₅ B₁₁ B₁₂ B₁₃ B₁₄
-            { 0x80 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_8 OP_ELSE OP_DROP OP_0 OP_ENDIF OP_TOALTSTACK
-            { 0x40 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_4 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            { 0x20 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_2 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            OP_16 OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_1 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            // ⋯ B₁₅ B₁₁ B₁₂ B₁₃ B₁₄ᵐᵒᵈ2⁴ | ⌊2⁻⁴⋅B₁₄⌋ ⌊2⁻⁷⋅B₁₀⌋ ⋯
-            OP_FROMALTSTACK OP_FROMALTSTACK OP_SWAP OP_TOALTSTACK OP_TOALTSTACK
-            // ⋯ B₁₅ B₁₁ B₁₂ B₁₃ B₁₄ᵐᵒᵈ2⁴ | ⌊2⁻⁷⋅B₁₀⌋ ⌊2⁻⁴⋅B₁₄⌋ ⋯
-            OP_256MUL OP_ADD
-            // ⋯ B₁₅ B₁₁ B₁₂ B₁₃+2⁸⋅❨B₁₄ᵐᵒᵈ2⁴❩
-            OP_256MUL OP_ADD
-            // ⋯ B₁₅ B₁₁ B₁₂+2⁸⋅B₁₃+2¹⁶⋅❨B₁₄ᵐᵒᵈ2⁴❩
-            OP_256MUL OP_ADD
-            // ⋯ B₁₅ B₁₁+2⁸⋅B₁₂+2¹⁶⋅B₁₃+2²⁴⋅❨B₁₄ᵐᵒᵈ2⁴❩
-            for _ in 7..8 { OP_DUP OP_ADD }
-            // ⋯ B₁₅ 2¹⋅B₁₁+2⁹⋅B₁₂+2¹⁷⋅B₁₃+2²⁵⋅❨B₁₄ᵐᵒᵈ2⁴❩
-            OP_FROMALTSTACK OP_ADD
-            // ⋯ B₁₅ ⌊2⁻⁷⋅B₁₀⌋+2¹⋅B₁₁+2⁹⋅B₁₂+2¹⁷⋅B₁₃+2²⁵⋅❨B₁₄ᵐᵒᵈ2⁴❩ | ⌊2⁻⁴⋅B₁₄⌋ ⋯
-            OP_FROMALTSTACK OP_SWAP OP_TOALTSTACK
-            // ⋯ B₁₅ ⌊2⁻⁴⋅B₁₄⌋ | ⌊2⁻⁷⋅B₁₀⌋+2¹⋅B₁₁+2⁹⋅B₁₂+2¹⁷⋅B₁₃+2²⁵⋅❨B₁₄ᵐᵒᵈ2⁴❩ ⋯
-            
-
-            //  ⌊2⁻⁴⋅B₁₄⌋ + 2⁴⋅B₁₅ + 2¹²⋅B₁₆ + 2²⁰⋅B₁₇ + 2²⁸⋅❨B₁₈ᵐᵒᵈ2¹❩
-            // ⋯ B₁₆ B₁₇ B₁₈ B₁₉ B₁₅ ⌊2⁻⁴⋅B₁₄⌋
-            OP_TOALTSTACK
-            // ⋯ B₁₆ B₁₇ B₁₈ B₁₉ B₁₅ | ⌊2⁻⁴⋅B₁₄⌋ ⋯
-            OP_4 OP_ROLL
-            // ⋯ B₁₇ B₁₈ B₁₉ B₁₅ B₁₆
-            OP_4 OP_ROLL
-            // ⋯ B₁₈ B₁₉ B₁₅ B₁₆ B₁₇
-            OP_4 OP_ROLL
-            // ⋯ B₁₉ B₁₅ B₁₆ B₁₇ B₁₈
-            { 0x80 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB { 64 } OP_ELSE OP_DROP OP_0 OP_ENDIF OP_TOALTSTACK
-            { 0x40 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB { 32 } OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            { 0x20 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_16 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            OP_16 OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_8 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            OP_8 OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_4 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            OP_4 OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_2 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            OP_2 OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_1 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            // ⋯ B₁₉ B₁₅ B₁₆ B₁₇ B₁₈ᵐᵒᵈ2¹ | ⌊2⁻¹⋅B₁₈⌋ ⌊2⁻⁴⋅B₁₄⌋ ⋯
-            OP_FROMALTSTACK OP_FROMALTSTACK OP_SWAP OP_TOALTSTACK OP_TOALTSTACK
-            // ⋯ B₁₉ B₁₅ B₁₆ B₁₇ B₁₈ᵐᵒᵈ2¹ | ⌊2⁻⁴⋅B₁₄⌋ ⌊2⁻¹⋅B₁₈⌋ ⋯
-            OP_256MUL OP_ADD
-            // ⋯ B₁₉ B₁₅ B₁₆ B₁₇+2⁸⋅❨B₁₈ᵐᵒᵈ2¹❩
-            OP_256MUL OP_ADD
-            // ⋯ B₁₉ B₁₅ B₁₆+2⁸⋅B₁₇+2¹⁶⋅❨B₁₈ᵐᵒᵈ2¹❩
-            OP_256MUL OP_ADD
-            // ⋯ B₁₉ B₁₅+2⁸⋅B₁₆+2¹⁶⋅B₁₇+2²⁴⋅❨B₁₈ᵐᵒᵈ2¹❩
-            for _ in 4..8 { OP_DUP OP_ADD }
-            // ⋯ B₁₉ 2⁴⋅B₁₅+2¹²⋅B₁₆+2²⁰⋅B₁₇+2²⁸⋅❨B₁₈ᵐᵒᵈ2¹❩
-            OP_FROMALTSTACK OP_ADD
-            // ⋯ B₁₉ ⌊2⁻⁴⋅B₁₄⌋+2⁴⋅B₁₅+2¹²⋅B₁₆+2²⁰⋅B₁₇+2²⁸⋅❨B₁₈ᵐᵒᵈ2¹❩ | ⌊2⁻¹⋅B₁₈⌋ ⋯
-            OP_FROMALTSTACK OP_SWAP OP_TOALTSTACK
-            // ⋯ B₁₉ ⌊2⁻¹⋅B₁₈⌋ | ⌊2⁻⁴⋅B₁₄⌋+2⁴⋅B₁₅+2¹²⋅B₁₆+2²⁰⋅B₁₇+2²⁸⋅❨B₁₈ᵐᵒᵈ2¹❩ ⋯
-            
-
-            //  ⌊2⁻¹⋅B₁₈⌋ + 2⁷⋅B₁₉ + 2¹⁵⋅B₂₀ + 2²³⋅❨B₂₁ᵐᵒᵈ2⁶❩
-            // ⋯ B₂₀ B₂₁ B₂₂ B₂₃ B₁₉ ⌊2⁻¹⋅B₁₈⌋
-            OP_TOALTSTACK
-            // ⋯ B₂₀ B₂₁ B₂₂ B₂₃ B₁₉ | ⌊2⁻¹⋅B₁₈⌋ ⋯
-            OP_4 OP_ROLL
-            // ⋯ B₂₁ B₂₂ B₂₃ B₁₉ B₂₀
-            OP_4 OP_ROLL
-            // ⋯ B₂₂ B₂₃ B₁₉ B₂₀ B₂₁
-            { 0x80 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_2 OP_ELSE OP_DROP OP_0 OP_ENDIF OP_TOALTSTACK
-            { 0x40 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_1 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            // ⋯ B₂₂ B₂₃ B₁₉ B₂₀ B₂₁ | ⌊2⁻⁶⋅B₂₁⌋ ⌊2⁻¹⋅B₁₈⌋ ⋯
-            OP_FROMALTSTACK OP_FROMALTSTACK OP_SWAP OP_TOALTSTACK OP_TOALTSTACK
-            // ⋯ B₂₂ B₂₃ B₁₉ B₂₀ B₂₁ᵐᵒᵈ2⁶ | ⌊2⁻¹⋅B₁₈⌋ ⌊2⁻⁶⋅B₂₁⌋ ⋯
-            OP_256MUL OP_ADD
-            // ⋯ B₂₂ B₂₃ B₁₉ B₂₀+2⁸⋅❨B₂₁ᵐᵒᵈ2⁶❩
-            OP_256MUL OP_ADD
-            // ⋯ B₂₂ B₂₃ B₁₉+2⁸⋅B₂₀+2¹⁶⋅❨B₂₁ᵐᵒᵈ2⁶❩
-            for _ in 1..8 { OP_DUP OP_ADD }
-            // ⋯ B₂₂ B₂₃ 2⁷⋅B₁₉+2¹⁵⋅B₂₀+2²³⋅❨B₂₁ᵐᵒᵈ2⁶❩
-            OP_FROMALTSTACK OP_ADD
-            // ⋯ B₂₂ B₂₃ ⌊2⁻¹⋅B₁₈⌋+2⁷⋅B₁₉+2¹⁵⋅B₂₀+2²³⋅❨B₂₁ᵐᵒᵈ2⁶❩ | ⌊2⁻⁶⋅B₂₁⌋ ⋯
-            OP_FROMALTSTACK OP_SWAP OP_TOALTSTACK
-            // ⋯ B₂₂ B₂₃ ⌊2⁻⁶⋅B₂₁⌋ | ⌊2⁻¹⋅B₁₈⌋+2⁷⋅B₁₉+2¹⁵⋅B₂₀+2²³⋅❨B₂₁ᵐᵒᵈ2⁶❩ ⋯
-            
-
-            //  ⌊2⁻⁶⋅B₂₁⌋ + 2²⋅B₂₂ + 2¹⁰⋅B₂₃ + 2¹⁸⋅B₂₄ + 2²⁶⋅❨B₂₅ᵐᵒᵈ2³❩
-            // ⋯ B₂₄ B₂₅ B₂₆ B₂₇ B₂₂ B₂₃ ⌊2⁻⁶⋅B₂₁⌋
-            OP_TOALTSTACK
-            // ⋯ B₂₄ B₂₅ B₂₆ B₂₇ B₂₂ B₂₃ | ⌊2⁻⁶⋅B₂₁⌋ ⋯
-            OP_5 OP_ROLL
-            // ⋯ B₂₅ B₂₆ B₂₇ B₂₂ B₂₃ B₂₄
-            OP_5 OP_ROLL
-            // ⋯ B₂₆ B₂₇ B₂₂ B₂₃ B₂₄ B₂₅
-            { 0x80 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_16 OP_ELSE OP_DROP OP_0 OP_ENDIF OP_TOALTSTACK
-            { 0x40 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_8 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            { 0x20 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_4 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            OP_16 OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_2 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            OP_8 OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_1 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            // ⋯ B₂₆ B₂₇ B₂₂ B₂₃ B₂₄ B₂₅ᵐᵒᵈ2³ | ⌊2⁻³⋅B₂₅⌋ ⌊2⁻⁶⋅B₂₁⌋ ⋯
-            OP_FROMALTSTACK OP_FROMALTSTACK OP_SWAP OP_TOALTSTACK OP_TOALTSTACK
-            // ⋯ B₂₆ B₂₇ B₂₂ B₂₃ B₂₄ B₂₅ᵐᵒᵈ2³ | ⌊2⁻⁶⋅B₂₁⌋ ⌊2⁻³⋅B₂₅⌋ ⋯
-            OP_256MUL OP_ADD
-            // ⋯ B₂₆ B₂₇ B₂₂ B₂₃ B₂₄+2⁸⋅❨B₂₅ᵐᵒᵈ2³❩
-            OP_256MUL OP_ADD
-            // ⋯ B₂₆ B₂₇ B₂₂ B₂₃+2⁸⋅B₂₄+2¹⁶⋅❨B₂₅ᵐᵒᵈ2³❩
-            OP_256MUL OP_ADD
-            // ⋯ B₂₆ B₂₇ B₂₂+2⁸⋅B₂₃+2¹⁶⋅B₂₄+2²⁴⋅❨B₂₅ᵐᵒᵈ2³❩
-            for _ in 6..8 { OP_DUP OP_ADD }
-            // ⋯ B₂₆ B₂₇ 2²⋅B₂₂+2¹⁰⋅B₂₃+2¹⁸⋅B₂₄+2²⁶⋅❨B₂₅ᵐᵒᵈ2³❩
-            OP_FROMALTSTACK OP_ADD
-            // ⋯ B₂₆ B₂₇ ⌊2⁻⁶⋅B₂₁⌋+2²⋅B₂₂+2¹⁰⋅B₂₃+2¹⁸⋅B₂₄+2²⁶⋅❨B₂₅ᵐᵒᵈ2³❩ | ⌊2⁻³⋅B₂₅⌋ ⋯
-            OP_FROMALTSTACK OP_SWAP OP_TOALTSTACK
-            // ⋯ B₂₆ B₂₇ ⌊2⁻³⋅B₂₅⌋ | ⌊2⁻⁶⋅B₂₁⌋+2²⋅B₂₂+2¹⁰⋅B₂₃+2¹⁸⋅B₂₄+2²⁶⋅❨B₂₅ᵐᵒᵈ2³❩ ⋯
-            
-            //  ⌊2⁻³⋅B₂₅⌋ + 2⁵⋅B₂₆ + 2¹³⋅B₂₇ + 2²¹⋅B₂₈
-            // ⋯ B₂₈ B₂₉ B₃₀ B₃₁ B₂₆ B₂₇ ⌊2⁻³⋅B₂₅⌋
-            OP_TOALTSTACK
-            // ⋯ B₂₈ B₂₉ B₃₀ B₃₁ B₂₆ B₂₇ | ⌊2⁻³⋅B₂₅⌋ ⋯
-            OP_5 OP_ROLL
-            // ⋯ B₂₉ B₃₀ B₃₁ B₂₆ B₂₇ B₂₈
-            OP_256MUL OP_ADD
-            // ⋯ B₂₉ B₃₀ B₃₁ B₂₆ B₂₇+2⁸⋅B₂₈
-            OP_256MUL OP_ADD
-            // ⋯ B₂₉ B₃₀ B₃₁ B₂₆+2⁸⋅B₂₇+2¹⁶⋅B₂₈
-            for _ in 3..8 { OP_DUP OP_ADD }
-            // ⋯ B₂₉ B₃₀ B₃₁ 2⁵⋅B₂₆+2¹³⋅B₂₇+2²¹⋅B₂₈
-            OP_FROMALTSTACK OP_ADD OP_TOALTSTACK // 29
-            // ⋯ B₂₉ B₃₀ B₃₁ | ⌊2⁻³⋅B₂₅⌋+2⁵⋅B₂₆+2¹³⋅B₂₇+2²¹⋅B₂₈ ⋯
-
-            //  2⁰⋅B₂₉ + 2⁸⋅B₃₀ + 2¹⁶⋅B₃₁
-            // ⋯ B₂₉ B₃₀ B₃₁
-            { 0x80 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_4 OP_ELSE OP_DROP OP_0 OP_ENDIF OP_TOALTSTACK
-            { 0x40 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_2 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            { 0x20 } OP_2DUP OP_GREATERTHANOREQUAL OP_IF OP_SUB OP_1 OP_FROMALTSTACK OP_ADD OP_TOALTSTACK OP_ELSE OP_DROP OP_ENDIF
-            // ⋯ B₂₉ B₃₀ B₃₁ᵐᵒᵈ2⁵ | ⌊2⁻⁵⋅B₃₁⌋ ⋯
-            OP_256MUL OP_ADD
-            // ⋯ B₂₉ B₃₀+2⁸⋅❨B₃₁ᵐᵒᵈ2⁵❩
-            OP_256MUL OP_ADD
-            // ⋯ B₂₉+2⁸⋅B₃₀+2¹⁶⋅❨B₃₁ᵐᵒᵈ2⁵❩
-            OP_FROMALTSTACK OP_SWAP
-            // ⋯ ⌊2⁻⁵⋅B₃₁⌋  B₂₉+2⁸⋅B₃₀+2¹⁶⋅❨B₃₁ᵐᵒᵈ2⁵❩ | ⌊2⁻³⋅B₂₅⌋+2⁵⋅B₂₆+2¹³⋅B₂₇+2²¹⋅B₂₈ ⋯
-            OP_FROMALTSTACK
-            // ⋯ ⌊2⁻³⋅B₂₅⌋+2⁵⋅B₂₆+2¹³⋅B₂₇+2²¹⋅B₂₈ | ⌊2⁻⁶⋅B₂₁⌋+2²⋅B₂₂+2¹⁰⋅B₂₃+2¹⁸⋅B₂₄+2²⁶⋅❨B₂₅ᵐᵒᵈ2³❩ ⋯
-            OP_FROMALTSTACK
-            // ⋯ ⌊2⁻⁶⋅B₂₁⌋+2²⋅B₂₂+2¹⁰⋅B₂₃+2¹⁸⋅B₂₄+2²⁶⋅❨B₂₅ᵐᵒᵈ2³❩ | ⌊2⁻¹⋅B₁₈⌋+2⁷⋅B₁₉+2¹⁵⋅B₂₀+2²³⋅❨B₂₁ᵐᵒᵈ2⁶❩ ⋯
-            OP_FROMALTSTACK
-            // ⋯ ⌊2⁻¹⋅B₁₈⌋+2⁷⋅B₁₉+2¹⁵⋅B₂₀+2²³⋅❨B₂₁ᵐᵒᵈ2⁶❩ | ⌊2⁻⁴⋅B₁₄⌋+2⁴⋅B₁₅+2¹²⋅B₁₆+2²⁰⋅B₁₇+2²⁸⋅❨B₁₈ᵐᵒᵈ2¹❩ ⋯
-            OP_FROMALTSTACK
-            // ⋯ ⌊2⁻⁴⋅B₁₄⌋+2⁴⋅B₁₅+2¹²⋅B₁₆+2²⁰⋅B₁₇+2²⁸⋅❨B₁₈ᵐᵒᵈ2¹❩ | ⌊2⁻⁷⋅B₁₀⌋+2¹⋅B₁₁+2⁹⋅B₁₂+2¹⁷⋅B₁₃+2²⁵⋅❨B₁₄ᵐᵒᵈ2⁴❩ ⋯
-            OP_FROMALTSTACK
-            // ⋯ ⌊2⁻⁷⋅B₁₀⌋+2¹⋅B₁₁+2⁹⋅B₁₂+2¹⁷⋅B₁₃+2²⁵⋅❨B₁₄ᵐᵒᵈ2⁴❩ | ⌊2⁻²⋅B₇⌋+2⁶⋅B₈+2¹⁴⋅B₉+2²²⋅❨B₁₀ᵐᵒᵈ2⁷❩ ⋯
-            OP_FROMALTSTACK
-            // ⋯ ⌊2⁻²⋅B₇⌋+2⁶⋅B₈+2¹⁴⋅B₉+2²²⋅❨B₁₀ᵐᵒᵈ2⁷❩ | ⌊2⁻⁵⋅B₃⌋+2³⋅B₄+2¹¹⋅B₅+2¹⁹⋅B₆+2²⁷⋅❨B₇ᵐᵒᵈ2²❩ ⋯
-            OP_FROMALTSTACK
-            // ⋯ ⌊2⁻⁵⋅B₃⌋+2³⋅B₄+2¹¹⋅B₅+2¹⁹⋅B₆+2²⁷⋅❨B₇ᵐᵒᵈ2²❩ | B₀+2⁸⋅B₁+2¹⁶⋅B₂+2²⁴⋅❨B₃ᵐᵒᵈ2⁵❩ ⋯
-            OP_FROMALTSTACK
-            // ⋯ B₀+2⁸⋅B₁+2¹⁶⋅B₂+2²⁴⋅❨B₃ᵐᵒᵈ2⁵❩
-
-            // encode montgomery
-            { Self::mul_by_constant(&Self::ConstantType::from(BigUint::from_str_radix(Self::MONTGOMERY_ONE, 16).unwrap())) }
-
-            // ⌊2⁻⁵⋅B₃₁⌋
-            OP_9 OP_PICK OP_7 OP_NUMEQUAL
-            OP_IF
-                { Self::push_u32_le(&c.clone().add(b.clone()).add(a.clone()).rem(modulus.clone()).to_u32_digits()) }
-            OP_ELSE
-                OP_9 OP_PICK OP_6 OP_NUMEQUAL
-                OP_IF
-                    { Self::push_u32_le(&c.clone().add(b.clone()).rem(modulus.clone()).to_u32_digits()) }
-                OP_ELSE
-                    OP_9 OP_PICK OP_5 OP_NUMEQUAL
-                    OP_IF
-                        { Self::push_u32_le(&c.clone().add(a.clone()).rem(modulus.clone()).to_u32_digits()) }
-                    OP_ELSE
-                        OP_9 OP_PICK OP_4 OP_NUMEQUAL
-                        OP_IF
-                            { Self::push_u32_le(&c.clone().rem(modulus.clone()).to_u32_digits()) }
-                        OP_ELSE
-                            OP_9 OP_PICK OP_3 OP_NUMEQUAL
-                            OP_IF
-                                { Self::push_u32_le(&a.clone().add(b.clone()).rem(modulus.clone()).to_u32_digits()) }
-                            OP_ELSE
-                                OP_9 OP_PICK OP_2 OP_NUMEQUAL
-                                OP_IF
-                                    { Self::push_u32_le(&b.clone().rem(modulus.clone()).to_u32_digits()) }
-                                OP_ELSE
-                                    OP_9 OP_PICK OP_1 OP_NUMEQUAL
-                                    OP_IF
-                                        { Self::push_u32_le(&a.clone().rem(modulus.clone()).to_u32_digits()) }
-                                    OP_ELSE
-                                        { Self::push_zero() }
-                                    OP_ENDIF
-                                OP_ENDIF
-                            OP_ENDIF
-                        OP_ENDIF
-                    OP_ENDIF
-                OP_ENDIF
-            OP_ENDIF
-
-            { Self::add(1, 0) }
-
-            OP_9 OP_ROLL OP_DROP
-
-        }
-    }
-
-    fn convert_to_be_bytes() -> Script {
-        let build_u8_from_be_bits = |i| {
-            script! {
-                for _ in 0..(i - 1) {
-                    OP_DUP OP_ADD OP_ADD
-                }
-            }
-        };
-
-        script! {
-            { Self::decode_montgomery() }
-            // start with the top limb
-            // 30 bits => 6 + 8 bytes
-            { Self::N_LIMBS - 1 } OP_ROLL
-            { limb_to_be_bits(22) }
-            { build_u8_from_be_bits(6) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-
-            // second limb, 30 bits => 3 bytes + 6 leftover bits
-            { Self::N_LIMBS - 2 } OP_ROLL
-            { limb_to_be_bits(29) }
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(5) } OP_TOALTSTACK
-
-            // third limb, 30 bits = 2 bits borrow + 3 bytes + 4 leftover bits
-            { Self::N_LIMBS - 3 } OP_ROLL
-            { limb_to_be_bits(29) }
-            OP_FROMALTSTACK
-            { build_u8_from_be_bits(4) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(2) } OP_TOALTSTACK
-
-            // fourth limb, 30 bits = 4 bits borrow + 3 bytes + 2 leftover bits
-            { Self::N_LIMBS - 4 } OP_ROLL
-            { limb_to_be_bits(29) }
-            OP_FROMALTSTACK
-            { build_u8_from_be_bits(7) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(7) } OP_TOALTSTACK
-
-            // fifth limb, 30 bits = 6 bits borrow + 3 bytes
-            { Self::N_LIMBS - 5 } OP_ROLL
-            { limb_to_be_bits(29) }
-            OP_FROMALTSTACK
-            { build_u8_from_be_bits(2) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(4) } OP_TOALTSTACK
-
-            // sixth limb, 30 bits => 3 bytes + 6 leftover bits
-            { Self::N_LIMBS - 6 } OP_ROLL
-            { limb_to_be_bits(29) }
-            OP_FROMALTSTACK
-            { build_u8_from_be_bits(5) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(1) } OP_TOALTSTACK
-
-            // seventh limb, 30 bits = 2 bits borrow + 3 bytes + 4 leftover bits
-            { Self::N_LIMBS - 7 } OP_ROLL
-            { limb_to_be_bits(29) }
-            OP_FROMALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(6) } OP_TOALTSTACK
-
-            // eighth limb, 30 bits = 4 bits borrow + 3 bytes + 2 leftover bits
-            { Self::N_LIMBS - 8 } OP_ROLL
-            { limb_to_be_bits(29) }
-            OP_FROMALTSTACK
-            { build_u8_from_be_bits(3) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(3) } OP_TOALTSTACK
-
-            // ninth limb, 30 bits = 6 bits borrow + 3 bytes
-            { Self::N_LIMBS - 9 } OP_ROLL
-            { limb_to_be_bits(29) }
-            OP_FROMALTSTACK
-            { build_u8_from_be_bits(6) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) } OP_TOALTSTACK
-            { build_u8_from_be_bits(8) }
-
-            for _ in 0..31 {
-                OP_FROMALTSTACK
-            }
-        }
-    }
-
-    fn convert_to_be_u4() -> Script {
-        let build_u8_from_be_bits = |i| {
-            script! {
-                for _ in 0..(i - 1) {
-                    OP_DUP OP_ADD OP_ADD
-                }
-            }
-        };
-
-        script! {
-            // { Self::decode_montgomery() }
-            // start with the top limb
-            // 22 bits => 2 + 5 u4
-            { Self::N_LIMBS - 1 } OP_ROLL
-            { limb_to_be_bits(22) }
-            { build_u8_from_be_bits(2) } OP_TOALTSTACK
-            for _ in 0..5 {
-                { build_u8_from_be_bits(4) } OP_TOALTSTACK
-            }
-
-            // second limb, 29 bits => 7 u4 + 1 leftover bits
-            { Self::N_LIMBS - 2 } OP_ROLL
-            { limb_to_be_bits(29) }
-            for _ in 0..7 {
-                { build_u8_from_be_bits(4) } OP_TOALTSTACK
-            }
-            { build_u8_from_be_bits(1) } OP_TOALTSTACK
-
-            // third limb, 29 bits = 3 bits borrow + 6 u4 + 2 leftover bits
-            { Self::N_LIMBS - 3 } OP_ROLL
-            { limb_to_be_bits(29) }
-            OP_FROMALTSTACK
-            { build_u8_from_be_bits(4) } OP_TOALTSTACK
-            for _ in 0..6 {
-                { build_u8_from_be_bits(4) } OP_TOALTSTACK
-            }
-            { build_u8_from_be_bits(2) } OP_TOALTSTACK
-
-            // fourth limb, 29 bits = 2 bits borrow + 6 u4 + 3 leftover bits
-            { Self::N_LIMBS - 4 } OP_ROLL
-            { limb_to_be_bits(29) }
-            OP_FROMALTSTACK
-            { build_u8_from_be_bits(3) } OP_TOALTSTACK
-            for _ in 0..6 {
-                { build_u8_from_be_bits(4) } OP_TOALTSTACK
-            }
-            { build_u8_from_be_bits(3) } OP_TOALTSTACK
-
-            // fifth limb, 30 bits = 1 bits borrow + 7 u4
-            { Self::N_LIMBS - 5 } OP_ROLL
-            { limb_to_be_bits(29) }
-            OP_FROMALTSTACK
-            { build_u8_from_be_bits(2) } OP_TOALTSTACK
-            for _ in 0..7 {
-                { build_u8_from_be_bits(4) } OP_TOALTSTACK
-            }
-
-            // sixth limb, 30 bits => 7 u4 + 1 leftover bits
-            { Self::N_LIMBS - 6 } OP_ROLL
-            { limb_to_be_bits(29) }
-            for _ in 0..7 {
-                { build_u8_from_be_bits(4) } OP_TOALTSTACK
-            }
-            { build_u8_from_be_bits(1) } OP_TOALTSTACK
-
-            // seventh limb, 30 bits = 3 bits borrow + 6 u4 + 2 leftover bits
-            { Self::N_LIMBS - 7 } OP_ROLL
-            { limb_to_be_bits(29) }
-            OP_FROMALTSTACK
-            { build_u8_from_be_bits(4) } OP_TOALTSTACK
-            for _ in 0..6 {
-                { build_u8_from_be_bits(4) } OP_TOALTSTACK
-            }
-            { build_u8_from_be_bits(2) } OP_TOALTSTACK
-
-            // eighth limb, 30 bits = 2 bits borrow + 6 u4 + 3 leftover bits
-            { Self::N_LIMBS - 8 } OP_ROLL
-            { limb_to_be_bits(29) }
-            OP_FROMALTSTACK
-            { build_u8_from_be_bits(3) } OP_TOALTSTACK
-            for _ in 0..6 {
-                { build_u8_from_be_bits(4) } OP_TOALTSTACK
-            }
-            { build_u8_from_be_bits(3) } OP_TOALTSTACK
-
-            // ninth limb, 29 bits = 1 bits borrow + 7 u4
-            { Self::N_LIMBS - 9 } OP_ROLL
-            { limb_to_be_bits(29) }
-            OP_FROMALTSTACK
-            { build_u8_from_be_bits(2) } OP_TOALTSTACK
-            for _ in 0..6 {
-                { build_u8_from_be_bits(4) } OP_TOALTSTACK
-            }
-            { build_u8_from_be_bits(4) }
-
-            for _ in 0..63 {
-                OP_FROMALTSTACK
-            }
-        }
-    }
-
-    fn toaltstack() -> Script { U254::toaltstack() }
-
-    fn fromaltstack() -> Script { U254::fromaltstack() }
-}
diff --git a/src/bn254/fq12.rs b/src/bn254/fq12.rs
deleted file mode 100644
index b8a06cf00..000000000
--- a/src/bn254/fq12.rs
+++ /dev/null
@@ -1,1012 +0,0 @@
-use crate::bn254::fp254impl::Fp254Impl;
-use crate::bn254::fq::Fq;
-use crate::bn254::fq2::Fq2;
-use crate::bn254::fq6::Fq6;
-use crate::bn254::fr::Fr;
-use crate::treepp::{script, Script};
-use ark_ff::Fp12Config;
-use num_bigint::BigUint;
-use num_traits::{Num, Zero};
-use std::ops::{ShrAssign, Sub};
-
-pub struct Fq12;
-
-impl Fq12 {
-    pub fn add(mut a: u32, mut b: u32) -> Script {
-        if a < b {
-            (a, b) = (b, a);
-        }
-        script! {
-            { Fq6::add(a + 6, b + 6) }
-            { Fq6::add(a, b + 6) }
-        }
-    }
-
-    pub fn sub(a: u32, b: u32) -> Script {
-        if a > b {
-            script! {
-                { Fq6::sub(a + 6, b + 6) }
-                { Fq6::sub(a, b + 6) }
-            }
-        } else {
-            script! {
-                { Fq6::sub(a + 6, b + 6) }
-                { Fq6::sub(a + 6, b) }
-            }
-        }
-    }
-
-    pub fn double(a: u32) -> Script {
-        script! {
-            { Fq6::double(a + 6) }
-            { Fq6::double(a + 6) }
-        }
-    }
-
-    pub fn equalverify() -> Script {
-        script! {
-            for i in 0..12 {
-                { Fq::equalverify(23 - i * 2, 11 - i) }
-            }
-        }
-    }
-
-    pub fn mul_fq6_by_nonresidue() -> Script {
-        script! {
-            { Fq6::mul_fq2_by_nonresidue() }
-            { Fq2::roll(4) }
-            { Fq2::roll(4) }
-        }
-    }
-
-    pub fn push_one() -> Script {
-        script! {
-            { Fq6::push_one() }
-            { Fq6::push_zero() }
-        }
-    }
-
-    pub fn push_zero() -> Script {
-        script! {
-            { Fq6::push_zero() }
-            { Fq6::push_zero() }
-        }
-    }
-
-    pub fn mul(mut a: u32, mut b: u32) -> Script {
-        if a < b {
-            (a, b) = (b, a);
-        }
-
-        // The degree-12 extension on BN254 Fq6 is under the polynomial z^2 - y
-
-        // TODO:
-        //  should be possible to save the stack space by using the lower limbs to store the
-        //  sum of high-low limbs after the first multiplication is done.
-
-        script! {
-            { Fq6::copy(a + 6) }
-            { Fq6::copy(b + 12) }
-            { Fq6::mul(6, 0) }
-            { Fq6::copy(a + 6) }
-            { Fq6::copy(b + 12) }
-            { Fq6::mul(6, 0) }
-            { Fq6::add(a + 12, a + 18) }
-            { Fq6::add(b + 18, b + 24) }
-            { Fq6::mul(6, 0) }
-            { Fq6::copy(12) }
-            { Fq6::copy(12) }
-            { Fq12::mul_fq6_by_nonresidue() }
-            { Fq6::add(6, 0) }
-            { Fq6::add(18, 12)}
-            { Fq6::sub(12, 0) }
-        }
-    }
-
-    pub fn mul_cpt(mut a: u32, mut b: u32) -> Script {
-        if a < b {
-            (a, b) = (b, a);
-        }
-        // a0, a1, b0, b1
-        script! {
-            { Fq6::copy(a + 6) }
-            // a0, a1, b0, b1, a0
-            { Fq6::copy(b + 12) }
-            // a0, a1, b0, b1, a0, b0
-            { Fq6::mul(6, 0) }
-            // a0, a1, b0, b1, a0 * b0
-            { Fq6::roll(a + 12) }
-            // a1, b0, b1, a0 * b0, a0
-            { Fq6::copy(a + 12) }
-            // a1, b0, b1, a0 * b0, a0, a1
-            { Fq6::add(6, 0) }
-            // a1, b0, b1, a0 * b0, a0 + a1
-            { Fq6::roll(b + 18) }
-            // a1, b1, a0 * b0, a0 + a1, b0
-            { Fq6::copy(b + 18) }
-            // a1, b1, a0 * b0, a0 + a1, b0, b1
-            { Fq6::add(6, 0) }
-            // a1, b1, a0 * b0, a0 + a1, b0 + b1
-            { Fq6::mul(6, 0) }
-            // a1, b1, a0 * b0, (a0 + a1) * (b0 + b1)
-            { Fq6::mul(a + 6, b + 12) }
-            // a0 * b0, (a0 + a1) * (b0 + b1), a1 * b1
-            { Fq6::copy(0) }
-            // a0 * b0, (a0 + a1) * (b0 + b1), a1 * b1, a1 * b1
-            { Fq6::mul_fq2_by_nonresidue() }
-            { Fq2::roll(4) }
-            { Fq2::roll(4) }
-            // a0 * b0, (a0 + a1) * (b0 + b1), a1 * b1, a1 * b1 * beta
-            { Fq6::copy(18) }
-            // a0 * b0, (a0 + a1) * (b0 + b1), a1 * b1, a1 * b1 * beta, a0 * b0
-            { Fq6::add(6, 0) }
-            // a0 * b0, (a0 + a1) * (b0 + b1), a1 * b1, a1 * b1 * beta + a0 * b0
-            { Fq6::add(18, 6) }
-            // (a0 + a1) * (b0 + b1), a1 * b1 * beta + a0 * b0, a0 * b0 + a1 * b1
-            { Fq6::sub(12, 0) }
-            // a1 * b1 * beta + a0 * b0, (a0 + a1) * (b0 + b1) - (a0 * b0 + a1 * b1)
-        }
-    }
-
-    // input:
-    //   p   (12 elements)
-    //   c0  (2 elements)
-    //   c3  (2 elements)
-    //   c4  (2 elements)
-    pub fn mul_by_034() -> Script {
-        script! {
-            // copy p.c1, c3, c4
-            { Fq6::copy(6) }
-            { Fq2::copy(8) }
-            { Fq2::copy(8) }
-
-            // compute b = p.c1 * (c3, c4)
-            { Fq6::mul_by_01() }
-
-            // copy p.c0, c0
-            { Fq6::copy(18) }
-            { Fq2::copy(16) }
-            { Fq6::mul_by_fp2() }
-
-            // compute beta * b
-            { Fq6::copy(6) }
-            { Fq12::mul_fq6_by_nonresidue() }
-
-            // compute final c0 = a + beta * b
-            { Fq6::copy(6) }
-            { Fq6::add(6, 0) }
-
-            // compute e = p.c0 + p.c1
-            { Fq6::add(30, 24) }
-
-            // compute c0 + c3
-            { Fq2::add(28, 26) }
-
-            // roll c4
-            { Fq2::roll(26) }
-
-            // update e = e * (c0 + c3, c4)
-            { Fq6::mul_by_01() }
-
-            // sum a and b
-            { Fq6::add(18, 12) }
-
-            // compute final c1 = e - (a + b)
-            { Fq6::sub(6, 0) }
-        }
-    }
-
-    // input:
-    //   p   (12 elements)
-    //   c0  (2 elements)
-    //   c3  (2 elements)
-    pub fn mul_by_034_with_4_constant(constant: &ark_bn254::Fq2) -> Script {
-        script! {
-            // copy p.c1, c3, c4
-            { Fq6::copy(4) }
-            { Fq2::copy(6) }
-
-            // compute b = p.c1 * (c3, c4)
-            { Fq6::mul_by_01_with_1_constant(constant) }
-            // [p.c0, p.c1, c0, c3, b]
-
-            // copy p.c0, c0
-            { Fq6::copy(16) }
-            { Fq2::copy(14) }
-
-            // compute a = p.c0 * c0
-            { Fq6::mul_by_fp2() }
-            // [p.c0, p.c1, c0, c3, b, a]
-
-            // compute beta * b
-            { Fq6::copy(6) }
-            { Fq12::mul_fq6_by_nonresidue() }
-            // [p.c0, p.c1, c0, c3, b, a, b * beta]
-
-            // compute final c0 = a + beta * b
-            { Fq6::copy(6) }
-            { Fq6::add(6, 0) }
-            // [p.c0, p.c1, c0, c3, b, a, a + b * beta]
-            // [p.c0, p.c1, c0, c3, b, a, c0']
-
-            // compute e = p.c0 + p.c1
-            { Fq6::add(28, 22) }
-            // [c0, c3, b, a, c0', e]
-
-            // compute c0 + c3
-            { Fq2::add(26, 24) }
-            // [b, a, c0', e, c0 + c3]
-
-            // update e = e * (c0 + c3, c4)
-            { Fq6::mul_by_01_with_1_constant(constant) }
-            // [b, a, c0', e * (c0 + c3, c4)]
-            // [b, a, c0', e]
-
-            // sum a and b
-            { Fq6::add(18, 12) }
-            // [c0', e, a + b]
-
-            // compute final c1 = e - (a + b)
-            { Fq6::sub(6, 0) }
-            // [c0', e - a + b]
-            // [c0', c1']
-        }
-    }
-
-    // input:
-    //   p   (12 elements)
-    //   c3  (2 elements)
-    //   c4  (2 elements)
-    // where c0 is a trival value ONE, so we can ignore it
-    pub fn mul_by_34() -> Script {
-        script! {
-            // copy p.c1, c3, c4
-            { Fq6::copy(4) }
-            { Fq2::copy(8) }
-            { Fq2::copy(8) }
-            // [p, c3, c4, p.c1, c3, c4]
-
-            // compute b = p.c1 * (c3, c4)
-            { Fq6::mul_by_01() }
-            // [p, c3, c4, b]
-
-            // a = p.c0 * c0, where c0 = 1
-            { Fq6::copy(16) }
-            // [p, c3, c4, b, a]
-
-            // compute beta * b
-            { Fq6::copy(6) }
-            { Fq12::mul_fq6_by_nonresidue() }
-            // [p, c3, c4, b, a, beta * b]
-
-            // compute final c0 = a + beta * b
-            { Fq6::copy(6) }
-            { Fq6::add(6, 0) }
-            // [p, c3, c4, b, a, c0]
-
-            // compute e = p.c0 + p.c1
-            { Fq6::add(28, 22) }
-            // [c3, c4, b, a, c0, e]
-
-            // compute c0 + c3, where c0 = 1
-            { Fq2::roll(26) }
-            { Fq2::push_one() }
-            { Fq2::add(2, 0) }
-            // [c4, b, a, c0, e, 1 + c3]
-
-            // update e = e * (c0 + c3, c4), where c0 = 1
-            { Fq2::roll(26) }
-            { Fq6::mul_by_01() }
-            // [b, a, c0, e]
-
-            // sum a and b
-            { Fq6::add(18, 12) }
-            // [c0, e, a + b]
-
-            // compute final c1 = e - (a + b)
-            { Fq6::sub(6, 0) }
-        }
-    }
-
-    pub fn copy(a: u32) -> Script {
-        script! {
-            { Fq6::copy(a + 6) }
-            { Fq6::copy(a + 6) }
-        }
-    }
-
-    pub fn roll(a: u32) -> Script {
-        script! {
-            { Fq6::roll(a + 6) }
-            { Fq6::roll(a + 6) }
-        }
-    }
-
-    pub fn cyclotomic_square() -> Script {
-        // https://eprint.iacr.org/2009/565.pdf
-        // based on the implementation in arkworks-rs, fq12_2over3over2.rs
-
-        let sqr = || {
-            script! {
-                // compute tmp = ra * rb
-                { Fq2::copy(2) }
-                { Fq2::copy(2) }
-                { Fq2::mul(2, 0) }
-
-                // compute ra + rb
-                { Fq2::copy(4) }
-                { Fq2::copy(4) }
-                { Fq2::add(2, 0) }
-
-                // compute ra + beta * rb
-                { Fq2::roll(4) }
-                { Fq6::mul_fq2_by_nonresidue() }
-                { Fq2::roll(6) }
-                { Fq2::add(2, 0) }
-
-                // compute (ra + rb) * (ra + beta * rb) - tmp - tmp * beta
-                { Fq2::mul(2, 0) }
-                { Fq2::copy(2) }
-                { Fq6::mul_fq2_by_nonresidue() }
-                { Fq2::copy(4) }
-                { Fq2::add(2, 0) }
-                { Fq2::sub(2, 0) }
-                { Fq2::double(2) }
-            }
-        };
-
-        script! {
-            // copy r0 = c0.c0 and r1 = c1.c1
-            { Fq2::copy(10) }
-            { Fq2::copy(4) }
-
-            // compute t0 = r0^2 + r1^2 * beta, t1 = 2r0r1
-            { sqr() }
-
-            // copy r2 = c1.c0 and r3 = c0.c2
-            { Fq2::copy(8) }
-            { Fq2::copy(12) }
-
-            // compute t2 = r2^2 + r3^2 * beta, t3 = 2r2r3
-            { sqr() }
-
-            // copy r4 = c0.c1 and r5 = c1.c2
-            { Fq2::copy(16) }
-            { Fq2::copy(10) }
-
-            // compute t4 = r4^2 + r5^2 * beta, t5 = 242r5
-            { sqr() }
-
-            // z0 = 2 * (t0 - r0) + t0
-            { Fq2::copy(10) }
-            { Fq2::roll(24) }
-            { Fq2::sub(2, 0) }
-            { Fq2::double(0) }
-            { Fq2::roll(12) }
-            { Fq2::add(2, 0) }
-
-            // z4 = 2 * (t2 - r4) + t2
-            { Fq2::copy(8) }
-            { Fq2::roll(22) }
-            { Fq2::sub(2, 0) }
-            { Fq2::double(0) }
-            { Fq2::roll(10) }
-            { Fq2::add(2, 0) }
-
-            // z3 = 2 * (t4 - r3) + t4
-            { Fq2::copy(6) }
-            { Fq2::roll(20) }
-            { Fq2::sub(2, 0) }
-            { Fq2::double(0) }
-            { Fq2::roll(8) }
-            { Fq2::add(2, 0) }
-
-            // z2 = 2 * (beta * t5 + r2) + (beta * t5)
-            { Fq2::roll(6) }
-            { Fq6::mul_fq2_by_nonresidue() }
-            { Fq2::copy(0) }
-            { Fq2::roll(18) }
-            { Fq2::add(2, 0) }
-            { Fq2::double(0) }
-            { Fq2::add(2, 0) }
-
-            // z1 = 2 * (t1 + r1) + t1
-            { Fq2::copy(10) }
-            { Fq2::roll(16) }
-            { Fq2::add(2, 0) }
-            { Fq2::double(0) }
-            { Fq2::roll(12) }
-            { Fq2::add(2, 0) }
-
-            // z5 = 2 * (t3 + r5) + t5
-            { Fq2::copy(10) }
-            { Fq2::roll(14) }
-            { Fq2::add(2, 0) }
-            { Fq2::double(0) }
-            { Fq2::roll(12) }
-            { Fq2::add(2, 0) }
-        }
-    }
-
-    pub fn square() -> Script {
-        script! {
-            // v0 = c0 + c1
-            { Fq6::copy(6) }
-            { Fq6::copy(6) }
-            { Fq6::add(6, 0) }
-
-            // v3 = c0 + beta * c1
-            { Fq6::copy(6) }
-            { Fq12::mul_fq6_by_nonresidue() }
-            { Fq6::copy(18) }
-            { Fq6::add(0, 6) }
-
-            // v2 = c0 * c1
-            { Fq6::mul(12, 18) }
-
-            // v0 = v0 * v3
-            { Fq6::mul(12, 6) }
-
-            // final c0 = v0 - (beta + 1) * v2
-            { Fq6::copy(6) }
-            { Fq12::mul_fq6_by_nonresidue() }
-            { Fq6::copy(12) }
-            { Fq6::add(6, 0) }
-            { Fq6::sub(6, 0) }
-
-            // final c1 = 2 * v2
-            { Fq6::double(6) }
-        }
-    }
-
-    pub fn cyclotomic_inverse() -> Script {
-        script! {
-            { Fq6::neg(0) }
-        }
-    }
-
-    pub fn inv() -> Script {
-        script! {
-            // copy c1
-            { Fq6::copy(0) }
-
-            // compute beta * v1 = beta * c1^2
-            { Fq6::square() }
-            { Fq12::mul_fq6_by_nonresidue() }
-
-            // copy c0
-            { Fq6::copy(12) }
-
-            // compute v0 = c0^2 + beta * v1
-            { Fq6::square() }
-            { Fq6::sub(0, 6) }
-
-            // compute inv v0
-            { Fq6::inv() }
-
-            // dup inv v0
-            { Fq6::copy(0) }
-
-            // compute c0
-            { Fq6::mul(18, 0) }
-
-            // compute c1
-            { Fq6::neg(12) }
-            { Fq6::mul(12, 0) }
-        }
-    }
-
-    pub fn frobenius_map(i: usize) -> Script {
-        script! {
-            { Fq6::roll(6) }
-            { Fq6::frobenius_map(i) }
-            { Fq6::roll(6) }
-            { Fq6::frobenius_map(i) }
-            { Fq6::mul_by_fp2_constant(&ark_bn254::Fq12Config::FROBENIUS_COEFF_FP12_C1[i % ark_bn254::Fq12Config::FROBENIUS_COEFF_FP12_C1.len()]) }
-        }
-    }
-
-    pub fn toaltstack() -> Script {
-        script! {
-            { Fq6::toaltstack() }
-            { Fq6::toaltstack() }
-        }
-    }
-
-    pub fn fromaltstack() -> Script {
-        script! {
-            { Fq6::fromaltstack() }
-            { Fq6::fromaltstack() }
-        }
-    }
-
-    pub fn drop() -> Script {
-        script! {
-            { Fq6::drop() }
-            { Fq6::drop() }
-        }
-    }
-
-    pub fn cyclotomic_pow_by_r() -> Script {
-        // idea: first compute mul_by_p, then handle the delta using double-and-add
-
-        let mut delta = BigUint::from_str_radix(Fq::MODULUS, 16)
-            .unwrap()
-            .sub(BigUint::from_str_radix(Fr::MODULUS, 16).unwrap());
-
-        let mut delta_bits = vec![];
-        while !delta.is_zero() {
-            delta_bits.push(delta.bit(0));
-            delta.shr_assign(1);
-        }
-
-        let loop_no_script = script! {
-            { Fq12::cyclotomic_square() }
-        };
-
-        let loop_yes_script = script! {
-            { Fq12::cyclotomic_square() }
-            { Fq12::copy(12) }
-            { Fq12::mul(12, 0) }
-        };
-
-        script! {
-            { Fq12::copy(0) }
-            { Fq12::frobenius_map(1) }
-            { Fq12::toaltstack() }
-            { Fq12::copy(0) }
-
-            for bit in delta_bits.iter().rev().skip(1) {
-                if *bit {
-                    { loop_yes_script.clone() }
-                } else {
-                    { loop_no_script.clone() }
-                }
-            }
-
-            { Fq12::roll(12) }
-            { Fq12::drop() }
-            { Fq12::cyclotomic_inverse() }
-            { Fq12::fromaltstack() }
-            { Fq12::mul(12, 0) }
-        }
-    }
-
-    pub fn move_to_cyclotomic() -> Script {
-        script! {
-            // compute f1 = a.cyclotomic_inverse()
-            { Fq12::copy(0) }
-            { Fq12::cyclotomic_inverse() }
-
-            // compute f2 = a.inverse()
-            { Fq12::roll(12) }
-            { Fq12::inv() }
-
-            // compute r := f1 * f2
-            { Fq12::mul(12, 0) }
-
-            // copy f2 := r, r
-            { Fq12::copy(0) }
-
-            // r.frobenius_map_in_place(2)
-            { Fq12::frobenius_map(2) }
-
-            // r *= f2
-            { Fq12::mul(12, 0) }
-        }
-    }
-
-    pub fn cyclotomic_verify_in_place() -> Script {
-        script! {
-            // check p^4 + 1 = p^2
-            { Fq12::copy(0) }
-            { Fq12::frobenius_map(4) }
-            { Fq12::copy(12) }
-            { Fq12::mul(12, 0) }
-            { Fq12::copy(12) }
-            { Fq12::frobenius_map(2) }
-            { Fq12::equalverify() }
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fq12::Fq12;
-    use crate::treepp::*;
-    use ark_ff::AdditiveGroup;
-    use ark_ff::{CyclotomicMultSubgroup, Field};
-    use ark_std::UniformRand;
-    use bitcoin_scriptexec::ExecError;
-    use core::ops::Mul;
-    use num_bigint::BigUint;
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-    use std::str::FromStr;
-
-    fn fq2_push(element: ark_bn254::Fq2) -> Script {
-        script! {
-            { Fq::push_u32_le(&BigUint::from(element.c0).to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from(element.c1).to_u32_digits()) }
-        }
-    }
-
-    fn fq12_push(element: ark_bn254::Fq12) -> Script {
-        script! {
-            for elem in element.to_base_prime_field_elements() {
-                { Fq::push_u32_le(&BigUint::from(elem).to_u32_digits()) }
-            }
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_add() {
-        println!("Fq12.add: {} bytes", Fq12::add(12, 0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..50 {
-            let a = ark_bn254::Fq12::rand(&mut prng);
-            let b = ark_bn254::Fq12::rand(&mut prng);
-            let c = &a + &b;
-
-            let script = script! {
-                { fq12_push(a) }
-                { fq12_push(b) }
-                { Fq12::add(12, 0) }
-                { fq12_push(c) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_double() {
-        println!("Fq12.double: {} bytes", Fq12::double(0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..50 {
-            let a = ark_bn254::Fq12::rand(&mut prng);
-            let c = a.double();
-
-            let script = script! {
-                { fq12_push(a) }
-                { Fq12::double(0) }
-                { fq12_push(c) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_mul() {
-        println!("Fq12.mul: {} bytes", Fq12::mul(12, 0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq12::rand(&mut prng);
-            let b = ark_bn254::Fq12::rand(&mut prng);
-            let c = a.mul(&b);
-
-            let script = script! {
-                { fq12_push(a) }
-                { fq12_push(b) }
-                { Fq12::mul(12, 0) }
-                { fq12_push(c) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_mul_cpt() {
-        println!("Fq12.mul_cpt: {} bytes", Fq12::mul_cpt(12, 0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq12::rand(&mut prng);
-            let b = ark_bn254::Fq12::rand(&mut prng);
-            let c = a.mul(&b);
-
-            let script = script! {
-                { fq12_push(a) }
-                { fq12_push(b) }
-                { Fq12::mul_cpt(12, 0) }
-                { fq12_push(c) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_cyclotomic_square() {
-        println!(
-            "Fq12.cyclotomic_square: {} bytes",
-            Fq12::cyclotomic_square().len()
-        );
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq12::rand(&mut prng);
-            let c = a.cyclotomic_square();
-
-            let script = script! {
-                { fq12_push(a) }
-                { Fq12::cyclotomic_square() }
-                { fq12_push(c) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_square() {
-        println!("Fq12.square: {} bytes", Fq12::square().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq12::rand(&mut prng);
-            let c = a.square();
-
-            let script = script! {
-                { fq12_push(a) }
-                { Fq12::square() }
-                { fq12_push(c) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_mul_by_034() {
-        println!("Fq12.mul_by_034: {} bytes", Fq12::mul_by_034().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq12::rand(&mut prng);
-            let c0 = ark_bn254::Fq2::rand(&mut prng);
-            let c3 = ark_bn254::Fq2::rand(&mut prng);
-            let c4 = ark_bn254::Fq2::rand(&mut prng);
-            let mut b = a;
-            b.mul_by_034(&c0, &c3, &c4);
-
-            let script = script! {
-                { fq12_push(a) }
-                { fq2_push(c0) }
-                { fq2_push(c3) }
-                { fq2_push(c4) }
-                { Fq12::mul_by_034() }
-                { fq12_push(b) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_mul_by_34() {
-        println!("Fq12.mul_by_034: {} bytes", Fq12::mul_by_034().len());
-        println!("Fq12.mul_by_34: {} bytes", Fq12::mul_by_34().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq12::rand(&mut prng);
-            let c0 = ark_bn254::Fq2::ONE;
-            let c3 = ark_bn254::Fq2::rand(&mut prng);
-            let c4 = ark_bn254::Fq2::rand(&mut prng);
-            let mut b = a;
-            b.mul_by_034(&c0, &c3, &c4);
-
-            let script = script! {
-                { fq12_push(a) }
-                { fq2_push(c3) }
-                { fq2_push(c4) }
-                { Fq12::mul_by_34() }
-                { fq12_push(b) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_inv() {
-        println!("Fq12.inv: {} bytes", Fq12::inv().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq12::rand(&mut prng);
-            let b = a.inverse().unwrap();
-
-            let script = script! {
-                { fq12_push(a) }
-                { Fq12::inv() }
-                { fq12_push(b) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_frobenius_map() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            for i in 0..12 {
-                let a = ark_bn254::Fq12::rand(&mut prng);
-                let b = a.frobenius_map(i);
-
-                let frobenius_map = Fq12::frobenius_map(i);
-                println!("Fq12.frobenius_map({}): {} bytes", i, frobenius_map.len());
-
-                let script = script! {
-                    { fq12_push(a) }
-                    { frobenius_map.clone() }
-                    { fq12_push(b) }
-                    { Fq12::equalverify() }
-                    OP_TRUE
-                };
-                let exec_result = execute_script(script);
-                assert!(exec_result.success);
-            }
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_mul_by_r() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        let cyclotomic_pow_by_r = Fq12::cyclotomic_pow_by_r();
-        println!(
-            "Fq12.cyclotomic_pow_by_r: {} bytes",
-            cyclotomic_pow_by_r.len()
-        );
-
-        for _ in 0..1 {
-            let a = ark_bn254::fq12::Fq12::rand(&mut prng);
-
-            // move a into the cyclotomic subgroup
-            let a = {
-                let f1 = a.cyclotomic_inverse().unwrap();
-
-                let mut f2 = a.inverse().unwrap();
-                let mut r = f1.mul(&f2);
-                f2 = r;
-
-                r.frobenius_map_in_place(2);
-
-                r *= f2;
-                r
-            };
-
-            let res = a.cyclotomic_exp(
-                BigUint::from_str(
-                    "21888242871839275222246405745257275088548364400416034343698204186575808495617",
-                )
-                .unwrap()
-                .to_u64_digits(),
-            );
-
-            let script = script! {
-                { fq12_push(a) }
-                { cyclotomic_pow_by_r.clone() }
-                { fq12_push(res) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_move_to_cyclotomic() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        let move_to_cyclotomic = Fq12::move_to_cyclotomic();
-        println!(
-            "Fq12.move_to_cyclotomic: {} bytes",
-            move_to_cyclotomic.len()
-        );
-
-        for _ in 0..1 {
-            let a = ark_bn254::fq12::Fq12::rand(&mut prng);
-
-            // move a into the cyclotomic subgroup
-            let res = {
-                let f1 = a.cyclotomic_inverse().unwrap();
-
-                let mut f2 = a.inverse().unwrap();
-                let mut r = f1.mul(&f2);
-                f2 = r;
-
-                r.frobenius_map_in_place(2);
-
-                r *= f2;
-                r
-            };
-
-            let script = script! {
-                { fq12_push(a) }
-                { move_to_cyclotomic.clone() }
-                { fq12_push(res) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq12_cyclotomic_verify_in_place() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        let cyclotomic_verify_in_place = Fq12::cyclotomic_verify_in_place();
-        println!(
-            "Fq12.cyclotomic_verify_in_place: {} bytes",
-            cyclotomic_verify_in_place.len()
-        );
-
-        for _ in 0..1 {
-            let a = ark_bn254::fq12::Fq12::rand(&mut prng);
-
-            // move a into the cyclotomic subgroup
-            let res = {
-                let f1 = a.cyclotomic_inverse().unwrap();
-
-                let mut f2 = a.inverse().unwrap();
-                let mut r = f1.mul(&f2);
-                f2 = r;
-
-                r.frobenius_map_in_place(2);
-
-                r *= f2;
-                r
-            };
-
-            let script = script! {
-                { fq12_push(a) }
-                { cyclotomic_verify_in_place.clone() }
-                { Fq12::drop() }
-            };
-            let exec_result = execute_script(script);
-            assert_eq!(exec_result.error, Some(ExecError::EqualVerify));
-
-            let script = script! {
-                { fq12_push(res) }
-                { cyclotomic_verify_in_place.clone() }
-                { Fq12::drop() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-}
diff --git a/src/bn254/fq2.rs b/src/bn254/fq2.rs
deleted file mode 100644
index d1296840f..000000000
--- a/src/bn254/fq2.rs
+++ /dev/null
@@ -1,544 +0,0 @@
-use crate::bn254::fp254impl::Fp254Impl;
-use crate::bn254::fq::Fq;
-use crate::treepp::{script, Script};
-use ark_ff::Fp2Config;
-use std::ops::Add;
-
-pub struct Fq2;
-
-impl Fq2 {
-    pub fn add(mut a: u32, mut b: u32) -> Script {
-        if a < b {
-            (a, b) = (b, a);
-        }
-
-        script! {
-            { Fq::add(a + 1, b + 1) }
-            { Fq::add(a, b + 1) }
-        }
-    }
-
-    pub fn sub(a: u32, b: u32) -> Script {
-        if a > b {
-            script! {
-                { Fq::sub(a + 1, b + 1) }
-                { Fq::sub(a, b + 1) }
-            }
-        } else {
-            script! {
-                { Fq::sub(a + 1, b + 1) }
-                { Fq::sub(a + 1, b) }
-            }
-        }
-    }
-
-    pub fn double(a: u32) -> Script {
-        script! {
-            { Fq::double(a + 1) }
-            { Fq::double(a + 1) }
-        }
-    }
-
-    /// Square the top Fq2 element
-    ///
-    /// Optimized by: @Hakkush-07
-    pub fn square() -> Script {
-        script! {
-            { Fq::copy(1) }
-            { Fq::copy(1) }
-            { Fq::copy(1) }
-            { Fq::copy(1) }
-            { Fq::mul() }
-            { Fq::double(0) }
-            { Fq::sub(2, 1) }
-            { Fq::add(3, 2) }
-            { Fq::mul() }
-            { Fq::roll(1) }
-        }
-    }
-
-    pub fn copy(a: u32) -> Script {
-        script! {
-            { Fq::copy(a + 1) }
-            { Fq::copy(a + 1) }
-        }
-    }
-
-    pub fn equalverify() -> Script {
-        script! {
-            { Fq::equalverify(3, 1) }
-            { Fq::equalverify(1, 0) }
-        }
-    }
-
-    pub fn roll(a: u32) -> Script {
-        script! {
-            { Fq::roll(a + 1) }
-            { Fq::roll(a + 1) }
-        }
-    }
-
-    pub fn mul(mut a: u32, mut b: u32) -> Script {
-        if a < b {
-            (a, b) = (b, a);
-        }
-
-        // The degree-2 extension on BN254 Fq is under the polynomial x^2 + 1
-        script! {
-            { Fq::copy(a + 1) }
-            { Fq::copy(b + 1 + 1) }
-            { Fq::mul() }
-            { Fq::copy(a + 1) }
-            { Fq::copy(b + 1 + 1) }
-            { Fq::mul() }
-            { Fq::add(a + 2, a + 3) }
-            { Fq::add(b + 3, b + 4) }
-            { Fq::mul() }
-            { Fq::copy(2) }
-            { Fq::copy(2) }
-            { Fq::sub(1, 0) }
-            { Fq::add(3, 2) }
-            { Fq::sub(2, 0) }
-        }
-    }
-
-    pub fn mul_by_fq(mut a: u32, b: u32) -> Script {
-        if a < b {
-            a += 1;
-        }
-
-        script! {
-            { Fq::copy(b) }
-            { Fq::roll(a + 2) }
-
-            { Fq::mul() }
-            { Fq::roll(b + 1) }
-            { Fq::roll(a + 1) }
-
-            { Fq::mul() }
-        }
-    }
-
-    pub fn push_one() -> Script {
-        script! {
-            { Fq::push_one() }
-            { Fq::push_zero() }
-        }
-    }
-
-    pub fn push_zero() -> Script {
-        script! {
-            { Fq::push_zero() }
-            { Fq::push_zero() }
-        }
-    }
-
-    pub fn neg(a: u32) -> Script {
-        script! {
-            { Fq::neg(a + 1) }
-            { Fq::neg(a + 1) }
-        }
-    }
-
-    pub fn inv() -> Script {
-        script! {
-            // copy c1
-            { Fq::copy(0) }
-
-            // compute v1 = c1^2
-            { Fq::square() }
-
-            // copy c0
-            { Fq::copy(2) }
-
-            // compute v0 = c0^2 + v1
-            { Fq::square() }
-            { Fq::add(1, 0) }
-
-            // compute inv v0
-            { Fq::inv() }
-
-            // dup inv v0
-            { Fq::copy(0) }
-
-            // compute c0
-            { Fq::roll(3) }
-            { Fq::mul() }
-
-            // compute c1
-            { Fq::roll(2) }
-            { Fq::roll(2) }
-            { Fq::mul() }
-            { Fq::neg(0) }
-        }
-    }
-
-    pub fn div2() -> Script {
-        script! {
-            { Fq::roll(1) }
-            { Fq::div2() }
-            { Fq::roll(1) }
-            { Fq::div2() }
-        }
-    }
-
-    pub fn div3() -> Script {
-        script! {
-            { Fq::roll(1) }
-            { Fq::div3() }
-            { Fq::roll(1) }
-            { Fq::div3() }
-        }
-    }
-
-    pub fn triple(a: u32) -> Script {
-        script! {
-            { Fq2::copy(a) }
-            { Fq2::double(a + 2) }
-            { Fq2::add(2, 0) }
-        }
-    }
-
-    pub fn frobenius_map(i: usize) -> Script {
-        script! {
-            { Fq::mul_by_constant(&ark_bn254::Fq2Config::FROBENIUS_COEFF_FP2_C1[i % ark_bn254::Fq2Config::FROBENIUS_COEFF_FP2_C1.len()]) }
-        }
-    }
-
-    pub fn mul_by_constant(constant: &ark_bn254::Fq2) -> Script {
-        script! {
-            { Fq::copy(1) }
-            { Fq::mul_by_constant(&constant.c0) }
-            { Fq::copy(1) }
-            { Fq::mul_by_constant(&constant.c1) }
-            { Fq::add(3, 2) }
-            { Fq::mul_by_constant(&constant.c0.add(constant.c1)) }
-            { Fq::copy(2) }
-            { Fq::copy(2) }
-            { Fq::add(1, 0) }
-            { Fq::sub(1, 0) }
-            { Fq::sub(2, 1) }
-            { Fq::roll(1) }
-        }
-    }
-
-    pub fn toaltstack() -> Script {
-        script! {
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-        }
-    }
-
-    pub fn fromaltstack() -> Script {
-        script! {
-            { Fq::fromaltstack() }
-            { Fq::fromaltstack() }
-        }
-    }
-
-    pub fn drop() -> Script {
-        script! {
-            { Fq::drop() }
-            { Fq::drop() }
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fq2::Fq2;
-    use crate::bn254::{fp254impl::Fp254Impl, utils::fq2_push};
-    use crate::treepp::*;
-    use ark_ff::Field;
-    use ark_std::UniformRand;
-    use core::ops::{Add, Mul};
-    use num_bigint::BigUint;
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-    use ark_ff::AdditiveGroup;
-
-    #[test]
-    fn test_bn254_fq2_add() {
-        println!("Fq2.add: {} bytes", Fq2::add(2, 0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..50 {
-            let a = ark_bn254::Fq2::rand(&mut prng);
-            let b = ark_bn254::Fq2::rand(&mut prng);
-            let c = &a + &b;
-
-            let script = script! {
-                { fq2_push(a) }
-                { fq2_push(b) }
-                { Fq2::add(2, 0) }
-                { fq2_push(c) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-
-            let script = script! {
-                { fq2_push(a) }
-                { fq2_push(b) }
-                { Fq2::add(0, 2) }
-                { fq2_push(c) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq2_sub() {
-        println!("Fq2.sub: {} bytes", Fq2::sub(2, 0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..50 {
-            let a = ark_bn254::Fq2::rand(&mut prng);
-            let b = ark_bn254::Fq2::rand(&mut prng);
-            let c = &a - &b;
-
-            let script = script! {
-                { fq2_push(a) }
-                { fq2_push(b) }
-                { Fq2::sub(2, 0) }
-                { fq2_push(c) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-
-            let script = script! {
-                { fq2_push(b) }
-                { fq2_push(a) }
-                { Fq2::sub(0, 2) }
-                { fq2_push(c) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq2_double() {
-        println!("Fq2.double: {} bytes", Fq2::double(0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..50 {
-            let a = ark_bn254::Fq2::rand(&mut prng);
-            let c = a.double();
-
-            let script = script! {
-                { fq2_push(a) }
-                { Fq2::double(0) }
-                { fq2_push(c) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq2_mul() {
-        println!("Fq2.mul: {} bytes", Fq2::mul(1, 0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq2::rand(&mut prng);
-            let b = ark_bn254::Fq2::rand(&mut prng);
-            let c = a.mul(&b);
-
-            let script = script! {
-                { fq2_push(a) }
-                { fq2_push(b) }
-                { Fq2::mul(2, 0) }
-                { fq2_push(c) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq2_mul_by_fq() {
-        println!("Fq2.mul_by_fq: {} bytes", Fq2::mul_by_fq(1, 0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..10 {
-            let a = ark_bn254::Fq2::rand(&mut prng);
-            let b = ark_bn254::Fq::rand(&mut prng);
-            let mut c = a;
-            c.mul_assign_by_fp(&b);
-
-            let script = script! {
-                { fq2_push(a) }
-                { Fq::push_u32_le(&BigUint::from(b).to_u32_digits()) }
-                { Fq2::mul_by_fq(1, 0) }
-                { fq2_push(c) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq2_inv() {
-        println!("Fq2.inv: {} bytes", Fq2::inv().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq2::rand(&mut prng);
-            let b = a.inverse().unwrap();
-
-            let script = script! {
-                { fq2_push(a) }
-                { Fq2::inv() }
-                { fq2_push(b) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq2_square() {
-        println!("Fq2.square: {} bytes", Fq2::square().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..10 {
-            let a = ark_bn254::Fq2::rand(&mut prng);
-            let b = a.square();
-
-            let script = script! {
-                { fq2_push(a) }
-                { Fq2::square() }
-                { fq2_push(b) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq2_div2() {
-        println!("Fq2.div2: {} bytes", Fq2::div2().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq2::rand(&mut prng);
-            let b = a.double();
-
-            let script = script! {
-                { fq2_push(b) }
-                { Fq2::div2() }
-                { fq2_push(a) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq2_div3() {
-        println!("Fq2.div3: {} bytes", Fq2::div3().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq2::rand(&mut prng);
-            let b = a.double();
-            let c = a.add(b);
-
-            let script = script! {
-                { fq2_push(c) }
-                { Fq2::div3() }
-                { fq2_push(a) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq2_triple() {
-        println!("Fq2.triple: {} bytes", Fq2::triple(0).len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq2::rand(&mut prng);
-            let b = a.double();
-            let c = a.add(b);
-
-            let script = script! {
-                { fq2_push(a) }
-                { Fq2::triple(0) }
-                { fq2_push(c) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_bn254_fq2_frobenius_map() {
-        println!(
-            "Fq2.frobenius_map(0): {} bytes",
-            Fq2::frobenius_map(0).len()
-        );
-        println!(
-            "Fq2.frobenius_map(1): {} bytes",
-            Fq2::frobenius_map(1).len()
-        );
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..3 {
-            let a = ark_bn254::Fq2::rand(&mut prng);
-            let b = a.frobenius_map(0);
-
-            let script = script! {
-                { fq2_push(a) }
-                { Fq2::frobenius_map(0) }
-                { fq2_push(b) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-
-            let b = a.frobenius_map(1);
-
-            let script = script! {
-                { fq2_push(a) }
-                { Fq2::frobenius_map(1) }
-                { fq2_push(b) }
-                { Fq2::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-}
diff --git a/src/bn254/msm.rs b/src/bn254/msm.rs
deleted file mode 100644
index 7f5c3aefa..000000000
--- a/src/bn254/msm.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-use crate::bn254::curves::G1Projective;
-use crate::bn254::fp254impl::Fp254Impl;
-use crate::bn254::fq::Fq;
-use crate::bn254::fr::Fr;
-use std::ops::Mul;
-use crate::treepp::{script, Script};
-use ark_ff::Field;
-use num_bigint::BigUint;
-
-pub fn g1_affine_push(point: ark_bn254::G1Affine) -> Script {
-    script! {
-        { Fq::push_u32_le(&BigUint::from(point.x).to_u32_digits()) }
-        { Fq::push_u32_le(&BigUint::from(point.y).to_u32_digits()) }
-    }
-}
-
-fn fr_push(scalar: ark_bn254::Fr) -> Script {
-    script! {
-        { Fr::push_u32_le(&BigUint::from(scalar).to_u32_digits()) }
-    }
-}
-
-// Will compute msm and return the affine point
-// Output Stack: [x,y]
-pub fn msm(bases: &[ark_bn254::G1Affine], scalars: &[ark_bn254::Fr]) -> Script {
-    assert_eq!(bases.len(), scalars.len());
-    let bases: Vec<ark_ec::short_weierstrass::Projective<ark_bn254::g1::Config>> =
-        bases.iter().map(|&p| p.into()).collect();
-    let len = bases.len();
-    let scalar_mul = G1Projective::scalar_mul();
-
-    script! {
-        // 1. init the sum=0;
-        {G1Projective::push_zero()}
-        for i in 0..len {
-            // 2. scalar mul
-            { G1Projective::push(bases[i]) }
-            if scalars[i] != ark_bn254::Fr::ONE {
-                { fr_push(scalars[i]) }
-                { scalar_mul.clone() }
-            }
-
-            // 3. sum the base
-            { G1Projective::add() }
-        }
-        // convert into Affine
-        { G1Projective::into_affine() }
-    }
-}
-
-// Will compute msm assuming bases are constant and return the affine point
-// Output Stack: [x,y]
-pub fn msm_with_constant_bases(bases: &[ark_bn254::G1Affine], scalars: &[ark_bn254::Fr]) -> Script {
-    assert_eq!(bases.len(), scalars.len());
-    let bases: Vec<ark_ec::short_weierstrass::Projective<ark_bn254::g1::Config>> =
-        bases.iter().map(|&p| p.into()).collect();
-    let len = bases.len();
-
-    println!("len: {len}");
-    script! {
-        // 1. init the sum=0;
-        {G1Projective::push_zero()}
-        for i in 0..len {
-            // 2. scalar mul
-            if scalars[i] != ark_bn254::Fr::ONE {
-                { fr_push(scalars[i]) }
-                { G1Projective::scalar_mul_by_constant_g1(bases[i]) }
-            } else {
-                { G1Projective::push(bases[i]) }
-            }
-            // 3. sum the base
-            // { G1Projective::add() }
-            { G1Projective::push(bases[i].mul(scalars[i])) }
-        }
-        // // convert into Affine
-        // { G1Projective::into_affine() }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::bn254::curves::G1Affine;
-    use crate::execute_script;
-    use ark_ec::{CurveGroup, VariableBaseMSM};
-
-    use ark_std::{end_timer, start_timer, test_rng, UniformRand};
-
-    #[test]
-    fn test_msm_script() {
-        let k = 2;
-        let n = 1 << k;
-        let rng = &mut test_rng();
-
-        let scalars = (0..n).map(|_| ark_bn254::Fr::rand(rng)).collect::<Vec<_>>();
-
-        let bases = (0..n)
-            .map(|_| ark_bn254::G1Projective::rand(rng).into_affine())
-            .collect::<Vec<_>>();
-
-        let expect = ark_bn254::G1Projective::msm(&bases, &scalars).unwrap();
-        let expect = expect.into_affine();
-
-        let start = start_timer!(|| "collect_script");
-        let script = script! {
-            { msm(&bases, &scalars) }
-            { g1_affine_push(expect) }
-            { G1Affine::equalverify() }
-            OP_TRUE
-        };
-        end_timer!(start);
-
-        println!("msm::test_msm_script = {} bytes", script.len());
-        let start = start_timer!(|| "execute_msm_script");
-        let exec_result = execute_script(script);
-        end_timer!(start);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_msm_with_constant_bases_script() {
-        let k = 0;
-        let n = 1 << k;
-        let rng = &mut test_rng();
-
-        let scalars = (0..n).map(|_| ark_bn254::Fr::rand(rng)).collect::<Vec<_>>();
-
-        let bases = (0..n)
-            .map(|_| ark_bn254::G1Projective::rand(rng).into_affine())
-            .collect::<Vec<_>>();
-
-        let expect = ark_bn254::G1Projective::msm(&bases, &scalars).unwrap();
-        let expect = expect.into_affine();
-        let msm = msm_with_constant_bases(&bases, &scalars);
-
-        let start = start_timer!(|| "collect_script");
-        let script = script! {
-            { msm.clone() }
-            // { g1_affine_push(expect) }
-            // { G1Affine::equalverify() }
-            // OP_TRUE
-        };
-        end_timer!(start);
-
-        println!("msm_with_constant_bases: = {} bytes", msm.len());
-        let start = start_timer!(|| "execute_msm_script");
-        let exec_result = execute_script(script);
-        end_timer!(start);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/bn254/pairing.rs b/src/bn254/pairing.rs
deleted file mode 100644
index 415b652c7..000000000
--- a/src/bn254/pairing.rs
+++ /dev/null
@@ -1,767 +0,0 @@
-#![allow(non_snake_case)]
-use crate::bn254::ell_coeffs::G2Prepared;
-use crate::bn254::fp254impl::Fp254Impl;
-use crate::bn254::fq::Fq;
-use crate::bn254::fq12::Fq12;
-use crate::bn254::fq2::Fq2;
-use crate::bn254::utils;
-use crate::treepp::*;
-use ark_ec::bn::BnConfig;
-
-pub struct Pairing;
-
-impl Pairing {
-    // input:
-    //   p.x
-    //   p.y
-    pub fn miller_loop(constant: &G2Prepared, is_affine: bool) -> Script {
-        let mut constant_iter = constant.ell_coeffs.iter();
-
-        let script = script! {
-            { Fq12::push_one() }
-
-            for i in (1..ark_bn254::Config::ATE_LOOP_COUNT.len()).rev() {
-                if i != ark_bn254::Config::ATE_LOOP_COUNT.len() - 1 {
-                    { Fq12::square() }
-                }
-
-                { Fq2::copy(12) }
-                if is_affine {
-                    { utils::ell_by_constant_affine(constant_iter.next().unwrap()) }
-                } else {
-                    { utils::ell_by_constant(constant_iter.next().unwrap()) }
-                }
-
-                if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == 1 || ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
-                    { Fq2::copy(12) }
-                    if is_affine {
-                        { utils::ell_by_constant_affine(constant_iter.next().unwrap()) }
-                    } else {
-                        { utils::ell_by_constant(constant_iter.next().unwrap()) }
-                    }
-                }
-            }
-
-            { Fq2::copy(12) }
-            if is_affine {
-                { utils::ell_by_constant_affine(constant_iter.next().unwrap()) }
-            } else {
-                { utils::ell_by_constant(constant_iter.next().unwrap()) }
-            }
-            { Fq2::roll(12) }
-            if is_affine {
-                { utils::ell_by_constant_affine(constant_iter.next().unwrap()) }
-            } else {
-                { utils::ell_by_constant(constant_iter.next().unwrap()) }
-            }
-        };
-
-        assert_eq!(constant_iter.next(), None);
-        script
-    }
-
-    // input:
-    //   p.x
-    //   p.y
-    //   q.x
-    //   q.y
-    pub fn dual_miller_loop(constant_1: &G2Prepared, constant_2: &G2Prepared) -> Script {
-        let mut constant_1_iter = constant_1.ell_coeffs.iter();
-        let mut constant_2_iter = constant_2.ell_coeffs.iter();
-
-        let script = script! {
-            { Fq12::push_one() }
-
-            for i in (1..ark_bn254::Config::ATE_LOOP_COUNT.len()).rev() {
-                if i != ark_bn254::Config::ATE_LOOP_COUNT.len() - 1 {
-                    { Fq12::square() }
-                }
-
-                { Fq2::copy(14) }
-                { utils::ell_by_constant(constant_1_iter.next().unwrap()) }
-
-                { Fq2::copy(12) }
-                { utils::ell_by_constant(constant_2_iter.next().unwrap()) }
-
-                if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == 1 || ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
-                    { Fq2::copy(14) }
-                    { utils::ell_by_constant(constant_1_iter.next().unwrap()) }
-
-                    { Fq2::copy(12) }
-                    { utils::ell_by_constant(constant_2_iter.next().unwrap()) }
-                }
-            }
-
-            { Fq2::copy(14) }
-            { utils::ell_by_constant(constant_1_iter.next().unwrap()) }
-
-            { Fq2::copy(12) }
-            { utils::ell_by_constant(constant_2_iter.next().unwrap()) }
-
-            { Fq2::roll(14) }
-            { utils::ell_by_constant(constant_1_iter.next().unwrap()) }
-
-            { Fq2::roll(12) }
-            { utils::ell_by_constant(constant_2_iter.next().unwrap()) }
-        };
-
-        assert_eq!(constant_1_iter.next(), None);
-        assert_eq!(constant_2_iter.next(), None);
-
-        script
-    }
-
-    // input on stack (non-fixed) : [P1, P2, c, c_inv, wi]
-    // input outside (fixed): L1(Q1), L2(Q2)
-    pub fn dual_miller_loop_with_c_wi(
-        constant_1: &G2Prepared,
-        constant_2: &G2Prepared,
-        affine: bool,
-    ) -> Script {
-        println!(
-            "miller loop length: {}",
-            ark_bn254::Config::ATE_LOOP_COUNT.len() - 1
-        );
-
-        let mut constant_1_iter = constant_1.ell_coeffs.iter();
-        let mut constant_2_iter = constant_2.ell_coeffs.iter();
-        let script = script! {
-            // f = c_inv
-            { Fq12::copy(12) }
-
-            // miller loop part, 6x + 2
-            for i in (1..ark_bn254::Config::ATE_LOOP_COUNT.len()).rev() {
-                // update f (double), f = f * f
-                { Fq12::square() }
-
-                // update c_inv
-                // f = f * c_inv, if bit == 1
-                // f = f * c, if bit == -1
-                if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == 1 {
-                    { Fq12::copy(24) }
-                    { Fq12::mul(12, 0) }
-                } else if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
-                    { Fq12::copy(36) }
-                    { Fq12::mul(12, 0) }
-                }
-
-                // update f, f = f * double_line_eval
-                { Fq2::copy(50) }
-                if affine {
-                    { utils::ell_by_constant_affine(constant_1_iter.next().unwrap()) }
-                } else {
-                    { utils::ell_by_constant(constant_1_iter.next().unwrap()) }
-                }
-
-                { Fq2::copy(48) }
-                if affine {
-                    { utils::ell_by_constant_affine(constant_2_iter.next().unwrap()) }
-                } else {
-                    { utils::ell_by_constant(constant_2_iter.next().unwrap()) }
-                }
-
-                // update f (add), f = f * add_line_eval
-                if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == 1 || ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
-                    { Fq2::copy(50) }
-                    if affine {
-                        { utils::ell_by_constant_affine(constant_1_iter.next().unwrap()) }
-                    } else {
-                        { utils::ell_by_constant(constant_1_iter.next().unwrap()) }
-                    }
-
-                    { Fq2::copy(48) }
-                    if affine {
-                        { utils::ell_by_constant_affine(constant_2_iter.next().unwrap()) }
-                    } else {
-                        { utils::ell_by_constant(constant_2_iter.next().unwrap()) }
-                    }
-                }
-            }
-
-            // update c_inv
-            // f = f * c_inv^p * c^{p^2}
-            { Fq12::roll(24) }
-            { Fq12::frobenius_map(1) }
-            { Fq12::mul(12, 0) }
-            { Fq12::roll(24) }
-            { Fq12::frobenius_map(2) }
-            { Fq12::mul(12, 0) }
-
-            // scale f
-            // f = f * wi
-            { Fq12::mul(12, 0) }
-
-            // update f (frobenius map): f = f * add_line_eval([p])
-            { Fq2::copy(14) }
-            if affine {
-                { utils::ell_by_constant_affine(constant_1_iter.next().unwrap()) }
-            } else {
-                { utils::ell_by_constant(constant_1_iter.next().unwrap()) }
-            }
-
-            { Fq2::copy(12) }
-            if affine {
-                { utils::ell_by_constant_affine(constant_2_iter.next().unwrap()) }
-            } else {
-                { utils::ell_by_constant(constant_2_iter.next().unwrap()) }
-            }
-
-            // update f (frobenius map): f = f * add_line_eval([-p^2])
-            { Fq2::roll(14) }
-            if affine {
-                { utils::ell_by_constant_affine(constant_1_iter.next().unwrap()) }
-            } else {
-                { utils::ell_by_constant(constant_1_iter.next().unwrap()) }
-            }
-
-            { Fq2::roll(12) }
-            if affine {
-                { utils::ell_by_constant_affine(constant_2_iter.next().unwrap()) }
-            } else {
-                { utils::ell_by_constant(constant_2_iter.next().unwrap()) }
-            }
-
-        };
-        assert_eq!(constant_1_iter.next(), None);
-        assert_eq!(constant_2_iter.next(), None);
-        script
-    }
-
-    // refer algorithm 9 of https://eprint.iacr.org/2024/640.pdf
-    // four pairings in total, where three of them is fixed on G2, only one is non-fixed on G2 (specially for groth16 verifier for now)
-    //
-    // input on stack:
-    //     [beta_12, beta_13, beta_22, P1', P2', P3', P4', Q4, c, c_inv, wi, T4]
-    //     P1', P2', P3', P4' are variants of points P1, P2, P3, P4 individually, such as P1' = (-P1.x / P1.y, 1 / P1.y)
-    //     Q1, Q2 and Q3 are fixed, Q4 is non-fixed and provided by prover
-    //     T4 is accumulator for Q4, initial T4 = Q4, will do double and add operations for T4
-    //
-    // input of parameters:
-    //     [L(Q1), L(Q2), L(Q3), L(Q4)] (line coefficients in affine mode)
-    pub fn quad_miller_loop_with_c_wi(constants: Vec<G2Prepared>) -> Script {
-        assert_eq!(constants.len(), 4);
-        let num_line_groups = constants.len();
-        let num_constant = 3;
-
-        let line_coeffs = utils::collect_line_coeffs(constants);
-        let num_lines = line_coeffs.len();
-
-        let script = script! {
-            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4)]
-            // 1. f = c_inv
-            { Fq12::copy(16) }
-            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
-
-            // ATE_LOOP_COUNT len: 65
-            for i in (1..ark_bn254::Config::ATE_LOOP_COUNT.len()).rev() {
-                // update f, squaring
-                { Fq12::square() }
-                // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
-
-                // update f, multiplying
-                // f = f * c_inv, if digit == 1
-                // f = f * c, if digit == -1
-                if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == 1 {
-                    // copy c_inv
-                    { Fq12::copy(28) }
-                    // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12), c_inv(12)]
-                    // f = f * c_inv
-                    { Fq12::mul(12, 0) }
-                } else if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
-                    // copy c
-                    { Fq12::copy(40) }
-                    // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12), c(12)]
-                    // f = f * c
-                    { Fq12::mul(12, 0) }
-                }
-                // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
-
-                // update f with double line evaluation
-                for j in 0..num_line_groups {
-                    // copy P_j(p1, p2, p3, p4) to stack
-                    { Fq2::copy((26 + 36 - j * 2) as u32) }
-                    // update f with double line evaluation
-                    { utils::ell_by_constant_affine(&line_coeffs[num_lines - (i + 2)][j][0]) }
-                    // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
-
-                    // non-fixed part
-                    if j == num_constant {
-                        // check line coeff is satisfied with T4
-                        { Fq12::toaltstack() }
-                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4) | f(12)]
-                        { Fq2::copy(2) }
-                        { Fq2::copy(2) }
-                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), T4(4) | f(12)]
-                        { utils::check_tangent_line(line_coeffs[num_lines - (i + 2)][j][0].1, line_coeffs[num_lines - (i + 2)][j][0].2) }
-                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4) | f(12)]
-
-                        // update T4
-                        // drop T4.y, leave T4.x
-                        { Fq2::drop() }
-                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4.x(2) | f(12)]
-                        { utils::affine_double_line(line_coeffs[num_lines - (i + 2)][j][0].1, line_coeffs[num_lines - (i + 2)][j][0].2) }
-                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4) | f(12)]
-                        { Fq12::fromaltstack() }
-                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
-                    }
-                }
-
-                // update f with add line evaluation
-                if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == 1 || ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
-                    for j in 0..num_line_groups {
-                        // copy P_j(p1, p2, p3, p4) to stack
-                        { Fq2::copy((26 + 36 - j * 2) as u32) }
-                        // update f with adding line evaluation
-                        { utils::ell_by_constant_affine(&line_coeffs[num_lines - (i + 2)][j][1]) }
-                        // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
-
-                        // non-fixed part
-                        if j == num_constant {
-                            { Fq12::toaltstack() }
-                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4) | f(12)]
-
-                            // copy T4
-                            { Fq2::copy(2) }
-                            { Fq2::copy(2) }
-                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), T4(4) | f(12)]
-
-                            // copy Q4
-                            { Fq2::copy(10 + 36) }
-                            { Fq2::copy(10 + 36) }
-                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), T4(4), Q4(4) | f(12)]
-                            if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1 {
-                                { Fq2::neg(0) }
-                            }
-                            { utils::check_chord_line(line_coeffs[num_lines - (i + 2)][j][1].1, line_coeffs[num_lines - (i + 2)][j][1].2) }
-                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4) | f(12)]
-
-                            // update T4
-                            // drop T4.y, leave T4.x
-                            { Fq2::drop() }
-                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4.x(2) | f(12)]
-                            // copy Q4.x
-                            { Fq2::copy(4 + 36) }
-                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4.x(2), Q4.x(2) | f(12)]
-                            { utils::affine_add_line(line_coeffs[num_lines - (i + 2)][j][1].1, line_coeffs[num_lines - (i + 2)][j][1].2) }
-                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4) | f(12)]
-                            { Fq12::fromaltstack() }
-                            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), c_inv(12), wi(12), T4(4), f(12)]
-                        }
-                    }
-                }
-            }
-
-            // update f with frobenius of c, say f = f * c_inv^p * c^{p^2}
-            { Fq12::roll(28) }
-            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), wi(12), T4(4), f(12), c_inv(12)]
-            { Fq12::frobenius_map(1) }
-            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), wi(12), T4(4), f(12), c_inv^p(12)]
-            { Fq12::mul(12, 0) }
-            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), c(12), wi(12), T4(4), f(12)]
-            { Fq12::roll(28) }
-            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), wi(12), T4(4), f(12), c(12)]
-            { Fq12::frobenius_map(2) }
-            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), wi(12), T4(4), f(12), c^{p^2}(12)]
-            { Fq12::mul(12, 0) }
-            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), wi(12), T4(4), f(12)]
-
-            // update f with scalar wi, say f = f * wi
-            { Fq12::roll(16) }
-            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), f(12), wi(12)]
-            { Fq12::mul(12, 0) }
-            // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), f(12)]
-
-            // update f with add line evaluation of one-time of frobenius map on Q4
-            for j in 0..num_line_groups {
-                // copy P_j(p1, p2, p3, p4) to stack
-                { Fq2::copy((26 - j * 2) as u32) }
-                // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), f(12), P_j(2)]
-                { utils::ell_by_constant_affine(&line_coeffs[num_lines - 2][j][0]) }
-                // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), f(12)]
-
-                // non-fixed part
-                if j == num_constant {
-                    { Fq12::toaltstack() }
-                    // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4) | f(12)]
-
-                    // Qx' = Qx.conjugate * beta^{2 * (p - 1) / 6}
-                    { Fq2::copy(6) }
-                    // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), Q4.x(2) | f(12)]
-                    { Fq::neg(0) }
-                    // [beta_12(2), beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), -Q4.x(2) | f(12)]
-                    { Fq2::roll(22) }
-                    // [beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), -Q4.x(2), beta_12(2) | f(12)]
-                    { Fq2::mul(2, 0) }
-                    // Q4.x' = -Q4.x * beta_12 (2)
-                    // [beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), Q4.x'(2) | f(12)]
-
-                    // Qy' = Qy.conjugate * beta^{3 * (p - 1) / 6}
-                    { Fq2::copy(6) }
-                    // [beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), Q4.x'(2), Q4.y(2) | f(12)]
-                    { Fq::neg(0) }
-                    // [beta_13(2), beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), Q4.x'(2), -Q4.y(2) | f(12)]
-                    { Fq2::roll(22) }
-                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), Q4.x'(2), -Q4.y(2), beta_13(2) | f(12)]
-                    { Fq2::mul(2, 0) }
-                    // Q4.y' = -Q4.y * beta_13 (2)
-                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), Q4.x'(2), Q4.y'(2) | f(12)]
-                    // phi(Q4) = (Q4.x', Q4.y')
-                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), phi(Q4)(4) | f(12)]
-
-                    // check chord line
-                    { Fq2::copy(6) }
-                    { Fq2::copy(6) }
-                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), phi(Q4)(4), T4(4) | f(12)]
-                    { Fq2::copy(6) }
-                    { Fq2::copy(6) }
-                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), phi(Q4)(4), T4(4), phi(Q4)(4) | f(12)]
-                    { utils::check_chord_line(line_coeffs[num_lines - 2][j][0].1, line_coeffs[num_lines - 2][j][0].2) }
-                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), phi(Q4)(4) | f(12)]
-
-                    // update T4
-                    { Fq2::drop() }
-                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), phi(Q4).x(2) | f(12)]
-                    { Fq2::toaltstack() }
-                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4) | phi(Q4).x(2), f(12)]
-                    { Fq2::drop() }
-                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4.x(2) | phi(Q4).x(2), f(12)]
-                    { Fq2::fromaltstack() }
-                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4.x(2), phi(Q4).x(2) | f(12)]
-                    { utils::affine_add_line(line_coeffs[num_lines - 2][j][0].1, line_coeffs[num_lines - 2][j][0].2) }
-                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4) | f(12)]
-                    { Fq12::fromaltstack() }
-                    // [beta_22(2), P1(2), P2(2), P3(2), P4(2), Q4(4), T4(4), f(12)]
-                }
-            }
-
-            // update f with add line evaluation of two-times of frobenius map on Q4
-            for j in 0..num_line_groups {
-                // update f with adding line evaluation by rolling each Pi(2) element to the right(stack top)
-                { Fq2::roll((26 - j * 2) as u32) }
-                { utils::ell_by_constant_affine(&line_coeffs[num_lines - 1][j][0]) }
-                // [beta_22(2), Q4(4), T4(4), f(12)]
-
-                // non-fixed part(Q4)
-                if j == num_constant {
-                    { Fq12::toaltstack() }
-                    // [beta_22(2), Q4(4), T4(4) | f(12)]
-                    { Fq2::roll(8) }
-                    // [Q4(4), T4(4), beta_22(2) | f(12)]
-                    { Fq2::roll(8) }
-                    // [Q4.y(2), T4(4), beta_22(2), Q4.x(2) | f(12)]
-                    { Fq2::mul(2, 0) }
-                    // [Q4.y(2), T4(4), beta_22(2) * Q4.x(2) | f(12)]
-                    // Q4.x' = Q4.x * beta^{2 * (p^2 - 1) / 6}
-                    // [Q4.y(2), T4(4), Q4.x'(2) | f(12)]
-                    { Fq2::roll(6) }
-                    // [T4(4), Q4.x'(2), Q4.y(2) | f(12)]
-                    // phi(Q4)^2 = (Q4.x', Qy)
-                    // [T4(4), phi(Q4)^2(4) | f(12)]
-
-                    // check whether the chord line through T4 and phi(Q4)^2
-                    { utils::check_chord_line(line_coeffs[num_lines - 1][j][0].1, line_coeffs[num_lines - 1][j][0].2) }
-                    // [ | f(12)]
-                    { Fq12::fromaltstack() }
-                    // [f(12)]
-                }
-            }
-        };
-        script
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::bn254::ell_coeffs::{mul_by_char, G2Prepared};
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fq12::Fq12;
-    use crate::bn254::fq2::Fq2;
-    use crate::bn254::pairing::Pairing;
-    use crate::bn254::utils::{self, fq12_push, fq2_push};
-    use crate::{execute_script_without_stack_limit, treepp::*};
-    use ark_bn254::g2::G2Affine;
-    use ark_bn254::Bn254;
-
-    use ark_ec::pairing::Pairing as _;
-    use ark_ec::AffineRepr;
-    use ark_ff::{AdditiveGroup, Field};
-    use ark_std::{test_rng, UniformRand};
-    use num_bigint::BigUint;
-    use num_traits::Num;
-    use rand::{RngCore, SeedableRng};
-    use rand_chacha::ChaCha20Rng;
-    use std::str::FromStr;
-
-    #[test]
-    fn test_miller_loop() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let p = ark_bn254::G1Affine::rand(&mut prng);
-
-            let a = ark_bn254::g2::G2Affine::rand(&mut prng);
-
-            // affine mode
-            let a_prepared = G2Prepared::from_affine(a);
-            let a_affine = a;
-
-            let miller_loop = Pairing::miller_loop(&a_prepared, true);
-            println!("Pairing.miller_loop: {} bytes", miller_loop.len());
-
-            let c = Bn254::multi_miller_loop_affine([p], [a_affine]).0;
-
-            let script = script! {
-                { utils::from_eval_point(p) }
-                { miller_loop.clone() }
-                { fq12_push(c) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            println!("{}", exec_result);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_dual_miller_loop_with_c_wi() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        // exp = 6x + 2 + p - p^2 = lambda - p^3
-        let p_pow3 = &BigUint::from_str_radix(Fq::MODULUS, 16).unwrap().pow(3_u32);
-        let lambda = BigUint::from_str(
-                        "10486551571378427818905133077457505975146652579011797175399169355881771981095211883813744499745558409789005132135496770941292989421431235276221147148858384772096778432243207188878598198850276842458913349817007302752534892127325269"
-                    ).unwrap();
-        let (exp, sign) = if lambda > *p_pow3 {
-            (lambda - p_pow3, true)
-        } else {
-            (p_pow3 - lambda, false)
-        };
-
-        // random c and wi just for unit test
-        let c = ark_bn254::Fq12::rand(&mut prng);
-        let c_inv = c.inverse().unwrap();
-        let wi = ark_bn254::Fq12::rand(&mut prng);
-
-        // random input points for following two pairings
-        let p = ark_bn254::G1Affine::rand(&mut prng);
-        let q = ark_bn254::G1Affine::rand(&mut prng);
-        let a = ark_bn254::g2::G2Affine::rand(&mut prng);
-        let b = ark_bn254::g2::G2Affine::rand(&mut prng);
-
-        // affine mode
-        let a_affine = a;
-        let b_affine = b;
-
-        // benchmark: multi miller loop with affine cooordinates of line functions
-        let f = Bn254::multi_miller_loop_affine([p, q], [a_affine, b_affine]).0;
-        println!("Bn254::multi_miller_loop done!");
-        let hint = if sign {
-            f * wi * (c_inv.pow(exp.to_u64_digits()))
-        } else {
-            f * wi * (c_inv.pow(exp.to_u64_digits()).inverse().unwrap())
-        };
-        println!("Accumulated f done!");
-
-        // (affine) coefficients of line functions
-        let a_prepared = G2Prepared::from_affine(a);
-        let b_prepared = G2Prepared::from_affine(b);
-        // test(script): of multi miller loop with affine coordinates of line functions
-        let dual_miller_loop_with_c_wi_affine =
-            Pairing::dual_miller_loop_with_c_wi(&a_prepared, &b_prepared, true);
-        println!(
-            "Pairing.dual_miller_loop_with_c_wi(affine): {} bytes",
-            dual_miller_loop_with_c_wi_affine.len()
-        );
-
-        // input on stack :
-        //      [-p.x / p.y, 1 / p.y, -q.x / q.y, 1 / q.y, c, c_inv, wi]
-        // input of script func (parameters):
-        //      a_prepared, Vec[(c0, c3, c4)]
-        //      b_prepared, Vec[(c0, c3, c4)]
-        let script = script! {
-            { utils::from_eval_point(p) }
-            // [-p.x / p.y, 1 / p.y]
-            { utils::from_eval_point(q) }
-            // [-p.x / p.y, 1 / p.y, -q.x / q.y, 1 / q.y]
-            { fq12_push(c) }
-            { fq12_push(c_inv) }
-            { fq12_push(wi) }
-            // [-p.x / p.y, 1 / p.y, -q.x / q.y, 1 / q.y, c, c_inv, wi]
-            { dual_miller_loop_with_c_wi_affine.clone() }
-            { fq12_push(hint) }
-            { Fq12::equalverify() }
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        println!("{}", exec_result);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_quad_miller_loop_with_c_wi() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        // exp = 6x + 2 + p - p^2 = lambda - p^3
-        let p_pow3 = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap().pow(3_u32);
-        let lambda = BigUint::from_str(
-            "10486551571378427818905133077457505975146652579011797175399169355881771981095211883813744499745558409789005132135496770941292989421431235276221147148858384772096778432243207188878598198850276842458913349817007302752534892127325269"
-        ).unwrap();
-        let (exp, sign) = if lambda > p_pow3 {
-            (lambda - p_pow3, true)
-        } else {
-            (p_pow3 - lambda, false)
-        };
-        // random c and wi
-        let c = ark_bn254::Fq12::rand(&mut prng);
-        let c_inv = c.inverse().unwrap();
-        let wi = ark_bn254::Fq12::rand(&mut prng);
-
-        let p1 = ark_bn254::G1Affine::rand(&mut prng);
-        let p2 = ark_bn254::G1Affine::rand(&mut prng);
-        let p3 = ark_bn254::G1Affine::rand(&mut prng);
-        let p4 = ark_bn254::G1Affine::rand(&mut prng);
-
-        let q1 = ark_bn254::g2::G2Affine::rand(&mut prng);
-        let q2 = ark_bn254::g2::G2Affine::rand(&mut prng);
-        let q3 = ark_bn254::g2::G2Affine::rand(&mut prng);
-        let q4 = ark_bn254::g2::G2Affine::rand(&mut prng);
-        let q1_prepared = G2Prepared::from_affine(q1);
-        let q2_prepared = G2Prepared::from_affine(q2);
-        let q3_prepared = G2Prepared::from_affine(q3);
-        let q4_prepared = G2Prepared::from_affine(q4);
-
-        let t4 = q4;
-
-        let quad_miller_loop_affine_script = Pairing::quad_miller_loop_with_c_wi(
-            [q1_prepared, q2_prepared, q3_prepared, q4_prepared].to_vec(),
-        );
-        println!(
-            "Pairing.quad_miller_loop: {} bytes",
-            quad_miller_loop_affine_script.len()
-        );
-
-        let f = Bn254::multi_miller_loop_affine([p1, p2, p3, p4], [q1, q2, q3, q4]).0;
-        println!("Bn254::multi_miller_loop_affine done!");
-
-        let hint = if sign {
-            f * wi * (c_inv.pow(exp.to_u64_digits()))
-        } else {
-            f * wi * (c_inv.pow(exp.to_u64_digits()).inverse().unwrap())
-        };
-
-        // [beta_12, beta_13, beta_22, P1, P2, P3, P4, Q4, c,  c_inv, wi, T4]: p1-p4: (-p.x / p.y, 1 / p.y)
-        let script = script! {
-            // beta_12
-            { Fq::push_u32_le(&BigUint::from_str("21575463638280843010398324269430826099269044274347216827212613867836435027261").unwrap().to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from_str("10307601595873709700152284273816112264069230130616436755625194854815875713954").unwrap().to_u32_digits()) }
-            // beta_13
-            { Fq::push_u32_le(&BigUint::from_str("2821565182194536844548159561693502659359617185244120367078079554186484126554").unwrap().to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from_str("3505843767911556378687030309984248845540243509899259641013678093033130930403").unwrap().to_u32_digits()) }
-            // beta_22
-            { Fq::push_u32_le(&BigUint::from_str("21888242871839275220042445260109153167277707414472061641714758635765020556616").unwrap().to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from_str("0").unwrap().to_u32_digits()) }
-
-            // p1, p2, p3, p4
-            { utils::from_eval_point(p1) }
-            { utils::from_eval_point(p2) }
-            { utils::from_eval_point(p3) }
-            { utils::from_eval_point(p4) }
-
-            // q4
-            { fq2_push(q4.x) }
-            { fq2_push(q4.y) }
-
-            // c, c_inv, wi
-            { fq12_push(c) }
-            { fq12_push(c_inv) }
-            { fq12_push(wi) }
-
-            // t4
-            { fq2_push(t4.x) }
-            { fq2_push(t4.y) }
-
-            { quad_miller_loop_affine_script.clone() }
-
-            { fq12_push(hint) }
-
-            { Fq12::equalverify() }
-
-            OP_TRUE
-        };
-        let exec_result = execute_script_without_stack_limit(script);
-        println!("{}", exec_result);
-        if !exec_result.success {
-            println!(
-                "Remaining script size: {}, last opcode: {}",
-                exec_result.remaining_script.len(),
-                exec_result.last_opcode.unwrap().to_string(),
-            );
-        }
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_mul_by_char() {
-        let mut rng = ark_std::rand::rngs::StdRng::seed_from_u64(test_rng().next_u64());
-        let q4 = G2Affine::rand(&mut rng);
-        let phi_q = mul_by_char(q4);
-        let mut phi_q2 = mul_by_char(phi_q);
-        phi_q2.y.neg_in_place();
-
-        let script = script! {
-            // [beta_12, beta_13, beta_22]
-            { Fq::push_u32_le(&BigUint::from_str("21575463638280843010398324269430826099269044274347216827212613867836435027261").unwrap().to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from_str("10307601595873709700152284273816112264069230130616436755625194854815875713954").unwrap().to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from_str("2821565182194536844548159561693502659359617185244120367078079554186484126554").unwrap().to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from_str("3505843767911556378687030309984248845540243509899259641013678093033130930403").unwrap().to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from_str("21888242871839275220042445260109153167277707414472061641714758635765020556616").unwrap().to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from_str("0").unwrap().to_u32_digits()) }
-            // [beta_12, beta_13, beta_22, Qx, Qy]
-            { Fq::push_u32_le(&BigUint::from(q4.x.c0).to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from(q4.x.c1).to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from(q4.y.c0).to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from(q4.y.c1).to_u32_digits()) }
-            // [beta_12, beta_13, beta_22, Qy, -Qx]
-            { Fq2::roll(2) }
-            { Fq::neg(0) }
-            // [beta_13, beta_22, Qy, -Qx, beta_12]
-            { Fq2::roll(8) }
-            // [beta_13, beta_22, Qy, -Qx * beta_12]
-            { Fq2::mul(2, 0) }
-            // [beta_13, beta_22, -Qx * beta_12, -Qy]
-            { Fq2::roll(2) }
-            { Fq::neg(0) }
-            // [beta_22, -Qx * beta_12, -Qy, beta_13]
-            { Fq2::roll(6) }
-            // [beta_22, -Qx * beta_12, -Qy * beta_13]
-            { Fq2::mul(2, 0) }
-            // check phi_Q
-            // [beta_22, -Qx * beta_12, -Qy * beta_13, phi_q]
-            { fq2_push(phi_q.y().unwrap().to_owned()) }
-            { Fq2::equalverify() }
-            { fq2_push(phi_q.x().unwrap().to_owned()) }
-            { Fq2::equalverify() }
-            // [beta_22, Qy, Qx]
-            { Fq::push_u32_le(&BigUint::from(q4.y.c0).to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from(q4.y.c1).to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from(q4.x.c0).to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from(q4.x.c1).to_u32_digits()) }
-            // [Qy, Qx, beta_22]
-            { Fq2::roll(4) }
-            // [Qy, Qx * beta_22]
-            { Fq2::mul(2, 0) }
-            // [Qx * beta_22, Qy]
-            { Fq2::roll(2) }
-            // [Qx * beta_22, Qy, phi_Q2]
-            { fq2_push(phi_q2.y().unwrap().to_owned()) }
-            { Fq2::equalverify() }
-            { fq2_push(phi_q2.x().unwrap().to_owned()) }
-            { Fq2::equalverify() }
-            OP_TRUE
-        };
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-}
diff --git a/src/bn254/utils.rs b/src/bn254/utils.rs
deleted file mode 100644
index 01384210e..000000000
--- a/src/bn254/utils.rs
+++ /dev/null
@@ -1,1088 +0,0 @@
-// utils for push fields into stack
-use crate::bn254::ell_coeffs::EllCoeff;
-use crate::bn254::ell_coeffs::G2Prepared;
-use crate::bn254::{fq12::Fq12, fq2::Fq2};
-use ark_ec::{bn::BnConfig, AffineRepr};
-use ark_ff::BigInt;
-use ark_ff::Field;
-use num_bigint::BigUint;
-
-use crate::{
-    bn254::{fp254impl::Fp254Impl, fq::Fq},
-    treepp::*,
-};
-
-// input:
-//  f            12 elements
-//  coeffs.c0    2 elements
-//  coeffs.c1    2 elements
-//  coeffs.c2    2 elements
-//  p.x          1 element
-//  p.y          1 element
-//
-// output:
-//  new f        12 elements
-pub fn ell() -> Script {
-    script! {
-        // compute the new c0
-        { Fq2::mul_by_fq(6, 0) }
-
-        // compute the new c1
-        { Fq2::mul_by_fq(5, 2) }
-
-        // roll c2
-        { Fq2::roll(4) }
-
-        // compute the new f
-        { Fq12::mul_by_034() }
-    }
-}
-
-// input:
-//  f            12 elements
-//  p.x          1 element
-//  p.y          1 element
-//
-// output:
-//  new f        12 elements
-pub fn ell_by_constant(constant: &EllCoeff) -> Script {
-    script! {
-        // [f, px, py]
-        // compute the new c0
-        // [f, px, py, py]
-        { Fq::copy(0) }
-        // [f, px, py, py * q1.x1]
-        { Fq::mul_by_constant(&constant.0.c0) }
-        // [f, px, py * q1.x1, py]
-        { Fq::roll(1) }
-        // [f, px, py * q1.x1, py * q1.x2]
-        { Fq::mul_by_constant(&constant.0.c1) }
-
-        // compute the new c1
-        // [f, px, py * q1.x1, py * q1.x2, px]
-        { Fq::copy(2) }
-        // [f, px, py * q1.x1, py * q1.x2, px * q1.y1]
-        { Fq::mul_by_constant(&constant.1.c0) }
-        // [f, py * q1.x1, py * q1.x2, px * q1.y1, px]
-        { Fq::roll(3) }
-        // [f, py * q1.x1, py * q1.x2, px * q1.y1, px * q1.y2]
-        { Fq::mul_by_constant(&constant.1.c1) }
-
-        // compute the new f
-        // [f, py * q1.x1, py * q1.x2, px * q1.y1, px * q1.y2]
-        { Fq12::mul_by_034_with_4_constant(&constant.2) }
-    }
-}
-
-// stack input:
-//  f            12 elements
-//  x': -p.x / p.y   1 element
-//  y': 1 / p.y      1 element
-// func params:
-//  (c0, c1, c2) where c0 is a trival value ONE in affine mode
-//
-// output:
-//  new f        12 elements
-pub fn ell_by_constant_affine(constant: &EllCoeff) -> Script {
-    assert_eq!(constant.0, ark_bn254::Fq2::ONE);
-    script! {
-        // [f, x', y']
-        // update c1, c1' = x' * c1
-        { Fq::copy(1) }
-        { Fq::mul_by_constant(&constant.1.c0) }
-        // [f, x', y', x' * c1.0]
-        { Fq::roll(2) }
-        { Fq::mul_by_constant(&constant.1.c1) }
-        // [f, y', x' * c1.0, x' * c1.1]
-        // [f, y', x' * c1]
-
-        // update c2, c2' = -y' * c2
-        { Fq::copy(2) }
-        { Fq::mul_by_constant(&constant.2.c0) }
-        // [f, y', x' * c1, y' * c2.0]
-        { Fq::roll(3) }
-        { Fq::mul_by_constant(&constant.2.c1) }
-        // [f, x' * c1, y' * c2.0, y' * c2.1]
-        // [f, x' * c1, y' * c2]
-        // [f, c1', c2']
-
-        // compute the new f with c1'(c3) and c2'(c4), where c1 is trival value 1
-        { Fq12::mul_by_34() }
-        // [f]
-    }
-}
-
-pub fn collect_line_coeffs(
-    constants: Vec<G2Prepared>,
-) -> Vec<Vec<Vec<(ark_bn254::Fq2, ark_bn254::Fq2, ark_bn254::Fq2)>>> {
-    let mut constant_iters = constants
-        .iter()
-        .map(|item| item.ell_coeffs.iter())
-        .collect::<Vec<_>>();
-    let mut all_line_coeffs = vec![];
-
-    for i in (1..ark_bn254::Config::ATE_LOOP_COUNT.len()).rev() {
-        let mut line_coeffs = vec![];
-        for j in 0..constants.len() {
-            // double line coeff
-            let mut line_coeff = vec![];
-            line_coeff.push(*constant_iters[j].next().unwrap());
-            // add line coeff
-            if ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == 1
-                || ark_bn254::Config::ATE_LOOP_COUNT[i - 1] == -1
-            {
-                line_coeff.push(*constant_iters[j].next().unwrap());
-            }
-            // line coeff for single point
-            line_coeffs.push(line_coeff);
-        }
-        // line coeffs for all points
-        all_line_coeffs.push(line_coeffs);
-    }
-    {
-        let mut line_coeffs = vec![];
-        for j in 0..constants.len() {
-            // add line coeff
-            line_coeffs.push(vec![*constant_iters[j].next().unwrap()]);
-        }
-        all_line_coeffs.push(line_coeffs);
-    }
-    {
-        let mut line_coeffs = vec![];
-        for j in 0..constants.len() {
-            // add line coeff
-            line_coeffs.push(vec![*constant_iters[j].next().unwrap()]);
-        }
-        all_line_coeffs.push(line_coeffs);
-    }
-    for i in 0..constant_iters.len() {
-        assert_eq!(constant_iters[i].next(), None);
-    }
-    assert_eq!(
-        all_line_coeffs.len(),
-        ark_bn254::Config::ATE_LOOP_COUNT.len() - 1 + 2
-    );
-    all_line_coeffs
-}
-
-/// input of func (params):
-///      p.x, p.y
-/// output on stack:
-///      x' = -p.x / p.y
-///      y' = 1 / p.y
-pub fn from_eval_point(p: ark_bn254::G1Affine) -> Script {
-    let py_inv = p.y().unwrap().inverse().unwrap();
-    script! {
-        { Fq::push_u32_le(&BigUint::from(py_inv).to_u32_digits()) }
-        // [1/y]
-        // check p.y.inv() is valid
-        { Fq::copy(0) }
-        // [1/y, 1/y]
-        { Fq::push_u32_le(&BigUint::from(p.y).to_u32_digits()) }
-        // [1/y, 1/y, y]
-        { Fq::mul() }
-        // [1/y, 1]
-        { Fq::push_one() }
-        // [1/y, 1, 1]
-        { Fq::equalverify(1, 0) }
-        // [1/y]
-
-        // -p.x / p.y
-        { Fq::copy(0) }
-        // [1/y, 1/y]
-        { Fq::push_u32_le(&BigUint::from(p.x).to_u32_digits()) }
-        // [1/y, 1/y, x]
-        { Fq::neg(0) }
-        // [1/y, 1/y, -x]
-        { Fq::mul() }
-        // [1/y, -x/y]
-        { Fq::roll(1) }
-        // [-x/y, 1/y]
-    }
-}
-
-/// input of stack:
-///      p.x, p.y (affine space)
-/// output on stack:
-///      x' = -p.x / p.y
-///      y' = 1 / p.y
-pub fn from_eval_point_in_stack() -> Script {
-    script! {
-        // [x, y]
-        { Fq::copy(0) }
-        // [x, y, y]
-        { Fq::copy(0) }
-        // [x, y, y, y]
-        { Fq::inv() }
-        // [x, y, y, 1/y]
-        // check p.y.inv() is valid
-        { Fq::mul() }
-        // [x, y, 1]
-        { Fq::push_one() }
-        // [x, y, 1, 1]
-        { Fq::equalverify(1, 0) }
-        // [x, y]
-        { Fq::inv() }
-        // [x, 1/y]
-
-        // -p.x / p.y
-        { Fq::copy(0) }
-        // [x, 1/y, 1/y]
-        { Fq::roll(2)}
-        // [1/y, 1/y, x]
-        { Fq::neg(0) }
-        // [1/y, 1/y, -x]
-        { Fq::mul() }
-        // [1/y, -x/y]
-        { Fq::roll(1) }
-        // [-x/y, 1/y]
-    }
-}
-
-pub fn fq2_push(element: ark_bn254::Fq2) -> Script {
-    script! {
-        { Fq::push_u32_le(&BigUint::from(element.c0).to_u32_digits()) }
-        { Fq::push_u32_le(&BigUint::from(element.c1).to_u32_digits()) }
-    }
-}
-
-pub fn fq6_push(element: ark_bn254::Fq6) -> Script {
-    script! {
-        for elem in element.to_base_prime_field_elements() {
-            { Fq::push_u32_le(&BigUint::from(elem).to_u32_digits()) }
-       }
-    }
-}
-
-pub fn fq12_push(element: ark_bn254::Fq12) -> Script {
-    script! {
-        for elem in element.to_base_prime_field_elements() {
-            { Fq::push_u32_le(&BigUint::from(elem).to_u32_digits()) }
-       }
-    }
-}
-
-pub fn fq_to_bits(fq: BigInt<4>, limb_size: usize) -> Vec<u32> {
-    let mut bits: Vec<bool> = ark_ff::BitIteratorBE::new(fq.as_ref()).skip(2).collect();
-    bits.reverse();
-
-    bits.chunks(limb_size)
-        .map(|chunk| {
-            let mut factor = 1;
-            let res = chunk.iter().fold(0, |acc, &x| {
-                let r = acc + if x { factor } else { 0 };
-                factor *= 2;
-                r
-            });
-            res
-        })
-        .collect()
-}
-
-/// add two points T and Q
-///     x' = alpha^2 - T.x - Q.x
-///     y' = -bias - alpha * x'
-///
-/// input on stack:
-///     T.x (2 elements)
-///     Q.x (2 elements)
-///
-/// input of parameters:
-///     c3: alpha - line slope
-///     c4: -bias - line intercept
-///
-/// output on stack:
-///     T'.x (2 elements)
-///     T'.y (2 elements)
-pub fn affine_add_line(c3: ark_bn254::Fq2, c4: ark_bn254::Fq2) -> Script {
-    script! {
-        // [T.x, Q.x]
-        { Fq2::neg(0) }
-        // [T.x, -Q.x]
-        { Fq2::roll(2) }
-        // [-Q.x, T.x]
-        { Fq2::neg(0) }
-        // [-T.x - Q.x]
-        { Fq2::add(2, 0) }
-        // [-T.x - Q.x]
-        { fq2_push(c3) }
-        // [-T.x - Q.x, alpha]
-        { Fq2::copy(0) }
-        // [-T.x - Q.x, alpha, alpha]
-        { Fq2::square() }
-        // [-T.x - Q.x, alpha, alpha^2]
-        // calculate x' = alpha^2 - T.x - Q.x
-        { Fq2::add(4, 0) }
-        // [alpha, x']
-        { Fq2::copy(0) }
-        // [alpha, x', x']
-        { Fq2::mul(4, 0) }
-        // [x', alpha * x']
-        { Fq2::neg(0) }
-        // [x', -alpha * x']
-        { fq2_push(c4) }
-        // [x', -alpha * x', -bias]
-        // compute y' = -bias - alpha * x'
-        { Fq2::add(2, 0) }
-        // [x', y']
-    }
-}
-
-/// double a point T:
-///     x' = alpha^2 - 2 * T.x
-///     y' = -bias - alpha* x'
-///
-/// input on stack:
-///     T.x (2 elements)
-///
-/// output on stack:
-///     T'.x (2 elements)
-///     T'.y (2 elements)
-pub fn affine_double_line(c3: ark_bn254::Fq2, c4: ark_bn254::Fq2) -> Script {
-    script! {
-        { Fq2::double(0) }
-        { Fq2::neg(0) }
-        // [- 2 * T.x]
-        { fq2_push(c3) }
-        { Fq2::copy(0) }
-        { Fq2::square() }
-        // [- 2 * T.x, alpha, alpha^2]
-        { Fq2::add(4, 0) }
-        { Fq2::copy(0) }
-        // [alpha, x', x']
-        { Fq2::mul(4, 0) }
-        { Fq2::neg(0) }
-        // [x', -alpha * x']
-
-        { fq2_push(c4) }
-        { Fq2::add(2, 0) }
-        // [x', y']
-    }
-}
-
-/// check line through one point, that is:
-///     y - alpha * x - bias = 0
-///
-/// input on stack:
-///     x (2 elements)
-///     y (2 elements)
-///
-/// input of parameters:
-///     c3: alpha
-///     c4: -bias
-///
-/// output:
-///     true or false (consumed on stack)
-pub fn check_line_through_point(c3: ark_bn254::Fq2, c4: ark_bn254::Fq2) -> Script {
-    script! {
-        // [x, y]
-        { Fq2::roll(2) }
-        // [y, x]
-        { Fq2::mul_by_constant(&c3) }
-        // [y, alpha * x]
-        { Fq2::neg(0) }
-        // [y, -alpha * x]
-        { Fq2::add(2, 0) }
-        // [y - alpha * x]
-
-        { fq2_push(c4) }
-        // [y - alpha * x, -bias]
-        { Fq2::add(2, 0) }
-        // [y - alpha * x - bias]
-
-        { Fq2::push_zero() }
-        // [y - alpha * x - bias, 0]
-        { Fq2::equalverify() }
-    }
-}
-
-/// check whether a tuple coefficient (alpha, -bias) of a tangent line is satisfied with expected point T (affine)
-/// two aspects:
-///     1. alpha * (2 * T.y) = 3 * T.x^2, make sure the alpha is the right ONE
-///     2. T.y - alpha * T.x - bias = 0, make sure the -bias is the right ONE
-///
-/// input on stack:
-///     T.x (2 element)
-///     T.y (2 element)
-///
-/// input of parameters:
-///     c3: alpha
-///     c4: -bias
-///
-/// output:
-///     true or false (consumed on stack)
-pub fn check_tangent_line(c3: ark_bn254::Fq2, c4: ark_bn254::Fq2) -> Script {
-    script! {
-        // alpha * (2 * T.y) = 3 * T.x^2
-        { Fq2::copy(0) }
-        { Fq2::double(0) }
-        { Fq2::mul_by_constant(&c3) }
-        // [T.x, T.y, alpha * (2 * T.y)]
-        { Fq2::copy(4) }
-        { Fq2::square() }
-        { Fq2::copy(0) }
-        { Fq2::double(0) }
-        { Fq2::add(2, 0) }
-        // [T.x, T.y, alpha * (2 * T.y), 3 * T.x^2]
-        { Fq2::neg(0) }
-        { Fq2::add(2, 0) }
-        { Fq2::push_zero() }
-        { Fq2::equalverify() }
-        // [T.x, T.y]
-
-        // check: T.y - alpha * T.x - bias = 0
-        { check_line_through_point(c3, c4) }
-        // []
-    }
-}
-
-/// check whether a tuple coefficient (alpha, -bias) of a chord line is satisfied with expected points T and Q (both are affine cooordinates)
-/// two aspects:
-///     1. T.y - alpha * T.x - bias = 0
-///     2. Q.y - alpha * Q.x - bias = 0, make sure the alpha/-bias are the right ONEs
-///
-/// input on stack:
-///     T.x (2 elements)
-///     T.y (2 elements)
-///     Q.x (2 elements)
-///     Q.y (2 elements)
-///
-/// input of parameters:
-///     c3: alpha
-///     c4: -bias
-/// output:
-///     true or false (consumed on stack)
-pub fn check_chord_line(c3: ark_bn254::Fq2, c4: ark_bn254::Fq2) -> Script {
-    script! {
-        // check: Q.y - alpha * Q.x - bias = 0
-        { check_line_through_point(c3, c4) }
-        // [T.x, T.y]
-        // check: T.y - alpha * T.x - bias = 0
-        { check_line_through_point(c3, c4) }
-        // []
-    }
-}
-
-// stack data: beta^{2 * (p - 1) / 6}, beta^{3 * (p - 1) / 6}, beta^{2 * (p^2 - 1) / 6}, 1/2, B,
-// P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, Qx, Qy
-// [..., Fq12, Fq12, Fq12, Fq12, Fq, Fq, (Fq, Fq), (Fq, Fq), (Fq, Fq), (Fq, Fq), (Fq, Fq)]
-//
-// flag == true ? T + Q : T - Q
-pub fn add_line_with_flag(flag: bool) -> Script {
-    script! {
-    // let theta = self.y - &(q.y * &self.z);
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy
-    { Fq2::copy(6) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, Ty
-    { Fq2::copy(2) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, Ty, Qy
-    if !flag {
-        { Fq2::neg(0) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, Ty, -Qy
-    }
-    { Fq2::copy(8) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, Ty, Qy, Tz
-    { Fq2::mul(2, 0) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, Ty, Qy * Tz
-    { Fq2::sub(2, 0) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, Ty - Qy * Tz
-
-    // let lambda = self.x - &(q.x * &self.z);
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta
-    { Fq2::copy(10) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, Tx
-    { Fq2::copy(6) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, Tx, Qx
-    { Fq2::copy(10) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, Tx, Qx, Tz
-    { Fq2::mul(2, 0) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, Tx, Qx * Tz
-    { Fq2::sub(2, 0) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, Tx - Qx * Tz
-
-    // let c = theta.square();
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda
-    { Fq2::copy(2) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, theta
-    { Fq2::square() }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, theta^2
-
-    // let d = lambda.square();
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, c
-    { Fq2::copy(2) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, c, lambda
-    { Fq2::square() }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, c, lambda^2
-
-    // let e = lambda * &d;
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, c, d
-    { Fq2::copy(4) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, c, d, lambda
-    { Fq2::copy(2) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, c, d, lambda, d
-    { Fq2::mul(2, 0) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, c, d, lambda * d
-
-    // let f = self.z * &c;
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, c, d, e
-    { Fq2::copy(14) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, c, d, e, Tz
-    { Fq2::roll(6) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, d, e, Tz, c
-    { Fq2::mul(2, 0) }
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, d, e, Tz * c
-
-    // let g = self.x * &d;
-    // f, Px, Py, Tx, Ty, Tz, Qx, Qy, theta, lambda, d, e, ff
-    { Fq2::roll(18) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, d, e, ff, Tx
-    { Fq2::roll(6) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, ff, Tx, d
-    { Fq2::mul(2, 0) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, ff, Tx * d
-
-    // let h = e + &f - &g.double();
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, ff, g
-    { Fq2::copy(0) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, ff, g, g
-    { Fq2::neg(0) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, ff, g, -g
-    { Fq2::double(0) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, ff, g, -2g
-    { Fq2::roll(4) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, g, -2g, ff
-    { Fq2::add(2, 0) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, g, -2g + ff
-    { Fq2::copy(4) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, g, -2g + ff, e
-    { Fq2::add(2, 0) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, g, -2g + ff + e
-
-    // self.x = lambda * &h;
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, g, h
-    { Fq2::copy(0) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, g, h, h
-    { Fq2::copy(8) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, g, h, h, lambda
-    { Fq2::mul(2, 0) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, g, h, h * lambda
-
-    // self.y = theta * &(g - &h) - &(e * &self.y);
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, g, h, x
-    { Fq2::copy(10) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, g, h, x, theta
-    { Fq2::roll(6) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, h, x, theta, g
-    { Fq2::roll(6) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, x, theta, g, h
-    { Fq2::sub(2, 0) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, x, theta, g - h
-    { Fq2::mul(2, 0) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, x, theta * (g - h)
-    { Fq2::copy(4) }
-    // f, Px, Py, Ty, Tz, Qx, Qy, theta, lambda, e, x, theta * (g - h), e
-    { Fq2::roll(18) }
-    // f, Px, Py, Tz, Qx, Qy, theta, lambda, e, x, theta * (g - h), e, Ty
-    { Fq2::mul(2, 0) }
-    // f, Px, Py, Tz, Qx, Qy, theta, lambda, e, x, theta * (g - h), e * Ty
-    { Fq2::sub(2, 0) }
-    // f, Px, Py, Tz, Qx, Qy, theta, lambda, e, x, theta * (g - h) - e * Ty
-
-    // self.z *= &e;
-    // f, Px, Py, Tz, Qx, Qy, theta, lambda, e, x, y
-    { Fq2::roll(14) }
-    // f, Px, Py, Qx, Qy, theta, lambda, e, x, y, Tz
-    { Fq2::roll(6) }
-    // f, Px, Py, Qx, Qy, theta, lambda, x, y, Tz, e
-    { Fq2::mul(2, 0) }
-    // f, Px, Py, Qx, Qy, theta, lambda, x, y, Tz * e
-
-    // let j = theta * &q.x - &(lambda * &q.y);
-    // f, Px, Py, Qx, Qy, theta, lambda, x, y, z
-    { Fq2::copy(8) }
-    // f, Px, Py, Qx, Qy, theta, lambda, x, y, z, theta
-    { Fq2::roll(14) }
-    // f, Px, Py, Qy, theta, lambda, x, y, z, theta, Qx
-    { Fq2::mul(2, 0) }
-    // f, Px, Py, Qy, theta, lambda, x, y, z, theta * Qx
-    { Fq2::copy(8) }
-    // f, Px, Py, Qy, theta, lambda, x, y, z, theta * Qx, lambda
-    { Fq2::roll(14) }
-    // f, Px, Py, theta, lambda, x, y, z, theta * Qx, lambda, Qy
-    if !flag {
-        { Fq2::neg(0) }
-    // f, Px, Py, theta, lambda, x, y, z, theta * Qx, lambda, -Qy
-    }
-    { Fq2::mul(2, 0) }
-    // f, Px, Py, theta, lambda, x, y, z, theta * Qx, lambda * Qy
-    { Fq2::sub(2, 0) }
-    // f, Px, Py, theta, lambda, x, y, z, theta * Qx - lambda * Qy
-
-    // (lambda, -theta, j)
-    // f, Px, Py, theta, lambda, x, y, z, j
-    { Fq2::roll(8) }
-    // f, Px, Py, theta, x, y, z, j, lambda
-    { Fq2::roll(10) }
-    // f, Px, Py, x, y, z, j, lambda, theta
-    { Fq2::neg(0) }
-    // f, Px, Py, x, y, z, j, lambda, -theta
-    { Fq2::roll(4) }
-    // f, Px, Py, x, y, z, lambda, -theta, j
-
-    }
-}
-
-// script of double line for the purpose of non-fixed point in miller loop
-// stack data: beta^{2 * (p - 1) / 6}, beta^{3 * (p - 1) / 6}, beta^{2 * (p^2 - 1) / 6}, 1/2, B,
-// P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz
-// [..., Fq12, Fq12, Fq12, Fq12, Fq, Fq, (Fq, Fq), (Fq, Fq), (Fq, Fq)]
-pub fn double_line() -> Script {
-    script! {
-
-    // let mut a = self.x * &self.y;
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz
-    { Fq2::copy(4) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, Tx
-    { Fq2::copy(4) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, Tx, Ty
-    { Fq2::mul(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, Tx * Ty
-
-    // a.mul_assign_by_fp(two_inv);
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a
-    { Fq::copy(72) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, 1/2
-    { Fq2::mul_by_fq(1, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a * 1/2
-
-    // let b = self.y.square();
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a
-    { Fq2::copy(4) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, Ty
-    { Fq2::square() }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, Ty^2
-
-    // let c = self.z.square();
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b
-    { Fq2::copy(4) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, Tz
-    { Fq2::square() }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, Tz^2
-
-    // let e = ark_bn254::g2::Config::COEFF_B * &(c.double() + &c);
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c
-    { Fq2::copy(0) }
-    { Fq2::copy(0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, c, c
-    { Fq2::double(0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, c, 2 * c
-    { Fq2::add(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, 3 * c
-    { Fq2::copy(76) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, 3 * c, B
-    { Fq2::mul(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, 3 * c * B
-
-    // let f = e.double() + &e;
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, e
-    { Fq2::copy(0) }
-    { Fq2::copy(0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, e, e, e
-    { Fq2::double(0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, e, e, 2 * e
-    { Fq2::add(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, e, 3 * e
-
-    // let mut g = b + &f;
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, e, f
-    { Fq2::copy(0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, e, f, f
-    { Fq2::copy(8) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, e, f, f, b
-    { Fq2::add(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, e, f, f + b
-
-    // g.mul_assign_by_fp(two_inv);
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, e, f, g
-    { Fq::copy(82) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, e, f, g, 1/2
-    { Fq2::mul_by_fq(1, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, e, f, g * 1/2
-
-    // let h = (self.y + &self.z).square() - &(b + &c);
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Ty, Tz, a, b, c, e, f, g
-    { Fq2::roll(14) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, Tz, a, b, c, e, f, g, Ty
-    { Fq2::roll(14) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, a, b, c, e, f, g, Ty, Tz
-    { Fq2::add(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, a, b, c, e, f, g, Ty + Tz
-    { Fq2::square() }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, a, b, c, e, f, g, (Ty + Tz)^2
-    { Fq2::copy(10) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, a, b, c, e, f, g, (Ty + Tz)^2, b
-    { Fq2::roll(10) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, a, b, e, f, g, (Ty + Tz)^2, b, c
-    { Fq2::add(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, a, b, e, f, g, (Ty + Tz)^2, b + c
-    { Fq2::sub(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, a, b, e, f, g, (Ty + Tz)^2 - (b + c)
-
-    // let i = e - &b;
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, a, b, e, f, g, h
-    { Fq2::copy(6) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, a, b, e, f, g, h, e
-    { Fq2::copy(10) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, a, b, e, f, g, h, e, b
-    { Fq2::sub(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, a, b, e, f, g, h, e - b
-
-    // let j = self.x.square();
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, Tx, a, b, e, f, g, h, i
-    { Fq2::roll(14) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, a, b, e, f, g, h, i, Tx
-    { Fq2::square() }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, a, b, e, f, g, h, i, Tx^2
-
-    // let e_square = e.square();
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, a, b, e, f, g, h, i, j
-    { Fq2::roll(10) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, a, b, f, g, h, i, j, e
-    { Fq2::square() }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, a, b, f, g, h, i, j, e^2
-
-    // self.x = a * &(b - &f);
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, a, b, f, g, h, i, j, e^2
-    { Fq2::roll(14) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, f, g, h, i, j, e^2, a
-    { Fq2::copy(14) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, f, g, h, i, j, e^2, a, b
-    { Fq2::roll(14) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, g, h, i, j, e^2, a, b, f
-    { Fq2::sub(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, g, h, i, j, e^2, a, b - f
-    { Fq2::mul(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, g, h, i, j, e^2, a * (b - f)
-
-    // self.y = g.square() - &(e_square.double() + &e_square);
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, g, h, i, j, e^2, x
-    { Fq2::roll(10) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, h, i, j, e^2, x, g
-    { Fq2::square() }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, h, i, j, e^2, x, g^2
-    { Fq2::roll(4) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, h, i, j, x, g^2, e^2
-    { Fq2::copy(0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, h, i, j, x, g^2, e^2, e^2
-    { Fq2::double(0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, h, i, j, x, g^2, e^2, 2 * e^2
-    { Fq2::add(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, h, i, j, x, g^2, 3 * e^2
-    { Fq2::sub(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, h, i, j, x, g^2 - 3 * e^2
-
-    // self.z = b * &h;
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, b, h, i, j, x, y
-    { Fq2::roll(10) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, h, i, j, x, y, b
-    { Fq2::roll(10) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, i, j, x, y, b, h
-    { Fq2::copy(0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, i, j, x, y, b, h, h
-    { Fq2::mul(4, 2) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, i, j, x, y, h, z
-
-    // (-h, j.double() + &j, i)
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, i, j, x, y, h, z
-    { Fq2::roll(2) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, i, j, x, y, z, h
-    { Fq2::neg(0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, i, j, x, y, z, -h
-    { Fq2::roll(8) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, i, x, y, z, -h, j
-    { Fq2::copy(0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, i, x, y, z, -h, j, j
-    { Fq2::double(0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, i, x, y, z, -h, j, 2 * j
-    { Fq2::add(2, 0) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, i, x, y, z, -h, 3 * j
-    { Fq2::roll(10) }
-    // 1/2, B, P1, P2, P3, P4, Q4, c, c', wi, f, Px, Py, x, y, z, -h, 3 * j, i
-
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::bn254::fq2::Fq2;
-    use ark_ff::AdditiveGroup;
-    use ark_std::UniformRand;
-    use num_traits::One;
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-
-    #[test]
-    fn test_ell() {
-        println!("Pairing.ell: {} bytes", ell().len());
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq12::rand(&mut prng);
-            let c0 = ark_bn254::Fq2::rand(&mut prng);
-            let c1 = ark_bn254::Fq2::rand(&mut prng);
-            let c2 = ark_bn254::Fq2::rand(&mut prng);
-            let px = ark_bn254::Fq::rand(&mut prng);
-            let py = ark_bn254::Fq::rand(&mut prng);
-
-            let b = {
-                let mut c0new = c0;
-                c0new.mul_assign_by_fp(&py);
-
-                let mut c1new = c1;
-                c1new.mul_assign_by_fp(&px);
-
-                let mut b = a;
-                b.mul_by_034(&c0new, &c1new, &c2);
-                b
-            };
-
-            let script = script! {
-                { fq12_push(a) }
-                { fq2_push(c0) }
-                { fq2_push(c1) }
-                { fq2_push(c2) }
-                { Fq::push_u32_le(&BigUint::from(px).to_u32_digits()) }
-                { Fq::push_u32_le(&BigUint::from(py).to_u32_digits()) }
-                ell
-                { fq12_push(b) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_ell_by_constant_projective() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        for _ in 0..1 {
-            let a = ark_bn254::Fq12::rand(&mut prng);
-            let b = ark_bn254::g2::G2Affine::rand(&mut prng);
-            let px = ark_bn254::Fq::rand(&mut prng);
-            let py = ark_bn254::Fq::rand(&mut prng);
-
-            // projective mode
-            let coeffs = G2Prepared::from(b);
-            let ell_by_constant_script = ell_by_constant(&coeffs.ell_coeffs[0]);
-            println!(
-                "Pairing.ell_by_constant: {} bytes",
-                ell_by_constant_script.len()
-            );
-
-            // projective mode as well
-            let b = {
-                let mut c0new = coeffs.ell_coeffs[0].0;
-                c0new.mul_assign_by_fp(&py);
-
-                let mut c1new = coeffs.ell_coeffs[0].1;
-                c1new.mul_assign_by_fp(&px);
-
-                let mut b = a;
-                b.mul_by_034(&c0new, &c1new, &coeffs.ell_coeffs[0].2);
-                b
-            };
-
-            let script = script! {
-                { fq12_push(a) }
-                { Fq::push_u32_le(&BigUint::from(px).to_u32_digits()) }
-                { Fq::push_u32_le(&BigUint::from(py).to_u32_digits()) }
-                { ell_by_constant_script.clone() }
-                { fq12_push(b) }
-                { Fq12::equalverify() }
-                OP_TRUE
-            };
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-
-    #[test]
-    fn test_ell_by_constant_affine() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        let f = ark_bn254::Fq12::rand(&mut prng);
-        let b = ark_bn254::g2::G2Affine::rand(&mut prng);
-        let p = ark_bn254::g1::G1Affine::rand(&mut prng);
-
-        // affine mode
-        let coeffs = G2Prepared::from_affine(b);
-        let ell_by_constant_affine_script = ell_by_constant_affine(&coeffs.ell_coeffs[0]);
-        println!(
-            "Pairing.ell_by_constant_affine: {} bytes",
-            ell_by_constant_affine_script.len()
-        );
-
-        // affine mode as well
-        let hint = {
-            assert_eq!(coeffs.ell_coeffs[0].0, ark_bn254::fq2::Fq2::ONE);
-
-            let mut f1 = f;
-            let mut c1new = coeffs.ell_coeffs[0].1;
-            c1new.mul_assign_by_fp(&(-p.x / p.y));
-
-            let mut c2new = coeffs.ell_coeffs[0].2;
-            c2new.mul_assign_by_fp(&(p.y.inverse().unwrap()));
-
-            f1.mul_by_034(&coeffs.ell_coeffs[0].0, &c1new, &c2new);
-            f1
-        };
-
-        let script = script! {
-            { fq12_push(f) }
-            { from_eval_point(p) }
-            { ell_by_constant_affine_script.clone() }
-            { fq12_push(hint) }
-            { Fq12::equalverify() }
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_from_eval_point() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        let p = ark_bn254::G1Affine::rand(&mut prng);
-        let script = script! {
-            { from_eval_point(p) }
-            { Fq::push_u32_le(&BigUint::from(-p.x / p.y).to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from(p.y.inverse().unwrap()).to_u32_digits()) }
-            { Fq::equalverify(2, 0) }
-            { Fq::equalverify(1, 0) }
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_affine_add_line() {
-        // alpha = (t.y - q.y) / (t.x - q.x)
-        // bias = t.y - alpha * t.x
-        // x' = alpha^2 - T.x - Q.x
-        // y' = -bias - alpha * x'
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        let t = ark_bn254::G2Affine::rand(&mut prng);
-        let q = ark_bn254::G2Affine::rand(&mut prng);
-        let alpha = (t.y - q.y) / (t.x - q.x);
-        // -bias
-        let bias_minus = alpha * t.x - t.y;
-
-        let x = alpha.square() - t.x - q.x;
-        let y = bias_minus - alpha * x;
-
-        let script = script! {
-            { fq2_push(t.x) }
-            { fq2_push(q.x) }
-            { affine_add_line(alpha, bias_minus) }
-            // [x']
-            { fq2_push(y) }
-            // [x', y', y]
-            { Fq2::equalverify() }
-            // [x']
-            { fq2_push(x) }
-            // [x', x]
-            { Fq2::equalverify() }
-            // []
-            OP_TRUE
-            // [OP_TRUE]
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_affine_double_line() {
-        // slope: alpha = 3 * x^2 / 2 * y
-        // intercept: bias = y - alpha * x
-        // x' = alpha^2 - 2 * x
-        // y' = -bias - alpha * x'
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        let t = ark_bn254::G2Affine::rand(&mut prng);
-        let two_inv = ark_bn254::Fq::one().double().inverse().unwrap();
-        let three_div_two = (ark_bn254::Fq::one().double() + ark_bn254::Fq::one()) * two_inv;
-        let mut alpha = t.x.square();
-        alpha /= t.y;
-        alpha.mul_assign_by_fp(&three_div_two);
-        // -bias
-        let bias_minus = alpha * t.x - t.y;
-
-        let x = alpha.square() - t.x.double();
-        let y = bias_minus - alpha * x;
-
-        let script = script! {
-            { fq2_push(t.x) }
-            { affine_double_line(alpha, bias_minus) }
-            // [x']
-            { fq2_push(y) }
-            // [x', y', y]
-            { Fq2::equalverify() }
-            // [x']
-            { fq2_push(x) }
-            // [x', x]
-            { Fq2::equalverify() }
-            // []
-            OP_TRUE
-            // [OP_TRUE]
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_check_tangent_line() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        let t = ark_bn254::G2Affine::rand(&mut prng);
-        let two_inv = ark_bn254::Fq::one().double().inverse().unwrap();
-        let three_div_two = (ark_bn254::Fq::one().double() + ark_bn254::Fq::one()) * two_inv;
-        let mut alpha = t.x.square();
-        alpha /= t.y;
-        alpha.mul_assign_by_fp(&three_div_two);
-        // -bias
-        let bias_minus = alpha * t.x - t.y;
-        assert_eq!(alpha * t.x - t.y, bias_minus);
-        let script = script! {
-            { fq2_push(t.x) }
-            { fq2_push(t.y) }
-            { check_line_through_point(alpha, bias_minus) }
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_check_chord_line() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        let t = ark_bn254::G2Affine::rand(&mut prng);
-        let q = ark_bn254::G2Affine::rand(&mut prng);
-        let alpha = (t.y - q.y) / (t.x - q.x);
-        // -bias
-        let bias_minus = alpha * t.x - t.y;
-        assert_eq!(alpha * t.x - t.y, bias_minus);
-        let script = script! {
-            { fq2_push(t.x) }
-            { fq2_push(t.y) }
-            { check_line_through_point(alpha, bias_minus) }
-            { fq2_push(q.x) }
-            { fq2_push(q.y) }
-            { check_line_through_point(alpha, bias_minus) }
-            OP_TRUE
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/bridge/client/chain/base.rs b/src/bridge/client/chain/base.rs
deleted file mode 100644
index 8f3fbba98..000000000
--- a/src/bridge/client/chain/base.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use async_trait::async_trait;
-
-use super::chain::PegInEvent;
-use super::chain::PegOutBurntEvent;
-use super::chain::PegOutEvent;
-
-#[async_trait]
-pub trait ChainAdaptor {
-    async fn get_peg_out_init_event(&self) -> Result<Vec<PegOutEvent>, String>;
-    async fn get_peg_out_burnt_event(&self) -> Result<Vec<PegOutBurntEvent>, String>;
-    async fn get_peg_in_minted_event(&self) -> Result<Vec<PegInEvent>, String>;
-}
diff --git a/src/bridge/client/chain/chain.rs b/src/bridge/client/chain/chain.rs
deleted file mode 100644
index cf2dd2c04..000000000
--- a/src/bridge/client/chain/chain.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use bitcoin::{Amount, OutPoint, PubkeyHash, PublicKey};
-
-use super::{
-    base::ChainAdaptor,
-    ethereum::{EthereumAdaptor, EthereumInitConfig},
-};
-
-#[derive(Debug)]
-pub struct PegOutEvent {
-    pub withdrawer_chain_address: String,
-    pub withdrawer_public_key_hash: PubkeyHash,
-    pub source_outpoint: OutPoint,
-    pub amount: Amount,
-    pub operator_public_key: PublicKey,
-    pub timestamp: u32,
-}
-
-#[derive(Debug)]
-pub struct PegOutBurntEvent {
-    pub withdrawer_chain_address: String,
-    pub source_outpoint: OutPoint,
-    pub amount: Amount,
-    pub operator_public_key: PublicKey,
-    pub timestamp: u32,
-}
-
-#[derive(Debug)]
-pub struct PegInEvent {
-    pub depositor: String,
-    pub amount: Amount,
-    pub depositor_pubkey: PublicKey,
-}
-
-static CLIENT_MISSING_ORACLE_DRIVER_ERROR: &str = "Bridge client is missing chain adaptor";
-
-pub struct Chain {
-    ethereum: Option<EthereumAdaptor>,
-}
-
-impl Chain {
-    pub fn new() -> Self {
-        Self {
-            ethereum: EthereumAdaptor::new(),
-        }
-    }
-
-    pub fn init_ethereum(&mut self, conf: EthereumInitConfig) {
-        self.ethereum = Some(EthereumAdaptor::from_config(conf));
-    }
-
-    pub async fn get_peg_out_init(&self) -> Result<Vec<PegOutEvent>, String> {
-        match self.get_driver() {
-            Ok(driver) => match driver.get_peg_out_init_event().await {
-                Ok(events) => Ok(events),
-                Err(err) => Err(err.to_string()),
-            },
-            Err(err) => Err(err.to_string()),
-        }
-    }
-
-    pub async fn get_peg_in_minted(&self) -> Result<Vec<PegInEvent>, String> {
-        match self.get_driver() {
-            Ok(driver) => driver.get_peg_in_minted_event().await,
-            Err(err) => Err(err.to_string()),
-        }
-    }
-
-    fn get_driver(&self) -> Result<&dyn ChainAdaptor, &str> {
-        if self.ethereum.is_some() {
-            return Ok(self.ethereum.as_ref().unwrap());
-        } else {
-            Err(CLIENT_MISSING_ORACLE_DRIVER_ERROR)
-        }
-    }
-}
diff --git a/src/bridge/client/chain/mod.rs b/src/bridge/client/chain/mod.rs
deleted file mode 100644
index 1ac558f40..000000000
--- a/src/bridge/client/chain/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod base;
-pub mod chain;
-pub mod ethereum;
diff --git a/src/bridge/client/client.rs b/src/bridge/client/client.rs
deleted file mode 100644
index 3bf4f99e3..000000000
--- a/src/bridge/client/client.rs
+++ /dev/null
@@ -1,1202 +0,0 @@
-use musig2::SecNonce;
-use serde::{Deserialize, Serialize};
-use std::{
-    collections::HashMap,
-    fs::{self},
-    path::Path,
-};
-
-use bitcoin::{absolute::Height, Address, Amount, Network, OutPoint, PublicKey, ScriptBuf, Txid};
-use esplora_client::{AsyncClient, Builder, Utxo};
-
-use crate::bridge::{constants::DestinationNetwork, contexts::base::generate_n_of_n_public_key};
-
-use super::{
-    super::{
-        contexts::{
-            depositor::DepositorContext, operator::OperatorContext, verifier::VerifierContext,
-            withdrawer::WithdrawerContext,
-        },
-        graphs::{
-            base::BaseGraph,
-            peg_in::{generate_id as peg_in_generate_id, PegInGraph},
-            peg_out::{generate_id as peg_out_generate_id, PegOutGraph},
-        },
-        serialization::{serialize, try_deserialize},
-        transactions::base::{Input, InputWithScript},
-    },
-    data_store::data_store::DataStore,
-};
-
-const ESPLORA_URL: &str = "https://mutinynet.com/api";
-const TEN_MINUTES: u64 = 10 * 60;
-
-pub type UtxoSet = HashMap<OutPoint, Height>;
-
-#[derive(Serialize, Deserialize, Eq, PartialEq)]
-pub struct BitVMClientPublicData {
-    pub version: u32,
-    pub peg_in_graphs: Vec<PegInGraph>,
-    pub peg_out_graphs: Vec<PegOutGraph>,
-}
-
-#[derive(Serialize, Deserialize, Eq, PartialEq)]
-pub struct BitVMClientPrivateData {
-    // Peg in and peg out nonces all go into the same file for now
-    // Verifier public key -> Graph ID -> Tx ID -> Input index
-    pub secret_nonces: HashMap<PublicKey, HashMap<String, HashMap<Txid, HashMap<usize, SecNonce>>>>,
-}
-
-pub struct BitVMClient {
-    pub esplora: AsyncClient,
-
-    depositor_context: Option<DepositorContext>,
-    operator_context: Option<OperatorContext>,
-    verifier_context: Option<VerifierContext>,
-    withdrawer_context: Option<WithdrawerContext>,
-
-    data_store: DataStore,
-    data: BitVMClientPublicData,
-    pub fetched_file_name: Option<String>,
-    pub file_path: String,
-
-    private_data: BitVMClientPrivateData,
-}
-
-impl BitVMClient {
-    pub async fn new(
-        source_network: Network,
-        destination_network: DestinationNetwork,
-        n_of_n_public_keys: &Vec<PublicKey>,
-        depositor_secret: Option<&str>,
-        operator_secret: Option<&str>,
-        verifier_secret: Option<&str>,
-        withdrawer_secret: Option<&str>,
-    ) -> Self {
-        let mut depositor_context = None;
-        if depositor_secret.is_some() {
-            depositor_context = Some(DepositorContext::new(
-                source_network,
-                depositor_secret.unwrap(),
-                n_of_n_public_keys,
-            ));
-        }
-
-        let mut operator_context = None;
-        if operator_secret.is_some() {
-            operator_context = Some(OperatorContext::new(
-                source_network,
-                operator_secret.unwrap(),
-                n_of_n_public_keys,
-            ));
-        }
-
-        let mut verifier_context = None;
-        if verifier_secret.is_some() {
-            verifier_context = Some(VerifierContext::new(
-                source_network,
-                verifier_secret.unwrap(),
-                n_of_n_public_keys,
-            ));
-        }
-
-        let mut withdrawer_context = None;
-        if withdrawer_secret.is_some() {
-            withdrawer_context = Some(WithdrawerContext::new(
-                source_network,
-                withdrawer_secret.unwrap(),
-                n_of_n_public_keys,
-            ));
-        }
-
-        // TODO scope data and private data by n of n public keys
-        // Prepend files with prefix
-        let (n_of_n_public_key, _) = generate_n_of_n_public_key(n_of_n_public_keys);
-        let file_path =
-            format! {"bridge_data/{source_network}/{destination_network}/{n_of_n_public_key}"};
-        Self::create_directories_if_non_existent(&file_path);
-
-        let data = BitVMClientPublicData {
-            version: 1,
-            peg_in_graphs: vec![],
-            peg_out_graphs: vec![],
-        };
-
-        let data_store = DataStore::new();
-
-        let private_data = Self::get_private_data(&file_path);
-
-        Self {
-            esplora: Builder::new(ESPLORA_URL)
-                .build_async()
-                .expect("Could not build esplora client"),
-
-            depositor_context,
-            operator_context,
-            verifier_context,
-            withdrawer_context,
-
-            data_store,
-            data,
-            fetched_file_name: None,
-            file_path,
-
-            private_data,
-        }
-    }
-
-    pub fn get_data(&self) -> &BitVMClientPublicData { return &self.data; }
-
-    pub async fn sync(&mut self) { self.read().await; }
-
-    pub async fn flush(&mut self) { self.save().await; }
-
-    /*
-     1. Fetch the lates file
-     2. Fetch all files within 10 minutes (use timestamp)
-     3. Merge files
-     4. Modify file
-     5. Fetch files that was created after fetching 1-2.
-     6. Merge with your file
-     7. Push the file to the server
-    */
-
-    async fn read(&mut self) {
-        let latest_file_names_result = Self::get_latest_file_names(
-            &self.data_store,
-            Some(&self.file_path),
-            self.fetched_file_name.clone(),
-        )
-        .await;
-
-        if latest_file_names_result.is_ok() {
-            let mut latest_file_names = latest_file_names_result.unwrap();
-            if !latest_file_names.is_empty() {
-                // fetch latest valid file
-                let (latest_file, latest_file_name) = Self::fetch_latest_valid_file(
-                    &self.data_store,
-                    &mut latest_file_names,
-                    Some(&self.file_path),
-                )
-                .await;
-                if latest_file.is_some() && latest_file_name.is_some() {
-                    Self::save_local_public_file(
-                        &self.file_path,
-                        latest_file_name.as_ref().unwrap(),
-                        &serialize(&latest_file.as_ref().unwrap()),
-                    );
-                    self.fetched_file_name = latest_file_name;
-
-                    // fetch and process all the previous files if latest valid file exists
-                    let result =
-                        Self::process_files_by_timestamp(self, latest_file_names, TEN_MINUTES)
-                            .await;
-                    match result {
-                        Ok(_) => (), // println!("Ok"),
-                        Err(err) => println!("Error: {}", err),
-                    }
-
-                    self.merge_data(latest_file.unwrap()); // merge the latest data at the end
-                }
-            } else {
-                println!("Up to date. No need to read data from the server.");
-            }
-        } else {
-            println!("Error: {}", latest_file_names_result.unwrap_err());
-        }
-    }
-
-    async fn get_latest_file_names(
-        data_store: &DataStore,
-        file_path: Option<&str>,
-        fetched_file_name: Option<String>,
-    ) -> Result<Vec<String>, String> {
-        let all_file_names_result = data_store.get_file_names(file_path).await;
-        if all_file_names_result.is_ok() {
-            let mut all_file_names = all_file_names_result.unwrap();
-
-            if fetched_file_name.is_some() {
-                let fetched_file_position = all_file_names
-                    .iter()
-                    .position(|file_name| file_name.eq(fetched_file_name.as_ref().unwrap()));
-                if fetched_file_position.is_some() {
-                    let unfetched_file_position = fetched_file_position.unwrap() + 1;
-                    if all_file_names.len() > unfetched_file_position {
-                        all_file_names = all_file_names.split_off(unfetched_file_position);
-                    } else {
-                        all_file_names.clear(); // no files to process
-                    }
-                }
-            }
-
-            return Ok(all_file_names);
-        } else {
-            return Err(all_file_names_result.unwrap_err());
-        }
-    }
-
-    async fn filter_files_names_by_timestamp(
-        latest_file_names: Vec<String>,
-        fetched_file_name: &Option<String>,
-        period: u64,
-    ) -> Result<Vec<String>, String> {
-        if fetched_file_name.is_some() {
-            let latest_timestamp =
-                DataStore::get_file_timestamp(fetched_file_name.as_ref().unwrap());
-            if latest_timestamp.is_err() {
-                return Err(latest_timestamp.unwrap_err());
-            }
-
-            let past_max_file_name =
-                DataStore::get_past_max_file_name_by_timestamp(latest_timestamp.unwrap(), period);
-
-            let mut previous_max_position = latest_file_names
-                .iter()
-                .position(|file_name| file_name >= &past_max_file_name);
-            if previous_max_position.is_none() {
-                previous_max_position = Some(latest_file_names.len());
-            }
-
-            let file_names_to_process = latest_file_names
-                .clone()
-                .split_off(previous_max_position.unwrap());
-
-            return Ok(file_names_to_process);
-        } else {
-            return Err(String::from(
-                "No latest file data. Must fetch the latest file first.",
-            ));
-        }
-    }
-
-    async fn process_files_by_timestamp(
-        &mut self,
-        latest_file_names: Vec<String>,
-        period: u64,
-    ) -> Result<String, String> {
-        let file_names_to_process_result = Self::filter_files_names_by_timestamp(
-            latest_file_names,
-            &self.fetched_file_name,
-            period,
-        )
-        .await;
-
-        if file_names_to_process_result.is_err() {
-            return Err(file_names_to_process_result.unwrap_err());
-        }
-
-        let file_names_to_process = file_names_to_process_result.unwrap();
-
-        Self::process_files(self, file_names_to_process).await;
-
-        return Ok(String::from("Files processed"));
-    }
-
-    async fn process_files(&mut self, file_names: Vec<String>) -> Option<String> {
-        let mut latest_valid_file_name: Option<String> = None;
-        if file_names.len() == 0 {
-            // println!("No additional files to process")
-        } else {
-            // TODO: can be optimized to fetch all data at once?
-            for file_name in file_names.iter() {
-                let result = self
-                    .data_store
-                    .fetch_data_by_key(file_name, Some(&self.file_path))
-                    .await; // TODO: use `fetch_by_key()` function
-                if result.is_ok() && result.as_ref().unwrap().is_some() {
-                    let data =
-                        try_deserialize::<BitVMClientPublicData>(&(result.unwrap()).unwrap());
-                    if data.is_ok() && Self::validate_data(&data.as_ref().unwrap()) {
-                        // merge the file if the data is valid
-                        println!("Merging {} data...", { file_name });
-                        self.merge_data(data.unwrap());
-                        if latest_valid_file_name.is_none() {
-                            latest_valid_file_name = Some(file_name.clone());
-                        }
-                    } else {
-                        // skip the file if the data is invalid
-                        println!("Invalid file {}, Skipping...", file_name);
-                    }
-                }
-            }
-        }
-
-        return latest_valid_file_name;
-    }
-
-    async fn fetch_latest_valid_file(
-        data_store: &DataStore,
-        file_names: &mut Vec<String>,
-        file_path: Option<&str>,
-    ) -> (Option<BitVMClientPublicData>, Option<String>) {
-        let mut latest_valid_file: Option<BitVMClientPublicData> = None;
-        let mut latest_valid_file_name: Option<String> = None;
-
-        while !file_names.is_empty() {
-            let file_name_result = file_names.pop();
-            if file_name_result.is_some() {
-                let file_name = file_name_result.unwrap();
-                let (latest_data, latest_data_len) =
-                    Self::fetch_by_key(data_store, &file_name, file_path).await;
-                if latest_data.is_some() && Self::validate_data(&latest_data.as_ref().unwrap()) {
-                    // data is valid
-                    println!(
-                        "Fetched valid file: {} (size: {})",
-                        file_name, latest_data_len
-                    );
-                    latest_valid_file = latest_data;
-                    latest_valid_file_name = Some(file_name);
-                    break;
-                } else {
-                    println!("Invalid file: {}", file_name); // TODO: can be removed
-                }
-                // for invalid data try another file
-            }
-        }
-
-        return (latest_valid_file, latest_valid_file_name);
-    }
-
-    async fn fetch_by_key(
-        data_store: &DataStore,
-        key: &String,
-        file_path: Option<&str>,
-    ) -> (Option<BitVMClientPublicData>, usize) {
-        let result = data_store.fetch_data_by_key(key, file_path).await;
-        if result.is_ok() {
-            if let Some(json) = result.unwrap() {
-                let data = try_deserialize::<BitVMClientPublicData>(&json);
-                if data.is_ok() {
-                    return (Some(data.unwrap()), json.len());
-                }
-            }
-        }
-
-        (None, 0)
-    }
-
-    async fn save(&mut self) {
-        // read newly created data before pushing
-        let latest_file_names_result = Self::get_latest_file_names(
-            &self.data_store,
-            Some(&self.file_path),
-            self.fetched_file_name.clone(),
-        )
-        .await;
-
-        if latest_file_names_result.is_ok() {
-            let mut latest_file_names = latest_file_names_result.unwrap();
-            latest_file_names.reverse();
-            let latest_valid_file_name = Self::process_files(self, latest_file_names).await;
-            self.fetched_file_name = latest_valid_file_name;
-        }
-
-        // push data
-        self.data.version += 1;
-
-        let json = serialize(&self.data);
-        let result = self
-            .data_store
-            .write_data(json.clone(), Some(&self.file_path))
-            .await;
-        match result {
-            Ok(key) => {
-                println!("Pushed new file: {} (size: {})", key, json.len());
-                Self::save_local_public_file(&self.file_path, &key, &json);
-            }
-            Err(err) => println!("Failed to push: {}", err),
-        }
-    }
-
-    pub fn validate_data(data: &BitVMClientPublicData) -> bool {
-        for peg_in_graph in data.peg_in_graphs.iter() {
-            if !peg_in_graph.validate() {
-                println!(
-                    "Encountered invalid peg in graph (Graph id: {})",
-                    peg_in_graph.id()
-                );
-                return false;
-            }
-        }
-        for peg_out_graph in data.peg_out_graphs.iter() {
-            if !peg_out_graph.validate() {
-                println!(
-                    "Encountered invalid peg out graph (Graph id: {})",
-                    peg_out_graph.id()
-                );
-                return false;
-            }
-        }
-
-        // println!("All graph data is valid");
-        true
-    }
-
-    /// Merges `data` into `self.data`.
-    ///
-    /// # Arguments
-    ///
-    /// * `data` - Must be valid data verified via `BitVMClient::validate_data()` function
-    pub fn merge_data(&mut self, data: BitVMClientPublicData) {
-        // peg-in graphs
-        let mut peg_in_graphs_by_id: HashMap<String, &mut PegInGraph> = HashMap::new();
-        for peg_in_graph in self.data.peg_in_graphs.iter_mut() {
-            peg_in_graphs_by_id.insert(peg_in_graph.id().clone(), peg_in_graph);
-        }
-
-        let mut peg_in_graphs_to_add: Vec<&PegInGraph> = Vec::new();
-        for peg_in_graph in data.peg_in_graphs.iter() {
-            let graph = peg_in_graphs_by_id.get_mut(peg_in_graph.id());
-            if graph.is_some() {
-                graph.unwrap().merge(peg_in_graph);
-            } else {
-                peg_in_graphs_to_add.push(peg_in_graph);
-            }
-        }
-
-        for graph in peg_in_graphs_to_add.into_iter() {
-            self.data.peg_in_graphs.push(graph.clone());
-        }
-
-        // peg-out graphs
-        let mut peg_out_graphs_by_id: HashMap<String, &mut PegOutGraph> = HashMap::new();
-        for peg_out_graph in self.data.peg_out_graphs.iter_mut() {
-            let id = peg_out_graph.id().clone();
-            peg_out_graphs_by_id.insert(id, peg_out_graph);
-        }
-
-        let mut peg_out_graphs_to_add: Vec<&PegOutGraph> = Vec::new();
-        for peg_out_graph in data.peg_out_graphs.iter() {
-            let graph = peg_out_graphs_by_id.get_mut(peg_out_graph.id());
-            if graph.is_some() {
-                graph.unwrap().merge(peg_out_graph);
-            } else {
-                peg_out_graphs_to_add.push(peg_out_graph);
-            }
-        }
-
-        for graph in peg_out_graphs_to_add.into_iter() {
-            self.data.peg_out_graphs.push(graph.clone());
-        }
-    }
-
-    // fn process(&self) {
-    //     for peg_in_graph in self.data.peg_in_graphs.iter() {
-    //         // match graph.get(outpoint) {
-    //         //     Some(subsequent_txs) => {
-    //         //         for bridge_transaction in subsequent_txs {
-    //         //             // TODO: Check whether the transaction is executable
-    //         //             let tx = bridge_transaction.finalize();
-    //         //             match self.esplora.broadcast(&tx).await {
-    //         //                 Ok(_) => {
-    //         //                     println!(
-    //         //                         "Succesfully broadcast next transaction with id: {}",
-    //         //                         tx.compute_txid()
-    //         //                     );
-    //         //                     remove_utxo = Some(*outpoint);
-    //         //                     break;
-    //         //                 }
-    //         //                 Err(err) => panic!("Tx Broadcast Error: {}", err),
-    //         //             }
-    //         //         }
-    //         //     }
-    //         //     None => continue,
-    //         // }
-    //     }
-    // }
-
-    pub async fn status(&self) {
-        if self.depositor_context.is_some() {
-            self.depositor_status().await;
-        }
-        if self.operator_context.is_some() {
-            self.operator_status().await;
-        }
-        if self.verifier_context.is_some() {
-            self.verifier_status().await;
-        }
-    }
-
-    async fn depositor_status(&self) {
-        if self.depositor_context.is_none() {
-            panic!("Depositor context must be initialized");
-        }
-
-        let depositor_public_key = &self
-            .depositor_context
-            .as_ref()
-            .unwrap()
-            .depositor_public_key;
-        for peg_in_graph in self.data.peg_in_graphs.iter() {
-            if peg_in_graph.depositor_public_key.eq(depositor_public_key) {
-                let status = peg_in_graph.depositor_status(&self.esplora).await;
-                println!("Graph id: {} status: {}\n", peg_in_graph.id(), status);
-            }
-        }
-    }
-
-    async fn operator_status(&self) {
-        if self.operator_context.is_none() {
-            panic!("Operator context must be initialized");
-        }
-
-        let mut peg_out_graphs_by_id: HashMap<&String, &PegOutGraph> = HashMap::new();
-        for peg_out_graph in self.data.peg_out_graphs.iter() {
-            peg_out_graphs_by_id.insert(&peg_out_graph.id(), peg_out_graph);
-        }
-
-        let operator_public_key = &self.operator_context.as_ref().unwrap().operator_public_key;
-        for peg_in_graph in self.data.peg_in_graphs.iter() {
-            let peg_out_graph_id = peg_out_generate_id(peg_in_graph, operator_public_key);
-            if !peg_out_graphs_by_id.contains_key(&peg_out_graph_id) {
-                println!(
-                    "Graph id: {} status: {}\n",
-                    peg_in_graph.id(),
-                    "Missing peg out graph" // TODO update this to ask the operator to create a new peg out graph
-                );
-            } else {
-                let peg_out_graph = peg_out_graphs_by_id.get(&peg_out_graph_id).unwrap();
-                let status = peg_out_graph.operator_status(&self.esplora).await;
-                println!("Graph id: {} status: {}\n", peg_out_graph.id(), status);
-            }
-        }
-    }
-
-    async fn verifier_status(&self) {
-        if self.verifier_context.is_none() {
-            panic!("Verifier context must be initialized");
-        }
-
-        for peg_out_graph in self.data.peg_out_graphs.iter() {
-            let status = peg_out_graph.verifier_status(&self.esplora).await;
-            println!("Graph id: {} status: {}\n", peg_out_graph.id(), status);
-        }
-    }
-
-    pub async fn create_peg_in_graph(&mut self, input: Input, evm_address: &str) -> String {
-        if self.depositor_context.is_none() {
-            panic!("Depositor context must be initialized");
-        }
-
-        let peg_in_graph =
-            PegInGraph::new(self.depositor_context.as_ref().unwrap(), input, evm_address);
-
-        let peg_in_graph_id = peg_in_generate_id(&peg_in_graph.peg_in_deposit_transaction);
-
-        let graph = self
-            .data
-            .peg_in_graphs
-            .iter()
-            .find(|&peg_out_graph| peg_out_graph.id().eq(&peg_in_graph_id));
-        if graph.is_some() {
-            panic!("Peg in graph already exists");
-        }
-
-        self.data.peg_in_graphs.push(peg_in_graph);
-
-        peg_in_graph_id
-    }
-
-    pub async fn broadcast_peg_in_deposit(&mut self, peg_in_graph_id: &str) {
-        let peg_in_graph = self
-            .data
-            .peg_in_graphs
-            .iter()
-            .find(|&peg_in_graph| peg_in_graph.id().eq(peg_in_graph_id));
-        if peg_in_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_in_graph.unwrap().deposit(&self.esplora).await
-    }
-
-    pub async fn broadcast_peg_in_refund(&mut self, peg_in_graph_id: &str) {
-        let peg_in_graph = self
-            .data
-            .peg_in_graphs
-            .iter()
-            .find(|&peg_in_graph| peg_in_graph.id().eq(peg_in_graph_id));
-        if peg_in_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_in_graph.unwrap().refund(&self.esplora).await
-    }
-
-    pub async fn broadcast_peg_in_confirm(&mut self, peg_in_graph_id: &str) {
-        let peg_in_graph = self
-            .data
-            .peg_in_graphs
-            .iter()
-            .find(|&peg_in_graph| peg_in_graph.id().eq(peg_in_graph_id));
-        if peg_in_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_in_graph.unwrap().confirm(&self.esplora).await
-    }
-
-    pub async fn create_peg_out_graph(
-        &mut self,
-        peg_in_graph_id: &str,
-        kickoff_input: Input,
-    ) -> String {
-        if self.operator_context.is_none() {
-            panic!("Operator context must be initialized");
-        }
-        let operator_public_key = &self.operator_context.as_ref().unwrap().operator_public_key;
-
-        let peg_in_graph = self
-            .data
-            .peg_in_graphs
-            .iter()
-            .find(|&peg_in_graph| peg_in_graph.id().eq(peg_in_graph_id));
-        if peg_in_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        let peg_out_graph_id = peg_out_generate_id(peg_in_graph.unwrap(), operator_public_key);
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter()
-            .find(|&peg_out_graph| peg_out_graph.id().eq(&peg_out_graph_id));
-        if peg_out_graph.is_some() {
-            panic!("Peg out graph already exists");
-        }
-
-        let peg_out_graph = PegOutGraph::new(
-            self.operator_context.as_ref().unwrap(),
-            peg_in_graph.unwrap(),
-            kickoff_input,
-        );
-
-        self.data.peg_out_graphs.push(peg_out_graph);
-
-        peg_out_graph_id
-    }
-
-    pub async fn broadcast_kick_off_1(&mut self, peg_out_graph_id: &str) {
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter_mut()
-            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id));
-        if peg_out_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_out_graph.unwrap().kick_off_1(&self.esplora).await;
-    }
-
-    pub async fn broadcast_start_time(&mut self, peg_out_graph_id: &str) {
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter_mut()
-            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id));
-        if peg_out_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_out_graph.unwrap().start_time(&self.esplora).await;
-    }
-
-    pub async fn broadcast_start_time_timeout(
-        &mut self,
-        peg_out_graph_id: &str,
-        output_script_pubkey: ScriptBuf,
-    ) {
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter_mut()
-            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id));
-        if peg_out_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_out_graph
-            .unwrap()
-            .start_time_timeout(&self.esplora, output_script_pubkey)
-            .await;
-    }
-
-    pub async fn broadcast_kick_off_2(&mut self, peg_out_graph_id: &str) {
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter_mut()
-            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id));
-        if peg_out_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_out_graph.unwrap().kick_off_2(&self.esplora).await;
-    }
-
-    pub async fn broadcast_kick_off_timeout(
-        &mut self,
-        peg_out_graph_id: &str,
-        output_script_pubkey: ScriptBuf,
-    ) {
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter_mut()
-            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id));
-        if peg_out_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_out_graph
-            .unwrap()
-            .kick_off_timeout(&self.esplora, output_script_pubkey)
-            .await;
-    }
-
-    pub async fn broadcast_challenge(
-        &mut self,
-        peg_out_graph_id: &str,
-        crowdfundng_inputs: &Vec<InputWithScript<'_>>,
-        output_script_pubkey: ScriptBuf,
-    ) {
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter_mut()
-            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id));
-        if peg_out_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        if self.depositor_context.is_some() {
-            peg_out_graph
-                .unwrap()
-                .challenge(
-                    &self.esplora,
-                    self.depositor_context.as_ref().unwrap(),
-                    crowdfundng_inputs,
-                    &self.depositor_context.as_ref().unwrap().depositor_keypair,
-                    output_script_pubkey,
-                )
-                .await;
-        } else if self.operator_context.is_some() {
-            peg_out_graph
-                .unwrap()
-                .challenge(
-                    &self.esplora,
-                    self.operator_context.as_ref().unwrap(),
-                    crowdfundng_inputs,
-                    &self.operator_context.as_ref().unwrap().operator_keypair,
-                    output_script_pubkey,
-                )
-                .await;
-        } else if self.verifier_context.is_some() {
-            peg_out_graph
-                .unwrap()
-                .challenge(
-                    &self.esplora,
-                    self.verifier_context.as_ref().unwrap(),
-                    crowdfundng_inputs,
-                    &self.verifier_context.as_ref().unwrap().verifier_keypair,
-                    output_script_pubkey,
-                )
-                .await;
-        } else if self.withdrawer_context.is_some() {
-            peg_out_graph
-                .unwrap()
-                .challenge(
-                    &self.esplora,
-                    self.withdrawer_context.as_ref().unwrap(),
-                    crowdfundng_inputs,
-                    &self.withdrawer_context.as_ref().unwrap().withdrawer_keypair,
-                    output_script_pubkey,
-                )
-                .await;
-        }
-    }
-
-    pub async fn broadcast_assert(&mut self, peg_out_graph_id: &str) {
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter_mut()
-            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id));
-        if peg_out_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_out_graph.unwrap().assert(&self.esplora).await;
-    }
-
-    pub async fn broadcast_disprove(
-        &mut self,
-        peg_out_graph_id: &str,
-        input_script_index: u32,
-        output_script_pubkey: ScriptBuf,
-    ) {
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter_mut()
-            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id));
-        if peg_out_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_out_graph
-            .unwrap()
-            .disprove(&self.esplora, input_script_index, output_script_pubkey)
-            .await;
-    }
-
-    pub async fn broadcast_disprove_chain(
-        &mut self,
-        peg_out_graph_id: &str,
-        output_script_pubkey: ScriptBuf,
-    ) {
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter_mut()
-            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id));
-        if peg_out_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_out_graph
-            .unwrap()
-            .disprove_chain(&self.esplora, output_script_pubkey)
-            .await;
-    }
-
-    pub async fn broadcast_take_1(&mut self, peg_out_graph_id: &str) {
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter_mut()
-            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id));
-        if peg_out_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_out_graph.unwrap().take_1(&self.esplora).await;
-    }
-
-    pub async fn broadcast_take_2(&mut self, peg_out_graph_id: &str) {
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter_mut()
-            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id));
-        if peg_out_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_out_graph.unwrap().take_2(&self.esplora).await;
-    }
-
-    pub async fn get_initial_utxo(&self, address: Address, amount: Amount) -> Option<Utxo> {
-        let utxos = self.esplora.get_address_utxo(address).await.unwrap();
-        let possible_utxos = utxos
-            .into_iter()
-            .filter(|utxo| utxo.value == amount)
-            .collect::<Vec<_>>();
-        if !possible_utxos.is_empty() {
-            Some(possible_utxos[0].clone())
-        } else {
-            None
-        }
-    }
-
-    pub async fn get_initial_utxos(&self, address: Address, amount: Amount) -> Option<Vec<Utxo>> {
-        let utxos = self.esplora.get_address_utxo(address).await.unwrap();
-        let possible_utxos = utxos
-            .into_iter()
-            .filter(|utxo| utxo.value == amount)
-            .collect::<Vec<_>>();
-        if !possible_utxos.is_empty() {
-            Some(possible_utxos)
-        } else {
-            None
-        }
-    }
-
-    pub fn push_peg_in_nonces(&mut self, peg_in_graph_id: &str) {
-        if self.verifier_context.is_none() {
-            panic!("Can only be called by a verifier!");
-        }
-
-        let peg_in_graph = self
-            .data
-            .peg_in_graphs
-            .iter_mut()
-            .find(|peg_in_graph| peg_in_graph.id().eq(peg_in_graph_id));
-        if peg_in_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        let secret_nonces = peg_in_graph
-            .unwrap()
-            .push_nonces(&self.verifier_context.as_ref().unwrap());
-
-        self.merge_secret_nonces(peg_in_graph_id, secret_nonces);
-
-        // TODO: Save secret nonces for all txs in the graph to the local file system. Later, when pre-signing the tx,
-        // we'll need to retrieve these nonces for this graph ID.
-
-        let json = serialize(&self.private_data);
-        Self::save_local_private_file(&self.file_path, &json);
-    }
-
-    pub fn push_peg_out_nonces(&mut self, peg_out_graph_id: &str) {
-        if self.verifier_context.is_none() {
-            panic!("Can only be called by a verifier!");
-        }
-
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter_mut()
-            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id));
-        if peg_out_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        let secret_nonces = peg_out_graph
-            .unwrap()
-            .push_nonces(&self.verifier_context.as_ref().unwrap());
-
-        self.merge_secret_nonces(peg_out_graph_id, secret_nonces);
-
-        // TODO: Save secret nonces for all txs in the graph to the local file system. Later, when pre-signing the tx,
-        // we'll need to retrieve these nonces for this graph ID.
-        let json = serialize(&self.private_data);
-        Self::save_local_private_file(&self.file_path, &json);
-
-        // TODO: Add public nonces in the remaining txs in this graph.
-    }
-
-    fn merge_secret_nonces(
-        &mut self,
-        graph_id: &str,
-        secret_nonces: HashMap<Txid, HashMap<usize, SecNonce>>,
-    ) {
-        if self
-            .private_data
-            .secret_nonces
-            .get(&self.verifier_context.as_ref().unwrap().verifier_public_key)
-            .is_none()
-        {
-            self.private_data.secret_nonces.insert(
-                self.verifier_context.as_ref().unwrap().verifier_public_key,
-                HashMap::new(),
-            );
-        }
-
-        if self.private_data.secret_nonces
-            [&self.verifier_context.as_ref().unwrap().verifier_public_key]
-            .get(graph_id)
-            .is_none()
-        {
-            self.private_data
-                .secret_nonces
-                .get_mut(&self.verifier_context.as_ref().unwrap().verifier_public_key)
-                .unwrap()
-                .insert(graph_id.to_string(), HashMap::new());
-        }
-
-        self.private_data
-            .secret_nonces
-            .get_mut(&self.verifier_context.as_ref().unwrap().verifier_public_key)
-            .unwrap()
-            .get_mut(graph_id)
-            .unwrap()
-            .extend(secret_nonces);
-    }
-
-    pub fn pre_sign_peg_in(&mut self, peg_in_graph_id: &str) {
-        if self.operator_context.is_none() && self.verifier_context.is_none() {
-            panic!("Can only be called by an operator or a verifier!");
-        }
-
-        let peg_in_graph = self
-            .data
-            .peg_in_graphs
-            .iter_mut()
-            .find(|peg_in_graph| peg_in_graph.id().eq(peg_in_graph_id));
-        if peg_in_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_in_graph.unwrap().pre_sign(
-            &self.verifier_context.as_ref().unwrap(),
-            &self.private_data.secret_nonces
-                [&self.verifier_context.as_ref().unwrap().verifier_public_key][peg_in_graph_id],
-        );
-    }
-
-    pub fn pre_sign_peg_out(&mut self, peg_out_graph_id: &str) {
-        if self.operator_context.is_none() && self.verifier_context.is_none() {
-            panic!("Can only be called by an operator or a verifier!");
-        }
-
-        let peg_out_graph = self
-            .data
-            .peg_out_graphs
-            .iter_mut()
-            .find(|peg_out_graph| peg_out_graph.id().eq(peg_out_graph_id));
-        if peg_out_graph.is_none() {
-            panic!("Invalid graph id");
-        }
-
-        peg_out_graph.unwrap().pre_sign(
-            &self.verifier_context.as_ref().unwrap(),
-            &self.private_data.secret_nonces
-                [&self.verifier_context.as_ref().unwrap().verifier_public_key][peg_out_graph_id],
-        );
-    }
-
-    fn get_private_data(file_path: &String) -> BitVMClientPrivateData {
-        match Self::read_local_private_file(file_path) {
-            Some(data) => try_deserialize::<BitVMClientPrivateData>(&data)
-                .expect("Could not deserialize private data"),
-            None => {
-                println!("New private data will be generated.");
-                BitVMClientPrivateData {
-                    secret_nonces: HashMap::new(),
-                }
-            }
-        }
-    }
-
-    fn save_local_public_file(file_path: &String, key: &String, json: &String) {
-        Self::create_directories_if_non_existent(file_path);
-        println!("Saving public data in local file: {}...", key);
-        fs::write(format!("{file_path}/public/{key}"), json).expect("Unable to write a file");
-    }
-
-    fn save_local_private_file(file_path: &String, json: &String) {
-        Self::create_directories_if_non_existent(file_path);
-        println!("Saving private data in local file...");
-        fs::write(format!("{file_path}/private/private_nonces.json"), json)
-            .expect("Unable to write a file");
-    }
-
-    fn read_local_private_file(file_path: &String) -> Option<String> {
-        println!("Reading private data from local file...");
-        match fs::read_to_string(format!("{file_path}/private/private_nonces.json")) {
-            Ok(content) => Some(content),
-            Err(e) => {
-                eprintln!("Could not read file {file_path} due to error: {e}");
-                None
-            }
-        }
-    }
-
-    fn create_directories_if_non_existent(file_path: &String) {
-        let path_exists = Path::new(file_path).exists();
-        if !path_exists {
-            fs::create_dir_all(file_path).expect("Failed to create directories");
-        }
-
-        let public_path_exists = Path::new(&format! {"{file_path}/public"}).exists();
-        let private_path_exists = Path::new(&format! {"{file_path}/private"}).exists();
-        if !public_path_exists {
-            fs::create_dir(format! {"{file_path}/public"})
-                .expect("Failed to create 'public' directory");
-        }
-        if !private_path_exists {
-            fs::create_dir(format! {"{file_path}/private"})
-                .expect("Failed to create 'private' directory");
-        }
-    }
-
-    // pub async fn execute_possible_txs(
-    //     &mut self,
-    //     context: &dyn BaseContext,
-    //     graph: &mut CompiledBitVMGraph,
-    // ) {
-    //     // Iterate through our UTXO set and execute an executable TX
-    //     // TODO: May have to respect an order here.
-    //     let mut remove_utxo = None;
-    //     for (outpoint, _) in self.utxo_set.iter() {
-    //         match graph.get(outpoint) {
-    //             Some(subsequent_txs) => {
-    //                 for bridge_transaction in subsequent_txs {
-    //                     // TODO: Check whether the transaction is executable
-    //                     let tx = bridge_transaction.finalize();
-    //                     match self.esplora.broadcast(&tx).await {
-    //                         Ok(_) => {
-    //                             println!(
-    //                                 "Succesfully broadcast next transaction with id: {}",
-    //                                 tx.compute_txid()
-    //                             );
-    //                             remove_utxo = Some(*outpoint);
-    //                             break;
-    //                         }
-    //                         Err(err) => panic!("Tx Broadcast Error: {}", err),
-    //                     }
-    //                 }
-    //             }
-    //             None => continue,
-    //         }
-    //     }
-
-    //     if let Some(remove_utxo) = remove_utxo {
-    //         self.utxo_set.remove(&remove_utxo);
-    //         graph.remove(&remove_utxo);
-    //     }
-    // }
-
-    // pub async fn listen(
-    //     &mut self,
-    //     context: &dyn BaseContext,
-    //     initial_outpoint: OutPoint,
-    //     graph: &mut CompiledBitVMGraph,
-    // ) {
-    //     let builder = Builder::new(ESPLORA_URL);
-    //     let esplora = builder.build_async().unwrap();
-    //     let mut latest_hash =
-    //         BlockHash::from_str("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f")
-    //             .unwrap();
-    //     self.utxo_set.insert(initial_outpoint, Height::ZERO);
-
-    //     while !graph.is_empty() {
-    //         if let Ok(block_hash) = esplora.get_tip_hash().await {
-    //             if block_hash == latest_hash {
-    //                 sleep(Duration::from_secs(10));
-    //                 continue;
-    //             }
-    //             latest_hash = block_hash;
-    //             // TODO: This assumes that the tip did not increase. There should be a
-    //             // better API endpoint like /block-height/{block_hash}
-    //             let block_height = esplora.get_height().await.unwrap();
-    //             let block = esplora
-    //                 .get_block_by_hash(&block_hash)
-    //                 .await
-    //                 .unwrap()
-    //                 .unwrap();
-
-    //             // Handle new block received logic
-    //             println!("Received block {}", block_hash);
-
-    //             for tx in block.txdata {
-    //                 for (vout, _) in tx.output.iter().enumerate() {
-    //                     let outpoint = OutPoint {
-    //                         txid: tx.compute_txid(),
-    //                         vout: vout as u32,
-    //                     };
-    //                     if graph.contains_key(&outpoint) {
-    //                         // Update our UTXO set
-    //                         self.utxo_set
-    //                             .insert(outpoint, Height::from_consensus(block_height).unwrap());
-    //                     }
-    //                 }
-    //             }
-    //             self.execute_possible_txs(context, graph).await;
-    //         }
-    //     }
-    // }
-}
diff --git a/src/bridge/client/data_store/base.rs b/src/bridge/client/data_store/base.rs
deleted file mode 100644
index ee058978e..000000000
--- a/src/bridge/client/data_store/base.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use async_trait::async_trait;
-
-#[async_trait]
-pub trait DataStoreDriver {
-    async fn list_objects(&self, file_path: Option<&str>) -> Result<Vec<String>, String>;
-    async fn fetch_json(&self, key: &str, file_path: Option<&str>) -> Result<String, String>;
-    async fn upload_json(
-        &self,
-        key: &str,
-        json: String,
-        file_path: Option<&str>,
-    ) -> Result<usize, String>;
-}
diff --git a/src/bridge/client/data_store/data_store.rs b/src/bridge/client/data_store/data_store.rs
deleted file mode 100644
index 81cf6310d..000000000
--- a/src/bridge/client/data_store/data_store.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-use once_cell::sync::Lazy;
-use regex::Regex;
-use std::cmp::Ordering;
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
-
-use super::base::DataStoreDriver;
-use super::{
-    aws_s3::AwsS3,
-    ftp::{ftp::Ftp, ftps::Ftps},
-    sftp::Sftp,
-};
-
-static CLIENT_MISSING_CREDENTIALS_ERROR: &str =
-    "Bridge client is missing AWS S3, FTP, FTPS, or SFTP credentials";
-
-static CLIENT_DATA_SUFFIX: &str = "-bridge-client-data-musig2.json";
-static CLIENT_DATA_REGEX: Lazy<Regex> =
-    Lazy::new(|| Regex::new(&format!(r"(\d{{13}}){}", CLIENT_DATA_SUFFIX)).unwrap());
-
-pub struct DataStore {
-    aws_s3: Option<AwsS3>,
-    ftp: Option<Ftp>,
-    ftps: Option<Ftps>,
-    sftp: Option<Sftp>,
-}
-
-impl DataStore {
-    pub fn new() -> Self {
-        Self {
-            aws_s3: AwsS3::new(),
-            ftp: None,  // Ftp::new(),
-            ftps: None, // Ftps::new(),
-            sftp: None, // Sftp::new(),
-        }
-    }
-
-    pub fn get_file_timestamp(file_name: &String) -> Result<u64, String> {
-        if CLIENT_DATA_REGEX.is_match(file_name) {
-            let mut timestamp_string = file_name.clone();
-            timestamp_string.truncate(13);
-            let timestamp = timestamp_string.parse::<u64>();
-            return match timestamp {
-                Ok(_) => Ok(timestamp.unwrap()),
-                Err(_) => Err(String::from("Failed to parse file timestamp")),
-            };
-        }
-
-        Err(String::from("Incorrect file name"))
-    }
-
-    pub async fn get_file_names(&self, file_path: Option<&str>) -> Result<Vec<String>, String> {
-        match self.get_driver() {
-            Ok(driver) => match driver.list_objects(file_path).await {
-                Ok(keys) => {
-                    let mut data_keys: Vec<String> = keys
-                        .iter()
-                        .map(|key| key.rsplit("/").next().unwrap().to_string())
-                        .collect();
-
-                    data_keys = data_keys
-                        .iter()
-                        .filter(|key| CLIENT_DATA_REGEX.is_match(key))
-                        .cloned()
-                        .collect();
-                    data_keys.sort_by(|x, y| {
-                        if x < y {
-                            return Ordering::Less;
-                        }
-                        return Ordering::Greater;
-                    });
-
-                    Ok(data_keys)
-                }
-                Err(err) => Err(err.to_string()),
-            },
-            Err(err) => Err(err.to_string()),
-        }
-    }
-
-    pub async fn fetch_data_by_key(
-        &self,
-        key: &String,
-        file_path: Option<&str>,
-    ) -> Result<Option<String>, String> {
-        match self.get_driver() {
-            Ok(driver) => {
-                let json = driver.fetch_json(key, file_path).await;
-                if json.is_ok() {
-                    // println!("Fetched data file: {}", key);
-                    return Ok(Some(json.unwrap()));
-                }
-
-                println!("No data file {} found", key);
-                Ok(None)
-            }
-            Err(err) => Err(err.to_string()),
-        }
-    }
-
-    pub async fn write_data(
-        &self,
-        json: String,
-        file_path: Option<&str>,
-    ) -> Result<String, String> {
-        match self.get_driver() {
-            Ok(driver) => {
-                let time = SystemTime::now()
-                    .duration_since(UNIX_EPOCH)
-                    .unwrap()
-                    .as_millis();
-                let key = Self::create_file_name(time);
-                let response = driver.upload_json(&key, json, file_path).await;
-
-                match response {
-                    Ok(_) => Ok(key),
-                    Err(_) => Err(String::from("Failed to save data file")),
-                }
-            }
-            Err(err) => Err(err.to_string()),
-        }
-    }
-
-    pub fn get_past_max_file_name_by_timestamp(latest_timestamp: u64, period: u64) -> String {
-        let past_max_timestamp =
-            (Duration::from_millis(latest_timestamp) - Duration::from_secs(period)).as_millis();
-        let past_max_file_name = Self::create_file_name(past_max_timestamp);
-
-        return past_max_file_name;
-    }
-
-    fn create_file_name(timestamp: u128) -> String {
-        return format!("{}{}", timestamp, CLIENT_DATA_SUFFIX);
-    }
-
-    fn get_driver(&self) -> Result<&dyn DataStoreDriver, &str> {
-        if self.aws_s3.is_some() {
-            return Ok(self.aws_s3.as_ref().unwrap());
-        } else if self.ftp.is_some() {
-            return Ok(self.ftp.as_ref().unwrap());
-        } else if self.ftps.is_some() {
-            return Ok(self.ftps.as_ref().unwrap());
-        } else if self.sftp.is_some() {
-            return Ok(self.sftp.as_ref().unwrap());
-        } else {
-            Err(CLIENT_MISSING_CREDENTIALS_ERROR)
-        }
-    }
-}
diff --git a/src/bridge/client/data_store/sftp.rs b/src/bridge/client/data_store/sftp.rs
deleted file mode 100644
index 5335c3ff8..000000000
--- a/src/bridge/client/data_store/sftp.rs
+++ /dev/null
@@ -1,265 +0,0 @@
-use super::base::DataStoreDriver;
-use async_trait::async_trait;
-use dotenv;
-use futures::{executor, TryStreamExt};
-use openssh_sftp_client::{
-    file::TokioCompatFile,
-    openssh::{KnownHosts, Session as SshSession},
-    Sftp as _Sftp,
-};
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
-
-// To use this data store, create a .env file in the base directory with the following values:
-// export BRIDGE_SFTP_HOST="..."
-// export BRIDGE_SFTP_PORT="..."
-// export BRIDGE_SFTP_USERNAME="..."
-// export BRIDGE_SFTP_KEYFILE_PATH="..."
-// export BRIDGE_SFTP_BASE_PATH="..."
-
-// NOTE: BRIDGE_SFTP_HOST should be an ip/domain that supports SSH
-
-struct SftpCredentials {
-    pub host: String,
-    pub port: String,
-    pub username: String,
-    pub keyfile_path: String,
-    pub base_path: String,
-}
-
-pub struct Sftp {
-    credentials: SftpCredentials,
-}
-
-// TODO: implement creating and reading from directories
-impl Sftp {
-    pub fn new() -> Option<Self> {
-        dotenv::dotenv().ok();
-        let host = dotenv::var("BRIDGE_SFTP_HOST");
-        let port = dotenv::var("BRIDGE_SFTP_PORT");
-        let username = dotenv::var("BRIDGE_SFTP_USERNAME");
-        let keyfile_path = dotenv::var("BRIDGE_SFTP_KEYFILE_PATH");
-        let base_path = dotenv::var("BRIDGE_SFTP_BASE_PATH");
-
-        if host.is_err()
-            || port.is_err()
-            || username.is_err()
-            || keyfile_path.is_err()
-            || base_path.is_err()
-        {
-            return None;
-        }
-
-        println!("SFTP 46");
-
-        let credentials = SftpCredentials {
-            host: host.unwrap(),
-            port: port.unwrap(),
-            username: username.unwrap(),
-            keyfile_path: keyfile_path.unwrap(),
-            base_path: base_path.unwrap(),
-        };
-
-        println!("SFTP 55");
-
-        match test_connection(&credentials) {
-            Ok(_) => Some(Self { credentials }),
-            Err(err) => {
-                eprintln!("{err:?}");
-                None
-            }
-        }
-    }
-
-    async fn get_object(&self, key: &str, file_path: Option<&str>) -> Result<Vec<u8>, String> {
-        let mut buffer: Vec<u8> = vec![];
-
-        match connect(&self.credentials).await {
-            Ok(sftp) => match sftp.open(key).await.map(TokioCompatFile::from) {
-                Ok(file) => {
-                    tokio::pin!(file);
-                    match file.read_to_end(&mut buffer).await {
-                        Ok(_) => {
-                            disconnect(sftp).await;
-                            Ok(buffer)
-                        }
-                        Err(err) => {
-                            disconnect(sftp).await;
-                            Err(format!("Unable to get {}: {}", key, err))
-                        }
-                    }
-                }
-                Err(err) => {
-                    disconnect(sftp).await;
-                    Err(format!("Unable to get {}: {}", key, err))
-                }
-            },
-            Err(err) => Err(format!("Unable to get {}: {}", key, err)),
-        }
-    }
-
-    async fn upload_object(
-        &self,
-        key: &str,
-        data: &Vec<u8>,
-        file_path: Option<&str>,
-    ) -> Result<(), String> {
-        match connect(&self.credentials).await {
-            Ok(sftp) => match sftp
-                .options()
-                .write(true)
-                .create_new(true)
-                .open(key)
-                .await
-                .map(TokioCompatFile::from)
-            {
-                Ok(file) => {
-                    tokio::pin!(file);
-                    match file.write(data).await {
-                        Ok(_) => match file.flush().await {
-                            Ok(_) => {
-                                disconnect(sftp).await;
-                                Ok(())
-                            }
-                            Err(err) => {
-                                disconnect(sftp).await;
-                                return Err(format!("Unable to write {}: {}", key, err));
-                            }
-                        },
-                        Err(err) => {
-                            disconnect(sftp).await;
-                            return Err(format!("Unable to write {}: {}", key, err));
-                        }
-                    }
-                }
-                Err(err) => {
-                    disconnect(sftp).await;
-                    return Err(format!("Unable to write {}: {}", key, err));
-                }
-            },
-            Err(err) => Err(format!("Unable to write {}: {}", key, err)),
-        }
-    }
-}
-
-#[async_trait]
-impl DataStoreDriver for Sftp {
-    async fn list_objects(&self, file_path: Option<&str>) -> Result<Vec<String>, String> {
-        match connect(&self.credentials).await {
-            Ok(sftp) => {
-                let mut fs = sftp.fs();
-                match fs.open_dir(".").await {
-                    Ok(dir) => {
-                        let read_dir = dir.read_dir();
-                        tokio::pin!(read_dir);
-
-                        let mut buffer: Vec<String> = vec![];
-                        while let Some(entry) = read_dir.try_next().await.unwrap() {
-                            buffer.push(entry.filename().to_str().unwrap().to_string());
-                        }
-
-                        disconnect(sftp).await;
-                        Ok(buffer)
-                    }
-                    Err(err) => {
-                        disconnect(sftp).await;
-                        Err(format!("Unable to list objects: {}", err.to_string()))
-                    }
-                }
-            }
-            Err(err) => Err(format!("Unable tolist objects: {}", err.to_string())),
-        }
-    }
-
-    async fn fetch_json(&self, key: &str, file_path: Option<&str>) -> Result<String, String> {
-        let response = self.get_object(key, file_path).await;
-        match response {
-            Ok(buffer) => {
-                let json = String::from_utf8(buffer);
-                match json {
-                    Ok(json) => Ok(json),
-                    Err(err) => Err(format!("Failed to parse json: {}", err.to_string())),
-                }
-            }
-            Err(err) => Err(format!("Failed to get json file: {}", err.to_string())),
-        }
-    }
-
-    async fn upload_json(
-        &self,
-        key: &str,
-        json: String,
-        file_path: Option<&str>,
-    ) -> Result<usize, String> {
-        let bytes = json.as_bytes().to_vec();
-        let size = bytes.len();
-
-        println!("Writing data file to {} (size: {})", key, size);
-
-        match self.upload_object(&key, &bytes, file_path).await {
-            Ok(_) => Ok(size),
-            Err(err) => Err(format!("Failed to save json file: {}", err)),
-        }
-    }
-}
-
-fn test_connection(credentials: &SftpCredentials) -> Result<(), String> {
-    println!("SFTP 190");
-    match executor::block_on(connect(credentials)) {
-        Ok(sftp) => {
-            println!("SFTP 192");
-            executor::block_on(disconnect(sftp));
-            Ok(())
-        }
-        Err(err) => Err(format!("Failed to connect: {}", err.to_string())),
-    }
-}
-
-async fn connect(credentials: &SftpCredentials) -> Result<_Sftp, String> {
-    let result = SshSession::connect_mux(
-        format!(
-            "ssh://{}@{}:{}",
-            &credentials.username, &credentials.host, &credentials.port
-        ),
-        KnownHosts::Add,
-    )
-    .await;
-    if result.is_err() {
-        return Err(format!(
-            "Unable to connect to SSH server at {}:{} (error: {})",
-            &credentials.host,
-            &credentials.port,
-            result.err().unwrap()
-        ));
-    }
-
-    let ssh_session = result.unwrap();
-
-    let result = _Sftp::from_session(ssh_session, Default::default()).await;
-    if result.is_err() {
-        return Err(format!(
-            "Unable to establish to SFTP session from SSH session at {}:{} (error: {})",
-            &credentials.host,
-            &credentials.port,
-            result.err().unwrap()
-        ));
-    }
-
-    let sftp = result.unwrap();
-
-    let mut fs = sftp.fs();
-    fs.set_cwd(&credentials.base_path);
-    let result = fs.open_dir(&credentials.base_path).await;
-    if result.is_err() {
-        return Err(format!("Invalid base path: {}", &credentials.base_path));
-    }
-
-    Ok(sftp)
-}
-
-async fn disconnect(sftp: _Sftp) {
-    if sftp.close().await.is_ok() {
-        return;
-    }
-
-    eprintln!("Unable to close connection");
-}
diff --git a/src/bridge/client/mod.rs b/src/bridge/client/mod.rs
deleted file mode 100644
index 0b50deec3..000000000
--- a/src/bridge/client/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod chain;
-pub mod client;
-pub mod data_store;
diff --git a/src/bridge/connectors/connector.rs b/src/bridge/connectors/connector.rs
deleted file mode 100644
index 5c83d7b16..000000000
--- a/src/bridge/connectors/connector.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use bitcoin::{taproot::TaprootSpendInfo, Address, ScriptBuf, Sequence, TxIn, Witness};
-
-use super::super::transactions::base::Input;
-
-pub fn generate_default_tx_in(input: &Input) -> TxIn {
-    TxIn {
-        previous_output: input.outpoint,
-        script_sig: ScriptBuf::new(),
-        sequence: Sequence::MAX,
-        witness: Witness::default(),
-    }
-}
-
-pub fn generate_timelock_tx_in(input: &Input, num_blocks: u32) -> TxIn {
-    let mut tx_in = generate_default_tx_in(input);
-    tx_in.sequence = Sequence(num_blocks & 0xFFFFFFFF);
-    tx_in
-}
-
-pub trait P2wshConnector {
-    fn generate_script(&self) -> ScriptBuf;
-
-    fn generate_address(&self) -> Address;
-
-    fn generate_tx_in(&self, input: &Input) -> TxIn;
-}
-
-pub trait TaprootConnector {
-    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf;
-
-    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn;
-
-    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo;
-
-    fn generate_taproot_address(&self) -> Address;
-}
diff --git a/src/bridge/connectors/connector_b.rs b/src/bridge/connectors/connector_b.rs
deleted file mode 100644
index b77f7814d..000000000
--- a/src/bridge/connectors/connector_b.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use bitcoin::{
-    key::Secp256k1,
-    taproot::{TaprootBuilder, TaprootSpendInfo},
-    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
-};
-use serde::{Deserialize, Serialize};
-
-use super::{
-    super::{
-        constants::NUM_BLOCKS_PER_3_DAYS, scripts::*, transactions::base::Input,
-        utils::num_blocks_per_network,
-    },
-    connector::*,
-};
-
-#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
-pub struct ConnectorB {
-    pub network: Network,
-    pub n_of_n_taproot_public_key: XOnlyPublicKey,
-    pub num_blocks_timelock_1: u32,
-}
-
-impl ConnectorB {
-    pub fn new(network: Network, n_of_n_taproot_public_key: &XOnlyPublicKey) -> Self {
-        ConnectorB {
-            network,
-            n_of_n_taproot_public_key: n_of_n_taproot_public_key.clone(),
-            num_blocks_timelock_1: num_blocks_per_network(network, NUM_BLOCKS_PER_3_DAYS),
-        }
-    }
-
-    fn generate_taproot_leaf_0_script(&self) -> ScriptBuf {
-        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_1_script(&self) -> ScriptBuf {
-        generate_timelock_taproot_script(
-            &self.n_of_n_taproot_public_key,
-            self.num_blocks_timelock_1,
-        )
-    }
-
-    fn generate_taproot_leaf_1_tx_in(&self, input: &Input) -> TxIn {
-        generate_timelock_tx_in(input, self.num_blocks_timelock_1)
-    }
-
-    fn generate_taproot_leaf_2_script(&self) -> ScriptBuf {
-        // TODO commit to super block
-        generate_pay_to_pubkey_taproot_script(&self.n_of_n_taproot_public_key)
-    }
-
-    fn generate_taproot_leaf_2_tx_in(&self, input: &Input) -> TxIn { generate_default_tx_in(input) }
-}
-
-impl TaprootConnector for ConnectorB {
-    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
-        match leaf_index {
-            0 => self.generate_taproot_leaf_0_script(),
-            1 => self.generate_taproot_leaf_1_script(),
-            2 => self.generate_taproot_leaf_2_script(),
-            _ => panic!("Invalid leaf index."),
-        }
-    }
-
-    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
-        match leaf_index {
-            0 => self.generate_taproot_leaf_0_tx_in(input),
-            1 => self.generate_taproot_leaf_1_tx_in(input),
-            2 => self.generate_taproot_leaf_2_tx_in(input),
-            _ => panic!("Invalid leaf index."),
-        }
-    }
-
-    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
-        TaprootBuilder::new()
-            .add_leaf(2, self.generate_taproot_leaf_0_script())
-            .expect("Unable to add leaf 0")
-            .add_leaf(2, self.generate_taproot_leaf_1_script())
-            .expect("Unable to add leaf 1")
-            .add_leaf(1, self.generate_taproot_leaf_2_script())
-            .expect("Unable to add leaf 2")
-            .finalize(&Secp256k1::new(), self.n_of_n_taproot_public_key)
-            .expect("Unable to finalize taproot")
-    }
-
-    fn generate_taproot_address(&self) -> Address {
-        Address::p2tr_tweaked(
-            self.generate_taproot_spend_info().output_key(),
-            self.network,
-        )
-    }
-}
diff --git a/src/bridge/connectors/connector_c.rs b/src/bridge/connectors/connector_c.rs
deleted file mode 100644
index 4eb83fc0d..000000000
--- a/src/bridge/connectors/connector_c.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use crate::treepp::script;
-use bitcoin::{
-    hashes::{ripemd160, Hash},
-    key::Secp256k1,
-    taproot::{TaprootBuilder, TaprootSpendInfo},
-    Address, Network, ScriptBuf, TxIn, XOnlyPublicKey,
-};
-use num_traits::ToPrimitive;
-use serde::{Deserialize, Serialize};
-
-use super::{super::transactions::base::Input, connector::*};
-
-// Specialized for assert leaves currently.
-pub type LockScript = fn(index: u32) -> ScriptBuf;
-pub type UnlockWitnessData = Vec<u8>;
-pub type UnlockWitness = fn(index: u32) -> UnlockWitnessData;
-
-pub struct DisproveLeaf {
-    pub lock: LockScript,
-    pub unlock: UnlockWitness,
-}
-
-#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
-pub struct ConnectorC {
-    pub network: Network,
-    pub operator_taproot_public_key: XOnlyPublicKey,
-    lock_scripts: Vec<ScriptBuf>,
-    unlock_witnesses: Vec<UnlockWitnessData>,
-}
-
-impl ConnectorC {
-    pub fn new(network: Network, operator_taproot_public_key: &XOnlyPublicKey) -> Self {
-        let leaves = generate_assert_leaves();
-
-        ConnectorC {
-            network,
-            operator_taproot_public_key: operator_taproot_public_key.clone(),
-            lock_scripts: leaves.0,
-            unlock_witnesses: leaves.1,
-        }
-    }
-
-    pub fn generate_taproot_leaf_script_witness(&self, leaf_index: u32) -> UnlockWitnessData {
-        let index = leaf_index.to_usize().unwrap();
-        if index >= self.unlock_witnesses.len() {
-            panic!("Invalid leaf index.")
-        }
-        self.unlock_witnesses[index].clone()
-    }
-}
-
-impl TaprootConnector for ConnectorC {
-    fn generate_taproot_leaf_script(&self, leaf_index: u32) -> ScriptBuf {
-        let index = leaf_index.to_usize().unwrap();
-        if index >= self.lock_scripts.len() {
-            panic!("Invalid leaf index.")
-        }
-        self.lock_scripts[index].clone()
-    }
-
-    fn generate_taproot_leaf_tx_in(&self, leaf_index: u32, input: &Input) -> TxIn {
-        let index = leaf_index.to_usize().unwrap();
-        if index >= self.lock_scripts.len() {
-            panic!("Invalid leaf index.")
-        }
-        generate_default_tx_in(input)
-    }
-
-    fn generate_taproot_spend_info(&self) -> TaprootSpendInfo {
-        let script_weights = self.lock_scripts.iter().map(|script| (1, script.clone()));
-
-        TaprootBuilder::with_huffman_tree(script_weights)
-            .expect("Unable to add assert leaves")
-            .finalize(&Secp256k1::new(), self.operator_taproot_public_key)
-            .expect("Unable to finalize assert transaction connector c taproot")
-    }
-
-    fn generate_taproot_address(&self) -> Address {
-        Address::p2tr_tweaked(
-            self.generate_taproot_spend_info().output_key(),
-            self.network,
-        )
-    }
-}
-
-// Leaf[i] for some i in 1,2,…1000: spendable by multisig of OPK and VPK[1…N] plus the condition that f_{i}(z_{i-1})!=z_i
-fn disprove_leaf() -> DisproveLeaf {
-    DisproveLeaf {
-        lock: |index| {
-            script! {
-                OP_RIPEMD160
-                { ripemd160::Hash::hash(format!("SECRET_{}", index).as_bytes()).as_byte_array().to_vec() }
-                OP_EQUALVERIFY
-                { index }
-                OP_DROP
-                OP_TRUE
-            }.compile()
-        },
-        unlock: |index| format!("SECRET_{}", index).as_bytes().to_vec(),
-    }
-}
-
-fn generate_assert_leaves() -> (Vec<ScriptBuf>, Vec<UnlockWitnessData>) {
-    // TODO: Scripts with n_of_n_public_key and one of the commitments disprove leaves in each leaf (Winternitz signatures)
-    let mut locks = Vec::with_capacity(1000);
-    let mut unlocks = Vec::with_capacity(1000);
-    let locking_template = disprove_leaf().lock;
-    let unlocking_template = disprove_leaf().unlock;
-    for i in 0..1000 {
-        locks.push(locking_template(i));
-        unlocks.push(unlocking_template(i));
-    }
-    (locks, unlocks)
-}
diff --git a/src/bridge/constants.rs b/src/bridge/constants.rs
deleted file mode 100644
index 082314eb6..000000000
--- a/src/bridge/constants.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use core::fmt;
-
-pub const NUM_BLOCKS_PER_HOUR: u32 = 6;
-pub const NUM_BLOCKS_PER_6_HOURS: u32 = NUM_BLOCKS_PER_HOUR * 6;
-
-pub const NUM_BLOCKS_PER_DAY: u32 = NUM_BLOCKS_PER_HOUR * 24;
-pub const NUM_BLOCKS_PER_3_DAYS: u32 = NUM_BLOCKS_PER_DAY * 3;
-
-pub const NUM_BLOCKS_PER_WEEK: u32 = NUM_BLOCKS_PER_DAY * 7;
-pub const NUM_BLOCKS_PER_2_WEEKS: u32 = NUM_BLOCKS_PER_WEEK * 2;
-pub const NUM_BLOCKS_PER_4_WEEKS: u32 = NUM_BLOCKS_PER_WEEK * 4;
-
-#[derive(Eq, PartialEq, Clone, Copy)]
-pub enum DestinationNetwork {
-    /// Mainnet Ethereum.
-    Ethereum,
-    /// Ethereum's testnet network.
-    EthereumSepolia,
-}
-
-impl fmt::Display for DestinationNetwork {
-    fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-        use DestinationNetwork::*;
-
-        let s = match *self {
-            Ethereum => "ethereum",
-            EthereumSepolia => "ethereum_sepolia",
-        };
-        write!(f, "{}", s)
-    }
-}
diff --git a/src/bridge/graphs/base.rs b/src/bridge/graphs/base.rs
deleted file mode 100644
index f013cc5a6..000000000
--- a/src/bridge/graphs/base.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use bitcoin::{Network, Txid};
-use esplora_client::{AsyncClient, Error};
-
-pub const GRAPH_VERSION: &str = "0.1";
-
-pub const INITIAL_AMOUNT: u64 = 2 << 16; // 131072
-pub const FEE_AMOUNT: u64 = 1_000;
-pub const DUST_AMOUNT: u64 = 10_000;
-pub const ONE_HUNDRED: u64 = 2 << 26; // 134217728
-
-// TODO delete
-// DEMO SECRETS
-pub const OPERATOR_SECRET: &str =
-    "3076ca1dfc1e383be26d5dd3c0c427340f96139fa8c2520862cf551ec2d670ac";
-
-pub const VERIFIER_0_SECRET: &str =
-    "ee0817eac0c13aa8ee2dd3256304041f09f0499d1089b56495310ae8093583e2";
-
-pub const VERIFIER_1_SECRET: &str =
-    "fc294c70faf210d4d0807ea7a3dba8f7e41700d90c119e1ae82a0687d89d297f";
-
-pub const DEPOSITOR_SECRET: &str =
-    "b8f17ea979be24199e7c3fec71ee88914d92fd4ca508443f765d56ce024ef1d7";
-
-pub const WITHDRAWER_SECRET: &str =
-    "fffd54f6d8f8ad470cb507fd4b6e9b3ea26b4221a4900cc5ad5916ce67c02f1e";
-
-pub const DEPOSITOR_EVM_ADDRESS: &str = "0xDDdDddDdDdddDDddDDddDDDDdDdDDdDDdDDDDDDd";
-pub const WITHDRAWER_EVM_ADDRESS: &str = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
-
-pub trait BaseGraph {
-    fn network(&self) -> Network;
-    fn id(&self) -> &String;
-}
-
-pub async fn get_block_height(client: &AsyncClient) -> u32 {
-    let blockchain_height_result = client.get_height().await;
-    if blockchain_height_result.is_err() {
-        panic!(
-            "Failed to fetch blockchain height! Error occurred {:?}",
-            blockchain_height_result
-        );
-    }
-
-    blockchain_height_result.unwrap()
-}
-
-pub async fn verify_if_not_mined(client: &AsyncClient, txid: Txid) {
-    let tx_status = client.get_tx_status(&txid).await;
-    if tx_status.as_ref().is_ok_and(|status| status.confirmed) {
-        panic!("Transaction already mined!");
-    } else if tx_status.is_err() {
-        panic!(
-            "Failed to get transaction status, error occurred {:?}",
-            tx_status
-        );
-    }
-}
-
-pub fn verify_tx_result(tx_result: &Result<(), Error>) {
-    if tx_result.is_ok() {
-        println!("Tx mined successfully.");
-    } else {
-        panic!("Error occurred {:?}", tx_result);
-    }
-}
diff --git a/src/bridge/graphs/peg_in.rs b/src/bridge/graphs/peg_in.rs
deleted file mode 100644
index 3796867b0..000000000
--- a/src/bridge/graphs/peg_in.rs
+++ /dev/null
@@ -1,475 +0,0 @@
-use bitcoin::{
-    hex::{Case::Upper, DisplayHex},
-    Network, OutPoint, PublicKey, Txid, XOnlyPublicKey,
-};
-use esplora_client::{AsyncClient, Error, TxStatus};
-use musig2::SecNonce;
-use num_traits::ToPrimitive;
-use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha256};
-use std::{
-    collections::HashMap,
-    fmt::{Display, Formatter, Result as FmtResult},
-};
-
-use super::{
-    super::{
-        contexts::{depositor::DepositorContext, verifier::VerifierContext},
-        graphs::base::get_block_height,
-        transactions::{
-            base::{validate_transaction, verify_public_nonces_for_tx, BaseTransaction, Input},
-            peg_in_confirm::PegInConfirmTransaction,
-            peg_in_deposit::PegInDepositTransaction,
-            peg_in_refund::PegInRefundTransaction,
-            pre_signed::PreSignedTransaction,
-        },
-    },
-    base::{verify_if_not_mined, verify_tx_result, BaseGraph, GRAPH_VERSION},
-};
-
-pub enum PegInDepositorStatus {
-    PegInDepositWait,     // peg-in deposit not yet confirmed
-    PegInConfirmWait, // peg-in confirm not yet confirmed, wait for operator to complete peg-in, refund not available yet
-    PegInConfirmComplete, // peg-in complete
-    PegInRefundAvailable, // peg-in refund available
-    PegInRefundComplete, // peg-in failed, refund complete
-}
-
-impl Display for PegInDepositorStatus {
-    fn fmt(&self, f: &mut Formatter) -> FmtResult {
-        match self {
-            PegInDepositorStatus::PegInDepositWait => {
-                write!(f, "Peg-in deposit transaction not confirmed yet. Wait...")
-            }
-            PegInDepositorStatus::PegInConfirmWait => {
-                write!(f, "Peg-in confirm transaction not confirmed yet. Wait...")
-            }
-            PegInDepositorStatus::PegInConfirmComplete => {
-                write!(f, "Peg-in complete. Done.")
-            }
-            PegInDepositorStatus::PegInRefundAvailable => {
-                write!(f, "Peg-in timed out. Broadcast refund transaction?")
-            }
-            PegInDepositorStatus::PegInRefundComplete => {
-                write!(f, "Peg-in refund complete, funds reclaimed. Done.")
-            }
-        }
-    }
-}
-
-pub enum PegInVerifierStatus {
-    PegInWait,     // no action required, wait
-    PegInPresign,  // should presign peg-in confirm
-    PegInComplete, // peg-in complete
-}
-
-impl Display for PegInVerifierStatus {
-    fn fmt(&self, f: &mut Formatter) -> FmtResult {
-        match self {
-            PegInVerifierStatus::PegInWait => write!(f, "No action available. Wait..."),
-            PegInVerifierStatus::PegInPresign => {
-                write!(f, "Signature required. Presign peg-in confirm transaction?")
-            }
-            PegInVerifierStatus::PegInComplete => write!(f, "Peg-in complete. Done."),
-        }
-    }
-}
-
-pub enum PegInOperatorStatus {
-    PegInWait,             // peg-in not yet complete, no action required yet, wait
-    PegInConfirmAvailable, // should execute peg-in confirm
-    PegInComplete,         // peg-in complete
-}
-
-impl Display for PegInOperatorStatus {
-    fn fmt(&self, f: &mut Formatter) -> FmtResult {
-        match self {
-            PegInOperatorStatus::PegInWait => {
-                write!(f, "No action available. Wait...")
-            }
-            PegInOperatorStatus::PegInConfirmAvailable => {
-                write!(
-                    f,
-                    "Peg-in confirm transaction ready. Broadcast peg-in confirm transaction?"
-                )
-            }
-            PegInOperatorStatus::PegInComplete => write!(f, "Peg-in complete. Done."),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
-pub struct PegInGraph {
-    version: String,
-    network: Network,
-    id: String,
-
-    pub peg_in_deposit_transaction: PegInDepositTransaction,
-    peg_in_refund_transaction: PegInRefundTransaction,
-    peg_in_confirm_transaction: PegInConfirmTransaction,
-
-    n_of_n_presigned: bool,
-    n_of_n_public_key: PublicKey,
-    n_of_n_taproot_public_key: XOnlyPublicKey,
-
-    pub depositor_public_key: PublicKey,
-    depositor_taproot_public_key: XOnlyPublicKey,
-    depositor_evm_address: String,
-}
-
-impl BaseGraph for PegInGraph {
-    fn network(&self) -> Network { self.network }
-
-    fn id(&self) -> &String { &self.id }
-}
-
-impl PegInGraph {
-    pub fn new(context: &DepositorContext, deposit_input: Input, evm_address: &str) -> Self {
-        let peg_in_deposit_transaction =
-            PegInDepositTransaction::new(context, evm_address, deposit_input);
-        let peg_in_deposit_txid = peg_in_deposit_transaction.tx().compute_txid();
-
-        let peg_in_refund_vout_0: usize = 0;
-        let peg_in_refund_transaction = PegInRefundTransaction::new(
-            context,
-            evm_address,
-            Input {
-                outpoint: OutPoint {
-                    txid: peg_in_deposit_txid,
-                    vout: peg_in_refund_vout_0.to_u32().unwrap(),
-                },
-                amount: peg_in_deposit_transaction.tx().output[peg_in_refund_vout_0].value,
-            },
-        );
-
-        let peg_in_confirm_vout_0: usize = 0;
-        let peg_in_confirm_transaction = PegInConfirmTransaction::new(
-            context,
-            evm_address,
-            Input {
-                outpoint: OutPoint {
-                    txid: peg_in_deposit_txid,
-                    vout: peg_in_confirm_vout_0.to_u32().unwrap(),
-                },
-                amount: peg_in_deposit_transaction.tx().output[peg_in_confirm_vout_0].value,
-            },
-        );
-
-        PegInGraph {
-            version: GRAPH_VERSION.to_string(),
-            network: context.network,
-            id: generate_id(&peg_in_deposit_transaction),
-            peg_in_deposit_transaction,
-            peg_in_refund_transaction,
-            peg_in_confirm_transaction,
-            n_of_n_presigned: false,
-            n_of_n_public_key: context.n_of_n_public_key,
-            n_of_n_taproot_public_key: context.n_of_n_taproot_public_key,
-            depositor_public_key: context.depositor_public_key,
-            depositor_taproot_public_key: context.depositor_taproot_public_key,
-            depositor_evm_address: evm_address.to_string(),
-        }
-    }
-
-    pub fn new_for_validation(&self) -> Self {
-        let peg_in_deposit_transaction = PegInDepositTransaction::new_for_validation(
-            self.network,
-            &self.depositor_public_key,
-            &self.depositor_taproot_public_key,
-            &self.n_of_n_taproot_public_key,
-            &self.depositor_evm_address,
-            Input {
-                outpoint: self.peg_in_deposit_transaction.tx().input[0].previous_output, // Self-referencing
-                amount: self.peg_in_deposit_transaction.prev_outs()[0].value, // Self-referencing
-            },
-        );
-        let peg_in_deposit_txid = peg_in_deposit_transaction.tx().compute_txid();
-
-        let peg_in_refund_vout_0: usize = 0;
-        let peg_in_refund_transaction = PegInRefundTransaction::new_for_validation(
-            self.network,
-            &self.depositor_public_key,
-            &self.depositor_taproot_public_key,
-            &self.n_of_n_taproot_public_key,
-            &self.depositor_evm_address,
-            Input {
-                outpoint: OutPoint {
-                    txid: peg_in_deposit_txid,
-                    vout: peg_in_refund_vout_0.to_u32().unwrap(),
-                },
-                amount: peg_in_deposit_transaction.tx().output[peg_in_refund_vout_0].value,
-            },
-        );
-
-        let peg_in_confirm_vout_0: usize = 0;
-        let peg_in_confirm_transaction = PegInConfirmTransaction::new_for_validation(
-            self.network,
-            &self.depositor_taproot_public_key,
-            &self.n_of_n_taproot_public_key,
-            &self.depositor_evm_address,
-            Input {
-                outpoint: OutPoint {
-                    txid: peg_in_deposit_txid,
-                    vout: peg_in_confirm_vout_0.to_u32().unwrap(),
-                },
-                amount: peg_in_deposit_transaction.tx().output[peg_in_confirm_vout_0].value,
-            },
-        );
-
-        PegInGraph {
-            version: GRAPH_VERSION.to_string(),
-            network: self.network,
-            id: generate_id(&peg_in_deposit_transaction),
-            peg_in_deposit_transaction,
-            peg_in_refund_transaction,
-            peg_in_confirm_transaction,
-            n_of_n_presigned: false,
-            n_of_n_public_key: self.n_of_n_public_key,
-            n_of_n_taproot_public_key: self.n_of_n_taproot_public_key,
-            depositor_public_key: self.depositor_public_key,
-            depositor_taproot_public_key: self.depositor_taproot_public_key,
-            depositor_evm_address: self.depositor_evm_address.clone(),
-        }
-    }
-
-    pub fn push_nonces(
-        &mut self,
-        context: &VerifierContext,
-    ) -> HashMap<Txid, HashMap<usize, SecNonce>> {
-        let mut secret_nonces = HashMap::new();
-
-        secret_nonces.insert(
-            self.peg_in_confirm_transaction.tx().compute_txid(),
-            self.peg_in_confirm_transaction.push_nonces(context),
-        );
-
-        secret_nonces
-    }
-
-    pub fn pre_sign(
-        &mut self,
-        context: &VerifierContext,
-        secret_nonces: &HashMap<Txid, HashMap<usize, SecNonce>>,
-    ) {
-        self.peg_in_confirm_transaction.pre_sign(
-            context,
-            &secret_nonces[&self.peg_in_confirm_transaction.tx().compute_txid()],
-        );
-
-        self.n_of_n_presigned = true; // TODO: set to true after collecting all n of n signatures
-    }
-
-    pub fn peg_in_confirm_transaction_ref(&self) -> &PegInConfirmTransaction {
-        &self.peg_in_confirm_transaction
-    }
-
-    pub async fn verifier_status(&self, client: &AsyncClient) -> PegInVerifierStatus {
-        let (peg_in_deposit_status, peg_in_confirm_status, _) =
-            Self::get_peg_in_statuses(self, client).await;
-
-        if peg_in_deposit_status.is_ok_and(|status| status.confirmed) {
-            if peg_in_confirm_status.is_ok_and(|status| status.confirmed) {
-                // peg in complete
-                return PegInVerifierStatus::PegInComplete;
-            } else {
-                if self.n_of_n_presigned {
-                    // peg-in confirm presigned, wait
-                    return PegInVerifierStatus::PegInWait;
-                } else {
-                    // should presign peg-in confirm
-                    return PegInVerifierStatus::PegInPresign;
-                }
-            }
-        } else {
-            // peg-in deposit not confirmed yet, wait
-            return PegInVerifierStatus::PegInWait;
-        }
-    }
-
-    pub async fn operator_status(&self, client: &AsyncClient) -> PegInOperatorStatus {
-        let (peg_in_deposit_status, peg_in_confirm_status, _) =
-            Self::get_peg_in_statuses(self, client).await;
-
-        if peg_in_deposit_status.is_ok_and(|status| status.confirmed) {
-            if peg_in_confirm_status.is_ok_and(|status| status.confirmed) {
-                // peg in complete
-                return PegInOperatorStatus::PegInComplete;
-            } else {
-                if self.n_of_n_presigned {
-                    // should execute peg-in confirm
-                    return PegInOperatorStatus::PegInConfirmAvailable;
-                } else {
-                    // peg-in confirm not yet presigned, wait
-                    return PegInOperatorStatus::PegInWait;
-                }
-            }
-        } else {
-            // peg-in deposit not confirmed yet, wait
-            return PegInOperatorStatus::PegInWait;
-        }
-    }
-
-    pub async fn depositor_status(&self, client: &AsyncClient) -> PegInDepositorStatus {
-        let (peg_in_deposit_status, peg_in_confirm_status, peg_in_refund_status) =
-            Self::get_peg_in_statuses(self, client).await;
-
-        let blockchain_height = get_block_height(client).await;
-
-        if peg_in_deposit_status
-            .as_ref()
-            .is_ok_and(|status| status.confirmed)
-        {
-            if peg_in_confirm_status.is_ok_and(|status| status.confirmed) {
-                // peg-in complete
-                return PegInDepositorStatus::PegInConfirmComplete;
-            } else {
-                if peg_in_deposit_status
-                    .unwrap()
-                    .block_height
-                    .is_some_and(|block_height| {
-                        block_height + self.peg_in_refund_transaction.num_blocks_timelock_0()
-                            <= blockchain_height
-                    })
-                {
-                    if peg_in_refund_status.is_ok_and(|status| status.confirmed) {
-                        // peg-in refund complete
-                        return PegInDepositorStatus::PegInRefundComplete;
-                    } else {
-                        // peg-in refund available
-                        return PegInDepositorStatus::PegInRefundAvailable;
-                    }
-                } else {
-                    // peg-in confirm not confirmed yet, refund not available yet, wait
-                    return PegInDepositorStatus::PegInConfirmWait;
-                }
-            }
-        } else {
-            // peg-in deposit not confirmed yet, wait
-            return PegInDepositorStatus::PegInDepositWait;
-        }
-    }
-
-    pub async fn deposit(&self, client: &AsyncClient) {
-        verify_if_not_mined(client, self.peg_in_deposit_transaction.tx().compute_txid()).await;
-
-        // complete deposit tx
-        let deposit_tx = self.peg_in_deposit_transaction.finalize();
-
-        // broadcast deposit tx
-        let deposit_result = client.broadcast(&deposit_tx).await;
-
-        // verify deposit result
-        verify_tx_result(&deposit_result);
-    }
-
-    pub async fn confirm(&self, client: &AsyncClient) {
-        verify_if_not_mined(client, self.peg_in_confirm_transaction.tx().compute_txid()).await;
-
-        let deposit_status = client
-            .get_tx_status(&self.peg_in_deposit_transaction.tx().compute_txid())
-            .await;
-
-        if deposit_status.is_ok_and(|status| status.confirmed) {
-            // complete confirm tx
-            let confirm_tx = self.peg_in_confirm_transaction.finalize();
-
-            // broadcast confirm tx
-            let confirm_result = client.broadcast(&confirm_tx).await;
-
-            // verify confirm result
-            verify_tx_result(&confirm_result);
-        } else {
-            panic!("Deposit tx has not been confirmed!");
-        }
-    }
-
-    pub async fn refund(&self, client: &AsyncClient) {
-        verify_if_not_mined(client, self.peg_in_refund_transaction.tx().compute_txid()).await;
-
-        let deposit_status = client
-            .get_tx_status(&self.peg_in_deposit_transaction.tx().compute_txid())
-            .await;
-
-        if deposit_status.is_ok_and(|status| status.confirmed) {
-            // complete refund tx
-            let refund_tx = self.peg_in_refund_transaction.finalize();
-
-            // broadcast refund tx
-            let refund_result = client.broadcast(&refund_tx).await;
-
-            // verify refund result
-            verify_tx_result(&refund_result);
-        } else {
-            panic!("Deposit tx has not been confirmed!");
-        }
-    }
-
-    async fn get_peg_in_statuses(
-        &self,
-        client: &AsyncClient,
-    ) -> (
-        Result<TxStatus, Error>,
-        Result<TxStatus, Error>,
-        Result<TxStatus, Error>,
-    ) {
-        let peg_in_deposit_status = client
-            .get_tx_status(&self.peg_in_deposit_transaction.tx().compute_txid())
-            .await;
-
-        let peg_in_confirm_status = client
-            .get_tx_status(&self.peg_in_confirm_transaction.tx().compute_txid())
-            .await;
-
-        let peg_in_refund_status = client
-            .get_tx_status(&self.peg_in_refund_transaction.tx().compute_txid())
-            .await;
-
-        return (
-            peg_in_deposit_status,
-            peg_in_confirm_status,
-            peg_in_refund_status,
-        );
-    }
-
-    pub fn validate(&self) -> bool {
-        let mut ret_val = true;
-        let peg_in_graph = self.new_for_validation();
-        if !validate_transaction(
-            self.peg_in_deposit_transaction.tx(),
-            peg_in_graph.peg_in_deposit_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-        if !validate_transaction(
-            self.peg_in_refund_transaction.tx(),
-            peg_in_graph.peg_in_refund_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-        if !validate_transaction(
-            self.peg_in_confirm_transaction.tx(),
-            peg_in_graph.peg_in_confirm_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-
-        if !verify_public_nonces_for_tx(&self.peg_in_confirm_transaction) {
-            ret_val = false;
-        }
-
-        ret_val
-    }
-
-    pub fn merge(&mut self, source_peg_in_graph: &PegInGraph) {
-        self.peg_in_confirm_transaction
-            .merge(&source_peg_in_graph.peg_in_confirm_transaction);
-    }
-}
-
-pub fn generate_id(peg_in_deposit_transaction: &PegInDepositTransaction) -> String {
-    let mut hasher = Sha256::new();
-
-    hasher.update(peg_in_deposit_transaction.tx().compute_txid().to_string());
-
-    hasher.finalize().to_hex_string(Upper)
-}
diff --git a/src/bridge/graphs/peg_out.rs b/src/bridge/graphs/peg_out.rs
deleted file mode 100644
index 08f3c6dcf..000000000
--- a/src/bridge/graphs/peg_out.rs
+++ /dev/null
@@ -1,1601 +0,0 @@
-use bitcoin::{
-    hex::{Case::Upper, DisplayHex},
-    key::Keypair,
-    Amount, Network, OutPoint, PublicKey, ScriptBuf, Txid, XOnlyPublicKey,
-};
-use esplora_client::{AsyncClient, Error, TxStatus};
-use musig2::SecNonce;
-use num_traits::ToPrimitive;
-use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha256};
-use std::{
-    collections::HashMap,
-    fmt::{Display, Formatter, Result as FmtResult},
-};
-
-use super::{
-    super::{
-        contexts::{base::BaseContext, operator::OperatorContext, verifier::VerifierContext},
-        transactions::{
-            assert::AssertTransaction,
-            base::{
-                validate_transaction, verify_public_nonces_for_tx, BaseTransaction, Input,
-                InputWithScript,
-            },
-            challenge::ChallengeTransaction,
-            disprove::DisproveTransaction,
-            disprove_chain::DisproveChainTransaction,
-            kick_off_1::KickOff1Transaction,
-            kick_off_2::KickOff2Transaction,
-            kick_off_timeout::KickOffTimeoutTransaction,
-            peg_out::PegOutTransaction,
-            pre_signed::PreSignedTransaction,
-            start_time::StartTimeTransaction,
-            start_time_timeout::StartTimeTimeoutTransaction,
-            take_1::Take1Transaction,
-            take_2::Take2Transaction,
-        },
-    },
-    base::{get_block_height, verify_if_not_mined, verify_tx_result, BaseGraph, GRAPH_VERSION},
-    peg_in::PegInGraph,
-};
-
-pub enum PegOutDepositorStatus {
-    PegOutNotStarted, // peg-out transaction not created yet
-    PegOutWait,       // peg-out not confirmed yet, wait
-    PegOutComplete,   // peg-out complete
-}
-
-impl Display for PegOutDepositorStatus {
-    fn fmt(&self, f: &mut Formatter) -> FmtResult {
-        match self {
-            PegOutDepositorStatus::PegOutNotStarted => {
-                write!(f, "Peg-out available. Request peg-out?")
-            }
-            PegOutDepositorStatus::PegOutWait => write!(f, "No action available. Wait..."),
-            PegOutDepositorStatus::PegOutComplete => write!(f, "Peg-out complete. Done."),
-        }
-    }
-}
-
-pub enum PegOutVerifierStatus {
-    PegOutPresign,            // should presign peg-out graph
-    PegOutComplete,           // peg-out complete
-    PegOutWait,               // no action required, wait
-    PegOutChallengeAvailable, // can call challenge
-    PegOutStartTimeTimeoutAvailable,
-    PegOutKickOffTimeoutAvailable,
-    PegOutDisproveChainAvailable,
-    PegOutDisproveAvailable,
-    PegOutFailed, // timeouts or disproves executed
-}
-
-impl Display for PegOutVerifierStatus {
-    fn fmt(&self, f: &mut Formatter) -> FmtResult {
-        match self {
-            PegOutVerifierStatus::PegOutPresign => {
-                write!(f, "Signatures required. Presign peg-out transactions?")
-            }
-            PegOutVerifierStatus::PegOutComplete => {
-                write!(f, "Peg-out complete, reimbursement succeded. Done.")
-            }
-            PegOutVerifierStatus::PegOutWait => write!(f, "No action available. Wait..."),
-            PegOutVerifierStatus::PegOutChallengeAvailable => {
-                write!(
-                    f,
-                    "Kick-off 1 transaction confirmed, dispute available. Broadcast challenge transaction?"
-                )
-            }
-            PegOutVerifierStatus::PegOutStartTimeTimeoutAvailable => {
-                write!(f, "Start time timed out. Broadcast timeout transaction?")
-            }
-            PegOutVerifierStatus::PegOutKickOffTimeoutAvailable => {
-                write!(f, "Kick-off 1 timed out. Broadcast timeout transaction?")
-            }
-            PegOutVerifierStatus::PegOutDisproveChainAvailable => {
-                write!(
-                    f,
-                    "Kick-off 2 transaction confirmed. Broadcast disprove chain transaction?"
-                )
-            }
-            PegOutVerifierStatus::PegOutDisproveAvailable => {
-                write!(
-                    f,
-                    "Assert transaction confirmed. Broadcast disprove transaction?"
-                )
-            }
-            PegOutVerifierStatus::PegOutFailed => {
-                write!(f, "Peg-out complete, reimbursement failed. Done.")
-            }
-        }
-    }
-}
-
-pub enum PegOutOperatorStatus {
-    PegOutWait,
-    PegOutComplete,    // peg-out complete
-    PegOutFailed,      // timeouts or disproves executed
-    PegOutStartPegOut, // should execute peg-out tx
-    PegOutKickOff1Available,
-    PegOutStartTimeAvailable,
-    PegOutKickOff2Available,
-    PegOutAssertAvailable,
-    PegOutTake1Available,
-    PegOutTake2Available,
-}
-
-impl Display for PegOutOperatorStatus {
-    fn fmt(&self, f: &mut Formatter) -> FmtResult {
-        match self {
-            PegOutOperatorStatus::PegOutWait => write!(f, "No action available. Wait..."),
-            PegOutOperatorStatus::PegOutComplete => {
-                write!(f, "Peg-out complete, reimbursement succeded. Done.")
-            }
-            PegOutOperatorStatus::PegOutFailed => {
-                write!(f, "Peg-out complete, reimbursement failed. Done.")
-            }
-            PegOutOperatorStatus::PegOutStartPegOut => {
-                write!(f, "Peg-out requested. Broadcast peg-out transaction?")
-            }
-            PegOutOperatorStatus::PegOutKickOff1Available => {
-                write!(f, "Peg-out confirmed. Broadcast kick-off 1 transaction?")
-            }
-            PegOutOperatorStatus::PegOutStartTimeAvailable => {
-                write!(f, "Kick-off confirmed. Broadcast start time transaction?")
-            }
-            PegOutOperatorStatus::PegOutKickOff2Available => {
-                write!(f, "Start time confirmed. Broadcast kick-off 2 transaction?")
-            }
-            PegOutOperatorStatus::PegOutAssertAvailable => {
-                write!(f, "Dispute raised. Broadcast assert transaction?")
-            }
-            PegOutOperatorStatus::PegOutTake1Available => write!(
-                f,
-                "Dispute timed out, reimbursement available. Broadcast take 1 transaction?"
-            ),
-            PegOutOperatorStatus::PegOutTake2Available => write!(
-                f,
-                "Dispute timed out, reimbursement available. Broadcast take 2 transaction?"
-            ),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
-pub struct PegOutGraph {
-    version: String,
-    network: Network,
-    id: String,
-
-    // state: State,
-    // n_of_n_pre_signing_state: PreSigningState,
-    n_of_n_presigned: bool,
-    n_of_n_public_key: PublicKey,
-    n_of_n_taproot_public_key: XOnlyPublicKey,
-
-    pub peg_in_graph_id: String,
-    peg_in_confirm_txid: Txid,
-
-    assert_transaction: AssertTransaction,
-    challenge_transaction: ChallengeTransaction,
-    disprove_chain_transaction: DisproveChainTransaction,
-    disprove_transaction: DisproveTransaction,
-    kick_off_1_transaction: KickOff1Transaction,
-    kick_off_2_transaction: KickOff2Transaction,
-    kick_off_timeout_transaction: KickOffTimeoutTransaction,
-    start_time_transaction: StartTimeTransaction,
-    start_time_timeout_transaction: StartTimeTimeoutTransaction,
-    take_1_transaction: Take1Transaction,
-    take_2_transaction: Take2Transaction,
-
-    operator_public_key: PublicKey,
-    operator_taproot_public_key: XOnlyPublicKey,
-
-    withdrawer_public_key: Option<PublicKey>,
-    withdrawer_taproot_public_key: Option<XOnlyPublicKey>,
-    withdrawer_evm_address: Option<String>,
-
-    peg_out_transaction: Option<PegOutTransaction>,
-}
-
-impl BaseGraph for PegOutGraph {
-    fn network(&self) -> Network { self.network }
-
-    fn id(&self) -> &String { &self.id }
-}
-
-impl PegOutGraph {
-    pub fn new(context: &OperatorContext, peg_in_graph: &PegInGraph, kickoff_input: Input) -> Self {
-        let peg_in_confirm_transaction = peg_in_graph.peg_in_confirm_transaction_ref();
-        let peg_in_confirm_txid = peg_in_confirm_transaction.tx().compute_txid();
-
-        let kick_off_1_transaction = KickOff1Transaction::new(context, kickoff_input);
-        let kick_off_1_txid = kick_off_1_transaction.tx().compute_txid();
-
-        let start_time_vout_0 = 2;
-        let start_time_transaction = StartTimeTransaction::new(
-            context,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: start_time_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[start_time_vout_0].value,
-            },
-        );
-
-        let start_time_timeout_vout_0 = 2;
-        let start_time_timeout_vout_1 = 1;
-        let start_time_timeout_transaction = StartTimeTimeoutTransaction::new(
-            context,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: start_time_timeout_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[start_time_timeout_vout_0].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: start_time_timeout_vout_1.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[start_time_timeout_vout_1].value,
-            },
-        );
-
-        let kick_off_2_vout_0 = 1;
-        let kick_off_2_transaction = KickOff2Transaction::new(
-            context,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: kick_off_2_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[kick_off_2_vout_0].value,
-            },
-        );
-        let kick_off_2_txid = kick_off_2_transaction.tx().compute_txid();
-
-        let kick_off_timeout_vout_0 = 1;
-        let kick_off_timeout_transaction = KickOffTimeoutTransaction::new(
-            context,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: kick_off_timeout_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[kick_off_timeout_vout_0].value,
-            },
-        );
-
-        let input_amount_crowdfunding = Amount::from_btc(1.0).unwrap(); // TODO replace placeholder
-        let challenge_vout_0 = 0;
-        let challenge_transaction = ChallengeTransaction::new(
-            context,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: challenge_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[challenge_vout_0].value,
-            },
-            input_amount_crowdfunding,
-        );
-
-        let take_1_vout_0 = 0;
-        let take_1_vout_1 = 0;
-        let take_1_vout_2 = 0;
-        let take_1_vout_3 = 1;
-        let take_1_transaction = Take1Transaction::new(
-            context,
-            Input {
-                outpoint: OutPoint {
-                    txid: peg_in_confirm_txid,
-                    vout: take_1_vout_0.to_u32().unwrap(),
-                },
-                amount: peg_in_confirm_transaction.tx().output[take_1_vout_0].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: take_1_vout_1.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[take_1_vout_1].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_2_txid,
-                    vout: take_1_vout_2.to_u32().unwrap(),
-                },
-                amount: kick_off_2_transaction.tx().output[take_1_vout_2].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_2_txid,
-                    vout: take_1_vout_3.to_u32().unwrap(),
-                },
-                amount: kick_off_2_transaction.tx().output[take_1_vout_3].value,
-            },
-        );
-
-        let assert_vout_0 = 1;
-        let assert_transaction = AssertTransaction::new(
-            context,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_2_txid,
-                    vout: assert_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_2_transaction.tx().output[assert_vout_0].value,
-            },
-        );
-        let assert_txid = assert_transaction.tx().compute_txid();
-
-        let take_2_vout_0 = 0;
-        let take_2_vout_1 = 0;
-        let take_2_vout_2 = 1;
-        let take_2_vout_3 = 2;
-        let take_2_transaction = Take2Transaction::new(
-            context,
-            Input {
-                outpoint: OutPoint {
-                    txid: peg_in_confirm_txid,
-                    vout: take_2_vout_0.to_u32().unwrap(),
-                },
-                amount: peg_in_confirm_transaction.tx().output[take_2_vout_0].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: assert_txid,
-                    vout: take_2_vout_1.to_u32().unwrap(),
-                },
-                amount: assert_transaction.tx().output[take_2_vout_1].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: assert_txid,
-                    vout: take_2_vout_2.to_u32().unwrap(),
-                },
-                amount: assert_transaction.tx().output[take_2_vout_2].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: assert_txid,
-                    vout: take_2_vout_3.to_u32().unwrap(),
-                },
-                amount: assert_transaction.tx().output[take_2_vout_3].value,
-            },
-        );
-
-        let script_index = 1; // TODO replace placeholder
-        let disprove_vout_0 = 1;
-        let disprove_vout_1 = 2;
-        let disprove_transaction = DisproveTransaction::new(
-            context,
-            Input {
-                outpoint: OutPoint {
-                    txid: assert_txid,
-                    vout: disprove_vout_0.to_u32().unwrap(),
-                },
-                amount: assert_transaction.tx().output[disprove_vout_0].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: assert_txid,
-                    vout: disprove_vout_1.to_u32().unwrap(),
-                },
-                amount: assert_transaction.tx().output[disprove_vout_1].value,
-            },
-            script_index,
-        );
-
-        let disprove_chain_vout_0 = 2;
-        let disprove_chain_transaction = DisproveChainTransaction::new(
-            context,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_2_txid,
-                    vout: disprove_chain_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_2_transaction.tx().output[disprove_chain_vout_0].value,
-            },
-        );
-
-        PegOutGraph {
-            version: GRAPH_VERSION.to_string(),
-            network: context.network,
-            id: generate_id(peg_in_graph, &context.operator_public_key),
-            n_of_n_presigned: false,
-            n_of_n_public_key: context.n_of_n_public_key,
-            n_of_n_taproot_public_key: context.n_of_n_taproot_public_key,
-            peg_in_graph_id: peg_in_graph.id().clone(),
-            peg_in_confirm_txid,
-            assert_transaction,
-            challenge_transaction,
-            disprove_chain_transaction,
-            disprove_transaction,
-            kick_off_1_transaction,
-            kick_off_2_transaction,
-            kick_off_timeout_transaction,
-            start_time_transaction,
-            start_time_timeout_transaction,
-            take_1_transaction,
-            take_2_transaction,
-            operator_public_key: context.operator_public_key,
-            operator_taproot_public_key: context.operator_taproot_public_key,
-            withdrawer_public_key: None,
-            withdrawer_taproot_public_key: None,
-            withdrawer_evm_address: None,
-            peg_out_transaction: None,
-        }
-    }
-
-    pub fn new_for_validation(&self) -> Self {
-        let peg_in_confirm_txid = self.take_1_transaction.tx().input[0].previous_output.txid; // Self-referencing
-
-        let kick_off_1_vout_0 = 0;
-        let kick_off_1_transaction = KickOff1Transaction::new_for_validation(
-            self.network,
-            &self.operator_public_key,
-            &self.operator_taproot_public_key,
-            &self.n_of_n_taproot_public_key,
-            Input {
-                outpoint: self.kick_off_1_transaction.tx().input[kick_off_1_vout_0].previous_output, // Self-referencing
-                amount: self.kick_off_1_transaction.prev_outs()[kick_off_1_vout_0].value, // Self-referencing
-            },
-        );
-        let kick_off_1_txid = kick_off_1_transaction.tx().compute_txid();
-
-        let start_time_vout_0 = 2;
-        let start_time_transaction = StartTimeTransaction::new_for_validation(
-            self.network,
-            &self.operator_public_key,
-            &self.operator_taproot_public_key,
-            &self.n_of_n_taproot_public_key,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: start_time_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[start_time_vout_0].value,
-            },
-        );
-
-        let start_time_timeout_vout_0 = 2;
-        let start_time_timeout_vout_1 = 1;
-        let start_time_timeout_transaction = StartTimeTimeoutTransaction::new_for_validation(
-            self.network,
-            &self.operator_taproot_public_key,
-            &self.n_of_n_taproot_public_key,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: start_time_timeout_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[start_time_timeout_vout_0].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: start_time_timeout_vout_1.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[start_time_timeout_vout_1].value,
-            },
-        );
-
-        let kick_off_2_vout_0 = 1;
-        let kick_off_2_transaction = KickOff2Transaction::new_for_validation(
-            self.network,
-            &self.operator_public_key,
-            &self.operator_taproot_public_key,
-            &self.n_of_n_taproot_public_key,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: kick_off_2_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[kick_off_2_vout_0].value,
-            },
-        );
-        let kick_off_2_txid = kick_off_2_transaction.tx().compute_txid();
-
-        let kick_off_timeout_vout_0 = 1;
-        let kick_off_timeout_transaction = KickOffTimeoutTransaction::new_for_validation(
-            self.network,
-            &self.operator_taproot_public_key,
-            &self.n_of_n_taproot_public_key,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: kick_off_timeout_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[kick_off_timeout_vout_0].value,
-            },
-        );
-
-        let input_amount_crowdfunding = Amount::from_btc(1.0).unwrap(); // TODO replace placeholder
-        let challenge_vout_0 = 0;
-        let challenge_transaction = ChallengeTransaction::new_for_validation(
-            self.network,
-            &self.operator_public_key,
-            &self.operator_taproot_public_key,
-            &self.n_of_n_taproot_public_key,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: challenge_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[challenge_vout_0].value,
-            },
-            input_amount_crowdfunding,
-        );
-
-        let take_1_vout_0 = 0;
-        let take_1_vout_1 = 0;
-        let take_1_vout_2 = 0;
-        let take_1_vout_3 = 1;
-        let take_1_transaction = Take1Transaction::new_for_validation(
-            self.network,
-            &self.operator_public_key,
-            &self.operator_taproot_public_key,
-            &self.n_of_n_taproot_public_key,
-            Input {
-                outpoint: OutPoint {
-                    txid: peg_in_confirm_txid,
-                    vout: take_1_vout_0.to_u32().unwrap(),
-                },
-                amount: self.take_1_transaction.prev_outs()[take_1_vout_0].value, // Self-referencing
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_1_txid,
-                    vout: take_1_vout_1.to_u32().unwrap(),
-                },
-                amount: kick_off_1_transaction.tx().output[take_1_vout_1].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_2_txid,
-                    vout: take_1_vout_2.to_u32().unwrap(),
-                },
-                amount: kick_off_2_transaction.tx().output[take_1_vout_2].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_2_txid,
-                    vout: take_1_vout_3.to_u32().unwrap(),
-                },
-                amount: kick_off_2_transaction.tx().output[take_1_vout_3].value,
-            },
-        );
-
-        let assert_vout_0 = 1;
-        let assert_transaction = AssertTransaction::new_for_validation(
-            self.network,
-            &self.operator_public_key,
-            &self.operator_taproot_public_key,
-            &self.n_of_n_taproot_public_key,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_2_txid,
-                    vout: assert_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_2_transaction.tx().output[assert_vout_0].value,
-            },
-        );
-        let assert_txid = assert_transaction.tx().compute_txid();
-
-        let take_2_vout_0 = 0;
-        let take_2_vout_1 = 0;
-        let take_2_vout_2 = 1;
-        let take_2_vout_3 = 2;
-        let take_2_transaction = Take2Transaction::new_for_validation(
-            self.network,
-            &self.operator_public_key,
-            &self.operator_taproot_public_key,
-            &self.n_of_n_taproot_public_key,
-            Input {
-                outpoint: OutPoint {
-                    txid: peg_in_confirm_txid,
-                    vout: take_2_vout_0.to_u32().unwrap(),
-                },
-                amount: self.take_2_transaction.prev_outs()[take_2_vout_0].value, // Self-referencing
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: assert_txid,
-                    vout: take_2_vout_1.to_u32().unwrap(),
-                },
-                amount: assert_transaction.tx().output[take_2_vout_1].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: assert_txid,
-                    vout: take_2_vout_2.to_u32().unwrap(),
-                },
-                amount: assert_transaction.tx().output[take_2_vout_2].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: assert_txid,
-                    vout: take_2_vout_3.to_u32().unwrap(),
-                },
-                amount: assert_transaction.tx().output[take_2_vout_3].value,
-            },
-        );
-
-        let script_index = 1; // TODO replace placeholder
-        let disprove_vout_0 = 1;
-        let disprove_vout_1 = 2;
-        let disprove_transaction = DisproveTransaction::new_for_validation(
-            self.network,
-            &self.operator_taproot_public_key,
-            &self.n_of_n_taproot_public_key,
-            Input {
-                outpoint: OutPoint {
-                    txid: assert_txid,
-                    vout: disprove_vout_0.to_u32().unwrap(),
-                },
-                amount: assert_transaction.tx().output[disprove_vout_0].value,
-            },
-            Input {
-                outpoint: OutPoint {
-                    txid: assert_txid,
-                    vout: disprove_vout_1.to_u32().unwrap(),
-                },
-                amount: assert_transaction.tx().output[disprove_vout_1].value,
-            },
-            script_index,
-        );
-
-        let disprove_chain_vout_0 = 1;
-        let disprove_chain_transaction = DisproveChainTransaction::new_for_validation(
-            self.network,
-            &self.n_of_n_taproot_public_key,
-            Input {
-                outpoint: OutPoint {
-                    txid: kick_off_2_txid,
-                    vout: disprove_chain_vout_0.to_u32().unwrap(),
-                },
-                amount: kick_off_2_transaction.tx().output[disprove_chain_vout_0].value,
-            },
-        );
-
-        PegOutGraph {
-            version: GRAPH_VERSION.to_string(),
-            network: self.network,
-            id: self.id.clone(),
-            n_of_n_presigned: false,
-            n_of_n_public_key: self.n_of_n_public_key,
-            n_of_n_taproot_public_key: self.n_of_n_taproot_public_key,
-            peg_in_graph_id: self.peg_in_graph_id.clone(),
-            peg_in_confirm_txid,
-            assert_transaction,
-            challenge_transaction,
-            disprove_chain_transaction,
-            disprove_transaction,
-            kick_off_1_transaction,
-            kick_off_2_transaction,
-            kick_off_timeout_transaction,
-            start_time_transaction,
-            start_time_timeout_transaction,
-            take_1_transaction,
-            take_2_transaction,
-            operator_public_key: self.operator_public_key,
-            operator_taproot_public_key: self.operator_taproot_public_key,
-            withdrawer_public_key: None,
-            withdrawer_taproot_public_key: None,
-            withdrawer_evm_address: None,
-            peg_out_transaction: None,
-        }
-    }
-
-    pub fn push_nonces(
-        &mut self,
-        context: &VerifierContext,
-    ) -> HashMap<Txid, HashMap<usize, SecNonce>> {
-        let mut secret_nonces = HashMap::new();
-
-        secret_nonces.insert(
-            self.assert_transaction.tx().compute_txid(),
-            self.assert_transaction.push_nonces(context),
-        );
-        secret_nonces.insert(
-            self.disprove_chain_transaction.tx().compute_txid(),
-            self.disprove_chain_transaction.push_nonces(context),
-        );
-        secret_nonces.insert(
-            self.disprove_transaction.tx().compute_txid(),
-            self.disprove_transaction.push_nonces(context),
-        );
-        secret_nonces.insert(
-            self.kick_off_timeout_transaction.tx().compute_txid(),
-            self.kick_off_timeout_transaction.push_nonces(context),
-        );
-        secret_nonces.insert(
-            self.start_time_timeout_transaction.tx().compute_txid(),
-            self.start_time_timeout_transaction.push_nonces(context),
-        );
-        secret_nonces.insert(
-            self.take_1_transaction.tx().compute_txid(),
-            self.take_1_transaction.push_nonces(context),
-        );
-        secret_nonces.insert(
-            self.take_2_transaction.tx().compute_txid(),
-            self.take_2_transaction.push_nonces(context),
-        );
-
-        secret_nonces
-    }
-
-    pub fn pre_sign(
-        &mut self,
-        context: &VerifierContext,
-        secret_nonces: &HashMap<Txid, HashMap<usize, SecNonce>>,
-    ) {
-        self.assert_transaction.pre_sign(
-            context,
-            &secret_nonces[&self.assert_transaction.tx().compute_txid()],
-        );
-        self.disprove_chain_transaction.pre_sign(
-            context,
-            &secret_nonces[&self.disprove_chain_transaction.tx().compute_txid()],
-        );
-        self.disprove_transaction.pre_sign(
-            context,
-            &secret_nonces[&self.disprove_transaction.tx().compute_txid()],
-        );
-        self.kick_off_timeout_transaction.pre_sign(
-            context,
-            &secret_nonces[&self.kick_off_timeout_transaction.tx().compute_txid()],
-        );
-        self.start_time_timeout_transaction.pre_sign(
-            context,
-            &secret_nonces[&self.start_time_timeout_transaction.tx().compute_txid()],
-        );
-        self.take_1_transaction.pre_sign(
-            context,
-            &secret_nonces[&self.take_1_transaction.tx().compute_txid()],
-        );
-        self.take_2_transaction.pre_sign(
-            context,
-            &secret_nonces[&self.take_2_transaction.tx().compute_txid()],
-        );
-
-        self.n_of_n_presigned = true; // TODO: set to true after collecting all n of n signatures
-    }
-
-    pub async fn verifier_status(&self, client: &AsyncClient) -> PegOutVerifierStatus {
-        if self.n_of_n_presigned {
-            let (
-                assert_status,
-                challenge_status,
-                disprove_chain_status,
-                disprove_status,
-                kick_off_1_status,
-                kick_off_2_status,
-                kick_off_timeout_status,
-                _,
-                start_time_timeout_status,
-                start_time_status,
-                take_1_status,
-                take_2_status,
-            ) = Self::get_peg_out_statuses(self, client).await;
-            let blockchain_height = get_block_height(client).await;
-
-            if kick_off_2_status
-                .as_ref()
-                .is_ok_and(|status| status.confirmed)
-            {
-                if take_1_status.as_ref().is_ok_and(|status| status.confirmed)
-                    || take_2_status.as_ref().is_ok_and(|status| status.confirmed)
-                {
-                    return PegOutVerifierStatus::PegOutComplete;
-                } else if disprove_status
-                    .as_ref()
-                    .is_ok_and(|status| status.confirmed)
-                    || disprove_chain_status
-                        .as_ref()
-                        .is_ok_and(|status| status.confirmed)
-                {
-                    return PegOutVerifierStatus::PegOutFailed; // TODO: can be also `PegOutVerifierStatus::PegOutComplete`
-                } else if assert_status.as_ref().is_ok_and(|status| status.confirmed) {
-                    return PegOutVerifierStatus::PegOutDisproveAvailable;
-                } else {
-                    return PegOutVerifierStatus::PegOutDisproveChainAvailable;
-                }
-            } else if kick_off_1_status
-                .as_ref()
-                .is_ok_and(|status| status.confirmed)
-            {
-                if start_time_timeout_status
-                    .as_ref()
-                    .is_ok_and(|status| status.confirmed)
-                    || kick_off_timeout_status
-                        .as_ref()
-                        .is_ok_and(|status| status.confirmed)
-                {
-                    return PegOutVerifierStatus::PegOutFailed; // TODO: can be also `PegOutVerifierStatus::PegOutComplete`
-                } else if start_time_status
-                    .as_ref()
-                    .is_ok_and(|status| !status.confirmed)
-                {
-                    if kick_off_1_status
-                        .as_ref()
-                        .unwrap()
-                        .block_height
-                        .is_some_and(|block_height| {
-                            block_height
-                                + self.start_time_timeout_transaction.num_blocks_timelock_1()
-                                > blockchain_height
-                        })
-                    {
-                        return PegOutVerifierStatus::PegOutStartTimeTimeoutAvailable;
-                    } else {
-                        return PegOutVerifierStatus::PegOutWait;
-                    }
-                } else if kick_off_1_status
-                    .as_ref()
-                    .unwrap()
-                    .block_height
-                    .is_some_and(|block_height| {
-                        block_height + self.kick_off_timeout_transaction.num_blocks_timelock_0()
-                            > blockchain_height
-                    })
-                {
-                    return PegOutVerifierStatus::PegOutKickOffTimeoutAvailable;
-                } else if challenge_status
-                    .as_ref()
-                    .is_ok_and(|status| !status.confirmed)
-                {
-                    return PegOutVerifierStatus::PegOutChallengeAvailable;
-                } else {
-                    return PegOutVerifierStatus::PegOutWait;
-                }
-            } else {
-                return PegOutVerifierStatus::PegOutWait;
-            }
-        } else {
-            return PegOutVerifierStatus::PegOutPresign;
-        }
-    }
-
-    pub async fn operator_status(&self, client: &AsyncClient) -> PegOutOperatorStatus {
-        if self.n_of_n_presigned {
-            let (
-                assert_status,
-                challenge_status,
-                disprove_chain_status,
-                disprove_status,
-                kick_off_1_status,
-                kick_off_2_status,
-                kick_off_timeout_status,
-                peg_out_status,
-                start_time_timeout_status,
-                start_time_status,
-                take_1_status,
-                take_2_status,
-            ) = Self::get_peg_out_statuses(self, client).await;
-            let blockchain_height = get_block_height(client).await;
-
-            if peg_out_status.is_some_and(|status| status.unwrap().confirmed) {
-                if kick_off_2_status
-                    .as_ref()
-                    .is_ok_and(|status| status.confirmed)
-                {
-                    if take_1_status.as_ref().is_ok_and(|status| status.confirmed)
-                        || take_2_status.as_ref().is_ok_and(|status| status.confirmed)
-                    {
-                        return PegOutOperatorStatus::PegOutComplete;
-                    } else if disprove_chain_status
-                        .as_ref()
-                        .is_ok_and(|status| status.confirmed)
-                        || disprove_status
-                            .as_ref()
-                            .is_ok_and(|status| status.confirmed)
-                    {
-                        return PegOutOperatorStatus::PegOutFailed; // TODO: can be also `PegOutOperatorStatus::PegOutComplete`
-                    } else if challenge_status.is_ok_and(|status| status.confirmed) {
-                        if assert_status.as_ref().is_ok_and(|status| status.confirmed) {
-                            if assert_status.as_ref().unwrap().block_height.is_some_and(
-                                |block_height| {
-                                    block_height + self.take_2_transaction.num_blocks_timelock_1()
-                                        <= blockchain_height
-                                },
-                            ) {
-                                return PegOutOperatorStatus::PegOutTake2Available;
-                            } else {
-                                return PegOutOperatorStatus::PegOutWait;
-                            }
-                        } else {
-                            if kick_off_2_status
-                                .as_ref()
-                                .unwrap()
-                                .block_height
-                                .is_some_and(|block_height| {
-                                    block_height + self.assert_transaction.num_blocks_timelock_0()
-                                        <= blockchain_height
-                                })
-                            {
-                                return PegOutOperatorStatus::PegOutAssertAvailable;
-                            } else {
-                                return PegOutOperatorStatus::PegOutWait;
-                            }
-                        }
-                    } else {
-                        if kick_off_2_status
-                            .as_ref()
-                            .unwrap()
-                            .block_height
-                            .is_some_and(|block_height| {
-                                block_height + self.take_1_transaction.num_blocks_timelock_2()
-                                    <= blockchain_height
-                            })
-                        {
-                            return PegOutOperatorStatus::PegOutTake1Available;
-                        } else {
-                            return PegOutOperatorStatus::PegOutWait;
-                        }
-                    }
-                } else if kick_off_1_status
-                    .as_ref()
-                    .is_ok_and(|status| status.confirmed)
-                {
-                    if start_time_timeout_status
-                        .as_ref()
-                        .is_ok_and(|status| status.confirmed)
-                        || kick_off_timeout_status
-                            .as_ref()
-                            .is_ok_and(|status| status.confirmed)
-                    {
-                        return PegOutOperatorStatus::PegOutFailed; // TODO: can be also `PegOutOperatorStatus::PegOutComplete`
-                    } else if start_time_status
-                        .as_ref()
-                        .is_ok_and(|status| status.confirmed)
-                    {
-                        if kick_off_1_status
-                            .as_ref()
-                            .unwrap()
-                            .block_height
-                            .is_some_and(|block_height| {
-                                block_height + self.kick_off_2_transaction.num_blocks_timelock_0()
-                                    <= blockchain_height
-                            })
-                        {
-                            return PegOutOperatorStatus::PegOutKickOff2Available;
-                        } else {
-                            return PegOutOperatorStatus::PegOutWait;
-                        }
-                    } else {
-                        return PegOutOperatorStatus::PegOutStartTimeAvailable;
-                    }
-                } else {
-                    return PegOutOperatorStatus::PegOutKickOff1Available;
-                }
-            } else {
-                return PegOutOperatorStatus::PegOutStartPegOut;
-            }
-        }
-
-        return PegOutOperatorStatus::PegOutWait;
-    }
-
-    pub async fn depositor_status(&self, client: &AsyncClient) -> PegOutDepositorStatus {
-        if self.peg_out_transaction.is_some() {
-            let peg_out_txid = self
-                .peg_out_transaction
-                .as_ref()
-                .unwrap()
-                .tx()
-                .compute_txid();
-            let peg_out_status = client.get_tx_status(&peg_out_txid).await;
-
-            if peg_out_status.is_ok_and(|status| status.confirmed) {
-                return PegOutDepositorStatus::PegOutComplete;
-            } else {
-                return PegOutDepositorStatus::PegOutWait;
-            }
-        } else {
-            return PegOutDepositorStatus::PegOutNotStarted;
-        }
-    }
-
-    pub async fn kick_off_1(&mut self, client: &AsyncClient) {
-        verify_if_not_mined(&client, self.kick_off_1_transaction.tx().compute_txid()).await;
-
-        // complete kick-off 1 tx
-        let kick_off_1_tx = self.kick_off_1_transaction.finalize();
-
-        // broadcast kick-off 1 tx
-        let kick_off_1_result = client.broadcast(&kick_off_1_tx).await;
-
-        // verify kick-off 1 tx result
-        verify_tx_result(&kick_off_1_result);
-    }
-
-    pub async fn challenge(
-        &mut self,
-        client: &AsyncClient,
-        context: &dyn BaseContext,
-        crowdfundng_inputs: &Vec<InputWithScript<'_>>,
-        keypair: &Keypair,
-        output_script_pubkey: ScriptBuf,
-    ) {
-        verify_if_not_mined(client, self.challenge_transaction.tx().compute_txid()).await;
-
-        let kick_off_1_txid = self.kick_off_1_transaction.tx().compute_txid();
-        let kick_off_1_status = client.get_tx_status(&kick_off_1_txid).await;
-
-        if kick_off_1_status.is_ok_and(|status| status.confirmed) {
-            // complete challenge tx
-            self.challenge_transaction.add_inputs_and_output(
-                context,
-                crowdfundng_inputs,
-                keypair,
-                output_script_pubkey,
-            );
-            let challenge_tx = self.challenge_transaction.finalize();
-
-            // broadcast challenge tx
-            let challenge_result = client.broadcast(&challenge_tx).await;
-
-            // verify challenge tx result
-            verify_tx_result(&challenge_result);
-        } else {
-            panic!("Kick-off 1 tx has not been confirmed!");
-        }
-    }
-
-    pub async fn start_time(&mut self, client: &AsyncClient) {
-        verify_if_not_mined(client, self.start_time_transaction.tx().compute_txid()).await;
-
-        let kick_off_1_txid = self.kick_off_1_transaction.tx().compute_txid();
-        let kick_off_1_status = client.get_tx_status(&kick_off_1_txid).await;
-
-        if kick_off_1_status.is_ok_and(|status| status.confirmed) {
-            // complete start time tx
-            let start_time_tx = self.start_time_transaction.finalize();
-
-            // broadcast start time tx
-            let start_time_result = client.broadcast(&start_time_tx).await;
-
-            // verify start time tx result
-            verify_tx_result(&start_time_result);
-        } else {
-            panic!("Kick-off 1 tx has not been confirmed!");
-        }
-    }
-
-    pub async fn start_time_timeout(
-        &mut self,
-        client: &AsyncClient,
-        output_script_pubkey: ScriptBuf,
-    ) {
-        verify_if_not_mined(
-            client,
-            self.start_time_timeout_transaction.tx().compute_txid(),
-        )
-        .await;
-
-        let kick_off_1_txid = self.kick_off_1_transaction.tx().compute_txid();
-        let kick_off_1_status = client.get_tx_status(&kick_off_1_txid).await;
-
-        let blockchain_height = get_block_height(client).await;
-
-        if kick_off_1_status
-            .as_ref()
-            .is_ok_and(|status| status.confirmed)
-        {
-            if kick_off_1_status
-                .as_ref()
-                .unwrap()
-                .block_height
-                .is_some_and(|block_height| {
-                    block_height + self.start_time_timeout_transaction.num_blocks_timelock_1()
-                        <= blockchain_height
-                })
-            {
-                // complete start time timeout tx
-                self.start_time_timeout_transaction
-                    .add_output(output_script_pubkey);
-                let start_time_timeout_tx = self.start_time_timeout_transaction.finalize();
-
-                // broadcast start time timeout tx
-                let start_time_timeout_result = client.broadcast(&start_time_timeout_tx).await;
-
-                // verify start time timeout tx result
-                verify_tx_result(&start_time_timeout_result);
-            } else {
-                panic!("Kick-off 1 timelock has not elapsed!");
-            }
-        } else {
-            panic!("Kick-off 1 tx has not been confirmed!");
-        }
-    }
-
-    pub async fn kick_off_2(&mut self, client: &AsyncClient) {
-        verify_if_not_mined(client, self.kick_off_2_transaction.tx().compute_txid()).await;
-
-        let kick_off_1_txid = self.kick_off_1_transaction.tx().compute_txid();
-        let kick_off_1_status = client.get_tx_status(&kick_off_1_txid).await;
-
-        let blockchain_height = get_block_height(client).await;
-
-        if kick_off_1_status
-            .as_ref()
-            .is_ok_and(|status| status.confirmed)
-        {
-            if kick_off_1_status
-                .as_ref()
-                .unwrap()
-                .block_height
-                .is_some_and(|block_height| {
-                    block_height + self.kick_off_2_transaction.num_blocks_timelock_0()
-                        <= blockchain_height
-                })
-            {
-                // complete kick-off 2 tx
-                let kick_off_2_tx = self.kick_off_2_transaction.finalize();
-
-                // broadcast kick-off 2 tx
-                let kick_off_2_result = client.broadcast(&kick_off_2_tx).await;
-
-                // verify kick-off 2 tx result
-                verify_tx_result(&kick_off_2_result);
-            } else {
-                panic!("Kick-off 1 timelock has not elapsed!");
-            }
-        } else {
-            panic!("Kick-off 1 tx has not been confirmed!");
-        }
-    }
-
-    pub async fn kick_off_timeout(
-        &mut self,
-        client: &AsyncClient,
-        output_script_pubkey: ScriptBuf,
-    ) {
-        verify_if_not_mined(
-            client,
-            self.kick_off_timeout_transaction.tx().compute_txid(),
-        )
-        .await;
-
-        let kick_off_1_txid = self.kick_off_1_transaction.tx().compute_txid();
-        let kick_off_1_status = client.get_tx_status(&kick_off_1_txid).await;
-
-        let blockchain_height = get_block_height(client).await;
-
-        if kick_off_1_status
-            .as_ref()
-            .is_ok_and(|status| status.confirmed)
-        {
-            if kick_off_1_status
-                .as_ref()
-                .unwrap()
-                .block_height
-                .is_some_and(|block_height| {
-                    block_height + self.kick_off_timeout_transaction.num_blocks_timelock_0()
-                        <= blockchain_height
-                })
-            {
-                // complete kick-off timeout tx
-                let kick_off_timeout_tx = self.kick_off_timeout_transaction.finalize();
-
-                // broadcast kick-off timeout tx
-                self.kick_off_timeout_transaction
-                    .add_output(output_script_pubkey);
-                let kick_off_timeout_result = client.broadcast(&kick_off_timeout_tx).await;
-
-                // verify kick-off timeout tx result
-                verify_tx_result(&kick_off_timeout_result);
-            } else {
-                panic!("Kick-off 1 timelock has not elapsed!");
-            }
-        } else {
-            panic!("Kick-off 1 tx has not been confirmed!");
-        }
-    }
-
-    pub async fn assert(&mut self, client: &AsyncClient) {
-        verify_if_not_mined(client, self.assert_transaction.tx().compute_txid()).await;
-
-        let kick_off_2_txid = self.kick_off_2_transaction.tx().compute_txid();
-        let kick_off_2_status = client.get_tx_status(&kick_off_2_txid).await;
-
-        let blockchain_height = get_block_height(client).await;
-
-        if kick_off_2_status
-            .as_ref()
-            .is_ok_and(|status| status.confirmed)
-        {
-            if kick_off_2_status
-                .as_ref()
-                .unwrap()
-                .block_height
-                .is_some_and(|block_height| {
-                    block_height + self.assert_transaction.num_blocks_timelock_0()
-                        <= blockchain_height
-                })
-            {
-                // complete assert tx
-                let assert_tx = self.assert_transaction.finalize();
-
-                // broadcast assert tx
-                let assert_result = client.broadcast(&assert_tx).await;
-
-                // verify assert tx result
-                verify_tx_result(&assert_result);
-            } else {
-                panic!("Kick-off 2 timelock has not elapsed!");
-            }
-        } else {
-            panic!("Kick-off 2 tx has not been confirmed!");
-        }
-    }
-
-    pub async fn disprove(
-        &mut self,
-        client: &AsyncClient,
-        input_script_index: u32,
-        output_script_pubkey: ScriptBuf,
-    ) {
-        verify_if_not_mined(client, self.disprove_transaction.tx().compute_txid()).await;
-
-        let assert_txid = self.assert_transaction.tx().compute_txid();
-        let assert_status = client.get_tx_status(&assert_txid).await;
-
-        if assert_status.is_ok_and(|status| status.confirmed) {
-            // complete disprove tx
-            self.disprove_transaction
-                .add_input_output(input_script_index, output_script_pubkey);
-            let disprove_tx = self.disprove_transaction.finalize();
-
-            // broadcast disprove tx
-            let disprove_result = client.broadcast(&disprove_tx).await;
-
-            // verify disprove tx result
-            verify_tx_result(&disprove_result);
-        } else {
-            panic!("Assert tx has not been confirmed!");
-        }
-    }
-
-    pub async fn disprove_chain(&mut self, client: &AsyncClient, output_script_pubkey: ScriptBuf) {
-        verify_if_not_mined(client, self.disprove_chain_transaction.tx().compute_txid()).await;
-
-        let kick_off_2_txid = self.kick_off_2_transaction.tx().compute_txid();
-        let kick_off_2_status = client.get_tx_status(&kick_off_2_txid).await;
-
-        if kick_off_2_status.is_ok_and(|status| status.confirmed) {
-            // complete disprove chain tx
-            self.disprove_chain_transaction
-                .add_output(output_script_pubkey);
-            let disprove_chain_tx = self.disprove_chain_transaction.finalize();
-
-            // broadcast disprove chain tx
-            let disprove_chain_result = client.broadcast(&disprove_chain_tx).await;
-
-            // verify disprove chain tx result
-            verify_tx_result(&disprove_chain_result);
-        } else {
-            panic!("Kick-off 2 tx has not been confirmed!");
-        }
-    }
-
-    pub async fn take_1(&mut self, client: &AsyncClient) {
-        verify_if_not_mined(&client, self.take_1_transaction.tx().compute_txid()).await;
-        verify_if_not_mined(&client, self.challenge_transaction.tx().compute_txid()).await;
-        verify_if_not_mined(&client, self.assert_transaction.tx().compute_txid()).await;
-        verify_if_not_mined(&client, self.disprove_chain_transaction.tx().compute_txid()).await;
-
-        let peg_in_confirm_status = client.get_tx_status(&self.peg_in_confirm_txid).await;
-
-        let kick_off_1_txid = self.kick_off_1_transaction.tx().compute_txid();
-        let kick_off_1_status = client.get_tx_status(&kick_off_1_txid).await;
-
-        let kick_off_2_txid = self.kick_off_2_transaction.tx().compute_txid();
-        let kick_off_2_status = client.get_tx_status(&kick_off_2_txid).await;
-
-        let blockchain_height = get_block_height(client).await;
-
-        if peg_in_confirm_status.is_ok_and(|status| status.confirmed)
-            && kick_off_1_status
-                .as_ref()
-                .is_ok_and(|status| status.confirmed)
-            && kick_off_2_status
-                .as_ref()
-                .is_ok_and(|status| status.confirmed)
-        {
-            if kick_off_2_status
-                .unwrap()
-                .block_height
-                .is_some_and(|block_height| {
-                    block_height + self.take_1_transaction.num_blocks_timelock_2()
-                        <= blockchain_height
-                })
-            {
-                // complete take 1 tx
-                let take_1_tx = self.take_1_transaction.finalize();
-
-                // broadcast take 1 tx
-                let take_1_result = client.broadcast(&take_1_tx).await;
-
-                // verify take 1 tx result
-                verify_tx_result(&take_1_result);
-            } else {
-                panic!("Kick-off 2 tx timelock has not elapsed!");
-            }
-        } else {
-            panic!("Peg-in confirm tx, kick-off 1 and kick-off 2 tx have not been confirmed!");
-        }
-    }
-
-    pub async fn take_2(&mut self, client: &AsyncClient) {
-        verify_if_not_mined(&client, self.take_2_transaction.tx().compute_txid()).await;
-        verify_if_not_mined(&client, self.take_1_transaction.tx().compute_txid()).await;
-        verify_if_not_mined(&client, self.disprove_transaction.tx().compute_txid()).await;
-
-        let peg_in_confirm_status = client.get_tx_status(&self.peg_in_confirm_txid).await;
-
-        let assert_txid = self.assert_transaction.tx().compute_txid();
-        let assert_status = client.get_tx_status(&assert_txid).await;
-
-        let blockchain_height = get_block_height(client).await;
-
-        if peg_in_confirm_status.is_ok_and(|status| status.confirmed)
-            && assert_status.as_ref().is_ok_and(|status| status.confirmed)
-        {
-            if assert_status
-                .unwrap()
-                .block_height
-                .is_some_and(|block_height| {
-                    block_height + self.take_2_transaction.num_blocks_timelock_1()
-                        <= blockchain_height
-                })
-            {
-                // complete take 2 tx
-                let take_2_tx = self.take_2_transaction.finalize();
-
-                // broadcast take 2 tx
-                let take_2_result = client.broadcast(&take_2_tx).await;
-
-                // verify take 2 tx result
-                verify_tx_result(&take_2_result);
-            } else {
-                panic!("Assert tx timelock has not elapsed!");
-            }
-        } else {
-            panic!("Peg-in confirm tx and assert tx have not been confirmed!");
-        }
-    }
-
-    async fn get_peg_out_statuses(
-        &self,
-        client: &AsyncClient,
-    ) -> (
-        Result<TxStatus, Error>,
-        Result<TxStatus, Error>,
-        Result<TxStatus, Error>,
-        Result<TxStatus, Error>,
-        Result<TxStatus, Error>,
-        Result<TxStatus, Error>,
-        Result<TxStatus, Error>,
-        Option<Result<TxStatus, Error>>,
-        Result<TxStatus, Error>,
-        Result<TxStatus, Error>,
-        Result<TxStatus, Error>,
-        Result<TxStatus, Error>,
-    ) {
-        let assert_status = client
-            .get_tx_status(&self.assert_transaction.tx().compute_txid())
-            .await;
-
-        let challenge_status = client
-            .get_tx_status(&self.challenge_transaction.tx().compute_txid())
-            .await;
-
-        let disprove_chain_status = client
-            .get_tx_status(&self.disprove_chain_transaction.tx().compute_txid())
-            .await;
-
-        let disprove_status = client
-            .get_tx_status(&self.disprove_transaction.tx().compute_txid())
-            .await;
-
-        let kick_off_1_status = client
-            .get_tx_status(&self.kick_off_1_transaction.tx().compute_txid())
-            .await;
-
-        let kick_off_2_status = client
-            .get_tx_status(&self.kick_off_2_transaction.tx().compute_txid())
-            .await;
-
-        let kick_off_timeout_status = client
-            .get_tx_status(&self.kick_off_timeout_transaction.tx().compute_txid())
-            .await;
-
-        let mut peg_out_status: Option<Result<TxStatus, Error>> = None;
-        if self.peg_out_transaction.is_some() {
-            peg_out_status = Some(
-                client
-                    .get_tx_status(
-                        &self
-                            .peg_out_transaction
-                            .as_ref()
-                            .unwrap()
-                            .tx()
-                            .compute_txid(),
-                    )
-                    .await,
-            );
-        }
-
-        let start_time_timeout_status = client
-            .get_tx_status(&self.start_time_timeout_transaction.tx().compute_txid())
-            .await;
-
-        let start_time_status = client
-            .get_tx_status(&self.start_time_transaction.tx().compute_txid())
-            .await;
-
-        let take_1_status = client
-            .get_tx_status(&self.take_1_transaction.tx().compute_txid())
-            .await;
-
-        let take_2_status = client
-            .get_tx_status(&self.take_2_transaction.tx().compute_txid())
-            .await;
-
-        return (
-            assert_status,
-            challenge_status,
-            disprove_chain_status,
-            disprove_status,
-            kick_off_1_status,
-            kick_off_2_status,
-            kick_off_timeout_status,
-            peg_out_status,
-            start_time_timeout_status,
-            start_time_status,
-            take_1_status,
-            take_2_status,
-        );
-    }
-
-    pub fn validate(&self) -> bool {
-        let mut ret_val = true;
-        let peg_out_graph = self.new_for_validation();
-        if !validate_transaction(
-            self.assert_transaction.tx(),
-            peg_out_graph.assert_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-        if !validate_transaction(
-            self.challenge_transaction.tx(),
-            peg_out_graph.challenge_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-        if !validate_transaction(
-            self.disprove_chain_transaction.tx(),
-            peg_out_graph.disprove_chain_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-        if !validate_transaction(
-            self.disprove_transaction.tx(),
-            peg_out_graph.disprove_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-        if !validate_transaction(
-            self.kick_off_1_transaction.tx(),
-            peg_out_graph.kick_off_1_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-        if !validate_transaction(
-            self.kick_off_2_transaction.tx(),
-            peg_out_graph.kick_off_2_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-        if !validate_transaction(
-            self.kick_off_timeout_transaction.tx(),
-            peg_out_graph.kick_off_timeout_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-        if !validate_transaction(
-            self.start_time_transaction.tx(),
-            peg_out_graph.start_time_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-        if !validate_transaction(
-            self.start_time_timeout_transaction.tx(),
-            peg_out_graph.start_time_timeout_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-        if !validate_transaction(
-            self.take_1_transaction.tx(),
-            peg_out_graph.take_1_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-        if !validate_transaction(
-            self.take_2_transaction.tx(),
-            peg_out_graph.take_2_transaction.tx(),
-        ) {
-            ret_val = false;
-        }
-
-        if !verify_public_nonces_for_tx(&self.assert_transaction) {
-            ret_val = false;
-        }
-        if !verify_public_nonces_for_tx(&self.disprove_chain_transaction) {
-            ret_val = false;
-        }
-        if !verify_public_nonces_for_tx(&self.disprove_transaction) {
-            ret_val = false;
-        }
-        if !verify_public_nonces_for_tx(&self.kick_off_timeout_transaction) {
-            ret_val = false;
-        }
-        if !verify_public_nonces_for_tx(&self.start_time_transaction) {
-            ret_val = false;
-        }
-        if !verify_public_nonces_for_tx(&self.start_time_timeout_transaction) {
-            ret_val = false;
-        }
-        if !verify_public_nonces_for_tx(&self.take_1_transaction) {
-            ret_val = false;
-        }
-        if !verify_public_nonces_for_tx(&self.take_2_transaction) {
-            ret_val = false;
-        }
-
-        ret_val
-    }
-
-    pub fn merge(&mut self, source_peg_out_graph: &PegOutGraph) {
-        self.assert_transaction
-            .merge(&source_peg_out_graph.assert_transaction);
-
-        self.challenge_transaction
-            .merge(&source_peg_out_graph.challenge_transaction);
-
-        self.disprove_chain_transaction
-            .merge(&source_peg_out_graph.disprove_chain_transaction);
-
-        self.disprove_transaction
-            .merge(&source_peg_out_graph.disprove_transaction);
-
-        self.kick_off_timeout_transaction
-            .merge(&source_peg_out_graph.kick_off_timeout_transaction);
-
-        self.start_time_transaction
-            .merge(&source_peg_out_graph.start_time_transaction);
-
-        self.start_time_timeout_transaction
-            .merge(&source_peg_out_graph.start_time_timeout_transaction);
-
-        self.take_1_transaction
-            .merge(&source_peg_out_graph.take_1_transaction);
-
-        self.take_2_transaction
-            .merge(&source_peg_out_graph.take_2_transaction);
-    }
-}
-
-pub fn generate_id(peg_in_graph: &PegInGraph, operator_public_key: &PublicKey) -> String {
-    let mut hasher = Sha256::new();
-
-    hasher.update(peg_in_graph.id().to_string() + &operator_public_key.to_string());
-
-    hasher.finalize().to_hex_string(Upper)
-}
diff --git a/src/bridge/transactions/kick_off_1.rs b/src/bridge/transactions/kick_off_1.rs
deleted file mode 100644
index 639464e7f..000000000
--- a/src/bridge/transactions/kick_off_1.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-use bitcoin::{
-    absolute, consensus, Amount, EcdsaSighashType, Network, PublicKey, ScriptBuf, Sequence,
-    Transaction, TxIn, TxOut, Witness, XOnlyPublicKey,
-};
-use serde::{Deserialize, Serialize};
-
-use super::{
-    super::{
-        connectors::{
-            connector::*, connector_1::Connector1, connector_2::Connector2, connector_a::ConnectorA,
-        },
-        contexts::operator::OperatorContext,
-        graphs::base::{DUST_AMOUNT, FEE_AMOUNT},
-        scripts::*,
-    },
-    base::*,
-    pre_signed::*,
-};
-
-#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
-pub struct KickOff1Transaction {
-    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
-    tx: Transaction,
-    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
-    prev_outs: Vec<TxOut>,
-    prev_scripts: Vec<ScriptBuf>,
-}
-
-impl PreSignedTransaction for KickOff1Transaction {
-    fn tx(&self) -> &Transaction { &self.tx }
-
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
-
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
-
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
-}
-
-impl KickOff1Transaction {
-    pub fn new(context: &OperatorContext, operator_input: Input) -> Self {
-        let mut this = Self::new_for_validation(
-            context.network,
-            &context.operator_public_key,
-            &context.operator_taproot_public_key,
-            &context.n_of_n_taproot_public_key,
-            operator_input,
-        );
-
-        this.sign_input_0(context);
-
-        this
-    }
-
-    pub fn new_for_validation(
-        network: Network,
-        operator_public_key: &PublicKey,
-        operator_taproot_public_key: &XOnlyPublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
-        operator_input: Input,
-    ) -> Self {
-        let connector_1 = Connector1::new(
-            network,
-            operator_taproot_public_key,
-            n_of_n_taproot_public_key,
-        );
-        let connector_a = ConnectorA::new(
-            network,
-            operator_taproot_public_key,
-            n_of_n_taproot_public_key,
-        );
-        let connector_2 = Connector2::new(
-            network,
-            operator_taproot_public_key,
-            n_of_n_taproot_public_key,
-        );
-
-        let _input_0 = TxIn {
-            previous_output: operator_input.outpoint,
-            script_sig: ScriptBuf::new(),
-            sequence: Sequence::MAX,
-            witness: Witness::default(),
-        };
-
-        let total_output_amount = operator_input.amount - Amount::from_sat(FEE_AMOUNT);
-
-        let _output_0 = TxOut {
-            value: Amount::from_sat(DUST_AMOUNT),
-            script_pubkey: connector_a.generate_taproot_address().script_pubkey(),
-        };
-
-        let _output_1 = TxOut {
-            value: total_output_amount - Amount::from_sat(DUST_AMOUNT) * 2,
-            script_pubkey: connector_1.generate_taproot_address().script_pubkey(),
-        };
-
-        let _output_2 = TxOut {
-            value: Amount::from_sat(DUST_AMOUNT),
-            script_pubkey: connector_2.generate_taproot_address().script_pubkey(),
-        };
-
-        KickOff1Transaction {
-            tx: Transaction {
-                version: bitcoin::transaction::Version(2),
-                lock_time: absolute::LockTime::ZERO,
-                input: vec![_input_0],
-                output: vec![_output_0, _output_1, _output_2],
-            },
-            prev_outs: vec![TxOut {
-                value: operator_input.amount,
-                script_pubkey: generate_pay_to_pubkey_script_address(network, operator_public_key)
-                    .script_pubkey(), // TODO: Add address of Commit y
-            }],
-            prev_scripts: vec![generate_pay_to_pubkey_script(operator_public_key)],
-        }
-    }
-
-    fn sign_input_0(&mut self, context: &OperatorContext) {
-        let input_index = 0;
-        pre_sign_p2wsh_input(
-            self,
-            context,
-            input_index,
-            EcdsaSighashType::All,
-            &vec![&context.operator_keypair],
-        );
-    }
-}
-
-impl BaseTransaction for KickOff1Transaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-}
diff --git a/src/bridge/transactions/kick_off_2.rs b/src/bridge/transactions/kick_off_2.rs
deleted file mode 100644
index 3a367059f..000000000
--- a/src/bridge/transactions/kick_off_2.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use bitcoin::{
-    absolute, consensus, Amount, Network, PublicKey, ScriptBuf, TapSighashType, Transaction, TxOut,
-    XOnlyPublicKey,
-};
-use serde::{Deserialize, Serialize};
-
-use super::{
-    super::{
-        connectors::{
-            connector::*, connector_1::Connector1, connector_3::Connector3, connector_b::ConnectorB,
-        },
-        contexts::operator::OperatorContext,
-        graphs::base::{DUST_AMOUNT, FEE_AMOUNT},
-    },
-    base::*,
-    pre_signed::*,
-};
-
-#[derive(Serialize, Deserialize, Eq, PartialEq, Clone)]
-pub struct KickOff2Transaction {
-    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
-    tx: Transaction,
-    #[serde(with = "consensus::serde::With::<consensus::serde::Hex>")]
-    prev_outs: Vec<TxOut>,
-    prev_scripts: Vec<ScriptBuf>,
-    connector_1: Connector1,
-}
-
-impl PreSignedTransaction for KickOff2Transaction {
-    fn tx(&self) -> &Transaction { &self.tx }
-
-    fn tx_mut(&mut self) -> &mut Transaction { &mut self.tx }
-
-    fn prev_outs(&self) -> &Vec<TxOut> { &self.prev_outs }
-
-    fn prev_scripts(&self) -> &Vec<ScriptBuf> { &self.prev_scripts }
-}
-
-impl KickOff2Transaction {
-    pub fn new(context: &OperatorContext, input_0: Input) -> Self {
-        let mut this = Self::new_for_validation(
-            context.network,
-            &context.operator_public_key,
-            &context.operator_taproot_public_key,
-            &context.n_of_n_taproot_public_key,
-            input_0,
-        );
-
-        this.sign_input_0(context);
-
-        this
-    }
-
-    pub fn new_for_validation(
-        network: Network,
-        operator_public_key: &PublicKey,
-        operator_taproot_public_key: &XOnlyPublicKey,
-        n_of_n_taproot_public_key: &XOnlyPublicKey,
-        input_0: Input,
-    ) -> Self {
-        let connector_1 = Connector1::new(
-            network,
-            operator_taproot_public_key,
-            n_of_n_taproot_public_key,
-        );
-        let connector_3 = Connector3::new(network, operator_public_key);
-        let connector_b = ConnectorB::new(network, n_of_n_taproot_public_key);
-
-        let input_0_leaf = 0;
-        let _input_0 = connector_1.generate_taproot_leaf_tx_in(input_0_leaf, &input_0);
-
-        let total_output_amount = input_0.amount - Amount::from_sat(FEE_AMOUNT);
-
-        let _output_0 = TxOut {
-            value: Amount::from_sat(DUST_AMOUNT),
-            script_pubkey: connector_3.generate_address().script_pubkey(),
-        };
-
-        let _output_1 = TxOut {
-            value: total_output_amount - Amount::from_sat(DUST_AMOUNT),
-            script_pubkey: connector_b.generate_taproot_address().script_pubkey(),
-        };
-
-        KickOff2Transaction {
-            tx: Transaction {
-                version: bitcoin::transaction::Version(2),
-                lock_time: absolute::LockTime::ZERO,
-                input: vec![_input_0],
-                output: vec![_output_0, _output_1],
-            },
-            prev_outs: vec![TxOut {
-                value: input_0.amount,
-                script_pubkey: connector_1.generate_taproot_address().script_pubkey(),
-            }],
-            prev_scripts: vec![connector_1.generate_taproot_leaf_script(input_0_leaf)],
-            connector_1,
-        }
-    }
-
-    pub fn num_blocks_timelock_0(&self) -> u32 { self.connector_1.num_blocks_timelock_0 }
-
-    fn sign_input_0(&mut self, context: &OperatorContext) {
-        let input_index = 0;
-        pre_sign_taproot_input(
-            self,
-            context,
-            input_index,
-            TapSighashType::All,
-            self.connector_1.generate_taproot_spend_info(),
-            &vec![&context.operator_keypair],
-        );
-    }
-}
-
-impl BaseTransaction for KickOff2Transaction {
-    fn finalize(&self) -> Transaction { self.tx.clone() }
-}
diff --git a/src/bridge/transactions/signing.rs b/src/bridge/transactions/signing.rs
deleted file mode 100644
index 1009d95a0..000000000
--- a/src/bridge/transactions/signing.rs
+++ /dev/null
@@ -1,284 +0,0 @@
-use bitcoin::{
-    key::Keypair,
-    secp256k1::Message,
-    sighash::{Prevouts, SighashCache},
-    taproot::{LeafVersion, TaprootSpendInfo},
-    Amount, EcdsaSighashType, PublicKey, Script, ScriptBuf, TapLeafHash, TapSighashType,
-    Transaction, TxOut,
-};
-use std::borrow::Borrow;
-
-use super::super::{contexts::base::BaseContext, scripts::generate_p2wpkh_address};
-
-pub fn generate_p2wsh_signature(
-    context: &dyn BaseContext,
-    tx: &mut Transaction,
-    input_index: usize,
-    sighash_type: EcdsaSighashType,
-    script: &Script,
-    value: Amount,
-    keypair: &Keypair,
-) -> bitcoin::ecdsa::Signature {
-    let mut sighash_cache = SighashCache::new(tx);
-
-    let sighash = sighash_cache
-        .p2wsh_signature_hash(input_index, script, value, sighash_type)
-        .expect("Failed to construct sighash");
-
-    let signature = context
-        .secp()
-        .sign_ecdsa(&Message::from(sighash), &keypair.secret_key());
-
-    bitcoin::ecdsa::Signature {
-        signature,
-        sighash_type,
-    }
-}
-
-pub fn push_p2wsh_signature_to_witness(
-    context: &dyn BaseContext,
-    tx: &mut Transaction,
-    input_index: usize,
-    sighash_type: EcdsaSighashType,
-    script: &Script,
-    value: Amount,
-    keypair: &Keypair,
-) {
-    let signature = generate_p2wsh_signature(
-        context,
-        tx,
-        input_index,
-        sighash_type,
-        script,
-        value,
-        keypair,
-    );
-
-    tx.input[input_index]
-        .witness
-        .push_ecdsa_signature(&signature);
-}
-
-pub fn push_p2wsh_script_to_witness(tx: &mut Transaction, input_index: usize, script: &Script) {
-    tx.input[input_index].witness.push(script); // TODO to_bytes() may be needed
-}
-
-pub fn populate_p2wsh_witness(
-    context: &dyn BaseContext,
-    tx: &mut Transaction,
-    input_index: usize,
-    sighash_type: EcdsaSighashType,
-    script: &Script,
-    value: Amount,
-    keypairs: &Vec<&Keypair>,
-) {
-    for keypair in keypairs {
-        push_p2wsh_signature_to_witness(
-            context,
-            tx,
-            input_index,
-            sighash_type,
-            script,
-            value,
-            keypair,
-        );
-    }
-    push_p2wsh_script_to_witness(tx, input_index, script);
-}
-
-pub fn generate_p2wpkh_signature(
-    context: &dyn BaseContext,
-    tx: &mut Transaction,
-    input_index: usize,
-    sighash_type: EcdsaSighashType,
-    value: Amount,
-    public_key: &PublicKey,
-    keypair: &Keypair,
-) -> bitcoin::ecdsa::Signature {
-    let mut sighash_cache = SighashCache::new(tx);
-
-    let sighash = sighash_cache
-        .p2wpkh_signature_hash(
-            input_index,
-            &generate_p2wpkh_address(context.network(), &public_key).script_pubkey(),
-            value,
-            sighash_type,
-        )
-        .expect("Failed to construct sighash");
-
-    let signature = context
-        .secp()
-        .sign_ecdsa(&Message::from(sighash), &keypair.secret_key());
-
-    bitcoin::ecdsa::Signature {
-        signature,
-        sighash_type,
-    }
-}
-
-pub fn push_p2wpkh_signature_to_witness(
-    context: &dyn BaseContext,
-    tx: &mut Transaction,
-    input_index: usize,
-    sighash_type: EcdsaSighashType,
-    value: Amount,
-    public_key: &PublicKey,
-    keypair: &Keypair,
-) {
-    let signature = generate_p2wpkh_signature(
-        context,
-        tx,
-        input_index,
-        sighash_type,
-        value,
-        public_key,
-        keypair,
-    );
-
-    tx.input[input_index]
-        .witness
-        .push_ecdsa_signature(&signature);
-}
-
-pub fn push_p2wpkh_public_key_to_witness(
-    tx: &mut Transaction,
-    input_index: usize,
-    public_key: &PublicKey,
-) {
-    tx.input[input_index].witness.push(public_key.to_bytes());
-}
-
-pub fn populate_p2wpkh_witness(
-    context: &dyn BaseContext,
-    tx: &mut Transaction,
-    input_index: usize,
-    sighash_type: EcdsaSighashType,
-    value: Amount,
-    public_key: &PublicKey,
-    keypair: &Keypair,
-) {
-    push_p2wpkh_signature_to_witness(
-        context,
-        tx,
-        input_index,
-        sighash_type,
-        value,
-        public_key,
-        keypair,
-    );
-    push_p2wpkh_public_key_to_witness(tx, input_index, public_key);
-}
-
-pub fn generate_taproot_leaf_signature<T: Borrow<TxOut>>(
-    context: &dyn BaseContext,
-    tx: &mut Transaction,
-    prevouts: &Prevouts<T>,
-    input_index: usize,
-    sighash_type: TapSighashType,
-    script: &Script,
-    keypair: &Keypair,
-) -> bitcoin::taproot::Signature {
-    let leaf_hash = TapLeafHash::from_script(script, LeafVersion::TapScript);
-
-    let sighash = SighashCache::new(tx)
-        .taproot_script_spend_signature_hash(input_index, &prevouts, leaf_hash, sighash_type)
-        .expect("Failed to construct sighash");
-
-    let signature = context
-        .secp()
-        .sign_schnorr_no_aux_rand(&Message::from(sighash), keypair);
-
-    bitcoin::taproot::Signature {
-        signature,
-        sighash_type,
-    }
-}
-
-pub fn push_taproot_leaf_signature_to_witness(
-    context: &dyn BaseContext,
-    tx: &mut Transaction,
-    prevouts: &Vec<TxOut>,
-    input_index: usize,
-    sighash_type: TapSighashType,
-    script: &Script,
-    keypair: &Keypair,
-) {
-    if sighash_type == TapSighashType::AllPlusAnyoneCanPay
-        || sighash_type == TapSighashType::SinglePlusAnyoneCanPay
-        || sighash_type == TapSighashType::NonePlusAnyoneCanPay
-    {
-        let signature = generate_taproot_leaf_signature(
-            context,
-            tx,
-            &Prevouts::One(input_index, &prevouts[input_index]),
-            input_index,
-            sighash_type,
-            script,
-            keypair,
-        );
-
-        tx.input[input_index].witness.push(signature.to_vec());
-    } else {
-        let signature = generate_taproot_leaf_signature(
-            context,
-            tx,
-            &Prevouts::All(&prevouts),
-            input_index,
-            sighash_type,
-            script,
-            keypair,
-        );
-
-        tx.input[input_index].witness.push(signature.to_vec());
-    }
-}
-
-pub fn push_taproot_leaf_script_and_control_block_to_witness(
-    tx: &mut Transaction,
-    input_index: usize,
-    taproot_spend_info: &TaprootSpendInfo,
-    script: &Script,
-) {
-    let prevout_leaf = (ScriptBuf::from(script), LeafVersion::TapScript);
-
-    let control_block = taproot_spend_info
-        .control_block(&prevout_leaf)
-        .expect("Unable to create Control block");
-
-    tx.input[input_index]
-        .witness
-        .push(prevout_leaf.0.to_bytes());
-
-    tx.input[input_index]
-        .witness
-        .push(control_block.serialize());
-}
-
-pub fn populate_taproot_input_witness(
-    context: &dyn BaseContext,
-    tx: &mut Transaction,
-    prevouts: &Vec<TxOut>,
-    input_index: usize,
-    sighash_type: TapSighashType,
-    taproot_spend_info: &TaprootSpendInfo,
-    script: &Script,
-    keypairs: &Vec<&Keypair>,
-) {
-    for keypair in keypairs {
-        push_taproot_leaf_signature_to_witness(
-            context,
-            tx,
-            prevouts,
-            input_index,
-            sighash_type,
-            script,
-            keypair,
-        );
-    }
-    push_taproot_leaf_script_and_control_block_to_witness(
-        tx,
-        input_index,
-        taproot_spend_info,
-        script,
-    );
-}
diff --git a/src/bridge/utils.rs b/src/bridge/utils.rs
deleted file mode 100644
index c84d9f40a..000000000
--- a/src/bridge/utils.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use bitcoin::Network;
-
-pub fn num_blocks_per_network(network: Network, mainnet_num_blocks: u32) -> u32 {
-    if network == Network::Bitcoin {
-        mainnet_num_blocks
-    } else {
-        1
-    }
-}
diff --git a/src/fflonk/check_format.rs b/src/fflonk/check_format.rs
deleted file mode 100644
index 6940a1b99..000000000
--- a/src/fflonk/check_format.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::curves::G1Affine;
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fr::Fr;
-    use crate::treepp::*;
-    
-    
-
-    #[test]
-    fn test_check_format() {
-        let script = script! {
-            // C1
-            { Fq::push_dec("8993820735255461694205287896466659762517378169680151817278189507219986014273") }
-            { Fq::push_dec("20608602847008036615737932995836476570376266531776948091942386633580114403199") }
-            { G1Affine::is_on_curve() }
-            OP_VERIFY
-            // C2
-            { Fq::push_dec("7381325072443970270370678023564870071058744625357849943766655609499175274412") }
-            { Fq::push_dec("15178578915928592705383893120230835636411008017183180871962629962483134367891") }
-            { G1Affine::is_on_curve() }
-            OP_VERIFY
-            // W1
-            { Fq::push_dec("32650538602400348219903702316313439265244325226254563471430382441955222030") }
-            { Fq::push_dec("1102261574488401129043229793384018650738538286437537952751903719159654317199") }
-            { G1Affine::is_on_curve() }
-            OP_VERIFY
-            // W2
-            { Fq::push_dec("11695827642347470645483614914520090101440686332033956264171712726147972703435") }
-            { Fq::push_dec("8930092616903485317239646434389939466400752538134075201209141980838088395614") }
-            { G1Affine::is_on_curve() }
-            OP_VERIFY
-            // ql
-            { Fr::push_dec("4305584171954448775801758618991977283131671407134816099015723841718827300684") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // qr
-            { Fr::push_dec("12383383973686840675128398394454489421896122330596726461131121746926747341189") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // qm
-            { Fr::push_dec("84696450614978050680673343346456326547032107368333805624994614151289555853") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // qo
-            { Fr::push_dec("3940439340424631873531863239669720717811550024514867065774687720368464792371") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // qc
-            { Fr::push_dec("16961785810060156933739931986193776143069216115530808410139185289490606944009") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // s1
-            { Fr::push_dec("12474437127153975801320290893919924661315458586210754316226946498711086665749") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // s2
-            { Fr::push_dec("599434615255095347665395089945860172292558760398201299457995057871688253664") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // s3
-            { Fr::push_dec("16217604511932175446614838218599989473511950977205890369538297955449224727219") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // a
-            { Fr::push_dec("7211168621666826182043583595845418959530786367587156242724929610231435505336") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // b
-            { Fr::push_dec("848088075173937026388846472327431819307508078325359401333033359624801042") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // c
-            { Fr::push_dec("18963734392470978715233675860777231227480937309534365140504133190694875258320") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // z
-            { Fr::push_dec("2427313569771756255376235777000596702684056445296844486767054635200432142794") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // zw
-            { Fr::push_dec("8690328511114991742730387856275843464438882369629727414507275814599493141660") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // t1w
-            { Fr::push_dec("20786626696833495453279531623626288211765949258916047124642669459480728122908") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // t2w
-            { Fr::push_dec("12092130080251498309415337127155404037148503145602589831662396526189421234148") }
-            { Fr::is_field() }
-            OP_VERIFY
-            // inv
-            { Fr::push_dec("21247383512588455895834686692756529012394058115069710447132959660051940541361") }
-            { Fr::is_field() }
-        };
-        println!("fflonk.check_format = {} bytes", script.len());
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/checkpairing_a1.rs b/src/fflonk/checkpairing_a1.rs
deleted file mode 100644
index f71dd341a..000000000
--- a/src/fflonk/checkpairing_a1.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::curves::G1Projective;
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fr::Fr;
-    use crate::treepp::*;
-
-    #[test]
-    fn test_checkpairing_a1() {
-        let script = script! {
-            // push F, E, J, W2
-            { Fq::push_dec("10827057179016943379099096512257711381208881258335395636699788359889105647796") }
-            { Fq::push_dec("15908485457276609870374048914742234656312588226903176268190825086381552148601") }
-            { Fq::push_dec("10704903381596808863042656941383257630189957941456629442401491652278045385710") }
-
-            { Fq::push_dec("10905825615646575916826598897124608361270584984190374057529352166783343482862") }
-            { Fq::push_dec("19290909793509893735943189519527824156597590461000288988451227768509803549366") }
-            { Fq::push_dec("10334981607594421347972269000738063023881743479366183631046354259553646162574") }
-
-            { Fq::push_dec("2959562071167086018427906252728568621973040394868315776950851582459669551081") }
-            { Fq::push_dec("5248835691815263544471788309691308785423871173394577194626050104765380585421") }
-            { Fq::push_dec("19277062899702791882368245424983329716198384271778017207570439921049817477033") }
-
-            { Fq::push_dec("11695827642347470645483614914520090101440686332033956264171712726147972703435") }
-            { Fq::push_dec("8930092616903485317239646434389939466400752538134075201209141980838088395614") }
-            { Fq::push_dec("1") }
-
-            // push y
-            { Fr::push_dec("6824639836122392703554190210911349683223362245243195922653951653214183338070") }
-
-            { G1Projective::scalar_mul() }
-            { G1Projective::roll(3) }
-            { G1Projective::add() }
-
-            { G1Projective::roll(2) }
-            { G1Projective::neg() }
-            { G1Projective::add() }
-
-            { G1Projective::roll(1) }
-            { G1Projective::neg() }
-            { G1Projective::add() }
-
-            { Fq::push_dec("21025932300722401404248737517866966587837387913191004025854702115722286998035") }
-            { Fq::push_dec("5748766770337880144484917096976043621609890780406924686031233755006782215858") }
-            { Fq::push_dec("18747233771850556311508953762939425433543524671221692065979284256379095132287") }
-
-            { G1Projective::equalverify() }
-            OP_TRUE
-        };
-
-        println!("fflonk.checkpairing_a = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/checkpairing_miller_loop.rs b/src/fflonk/checkpairing_miller_loop.rs
deleted file mode 100644
index 5574ab5eb..000000000
--- a/src/fflonk/checkpairing_miller_loop.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::ell_coeffs::G2Prepared;
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fq12::Fq12;
-    use crate::bn254::pairing::Pairing;
-    use crate::bn254::utils::{self, fq12_push};
-    use crate::treepp::*;
-    use ark_bn254::Bn254;
-    use ark_ec::pairing::Pairing as ArkPairing;
-    use ark_ec::{AffineRepr, CurveGroup};
-
-    use num_bigint::BigUint;
-    use std::ops::Neg;
-    use std::str::FromStr;
-
-    #[test]
-    fn test_checkpairing_miller_loop() {
-        let projective = ark_bn254::G1Projective::new(
-            ark_bn254::Fq::from_str(
-                "21025932300722401404248737517866966587837387913191004025854702115722286998035",
-            )
-            .unwrap(),
-            ark_bn254::Fq::from_str(
-                "5748766770337880144484917096976043621609890780406924686031233755006782215858",
-            )
-            .unwrap(),
-            ark_bn254::Fq::from_str(
-                "18747233771850556311508953762939425433543524671221692065979284256379095132287",
-            )
-            .unwrap(),
-        );
-        let affine = projective.into_affine();
-
-        let a = ark_bn254::g2::G2Affine::new(
-            ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str(
-                    "10857046999023057135944570762232829481370756359578518086990519993285655852781",
-                )
-                .unwrap(),
-                ark_bn254::Fq::from_str(
-                    "11559732032986387107991004021392285783925812861821192530917403151452391805634",
-                )
-                .unwrap(),
-            ),
-            ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str(
-                    "8495653923123431417604973247489272438418190587263600148770280649306958101930",
-                )
-                .unwrap(),
-                ark_bn254::Fq::from_str(
-                    "4082367875863433681332203403145435568316851327593401208105741076214120093531",
-                )
-                .unwrap(),
-            ),
-        );
-        let a_prepared = G2Prepared::from(a);
-
-        let b = ark_bn254::g2::G2Affine::new(
-            ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str(
-                    "21831381940315734285607113342023901060522397560371972897001948545212302161822",
-                )
-                .unwrap(),
-                ark_bn254::Fq::from_str(
-                    "17231025384763736816414546592865244497437017442647097510447326538965263639101",
-                )
-                .unwrap(),
-            ),
-            ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str(
-                    "2388026358213174446665280700919698872609886601280537296205114254867301080648",
-                )
-                .unwrap(),
-                ark_bn254::Fq::from_str(
-                    "11507326595632554467052522095592665270651932854513688777769618397986436103170",
-                )
-                .unwrap(),
-            ),
-        );
-        let b_prepared = G2Prepared::from(b);
-
-        let dual_miller_loop = Pairing::dual_miller_loop(&a_prepared, &b_prepared);
-
-        let w2 = ark_bn254::g1::G1Affine::new(
-            ark_bn254::Fq::from_str(
-                "11695827642347470645483614914520090101440686332033956264171712726147972703435",
-            )
-            .unwrap(),
-            ark_bn254::Fq::from_str(
-                "8930092616903485317239646434389939466400752538134075201209141980838088395614",
-            )
-            .unwrap(),
-        );
-
-        let a_proj = ark_bn254::G2Projective::from(a);
-        let b_proj = ark_bn254::G2Projective::from(b);
-
-        let c = Bn254::multi_miller_loop([affine.neg(), w2], [a_proj, b_proj]).0;
-
-        let script = script! {
-            // push A1
-            { Fq::push_u32_le(&BigUint::from(affine.x().unwrap()).to_u32_digits()) }
-            { Fq::push_u32_le(&BigUint::from(affine.y().unwrap()).to_u32_digits()) }
-            { Fq::neg(0) }
-
-            // push W2
-            { Fq::push_dec("11695827642347470645483614914520090101440686332033956264171712726147972703435") }
-            { Fq::push_dec("8930092616903485317239646434389939466400752538134075201209141980838088395614") }
-
-            { dual_miller_loop.clone() }
-            { fq12_push(c) }
-            { Fq12::equalverify() }
-            OP_TRUE
-        };
-
-        println!("fflonk.checkpairing_miller_loop = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/checkpairing_normalize.rs b/src/fflonk/checkpairing_normalize.rs
deleted file mode 100644
index 6a7c8fc81..000000000
--- a/src/fflonk/checkpairing_normalize.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fr::Fr;
-    use crate::treepp::*;
-    use ark_ec::{AffineRepr, CurveGroup};
-    use ark_ff::Field;
-    use num_bigint::BigUint;
-    use std::str::FromStr;
-
-    #[test]
-    fn test_checkpairing_normalize() {
-        // note: this is not necessarily the point that the verifier obtains
-
-        let projective = ark_bn254::G1Projective::new(
-            ark_bn254::Fq::from_str(
-                "21025932300722401404248737517866966587837387913191004025854702115722286998035",
-            )
-            .unwrap(),
-            ark_bn254::Fq::from_str(
-                "5748766770337880144484917096976043621609890780406924686031233755006782215858",
-            )
-            .unwrap(),
-            ark_bn254::Fq::from_str(
-                "18747233771850556311508953762939425433543524671221692065979284256379095132287",
-            )
-            .unwrap(),
-        );
-        let affine = projective.into_affine();
-
-        let mut inv = ark_bn254::Fq::from_str(
-            "18747233771850556311508953762939425433543524671221692065979284256379095132287",
-        )
-        .unwrap();
-        inv.inverse_in_place().unwrap();
-
-        let script = script! {
-            { Fq::push_dec("21025932300722401404248737517866966587837387913191004025854702115722286998035") }
-            { Fq::push_dec("5748766770337880144484917096976043621609890780406924686031233755006782215858") }
-            { Fq::push_dec("18747233771850556311508953762939425433543524671221692065979284256379095132287") }
-
-            { Fq::inv() }
-
-            { Fq::copy(0) }
-            { Fq::square() }
-            { Fq::copy(0) } { Fr::toaltstack() }
-
-            { Fq::roll(3) }
-            { Fq::mul() }
-
-            { Fq::fromaltstack() }
-            { Fq::roll(2) }
-            { Fq::mul() }
-            { Fq::roll(2) }
-            { Fq::mul() }
-
-            // y
-            { Fq::push_u32_le(&BigUint::from(affine.y().unwrap()).to_u32_digits()) }
-            { Fq::equalverify(1, 0) }
-
-            // x
-            { Fq::push_u32_le(&BigUint::from(affine.x().unwrap()).to_u32_digits()) }
-            { Fq::equalverify(1, 0) }
-
-            OP_TRUE
-        };
-
-        println!("fflonk.checkpairing_normalize = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/checkpairing_with_c_wi.rs b/src/fflonk/checkpairing_with_c_wi.rs
deleted file mode 100644
index 38ab72070..000000000
--- a/src/fflonk/checkpairing_with_c_wi.rs
+++ /dev/null
@@ -1,230 +0,0 @@
-#[allow(non_snake_case)]
-#[cfg(test)]
-mod test {
-    use crate::bn254::ell_coeffs::G2Prepared;
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fq12::Fq12;
-    use crate::bn254::pairing::Pairing;
-    use crate::bn254::utils;
-    use crate::treepp::*;
-    use ark_bn254::Bn254;
-    use ark_ec::pairing::Pairing as ArkPairing;
-    use ark_ec::{AffineRepr, CurveGroup};
-    use ark_ff::{Field, One};
-    use ark_std::UniformRand;
-    use num_bigint::BigUint;
-    use num_traits::{Num, ToPrimitive};
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-    use std::ops::Neg;
-    use std::str::FromStr;
-
-    fn fq12_push(element: ark_bn254::Fq12) -> Script {
-        script! {
-            for elem in element.to_base_prime_field_elements() {
-                { Fq::push_u32_le(&BigUint::from(elem).to_u32_digits()) }
-           }
-        }
-    }
-
-    // refer table 3 of https://eprint.iacr.org/2009/457.pdf
-    // a: Fp12 which is cubic residue
-    // c: random Fp12 which is cubic non-residue
-    // s: satisfying p^12 - 1 = 3^s * t
-    // t: satisfying p^12 - 1 = 3^s * t
-    // k: k = (t + 1) // 3
-    fn tonelli_shanks_cubic(
-        a: ark_bn254::Fq12,
-        c: ark_bn254::Fq12,
-        s: u32,
-        t: BigUint,
-        k: BigUint,
-    ) -> ark_bn254::Fq12 {
-        let mut r = a.pow(t.to_u64_digits());
-        let e = 3_u32.pow(s - 1);
-        let exp = 3_u32.pow(s) * &t;
-
-        // compute cubic root of (a^t)^-1, say h
-        let (mut h, cc, mut c) = (
-            ark_bn254::Fq12::ONE,
-            c.pow([e as u64]),
-            c.inverse().unwrap(),
-        );
-        for i in 1..(s as i32) {
-            let delta = (s as i32) - i - 1;
-            let d = if delta < 0 {
-                r.pow((&exp / 3_u32.pow((-delta) as u32)).to_u64_digits())
-            } else {
-                r.pow([3_u32.pow(delta as u32).to_u64().unwrap()])
-            };
-            if d == cc {
-                (h, r) = (h * c, r * c.pow([3_u64]));
-            } else if d == cc.pow([2_u64]) {
-                (h, r) = (h * c.pow([2_u64]), r * c.pow([3_u64]).pow([2_u64]));
-            }
-            c = c.pow([3_u64])
-        }
-
-        // recover cubic root of a
-        r = a.pow(k.to_u64_digits()) * h;
-        if t == 3_u32 * k + 1_u32 {
-            r = r.inverse().unwrap();
-        }
-
-        assert_eq!(r.pow([3_u64]), a);
-        r
-    }
-
-    // refer from Algorithm 5 of "On Proving Pairings"(https://eprint.iacr.org/2024/640.pdf)
-    fn compute_c_wi(f: ark_bn254::Fq12) -> (ark_bn254::Fq12, ark_bn254::Fq12) {
-        let p = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap();
-        let r = BigUint::from_str(
-            "21888242871839275222246405745257275088548364400416034343698204186575808495617",
-        )
-        .unwrap();
-        let lambda = BigUint::from_str(
-            "10486551571378427818905133077457505975146652579011797175399169355881771981095211883813744499745558409789005132135496770941292989421431235276221147148858384772096778432243207188878598198850276842458913349817007302752534892127325269"
-        ).unwrap();
-        let s = 3_u32;
-        let exp = p.pow(12_u32) - 1_u32;
-        let h = &exp / &r;
-        let t = &exp / 3_u32.pow(s);
-        let k = (&t + 1_u32) / 3_u32;
-        let m = &lambda / &r;
-        let d = 3_u32;
-        let mm = &m / d;
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        let cofactor_cubic = 3_u32.pow(s - 1) * &t;
-
-        // make f is r-th residue, but it's not cubic residue
-        assert_eq!(f.pow(h.to_u64_digits()), ark_bn254::Fq12::ONE);
-        assert_ne!(f.pow(cofactor_cubic.to_u64_digits()), ark_bn254::Fq12::ONE);
-
-        // sample a proper scalar w which is cubic non-residue
-        let w = {
-            let (mut w, mut z) = (ark_bn254::Fq12::ONE, ark_bn254::Fq12::ONE);
-            while w == ark_bn254::Fq12::ONE {
-                // choose z which is 3-th non-residue
-                let mut legendre = ark_bn254::Fq12::ONE;
-                while legendre == ark_bn254::Fq12::ONE {
-                    z = ark_bn254::Fq12::rand(&mut prng);
-                    legendre = z.pow(cofactor_cubic.to_u64_digits());
-                }
-                // obtain w which is t-th power of z
-                w = z.pow(t.to_u64_digits());
-            }
-            w
-        };
-        // make sure 27-th root w, is 3-th non-residue and r-th residue
-        assert_ne!(w.pow(cofactor_cubic.to_u64_digits()), ark_bn254::Fq12::ONE);
-        assert_eq!(w.pow(h.to_u64_digits()), ark_bn254::Fq12::ONE);
-
-        // just two option, w and w^2, since w^3 must be cubic residue, leading f*w^3 must not be cubic residue
-        let mut wi = w;
-        if (f * wi).pow(cofactor_cubic.to_u64_digits()) != ark_bn254::Fq12::ONE {
-            assert_eq!(
-                (f * w * w).pow(cofactor_cubic.to_u64_digits()),
-                ark_bn254::Fq12::ONE
-            );
-            wi = w * w;
-        }
-        assert_eq!(wi.pow(h.to_u64_digits()), ark_bn254::Fq12::ONE);
-
-        assert_eq!(lambda, &d * &mm * &r);
-        // f1 is scaled f
-        let f1 = f * wi;
-
-        // r-th root of f1, say f2
-        let r_inv = r.modinv(&h).unwrap();
-        assert_ne!(r_inv, BigUint::one());
-        let f2 = f1.pow(r_inv.to_u64_digits());
-        assert_ne!(f2, ark_bn254::Fq12::ONE);
-
-        // m'-th root of f, say f3
-        let mm_inv = mm.modinv(&(r * h)).unwrap();
-        assert_ne!(mm_inv, BigUint::one());
-        let f3 = f2.pow(mm_inv.to_u64_digits());
-        assert_eq!(f3.pow(cofactor_cubic.to_u64_digits()), ark_bn254::Fq12::ONE);
-        assert_ne!(f3, ark_bn254::Fq12::ONE);
-
-        // d-th (cubic) root, say c
-        let c = tonelli_shanks_cubic(f3, w, s, t, k);
-        assert_ne!(c, ark_bn254::Fq12::ONE);
-        assert_eq!(c.pow(lambda.to_u64_digits()), f * wi);
-
-        (c, wi)
-    }
-
-    #[test]
-    fn test_checkpairing_with_c_wi() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        // exp = 6x + 2 + p - p^2 = lambda - p^3
-        let p_pow3 = &BigUint::from_str_radix(Fq::MODULUS, 16).unwrap().pow(3_u32);
-        let lambda = BigUint::from_str(
-                        "10486551571378427818905133077457505975146652579011797175399169355881771981095211883813744499745558409789005132135496770941292989421431235276221147148858384772096778432243207188878598198850276842458913349817007302752534892127325269"
-                    ).unwrap();
-        let (exp, sign) = if lambda > *p_pow3 {
-            (lambda - p_pow3, true)
-        } else {
-            (p_pow3 - lambda, false)
-        };
-
-        // prove e(P1, Q1) = e(P2, Q2)
-        // namely e(-P1, Q1) * e(P2, Q2) = 1
-        let P1 = ark_bn254::G1Affine::rand(&mut prng);
-        let Q2 = ark_bn254::g2::G2Affine::rand(&mut prng);
-        let factor = [3_u64];
-        let P2 = P1.mul_bigint(factor).into_affine();
-        let Q1 = Q2.mul_bigint(factor).into_affine();
-        let Q1_prepared = G2Prepared::from_affine(Q1);
-        let Q2_prepared = G2Prepared::from_affine(Q2);
-
-        // f^{lambda - p^3} * wi = c^lambda
-        // benchmark(arkworks): multi miller loop with projective cooordinates of line functions
-        let f = Bn254::multi_miller_loop_affine([P1.neg(), P2], [Q1, Q2]).0;
-        println!("Bn254::multi_miller_loop done!");
-        let (c, wi) = compute_c_wi(f);
-        let c_inv = c.inverse().unwrap();
-        // equivalently (f * c_inv)^{lambda - p^3} * wi = c_inv^{-p^3} = c^{p^3}
-        let hint = if sign {
-            f * wi * (c_inv.pow(exp.to_u64_digits()))
-        } else {
-            f * wi * (c_inv.pow(exp.to_u64_digits()).inverse().unwrap())
-        };
-        println!("Accumulated f done!");
-        assert_eq!(hint, c.pow(p_pow3.to_u64_digits()));
-
-        // miller loop script
-        let dual_miller_loop_with_c_wi =
-            Pairing::dual_miller_loop_with_c_wi(&Q1_prepared, &Q2_prepared, true);
-        println!(
-            "Pairing.dual_miller_loop_with_c_wi: {} bytes",
-            dual_miller_loop_with_c_wi.len()
-        );
-
-        // input on stack :
-        //      [-P1.neg.x / P1.neg.y, 1 / P1.neg.y, -P2.x / P2.y, 1 / P2.y, c, c_inv, wi]
-        // input of script func (parameters):
-        //      Vec[(c0, c3, c4)]
-        //      Vec[(c0, c3, c4)]
-        let script = script! {
-            { utils::from_eval_point(P1.neg()) }
-            // [-P1.neg.x / P1.neg.y, 1 / P1.neg.y]
-            { utils::from_eval_point(P2) }
-            // [-P1.neg.x / P1.neg.y, 1 / P1.neg.y, -P2.x / P2.y, 1 / P2.y]
-            { fq12_push(c) }
-            { fq12_push(c_inv) }
-            { fq12_push(wi) }
-            { dual_miller_loop_with_c_wi.clone() }
-            { fq12_push(hint) }
-            { Fq12::equalverify() }
-            OP_TRUE
-        };
-        println!("fflonk.checkpairing_miller_loop = {} bytes", script.len());
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/checkpairing_zerotest.rs b/src/fflonk/checkpairing_zerotest.rs
deleted file mode 100644
index ceb5052a1..000000000
--- a/src/fflonk/checkpairing_zerotest.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fq12::Fq12;
-    use crate::treepp::*;
-    use ark_ec::pairing::Pairing;
-    use ark_ec::CurveGroup;
-    use ark_ff::{CyclotomicMultSubgroup, Field};
-    use ark_std::UniformRand;
-    use bitcoin_script::script;
-    use num_bigint::BigUint;
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-    use std::ops::{Mul, Neg};
-    use std::str::FromStr;
-
-    fn fq12_push(element: ark_bn254::Fq12) -> Script {
-        script! {
-            for elem in element.to_base_prime_field_elements() {
-                { Fq::push_u32_le(&BigUint::from(elem).to_u32_digits()) }
-           }
-        }
-    }
-
-    #[test]
-    fn test_checkpairing_zerotest() {
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-
-        let x = ark_bn254::fr::Fr::rand(&mut prng);
-
-        let a = ark_bn254::g1::G1Affine::rand(&mut prng);
-        let b = ark_bn254::g2::G2Affine::rand(&mut prng);
-
-        let ax = a.mul(&x).into_affine();
-        let bx = b.mul(&x).into_affine();
-
-        let c = ark_bn254::Bn254::multi_miller_loop_affine([a.neg(), ax], [bx, b]).0;
-
-        let c_cyc = {
-            let f1 = c.cyclotomic_inverse().unwrap();
-
-            let mut f2 = c.inverse().unwrap();
-            let mut r = f1.mul(&f2);
-            f2 = r;
-
-            r.frobenius_map_in_place(2);
-
-            r *= f2;
-            r
-        };
-
-        let exp = BigUint::from_str("4436617972506257923193419177489456460765748607520165056184824179968964824433551145989002390683181468014844846405056222620624959232531272028933759852593591675750731194524123260979423353851618673937937363358520803481826312825518387").unwrap();
-        let hint = c_cyc.cyclotomic_exp(exp.to_u64_digits());
-
-        let r = BigUint::from_str(
-            "21888242871839275222246405745257275088548364400416034343698204186575808495617",
-        )
-        .unwrap();
-        let res = hint.cyclotomic_exp(r.to_u64_digits());
-
-        assert_eq!(res, c_cyc);
-
-        let script = script! {
-            // push the hint
-            { fq12_push(hint) }
-
-            // push c
-            { fq12_push(c) }
-
-            // make c cyclotomic
-            { Fq12::move_to_cyclotomic() }
-
-            // check that the hint is cyclotomic
-            { Fq12::roll(12) }
-            { Fq12::cyclotomic_verify_in_place() }
-
-            // power the hint by r
-            { Fq12::cyclotomic_pow_by_r() }
-
-            // check equality
-            { Fq12::equalverify() }
-
-            OP_TRUE
-        };
-
-        println!("fflonk.checkpairing_zerotest = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/circom_ref/input.json b/src/fflonk/circom_ref/input.json
deleted file mode 100644
index ac97eb74f..000000000
--- a/src/fflonk/circom_ref/input.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "in": [1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0] }
\ No newline at end of file
diff --git a/src/fflonk/circom_ref/proof.json b/src/fflonk/circom_ref/proof.json
deleted file mode 100644
index 00e4e92af..000000000
--- a/src/fflonk/circom_ref/proof.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "polynomials": {
-  "C1": [
-   "8993820735255461694205287896466659762517378169680151817278189507219986014273",
-   "20608602847008036615737932995836476570376266531776948091942386633580114403199",
-   "1"
-  ],
-  "C2": [
-   "7381325072443970270370678023564870071058744625357849943766655609499175274412",
-   "15178578915928592705383893120230835636411008017183180871962629962483134367891",
-   "1"
-  ],
-  "W1": [
-   "32650538602400348219903702316313439265244325226254563471430382441955222030",
-   "1102261574488401129043229793384018650738538286437537952751903719159654317199",
-   "1"
-  ],
-  "W2": [
-   "11695827642347470645483614914520090101440686332033956264171712726147972703435",
-   "8930092616903485317239646434389939466400752538134075201209141980838088395614",
-   "1"
-  ]
- },
- "evaluations": {
-  "ql": "4305584171954448775801758618991977283131671407134816099015723841718827300684",
-  "qr": "12383383973686840675128398394454489421896122330596726461131121746926747341189",
-  "qm": "84696450614978050680673343346456326547032107368333805624994614151289555853",
-  "qo": "3940439340424631873531863239669720717811550024514867065774687720368464792371",
-  "qc": "16961785810060156933739931986193776143069216115530808410139185289490606944009",
-  "s1": "12474437127153975801320290893919924661315458586210754316226946498711086665749",
-  "s2": "599434615255095347665395089945860172292558760398201299457995057871688253664",
-  "s3": "16217604511932175446614838218599989473511950977205890369538297955449224727219",
-  "a": "7211168621666826182043583595845418959530786367587156242724929610231435505336",
-  "b": "848088075173937026388846472327431819307508078325359401333033359624801042",
-  "c": "18963734392470978715233675860777231227480937309534365140504133190694875258320",
-  "z": "2427313569771756255376235777000596702684056445296844486767054635200432142794",
-  "zw": "8690328511114991742730387856275843464438882369629727414507275814599493141660",
-  "t1w": "20786626696833495453279531623626288211765949258916047124642669459480728122908",
-  "t2w": "12092130080251498309415337127155404037148503145602589831662396526189421234148",
-  "inv": "21247383512588455895834686692756529012394058115069710447132959660051940541361"
- },
- "protocol": "fflonk",
- "curve": "bn128"
-}
\ No newline at end of file
diff --git a/src/fflonk/circom_ref/public.json b/src/fflonk/circom_ref/public.json
deleted file mode 100644
index 2441a49fc..000000000
--- a/src/fflonk/circom_ref/public.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
- "246513590391103489634602289097178521809",
- "138371009144214353742010089705444713455"
-]
\ No newline at end of file
diff --git a/src/fflonk/circom_ref/test_circuit.circom b/src/fflonk/circom_ref/test_circuit.circom
deleted file mode 100644
index 67ae7b883..000000000
--- a/src/fflonk/circom_ref/test_circuit.circom
+++ /dev/null
@@ -1,28 +0,0 @@
-pragma circom 2.0.0;
-
-include "circomlib/circuits/sha256/sha256.circom";
-include "circomlib/circuits/bitify.circom";
-
-template Main() {
-    signal input in[256]; // private
-
-    signal output out_1;
-    signal output out_2;
-
-    component sha256 = Sha256(256);
-    sha256.in <== in;
-
-    component b2n_1 = Bits2Num(128);
-    for(var i = 0; i < 128; i++) {
-        b2n_1.in[i] <== sha256.out[i];
-    }
-    out_1 <== b2n_1.out;
-
-    component b2n_2 = Bits2Num(128);
-    for(var i = 0; i < 128; i++) {
-        b2n_2.in[i] <== sha256.out[128 + i];
-    }
-    out_2 <== b2n_2.out;
-}
-
-component main = Main();
\ No newline at end of file
diff --git a/src/fflonk/circom_ref/verification_key.json b/src/fflonk/circom_ref/verification_key.json
deleted file mode 100644
index 34ae13031..000000000
--- a/src/fflonk/circom_ref/verification_key.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "protocol": "fflonk",
- "curve": "bn128",
- "nPublic": 2,
- "power": 18,
- "k1": "2",
- "k2": "3",
- "w": "11699596668367776675346610687704220591435078791727316319397053191800576917728",
- "w3": "21888242871839275217838484774961031246154997185409878258781734729429964517155",
- "w4": "21888242871839275217838484774961031246007050428528088939761107053157389710902",
- "w8": "19540430494807482326159819597004422086093766032135589407132600596362845576832",
- "wr": "19699792133865984655632994927951174943026102279822605383822362801478354085676",
- "X_2": [
-  [
-   "21831381940315734285607113342023901060522397560371972897001948545212302161822",
-   "17231025384763736816414546592865244497437017442647097510447326538965263639101"
-  ],
-  [
-   "2388026358213174446665280700919698872609886601280537296205114254867301080648",
-   "11507326595632554467052522095592665270651932854513688777769618397986436103170"
-  ],
-  [
-   "1",
-   "0"
-  ]
- ],
- "C0": [
-  "303039279492065453055049758769758984569666029850327527958551993331680103359",
-  "15061669176783843627135305167141360334623983780813847469326507992811672859575",
-  "1"
- ]
-}
\ No newline at end of file
diff --git a/src/fflonk/circom_ref/verifier.sol b/src/fflonk/circom_ref/verifier.sol
deleted file mode 100644
index 4f3ea8211..000000000
--- a/src/fflonk/circom_ref/verifier.sol
+++ /dev/null
@@ -1,1254 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-/*
-    Copyright 2021 0KIMS association.
-
-    This file is generated with [snarkJS](https://github.com/iden3/snarkjs).
-
-    snarkJS is a free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    snarkJS is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-    or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
-    License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with snarkJS. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-pragma solidity >=0.7.0 <0.9.0;
-
-contract FflonkVerifier {
-    uint32 constant n     = 262144; // Domain size
-
-    // Verification Key data
-    uint256 constant k1   = 2;   // Plonk k1 multiplicative factor to force distinct cosets of H
-    uint256 constant k2   = 3;   // Plonk k2 multiplicative factor to force distinct cosets of H
-
-    // OMEGAS
-    // Omega, Omega^{1/3}
-    uint256 constant w1   = 11699596668367776675346610687704220591435078791727316319397053191800576917728;
-    uint256 constant wr   = 19699792133865984655632994927951174943026102279822605383822362801478354085676;
-    // Omega_3, Omega_3^2
-    uint256 constant w3   = 21888242871839275217838484774961031246154997185409878258781734729429964517155;
-    uint256 constant w3_2 = 4407920970296243842393367215006156084916469457145843978461;
-    // Omega_4, Omega_4^2, Omega_4^3
-    uint256 constant w4   = 21888242871839275217838484774961031246007050428528088939761107053157389710902;
-    uint256 constant w4_2 = 21888242871839275222246405745257275088548364400416034343698204186575808495616;
-    uint256 constant w4_3 = 4407920970296243842541313971887945403937097133418418784715;
-    // Omega_8, Omega_8^2, Omega_8^3, Omega_8^4, Omega_8^5, Omega_8^6, Omega_8^7
-    uint256 constant w8_1 = 19540430494807482326159819597004422086093766032135589407132600596362845576832;
-    uint256 constant w8_2 = 21888242871839275217838484774961031246007050428528088939761107053157389710902;
-    uint256 constant w8_3 = 13274704216607947843011480449124596415239537050559949017414504948711435969894;
-    uint256 constant w8_4 = 21888242871839275222246405745257275088548364400416034343698204186575808495616;
-    uint256 constant w8_5 = 2347812377031792896086586148252853002454598368280444936565603590212962918785;
-    uint256 constant w8_6 = 4407920970296243842541313971887945403937097133418418784715;
-    uint256 constant w8_7 = 8613538655231327379234925296132678673308827349856085326283699237864372525723;
-
-    // Verifier preprocessed input C_0(x)·[1]_1
-    uint256 constant C0x  = 303039279492065453055049758769758984569666029850327527958551993331680103359;
-    uint256 constant C0y  = 15061669176783843627135305167141360334623983780813847469326507992811672859575;
-
-    // Verifier preprocessed input x·[1]_2
-    uint256 constant X2x1 = 21831381940315734285607113342023901060522397560371972897001948545212302161822;
-    uint256 constant X2x2 = 17231025384763736816414546592865244497437017442647097510447326538965263639101;
-    uint256 constant X2y1 = 2388026358213174446665280700919698872609886601280537296205114254867301080648;
-    uint256 constant X2y2 = 11507326595632554467052522095592665270651932854513688777769618397986436103170;
-
-    // Scalar field size
-    uint256 constant q    = 21888242871839275222246405745257275088548364400416034343698204186575808495617;
-    // Base field size
-    uint256 constant qf   = 21888242871839275222246405745257275088696311157297823662689037894645226208583;
-    // [1]_1
-    uint256 constant G1x  = 1;
-    uint256 constant G1y  = 2;
-    // [1]_2
-    uint256 constant G2x1 = 10857046999023057135944570762232829481370756359578518086990519993285655852781;
-    uint256 constant G2x2 = 11559732032986387107991004021392285783925812861821192530917403151452391805634;
-    uint256 constant G2y1 = 8495653923123431417604973247489272438418190587263600148770280649306958101930;
-    uint256 constant G2y2 = 4082367875863433681332203403145435568316851327593401208105741076214120093531;
-
-    // Proof calldata
-    // Byte offset of every parameter of the calldata
-    // Polynomial commitments
-    uint16 constant pC1       = 4 + 0;     // [C1]_1
-    uint16 constant pC2       = 4 + 32*2;  // [C2]_1
-    uint16 constant pW1       = 4 + 32*4;  // [W]_1
-    uint16 constant pW2       = 4 + 32*6;  // [W']_1
-    // Opening evaluations
-    uint16 constant pEval_ql  = 4 + 32*8;  // q_L(xi)
-    uint16 constant pEval_qr  = 4 + 32*9;  // q_R(xi)
-    uint16 constant pEval_qm  = 4 + 32*10; // q_M(xi)
-    uint16 constant pEval_qo  = 4 + 32*11; // q_O(xi)
-    uint16 constant pEval_qc  = 4 + 32*12; // q_C(xi)
-    uint16 constant pEval_s1  = 4 + 32*13; // S_{sigma_1}(xi)
-    uint16 constant pEval_s2  = 4 + 32*14; // S_{sigma_2}(xi)
-    uint16 constant pEval_s3  = 4 + 32*15; // S_{sigma_3}(xi)
-    uint16 constant pEval_a   = 4 + 32*16; // a(xi)
-    uint16 constant pEval_b   = 4 + 32*17; // b(xi)
-    uint16 constant pEval_c   = 4 + 32*18; // c(xi)
-    uint16 constant pEval_z   = 4 + 32*19; // z(xi)
-    uint16 constant pEval_zw  = 4 + 32*20; // z_omega(xi)
-    uint16 constant pEval_t1w = 4 + 32*21; // T_1(xi omega)
-    uint16 constant pEval_t2w = 4 + 32*22; // T_2(xi omega)
-    uint16 constant pEval_inv = 4 + 32*23; // inv(batch) sent by the prover to avoid any inverse calculation to save gas,
-                                           // we check the correctness of the inv(batch) by computing batch
-                                           // and checking inv(batch) * batch == 1
-
-    // Memory data
-    // Challenges
-    uint16 constant pAlpha   = 0;   // alpha challenge
-    uint16 constant pBeta    = 32;  // beta challenge
-    uint16 constant pGamma   = 64;  // gamma challenge
-    uint16 constant pY       = 96;  // y challenge
-    uint16 constant pXiSeed  = 128; // xi seed, from this value we compute xi = xiSeed^24
-    uint16 constant pXiSeed2 = 160; // (xi seed)^2
-    uint16 constant pXi      = 192; // xi challenge
-
-    // Roots
-    // S_0 = roots_8(xi) = { h_0, h_0w_8, h_0w_8^2, h_0w_8^3, h_0w_8^4, h_0w_8^5, h_0w_8^6, h_0w_8^7 }
-    uint16 constant pH0w8_0 = 224;
-    uint16 constant pH0w8_1 = 256;
-    uint16 constant pH0w8_2 = 288;
-    uint16 constant pH0w8_3 = 320;
-    uint16 constant pH0w8_4 = 352;
-    uint16 constant pH0w8_5 = 384;
-    uint16 constant pH0w8_6 = 416;
-    uint16 constant pH0w8_7 = 448;
-
-    // S_1 = roots_4(xi) = { h_1, h_1w_4, h_1w_4^2, h_1w_4^3 }
-    uint16 constant pH1w4_0 = 480;
-    uint16 constant pH1w4_1 = 512;
-    uint16 constant pH1w4_2 = 544;
-    uint16 constant pH1w4_3 = 576;
-
-    // S_2 = roots_3(xi) U roots_3(xi omega)
-    // roots_3(xi) = { h_2, h_2w_3, h_2w_3^2 }
-    uint16 constant pH2w3_0 = 608;
-    uint16 constant pH2w3_1 = 640;
-    uint16 constant pH2w3_2 = 672;
-    // roots_3(xi omega) = { h_3, h_3w_3, h_3w_3^2 }
-    uint16 constant pH3w3_0 = 704;
-    uint16 constant pH3w3_1 = 736;
-    uint16 constant pH3w3_2 = 768;
-
-    uint16 constant pPi     = 800; // PI(xi)
-    uint16 constant pR0     = 832; // r0(y)
-    uint16 constant pR1     = 864; // r1(y)
-    uint16 constant pR2     = 896; // r2(y)
-
-    uint16 constant pF      = 928;  // [F]_1, 64 bytes
-    uint16 constant pE      = 992;  // [E]_1, 64 bytes
-    uint16 constant pJ      = 1056; // [J]_1, 64 bytes
-
-    uint16 constant pZh     = 1184; // Z_H(xi)
-    // From this point we write all the variables that must be computed using the Montgomery batch inversion
-    uint16 constant pZhInv  = 1216; // 1/Z_H(xi)
-    uint16 constant pDenH1  = 1248; // 1/( (y-h_1w_4) (y-h_1w_4^2) (y-h_1w_4^3) (y-h_1w_4^4) )
-    uint16 constant pDenH2  = 1280; // 1/( (y-h_2w_3) (y-h_2w_3^2) (y-h_2w_3^3) (y-h_3w_3) (y-h_3w_3^2) (y-h_3w_3^3) )
-    uint16 constant pLiS0Inv = 1312; // Reserve 8 * 32 bytes to compute r_0(X)
-    uint16 constant pLiS1Inv = 1568; // Reserve 4 * 32 bytes to compute r_1(X)
-    uint16 constant pLiS2Inv = 1696; // Reserve 6 * 32 bytes to compute r_2(X)
-    // Lagrange evaluations
-    
-    uint16 constant pEval_l1 = 1888;
-    
-    uint16 constant pEval_l2 = 1920;
-    
-    
-    uint16 constant lastMem = 1952;
-     
-
-    function verifyProof(bytes32[24] calldata proof, uint256[2] calldata pubSignals) public view returns (bool) {
-        assembly {
-            // Computes the inverse of an array of values
-            // See https://vitalik.ca/general/2018/07/21/starks_part_3.html in section where explain fields operations
-            // To save the inverse to be computed on chain the prover sends the inverse as an evaluation in commits.eval_inv
-            function inverseArray(pMem) {
-
-                let pAux := mload(0x40)     // Point to the next free position
-                let acc := mload(add(pMem,pZhInv))       // Read the first element
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, pDenH1)), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, pDenH2)), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, pLiS0Inv)), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 32))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 64))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 96))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 128))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 160))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 192))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 224))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, pLiS1Inv)), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS1Inv, 32))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS1Inv, 64))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS1Inv, 96))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, pLiS2Inv)), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS2Inv, 32))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS2Inv, 64))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS2Inv, 96))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS2Inv, 128))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS2Inv, 160))), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, pEval_l1)), q)
-                mstore(pAux, acc)
-
-                pAux := add(pAux, 32)
-                acc := mulmod(acc, mload(add(pMem, pEval_l2)), q)
-                mstore(pAux, acc)
-
-
-                let inv := calldataload(pEval_inv)
-
-                // Before using the inverse sent by the prover the verifier checks inv(batch) * batch === 1
-                if iszero(eq(1, mulmod(acc, inv, q))) {
-                    mstore(0, 0)
-                    return(0,0x20)
-                }
-
-                acc := inv
-
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, pEval_l2)), q)
-                mstore(add(pMem, pEval_l2), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, pEval_l1)), q)
-                mstore(add(pMem, pEval_l1), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS2Inv, 160))), q)
-                mstore(add(pMem, add(pLiS2Inv, 160)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS2Inv, 128))), q)
-                mstore(add(pMem, add(pLiS2Inv, 128)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS2Inv, 96))), q)
-                mstore(add(pMem, add(pLiS2Inv, 96)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS2Inv, 64))), q)
-                mstore(add(pMem, add(pLiS2Inv, 64)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS2Inv, 32))), q)
-                mstore(add(pMem, add(pLiS2Inv, 32)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, pLiS2Inv)), q)
-                mstore(add(pMem, pLiS2Inv), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS1Inv, 96))), q)
-                mstore(add(pMem, add(pLiS1Inv, 96)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS1Inv, 64))), q)
-                mstore(add(pMem, add(pLiS1Inv, 64)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS1Inv, 32))), q)
-                mstore(add(pMem, add(pLiS1Inv, 32)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, pLiS1Inv)), q)
-                mstore(add(pMem, pLiS1Inv), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 224))), q)
-                mstore(add(pMem, add(pLiS0Inv, 224)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 192))), q)
-                mstore(add(pMem, add(pLiS0Inv, 192)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 160))), q)
-                mstore(add(pMem, add(pLiS0Inv, 160)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 128))), q)
-                mstore(add(pMem, add(pLiS0Inv, 128)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 96))), q)
-                mstore(add(pMem, add(pLiS0Inv, 96)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 64))), q)
-                mstore(add(pMem, add(pLiS0Inv, 64)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, add(pLiS0Inv, 32))), q)
-                mstore(add(pMem, add(pLiS0Inv, 32)), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, pLiS0Inv)), q)
-                mstore(add(pMem, pLiS0Inv), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, pDenH2)), q)
-                mstore(add(pMem, pDenH2), inv)
-                pAux := sub(pAux, 32)
-                inv := mulmod(acc, mload(pAux), q)
-                acc := mulmod(acc, mload(add(pMem, pDenH1)), q)
-                mstore(add(pMem, pDenH1), inv)
-
-                mstore(add(pMem, pZhInv), acc)
-            }
-
-            function checkField(v) {
-                if iszero(lt(v, q)) {
-                    mstore(0, 0)
-                    return(0, 0x20)
-                }
-            }
-
-            function checkPointBelongsToBN128Curve(p) {
-                let x := calldataload(p)
-                let y := calldataload(add(p, 32))
-
-                // Check that the point is on the curve
-                // y^2 = x^3 + 3
-                let x3_3 := addmod(mulmod(x, mulmod(x, x, qf), qf), 3, qf)
-                let y2 := mulmod(y, y, qf)
-
-                if iszero(eq(x3_3, y2)) {
-                    mstore(0, 0)
-                    return(0, 0x20)
-                }
-            }  
-            
-            // Validate all the evaluations sent by the prover ∈ F
-            function checkInput() {
-                // Check proof commitments fullfill bn128 curve equation Y^2 = X^3 + 3
-                checkPointBelongsToBN128Curve(pC1)
-                checkPointBelongsToBN128Curve(pC2)
-                checkPointBelongsToBN128Curve(pW1)
-                checkPointBelongsToBN128Curve(pW2)
-
-                checkField(calldataload(pEval_ql))
-                checkField(calldataload(pEval_qr))
-                checkField(calldataload(pEval_qm))
-                checkField(calldataload(pEval_qo))
-                checkField(calldataload(pEval_qc))
-                checkField(calldataload(pEval_s1))
-                checkField(calldataload(pEval_s2))
-                checkField(calldataload(pEval_s3))
-                checkField(calldataload(pEval_a))
-                checkField(calldataload(pEval_b))
-                checkField(calldataload(pEval_c))
-                checkField(calldataload(pEval_z))
-                checkField(calldataload(pEval_zw))
-                checkField(calldataload(pEval_t1w))
-                checkField(calldataload(pEval_t2w))
-                checkField(calldataload(pEval_inv))
-
-                // Points are checked in the point operations precompiled smart contracts
-            }
-
-            function computeChallenges(pMem, pPublic) {
-                // Compute challenge.beta & challenge.gamma
-                mstore(add(pMem, 1952 ), C0x)
-                mstore(add(pMem, 1984 ), C0y)
-
-                mstore(add(pMem, 2016), calldataload(pPublic))
-                
-                mstore(add(pMem, 2048 ), calldataload(add(pPublic, 32)))
-                
-                
-
-                mstore(add(pMem, 2080 ),  calldataload(pC1))
-                mstore(add(pMem, 2112 ),  calldataload(add(pC1, 32)))
-
-                mstore(add(pMem, pBeta),  mod(keccak256(add(pMem, lastMem), 192), q))
-                mstore(add(pMem, pGamma), mod(keccak256(add(pMem, pBeta), 32), q))
-
-                // Get xiSeed & xiSeed2
-                mstore(add(pMem, lastMem), mload(add(pMem, pGamma)))
-                mstore(add(pMem, 1984), calldataload(pC2))
-                mstore(add(pMem, 2016), calldataload(add(pC2, 32)))
-                let xiSeed := mod(keccak256(add(pMem, lastMem), 96), q)
-
-                mstore(add(pMem, pXiSeed), xiSeed)
-                mstore(add(pMem, pXiSeed2), mulmod(xiSeed, xiSeed, q))
-
-                // Compute roots.S0.h0w8
-                mstore(add(pMem, pH0w8_0), mulmod(mload(add(pMem, pXiSeed2)), mload(add(pMem, pXiSeed)), q))
-                mstore(add(pMem, pH0w8_1), mulmod(mload(add(pMem, pH0w8_0)), w8_1, q))
-                mstore(add(pMem, pH0w8_2), mulmod(mload(add(pMem, pH0w8_0)), w8_2, q))
-                mstore(add(pMem, pH0w8_3), mulmod(mload(add(pMem, pH0w8_0)), w8_3, q))
-                mstore(add(pMem, pH0w8_4), mulmod(mload(add(pMem, pH0w8_0)), w8_4, q))
-                mstore(add(pMem, pH0w8_5), mulmod(mload(add(pMem, pH0w8_0)), w8_5, q))
-                mstore(add(pMem, pH0w8_6), mulmod(mload(add(pMem, pH0w8_0)), w8_6, q))
-                mstore(add(pMem, pH0w8_7), mulmod(mload(add(pMem, pH0w8_0)), w8_7, q))
-
-                // Compute roots.S1.h1w4
-                mstore(add(pMem, pH1w4_0), mulmod(mload(add(pMem, pH0w8_0)), mload(add(pMem, pH0w8_0)), q))
-                mstore(add(pMem, pH1w4_1), mulmod(mload(add(pMem, pH1w4_0)), w4, q))
-                mstore(add(pMem, pH1w4_2), mulmod(mload(add(pMem, pH1w4_0)), w4_2, q))
-                mstore(add(pMem, pH1w4_3), mulmod(mload(add(pMem, pH1w4_0)), w4_3, q))
-
-                // Compute roots.S2.h2w3
-                mstore(add(pMem, pH2w3_0), mulmod(mload(add(pMem, pH1w4_0)), mload(add(pMem, pXiSeed2)), q))
-                mstore(add(pMem, pH2w3_1), mulmod(mload(add(pMem, pH2w3_0)), w3, q))
-                mstore(add(pMem, pH2w3_2), mulmod(mload(add(pMem, pH2w3_0)), w3_2, q))
-
-                // Compute roots.S2.h2w3
-                mstore(add(pMem, pH3w3_0), mulmod(mload(add(pMem, pH2w3_0)), wr, q))
-                mstore(add(pMem, pH3w3_1), mulmod(mload(add(pMem, pH3w3_0)), w3, q))
-                mstore(add(pMem, pH3w3_2), mulmod(mload(add(pMem, pH3w3_0)), w3_2, q))
-
-                let xin := mulmod(mulmod(mload(add(pMem, pH2w3_0)), mload(add(pMem, pH2w3_0)), q), mload(add(pMem, pH2w3_0)), q)
-                mstore(add(pMem, pXi), xin)
-
-                // Compute xi^n
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                xin:= mulmod(xin, xin, q)
-                
-                
-                xin:= mod(add(sub(xin, 1), q), q)
-                mstore(add(pMem, pZh), xin)
-                mstore(add(pMem, pZhInv), xin)  // We will invert later together with lagrange pols
-
-                // Compute challenge.alpha
-                mstore(add(pMem, lastMem), xiSeed)
-
-                calldatacopy(add(pMem, 1984), pEval_ql, 480)
-                mstore(add(pMem, pAlpha), mod(keccak256(add(pMem, lastMem), 512), q))
-
-                // Compute challenge.y
-                mstore(add(pMem, lastMem), mload(add(pMem, pAlpha)))
-                mstore(add(pMem, 1984 ),  calldataload(pW1))
-                mstore(add(pMem, 2016 ),  calldataload(add(pW1, 32)))
-                mstore(add(pMem, pY), mod(keccak256(add(pMem, lastMem), 96), q))
-            }
-
-            function computeLiS0(pMem) {
-                let root0 := mload(add(pMem, pH0w8_0))
-                let y := mload(add(pMem, pY))
-                let den1 := 1
-                den1 := mulmod(den1, root0, q)
-                den1 := mulmod(den1, root0, q)
-                den1 := mulmod(den1, root0, q)
-                den1 := mulmod(den1, root0, q)
-                den1 := mulmod(den1, root0, q)
-                den1 := mulmod(den1, root0, q)
-                
-                den1 := mulmod(8, den1, q)
-
-                let den2 := mload(add(pMem, add(pH0w8_0, mul(mod(mul(7, 0), 8), 32))))
-                let den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH0w8_0, mul(0, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS0Inv, 0)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH0w8_0, mul(mod(mul(7, 1), 8), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH0w8_0, mul(1, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS0Inv, 32)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH0w8_0, mul(mod(mul(7, 2), 8), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH0w8_0, mul(2, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS0Inv, 64)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH0w8_0, mul(mod(mul(7, 3), 8), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH0w8_0, mul(3, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS0Inv, 96)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH0w8_0, mul(mod(mul(7, 4), 8), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH0w8_0, mul(4, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS0Inv, 128)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH0w8_0, mul(mod(mul(7, 5), 8), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH0w8_0, mul(5, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS0Inv, 160)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH0w8_0, mul(mod(mul(7, 6), 8), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH0w8_0, mul(6, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS0Inv, 192)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH0w8_0, mul(mod(mul(7, 7), 8), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH0w8_0, mul(7, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS0Inv, 224)), mulmod(den1, mulmod(den2, den3, q), q))
-            
-            }
-
-            function computeLiS1(pMem) {
-                let root0 := mload(add(pMem, pH1w4_0))
-                let y := mload(add(pMem, pY))
-                let den1 := 1
-                den1 := mulmod(den1, root0, q)
-                den1 := mulmod(den1, root0, q)
-                
-                den1 := mulmod(4, den1, q)
-
-                let den2 := mload(add(pMem, add(pH1w4_0, mul(mod(mul(3, 0), 4), 32))))
-                let den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH1w4_0, mul(0, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS1Inv, 0)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH1w4_0, mul(mod(mul(3, 1), 4), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH1w4_0, mul(1, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS1Inv, 32)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH1w4_0, mul(mod(mul(3, 2), 4), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH1w4_0, mul(2, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS1Inv, 64)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH1w4_0, mul(mod(mul(3, 3), 4), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH1w4_0, mul(3, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS1Inv, 96)), mulmod(den1, mulmod(den2, den3, q), q))            
-            }
-
-            function computeLiS2(pMem) {
-
-                let y := mload(add(pMem, pY))
-
-                let den1 := mulmod(mulmod(3,mload(add(pMem, pH2w3_0)),q), addmod(mload(add(pMem, pXi)) ,mod(sub(q, mulmod(mload(add(pMem, pXi)), w1 ,q)), q), q), q)
-
-                let den2 := mload(add(pMem, add(pH2w3_0, mul(mod(mul(2, 0), 3), 32))))
-                let den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH2w3_0, mul(0, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS2Inv, 0)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH2w3_0, mul(mod(mul(2, 1), 3), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH2w3_0, mul(1, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS2Inv, 32)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH2w3_0, mul(mod(mul(2, 2), 3), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH2w3_0, mul(2, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS2Inv, 64)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den1 := mulmod(mulmod(3,mload(add(pMem, pH3w3_0)),q), addmod(mulmod(mload(add(pMem, pXi)), w1 ,q),mod(sub(q, mload(add(pMem, pXi))), q), q), q)
-
-                den2 := mload(add(pMem, add(pH3w3_0, mul(mod(mul(2, 0), 3), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH3w3_0, mul(0, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS2Inv, 96)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH3w3_0, mul(mod(mul(2, 1), 3), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH3w3_0, mul(1, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS2Inv, 128)), mulmod(den1, mulmod(den2, den3, q), q))
-
-                den2 := mload(add(pMem, add(pH3w3_0, mul(mod(mul(2, 2), 3), 32))))
-                den3 := addmod(y, mod(sub(q, mload(add(pMem, add(pH3w3_0, mul(2, 32))))), q), q)
-
-                mstore(add(pMem, add(pLiS2Inv, 160)), mulmod(den1, mulmod(den2, den3, q), q))
-            }
-
-            // Prepare all the denominators that must be inverted, placed them in consecutive memory addresses
-            function computeInversions(pMem) {
-                // 1/ZH(xi) used in steps 8 and 9 of the verifier to multiply by 1/Z_H(xi)
-                // Value computed during computeChallenges function and stores in pMem+pZhInv
-
-                // 1/((y - h1) (y - h1w4) (y - h1w4_2) (y - h1w4_3))
-                // used in steps 10 and 11 of the verifier
-                let y := mload(add(pMem, pY))
-                let w := addmod(y, mod(sub(q, mload(add(pMem, pH1w4_0))), q), q)
-                w := mulmod(w, addmod(y, mod(sub(q, mload(add(pMem, pH1w4_1))), q), q), q)
-                w := mulmod(w, addmod(y, mod(sub(q, mload(add(pMem, pH1w4_2))), q), q), q)
-                w := mulmod(w, addmod(y, mod(sub(q, mload(add(pMem, pH1w4_3))), q), q), q)
-                mstore(add(pMem, pDenH1), w)
-
-                // 1/((y - h2) (y - h2w3) (y - h2w3_2) (y - h3) (y - h3w3) (y - h3w3_2))
-                w := addmod(y, mod(sub(q, mload(add(pMem, pH2w3_0))), q), q)
-                w := mulmod(w, addmod(y, mod(sub(q, mload(add(pMem, pH2w3_1))), q), q), q)
-                w := mulmod(w, addmod(y, mod(sub(q, mload(add(pMem, pH2w3_2))), q), q), q)
-                w := mulmod(w, addmod(y, mod(sub(q, mload(add(pMem, pH3w3_0))), q), q), q)
-                w := mulmod(w, addmod(y, mod(sub(q, mload(add(pMem, pH3w3_1))), q), q), q)
-                w := mulmod(w, addmod(y, mod(sub(q, mload(add(pMem, pH3w3_2))), q), q), q)
-                mstore(add(pMem, pDenH2), w)
-
-                // Denominator needed in the verifier when computing L_i^{S0}(X)
-                computeLiS0(pMem)
-                
-                // Denominator needed in the verifier when computing L_i^{S1}(X)
-                computeLiS1(pMem)
-
-                // Denominator needed in the verifier when computing L_i^{S2}(X)
-                computeLiS2(pMem)
-
-                // L_i where i from 1 to num public inputs, needed in step 6 and 7 of the verifier to compute L_1(xi) and PI(xi)
-                w := 1
-                let xi := mload(add(pMem, pXi))
-                
-                mstore(add(pMem, pEval_l1), mulmod(n, mod(add(sub(xi, w), q), q), q))
-                
-                w := mulmod(w, w1, q)
-                
-                mstore(add(pMem, pEval_l2), mulmod(n, mod(add(sub(xi, w), q), q), q))
-                
-
-                // Execute Montgomery batched inversions of the previous prepared values
-                inverseArray(pMem)            }
-
-            // Compute Lagrange polynomial evaluation L_i(xi)
-            function computeLagrange(pMem) {
-                let zh := mload(add(pMem, pZh))
-                let w := 1
-                
-                    mstore(add(pMem, pEval_l1 ), mulmod(mload(add(pMem, pEval_l1 )), zh, q))
-                    
-                    w := mulmod(w, w1, q)
-                    
-                    mstore(add(pMem, pEval_l2), mulmod(w, mulmod(mload(add(pMem, pEval_l2)), zh, q), q))
-                    
-            }
-
-            // Compute public input polynomial evaluation PI(xi)
-            function computePi(pMem, pPub) {
-                let pi := 0
-                pi := mod(add(sub(pi, mulmod(mload(add(pMem, pEval_l1)), calldataload(pPub), q)), q), q)
-                
-                pi := mod(add(sub(pi, mulmod(mload(add(pMem, pEval_l2)), calldataload(add(pPub, 32)), q)), q), q)
-                
-                mstore(add(pMem, pPi), pi)
-            }
-
-            // Compute r0(y) by interpolating the polynomial r0(X) using 8 points (x,y)
-            // where x = {h9, h0w8, h0w8^2, h0w8^3, h0w8^4, h0w8^5, h0w8^6, h0w8^7}
-            // and   y = {C0(h0), C0(h0w8), C0(h0w8^2), C0(h0w8^3), C0(h0w8^4), C0(h0w8^5), C0(h0w8^6), C0(h0w8^7)}
-            // and computing C0(xi)
-            function computeR0(pMem) {
-                let num := 1
-                let y := mload(add(pMem, pY))
-                num := mulmod(num, y, q)
-                num := mulmod(num, y, q)
-                num := mulmod(num, y, q)
-                num := mulmod(num, y, q)
-                num := mulmod(num, y, q)
-                num := mulmod(num, y, q)
-                num := mulmod(num, y, q)
-                num := mulmod(num, y, q)
-
-                num := addmod(num, mod(sub(q, mload(add(pMem, pXi))), q), q)
-
-                let res
-                let h0w80
-                let c0Value
-                let h0w8i
-                    
-                // Compute c0Value = ql + (h0w8i) qr + (h0w8i)^2 qo + (h0w8i)^3 qm + (h0w8i)^4 qc +
-                //                      + (h0w8i)^5 S1 + (h0w8i)^6 S2 + (h0w8i)^7 S3
-                h0w80 := mload(add(pMem, pH0w8_0))
-                c0Value := addmod(calldataload(pEval_ql), mulmod(calldataload(pEval_qr), h0w80, q), q)
-                h0w8i := mulmod(h0w80, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qo), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qm), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qc), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s1), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s2), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s3), h0w8i, q), q)
-
-                res := addmod(res, mulmod(c0Value, mulmod(num, mload(add(pMem, add(pLiS0Inv, 0))), q), q), q)
-
-                    
-                // Compute c0Value = ql + (h0w8i) qr + (h0w8i)^2 qo + (h0w8i)^3 qm + (h0w8i)^4 qc +
-                //                      + (h0w8i)^5 S1 + (h0w8i)^6 S2 + (h0w8i)^7 S3
-                h0w80 := mload(add(pMem, pH0w8_1))
-                c0Value := addmod(calldataload(pEval_ql), mulmod(calldataload(pEval_qr), h0w80, q), q)
-                h0w8i := mulmod(h0w80, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qo), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qm), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qc), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s1), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s2), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s3), h0w8i, q), q)
-
-                res := addmod(res, mulmod(c0Value, mulmod(num, mload(add(pMem, add(pLiS0Inv, 32))), q), q), q)
-
-                    
-                // Compute c0Value = ql + (h0w8i) qr + (h0w8i)^2 qo + (h0w8i)^3 qm + (h0w8i)^4 qc +
-                //                      + (h0w8i)^5 S1 + (h0w8i)^6 S2 + (h0w8i)^7 S3
-                h0w80 := mload(add(pMem, pH0w8_2))
-                c0Value := addmod(calldataload(pEval_ql), mulmod(calldataload(pEval_qr), h0w80, q), q)
-                h0w8i := mulmod(h0w80, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qo), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qm), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qc), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s1), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s2), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s3), h0w8i, q), q)
-
-                res := addmod(res, mulmod(c0Value, mulmod(num, mload(add(pMem, add(pLiS0Inv, 64))), q), q), q)
-
-                    
-                // Compute c0Value = ql + (h0w8i) qr + (h0w8i)^2 qo + (h0w8i)^3 qm + (h0w8i)^4 qc +
-                //                      + (h0w8i)^5 S1 + (h0w8i)^6 S2 + (h0w8i)^7 S3
-                h0w80 := mload(add(pMem, pH0w8_3))
-                c0Value := addmod(calldataload(pEval_ql), mulmod(calldataload(pEval_qr), h0w80, q), q)
-                h0w8i := mulmod(h0w80, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qo), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qm), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qc), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s1), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s2), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s3), h0w8i, q), q)
-
-                res := addmod(res, mulmod(c0Value, mulmod(num, mload(add(pMem, add(pLiS0Inv, 96))), q), q), q)
-
-                    
-                // Compute c0Value = ql + (h0w8i) qr + (h0w8i)^2 qo + (h0w8i)^3 qm + (h0w8i)^4 qc +
-                //                      + (h0w8i)^5 S1 + (h0w8i)^6 S2 + (h0w8i)^7 S3
-                h0w80 := mload(add(pMem, pH0w8_4))
-                c0Value := addmod(calldataload(pEval_ql), mulmod(calldataload(pEval_qr), h0w80, q), q)
-                h0w8i := mulmod(h0w80, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qo), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qm), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qc), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s1), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s2), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s3), h0w8i, q), q)
-
-                res := addmod(res, mulmod(c0Value, mulmod(num, mload(add(pMem, add(pLiS0Inv, 128))), q), q), q)
-
-                    
-                // Compute c0Value = ql + (h0w8i) qr + (h0w8i)^2 qo + (h0w8i)^3 qm + (h0w8i)^4 qc +
-                //                      + (h0w8i)^5 S1 + (h0w8i)^6 S2 + (h0w8i)^7 S3
-                h0w80 := mload(add(pMem, pH0w8_5))
-                c0Value := addmod(calldataload(pEval_ql), mulmod(calldataload(pEval_qr), h0w80, q), q)
-                h0w8i := mulmod(h0w80, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qo), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qm), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qc), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s1), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s2), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s3), h0w8i, q), q)
-
-                res := addmod(res, mulmod(c0Value, mulmod(num, mload(add(pMem, add(pLiS0Inv, 160))), q), q), q)
-
-                    
-                // Compute c0Value = ql + (h0w8i) qr + (h0w8i)^2 qo + (h0w8i)^3 qm + (h0w8i)^4 qc +
-                //                      + (h0w8i)^5 S1 + (h0w8i)^6 S2 + (h0w8i)^7 S3
-                h0w80 := mload(add(pMem, pH0w8_6))
-                c0Value := addmod(calldataload(pEval_ql), mulmod(calldataload(pEval_qr), h0w80, q), q)
-                h0w8i := mulmod(h0w80, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qo), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qm), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qc), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s1), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s2), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s3), h0w8i, q), q)
-
-                res := addmod(res, mulmod(c0Value, mulmod(num, mload(add(pMem, add(pLiS0Inv, 192))), q), q), q)
-
-                    
-                // Compute c0Value = ql + (h0w8i) qr + (h0w8i)^2 qo + (h0w8i)^3 qm + (h0w8i)^4 qc +
-                //                      + (h0w8i)^5 S1 + (h0w8i)^6 S2 + (h0w8i)^7 S3
-                h0w80 := mload(add(pMem, pH0w8_7))
-                c0Value := addmod(calldataload(pEval_ql), mulmod(calldataload(pEval_qr), h0w80, q), q)
-                h0w8i := mulmod(h0w80, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qo), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qm), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_qc), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s1), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s2), h0w8i, q), q)
-                h0w8i := mulmod(h0w8i, h0w80, q)
-                c0Value := addmod(c0Value, mulmod(calldataload(pEval_s3), h0w8i, q), q)
-
-                res := addmod(res, mulmod(c0Value, mulmod(num, mload(add(pMem, add(pLiS0Inv, 224))), q), q), q)
-
-
-                mstore(add(pMem, pR0), res)
-            }
-
-            // Compute r1(y) by interpolating the polynomial r1(X) using 4 points (x,y)
-            // where x = {h1, h1w4, h1w4^2, h1w4^3}
-            // and   y = {C1(h1), C1(h1w4), C1(h1w4^2), C1(h1w4^3)}
-            // and computing T0(xi)
-            function computeR1(pMem) {
-                let num := 1
-                let y := mload(add(pMem, pY))
-                num := mulmod(num, y, q)
-                num := mulmod(num, y, q)
-                num := mulmod(num, y, q)
-                num := mulmod(num, y, q)
-
-                num := addmod(num, mod(sub(q, mload(add(pMem, pXi))), q), q)
-
-                let t0
-                let evalA := calldataload(pEval_a)
-                let evalB := calldataload(pEval_b)
-                let evalC := calldataload(pEval_c)
-
-                t0 := mulmod(calldataload(pEval_ql), evalA, q)
-                t0 := addmod(t0, mulmod(calldataload(pEval_qr), evalB, q) ,q)
-                t0 := addmod(t0, mulmod(calldataload(pEval_qm), mulmod(evalA, evalB, q), q) ,q)
-                t0 := addmod(t0, mulmod(calldataload(pEval_qo), evalC, q) ,q)
-                t0 := addmod(t0, calldataload(pEval_qc) ,q)
-                t0 := addmod(t0, mload(add(pMem, pPi)), q)
-                t0 := mulmod(t0, mload(add(pMem, pZhInv)), q)
-
-                let res
-                let c1Value
-                let h1w4
-                let square
-                c1Value := evalA
-                h1w4 := mload(add(pMem, pH1w4_0))
-
-                c1Value := addmod(c1Value, mulmod(h1w4, evalB, q), q)
-                square := mulmod(h1w4, h1w4, q)
-                c1Value := addmod(c1Value, mulmod(square, evalC, q), q)
-                c1Value := addmod(c1Value, mulmod(mulmod(square, h1w4, q), t0, q), q)
-
-                res := addmod(res, mulmod(c1Value, mulmod(num, mload(add(pMem, add(pLiS1Inv, mul(0, 32)))), q), q), q)
-
-                c1Value := evalA
-                h1w4 := mload(add(pMem, pH1w4_1))
-
-                c1Value := addmod(c1Value, mulmod(h1w4, evalB, q), q)
-                square := mulmod(h1w4, h1w4, q)
-                c1Value := addmod(c1Value, mulmod(square, evalC, q), q)
-                c1Value := addmod(c1Value, mulmod(mulmod(square, h1w4, q), t0, q), q)
-
-                res := addmod(res, mulmod(c1Value, mulmod(num, mload(add(pMem, add(pLiS1Inv, mul(1, 32)))), q), q), q)
-
-                c1Value := evalA
-                h1w4 := mload(add(pMem, pH1w4_2))
-
-                c1Value := addmod(c1Value, mulmod(h1w4, evalB, q), q)
-                square := mulmod(h1w4, h1w4, q)
-                c1Value := addmod(c1Value, mulmod(square, evalC, q), q)
-                c1Value := addmod(c1Value, mulmod(mulmod(square, h1w4, q), t0, q), q)
-
-                res := addmod(res, mulmod(c1Value, mulmod(num, mload(add(pMem, add(pLiS1Inv, mul(2, 32)))), q), q), q)
-
-                c1Value := evalA
-                h1w4 := mload(add(pMem, pH1w4_3))
-
-                c1Value := addmod(c1Value, mulmod(h1w4, evalB, q), q)
-                square := mulmod(h1w4, h1w4, q)
-                c1Value := addmod(c1Value, mulmod(square, evalC, q), q)
-                c1Value := addmod(c1Value, mulmod(mulmod(square, h1w4, q), t0, q), q)
-
-                res := addmod(res, mulmod(c1Value, mulmod(num, mload(add(pMem, add(pLiS1Inv, mul(3, 32)))), q), q), q)
-
-
-                mstore(add(pMem, pR1), res)
-            }
-
-            // Compute r2(y) by interpolating the polynomial r2(X) using 6 points (x,y)
-            // where x = {[h2, h2w3, h2w3^2], [h3, h3w3, h3w3^2]}
-            // and   y = {[C2(h2), C2(h2w3), C2(h2w3^2)], [C2(h3), C2(h3w3), C2(h3w3^2)]}
-            // and computing T1(xi) and T2(xi)
-            function computeR2(pMem) {
-                let y := mload(add(pMem, pY))
-                let num := 1
-                num := mulmod(y, num, q)
-                num := mulmod(y, num, q)
-                num := mulmod(y, num, q)
-                num := mulmod(y, num, q)
-                num := mulmod(y, num, q)
-                num := mulmod(y, num, q)
-
-                let num2 := 1
-                num2 := mulmod(y, num2, q)
-                num2 := mulmod(y, num2, q)
-                num2 := mulmod(y, num2, q)
-                num2 := mulmod(num2, addmod(mulmod(mload(add(pMem, pXi)), w1 ,q), mload(add(pMem, pXi)), q), q)
-
-                num := addmod(num, mod(sub(q, num2), q), q)
-
-                num2 := mulmod(mulmod(mload(add(pMem, pXi)), w1 ,q), mload(add(pMem, pXi)), q)
-
-                num := addmod(num, num2, q)
-
-                let t1
-                let t2
-                let betaXi := mulmod(mload(add(pMem, pBeta)), mload(add(pMem, pXi)), q)
-                let gamma := mload(add(pMem, pGamma))
-
-                t2 := addmod(calldataload( pEval_a), addmod(betaXi, gamma, q) ,q)
-                t2 := mulmod(t2,
-                            addmod(calldataload( pEval_b),
-                            addmod(mulmod(betaXi, k1, q), gamma, q) ,q), q)
-                t2 := mulmod(t2,
-                            addmod(calldataload( pEval_c),
-                            addmod(mulmod(betaXi, k2, q), gamma, q) ,q), q)
-                t2 := mulmod(t2, calldataload(pEval_z), q)
-
-                //Let's use t1 as a temporal variable to save one local
-                t1 := addmod(calldataload(pEval_a), addmod(mulmod(mload(add(pMem, pBeta)), calldataload(pEval_s1), q), gamma, q) ,q)
-                t1 := mulmod(t1,
-                      addmod(calldataload(pEval_b), addmod(mulmod(mload(add(pMem, pBeta)), calldataload(pEval_s2), q), gamma, q) ,q), q)
-                t1 := mulmod(t1,
-                      addmod(calldataload(pEval_c), addmod(mulmod(mload(add(pMem, pBeta)), calldataload(pEval_s3), q), gamma, q) ,q), q)
-                t1 := mulmod(t1, calldataload(pEval_zw), q)
-
-                t2:= addmod(t2, mod(sub(q, t1), q), q)
-                t2 := mulmod(t2, mload(add(pMem, pZhInv)), q)
-
-                // Compute T1(xi)
-                t1 := sub(calldataload(pEval_z), 1)
-                t1 := mulmod(t1, mload(add(pMem, pEval_l1)) ,q)
-                t1 := mulmod(t1, mload(add(pMem, pZhInv)) ,q)
-
-                // Let's use local variable gamma to save the result
-                gamma:=0
-                
-                let hw
-                let c2Value 
-
-                hw := mload(add(pMem, pH2w3_0))
-                c2Value := addmod(calldataload(pEval_z), mulmod(hw, t1, q), q)
-                c2Value := addmod(c2Value, mulmod(mulmod(hw, hw, q), t2, q), q)
-                gamma := addmod(gamma, mulmod(c2Value, mulmod(num, mload(add(pMem, add(pLiS2Inv, mul(0, 32)))), q), q), q)
-
-                hw := mload(add(pMem, pH2w3_1))
-                c2Value := addmod(calldataload(pEval_z), mulmod(hw, t1, q), q)
-                c2Value := addmod(c2Value, mulmod(mulmod(hw, hw, q), t2, q), q)
-                gamma := addmod(gamma, mulmod(c2Value, mulmod(num, mload(add(pMem, add(pLiS2Inv, mul(1, 32)))), q), q), q)
-
-                hw := mload(add(pMem, pH2w3_2))
-                c2Value := addmod(calldataload(pEval_z), mulmod(hw, t1, q), q)
-                c2Value := addmod(c2Value, mulmod(mulmod(hw, hw, q), t2, q), q)
-                gamma := addmod(gamma, mulmod(c2Value, mulmod(num, mload(add(pMem, add(pLiS2Inv, mul(2, 32)))), q), q), q)
-
-                hw := mload(add(pMem, pH3w3_0))
-                c2Value := addmod(calldataload(pEval_zw), mulmod(hw, calldataload(pEval_t1w), q), q)
-                c2Value := addmod(c2Value, mulmod(mulmod(hw, hw, q), calldataload(pEval_t2w), q), q)
-                gamma := addmod(gamma, mulmod(c2Value, mulmod(num, mload(add(pMem, add(pLiS2Inv, mul(3, 32)))), q), q), q)
-
-                hw := mload(add(pMem, pH3w3_1))
-                c2Value := addmod(calldataload(pEval_zw), mulmod(hw, calldataload(pEval_t1w), q), q)
-                c2Value := addmod(c2Value, mulmod(mulmod(hw, hw, q), calldataload(pEval_t2w), q), q)
-                gamma := addmod(gamma, mulmod(c2Value, mulmod(num, mload(add(pMem, add(pLiS2Inv, mul(4, 32)))), q), q), q)
-
-                hw := mload(add(pMem, pH3w3_2))
-                c2Value := addmod(calldataload(pEval_zw), mulmod(hw, calldataload(pEval_t1w), q), q)
-                c2Value := addmod(c2Value, mulmod(mulmod(hw, hw, q), calldataload(pEval_t2w), q), q)
-                gamma := addmod(gamma, mulmod(c2Value, mulmod(num, mload(add(pMem, add(pLiS2Inv, mul(5, 32)))), q), q), q)
-
-                mstore(add(pMem, pR2), gamma)
-            }
-
-            // G1 function to accumulate a G1 value to an address
-            function g1_acc(pR, pP) {
-                let mIn := mload(0x40)
-                mstore(mIn, mload(pR))
-                mstore(add(mIn, 32), mload(add(pR, 32)))
-                mstore(add(mIn, 64), mload(pP))
-                mstore(add(mIn, 96), mload(add(pP, 32)))
-
-                let success := staticcall(sub(gas(), 2000), 6, mIn, 128, pR, 64)
-
-                if iszero(success) {
-                    mstore(0, 0)
-                    return(0, 0x20)
-                }
-            }
-
-            // G1 function to multiply a G1 value to value in an address
-            function g1_mulAcc(pR, pP, s) {
-                let success
-                let mIn := mload(0x40)
-                mstore(mIn, calldataload(pP))
-                mstore(add(mIn, 32), calldataload(add(pP, 32)))
-                mstore(add(mIn, 64), s)
-
-                success := staticcall(sub(gas(), 2000), 7, mIn, 96, mIn, 64)
-
-                if iszero(success) {
-                    mstore(0, 0)
-                    return(0, 0x20)
-                }
-
-                mstore(add(mIn, 64), mload(pR))
-                mstore(add(mIn, 96), mload(add(pR, 32)))
-
-                success := staticcall(sub(gas(), 2000), 6, mIn, 128, pR, 64)
-
-                if iszero(success) {
-                    mstore(0, 0)
-                    return(0, 0x20)
-                }
-            }
-
-            // G1 function to multiply a G1 value(x,y) to value in an address
-            function g1_mulAccC(pR, x, y, s) {
-                let success
-                let mIn := mload(0x40)
-                mstore(mIn, x)
-                mstore(add(mIn, 32), y)
-                mstore(add(mIn, 64), s)
-
-                success := staticcall(sub(gas(), 2000), 7, mIn, 96, mIn, 64)
-
-                if iszero(success) {
-                    mstore(0, 0)
-                    return(0, 0x20)
-                }
-
-                mstore(add(mIn, 64), mload(pR))
-                mstore(add(mIn, 96), mload(add(pR, 32)))
-
-                success := staticcall(sub(gas(), 2000), 6, mIn, 128, pR, 64)
-
-                if iszero(success) {
-                    mstore(0, 0)
-                    return(0, 0x20)
-                }
-            }
-
-            function computeFEJ(pMem) {
-                // Prepare shared numerator between F, E and J to reuse it
-                let y := mload(add(pMem, pY))
-                let numerator := addmod(y, mod(sub(q, mload(add(pMem, pH0w8_0))), q), q)
-                numerator := mulmod(numerator, addmod(y, mod(sub(q, mload(add(pMem, pH0w8_1))), q), q), q)
-                numerator := mulmod(numerator, addmod(y, mod(sub(q, mload(add(pMem, pH0w8_2))), q), q), q)
-                numerator := mulmod(numerator, addmod(y, mod(sub(q, mload(add(pMem, pH0w8_3))), q), q), q)
-                numerator := mulmod(numerator, addmod(y, mod(sub(q, mload(add(pMem, pH0w8_4))), q), q), q)
-                numerator := mulmod(numerator, addmod(y, mod(sub(q, mload(add(pMem, pH0w8_5))), q), q), q)
-                numerator := mulmod(numerator, addmod(y, mod(sub(q, mload(add(pMem, pH0w8_6))), q), q), q)
-                numerator := mulmod(numerator, addmod(y, mod(sub(q, mload(add(pMem, pH0w8_7))), q), q), q)
-
-                // Prepare shared quotient between F and E to reuse it
-                let quotient1 := mulmod(mload(add(pMem, pAlpha)), mulmod(numerator, mload(add(pMem, pDenH1)), q), q)
-                let quotient2 := mulmod(mulmod(mload(add(pMem, pAlpha)), mload(add(pMem, pAlpha)), q), mulmod(numerator, mload(add(pMem, pDenH2)), q), q)
-
-                // Compute full batched polynomial commitment [F]_1
-                mstore(add(pMem, pF), C0x)
-                mstore(add(pMem, add(pF, 32)), C0y)
-                g1_mulAcc(add(pMem, pF), pC1, quotient1)
-                g1_mulAcc(add(pMem, pF), pC2, quotient2)
-
-                // Compute group-encoded batch evaluation [E]_1
-                g1_mulAccC(add(pMem, pE), G1x, G1y, addmod(mload(add(pMem, pR0)), addmod(mulmod(quotient1, mload(add(pMem, pR1)),q), mulmod(quotient2, mload(add(pMem, pR2)),q), q), q))
-
-                // Compute the full difference [J]_1
-                g1_mulAcc(add(pMem, pJ), pW1, numerator)
-            }
-
-            // Validate all evaluations with a pairing checking that e([F]_1 - [E]_1 - [J]_1 + y[W2]_1, [1]_2) == e([W']_1, [x]_2)
-            function checkPairing(pMem) -> isOk {
-                let mIn := mload(0x40)
-
-                // First pairing value
-                // Compute -E
-                mstore(add(add(pMem, pE), 32), mod(sub(qf, mload(add(add(pMem, pE), 32))), qf))
-                // Compute -J
-                mstore(add(add(pMem, pJ), 32), mod(sub(qf, mload(add(add(pMem, pJ), 32))), qf))
-                // F = F - E - J + y·W2
-                g1_acc(add(pMem, pF), add(pMem, pE))
-                g1_acc(add(pMem, pF), add(pMem, pJ))
-                g1_mulAcc(add(pMem, pF), pW2, mload(add(pMem, pY)))
-
-                mstore(mIn, mload(add(pMem, pF)))
-                mstore(add(mIn, 32), mload(add(add(pMem, pF), 32)))
-
-                // Second pairing value
-                mstore(add(mIn, 64), G2x2)
-                mstore(add(mIn, 96), G2x1)
-                mstore(add(mIn, 128), G2y2)
-                mstore(add(mIn, 160), G2y1)
-
-                // Third pairing value
-                // Compute -W2
-                mstore(add(mIn, 192), calldataload(pW2))
-                let s := calldataload(add(pW2, 32))
-                s := mod(sub(qf, s), qf)
-                mstore(add(mIn, 224), s)
-
-                // Fourth pairing value
-                mstore(add(mIn, 256), X2x2)
-                mstore(add(mIn, 288), X2x1)
-                mstore(add(mIn, 320), X2y2)
-                mstore(add(mIn, 352), X2y1)
-
-                let success := staticcall(sub(gas(), 2000), 8, mIn, 384, mIn, 0x20)
-
-                isOk := and(success, mload(mIn))
-            }
-
-            let pMem := mload(0x40)
-            mstore(0x40, add(pMem, lastMem))
-
-            // Validate that all evaluations ∈ F
-            checkInput()
-
-            // Compute the challenges: beta, gamma, xi, alpha and y ∈ F, h1w4/h2w3/h3w3 roots, xiN and zh(xi)
-            computeChallenges(pMem, pubSignals)
-
-            // To divide prime fields the Extended Euclidean Algorithm for computing modular inverses is needed.
-            // The Montgomery batch inversion algorithm allow us to compute n inverses reducing to a single one inversion.
-            // More info: https://vitalik.ca/general/2018/07/21/starks_part_3.html
-            // To avoid this single inverse computation on-chain, it has been computed in proving time and send it to the verifier.
-            // Therefore, the verifier:
-            //      1) Prepare all the denominators to inverse
-            //      2) Check the inverse sent by the prover it is what it should be
-            //      3) Compute the others inverses using the Montgomery Batched Algorithm using the inverse sent to avoid the inversion operation it does.
-            computeInversions(pMem)
-
-            // Compute Lagrange polynomial evaluations Li(xi)
-            computeLagrange(pMem)
-
-            // Compute public input polynomial evaluation PI(xi) = \sum_i^l -public_input_i·L_i(xi)
-            computePi(pMem, pubSignals)
-
-            // Computes r1(y) and r2(y)
-            computeR0(pMem)
-            computeR1(pMem)
-            computeR2(pMem)
-
-            // Compute full batched polynomial commitment [F]_1, group-encoded batch evaluation [E]_1 and the full difference [J]_1
-            computeFEJ(pMem)
-
-            // Validate all evaluations
-            let isValid := checkPairing(pMem)
-
-            mstore(0, isValid)
-            return(0, 0x20)
-        }
-    }
-}
diff --git a/src/fflonk/compute_c_wi.rs b/src/fflonk/compute_c_wi.rs
deleted file mode 100644
index 0ff4c19ea..000000000
--- a/src/fflonk/compute_c_wi.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use ark_ff::{Field, One};
-    use ark_std::UniformRand;
-    use num_bigint::BigUint;
-    use num_traits::{Num, ToPrimitive};
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-    use std::str::FromStr;
-
-    // refer table 3 of https://eprint.iacr.org/2009/457.pdf
-    // a: Fp12 which is cubic residue
-    // c: random Fp12 which is cubic non-residue
-    // s: satisfying p^12 - 1 = 3^s * t
-    // t: satisfying p^12 - 1 = 3^s * t
-    // k: k = (t + 1) // 3
-    fn tonelli_shanks_cubic(
-        a: ark_bn254::Fq12,
-        c: ark_bn254::Fq12,
-        s: u32,
-        t: BigUint,
-        k: BigUint,
-    ) -> ark_bn254::Fq12 {
-        let mut r = a.pow(t.to_u64_digits());
-        let e = 3_u32.pow(s - 1);
-        let exp = 3_u32.pow(s) * &t;
-
-        // compute cubic root of (a^t)^-1, say h
-        let (mut h, cc, mut c) = (
-            ark_bn254::Fq12::ONE,
-            c.pow([e as u64]),
-            c.inverse().unwrap(),
-        );
-        for i in 1..(s as i32) {
-            let delta = (s as i32) - i - 1;
-            let d = if delta < 0 {
-                r.pow((&exp / 3_u32.pow((-delta) as u32)).to_u64_digits())
-            } else {
-                r.pow([3_u32.pow(delta as u32).to_u64().unwrap()])
-            };
-            if d == cc {
-                (h, r) = (h * c, r * c.pow([3_u64]));
-            } else if d == cc.pow([2_u64]) {
-                (h, r) = (h * c.pow([2_u64]), r * c.pow([3_u64]).pow([2_u64]));
-            }
-            c = c.pow([3_u64])
-        }
-
-        // recover cubic root of a
-        r = a.pow(k.to_u64_digits()) * h;
-        if t == 3_u32 * k + 1_u32 {
-            r = r.inverse().unwrap();
-        }
-
-        assert_eq!(r.pow([3_u64]), a);
-        r
-    }
-
-    #[test]
-    fn test_compute_c_wi() {
-        let p = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap();
-        let r = BigUint::from_str(
-            "21888242871839275222246405745257275088548364400416034343698204186575808495617",
-        )
-        .unwrap();
-        let lambda = BigUint::from_str(
-            "10486551571378427818905133077457505975146652579011797175399169355881771981095211883813744499745558409789005132135496770941292989421431235276221147148858384772096778432243207188878598198850276842458913349817007302752534892127325269"
-        ).unwrap();
-        let s = 3_u32;
-        let exp = p.pow(12) - 1_u32;
-        let h = &exp / &r;
-        let t = &exp / 3_u32.pow(s);
-        let k = (&t + 1_u32) / 3_u32;
-        let m = &lambda / &r;
-        let d = 3_u32;
-        let mm = &m / d;
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        let cofactor_cubic = 3_u32.pow(s - 1) * &t;
-
-        // sample a miller loop result f which is cubic non-residue
-        let f = {
-            // (p^12 - 1) // 3
-            let mut f = ark_bn254::Fq12::rand(&mut prng).pow(r.to_u64_digits());
-            let mut legendre = f.pow(cofactor_cubic.to_u64_digits());
-            while legendre == ark_bn254::Fq12::ONE {
-                f = ark_bn254::Fq12::rand(&mut prng).pow(r.to_u64_digits());
-                legendre = f.pow(cofactor_cubic.to_u64_digits());
-            }
-            f
-        };
-        assert_eq!(f.pow(h.to_u64_digits()), ark_bn254::Fq12::ONE);
-
-        // sample a proper scalar w which is cubic non-residue
-        let w = {
-            let (mut w, mut z) = (ark_bn254::Fq12::one(), ark_bn254::Fq12::one());
-            while w == ark_bn254::Fq12::ONE {
-                // choose z which is 3-th non-residue
-                let mut legendre = ark_bn254::Fq12::ONE;
-                while legendre == ark_bn254::Fq12::ONE {
-                    z = ark_bn254::Fq12::rand(&mut prng);
-                    legendre = z.pow(cofactor_cubic.to_u64_digits());
-                }
-                // obtain w which is t-th power of z
-                w = z.pow(t.to_u64_digits());
-            }
-            w
-        };
-        // make sure 27-th root w, is 3-th non-residue and r-th residue
-        assert_ne!(w.pow(cofactor_cubic.to_u64_digits()), ark_bn254::Fq12::ONE);
-        assert_eq!(w.pow(h.to_u64_digits()), ark_bn254::Fq12::ONE);
-
-        // just two option, w and w^2, since w^3 must be cubic residue, leading f*w^3 must not be cubic residue
-        let mut wi = w;
-        if (f * wi).pow(cofactor_cubic.to_u64_digits()) != ark_bn254::Fq12::ONE {
-            assert_eq!(
-                (f * w * w).pow(cofactor_cubic.to_u64_digits()),
-                ark_bn254::Fq12::ONE
-            );
-            wi = w * w;
-        }
-        assert_eq!(wi.pow(h.to_u64_digits()), ark_bn254::Fq12::ONE);
-
-        assert_eq!(lambda, &d * &mm * &r);
-        // f1 is scaled f
-        let f1 = f * wi;
-
-        // r-th root of f1, say f2
-        let r_inv = r.modinv(&h).unwrap();
-        assert_ne!(r_inv, BigUint::one());
-        let f2 = f1.pow(r_inv.to_u64_digits());
-
-        // m'-th root of f, say f3
-        let mm_inv = mm.modinv(&(r * h)).unwrap();
-        assert_ne!(mm_inv, BigUint::one());
-        let f3 = f2.pow(mm_inv.to_u64_digits());
-
-        // d-th (cubic) root, say c
-        let c = tonelli_shanks_cubic(f3, w, s, t, k);
-        assert_eq!(c.pow(lambda.to_u64_digits()), f * wi);
-    }
-}
diff --git a/src/fflonk/compute_challenges.rs b/src/fflonk/compute_challenges.rs
deleted file mode 100644
index ab38e967e..000000000
--- a/src/fflonk/compute_challenges.rs
+++ /dev/null
@@ -1,423 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::curves::G1Affine;
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fr::Fr;
-    use crate::hash::blake3::blake3_var_length;
-    use crate::treepp::*;
-
-    #[test]
-    fn test_compute_challenges_beta() {
-        let blake3_script = blake3_var_length(128);
-
-        let script = script! {
-            // push C0
-            { Fq::push_dec("303039279492065453055049758769758984569666029850327527958551993331680103359")}
-            { Fq::push_dec("15061669176783843627135305167141360334623983780813847469326507992811672859575")}
-            // push the public input
-            { Fq::push_dec("246513590391103489634602289097178521809") }
-            { Fq::push_dec("138371009144214353742010089705444713455") }
-            // push C1
-            { Fq::push_dec("8993820735255461694205287896466659762517378169680151817278189507219986014273") }
-            { Fq::push_dec("20608602847008036615737932995836476570376266531776948091942386633580114403199") }
-
-            // send C0 to altstack
-            { Fq::roll(4) } { Fq::toaltstack() }
-            { Fq::roll(4) } { Fq::toaltstack() }
-
-            // send the public input to altstack
-            { Fq::roll(3) } { Fq::toaltstack() }
-            { Fq::roll(2) } { Fq::toaltstack() }
-
-            // convert C1 into bytes
-            { G1Affine::convert_to_compressed() }
-
-            // convert the public input into bytes
-            { Fq::fromaltstack() } { Fq::convert_to_be_bytes() }
-            { Fq::fromaltstack() } { Fq::convert_to_be_bytes() }
-
-            // convert C0 into bytes
-            { Fq::fromaltstack() } { Fq::fromaltstack() }
-            { G1Affine::convert_to_compressed() }
-
-            // compute the hash
-            { blake3_script.clone() }
-            { Fr::from_hash() }
-            { Fr::push_dec("485596931070696584921673007746559446164232583596250406637950679013042540061")}
-            { Fr::equal(1, 0) }
-        };
-
-        println!("fflonk.compute_challenges.beta = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_compute_challenges_gamma() {
-        let blake3_script = blake3_var_length(32);
-
-        let script = script! {
-            { Fr::push_dec("485596931070696584921673007746559446164232583596250406637950679013042540061")}
-            { Fr::convert_to_be_bytes() }
-            { blake3_script.clone() }
-            { Fr::from_hash() }
-            { Fr::push_dec("19250037324033436581569284153336383290774316882310310865823706333327285195728") }
-            { Fr::equal(1, 0) }
-        };
-
-        println!("fflonk.compute_challenges.gamma = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_compute_challenges_alpha() {
-        let blake3_script = blake3_var_length(512);
-
-        let script = script! {
-            // push xi seed
-            { Fr::push_dec("12675309311304482509247823029963782393309524866265275290730041635615278736000") }
-
-            // push the polynomial evaluations
-
-            // ql
-            { Fr::push_dec("4305584171954448775801758618991977283131671407134816099015723841718827300684") }
-
-            // qr
-            { Fr::push_dec("12383383973686840675128398394454489421896122330596726461131121746926747341189") }
-
-            // qm
-            { Fr::push_dec("84696450614978050680673343346456326547032107368333805624994614151289555853") }
-
-            // qo
-            { Fr::push_dec("3940439340424631873531863239669720717811550024514867065774687720368464792371") }
-
-            // qc
-            { Fr::push_dec("16961785810060156933739931986193776143069216115530808410139185289490606944009") }
-
-            // s1
-            { Fr::push_dec("12474437127153975801320290893919924661315458586210754316226946498711086665749") }
-
-            // s2
-            { Fr::push_dec("599434615255095347665395089945860172292558760398201299457995057871688253664") }
-
-            // s3
-            { Fr::push_dec("16217604511932175446614838218599989473511950977205890369538297955449224727219") }
-
-            // a
-            { Fr::push_dec("7211168621666826182043583595845418959530786367587156242724929610231435505336") }
-
-            // b
-            { Fr::push_dec("848088075173937026388846472327431819307508078325359401333033359624801042") }
-
-            // c
-            { Fr::push_dec("18963734392470978715233675860777231227480937309534365140504133190694875258320") }
-
-            // z
-            { Fr::push_dec("2427313569771756255376235777000596702684056445296844486767054635200432142794") }
-
-            // zw
-            { Fr::push_dec("8690328511114991742730387856275843464438882369629727414507275814599493141660") }
-
-            // t1w
-            { Fr::push_dec("20786626696833495453279531623626288211765949258916047124642669459480728122908") }
-
-            // t2w
-            { Fr::push_dec("12092130080251498309415337127155404037148503145602589831662396526189421234148") }
-
-            for i in 1..16 {
-                { Fr::roll(16 - i) } { Fr::toaltstack() }
-            }
-
-            { Fr::convert_to_be_bytes() }
-
-            for _ in 0..15 {
-                { Fr::fromaltstack() } { Fr::convert_to_be_bytes() }
-            }
-
-            {blake3_script.clone()}
-            { Fr::from_hash() }
-            { Fr::push_dec("13196272401875304388921830696024531900252495617961467853893732289110815791950") }
-            { Fr::equal(1, 0) }
-        };
-
-        println!("fflonk.compute_challenges.alpha = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_compute_challenges_y() {
-        let blake3_script = blake3_var_length(64);
-
-        let script = script! {
-            // alpha
-            { Fr::push_dec("13196272401875304388921830696024531900252495617961467853893732289110815791950") }
-            // W1
-            { Fq::push_dec("32650538602400348219903702316313439265244325226254563471430382441955222030") }
-            { Fq::push_dec("1102261574488401129043229793384018650738538286437537952751903719159654317199") }
-
-            { Fr::roll(2) }
-            { Fr::toaltstack() }
-
-            { G1Affine::convert_to_compressed() }
-            { Fr::fromaltstack() }
-            { Fr::convert_to_be_bytes() }
-
-            {blake3_script.clone()}
-            { Fr::from_hash() }
-            { Fr::push_dec("6824639836122392703554190210911349683223362245243195922653951653214183338070") }
-            { Fr::equal(1, 0) }
-        };
-
-        println!("fflonk.compute_challenges.y = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_compute_challenges_xiseed() {
-        let blake3_script = blake3_var_length(64);
-
-        let script = script! {
-            // gamma
-            { Fr::push_dec("19250037324033436581569284153336383290774316882310310865823706333327285195728") }
-            // C2
-            { Fq::push_dec("7381325072443970270370678023564870071058744625357849943766655609499175274412") }
-            { Fq::push_dec("15178578915928592705383893120230835636411008017183180871962629962483134367891") }
-
-            { Fr::roll(2) }
-            { Fr::toaltstack() }
-
-            { G1Affine::convert_to_compressed() }
-            { Fr::fromaltstack() }
-            { Fr::convert_to_be_bytes() }
-
-            {blake3_script.clone()}
-            { Fr::from_hash() }
-            { Fr::push_dec("12675309311304482509247823029963782393309524866265275290730041635615278736000") }
-            { Fr::equal(1, 0) }
-        };
-
-        println!("fflonk.compute_challenges.xiseed = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_compute_challenges_xin() {
-        let script = script! {
-            // push xiseed
-            { Fr::push_dec("12675309311304482509247823029963782393309524866265275290730041635615278736000") }
-            // compute xiseed^2
-            { Fr::copy(0) }
-            { Fr::square() }
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // pH0w8_0 = xiseed^3
-            { Fr::mul() }
-
-            // pH0w8_0
-            { Fr::copy(0) }
-            { Fr::push_dec("10210594730394925429746291702746561332060256679615545074401657104125756649578") }
-            { Fr::equalverify(1, 0) }
-
-            // pH0w8_1
-            { Fr::copy(0) }
-            // push constant w8_1
-            { Fr::push_dec("19540430494807482326159819597004422086093766032135589407132600596362845576832") }
-            { Fr::mul() }
-            { Fr::push_dec("8372804009848668687759614171560040965977592547922202747919047620642117005104") }
-            { Fr::equalverify(1, 0) }
-
-            // pH0w8_2
-            { Fr::copy(0) }
-            // push constant w8_2
-            { Fr::push_dec("21888242871839275217838484774961031246007050428528088939761107053157389710902") }
-            { Fr::mul() }
-            { Fr::push_dec("12018168561098599325315012321442861121728268008555918380929453858170772126806") }
-            { Fr::equalverify(1, 0) }
-
-            // pH0w8_3
-            { Fr::copy(0) }
-            // push constant w8_3
-            { Fr::push_dec("13274704216607947843011480449124596415239537050559949017414504948711435969894") }
-            { Fr::mul() }
-            { Fr::push_dec("16309511826969302107699393610404172200913629782896950912885458723657982725366") }
-            { Fr::equalverify(1, 0) }
-
-            // pH0w8_4
-            { Fr::copy(0) }
-            // push constant w8_4
-            { Fr::push_dec("21888242871839275222246405745257275088548364400416034343698204186575808495616") }
-            { Fr::mul() }
-            { Fr::push_dec("11677648141444349792500114042510713756488107720800489269296547082450051846039") }
-            { Fr::equalverify(1, 0) }
-
-            // pH0w8_5
-            { Fr::copy(0) }
-            // push constant w8_5
-            { Fr::push_dec("2347812377031792896086586148252853002454598368280444936565603590212962918785") }
-            { Fr::mul() }
-            { Fr::push_dec("13515438861990606534486791573697234122570771852493831595779156565933691490513") }
-            { Fr::equalverify(1, 0) }
-
-            // pH0w8_6
-            { Fr::copy(0) }
-            // push constant w8_6
-            { Fr::push_dec("4407920970296243842541313971887945403937097133418418784715") }
-            { Fr::mul() }
-            { Fr::push_dec("9870074310740675896931393423814413966820096391860115962768750328405036368811") }
-            { Fr::equalverify(1, 0) }
-
-            // pH0w8_7
-            { Fr::copy(0) }
-            // push constant w8_7
-            { Fr::push_dec("8613538655231327379234925296132678673308827349856085326283699237864372525723") }
-            { Fr::mul() }
-            { Fr::push_dec("5578731044869973114547012134853102887634734617519083430812745462917825770251") }
-            { Fr::equalverify(1, 0) }
-
-            // pH1w4_0 = xiseed^6
-            { Fr::square() }
-
-            // pH1w4_0
-            { Fr::copy(0) }
-            { Fr::push_dec("1756820407515345004507058825871382296137098363972706405994173662850350774688") }
-            { Fr::equalverify(1, 0) }
-
-            // pH1w4_1
-            { Fr::copy(0) }
-            // push constant w4
-            { Fr::push_dec("21888242871839275217838484774961031246007050428528088939761107053157389710902") }
-            { Fr::mul() }
-            { Fr::push_dec("16907152808936898292083477165412732098542037853664649778796264398384084027651") }
-            { Fr::equalverify(1, 0) }
-
-            // pH1w4_2
-            { Fr::copy(0) }
-            // push constant w4_1
-            { Fr::push_dec("21888242871839275222246405745257275088548364400416034343698204186575808495616") }
-            { Fr::mul() }
-            { Fr::push_dec("20131422464323930217739346919385892792411266036443327937704030523725457720929") }
-            { Fr::equalverify(1, 0) }
-
-            // pH1w4_3
-            { Fr::copy(0) }
-            // push constant w4_2
-            { Fr::push_dec("4407920970296243842541313971887945403937097133418418784715") }
-            { Fr::mul() }
-            { Fr::push_dec("4981090062902376930162928579844542990006326546751384564901939788191724467966") }
-            { Fr::equalverify(1, 0) }
-
-            // pH2w3_0 = xiseed^8
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // pH2w3_0
-            { Fr::copy(0) }
-            { Fr::push_dec("8645910648030292747222447120598663930712351861448151482708581449066841434015") }
-            { Fr::equalverify(1, 0) }
-
-            // pH2w3_1
-            { Fr::copy(0) }
-            // push constant w3
-            { Fr::push_dec("21888242871839275217838484774961031246154997185409878258781734729429964517155") }
-            { Fr::mul() }
-            { Fr::push_dec("2196608840183762817611603553419504245649898072887146050087043489198732467688") }
-            { Fr::equalverify(1, 0) }
-
-            // pH2w3_2
-            { Fr::copy(0) }
-            // push constant w3_2
-            { Fr::push_dec("4407920970296243842393367215006156084916469457145843978461") }
-            { Fr::mul() }
-            { Fr::push_dec("11045723383625219657412355071239106912186114466080736810902579248310234593914") }
-            { Fr::equalverify(1, 0) }
-
-            // pH3w3_0 = xiseed^8 * ω^{1/3}
-            { Fr::push_dec("19699792133865984655632994927951174943026102279822605383822362801478354085676") }
-            { Fr::mul() }
-
-            // pH3w3_0
-            { Fr::copy(0) }
-            { Fr::push_dec("21405568746311661929319138487394095463124289053215849061649274916682085734478") }
-            { Fr::equalverify(1, 0) }
-
-            // pH3w3_1
-            { Fr::copy(0) }
-            // push constant w3
-            { Fr::push_dec("21888242871839275217838484774961031246154997185409878258781734729429964517155") }
-            { Fr::mul() }
-            { Fr::push_dec("16458699422327211795980147165837933894457139622322803085568450314170832928180") }
-            { Fr::equalverify(1, 0) }
-
-            // pH2w3_2
-            // push constant w3_2
-            { Fr::push_dec("4407920970296243842393367215006156084916469457145843978461") }
-            { Fr::mul() }
-            { Fr::push_dec("5912217575039676719193525837282520819515300125293416540178683142298698328576") }
-            { Fr::equalverify(1, 0) }
-
-            { Fr::fromaltstack() }
-
-            // xi = xi_seeder^24
-            { Fr::copy(0) }
-            { Fr::square() }
-            { Fr::mul() }
-
-            // xi
-            { Fr::copy(0) }
-            { Fr::push_dec("14814634099415170872937750660683266261347419959225231219985478027287965492246") }
-            { Fr::equalverify(1, 0) }
-
-            // xiN
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-
-            // xin
-            { Fr::copy(0) }
-            { Fr::push_dec("9539499652122301619680560867461437153480631573357135330838514610439758374056") }
-            { Fr::equalverify(1, 0) }
-
-            // zh
-            { Fr::push_one() }
-            { Fr::sub(1, 0) }
-            { Fr::push_dec("9539499652122301619680560867461437153480631573357135330838514610439758374055") }
-            { Fr::equalverify(1, 0) }
-
-            OP_TRUE
-        };
-
-        println!("fflonk.compute_challenges.xin = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/compute_e.rs b/src/fflonk/compute_e.rs
deleted file mode 100644
index 21ffb135e..000000000
--- a/src/fflonk/compute_e.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::curves::G1Projective;
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fr::Fr;
-    use crate::treepp::*;
-
-    #[test]
-    fn test_compute_e() {
-        let script = script! {
-            // push G1x, G1y (3 elements)
-            { Fq::push_dec("1") }
-            { Fq::push_dec("2") }
-            { Fq::push_dec("1") }
-
-            // push the scalar
-            { Fr::push_dec("20939596453786382856662891660365666437489374655427796935463148514894213437967") }
-            { G1Projective::scalar_mul() }
-
-            { Fq::push_dec("10905825615646575916826598897124608361270584984190374057529352166783343482862") }
-            { Fq::push_dec("19290909793509893735943189519527824156597590461000288988451227768509803549366") }
-            { Fq::push_dec("10334981607594421347972269000738063023881743479366183631046354259553646162574") }
-
-            { G1Projective::equalverify() }
-            OP_TRUE
-        };
-
-        println!("fflonk.compute_e = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/compute_f.rs b/src/fflonk/compute_f.rs
deleted file mode 100644
index 07eac6f6e..000000000
--- a/src/fflonk/compute_f.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::curves::G1Projective;
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fr::Fr;
-    use crate::treepp::*;
-
-    #[test]
-    fn test_compute_f() {
-        let script = script! {
-            // push (C0x, C0y), C1, C2 (9 elements)
-            { Fq::push_dec("303039279492065453055049758769758984569666029850327527958551993331680103359") }
-            { Fq::push_dec("15061669176783843627135305167141360334623983780813847469326507992811672859575") }
-            { Fq::push_dec("1") }
-
-            { Fq::push_dec("8993820735255461694205287896466659762517378169680151817278189507219986014273") }
-            { Fq::push_dec("20608602847008036615737932995836476570376266531776948091942386633580114403199") }
-            { Fq::push_dec("1") }
-
-            { Fq::push_dec("7381325072443970270370678023564870071058744625357849943766655609499175274412") }
-            { Fq::push_dec("15178578915928592705383893120230835636411008017183180871962629962483134367891") }
-            { Fq::push_dec("1") }
-
-            // push quotient1, quotient2 (2 elements)
-            { Fr::push_dec("8336823378405991273186613678056299833572545852849807089784419620701331198620") }
-            { Fr::push_dec("9383905404220215760494220727835590239846562451983646600728203514340336934716") }
-
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            { G1Projective::roll(1) } // [c0, c2, c1, q1; q2]
-            { Fr::fromaltstack() }
-            { Fq::roll(6)} {Fq::roll(6)} {Fq::roll(6)} // [c0, c1, q1, c2]
-            { Fr::fromaltstack() } // [c0, c1, q1, c2, q2]
-            { G1Projective::batched_scalar_mul::<2>() }
-            { G1Projective::add() }
-
-            { Fq::push_dec("10827057179016943379099096512257711381208881258335395636699788359889105647796") }
-            { Fq::push_dec("15908485457276609870374048914742234656312588226903176268190825086381552148601") }
-            { Fq::push_dec("10704903381596808863042656941383257630189957941456629442401491652278045385710") }
-
-            { G1Projective::equalverify() }
-            OP_TRUE
-        };
-
-        println!("fflonk.compute_f = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/compute_fej_scalars.rs b/src/fflonk/compute_fej_scalars.rs
deleted file mode 100644
index e64347694..000000000
--- a/src/fflonk/compute_fej_scalars.rs
+++ /dev/null
@@ -1,126 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fr::Fr;
-    use crate::treepp::*;
-    use ark_ff::Field;
-    use num_bigint::BigUint;
-    use std::str::FromStr;
-
-    #[test]
-    fn test_compute_fej() {
-        let mut denh1_inv = ark_bn254::Fr::from_str(
-            "16119335534554612347069410224124107110204763328009905428743152543535476039579",
-        )
-        .unwrap();
-        denh1_inv.inverse_in_place().unwrap();
-
-        let mut denh2_inv = ark_bn254::Fr::from_str(
-            "3243830272143196976292614075227959624327946119988523541753598495438231730971",
-        )
-        .unwrap();
-        denh2_inv.inverse_in_place().unwrap();
-
-        let script = script! {
-            // push alpha, denh1, denh2, y (4 elements)
-            { Fr::push_dec("13196272401875304388921830696024531900252495617961467853893732289110815791950") }
-            { Fr::push_u32_le(&BigUint::from(denh1_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(denh2_inv).to_u32_digits()) }
-            { Fr::push_dec("6824639836122392703554190210911349683223362245243195922653951653214183338070") }
-
-            // push R0, R1, R2 (3 elements)
-            { Fr::push_dec("9984215396403043994941496429066900252890008119992652401049849633408576425336") }
-            { Fr::push_dec("20094893460628001506464425210304996393341228871437567669976791505614033716878") }
-            { Fr::push_dec("17870878740602377735172834182794916404148892013933556022942404950055827532212") }
-
-            // push H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 (8 elements)
-            { Fr::push_dec("10210594730394925429746291702746561332060256679615545074401657104125756649578") }
-            { Fr::push_dec("8372804009848668687759614171560040965977592547922202747919047620642117005104") }
-            { Fr::push_dec("12018168561098599325315012321442861121728268008555918380929453858170772126806") }
-            { Fr::push_dec("16309511826969302107699393610404172200913629782896950912885458723657982725366") }
-            { Fr::push_dec("11677648141444349792500114042510713756488107720800489269296547082450051846039") }
-            { Fr::push_dec("13515438861990606534486791573697234122570771852493831595779156565933691490513") }
-            { Fr::push_dec("9870074310740675896931393423814413966820096391860115962768750328405036368811") }
-            { Fr::push_dec("5578731044869973114547012134853102887634734617519083430812745462917825770251") }
-
-            // roll y
-            { Fr::roll(8 + 3) }
-
-            // compute numerator entries
-            for i in 0..8 {
-                { Fr::copy(0) }
-                { Fr::roll(7 - i + 2) }
-                { Fr::sub(1, 0) }
-                { Fr::toaltstack() }
-            }
-
-            // drop y
-            { Fr::drop() }
-
-            // compute numerator
-            { Fr::fromaltstack() }
-            for _ in 0..7 {
-                { Fr::fromaltstack() }
-                { Fr::mul() }
-            }
-
-            // copy the numerator in the altstack
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // compute quotient1 = alpha * numerator * denh1
-            { Fr::copy(0) }
-            { Fr::copy(3 + 2 + 2) }
-            { Fr::mul() }
-            { Fr::roll(3 + 1 + 2) }
-            { Fr::mul() }
-
-            // compute quotient2 = alpha * alpha * numerator * denh2
-            { Fr::roll(1) }
-            { Fr::roll(3 + 2) }
-            { Fr::mul() }
-            { Fr::roll(3 + 2) }
-            { Fr::square() }
-            { Fr::mul() }
-
-            // the stack now looks:
-            //    R0, R1, R2
-            //    quotient1, quotient2
-            // altstack: numerator
-
-            // compute the scalar = R0 + quotient1 * R1 + quotient2 * R2
-            { Fr::copy(1) }
-            { Fr::roll(2 + 1 + 1) }
-            { Fr::mul() }
-            { Fr::copy(1) }
-            { Fr::roll(2 + 2) }
-            { Fr::mul() }
-            { Fr::add(1, 0) }
-            { Fr::roll(2 + 1) }
-            { Fr::add(1, 0) }
-
-            { Fr::fromaltstack() }
-
-            // J scalar
-            { Fr::push_dec("1021979267781513382639867303596638615172285308777215242749714941672007413081") }
-            { Fr::equalverify(1, 0) }
-
-            // E scalar
-            { Fr::push_dec("20939596453786382856662891660365666437489374655427796935463148514894213437967") }
-            { Fr::equalverify(1, 0) }
-
-            // F scalar
-            { Fr::push_dec("9383905404220215760494220727835590239846562451983646600728203514340336934716") }
-            { Fr::equalverify(1, 0) }
-            { Fr::push_dec("8336823378405991273186613678056299833572545852849807089784419620701331198620") }
-            { Fr::equalverify(1, 0) }
-
-            OP_TRUE
-        };
-
-        println!("fflonk.compute_fej_scalars = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/compute_inversions.rs b/src/fflonk/compute_inversions.rs
deleted file mode 100644
index eead154a4..000000000
--- a/src/fflonk/compute_inversions.rs
+++ /dev/null
@@ -1,800 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fr::Fr;
-    use crate::treepp::*;
-
-    #[test]
-    fn test_inversions() {
-        let script = script! {
-            // push Z_H
-            { Fr::push_dec("9539499652122301619680560867461437153480631573357135330838514610439758374055") }
-            { Fr::toaltstack() }
-
-            // push y
-            { Fr::push_dec("6824639836122392703554190210911349683223362245243195922653951653214183338070") }
-            // push H1w4_0, H1w4_1, H1w4_2, H1w4_3
-            { Fr::push_dec("1756820407515345004507058825871382296137098363972706405994173662850350774688") }
-            { Fr::push_dec("16907152808936898292083477165412732098542037853664649778796264398384084027651") }
-            { Fr::push_dec("20131422464323930217739346919385892792411266036443327937704030523725457720929") }
-            { Fr::push_dec("4981090062902376930162928579844542990006326546751384564901939788191724467966") }
-
-            { Fr::copy(4) }
-            { Fr::sub(0, 1) }
-            { Fr::copy(4) }
-            { Fr::sub(0, 2) }
-            { Fr::copy(4) }
-            { Fr::sub(0, 3) }
-            { Fr::copy(4) }
-            { Fr::sub(0, 4) }
-
-            { Fr::mul() }
-            { Fr::mul() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // push H2w3_0, H2w3_1, H2w3_2, H3w3_0, H3w3_1, H3w3_2
-            { Fr::push_dec("8645910648030292747222447120598663930712351861448151482708581449066841434015") }
-            { Fr::push_dec("2196608840183762817611603553419504245649898072887146050087043489198732467688") }
-            { Fr::push_dec("11045723383625219657412355071239106912186114466080736810902579248310234593914") }
-            { Fr::push_dec("21405568746311661929319138487394095463124289053215849061649274916682085734478") }
-            { Fr::push_dec("16458699422327211795980147165837933894457139622322803085568450314170832928180") }
-            { Fr::push_dec("5912217575039676719193525837282520819515300125293416540178683142298698328576") }
-
-            { Fr::copy(6) }
-            { Fr::sub(0, 1) }
-            { Fr::copy(6) }
-            { Fr::sub(0, 2) }
-            { Fr::copy(6) }
-            { Fr::sub(0, 3) }
-            { Fr::copy(6) }
-            { Fr::sub(0, 4) }
-            { Fr::copy(6) }
-            { Fr::sub(0, 5) }
-            { Fr::copy(6) }
-            { Fr::sub(0, 6) }
-
-            { Fr::mul() }
-            { Fr::mul() }
-            { Fr::mul() }
-            { Fr::mul() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // push H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7
-            { Fr::push_dec("10210594730394925429746291702746561332060256679615545074401657104125756649578") }
-            { Fr::push_dec("8372804009848668687759614171560040965977592547922202747919047620642117005104") }
-            { Fr::push_dec("12018168561098599325315012321442861121728268008555918380929453858170772126806") }
-            { Fr::push_dec("16309511826969302107699393610404172200913629782896950912885458723657982725366") }
-            { Fr::push_dec("11677648141444349792500114042510713756488107720800489269296547082450051846039") }
-            { Fr::push_dec("13515438861990606534486791573697234122570771852493831595779156565933691490513") }
-            { Fr::push_dec("9870074310740675896931393423814413966820096391860115962768750328405036368811") }
-            { Fr::push_dec("5578731044869973114547012134853102887634734617519083430812745462917825770251") }
-
-            // den1 = Fr.mul(Fr.e(len), Fr.exp(roots[0], len - 2)) = = 8 * H0w8_0 ^ 6
-            { Fr::copy(7) }
-            { Fr::square() }
-            { Fr::copy(0) }
-            { Fr::square() }
-            { Fr::mul() }
-            { Fr::double(0) }
-            { Fr::double(0) }
-            { Fr::double(0) }
-            { Fr::toaltstack() }
-
-            // den2 = roots[7 * 0 % 8] = roots[0]
-            { Fr::copy(7) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[0]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(7) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_1 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[7 * 1 % 8] = roots[7]
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[1]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(6) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_2 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[7 * 2 % 8] = roots[6]
-            { Fr::copy(1) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[2]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(5) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_3 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[7 * 3 % 8] = roots[5]
-            { Fr::copy(2) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[3]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(4) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_4 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[7 * 4 % 8] = roots[4]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[4]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(3) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_5 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[7 * 5 % 8] = roots[3]
-            { Fr::copy(4) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[5]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(2) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_6 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[7 * 6 % 8] = roots[2]
-            { Fr::copy(5) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[6]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(1) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_7 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[7 * 7 % 8] = roots[1]
-            { Fr::copy(6) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[7]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(0) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_8 = den1 * den2 * den3, remove den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // drop H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-
-            // push H1w4_0, H1w4_1, H1w4_2, H1w4_3
-            { Fr::push_dec("1756820407515345004507058825871382296137098363972706405994173662850350774688") }
-            { Fr::push_dec("16907152808936898292083477165412732098542037853664649778796264398384084027651") }
-            { Fr::push_dec("20131422464323930217739346919385892792411266036443327937704030523725457720929") }
-            { Fr::push_dec("4981090062902376930162928579844542990006326546751384564901939788191724467966") }
-
-            // den1 = Fr.mul(Fr.e(len), Fr.exp(roots[0], len - 2)) = = 4 * H0w8_0 ^ 2
-            { Fr::copy(3) }
-            { Fr::square() }
-            { Fr::double(0) }
-            { Fr::double(0) }
-            { Fr::toaltstack() }
-
-            // den2 = roots[3 * 0 % 4] = roots[0]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[0]
-            { Fr::copy(4) }
-            { Fr::toaltstack() }
-            { Fr::copy(3) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS1_1 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[3 * 1 % 4] = roots[3]
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[1]
-            { Fr::copy(4) }
-            { Fr::toaltstack() }
-            { Fr::copy(2) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS1_2 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[3 * 2 % 4] = roots[2]
-            { Fr::copy(1) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[2]
-            { Fr::copy(4) }
-            { Fr::toaltstack() }
-            { Fr::copy(1) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS1_3 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[3 * 3 % 4] = roots[1]
-            { Fr::copy(2) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[3]
-            { Fr::copy(4) }
-            { Fr::toaltstack() }
-            { Fr::copy(0) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS1_4 = den1 * den2 * den3, remove den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // drop H1w4_0, H1w4_1, H1w4_2, H1w4_3
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-
-            // push H2w3_0, H2w3_1, H2w3_2
-            { Fr::push_dec("8645910648030292747222447120598663930712351861448151482708581449066841434015") }
-            { Fr::push_dec("2196608840183762817611603553419504245649898072887146050087043489198732467688") }
-            { Fr::push_dec("11045723383625219657412355071239106912186114466080736810902579248310234593914") }
-
-            // push xi
-            { Fr::push_dec("14814634099415170872937750660683266261347419959225231219985478027287965492246") }
-
-            // compute xiw
-            { Fr::copy(0) }
-            { Fr::push_dec("11699596668367776675346610687704220591435078791727316319397053191800576917728") }
-            { Fr::mul() }
-
-            // compute xi - xiw
-            { Fr::sub(1, 0) }
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // move xi - xiw to before y
-            { Fr::roll(4) }
-            { Fr::roll(4) }
-            { Fr::roll(4) }
-            { Fr::roll(4) }
-
-            // _3h2 = Fr.mul(Fr.e(len), Fr.exp(roots[0], len - 2)) = = 3 * H2w3_0
-            { Fr::copy(2) }
-            { Fr::copy(0) }
-            { Fr::double(0) }
-            { Fr::add(1, 0) }
-
-            // compute den1 = _3h2 * (xi - xiw)
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[2 * 0 % 3] = roots[0]
-            { Fr::copy(2) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[0]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-            { Fr::copy(2) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS2_1 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[2 * 1 % 3] = roots[2]
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[1]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-            { Fr::copy(1) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS2_2 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[2 * 2 % 3] = roots[1]
-            { Fr::copy(1) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[2]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-            { Fr::copy(0) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS2_3 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // drop H2w3_0, H2w3_1, H2w3_2
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-
-            // push H3w3_0, H3w3_1, H3w3_2
-            { Fr::push_dec("21405568746311661929319138487394095463124289053215849061649274916682085734478") }
-            { Fr::push_dec("16458699422327211795980147165837933894457139622322803085568450314170832928180") }
-            { Fr::push_dec("5912217575039676719193525837282520819515300125293416540178683142298698328576") }
-
-            // obtain xiw - xi
-            { Fr::neg(4) }
-            { Fr::toaltstack() }
-
-            // _3h2 = Fr.mul(Fr.e(len), Fr.exp(roots[0], len - 2)) = = 3 * H3w3_0
-            { Fr::copy(2) }
-            { Fr::copy(0) }
-            { Fr::double(0) }
-            { Fr::add(1, 0) }
-
-            // compute den1 = _3h2 * (xiw - xi)
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[2 * 0 % 3] = roots[0]
-            { Fr::copy(2) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[0]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-            { Fr::copy(2) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS3_1 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[2 * 1 % 3] = roots[2]
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[1]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-            { Fr::copy(1) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS3_2 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // den2 = roots[2 * 2 % 3] = roots[1]
-            { Fr::copy(1) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[2]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-            { Fr::copy(0) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS3_3 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // drop H3w3_0, H3w3_1, H3w3_2
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-
-            // drop y
-            { Fr::drop() }
-
-            // push xi again
-            { Fr::push_dec("14814634099415170872937750660683266261347419959225231219985478027287965492246") }
-
-            // Li_1 = 262144 * (xi - 1)
-            { Fr::copy(0) }
-            { Fr::push_one() }
-            { Fr::sub(1, 0) }
-            { Fr::push_dec("262144") }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // Li_2 = 262144 * (xi - w1)
-            { Fr::push_dec("11699596668367776675346610687704220591435078791727316319397053191800576917728") }
-            { Fr::sub(1, 0) }
-            { Fr::push_dec("262144") }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // Get all the elements back to the stack
-            for _ in 0..23 {
-                { Fr::fromaltstack() }
-            }
-
-            // build up the accumulator
-            { Fr::copy(0) }
-            for i in 1..23 {
-                { Fr::copy(0) }
-                { Fr::copy(i + 1 + i) }
-                { Fr::mul() }
-            }
-
-            // push the inv from the proof and verify the inv
-            { Fr::copy(0) }
-            { Fr::push_dec("21247383512588455895834686692756529012394058115069710447132959660051940541361") }
-            { Fr::copy(0) } { Fr::toaltstack() }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // current stack:
-            //   inputs (Li_2 down to ZH)
-            //   accumulators (ZH down to prod of all)
-            // altstack:
-            //   inv
-
-            // compute the inverses now
-            { Fr::drop() }
-            { Fr::fromaltstack() }
-
-            for i in 0..22 {
-                { Fr::copy(0) }
-                { Fr::roll(2) }
-                { Fr::mul() }
-                { Fr::toaltstack() }
-                { Fr::roll(23 - 1 - i + 23 - 1 - i) }
-                { Fr::mul() }
-            }
-            { Fr::roll(1) }
-            { Fr::drop() }
-
-            // ZH
-            { Fr::push_dec("9539499652122301619680560867461437153480631573357135330838514610439758374055") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // DenH1
-            { Fr::fromaltstack() }
-            { Fr::push_dec("16119335534554612347069410224124107110204763328009905428743152543535476039579") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // DenH2
-            { Fr::fromaltstack() }
-            { Fr::push_dec("3243830272143196976292614075227959624327946119988523541753598495438231730971") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS0_1
-            { Fr::fromaltstack() }
-            { Fr::push_dec("15956404548953753015502565241304679000484076548059581562924872764096813859245") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS0_2
-            { Fr::fromaltstack() }
-            { Fr::push_dec("9114366468980522899431022597914765424075108533625127448987363134676737768036") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS0_3
-            { Fr::fromaltstack() }
-            { Fr::push_dec("4805205350560837475207388792928996841502521120538573943461389657486975511196") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS0_4
-            { Fr::fromaltstack() }
-            { Fr::push_dec("10337098495972798453045437161191603828214396074717644472335031854871930659950") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS0_5
-            { Fr::fromaltstack() }
-            { Fr::push_dec("9668364322474815684450293130850361880537576909329131041685929038205440212223") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS0_6
-            { Fr::fromaltstack() }
-            { Fr::push_dec("16510402402448045800521835774240275456946544923763585155623438667625516303432") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS0_7
-            { Fr::fromaltstack() }
-            { Fr::push_dec("20819563520867731224745469579226044039519132336850138661149412144815278560272") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS0_8
-            { Fr::fromaltstack() }
-            { Fr::push_dec("15287670375455770246907421210963437052807257382671068132275769947430323411518") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS1_1
-            { Fr::fromaltstack() }
-            { Fr::push_dec("14020133117267276520346758762568130957151367475598025622226445111246020829435") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS1_2
-            { Fr::fromaltstack() }
-            { Fr::push_dec("11834191057204778210308675185625212949005795861807682697825227112830256931177") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS1_3
-            { Fr::fromaltstack() }
-            { Fr::push_dec("20680494190286283051876076168766664571907823653512365023777159976480914701916") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-             // LiS1_4
-            { Fr::fromaltstack() }
-            { Fr::push_dec("978193378509506139667754000452307491505030866886673604480173788320870104557") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS2_1
-            { Fr::fromaltstack() }
-            { Fr::push_dec("3093337848584598859019239395285698636013991558183047188123490283901254813860") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS2_2
-            { Fr::fromaltstack() }
-            { Fr::push_dec("20657040851814184192491101400192407860657376306604707917505085770367913835835") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS2_3
-            { Fr::fromaltstack() }
-            { Fr::push_dec("19967358551509656347901544077253903207276114223653090077162230657486295778552") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS2_4
-            { Fr::fromaltstack() }
-            { Fr::push_dec("21800223472280064353933220303685416010271075398742978562230724357473593460561") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS2_5
-            { Fr::fromaltstack() }
-            { Fr::push_dec("2883351026271900821141854554977492864766487799404625079971870711410039053769") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // LiS2_6
-            { Fr::fromaltstack() }
-            { Fr::push_dec("9551022927007589928168012516897412879701840127652630952681115227109825028798") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // Li_1
-            { Fr::fromaltstack() }
-            { Fr::push_dec("2173335263468457880677030391603678787407318523287432531877773790452047235821") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // Li_2
-            { Fr::fromaltstack() }
-            { Fr::push_dec("3695504780263816985137938305786365026932326252410439503136485422302932463173") }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            OP_TRUE
-        };
-
-        println!("fflonk.compute_inversions = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/compute_j.rs b/src/fflonk/compute_j.rs
deleted file mode 100644
index c25d25e70..000000000
--- a/src/fflonk/compute_j.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::curves::G1Projective;
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fr::Fr;
-    use crate::treepp::*;
-
-    #[test]
-    fn test_compute_j() {
-        let script = script! {
-            // push W1 (3 elements)
-            { Fq::push_dec("32650538602400348219903702316313439265244325226254563471430382441955222030") }
-            { Fq::push_dec("1102261574488401129043229793384018650738538286437537952751903719159654317199") }
-            { Fq::push_dec("1") }
-
-            // push the scalar
-            { Fr::push_dec("1021979267781513382639867303596638615172285308777215242749714941672007413081") }
-            { G1Projective::scalar_mul() }
-
-            { Fq::push_dec("2959562071167086018427906252728568621973040394868315776950851582459669551081") }
-            { Fq::push_dec("5248835691815263544471788309691308785423871173394577194626050104765380585421") }
-            { Fq::push_dec("19277062899702791882368245424983329716198384271778017207570439921049817477033") }
-
-            { G1Projective::equalverify() }
-            OP_TRUE
-        };
-
-        println!("fflonk.compute_j = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/compute_lagrange.rs b/src/fflonk/compute_lagrange.rs
deleted file mode 100644
index 1b846694e..000000000
--- a/src/fflonk/compute_lagrange.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fr::Fr;
-    use crate::treepp::*;
-    use ark_ff::Field;
-    use num_bigint::BigUint;
-    use std::str::FromStr;
-
-    #[test]
-    fn test_compute_lagrange() {
-        let mut li_1_inv = ark_bn254::Fr::from_str(
-            "2173335263468457880677030391603678787407318523287432531877773790452047235821",
-        )
-        .unwrap();
-        li_1_inv.inverse_in_place().unwrap();
-
-        let mut li_2_inv = ark_bn254::Fr::from_str(
-            "3695504780263816985137938305786365026932326252410439503136485422302932463173",
-        )
-        .unwrap();
-        li_2_inv.inverse_in_place().unwrap();
-
-        let script = script! {
-            // push zh
-            { Fr::push_dec("9539499652122301619680560867461437153480631573357135330838514610439758374055") }
-
-            // push the inverse of Li_1
-            { Fr::push_u32_le(&BigUint::from(li_1_inv).to_u32_digits()) }
-
-            { Fr::copy(1) }
-            { Fr::toaltstack() }
-
-            { Fr::mul() }
-
-            // check L[1]
-            { Fr::push_dec("19264250262515049392118907974032894668050943806280011767302681470321758079402") }
-            { Fr::equalverify(1, 0) }
-
-            // push the inverse of Li_2
-            { Fr::push_u32_le(&BigUint::from(li_2_inv).to_u32_digits()) }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::push_dec("11699596668367776675346610687704220591435078791727316319397053191800576917728") }
-            { Fr::mul() }
-
-            // check L[2]
-            { Fr::push_dec("5147149846110622280763906966379810308773882279335494056719681880590330080749") }
-            { Fr::equalverify(1, 0) }
-
-            OP_TRUE
-        };
-
-        println!("fflonk.compute_lagrange = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/compute_pi.rs b/src/fflonk/compute_pi.rs
deleted file mode 100644
index 1e16a9c7f..000000000
--- a/src/fflonk/compute_pi.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fr::Fr;
-    use crate::treepp::*;
-
-    #[test]
-    fn test_compute_pi() {
-        let script = script! {
-            // push L[1], L[2]
-            { Fr::push_dec("19264250262515049392118907974032894668050943806280011767302681470321758079402") }
-            { Fr::push_dec("5147149846110622280763906966379810308773882279335494056719681880590330080749") }
-
-            // push the inputs
-            { Fr::push_dec("246513590391103489634602289097178521809") }
-            { Fr::push_dec("138371009144214353742010089705444713455") }
-
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::add(1, 0) }
-            { Fr::neg(0) }
-
-            { Fr::push_dec("12368363170870087162509434874521168463460384615249055347885673275750149676873") }
-            { Fr::equalverify(1, 0) }
-            OP_TRUE
-        };
-
-        println!("fflonk.compute_pi = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/compute_r0.rs b/src/fflonk/compute_r0.rs
deleted file mode 100644
index 23ef8e353..000000000
--- a/src/fflonk/compute_r0.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fr::Fr;
-    use crate::treepp::*;
-    use ark_ff::Field;
-    use num_bigint::BigUint;
-    use std::str::FromStr;
-
-    #[test]
-    fn test_compute_r0() {
-        let mut lis0_1_inv = ark_bn254::Fr::from_str(
-            "15956404548953753015502565241304679000484076548059581562924872764096813859245",
-        )
-        .unwrap();
-        lis0_1_inv.inverse_in_place().unwrap();
-
-        let mut lis0_2_inv = ark_bn254::Fr::from_str(
-            "9114366468980522899431022597914765424075108533625127448987363134676737768036",
-        )
-        .unwrap();
-        lis0_2_inv.inverse_in_place().unwrap();
-
-        let mut lis0_3_inv = ark_bn254::Fr::from_str(
-            "4805205350560837475207388792928996841502521120538573943461389657486975511196",
-        )
-        .unwrap();
-        lis0_3_inv.inverse_in_place().unwrap();
-
-        let mut lis0_4_inv = ark_bn254::Fr::from_str(
-            "10337098495972798453045437161191603828214396074717644472335031854871930659950",
-        )
-        .unwrap();
-        lis0_4_inv.inverse_in_place().unwrap();
-
-        let mut lis0_5_inv = ark_bn254::Fr::from_str(
-            "9668364322474815684450293130850361880537576909329131041685929038205440212223",
-        )
-        .unwrap();
-        lis0_5_inv.inverse_in_place().unwrap();
-
-        let mut lis0_6_inv = ark_bn254::Fr::from_str(
-            "16510402402448045800521835774240275456946544923763585155623438667625516303432",
-        )
-        .unwrap();
-        lis0_6_inv.inverse_in_place().unwrap();
-
-        let mut lis0_7_inv = ark_bn254::Fr::from_str(
-            "20819563520867731224745469579226044039519132336850138661149412144815278560272",
-        )
-        .unwrap();
-        lis0_7_inv.inverse_in_place().unwrap();
-
-        let mut lis0_8_inv = ark_bn254::Fr::from_str(
-            "15287670375455770246907421210963437052807257382671068132275769947430323411518",
-        )
-        .unwrap();
-        lis0_8_inv.inverse_in_place().unwrap();
-
-        let script = script! {
-            // push ql, qr, qo, qm, qc, s1, s2, s3 evaluations
-            // be careful: qo is before qm here
-            { Fr::push_dec("4305584171954448775801758618991977283131671407134816099015723841718827300684") }
-            { Fr::push_dec("12383383973686840675128398394454489421896122330596726461131121746926747341189") }
-            { Fr::push_dec("3940439340424631873531863239669720717811550024514867065774687720368464792371") }
-            { Fr::push_dec("84696450614978050680673343346456326547032107368333805624994614151289555853") }
-            { Fr::push_dec("16961785810060156933739931986193776143069216115530808410139185289490606944009") }
-            { Fr::push_dec("12474437127153975801320290893919924661315458586210754316226946498711086665749") }
-            { Fr::push_dec("599434615255095347665395089945860172292558760398201299457995057871688253664") }
-            { Fr::push_dec("16217604511932175446614838218599989473511950977205890369538297955449224727219") }
-
-            // push H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7
-            { Fr::push_dec("10210594730394925429746291702746561332060256679615545074401657104125756649578") }
-            { Fr::push_dec("8372804009848668687759614171560040965977592547922202747919047620642117005104") }
-            { Fr::push_dec("12018168561098599325315012321442861121728268008555918380929453858170772126806") }
-            { Fr::push_dec("16309511826969302107699393610404172200913629782896950912885458723657982725366") }
-            { Fr::push_dec("11677648141444349792500114042510713756488107720800489269296547082450051846039") }
-            { Fr::push_dec("13515438861990606534486791573697234122570771852493831595779156565933691490513") }
-            { Fr::push_dec("9870074310740675896931393423814413966820096391860115962768750328405036368811") }
-            { Fr::push_dec("5578731044869973114547012134853102887634734617519083430812745462917825770251") }
-
-            // push LiS0Inv 1-8
-            { Fr::push_u32_le(&BigUint::from(lis0_1_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis0_2_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis0_3_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis0_4_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis0_5_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis0_6_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis0_7_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis0_8_inv).to_u32_digits()) }
-
-            // push y
-            { Fr::push_dec("6824639836122392703554190210911349683223362245243195922653951653214183338070") }
-            // push xi
-            { Fr::push_dec("14814634099415170872937750660683266261347419959225231219985478027287965492246") }
-
-            // compute num = y^8 - xi, push to altstack
-            { Fr::roll(1) }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::sub(0, 1) }
-            { Fr::toaltstack() }
-
-            // pick H0w8_0, ..., H0w8_7 and compute the corresponding c0Value
-            for i in 0..8 {
-                { Fr::copy(8 + 7 - i) }
-
-                { Fr::copy(0) } { Fr::copy(1) } { Fr::mul() }
-                { Fr::copy(0) } { Fr::copy(2) } { Fr::mul() }
-                { Fr::copy(0) } { Fr::copy(3) } { Fr::mul() }
-                { Fr::copy(0) } { Fr::copy(4) } { Fr::mul() }
-                { Fr::copy(0) } { Fr::copy(5) } { Fr::mul() }
-                { Fr::copy(0) } { Fr::copy(6) } { Fr::mul() }
-
-                for _ in 0..7 {
-                    { Fr::toaltstack() }
-                }
-
-                // c0Value starts with ql
-                { Fr::copy(16 + 7) }
-                { Fr::copy(16 + 6 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(16 + 5 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(16 + 4 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(16 + 3 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(16 + 2 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(16 + 1 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(16 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-
-                // push this c0Value to the altstack
-                { Fr::toaltstack() }
-            }
-
-            // get all the c0Values out
-            for _ in 0..8 {
-                { Fr::fromaltstack() }
-            }
-
-            // multiply the corresponding LiS0Inv
-            for i in 0..8 {
-                { Fr::roll(8 - i + 7 - i) }
-                { Fr::mul() }
-                { Fr::toaltstack() }
-            }
-
-            // drop all the intermediate values
-            for _ in 0..16 {
-                { Fr::drop() }
-            }
-
-            // add all the c0Values together
-            { Fr::fromaltstack() }
-            for _ in 1..8 {
-                { Fr::fromaltstack() }
-                { Fr::add(1, 0) }
-            }
-
-            // multiply by the num
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-
-            { Fr::push_dec("9984215396403043994941496429066900252890008119992652401049849633408576425336") }
-            { Fr::equalverify(1, 0) }
-            OP_TRUE
-        };
-
-        println!("fflonk.compute_r0 = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/compute_r1.rs b/src/fflonk/compute_r1.rs
deleted file mode 100644
index ebca863a0..000000000
--- a/src/fflonk/compute_r1.rs
+++ /dev/null
@@ -1,192 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fr::Fr;
-    use crate::treepp::*;
-    use ark_ff::Field;
-    use num_bigint::BigUint;
-    use std::str::FromStr;
-
-    #[test]
-    fn test_compute_r1() {
-        let mut zh_inv = ark_bn254::Fr::from_str(
-            "9539499652122301619680560867461437153480631573357135330838514610439758374055",
-        )
-        .unwrap();
-        zh_inv.inverse_in_place().unwrap();
-
-        let mut lis1_1_inv = ark_bn254::Fr::from_str(
-            "14020133117267276520346758762568130957151367475598025622226445111246020829435",
-        )
-        .unwrap();
-        lis1_1_inv.inverse_in_place().unwrap();
-
-        let mut lis1_2_inv = ark_bn254::Fr::from_str(
-            "11834191057204778210308675185625212949005795861807682697825227112830256931177",
-        )
-        .unwrap();
-        lis1_2_inv.inverse_in_place().unwrap();
-
-        let mut lis1_3_inv = ark_bn254::Fr::from_str(
-            "20680494190286283051876076168766664571907823653512365023777159976480914701916",
-        )
-        .unwrap();
-        lis1_3_inv.inverse_in_place().unwrap();
-
-        let mut lis1_4_inv = ark_bn254::Fr::from_str(
-            "978193378509506139667754000452307491505030866886673604480173788320870104557",
-        )
-        .unwrap();
-        lis1_4_inv.inverse_in_place().unwrap();
-
-        let script = script! {
-            // push ql, qr, qm, qo, qc, a, b, c
-            { Fr::push_dec("4305584171954448775801758618991977283131671407134816099015723841718827300684") }
-            { Fr::push_dec("12383383973686840675128398394454489421896122330596726461131121746926747341189") }
-            { Fr::push_dec("84696450614978050680673343346456326547032107368333805624994614151289555853") }
-            { Fr::push_dec("3940439340424631873531863239669720717811550024514867065774687720368464792371") }
-            { Fr::push_dec("16961785810060156933739931986193776143069216115530808410139185289490606944009") }
-            { Fr::push_dec("7211168621666826182043583595845418959530786367587156242724929610231435505336") }
-            { Fr::push_dec("848088075173937026388846472327431819307508078325359401333033359624801042") }
-            { Fr::push_dec("18963734392470978715233675860777231227480937309534365140504133190694875258320") }
-
-            // push pi, zhInv
-            { Fr::push_dec("12368363170870087162509434874521168463460384615249055347885673275750149676873") }
-            { Fr::push_u32_le(&BigUint::from(zh_inv).to_u32_digits()) }
-
-            // push H1w4_0, H1w4_1, H1w4_2, H1w4_3
-            { Fr::push_dec("1756820407515345004507058825871382296137098363972706405994173662850350774688") }
-            { Fr::push_dec("16907152808936898292083477165412732098542037853664649778796264398384084027651") }
-            { Fr::push_dec("20131422464323930217739346919385892792411266036443327937704030523725457720929") }
-            { Fr::push_dec("4981090062902376930162928579844542990006326546751384564901939788191724467966") }
-
-            // push LiS1Inv 1-4
-            { Fr::push_u32_le(&BigUint::from(lis1_1_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis1_2_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis1_3_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis1_4_inv).to_u32_digits()) }
-
-            // push y
-            { Fr::push_dec("6824639836122392703554190210911349683223362245243195922653951653214183338070") }
-            // push xi
-            { Fr::push_dec("14814634099415170872937750660683266261347419959225231219985478027287965492246") }
-
-            // compute num = y^4 - xi, push to altstack
-            { Fr::roll(1) }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::sub(0, 1) }
-            { Fr::toaltstack() }
-
-            // compute t0
-
-            // ql * evalA
-            { Fr::copy(10 + 7) }
-            { Fr::copy(10 + 2 + 1) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // qr * evalB
-            { Fr::copy(10 + 6) }
-            { Fr::copy(10 + 1 + 1) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // qm * evalA * evalB
-            { Fr::copy(10 + 5) }
-            { Fr::copy(10 + 2 + 1) }
-            { Fr::mul() }
-            { Fr::copy(10 + 1 + 1) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // qo * evalC
-            { Fr::copy(10 + 4) }
-            { Fr::copy(10 + 1) }
-            { Fr::mul() }
-
-            // t0 := ql * evalA + qr * evalB + qm * evalA * evalB + qo * evalC + qc + pi
-            { Fr::fromaltstack() }
-            { Fr::add(1, 0) }
-            { Fr::fromaltstack() }
-            { Fr::add(1, 0) }
-            { Fr::fromaltstack() }
-            { Fr::add(1, 0) }
-            { Fr::copy(10 + 3 + 1) }
-            { Fr::add(1, 0) }
-            { Fr::copy(8 + 1 + 1) }
-            { Fr::add(1, 0) }
-
-            // t0 := t0 * zhInv
-            { Fr::copy(8 + 1) }
-            { Fr::mul() }
-
-            // the stack should look like:
-            //    ql, qr, qm, qo, qc, a, b, c
-            //    pi, zhInv
-            //    H1w4_0, H1w4_1, H1w4_2, H1w4_3
-            //    LiS1Inv 1-4
-            //    t0
-            //
-            // altstack: num
-
-            // pick H1w4_0, ..., H1w4_3 and compute the corresponding c1Value
-            for i in 0..4 {
-                { Fr::copy(1 + 4 + 3 - i) }
-
-                { Fr::copy(0) } { Fr::copy(1) } { Fr::mul() }
-                { Fr::copy(0) } { Fr::copy(2) } { Fr::mul() }
-
-                for _ in 0..3 {
-                    { Fr::toaltstack() }
-                }
-
-                // c1Value starts with a
-                { Fr::copy(1 + 4 + 4 + 2 + 2) }
-                { Fr::copy(1 + 4 + 4 + 2 + 1 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(1 + 4 + 4 + 2 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-
-                // push this c1Value to the altstack
-                { Fr::toaltstack() }
-            }
-
-            // get all the c1Values out
-            for _ in 0..4 {
-                { Fr::fromaltstack() }
-            }
-
-            // multiply the corresponding LiS1Inv
-            for i in 0..4 {
-                { Fr::roll(4 - i + 1 + 3 - i) }
-                { Fr::mul() }
-                { Fr::toaltstack() }
-            }
-
-            // drop all the intermediate values
-            for _ in 0..(1 + 4 + 2 + 8) {
-                { Fr::drop() }
-            }
-
-            // add all the c0Values together
-            { Fr::fromaltstack() }
-            for _ in 1..4 {
-                { Fr::fromaltstack() }
-                { Fr::add(1, 0) }
-            }
-
-            // multiply by the num
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-
-            { Fr::push_dec("20094893460628001506464425210304996393341228871437567669976791505614033716878") }
-            { Fr::equalverify(1, 0) }
-            OP_TRUE
-        };
-
-        println!("fflonk.compute_r1 = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/compute_r2.rs b/src/fflonk/compute_r2.rs
deleted file mode 100644
index 55f608864..000000000
--- a/src/fflonk/compute_r2.rs
+++ /dev/null
@@ -1,309 +0,0 @@
-#[cfg(test)]
-mod test {
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fr::Fr;
-    use crate::treepp::*;
-    use ark_ff::Field;
-    use num_bigint::BigUint;
-    use std::str::FromStr;
-
-    #[test]
-    fn test_compute_r2() {
-        let mut zh_inv = ark_bn254::Fr::from_str(
-            "9539499652122301619680560867461437153480631573357135330838514610439758374055",
-        )
-        .unwrap();
-        zh_inv.inverse_in_place().unwrap();
-
-        let mut lis2_1_inv = ark_bn254::Fr::from_str(
-            "3093337848584598859019239395285698636013991558183047188123490283901254813860",
-        )
-        .unwrap();
-        lis2_1_inv.inverse_in_place().unwrap();
-
-        let mut lis2_2_inv = ark_bn254::Fr::from_str(
-            "20657040851814184192491101400192407860657376306604707917505085770367913835835",
-        )
-        .unwrap();
-        lis2_2_inv.inverse_in_place().unwrap();
-
-        let mut lis2_3_inv = ark_bn254::Fr::from_str(
-            "19967358551509656347901544077253903207276114223653090077162230657486295778552",
-        )
-        .unwrap();
-        lis2_3_inv.inverse_in_place().unwrap();
-
-        let mut lis2_4_inv = ark_bn254::Fr::from_str(
-            "21800223472280064353933220303685416010271075398742978562230724357473593460561",
-        )
-        .unwrap();
-        lis2_4_inv.inverse_in_place().unwrap();
-
-        let mut lis2_5_inv = ark_bn254::Fr::from_str(
-            "2883351026271900821141854554977492864766487799404625079971870711410039053769",
-        )
-        .unwrap();
-        lis2_5_inv.inverse_in_place().unwrap();
-
-        let mut lis2_6_inv = ark_bn254::Fr::from_str(
-            "9551022927007589928168012516897412879701840127652630952681115227109825028798",
-        )
-        .unwrap();
-        lis2_6_inv.inverse_in_place().unwrap();
-
-        let script = script! {
-            // push a, b, c, z, zw, s1, s2, s3, t1w, t2w (10 elements)
-            { Fr::push_dec("7211168621666826182043583595845418959530786367587156242724929610231435505336") }
-            { Fr::push_dec("848088075173937026388846472327431819307508078325359401333033359624801042") }
-            { Fr::push_dec("18963734392470978715233675860777231227480937309534365140504133190694875258320") }
-            { Fr::push_dec("2427313569771756255376235777000596702684056445296844486767054635200432142794") }
-            { Fr::push_dec("8690328511114991742730387856275843464438882369629727414507275814599493141660") }
-            { Fr::push_dec("12474437127153975801320290893919924661315458586210754316226946498711086665749") }
-            { Fr::push_dec("599434615255095347665395089945860172292558760398201299457995057871688253664") }
-            { Fr::push_dec("16217604511932175446614838218599989473511950977205890369538297955449224727219") }
-            { Fr::push_dec("20786626696833495453279531623626288211765949258916047124642669459480728122908") }
-            { Fr::push_dec("12092130080251498309415337127155404037148503145602589831662396526189421234148") }
-
-            // push beta, y, xi, gamma, zhinv, L[1] which is from computeLagrange (6 elements)
-            { Fr::push_dec("485596931070696584921673007746559446164232583596250406637950679013042540061")}
-            { Fr::push_dec("6824639836122392703554190210911349683223362245243195922653951653214183338070") }
-            { Fr::push_dec("14814634099415170872937750660683266261347419959225231219985478027287965492246") }
-            { Fr::push_dec("19250037324033436581569284153336383290774316882310310865823706333327285195728") }
-            { Fr::push_u32_le(&BigUint::from(zh_inv).to_u32_digits()) }
-            { Fr::push_dec("19264250262515049392118907974032894668050943806280011767302681470321758079402") }
-
-            // push H2w3_0, H2w3_1, H2w3_2, H3w3_0, H3w3_1, H3w3_2 (6 elements)
-            { Fr::push_dec("8645910648030292747222447120598663930712351861448151482708581449066841434015") }
-            { Fr::push_dec("2196608840183762817611603553419504245649898072887146050087043489198732467688") }
-            { Fr::push_dec("11045723383625219657412355071239106912186114466080736810902579248310234593914") }
-            { Fr::push_dec("21405568746311661929319138487394095463124289053215849061649274916682085734478") }
-            { Fr::push_dec("16458699422327211795980147165837933894457139622322803085568450314170832928180") }
-            { Fr::push_dec("5912217575039676719193525837282520819515300125293416540178683142298698328576") }
-
-            // push LiS2Inv 1-6 (6 elements)
-            { Fr::push_u32_le(&BigUint::from(lis2_1_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis2_2_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis2_3_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis2_4_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis2_5_inv).to_u32_digits()) }
-            { Fr::push_u32_le(&BigUint::from(lis2_6_inv).to_u32_digits()) }
-
-            // compute num2 := y^3
-            { Fr::copy(6 + 6 + 4) }
-            { Fr::copy(0) }
-            { Fr::square() }
-            { Fr::mul() }
-
-            // compute num := num2^2 = y^6
-            { Fr::copy(0) }
-            { Fr::square() }
-
-            // compute xi * w1 + xi = xi * (w1 + 1)
-            { Fr::copy(6 + 6 + 3 + 2) }
-            { Fr::push_dec("11699596668367776675346610687704220591435078791727316319397053191800576917728") }
-            { Fr::push_one() }
-            { Fr::add(1, 0) }
-            { Fr::mul() }
-
-            // compute num2 := num2 * (xi * (w1 + 1))
-            { Fr::roll(2) }
-            { Fr::mul() }
-
-            // compute num := num - num2
-            { Fr::sub(1, 0) }
-
-            // compute xi^2 * w1
-            { Fr::copy(6 + 6 + 3 + 1) }
-            { Fr::square() }
-            { Fr::push_dec("11699596668367776675346610687704220591435078791727316319397053191800576917728") }
-            { Fr::mul() }
-
-            // compute num := num +  xi^2 * w1 and move to altstack
-            { Fr::add(1, 0) }
-            { Fr::toaltstack() }
-
-            // compute betaxi
-            { Fr::copy(6 + 6 + 5) }
-            { Fr::copy(6 + 6 + 3 + 1) }
-            { Fr::mul() }
-
-            // compute betaxi + gamma
-            { Fr::copy(0) }
-            { Fr::copy(6 + 6 + 2 + 2) }
-            { Fr::add(1, 0) }
-
-            // compute a + betaxi + gamma and send to altstack
-            { Fr::copy(6 + 6 + 6 + 9 + 2) }
-            { Fr::add(1, 0) }
-            { Fr::toaltstack() }
-
-            // compute betaxi * k1 + gamma for k1 = 2
-            { Fr::copy(0) }
-            { Fr::double(0) }
-            { Fr::copy(6 + 6 + 2 + 2) }
-            { Fr::add(1, 0) }
-
-            // compute b + betaxi * k1 + gamma and send to altstack
-            { Fr::copy(6 + 6 + 6 + 8 + 2) }
-            { Fr::add(1, 0) }
-            { Fr::toaltstack() }
-
-            // compute betaxi * k2 + gamma for k2 = 3
-            { Fr::copy(0) }
-            { Fr::double(0) }
-            { Fr::add(1, 0) }
-            { Fr::copy(6 + 6 + 2 + 1) }
-            { Fr::add(1, 0) }
-
-            // compute c + betaxi * k2 + gamma and send to altstack
-            { Fr::copy(6 + 6 + 6 + 7 + 1) }
-            { Fr::add(1, 0) }
-
-            // compute t2 = (a + betaxi + gamma) * (b + betaxi * k1 + gamma) * (c + betaxi * k2 + gamma) * z
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::copy(6 + 6 + 6 + 6 + 1) }
-            { Fr::mul() }
-
-            // send t2 to the altstack
-            { Fr::toaltstack() }
-
-            // compute beta * s1 + gamma + a
-            { Fr::copy(6 + 6 + 5) }
-            { Fr::copy(6 + 6 + 6 + 4 + 1) }
-            { Fr::mul() }
-            { Fr::copy(6 + 6 + 2 + 1) }
-            { Fr::add(1, 0) }
-            { Fr::copy(6 + 6 + 6 + 9 + 1) }
-            { Fr::add(1, 0) }
-            { Fr::toaltstack() }
-
-            // compute beta * s2 + gamma + b
-            { Fr::copy(6 + 6 + 5) }
-            { Fr::copy(6 + 6 + 6 + 3 + 1) }
-            { Fr::mul() }
-            { Fr::copy(6 + 6 + 2 + 1) }
-            { Fr::add(1, 0) }
-            { Fr::copy(6 + 6 + 6 + 8 + 1) }
-            { Fr::add(1, 0) }
-            { Fr::toaltstack() }
-
-            // compute beta * s3 + gamma + c
-            { Fr::copy(6 + 6 + 5) }
-            { Fr::copy(6 + 6 + 6 + 2 + 1) }
-            { Fr::mul() }
-            { Fr::copy(6 + 6 + 2 + 1) }
-            { Fr::add(1, 0) }
-            { Fr::copy(6 + 6 + 6 + 7 + 1) }
-            { Fr::add(1, 0) }
-
-            // compute t2' = (beta * s1 + gamma + a) * (beta * s2 + gamma + b) * (beta * s3 + gamma + c) * zw
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::copy(6 + 6 + 6 + 5 + 1) }
-            { Fr::mul() }
-
-            // compute t2 := t2 - t2'
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // compute t2 := t2 * zhinv
-            { Fr::copy(6 + 6 + 1 + 1) }
-            { Fr::mul() }
-
-            // send the updated t2 to the altstack
-            { Fr::toaltstack() }
-
-            // compute t1 = (z - 1) * L[1] * zhinv
-            { Fr::copy(6 + 6 + 6 + 6) }
-            { Fr::push_one() }
-            { Fr::sub(1, 0) }
-            { Fr::copy(6 + 6 + 1) }
-            { Fr::mul() }
-            { Fr::copy(6 + 6 + 1 + 1) }
-            { Fr::mul() }
-
-            // pull t2 from the altstack
-            { Fr::fromaltstack() }
-
-            // the stack now looks:
-            //   10 + 6 + 6 + 6 Fr elements
-            //   t1
-            //   t2
-            // altstack: num
-
-            // pick H2w3_0, ..., H2w3_2 and compute the corresponding c2Value
-            for i in 0..3 {
-                { Fr::copy(2 + 6 + 5 - i) }
-
-                { Fr::copy(0) } { Fr::square() }
-                { Fr::toaltstack() } { Fr::toaltstack() }
-
-                // c2Value starts with z
-                { Fr::copy(2 + 6 + 6 + 6 + 6) }
-                { Fr::copy(1 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-
-                // push this c2Value to the altstack
-                { Fr::toaltstack() }
-            }
-
-            // pick H3w3_0, ..., H3w3_2 and compute the corresponding c2Value
-            for i in 0..3 {
-                { Fr::copy(2 + 6 + 2 - i) }
-
-                { Fr::copy(0) } { Fr::square() }
-                { Fr::toaltstack() } { Fr::toaltstack() }
-
-                // c2Value starts with zw
-                { Fr::copy(2 + 6 + 6 + 6 + 5) }
-                { Fr::copy(2 + 6 + 6 + 6 + 1 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(2 + 6 + 6 + 6 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-
-                // push this c2Value to the altstack
-                { Fr::toaltstack() }
-            }
-
-            // get all the c1Values out
-            for _ in 0..6 {
-                { Fr::fromaltstack() }
-            }
-
-            // multiply the corresponding LiS1Inv
-            for i in 0..6 {
-                { Fr::roll(6 - i + 2 + 5 - i) }
-                { Fr::mul() }
-                { Fr::toaltstack() }
-            }
-
-            // drop all the intermediate values
-            for _ in 0..(2 + 6 + 6 + 10) {
-                { Fr::drop() }
-            }
-
-            // add all the c0Values together
-            { Fr::fromaltstack() }
-            for _ in 1..6 {
-                { Fr::fromaltstack() }
-                { Fr::add(1, 0) }
-            }
-
-            // multiply by the num
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-
-            { Fr::push_dec("17870878740602377735172834182794916404148892013933556022942404950055827532212") }
-            { Fr::equalverify(1, 0) }
-            OP_TRUE
-        };
-
-        println!("fflonk.compute_r2 = {} bytes", script.len());
-
-        let exec_result = execute_script(script);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/fflonk/mod.rs b/src/fflonk/mod.rs
deleted file mode 100644
index 0625f0e99..000000000
--- a/src/fflonk/mod.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-pub mod check_format;
-pub mod checkpairing_a1;
-pub mod checkpairing_miller_loop;
-pub mod checkpairing_normalize;
-pub mod checkpairing_with_c_wi;
-pub mod checkpairing_zerotest;
-pub mod compute_c_wi;
-pub mod compute_challenges;
-pub mod compute_e;
-pub mod compute_f;
-pub mod compute_fej_scalars;
-pub mod compute_inversions;
-pub mod compute_j;
-pub mod compute_lagrange;
-pub mod compute_pi;
-pub mod compute_r0;
-pub mod compute_r1;
-pub mod compute_r2;
-pub mod verifier;
diff --git a/src/fflonk/verifier.rs b/src/fflonk/verifier.rs
deleted file mode 100644
index 0caf98987..000000000
--- a/src/fflonk/verifier.rs
+++ /dev/null
@@ -1,2877 +0,0 @@
-#[allow(non_snake_case)]
-#[cfg(test)]
-mod test {
-    use crate::bn254::curves::G1Affine;
-    use crate::bn254::curves::G1Projective;
-    use crate::bn254::ell_coeffs::G2Prepared;
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::bn254::fq::Fq;
-    use crate::bn254::fq12::Fq12;
-    use crate::bn254::fr::Fr;
-    use crate::bn254::pairing::Pairing;
-
-    use crate::bn254::utils;
-    use crate::execute_script_as_chunks;
-    use crate::hash::blake3::blake3_var_length;
-    use crate::treepp::*;
-    use ark_bn254::Bn254;
-    use ark_ec::pairing::Pairing as ArkPairing;
-    use ark_ec::CurveGroup;
-    use ark_ff::{Field, One};
-    use ark_std::UniformRand;
-    use num_bigint::BigUint;
-    use num_traits::{Num, ToPrimitive};
-    use rand::SeedableRng;
-    use rand_chacha::ChaCha20Rng;
-    use std::str::FromStr;
-
-    fn fq12_push(element: ark_bn254::Fq12) -> Script {
-        script! {
-            for elem in element.to_base_prime_field_elements() {
-                { Fq::push_u32_le(&BigUint::from(elem).to_u32_digits()) }
-           }
-        }
-    }
-
-    /// compute challenges
-    fn compute_challenges_beta(
-        hash: &Script,
-        c0_x: &str,
-        c0_y: &str,
-        c1_x: &str,
-        c1_y: &str,
-        inp_1: &str,
-        inp_2: &str,
-    ) -> Script {
-        script! {
-            // push C0
-            {
-                Fq::push_dec(
-                    c0_x
-                )
-            }
-            {
-                Fq::push_dec(
-                    c0_y
-                )
-            }
-            // push the public input
-            {
-                Fq::push_dec(inp_1)
-            }
-            {
-                Fq::push_dec(inp_2)
-            }
-            // push C1
-            {
-                Fq::push_dec(
-                    c1_x
-                )
-            }
-            {
-                Fq::push_dec(
-                    c1_y
-                )
-            }
-
-            // send C0 to altstack
-            {
-                Fq::roll(4)
-            }
-            {
-                Fq::toaltstack()
-            }
-            {
-                Fq::roll(4)
-            }
-            {
-                Fq::toaltstack()
-            }
-
-            // send the public input to altstack
-            {
-                Fq::roll(3)
-            }
-            {
-                Fq::toaltstack()
-            }
-            {
-                Fq::roll(2)
-            }
-            {
-                Fq::toaltstack()
-            }
-
-            // convert C1 into bytes
-            {
-                G1Affine::convert_to_compressed()
-            }
-
-            // convert the public input into bytes
-            {
-                Fq::fromaltstack()
-            }
-            {
-                Fq::convert_to_be_bytes()
-            }
-            {
-                Fq::fromaltstack()
-            }
-            {
-                Fq::convert_to_be_bytes()
-            }
-
-            // convert C0 into bytes
-            {
-                Fq::fromaltstack()
-            }
-            {
-                Fq::fromaltstack()
-            }
-            {
-                G1Affine::convert_to_compressed()
-            }
-
-            // compute the hash
-            {
-                hash.clone()
-            }
-            {
-                Fr::from_hash()
-            }
-        }
-    }
-
-    fn compute_challenges_gamma(hash: &Script) -> Script {
-        script! {
-         { Fr::copy(0) }
-         { Fr::convert_to_be_bytes() }
-         { hash.clone() }
-         { Fr::from_hash() }
-        }
-    }
-
-    fn compute_challenges_alpha(
-        hash: &Script,
-        xi: &str,
-        ql: &str,
-        qr: &str,
-        qm: &str,
-        qo: &str,
-        qc: &str,
-        s1: &str,
-        s2: &str,
-        s3: &str,
-        a: &str,
-        b: &str,
-        c: &str,
-        z: &str,
-        zw: &str,
-        t1w: &str,
-        t2w: &str,
-    ) -> Script {
-        script! {
-            // push xi seed
-            { Fr::push_dec(xi) }
-
-            // push the polynomial evaluations
-
-            // ql
-            { Fr::push_dec(ql) }
-
-            // qr
-            { Fr::push_dec(qr) }
-
-            // qm
-            { Fr::push_dec(qm) }
-
-            // qo
-            { Fr::push_dec(qo) }
-
-            // qc
-            { Fr::push_dec(qc) }
-
-            // s1
-            { Fr::push_dec(s1) }
-
-            // s2
-            { Fr::push_dec(s2) }
-
-            // s3
-            { Fr::push_dec(s3) }
-
-            // a
-            { Fr::push_dec(a) }
-
-            // b
-            { Fr::push_dec(b) }
-
-            // c
-            { Fr::push_dec(c) }
-
-            // z
-            { Fr::push_dec(z) }
-
-            // zw
-            { Fr::push_dec(zw) }
-
-            // t1w
-            { Fr::push_dec(t1w) }
-
-            // t2w
-            { Fr::push_dec(t2w) }
-
-            for i in 1..16 {
-                { Fr::roll(16 - i) } { Fr::toaltstack() }
-            }
-
-            { Fr::convert_to_be_bytes() }
-
-            for _ in 0..15 {
-                { Fr::fromaltstack() } { Fr::convert_to_be_bytes() }
-            }
-
-            {hash.clone()}
-            { Fr::from_hash() }
-        }
-    }
-
-    // [beta, gamma, alpha]
-    fn compute_challenges_y(hash: &Script, w1_x: &str, w1_y: &str) -> Script {
-        script! {
-            // alpha
-            { Fr::copy(0) }
-            // W1
-            { Fq::push_dec(w1_x) }
-            { Fq::push_dec(w1_y) }
-
-            { Fr::roll(2) }
-            { Fr::toaltstack() }
-
-            { G1Affine::convert_to_compressed() }
-            { Fr::fromaltstack() }
-            { Fr::convert_to_be_bytes() }
-
-            {hash.clone()}
-            { Fr::from_hash() }
-        }
-    }
-
-    // [beta, gamma, alpha, y]
-    fn compute_challenges_xiseed(hash: &Script, c2_x: &str, c2_y: &str) -> Script {
-        script! {
-            { Fr::copy(2) }
-            // C2
-            { Fq::push_dec(c2_x) }
-            { Fq::push_dec(c2_y) }
-
-            { Fr::roll(2) }
-            { Fr::toaltstack() }
-
-            { G1Affine::convert_to_compressed() }
-            { Fr::fromaltstack() }
-            { Fr::convert_to_be_bytes() }
-
-            {hash.clone()}
-            { Fr::from_hash() }
-        }
-    }
-
-    // [beta, gamma, alpha, y, xiseed]
-    fn compute_challenges_xin(
-        w8_1: &str,
-        w8_2: &str,
-        w8_3: &str,
-        w8_4: &str,
-        w8_5: &str,
-        w8_6: &str,
-        w8_7: &str,
-        w3: &str,
-        w3_2: &str,
-        w4: &str,
-        w4_2: &str,
-        w4_3: &str,
-        wr: &str,
-    ) -> Script {
-        script! {
-            // push xiseed
-            // { Fr::copy(0) }
-            // compute xiseed^2
-            { Fr::copy(0) }
-            { Fr::square() }
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // pH0w8_0 = xiseed^3
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0]
-
-            // pH0w8_1
-            { Fr::copy(0) }
-            // push constant w8_1
-            { Fr::push_dec(w8_1) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1]
-
-            // pH0w8_2
-            // { Fr::copy(0) }
-            { Fr::copy(1) }
-            // push constant w8_2
-            { Fr::push_dec(w8_2) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2]
-
-            // pH0w8_3
-            // { Fr::copy(0) }
-            { Fr::copy(2) }
-            // push constant w8_3
-            { Fr::push_dec(w8_3) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3]
-
-            // pH0w8_4
-            { Fr::copy(3) }
-            // push constant w8_4
-            { Fr::push_dec(w8_4) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4]
-
-            // pH0w8_5
-            { Fr::copy(4) }
-            // push constant w8_5
-            { Fr::push_dec(w8_5) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5]
-
-            // pH0w8_6
-            { Fr::copy(5) }
-            // push constant w8_6
-            { Fr::push_dec(w8_6) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6]
-
-            // pH0w8_7
-            { Fr::copy(6) }
-            // push constant w8_7
-            { Fr::push_dec(w8_7) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7]
-
-            // pH1w4_0 = xiseed^6
-            { Fr::copy(7) }
-            { Fr::square() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, ]
-
-            // pH1w4_1
-            { Fr::copy(0) }
-            // push constant w4
-            { Fr::push_dec(w4) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1]
-
-            // pH1w4_2
-            { Fr::copy(1) }
-            // push constant w4_1
-            { Fr::push_dec(w4_2) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2]
-
-            // pH1w4_3
-            { Fr::copy(2) }
-            // push constant w4_2
-            { Fr::push_dec(w4_3) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3]
-
-            // pH2w3_0 = xiseed^8
-            { Fr::copy(3) }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            // { Fr::copy(0) }
-            // { Fr::toaltstack() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0]
-
-            // pH2w3_1
-            { Fr::copy(0) }
-            // push constant w3
-            { Fr::push_dec(w3) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1]
-
-            // pH2w3_2
-            { Fr::copy(1) }
-            // push constant w3_2
-            { Fr::push_dec(w3_2) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2]
-
-            // pH3w3_0 = xiseed^8 * ω^{1/3}
-            { Fr::copy(2) }
-            { Fr::push_dec(wr) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0]
-
-            // pH3w3_1
-            { Fr::copy(0) }
-            // push constant w3
-            { Fr::push_dec(w3) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1]
-
-            // pH2w3_2
-            // push constant w3_2
-            { Fr::copy(1) }
-            { Fr::push_dec(w3_2) }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2]
-
-            // { Fr::fromaltstack() }
-            { Fr::copy(5) }
-
-            // xi = xi_seeder^24
-            { Fr::copy(0) }
-            { Fr::square() }
-            { Fr::mul() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi]
-
-            // xiN
-            { Fr::copy(0) }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, xiN]
-
-            // zh
-            { Fr::push_one() }
-            { Fr::sub(1, 0) }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh]
-        }
-    }
-    // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-    // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh]
-    // pH3w3_0(3), pH2w3_0(6), pH1w4_0(10), pH0w8_0(18)
-
-    /// compute inversions
-    fn compute_inversions(w: &str, inv: &str) -> Script {
-        script! {
-            // push Z_H
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // push y
-            { Fr::copy(20) }
-            // push H1w4_0, H1w4_1, H1w4_2, H1w4_3
-            { Fr::copy(12) }
-            { Fr::copy(12) }
-            { Fr::copy(12) }
-            { Fr::copy(12) }
-            // [..., xi, zh, y, pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3 | Z_H]
-
-            { Fr::copy(4) }
-            { Fr::sub(0, 1) }
-            // [xi, zh, y, pH1w4_0, pH1w4_1, pH1w4_2, y - pH1w4_3 | Z_H]
-            { Fr::copy(4) }
-            { Fr::sub(0, 2) }
-            // [xi, zh, y, pH1w4_0, pH1w4_1, y - pH1w4_3, y - pH1w4_2 | Z_H]
-            { Fr::copy(4) }
-            { Fr::sub(0, 3) }
-            // [xi, zh, y, pH1w4_0, y - pH1w4_3, y - pH1w4_2, y - pH1w4_1 | Z_H]
-            { Fr::copy(4) }
-            { Fr::sub(0, 4) }
-            // [xi, zh, y, y - pH1w4_3, y - pH1w4_2, y - pH1w4_1, y - pH1w4_0 | Z_H]
-
-            { Fr::mul() }
-            { Fr::mul() }
-            { Fr::mul() }
-            // [y, (y - pH1w4_3) * (y - pH1w4_2) * (y - pH1w4_1) * (y - pH1w4_0)]
-            { Fr::toaltstack() }
-            // [y | Z_H, (y - pH1w4_3) * (y - pH1w4_2) * (y - pH1w4_1) * (y - pH1w4_0)]
-
-            // push H2w3_0, H2w3_1, H2w3_2, H3w3_0, H3w3_1, H3w3_2
-            { Fr::copy(8) }
-            { Fr::copy(8) }
-            { Fr::copy(8) }
-            { Fr::copy(8) }
-            { Fr::copy(8) }
-            { Fr::copy(8) }
-            // [y, H2w3_0, H2w3_1, H2w3_2, H3w3_0, H3w3_1, H3w3_2 | Z_H, prod_1]
-
-            { Fr::copy(6) }
-            { Fr::sub(0, 1) }
-            // [y, H2w3_0, H2w3_1, H2w3_2, H3w3_0, H3w3_1, y -  H3w3_2]
-            { Fr::copy(6) }
-            { Fr::sub(0, 2) }
-            // [y, H2w3_0, H2w3_1, H2w3_2, H3w3_0, y -  H3w3_2, y - H3w3_1]
-            { Fr::copy(6) }
-            { Fr::sub(0, 3) }
-            // [y, H2w3_0, H2w3_1, H2w3_2, y -  H3w3_2, y - H3w3_1, y - H3w3_0]
-            { Fr::copy(6) }
-            { Fr::sub(0, 4) }
-            // [y, H2w3_0, H2w3_1, y -  H3w3_2, y - H3w3_1, y - H3w3_0, y - H2w3_2]
-            { Fr::copy(6) }
-            { Fr::sub(0, 5) }
-            // [y, H2w3_0, y -  H3w3_2, y - H3w3_1, y - H3w3_0, y - H2w3_2, y - H2w3_1]
-            { Fr::copy(6) }
-            { Fr::sub(0, 6) }
-            // [y, y -  H3w3_2, y - H3w3_1, y - H3w3_0, y - H2w3_2, y - H2w3_1, y - H2w3_0]
-
-            { Fr::mul() }
-            { Fr::mul() }
-            { Fr::mul() }
-            { Fr::mul() }
-            { Fr::mul() }
-            // [y, (y -  H3w3_2) * (y - H3w3_1) * (y - H3w3_0) * (y - H2w3_2) * (y - H2w3_1) * (y - H2w3_0)]
-            { Fr::toaltstack() }
-            // [y | Z_H, prod_1, prod_2]
-
-            // push H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7
-            { Fr::copy(20) }
-            { Fr::copy(20) }
-            { Fr::copy(20) }
-            { Fr::copy(20) }
-            { Fr::copy(20) }
-            { Fr::copy(20) }
-            { Fr::copy(20) }
-            { Fr::copy(20) }
-            // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 | Z_H, prod_1, prod_2]
-
-            // den1 = Fr.mul(Fr.e(len), Fr.exp(roots[0], len - 2)) = = 8 * H0w8_0 ^ 6
-            { Fr::copy(7) }
-            { Fr::square() }
-            { Fr::copy(0) }
-            { Fr::square() }
-            { Fr::mul() }
-            { Fr::double(0) }
-            { Fr::double(0) }
-            { Fr::double(0) }
-            { Fr::toaltstack() }
-            // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 | Z_H, prod_1, prod_2, den1]
-
-            // den2 = roots[7 * 0 % 8] = roots[0]
-            { Fr::copy(7) }
-            { Fr::toaltstack() }
-            // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 | prod_1, prod_2, den1, den2]
-
-            // den3 = x - roots[0]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(7) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-            // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7, y - H0w8_0 | Z_H, prod_1, prod_2, den1, den2]
-
-            // LiS0_1 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-            // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 | Z_H, prod_1, prod_2, LiS0_1, den1]
-
-            // den2 = roots[7 * 1 % 8] = roots[7]
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-            // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 | Z_H, prod_1, prod_2, LiS0_1, den1, H0w8_7]
-
-            // den3 = x - roots[1]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(6) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-            // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7, y - H0w8_1 | Z_H, prod_1, prod_2, LiS0_1, den1, den2]
-
-            // LiS0_2 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-            // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, den1]
-
-            // den2 = roots[7 * 2 % 8] = roots[6]
-            { Fr::copy(1) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[2]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(5) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_3 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-            // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, den1]
-
-            // den2 = roots[7 * 3 % 8] = roots[5]
-            { Fr::copy(2) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[3]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(4) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_4 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-            // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, den1]
-
-            // den2 = roots[7 * 4 % 8] = roots[4]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[4]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(3) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_5 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-            // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, den1]
-
-            // den2 = roots[7 * 5 % 8] = roots[3]
-            { Fr::copy(4) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[5]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(2) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_6 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-            // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, den1]
-
-            // den2 = roots[7 * 6 % 8] = roots[2]
-            { Fr::copy(5) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[6]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(1) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_7 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-           // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, den1]
-
-            // den2 = roots[7 * 7 % 8] = roots[1]
-            { Fr::copy(6) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[7]
-            { Fr::copy(8) }
-            { Fr::toaltstack() }
-            { Fr::copy(0) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS0_8 = den1 * den2 * den3, remove den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-           // [y, H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8]
-
-            // drop H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-           // [y | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8]
-
-            // push H1w4_0, H1w4_1, H1w4_2, H1w4_3
-            { Fr::copy(12) }
-            { Fr::copy(12) }
-            { Fr::copy(12) }
-            { Fr::copy(12) }
-
-            // den1 = Fr.mul(Fr.e(len), Fr.exp(roots[0], len - 2)) = = 4 * H0w8_0 ^ 2
-            { Fr::copy(3) }
-            { Fr::square() }
-            { Fr::double(0) }
-            { Fr::double(0) }
-            { Fr::toaltstack() }
-           // [y, H1w4_0, H1w4_1, H1w4_2, H1w4_3 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, den1]
-
-            // den2 = roots[3 * 0 % 4] = roots[0]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-           // [y, H1w4_0, H1w4_1, H1w4_2, H1w4_3 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, den1, den2]
-
-            // den3 = x - roots[0]
-            { Fr::copy(4) }
-            { Fr::toaltstack() }
-            { Fr::copy(3) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-           // [y, H1w4_0, H1w4_1, H1w4_2, H1w4_3, den3 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, den1, den2]
-
-            // LiS1_1 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-           // [y, H1w4_0, H1w4_1, H1w4_2, H1w4_3 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, den1]
-
-            // den2 = roots[3 * 1 % 4] = roots[3]
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[1]
-            { Fr::copy(4) }
-            { Fr::toaltstack() }
-            { Fr::copy(2) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS1_2 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-           // [y, H1w4_0, H1w4_1, H1w4_2, H1w4_3 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, den1]
-
-            // den2 = roots[3 * 2 % 4] = roots[2]
-            { Fr::copy(1) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[2]
-            { Fr::copy(4) }
-            { Fr::toaltstack() }
-            { Fr::copy(1) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS1_3 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-           // [y, H1w4_0, H1w4_1, H1w4_2, H1w4_3 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, den1]
-
-            // den2 = roots[3 * 3 % 4] = roots[1]
-            { Fr::copy(2) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[3]
-            { Fr::copy(4) }
-            { Fr::toaltstack() }
-            { Fr::copy(0) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS1_4 = den1 * den2 * den3, remove den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-           // [y, H1w4_0, H1w4_1, H1w4_2, H1w4_3 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4]
-
-            // drop H1w4_0, H1w4_1, H1w4_2, H1w4_3
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-           // [y | prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4]
-
-            // push H2w3_0, H2w3_1, H2w3_2
-            { Fr::copy(8) }
-            { Fr::copy(8) }
-            { Fr::copy(8) }
-            // [y, H2w3_0, H2w3_1, H2w3_2 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4]
-
-            // push xi
-            // { Fr::push_dec("14814634099415170872937750660683266261347419959225231219985478027287965492246") }
-            { Fr::copy(5) }
-            // [y, H2w3_0, H2w3_1, H2w3_2, xi | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4]
-
-            // compute xiw
-            { Fr::copy(0) }
-            { Fr::push_dec(w) }
-            { Fr::mul() }
-            // [y, H2w3_0, H2w3_1, H2w3_2, xi, xiw | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4]
-
-            // compute xi - xiw
-            { Fr::sub(1, 0) }
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-            // [y, H2w3_0, H2w3_1, H2w3_2, xi - xiw | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, xi - xiw]
-
-            // move xi - xiw to before y
-            { Fr::roll(4) }
-            { Fr::roll(4) }
-            { Fr::roll(4) }
-            { Fr::roll(4) }
-            // [xi - xiw, y, H2w3_0, H2w3_1, H2w3_2 | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, xi - xiw]
-
-            // _3h2 = Fr.mul(Fr.e(len), Fr.exp(roots[0], len - 2)) = = 3 * H2w3_0
-            { Fr::copy(2) }
-            { Fr::copy(0) }
-            { Fr::double(0) }
-            { Fr::add(1, 0) }
-
-            // compute den1 = _3h2 * (xi - xiw)
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            // [xi - xiw, y, H2w3_0, H2w3_1, H2w3_2 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, den1]
-
-            // den2 = roots[2 * 0 % 3] = roots[0]
-            { Fr::copy(2) }
-            { Fr::toaltstack() }
-            // [xi - xiw, y, H2w3_0, H2w3_1, H2w3_2 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, den1, den2]
-
-            // den3 = x - roots[0]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-            { Fr::copy(2) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-            // [xi - xiw, y, H2w3_0, H2w3_1, H2w3_2, y - H2w3_0 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, den1, den2]
-
-            // LiS2_1 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-            // [xi - xiw, y, H2w3_0, H2w3_1, H2w3_2 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, den1]
-
-            // den2 = roots[2 * 1 % 3] = roots[2]
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-            // [xi - xiw, y, H2w3_0, H2w3_1, H2w3_2 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, den1, den2]
-
-            // den3 = x - roots[1]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-            { Fr::copy(1) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS2_2 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-            // [xi - xiw, y, H2w3_0, H2w3_1, H2w3_2 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, den1]
-
-            // den2 = roots[2 * 2 % 3] = roots[1]
-            { Fr::copy(1) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[2]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-            { Fr::copy(0) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS2_3 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            // [xi - xiw, y, H2w3_0, H2w3_1, H2w3_2 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3]
-
-            // drop H2w3_0, H2w3_1, H2w3_2
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-            // [xi - xiw, y |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3]
-
-            // push H3w3_0, H3w3_1, H3w3_2
-            { Fr::copy(6) }
-            { Fr::copy(6) }
-            { Fr::copy(6) }
-            // [xi - xiw, y, H3w3_0, H3w3_1, H3w3_2 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3]
-
-            // obtain xiw - xi
-            { Fr::neg(4) }
-            { Fr::toaltstack() }
-            // [y, H3w3_0, H3w3_1, H3w3_2 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, xiw - xi]
-
-            // _3h2 = Fr.mul(Fr.e(len), Fr.exp(roots[0], len - 2)) = = 3 * H3w3_0
-            { Fr::copy(2) }
-            { Fr::copy(0) }
-            { Fr::double(0) }
-            { Fr::add(1, 0) }
-
-            // compute den1 = _3h2 * (xiw - xi)
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            // [y, H3w3_0, H3w3_1, H3w3_2 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, den1]
-
-            // den2 = roots[2 * 0 % 3] = roots[0]
-            { Fr::copy(2) }
-            { Fr::toaltstack() }
-            // [y, H3w3_0, H3w3_1, H3w3_2 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, den1, den2]
-
-            // den3 = x - roots[0]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-            { Fr::copy(2) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-            // [y, H3w3_0, H3w3_1, H3w3_2, den3 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, den1, den2]
-
-            // LiS3_1 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-            // [y, H3w3_0, H3w3_1, H3w3_2 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, den1]
-
-            // den2 = roots[2 * 1 % 3] = roots[2]
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[1]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-            { Fr::copy(1) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS3_2 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::copy(0) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-            // [y, H3w3_0, H3w3_1, H3w3_2 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, den1]
-
-            // den2 = roots[2 * 2 % 3] = roots[1]
-            { Fr::copy(1) }
-            { Fr::toaltstack() }
-
-            // den3 = x - roots[2]
-            { Fr::copy(3) }
-            { Fr::toaltstack() }
-            { Fr::copy(0) }
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // LiS3_3 = den1 * den2 * den3, keep den1 in the altstack
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            // [y, H3w3_0, H3w3_1, H3w3_2 |
-            // Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3]
-
-            // drop H3w3_0, H3w3_1, H3w3_2
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-
-            // drop y
-            { Fr::drop() }
-            // [ xi, zh | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3]
-
-            // push xi again
-            // { Fr::push_dec("14814634099415170872937750660683266261347419959225231219985478027287965492246") }
-            { Fr::copy(1) }
-            // [ xi | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3]
-
-            // Li_1 = 262144 * (xi - 1)
-            { Fr::copy(0) }
-            { Fr::push_one() }
-            { Fr::sub(1, 0) }
-            { Fr::push_dec("262144") }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            // [ xi | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1]
-
-            // Li_2 = 262144 * (xi - w1)
-            { Fr::copy(0) }
-            { Fr::push_dec(w) }
-            { Fr::sub(1, 0) }
-            { Fr::push_dec("262144") }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-            // [ xi | Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2]
-
-
-            // Get all the elements back to the stack
-            for _ in 0..23 {
-                { Fr::fromaltstack() }
-            }
-            // [ xi , Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8, LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2]
-
-            // build up the accumulator
-            { Fr::copy(0) }
-            for i in 1..23 {
-                { Fr::copy(0) }
-                // [ xi, Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-                // LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, Li_2, Li_2]
-                { Fr::copy(i + 1 + i) }
-                { Fr::mul() }
-                // [ xi, Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-                // LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, Li_2, Li_2 * Li_1]
-            }
-
-            // push the inv from the proof and verify the inv
-            { Fr::copy(0) }
-            { Fr::push_dec(inv) }
-            { Fr::copy(0) } { Fr::toaltstack() }
-            { Fr::mul() }
-            { Fr::is_one_keep_element(0) }
-            OP_VERIFY
-            { Fr::drop() } // is_one does not consume the input
-
-            // current stack:
-            //   inputs (Li_2 down to ZH)
-            //   accumulators (ZH down to prod of all)
-            // altstack:
-            //   inv
-
-            // compute the inverses now
-            { Fr::drop() }
-            { Fr::fromaltstack() }
-            // [ Z_H, prod_1, prod_2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-            // LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, Li_2, Li_2 * Li_1, Li_2 * Li_1 * LiS3_3, ...
-            // inv ]
-
-            for i in 0..22 {
-                { Fr::copy(0) }
-                { Fr::roll(2) }
-                { Fr::mul() }
-                { Fr::toaltstack() }
-                { Fr::roll(23 - 1 - i + 23 - 1 - i) }
-                { Fr::mul() }
-            }
-            { Fr::roll(1) }
-            { Fr::drop() }
-            { Fr::roll(1) }
-            { Fr::drop() }
-            // [ZH | ..., LiS0_3, LiS0_2, LiS0_1, DenH2, DenH1]
-
-            for _ in 0..22 {
-                { Fr::fromaltstack() }
-            }
-            // [..., xi, ZH, DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, ...]
-        }
-    }
-
-    /// compute lagranges
-    // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-    // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh,
-    // ZH, DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-    // LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2]
-    fn compute_lagranges(w1: &str) -> Script {
-        script! {
-            // push zh
-            { Fr::copy(23) }
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // push the inverse of Li_1
-            { Fr::copy(2) }
-            { Fr::mul() }
-
-            // push the inverse of Li_2
-            { Fr::copy(1)}
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::push_dec(w1) }
-            { Fr::mul() }
-        }
-    }
-
-    /// compute pi {48 elements}
-    // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-    // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi,
-    // ZH, DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-    // LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, L1, L2]
-    fn compute_pi(input1: &str, input2: &str) -> Script {
-        script! {
-
-            { Fr::copy(1)}
-            { Fr::copy(1)}
-            { Fr::push_dec(input1) }
-            { Fr::push_dec(input2) }
-            { Fr::roll(2) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::add(1, 0) }
-            { Fr::neg(0) }
-        }
-    }
-
-    /// compute R0 {50 elements} ql, qr, qo, qm, qc, s1, s2, s3
-    // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-    // pH1w4_0(37), pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh,
-    // ZH(25), DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-    // LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, L1, L2, PI]
-    fn compute_r0(
-        ql: &str,
-        qr: &str,
-        qo: &str,
-        qm: &str,
-        qc: &str,
-        s1: &str,
-        s2: &str,
-        s3: &str,
-    ) -> Script {
-        script! {
-            // push ql, qr, qo, qm, qc, s1, s2, s3
-            { Fr::push_dec(ql) }
-            { Fr::push_dec(qr) }
-            { Fr::push_dec(qo) }
-            { Fr::push_dec(qm) }
-            { Fr::push_dec(qc) }
-            { Fr::push_dec(s1) }
-            { Fr::push_dec(s2) }
-            { Fr::push_dec(s3) }
-
-            // push H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7
-            { Fr::copy(53) }
-            { Fr::copy(53) }
-            { Fr::copy(53) }
-            { Fr::copy(53) }
-            { Fr::copy(53) }
-            { Fr::copy(53) }
-            { Fr::copy(53) }
-            { Fr::copy(53) }
-
-            // push lis0_1_inv, ...
-            { Fr::copy(38) }
-            { Fr::copy(38) }
-            { Fr::copy(38) }
-            { Fr::copy(38) }
-            { Fr::copy(38) }
-            { Fr::copy(38) }
-            { Fr::copy(38) }
-            { Fr::copy(38) }
-
-            // push y, xi
-            { Fr::copy(70) }
-            { Fr::copy(52) }
-
-            // compute num = y^8 - xi, push to altstack
-            { Fr::roll(1) }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::sub(0, 1) }
-            { Fr::toaltstack() }
-            // [ql, qr, ...., H0w8_0, H0w8_1, ..., lis0_1_inv, lis0_2_inv, ... | num]
-
-            // pick H0w8_0, ..., H0w8_7 and compute the corresponding c0Value
-            for i in 0..8 {
-                { Fr::copy(8 + 7 - i) }
-
-                { Fr::copy(0) } { Fr::copy(1) } { Fr::mul() }
-                { Fr::copy(0) } { Fr::copy(2) } { Fr::mul() }
-                { Fr::copy(0) } { Fr::copy(3) } { Fr::mul() }
-                { Fr::copy(0) } { Fr::copy(4) } { Fr::mul() }
-                { Fr::copy(0) } { Fr::copy(5) } { Fr::mul() }
-                { Fr::copy(0) } { Fr::copy(6) } { Fr::mul() }
-                // H0w8_0, H0w8_0^2, H0w8_0^3, ...
-
-                for _ in 0..7 {
-                    { Fr::toaltstack() }
-                }
-
-                // c0Value starts with ql
-                { Fr::copy(16 + 7) }
-                { Fr::copy(16 + 6 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(16 + 5 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(16 + 4 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(16 + 3 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(16 + 2 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(16 + 1 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(16 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-
-                // push this c0Value to the altstack
-                { Fr::toaltstack() }
-            }
-
-            // get all the c0Values out
-            for _ in 0..8 {
-                { Fr::fromaltstack() }
-            }
-
-            // multiply the corresponding LiS0Inv
-            for i in 0..8 {
-                { Fr::roll(8 - i + 7 - i) }
-                { Fr::mul() }
-                { Fr::toaltstack() }
-            }
-
-            // drop all the intermediate values
-            for _ in 0..16 {
-                { Fr::drop() }
-            }
-
-            // add all the c0Values together
-            { Fr::fromaltstack() }
-            for _ in 1..8 {
-                { Fr::fromaltstack() }
-                { Fr::add(1, 0) }
-            }
-
-            // multiply by the num
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-        }
-    }
-
-    /// compute R1 {51 elements} ql, qr, qo, qm, qc, a, b, c
-    // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-    // pH1w4_0(38), pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh,
-    // ZH(26), DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-    // LiS1_1(15), LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, L1, L2, PI, r0]
-    fn compute_r1(
-        ql: &str,
-        qr: &str,
-        qm: &str,
-        qo: &str,
-        qc: &str,
-        a: &str,
-        b: &str,
-        c: &str,
-    ) -> Script {
-        script! {
-
-            { Fr::push_dec(ql) }
-            { Fr::push_dec(qr) }
-            { Fr::push_dec(qm) }
-            { Fr::push_dec(qo) }
-            { Fr::push_dec(qc) }
-            { Fr::push_dec(a) }
-            { Fr::push_dec(b) }
-            { Fr::push_dec(c) }
-            // pi, zh
-            { Fr::copy(9)}
-            { Fr::copy(35)}
-            // pH1w4_0->3
-            { Fr::copy(48)}
-            { Fr::copy(48)}
-            { Fr::copy(48)}
-            { Fr::copy(48)}
-            // LiS1_1 -> 4
-            { Fr::copy(29)}
-            { Fr::copy(29)}
-            { Fr::copy(29)}
-            { Fr::copy(29)}
-            // y, xi
-            { Fr::copy(65)}
-            { Fr::copy(47)}
-            // compute num = y^4 - xi, push to altstack
-            { Fr::roll(1) }
-            { Fr::square() }
-            { Fr::square() }
-            { Fr::sub(0, 1) }
-            { Fr::toaltstack() }
-
-            // compute t0
-
-            // ql * evalA
-            { Fr::copy(10 + 7) }
-            { Fr::copy(10 + 2 + 1) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // qr * evalB
-            { Fr::copy(10 + 6) }
-            { Fr::copy(10 + 1 + 1) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // qm * evalA * evalB
-            { Fr::copy(10 + 5) }
-            { Fr::copy(10 + 2 + 1) }
-            { Fr::mul() }
-            { Fr::copy(10 + 1 + 1) }
-            { Fr::mul() }
-            { Fr::toaltstack() }
-
-            // qo * evalC
-            { Fr::copy(10 + 4) }
-            { Fr::copy(10 + 1) }
-            { Fr::mul() }
-
-            // t0 := ql * evalA + qr * evalB + qm * evalA * evalB + qo * evalC + qc + pi
-            { Fr::fromaltstack() }
-            { Fr::add(1, 0) }
-            { Fr::fromaltstack() }
-            { Fr::add(1, 0) }
-            { Fr::fromaltstack() }
-            { Fr::add(1, 0) }
-            { Fr::copy(10 + 3 + 1) }
-            { Fr::add(1, 0) }
-            { Fr::copy(8 + 1 + 1) }
-            { Fr::add(1, 0) }
-
-            // t0 := t0 * zhInv
-            { Fr::copy(8 + 1) }
-            { Fr::mul() }
-
-            // the stack should look like:
-            //    ql, qr, qm, qo, qc, a, b, c
-            //    pi, zhInv
-            //    H1w4_0, H1w4_1, H1w4_2, H1w4_3
-            //    LiS1Inv 1-4
-            //    t0
-            //
-            // altstack: num
-
-            // pick H1w4_0, ..., H1w4_3 and compute the corresponding c1Value
-            for i in 0..4 {
-                { Fr::copy(1 + 4 + 3 - i) }
-
-                { Fr::copy(0) } { Fr::copy(1) } { Fr::mul() }
-                { Fr::copy(0) } { Fr::copy(2) } { Fr::mul() }
-
-                for _ in 0..3 {
-                    { Fr::toaltstack() }
-                }
-
-                // c1Value starts with a
-                { Fr::copy(1 + 4 + 4 + 2 + 2) }
-                { Fr::copy(1 + 4 + 4 + 2 + 1 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(1 + 4 + 4 + 2 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-
-                // push this c1Value to the altstack
-                { Fr::toaltstack() }
-            }
-
-            // get all the c1Values out
-            for _ in 0..4 {
-                { Fr::fromaltstack() }
-            }
-
-            // multiply the corresponding LiS1Inv
-            for i in 0..4 {
-                { Fr::roll(4 - i + 1 + 3 - i) }
-                { Fr::mul() }
-                { Fr::toaltstack() }
-            }
-
-            // drop all the intermediate values
-            for _ in 0..(1 + 4 + 2 + 8) {
-                { Fr::drop() }
-            }
-
-            // add all the c0Values together
-            { Fr::fromaltstack() }
-            for _ in 1..4 {
-                { Fr::fromaltstack() }
-                { Fr::add(1, 0) }
-            }
-
-            // multiply by the num
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-        }
-    }
-
-    /// compute R2 {52 elements} a, b, c, z, zw, s1, s2, s3, t1w, t2w
-    // [beta(51), gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-    // pH1w4_0(39), pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh,
-    // ZH(27), DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-    // LiS1_1(16), LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, L1, L2, PI, r0, r1]
-    fn compute_r2(
-        a: &str,
-        b: &str,
-        c: &str,
-        z: &str,
-        zw: &str,
-        s1: &str,
-        s2: &str,
-        s3: &str,
-        t1w: &str,
-        t2w: &str,
-        w1: &str,
-    ) -> Script {
-        script! {
-
-            { Fr::push_dec(a) }
-            { Fr::push_dec(b) }
-            { Fr::push_dec(c) }
-            { Fr::push_dec(z) }
-            { Fr::push_dec(zw) }
-            { Fr::push_dec(s1) }
-            { Fr::push_dec(s2) }
-            { Fr::push_dec(s3) }
-            { Fr::push_dec(t1w) }
-            { Fr::push_dec(t2w) }
-            // beta, y, xi, gamma, zhinv, L[1]
-            { Fr::copy(61)}
-            { Fr::copy(59)}
-            { Fr::copy(41)}
-            { Fr::copy(63)}
-            { Fr::copy(41)}
-            { Fr::copy(19)}
-            // todo push from stack
-            //{ Fr::push_dec("19264250262515049392118907974032894668050943806280011767302681470321758079402") }
-            //  H2w3_0, H2w3_1, H2w3_2, H3w3_0, H3w3_1, H3w3_2 (6 elements)
-            { Fr::copy(51)}
-            { Fr::copy(51)}
-            { Fr::copy(51)}
-            { Fr::copy(51)}
-            { Fr::copy(51)}
-            { Fr::copy(51)}
-            // LiS2Inv 1-6 (6 elements)
-            { Fr::copy(34)}
-            { Fr::copy(34)}
-            { Fr::copy(34)}
-            { Fr::copy(34)}
-            { Fr::copy(34)}
-            { Fr::copy(34)}
-
-            // compute num2 := y^3
-            { Fr::copy(6 + 6 + 4) }
-            { Fr::copy(0) }
-            { Fr::square() }
-            { Fr::mul() }
-
-            // compute num := num2^2 = y^6
-            { Fr::copy(0) }
-            { Fr::square() }
-
-            // compute xi * w1 + xi = xi * (w1 + 1)
-            { Fr::copy(6 + 6 + 3 + 2) }
-            // { Fr::push_dec("11699596668367776675346610687704220591435078791727316319397053191800576917728") }
-            { Fr::push_dec(w1) }
-            { Fr::push_one() }
-            { Fr::add(1, 0) }
-            { Fr::mul() }
-
-            // compute num2 := num2 * (xi * (w1 + 1))
-            { Fr::roll(2) }
-            { Fr::mul() }
-
-            // compute num := num - num2
-            { Fr::sub(1, 0) }
-
-            // compute xi^2 * w1
-            { Fr::copy(6 + 6 + 3 + 1) }
-            { Fr::square() }
-            // { Fr::push_dec("11699596668367776675346610687704220591435078791727316319397053191800576917728") }
-            { Fr::push_dec(w1) }
-            { Fr::mul() }
-
-            // compute num := num +  xi^2 * w1 and move to altstack
-            { Fr::add(1, 0) }
-            { Fr::toaltstack() }
-
-            // compute betaxi
-            { Fr::copy(6 + 6 + 5) }
-            { Fr::copy(6 + 6 + 3 + 1) }
-            { Fr::mul() }
-
-            // compute betaxi + gamma
-            { Fr::copy(0) }
-            { Fr::copy(6 + 6 + 2 + 2) }
-            { Fr::add(1, 0) }
-
-            // compute a + betaxi + gamma and send to altstack
-            { Fr::copy(6 + 6 + 6 + 9 + 2) }
-            { Fr::add(1, 0) }
-            { Fr::toaltstack() }
-
-            // compute betaxi * k1 + gamma for k1 = 2
-            { Fr::copy(0) }
-            { Fr::double(0) }
-            { Fr::copy(6 + 6 + 2 + 2) }
-            { Fr::add(1, 0) }
-
-            // compute b + betaxi * k1 + gamma and send to altstack
-            { Fr::copy(6 + 6 + 6 + 8 + 2) }
-            { Fr::add(1, 0) }
-            { Fr::toaltstack() }
-
-            // compute betaxi * k2 + gamma for k2 = 3
-            { Fr::copy(0) }
-            { Fr::double(0) }
-            { Fr::add(1, 0) }
-            { Fr::copy(6 + 6 + 2 + 1) }
-            { Fr::add(1, 0) }
-
-            // compute c + betaxi * k2 + gamma and send to altstack
-            { Fr::copy(6 + 6 + 6 + 7 + 1) }
-            { Fr::add(1, 0) }
-
-            // compute t2 = (a + betaxi + gamma) * (b + betaxi * k1 + gamma) * (c + betaxi * k2 + gamma) * z
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::copy(6 + 6 + 6 + 6 + 1) }
-            { Fr::mul() }
-
-            // send t2 to the altstack
-            { Fr::toaltstack() }
-
-            // compute beta * s1 + gamma + a
-            { Fr::copy(6 + 6 + 5) }
-            { Fr::copy(6 + 6 + 6 + 4 + 1) }
-            { Fr::mul() }
-            { Fr::copy(6 + 6 + 2 + 1) }
-            { Fr::add(1, 0) }
-            { Fr::copy(6 + 6 + 6 + 9 + 1) }
-            { Fr::add(1, 0) }
-            { Fr::toaltstack() }
-
-            // compute beta * s2 + gamma + b
-            { Fr::copy(6 + 6 + 5) }
-            { Fr::copy(6 + 6 + 6 + 3 + 1) }
-            { Fr::mul() }
-            { Fr::copy(6 + 6 + 2 + 1) }
-            { Fr::add(1, 0) }
-            { Fr::copy(6 + 6 + 6 + 8 + 1) }
-            { Fr::add(1, 0) }
-            { Fr::toaltstack() }
-
-            // compute beta * s3 + gamma + c
-            { Fr::copy(6 + 6 + 5) }
-            { Fr::copy(6 + 6 + 6 + 2 + 1) }
-            { Fr::mul() }
-            { Fr::copy(6 + 6 + 2 + 1) }
-            { Fr::add(1, 0) }
-            { Fr::copy(6 + 6 + 6 + 7 + 1) }
-            { Fr::add(1, 0) }
-
-            // compute t2' = (beta * s1 + gamma + a) * (beta * s2 + gamma + b) * (beta * s3 + gamma + c) * zw
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-            { Fr::copy(6 + 6 + 6 + 5 + 1) }
-            { Fr::mul() }
-
-            // compute t2 := t2 - t2'
-            { Fr::fromaltstack() }
-            { Fr::sub(0, 1) }
-
-            // compute t2 := t2 * zhinv
-            { Fr::copy(6 + 6 + 1 + 1) }
-            { Fr::mul() }
-
-            // send the updated t2 to the altstack
-            { Fr::toaltstack() }
-
-            // compute t1 = (z - 1) * L[1] * zhinv
-            { Fr::copy(6 + 6 + 6 + 6) }
-            { Fr::push_one() }
-            { Fr::sub(1, 0) }
-            { Fr::copy(6 + 6 + 1) }
-            { Fr::mul() }
-            { Fr::copy(6 + 6 + 1 + 1) }
-            { Fr::mul() }
-
-            // pull t2 from the altstack
-            { Fr::fromaltstack() }
-
-            // the stack now looks:
-            //   10 + 6 + 6 + 6 Fr elements
-            //   t1
-            //   t2
-            // altstack: num
-
-            // pick H2w3_0, ..., H2w3_2 and compute the corresponding c2Value
-            for i in 0..3 {
-                { Fr::copy(2 + 6 + 5 - i) }
-
-                { Fr::copy(0) } { Fr::square() }
-                { Fr::toaltstack() } { Fr::toaltstack() }
-
-                // c2Value starts with z
-                { Fr::copy(2 + 6 + 6 + 6 + 6) }
-                { Fr::copy(1 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-
-                // push this c2Value to the altstack
-                { Fr::toaltstack() }
-            }
-
-            // pick H3w3_0, ..., H3w3_2 and compute the corresponding c2Value
-            for i in 0..3 {
-                { Fr::copy(2 + 6 + 2 - i) }
-
-                { Fr::copy(0) } { Fr::square() }
-                { Fr::toaltstack() } { Fr::toaltstack() }
-
-                // c2Value starts with zw
-                { Fr::copy(2 + 6 + 6 + 6 + 5) }
-                { Fr::copy(2 + 6 + 6 + 6 + 1 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-                { Fr::copy(2 + 6 + 6 + 6 + 1) } { Fr::fromaltstack() } { Fr::mul() } { Fr::add(1, 0) }
-
-                // push this c2Value to the altstack
-                { Fr::toaltstack() }
-            }
-
-            // get all the c1Values out
-            for _ in 0..6 {
-                { Fr::fromaltstack() }
-            }
-
-            // multiply the corresponding LiS1Inv
-            for i in 0..6 {
-                { Fr::roll(6 - i + 2 + 5 - i) }
-                { Fr::mul() }
-                { Fr::toaltstack() }
-            }
-
-            // drop all the intermediate values
-            for _ in 0..(2 + 6 + 6 + 10) {
-                { Fr::drop() }
-            }
-
-            // add all the c0Values together
-            { Fr::fromaltstack() }
-            for _ in 1..6 {
-                { Fr::fromaltstack() }
-                { Fr::add(1, 0) }
-            }
-
-            // multiply by the num
-            { Fr::fromaltstack() }
-            { Fr::mul() }
-        }
-    }
-
-    /// compute fej {53 elements}
-    // [beta(52), gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-    // pH1w4_0(40), pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh,
-    // ZH(28), DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-    // LiS1_1(17), LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, L1, L2, PI, r0, r1, r2]
-    fn compute_fej() -> Script {
-        script! {
-
-            // push alpha, denh1, denh2, y (4 elements)
-            { Fr::copy(50)}
-            { Fr::copy(28)}
-            { Fr::copy(28)}
-            { Fr::copy(52)}
-
-            // push R0, R1, R2 (3 elements)
-            { Fr::copy(6)}
-            { Fr::copy(6)}
-            { Fr::copy(6)}
-
-            // push H0w8_0, H0w8_1, H0w8_2, H0w8_3, H0w8_4, H0w8_5, H0w8_6, H0w8_7 (8 elements)
-            { Fr::copy(55)}
-            { Fr::copy(55)}
-            { Fr::copy(55)}
-            { Fr::copy(55)}
-            { Fr::copy(55)}
-            { Fr::copy(55)}
-            { Fr::copy(55)}
-            { Fr::copy(55)}
-
-            // roll y
-            { Fr::roll(8 + 3) }
-
-            // compute numerator entries
-            for i in 0..8 {
-                { Fr::copy(0) }
-                { Fr::roll(7 - i + 2) }
-                { Fr::sub(1, 0) }
-                { Fr::toaltstack() }
-            }
-
-            // drop y
-            { Fr::drop() }
-
-            // compute numerator
-            { Fr::fromaltstack() }
-            for _ in 0..7 {
-                { Fr::fromaltstack() }
-                { Fr::mul() }
-            }
-
-            // copy the numerator in the altstack
-            { Fr::copy(0) }
-            { Fr::toaltstack() }
-
-            // compute quotient1 = alpha * numerator * denh1
-            { Fr::copy(0) }
-            { Fr::copy(3 + 2 + 2) }
-            { Fr::mul() }
-            { Fr::roll(3 + 1 + 2) }
-            { Fr::mul() }
-
-            // compute quotient2 = alpha * alpha * numerator * denh2
-            { Fr::roll(1) }
-            { Fr::roll(3 + 2) }
-            { Fr::mul() }
-            { Fr::roll(3 + 2) }
-            { Fr::square() }
-            { Fr::mul() }
-
-            // the stack now looks:
-            //    R0, R1, R2
-            //    quotient1, quotient2
-            // altstack: numerator
-
-            // compute the scalar = R0 + quotient1 * R1 + quotient2 * R2
-            { Fr::copy(1) }
-            { Fr::roll(2 + 1 + 1) }
-            { Fr::mul() }
-            { Fr::copy(1) }
-            { Fr::roll(2 + 2) }
-            { Fr::mul() }
-            { Fr::add(1, 0) }
-            { Fr::roll(2 + 1) }
-            { Fr::add(1, 0) }
-
-            { Fr::fromaltstack() }
-
-            // Drop useless elements, only reserve y
-            // ... ] } [scalar_j, scalar_e, scalar_f2, scalar_f1]
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-            // ... y ] } [scalar_j, scalar_e, scalar_f2, scalar_f1]
-            { Fr::copy(49) }
-
-            // ... ] } [scalar_j, scalar_e, scalar_f2, scalar_f1, y]
-            { Fr::toaltstack() }
-
-            for _ in 0..53 {
-
-                {Fr::drop()}
-            }
-
-            // [ y, scalar_f1, scalar_f2, scalar_e, scalar_j ] }
-            { Fr::fromaltstack() }
-            { Fr::fromaltstack() }
-            { Fr::fromaltstack() }
-            { Fr::fromaltstack() }
-            { Fr::fromaltstack() }
-        }
-    }
-
-    /// compute f (5)
-    //[ y scalar_f1, scalar_f2, scalar_e, scalar_j]
-    fn compute_f(
-        c0x: &str,
-        c0y: &str,
-        c0z: &str,
-        c1x: &str,
-        c1y: &str,
-        c1z: &str,
-        c2x: &str,
-        c2y: &str,
-        c2z: &str,
-    ) -> Script {
-        script! {
-
-            // push quotient1, quotient2 (2 elements)
-            { Fr::copy(3)}
-            { Fr::copy(3)}
-
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // push (C0x, C0y), C1, C2 (9 elements)
-            { Fq::push_dec(c0x)}
-            { Fq::push_dec(c0y)}
-            { Fq::push_dec(c0z)}
-            { Fq::push_dec(c1x)}
-            { Fq::push_dec(c1y)}
-            { Fq::push_dec(c1z)}
-            { Fq::push_dec(c2x)}
-            { Fq::push_dec(c2y)}
-            { Fq::push_dec(c2z)}
-
-            { G1Projective::roll(1) }
-            { Fr::fromaltstack() }
-            { G1Projective::scalar_mul() }
-
-            { G1Projective::roll(1) }
-            { Fr::fromaltstack() }
-            { G1Projective::scalar_mul() }
-
-            { G1Projective::add() }
-            { G1Projective::add() }
-
-        }
-    }
-
-    /// compute f (5)
-    //[ y scalar_f1, scalar_f2, scalar_e, scalar_j]
-    fn compute_f_opt(
-        c0x: &str,
-        c0y: &str,
-        c0z: &str,
-        c1x: &str,
-        c1y: &str,
-        c1z: &str,
-        c2x: &str,
-        c2y: &str,
-        c2z: &str,
-    ) -> Script {
-        script! {
-
-            // push quotient1, quotient2 (2 elements)
-            { Fr::copy(3)}
-            { Fr::copy(3)}
-
-            { Fr::toaltstack() }
-            { Fr::toaltstack() }
-
-            // push (C0x, C0y), C1, C2 (9 elements)
-            { Fq::push_dec(c0x)}
-            { Fq::push_dec(c0y)}
-            { Fq::push_dec(c0z)}
-            { Fq::push_dec(c1x)}
-            { Fq::push_dec(c1y)}
-            { Fq::push_dec(c1z)}
-            { Fq::push_dec(c2x)}
-            { Fq::push_dec(c2y)}
-            { Fq::push_dec(c2z)}
-
-            { G1Projective::roll(1) } // [c0, c2, c1, q1; q2]
-            { Fr::fromaltstack() }
-            { Fq::roll(6)} {Fq::roll(6)} {Fq::roll(6)} // [c0, c1, q1, c2]
-            { Fr::fromaltstack() } // [c0, c1, q1, c2, q2]
-            { G1Projective::batched_scalar_mul::<2>() }
-            { G1Projective::add() }
-
-        }
-    }
-
-    /// compute e (6)
-    // [y, scalar_f1, scalar_f2, scalar_e, scalar_j, f.x, f.y, f.z]
-    fn compute_e(g1x: &str, g1y: &str, g1z: &str) -> Script {
-        script! {
-
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-
-            // push the scalar
-            { Fr::copy(1)}
-            { Fr::toaltstack()}
-
-            { Fq::push_dec(g1x) }
-            { Fq::push_dec(g1y) }
-            { Fq::push_dec(g1z) }
-
-            // [y, scalar_f1, scalar_f2, scalar_e, scalar_j, e.x, e.y, e.z ] | [f.z, f.y, f.x]
-            { Fr::fromaltstack() }
-            { G1Projective::scalar_mul() }
-        }
-    }
-
-    /// compute j (11)
-    /// [ y, scalar_f1, scalar_f2, scalar_e, scalar_j, e.x, e.y, e.z] | [f.z, f.y, f.x]
-    fn compute_j(w1x: &str, w1y: &str) -> Script {
-        script! {
-            // to alt stack: | [f.z, f.y, f.z, e.z, e.y, e.z ]
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-
-            // push the scalar
-            { Fr::toaltstack() }
-            // push G1x, G1y (3 elements)
-            { Fq::push_dec(w1x) }
-            { Fq::push_dec(w1y) }
-            { Fq::push_dec("1") }
-            { Fr::fromaltstack() }
-            { G1Projective::scalar_mul() }
-            // [y, scalar_f1, scalar_f2, scalar_e, j.x, j.y, j.z ] | [f.z, f.y, f.x, e.z, e.y, e.x]
-        }
-    }
-
-    /// verify pairings
-    /// compute j (14)
-    // [y, scalar_f1, scalar_f2, scalar_e, j.x, j.y, j.z ] | [f.z, f.y, f.x, e.z, e.y, e.x]
-    fn checkpairing_a1(proof_w2x: &str, proof_w2y: &str) -> Script {
-        script! {
-            // ] | [f.z, f.y, f.x, e.z, e.y, e.x, j.z, j.y, j.x]
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-
-            // ] | [f, e, j]
-            { Fr::roll(3) }
-            // ] | [f, e, j, y]
-            { Fr::toaltstack() }
-
-            // W2 ] | [f, e, j, y]
-            { Fq::push_dec(proof_w2x) }
-            { Fq::push_dec(proof_w2y) }
-            { Fq::push_dec("1") }
-
-            // W2, y ] | [f, e, j]
-            { Fr::fromaltstack() }
-
-            // W2 * y ] | [f, e, j]
-            { G1Projective::scalar_mul() }
-
-            // W2 * y, j, e, f ]
-            { G1Projective::fromaltstack() }
-            { G1Projective::fromaltstack() }
-            // W2 * y, j, e] | [ f ]
-            // W2 * y, j + e] | [ f ]
-            { G1Projective::add() }
-            // W2 * y, - (j + e)] | [ f ]
-            { G1Projective::neg() }
-            // W2 * y - (j + e)] | [ f ]
-            { G1Projective::add() }
-            // W2 * y - (j + e), f ]
-            { G1Projective::fromaltstack() }
-            // A1 = w2 * y + f - (e + j)
-            { G1Projective::add() }
-
-            { G1Projective::toaltstack() }
-
-            { Fr::drop() }
-            { Fr::drop() }
-            { Fr::drop() }
-
-            { G1Projective::fromaltstack() }
-            { G1Projective::into_affine() }
-
-        }
-    }
-
-    // todo
-    /// fflonk_pairing_with_c_wi
-    // compute j (60)
-    // stack input: [A1.x, A1.y]
-    fn fflonk_pairing_with_c_wi(
-        w2: ark_bn254::g1::G1Affine,
-        c: ark_bn254::Fq12,
-        c_inv: ark_bn254::Fq12,
-        wi: ark_bn254::Fq12,
-        constant_1: &G2Prepared,
-        constant_2: &G2Prepared,
-    ) -> Script {
-        script! {
-            // [A1.x, A1.y]
-            { utils::from_eval_point_in_stack() }
-            // [A1.x', A1.y'] = [-A1.x/A1.y, 1/A1.y]
-            { utils::from_eval_point(w2) }
-            // [w2.x', w2.y'] = [-w2.x/w2.y, 1/w2.y]
-            // [A1.x', A1.y', w2.x', w2.y']
-            { fq12_push(c) }
-            { fq12_push(c_inv) }
-            { fq12_push(wi) }
-            // [A1.x', A1.y', w2.x', w2.y', c, c_inv, wi]
-            { Pairing::dual_miller_loop_with_c_wi(constant_1, constant_2, true) }
-        }
-    }
-
-    // refer table 3 of https://eprint.iacr.org/2009/457.pdf
-    // a: Fp12 which is cubic residue
-    // c: random Fp12 which is cubic non-residue
-    // s: satisfying p^12 - 1 = 3^s * t
-    // t: satisfying p^12 - 1 = 3^s * t
-    // k: k = (t + 1) // 3
-    fn tonelli_shanks_cubic(
-        a: ark_bn254::Fq12,
-        c: ark_bn254::Fq12,
-        s: u32,
-        t: BigUint,
-        k: BigUint,
-    ) -> ark_bn254::Fq12 {
-        let mut r = a.pow(t.to_u64_digits());
-        let e = 3_u32.pow(s - 1);
-        let exp = 3_u32.pow(s) * &t;
-
-        // compute cubic root of (a^t)^-1, say h
-        let (mut h, cc, mut c) = (
-            ark_bn254::Fq12::ONE,
-            c.pow([e as u64]),
-            c.inverse().unwrap(),
-        );
-        for i in 1..(s as i32) {
-            let delta = (s as i32) - i - 1;
-            let d = if delta < 0 {
-                r.pow((&exp / 3_u32.pow((-delta) as u32)).to_u64_digits())
-            } else {
-                r.pow([3_u32.pow(delta as u32).to_u64().unwrap()])
-            };
-            if d == cc {
-                (h, r) = (h * c, r * c.pow([3_u64]));
-            } else if d == cc.pow([2_u64]) {
-                (h, r) = (h * c.pow([2_u64]), r * c.pow([3_u64]).pow([2_u64]));
-            }
-            c = c.pow([3_u64])
-        }
-
-        // recover cubic root of a
-        r = a.pow(k.to_u64_digits()) * h;
-        if t == 3_u32 * k + 1_u32 {
-            r = r.inverse().unwrap();
-        }
-
-        assert_eq!(r.pow([3_u64]), a);
-        r
-    }
-
-    // refer from Algorithm 5 of "On Proving Pairings"(https://eprint.iacr.org/2024/640.pdf)
-    fn compute_c_wi(f: ark_bn254::Fq12) -> (ark_bn254::Fq12, ark_bn254::Fq12) {
-        let p = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap();
-        let r = BigUint::from_str(
-            "21888242871839275222246405745257275088548364400416034343698204186575808495617",
-        )
-        .unwrap();
-        let lambda = BigUint::from_str(
-            "10486551571378427818905133077457505975146652579011797175399169355881771981095211883813744499745558409789005132135496770941292989421431235276221147148858384772096778432243207188878598198850276842458913349817007302752534892127325269"
-        ).unwrap();
-        let s = 3_u32;
-        let exp = p.pow(12_u32) - 1_u32;
-        let h = &exp / &r;
-        let t = &exp / 3_u32.pow(s);
-        let k = (&t + 1_u32) / 3_u32;
-        let m = &lambda / &r;
-        let d = 3_u32;
-        let mm = &m / d;
-
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        let cofactor_cubic = 3_u32.pow(s - 1) * &t;
-
-        // make f is r-th residue, but it's not cubic residue
-        assert_eq!(f.pow(h.to_u64_digits()), ark_bn254::Fq12::ONE);
-        assert_ne!(f.pow(cofactor_cubic.to_u64_digits()), ark_bn254::Fq12::ONE);
-
-        // sample a proper scalar w which is cubic non-residue
-        let w = {
-            let (mut w, mut z) = (ark_bn254::Fq12::ONE, ark_bn254::Fq12::ONE);
-            while w == ark_bn254::Fq12::ONE {
-                // choose z which is 3-th non-residue
-                let mut legendre = ark_bn254::Fq12::ONE;
-                while legendre == ark_bn254::Fq12::ONE {
-                    z = ark_bn254::Fq12::rand(&mut prng);
-                    legendre = z.pow(cofactor_cubic.to_u64_digits());
-                }
-                // obtain w which is t-th power of z
-                w = z.pow(t.to_u64_digits());
-            }
-            w
-        };
-        // make sure 27-th root w, is 3-th non-residue and r-th residue
-        assert_ne!(w.pow(cofactor_cubic.to_u64_digits()), ark_bn254::Fq12::ONE);
-        assert_eq!(w.pow(h.to_u64_digits()), ark_bn254::Fq12::ONE);
-
-        // just two option, w and w^2, since w^3 must be cubic residue, leading f*w^3 must not be cubic residue
-        let mut wi = w;
-        if (f * wi).pow(cofactor_cubic.to_u64_digits()) != ark_bn254::Fq12::ONE {
-            assert_eq!(
-                (f * w * w).pow(cofactor_cubic.to_u64_digits()),
-                ark_bn254::Fq12::ONE
-            );
-            wi = w * w;
-        }
-        assert_eq!(wi.pow(h.to_u64_digits()), ark_bn254::Fq12::ONE);
-
-        assert_eq!(lambda, &d * &mm * &r);
-        // f1 is scaled f
-        let f1 = f * wi;
-
-        // r-th root of f1, say f2
-        let r_inv = r.modinv(&h).unwrap();
-        assert_ne!(r_inv, BigUint::one());
-        let f2 = f1.pow(r_inv.to_u64_digits());
-        assert_ne!(f2, ark_bn254::Fq12::ONE);
-
-        // m'-th root of f, say f3
-        let mm_inv = mm.modinv(&(r * h)).unwrap();
-        assert_ne!(mm_inv, BigUint::one());
-        let f3 = f2.pow(mm_inv.to_u64_digits());
-        assert_eq!(f3.pow(cofactor_cubic.to_u64_digits()), ark_bn254::Fq12::ONE);
-        assert_ne!(f3, ark_bn254::Fq12::ONE);
-
-        // d-th (cubic) root, say c
-        let c = tonelli_shanks_cubic(f3, w, s, t, k);
-        assert_ne!(c, ark_bn254::Fq12::ONE);
-        assert_eq!(c.pow(lambda.to_u64_digits()), f * wi);
-
-        (c, wi)
-    }
-
-    #[test]
-    fn test_fflonk_verifier() {
-        let (c0_x, c0_y, c0_z, c1_x, c1_y, c1_z, inp_1, inp_2) = (
-            "303039279492065453055049758769758984569666029850327527958551993331680103359",
-            "15061669176783843627135305167141360334623983780813847469326507992811672859575",
-            "1",
-            "8993820735255461694205287896466659762517378169680151817278189507219986014273",
-            "20608602847008036615737932995836476570376266531776948091942386633580114403199",
-            "1",
-            "246513590391103489634602289097178521809",
-            "138371009144214353742010089705444713455",
-        );
-        let (xi, ql, qr, qm, qo, qc, s1, s2, s3, a, b, c, z, zw, t1w, t2w) = (
-            "12675309311304482509247823029963782393309524866265275290730041635615278736000",
-            "4305584171954448775801758618991977283131671407134816099015723841718827300684",
-            "12383383973686840675128398394454489421896122330596726461131121746926747341189",
-            "84696450614978050680673343346456326547032107368333805624994614151289555853",
-            "3940439340424631873531863239669720717811550024514867065774687720368464792371",
-            "16961785810060156933739931986193776143069216115530808410139185289490606944009",
-            "12474437127153975801320290893919924661315458586210754316226946498711086665749",
-            "599434615255095347665395089945860172292558760398201299457995057871688253664",
-            "16217604511932175446614838218599989473511950977205890369538297955449224727219",
-            "7211168621666826182043583595845418959530786367587156242724929610231435505336",
-            "848088075173937026388846472327431819307508078325359401333033359624801042",
-            "18963734392470978715233675860777231227480937309534365140504133190694875258320",
-            "2427313569771756255376235777000596702684056445296844486767054635200432142794",
-            "8690328511114991742730387856275843464438882369629727414507275814599493141660",
-            "20786626696833495453279531623626288211765949258916047124642669459480728122908",
-            "12092130080251498309415337127155404037148503145602589831662396526189421234148",
-        );
-        let (w1_x, w1_y, w1_z) = (
-            "32650538602400348219903702316313439265244325226254563471430382441955222030",
-            "1102261574488401129043229793384018650738538286437537952751903719159654317199",
-            "1",
-        );
-
-        let (w2_x, w2_y, w2_z) = (
-            "11695827642347470645483614914520090101440686332033956264171712726147972703435",
-            "8930092616903485317239646434389939466400752538134075201209141980838088395614",
-            "1",
-        );
-
-        let (c2_x, c2_y, c2_z) = (
-            "7381325072443970270370678023564870071058744625357849943766655609499175274412",
-            "15178578915928592705383893120230835636411008017183180871962629962483134367891",
-            "1",
-        );
-        let (w8_1, w8_2, w8_3, w8_4, w8_5, w8_6, w8_7, w3, w3_2, w4, w4_2, w4_3, wr) = (
-            "19540430494807482326159819597004422086093766032135589407132600596362845576832",
-            "21888242871839275217838484774961031246007050428528088939761107053157389710902",
-            "13274704216607947843011480449124596415239537050559949017414504948711435969894",
-            "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-            "2347812377031792896086586148252853002454598368280444936565603590212962918785",
-            "4407920970296243842541313971887945403937097133418418784715",
-            "8613538655231327379234925296132678673308827349856085326283699237864372525723",
-            "21888242871839275217838484774961031246154997185409878258781734729429964517155",
-            "4407920970296243842393367215006156084916469457145843978461",
-            "21888242871839275217838484774961031246007050428528088939761107053157389710902",
-            "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-            "4407920970296243842541313971887945403937097133418418784715",
-            "19699792133865984655632994927951174943026102279822605383822362801478354085676",
-        );
-        let (w1, inv) = (
-            "11699596668367776675346610687704220591435078791727316319397053191800576917728",
-            "21247383512588455895834686692756529012394058115069710447132959660051940541361",
-        );
-
-        let (g1_x, g1_y, g1_z) = ("1", "2", "1");
-
-        let hash_128 = blake3_var_length(128);
-        let hash_32 = blake3_var_length(32);
-        let hash_512 = blake3_var_length(512);
-        let hash_64 = blake3_var_length(64);
-
-        // ****************** prepare for pairing_verify **************************
-        // exp = 6x + 2 + p - p^2 = lambda - p^3
-        let p_pow3 = &BigUint::from_str_radix(Fq::MODULUS, 16).unwrap().pow(3_u32);
-        let lambda = BigUint::from_str(
-                        "10486551571378427818905133077457505975146652579011797175399169355881771981095211883813744499745558409789005132135496770941292989421431235276221147148858384772096778432243207188878598198850276842458913349817007302752534892127325269"
-                    ).unwrap();
-        let (exp, sign) = if lambda > *p_pow3 {
-            (lambda - p_pow3, true)
-        } else {
-            (p_pow3 - lambda, false)
-        };
-
-        let projective = ark_bn254::G1Projective::new(
-            ark_bn254::Fq::from_str(
-                "21025932300722401404248737517866966587837387913191004025854702115722286998035",
-            )
-            .unwrap(),
-            ark_bn254::Fq::from_str(
-                "5748766770337880144484917096976043621609890780406924686031233755006782215858",
-            )
-            .unwrap(),
-            ark_bn254::Fq::from_str(
-                "18747233771850556311508953762939425433543524671221692065979284256379095132287",
-            )
-            .unwrap(),
-        );
-        let affine = projective.into_affine();
-
-        let Q0 = ark_bn254::g2::G2Affine::new(
-            ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str(
-                    "10857046999023057135944570762232829481370756359578518086990519993285655852781",
-                )
-                .unwrap(),
-                ark_bn254::Fq::from_str(
-                    "11559732032986387107991004021392285783925812861821192530917403151452391805634",
-                )
-                .unwrap(),
-            ),
-            ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str(
-                    "8495653923123431417604973247489272438418190587263600148770280649306958101930",
-                )
-                .unwrap(),
-                ark_bn254::Fq::from_str(
-                    "4082367875863433681332203403145435568316851327593401208105741076214120093531",
-                )
-                .unwrap(),
-            ),
-        );
-        let Q0_prepared = G2Prepared::from_affine(Q0);
-
-        let Q1 = ark_bn254::g2::G2Affine::new(
-            ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str(
-                    "21831381940315734285607113342023901060522397560371972897001948545212302161822",
-                )
-                .unwrap(),
-                ark_bn254::Fq::from_str(
-                    "17231025384763736816414546592865244497437017442647097510447326538965263639101",
-                )
-                .unwrap(),
-            ),
-            ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str(
-                    "2388026358213174446665280700919698872609886601280537296205114254867301080648",
-                )
-                .unwrap(),
-                ark_bn254::Fq::from_str(
-                    "11507326595632554467052522095592665270651932854513688777769618397986436103170",
-                )
-                .unwrap(),
-            ),
-        );
-        let Q1_prepared = G2Prepared::from_affine(-Q1);
-
-        let w2 = ark_bn254::g1::G1Affine::new(
-            ark_bn254::Fq::from_str(
-                "11695827642347470645483614914520090101440686332033956264171712726147972703435",
-            )
-            .unwrap(),
-            ark_bn254::Fq::from_str(
-                "8930092616903485317239646434389939466400752538134075201209141980838088395614",
-            )
-            .unwrap(),
-        );
-
-        let f = Bn254::multi_miller_loop_affine([affine, w2], [Q0, -Q1]).0;
-
-        let (c_ori, wi) = compute_c_wi(f);
-        let c_inv = c_ori.inverse().unwrap();
-        let hint = if sign {
-            f * wi * (c_inv.pow(exp.to_u64_digits()))
-        } else {
-            f * wi * (c_inv.pow(exp.to_u64_digits()).inverse().unwrap())
-        };
-
-        assert_eq!(hint, c_ori.pow(p_pow3.to_u64_digits()));
-
-        let script = script! {
-            // compute challenge beta and check
-            {  compute_challenges_beta(&hash_128, c0_x, c0_y, c1_x, c1_y, inp_1, inp_2) }
-            // [beta]
-
-            // compute challenge gamma and check
-            { compute_challenges_gamma(&hash_32) }
-            // [beta, gamma]
-
-            // // compute alpha
-            { compute_challenges_alpha(&hash_512,
-                xi,
-                ql,
-                qr,
-                qm,
-                qo,
-                qc,
-                s1,
-                s2,
-                s3,
-                a,
-                b,
-                c,
-                z,
-                zw,
-                t1w,
-                t2w) }
-            // [beta, gamma, alpha]
-
-            //// compute challenges_y
-            { compute_challenges_y(&hash_64, w1_x, w1_y) }
-            // [beta, gamma, alpha, y]
-
-            { compute_challenges_xiseed(&hash_64, c2_x, c2_y) }
-            // [beta, gamma, alpha, y, xiseed]
-
-            {
-                compute_challenges_xin(
-                    w8_1,
-                    w8_2,
-                    w8_3,
-                    w8_4,
-                    w8_5,
-                    w8_6,
-                    w8_7,
-                    w3,
-                    w3_2,
-                    w4,
-                    w4_2,
-                    w4_3,
-                    wr,
-                )
-            }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh]
-
-            { compute_inversions(w1, inv) }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh,
-            // ZH, DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, ...]
-
-            { compute_lagranges(w1) }
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh,
-            // ZH, DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-            // LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, L[1], L[2]]
-
-            { compute_pi(inp_1, inp_2) }
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh,
-            // ZH, DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-            // LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, pi]
-
-            { compute_r0(ql, qr, qo, qm, qc, s1, s2, s3) }
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh,
-            // ZH, DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-            // LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, pi, r0]
-
-            { compute_r1(ql, qr, qm, qo, qc, a, b, c) }
-
-            { compute_r2(a, b, c, z, zw, s1, s2, s3, t1w, t2w, w1) }
-
-            { compute_fej() }
-
-            {compute_f_opt(c0_x, c0_y, c0_z, c1_x, c1_y, c1_z, c2_x, c2_y, c2_z)}
-
-
-            // save f
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-
-            // push the scalar
-            { Fr::copy(1)}
-            { Fr::toaltstack()} // [ | e_scalar]
-
-            // push g1
-            { Fq::push_dec(g1_x) }
-            { Fq::push_dec(g1_y) }
-            { Fq::push_dec(g1_z) } // [-g1 | e_scalar]
-            { G1Projective::neg() }
-            { G1Projective::toaltstack() } // [ | -g1 e_scalar]
-
-            // push the scalar
-            { Fr::toaltstack() }
-            // push G1x, G1y (3 elements)
-            { Fq::push_dec(w1_x) }
-            { Fq::push_dec(w1_y) }
-            { Fq::push_dec("1") }
-            { G1Projective::neg() }
-            { G1Projective::toaltstack() } // [| -w1, w1_scalar, -g1, e_scalar]
-
-            {Fr::roll(3)}
-            {Fr::toaltstack()}
-
-            {Fq::push_dec(w2_x)}
-            {Fq::push_dec(w2_y)}
-            {Fq::push_dec("1")}
-            {Fr::fromaltstack()} // [w2, w2_scalar(y) | -w1, w1_scalar, -g1, e_scalar ]
-
-            { Fr::fromaltstack() }
-            { G1Projective::fromaltstack() }
-            { Fr::fromaltstack() }
-            { G1Projective::fromaltstack() } // [w2, w2_scalar(y) -w1, w1_scalar, -g1, e_scalar ]
-
-            { G1Projective::batched_scalar_mul::<3>()} // W2 * y - (j + e)] | [ f ]
-            { G1Projective::fromaltstack() }
-            { G1Projective::add() }  // A1 = w2 * y + f - (e + j)
-
-            // clear stack
-            {G1Projective::toaltstack()}
-            {Fr::drop()}
-            {Fr::drop()}
-            {Fr::drop()}
-            {G1Projective::fromaltstack()}
-
-            // A1 to affine
-            {G1Projective::into_affine()}
-
-            { fflonk_pairing_with_c_wi(w2, c_ori, c_inv, wi, &Q0_prepared, &Q1_prepared) }
-
-            { fq12_push(hint) }
-            { Fq12::equalverify() }
-
-            OP_TRUE
-
-        };
-        println!("fflonk.checkpairing_miller_loop = {} bytes", script.len());
-        let exec_result = execute_script(script);
-        println!("{}", exec_result);
-        assert!(exec_result.success);
-    }
-
-
-    #[test]
-    fn test_fflonk_verifier_as_chunks() {
-        let (c0_x, c0_y, c0_z, c1_x, c1_y, c1_z, inp_1, inp_2) = (
-            "303039279492065453055049758769758984569666029850327527958551993331680103359",
-            "15061669176783843627135305167141360334623983780813847469326507992811672859575",
-            "1",
-            "8993820735255461694205287896466659762517378169680151817278189507219986014273",
-            "20608602847008036615737932995836476570376266531776948091942386633580114403199",
-            "1",
-            "246513590391103489634602289097178521809",
-            "138371009144214353742010089705444713455",
-        );
-        let (xi, ql, qr, qm, qo, qc, s1, s2, s3, a, b, c, z, zw, t1w, t2w) = (
-            "12675309311304482509247823029963782393309524866265275290730041635615278736000",
-            "4305584171954448775801758618991977283131671407134816099015723841718827300684",
-            "12383383973686840675128398394454489421896122330596726461131121746926747341189",
-            "84696450614978050680673343346456326547032107368333805624994614151289555853",
-            "3940439340424631873531863239669720717811550024514867065774687720368464792371",
-            "16961785810060156933739931986193776143069216115530808410139185289490606944009",
-            "12474437127153975801320290893919924661315458586210754316226946498711086665749",
-            "599434615255095347665395089945860172292558760398201299457995057871688253664",
-            "16217604511932175446614838218599989473511950977205890369538297955449224727219",
-            "7211168621666826182043583595845418959530786367587156242724929610231435505336",
-            "848088075173937026388846472327431819307508078325359401333033359624801042",
-            "18963734392470978715233675860777231227480937309534365140504133190694875258320",
-            "2427313569771756255376235777000596702684056445296844486767054635200432142794",
-            "8690328511114991742730387856275843464438882369629727414507275814599493141660",
-            "20786626696833495453279531623626288211765949258916047124642669459480728122908",
-            "12092130080251498309415337127155404037148503145602589831662396526189421234148",
-        );
-        let (w1_x, w1_y, w1_z) = (
-            "32650538602400348219903702316313439265244325226254563471430382441955222030",
-            "1102261574488401129043229793384018650738538286437537952751903719159654317199",
-            "1",
-        );
-
-        let (w2_x, w2_y, w2_z) = (
-            "11695827642347470645483614914520090101440686332033956264171712726147972703435",
-            "8930092616903485317239646434389939466400752538134075201209141980838088395614",
-            "1",
-        );
-
-        let (c2_x, c2_y, c2_z) = (
-            "7381325072443970270370678023564870071058744625357849943766655609499175274412",
-            "15178578915928592705383893120230835636411008017183180871962629962483134367891",
-            "1",
-        );
-        let (w8_1, w8_2, w8_3, w8_4, w8_5, w8_6, w8_7, w3, w3_2, w4, w4_2, w4_3, wr) = (
-            "19540430494807482326159819597004422086093766032135589407132600596362845576832",
-            "21888242871839275217838484774961031246007050428528088939761107053157389710902",
-            "13274704216607947843011480449124596415239537050559949017414504948711435969894",
-            "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-            "2347812377031792896086586148252853002454598368280444936565603590212962918785",
-            "4407920970296243842541313971887945403937097133418418784715",
-            "8613538655231327379234925296132678673308827349856085326283699237864372525723",
-            "21888242871839275217838484774961031246154997185409878258781734729429964517155",
-            "4407920970296243842393367215006156084916469457145843978461",
-            "21888242871839275217838484774961031246007050428528088939761107053157389710902",
-            "21888242871839275222246405745257275088548364400416034343698204186575808495616",
-            "4407920970296243842541313971887945403937097133418418784715",
-            "19699792133865984655632994927951174943026102279822605383822362801478354085676",
-        );
-        let (w1, inv) = (
-            "11699596668367776675346610687704220591435078791727316319397053191800576917728",
-            "21247383512588455895834686692756529012394058115069710447132959660051940541361",
-        );
-
-        let (g1_x, g1_y, g1_z) = ("1", "2", "1");
-
-        let hash_128 = blake3_var_length(128);
-        let hash_32 = blake3_var_length(32);
-        let hash_512 = blake3_var_length(512);
-        let hash_64 = blake3_var_length(64);
-
-        // ****************** prepare for pairing_verify **************************
-        // exp = 6x + 2 + p - p^2 = lambda - p^3
-        let p_pow3 = &BigUint::from_str_radix(Fq::MODULUS, 16).unwrap().pow(3_u32);
-        let lambda = BigUint::from_str(
-                        "10486551571378427818905133077457505975146652579011797175399169355881771981095211883813744499745558409789005132135496770941292989421431235276221147148858384772096778432243207188878598198850276842458913349817007302752534892127325269"
-                    ).unwrap();
-        let (exp, sign) = if lambda > *p_pow3 {
-            (lambda - p_pow3, true)
-        } else {
-            (p_pow3 - lambda, false)
-        };
-
-        let projective = ark_bn254::G1Projective::new(
-            ark_bn254::Fq::from_str(
-                "21025932300722401404248737517866966587837387913191004025854702115722286998035",
-            )
-            .unwrap(),
-            ark_bn254::Fq::from_str(
-                "5748766770337880144484917096976043621609890780406924686031233755006782215858",
-            )
-            .unwrap(),
-            ark_bn254::Fq::from_str(
-                "18747233771850556311508953762939425433543524671221692065979284256379095132287",
-            )
-            .unwrap(),
-        );
-        let affine = projective.into_affine();
-
-        let Q0 = ark_bn254::g2::G2Affine::new(
-            ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str(
-                    "10857046999023057135944570762232829481370756359578518086990519993285655852781",
-                )
-                .unwrap(),
-                ark_bn254::Fq::from_str(
-                    "11559732032986387107991004021392285783925812861821192530917403151452391805634",
-                )
-                .unwrap(),
-            ),
-            ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str(
-                    "8495653923123431417604973247489272438418190587263600148770280649306958101930",
-                )
-                .unwrap(),
-                ark_bn254::Fq::from_str(
-                    "4082367875863433681332203403145435568316851327593401208105741076214120093531",
-                )
-                .unwrap(),
-            ),
-        );
-        let Q0_prepared = G2Prepared::from_affine(Q0);
-
-        let Q1 = ark_bn254::g2::G2Affine::new(
-            ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str(
-                    "21831381940315734285607113342023901060522397560371972897001948545212302161822",
-                )
-                .unwrap(),
-                ark_bn254::Fq::from_str(
-                    "17231025384763736816414546592865244497437017442647097510447326538965263639101",
-                )
-                .unwrap(),
-            ),
-            ark_bn254::Fq2::new(
-                ark_bn254::Fq::from_str(
-                    "2388026358213174446665280700919698872609886601280537296205114254867301080648",
-                )
-                .unwrap(),
-                ark_bn254::Fq::from_str(
-                    "11507326595632554467052522095592665270651932854513688777769618397986436103170",
-                )
-                .unwrap(),
-            ),
-        );
-        let Q1_prepared = G2Prepared::from_affine(-Q1);
-
-        let w2 = ark_bn254::g1::G1Affine::new(
-            ark_bn254::Fq::from_str(
-                "11695827642347470645483614914520090101440686332033956264171712726147972703435",
-            )
-            .unwrap(),
-            ark_bn254::Fq::from_str(
-                "8930092616903485317239646434389939466400752538134075201209141980838088395614",
-            )
-            .unwrap(),
-        );
-
-        let f = Bn254::multi_miller_loop_affine([affine, w2], [Q0, -Q1]).0;
-
-        let (c_ori, wi) = compute_c_wi(f);
-        let c_inv = c_ori.inverse().unwrap();
-        let hint = if sign {
-            f * wi * (c_inv.pow(exp.to_u64_digits()))
-        } else {
-            f * wi * (c_inv.pow(exp.to_u64_digits()).inverse().unwrap())
-        };
-
-        assert_eq!(hint, c_ori.pow(p_pow3.to_u64_digits()));
-
-        let script = script! {
-            // compute challenge beta and check
-            {  compute_challenges_beta(&hash_128, c0_x, c0_y, c1_x, c1_y, inp_1, inp_2) }
-            // [beta]
-
-            // compute challenge gamma and check
-            { compute_challenges_gamma(&hash_32) }
-            // [beta, gamma]
-
-            // // compute alpha
-            { compute_challenges_alpha(&hash_512,
-                xi,
-                ql,
-                qr,
-                qm,
-                qo,
-                qc,
-                s1,
-                s2,
-                s3,
-                a,
-                b,
-                c,
-                z,
-                zw,
-                t1w,
-                t2w) }
-            // [beta, gamma, alpha]
-
-            //// compute challenges_y
-            { compute_challenges_y(&hash_64, w1_x, w1_y) }
-            // [beta, gamma, alpha, y]
-
-            { compute_challenges_xiseed(&hash_64, c2_x, c2_y) }
-            // [beta, gamma, alpha, y, xiseed]
-
-            {
-                compute_challenges_xin(
-                    w8_1,
-                    w8_2,
-                    w8_3,
-                    w8_4,
-                    w8_5,
-                    w8_6,
-                    w8_7,
-                    w3,
-                    w3_2,
-                    w4,
-                    w4_2,
-                    w4_3,
-                    wr,
-                )
-            }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh]
-
-            { compute_inversions(w1, inv) }
-            // [beta, gamma, alpha, y, pH0w8_0, pH0w8_1, pH0w8_2, pH0w8_3, pH0w8_4, pH0w8_5, pH0w8_6, pH0w8_7,
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh,
-            // ZH, DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, ...]
-
-            { compute_lagranges(w1) }
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh,
-            // ZH, DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-            // LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, L[1], L[2]]
-
-            { compute_pi(inp_1, inp_2) }
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh,
-            // ZH, DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-            // LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, pi]
-
-            { compute_r0(ql, qr, qo, qm, qc, s1, s2, s3) }
-            // pH1w4_0, pH1w4_1, pH1w4_2, pH1w4_3, pH2w3_0, pH2w3_1, pH2w3_2, pH3w3_0, pH3w3_1, pH2w3_2, xi, zh,
-            // ZH, DenH1, DenH2, LiS0_1, LiS0_2, LiS0_3, LiS0_4, LiS0_5, LiS0_6, LiS0_7, LiS0_8,
-            // LiS1_1, LiS1_2, LiS1_3, LiS1_4, LiS2_1, LiS2_2, LiS2_3, LiS3_1, LiS3_2, LiS3_3, Li_1, Li_2, pi, r0]
-
-            { compute_r1(ql, qr, qm, qo, qc, a, b, c) }
-
-            { compute_r2(a, b, c, z, zw, s1, s2, s3, t1w, t2w, w1) }
-
-            { compute_fej() }
-
-            {compute_f_opt(c0_x, c0_y, c0_z, c1_x, c1_y, c1_z, c2_x, c2_y, c2_z)}
-
-
-            // save f
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-            { Fq::toaltstack() }
-
-            // push the scalar
-            { Fr::copy(1)}
-            { Fr::toaltstack()} // [ | e_scalar]
-
-            // push g1
-            { Fq::push_dec(g1_x) }
-            { Fq::push_dec(g1_y) }
-            { Fq::push_dec(g1_z) } // [-g1 | e_scalar]
-            { G1Projective::neg() }
-            { G1Projective::toaltstack() } // [ | -g1 e_scalar]
-
-            // push the scalar
-            { Fr::toaltstack() }
-            // push G1x, G1y (3 elements)
-            { Fq::push_dec(w1_x) }
-            { Fq::push_dec(w1_y) }
-            { Fq::push_dec("1") }
-            { G1Projective::neg() }
-            { G1Projective::toaltstack() } // [| -w1, w1_scalar, -g1, e_scalar]
-
-            {Fr::roll(3)}
-            {Fr::toaltstack()}
-
-            {Fq::push_dec(w2_x)}
-            {Fq::push_dec(w2_y)}
-            {Fq::push_dec("1")}
-            {Fr::fromaltstack()} // [w2, w2_scalar(y) | -w1, w1_scalar, -g1, e_scalar ]
-
-            { Fr::fromaltstack() }
-            { G1Projective::fromaltstack() }
-            { Fr::fromaltstack() }
-            { G1Projective::fromaltstack() } // [w2, w2_scalar(y) -w1, w1_scalar, -g1, e_scalar ]
-
-            { G1Projective::batched_scalar_mul::<3>()} // W2 * y - (j + e)] | [ f ]
-            { G1Projective::fromaltstack() }
-            { G1Projective::add() }  // A1 = w2 * y + f - (e + j)
-
-            // clear stack
-            {G1Projective::toaltstack()}
-            {Fr::drop()}
-            {Fr::drop()}
-            {Fr::drop()}
-            {G1Projective::fromaltstack()}
-
-            // A1 to affine
-            {G1Projective::into_affine()}
-
-            { fflonk_pairing_with_c_wi(w2, c_ori, c_inv, wi, &Q0_prepared, &Q1_prepared) }
-
-            { fq12_push(hint) }
-            { Fq12::equalverify() }
-
-            OP_TRUE
-
-        };
-        println!("fflonk.checkpairing_miller_loop = {} bytes", script.len());
-        let interval = script.max_op_if_interval();
-        println!("Max if interval: {:?} difference: {}, debug info: {}, {}", interval, interval.1 - interval.0, script.debug_info(interval.0), script.debug_info(interval.1));
-        let exec_result = execute_script_as_chunks(script, 3_000_000, 2_000_000);
-        println!("{}", exec_result);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/groth16/constants.rs b/src/groth16/constants.rs
deleted file mode 100644
index 9d8b9447d..000000000
--- a/src/groth16/constants.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use std::str::FromStr;
-
-use crate::bn254::{fp254impl::Fp254Impl, fq::Fq};
-use num_bigint::BigUint;
-use num_traits::Num;
-use once_cell::sync::Lazy;
-
-pub static P_POW3: Lazy<BigUint> =
-    Lazy::new(|| BigUint::from_str_radix(Fq::MODULUS, 16).unwrap().pow(3_u32));
-
-pub static LAMBDA: Lazy<BigUint> = Lazy::new(|| {
-    BigUint::from_str(
-        "10486551571378427818905133077457505975146652579011797175399169355881771981095211883813744499745558409789005132135496770941292989421431235276221147148858384772096778432243207188878598198850276842458913349817007302752534892127325269"
-    ).unwrap()
-});
diff --git a/src/groth16/offchain_checker.rs b/src/groth16/offchain_checker.rs
deleted file mode 100644
index cba36d9f3..000000000
--- a/src/groth16/offchain_checker.rs
+++ /dev/null
@@ -1,264 +0,0 @@
-#![allow(non_snake_case)]
-use crate::bn254::fp254impl::Fp254Impl;
-use crate::bn254::fq::Fq;
-
-use crate::groth16::constants::LAMBDA;
-use ark_ff::UniformRand;
-use ark_ff::{Field, One};
-use num_bigint::BigUint;
-use num_traits::{Num, ToPrimitive};
-use rand::SeedableRng;
-use rand_chacha::ChaCha20Rng;
-use std::str::FromStr;
-
-// refer table 3 of https://eprint.iacr.org/2009/457.pdf
-// a: Fp12 which is cubic residue
-// c: random Fp12 which is cubic non-residue
-// s: satisfying p^12 - 1 = 3^s * t
-// t: satisfying p^12 - 1 = 3^s * t
-// k: k = (t + 1) // 3
-fn tonelli_shanks_cubic(
-    a: ark_bn254::Fq12,
-    c: ark_bn254::Fq12,
-    s: u32,
-    t: BigUint,
-    k: BigUint,
-) -> ark_bn254::Fq12 {
-    let mut r = a.pow(t.to_u64_digits());
-    let e = 3_u32.pow(s - 1);
-    let exp = 3_u32.pow(s) * &t;
-
-    // compute cubic root of (a^t)^-1, say h
-    let (mut h, cc, mut c) = (
-        ark_bn254::Fq12::ONE,
-        c.pow([e as u64]),
-        c.inverse().unwrap(),
-    );
-    for i in 1..(s as i32) {
-        let delta = (s as i32) - i - 1;
-        let d = if delta < 0 {
-            r.pow((&exp / 3_u32.pow((-delta) as u32)).to_u64_digits())
-        } else {
-            r.pow([3_u32.pow(delta as u32).to_u64().unwrap()])
-        };
-        if d == cc {
-            (h, r) = (h * c, r * c.pow([3_u64]));
-        } else if d == cc.pow([2_u64]) {
-            (h, r) = (h * c.pow([2_u64]), r * c.pow([3_u64]).pow([2_u64]));
-        }
-        c = c.pow([3_u64])
-    }
-
-    // recover cubic root of a
-    r = a.pow(k.to_u64_digits()) * h;
-    if t == 3_u32 * k + 1_u32 {
-        r = r.inverse().unwrap();
-    }
-
-    assert_eq!(r.pow([3_u64]), a);
-    r
-}
-
-// Finding C
-// refer from Algorithm 5 of "On Proving Pairings"(https://eprint.iacr.org/2024/640.pdf)
-pub fn compute_c_wi(f: ark_bn254::Fq12) -> (ark_bn254::Fq12, ark_bn254::Fq12) {
-    let p = BigUint::from_str_radix(Fq::MODULUS, 16).unwrap();
-    let r = BigUint::from_str(
-        "21888242871839275222246405745257275088548364400416034343698204186575808495617",
-    )
-    .unwrap();
-    let s = 3_u32;
-    let exp = p.pow(12_u32) - 1_u32;
-    let h = &exp / &r;
-    let t = &exp / 3_u32.pow(s);
-    let k = (&t + 1_u32) / 3_u32;
-    let m = &*LAMBDA / &r;
-    let d = 3_u32;
-    let mm = &m / d;
-
-    let mut prng = ChaCha20Rng::seed_from_u64(0);
-    let cofactor_cubic = 3_u32.pow(s - 1) * &t;
-
-    // make f is r-th residue, but it's not cubic residue
-    assert_eq!(f.pow(h.to_u64_digits()), ark_bn254::Fq12::ONE);
-    assert_ne!(f.pow(cofactor_cubic.to_u64_digits()), ark_bn254::Fq12::ONE);
-
-    // sample a proper scalar w which is cubic non-residue
-    let w = {
-        let (mut w, mut z) = (ark_bn254::Fq12::ONE, ark_bn254::Fq12::ONE);
-        while w == ark_bn254::Fq12::ONE {
-            // choose z which is 3-th non-residue
-            let mut legendre = ark_bn254::Fq12::ONE;
-            while legendre == ark_bn254::Fq12::ONE {
-                z = ark_bn254::Fq12::rand(&mut prng);
-                legendre = z.pow(cofactor_cubic.to_u64_digits());
-            }
-            // obtain w which is t-th power of z
-            w = z.pow(t.to_u64_digits());
-        }
-        w
-    };
-    // make sure 27-th root w, is 3-th non-residue and r-th residue
-    assert_ne!(w.pow(cofactor_cubic.to_u64_digits()), ark_bn254::Fq12::ONE);
-    assert_eq!(w.pow(h.to_u64_digits()), ark_bn254::Fq12::ONE);
-
-    // just two option, w and w^2, since w^3 must be cubic residue, leading f*w^3 must not be cubic residue
-    let mut wi = w;
-    if (f * wi).pow(cofactor_cubic.to_u64_digits()) != ark_bn254::Fq12::ONE {
-        assert_eq!(
-            (f * w * w).pow(cofactor_cubic.to_u64_digits()),
-            ark_bn254::Fq12::ONE
-        );
-        wi = w * w;
-    }
-    assert_eq!(wi.pow(h.to_u64_digits()), ark_bn254::Fq12::ONE);
-
-    assert_eq!(LAMBDA.clone(), d * &mm * &r);
-    // f1 is scaled f
-    let f1 = f * wi;
-
-    // r-th root of f1, say f2
-    let r_inv = r.modinv(&h).unwrap();
-    assert_ne!(r_inv, BigUint::one());
-    let f2 = f1.pow(r_inv.to_u64_digits());
-    assert_ne!(f2, ark_bn254::Fq12::ONE);
-
-    // m'-th root of f, say f3
-    let mm_inv = mm.modinv(&(r * h)).unwrap();
-    assert_ne!(mm_inv, BigUint::one());
-    let f3 = f2.pow(mm_inv.to_u64_digits());
-    assert_eq!(f3.pow(cofactor_cubic.to_u64_digits()), ark_bn254::Fq12::ONE);
-    assert_ne!(f3, ark_bn254::Fq12::ONE);
-
-    // d-th (cubic) root, say c
-    let c = tonelli_shanks_cubic(f3, w, s, t, k);
-    assert_ne!(c, ark_bn254::Fq12::ONE);
-    assert_eq!(c.pow(LAMBDA.to_u64_digits()), f * wi);
-
-    (c, wi)
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::bn254::ell_coeffs::G2Prepared;
-    use crate::bn254::fq12::Fq12;
-    use crate::bn254::pairing::Pairing;
-    use crate::bn254::utils;
-    use crate::bn254::utils::fq12_push;
-    use crate::groth16::constants::{LAMBDA, P_POW3};
-    use crate::{execute_script_without_stack_limit, treepp::*};
-    use ark_bn254::Bn254;
-    use ark_ec::pairing::Pairing as ArkPairing;
-    use ark_ec::{AffineRepr, CurveGroup};
-    use ark_std::{end_timer, start_timer};
-    use std::ops::Neg;
-
-    #[test]
-    fn test_checkpairing_with_c_wi_groth16() {
-        // exp = 6x + 2 + p - p^2 = lambda - p^3
-        let (exp, sign) = if LAMBDA.gt(&P_POW3) {
-            (&*LAMBDA - &*P_POW3, true)
-        } else {
-            (&*P_POW3 - &*LAMBDA, false)
-        };
-
-        // let g1 =
-        //     ark_bn254::G1Affine::new(ark_bn254::g1::G1_GENERATOR_X, ark_bn254::g1::G1_GENERATOR_Y);
-        // let g2 =
-        //     ark_bn254::G2Affine::new(ark_bn254::g2::G2_GENERATOR_X, ark_bn254::g2::G2_GENERATOR_Y);
-        let mut prng = ChaCha20Rng::seed_from_u64(0);
-        let g1 = ark_bn254::G1Affine::rand(&mut prng);
-        let g2 = ark_bn254::g2::G2Affine::rand(&mut prng);
-        let factors = [[2_u64], [3_u64], [4_u64], [9_u64]];
-        let (P1, P2, P3, P4) = (
-            g1.mul_bigint(factors[0]).into_affine(),
-            g1,
-            g1.mul_bigint(factors[2]).into_affine(),
-            g1,
-        );
-        let (Q1, Q2, Q3, Q4) = (
-            g2,
-            g2.mul_bigint(factors[1]).into_affine(),
-            g2,
-            g2.mul_bigint(factors[3]).into_affine(),
-        );
-        let Q_prepared = [
-            G2Prepared::from_affine(Q1),
-            G2Prepared::from_affine(Q2),
-            G2Prepared::from_affine(Q3),
-            G2Prepared::from_affine(Q4),
-        ]
-        .to_vec();
-
-        let T4 = Q4;
-
-        // f^{lambda - p^3} * wi = c^lambda
-        // equivalently (f * c_inv)^{lambda - p^3} * wi = c_inv^{-p^3} = c^{p^3}
-        let f = Bn254::multi_miller_loop_affine([P1, P2, P3, -P4], [Q1, Q2, Q3, Q4]).0;
-        println!("Bn254::multi_miller_loop done!");
-        let (c, wi) = compute_c_wi(f);
-        let c_inv = c.inverse().unwrap();
-        let hint = if sign {
-            f * wi * (c_inv.pow(exp.to_u64_digits()))
-        } else {
-            f * wi * (c_inv.pow(exp.to_u64_digits()).inverse().unwrap())
-        };
-        println!("Accumulated f done!");
-        assert_eq!(hint, c.pow(P_POW3.to_u64_digits()));
-
-        // miller loop script
-        let quad_miller_loop_with_c_wi = Pairing::quad_miller_loop_with_c_wi(Q_prepared);
-        println!(
-            "Pairing.dual_miller_loop_with_c_wi: {} bytes",
-            quad_miller_loop_with_c_wi.len()
-        );
-
-        let start = start_timer!(|| "collect_script");
-        let script = script! {
-            { Fq::push_dec("21575463638280843010398324269430826099269044274347216827212613867836435027261") }
-            { Fq::push_dec("10307601595873709700152284273816112264069230130616436755625194854815875713954") }
-
-            { Fq::push_dec("2821565182194536844548159561693502659359617185244120367078079554186484126554") }
-            { Fq::push_dec("3505843767911556378687030309984248845540243509899259641013678093033130930403") }
-
-            { Fq::push_dec("21888242871839275220042445260109153167277707414472061641714758635765020556616") }
-            { Fq::push_zero() }
-
-            // p1, p2, p3, p4
-            { utils::from_eval_point(P1) }
-            { utils::from_eval_point(P2) }
-            { utils::from_eval_point(P3) }
-            { utils::from_eval_point(P4.neg()) }
-
-            // q4
-            { utils::fq2_push(Q4.x) }
-            { utils::fq2_push(Q4.y) }
-
-            // c, c_inv, wi
-            { fq12_push(c) }
-            { fq12_push(c_inv) }
-            { fq12_push(wi) }
-
-            // t4
-            { utils::fq2_push(T4.x) }
-            { utils::fq2_push(T4.y) }
-
-            { quad_miller_loop_with_c_wi.clone() }
-            { fq12_push(hint) }
-            { Fq12::equalverify() }
-            OP_TRUE
-        };
-        end_timer!(start);
-        println!(
-            "groth16.test_checkpairing_with_c_wi_groth16 = {} bytes",
-            script.len()
-        );
-
-        let start = start_timer!(|| "execute_script");
-        let exec_result = execute_script_without_stack_limit(script);
-        end_timer!(start);
-
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/groth16/verifier.rs b/src/groth16/verifier.rs
deleted file mode 100644
index de70ff050..000000000
--- a/src/groth16/verifier.rs
+++ /dev/null
@@ -1,169 +0,0 @@
-use crate::bn254::ell_coeffs::G2Prepared;
-use crate::bn254::fp254impl::Fp254Impl;
-use crate::bn254::fq::Fq;
-use crate::bn254::fq12::Fq12;
-use crate::bn254::msm::msm_with_constant_bases;
-use crate::bn254::pairing::Pairing;
-use crate::bn254::utils;
-use crate::bn254::utils::fq12_push;
-use crate::groth16::constants::{LAMBDA, P_POW3};
-use crate::groth16::offchain_checker::compute_c_wi;
-use crate::treepp::{script, Script};
-use ark_bn254::{Bn254, G1Projective};
-use ark_ec::pairing::Pairing as ark_Pairing;
-use ark_ec::short_weierstrass::Projective;
-use ark_ec::{AffineRepr, CurveGroup, VariableBaseMSM};
-use ark_ff::Field;
-use ark_groth16::{Proof, VerifyingKey};
-use core::ops::Neg;
-
-#[derive(Clone, Copy, Debug)]
-pub struct Verifier;
-
-impl Verifier {
-    pub fn verify_proof(
-        public_inputs: &Vec<<Bn254 as ark_Pairing>::ScalarField>,
-        proof: &Proof<Bn254>,
-        vk: &VerifyingKey<Bn254>,
-    ) -> Script {
-        let (msm_script, msm_g1) = Self::prepare_inputs(public_inputs, vk);
-        Self::verify_proof_with_prepared_inputs(proof, vk, msm_script, msm_g1)
-    }
-
-    pub fn prepare_inputs(
-        public_inputs: &Vec<<Bn254 as ark_Pairing>::ScalarField>,
-        vk: &VerifyingKey<Bn254>,
-    ) -> (Script, Projective<ark_bn254::g1::Config>) {
-        let scalars = [
-            vec![<Bn254 as ark_Pairing>::ScalarField::ONE],
-            public_inputs.clone(),
-        ]
-        .concat();
-        let sum_ai_abc_gamma =
-            G1Projective::msm(&vk.gamma_abc_g1, &scalars).expect("failed to calculate msm");
-        (msm_with_constant_bases(&vk.gamma_abc_g1, &scalars), sum_ai_abc_gamma)
-    }
-
-    pub fn verify_proof_with_prepared_inputs(
-        proof: &Proof<Bn254>,
-        vk: &VerifyingKey<Bn254>,
-        msm_script: Script,
-        msm_g1: Projective<ark_bn254::g1::Config>,
-    ) -> Script {
-        let (exp, sign) = if LAMBDA.gt(&P_POW3) {
-            (&*LAMBDA - &*P_POW3, true)
-        } else {
-            (&*P_POW3 - &*LAMBDA, false)
-        };
-
-        // G1/G2 points for pairings
-        let (p1, p2, p3, p4) = (msm_g1.into_affine(), proof.c, vk.alpha_g1, proof.a);
-        let (q1, q2, q3, q4) = (
-            vk.gamma_g2.into_group().neg().into_affine(),
-            vk.delta_g2.into_group().neg().into_affine(),
-            -vk.beta_g2,
-            proof.b,
-        );
-        let t4 = q4;
-
-        // hint from arkworks
-        let f = Bn254::multi_miller_loop_affine([p1, p2, p3, p4], [q1, q2, q3, q4]).0;
-        let (c, wi) = compute_c_wi(f);
-        let c_inv = c.inverse().unwrap();
-        let hint = if sign {
-            f * wi * (c_inv.pow((exp).to_u64_digits()))
-        } else {
-            f * wi * (c_inv.pow((exp).to_u64_digits()).inverse().unwrap())
-        };
-        assert_eq!(hint, c.pow(P_POW3.to_u64_digits()), "hint isn't correct!");
-
-        let q_prepared = vec![
-            G2Prepared::from_affine(q1),
-            G2Prepared::from_affine(q2),
-            G2Prepared::from_affine(q3),
-            G2Prepared::from_affine(q4),
-        ];
-        script! {
-            // constants
-            { constants() }
-
-            // variant of p1, say -p1.x / p1.y, 1 / p1.y
-            { msm_script }
-            { Fq::inv() }
-            { Fq::copy(0) }
-            { Fq::roll(2) }
-            { Fq::neg(0) }
-            { Fq::mul() }
-            { Fq::roll(1) }
-
-            // variants of G1 points
-            { utils::from_eval_point(p2) }
-            { utils::from_eval_point(p3) }
-            { utils::from_eval_point(p4) }
-
-            // the only non-fixed G2 point, say q4
-            { utils::fq2_push(q4.x) }
-            { utils::fq2_push(q4.y) }
-
-            // proofs for verifying final exp
-            { utils::fq12_push(c) }
-            { utils::fq12_push(c_inv) }
-            { utils::fq12_push(wi) }
-
-            // accumulator of q4, say t4
-            { utils::fq2_push(t4.x) }
-            { utils::fq2_push(t4.y) }
-            // stack: [beta_12, beta_13, beta_22, P1, P2, P3, P4, Q4, c, c_inv, wi, T4]
-
-            // 3. verify pairing
-            { check_pairing(&q_prepared, hint) }
-        }
-    }
-}
-
-// Groth16's pairing verifier
-//
-// To verify e(P1,Q1)*e(P2,Q2)*e(P3,Q3)*e(P4,Q4)=1
-//
-// Here is only support to verify groth16's pairing, which (Q1,Q2,Q3) are fixed, Q4 is non-fixed.
-//
-// params:
-//  @eval_points: [P1,P2,P3]. which has fixed {Q1,Q2,Q3}
-//  @P4: P4
-//  @Q4: Q4
-//  @lines: []precompute miller lines for Qi. Only support fixed Qi.
-//  @c: c^lambda = f*w^i
-//  @c_inv: inverse of c
-//  @hint: expect final_f
-//
-// verify c^lambda = f * wi, namely c_inv^lambda * f * wi = 1
-pub fn check_pairing(precompute_lines: &Vec<G2Prepared>, hint: ark_bn254::Fq12) -> Script {
-    script! {
-        // Input stack: [beta_12, beta_13, beta_22, P1, P2, P3, P4, Q4, c, c_inv, wi, T4]
-        // Output stack: [final_f]
-        { Pairing::quad_miller_loop_with_c_wi(precompute_lines.to_vec()) }
-
-        // check final_f == hint
-        { fq12_push(hint) }
-        { Fq12::equalverify() }
-        OP_TRUE
-    }
-}
-
-// Push constants to stack
-// Return Stack: [beta_12, beta_13, beta_22, 1/2, B]
-fn constants() -> Script {
-    script! {
-        // beta_12
-        { Fq::push_dec("21575463638280843010398324269430826099269044274347216827212613867836435027261") }
-        { Fq::push_dec("10307601595873709700152284273816112264069230130616436755625194854815875713954") }
-
-         // beta_13
-        { Fq::push_dec("2821565182194536844548159561693502659359617185244120367078079554186484126554") }
-        { Fq::push_dec("3505843767911556378687030309984248845540243509899259641013678093033130930403") }
-
-        // beta_22
-        { Fq::push_dec("21888242871839275220042445260109153167277707414472061641714758635765020556616") }
-        { Fq::push_zero() }
-    }
-}
diff --git a/src/hash/blake3_u4.rs b/src/hash/blake3_u4.rs
deleted file mode 100644
index 5f4325b0b..000000000
--- a/src/hash/blake3_u4.rs
+++ /dev/null
@@ -1,830 +0,0 @@
-use std::collections::HashMap;
-
-use bitcoin_script_stack::stack::{StackTracker, StackVariable};
-
-pub use bitcoin_script::script;
-pub use bitcoin::ScriptBuf as Script;
-
-use crate::u4::{u4_add_stack::*, u4_logic_stack::*, u4_shift_stack::*, u4_std::u4_repeat_number};
-
-const IV: [u32; 8] = [
-    0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19,
-];
-
-const MSG_PERMUTATION: [u8; 16] = [2, 6, 3, 10, 7, 0, 4, 13, 1, 11, 12, 5, 9, 14, 15, 8];
-
-#[derive(Clone, Debug, Copy)]
-pub struct TablesVars {
-    modulo: StackVariable,
-    quotient: StackVariable,
-    shift_tables: StackVariable,
-    half_lookup: StackVariable,
-    xor_table: StackVariable,
-}
-
-impl TablesVars {
-    pub fn new(stack: &mut StackTracker, use_full_tables: bool) -> Self {
-        let modulo = u4_push_modulo_for_blake(stack);
-        let quotient = u4_push_quotient_for_blake(stack);
-        let shift_tables = u4_push_shift_for_blake(stack);
-        let half_lookup = if !use_full_tables {
-            u4_push_lookup_table_stack(stack)
-        } else {
-            u4_push_full_lookup_table_stack(stack)
-        };
-        let xor_table = if !use_full_tables {
-            u4_push_xor_table_stack(stack)
-        } else {
-            u4_push_xor_full_table_stack(stack)
-        };
-        TablesVars {
-            modulo,
-            quotient,
-            shift_tables,
-            half_lookup,
-            xor_table,
-        }
-    }
-
-    pub fn drop(&self, stack: &mut StackTracker) {
-        stack.drop(self.xor_table);
-        stack.drop(self.half_lookup);
-        stack.drop(self.shift_tables);
-        stack.drop(self.quotient);
-        stack.drop(self.modulo);
-    }
-}
-
-pub fn right_rotate_xored(
-    stack: &mut StackTracker,
-    var_map: &mut HashMap<u8, StackVariable>,
-    x: u8,
-    y: u8,
-    n: u8,
-    tables: &TablesVars,
-) -> StackVariable {
-    let pos_shift = 8 - n / 4;
-
-    let y = var_map[&y];
-    let x = var_map.get_mut(&x).unwrap();
-
-    let mut ret = Vec::new();
-
-    for i in pos_shift..pos_shift + 8 {
-        let n = i % 8;
-
-        let mut z = 0;
-        if i < 8 {
-            z = pos_shift;
-        }
-
-        stack.move_var_sub_n(x, z as u32);
-        stack.copy_var_sub_n(y, n as u32);
-
-        let r0 = u4_logic_stack_nib(stack, tables.half_lookup, tables.xor_table, false);
-        ret.push(r0);
-    }
-
-    stack.join_count(&mut ret[0], 7)
-}
-
-pub fn right_rotate7_xored_sub(
-    stack: &mut StackTracker,
-    x: &mut StackVariable,
-    y: StackVariable,
-    tables: &TablesVars,
-    n: u8,
-) {
-    stack.from_altstack();
-
-    stack.move_var_sub_n(x, 0);
-    stack.copy_var_sub_n(y, n as u32);
-
-    let r0 = u4_logic_stack_nib(stack, tables.half_lookup, tables.xor_table, false);
-    stack.rename(r0, &format!("z{}", n));
-    stack.copy_var(r0);
-
-    stack.to_altstack();
-
-    // r7 r0 >> 3
-    let w1 = u4_2_nib_shift_blake(stack, tables.shift_tables);
-    stack.rename(w1, &format!("w{}", n + 1));
-}
-
-pub fn right_rotate7_xored(
-    stack: &mut StackTracker,
-    var_map: &mut HashMap<u8, StackVariable>,
-    x: u8,
-    y: u8,
-    tables: &TablesVars,
-) -> StackVariable {
-    // x    = x0 x1 x2 x3 x4 x5 x6 x7
-    // y    = y0 y1 y2 y3 y4 y5 y6 y7
-    // x^y = z
-    // z             = z0 z1 z2 z3 z4 z5 z6 z7
-    // rrot4( z )    = z7 z0 z1 z2 z3 z4 z5 z6
-    // w = rrot7( z ) = (z6) z7 z0 z1 z2 z3 z4 z5 z6  >> 3
-
-    let y = var_map[&y];
-    let x = var_map.get_mut(&x).unwrap();
-
-    // nib 6 xored
-    stack.move_var_sub_n(x, 6);
-    stack.copy_var_sub_n(y, 6);
-    let z6 = u4_logic_stack_nib(stack, tables.half_lookup, tables.xor_table, false);
-    stack.rename(z6, "z6");
-
-    // nib 6 copy saved
-    stack.copy_var(z6);
-    stack.to_altstack();
-
-    //nib 7 xored
-    stack.move_var_sub_n(x, 6); // previous nib 7 as it was consumed
-    stack.copy_var_sub_n(y, 7);
-
-    let z7 = u4_logic_stack_nib(stack, tables.half_lookup, tables.xor_table, false);
-    stack.rename(z7, "z7");
-    stack.copy_var(z7);
-    stack.to_altstack();
-
-    // z6 z7 >> 3
-    let mut w0 = u4_2_nib_shift_blake(stack, tables.shift_tables);
-    stack.rename(w0, "w0");
-
-    for i in 0..6 {
-        right_rotate7_xored_sub(stack, x, y, tables, i);
-    }
-
-    stack.from_altstack();
-    stack.from_altstack();
-
-    let w7 = u4_2_nib_shift_blake(stack, tables.shift_tables);
-    stack.rename(w7, "w7");
-
-    stack.join_count(&mut w0, 7)
-}
-
-pub fn g(
-    stack: &mut StackTracker,
-    var_map: &mut HashMap<u8, StackVariable>,
-    a: u8,
-    b: u8,
-    c: u8,
-    d: u8,
-    mx: StackVariable,
-    my: StackVariable,
-    tables: &TablesVars,
-) {
-    //adds a + b + mx
-    //consumes a and mx and copies b
-    let vb = var_map[&b];
-    let mut va = var_map.get_mut(&a).unwrap();
-    u4_add_stack(
-        stack,
-        8,
-        3,
-        vec![vb, mx],
-        vec![&mut va],
-        vec![],
-        tables.quotient,
-        tables.modulo,
-    );
-    //stores the results in a
-    *va = stack.from_altstack_joined(8, &format!("state_{}", a));
-
-    // right rotate d xor a ( consumes d and copies a)
-    let ret = right_rotate_xored(stack, var_map, d, a, 16, tables);
-    // saves in d
-    var_map.insert(d, ret);
-
-    let vd = var_map[&d];
-    let mut vc = var_map.get_mut(&c).unwrap();
-    u4_add_stack(
-        stack,
-        8,
-        2,
-        vec![vd],
-        vec![&mut vc],
-        vec![],
-        tables.quotient,
-        tables.modulo,
-    );
-    *vc = stack.from_altstack_joined(8, &format!("state_{}", c));
-
-    let ret = right_rotate_xored(stack, var_map, b, c, 12, tables);
-    var_map.insert(b, ret);
-
-    let vb = var_map[&b];
-    let mut va = var_map.get_mut(&a).unwrap();
-    u4_add_stack(
-        stack,
-        8,
-        3,
-        vec![vb, my],
-        vec![&mut va],
-        vec![],
-        tables.quotient,
-        tables.modulo,
-    );
-    *va = stack.from_altstack_joined(8, &format!("state_{}", a));
-
-    let ret = right_rotate_xored(stack, var_map, d, a, 8, tables);
-    var_map.insert(d, ret);
-    stack.rename(ret, &format!("state_{}", d));
-
-    let vd = var_map[&d];
-    let mut vc = var_map.get_mut(&c).unwrap();
-    u4_add_stack(
-        stack,
-        8,
-        2,
-        vec![vd],
-        vec![&mut vc],
-        vec![],
-        tables.quotient,
-        tables.modulo,
-    );
-    *vc = stack.from_altstack_joined(8, &format!("state_{}", c));
-
-    let ret = right_rotate7_xored(stack, var_map, b, c, tables);
-    var_map.insert(b, ret);
-    stack.rename(ret, &format!("state_{}", b));
-}
-
-pub fn round(
-    stack: &mut StackTracker,
-    state_var_map: &mut HashMap<u8, StackVariable>,
-    message_var_map: &HashMap<u8, StackVariable>,
-    tables: &TablesVars,
-) {
-    g(
-        stack,
-        state_var_map,
-        0,
-        4,
-        8,
-        12,
-        message_var_map[&0],
-        message_var_map[&1],
-        tables,
-    );
-    g(
-        stack,
-        state_var_map,
-        1,
-        5,
-        9,
-        13,
-        message_var_map[&2],
-        message_var_map[&3],
-        tables,
-    );
-    g(
-        stack,
-        state_var_map,
-        2,
-        6,
-        10,
-        14,
-        message_var_map[&4],
-        message_var_map[&5],
-        tables,
-    );
-    g(
-        stack,
-        state_var_map,
-        3,
-        7,
-        11,
-        15,
-        message_var_map[&6],
-        message_var_map[&7],
-        tables,
-    );
-
-    g(
-        stack,
-        state_var_map,
-        0,
-        5,
-        10,
-        15,
-        message_var_map[&8],
-        message_var_map[&9],
-        tables,
-    );
-    g(
-        stack,
-        state_var_map,
-        1,
-        6,
-        11,
-        12,
-        message_var_map[&10],
-        message_var_map[&11],
-        tables,
-    );
-    g(
-        stack,
-        state_var_map,
-        2,
-        7,
-        8,
-        13,
-        message_var_map[&12],
-        message_var_map[&13],
-        tables,
-    );
-    g(
-        stack,
-        state_var_map,
-        3,
-        4,
-        9,
-        14,
-        message_var_map[&14],
-        message_var_map[&15],
-        tables,
-    );
-}
-
-pub fn permutate(message_var_map: &HashMap<u8, StackVariable>) -> HashMap<u8, StackVariable> {
-    let mut ret = HashMap::new();
-    for i in 0..16_u8 {
-        ret.insert(i, message_var_map[&MSG_PERMUTATION[i as usize]]);
-    }
-    ret
-}
-
-pub fn init_state(
-    stack: &mut StackTracker,
-    chaining: bool,
-    counter: u32,
-    block_len: u32,
-    flags: u32,
-) -> HashMap<u8, StackVariable> {
-    let mut state = Vec::new();
-
-    if chaining {
-        for i in 0..8 {
-            state.push(stack.from_altstack_joined(8, &format!("prev-hash[{}]", i)));
-        }
-    } else {
-        for i in 0..8 {
-            state.push(stack.number_u32(IV[i]));
-        }
-    }
-    for i in 0..4 {
-        state.push(stack.number_u32(IV[i]));
-    }
-    state.push(stack.number_u32(0));
-    state.push(stack.number_u32(counter));
-    state.push(stack.number_u32(block_len));
-    state.push(stack.number_u32(flags));
-
-    let mut state_map = HashMap::new();
-    for i in 0..16 {
-        state_map.insert(i as u8, state[i]);
-        stack.rename(state[i], &format!("state_{}", i));
-    }
-    state_map
-}
-
-pub fn compress(
-    stack: &mut StackTracker,
-    chaining: bool,
-    counter: u32,
-    block_len: u32,
-    flags: u32,
-    mut message: HashMap<u8, StackVariable>,
-    tables: &TablesVars,
-    final_rounds: u8,
-    last_round: bool,
-) {
-    //chaining value needs to be copied for multiple blocks
-    //every time that is provided
-
-    let mut state = init_state(stack, chaining, counter, block_len, flags);
-
-    for i in 0..7 {
-        //round 6 could consume the message
-        round(stack, &mut state, &message, tables);
-
-        if i == 6 {
-            break;
-        }
-        message = permutate(&message);
-    }
-
-    for i in (0..final_rounds).rev() {
-        let mut tmp = Vec::new();
-
-        //iterate nibbles
-        for n in 0..8 {
-            let v2 = *state.get(&(i + 8)).unwrap();
-            stack.copy_var_sub_n(v2, n);
-            let v1 = state.get_mut(&i).unwrap();
-            stack.move_var_sub_n(v1, 0);
-            tmp.push(u4_logic_stack_nib(
-                stack,
-                tables.half_lookup,
-                tables.xor_table,
-                false,
-            ));
-
-            if last_round && n % 2 == 1 {
-                stack.to_altstack();
-                stack.to_altstack();
-            }
-        }
-        if !last_round {
-            for _ in 0..8 {
-                stack.to_altstack();
-            }
-        }
-    }
-}
-
-pub fn get_flags_for_block(i: u32, num_blocks: u32) -> u32 {
-    if num_blocks == 1 {
-        return 0b00001011;
-    }
-    if i == 0 {
-        return 0b00000001;
-    }
-    if i == num_blocks - 1 {
-        return 0b00001010;
-    }
-    0
-}
-
-// final rounds: 8 => 32 bytes hash
-// final rounds: 5 => 20 bytes hash (blake_160)
-pub fn blake3(stack: &mut StackTracker, mut msg_len: u32, final_rounds: u8) {
-    assert!(
-        msg_len <= 288,
-        "This blake3 implementation supports up to 288 bytes"
-    );
-
-    let use_full_tables = msg_len <= 232;
-
-    let num_blocks = (msg_len + 64 - 1) / 64;
-    let mut num_padding_bytes = num_blocks * 64 - msg_len;
-
-    //to handle the message the padding needs to be multiple of 4
-    //so if it's not multiple it needs to be added at the beginning
-    let mandatory_first_block_padding = num_padding_bytes % 4;
-    num_padding_bytes -= mandatory_first_block_padding;
-
-    //to optimize space the original message already processed is moved and dropped early
-    //but it consumes more opcodes, so it's done only if necessary
-    let optimize_space = num_blocks > 3;
-
-    if mandatory_first_block_padding > 0 {
-        stack.custom(
-            u4_repeat_number(0, (mandatory_first_block_padding) * 2),
-            0,
-            false,
-            0,
-            "padding",
-        );
-    }
-
-    let mut original_message = Vec::new();
-    for i in 0..msg_len / 4 {
-        let m = stack.define(8, &format!("msg_{}", i));
-        original_message.push(m);
-    }
-
-    let tables = TablesVars::new(stack, use_full_tables);
-
-    //process every block
-    for i in 0..num_blocks {
-        let last_round = i == num_blocks - 1;
-        let intermediate_rounds = if last_round { final_rounds } else { 8 };
-
-        let flags = get_flags_for_block(i, num_blocks);
-
-        // add the padding on the last round
-        if last_round && num_padding_bytes > 0 {
-            stack.custom(
-                u4_repeat_number(0, (num_padding_bytes) * 2),
-                0,
-                false,
-                0,
-                "padding",
-            );
-            for i in 0..(num_padding_bytes / 4) {
-                let m = stack.define(8, &format!("padd_{}", i));
-                original_message.push(m);
-            }
-        }
-
-        // create the current block message map
-        let mut message = HashMap::new();
-        for m in 0..16 {
-            message.insert(m as u8, original_message[m + (16 * i) as usize]);
-        }
-
-        // compress the block
-        compress(
-            stack,
-            i > 0,
-            0,
-            msg_len.min(64),
-            flags,
-            message,
-            &tables,
-            intermediate_rounds,
-            last_round,
-        );
-
-        if msg_len > 64 {
-            msg_len -= 64;
-        }
-
-        //drop the rest of the state
-        for _ in 0..16 - intermediate_rounds {
-            stack.drop(stack.get_var_from_stack(0));
-        }
-
-        // drop the processed messasge if we are in optimize space mode
-        if optimize_space && !last_round {
-            for j in 0..16 {
-                let x = stack.move_var(original_message[j + (16 * i as usize)]);
-                stack.drop(x);
-            }
-        }
-    }
-
-    // drop the padding
-    for _ in 0..num_padding_bytes / 4 {
-        stack.drop(stack.get_var_from_stack(0));
-    }
-
-    //drop tables
-    tables.drop(stack);
-
-    //drop the original message
-    let mut to_drop = if optimize_space { 16 } else { 16 * num_blocks };
-    to_drop -= num_padding_bytes / 4;
-    for _ in 0..to_drop {
-        stack.drop(stack.get_var_from_stack(0));
-    }
-
-    //get the result hash
-    stack.from_altstack_joined(final_rounds as u32 * 8, "blake3-hash");
-}
-
-#[cfg(test)]
-mod tests {
-
-    use std::collections::HashMap;
-
-    pub use bitcoin_script::script;
-    //pub use bitcoin::ScriptBuf as Script;
-    use bitcoin_script_stack::{script_util::verify_n, stack::StackTracker};
-
-    use super::*;
-    use crate::u4::u4_std::u4_hex_to_nibbles;
-
-    fn verify_blake3_hash(result: &str) -> Script {
-        script! {
-            { u4_hex_to_nibbles(result)}
-            for _ in 0..result.len() {
-                OP_TOALTSTACK
-            }
-
-            for i in 1..result.len() {
-                {i}
-                OP_ROLL
-            }
-
-            for _ in 0..result.len() {
-                OP_FROMALTSTACK
-                OP_EQUALVERIFY
-            }
-
-        }
-    }
-
-    #[test]
-    fn test_blake3() {
-        let hex_out = "86ca95aefdee3d969af9bcc78b48a5c1115be5d66cafc2fc106bbd982d820e70";
-
-        let mut stack = StackTracker::new();
-
-        let hex_in = "00000001".repeat(16);
-        stack.custom(
-            script! { { u4_hex_to_nibbles(&hex_in) } },
-            0,
-            false,
-            0,
-            "msg",
-        );
-
-        let start = stack.get_script_len();
-        blake3(&mut stack, 64, 8);
-        let end = stack.get_script_len();
-        println!("Blake3 size: {}", end - start);
-
-        stack.custom(
-            script! { {verify_blake3_hash(hex_out)}},
-            1,
-            false,
-            0,
-            "verify",
-        );
-
-        stack.op_true();
-
-        assert!(stack.run().success);
-    }
-
-    #[test]
-    fn test_blake3_160() {
-        let hex_out = "290eef2c4633e64835e2ea6395e9fc3e8bf459a7";
-
-        let mut stack = StackTracker::new();
-
-        let hex_in = "00000001".repeat(10);
-        stack.custom(
-            script! { { u4_hex_to_nibbles(&hex_in) } },
-            0,
-            false,
-            0,
-            "msg",
-        );
-
-        let start = stack.get_script_len();
-        blake3(&mut stack, 40, 5);
-        let end = stack.get_script_len();
-        println!("Blake3 size: {}", end - start);
-
-        stack.custom(
-            script! { {verify_blake3_hash(hex_out)}},
-            1,
-            false,
-            0,
-            "verify",
-        );
-
-        stack.op_true();
-
-        assert!(stack.run().success);
-    }
-
-    fn test_long_blakes(repeat: u32, hex_out: &str) {
-        let mut stack = StackTracker::new();
-
-        let hex_in = "00000001".repeat(repeat as usize);
-        stack.custom(
-            script! { { u4_hex_to_nibbles(&hex_in) } },
-            0,
-            false,
-            0,
-            "msg",
-        );
-
-        let start = stack.get_script_len();
-        blake3(&mut stack, repeat * 4, 8);
-        let end = stack.get_script_len();
-        println!("Blake3 size: {} for: {} bytes", end - start, repeat * 4);
-
-        stack.custom(
-            script! { {verify_blake3_hash(hex_out)}},
-            1,
-            false,
-            0,
-            "verify",
-        );
-
-        stack.op_true();
-
-        assert!(stack.run().success);
-    }
-
-    #[test]
-    fn test_blake3_long() {
-        let hex_out = "9bd93dd19a93d1d3522c6717d77a2e20e11b8627efa5df80c76d727ca7431892";
-        test_long_blakes(20, hex_out);
-
-        let hex_out = "08729d0161b725b93e83ce79b06c534ce7684d39e21ad05074b67e0ac89ef44a";
-        test_long_blakes(40, hex_out);
-
-        //limit not moving padding
-        let hex_out = "f2487b9f736cc30faf28952733c95560dc60e72cc7731b03a9ecfc86665e2e85";
-        test_long_blakes(48, hex_out);
-
-        //limit full tables
-        let hex_out = "034acb9761990badc714913b9bb6329d96ed91ea01530a55e8fd4c8ffb3aee42";
-        test_long_blakes(57, hex_out);
-
-        let hex_out = "a23e7a7e11ff2febf28a205c8dc0ca57ae4eb2d0eb079bb5c6a5bdcdd3e56de1";
-        test_long_blakes(60, hex_out);
-
-        //max limit
-        let hex_out = "b6c1b3d6b1555e0d20bd5188e4b8b20488c36105fd9c8971ac10dd267e612e4f";
-        test_long_blakes(72, hex_out);
-    }
-
-    #[test]
-    fn test_rrot7() {
-        let mut stack = StackTracker::new();
-        let tables = TablesVars::new(&mut stack, true);
-
-        let mut ret = Vec::new();
-        ret.push(stack.number_u32(0xdeadbeaf));
-        ret.push(stack.number_u32(0x01020304));
-
-        let mut var_map: HashMap<u8, StackVariable> = HashMap::new();
-        var_map.insert(0, ret[0]);
-        var_map.insert(1, ret[1]);
-
-        right_rotate7_xored(&mut stack, &mut var_map, 0, 1, &tables);
-
-        stack.number_u32(0x57bf5f7b);
-
-        stack.custom(script! { {verify_n(8)}}, 2, false, 0, "verify");
-
-        stack.drop(ret[1]);
-
-        tables.drop(&mut stack);
-
-        stack.op_true();
-
-        assert!(stack.run().success);
-    }
-
-    #[test]
-    fn test_g() {
-        let mut stack = StackTracker::new();
-
-        let tables = TablesVars::new(&mut stack, true);
-
-        let mut ret = Vec::new();
-        for i in 0..6 {
-            ret.push(stack.number_u32(i));
-        }
-
-        let mut var_map: HashMap<u8, StackVariable> = HashMap::new();
-        var_map.insert(0, ret[0]);
-        var_map.insert(1, ret[1]);
-        var_map.insert(2, ret[2]);
-        var_map.insert(3, ret[3]);
-
-        let start = stack.get_script_len();
-        g(
-            &mut stack,
-            &mut var_map,
-            0,
-            1,
-            2,
-            3,
-            ret[4],
-            ret[5],
-            &tables,
-        );
-        let end = stack.get_script_len();
-        println!("G size: {}", end - start);
-
-        stack.number_u32(0xc4d46c6c); //b
-        stack.custom(script! { {verify_n(8)}}, 2, false, 0, "verify");
-
-        stack.number_u32(0x6a063602); //c
-        stack.custom(script! { {verify_n(8)}}, 2, false, 0, "verify");
-
-        stack.number_u32(0x6a003600); //d
-        stack.custom(script! { {verify_n(8)}}, 2, false, 0, "verify");
-
-        stack.number_u32(0x0030006a); //a
-        stack.custom(script! { {verify_n(8)}}, 2, false, 0, "verify");
-
-        stack.drop(ret[5]);
-        stack.drop(ret[4]);
-        tables.drop(&mut stack);
-
-        stack.op_true();
-
-        assert!(stack.run().success);
-    }
-
-    #[test]
-    fn test_round() {
-        let mut stack = StackTracker::new();
-
-        let tables = TablesVars::new(&mut stack, true);
-
-        let mut var_map: HashMap<u8, StackVariable> = HashMap::new();
-        let mut msg_map: HashMap<u8, StackVariable> = HashMap::new();
-        for i in 0..16 {
-            var_map.insert(i, stack.number_u32(i as u32));
-            msg_map.insert(i, stack.number_u32(i as u32));
-        }
-
-        let start = stack.get_script_len();
-        round(&mut stack, &mut var_map, &msg_map, &tables);
-        let end = stack.get_script_len();
-        println!("Round size: {}", end - start);
-    }
-}
diff --git a/src/hash/mod.rs b/src/hash/mod.rs
deleted file mode 100644
index b3eed0ce6..000000000
--- a/src/hash/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod blake3;
-//pub mod blake3_u4;
-pub mod sha256;
-pub mod sha256_u4;
-//pub mod sha256_u4_stack;
diff --git a/src/hash/sha256_u4_stack.rs b/src/hash/sha256_u4_stack.rs
deleted file mode 100644
index 9934aa377..000000000
--- a/src/hash/sha256_u4_stack.rs
+++ /dev/null
@@ -1,766 +0,0 @@
-use crate::treepp::{script, Script};
-use crate::u4::{
-    u4_add_stack::*, u4_logic_stack::*, u4_rot_stack::*, u4_shift_stack::*, u4_std::*,
-};
-use bitcoin_script_stack::stack::{StackTracker, StackVariable};
-use std::{collections::HashMap, vec};
-
-const K: [u32; 64] = [
-    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-    0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-    0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-    0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-    0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-    0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-    0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-    0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2,
-];
-
-const INITSTATE_MAPPING: [char; 8] = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'];
-
-const INITSTATE: [u32; 8] = [
-    0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19,
-];
-
-pub fn double_padding(num_bytes: u32) -> (Vec<Script>, u32) {
-    //55 bytes fits in one block
-    //56 to 64 requires two block padding
-
-    let mut chunks = num_bytes / 64;
-    chunks += 1;
-
-    if num_bytes % 64 > 55 {
-        let mut bytes_left_first_padding = 64 - (num_bytes % 64);
-        bytes_left_first_padding -= 1; // remove the 0x80 that will be added always
-        let script1 = script! {
-            8
-            0
-            for _ in 0..bytes_left_first_padding { //can optimize with a couple of dups
-                0
-                0
-            }
-        };
-
-        let script2 = script! {
-            0
-            OP_DUP
-            for _ in 0..59 {
-                OP_2DUP
-            }
-            { u4_number_to_nibble( num_bytes * 8 ) }
-        };
-
-        chunks += 1;
-
-        let mut results = Vec::new();
-        for _ in 0..(chunks - 2) {
-            results.push(script! {});
-        }
-        results.push(script1);
-        results.push(script2);
-
-        (results, chunks)
-    } else {
-        let (script1, _) = padding(num_bytes);
-        let mut results = Vec::new();
-        for _ in 0..(chunks - 1) {
-            results.push(script! {});
-        }
-        results.push(script1);
-        (results, chunks)
-    }
-}
-
-pub fn padding(num_bytes: u32) -> (Script, u32) {
-    let l = (num_bytes * 8) as i32;
-    let mut k = 512 - l - 8 - 32; // heres is usually minus 8, but as
-                                  // there will be never that many bytes to process
-                                  // one u32 will be enough
-    let mut chunks = 1;
-    while k < 0 {
-        k += 512;
-        chunks += 1;
-    }
-    let zeros = k / 16;
-    let extras = k % 16;
-
-    (
-        script! {
-          8
-          0
-          for i in 0..zeros {
-              if i == 0 {
-                  0
-                  OP_DUP
-                  OP_2DUP
-              } else {
-                  OP_2DUP
-                  OP_2DUP
-              }
-          }
-          if extras > 0 {
-              0
-              0
-          }
-          { u4_number_to_nibble( l as u32 ) }
-        },
-        chunks,
-    )
-}
-
-pub fn calculate_s_stack(
-    stack: &mut StackTracker,
-    number: StackVariable,
-    shift_table: StackVariable,
-    shift_value: Vec<u32>,
-    last_is_shift: bool,
-    lookup_table: StackVariable,
-    logic_table: StackVariable,
-    do_xor_with_and: bool,
-) -> StackVariable {
-    let mut results = Vec::new();
-    for nib in 0..8 {
-        u4_rrot_nib_from_u32(stack, shift_table, number, nib, shift_value[0], false);
-        u4_rrot_nib_from_u32(stack, shift_table, number, nib, shift_value[1], false);
-        u4_logic_stack_nib(stack, lookup_table, logic_table, do_xor_with_and);
-        u4_rrot_nib_from_u32(
-            stack,
-            shift_table,
-            number,
-            nib,
-            shift_value[2],
-            last_is_shift,
-        );
-        results.push(u4_logic_stack_nib(
-            stack,
-            lookup_table,
-            logic_table,
-            do_xor_with_and,
-        ));
-    }
-
-    let var = stack.join_count(&mut results[0], 7);
-    stack.rename(var, "s");
-    var
-}
-
-pub fn ch_calculation_stack(
-    stack: &mut StackTracker,
-    e: StackVariable,
-    f: StackVariable,
-    g: StackVariable,
-    lookup: StackVariable,
-    andtable: StackVariable,
-) -> StackVariable {
-    let mut ret = Vec::new();
-    for nib in 0..8 {
-        stack.copy_var_sub_n(e, nib); // e[nib]
-        stack.op_dup(); // e e
-
-        stack.op_negate(); // e ~e
-        stack.number(15);
-        stack.op_add();
-
-        stack.copy_var_sub_n(g, nib); // e ~e g[nib]
-
-        u4_logic_with_table_stack(stack, lookup, andtable, false); // e  ( ~e & g )
-        stack.op_swap(); // ( ~e & g ) e
-
-        stack.copy_var_sub_n(f, nib); // ( ~e & g ) e f[nib]
-
-        u4_logic_with_table_stack(stack, lookup, andtable, false); // ( ~e & g ) (e & f)
-        ret.push(u4_xor_with_and_stack(stack, lookup, andtable)); // ( ~e & g ) ^ (e & f)
-    }
-
-    stack.join_count(&mut ret[0], 7);
-    stack.rename(ret[0], "ch");
-    ret[0]
-}
-
-pub fn maj_calculation_stack(
-    stack: &mut StackTracker,
-    a: StackVariable,
-    b: StackVariable,
-    c: StackVariable,
-    lookup: StackVariable,
-    andtable: StackVariable,
-) -> StackVariable {
-    let mut ret = Vec::new();
-    for nib in 0..8 {
-        stack.copy_var_sub_n(a, nib); // a[nib]
-
-        stack.copy_var_sub_n(b, nib); // a b[nib]
-
-        stack.op_2dup(); // a b a b
-
-        u4_xor_with_and_stack(stack, lookup, andtable); // a b (a^b)
-
-        stack.copy_var_sub_n(c, nib); // a b (a^b) c
-
-        u4_logic_with_table_stack(stack, lookup, andtable, false); // a b ((a^b) & c)
-
-        stack.op_rot();
-        stack.op_rot(); // ((a^b) & c) a b
-
-        u4_logic_with_table_stack(stack, lookup, andtable, false); // ((a^b) & c) (a & b)
-
-        ret.push(u4_xor_with_and_stack(stack, lookup, andtable)); // ((a^b) & c) ^ (a & b)
-    }
-
-    stack.join_count(&mut ret[0], 7);
-    stack.rename(ret[0], "maj");
-    ret[0]
-}
-
-pub fn sha256_stack(stack: &mut StackTracker, num_bytes: u32) -> Script {
-    // up to 55 is one block and always supports add table
-    // probably up to 68 bytes I can afford to load the add tables for the first chunk (but have I would have to unload it)
-
-    let (mut padding_scripts, chunks) = double_padding(num_bytes);
-    let mut bytes_per_chunk: Vec<u32> = Vec::new();
-    let mut bytes_remaining = num_bytes;
-    while bytes_remaining > 0 {
-        if bytes_remaining > 64 {
-            bytes_per_chunk.push(64);
-            bytes_remaining -= 64;
-        } else {
-            bytes_per_chunk.push(bytes_remaining);
-            bytes_remaining = 0;
-        }
-    }
-    if bytes_per_chunk.len() < chunks as usize {
-        bytes_per_chunk.push(0);
-    }
-    //println!("{:?}", bytes_per_chunk);
-    //println!("{:?}", padding_scripts);
-
-    let mut use_add_table = chunks == 1;
-
-    let mut message = (0..num_bytes * 2)
-        .map(|i| stack.define(1, &format!("message[{}]", i)))
-        .collect::<Vec<StackVariable>>();
-
-    let (mut modulo, mut quotient) = match use_add_table {
-        true => (
-            u4_push_modulo_table_stack(stack),
-            u4_push_quotient_table_stack(stack),
-        ),
-        false => (StackVariable::null(), StackVariable::null()),
-    };
-
-    stack.set_breakpoint("init");
-
-    let shift_tables = u4_push_shift_tables_stack(stack);
-    let half_lookup = u4_push_lookup_table_stack(stack);
-    let mut xor_table = u4_push_xor_table_stack(stack);
-    let mut and_table = StackVariable::null();
-
-    let mut varmap: HashMap<char, StackVariable> = HashMap::new();
-    let mut initstate: HashMap<char, StackVariable> = HashMap::new();
-
-    stack.set_breakpoint("load tables");
-
-    for c in 0..chunks {
-        //change tables
-        if c > 0 {
-            stack.drop(and_table);
-
-            xor_table = u4_push_xor_table_stack(stack);
-            stack.set_breakpoint("change tables");
-        }
-
-        //move the message to the top of the stack
-        //this can be optimized only moving the las nibbles that would form an u32 with the first part of the padding
-        let mut moved_message = (0..bytes_per_chunk[c as usize] * 2)
-            .map(|i| stack.move_var(message[i as usize]))
-            .collect::<Vec<StackVariable>>();
-        message.drain(0..moved_message.len());
-
-        stack.set_breakpoint("moved message");
-
-        //complete message with padding
-        stack.custom(padding_scripts.remove(0), 0, false, 0, "padding");
-        let len = moved_message.len();
-        if len < 128 {
-            for i in 0..(128 - len) {
-                moved_message.push(stack.define(1, &format!("padding[{}]", i)));
-            }
-        }
-        stack.set_breakpoint("padding");
-
-        //redefine from nibbles to u32
-        assert!(moved_message.len() == 128);
-        let mut schedule = Vec::new();
-        for i in 0..16 {
-            let joined = stack.join_count(&mut moved_message[0], 7);
-            stack.rename(joined, &format!("schedule[{}]", i));
-            schedule.push(joined);
-            moved_message.drain(0..8);
-        }
-        stack.set_breakpoint("schedule");
-
-        //schedule loop
-        for i in 16..64 {
-            let mut s0 = calculate_s_stack(
-                stack,
-                schedule[i - 15],
-                shift_tables,
-                vec![7, 18, 3],
-                true,
-                half_lookup,
-                xor_table,
-                false,
-            );
-            let mut s1 = calculate_s_stack(
-                stack,
-                schedule[i - 2],
-                shift_tables,
-                vec![17, 19, 10],
-                true,
-                half_lookup,
-                xor_table,
-                false,
-            );
-            u4_add_stack(
-                stack,
-                8,
-                4,
-                vec![schedule[i - 16], schedule[i - 7]],
-                vec![&mut s0, &mut s1],
-                vec![],
-                quotient,
-                modulo,
-            );
-            let sched_i = stack.from_altstack_joined(8, &format!("schedule[{}]", i));
-            schedule.push(sched_i);
-
-            stack.set_breakpoint(&format!("schedule[{}]", i));
-        }
-
-        //exchange xor with and table
-        stack.to_altstack_count(64);
-        stack.drop(xor_table);
-
-        and_table = u4_push_and_table_stack(stack);
-        stack.from_altstack_count(64);
-
-        if c == 0 {
-            for i in 0..INITSTATE.len() {
-                let var = stack.number_u32(INITSTATE[i]);
-                varmap.insert(INITSTATE_MAPPING[i], var);
-            }
-        } else {
-            for i in 0..INITSTATE_MAPPING.len() {
-                varmap.insert(
-                    INITSTATE_MAPPING[i],
-                    stack.from_altstack_joined(8, &format!("{}", INITSTATE_MAPPING[i])),
-                );
-                initstate.insert(
-                    INITSTATE_MAPPING[i],
-                    stack.copy_var(varmap[&INITSTATE_MAPPING[i]]),
-                );
-            }
-        }
-
-        for i in 0..64 {
-            //calculated that after 6 iterations of chunk 2 the add tables fit in the stack
-            if i == 6 && c == 1 {
-                modulo = u4_push_modulo_table_stack(stack);
-                quotient = u4_push_quotient_table_stack(stack);
-                use_add_table = true;
-            }
-
-            //Calculate S1
-            let mut s1 = calculate_s_stack(
-                stack,
-                varmap[&'e'],
-                shift_tables,
-                vec![6, 11, 25],
-                false,
-                half_lookup,
-                and_table,
-                true,
-            );
-
-            //calculate ch
-            let mut ch = ch_calculation_stack(
-                stack,
-                varmap[&'e'],
-                varmap[&'f'],
-                varmap[&'g'],
-                half_lookup,
-                and_table,
-            );
-
-            //calculate temp1
-            let mut h = varmap[&'h'];
-            if use_add_table {
-                u4_add_stack(
-                    stack,
-                    8,
-                    2,
-                    vec![],
-                    vec![&mut schedule[i]],
-                    vec![K[i]],
-                    quotient,
-                    modulo,
-                );
-                let mut parts = stack.from_altstack_count(8);
-                let mut part1 = stack.join_count(&mut parts[0], 7);
-                u4_add_stack(
-                    stack,
-                    8,
-                    4,
-                    vec![],
-                    vec![&mut s1, &mut ch, &mut h, &mut part1],
-                    vec![],
-                    quotient,
-                    modulo,
-                );
-            } else {
-                u4_add_stack(
-                    stack,
-                    8,
-                    5,
-                    vec![],
-                    vec![&mut s1, &mut ch, &mut h, &mut schedule[i]],
-                    vec![K[i]],
-                    StackVariable::null(),
-                    StackVariable::null(),
-                );
-            }
-            let mut temp1 = stack.from_altstack_joined(8, "temp1");
-
-            //Calculate S0
-            let mut s0 = calculate_s_stack(
-                stack,
-                varmap[&'a'],
-                shift_tables,
-                vec![2, 13, 22],
-                false,
-                half_lookup,
-                and_table,
-                true,
-            );
-
-            //Calculate maj
-            let mut maj = maj_calculation_stack(
-                stack,
-                varmap[&'a'],
-                varmap[&'b'],
-                varmap[&'c'],
-                half_lookup,
-                and_table,
-            );
-
-            //calculate a = temp1 + s0 + maj
-            u4_add_stack(
-                stack,
-                8,
-                3,
-                vec![temp1],
-                vec![&mut s0, &mut maj],
-                vec![],
-                quotient,
-                modulo,
-            );
-            let temp_a = stack.from_altstack_joined(8, "temp_a");
-
-            //e = d + temp1 (consumes d)
-            let mut d = varmap[&'d'];
-            u4_add_stack(
-                stack,
-                8,
-                2,
-                vec![],
-                vec![&mut d, &mut temp1],
-                vec![],
-                quotient,
-                modulo,
-            );
-            let temp_e = stack.from_altstack_joined(8, "temp_e");
-
-            //reorder variables
-            varmap.insert('h', varmap[&'g']);
-            varmap.insert('g', varmap[&'f']);
-            varmap.insert('f', varmap[&'e']);
-            varmap.insert('e', temp_e);
-            varmap.insert('d', varmap[&'c']);
-            varmap.insert('c', varmap[&'b']);
-            varmap.insert('b', varmap[&'a']);
-            varmap.insert('a', temp_a);
-
-            for c in INITSTATE_MAPPING.iter() {
-                stack.rename(varmap[c], &format!("{}", c));
-            }
-
-            stack.set_breakpoint(&format!("loop[{}]", i));
-        }
-
-        if c == 0 {
-            //first chunk adds with init state
-            for i in (0..INITSTATE_MAPPING.len()).rev() {
-                let mut x = *varmap.get(&INITSTATE_MAPPING[i]).unwrap();
-                u4_add_stack(
-                    stack,
-                    8,
-                    2,
-                    vec![],
-                    vec![&mut x],
-                    vec![INITSTATE[i]],
-                    quotient,
-                    modulo,
-                );
-            }
-        } else {
-            for i in (0..INITSTATE_MAPPING.len()).rev() {
-                let mut prev_state = *initstate.get(&INITSTATE_MAPPING[i]).unwrap();
-                let mut x = *varmap.get(&INITSTATE_MAPPING[i]).unwrap();
-                u4_add_stack(
-                    stack,
-                    8,
-                    2,
-                    vec![],
-                    vec![&mut x, &mut prev_state],
-                    vec![],
-                    quotient,
-                    modulo,
-                );
-            }
-        }
-
-        stack.set_breakpoint("var addition");
-
-        // if last chunk drop the tables
-        if c == chunks - 1 {
-            if use_add_table && chunks == 2 {
-                stack.drop(quotient);
-                stack.drop(modulo);
-            }
-            stack.drop(and_table);
-            stack.drop(half_lookup);
-            stack.drop(shift_tables);
-            if use_add_table && chunks == 1 {
-                stack.drop(quotient);
-                stack.drop(modulo);
-            }
-        }
-        stack.set_breakpoint("dropped");
-    }
-
-    for i in 0..INITSTATE_MAPPING.len() {
-        *varmap.get_mut(&INITSTATE_MAPPING[i]).unwrap() =
-            stack.from_altstack_joined(8, &format!("h{}", i));
-    }
-
-    stack.set_breakpoint("final");
-
-    stack.get_script()
-}
-
-#[cfg(test)]
-mod tests {
-
-    use super::*;
-    use crate::{execute_script, treepp::script};
-    use sha2::{Digest, Sha256};
-
-    #[test]
-    fn test_sizes_tmp() {
-        let mut stack = StackTracker::new();
-        let x = sha256_stack(&mut stack, 32);
-        println!("sha 32 bytes: {}", x.len());
-        println!("max stack: {}", stack.get_max_stack_size());
-
-        let mut stack = StackTracker::new();
-        let x = sha256_stack(&mut stack, 80);
-        println!("sha 80 bytes: {}", x.len());
-        println!("max stack: {}", stack.get_max_stack_size());
-    }
-
-    #[test]
-    fn test_shatemp() {
-        let mut stack = StackTracker::new();
-        stack.custom(
-            script! {
-                {u4_number_to_nibble(0xdeadbeaf)}
-                {u4_number_to_nibble(0x01020304)}
-            },
-            0,
-            false,
-            0,
-            "message",
-        );
-
-        sha256_stack(&mut stack, 8);
-        stack.run();
-    }
-
-    fn test_sha256(hex_in: &str) {
-        let mut hasher = Sha256::new();
-        let data = hex::decode(hex_in).unwrap();
-        hasher.update(&data);
-        let result = hasher.finalize();
-        let res = hex::encode(result);
-        println!("Result: {}", res);
-
-        let mut stack = StackTracker::new();
-        stack.custom(
-            script! { {u4_hex_to_nibbles(hex_in)}},
-            0,
-            false,
-            0,
-            "message",
-        );
-
-        let shascript = sha256_stack(&mut stack, hex_in.len() as u32 / 2);
-
-        let script = script! {
-            { shascript }
-            { u4_hex_to_nibbles(res.as_str())}
-            for _ in 0..64 {
-                OP_TOALTSTACK
-            }
-
-            for i in 1..64 {
-                {i}
-                OP_ROLL
-            }
-
-            for _ in 0..64 {
-                OP_FROMALTSTACK
-                OP_EQUALVERIFY
-            }
-            OP_TRUE
-
-        };
-
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_sha256_strs() {
-        let message = "Hello.";
-        let hex: String = message
-            .as_bytes()
-            .iter()
-            .map(|&b| format!("{:02x}", b))
-            .collect();
-        test_sha256(&hex);
-        let message = "This is a longer message that still fits in one block!";
-        let hex: String = message
-            .as_bytes()
-            .iter()
-            .map(|&b| format!("{:02x}", b))
-            .collect();
-        test_sha256(&hex)
-    }
-
-    #[test]
-    fn test_sha256_two_blocks() {
-        let hex = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaaaaaaa";
-        test_sha256(hex);
-        let hex = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001122334455667788";
-        test_sha256(hex);
-        let hex = "7788ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaaaaaaaaaaaaaaa001122334455667788";
-        test_sha256(hex);
-    }
-
-    #[test]
-    fn test_padding() {
-        let (script, _) = padding(1);
-        let script = script! {
-            { 0}
-            { 1 }
-            { script }
-            { u4_drop(128) }
-            OP_TRUE
-        };
-
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_split_padding() {
-        for num_bytes in 0..150 {
-            let (padding_scripts, chunks) = double_padding(num_bytes);
-
-            let script = script! {
-                for _ in 0..num_bytes {
-                    { 1 }
-                    { 0 }
-                }
-                OP_DEPTH
-                OP_TOALTSTACK
-                for script in padding_scripts {
-                    { script }
-                    OP_DEPTH
-                    OP_TOALTSTACK
-                }
-                { u4_drop(chunks*128) }
-                OP_DEPTH
-                OP_TOALTSTACK
-                OP_TRUE
-            };
-
-            let res = execute_script(script);
-            assert!(res.success);
-        }
-    }
-
-    #[test]
-    fn test_genesis_block() {
-        // the genesis block header of bitcoin
-        // version previous-block merkle-root time bits nonce
-        // 01000000 0000000000000000000000000000000000000000000000000000000000000000 3ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a 29ab5f49 ffff001d 1dac2b7c
-        let block_header = "0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a29ab5f49ffff001d1dac2b7c";
-        let mut hasher = Sha256::new();
-        let data = hex::decode(block_header).unwrap();
-        hasher.update(&data);
-        let mut result = hasher.finalize();
-        hasher = Sha256::new();
-        hasher.update(result);
-        result = hasher.finalize();
-        let res = hex::encode(result);
-        let genesis_block_hash = "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000";
-        assert_eq!(res.as_str(), genesis_block_hash);
-
-        let mut stack = StackTracker::new();
-        stack.custom(
-            script! { {u4_hex_to_nibbles(block_header)}},
-            0,
-            false,
-            0,
-            "message",
-        );
-        sha256_stack(&mut stack, block_header.len() as u32 / 2);
-        let shascript = sha256_stack(&mut stack, 32);
-
-        let script = script! {
-
-            { shascript }
-
-            { u4_hex_to_nibbles(res.as_str())}
-            for _ in 0..64 {
-                OP_TOALTSTACK
-            }
-
-            for i in 1..64 {
-                {i}
-                OP_ROLL
-            }
-
-            for _ in 0..64 {
-                OP_FROMALTSTACK
-                OP_EQUALVERIFY
-            }
-            OP_TRUE
-
-
-        };
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-}
diff --git a/src/lib.rs b/src/lib.rs
deleted file mode 100644
index 66fb16cba..000000000
--- a/src/lib.rs
+++ /dev/null
@@ -1,514 +0,0 @@
-#[allow(dead_code)]
-// Re-export what is needed to write treepp scripts
-pub mod treepp {
-    pub use crate::execute_script;
-    pub use crate::run;
-    pub use bitcoin_script::{script, Script};
-}
-
-use core::fmt;
-use std::{cmp::min, fs::File, io::Write};
-
-use bitcoin::{hashes::Hash, hex::DisplayHex, Opcode, ScriptBuf, TapLeafHash, Transaction};
-use bitcoin_scriptexec::{Exec, ExecCtx, ExecError, ExecStats, Options, Stack, TxTemplate};
-
-pub mod bigint;
-pub mod bn254;
-pub mod bridge;
-pub mod fflonk;
-pub mod groth16;
-pub mod hash;
-pub mod pseudo;
-pub mod signatures;
-pub mod u32;
-pub mod u4;
-
-/// A wrapper for the stack types to print them better.
-pub struct FmtStack(Stack);
-impl fmt::Display for FmtStack {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mut iter = self.0.iter_str().enumerate().peekable();
-        write!(f, "\n0:\t\t ")?;
-        while let Some((index, mut item)) = iter.next() {
-            if item.is_empty() {
-                write!(f, "    []    ")?;
-            } else {
-            item.reverse();
-            write!(f, "0x{:8}", item.as_hex())?;
-            }
-            if iter.peek().is_some() {
-                if (index + 1) % f.width().unwrap_or(4) == 0 {
-                    write!(f, "\n{}:\t\t", index + 1)?;
-                }
-                write!(f, " ")?;
-            }
-        }
-        Ok(())
-    }
-}
-
-impl FmtStack {
-    pub fn len(&self) -> usize { self.0.len() }
-
-    pub fn get(&self, index: usize) -> Vec<u8> { self.0.get(index) }
-}
-
-impl fmt::Debug for FmtStack {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self)?;
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct ExecuteInfo {
-    pub success: bool,
-    pub error: Option<ExecError>,
-    pub final_stack: FmtStack,
-    pub remaining_script: String,
-    pub last_opcode: Option<Opcode>,
-    pub stats: ExecStats,
-}
-
-impl fmt::Display for ExecuteInfo {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if self.success {
-            writeln!(f, "Script execution successful.")?;
-        } else {
-            writeln!(f, "Script execution failed!")?;
-        }
-        if let Some(ref error) = self.error {
-            writeln!(f, "Error: {:?}", error)?;
-        }
-        if !self.remaining_script.is_empty() {
-            if self.remaining_script.len() < 500 {
-                writeln!(f, "Remaining Script: {}", self.remaining_script)?;
-            } else {
-                let mut string = self.remaining_script.clone();
-                string.truncate(500);
-                writeln!(f, "Remaining Script: {}...", string)?;
-            }
-        }
-        if self.final_stack.len() > 0 {
-            match f.width() {
-                None => writeln!(f, "Final Stack: {:4}", self.final_stack)?,
-                Some(width) => {
-                    writeln!(f, "Final Stack: {:width$}", self.final_stack, width = width)?
-                }
-            }
-        }
-        if let Some(ref opcode) = self.last_opcode {
-            writeln!(f, "Last Opcode: {:?}", opcode)?;
-        }
-        writeln!(f, "Stats: {:?}", self.stats)?;
-        Ok(())
-    }
-}
-
-pub fn execute_script(script: treepp::Script) -> ExecuteInfo {
-    let mut exec = Exec::new(
-        ExecCtx::Tapscript,
-        Options::default(),
-        TxTemplate {
-            tx: Transaction {
-                version: bitcoin::transaction::Version::TWO,
-                lock_time: bitcoin::locktime::absolute::LockTime::ZERO,
-                input: vec![],
-                output: vec![],
-            },
-            prevouts: vec![],
-            input_idx: 0,
-            taproot_annex_scriptleaf: Some((TapLeafHash::all_zeros(), None)),
-        },
-        script.compile(),
-        vec![],
-    )
-    .expect("error creating exec");
-
-    loop {
-        if exec.exec_next().is_err() {
-            break;
-        }
-    }
-    let res = exec.result().unwrap();
-    ExecuteInfo {
-        success: res.success,
-        error: res.error.clone(),
-        last_opcode: res.opcode,
-        final_stack: FmtStack(exec.stack().clone()),
-        remaining_script: exec.remaining_script().to_asm_string(),
-        stats: exec.stats().clone(),
-    }
-}
-
-pub fn run(script: treepp::Script) {
-    let exec_result = execute_script(script);
-    if !exec_result.success {
-        println!(
-            "ERROR: {:?} <--- \n STACK: {:4} ",
-            exec_result.last_opcode, exec_result.final_stack
-        );
-    }
-    assert!(exec_result.success);
-}
-
-// Execute a script on stack without `MAX_STACK_SIZE` limit.
-// This function is only used for script test, not for production.
-//
-// NOTE: Only for test purposes.
-pub fn execute_script_without_stack_limit(script: treepp::Script) -> ExecuteInfo {
-    // Get the default options for the script exec.
-    let mut opts = Options::default();
-    // Do not enforce the stack limit.
-    opts.enforce_stack_limit = false;
-
-    let mut exec = Exec::new(
-        ExecCtx::Tapscript,
-        opts,
-        TxTemplate {
-            tx: Transaction {
-                version: bitcoin::transaction::Version::TWO,
-                lock_time: bitcoin::locktime::absolute::LockTime::ZERO,
-                input: vec![],
-                output: vec![],
-            },
-            prevouts: vec![],
-            input_idx: 0,
-            taproot_annex_scriptleaf: Some((TapLeafHash::all_zeros(), None)),
-        },
-        script.compile(),
-        vec![],
-    )
-    .expect("error creating exec");
-
-    loop {
-        if exec.exec_next().is_err() {
-            break;
-        }
-    }
-    let res = exec.result().unwrap();
-    ExecuteInfo {
-        success: res.success,
-        error: res.error.clone(),
-        last_opcode: res.opcode,
-        final_stack: FmtStack(exec.stack().clone()),
-        remaining_script: exec.remaining_script().to_asm_string(),
-        stats: exec.stats().clone(),
-    }
-}
-
-// TODO: Use signatures to copy over the stack from one chunk to the next.
-pub fn execute_script_as_chunks(
-    script: treepp::Script,
-    target_chunk_size: usize,
-    tolerance: usize,
-) -> ExecuteInfo {
-    let (chunk_sizes, scripts) = script
-        .clone()
-        .compile_to_chunks(target_chunk_size, tolerance);
-    // TODO: Remove this when we are sure we are in script size limit for groth16
-    // Get the default options for the script exec.
-    let mut opts = Options::default();
-    // Do not enforce the stack limit.
-    opts.enforce_stack_limit = false;
-
-    assert!(scripts.len() > 0, "No chunks to execute");
-    let mut stats_file = File::create("chunk_stats.txt").expect("Unable to create stats file");
-    writeln!(stats_file, "chunk sizes: {:?}", chunk_sizes).expect("Unable to write to stats file");
-    let num_chunks = scripts.len();
-    let mut scripts = scripts.into_iter();
-    let mut final_exec = None; // Only used to not initialize an obsolote Exec
-    let mut next_stack = Stack::new();
-    let mut next_altstack = Stack::new();
-    let mut chunk_stacks = vec![];
-
-    // Execute each chunk and copy over the stacks
-    for i in 0..num_chunks {
-        // Note: Exec::with_stack() currently overwrites the witness!
-        let mut exec = Exec::with_stack(
-            ExecCtx::Tapscript,
-            opts.clone(),
-            TxTemplate {
-                tx: Transaction {
-                    version: bitcoin::transaction::Version::TWO,
-                    lock_time: bitcoin::locktime::absolute::LockTime::ZERO,
-                    input: vec![],
-                    output: vec![],
-                },
-                prevouts: vec![],
-                input_idx: 0,
-                taproot_annex_scriptleaf: Some((TapLeafHash::all_zeros(), None)),
-            },
-            scripts.next().unwrap_or_else(|| unreachable!()),
-            vec![], // Note: If you put a witness here make sure to adjust
-                                    // Exec::with_stack() to not overwrite it!
-            next_stack.clone(),
-            next_altstack.clone(),
-        )
-        .expect("Failed to create Exec");
-        
-        // Execute the current chunk.
-        while exec.exec_next().is_ok() {
-        }
-
-        if exec.result().unwrap().error.is_some() {
-            let res = exec.result().unwrap();
-            println!("Exec errored in chunk {}", i);
-            return ExecuteInfo {
-                success: res.success,
-                error: res.error.clone(),
-                last_opcode: res.opcode,
-                final_stack: FmtStack(exec.stack().clone()),
-                remaining_script: exec.remaining_script().to_asm_string(),
-                stats: exec.stats().clone(),
-            }
-        };
-
-        chunk_stacks.push(exec.stack().len() + exec.altstack().len());
-        // Copy over the stack for next iteration.
-        // TODO: Take the stack snapshot at the end of the chunk logic (before the stack is hashed and
-        // then dropped) BUT AFTER THE ALSTACK IS MOVED TO STACK
-        next_stack = exec.stack().clone();
-        // TODO: altstack should be empty
-        // TODO: Next altstack is generated from the stack entries
-        next_altstack = exec.altstack().clone();
-        final_exec = Some(exec);
-    }
-    let final_exec = final_exec.unwrap_or_else(|| unreachable!());
-    let res = final_exec.result().unwrap();
-    writeln!(stats_file,
-        "intermediate stack transfer sizes: {:?}",
-        chunk_stacks[0..chunk_stacks.len() - 1].to_vec()
-    ).expect("Unable to write into stats_file");
-    ExecuteInfo {
-        success: res.success,
-        error: res.error.clone(),
-        last_opcode: res.opcode,
-        final_stack: FmtStack(final_exec.stack().clone()),
-        remaining_script: final_exec.remaining_script().to_asm_string(),
-        stats: final_exec.stats().clone(),
-    }
-}
-
-
-pub fn execute_script_as_chunks_vs_normal(
-    script: treepp::Script,
-    target_chunk_size: usize,
-    tolerance: usize,
-) -> ExecuteInfo {
-    let (chunk_sizes, scripts) = script
-        .clone()
-        .compile_to_chunks(target_chunk_size, tolerance);
-    let compiled_script = script.compile();
-    let mut total_script = vec![];
-    for script in &scripts {
-        total_script.extend(script.clone().into_bytes());
-    }
-    println!("chunk sizes: {:?}", chunk_sizes);
-    
-    for i in 0..min(compiled_script.len(), total_script.len()) {
-        assert_eq!(compiled_script.as_bytes()[i], total_script[i], "Incorrect at position {}: compiled: {} total: {}", i, compiled_script.as_bytes()[i], total_script[i]);
-    }
-    //assert!(
-    //    compiled_script.as_bytes() == total_script,
-    //    "Total chunk script is not same as compiled script {:?}, {:?}", compiled_script.len(), total_script.len()
-    //);
-
-    assert!(scripts.len() > 0, "No chunks to execute");
-    let num_chunks = scripts.len();
-    let mut scripts = scripts.into_iter();
-    let mut final_exec = None; // Only used to not initialize an obsolote Exec
-    let mut next_stack = Stack::new();
-    let mut next_altstack = Stack::new();
-    let mut chunk_stacks = vec![];
-    let mut compiled_exec = Exec::new(
-        ExecCtx::Tapscript,
-        Options::default(),
-        TxTemplate {
-            tx: Transaction {
-                version: bitcoin::transaction::Version::TWO,
-                lock_time: bitcoin::locktime::absolute::LockTime::ZERO,
-                input: vec![],
-                output: vec![],
-            },
-            prevouts: vec![],
-            input_idx: 0,
-            taproot_annex_scriptleaf: Some((TapLeafHash::all_zeros(), None)),
-        },
-        compiled_script,
-        vec![], // Note: If you put a witness here make sure to adjust
-                // Exec::with_stack() to not overwrite it!
-    )
-    .expect("Failed to create Exec");
-
-    // Execute each chunk and copy over the stacks
-    for i in 0..num_chunks {
-        // Note: Exec::with_stack() currently overwrites the witness!
-        let mut exec = Exec::with_stack(
-            ExecCtx::Tapscript,
-            Options::default(),
-            TxTemplate {
-                tx: Transaction {
-                    version: bitcoin::transaction::Version::TWO,
-                    lock_time: bitcoin::locktime::absolute::LockTime::ZERO,
-                    input: vec![],
-                    output: vec![],
-                },
-                prevouts: vec![],
-                input_idx: 0,
-                taproot_annex_scriptleaf: Some((TapLeafHash::all_zeros(), None)),
-            },
-            scripts.next().unwrap_or_else(|| unreachable!()),
-            vec![], // Note: If you put a witness here make sure to adjust
-            // Exec::with_stack() to not overwrite it!
-            next_stack.clone(),
-            next_altstack.clone(),
-        )
-        .expect("Failed to create Exec");
-
-        // Execute the current chunk.
-        while exec.exec_next().is_ok() {
-            // Execute the compiled script in parallel.
-            if compiled_exec.exec_next().is_err() {
-                println!("compiled_exec error: {:?}", compiled_exec.result());
-                panic!("Errored with compiled_exec");
-            }
-            assert_eq!(
-                exec.stack(),
-                compiled_exec.stack(),
-                "Stack not equal to compiled_exec {:?}\n{:?} \n -- in chunk: {}",
-                compiled_exec.stats(),
-                exec.stats(),
-                i
-            );
-            assert_eq!(
-                exec.altstack(),
-                compiled_exec.altstack(),
-                "Altstack not equal to compiled_exec {:?}\n{:?}",
-                compiled_exec.stats(),
-                exec.stats()
-            );
-        }
-
-        if exec.result().unwrap().error.is_some() {
-            let res = exec.result().unwrap();
-            println!("Exec errored in chunk {}", i);
-            println!(
-                "intermediate stack transfer sizes: {:?}",
-                chunk_stacks[0..chunk_stacks.len() - 1].to_vec()
-            );
-            return ExecuteInfo {
-                success: res.success,
-                error: res.error.clone(),
-                last_opcode: res.opcode,
-                final_stack: FmtStack(exec.stack().clone()),
-                remaining_script: exec.remaining_script().to_asm_string(),
-                stats: exec.stats().clone(),
-            }
-        };
-
-        chunk_stacks.push(exec.stack().len() + exec.altstack().len());
-        // Copy over the stack for next iteration.
-        next_stack = exec.stack().clone();
-        next_altstack = exec.altstack().clone();
-        final_exec = Some(exec);
-    }
-    let final_exec = final_exec.unwrap_or_else(|| unreachable!());
-    let res = final_exec.result().unwrap();
-    println!(
-        "intermediate stack transfer sizes: {:?}",
-        chunk_stacks[0..chunk_stacks.len() - 1].to_vec()
-    );
-    ExecuteInfo {
-        success: res.success,
-        error: res.error.clone(),
-        last_opcode: res.opcode,
-        final_stack: FmtStack(final_exec.stack().clone()),
-        remaining_script: final_exec.remaining_script().to_asm_string(),
-        stats: final_exec.stats().clone(),
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::bn254;
-    use crate::bn254::fp254impl::Fp254Impl;
-    use crate::execute_script_as_chunks;
-
-    use super::execute_script_without_stack_limit;
-    use super::treepp::*;
-
-    #[test]
-    fn test_script_debug() {
-        let script = script! {
-            OP_TRUE
-            DEBUG
-            OP_TRUE
-            OP_VERIFY
-        };
-        let exec_result = execute_script(script);
-        assert!(!exec_result.success);
-    }
-
-    #[test]
-    fn test_script_execute() {
-        let script = script! {
-            for i in 0..36 {
-                { 0x0babe123 + i }
-            }
-        };
-        let exec_result = execute_script(script);
-        // The width decides how many stack elements are printed per row
-        println!(
-            "{:width$}",
-            exec_result,
-            width = bn254::fq::Fq::N_LIMBS as usize
-        );
-        println!("{:4}", exec_result);
-        println!("{}", exec_result);
-        assert!(!exec_result.success);
-        assert_eq!(exec_result.error, None);
-    }
-
-    #[test]
-    fn test_execute_script_without_stack_limit() {
-        let script = script! {
-            for _ in 0..1001 {
-                OP_1
-            }
-            for _ in 0..1001 {
-                OP_DROP
-            }
-            OP_1
-        };
-        let exec_result = execute_script_without_stack_limit(script);
-        assert!(exec_result.success);
-    }
-
-    #[test]
-    fn test_execute_script_as_chunks() {
-        let sub_script = script! {
-            OP_1
-            OP_1
-        };
-        let sub_script_2 = script! {
-            OP_DROP
-            OP_DROP
-        };
-
-        let script = script! {
-            { sub_script.clone() }
-            { sub_script.clone() }
-            { sub_script.clone() }
-            { sub_script.clone() }
-            { sub_script_2.clone() }
-            { sub_script_2.clone() }
-            { sub_script_2.clone() }
-            { sub_script_2.clone() }
-            OP_1
-        };
-        let exec_result = execute_script_as_chunks(script, 2, 0);
-        println!("{:?}", exec_result);
-        assert!(exec_result.success);
-    }
-}
diff --git a/src/signatures/mod.rs b/src/signatures/mod.rs
deleted file mode 100644
index f26a72932..000000000
--- a/src/signatures/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod winternitz;
-pub mod winternitz_compact;
-pub mod winternitz_hash;
-
-
-
diff --git a/src/signatures/winternitz.rs b/src/signatures/winternitz.rs
deleted file mode 100644
index 1b060a8d4..000000000
--- a/src/signatures/winternitz.rs
+++ /dev/null
@@ -1,281 +0,0 @@
-//
-// Winternitz One-time Signatures
-//
-
-//
-// Winternitz signatures are an improved version of Lamport signatures.
-// A detailed introduction to Winternitz signatures can be found
-// in "A Graduate Course in Applied Cryptography" in chapter 14.3
-// https://toc.cryptobook.us/book.pdf
-//
-// We are trying to closely follow the authors' notation here.
-//
-
-//
-// BEAT OUR IMPLEMENTATION AND WIN A CODE GOLF BOUNTY!
-//
-
-use crate::treepp::*;
-use bitcoin::hashes::{hash160, Hash};
-use hex::decode as hex_decode;
-
-/// Bits per digit
-const LOG_D: u32 = 4;
-/// Digits are base d+1
-pub const D: u32 = (1 << LOG_D) - 1;
-/// Number of digits of the message
-const N0: u32 = 40;
-/// Number of digits of the checksum.  N1 = ⌈log_{D+1}(D*N0)⌉ + 1
-const N1: usize = 4;
-/// Total number of digits to be signed
-const N: u32 = N0 + N1 as u32;
-/// The public key type
-pub type PublicKey = [[u8; 20]; N as usize];
-
-//
-// Helper functions
-//
-
-/// Generate a public key for the i-th digit of the message
-pub fn public_key_for_digit(secret_key: &str, digit_index: u32) -> [u8; 20] {
-    // Convert secret_key from hex string to bytes
-    let mut secret_i = match hex_decode(secret_key) {
-        Ok(bytes) => bytes,
-        Err(_) => panic!("Invalid hex string"),
-    };
-
-    secret_i.push(digit_index as u8);
-
-    let mut hash = hash160::Hash::hash(&secret_i);
-
-    for _ in 0..D {
-        hash = hash160::Hash::hash(&hash[..]);
-    }
-
-    *hash.as_byte_array()
-}
-
-/// Generate a public key from a secret key 
-pub fn generate_public_key(secret_key: &str) -> PublicKey {
-    let mut public_key_array = [[0u8; 20]; N as usize];
-    for i in 0..N {
-        public_key_array[i as usize] = public_key_for_digit(secret_key, i);
-    }
-    public_key_array
-}
-
-/// Compute the signature for the i-th digit of the message
-pub fn digit_signature(secret_key: &str, digit_index: u32, message_digit: u8) -> Script {
-    // Convert secret_key from hex string to bytes
-    let mut secret_i = match hex_decode(secret_key) {
-        Ok(bytes) => bytes,
-        Err(_) => panic!("Invalid hex string"),
-    };
-
-    secret_i.push(digit_index as u8);
-
-    let mut hash = hash160::Hash::hash(&secret_i);
-
-    for _ in 0..message_digit {
-        hash = hash160::Hash::hash(&hash[..]);
-    }
-
-    let hash_bytes = hash.as_byte_array().to_vec();
-
-    script! {
-        { hash_bytes }
-        { message_digit }
-    }
-}
-
-/// Compute the checksum of the message's digits.
-/// Further infos in chapter "A domination free function for Winternitz signatures"
-pub fn checksum(digits: [u8; N0 as usize]) -> u32 {
-    let mut sum = 0;
-    for digit in digits {
-        sum += digit as u32;
-    }
-    D * N0 - sum
-}
-
-/// Convert a number to digits
-pub fn to_digits<const DIGIT_COUNT: usize>(mut number: u32) -> [u8; DIGIT_COUNT] {
-    let mut digits: [u8; DIGIT_COUNT] = [0; DIGIT_COUNT];
-    for i in 0..DIGIT_COUNT {
-        let digit = number % (D + 1);
-        number = (number - digit) / (D + 1);
-        digits[i] = digit as u8;
-    }
-    digits
-}
-
-
-
-/// Compute the signature for a given message
-pub fn sign_digits(secret_key: &str, message_digits: [u8; N0 as usize]) -> Script {
-    // const message_digits = to_digits(message, n0)
-    let mut checksum_digits = to_digits::<N1>(checksum(message_digits)).to_vec();
-    checksum_digits.append(&mut message_digits.to_vec());
-
-    script! {
-        for i in 0..N {
-            { digit_signature(secret_key, i, checksum_digits[ (N-1-i) as usize]) }
-        }
-    }
-}
-
-pub fn sign(secret_key: &str, message_bytes: &[u8]) -> Script {
-    // Convert message to digits
-    let mut message_digits = [0u8; 20 * 2 as usize];
-    for (digits, byte) in message_digits.chunks_mut(2).zip(message_bytes) {
-        digits[0] = byte & 0b00001111;
-        digits[1] = byte >> 4;
-    }
-
-    sign_digits(secret_key, message_digits)
-}
-
-pub fn checksig_verify(public_key: &PublicKey) -> Script {
-    script! {
-        //
-        // Verify the hash chain for each digit
-        //
-
-        // Repeat this for every of the n many digits
-        for digit_index in 0..N {
-            // Verify that the digit is in the range [0, d]
-            // See https://github.com/BitVM/BitVM/issues/35
-            { D }
-            OP_MIN
-
-            // Push two copies of the digit onto the altstack
-            OP_DUP
-            OP_TOALTSTACK
-            OP_TOALTSTACK
-
-            // Hash the input hash d times and put every result on the stack
-            for _ in 0..D {
-                OP_DUP OP_HASH160
-            }
-
-            // Verify the signature for this digit
-            OP_FROMALTSTACK
-            OP_PICK
-            { public_key[N as usize - 1 - digit_index as usize].to_vec() }
-            OP_EQUALVERIFY
-
-            // Drop the d+1 stack items
-            for _ in 0..(D+1)/2 {
-                OP_2DROP
-            }
-        }
-
-        //
-        // Verify the Checksum
-        //
-
-        // 1. Compute the checksum of the message's digits
-        OP_FROMALTSTACK OP_DUP OP_NEGATE
-        for _ in 1..N0 {
-            OP_FROMALTSTACK OP_TUCK OP_SUB
-        }
-        { D * N0 }
-        OP_ADD
-
-
-        // 2. Sum up the signed checksum's digits
-        OP_FROMALTSTACK
-        for _ in 0..N1 - 1 {
-            for _ in 0..LOG_D {
-                OP_DUP OP_ADD
-            }
-            OP_FROMALTSTACK
-            OP_ADD
-        }
-
-        // 3. Ensure both checksums are equal
-        OP_EQUALVERIFY
-
-
-        // Convert the message's digits to bytes
-        for i in 0..N0 / 2 {
-            OP_SWAP
-            for _ in 0..LOG_D {
-                OP_DUP OP_ADD
-            }
-            OP_ADD
-            // Push all bytes to the altstack, except for the last byte
-            if i != (N0/2) - 1 {
-                OP_TOALTSTACK
-            }
-        }
-        // Read the bytes from the altstack
-        for _ in 0..N0 / 2 - 1{
-            OP_FROMALTSTACK
-        }
-
-    }
-}
-
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    // The secret key
-    const MY_SECKEY: &str = "b138982ce17ac813d505b5b40b665d404e9528e7";
-
-
-    #[test]
-    fn test_winternitz() {
-        // The message to sign
-        #[rustfmt::skip]
-        const MESSAGE: [u8; N0 as usize] = [
-            1, 2, 3, 4, 5, 6, 7, 8, 9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 7, 7, 7, 7, 7,
-            1, 2, 3, 4, 5, 6, 7, 8, 9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 7, 7, 7, 7, 7,
-        ];
-
-        let public_key = generate_public_key(MY_SECKEY);
-
-        let script = script! {
-            { sign_digits(MY_SECKEY, MESSAGE) }
-            { checksig_verify(&public_key) }
-        };
-
-        println!(
-            "Winternitz signature size:\n \t{:?} bytes / {:?} bits \n\t{:?} bytes / bit",
-            script.len(),
-            N0 * 4,
-            script.len() as f64 / (N0 * 4) as f64
-        );
-
-        run(script! {
-            { sign_digits(MY_SECKEY, MESSAGE) }
-            { checksig_verify(&public_key) }
-
-            0x21 OP_EQUALVERIFY
-            0x43 OP_EQUALVERIFY
-            0x65 OP_EQUALVERIFY
-            0x87 OP_EQUALVERIFY
-            0xA9 OP_EQUALVERIFY
-            0xCB OP_EQUALVERIFY
-            0xED OP_EQUALVERIFY
-            0x7F OP_EQUALVERIFY
-            0x77 OP_EQUALVERIFY
-            0x77 OP_EQUALVERIFY
-
-            0x21 OP_EQUALVERIFY
-            0x43 OP_EQUALVERIFY
-            0x65 OP_EQUALVERIFY
-            0x87 OP_EQUALVERIFY
-            0xA9 OP_EQUALVERIFY
-            0xCB OP_EQUALVERIFY
-            0xED OP_EQUALVERIFY
-            0x7F OP_EQUALVERIFY
-            0x77 OP_EQUALVERIFY
-            0x77 OP_EQUAL
-        });
-    }
-
-    // TODO: test the error cases: negative digits, digits > D, ...
-}
\ No newline at end of file
diff --git a/src/signatures/winternitz_compact.rs b/src/signatures/winternitz_compact.rs
deleted file mode 100644
index 12fa1e01a..000000000
--- a/src/signatures/winternitz_compact.rs
+++ /dev/null
@@ -1,300 +0,0 @@
-//
-// Compact Winternitz Signatures
-//
-// In this variant, the user doesn't need to provide the message in the unlocking script.
-// Instead, we calculate the message from the signature hashes.
-// This reduces stack usage at the expense of script size.
-//
-
-//
-// Winternitz signatures are an improved version of Lamport signatures.
-// A detailed introduction to Winternitz signatures can be found
-// in "A Graduate Course in Applied Cryptography" in chapter 14.3
-// https://toc.cryptobook.us/book.pdf
-//
-// We are trying to closely follow the authors' notation here.
-//
-
-//
-// BEAT OUR IMPLEMENTATION AND WIN A CODE GOLF BOUNTY!
-//
-
-use crate::treepp::*;
-use bitcoin::hashes::{hash160, Hash};
-use hex::decode as hex_decode;
-
-/// Bits per digit
-const LOG_D: u32 = 4;
-/// Digits are base d+1
-pub const D: u32 = (1 << LOG_D) - 1;
-/// Number of digits of the message
-const N0: u32 = 80;
-/// Number of digits of the checksum
-const N1: usize = 4;
-/// Total number of digits to be signed
-const N: u32 = N0 + N1 as u32;
-
-//
-// Helper functions
-//
-
-/// Generate the public key for the i-th digit of the message
-pub fn public_key(secret_key: &str, digit_index: u32) -> Script {
-    // Convert secret_key from hex string to bytes
-    let mut secret_i = match hex_decode(secret_key) {
-        Ok(bytes) => bytes,
-        Err(_) => panic!("Invalid hex string"),
-    };
-
-    secret_i.push(digit_index as u8);
-
-    let mut hash = hash160::Hash::hash(&secret_i);
-
-    for _ in 0..D {
-        hash = hash160::Hash::hash(&hash[..]);
-    }
-
-    let hash_bytes = hash.as_byte_array().to_vec();
-
-    script! {
-        { hash_bytes }
-    }
-}
-
-/// Compute the signature for the i-th digit of the message
-pub fn digit_signature(secret_key: &str, digit_index: u32, message_digit: u8) -> Script {
-    // Convert secret_key from hex string to bytes
-    let mut secret_i = match hex_decode(secret_key) {
-        Ok(bytes) => bytes,
-        Err(_) => panic!("Invalid hex string"),
-    };
-
-    secret_i.push(digit_index as u8);
-
-    let mut hash = hash160::Hash::hash(&secret_i);
-
-    for _ in 0..message_digit {
-        hash = hash160::Hash::hash(&hash[..]);
-    }
-
-    let hash_bytes = hash.as_byte_array().to_vec();
-
-    script! {
-        { hash_bytes }
-    }
-}
-
-/// Compute the checksum of the message's digits.
-/// Further infos in chapter "A domination free function for Winternitz signatures"
-pub fn checksum(digits: [u8; N0 as usize]) -> u32 {
-    let mut sum = 0;
-    for digit in digits {
-        sum += digit as u32;
-    }
-    D * N0 - sum
-}
-
-/// Convert a number to digits
-pub fn to_digits<const DIGIT_COUNT: usize>(mut number: u32) -> [u8; DIGIT_COUNT] {
-    let mut digits: [u8; DIGIT_COUNT] = [0; DIGIT_COUNT];
-    for i in 0..DIGIT_COUNT {
-        let digit = number % (D + 1);
-        number = (number - digit) / (D + 1);
-        digits[i] = digit as u8;
-    }
-    digits
-}
-
-/// Compute the signature for a given message
-pub fn sign(secret_key: &str, message_digits: [u8; N0 as usize]) -> Script {
-    // const message_digits = to_digits(message, n0)
-    let mut checksum_digits = to_digits::<N1>(checksum(message_digits)).to_vec();
-    checksum_digits.append(&mut message_digits.to_vec());
-
-    script! {
-        for i in 0..N {
-            { digit_signature(secret_key, i, checksum_digits[ (N-1-i) as usize]) }
-        }
-    }
-}
-
-/// Winternitz Signature verification
-///
-/// Note that the script inputs are malleable.
-///
-/// Optimized by @SergioDemianLerner, @tomkosm
-pub fn checksig_verify(secret_key: &str) -> Script {
-    script! {
-        //
-        // Verify the hash chain for each digit
-        //
-
-        // Repeat this for every of the n many digits
-        for digit_index in 0..N {
-
-            { public_key(secret_key, N - 1 - digit_index) }
-
-
-            // Check if hash is equal with public key and add digit to altstack.
-            // We dont check if a digit was found to save space, incase we have an invalid hash
-            // there will be one fewer entry in altstack and OP_FROMALTSTACK later will crash.
-            // So its important to start with the altstack empty.
-            // TODO: add testcase for this.
-            OP_SWAP
-
-            OP_2DUP
-            OP_EQUAL
-
-            OP_IF
-
-                {D}
-
-                OP_TOALTSTACK
-
-            OP_ENDIF
-
-            for i in 0..D {
-
-                OP_HASH160
-
-                OP_2DUP
-
-                OP_EQUAL
-
-                OP_IF
-
-                    {D-i-1}
-
-                    OP_TOALTSTACK
-
-                OP_ENDIF
-            }
-
-            OP_2DROP
-        }
-
-
-        // 1. Compute the checksum of the message's digits
-        OP_FROMALTSTACK OP_DUP OP_NEGATE
-        for _ in 1..N0{
-            OP_FROMALTSTACK OP_TUCK OP_SUB
-        }
-        { D * N0 }
-        OP_ADD
-
-
-        // 2. Sum up the signed checksum's digits
-        OP_FROMALTSTACK
-        for _ in 0..N1 - 1 {
-            for _ in 0..LOG_D {
-                OP_DUP OP_ADD
-            }
-            OP_FROMALTSTACK
-            OP_ADD
-        }
-
-        // 3. Ensure both checksums are equal
-        OP_EQUALVERIFY
-
-
-        // Convert the message's digits to bytes
-        for i in 0..N0 / 2 {
-            OP_SWAP
-            for _ in 0..LOG_D {
-                OP_DUP OP_ADD
-            }
-            OP_ADD
-            // Push all bytes to the altstack, except for the last byte
-            if i != (N0/2) - 1 {
-                OP_TOALTSTACK
-            }
-        }
-        for _ in 0..N0 / 2 - 1 {
-            OP_FROMALTSTACK
-        }
-
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    // The secret key
-    const MY_SECKEY: &str = "b138982ce17ac813d505b5b40b665d404e9528e7";
-
-    #[test]
-    fn test_winternitz() {
-        // The message to sign
-        #[rustfmt::skip]
-        const MESSAGE: [u8; N0 as usize] = [
-            1, 2, 3, 4, 5, 6, 7, 8, 9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 7, 7, 7, 7, 7,
-            1, 2, 3, 4, 5, 6, 7, 8, 9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 7, 7, 7, 7, 7,
-            1, 2, 3, 4, 5, 6, 7, 8, 9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 7, 7, 7, 7, 7,
-            1, 2, 3, 4, 5, 6, 7, 8, 9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 7, 7, 7, 7, 7,
-        ];
-        let script = script! {
-            { sign(MY_SECKEY, MESSAGE) }
-            { checksig_verify(MY_SECKEY) }
-        };
-
-        println!(
-            "Winternitz signature size:\n \t{:?} bytes / {:?} bits \n\t{:?} bytes / bit",
-            script.len(),
-            N0 * 4,
-            script.len() as f64 / (N0 * 4) as f64
-        );
-
-        run(script! {
-            { sign(MY_SECKEY, MESSAGE) }
-            { checksig_verify(MY_SECKEY) }
-
-            0x21 OP_EQUALVERIFY
-            0x43 OP_EQUALVERIFY
-            0x65 OP_EQUALVERIFY
-            0x87 OP_EQUALVERIFY
-            0xA9 OP_EQUALVERIFY
-            0xCB OP_EQUALVERIFY
-            0xED OP_EQUALVERIFY
-            0x7F OP_EQUALVERIFY
-            0x77 OP_EQUALVERIFY
-            0x77 OP_EQUALVERIFY
-
-            0x21 OP_EQUALVERIFY
-            0x43 OP_EQUALVERIFY
-            0x65 OP_EQUALVERIFY
-            0x87 OP_EQUALVERIFY
-            0xA9 OP_EQUALVERIFY
-            0xCB OP_EQUALVERIFY
-            0xED OP_EQUALVERIFY
-            0x7F OP_EQUALVERIFY
-            0x77 OP_EQUALVERIFY
-            0x77 OP_EQUALVERIFY
-
-            0x21 OP_EQUALVERIFY
-            0x43 OP_EQUALVERIFY
-            0x65 OP_EQUALVERIFY
-            0x87 OP_EQUALVERIFY
-            0xA9 OP_EQUALVERIFY
-            0xCB OP_EQUALVERIFY
-            0xED OP_EQUALVERIFY
-            0x7F OP_EQUALVERIFY
-            0x77 OP_EQUALVERIFY
-            0x77 OP_EQUALVERIFY
-
-            0x21 OP_EQUALVERIFY
-            0x43 OP_EQUALVERIFY
-            0x65 OP_EQUALVERIFY
-            0x87 OP_EQUALVERIFY
-            0xA9 OP_EQUALVERIFY
-            0xCB OP_EQUALVERIFY
-            0xED OP_EQUALVERIFY
-            0x7F OP_EQUALVERIFY
-            0x77 OP_EQUALVERIFY
-            0x77 OP_EQUAL
-        });
-
-    }
-
-    // TODO: test the error cases: negative digits, digits > D, ...
-}
diff --git a/src/signatures/winternitz_hash.rs b/src/signatures/winternitz_hash.rs
deleted file mode 100644
index 6d0cdc7c6..000000000
--- a/src/signatures/winternitz_hash.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use crate::treepp::*;
-use crate::signatures::winternitz::{sign, checksig_verify, generate_public_key, PublicKey
-};
-use crate::hash::blake3::blake3_160_var_length;
-use blake3::hash;
-
-const MESSAGE_HASH_LEN: u8 = 20;
-
-
-/// Verify a Winternitz signature for the hash of the top `input_len` many bytes on the stack
-/// The hash function is blake3 with a 20-byte digest size
-/// Fails if the signature is invalid
-pub fn check_hash_sig(public_key: &PublicKey, input_len: usize) -> Script {
-    script! {
-        // 1. Verify the signature and compute the signed message
-        { checksig_verify(&public_key) }
-        for _ in 0..MESSAGE_HASH_LEN {
-            OP_TOALTSTACK
-        }
-
-        // 2. Hash the inputs
-        { blake3_160_var_length(input_len) }
-
-        // 3. Compare signed message to the hash
-        for _ in 0..MESSAGE_HASH_LEN / 4 {
-            for j in 0..4 {
-                { 3 - j }
-                OP_ROLL
-                OP_FROMALTSTACK
-                OP_EQUALVERIFY
-            }
-        }
-    }
-}
-
-/// Create a Winternitz signature for the blake3 hash of a given message
-pub fn sign_hash(sec_key: &str, message: &[u8]) -> Script {
-    let message_hash = hash(message);
-    let message_hash_bytes = &message_hash.as_bytes()[0..20];
-    script! {
-        { sign(sec_key, message_hash_bytes) }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_check_hash_sig() {
-
-        // My secret key 
-        let my_sec_key = "b138982ce17ac813d505b5b40b665d404e9528e7";
-        
-        // My public key
-        let public_key = generate_public_key(my_sec_key);
-
-        // The message to sign
-        let message = *b"This is an arbitrary length input intended for testing purposes....";
-
-
-        run(script! {
-            //
-            // Unlocking Script
-            //
-
-            // 1. Push the message 
-            for byte in message.iter().rev() {
-                { *byte }
-            }
-            // 2. Push the signature
-            { sign_hash(my_sec_key, &message) }
-            
-            
-            //
-            // Locking Script
-            //
-            { check_hash_sig(&public_key, message.len()) }
-            OP_TRUE
-        });   
-    }
-
-}
\ No newline at end of file
diff --git a/src/u32/u32_add.rs b/src/u32/u32_add.rs
deleted file mode 100644
index df6bf39a1..000000000
--- a/src/u32/u32_add.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-use crate::treepp::{script, Script};
-use crate::u32::u32_zip::{u32_copy_zip, u32_zip};
-
-pub fn u8_add_carry() -> Script {
-    script! {
-        OP_ADD
-        OP_DUP
-        255
-        OP_GREATERTHAN
-        OP_IF
-            256
-            OP_SUB
-            1
-        OP_ELSE
-            0
-        OP_ENDIF
-    }
-}
-
-pub fn u8_add() -> Script {
-    script! {
-        OP_ADD
-        OP_DUP
-        255
-        OP_GREATERTHAN
-        OP_IF
-            256
-            OP_SUB
-        OP_ENDIF
-    }
-}
-
-/// Addition of two u32 values represented as u8
-/// Copies the first summand `a` and drops `b`
-pub fn u32_add(a: u32, b: u32) -> Script {
-    assert_ne!(a, b);
-    script! {
-        {u32_copy_zip(a, b)}
-
-        // A0 + B0
-        u8_add_carry
-        OP_SWAP
-        OP_TOALTSTACK
-
-        // A1 + B1 + carry_0
-        OP_ADD
-        u8_add_carry
-        OP_SWAP
-        OP_TOALTSTACK
-
-        // A2 + B2 + carry_1
-        OP_ADD
-        u8_add_carry
-        OP_SWAP
-        OP_TOALTSTACK
-
-        // A3 + B3 + carry_2
-        OP_ADD
-        u8_add
-
-        OP_FROMALTSTACK
-        OP_FROMALTSTACK
-        OP_FROMALTSTACK
-
-        // Now there's the result C_3 C_2 C_1 C_0 on the stack
-    }
-}
-
-/// Addition of two u32 values represented as u8
-/// Drops both summands `a` and `b`
-pub fn u32_add_drop(a: u32, b: u32) -> Script {
-    assert_ne!(a, b);
-    script! {
-        {u32_zip(a, b)}
-
-        // A0 + B0
-        u8_add_carry
-        OP_SWAP
-        OP_TOALTSTACK
-
-        // A1 + B1 + carry_0
-        OP_ADD
-        u8_add_carry
-        OP_SWAP
-        OP_TOALTSTACK
-
-        // A2 + B2 + carry_1
-        OP_ADD
-        u8_add_carry
-        OP_SWAP
-        OP_TOALTSTACK
-
-        // A3 + B3 + carry_2
-        OP_ADD
-        u8_add
-
-        OP_FROMALTSTACK
-        OP_FROMALTSTACK
-        OP_FROMALTSTACK
-
-        // Now there's the result C_3 C_2 C_1 C_0 on the stack
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::treepp::{execute_script, script};
-    use crate::u32::u32_add::*;
-    use crate::u32::u32_std::u32_push;
-
-    #[test]
-    fn test_u32_add() {
-        let u32_value_a = 0xFFEEFFEEu32;
-        let u32_value_b = 0xEEFFEEFFu32;
-
-        let script = script! {
-            { u32_push(u32_value_a) }
-            { u32_push(u32_value_b) }
-            { u32_add_drop(1, 0) }
-            0xed OP_EQUALVERIFY
-            0xee OP_EQUALVERIFY
-            0xee OP_EQUALVERIFY
-            0xee OP_EQUAL
-        };
-        let exec_result = execute_script(script);
-        assert!(exec_result.success)
-    }
-}
diff --git a/src/u32/u32_or.rs b/src/u32/u32_or.rs
deleted file mode 100644
index 898e52110..000000000
--- a/src/u32/u32_or.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-#![allow(dead_code)]
-
-use crate::treepp::{script, Script};
-use crate::u32::u32_zip::u32_copy_zip;
-
-/// Bitwise OR of two u8 elements.
-/// Expects the u8_xor_table to be on the stack.
-///
-pub fn u8_or(i: u32) -> Script {
-    script! {
-        // f_A = f(A)
-        OP_DUP
-        {i}
-        OP_ADD
-        OP_PICK
-
-        // A_even = f_A << 1
-        OP_DUP
-        OP_DUP
-        OP_ADD
-
-        // A_odd = A - A_even
-        OP_ROT
-        OP_SWAP
-        OP_SUB
-
-        // f_B = f(B)
-        OP_ROT
-        OP_DUP
-        {i + 1}
-        OP_ADD
-        OP_PICK
-
-        // B_even = f_B << 1
-        OP_DUP
-        OP_DUP
-        OP_ADD
-
-        // B_odd = B - B_even
-        OP_ROT
-        OP_SWAP
-        OP_SUB
-
-        // A_andxor_B_even = f_A + f_B
-        OP_SWAP
-        3
-        OP_ROLL
-        OP_ADD
-
-        // A_and_B_even = f(A_andxor_B_even)
-        OP_DUP
-        {i + 1}
-        OP_ADD
-        OP_PICK
-        OP_SUB
-
-        // A_andxor_B_odd = A_odd + B_odd
-        OP_SWAP
-        OP_ROT
-        OP_ADD
-
-        // A_and_B_odd = f(A_andxor_B_odd)
-        OP_DUP
-        {i}
-        OP_ADD
-        OP_PICK
-        OP_SUB
-
-        // A_and_B = A_and_B_odd + (A_and_B_even << 1)
-        OP_OVER
-        OP_ADD
-        OP_ADD
-    }
-}
-
-/// Bitwise OR of two u32 elements.
-/// Expects the u8_xor_table to be on the stack
-pub fn u32_or(a: u32, b: u32, stack_size: u32) -> Script {
-    assert_ne!(a, b);
-
-    script! {
-        {u32_copy_zip(a, b)}
-
-        {u8_or(8 + (stack_size - 2) * 4)}
-
-        OP_TOALTSTACK
-
-        {u8_or(6 + (stack_size - 2) * 4)}
-
-        OP_TOALTSTACK
-
-        {u8_or(4 + (stack_size - 2) * 4)}
-
-        OP_TOALTSTACK
-
-        {u8_or(2 + (stack_size - 2) * 4)}
-
-
-        OP_FROMALTSTACK
-        OP_FROMALTSTACK
-        OP_FROMALTSTACK
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::treepp::{execute_script, script};
-    use crate::u32::u32_or::*;
-    use crate::u32::u32_std::*;
-    use crate::u32::u32_xor::{u8_drop_xor_table, u8_push_xor_table};
-    use rand::Rng;
-
-    fn or(x: u32, y: u32) -> u32 { x | y }
-
-    #[test]
-    fn test_or() {
-        println!("u32 or: {} bytes", u32_or(0, 1, 3).len());
-        for _ in 0..100 {
-            let mut rng = rand::thread_rng();
-            let x: u32 = rng.gen();
-            let y: u32 = rng.gen();
-            let exec_script = script! {
-                {u8_push_xor_table()}
-                {u32_push(x)}
-                {u32_push(y)}
-                {u32_or(0, 1, 3)}
-                {u32_push(or(x, y))}
-                {u32_equal()}
-                OP_TOALTSTACK
-                {u32_drop()} // drop y
-                {u8_drop_xor_table()}
-                OP_FROMALTSTACK
-            };
-            let res = execute_script(exec_script);
-            assert!(res.success);
-        }
-    }
-}
diff --git a/src/u32/u32_rshift.rs b/src/u32/u32_rshift.rs
deleted file mode 100644
index 37482c306..000000000
--- a/src/u32/u32_rshift.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-#![allow(dead_code)]
-
-use crate::{
-    treepp::{script, Script},
-    u32::u32_rrot::u8_extract_hbit,
-};
-use core::panic;
-
-pub fn post_process(offset: usize) -> Script {
-    assert!(offset < 4);
-    let res: Script = match offset {
-        0 => script! {
-            OP_FROMALTSTACK //[c+cD]
-            OP_FROMALTSTACK //[c+cD, b+bC]
-            OP_FROMALTSTACK //[c+cD, b+bC, a+cB]
-            OP_FROMALTSTACK //[c+cD, b+bC, a+cB, cA]
-            OP_SWAP         //[c+cD, b+bC, cA, a+cB]
-            OP_2SWAP        //[cA, a+cB, c+cD, b+bC]
-            OP_SWAP         //[cA, a+cB, b+bC, c+cD]
-        },
-        1 => script! {
-            OP_FROMALTSTACK // [c+cD]
-            OP_DROP         // []
-            0               // [0]
-            OP_FROMALTSTACK // [0,b+bC]
-            OP_FROMALTSTACK // [0,b+bC,a+cB]
-            OP_FROMALTSTACK // [0,b+bC,a+cB,cA]
-            OP_SWAP         // [0,b+bC,cA,a+cB]
-            OP_ROT          // [0,cA,a+cB,b+bC]
-        },
-        2 => script! {
-            OP_FROMALTSTACK // [c+cD]
-            OP_DROP         // []
-            0               // [0]
-            OP_FROMALTSTACK // [0,b+bC]
-            OP_DROP         // [0]
-            0               // [0, 0]
-            OP_FROMALTSTACK // [0,0,a+cB]
-            OP_FROMALTSTACK // [0,0,a+cB,cA]
-            OP_SWAP         // [0,0,cA,a+cB]
-        },
-        3 => script! {
-            OP_FROMALTSTACK // [c+cD]
-            OP_DROP         // []
-            0               // [0]
-            OP_FROMALTSTACK // [0,b+bC]
-            OP_DROP         // [0]
-            0               // [0, 0]
-            OP_FROMALTSTACK // [0,0,a+cB]
-            OP_DROP         // [0,0]
-            0               // [0,0,0]
-            OP_FROMALTSTACK // [0,0,0,cA]
-        },
-        _ => panic!("offset out of range"),
-    };
-    res
-}
-pub fn specific_optimize_rshift(shift_num: usize) -> Option<Script> {
-    let res: Option<Script> = match shift_num {
-        0 => script! {}.into(),
-        8 => script! {  // [a, b, c, d]
-            OP_DROP        //[a, b, c]
-            0              //[a, b, c, 0]
-            3 OP_ROLL      //[b, c, 0, a]
-            3 OP_ROLL      //[c, 0, a, b]
-            3 OP_ROLL      //[0, c, a, b]
-
-        }
-        .into(),
-        16 => script! {
-            OP_DROP         //[a, b, c]
-            OP_DROP         //[a, b]
-            0               //[a, b, 0]
-            0               //[a, b, 0, 0]
-            OP_2SWAP        //[0, 0, a, b]
-        }
-        .into(),
-        24 => script! {
-            OP_DROP         //[a, b, c]
-            OP_DROP         //[a, b]
-            OP_DROP         //[a]
-            0               //[a, 0]
-            0               //[a, 0, 0]
-            0               //[a, 0, 0, 0]
-            3 OP_ROLL       //[0, 0, 0, a]
-        }
-        .into(),
-        _ => None,
-    };
-    res
-}
-pub fn u32_rshift(shift_num: usize) -> Script {
-    assert!(shift_num < 32);
-    if let Some(res) = specific_optimize_rshift(shift_num) { return res }
-    let remainder: usize = shift_num % 8;
-
-    let hbit: usize = 8 - remainder;
-    let offset: usize = (shift_num - remainder) / 8;
-
-    script! {
-        {u8_extract_hbit(hbit)} //[A, B, C, d, carryD]
-        OP_ROT {u8_extract_hbit(hbit)} //[A, B, d, carryD, c, carryC]
-        4 OP_ROLL {u8_extract_hbit(hbit)} //[A, d, carryD, c, carryC, b, carryB]
-        6 OP_ROLL {u8_extract_hbit(hbit)} //[d, carryD, c, carryC, b, carryB, a, carryA]
-
-        OP_TOALTSTACK // carryA
-
-        OP_ADD
-        OP_TOALTSTACK // a+carryB
-
-        OP_ADD
-        OP_TOALTSTACK // b+carryC
-
-        OP_ADD
-        OP_TOALTSTACK // c+carryD
-
-        OP_DROP
-
-        {post_process(offset)}
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::treepp::{execute_script, script};
-    use crate::u32::u32_rshift::*;
-    use crate::u32::u32_std::*;
-    use rand::Rng;
-
-    fn rshift(x: u32, n: usize) -> u32 {
-        if n == 0 {
-            return x;
-        }
-        x >> n
-    }
-
-    #[test]
-    fn test_rshift() {
-        for _ in 0..10000 {
-            let mut rng = rand::thread_rng();
-            let x: u32 = rng.gen();
-            for i in 0..32 {
-                let exec_script = script! {
-                    {u32_push(x)}
-                    {u32_rshift(i)}
-                    {u32_push(rshift(x, i))}
-                    {u32_equal()}
-                };
-                let res = execute_script(exec_script);
-                assert!(res.success);
-            }
-        }
-    }
-}
diff --git a/src/u32/u32_std.rs b/src/u32/u32_std.rs
deleted file mode 100644
index 5431cf01d..000000000
--- a/src/u32/u32_std.rs
+++ /dev/null
@@ -1,215 +0,0 @@
-#![allow(dead_code)]
-
-use crate::pseudo::{push_to_stack, OP_256MUL, OP_4DUP};
-
-use crate::treepp::{script, Script};
-
-/// Pushes a value as u32 element onto the stack
-pub fn u32_push(value: u32) -> Script {
-    script! {
-        //optimization
-        if (value >> 24 & 0xff) == (value >> 16 & 0xff) &&
-            (value >> 24 & 0xff) == (value >> 8 & 0xff) &&
-            (value >> 24 & 0xff) == (value & 0xff) {
-
-                { push_to_stack((value >> 24 & 0xff) as usize,4) }
-        }
-        else{
-
-                {value >> 24 & 0xff}
-                {value >> 16 & 0xff}
-                {value >>  8 & 0xff}
-                {value & 0xff}
-        }
-    }
-}
-
-/// Marks transaction as invalid if the top two stack value are not equal
-pub fn u32_equalverify() -> Script {
-    script! {
-        4
-        OP_ROLL
-        OP_EQUALVERIFY
-        3
-        OP_ROLL
-        OP_EQUALVERIFY
-        OP_ROT
-        OP_EQUALVERIFY
-        OP_EQUALVERIFY
-    }
-}
-/// Returns 1 if the top two u32 are equal, 0 otherwise
-pub fn u32_equal() -> Script {
-    script! {
-        4
-        OP_ROLL
-        OP_EQUAL OP_TOALTSTACK
-        3
-        OP_ROLL
-        OP_EQUAL OP_TOALTSTACK
-        OP_ROT
-        OP_EQUAL OP_TOALTSTACK
-        OP_EQUAL
-        OP_FROMALTSTACK OP_BOOLAND
-        OP_FROMALTSTACK OP_BOOLAND
-        OP_FROMALTSTACK OP_BOOLAND
-    }
-}
-
-/// Returns 1 if the top two u32 are not equal, 0 otherwise
-pub fn u32_notequal() -> Script {
-    script! {
-        4
-        OP_ROLL
-        OP_NUMNOTEQUAL OP_TOALTSTACK
-        3
-        OP_ROLL
-        OP_NUMNOTEQUAL OP_TOALTSTACK
-        OP_ROT
-        OP_NUMNOTEQUAL OP_TOALTSTACK
-        OP_NUMNOTEQUAL
-        OP_FROMALTSTACK OP_BOOLOR
-        OP_FROMALTSTACK OP_BOOLOR
-        OP_FROMALTSTACK OP_BOOLOR
-    }
-}
-
-/// Puts the top u32 element onto the top of the alt stack. Removes it from the main stack.
-pub fn u32_toaltstack() -> Script {
-    script! {
-        OP_TOALTSTACK
-        OP_TOALTSTACK
-        OP_TOALTSTACK
-        OP_TOALTSTACK
-    }
-}
-
-/// Puts the top u32 element of the alt stack onto the top of the main stack. Removes it from the alt stack.
-pub fn u32_fromaltstack() -> Script {
-    script! {
-        OP_FROMALTSTACK
-        OP_FROMALTSTACK
-        OP_FROMALTSTACK
-        OP_FROMALTSTACK
-    }
-}
-
-/// Duplicates the top u32 stack element
-pub fn u32_dup() -> Script {
-    script! { OP_4DUP }
-}
-
-/// Removes the top u32 element from the stack.
-pub fn u32_drop() -> Script {
-    script! {
-        OP_2DROP
-        OP_2DROP
-    }
-}
-
-/// The u32 element n back in the stack is moved to the top.
-pub fn u32_roll(n: u32) -> Script {
-    let n = (n + 1) * 4 - 1;
-    script! {
-        {n} OP_ROLL
-        {n} OP_ROLL
-        {n} OP_ROLL
-        {n} OP_ROLL
-    }
-}
-
-/// The u32 element n back in the stack is copied to the top.
-pub fn u32_pick(n: u32) -> Script {
-    let n = (n + 1) * 4 - 1;
-    script! {
-        {n} OP_PICK
-        {n} OP_PICK
-        {n} OP_PICK
-        {n} OP_PICK
-    }
-}
-
-/// The top u32 element is compressed into a single 4-byte word
-pub fn u32_compress() -> Script {
-    script! {
-        OP_SWAP
-        OP_ROT
-        3
-        OP_ROLL
-        OP_DUP
-        127
-        OP_GREATERTHAN
-        OP_IF
-            128
-            OP_SUB
-            1
-        OP_ELSE
-            0
-        OP_ENDIF
-        OP_TOALTSTACK
-        OP_256MUL
-        OP_ADD
-        OP_256MUL
-        OP_ADD
-        OP_256MUL
-        OP_ADD
-        OP_FROMALTSTACK
-        OP_IF
-            OP_NEGATE
-        OP_ENDIF
-    }
-}
-
-#[cfg(test)]
-mod test {
-
-    use crate::treepp::{execute_script, script};
-    use crate::u32::u32_std::*;
-    use rand::Rng;
-
-    #[test]
-    fn test_u32_push() {
-        let script = script! {
-            { u32_push(0x01020304) }
-            0x04
-            OP_EQUALVERIFY
-            0x03
-            OP_EQUALVERIFY
-            0x02
-            OP_EQUALVERIFY
-            0x01
-            OP_EQUAL
-        };
-
-        assert!(execute_script(script).success)
-    }
-
-    #[test]
-    fn test_with_u32_compress() {
-        let mut rng = rand::thread_rng();
-
-        for _ in 0..30 {
-            let mut origin_value0: u32 = rng.gen();
-            origin_value0 = (origin_value0 % 1) << 31;
-            let mut origin_value1: u32 = rng.gen();
-            origin_value1 = (origin_value1 % 1) << 31;
-
-            let v = origin_value0 + origin_value1;
-
-            let script = script! {
-                { u32_push(origin_value0)}
-                { u32_compress()}
-                { u32_push(origin_value1)}
-                { u32_compress()}
-                OP_ADD
-                { u32_push(v)}
-                { u32_compress()}
-                OP_EQUAL
-
-            };
-
-            let exec_result = execute_script(script);
-            assert!(exec_result.success);
-        }
-    }
-}
diff --git a/src/u4/mod.rs b/src/u4/mod.rs
deleted file mode 100644
index d417c2f04..000000000
--- a/src/u4/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub mod u4_add;
-//pub mod u4_add_stack;
-pub mod u4_logic;
-//pub mod u4_logic_stack;
-pub mod u4_rot;
-//pub mod u4_rot_stack;
-pub mod u4_shift;
-//pub mod u4_shift_stack;
-pub mod u4_std;
diff --git a/src/u4/u4_add.rs b/src/u4/u4_add.rs
deleted file mode 100644
index d234fffa0..000000000
--- a/src/u4/u4_add.rs
+++ /dev/null
@@ -1,521 +0,0 @@
-use crate::treepp::{script, Script};
-use bitcoin::opcodes::all::*;
-
-use super::u4_std::{u4_drop, CalculateOffset};
-
-// Add it's performed be adding nibble by nibble, then duplicating the result
-// and then using two lookup tables to obtain the modulo and the quotient.
-
-// The modulo represent the result for the particular nibble
-// and the quotient it's used as carry for the next nibble
-
-// The lookup tables currently have 65 entries
-// because it was created to support up to 4 additions
-// simultaneously to improve the performance as
-// carry only needs to be calculated once
-//
-// 5 additions would be great and would allow to avoid one currently splitted operation on sha
-// but it's not fitting on the 1000k stack limit (alongside the rest of the tables and variables)
-
-pub fn u4_push_quotient_table() -> Script {
-    script! {
-        OP_4
-        OP_3
-        OP_DUP
-        OP_2DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-        OP_2
-        OP_DUP
-        OP_2DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-        OP_1
-        OP_DUP
-        OP_2DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-        OP_0
-        OP_DUP
-        OP_2DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-    }
-}
-
-pub fn u4_drop_quotient_table() -> Script { u4_drop(65) }
-
-pub fn u4_push_modulo_table() -> Script {
-    script! {
-        OP_0
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-    }
-}
-
-pub fn u4_drop_modulo_table() -> Script { u4_drop(65) }
-
-//130 bytes
-pub fn u4_push_add_tables() -> Script {
-    script! {
-        { u4_push_modulo_table() }
-        { u4_push_quotient_table() }
-    }
-}
-
-pub fn u4_drop_add_tables() -> Script {
-    script! {
-        { u4_drop_quotient_table() }
-        { u4_drop_modulo_table() }
-    }
-}
-
-pub fn u4_arrange_nibbles(nibble_count: u32, mut bases: Vec<u32>) -> Script {
-    bases.sort();
-    bases.reverse();
-    for i in 0..bases.len() {
-        bases[i] += nibble_count - 1;
-    }
-
-    script! {
-        for i in 0..nibble_count {
-            for (n, base) in bases.iter().enumerate() {
-                {  (base - i)  +  ((n as u32 + 1) * (i + 1)) - 1 }
-                OP_ROLL
-            }
-        }
-    }
-}
-
-pub fn u4_add_carry_nested(current: u32, limit: u32) -> Script {
-    script! {
-        OP_DUP
-        OP_16
-        OP_GREATERTHANOREQUAL
-        OP_IF
-            OP_16
-            OP_SUB
-            if current + 1 == limit {
-                { current }
-            } else {
-                { u4_add_carry_nested(current+1, limit)}
-            }
-        OP_ELSE
-            { current }
-        OP_ENDIF
-    }
-}
-
-pub fn u4_add_nested(current: u32, limit: u32) -> Script {
-    script! {
-        OP_DUP
-        OP_16
-        OP_GREATERTHANOREQUAL
-        OP_IF
-            OP_16
-            OP_SUB
-            if current + 1 < limit {
-                { u4_add_nested(current+1, limit)}
-            }
-        OP_ENDIF
-    }
-}
-
-pub fn u4_add_no_table_internal(nibble_count: u32, number_count: u32) -> Script {
-    script! {
-
-        for i in 0..nibble_count {
-
-            //add the column of nibbles (needs one less add than nibble count)
-            for _ in 0..number_count-1 {
-                OP_ADD
-            }
-
-            if i < nibble_count - 1 {
-                { u4_add_carry_nested(0, number_count ) }
-                OP_SWAP
-                OP_TOALTSTACK
-                OP_ADD
-            } else {
-                { u4_add_nested(0, number_count ) }
-                OP_TOALTSTACK
-            }
-
-        }
-
-    }
-}
-
-//assumes to habe the numbers prepared alongside nibble by nibble
-//tables offset
-pub fn u4_add_internal(nibble_count: u32, number_count: u32, tables_offset: u32) -> Script {
-    let quotient_table_size = 65;
-    //extra size on the stack
-    let mut offset_calc: i32 = 0;
-    let script = script! {
-
-        for i in 0..nibble_count {
-
-            //extra add to add the carry from previous addition
-            if i > 0 {
-                { offset_calc.modify(OP_ADD) }
-            }
-
-            //add the column of nibbles (needs one less add than nibble count)
-            for _ in 0..number_count-1 {
-                { offset_calc.modify(OP_ADD) }
-            }
-
-            // duplicate the result to be used to get the carry except for the last nibble
-            if i < nibble_count -1 {
-                { offset_calc.modify( OP_DUP) }
-            }
-
-            //get the modulo of the addition
-            {  (offset_calc - 1)  + tables_offset as i32 + quotient_table_size }   // this adds 1 to the calc
-            OP_ADD                                                    // and this one consumes it
-            { offset_calc.modify( OP_PICK) }
-            { offset_calc.modify( OP_TOALTSTACK) }
-
-            //we don't care about the last carry
-            if i < nibble_count - 1 {
-                //obtain the quotinent to be used as carry for the next addition
-                {  (offset_calc - 1) + tables_offset as i32 }
-                OP_ADD
-                { offset_calc.modify( OP_PICK) }
-            }
-        }
-
-
-    };
-
-    script
-}
-
-pub fn u4_add_with_table(nibble_count: u32, bases: Vec<u32>, tables_offset: u32) -> Script {
-    let numbers = bases.len() as u32;
-    script! {
-        { u4_arrange_nibbles(nibble_count, bases)  }
-        { u4_add_internal(nibble_count, numbers, tables_offset) }
-    }
-}
-
-pub fn u4_add_no_table(nibble_count: u32, bases: Vec<u32>) -> Script {
-    let numbers = bases.len() as u32;
-    script! {
-        { u4_arrange_nibbles(nibble_count, bases)  }
-        { u4_add_no_table_internal(nibble_count, numbers) }
-    }
-}
-
-pub fn u4_add(
-    nibble_count: u32,
-    bases: Vec<u32>,
-    tables_offset: u32,
-    use_add_table: bool,
-) -> Script {
-    if use_add_table {
-        u4_add_with_table(nibble_count, bases, tables_offset)
-    } else {
-        u4_add_no_table(nibble_count, bases)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::u4::{u4_add::*, u4_std::u4_number_to_nibble};
-    use crate::{execute_script, treepp::script};
-
-    #[test]
-    fn test_calc() {
-        let x = u4_arrange_nibbles(8, vec![0, 1, 2, 4]);
-        println!("{}", x.len());
-        let x = u4_add_with_table(8, vec![0, 8, 16, 24, 32], 100);
-        println!("{}", x.len());
-        let x = u4_add_with_table(8, vec![0, 8, 16, 24], 100);
-        println!("{}", x.len());
-        let x = u4_add_no_table(8, vec![0, 8, 16, 24, 32]);
-        println!("{}", x.len());
-        let x = u4_add_no_table(8, vec![0, 8, 16, 24]);
-        println!("{}", x.len());
-        let x = u4_add_no_table(8, vec![0, 8, 16]);
-        println!("{}", x.len());
-        let x = u4_add_no_table(8, vec![0, 8]);
-        println!("{}", x.len());
-    }
-
-    #[test]
-    fn test_add_no_table() {
-        let calc = script! {
-            { u4_add_no_table( 8, vec![0,8,16,24]) }
-        };
-
-        let script = script! {
-            { u4_number_to_nibble(100) }
-            { u4_number_to_nibble(200) }
-            { u4_number_to_nibble(1000) }
-            { u4_number_to_nibble(2000) }
-            { u4_add_no_table( 8, vec![0,8,16,24]) }
-            { u4_number_to_nibble(3300) }
-
-            for _ in 0..8 {
-                OP_FROMALTSTACK
-            }
-            for i in 0..8 {
-                { 8 - i}
-                OP_ROLL
-                OP_EQUALVERIFY
-            }
-            OP_TRUE
-
-        };
-        let res = execute_script(script);
-        assert!(res.success);
-        println!("{}", calc.len());
-    }
-
-    #[test]
-    fn test_add_2_32() {
-        let script = script! {
-            { u4_push_add_tables() }
-            { u4_number_to_nibble(253) }
-            { u4_number_to_nibble(252) }
-            { u4_add_with_table( 8, vec![0,8], 16) }
-            { u4_drop_add_tables() }
-            { u4_number_to_nibble(505) }
-
-            for _ in 0..8 {
-                OP_FROMALTSTACK
-            }
-            for i in 0..8 {
-                { 8 - i}
-                OP_ROLL
-                OP_EQUALVERIFY
-            }
-            OP_TRUE
-
-        };
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_add_4_32() {
-        let script = script! {
-            { u4_push_add_tables() }
-            { u4_number_to_nibble(100) }
-            { u4_number_to_nibble(200) }
-            { u4_number_to_nibble(1000) }
-            { u4_number_to_nibble(2000) }
-            { u4_add_with_table( 8, vec![0,8,16,24], 32) }
-            { u4_drop_add_tables() }
-            { u4_number_to_nibble(3300) }
-
-            for _ in 0..8 {
-                OP_FROMALTSTACK
-            }
-            for i in 0..8 {
-                { 8 - i}
-                OP_ROLL
-                OP_EQUALVERIFY
-            }
-            OP_TRUE
-
-        };
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_add_2() {
-        let script = script! {
-            { u4_push_add_tables() }
-            15
-            15
-            13
-            12
-            { u4_add_internal(2, 2, 4) }
-            { u4_drop_add_tables() }
-            OP_FROMALTSTACK
-            15
-            OP_EQUALVERIFY
-            OP_FROMALTSTACK
-            9
-            OP_EQUALVERIFY
-            OP_TRUE
-        };
-
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_add_step_by_step() {
-        let script = script! {
-            { u4_push_modulo_table() }
-            { u4_push_quotient_table() }
-            // fd + fc = 1f9 % 100 = f9
-            15          // F
-            15          // F F
-            13          // F F D
-            12          // F F D C
-
-            OP_ADD      // F F 19
-            OP_DUP      // F F 19 19
-            { 65 + 3 }  // F F 19 19 68=offset modulo
-            OP_ADD
-            OP_PICK         // F F 19 9
-            OP_TOALTSTACK   // F F 19     | 9
-            { 2 }           // F F 19 2   | 9
-            OP_ADD          // F F 21     | 9
-            OP_PICK         // F F 1
-
-            OP_ADD          // F 10
-            OP_ADD          // 1F
-            { 65 }          // 1F 65      | 9
-            OP_ADD          // 1F+65      | 9
-            OP_PICK         // F          | 9
-
-            OP_FROMALTSTACK
-            9
-            OP_EQUALVERIFY
-            15
-            OP_EQUALVERIFY
-            { u4_drop_modulo_table() }
-            { u4_drop_quotient_table() }
-
-            OP_TRUE
-        };
-
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-    #[test]
-    fn test_quotient() {
-        for i in 0..65 {
-            let script = script! {
-                { u4_push_quotient_table() }
-                { i as u32 }
-                OP_PICK
-                { i / 16 }
-                OP_EQUALVERIFY
-                { u4_drop_quotient_table() }
-                OP_TRUE
-            };
-
-            let res = execute_script(script);
-            assert!(res.success);
-        }
-    }
-
-    #[test]
-    fn test_modulo() {
-        for i in 0..65 {
-            let script = script! {
-                { u4_push_modulo_table() }
-                { i as u32 }
-                OP_PICK
-                { i % 16 }
-                OP_EQUALVERIFY
-                { u4_drop_modulo_table() }
-                OP_TRUE
-            };
-
-            let res = execute_script(script);
-            assert!(res.success);
-        }
-    }
-
-    #[test]
-    fn test_arrange() {
-        let script = script! {
-            1
-            2
-            3
-            4
-            5
-            6
-            7
-            8
-            9
-            10
-            11
-            12
-            { u4_arrange_nibbles(4, vec![0,4,8]) }
-
-        };
-
-        let _res = execute_script(script);
-    }
-}
diff --git a/src/u4/u4_logic.rs b/src/u4/u4_logic.rs
deleted file mode 100644
index 3f8d591df..000000000
--- a/src/u4/u4_logic.rs
+++ /dev/null
@@ -1,1418 +0,0 @@
-use crate::treepp::{script, Script};
-
-use crate::u4::u4_add::u4_arrange_nibbles;
-
-use super::u4_std::u4_drop;
-
-// And / Or / Xor tables are created here and can be used for bitwise operations
-// Sadly for sha256 those does not fit well in memory at the same time and therefor
-// and optimized version that is called half table is used for the operations
-
-// As this operations are commutative there is no need to have the tables for both
-// i.e: 15 & 7  AND  7 & 15  as the result would be the same, so half of the values
-// are stored on the tables, and to be used the values are ordered using min/max
-// before using the lookup table
-
-pub fn u4_push_or_table() -> Script {
-    script! {
-        OP_15
-        OP_DUP
-        OP_2DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-        OP_15
-        OP_14
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_15
-        OP_DUP
-        OP_13
-        OP_DUP
-        OP_15
-        OP_DUP
-        OP_13
-        OP_DUP
-        OP_15
-        OP_DUP
-        OP_13
-        OP_DUP
-        OP_15
-        OP_DUP
-        OP_13
-        OP_DUP
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_15
-        OP_DUP
-        OP_2DUP
-        OP_11
-        OP_DUP
-        OP_2DUP
-        OP_15
-        OP_DUP
-        OP_2DUP
-        OP_11
-        OP_DUP
-        OP_2DUP
-        OP_15
-        OP_14
-        OP_2DUP
-        OP_11
-        OP_10
-        OP_2DUP
-        OP_15
-        OP_14
-        OP_2DUP
-        OP_11
-        OP_10
-        OP_2DUP
-        OP_15
-        OP_DUP
-        OP_13
-        OP_DUP
-        OP_11
-        OP_DUP
-        OP_9
-        OP_DUP
-        OP_15
-        OP_DUP
-        OP_13
-        OP_DUP
-        OP_11
-        OP_DUP
-        OP_9
-        OP_DUP
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_15
-        OP_DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_7
-        OP_DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_15
-        OP_14
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_7
-        OP_6
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_15
-        OP_DUP
-        OP_13
-        OP_DUP
-        OP_15
-        OP_DUP
-        OP_13
-        OP_DUP
-        OP_7
-        OP_DUP
-        OP_5
-        OP_DUP
-        OP_7
-        OP_DUP
-        OP_5
-        OP_DUP
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_2OVER
-        OP_2OVER
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_2OVER
-        OP_2OVER
-        OP_15
-        OP_DUP
-        OP_2DUP
-        OP_11
-        OP_DUP
-        OP_2DUP
-        OP_7
-        OP_DUP
-        OP_2DUP
-        OP_3
-        OP_DUP
-        OP_2DUP
-        OP_15
-        OP_14
-        OP_2DUP
-        OP_11
-        OP_10
-        OP_2DUP
-        OP_7
-        OP_6
-        OP_2DUP
-        OP_3
-        OP_2
-        OP_2DUP
-        OP_15
-        OP_DUP
-        OP_13
-        OP_DUP
-        OP_11
-        OP_DUP
-        OP_9
-        OP_DUP
-        OP_7
-        OP_DUP
-        OP_5
-        OP_DUP
-        OP_3
-        OP_DUP
-        OP_1
-        OP_DUP
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-    }
-}
-
-pub fn u4_push_xor_table() -> Script {
-    script! {
-        OP_0
-        OP_1
-        OP_2
-        OP_3
-        OP_4
-        OP_5
-        OP_6
-        OP_7
-        OP_8
-        OP_9
-        OP_10
-        OP_11
-        OP_12
-        OP_13
-        OP_14
-        OP_15
-        OP_1
-        OP_0
-        OP_3
-        OP_2
-        OP_5
-        OP_4
-        OP_7
-        OP_6
-        OP_9
-        OP_8
-        OP_11
-        OP_10
-        OP_13
-        OP_12
-        OP_15
-        OP_14
-        OP_2
-        OP_3
-        OP_0
-        OP_1
-        OP_6
-        OP_7
-        OP_4
-        OP_5
-        OP_10
-        OP_11
-        OP_8
-        OP_9
-        OP_14
-        OP_15
-        OP_12
-        OP_13
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_4
-        OP_5
-        OP_6
-        OP_7
-        OP_0
-        OP_1
-        OP_2
-        OP_3
-        OP_12
-        OP_13
-        OP_14
-        OP_15
-        OP_8
-        OP_9
-        OP_10
-        OP_11
-        OP_5
-        OP_4
-        OP_7
-        OP_6
-        OP_1
-        OP_0
-        OP_3
-        OP_2
-        OP_13
-        OP_12
-        OP_15
-        OP_14
-        OP_9
-        OP_8
-        OP_11
-        OP_10
-        OP_6
-        OP_7
-        OP_4
-        OP_5
-        OP_2
-        OP_3
-        OP_0
-        OP_1
-        OP_14
-        OP_15
-        OP_12
-        OP_13
-        OP_10
-        OP_11
-        OP_8
-        OP_9
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_8
-        OP_9
-        OP_10
-        OP_11
-        OP_12
-        OP_13
-        OP_14
-        OP_15
-        OP_0
-        OP_1
-        OP_2
-        OP_3
-        OP_4
-        OP_5
-        OP_6
-        OP_7
-        OP_9
-        OP_8
-        OP_11
-        OP_10
-        OP_13
-        OP_12
-        OP_15
-        OP_14
-        OP_1
-        OP_0
-        OP_3
-        OP_2
-        OP_5
-        OP_4
-        OP_7
-        OP_6
-        OP_10
-        OP_11
-        OP_8
-        OP_9
-        OP_14
-        OP_15
-        OP_12
-        OP_13
-        OP_2
-        OP_3
-        OP_0
-        OP_1
-        OP_6
-        OP_7
-        OP_4
-        OP_5
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_12
-        OP_13
-        OP_14
-        OP_15
-        OP_8
-        OP_9
-        OP_10
-        OP_11
-        OP_4
-        OP_5
-        OP_6
-        OP_7
-        OP_0
-        OP_1
-        OP_2
-        OP_3
-        OP_13
-        OP_12
-        OP_15
-        OP_14
-        OP_9
-        OP_8
-        OP_11
-        OP_10
-        OP_5
-        OP_4
-        OP_7
-        OP_6
-        OP_1
-        OP_0
-        OP_3
-        OP_2
-        OP_14
-        OP_15
-        OP_12
-        OP_13
-        OP_10
-        OP_11
-        OP_8
-        OP_9
-        OP_6
-        OP_7
-        OP_4
-        OP_5
-        OP_2
-        OP_3
-        OP_0
-        OP_1
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-
-    }
-}
-
-pub fn u4_push_and_table() -> Script {
-    script! {
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_14
-        OP_DUP
-        OP_12
-        OP_DUP
-        OP_10
-        OP_DUP
-        OP_8
-        OP_DUP
-        OP_6
-        OP_DUP
-        OP_4
-        OP_DUP
-        OP_2
-        OP_DUP
-        OP_0
-        OP_DUP
-        OP_13
-        OP_12
-        OP_2DUP
-        OP_9
-        OP_8
-        OP_2DUP
-        OP_5
-        OP_4
-        OP_2DUP
-        OP_1
-        OP_0
-        OP_2DUP
-        OP_12
-        OP_DUP
-        OP_2DUP
-        OP_8
-        OP_DUP
-        OP_2DUP
-        OP_4
-        OP_DUP
-        OP_2DUP
-        OP_0
-        OP_DUP
-        OP_2DUP
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_2OVER
-        OP_2OVER
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_2OVER
-        OP_2OVER
-        OP_10
-        OP_DUP
-        OP_8
-        OP_DUP
-        OP_10
-        OP_DUP
-        OP_8
-        OP_DUP
-        OP_2
-        OP_DUP
-        OP_0
-        OP_DUP
-        OP_2
-        OP_DUP
-        OP_0
-        OP_DUP
-        OP_9
-        OP_8
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_1
-        OP_0
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_8
-        OP_DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_0
-        OP_DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_6
-        OP_DUP
-        OP_4
-        OP_DUP
-        OP_2
-        OP_DUP
-        OP_0
-        OP_DUP
-        OP_6
-        OP_DUP
-        OP_4
-        OP_DUP
-        OP_2
-        OP_DUP
-        OP_0
-        OP_DUP
-        OP_5
-        OP_4
-        OP_2DUP
-        OP_1
-        OP_0
-        OP_2DUP
-        OP_5
-        OP_4
-        OP_2DUP
-        OP_1
-        OP_0
-        OP_2DUP
-        OP_4
-        OP_DUP
-        OP_2DUP
-        OP_0
-        OP_DUP
-        OP_2DUP
-        OP_4
-        OP_DUP
-        OP_2DUP
-        OP_0
-        OP_DUP
-        OP_2DUP
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_2
-        OP_DUP
-        OP_0
-        OP_DUP
-        OP_2
-        OP_DUP
-        OP_0
-        OP_DUP
-        OP_2
-        OP_DUP
-        OP_0
-        OP_DUP
-        OP_2
-        OP_DUP
-        OP_0
-        OP_DUP
-        OP_1
-        OP_0
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_0
-        OP_DUP
-        OP_2DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-    }
-}
-
-pub fn u4_drop_logic_table() -> Script { u4_drop(16 * 16) }
-
-pub fn u4_push_lookup() -> Script {
-    script! {
-        256
-        240
-        224
-        208
-        192
-        176
-        160
-        144
-        128
-        112
-        96
-        80
-        64
-        48
-        32
-        16
-        OP_0   //zero is extra so it can be used as lshift4 changing the offset
-    }
-}
-
-pub fn u4_push_half_xor_table() -> Script {
-    script! {
-        OP_0
-        OP_1
-        OP_0
-        OP_2
-        OP_3
-        OP_0
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_4
-        OP_5
-        OP_6
-        OP_7
-        OP_0
-        OP_5
-        OP_4
-        OP_7
-        OP_6
-        OP_1
-        OP_0
-        OP_6
-        OP_7
-        OP_4
-        OP_5
-        OP_2
-        OP_3
-        OP_0
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_8
-        OP_9
-        OP_10
-        OP_11
-        OP_12
-        OP_13
-        OP_14
-        OP_15
-        OP_0
-        OP_9
-        OP_8
-        OP_11
-        OP_10
-        OP_13
-        OP_12
-        OP_15
-        OP_14
-        OP_1
-        OP_0
-        OP_10
-        OP_11
-        OP_8
-        OP_9
-        OP_14
-        OP_15
-        OP_12
-        OP_13
-        OP_2
-        OP_3
-        OP_0
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_12
-        OP_13
-        OP_14
-        OP_15
-        OP_8
-        OP_9
-        OP_10
-        OP_11
-        OP_4
-        OP_5
-        OP_6
-        OP_7
-        OP_0
-        OP_13
-        OP_12
-        OP_15
-        OP_14
-        OP_9
-        OP_8
-        OP_11
-        OP_10
-        OP_5
-        OP_4
-        OP_7
-        OP_6
-        OP_1
-        OP_0
-        OP_14
-        OP_15
-        OP_12
-        OP_13
-        OP_10
-        OP_11
-        OP_8
-        OP_9
-        OP_6
-        OP_7
-        OP_4
-        OP_5
-        OP_2
-        OP_3
-        OP_0
-        OP_15
-        OP_14
-        OP_13
-        OP_12
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-    }
-}
-
-pub fn u4_push_half_and_table() -> Script {
-    script! {
-        OP_15
-        OP_14
-        OP_DUP
-        OP_13
-        OP_12
-        OP_2DUP
-        OP_DUP
-        OP_2DUP
-        OP_11
-        OP_10
-        OP_9
-        OP_8
-        OP_11
-        OP_10
-        OP_DUP
-        OP_8
-        OP_DUP
-        OP_10
-        OP_DUP
-        OP_9
-        OP_8
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_7
-        OP_6
-        OP_5
-        OP_4
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_7
-        OP_6
-        OP_DUP
-        OP_4
-        OP_DUP
-        OP_2
-        OP_DUP
-        OP_0
-        OP_DUP
-        OP_6
-        OP_DUP
-        OP_5
-        OP_4
-        OP_2DUP
-        OP_1
-        OP_0
-        OP_2DUP
-        OP_5
-        OP_4
-        OP_2DUP
-        OP_DUP
-        OP_2DUP
-        OP_0
-        OP_DUP
-        OP_2DUP
-        OP_4
-        OP_DUP
-        OP_2DUP
-        OP_3
-        OP_2
-        OP_1
-        OP_0
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_3
-        OP_2
-        OP_DUP
-        OP_0
-        OP_DUP
-        OP_2
-        OP_DUP
-        OP_0
-        OP_DUP
-        OP_2
-        OP_DUP
-        OP_0
-        OP_DUP
-        OP_2
-        OP_DUP
-        OP_1
-        OP_0
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_DUP
-        OP_2DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-        OP_3DUP
-    }
-}
-
-pub fn u4_drop_half_and() -> Script { u4_drop(136) }
-
-pub fn u4_push_half_lookup() -> Script {
-    script! {
-        136
-        135
-        133
-        130
-        126
-        121
-        115
-        108
-        100
-        91
-        81
-        70
-        58
-        45
-        31
-        16
-    }
-}
-
-pub fn u4_drop_half_lookup() -> Script { u4_drop(16) }
-
-pub fn u4_drop_lookup() -> Script { u4_drop(17) }
-
-pub fn u4_sort() -> Script {
-    script! {
-        OP_2DUP
-        OP_MIN
-        OP_TOALTSTACK
-        OP_MAX
-        OP_FROMALTSTACK
-    }
-}
-
-pub fn u4_and_half_table(lookup: u32) -> Script {
-    script! {
-        { u4_sort() }
-        { lookup - 1 }
-        OP_ADD
-        OP_PICK
-        { lookup - 2 }
-        OP_ADD
-        OP_ADD
-        OP_PICK
-    }
-}
-
-pub fn u4_and(lookup: u32, table: u32) -> Script {
-    script! {
-        { lookup }
-        OP_ADD
-        OP_PICK
-        { table }
-        OP_ADD
-        OP_ADD
-        OP_PICK
-    }
-}
-
-//(a xor b) = (a + b) - 2*(a & b)) = b - 2(a&b) + a
-pub fn u4_xor_with_and(lookup: u32, table: u32) -> Script {
-    script! {
-        OP_2DUP
-        { u4_and( lookup+2, table+2) }
-        OP_DUP
-        OP_ADD
-        OP_SUB
-        OP_ADD
-    }
-}
-
-pub fn u4_xor_with_and_table(lookup: u32) -> Script {
-    script! {
-        OP_2DUP
-        { u4_and_half_table( lookup+2) }
-        OP_DUP
-        OP_ADD
-        OP_SUB
-        OP_ADD
-    }
-}
-
-pub fn u4_logic_nibs(
-    nibble_count: u32,
-    bases: Vec<u32>,
-    offset: u32,
-    do_xor_with_and: bool,
-) -> Script {
-    let numbers = bases.len() as u32;
-    script! {
-        { u4_arrange_nibbles(nibble_count, bases) }
-        for nib in 0..nibble_count {
-            for i in 0..numbers-1 {
-                if do_xor_with_and {
-                    { u4_xor_with_and_table( offset - i - nib * numbers ) }
-                } else {
-                    { u4_and_half_table( offset - i - nib * numbers ) }
-                }
-            }
-            OP_TOALTSTACK
-        }
-
-    }
-}
-
-pub fn u4_and_u32(bases: Vec<u32>, offset: u32) -> Script { u4_logic_nibs(8, bases, offset, false) }
-
-pub fn u4_xor_u32(bases: Vec<u32>, offset: u32, do_xor_with_and: bool) -> Script {
-    u4_logic_nibs(8, bases, offset, do_xor_with_and)
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::u4::u4_logic::*;
-    use crate::u4::u4_shift::{u4_drop_rshift_tables, u4_push_rshift_tables};
-    use crate::u4::u4_std::{u4_number_to_nibble, u4_u32_verify_from_altstack};
-    use crate::{execute_script, treepp::script};
-
-    #[test]
-    fn test_xor_u32() {
-        let script = script! {
-            { u4_push_half_xor_table() }
-            { u4_push_half_lookup()}
-            { u4_number_to_nibble(0x87878787)}
-            { u4_number_to_nibble(0xFF010203)}
-            { u4_number_to_nibble(0xAABBCCDD)}
-            { u4_logic_nibs( 8, vec![0,8,16], 24, false )}
-            { u4_drop_half_lookup() }
-            { u4_drop_half_and() }
-
-            { u4_number_to_nibble(0xD23D4959)}
-            { u4_u32_verify_from_altstack() }
-            OP_TRUE
-
-
-        };
-
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-    #[test]
-    fn test_xor_u32_with_and() {
-        let script = script! {
-            { u4_push_half_and_table() }
-            { u4_push_half_lookup()}
-            { u4_number_to_nibble(0x87878787)}
-            { u4_number_to_nibble(0xFF010203)}
-            { u4_number_to_nibble(0xAABBCCDD)}
-            { u4_logic_nibs( 8, vec![0,8,16], 24, true )}
-            { u4_drop_half_lookup() }
-            { u4_drop_half_and() }
-
-            { u4_number_to_nibble(0xD23D4959)}
-            { u4_u32_verify_from_altstack() }
-            OP_TRUE
-
-
-        };
-
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_logic_u32_size() {
-        let xor_x2 = u4_logic_nibs(8, vec![0, 8], 24, true);
-        println!("{}", xor_x2.len());
-        let xor_x3 = u4_logic_nibs(8, vec![0, 8, 16], 24, true);
-        println!("{}", xor_x3.len());
-        let xor_x2 = u4_logic_nibs(8, vec![0, 8], 24, false);
-        println!("{}", xor_x2.len());
-        let xor_x3 = u4_logic_nibs(8, vec![0, 8, 16], 24, false);
-        println!("{}", xor_x3.len());
-    }
-
-    #[test]
-    fn test_and_u32() {
-        let script = script! {
-            { u4_push_half_and_table() }
-            { u4_push_half_lookup()}
-            { u4_number_to_nibble(0x87878787)}
-            { u4_number_to_nibble(0xFF010203)}
-            { u4_number_to_nibble(0xAABBCCDD)}
-            { u4_logic_nibs( 8, vec![0,8,16], 24, false )}
-            { u4_drop_half_lookup() }
-            { u4_drop_half_and() }
-
-            { u4_number_to_nibble(0x82010001)}
-            { u4_u32_verify_from_altstack() }
-            OP_TRUE
-
-
-        };
-
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_xor_half() {
-        for x in 0..16 {
-            for y in 0..16 {
-                let script = script! {
-                    { u4_push_half_and_table() }
-                    { u4_push_half_lookup()}
-                    {x}      // X
-                    {y}       // Y
-                    { u4_xor_with_and_table(2)}
-                    { x ^ y}
-                    OP_EQUALVERIFY
-                    { u4_drop_half_lookup() }
-                    { u4_drop_half_and() }
-                    OP_TRUE
-                };
-
-                let res = execute_script(script);
-                assert!(res.success);
-            }
-        }
-    }
-    #[test]
-    fn test_and_half() {
-        for x in 0..16 {
-            for y in 0..16 {
-                let script = script! {
-                    { u4_push_half_and_table() }
-                    { u4_push_half_lookup()}
-                    {x}      // X
-                    {y}       // Y
-                    { u4_and_half_table(2)}
-                    { x & y}
-                    OP_EQUALVERIFY
-                    { u4_drop_half_lookup() }
-                    { u4_drop_half_and() }
-                    OP_TRUE
-                };
-
-                let res = execute_script(script);
-                assert!(res.success);
-            }
-        }
-    }
-
-    #[test]
-    fn test_xor_with_and() {
-        for x in 0..16 {
-            for y in 0..16 {
-                let script = script! {
-                    { u4_push_and_table() }
-                    { u4_push_lookup()}
-                    {x}      // X
-                    {y}       // Y
-                    { u4_xor_with_and(1, 17)}
-                    {x^y}
-                    OP_EQUALVERIFY
-                    { u4_drop_lookup() }
-                    { u4_drop_logic_table() }
-                    OP_TRUE
-                };
-
-                println!("{}", script.len());
-                let res = execute_script(script);
-
-                assert!(res.success);
-            }
-        }
-    }
-
-    #[test]
-    fn test_xor_func() {
-        let script = script! {
-            { u4_push_xor_table() }
-            { u4_push_lookup()}
-            12      // X
-            5       // Y
-            { u4_and(1, 17)}
-            9
-            OP_EQUALVERIFY
-            { u4_drop_lookup() }
-            { u4_drop_logic_table() }
-            OP_TRUE
-        };
-
-        println!("{}", script.len());
-        let res = execute_script(script);
-
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_and_func() {
-        let script = script! {
-            { u4_push_and_table() }
-            { u4_push_lookup()}
-            12      // X
-            5       // Y
-            { u4_and(1, 17)}
-            4
-            OP_EQUALVERIFY
-            { u4_drop_lookup() }
-            { u4_drop_logic_table() }
-            OP_TRUE
-        };
-
-        println!("{}", script.len());
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-    #[test]
-    fn test_lookup() {
-        let script = script! {
-            { u4_push_lookup() }
-            15
-            1
-            OP_ADD
-            OP_PICK
-            256
-            OP_EQUALVERIFY
-            { u4_drop_lookup() }
-            OP_TRUE
-        };
-
-        let res = execute_script(script);
-        assert!(res.success);
-        let script = script! {
-            { u4_push_lookup() }
-            0
-            1
-            OP_ADD
-            OP_PICK
-            16
-            OP_EQUALVERIFY
-            { u4_drop_lookup() }
-            OP_TRUE
-        };
-
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_shift4() {
-        let script = script! {
-            { u4_push_lookup() }
-            0
-            OP_PICK
-            0
-            OP_EQUALVERIFY
-            { u4_drop_lookup() }
-            OP_TRUE
-        };
-        let res = execute_script(script);
-        assert!(res.success);
-
-        let script = script! {
-            { u4_push_lookup() }
-            15
-            OP_PICK
-            240
-            OP_EQUALVERIFY
-            { u4_drop_lookup() }
-            OP_TRUE
-        };
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_and() {
-        let script = script! {
-            { u4_push_and_table() }
-            { u4_push_lookup()}
-            { u4_push_rshift_tables() }
-            12      // X
-            5       // Y
-            { 1 + 1 + 48 }       // offset (X + rshift size is the offset)
-            OP_ADD
-            OP_PICK
-            { 1 + 48 }      // size of rshift
-            OP_ADD
-            OP_ADD
-            OP_PICK
-            4
-            OP_EQUALVERIFY
-            { u4_drop_rshift_tables() }
-            { u4_drop_lookup() }
-            { u4_drop_logic_table() }
-            OP_TRUE
-        };
-
-        println!("{}", script.len());
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_xor() {
-        let script = script! {
-            { u4_push_xor_table() }
-            { u4_push_lookup()}
-            { u4_push_rshift_tables() }
-            12      // X
-            5       // Y
-            { 1 + 1 + 48 }       // offset (X + rshift size is the offset)
-            OP_ADD
-            OP_PICK
-            { 1 + 48 }      // size of rshift
-            OP_ADD
-            OP_ADD
-            OP_PICK
-            9
-            OP_EQUALVERIFY
-            { u4_drop_rshift_tables() }
-            { u4_drop_lookup() }
-            { u4_drop_logic_table() }
-            OP_TRUE
-        };
-
-        println!("{}", script.len());
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_or() {
-        let script = script! {
-            { u4_push_or_table() }
-            { u4_push_lookup()}
-            { u4_push_rshift_tables() } // just as example for the delta
-            12      // X
-            5       // Y
-            { 1 + 1 + 48 }       // offset (X + rshift size is the offset)
-            OP_ADD
-            OP_PICK
-            { 1 + 48 }      // size of rshift
-            OP_ADD
-            OP_ADD
-            OP_PICK
-            13
-            OP_EQUALVERIFY
-            { u4_drop_rshift_tables() }
-            { u4_drop_lookup() }
-            { u4_drop_logic_table() }
-            OP_TRUE
-        };
-
-        println!("{}", script.len());
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-}
diff --git a/src/u4/u4_logic_stack.rs b/src/u4/u4_logic_stack.rs
deleted file mode 100644
index 9f468cf2c..000000000
--- a/src/u4/u4_logic_stack.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use crate::treepp::{script, Script};
-use bitcoin_script_stack::stack::{StackTracker, StackVariable};
-
-use crate::u4::u4_logic::u4_sort;
-
-use super::{
-    u4_add_stack::u4_arrange_nibbles_stack,
-    u4_logic::{u4_push_half_and_table, u4_push_half_xor_table, u4_push_lookup, u4_push_xor_table},
-};
-
-pub fn u4_push_and_table_stack(stack: &mut StackTracker) -> StackVariable {
-    stack.var(136, u4_push_half_and_table(), "and_table")
-}
-
-pub fn u4_push_xor_table_stack(stack: &mut StackTracker) -> StackVariable {
-    stack.var(136, u4_push_half_xor_table(), "xor_table")
-}
-
-pub fn u4_push_xor_full_table_stack(stack: &mut StackTracker) -> StackVariable {
-    stack.var(256, u4_push_xor_table(), "xor_full_table")
-}
-
-pub fn u4_push_half_lookup_0_based() -> Script {
-    script! {
-        120
-        119
-        117
-        114
-        110
-        105
-        99
-        92
-        84
-        75
-        65
-        54
-        42
-        29
-        15
-        0
-    }
-}
-
-pub fn u4_push_lookup_table_stack(stack: &mut StackTracker) -> StackVariable {
-    stack.var(16, u4_push_half_lookup_0_based(), "lookup_table")
-}
-
-pub fn u4_push_full_lookup_table_stack(stack: &mut StackTracker) -> StackVariable {
-    stack.var(17, u4_push_lookup(), "full_lookup_table")
-}
-
-pub fn u4_logic_with_table_stack(
-    stack: &mut StackTracker,
-    lookup_table: StackVariable,
-    logic_table: StackVariable,
-    use_full_table: bool,
-) -> StackVariable {
-    if !use_full_table {
-        stack.custom(u4_sort(), 0, false, 0, "sort");
-    }
-    stack.get_value_from_table(lookup_table, None);
-    stack.op_add();
-    stack.get_value_from_table(logic_table, None)
-}
-
-//(a xor b) = (a + b) - 2*(a & b)) = b - 2(a&b) + a
-pub fn u4_xor_with_and_stack(
-    stack: &mut StackTracker,
-    lookup_table: StackVariable,
-    logic_table: StackVariable,
-) -> StackVariable {
-    stack.op_2dup();
-    u4_logic_with_table_stack(stack, lookup_table, logic_table, false);
-    stack.op_dup();
-    stack.op_add();
-    stack.op_sub();
-    stack.op_add()
-}
-
-pub fn u4_logic_stack_nib(
-    stack: &mut StackTracker,
-    lookup_table: StackVariable,
-    logic_table: StackVariable,
-    do_xor_with_and: bool,
-) -> StackVariable {
-    if do_xor_with_and {
-        u4_xor_with_and_stack(stack, lookup_table, logic_table)
-    } else {
-        u4_logic_with_table_stack(stack, lookup_table, logic_table, logic_table.size() > 136)
-    }
-}
-
-pub fn u4_logic_stack(
-    stack: &mut StackTracker,
-    nibble_count: u32,
-    numbers: Vec<StackVariable>,
-    lookup_table: StackVariable,
-    logic_table: StackVariable,
-    do_xor_with_and: bool,
-) {
-    let numnber_count = numbers.len();
-    u4_arrange_nibbles_stack(nibble_count, stack, numbers, vec![], vec![]);
-
-    for _ in 0..nibble_count {
-        for _ in 0..numnber_count - 1 {
-            if do_xor_with_and {
-                u4_xor_with_and_stack(stack, lookup_table, logic_table);
-            } else {
-                u4_logic_with_table_stack(stack, lookup_table, logic_table, false);
-            }
-            stack.to_altstack();
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use bitcoin_script_stack::stack::StackTracker;
-
-    #[test]
-    fn test_xor() {
-        for x in 0..16 {
-            for y in 0..16 {
-                let mut stack = StackTracker::new();
-                let xor = u4_push_xor_full_table_stack(&mut stack);
-                let lookup = u4_push_full_lookup_table_stack(&mut stack);
-
-                stack.number(x);
-                stack.number(y);
-
-                u4_logic_with_table_stack(&mut stack, lookup, xor, true);
-
-                stack.number(x ^ y);
-
-                stack.op_equalverify();
-
-                stack.drop(lookup);
-                stack.drop(xor);
-
-                stack.op_true();
-
-                assert!(stack.run().success);
-            }
-        }
-    }
-
-    #[test]
-    fn test_xor_half() {
-        for x in 0..16 {
-            for y in 0..16 {
-                let mut stack = StackTracker::new();
-                let xor = u4_push_xor_table_stack(&mut stack);
-                let lookup = u4_push_lookup_table_stack(&mut stack);
-
-                stack.number(x);
-                stack.number(y);
-
-                u4_logic_with_table_stack(&mut stack, lookup, xor, false);
-
-                stack.number(x ^ y);
-
-                stack.op_equalverify();
-
-                stack.drop(lookup);
-                stack.drop(xor);
-
-                stack.op_true();
-
-                assert!(stack.run().success);
-            }
-        }
-    }
-
-    #[test]
-    fn test_xor_with_and_half() {
-        for x in 0..16 {
-            for y in 0..16 {
-                let mut stack = StackTracker::new();
-                let and = u4_push_and_table_stack(&mut stack);
-                let lookup = u4_push_lookup_table_stack(&mut stack);
-
-                stack.number(x);
-                stack.number(y);
-
-                u4_xor_with_and_stack(&mut stack, lookup, and);
-
-                stack.number(x ^ y);
-
-                stack.op_equalverify();
-
-                stack.drop(lookup);
-                stack.drop(and);
-
-                stack.op_true();
-
-                assert!(stack.run().success);
-            }
-        }
-    }
-
-    #[test]
-    fn test_and_half() {
-        for x in 0..16 {
-            for y in 0..16 {
-                let mut stack = StackTracker::new();
-                let and = u4_push_and_table_stack(&mut stack);
-                let lookup = u4_push_lookup_table_stack(&mut stack);
-
-                stack.number(x);
-                stack.number(y);
-
-                u4_logic_with_table_stack(&mut stack, lookup, and, false);
-
-                stack.number(x & y);
-
-                stack.op_equalverify();
-
-                stack.drop(lookup);
-                stack.drop(and);
-
-                stack.op_true();
-
-                assert!(stack.run().success);
-            }
-        }
-    }
-}
diff --git a/src/u4/u4_rot.rs b/src/u4/u4_rot.rs
deleted file mode 100644
index 4dabedd30..000000000
--- a/src/u4/u4_rot.rs
+++ /dev/null
@@ -1,274 +0,0 @@
-use crate::treepp::{script, Script};
-use crate::u4::u4_shift::*;
-
-// rot right for n bits is constructed using shifting operations of two nibbles
-// also, there is a function to prepare the nibbles to be shifted
-// so if 0xff000001 is shifted right, then the nibble 1 is copied in front to be shifted into f
-
-pub fn u4_push_rrot_tables() -> Script {
-    script! {
-       {  u4_push_2_nib_rshift_tables() }
-    }
-}
-
-pub fn u4_drop_rrot_tables() -> Script {
-    script! {
-        { u4_drop_2_nib_rshift_tables() }
-    }
-}
-
-pub fn u4_prepare_number(shift: u32, number_pos: u32, is_shift: bool) -> Script {
-    let pos_shift = shift / 4;
-
-    let pos_shift_extra = pos_shift + 1;
-    script! {
-        for _ in 8-pos_shift_extra ..8 {
-            if is_shift {
-                OP_0
-            } else {
-                { number_pos + 7-(8-pos_shift_extra) }
-                OP_PICK
-            }
-        }
-        for _ in 0..8-pos_shift {
-            { number_pos + 7 + pos_shift_extra  }
-            OP_PICK
-        }
-
-    }
-}
-
-pub fn u4_rrot(shift: u32, number_pos: u32, shift_tables: u32, is_shift: bool) -> Script {
-    let bit_shift = shift % 4;
-    //TODO: to improve, some operations of shifting zero into zero can be removed
-    script! {
-        { u4_prepare_number(shift, number_pos, is_shift ) }
-
-        for i in 0..8 {
-            if i == 7 {
-                OP_SWAP
-                { u4_2_nib_shift_n(bit_shift, shift_tables - 2 + (9-i) ) }
-            } else {
-                OP_OVER
-                { u4_2_nib_shift_n(bit_shift, shift_tables - 2 + (10-i) ) }
-            }
-            OP_TOALTSTACK
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::u4::{
-        u4_rot::*,
-        u4_std::{u4_drop, u4_number_to_nibble},
-    };
-    use crate::{execute_script, treepp::script};
-    use rand::Rng;
-
-    #[test]
-    fn test_prepare_number() {
-        let script = script! {
-            0
-            255
-            0
-            1
-            2
-            3
-            4
-            5
-            6
-            7
-            255
-            255
-            { u4_prepare_number( 7, 2, false ) }
-        };
-
-        let _ = execute_script(script);
-    }
-
-    #[test]
-    fn test_prepare_number_for_shift() {
-        let script = script! {
-            0
-            255
-            15
-            1
-            2
-            3
-            4
-            5
-            6
-            7
-            255
-            255
-            { u4_prepare_number( 10, 2, true ) }
-        };
-
-        let _ = execute_script(script);
-    }
-
-    fn rrot(x: u32, n: u32) -> u32 {
-        if n == 0 {
-            return x;
-        }
-        (x >> n) | (x << (32 - n))
-    }
-
-    fn rshift(x: u32, n: u32) -> u32 {
-        if n == 0 {
-            return x;
-        }
-        x >> n
-    }
-
-    #[test]
-    fn test_x() {
-        let script = script! {
-            { u4_number_to_nibble(0x80_00_00_01) }
-            { u4_prepare_number(3, 0, false) }
-            OP_OVER
-        };
-        let _ = execute_script(script);
-    }
-    #[test]
-    fn test_rrot_shift() {
-        let script = script! {
-            { u4_push_rrot_tables() }
-            { u4_number_to_nibble(0xF0_FF_FF_FF) }
-            { u4_rrot(10, 0, 8, true ) }
-
-            { u4_drop(8) }
-            { u4_drop_rrot_tables() }
-
-            { u4_number_to_nibble(rshift(0xF0FF_FFFF, 10)) }
-
-            for _ in 0..8 {
-                OP_FROMALTSTACK
-            }
-            for i in 0..8 {
-                { 8 - i}
-                OP_ROLL
-                OP_EQUALVERIFY
-            }
-
-            OP_TRUE
-        };
-
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_rrot() {
-        let script = script! {
-            { u4_rrot(7, 0, 8, false ) }
-        };
-        println!("{}", script.len());
-
-        let script = script! {
-            { u4_push_rrot_tables() }
-            { u4_number_to_nibble(0xF0_00_10_01) }
-
-            { u4_rrot(7, 0, 8, false ) }
-
-            { u4_drop(8) }
-            { u4_drop_rrot_tables() }
-
-            { u4_number_to_nibble(rrot(0xF0_00_10_01, 7)) } //OP_FROMALTSTACK
-
-            for _ in 0..8 {
-                OP_FROMALTSTACK
-            }
-            for i in 0..8 {
-                { 8 - i}
-                OP_ROLL
-                OP_EQUALVERIFY
-            }
-
-            OP_TRUE
-        };
-
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_rrot_rand() {
-        let mut rng = rand::thread_rng();
-        for _ in 0..1000 {
-            let x: u32 = rng.gen();
-            let mut n: u32 = rng.gen();
-            n %= 32;
-            if n % 4 == 0 {
-                n += 1;
-            }
-
-            let script = script! {
-                { u4_push_rrot_tables() }
-                { u4_number_to_nibble(x) }
-
-                { u4_rrot(n, 0, 8, false ) }
-
-                { u4_drop(8) }
-                { u4_drop_rrot_tables() }
-
-                { u4_number_to_nibble(rrot(x, n)) } //OP_FROMALTSTACK
-
-                for _ in 0..8 {
-                    OP_FROMALTSTACK
-                }
-                for i in 0..8 {
-                    { 8 - i}
-                    OP_ROLL
-                    OP_EQUALVERIFY
-                }
-
-                OP_TRUE
-            };
-
-            let res = execute_script(script);
-            assert!(res.success);
-        }
-    }
-
-    #[test]
-    fn test_rshift_rand() {
-        let mut rng = rand::thread_rng();
-        for _ in 0..1000 {
-            let x: u32 = rng.gen();
-            let mut n: u32 = rng.gen();
-            n %= 32;
-            if n % 4 == 0 {
-                n += 1;
-            }
-
-            let script = script! {
-                { u4_push_rrot_tables() }
-                { u4_number_to_nibble(x) }
-
-                { u4_rrot(n, 0, 8, true ) }
-
-                { u4_drop(8) }
-                { u4_drop_rrot_tables() }
-
-                { u4_number_to_nibble(rshift(x, n)) } //OP_FROMALTSTACK
-
-                for _ in 0..8 {
-                    OP_FROMALTSTACK
-                }
-                for i in 0..8 {
-                    { 8 - i}
-                    OP_ROLL
-                    OP_EQUALVERIFY
-                }
-
-                OP_TRUE
-            };
-
-            let res = execute_script(script);
-            assert!(res.success);
-        }
-    }
-}
diff --git a/src/u4/u4_rot_stack.rs b/src/u4/u4_rot_stack.rs
deleted file mode 100644
index 241d470ef..000000000
--- a/src/u4/u4_rot_stack.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-//use crate::treepp::{script, Script};
-//use sha2::digest::typenum::bit;
-
-use bitcoin_script_stack::stack::{StackTracker, StackVariable};
-
-use super::u4_shift_stack::{u4_2_nib_shift_stack, u4_rshift_stack};
-
-pub fn u4_rrot_nib_from_u32(
-    stack: &mut StackTracker,
-    tables: StackVariable,
-    number: StackVariable,
-    nib: u32,
-    shift: u32,
-    is_shift: bool,
-) -> StackVariable {
-    let pos_shift = shift / 4;
-
-    if pos_shift > nib && is_shift {
-        return stack.number(0);
-    }
-
-    let y = (8 - pos_shift + nib - 1) % 8;
-    let x = (8 - pos_shift + nib) % 8;
-
-    stack.copy_var_sub_n(number, x);
-
-    let bit_shift = shift % 4;
-
-    if y == 7 && is_shift {
-        u4_rshift_stack(stack, tables, bit_shift)
-    } else {
-        stack.copy_var_sub_n(number, y);
-        u4_2_nib_shift_stack(stack, tables, bit_shift)
-    }
-}
-
-pub fn u4_rrot_u32(
-    stack: &mut StackTracker,
-    tables: StackVariable,
-    number: StackVariable,
-    shift: u32,
-    is_shift: bool,
-) -> StackVariable {
-    let vars: Vec<StackVariable> = (0..8)
-        .map(|nib| u4_rrot_nib_from_u32(stack, tables, number, nib, shift, is_shift))
-        .collect();
-    let mut nib0 = vars[0];
-    stack.join_count(&mut nib0, 7);
-    nib0
-}
-
-#[cfg(test)]
-mod tests {
-
-    use super::*;
-    use crate::treepp::script;
-    use crate::u4::u4_shift_stack::u4_push_shift_tables_stack;
-    use bitcoin_script_stack::stack::StackTracker;
-    use rand::Rng;
-
-    fn rrot(x: u32, n: u32) -> u32 {
-        if n == 0 {
-            return x;
-        }
-        (x >> n) | (x << (32 - n))
-    }
-
-    fn rshift(x: u32, n: u32) -> u32 {
-        if n == 0 {
-            return x;
-        }
-        x >> n
-    }
-
-    #[test]
-    fn test_rshift_rand() {
-        let mut rng = rand::thread_rng();
-        for _ in 0..100 {
-            let x: u32 = rng.gen();
-            let mut n: u32 = rng.gen();
-            n %= 32;
-            if n % 4 == 0 {
-                n += 1;
-            }
-
-            let mut stack = StackTracker::new();
-            let tables = u4_push_shift_tables_stack(&mut stack);
-            let pos = stack.number_u32(x);
-            u4_rrot_u32(&mut stack, tables, pos, n, true);
-
-            stack.number_u32(rshift(x, n));
-
-            stack.custom(
-                script! {
-                    for i in 0..8 {
-                        { 8 - i}
-                        OP_ROLL
-                        OP_EQUALVERIFY
-                    }
-                },
-                2,
-                false,
-                0,
-                "verify",
-            );
-
-            stack.drop(pos);
-            stack.drop(tables);
-            stack.op_true();
-
-            assert!(stack.run().success);
-        }
-    }
-
-    #[test]
-    fn test_rrot_rand() {
-        let mut rng = rand::thread_rng();
-        for _ in 0..100 {
-            let x: u32 = rng.gen();
-            let mut n: u32 = rng.gen();
-            n %= 32;
-            if n % 4 == 0 {
-                n += 1;
-            }
-
-            let mut stack = StackTracker::new();
-            let tables = u4_push_shift_tables_stack(&mut stack);
-            let pos = stack.number_u32(x);
-            u4_rrot_u32(&mut stack, tables, pos, n, false);
-
-            stack.number_u32(rrot(x, n));
-
-            stack.custom(
-                script! {
-                    for i in 0..8 {
-                        { 8 - i}
-                        OP_ROLL
-                        OP_EQUALVERIFY
-                    }
-                },
-                2,
-                false,
-                0,
-                "verify",
-            );
-
-            stack.drop(pos);
-            stack.drop(tables);
-            stack.op_true();
-
-            assert!(stack.run().success);
-        }
-    }
-}
diff --git a/src/u4/u4_shift.rs b/src/u4/u4_shift.rs
deleted file mode 100644
index 8a715f318..000000000
--- a/src/u4/u4_shift.rs
+++ /dev/null
@@ -1,246 +0,0 @@
-use crate::treepp::{script, Script};
-use super::u4_std::u4_drop;
-
-// right and left shfit tables for 3 bits options
-// compressed to reduce the size of the script
-// but in memory it will be 16*3 = 48
-
-pub fn u4_push_lshift_tables() -> Script {
-    //lshift3, lshift2, lshift1
-    script! {
-        OP_8
-        OP_0
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_2DUP
-        OP_12
-        OP_8
-        OP_4
-        OP_0
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_2OVER
-        OP_14
-        OP_12
-        OP_10
-        OP_8
-        OP_6
-        OP_4
-        OP_2
-        OP_0
-        OP_14
-        OP_12
-        OP_10
-        OP_8
-        OP_6
-        OP_4
-        OP_2
-        OP_0
-    }
-}
-
-pub fn u4_drop_lshift_tables() -> Script { u4_drop(16 * 3) }
-
-pub fn u4_push_rshift_tables() -> Script {
-    //rshift3, rshift2, rshift1
-    script! {
-    OP_1
-    OP_DUP
-    OP_2DUP
-    OP_2DUP
-    OP_2DUP
-    OP_0
-    OP_DUP
-    OP_2DUP
-    OP_2DUP
-    OP_2DUP
-    OP_3
-    OP_DUP
-    OP_2DUP
-    OP_2
-    OP_DUP
-    OP_2DUP
-    OP_1
-    OP_DUP
-    OP_2DUP
-    OP_0
-    OP_DUP
-    OP_2DUP
-    OP_7
-    OP_DUP
-    OP_6
-    OP_DUP
-    OP_5
-    OP_DUP
-    OP_4
-    OP_DUP
-    OP_3
-    OP_DUP
-    OP_2
-    OP_DUP
-    OP_1
-    OP_DUP
-    OP_0
-    OP_DUP
-      }
-}
-
-pub fn u4_drop_rshift_tables() -> Script { u4_drop(16 * 3) }
-
-pub fn u4_push_2_nib_rshift_tables() -> Script {
-    script! {
-       { u4_push_lshift_tables() }
-       { u4_push_rshift_tables() }
-    }
-}
-
-pub fn u4_drop_2_nib_rshift_tables() -> Script {
-    script! {
-       { u4_drop_rshift_tables() }
-       { u4_drop_lshift_tables() }
-    }
-}
-
-//It will process a nibble and shift it left 1,2 or 3 bits
-pub fn u4_lshift(n: u32, lshift_offset: u32) -> Script {
-    script! {
-        { lshift_offset + (16*(n-1)) }
-        OP_ADD
-        OP_PICK
-    }
-}
-
-//It will process a nibble and shift it right 1,2 or 3 bits
-pub fn u4_rshift(n: u32, rshift_offset: u32) -> Script {
-    script! {
-        { rshift_offset + (16*(n-1)) }
-        OP_ADD
-        OP_PICK
-    }
-}
-
-// Assumes Y and X are on the stack and will produce YX >> n
-// It calculates the offset doing (Y << (4-n)) & 15 + (X >> n) & 15
-pub fn u4_2_nib_shift_n(n: u32, tables_offset: u32) -> Script {
-    script! {
-        { u4_lshift(4-n, tables_offset + (16*3) + 1)  }
-        OP_SWAP
-        { u4_rshift(n, tables_offset + 1)  }
-        OP_ADD
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use super::*;
-    use crate::{execute_script, treepp::script};
-
-    #[test]
-    fn test_rshift() {
-        let script = script! {
-            { u4_push_rshift_tables() }
-            15
-            16         // 16 is the size of rshift 1,2,3 choosing 2
-            OP_ADD
-            OP_PICK
-            3
-            OP_EQUALVERIFY
-            { u4_drop_rshift_tables() }
-            OP_TRUE
-        };
-
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_lshift() {
-        let script = script! {
-            { u4_push_lshift_tables() }
-            7
-            0         // 16 is the size of rshift 1,2,3 choosing 1
-            OP_ADD
-            OP_PICK
-            14
-            OP_EQUALVERIFY
-            { u4_drop_lshift_tables() }
-            OP_TRUE
-        };
-
-        let res = execute_script(script);
-        assert!(res.success);
-    }
-
-    #[test]
-    fn test_lshift_func() {
-        for n in 1..4 {
-            for x in 0..16 {
-                let script = script! {
-
-                    { u4_push_lshift_tables() }
-                    { x }           //  X
-                    { u4_lshift(n , 0)}
-                    { (x << n) % 16 }
-                    OP_EQUALVERIFY
-                    { u4_drop_lshift_tables() }
-                    OP_TRUE
-                };
-
-                let res = execute_script(script);
-                assert!(res.success);
-            }
-        }
-    }
-
-    #[test]
-    fn test_rshift_func() {
-        for n in 1..4 {
-            for x in 0..16 {
-                let script = script! {
-
-                    { u4_push_rshift_tables() }
-                    { x }           //  X
-                    { u4_lshift(n , 0)}
-                    { (x >> n) % 16 }
-                    OP_EQUALVERIFY
-                    { u4_drop_rshift_tables() }
-                    OP_TRUE
-                };
-
-                let res = execute_script(script);
-                assert!(res.success);
-            }
-        }
-    }
-
-    #[test]
-    fn test_2_nib_rshift_function() {
-        for n in 1..4 {
-            for y in 0..16 {
-                for x in 0..16 {
-                    let script = script! {
-                        { u4_push_2_nib_rshift_tables() }
-                        { x }           //  X
-                        { y }          //  X  |  Y
-                        { u4_2_nib_shift_n(n, 0) }
-                        { (((y << 4)+x) >> n) % 16 }
-                        OP_EQUALVERIFY
-                        { u4_drop_2_nib_rshift_tables() }
-                        OP_TRUE
-                    };
-
-                    let res = execute_script(script);
-                    assert!(res.success);
-                }
-            }
-        }
-    }
-}
diff --git a/tests/bridge/assert/assert.rs b/tests/bridge/assert/assert.rs
deleted file mode 100644
index 10c2f35c3..000000000
--- a/tests/bridge/assert/assert.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    connectors::connector::TaprootConnector,
-    graphs::base::ONE_HUNDRED,
-    transactions::{
-        assert::AssertTransaction,
-        base::{BaseTransaction, Input},
-    },
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_assert_tx() {
-    let (
-        client,
-        _,
-        _,
-        operator_context,
-        verifier_0_context,
-        verifier_1_context,
-        _,
-        _,
-        connector_b,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-    ) = setup_test().await;
-
-    let amount = Amount::from_sat(ONE_HUNDRED * 2 / 100);
-    let outpoint =
-        generate_stub_outpoint(&client, &connector_b.generate_taproot_address(), amount).await;
-
-    let mut assert_tx = AssertTransaction::new(&operator_context, Input { outpoint, amount });
-
-    let secret_nonces_0 = assert_tx.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = assert_tx.push_nonces(&verifier_1_context);
-
-    assert_tx.pre_sign(&verifier_0_context, &secret_nonces_0);
-    assert_tx.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let tx = assert_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = client.esplora.broadcast(&tx).await;
-    println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
-    assert!(result.is_ok());
-}
diff --git a/tests/bridge/assert/mod.rs b/tests/bridge/assert/mod.rs
deleted file mode 100644
index 0897e2a1e..000000000
--- a/tests/bridge/assert/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod assert;
diff --git a/tests/bridge/challenge/challenge.rs b/tests/bridge/challenge/challenge.rs
deleted file mode 100644
index 65660b5d0..000000000
--- a/tests/bridge/challenge/challenge.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount, OutPoint};
-
-use bitvm::bridge::{
-    connectors::connector::TaprootConnector,
-    graphs::base::{DUST_AMOUNT, INITIAL_AMOUNT},
-    scripts::{generate_pay_to_pubkey_script, generate_pay_to_pubkey_script_address},
-    transactions::{
-        base::{BaseTransaction, Input, InputWithScript},
-        challenge::ChallengeTransaction,
-    },
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_challenge_tx() {
-    let (
-        client,
-        _,
-        depositor_context,
-        operator_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        connector_1,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-    ) = setup_test().await;
-
-    // We re-use the depositor private key to imitate a third-party
-    let crowdfunding_keypair = &depositor_context.depositor_keypair;
-    let crowdfunding_public_key = &depositor_context.depositor_public_key;
-
-    let amount_0 = Amount::from_sat(DUST_AMOUNT);
-    let outpoint_0 =
-        generate_stub_outpoint(&client, &connector_1.generate_taproot_address(), amount_0).await;
-
-    // Create two inputs that exceed the crowdfunding total
-    let input_amount_crowdfunding_total = Amount::from_sat(INITIAL_AMOUNT);
-
-    let address =
-        generate_pay_to_pubkey_script_address(depositor_context.network, crowdfunding_public_key);
-    let amount_1 = Amount::from_sat(INITIAL_AMOUNT * 2 / 3);
-
-    // Check there are two utxos
-    let crowdfunding_utxos = client
-        .get_initial_utxos(address.clone(), amount_1)
-        .await
-        .unwrap_or_else(|| {
-            panic!(
-                "Fund {:?} with {} sats at https://faucet.mutinynet.com/",
-                address,
-                amount_1.to_sat()
-            );
-        });
-
-    if crowdfunding_utxos.len() < 2 {
-        panic!(
-            "Fund {:?} with {} sats at https://faucet.mutinynet.com/",
-            address,
-            amount_1.to_sat()
-        );
-    }
-
-    let refund_address =
-        generate_pay_to_pubkey_script_address(depositor_context.network, crowdfunding_public_key);
-
-    let mut challenge_tx = ChallengeTransaction::new(
-        &operator_context,
-        Input {
-            outpoint: outpoint_0,
-            amount: amount_0,
-        },
-        input_amount_crowdfunding_total,
-    );
-
-    challenge_tx.add_inputs_and_output(
-        &depositor_context,
-        &vec![
-            InputWithScript {
-                outpoint: OutPoint {
-                    txid: crowdfunding_utxos[0].txid,
-                    vout: crowdfunding_utxos[0].vout,
-                },
-                amount: amount_1,
-                script: &generate_pay_to_pubkey_script(crowdfunding_public_key),
-            },
-            InputWithScript {
-                outpoint: OutPoint {
-                    txid: crowdfunding_utxos[1].txid,
-                    vout: crowdfunding_utxos[1].vout,
-                },
-                amount: amount_1,
-                script: &generate_pay_to_pubkey_script(crowdfunding_public_key),
-            },
-        ],
-        crowdfunding_keypair,
-        refund_address.script_pubkey(),
-    );
-
-    let tx = challenge_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = client.esplora.broadcast(&tx).await;
-    println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
-    assert!(result.is_ok());
-
-    // assert refund balance
-    let challenge_txid = tx.compute_txid();
-    let refund_utxos = client
-        .esplora
-        .get_address_utxo(refund_address)
-        .await
-        .unwrap();
-    let refund_utxo = refund_utxos
-        .clone()
-        .into_iter()
-        .find(|x| x.txid == challenge_txid);
-    assert!(refund_utxo.is_some());
-    assert_eq!(
-        refund_utxo.unwrap().value,
-        amount_1 * 2 - input_amount_crowdfunding_total
-    );
-}
diff --git a/tests/bridge/client/musig2_peg_out.rs b/tests/bridge/client/musig2_peg_out.rs
deleted file mode 100644
index 35ca34e24..000000000
--- a/tests/bridge/client/musig2_peg_out.rs
+++ /dev/null
@@ -1,335 +0,0 @@
-use std::time::Duration;
-
-use bitcoin::{Address, Amount};
-use bitvm::bridge::{
-    client::client::BitVMClient,
-    contexts::depositor::DepositorContext,
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::{generate_pay_to_pubkey_script, generate_pay_to_pubkey_script_address},
-    transactions::base::{Input, InputWithScript},
-};
-use tokio::time::sleep;
-
-use crate::bridge::{
-    helper::{generate_stub_outpoint, verify_funding_inputs, TX_WAIT_TIME},
-    setup::setup_test,
-};
-
-#[tokio::test]
-async fn test_musig2_peg_out_take_1() {
-    let with_kick_off_2_tx = false;
-    let with_challenge_tx = false;
-    let with_assert_tx = false;
-    let (mut depositor_operator_verifier_0_client, _, peg_out_graph_id, _) =
-        create_peg_out_graph(with_kick_off_2_tx, with_challenge_tx, with_assert_tx).await;
-
-    depositor_operator_verifier_0_client.sync().await;
-    depositor_operator_verifier_0_client
-        .broadcast_take_1(&peg_out_graph_id)
-        .await;
-}
-
-#[tokio::test]
-async fn test_musig2_peg_out_take_2() {
-    let with_kick_off_2_tx = true;
-    let with_challenge_tx = false;
-    let with_assert_tx = true;
-    let (mut depositor_operator_verifier_0_client, _, peg_out_graph_id, _) =
-        create_peg_out_graph(with_kick_off_2_tx, with_challenge_tx, with_assert_tx).await;
-
-    eprintln!("Broadcasting take 2...");
-    depositor_operator_verifier_0_client.sync().await;
-    depositor_operator_verifier_0_client
-        .broadcast_take_2(&peg_out_graph_id)
-        .await;
-}
-
-#[tokio::test]
-async fn test_musig2_start_time_timeout() {
-    let with_kick_off_2_tx = false;
-    let with_challenge_tx = false;
-    let with_assert_tx = false;
-    let (mut depositor_operator_verifier_0_client, _, peg_out_graph_id, depositor_context) =
-        create_peg_out_graph(with_kick_off_2_tx, with_challenge_tx, with_assert_tx).await;
-
-    depositor_operator_verifier_0_client.sync().await;
-    depositor_operator_verifier_0_client
-        .broadcast_start_time_timeout(
-            &peg_out_graph_id,
-            generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
-        )
-        .await;
-}
-
-#[tokio::test]
-async fn test_musig2_kick_off_timeout() {
-    let with_kick_off_2_tx = false;
-    let with_challenge_tx = false;
-    let with_assert_tx = false;
-    let (mut depositor_operator_verifier_0_client, _, peg_out_graph_id, depositor_context) =
-        create_peg_out_graph(with_kick_off_2_tx, with_challenge_tx, with_assert_tx).await;
-
-    depositor_operator_verifier_0_client.sync().await;
-    depositor_operator_verifier_0_client
-        .broadcast_kick_off_timeout(
-            &peg_out_graph_id,
-            generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
-        )
-        .await;
-}
-
-#[tokio::test]
-async fn test_musig2_peg_out_disprove_with_challenge() {
-    let with_kick_off_2_tx = true;
-    let with_challenge_tx = true;
-    let with_assert_tx = true;
-    let (mut depositor_operator_verifier_0_client, _, peg_out_graph_id, depositor_context) =
-        create_peg_out_graph(with_kick_off_2_tx, with_challenge_tx, with_assert_tx).await;
-
-    depositor_operator_verifier_0_client.sync().await;
-    depositor_operator_verifier_0_client
-        .broadcast_disprove(
-            &peg_out_graph_id,
-            1,
-            generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
-        )
-        .await;
-}
-
-#[tokio::test]
-async fn test_musig2_peg_out_disprove_chain_with_challenge() {
-    let with_kick_off_2_tx = true;
-    let with_challenge_tx = true;
-    let with_assert_tx = false;
-    let (mut depositor_operator_verifier_0_client, _, peg_out_graph_id, depositor_context) =
-        create_peg_out_graph(with_kick_off_2_tx, with_challenge_tx, with_assert_tx).await;
-
-    depositor_operator_verifier_0_client.sync().await;
-    depositor_operator_verifier_0_client
-        .broadcast_disprove_chain(
-            &peg_out_graph_id,
-            generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
-        )
-        .await;
-}
-
-async fn create_peg_out_graph(
-    with_kick_off_2_tx: bool,
-    with_challenge_tx: bool,
-    with_assert_tx: bool,
-) -> (BitVMClient, BitVMClient, String, DepositorContext) {
-    let (
-        mut depositor_operator_verifier_0_client,
-        mut verifier_1_client,
-        depositor_context,
-        operator_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    // verify funding inputs
-    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
-
-    let deposit_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let deposit_funding_address = generate_pay_to_pubkey_script_address(
-        depositor_context.network,
-        &depositor_context.depositor_public_key,
-    );
-    funding_inputs.push((&deposit_funding_address, deposit_input_amount));
-
-    let kick_off_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let kick_off_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
-    );
-    funding_inputs.push((&kick_off_funding_utxo_address, kick_off_input_amount));
-
-    let challenge_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let challenge_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        depositor_context.network,
-        &depositor_context.depositor_public_key,
-    );
-    if with_challenge_tx {
-        funding_inputs.push((&challenge_funding_utxo_address, challenge_input_amount));
-    }
-
-    verify_funding_inputs(&depositor_operator_verifier_0_client, &funding_inputs).await;
-
-    let kick_off_outpoint = generate_stub_outpoint(
-        &depositor_operator_verifier_0_client,
-        &kick_off_funding_utxo_address,
-        kick_off_input_amount,
-    )
-    .await;
-
-    eprintln!("Creating peg-in graph...");
-    // create and complete peg-in graph
-    let peg_in_graph_id = create_peg_in_graph(
-        &mut depositor_operator_verifier_0_client,
-        &mut verifier_1_client,
-        deposit_funding_address,
-        deposit_input_amount,
-        &depositor_evm_address,
-    )
-    .await;
-
-    eprintln!("Creating peg-out graph...");
-    depositor_operator_verifier_0_client.sync().await;
-    let peg_out_graph_id = depositor_operator_verifier_0_client
-        .create_peg_out_graph(
-            &peg_in_graph_id,
-            Input {
-                outpoint: kick_off_outpoint,
-                amount: kick_off_input_amount,
-            },
-        )
-        .await;
-
-    eprintln!("Verifier 0 push peg-out nonces");
-    depositor_operator_verifier_0_client.push_peg_out_nonces(&peg_out_graph_id);
-    depositor_operator_verifier_0_client.flush().await;
-
-    eprintln!("Verifier 1 push peg-out nonces");
-    verifier_1_client.sync().await;
-    verifier_1_client.push_peg_out_nonces(&peg_out_graph_id);
-    verifier_1_client.flush().await;
-
-    eprintln!("Verifier 0 pre-sign peg-out");
-    depositor_operator_verifier_0_client.sync().await;
-    depositor_operator_verifier_0_client.pre_sign_peg_out(&peg_out_graph_id);
-    depositor_operator_verifier_0_client.flush().await;
-
-    eprintln!("Verifier 1 pre-sign peg-out");
-    verifier_1_client.sync().await;
-    verifier_1_client.pre_sign_peg_out(&peg_out_graph_id);
-    verifier_1_client.flush().await;
-
-    eprintln!("Broadcasting kick-off 1...");
-    depositor_operator_verifier_0_client.sync().await;
-    depositor_operator_verifier_0_client
-        .broadcast_kick_off_1(&peg_out_graph_id)
-        .await;
-
-    // Wait for peg-in deposit transaction to be mined
-    println!("Waiting for peg-out kick-off tx...");
-    sleep(Duration::from_secs(TX_WAIT_TIME)).await;
-
-    if with_kick_off_2_tx {
-        eprintln!("Broadcasting start time...");
-        depositor_operator_verifier_0_client
-            .broadcast_start_time(&peg_out_graph_id)
-            .await;
-
-        println!("Waiting for peg-out start time tx...");
-        sleep(Duration::from_secs(TX_WAIT_TIME)).await;
-
-        eprintln!("Broadcasting kick-off 2...");
-        depositor_operator_verifier_0_client
-            .broadcast_kick_off_2(&peg_out_graph_id)
-            .await;
-
-        println!("Waiting for peg-out kick-off 2 tx...");
-        sleep(Duration::from_secs(TX_WAIT_TIME)).await;
-    }
-
-    if with_challenge_tx {
-        let challenge_funding_outpoint = generate_stub_outpoint(
-            &depositor_operator_verifier_0_client,
-            &challenge_funding_utxo_address,
-            challenge_input_amount,
-        )
-        .await;
-        let challenge_crowdfunding_input = InputWithScript {
-            outpoint: challenge_funding_outpoint,
-            amount: challenge_input_amount,
-            script: &generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
-        };
-        eprintln!("Broadcasting challenge...");
-        depositor_operator_verifier_0_client
-            .broadcast_challenge(
-                &peg_out_graph_id,
-                &vec![challenge_crowdfunding_input],
-                generate_pay_to_pubkey_script(&depositor_context.depositor_public_key),
-            )
-            .await;
-
-        println!("Waiting for peg-out challenge tx...");
-        sleep(Duration::from_secs(TX_WAIT_TIME)).await;
-    }
-
-    if with_assert_tx {
-        eprintln!("Broadcasting assert...");
-        depositor_operator_verifier_0_client
-            .broadcast_assert(&peg_out_graph_id)
-            .await;
-
-        println!("Waiting for peg-out assert tx...");
-        sleep(Duration::from_secs(TX_WAIT_TIME)).await;
-    }
-
-    return (
-        depositor_operator_verifier_0_client,
-        verifier_1_client,
-        peg_out_graph_id,
-        depositor_context,
-    );
-}
-
-async fn create_peg_in_graph(
-    client_0: &mut BitVMClient,
-    client_1: &mut BitVMClient,
-    deposit_funding_address: Address,
-    deposit_amount: Amount,
-    depositor_evm_address: &String,
-) -> String {
-    let deposit_outpoint =
-        generate_stub_outpoint(client_0, &deposit_funding_address, deposit_amount).await;
-    let graph_id = client_0
-        .create_peg_in_graph(
-            Input {
-                outpoint: deposit_outpoint,
-                amount: deposit_amount,
-            },
-            depositor_evm_address,
-        )
-        .await;
-
-    client_0.broadcast_peg_in_deposit(&graph_id).await;
-    client_0.push_peg_in_nonces(&graph_id);
-    client_0.flush().await;
-
-    client_1.sync().await;
-    client_1.push_peg_in_nonces(&graph_id);
-    client_1.flush().await;
-
-    client_0.sync().await;
-    client_0.pre_sign_peg_in(&graph_id);
-    client_0.flush().await;
-
-    client_1.sync().await;
-    client_1.pre_sign_peg_in(&graph_id);
-    client_1.flush().await;
-
-    // Wait for peg-in deposit transaction to be mined
-    println!("Waiting for peg-in deposit tx...");
-    sleep(Duration::from_secs(TX_WAIT_TIME)).await;
-
-    client_0.sync().await;
-    client_0.broadcast_peg_in_confirm(&graph_id).await;
-    client_0.flush().await;
-
-    return graph_id;
-}
diff --git a/tests/bridge/client/sync.rs b/tests/bridge/client/sync.rs
deleted file mode 100644
index 0af6a1516..000000000
--- a/tests/bridge/client/sync.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use bitcoin::Amount;
-
-use bitvm::bridge::{
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
-    transactions::base::Input,
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_sync() {
-    let (
-        mut client,
-        _,
-        depositor_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    println!("Read from remote");
-    client.sync().await;
-
-    println!("Modify data and save");
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT + 1);
-    let outpoint = generate_stub_outpoint(
-        &client,
-        &generate_pay_to_pubkey_script_address(
-            depositor_context.network,
-            &depositor_context.depositor_public_key,
-        ),
-        amount,
-    )
-    .await;
-
-    let peg_in_graph_id = client
-        .create_peg_in_graph(Input { outpoint, amount }, &depositor_evm_address)
-        .await;
-
-    client
-        .create_peg_out_graph(
-            &peg_in_graph_id,
-            Input {
-                outpoint: generate_stub_outpoint(
-                    &client,
-                    &generate_pay_to_pubkey_script_address(
-                        depositor_context.network,
-                        &depositor_context.depositor_public_key,
-                    ),
-                    amount,
-                )
-                .await,
-                amount,
-            },
-        )
-        .await;
-
-    println!("Save to remote");
-    client.flush().await;
-}
diff --git a/tests/bridge/disprove/disprove.rs b/tests/bridge/disprove/disprove.rs
deleted file mode 100644
index 664130af7..000000000
--- a/tests/bridge/disprove/disprove.rs
+++ /dev/null
@@ -1,160 +0,0 @@
-#[cfg(test)]
-mod tests {
-
-    use bitcoin::{
-        consensus::encode::serialize_hex, key::Keypair, Amount, Network, PrivateKey, PublicKey,
-        TxOut,
-    };
-
-    use bitvm::bridge::{
-        connectors::connector::TaprootConnector,
-        graphs::base::{DUST_AMOUNT, FEE_AMOUNT, INITIAL_AMOUNT},
-        scripts::generate_pay_to_pubkey_script,
-        transactions::{
-            base::{BaseTransaction, Input},
-            disprove::DisproveTransaction,
-        },
-    };
-
-    use super::super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-    #[tokio::test]
-    async fn test_should_be_able_to_submit_disprove_tx_successfully() {
-        let (
-            client,
-            _,
-            _,
-            operator_context,
-            verifier_0_context,
-            verifier_1_context,
-            _,
-            _,
-            _,
-            connector_c,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-        ) = setup_test().await;
-
-        let amount_0 = Amount::from_sat(DUST_AMOUNT);
-        let outpoint_0 =
-            generate_stub_outpoint(&client, &connector_c.generate_taproot_address(), amount_0)
-                .await;
-
-        let amount_1 = Amount::from_sat(INITIAL_AMOUNT);
-        let outpoint_1 =
-            generate_stub_outpoint(&client, &connector_c.generate_taproot_address(), amount_1)
-                .await;
-
-        let mut disprove_tx = DisproveTransaction::new(
-            &operator_context,
-            Input {
-                outpoint: outpoint_0,
-                amount: amount_0,
-            },
-            Input {
-                outpoint: outpoint_1,
-                amount: amount_1,
-            },
-            1,
-        );
-
-        let secret_nonces_0 = disprove_tx.push_nonces(&verifier_0_context);
-        let secret_nonces_1 = disprove_tx.push_nonces(&verifier_1_context);
-
-        disprove_tx.pre_sign(&verifier_0_context, &secret_nonces_0);
-        disprove_tx.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-        let tx = disprove_tx.finalize();
-        println!("Script Path Spend Transaction: {:?}\n", tx);
-        let result = client.esplora.broadcast(&tx).await;
-        println!("Txid: {:?}", tx.compute_txid());
-        println!("Broadcast result: {:?}\n", result);
-        println!("Transaction hex: \n{}", serialize_hex(&tx));
-        assert!(result.is_ok());
-    }
-
-    #[tokio::test]
-    async fn test_should_be_able_to_submit_disprove_tx_with_verifier_added_to_output_successfully()
-    {
-        let (
-            client,
-            _,
-            _,
-            operator_context,
-            verifier_0_context,
-            verifier_1_context,
-            _,
-            _,
-            _,
-            connector_c,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-        ) = setup_test().await;
-
-        let amount_0 = Amount::from_sat(DUST_AMOUNT);
-        let outpoint_0 =
-            generate_stub_outpoint(&client, &connector_c.generate_taproot_address(), amount_0)
-                .await;
-
-        let amount_1 = Amount::from_sat(INITIAL_AMOUNT);
-        let outpoint_1 =
-            generate_stub_outpoint(&client, &connector_c.generate_taproot_address(), amount_1)
-                .await;
-
-        let mut disprove_tx = DisproveTransaction::new(
-            &operator_context,
-            Input {
-                outpoint: outpoint_0,
-                amount: amount_0,
-            },
-            Input {
-                outpoint: outpoint_1,
-                amount: amount_1,
-            },
-            1,
-        );
-
-        let secret_nonces_0 = disprove_tx.push_nonces(&verifier_0_context);
-        let secret_nonces_1 = disprove_tx.push_nonces(&verifier_1_context);
-
-        disprove_tx.pre_sign(&verifier_0_context, &secret_nonces_0);
-        disprove_tx.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-        let mut tx = disprove_tx.finalize();
-
-        let secp = verifier_0_context.secp;
-        let verifier_secret: &str =
-            "aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffff1234";
-        let verifier_keypair = Keypair::from_seckey_str(&secp, verifier_secret).unwrap();
-        let verifier_private_key = PrivateKey::new(verifier_keypair.secret_key(), Network::Testnet);
-        let verifier_pubkey = PublicKey::from_private_key(&secp, &verifier_private_key);
-
-        let verifier_output = TxOut {
-            value: (Amount::from_sat(INITIAL_AMOUNT) - Amount::from_sat(FEE_AMOUNT)) / 2,
-            script_pubkey: generate_pay_to_pubkey_script(&verifier_pubkey),
-        };
-
-        tx.output.push(verifier_output);
-
-        println!("Script Path Spend Transaction: {:?}\n", tx);
-        let result = client.esplora.broadcast(&tx).await;
-        println!("Txid: {:?}", tx.compute_txid());
-        println!("Broadcast result: {:?}\n", result);
-        println!("Transaction hex: \n{}", serialize_hex(&tx));
-        assert!(result.is_ok());
-    }
-}
diff --git a/tests/bridge/disprove_chain/disprove_chain.rs b/tests/bridge/disprove_chain/disprove_chain.rs
deleted file mode 100644
index 14f6ff323..000000000
--- a/tests/bridge/disprove_chain/disprove_chain.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-#[cfg(test)]
-mod tests {
-
-    use bitcoin::{
-        consensus::encode::serialize_hex, key::Keypair, Amount, PrivateKey, PublicKey, TxOut,
-    };
-
-    use bitvm::bridge::{
-        connectors::connector::TaprootConnector,
-        graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-        scripts::generate_pay_to_pubkey_script,
-        transactions::{
-            base::{BaseTransaction, Input},
-            disprove_chain::DisproveChainTransaction,
-        },
-    };
-
-    use super::super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-    #[tokio::test]
-    async fn test_should_be_able_to_submit_disprove_chain_tx_successfully() {
-        let (
-            client,
-            _,
-            _,
-            operator_context,
-            verifier_0_context,
-            verifier_1_context,
-            _,
-            _,
-            connector_b,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-        ) = setup_test().await;
-
-        let amount = Amount::from_sat(INITIAL_AMOUNT);
-        let outpoint =
-            generate_stub_outpoint(&client, &connector_b.generate_taproot_address(), amount).await;
-
-        let mut disprove_chain_tx =
-            DisproveChainTransaction::new(&operator_context, Input { outpoint, amount });
-
-        let secret_nonces_0 = disprove_chain_tx.push_nonces(&verifier_0_context);
-        let secret_nonces_1 = disprove_chain_tx.push_nonces(&verifier_1_context);
-
-        disprove_chain_tx.pre_sign(&verifier_0_context, &secret_nonces_0);
-        disprove_chain_tx.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-        let tx = disprove_chain_tx.finalize();
-        println!("Script Path Spend Transaction: {:?}\n", tx);
-
-        let result = client.esplora.broadcast(&tx).await;
-        println!("Txid: {:?}", tx.compute_txid());
-        println!("Broadcast result: {:?}\n", result);
-        println!("Transaction hex: \n{}", serialize_hex(&tx));
-        assert!(result.is_ok());
-    }
-
-    #[tokio::test]
-    async fn test_should_be_able_to_submit_disprove_chain_tx_with_verifier_added_to_output_successfully(
-    ) {
-        let (
-            client,
-            _,
-            _,
-            operator_context,
-            verifier_0_context,
-            verifier_1_context,
-            _,
-            _,
-            connector_b,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-            _,
-        ) = setup_test().await;
-
-        let amount = Amount::from_sat(INITIAL_AMOUNT);
-        let outpoint =
-            generate_stub_outpoint(&client, &connector_b.generate_taproot_address(), amount).await;
-
-        let mut disprove_chain_tx =
-            DisproveChainTransaction::new(&operator_context, Input { outpoint, amount });
-
-        let secret_nonces_0 = disprove_chain_tx.push_nonces(&verifier_0_context);
-        let secret_nonces_1 = disprove_chain_tx.push_nonces(&verifier_1_context);
-
-        disprove_chain_tx.pre_sign(&verifier_0_context, &secret_nonces_0);
-        disprove_chain_tx.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-        let mut tx = disprove_chain_tx.finalize();
-
-        let secp = verifier_0_context.secp;
-        let verifier_secret: &str =
-            "aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffff1234";
-        let verifier_keypair = Keypair::from_seckey_str(&secp, verifier_secret).unwrap();
-        let verifier_private_key =
-            PrivateKey::new(verifier_keypair.secret_key(), verifier_0_context.network);
-        let verifier_pubkey = PublicKey::from_private_key(&secp, &verifier_private_key);
-
-        let verifier_output = TxOut {
-            value: (Amount::from_sat(INITIAL_AMOUNT) - Amount::from_sat(FEE_AMOUNT)) * 5 / 100,
-            script_pubkey: generate_pay_to_pubkey_script(&verifier_pubkey),
-        };
-
-        tx.output.push(verifier_output);
-
-        println!("Script Path Spend Transaction: {:?}\n", tx);
-
-        let result = client.esplora.broadcast(&tx).await;
-        println!("Txid: {:?}", tx.compute_txid());
-        println!("Broadcast result: {:?}\n", result);
-        println!("Transaction hex: \n{}", serialize_hex(&tx));
-        assert!(result.is_ok());
-    }
-}
diff --git a/tests/bridge/helper.rs b/tests/bridge/helper.rs
deleted file mode 100644
index 4bb6063f7..000000000
--- a/tests/bridge/helper.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use bitcoin::{Address, Amount, OutPoint, Txid};
-
-use bitvm::bridge::client::client::BitVMClient;
-use esplora_client::Builder;
-use serde::{Deserialize, Serialize};
-
-pub const TX_WAIT_TIME: u64 = 45; // in seconds
-pub const ESPLORA_FUNDING_URL: &str = "https://faucet.mutinynet.com/";
-
-pub async fn generate_stub_outpoint(
-    client: &BitVMClient,
-    funding_utxo_address: &Address,
-    input_value: Amount,
-) -> OutPoint {
-    let funding_utxo = client
-        .get_initial_utxo(funding_utxo_address.clone(), input_value)
-        .await
-        .unwrap_or_else(|| {
-            panic!(
-                "Fund {:?} with {} sats at https://faucet.mutinynet.com/",
-                funding_utxo_address,
-                input_value.to_sat()
-            );
-        });
-    OutPoint {
-        txid: funding_utxo.txid,
-        vout: funding_utxo.vout,
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-struct FundResult {
-    txid: Txid,
-    address: String,
-}
-
-pub async fn fund_utxo(address: &Address, amount: Amount) -> Txid {
-    println!(
-        "Funding {:?} with {} sats at https://faucet.mutinynet.com/",
-        address,
-        amount.to_sat()
-    );
-    let esplora = Builder::new(ESPLORA_FUNDING_URL)
-        .build_async()
-        .expect("Could not build esplora client");
-    let payload = format!(
-        "{{\"sats\":{},\"address\":\"{}\"}}",
-        amount.to_sat(),
-        address
-    );
-    let resp = esplora
-        .client()
-        .post(format!("{}api/onchain", ESPLORA_FUNDING_URL))
-        .body(payload)
-        .header("CONTENT-TYPE", "application/json")
-        .send()
-        .await
-        .unwrap_or_else(|e| {
-            panic!("Could not fund {} due to {:?}", address, e);
-        });
-    if resp.status().is_client_error() || resp.status().is_server_error() {
-        panic!(
-            "Could not fund {} with respond code {:?}",
-            address,
-            resp.status()
-        );
-    }
-
-    let result = resp.json::<FundResult>().await.unwrap();
-    println!("Funded at: {}", result.txid);
-
-    result.txid
-}
-
-pub async fn verify_funding_inputs(client: &BitVMClient, funding_inputs: &Vec<(&Address, Amount)>) {
-    let mut inputs_to_fund: Vec<(&Address, Amount)> = vec![];
-
-    for funding_input in funding_inputs {
-        if client
-            .get_initial_utxo(funding_input.0.clone(), funding_input.1)
-            .await
-            .is_none()
-        {
-            inputs_to_fund.push((funding_input.0, funding_input.1));
-        }
-    }
-
-    for input_to_fund in inputs_to_fund.clone() {
-        println!(
-            "Fund {:?} with {} sats at https://faucet.mutinynet.com/",
-            input_to_fund.0,
-            input_to_fund.1.to_sat()
-        );
-    }
-    if inputs_to_fund.len() > 0 {
-        panic!("You need to fund {} addresses first.", inputs_to_fund.len());
-    }
-}
diff --git a/tests/bridge/integration/chain/mod.rs b/tests/bridge/integration/chain/mod.rs
deleted file mode 100644
index 9295ce8eb..000000000
--- a/tests/bridge/integration/chain/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod peg_out;
diff --git a/tests/bridge/integration/chain/peg_out.rs b/tests/bridge/integration/chain/peg_out.rs
deleted file mode 100644
index 7416f897c..000000000
--- a/tests/bridge/integration/chain/peg_out.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use std::time::Duration;
-
-use alloy::{primitives::Address as EvmAddress, transports::http::reqwest::Url};
-use bitcoin::Amount;
-
-use bitvm::bridge::{
-    client::chain::{chain::Chain, ethereum::EthereumInitConfig},
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
-    transactions::{
-        base::{BaseTransaction, Input},
-        peg_out::PegOutTransaction,
-    },
-};
-use tokio::time::sleep;
-
-use crate::bridge::{
-    helper::{fund_utxo, generate_stub_outpoint},
-    setup::setup_test,
-};
-
-#[tokio::test]
-async fn test_peg_out_for_chain() {
-    let (
-        client,
-        _,
-        _,
-        operator_context,
-        _,
-        _,
-        withdrawer_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-    ) = setup_test().await;
-    let mut adaptors = Chain::new();
-    adaptors.init_ethereum(EthereumInitConfig {
-        rpc_url: "http://127.0.0.1:8545".parse::<Url>().unwrap(),
-        bridge_address: "0x76d05F58D14c0838EC630C8140eDC5aB7CD159Dc"
-            .parse::<EvmAddress>()
-            .unwrap(),
-        bridge_creation_block: 20588300,
-    });
-    let events_result = adaptors.get_peg_out_init().await;
-    assert!(events_result.as_ref().is_ok_and(|x| x.len() > 0));
-
-    let peg_out_event = events_result.unwrap().pop().unwrap();
-
-    let input_amount_raw = INITIAL_AMOUNT + FEE_AMOUNT;
-    let operator_input_amount = Amount::from_sat(input_amount_raw);
-
-    let operator_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
-    );
-    println!(
-        "operator_funding_utxo_address: {:?}",
-        operator_funding_utxo_address
-    );
-
-    fund_utxo(&operator_funding_utxo_address, operator_input_amount).await;
-    sleep(Duration::from_secs(5)).await;
-
-    let operator_funding_outpoint = generate_stub_outpoint(
-        &client,
-        &operator_funding_utxo_address,
-        operator_input_amount,
-    )
-    .await;
-    println!(
-        "operator_funding_utxo.txid: {:?}",
-        operator_funding_outpoint.txid
-    );
-    let operator_input = Input {
-        outpoint: operator_funding_outpoint,
-        amount: operator_input_amount,
-    };
-
-    let peg_out = PegOutTransaction::new(
-        &operator_context,
-        &withdrawer_context.withdrawer_public_key,
-        &peg_out_event.withdrawer_chain_address,
-        peg_out_event.timestamp,
-        operator_input,
-    );
-
-    let peg_out_tx = peg_out.finalize();
-    let peg_out_tx_id = peg_out_tx.compute_txid();
-
-    // mine peg-out
-    let peg_out_result = client.esplora.broadcast(&peg_out_tx).await;
-    println!("Peg Out Tx result: {:?}", peg_out_result);
-    assert!(peg_out_result.is_ok());
-    println!("Peg Out Txid: {:?}", peg_out_tx_id);
-}
diff --git a/tests/bridge/integration/peg_in/peg_in.rs b/tests/bridge/integration/peg_in/peg_in.rs
deleted file mode 100644
index ccaa6ad2e..000000000
--- a/tests/bridge/integration/peg_in/peg_in.rs
+++ /dev/null
@@ -1,294 +0,0 @@
-use std::time::Duration;
-
-use bitcoin::{Amount, OutPoint};
-
-use bitvm::bridge::{
-    connectors::{connector::TaprootConnector, connector_0::Connector0},
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
-    transactions::{
-        base::{BaseTransaction, Input},
-        peg_in_confirm::PegInConfirmTransaction,
-        peg_in_deposit::PegInDepositTransaction,
-        peg_in_refund::PegInRefundTransaction,
-    },
-};
-use esplora_client::Error;
-use tokio::time::sleep;
-
-use crate::bridge::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_peg_in_success() {
-    let (
-        client,
-        _,
-        depositor_context,
-        _,
-        verifier_0_context,
-        verifier_1_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    let input_amount_raw = INITIAL_AMOUNT + FEE_AMOUNT * 2;
-    let deposit_input_amount = Amount::from_sat(input_amount_raw);
-
-    // peg-in deposit
-    let deposit_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        depositor_context.network,
-        &depositor_context.depositor_public_key,
-    );
-    let deposit_funding_outpoint =
-        generate_stub_outpoint(&client, &deposit_funding_utxo_address, deposit_input_amount).await;
-    let deposit_input = Input {
-        outpoint: deposit_funding_outpoint,
-        amount: deposit_input_amount,
-    };
-
-    let peg_in_deposit =
-        PegInDepositTransaction::new(&depositor_context, &depositor_evm_address, deposit_input);
-
-    let peg_in_deposit_tx = peg_in_deposit.finalize();
-    let deposit_txid = peg_in_deposit_tx.compute_txid();
-
-    // mine peg-in deposit
-    let deposit_result = client.esplora.broadcast(&peg_in_deposit_tx).await;
-    assert!(deposit_result.is_ok());
-    println!("Deposit Txid: {:?}", deposit_txid);
-
-    // peg-in confirm
-    let output_index = 0;
-    let confirm_funding_outpoint = OutPoint {
-        txid: deposit_txid,
-        vout: output_index,
-    };
-    let confirm_input = Input {
-        outpoint: confirm_funding_outpoint,
-        amount: peg_in_deposit_tx.output[output_index as usize].value,
-    };
-    let mut peg_in_confirm =
-        PegInConfirmTransaction::new(&depositor_context, &depositor_evm_address, confirm_input);
-
-    let secret_nonces_0 = peg_in_confirm.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = peg_in_confirm.push_nonces(&verifier_1_context);
-
-    peg_in_confirm.pre_sign(&verifier_0_context, &secret_nonces_0);
-    peg_in_confirm.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let peg_in_confirm_tx = peg_in_confirm.finalize();
-    let confirm_txid = peg_in_confirm_tx.compute_txid();
-
-    // mine peg-in confirm
-    let confirm_result = client.esplora.broadcast(&peg_in_confirm_tx).await;
-    assert!(confirm_result.is_ok());
-    println!("Confirm Txid: {:?}", confirm_txid);
-
-    // multi-sig balance
-    let connector_0 = Connector0::new(
-        depositor_context.network,
-        &depositor_context.n_of_n_taproot_public_key,
-    );
-    let multi_sig_address = connector_0.generate_taproot_address();
-    let multi_sig_utxos = client
-        .esplora
-        .get_address_utxo(multi_sig_address.clone())
-        .await
-        .unwrap();
-    let multi_sig_utxo = multi_sig_utxos
-        .clone()
-        .into_iter()
-        .find(|x| x.txid == confirm_txid);
-
-    // assert
-    assert!(multi_sig_utxo.is_some());
-    assert_eq!(
-        multi_sig_utxo.unwrap().value,
-        peg_in_confirm_tx.output[0].value,
-    );
-    assert_eq!(
-        peg_in_confirm_tx.output[0].value,
-        Amount::from_sat(INITIAL_AMOUNT),
-    );
-}
-
-#[tokio::test]
-async fn test_peg_in_time_lock_not_surpassed() {
-    let (
-        client,
-        _,
-        depositor_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    let input_amount_raw = INITIAL_AMOUNT + FEE_AMOUNT * 2;
-    let deposit_input_amount = Amount::from_sat(input_amount_raw);
-
-    // peg-in deposit
-    let deposit_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        depositor_context.network,
-        &depositor_context.depositor_public_key,
-    );
-    let deposit_funding_outpoint =
-        generate_stub_outpoint(&client, &deposit_funding_utxo_address, deposit_input_amount).await;
-    let deposit_input = Input {
-        outpoint: deposit_funding_outpoint,
-        amount: deposit_input_amount,
-    };
-
-    let peg_in_deposit =
-        PegInDepositTransaction::new(&depositor_context, &depositor_evm_address, deposit_input);
-    let peg_in_deposit_tx = peg_in_deposit.finalize();
-    let deposit_txid = peg_in_deposit_tx.compute_txid();
-
-    // mine peg-in deposit
-    let deposit_result = client.esplora.broadcast(&peg_in_deposit_tx).await;
-    assert!(deposit_result.is_ok());
-
-    // peg-in refund
-    let output_index = 0;
-    let refund_funding_outpoint = OutPoint {
-        txid: deposit_txid,
-        vout: output_index,
-    };
-    let refund_input = Input {
-        outpoint: refund_funding_outpoint,
-        amount: peg_in_deposit_tx.output[output_index as usize].value,
-    };
-    let peg_in_refund =
-        PegInRefundTransaction::new(&depositor_context, &depositor_evm_address, refund_input);
-    let peg_in_refund_tx = peg_in_refund.finalize();
-
-    // mine peg-in refund
-    let refund_result = client.esplora.broadcast(&peg_in_refund_tx).await;
-    assert!(refund_result.is_err());
-    let error = refund_result.unwrap_err();
-    let expected_error = Error::HttpResponse {
-        status: 400,
-        message: String::from(
-            "sendrawtransaction RPC error: {\"code\":-26,\"message\":\"non-BIP68-final\"}",
-        ), // indicates that relative timelock based on sequence numbers has not elapsed
-    };
-    assert_eq!(error.to_string(), expected_error.to_string());
-}
-
-#[tokio::test]
-async fn test_peg_in_time_lock_surpassed() {
-    let (
-        client,
-        _,
-        depositor_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    let input_amount_raw = INITIAL_AMOUNT + FEE_AMOUNT * 2;
-    let deposit_input_amount = Amount::from_sat(input_amount_raw);
-
-    // peg-in deposit
-    let deposit_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        depositor_context.network,
-        &depositor_context.depositor_public_key,
-    );
-    let deposit_funding_outpoint =
-        generate_stub_outpoint(&client, &deposit_funding_utxo_address, deposit_input_amount).await;
-    let deposit_input = Input {
-        outpoint: deposit_funding_outpoint,
-        amount: deposit_input_amount,
-    };
-
-    let peg_in_deposit =
-        PegInDepositTransaction::new(&depositor_context, &depositor_evm_address, deposit_input);
-    let peg_in_deposit_tx = peg_in_deposit.finalize();
-    let deposit_txid = peg_in_deposit_tx.compute_txid();
-
-    // mine peg-in deposit
-    let deposit_result = client.esplora.broadcast(&peg_in_deposit_tx).await;
-    assert!(deposit_result.is_ok());
-
-    // peg-in refund
-    let output_index = 0;
-    let refund_funding_outpoint = OutPoint {
-        txid: deposit_txid,
-        vout: output_index,
-    };
-    let refund_input = Input {
-        outpoint: refund_funding_outpoint,
-        amount: peg_in_deposit_tx.output[output_index as usize].value,
-    };
-    let peg_in_refund =
-        PegInRefundTransaction::new(&depositor_context, &depositor_evm_address, refund_input);
-    let peg_in_refund_tx = peg_in_refund.finalize();
-    let refund_txid = peg_in_refund_tx.compute_txid();
-
-    // mine peg-in refund
-    sleep(Duration::from_secs(60)).await; // TODO: check if this can be refactored to drop waiting
-    let refund_result = client.esplora.broadcast(&peg_in_refund_tx).await;
-    assert!(refund_result.is_ok());
-
-    // depositor balance
-    let depositor_address = generate_pay_to_pubkey_script_address(
-        depositor_context.network,
-        &depositor_context.depositor_public_key,
-    );
-    let depositor_utxos = client
-        .esplora
-        .get_address_utxo(depositor_address.clone())
-        .await
-        .unwrap();
-    let depositor_utxo = depositor_utxos
-        .clone()
-        .into_iter()
-        .find(|x| x.txid == refund_txid);
-
-    // assert
-    assert!(depositor_utxo.is_some());
-    assert_eq!(
-        depositor_utxo.unwrap().value,
-        peg_in_refund_tx.output[0].value
-    );
-    assert_eq!(
-        peg_in_refund_tx.output[0].value,
-        Amount::from_sat(INITIAL_AMOUNT),
-    );
-}
diff --git a/tests/bridge/integration/peg_out/disprove.rs b/tests/bridge/integration/peg_out/disprove.rs
deleted file mode 100644
index 3eb4cd98b..000000000
--- a/tests/bridge/integration/peg_out/disprove.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-use bitcoin::{Address, Amount, OutPoint};
-use bitvm::bridge::{
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
-    transactions::{
-        assert::AssertTransaction,
-        base::{BaseTransaction, Input},
-        disprove::DisproveTransaction,
-    },
-};
-
-use crate::bridge::{
-    helper::verify_funding_inputs, integration::peg_out::utils::create_and_mine_kick_off_2_tx,
-    setup::setup_test,
-};
-
-#[tokio::test]
-async fn test_disprove_success() {
-    let (
-        client,
-        _,
-        _,
-        operator_context,
-        verifier_0_context,
-        verifier_1_context,
-        withdrawer_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-    ) = setup_test().await;
-
-    // verify funding inputs
-    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
-    let kick_off_2_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let kick_off_2_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
-    );
-    funding_inputs.push((&kick_off_2_funding_utxo_address, kick_off_2_input_amount));
-
-    verify_funding_inputs(&client, &funding_inputs).await;
-
-    // kick-off 2
-    let (kick_off_2_tx, kick_off_2_txid) = create_and_mine_kick_off_2_tx(
-        &client,
-        &operator_context,
-        &kick_off_2_funding_utxo_address,
-        kick_off_2_input_amount,
-    )
-    .await;
-
-    // assert
-    let vout = 1; // connector B
-    let assert_input_0 = Input {
-        outpoint: OutPoint {
-            txid: kick_off_2_txid,
-            vout,
-        },
-        amount: kick_off_2_tx.output[vout as usize].value,
-    };
-    let mut assert = AssertTransaction::new(&operator_context, assert_input_0);
-
-    let secret_nonces_0 = assert.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = assert.push_nonces(&verifier_1_context);
-
-    assert.pre_sign(&verifier_0_context, &secret_nonces_0);
-    assert.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let assert_tx = assert.finalize();
-    let assert_txid = assert_tx.compute_txid();
-    let assert_result = client.esplora.broadcast(&assert_tx).await;
-    assert!(assert_result.is_ok());
-
-    // disprove
-    let vout = 1;
-    let script_index = 1;
-    let disprove_input_0 = Input {
-        outpoint: OutPoint {
-            txid: assert_txid,
-            vout,
-        },
-        amount: assert_tx.output[vout as usize].value,
-    };
-
-    let vout = 2;
-    let disprove_input_1 = Input {
-        outpoint: OutPoint {
-            txid: assert_txid,
-            vout,
-        },
-        amount: assert_tx.output[vout as usize].value,
-    };
-
-    let mut disprove = DisproveTransaction::new(
-        &operator_context,
-        disprove_input_0,
-        disprove_input_1,
-        script_index,
-    );
-
-    let secret_nonces_0 = disprove.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = disprove.push_nonces(&verifier_1_context);
-
-    disprove.pre_sign(&verifier_0_context, &secret_nonces_0);
-    disprove.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let reward_address = generate_pay_to_pubkey_script_address(
-        withdrawer_context.network,
-        &withdrawer_context.withdrawer_public_key,
-    );
-    let verifier_reward_script = reward_address.script_pubkey(); // send reward to withdrawer address
-    disprove.add_input_output(script_index, verifier_reward_script);
-
-    let disprove_tx = disprove.finalize();
-    let disprove_txid = disprove_tx.compute_txid();
-
-    // mine disprove
-    let disprove_result = client.esplora.broadcast(&disprove_tx).await;
-    assert!(disprove_result.is_ok());
-
-    // reward balance
-    let reward_utxos = client
-        .esplora
-        .get_address_utxo(reward_address)
-        .await
-        .unwrap();
-    let reward_utxo = reward_utxos
-        .clone()
-        .into_iter()
-        .find(|x| x.txid == disprove_txid);
-
-    // assert
-    assert!(reward_utxo.is_some());
-    assert_eq!(reward_utxo.unwrap().value, disprove_tx.output[1].value);
-}
diff --git a/tests/bridge/integration/peg_out/disprove_chain.rs b/tests/bridge/integration/peg_out/disprove_chain.rs
deleted file mode 100644
index 0386c6acf..000000000
--- a/tests/bridge/integration/peg_out/disprove_chain.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use std::time::Duration;
-use tokio::time::sleep;
-
-use bitcoin::{Address, Amount, OutPoint};
-use bitvm::bridge::{
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
-    transactions::{
-        base::{BaseTransaction, Input},
-        disprove_chain::DisproveChainTransaction,
-    },
-};
-
-use crate::bridge::{
-    helper::verify_funding_inputs, integration::peg_out::utils::create_and_mine_kick_off_2_tx,
-    setup::setup_test,
-};
-
-#[tokio::test]
-async fn test_disprove_chain_success() {
-    let (
-        client,
-        _,
-        _,
-        operator_context,
-        verifier_0_context,
-        verifier_1_context,
-        withdrawer_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-    ) = setup_test().await;
-
-    // verify funding inputs
-    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
-    let kick_off_2_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let kick_off_2_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
-    );
-    funding_inputs.push((&kick_off_2_funding_utxo_address, kick_off_2_input_amount));
-
-    verify_funding_inputs(&client, &funding_inputs).await;
-
-    // kick-off 2
-    let (kick_off_2_tx, kick_off_2_txid) = create_and_mine_kick_off_2_tx(
-        &client,
-        &operator_context,
-        &kick_off_2_funding_utxo_address,
-        kick_off_2_input_amount,
-    )
-    .await;
-
-    // disprove chain
-    let vout = 1; // connector B
-    let disprove_chain_input_0 = Input {
-        outpoint: OutPoint {
-            txid: kick_off_2_txid,
-            vout,
-        },
-        amount: kick_off_2_tx.output[vout as usize].value,
-    };
-
-    let mut disprove_chain =
-        DisproveChainTransaction::new(&operator_context, disprove_chain_input_0);
-
-    let secret_nonces_0 = disprove_chain.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = disprove_chain.push_nonces(&verifier_1_context);
-
-    disprove_chain.pre_sign(&verifier_0_context, &secret_nonces_0);
-    disprove_chain.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let reward_address = generate_pay_to_pubkey_script_address(
-        withdrawer_context.network,
-        &withdrawer_context.withdrawer_public_key,
-    );
-    disprove_chain.add_output(reward_address.script_pubkey());
-
-    let disprove_chain_tx = disprove_chain.finalize();
-    let disprove_chain_txid = disprove_chain_tx.compute_txid();
-
-    // mine disprove chain
-    sleep(Duration::from_secs(60)).await;
-    let disprove_chain_result = client.esplora.broadcast(&disprove_chain_tx).await;
-    assert!(disprove_chain_result.is_ok());
-
-    // reward balance
-    let reward_utxos = client
-        .esplora
-        .get_address_utxo(reward_address)
-        .await
-        .unwrap();
-    let reward_utxo = reward_utxos
-        .clone()
-        .into_iter()
-        .find(|x| x.txid == disprove_chain_txid);
-
-    // assert
-    assert!(reward_utxo.is_some());
-    assert_eq!(
-        reward_utxo.unwrap().value,
-        disprove_chain_tx.output[1].value
-    );
-}
diff --git a/tests/bridge/integration/peg_out/kick_off_timeout.rs b/tests/bridge/integration/peg_out/kick_off_timeout.rs
deleted file mode 100644
index fd0658502..000000000
--- a/tests/bridge/integration/peg_out/kick_off_timeout.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use std::time::Duration;
-use tokio::time::sleep;
-
-use bitcoin::{Address, Amount, OutPoint};
-use bitvm::bridge::{
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
-    transactions::{
-        base::{BaseTransaction, Input},
-        kick_off_timeout::KickOffTimeoutTransaction,
-    },
-};
-
-use crate::bridge::{
-    helper::verify_funding_inputs, integration::peg_out::utils::create_and_mine_kick_off_1_tx,
-    setup::setup_test,
-};
-
-#[tokio::test]
-async fn test_kick_off_timeout_success() {
-    let (
-        client,
-        _,
-        _,
-        operator_context,
-        verifier_0_context,
-        verifier_1_context,
-        withdrawer_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-    ) = setup_test().await;
-
-    // verify funding inputs
-    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
-    let kick_off_1_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let kick_off_1_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
-    );
-    funding_inputs.push((&kick_off_1_funding_utxo_address, kick_off_1_input_amount));
-
-    verify_funding_inputs(&client, &funding_inputs).await;
-
-    // kick-off 1
-    let (kick_off_1_tx, kick_off_1_txid) = create_and_mine_kick_off_1_tx(
-        &client,
-        &operator_context,
-        &kick_off_1_funding_utxo_address,
-        kick_off_1_input_amount,
-    )
-    .await;
-
-    // kick-off timeout
-    let vout = 1; // connector 1
-    let kick_off_timeout_input_0 = Input {
-        outpoint: OutPoint {
-            txid: kick_off_1_txid,
-            vout: vout,
-        },
-        amount: kick_off_1_tx.output[vout as usize].value,
-    };
-
-    let mut kick_off_timeout =
-        KickOffTimeoutTransaction::new(&operator_context, kick_off_timeout_input_0);
-
-    let secret_nonces_0 = kick_off_timeout.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = kick_off_timeout.push_nonces(&verifier_1_context);
-
-    kick_off_timeout.pre_sign(&verifier_0_context, &secret_nonces_0);
-    kick_off_timeout.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let reward_address = generate_pay_to_pubkey_script_address(
-        withdrawer_context.network,
-        &withdrawer_context.withdrawer_public_key,
-    );
-    kick_off_timeout.add_output(reward_address.script_pubkey());
-
-    let kick_off_timeout_tx = kick_off_timeout.finalize();
-    let kick_off_timeout_txid = kick_off_timeout_tx.compute_txid();
-
-    // mine kick-off timeout
-    sleep(Duration::from_secs(60)).await;
-    let kick_off_timeout_result = client.esplora.broadcast(&kick_off_timeout_tx).await;
-    assert!(kick_off_timeout_result.is_ok());
-
-    // reward balance
-    let reward_utxos = client
-        .esplora
-        .get_address_utxo(reward_address)
-        .await
-        .unwrap();
-    let reward_utxo = reward_utxos
-        .clone()
-        .into_iter()
-        .find(|x| x.txid == kick_off_timeout_txid);
-
-    // assert
-    assert!(reward_utxo.is_some());
-    assert_eq!(
-        reward_utxo.unwrap().value,
-        kick_off_timeout_tx.output[1].value
-    );
-}
diff --git a/tests/bridge/integration/peg_out/peg_out.rs b/tests/bridge/integration/peg_out/peg_out.rs
deleted file mode 100644
index d5a7c1e80..000000000
--- a/tests/bridge/integration/peg_out/peg_out.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use bitcoin::Amount;
-
-use bitvm::bridge::{
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
-    transactions::{
-        base::{BaseTransaction, Input},
-        peg_out::PegOutTransaction,
-    },
-};
-
-use crate::bridge::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_peg_out_success() {
-    let (
-        client,
-        _,
-        _,
-        operator_context,
-        _,
-        _,
-        withdrawer_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        withdrawer_evm_address,
-    ) = setup_test().await;
-    let timestamp = 1722328130u32;
-
-    let input_amount_raw = INITIAL_AMOUNT + FEE_AMOUNT;
-    let operator_input_amount = Amount::from_sat(input_amount_raw);
-
-    let operator_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
-    );
-    println!(
-        "operator_funding_utxo_address: {:?}",
-        operator_funding_utxo_address
-    );
-    let operator_funding_outpoint = generate_stub_outpoint(
-        &client,
-        &operator_funding_utxo_address,
-        operator_input_amount,
-    )
-    .await;
-    println!(
-        "operator_funding_utxo.txid: {:?}",
-        operator_funding_outpoint.txid
-    );
-    let operator_input = Input {
-        outpoint: operator_funding_outpoint,
-        amount: operator_input_amount,
-    };
-
-    let peg_out = PegOutTransaction::new(
-        &operator_context,
-        &withdrawer_context.withdrawer_public_key,
-        &withdrawer_evm_address,
-        timestamp,
-        operator_input,
-    );
-
-    let peg_out_tx = peg_out.finalize();
-    let peg_out_txid = peg_out_tx.compute_txid();
-
-    // mine peg-out
-    let peg_out_result = client.esplora.broadcast(&peg_out_tx).await;
-    println!("Peg Out Tx result: {:?}", peg_out_result);
-    assert!(peg_out_result.is_ok());
-    println!("Peg Out Txid: {:?}", peg_out_txid);
-}
diff --git a/tests/bridge/integration/peg_out/start_time.rs b/tests/bridge/integration/peg_out/start_time.rs
deleted file mode 100644
index e93706f53..000000000
--- a/tests/bridge/integration/peg_out/start_time.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use std::time::Duration;
-use tokio::time::sleep;
-
-use bitcoin::{Address, Amount, OutPoint};
-use bitvm::bridge::{
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
-    transactions::{
-        base::{BaseTransaction, Input},
-        start_time::StartTimeTransaction,
-    },
-};
-
-use crate::bridge::{
-    helper::verify_funding_inputs, integration::peg_out::utils::create_and_mine_kick_off_1_tx,
-    setup::setup_test,
-};
-
-#[tokio::test]
-async fn test_start_time_success() {
-    let (client, _, _, operator_context, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =
-        setup_test().await;
-
-    // verify funding inputs
-    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
-    let kick_off_1_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let kick_off_1_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
-    );
-    funding_inputs.push((&kick_off_1_funding_utxo_address, kick_off_1_input_amount));
-
-    verify_funding_inputs(&client, &funding_inputs).await;
-
-    // kick-off 1
-    let (kick_off_1_tx, kick_off_1_txid) = create_and_mine_kick_off_1_tx(
-        &client,
-        &operator_context,
-        &kick_off_1_funding_utxo_address,
-        kick_off_1_input_amount,
-    )
-    .await;
-
-    // start time
-    let vout = 2;
-    let start_time_input_0 = Input {
-        outpoint: OutPoint {
-            // connector 2
-            txid: kick_off_1_txid,
-            vout,
-        },
-        amount: kick_off_1_tx.output[vout as usize].value,
-    };
-    let start_time = StartTimeTransaction::new(&operator_context, start_time_input_0);
-
-    let start_time_tx = start_time.finalize();
-
-    // mine start time
-    sleep(Duration::from_secs(60)).await;
-    let start_time_result = client.esplora.broadcast(&start_time_tx).await;
-    assert!(start_time_result.is_ok());
-}
diff --git a/tests/bridge/integration/peg_out/start_time_timeout.rs b/tests/bridge/integration/peg_out/start_time_timeout.rs
deleted file mode 100644
index 9858c3e81..000000000
--- a/tests/bridge/integration/peg_out/start_time_timeout.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-use std::time::Duration;
-use tokio::time::sleep;
-
-use bitcoin::{Address, Amount, OutPoint};
-use bitvm::bridge::{
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
-    transactions::{
-        base::{BaseTransaction, Input},
-        start_time_timeout::StartTimeTimeoutTransaction,
-    },
-};
-
-use crate::bridge::{
-    helper::verify_funding_inputs, integration::peg_out::utils::create_and_mine_kick_off_1_tx,
-    setup::setup_test,
-};
-
-#[tokio::test]
-async fn test_start_time_timeout_success() {
-    let (
-        client,
-        _,
-        _,
-        operator_context,
-        verifier_0_context,
-        verifier_1_context,
-        withdrawer_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-    ) = setup_test().await;
-
-    // verify funding inputs
-    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
-    let kick_off_1_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let kick_off_1_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
-    );
-    funding_inputs.push((&kick_off_1_funding_utxo_address, kick_off_1_input_amount));
-
-    verify_funding_inputs(&client, &funding_inputs).await;
-
-    // kick-off 1
-    let (kick_off_1_tx, kick_off_1_txid) = create_and_mine_kick_off_1_tx(
-        &client,
-        &operator_context,
-        &kick_off_1_funding_utxo_address,
-        kick_off_1_input_amount,
-    )
-    .await;
-
-    // start time timeout
-    let vout = 2; // connector 2
-    let start_time_timeout_input_0 = Input {
-        outpoint: OutPoint {
-            txid: kick_off_1_txid,
-            vout,
-        },
-        amount: kick_off_1_tx.output[vout as usize].value,
-    };
-    let vout = 1; // connector 1
-    let start_time_timeout_input_1 = Input {
-        outpoint: OutPoint {
-            txid: kick_off_1_txid,
-            vout,
-        },
-        amount: kick_off_1_tx.output[vout as usize].value,
-    };
-    let mut start_time_timeout = StartTimeTimeoutTransaction::new(
-        &operator_context,
-        start_time_timeout_input_0,
-        start_time_timeout_input_1,
-    );
-
-    let secret_nonces_0 = start_time_timeout.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = start_time_timeout.push_nonces(&verifier_1_context);
-
-    start_time_timeout.pre_sign(&verifier_0_context, &secret_nonces_0);
-    start_time_timeout.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let reward_address = generate_pay_to_pubkey_script_address(
-        withdrawer_context.network,
-        &withdrawer_context.withdrawer_public_key,
-    );
-    start_time_timeout.add_output(reward_address.script_pubkey());
-
-    let start_time_timeout_tx = start_time_timeout.finalize();
-    let start_time_timeout_txid = start_time_timeout_tx.compute_txid();
-
-    // mine start time timeout
-    sleep(Duration::from_secs(60)).await;
-    let start_time_timeout_result = client.esplora.broadcast(&start_time_timeout_tx).await;
-    assert!(start_time_timeout_result.is_ok());
-
-    // reward balance
-    let reward_utxos = client
-        .esplora
-        .get_address_utxo(reward_address)
-        .await
-        .unwrap();
-    let reward_utxo = reward_utxos
-        .clone()
-        .into_iter()
-        .find(|x| x.txid == start_time_timeout_txid);
-
-    // assert
-    assert!(reward_utxo.is_some());
-    assert_eq!(
-        reward_utxo.unwrap().value,
-        start_time_timeout_tx.output[1].value
-    );
-}
diff --git a/tests/bridge/integration/peg_out/take_1.rs b/tests/bridge/integration/peg_out/take_1.rs
deleted file mode 100644
index 6281ba15f..000000000
--- a/tests/bridge/integration/peg_out/take_1.rs
+++ /dev/null
@@ -1,176 +0,0 @@
-use std::time::Duration;
-
-use bitcoin::{Address, Amount, OutPoint};
-use bitvm::bridge::{
-    connectors::connector::TaprootConnector,
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
-    transactions::{
-        base::{BaseTransaction, Input},
-        kick_off_2::KickOff2Transaction,
-        take_1::Take1Transaction,
-    },
-};
-use tokio::time::sleep;
-
-use crate::bridge::{
-    helper::verify_funding_inputs,
-    integration::peg_out::utils::{
-        create_and_mine_kick_off_1_tx, create_and_mine_peg_in_confirm_tx,
-    },
-    setup::setup_test,
-};
-
-#[tokio::test]
-async fn test_take_1_success() {
-    let (
-        client,
-        _,
-        depositor_context,
-        operator_context,
-        verifier_0_context,
-        verifier_1_context,
-        _,
-        _,
-        _,
-        _,
-        connector_z,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    // verify funding inputs
-    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
-
-    let deposit_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let peg_in_confirm_funding_address = connector_z.generate_taproot_address();
-    funding_inputs.push((&peg_in_confirm_funding_address, deposit_input_amount));
-
-    let kick_off_1_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let kick_off_1_funding_utxo_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
-    );
-    funding_inputs.push((&kick_off_1_funding_utxo_address, kick_off_1_input_amount));
-
-    verify_funding_inputs(&client, &funding_inputs).await;
-
-    // peg-in confirm
-    let (peg_in_confirm_tx, peg_in_confirm_txid) = create_and_mine_peg_in_confirm_tx(
-        &client,
-        &depositor_context,
-        &verifier_0_context,
-        &verifier_1_context,
-        &depositor_evm_address,
-        &peg_in_confirm_funding_address,
-        deposit_input_amount,
-    )
-    .await;
-
-    // kick-off 1
-    let (kick_off_1_tx, kick_off_1_txid) = create_and_mine_kick_off_1_tx(
-        &client,
-        &operator_context,
-        &kick_off_1_funding_utxo_address,
-        kick_off_1_input_amount,
-    )
-    .await;
-
-    // kick-off 2
-    let vout = 1; // connector 1
-    let kick_off_2_input_0 = Input {
-        outpoint: OutPoint {
-            txid: kick_off_1_txid,
-            vout,
-        },
-        amount: kick_off_1_tx.output[vout as usize].value,
-    };
-    let kick_off_2 = KickOff2Transaction::new(&operator_context, kick_off_2_input_0);
-    let kick_off_2_tx = kick_off_2.finalize();
-    let kick_off_2_txid = kick_off_2_tx.compute_txid();
-
-    // mine kick-off 2
-    sleep(Duration::from_secs(60)).await;
-    let kick_off_2_result = client.esplora.broadcast(&kick_off_2_tx).await;
-    assert!(kick_off_2_result.is_ok());
-
-    // take 1
-    let vout = 0; // connector 0
-    let take_1_input_0 = Input {
-        outpoint: OutPoint {
-            txid: peg_in_confirm_txid,
-            vout,
-        },
-        amount: peg_in_confirm_tx.output[vout as usize].value,
-    };
-    let vout = 0; // connector a
-    let take_1_input_1 = Input {
-        outpoint: OutPoint {
-            txid: kick_off_1_txid,
-            vout,
-        },
-        amount: kick_off_1_tx.output[vout as usize].value,
-    };
-    let vout = 0; // connector 3
-    let take_1_input_2 = Input {
-        outpoint: OutPoint {
-            txid: kick_off_2_txid,
-            vout,
-        },
-        amount: kick_off_2_tx.output[vout as usize].value,
-    };
-    let vout = 1; // connector b
-    let take_1_input_3 = Input {
-        outpoint: OutPoint {
-            txid: kick_off_2_txid,
-            vout,
-        },
-        amount: kick_off_2_tx.output[vout as usize].value,
-    };
-
-    let mut take_1 = Take1Transaction::new(
-        &operator_context,
-        take_1_input_0,
-        take_1_input_1,
-        take_1_input_2,
-        take_1_input_3,
-    );
-
-    let secret_nonces_0 = take_1.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = take_1.push_nonces(&verifier_1_context);
-
-    take_1.pre_sign(&verifier_0_context, &secret_nonces_0);
-    take_1.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let take_1_tx = take_1.finalize();
-    let take_1_txid = take_1_tx.compute_txid();
-
-    // mine take 1
-    sleep(Duration::from_secs(60)).await;
-    let take_1_result = client.esplora.broadcast(&take_1_tx).await;
-    assert!(take_1_result.is_ok());
-
-    // operator balance
-    let operator_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
-    );
-    let operator_utxos = client
-        .esplora
-        .get_address_utxo(operator_address.clone())
-        .await
-        .unwrap();
-    let operator_utxo = operator_utxos
-        .clone()
-        .into_iter()
-        .find(|x| x.txid == take_1_txid);
-
-    // assert
-    assert!(operator_utxo.is_some());
-}
diff --git a/tests/bridge/integration/peg_out/take_2.rs b/tests/bridge/integration/peg_out/take_2.rs
deleted file mode 100644
index 26d574a10..000000000
--- a/tests/bridge/integration/peg_out/take_2.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-use std::time::Duration;
-
-use bitcoin::{Address, Amount, OutPoint};
-use bitvm::bridge::{
-    connectors::connector::TaprootConnector,
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
-    transactions::{
-        base::{BaseTransaction, Input},
-        take_2::Take2Transaction,
-    },
-};
-use tokio::time::sleep;
-
-use crate::bridge::{
-    helper::verify_funding_inputs,
-    integration::peg_out::utils::{create_and_mine_assert_tx, create_and_mine_peg_in_confirm_tx},
-    setup::setup_test,
-};
-
-#[tokio::test]
-async fn test_take_2_success() {
-    let (
-        client,
-        _,
-        depositor_context,
-        operator_context,
-        verifier_0_context,
-        verifier_1_context,
-        _,
-        _,
-        connector_b,
-        _,
-        connector_z,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    // verify funding inputs
-    let mut funding_inputs: Vec<(&Address, Amount)> = vec![];
-
-    let deposit_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let peg_in_confirm_funding_address = connector_z.generate_taproot_address();
-    funding_inputs.push((&peg_in_confirm_funding_address, deposit_input_amount));
-
-    let assert_input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let assert_funding_address = connector_b.generate_taproot_address();
-    funding_inputs.push((&assert_funding_address, assert_input_amount));
-
-    verify_funding_inputs(&client, &funding_inputs).await;
-
-    // peg-in confirm
-    let (peg_in_confirm_tx, peg_in_confirm_txid) = create_and_mine_peg_in_confirm_tx(
-        &client,
-        &depositor_context,
-        &verifier_0_context,
-        &verifier_1_context,
-        &depositor_evm_address,
-        &peg_in_confirm_funding_address,
-        deposit_input_amount,
-    )
-    .await;
-
-    // assert
-    let (assert_tx, assert_txid) = create_and_mine_assert_tx(
-        &client,
-        &operator_context,
-        &verifier_0_context,
-        &verifier_1_context,
-        &assert_funding_address,
-        assert_input_amount,
-    )
-    .await;
-
-    // take 2
-    let vout = 0; // connector 0
-    let take_2_input_0 = Input {
-        outpoint: OutPoint {
-            txid: peg_in_confirm_txid,
-            vout,
-        },
-        amount: peg_in_confirm_tx.output[vout as usize].value,
-    };
-    let vout = 0; // connector 4
-    let take_2_input_1 = Input {
-        outpoint: OutPoint {
-            txid: assert_txid,
-            vout,
-        },
-        amount: assert_tx.output[vout as usize].value,
-    };
-    let vout = 1; // connector 5
-    let take_2_input_2 = Input {
-        outpoint: OutPoint {
-            txid: assert_txid,
-            vout,
-        },
-        amount: assert_tx.output[vout as usize].value,
-    };
-    let vout = 2; // connector c
-    let take_2_input_3 = Input {
-        outpoint: OutPoint {
-            txid: assert_txid,
-            vout,
-        },
-        amount: assert_tx.output[vout as usize].value,
-    };
-
-    let mut take_2 = Take2Transaction::new(
-        &operator_context,
-        take_2_input_0,
-        take_2_input_1,
-        take_2_input_2,
-        take_2_input_3,
-    );
-
-    let secret_nonces_0 = take_2.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = take_2.push_nonces(&verifier_1_context);
-
-    take_2.pre_sign(&verifier_0_context, &secret_nonces_0);
-    take_2.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let take_2_tx = take_2.finalize();
-    let take_2_txid = take_2_tx.compute_txid();
-
-    // mine take 2
-    sleep(Duration::from_secs(60)).await;
-    let take_2_result = client.esplora.broadcast(&take_2_tx).await;
-    assert!(take_2_result.is_ok());
-
-    // operator balance
-    let operator_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
-    );
-    let operator_utxos = client
-        .esplora
-        .get_address_utxo(operator_address.clone())
-        .await
-        .unwrap();
-    let operator_utxo = operator_utxos
-        .clone()
-        .into_iter()
-        .find(|x| x.txid == take_2_txid);
-
-    // assert
-    assert!(operator_utxo.is_some());
-}
diff --git a/tests/bridge/integration/peg_out/utils.rs b/tests/bridge/integration/peg_out/utils.rs
deleted file mode 100644
index 6e40b2897..000000000
--- a/tests/bridge/integration/peg_out/utils.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-use bitcoin::{Address, Amount, Transaction, Txid};
-use bitvm::bridge::{
-    client::client::BitVMClient,
-    contexts::{depositor::DepositorContext, operator::OperatorContext, verifier::VerifierContext},
-    transactions::{
-        assert::AssertTransaction,
-        base::{BaseTransaction, Input},
-        kick_off_1::KickOff1Transaction,
-        kick_off_2::KickOff2Transaction,
-        peg_in_confirm::PegInConfirmTransaction,
-    },
-};
-
-use crate::bridge::helper::generate_stub_outpoint;
-
-pub async fn create_and_mine_kick_off_1_tx(
-    client: &BitVMClient,
-    operator_context: &OperatorContext,
-    kick_off_1_funding_utxo_address: &Address,
-    input_amount: Amount,
-) -> (Transaction, Txid) {
-    let kick_off_1_funding_outpoint =
-        generate_stub_outpoint(&client, kick_off_1_funding_utxo_address, input_amount).await;
-    let kick_off_1_input = Input {
-        outpoint: kick_off_1_funding_outpoint,
-        amount: input_amount,
-    };
-    let kick_off_1 = KickOff1Transaction::new(&operator_context, kick_off_1_input);
-    let kick_off_1_tx = kick_off_1.finalize();
-    let kick_off_1_txid = kick_off_1_tx.compute_txid();
-
-    // mine kick-off 1 tx
-    let kick_off_1_result = client.esplora.broadcast(&kick_off_1_tx).await;
-    assert!(kick_off_1_result.is_ok());
-
-    return (kick_off_1_tx, kick_off_1_txid);
-}
-
-pub async fn create_and_mine_kick_off_2_tx(
-    client: &BitVMClient,
-    operator_context: &OperatorContext,
-    kick_off_2_funding_utxo_address: &Address,
-    input_amount: Amount,
-) -> (Transaction, Txid) {
-    let kick_off_2_funding_outpoint =
-        generate_stub_outpoint(&client, kick_off_2_funding_utxo_address, input_amount).await;
-    let kick_off_2_input = Input {
-        outpoint: kick_off_2_funding_outpoint,
-        amount: input_amount,
-    };
-    let kick_off_2 = KickOff2Transaction::new(&operator_context, kick_off_2_input);
-    let kick_off_2_tx = kick_off_2.finalize();
-    let kick_off_2_txid = kick_off_2_tx.compute_txid();
-
-    // mine kick-off 2 tx
-    let kick_off_2_result = client.esplora.broadcast(&kick_off_2_tx).await;
-    assert!(kick_off_2_result.is_ok());
-
-    return (kick_off_2_tx, kick_off_2_txid);
-}
-
-pub async fn create_and_mine_assert_tx(
-    client: &BitVMClient,
-    operator_context: &OperatorContext,
-    verifier_0_context: &VerifierContext,
-    verifier_1_context: &VerifierContext,
-    assert_funding_utxo_address: &Address,
-    input_amount: Amount,
-) -> (Transaction, Txid) {
-    // create assert tx
-    let assert_funding_outpoint =
-        generate_stub_outpoint(&client, assert_funding_utxo_address, input_amount).await;
-    let assert_input = Input {
-        outpoint: assert_funding_outpoint,
-        amount: input_amount,
-    };
-    let mut assert = AssertTransaction::new(&operator_context, assert_input);
-
-    let secret_nonces_0 = assert.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = assert.push_nonces(&verifier_1_context);
-
-    assert.pre_sign(&verifier_0_context, &secret_nonces_0);
-    assert.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let assert_tx = assert.finalize();
-    let assert_txid = assert_tx.compute_txid();
-
-    // mine assert tx
-    let assert_result = client.esplora.broadcast(&assert_tx).await;
-    assert!(assert_result.is_ok());
-
-    return (assert_tx, assert_txid);
-}
-
-pub async fn create_and_mine_peg_in_confirm_tx(
-    client: &BitVMClient,
-    depositor_context: &DepositorContext,
-    verifier_0_context: &VerifierContext,
-    verifier_1_context: &VerifierContext,
-    evm_address: &str,
-    funding_address: &Address,
-    input_amount: Amount,
-) -> (Transaction, Txid) {
-    let peg_in_confirm_funding_outpoint =
-        generate_stub_outpoint(client, &funding_address, input_amount).await;
-
-    let confirm_input = Input {
-        outpoint: peg_in_confirm_funding_outpoint,
-        amount: input_amount,
-    };
-    let mut peg_in_confirm =
-        PegInConfirmTransaction::new(depositor_context, evm_address, confirm_input);
-
-    let secret_nonces_0 = peg_in_confirm.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = peg_in_confirm.push_nonces(&verifier_1_context);
-
-    peg_in_confirm.pre_sign(&verifier_0_context, &secret_nonces_0);
-    peg_in_confirm.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let peg_in_confirm_tx = peg_in_confirm.finalize();
-    let peg_in_confirm_txid = peg_in_confirm_tx.compute_txid();
-
-    // mine peg-in confirm
-    let confirm_result = client.esplora.broadcast(&peg_in_confirm_tx).await;
-    assert!(confirm_result.is_ok());
-
-    return (peg_in_confirm_tx, peg_in_confirm_txid);
-}
diff --git a/tests/bridge/kick_off_1/kick_off_1.rs b/tests/bridge/kick_off_1/kick_off_1.rs
deleted file mode 100644
index 2da1bf801..000000000
--- a/tests/bridge/kick_off_1/kick_off_1.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
-    transactions::{
-        base::{BaseTransaction, Input},
-        kick_off_1::KickOff1Transaction,
-    },
-};
-
-use crate::bridge::helper::generate_stub_outpoint;
-
-use super::super::setup::setup_test;
-
-#[tokio::test]
-async fn test_kick_off_1_tx() {
-    let (client, _, _, operator_context, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =
-        setup_test().await;
-
-    let input_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let funding_address = generate_pay_to_pubkey_script_address(
-        operator_context.network,
-        &operator_context.operator_public_key,
-    );
-    let funding_outpoint_0 = generate_stub_outpoint(&client, &funding_address, input_amount).await;
-
-    let input = Input {
-        outpoint: funding_outpoint_0,
-        amount: input_amount,
-    };
-
-    let kick_off_1_tx = KickOff1Transaction::new(&operator_context, input);
-
-    let tx = kick_off_1_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = client.esplora.broadcast(&tx).await;
-    println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
-    assert!(result.is_ok());
-}
diff --git a/tests/bridge/kick_off_2/kick_off_2.rs b/tests/bridge/kick_off_2/kick_off_2.rs
deleted file mode 100644
index 8478db23c..000000000
--- a/tests/bridge/kick_off_2/kick_off_2.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    connectors::connector::TaprootConnector,
-    graphs::base::ONE_HUNDRED,
-    transactions::{
-        base::{BaseTransaction, Input},
-        kick_off_2::KickOff2Transaction,
-    },
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_kick_off_2_tx() {
-    let (client, _, _, operator_context, _, _, _, _, _, _, _, _, connector_1, _, _, _, _, _, _) =
-        setup_test().await;
-
-    let input_value0 = Amount::from_sat(ONE_HUNDRED * 2 / 100);
-    let funding_utxo_address0 = connector_1.generate_taproot_address();
-    let funding_outpoint0 =
-        generate_stub_outpoint(&client, &funding_utxo_address0, input_value0).await;
-
-    let kick_off_2_tx = KickOff2Transaction::new(
-        &operator_context,
-        Input {
-            outpoint: funding_outpoint0,
-            amount: input_value0,
-        },
-    );
-
-    let tx = kick_off_2_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = client.esplora.broadcast(&tx).await;
-    println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
-    assert!(result.is_ok());
-}
diff --git a/tests/bridge/kick_off_timeout/kick_off_timeout.rs b/tests/bridge/kick_off_timeout/kick_off_timeout.rs
deleted file mode 100644
index 74cb9cbba..000000000
--- a/tests/bridge/kick_off_timeout/kick_off_timeout.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    connectors::connector::TaprootConnector,
-    graphs::base::ONE_HUNDRED,
-    transactions::{
-        base::{BaseTransaction, Input},
-        kick_off_timeout::KickOffTimeoutTransaction,
-    },
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_kick_off_timeout_tx() {
-    let (
-        client,
-        _,
-        _,
-        operator_context,
-        verifier_0_context,
-        verifier_1_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        connector_1,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-    ) = setup_test().await;
-
-    let input_value0 = Amount::from_sat(ONE_HUNDRED * 2 / 100);
-    let outpoint_0 = generate_stub_outpoint(
-        &client,
-        &connector_1.generate_taproot_address(),
-        input_value0,
-    )
-    .await;
-
-    let mut kick_off_timeout_tx = KickOffTimeoutTransaction::new(
-        &operator_context,
-        Input {
-            outpoint: outpoint_0,
-            amount: input_value0,
-        },
-    );
-
-    let secret_nonces_0 = kick_off_timeout_tx.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = kick_off_timeout_tx.push_nonces(&verifier_1_context);
-
-    kick_off_timeout_tx.pre_sign(&verifier_0_context, &secret_nonces_0);
-    kick_off_timeout_tx.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let tx = kick_off_timeout_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = client.esplora.broadcast(&tx).await;
-    println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
-    assert!(result.is_ok());
-}
diff --git a/tests/bridge/peg_in/peg_in_confirm.rs b/tests/bridge/peg_in/peg_in_confirm.rs
deleted file mode 100644
index 6dfbb0521..000000000
--- a/tests/bridge/peg_in/peg_in_confirm.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    connectors::connector::TaprootConnector,
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    transactions::{
-        base::{BaseTransaction, Input},
-        peg_in_confirm::PegInConfirmTransaction,
-    },
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_peg_in_confirm_tx() {
-    let (
-        client,
-        _,
-        depositor_context,
-        _,
-        verifier_0_context,
-        verifier_1_context,
-        _,
-        _,
-        _,
-        _,
-        connector_z,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let outpoint =
-        generate_stub_outpoint(&client, &connector_z.generate_taproot_address(), amount).await;
-
-    let mut peg_in_confirm_tx = PegInConfirmTransaction::new(
-        &depositor_context,
-        &depositor_evm_address,
-        Input { outpoint, amount },
-    );
-
-    let secret_nonces_0 = peg_in_confirm_tx.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = peg_in_confirm_tx.push_nonces(&verifier_1_context);
-
-    peg_in_confirm_tx.pre_sign(&verifier_0_context, &secret_nonces_0);
-    peg_in_confirm_tx.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let tx = peg_in_confirm_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = client.esplora.broadcast(&tx).await;
-    println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
-    assert!(result.is_ok());
-}
diff --git a/tests/bridge/peg_in/peg_in_deposit.rs b/tests/bridge/peg_in/peg_in_deposit.rs
deleted file mode 100644
index e3d5c1e71..000000000
--- a/tests/bridge/peg_in/peg_in_deposit.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    scripts::generate_pay_to_pubkey_script_address,
-    transactions::{
-        base::{BaseTransaction, Input},
-        peg_in_deposit::PegInDepositTransaction,
-    },
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_peg_in_deposit_tx() {
-    let (
-        client,
-        _,
-        depositor_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let outpoint = generate_stub_outpoint(
-        &client,
-        &generate_pay_to_pubkey_script_address(
-            depositor_context.network,
-            &depositor_context.depositor_public_key,
-        ),
-        amount,
-    )
-    .await;
-
-    let peg_in_deposit_tx = PegInDepositTransaction::new(
-        &depositor_context,
-        &depositor_evm_address,
-        Input { outpoint, amount },
-    );
-
-    println!(
-        "Depositor public key: {:?}\n",
-        &depositor_context.depositor_public_key
-    );
-
-    let tx = peg_in_deposit_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = client.esplora.broadcast(&tx).await;
-    println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
-    assert!(result.is_ok());
-}
diff --git a/tests/bridge/peg_in/peg_in_refund.rs b/tests/bridge/peg_in/peg_in_refund.rs
deleted file mode 100644
index ddcba7050..000000000
--- a/tests/bridge/peg_in/peg_in_refund.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    connectors::connector::TaprootConnector,
-    graphs::base::{FEE_AMOUNT, INITIAL_AMOUNT},
-    transactions::{
-        base::{BaseTransaction, Input},
-        peg_in_refund::PegInRefundTransaction,
-    },
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_peg_in_refund_tx() {
-    let (
-        client,
-        _,
-        depositor_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        connector_z,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let outpoint =
-        generate_stub_outpoint(&client, &connector_z.generate_taproot_address(), amount).await;
-
-    let peg_in_refund_tx = PegInRefundTransaction::new(
-        &depositor_context,
-        &depositor_evm_address,
-        Input { outpoint, amount },
-    );
-
-    let tx = peg_in_refund_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = client.esplora.broadcast(&tx).await;
-    println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
-    assert!(result.is_ok());
-}
diff --git a/tests/bridge/serialization/assert_transaction.rs b/tests/bridge/serialization/assert_transaction.rs
deleted file mode 100644
index e1baecc09..000000000
--- a/tests/bridge/serialization/assert_transaction.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use bitcoin::Amount;
-
-use bitvm::bridge::{
-    connectors::connector::TaprootConnector,
-    graphs::base::ONE_HUNDRED,
-    serialization::{deserialize, serialize},
-    transactions::{assert::AssertTransaction, base::Input},
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_assert_tx_serialization() {
-    let (
-        client,
-        _,
-        _,
-        operator_context,
-        verifier_0_context,
-        verifier_1_context,
-        _,
-        _,
-        connector_b,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-    ) = setup_test().await;
-
-    let amount = Amount::from_sat(ONE_HUNDRED * 2 / 100);
-    let outpoint =
-        generate_stub_outpoint(&client, &connector_b.generate_taproot_address(), amount).await;
-
-    let mut assert_tx = AssertTransaction::new(&operator_context, Input { outpoint, amount });
-
-    let secret_nonces_0 = assert_tx.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = assert_tx.push_nonces(&verifier_1_context);
-
-    assert_tx.pre_sign(&verifier_0_context, &secret_nonces_0);
-    assert_tx.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let json = serialize(&assert_tx);
-    assert!(json.len() > 0);
-    let deserialized_assert_tx = deserialize::<AssertTransaction>(&json);
-    assert!(assert_tx == deserialized_assert_tx);
-}
diff --git a/tests/bridge/serialization/peg_in_graph.rs b/tests/bridge/serialization/peg_in_graph.rs
deleted file mode 100644
index b02538eb8..000000000
--- a/tests/bridge/serialization/peg_in_graph.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use bitcoin::Amount;
-
-use bitvm::bridge::{
-    graphs::{
-        base::{FEE_AMOUNT, INITIAL_AMOUNT},
-        peg_in::PegInGraph,
-    },
-    scripts::generate_pay_to_pubkey_script_address,
-    serialization::{deserialize, serialize},
-    transactions::base::Input,
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_peg_in_graph_serialization() {
-    let (
-        client,
-        _,
-        depositor_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-
-    let outpoint = generate_stub_outpoint(
-        &client,
-        &generate_pay_to_pubkey_script_address(
-            depositor_context.network,
-            &depositor_context.depositor_public_key,
-        ),
-        amount,
-    )
-    .await;
-
-    let peg_in_graph = PegInGraph::new(
-        &depositor_context,
-        Input { outpoint, amount },
-        &depositor_evm_address,
-    );
-
-    let json = serialize(&peg_in_graph);
-    assert!(json.len() > 0);
-    let deserialized_peg_in_graph = deserialize::<PegInGraph>(&json);
-    assert!(peg_in_graph == deserialized_peg_in_graph);
-}
diff --git a/tests/bridge/serialization/peg_out_graph.rs b/tests/bridge/serialization/peg_out_graph.rs
deleted file mode 100644
index 061acc940..000000000
--- a/tests/bridge/serialization/peg_out_graph.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use bitcoin::Amount;
-
-use bitvm::bridge::{
-    graphs::{
-        base::{FEE_AMOUNT, INITIAL_AMOUNT},
-        peg_in::PegInGraph,
-        peg_out::PegOutGraph,
-    },
-    scripts::generate_pay_to_pubkey_script_address,
-    serialization::{deserialize, serialize},
-    transactions::base::Input,
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_peg_out_graph_serialization() {
-    let (
-        client,
-        _,
-        depositor_context,
-        operator_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        depositor_evm_address,
-        _,
-    ) = setup_test().await;
-
-    let amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-
-    let outpoint = generate_stub_outpoint(
-        &client,
-        &generate_pay_to_pubkey_script_address(
-            depositor_context.network,
-            &depositor_context.depositor_public_key,
-        ),
-        amount,
-    )
-    .await;
-
-    let peg_in_graph = PegInGraph::new(
-        &depositor_context,
-        Input { outpoint, amount },
-        &depositor_evm_address,
-    );
-
-    let kick_off_amount = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT); // Arbitrary amount
-
-    let kick_off_outpoint = generate_stub_outpoint(
-        &client,
-        &generate_pay_to_pubkey_script_address(
-            operator_context.network,
-            &operator_context.operator_public_key,
-        ),
-        kick_off_amount,
-    )
-    .await;
-
-    let peg_out_graph = PegOutGraph::new(
-        &operator_context,
-        &peg_in_graph,
-        Input {
-            outpoint: kick_off_outpoint,
-            amount: kick_off_amount,
-        },
-    );
-
-    let json = serialize(&peg_out_graph);
-    assert!(json.len() > 0);
-    let deserialized_peg_out_graph = deserialize::<PegOutGraph>(&json);
-    assert!(peg_out_graph == deserialized_peg_out_graph);
-}
diff --git a/tests/bridge/setup.rs b/tests/bridge/setup.rs
deleted file mode 100644
index a1f4a48f4..000000000
--- a/tests/bridge/setup.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use bitcoin::{Network, PublicKey};
-
-use bitvm::bridge::{
-    client::client::BitVMClient,
-    connectors::{
-        connector_0::Connector0, connector_1::Connector1, connector_2::Connector2,
-        connector_3::Connector3, connector_4::Connector4, connector_5::Connector5,
-        connector_a::ConnectorA, connector_b::ConnectorB, connector_c::ConnectorC,
-        connector_z::ConnectorZ,
-    },
-    constants::DestinationNetwork,
-    contexts::{
-        base::generate_keys_from_secret, depositor::DepositorContext, operator::OperatorContext,
-        verifier::VerifierContext, withdrawer::WithdrawerContext,
-    },
-    graphs::base::{
-        DEPOSITOR_EVM_ADDRESS, DEPOSITOR_SECRET, OPERATOR_SECRET, VERIFIER_0_SECRET,
-        VERIFIER_1_SECRET, WITHDRAWER_EVM_ADDRESS, WITHDRAWER_SECRET,
-    },
-};
-
-pub async fn setup_test() -> (
-    BitVMClient,
-    BitVMClient,
-    DepositorContext,
-    OperatorContext,
-    VerifierContext,
-    VerifierContext,
-    WithdrawerContext,
-    ConnectorA,
-    ConnectorB,
-    ConnectorC,
-    ConnectorZ,
-    Connector0,
-    Connector1,
-    Connector2,
-    Connector3,
-    Connector4,
-    Connector5,
-    String,
-    String,
-) {
-    let source_network = Network::Testnet;
-    let destination_network = DestinationNetwork::EthereumSepolia;
-
-    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);
-    let mut n_of_n_public_keys: Vec<PublicKey> = Vec::new();
-    n_of_n_public_keys.push(verifier_0_public_key);
-    n_of_n_public_keys.push(verifier_1_public_key);
-
-    let depositor_context =
-        DepositorContext::new(source_network, DEPOSITOR_SECRET, &n_of_n_public_keys);
-    let operator_context =
-        OperatorContext::new(source_network, OPERATOR_SECRET, &n_of_n_public_keys);
-    let verifier_0_context =
-        VerifierContext::new(source_network, VERIFIER_0_SECRET, &n_of_n_public_keys);
-    let verifier_1_context =
-        VerifierContext::new(source_network, VERIFIER_1_SECRET, &n_of_n_public_keys);
-    let withdrawer_context =
-        WithdrawerContext::new(source_network, WITHDRAWER_SECRET, &n_of_n_public_keys);
-
-    let client_0 = BitVMClient::new(
-        source_network,
-        destination_network,
-        &n_of_n_public_keys,
-        Some(DEPOSITOR_SECRET),
-        Some(OPERATOR_SECRET),
-        Some(VERIFIER_0_SECRET),
-        Some(WITHDRAWER_SECRET),
-    )
-    .await;
-
-    let client_1 = BitVMClient::new(
-        source_network,
-        destination_network,
-        &n_of_n_public_keys,
-        Some(DEPOSITOR_SECRET),
-        Some(OPERATOR_SECRET),
-        Some(VERIFIER_1_SECRET),
-        Some(WITHDRAWER_SECRET),
-    )
-    .await;
-
-    let connector_a = ConnectorA::new(
-        source_network,
-        &operator_context.operator_taproot_public_key,
-        &operator_context.n_of_n_taproot_public_key,
-    );
-    let connector_b = ConnectorB::new(source_network, &operator_context.n_of_n_taproot_public_key);
-    let connector_c = ConnectorC::new(
-        source_network,
-        &operator_context.operator_taproot_public_key,
-    );
-    let connector_z = ConnectorZ::new(
-        source_network,
-        DEPOSITOR_EVM_ADDRESS,
-        &depositor_context.depositor_taproot_public_key,
-        &operator_context.n_of_n_taproot_public_key,
-    );
-    let connector_0 = Connector0::new(source_network, &operator_context.n_of_n_taproot_public_key);
-    let connector_1 = Connector1::new(
-        source_network,
-        &operator_context.operator_taproot_public_key,
-        &operator_context.n_of_n_taproot_public_key,
-    );
-    let connector_2 = Connector2::new(
-        source_network,
-        &operator_context.operator_taproot_public_key,
-        &operator_context.n_of_n_taproot_public_key,
-    );
-    let connector_3 = Connector3::new(source_network, &operator_context.operator_public_key);
-    let connector_4 = Connector4::new(source_network, &operator_context.operator_public_key);
-    let connector_5 = Connector5::new(source_network, &operator_context.n_of_n_taproot_public_key);
-
-    return (
-        client_0,
-        client_1,
-        depositor_context,
-        operator_context,
-        verifier_0_context,
-        verifier_1_context,
-        withdrawer_context,
-        connector_a,
-        connector_b,
-        connector_c,
-        connector_z,
-        connector_0,
-        connector_1,
-        connector_2,
-        connector_3,
-        connector_4,
-        connector_5,
-        DEPOSITOR_EVM_ADDRESS.to_string(),
-        WITHDRAWER_EVM_ADDRESS.to_string(),
-    );
-}
diff --git a/tests/bridge/start_time/start_time.rs b/tests/bridge/start_time/start_time.rs
deleted file mode 100644
index b09459111..000000000
--- a/tests/bridge/start_time/start_time.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    connectors::connector::TaprootConnector,
-    graphs::base::DUST_AMOUNT,
-    transactions::{
-        base::{BaseTransaction, Input},
-        start_time::StartTimeTransaction,
-    },
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_start_time_tx() {
-    let (client, _, _, operator_context, _, _, _, _, _, _, _, _, _, connector_2, _, _, _, _, _) =
-        setup_test().await;
-
-    let input_value0 = Amount::from_sat(DUST_AMOUNT);
-    let funding_utxo_address0 = connector_2.generate_taproot_address();
-    let funding_outpoint0 =
-        generate_stub_outpoint(&client, &funding_utxo_address0, input_value0).await;
-
-    let start_time_tx = StartTimeTransaction::new(
-        &operator_context,
-        Input {
-            outpoint: funding_outpoint0,
-            amount: input_value0,
-        },
-    );
-
-    let tx = start_time_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = client.esplora.broadcast(&tx).await;
-    println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
-    assert!(result.is_ok());
-}
diff --git a/tests/bridge/start_time_timeout/start_time_timeout.rs b/tests/bridge/start_time_timeout/start_time_timeout.rs
deleted file mode 100644
index ee98e00a5..000000000
--- a/tests/bridge/start_time_timeout/start_time_timeout.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    connectors::connector::TaprootConnector,
-    graphs::base::{DUST_AMOUNT, ONE_HUNDRED},
-    transactions::{
-        base::{BaseTransaction, Input},
-        start_time_timeout::StartTimeTimeoutTransaction,
-    },
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_start_time_timeout_tx() {
-    let (
-        client,
-        _,
-        _,
-        operator_context,
-        verifier_0_context,
-        verifier_1_context,
-        _,
-        _,
-        _,
-        _,
-        _,
-        _,
-        connector_1,
-        connector_2,
-        _,
-        _,
-        _,
-        _,
-        _,
-    ) = setup_test().await;
-
-    let input_value0 = Amount::from_sat(DUST_AMOUNT);
-    let funding_utxo_address0 = connector_1.generate_taproot_address();
-    let funding_outpoint0 =
-        generate_stub_outpoint(&client, &funding_utxo_address0, input_value0).await;
-
-    let input_value1 = Amount::from_sat(ONE_HUNDRED * 2 / 100);
-    let funding_utxo_address1 = connector_2.generate_taproot_address();
-    let funding_outpoint1 =
-        generate_stub_outpoint(&client, &funding_utxo_address1, input_value1).await;
-
-    let mut start_time_timeout_tx = StartTimeTimeoutTransaction::new(
-        &operator_context,
-        Input {
-            outpoint: funding_outpoint0,
-            amount: input_value0,
-        },
-        Input {
-            outpoint: funding_outpoint1,
-            amount: input_value1,
-        },
-    );
-
-    let secret_nonces_0 = start_time_timeout_tx.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = start_time_timeout_tx.push_nonces(&verifier_1_context);
-
-    start_time_timeout_tx.pre_sign(&verifier_0_context, &secret_nonces_0);
-    start_time_timeout_tx.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let tx = start_time_timeout_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = client.esplora.broadcast(&tx).await;
-    println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
-    assert!(result.is_ok());
-}
diff --git a/tests/bridge/take_1/take_1.rs b/tests/bridge/take_1/take_1.rs
deleted file mode 100644
index 807ecdba7..000000000
--- a/tests/bridge/take_1/take_1.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    connectors::connector::{P2wshConnector, TaprootConnector},
-    graphs::base::{DUST_AMOUNT, FEE_AMOUNT, INITIAL_AMOUNT, ONE_HUNDRED},
-    transactions::{
-        base::{BaseTransaction, Input},
-        take_1::Take1Transaction,
-    },
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_take_1_tx() {
-    let (
-        client,
-        _,
-        _,
-        operator_context,
-        verifier_0_context,
-        verifier_1_context,
-        _,
-        connector_a,
-        connector_b,
-        _,
-        _,
-        connector_0,
-        _,
-        _,
-        connector_3,
-        _,
-        _,
-        _,
-        _,
-    ) = setup_test().await;
-
-    let input_value0 = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let funding_utxo_address0 = connector_0.generate_taproot_address();
-    let funding_outpoint0 =
-        generate_stub_outpoint(&client, &funding_utxo_address0, input_value0).await;
-
-    let input_value1 = Amount::from_sat(DUST_AMOUNT);
-    let funding_utxo_address1 = connector_a.generate_taproot_address();
-    let funding_outpoint1 =
-        generate_stub_outpoint(&client, &funding_utxo_address1, input_value1).await;
-
-    let input_value2 = Amount::from_sat(DUST_AMOUNT);
-    let funding_utxo_address2 = connector_3.generate_address();
-    let funding_outpoint2 =
-        generate_stub_outpoint(&client, &funding_utxo_address2, input_value2).await;
-
-    let input_value3 = Amount::from_sat(ONE_HUNDRED * 2 / 100);
-    let funding_utxo_address3 = connector_b.generate_taproot_address();
-    let funding_outpoint3 =
-        generate_stub_outpoint(&client, &funding_utxo_address3, input_value3).await;
-
-    let mut take_1_tx = Take1Transaction::new(
-        &operator_context,
-        Input {
-            outpoint: funding_outpoint0,
-            amount: input_value0,
-        },
-        Input {
-            outpoint: funding_outpoint1,
-            amount: input_value1,
-        },
-        Input {
-            outpoint: funding_outpoint2,
-            amount: input_value2,
-        },
-        Input {
-            outpoint: funding_outpoint3,
-            amount: input_value3,
-        },
-    );
-
-    let secret_nonces_0 = take_1_tx.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = take_1_tx.push_nonces(&verifier_1_context);
-
-    take_1_tx.pre_sign(&verifier_0_context, &secret_nonces_0);
-    take_1_tx.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let tx = take_1_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = client.esplora.broadcast(&tx).await;
-    println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
-    assert!(result.is_ok());
-}
diff --git a/tests/bridge/take_2/take_2.rs b/tests/bridge/take_2/take_2.rs
deleted file mode 100644
index 97d235f46..000000000
--- a/tests/bridge/take_2/take_2.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use bitcoin::{consensus::encode::serialize_hex, Amount};
-
-use bitvm::bridge::{
-    connectors::connector::{P2wshConnector, TaprootConnector},
-    graphs::base::{DUST_AMOUNT, FEE_AMOUNT, INITIAL_AMOUNT, ONE_HUNDRED},
-    transactions::{
-        base::{BaseTransaction, Input},
-        take_2::Take2Transaction,
-    },
-};
-
-use super::super::{helper::generate_stub_outpoint, setup::setup_test};
-
-#[tokio::test]
-async fn test_take_2_tx() {
-    let (
-        client,
-        _,
-        _,
-        operator_context,
-        verifier_0_context,
-        verifier_1_context,
-        _,
-        _,
-        _,
-        connector_c,
-        _,
-        connector_0,
-        _,
-        _,
-        _,
-        connector_4,
-        connector_5,
-        _,
-        _,
-    ) = setup_test().await;
-
-    let input_value0 = Amount::from_sat(INITIAL_AMOUNT + FEE_AMOUNT);
-    let funding_utxo_address0 = connector_0.generate_taproot_address();
-    let funding_outpoint0 =
-        generate_stub_outpoint(&client, &funding_utxo_address0, input_value0).await;
-
-    let input_value1 = Amount::from_sat(DUST_AMOUNT);
-    let funding_utxo_address1 = connector_4.generate_address();
-    let funding_outpoint1 =
-        generate_stub_outpoint(&client, &funding_utxo_address1, input_value1).await;
-
-    let input_value2 = Amount::from_sat(ONE_HUNDRED * 2 / 100);
-    let funding_utxo_address2 = connector_5.generate_taproot_address();
-    let funding_outpoint2 =
-        generate_stub_outpoint(&client, &funding_utxo_address2, input_value2).await;
-
-    let input_value3 = Amount::from_sat(DUST_AMOUNT);
-    let funding_utxo_address3 = connector_c.generate_taproot_address();
-    let funding_outpoint3 =
-        generate_stub_outpoint(&client, &funding_utxo_address3, input_value3).await;
-
-    let mut take_2_tx = Take2Transaction::new(
-        &operator_context,
-        Input {
-            outpoint: funding_outpoint0,
-            amount: input_value0,
-        },
-        Input {
-            outpoint: funding_outpoint1,
-            amount: input_value1,
-        },
-        Input {
-            outpoint: funding_outpoint2,
-            amount: input_value2,
-        },
-        Input {
-            outpoint: funding_outpoint3,
-            amount: input_value3,
-        },
-    );
-
-    let secret_nonces_0 = take_2_tx.push_nonces(&verifier_0_context);
-    let secret_nonces_1 = take_2_tx.push_nonces(&verifier_1_context);
-
-    take_2_tx.pre_sign(&verifier_0_context, &secret_nonces_0);
-    take_2_tx.pre_sign(&verifier_1_context, &secret_nonces_1);
-
-    let tx = take_2_tx.finalize();
-    println!("Script Path Spend Transaction: {:?}\n", tx);
-    let result = client.esplora.broadcast(&tx).await;
-    println!("Txid: {:?}", tx.compute_txid());
-    println!("Broadcast result: {:?}\n", result);
-    println!("Transaction hex: \n{}", serialize_hex(&tx));
-    assert!(result.is_ok());
-}